[Libreoffice-commits] core.git: 2 commits - external/python3 framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
external/python3/UnpackedTarball_python3.mk |1 external/python3/tsan.patch.0| 10 framework/qa/complex/api_internal/api.lst|1 qadevOOo/Jar_OOoRunner.mk|1 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv |3 qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java| 179 -- sc/qa/unoapi/sc_4.sce|1 7 files changed, 11 insertions(+), 185 deletions(-) New commits: commit 89aec8620034d9cbaa44275282fb3c56e8b3935e Author: Jens Carl AuthorDate: Thu Mar 3 22:45:16 2022 -0800 Commit: Jens Carl CommitDate: Fri Mar 4 17:16:06 2022 +0100 tdf#45904: Remove ScHeaderFieldObj Java test The ScHeaderFieldObj Java tests are implemented in ScEditFieldObj_Header. Change-Id: I45d3b17bd244090c491c85475f20bc06eb92908f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130953 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index 6854643155be..096e10dc81cb 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -73,7 +73,6 @@ job73=sc.ScAccessiblePreviewTable job74=sc.ScAccessibleSpreadsheet job78=sc.ScAutoFormatFieldObj job88=sc.ScDatabaseRangeObj -job98=sc.ScHeaderFieldObj job126=sc.ScSheetLinkObj job132=sc.ScStyleObj job140=sc.XMLContentExporter diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 38a0b628ed4d..60e1df69111b 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -951,7 +951,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \ qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \ qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration \ -qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \ qadevOOo/tests/java/mod/_sc/ScModelObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv deleted file mode 100644 index e4f37d6e1016.. --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv +++ /dev/null @@ -1,3 +0,0 @@ -"ScHeaderFieldObj";"com::sun::star::lang::XComponent";"dispose()" -"ScHeaderFieldObj";"com::sun::star::lang::XComponent";"addEventListener()" -"ScHeaderFieldObj";"com::sun::star::lang::XComponent";"removeEventListener()" diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java deleted file mode 100644 index 7cf49d47e207.. --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package mod._sc; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.SOfficeFactory; - -import com.sun.star.beans.XPropertySet; -import com.sun.star.container.XNameAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.sheet.XHeaderFooterContent; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.style.XStyle; -import com.sun.star.style.XStyleFamiliesSupplier; -import com.sun.star.text.XText; -import com.sun.star.text.XTextContent; -import com.sun.star.text.XTextCursor; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - -/** -* Test for object which is represented by service -* com.sun.star.text.TextField. -* Object implements the following interfaces : -* -* com::sun::star::lang::XComponent -* com::sun::star::beans::XPropertySet -* com::sun::star::text::XTextField -* com::sun::star::text::XTextContent -* com::sun::star::text::TextContent -* -* @see com.sun.star.text.TextField -* @see
[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
framework/qa/complex/api_internal/api.lst |1 qadevOOo/Jar_OOoRunner.mk |1 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv |3 qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java| 158 -- sc/qa/extras/sceditfieldobj-cell.cxx |8 sc/qa/extras/sceditfieldobj-header.cxx |8 sc/qa/unoapi/sc_2.sce |1 7 files changed, 16 insertions(+), 164 deletions(-) New commits: commit 26cbb045a06c4027bd7b446d692c3b38297d0283 Author: Jens Carl AuthorDate: Mon Feb 28 23:54:54 2022 -0800 Commit: Jens Carl CommitDate: Tue Mar 1 17:40:52 2022 +0100 tdf#45904 Move XComponent Java test to C++ Move XComponent Jave tests to C++ for ScCellFieldObj_Cell and ScCellFieldObj_Header (formerly ScCellFieldObj). Change-Id: Ibf293a72801720fee49acdda5a3a463e9202bb58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130742 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index b588cfd18b4b..6854643155be 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -72,7 +72,6 @@ job72=sc.ScAccessiblePageHeader job73=sc.ScAccessiblePreviewTable job74=sc.ScAccessibleSpreadsheet job78=sc.ScAutoFormatFieldObj -job81=sc.ScCellFieldObj job88=sc.ScDatabaseRangeObj job98=sc.ScHeaderFieldObj job126=sc.ScSheetLinkObj diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 4b91eee49fd4..38a0b628ed4d 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -944,7 +944,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor \ qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj \ qadevOOo/tests/java/mod/_sc/ScCellCursorObj \ -qadevOOo/tests/java/mod/_sc/ScCellFieldObj \ qadevOOo/tests/java/mod/_sc/ScCellObj \ qadevOOo/tests/java/mod/_sc/ScCellRangeObj \ qadevOOo/tests/java/mod/_sc/ScCellRangesObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv deleted file mode 100644 index 35be57d9423c.. --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv +++ /dev/null @@ -1,3 +0,0 @@ -"ScCellFieldObj";"com::sun::star::lang::XComponent";"dispose()" -"ScCellFieldObj";"com::sun::star::lang::XComponent";"addEventListener()" -"ScCellFieldObj";"com::sun::star::lang::XComponent";"removeEventListener()" diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java deleted file mode 100644 index 0194491218ff.. --- a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -package mod._sc; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.SOfficeFactory; - -import com.sun.star.container.XIndexAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.table.XCell; -import com.sun.star.text.XText; -import com.sun.star.text.XTextContent; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - -/** -* Test for object that represents a text field (implements -* com.sun.star.text.TextField) which inserted in a cell of -* the spreadsheet. -* Object implements the following interfaces : -* -* com::sun::star::lang::XComponent -* com::sun::star::beans::XPropertySet -* com::sun::star::text::XTextField -* com::sun::star::text::XTextContent -* com::sun::star::text::TextContent -* -* @see com.sun.star.text.TextField -* @see com.sun.star.lang.XComponent -* @see com.sun.star.beans.XPropertySet
[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
framework/qa/complex/api_internal/api.lst |1 qadevOOo/Jar_OOoRunner.mk |1 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldsObj.csv |2 qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java| 158 -- sc/qa/extras/scheaderfieldsobj.cxx| 22 + sc/qa/unoapi/sc_4.sce |1 6 files changed, 19 insertions(+), 166 deletions(-) New commits: commit a1877ab81b396c742c58a13d3830b4637db924c0 Author: Jens Carl AuthorDate: Sun Feb 27 00:00:17 2022 -0800 Commit: Jens Carl CommitDate: Mon Feb 28 06:27:21 2022 +0100 tdf#45904 Move XElementAccess Java test to C++ Move XElementAccess Java test to C++ for ScHeaderFieldsObj. Change-Id: I1bc29be9f17d117edecfd889b4f9784ffbd74d71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130660 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index f19edba01394..b588cfd18b4b 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -75,7 +75,6 @@ job78=sc.ScAutoFormatFieldObj job81=sc.ScCellFieldObj job88=sc.ScDatabaseRangeObj job98=sc.ScHeaderFieldObj -job99=sc.ScHeaderFieldsObj job126=sc.ScSheetLinkObj job132=sc.ScStyleObj job140=sc.XMLContentExporter diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index a526ad0ca163..4b91eee49fd4 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -953,7 +953,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \ qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration \ qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj \ -qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \ qadevOOo/tests/java/mod/_sc/ScModelObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldsObj.csv deleted file mode 100644 index 1d68820a8b35.. --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldsObj.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScHeaderFieldsObj";"com::sun::star::container::XElementAccess";"getElementType()" -"ScHeaderFieldsObj";"com::sun::star::container::XElementAccess";"hasElements()" diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java deleted file mode 100644 index 945b607cde79.. --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package mod._sc; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.SOfficeFactory; - -import com.sun.star.beans.XPropertySet; -import com.sun.star.container.XNameAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.sheet.XHeaderFooterContent; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.style.XStyle; -import com.sun.star.style.XStyleFamiliesSupplier; -import com.sun.star.text.XText; -import com.sun.star.text.XTextContent; -import com.sun.star.text.XTextCursor; -import com.sun.star.text.XTextFieldsSupplier; -import com.sun.star.uno.AnyConverter; -import com.sun.star.uno.Type; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - -/** - * Test for object which is represented by collection of - * text fields contained in the text of a page header. - * - * Object implements the following interfaces : - * - * com::sun::star::container::XEnumerationAccess - * com::sun::star::util::XRefreshable - * com::sun::star::container::XElementAccess - * - * - * @see com.sun.star.container.XEnumerationAccess - * @see com.sun.star.util.XRefreshable - * @see com.sun.star.container.XElementAccess - * @see
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/cellsuno.cxx |2 +-
sc/source/ui/unoobj/docuno.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a6496d03f69ae4a0140f78eff2d6f29a6fdb74da
Author: Jens Carl
AuthorDate: Mon Feb 24 21:52:10 2020 -0800
Commit: Jens Carl
CommitDate: Fri Mar 27 07:09:28 2020 +0100
tdf#43157 Clean up OSL_ASSERT
Change-Id: I23da49e2395a76eaa97c98757db16289e200a828
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89407
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index e1ffc7e9cf26..8a81f814a7e6 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3228,7 +3228,7 @@ void ScCellRangesBase::ForceChartListener_Impl()
for (auto const& it : rListeners)
{
ScChartListener *const p = it.second.get();
-OSL_ASSERT(p);
+assert(p);
if (p->GetUnoSource() == static_cast(this) &&
p->IsDirty())
p->Update();
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 75aa90ea9e6d..da8394343891 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2861,7 +2861,7 @@ css::uno::Reference
ScModelObj::create(
( pDocShell->GetCreateMode() == SfxObjectCreateMode::INTERNAL
));
// this should never happen, i.e. the temporary document should never
be
// loaded, because this unlinks the data
-OSL_ASSERT( bCreate );
+assert(bCreate);
if ( !xRet.is() && bCreate )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test sc/qa
include/test/container/xnamereplace.hxx |2 +-
sc/qa/extras/scautoformatsobj.cxx |6 --
sc/qa/extras/scstylefamilyobj.cxx |4 ++--
sc/qa/extras/sctablesheetsobj.cxx |2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 70d40d57f46afd593a86a12281546b570c2fd330
Author: Jens Carl
AuthorDate: Sat Feb 29 12:05:41 2020 -0800
Commit: Jens Carl
CommitDate: Thu Mar 5 06:28:53 2020 +0100
Rename method setReplacementElement()
... to setElement() to have a uniform interface with
similar classes like XNameContainer.
Change-Id: I2058e3ea9f14a5792a07f23f4bd13c4708dccdfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89784
Tested-by: Jens Carl
Reviewed-by: Jens Carl
diff --git a/include/test/container/xnamereplace.hxx
b/include/test/container/xnamereplace.hxx
index ddfbb4027eb7..a5e7fe516657 100644
--- a/include/test/container/xnamereplace.hxx
+++ b/include/test/container/xnamereplace.hxx
@@ -31,7 +31,7 @@ public:
virtual css::uno::Reference init() = 0;
void testReplaceByName();
-void setReplacementElement(const css::uno::Any& rElement) {
m_aReplacementElement = rElement; }
+void setElement(const css::uno::Any& rElement) { m_aReplacementElement =
rElement; }
protected:
~XNameReplace() {}
diff --git a/sc/qa/extras/scautoformatsobj.cxx
b/sc/qa/extras/scautoformatsobj.cxx
index 42cee493c9e2..ed799c018ef4 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -109,9 +109,11 @@ uno::Reference ScAutoFormatsObj::init()
uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
}
// XNameContainer
-
setElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
+XNameContainer::setElement(
+
uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
// XNameReplace
-
setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
+XNameReplace::setElement(
+
uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
return xTAF;
}
diff --git a/sc/qa/extras/scstylefamilyobj.cxx
b/sc/qa/extras/scstylefamilyobj.cxx
index fe5d8fb2ec19..a5843a8f3a1f 100644
--- a/sc/qa/extras/scstylefamilyobj.cxx
+++ b/sc/qa/extras/scstylefamilyobj.cxx
@@ -107,9 +107,9 @@ uno::Reference ScStyleFamilyObj::init()
uno::Reference
xCS(xMSF->createInstance("com.sun.star.style.CellStyle"),
uno::UNO_SET_THROW);
// XNameContainer
-
setElement(uno::makeAny(xMSF->createInstance("com.sun.star.style.CellStyle")));
+
XNameContainer::setElement(uno::makeAny(xMSF->createInstance("com.sun.star.style.CellStyle")));
// XNameReplace
-
setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.style.CellStyle")));
+
XNameReplace::setElement(uno::makeAny(xMSF->createInstance("com.sun.star.style.CellStyle")));
uno::Reference xNC(xNA_SF,
uno::UNO_QUERY_THROW);
xNC->insertByName("ScStyleFamilyObj", uno::makeAny(xCS));
diff --git a/sc/qa/extras/sctablesheetsobj.cxx
b/sc/qa/extras/sctablesheetsobj.cxx
index 286ff839622c..a8ffa36b2ed8 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -145,7 +145,7 @@ uno::Reference ScTableSheetsObj::init()
XNameContainer::setElement(
uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
// XNameReplace
-
setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
+
XNameReplace::setElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
return xReturn;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/sctablesheetsobj.cxx | 49 --
1 file changed, 31 insertions(+), 18 deletions(-)
New commits:
commit a741e86aaf9cc148dca20c2337a42e68270e669f
Author: Jens Carl
AuthorDate: Sat Feb 29 11:10:25 2020 -0800
Commit: Jens Carl
CommitDate: Mon Mar 2 04:57:24 2020 +0100
Add XServiceInfo tests to ScTableSheetsObj
Change-Id: Iaaadc2554bb0ce103ef01bbf02c316d21fae51af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89761
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/sctablesheetsobj.cxx
b/sc/qa/extras/sctablesheetsobj.cxx
index 41856b5b2df7..286ff839622c 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -14,17 +14,25 @@
#include
#include
#include
+#include
#include
#include
-#include
+#include
#include
#include
+#include
+
+#include
+#include
+
+#include
using namespace css;
using namespace css::uno;
-namespace sc_apitest {
+namespace sc_apitest
+{
class ScTableSheetsObj : public CalcUnoApiTest,
public ::apitest::XElementAccess,
public ::apitest::XEnumerationAccess,
@@ -32,6 +40,7 @@ class ScTableSheetsObj : public CalcUnoApiTest,
public ::apitest::XNameAccess,
public ::apitest::XNameContainer,
public ::apitest::XNameReplace,
+ public ::apitest::XServiceInfo,
public ::apitest::XSpreadsheets,
public ::apitest::XSpreadsheets2
{
@@ -40,6 +49,7 @@ public:
virtual void setUp() override;
virtual void tearDown() override;
+virtual uno::Reference init() override;
CPPUNIT_TEST_SUITE(ScTableSheetsObj);
@@ -69,6 +79,11 @@ public:
// XNameReplace
CPPUNIT_TEST(testReplaceByName);
+// XServiceInfo
+CPPUNIT_TEST(testGetImplementationName);
+CPPUNIT_TEST(testGetSupportedServiceNames);
+CPPUNIT_TEST(testSupportsService);
+
// XSpreadsheets
CPPUNIT_TEST(testInsertNewByName);
CPPUNIT_TEST(testInsertNewByNameBadName);
@@ -90,12 +105,12 @@ public:
CPPUNIT_TEST_SUITE_END();
-virtual uno::Reference< lang::XComponent > getComponent() override;
+virtual uno::Reference getComponent() override;
virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL)
override;
-virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString&
rString) override;
-virtual uno::Reference< uno::XInterface > init() override;
+virtual uno::Reference loadFromDesktop(const OUString&
rString) override;
+
protected:
-uno::Reference< lang::XComponent > mxComponent;
+uno::Reference mxComponent;
};
ScTableSheetsObj::ScTableSheetsObj()
@@ -105,31 +120,30 @@ ScTableSheetsObj::ScTableSheetsObj()
, ::apitest::XNameAccess("Sheet1")
, ::apitest::XNameContainer("Sheet2")
, ::apitest::XNameReplace("Sheet2")
+, ::apitest::XServiceInfo("ScTableSheetsObj",
"com.sun.star.sheet.Spreadsheets")
{
}
-uno::Reference< lang::XComponent > ScTableSheetsObj::getComponent()
-{
-return mxComponent;
-}
+uno::Reference ScTableSheetsObj::getComponent() { return
mxComponent; }
void ScTableSheetsObj::createFileURL(const OUString& rFileBase, OUString&
rFileURL)
{
CalcUnoApiTest::createFileURL(rFileBase, rFileURL);
}
-uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const
OUString& rString)
+uno::Reference ScTableSheetsObj::loadFromDesktop(const
OUString& rString)
{
return CalcUnoApiTest::loadFromDesktop(rString);
}
-uno::Reference< uno::XInterface > ScTableSheetsObj::init()
+uno::Reference ScTableSheetsObj::init()
{
xDocument.set(mxComponent, UNO_QUERY_THROW);
-uno::Reference< uno::XInterface > xReturn( xDocument->getSheets(),
UNO_QUERY_THROW);
+uno::Reference xReturn(xDocument->getSheets(),
UNO_QUERY_THROW);
uno::Reference xMSF(mxComponent,
uno::UNO_QUERY_THROW);
-
XNameContainer::setElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
+XNameContainer::setElement(
+uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
// XNameReplace
setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
@@ -152,9 +166,8 @@ void ScTableSheetsObj::tearDown()
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetsObj);
-
-}
+} // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT();
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
qadevOOo/Jar_OOoRunner.mk|1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv |2
qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java| 156
--
sc/qa/extras/sctablesheetsobj.cxx| 12
sc/qa/unoapi/sc_7.sce|1
5 files changed, 8 insertions(+), 164 deletions(-)
New commits:
commit 59fd5874dcc1ff4fc469067a55e99c2cd79716c3
Author: Jens Carl
AuthorDate: Wed Feb 26 22:36:36 2020 -0800
Commit: Jens Carl
CommitDate: Thu Feb 27 22:27:05 2020 +0100
tdf#45904 Move XNameContainer Java tests to C++
Move missing XNameContainer Java tests to C++ for ScTableSheetsObj.
Change-Id: I63a91487ab2e50b97c937edae929c43261553db9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89614
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 201b83e1b942..b3f7f258 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -962,7 +962,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
qadevOOo/tests/java/mod/_sc/ScStyleObj \
qadevOOo/tests/java/mod/_sc/ScTableSheetObj \
-qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \
qadevOOo/tests/java/mod/_sc/ScTabViewObj \
qadevOOo/tests/java/mod/_sc/XMLContentExporter \
qadevOOo/tests/java/mod/_sc/XMLContentImporter \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
deleted file mode 100644
index 18c378322001..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"insertByName()"
-"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"removeByName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java
b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java
deleted file mode 100644
index 8270337b7aef..
--- a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* com.sun.star.sheet.Spreadsheets.
-* Object implements the following interfaces :
-*
-* com::sun::star::sheet::XSpreadsheets
-* com::sun::star::container::XNameAccess
-* com::sun::star::container::XIndexAccess
-* com::sun::star::container::XElementAccess
-* com::sun::star::container::XNameReplace
-* com::sun::star::container::XNameContainer
-*
-* @see com.sun.star.sheet.Spreadsheets
-* @see com.sun.star.sheet.XSpreadsheets
-* @see com.sun.star.container.XNameAccess
-* @see com.sun.star.container.XIndexAccess
-* @see com.sun.star.container.XElementAccess
-* @see com.sun.star.container.XNameReplace
-* @see com.sun.star.container.XNameContainer
-* @see ifc.sheet._XSpreadsheets
-* @see ifc.container._XNameAccess
-* @see ifc.container._XIndexAccess
-* @see ifc.container._XElementAccess
-* @see ifc.container._XNameReplace
-* @see ifc.container._XNameContainer
-*/
-public class ScTableSheetsObj extends TestCase {
-private XSpreadsheetDocument xSpreadsheetDoc = null;
-
-/**
-* Creates Spreadsheet document.
-*/
-@Override
-public void initialize( TestParameters Param, PrintWriter log ) throws
Exception {
-// get a soffice factory object
-SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
-log.println("creating a spreadsheetdocument");
-xSpreadsheetDoc = SOF.createCalcDoc(null);
-}
-
-/**
-* Disposes
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv |2 --
sc/qa/extras/sctablesheetsobj.cxx|9
+
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit b9b553f17404ff24aae2be4cda65fa3c0f380985
Author: Jens Carl
AuthorDate: Wed Feb 26 22:29:01 2020 -0800
Commit: Jens Carl
CommitDate: Thu Feb 27 22:26:31 2020 +0100
tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScTableSheetsObj.
Change-Id: Ibc9d7e164e82387159a51568157c1d3b0756bf05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89610
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
index f88b5527bbe4..18c378322001 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
@@ -1,4 +1,2 @@
"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"insertByName()"
"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"removeByName()"
-"ScTableSheetsObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScTableSheetsObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/sc/qa/extras/sctablesheetsobj.cxx
b/sc/qa/extras/sctablesheetsobj.cxx
index 8b61d3825639..b995a03a78ab 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
#include
@@ -15,7 +16,9 @@
#include
#include
#include
+#include
+#include
#include
using namespace css;
@@ -23,6 +26,7 @@ using namespace css::uno;
namespace sc_apitest {
class ScTableSheetsObj : public CalcUnoApiTest,
+ public ::apitest::XElementAccess,
public ::apitest::XEnumerationAccess,
public ::apitest::XIndexAccess,
public ::apitest::XNameAccess,
@@ -39,6 +43,10 @@ public:
CPPUNIT_TEST_SUITE(ScTableSheetsObj);
+// XElementAccess
+CPPUNIT_TEST(testGetElementType);
+CPPUNIT_TEST(testHasElements);
+
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
@@ -89,6 +97,7 @@ protected:
ScTableSheetsObj::ScTableSheetsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, ::apitest::XElementAccess(cppu::UnoType::get())
, ::apitest::XIndexAccess(3)
, ::apitest::XNameAccess("Sheet1")
, ::apitest::XNameContainer("Sheet2")
___
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.ScTableSheetsObj.csv |2 --
sc/qa/extras/sctablesheetsobj.cxx|7 +++
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit c6aceaa407faf9950675411cc24d0c156fc7d972
Author: Jens Carl
AuthorDate: Wed Feb 26 22:22:17 2020 -0800
Commit: Jens Carl
CommitDate: Thu Feb 27 08:41:47 2020 +0100
tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java tests to C++ for ScTableSheetsObj.
Change-Id: Idb130a51dc024cebbbc739d15c767f99558a69b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89609
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
index e348d3613059..f88b5527bbe4 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
@@ -1,6 +1,4 @@
"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"insertByName()"
"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"removeByName()"
-"ScTableSheetsObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScTableSheetsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScTableSheetsObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScTableSheetsObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/sc/qa/extras/sctablesheetsobj.cxx
b/sc/qa/extras/sctablesheetsobj.cxx
index 34b1e03cfa90..8b61d3825639 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
#include
@@ -23,6 +24,7 @@ using namespace css::uno;
namespace sc_apitest {
class ScTableSheetsObj : public CalcUnoApiTest,
public ::apitest::XEnumerationAccess,
+ public ::apitest::XIndexAccess,
public ::apitest::XNameAccess,
public ::apitest::XNameContainer,
public ::apitest::XNameReplace,
@@ -40,6 +42,10 @@ public:
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
+// XIndexAccess
+CPPUNIT_TEST(testGetByIndex);
+CPPUNIT_TEST(testGetCount);
+
// XNameAccess
CPPUNIT_TEST(testGetByName);
CPPUNIT_TEST(testGetElementNames);
@@ -83,6 +89,7 @@ protected:
ScTableSheetsObj::ScTableSheetsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, ::apitest::XIndexAccess(3)
, ::apitest::XNameAccess("Sheet1")
, ::apitest::XNameContainer("Sheet2")
, ::apitest::XNameReplace("Sheet2")
___
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.ScTableSheetsObj.csv |1 -
sc/qa/extras/sctablesheetsobj.cxx| 10
++
sc/qa/unoapi/knownissues.xcl |3 ---
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 20747665a60b5c8782ab77962380ea34a30c20fa
Author: Jens Carl
AuthorDate: Tue Feb 25 20:27:40 2020 -0800
Commit: Jens Carl
CommitDate: Wed Feb 26 07:11:50 2020 +0100
tdf#45904 Move XNameReplace Java test to C++
Move XNameReplace Java test to C++ for ScTableSheetsObj.
Fixes i#23594 by creating a new "com.sun.star.sheet.Spreadsheet" rather
then using an existing one.
Change-Id: If7058647cc5d79d11e5542a82017d5bd02f7049e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89493
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
index 83fbb64ec41d..e348d3613059 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
@@ -1,4 +1,3 @@
-"ScTableSheetsObj";"com::sun::star::container::XNameReplace";"replaceByName()"
"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"insertByName()"
"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"removeByName()"
"ScTableSheetsObj";"com::sun::star::container::XIndexAccess";"getCount()"
diff --git a/sc/qa/extras/sctablesheetsobj.cxx
b/sc/qa/extras/sctablesheetsobj.cxx
index 82c74e832c7d..34b1e03cfa90 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -24,6 +25,7 @@ class ScTableSheetsObj : public CalcUnoApiTest,
public ::apitest::XEnumerationAccess,
public ::apitest::XNameAccess,
public ::apitest::XNameContainer,
+ public ::apitest::XNameReplace,
public ::apitest::XSpreadsheets,
public ::apitest::XSpreadsheets2
{
@@ -43,6 +45,9 @@ public:
CPPUNIT_TEST(testGetElementNames);
CPPUNIT_TEST(testHasByName);
+// XNameReplace
+CPPUNIT_TEST(testReplaceByName);
+
// XSpreadsheets
CPPUNIT_TEST(testInsertNewByName);
CPPUNIT_TEST(testInsertNewByNameBadName);
@@ -80,6 +85,7 @@ ScTableSheetsObj::ScTableSheetsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, ::apitest::XNameAccess("Sheet1")
, ::apitest::XNameContainer("Sheet2")
+, ::apitest::XNameReplace("Sheet2")
{
}
@@ -103,6 +109,10 @@ uno::Reference< uno::XInterface > ScTableSheetsObj::init()
xDocument.set(mxComponent, UNO_QUERY_THROW);
uno::Reference< uno::XInterface > xReturn( xDocument->getSheets(),
UNO_QUERY_THROW);
+uno::Reference xMSF(mxComponent,
uno::UNO_QUERY_THROW);
+// XNameReplace
+
setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
+
return xReturn;
}
diff --git a/sc/qa/unoapi/knownissues.xcl b/sc/qa/unoapi/knownissues.xcl
index 7da16e74cf43..999c7681d327 100644
--- a/sc/qa/unoapi/knownissues.xcl
+++ b/sc/qa/unoapi/knownissues.xcl
@@ -38,9 +38,6 @@ sc.ScTableSheetObj::com::sun::star::sheet::XCellRangeData
### i84669 ###
sc.ScTabViewObj::com::sun::star::sheet::XRangeSelection
-### i23594 ###
-sc.ScTableSheetsObj::com::sun::star::container::XNameReplace
-
### i31378 ###
sc.ScDocumentConfiguration::com::sun::star::document::Settings
___
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.ScTableSheetsObj.csv |3 -
sc/qa/extras/sctablesheetsobj.cxx| 24
++
2 files changed, 16 insertions(+), 11 deletions(-)
New commits:
commit 49eb4906de8f499ae14b789e90df9ba654895af5
Author: Jens Carl
AuthorDate: Mon Feb 24 22:56:27 2020 -0800
Commit: Jens Carl
CommitDate: Wed Feb 26 05:05:24 2020 +0100
tdf#45904 Move XNameAccess Java tests to C++
Move XNameAccess Java tests to C++ for ScTableSheetsObj.
Change-Id: I5fdaafe35852ea3c6e260d490200ce99e990c3b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89408
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
index 8eca36532a14..83fbb64ec41d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
@@ -1,6 +1,3 @@
-"ScTableSheetsObj";"com::sun::star::container::XNameAccess";"getByName()"
-"ScTableSheetsObj";"com::sun::star::container::XNameAccess";"getElementNames()"
-"ScTableSheetsObj";"com::sun::star::container::XNameAccess";"hasByName()"
"ScTableSheetsObj";"com::sun::star::container::XNameReplace";"replaceByName()"
"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"insertByName()"
"ScTableSheetsObj";"com::sun::star::container::XNameContainer";"removeByName()"
diff --git a/sc/qa/extras/sctablesheetsobj.cxx
b/sc/qa/extras/sctablesheetsobj.cxx
index 99d55ea75a16..82c74e832c7d 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
#include
@@ -19,11 +20,12 @@ using namespace css;
using namespace css::uno;
namespace sc_apitest {
-
-class ScTableSheetsObj : public CalcUnoApiTest, public
apitest::XEnumerationAccess,
-public
::apitest::XSpreadsheets,
-public
::apitest::XSpreadsheets2,
-public apitest::XNameContainer
+class ScTableSheetsObj : public CalcUnoApiTest,
+ public ::apitest::XEnumerationAccess,
+ public ::apitest::XNameAccess,
+ public ::apitest::XNameContainer,
+ public ::apitest::XSpreadsheets,
+ public ::apitest::XSpreadsheets2
{
public:
ScTableSheetsObj();
@@ -36,6 +38,11 @@ public:
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
+// XNameAccess
+CPPUNIT_TEST(testGetByName);
+CPPUNIT_TEST(testGetElementNames);
+CPPUNIT_TEST(testHasByName);
+
// XSpreadsheets
CPPUNIT_TEST(testInsertNewByName);
CPPUNIT_TEST(testInsertNewByNameBadName);
@@ -69,9 +76,10 @@ protected:
uno::Reference< lang::XComponent > mxComponent;
};
-ScTableSheetsObj::ScTableSheetsObj():
-CalcUnoApiTest("/sc/qa/extras/testdocuments"),
-apitest::XNameContainer("Sheet2")
+ScTableSheetsObj::ScTableSheetsObj()
+: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, ::apitest::XNameAccess("Sheet1")
+, ::apitest::XNameContainer("Sheet2")
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/cellsuno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e5f81b90629c5f3bd733f862d17a57c251acc291
Author: Jens Carl
AuthorDate: Sun Feb 23 22:32:51 2020 -0800
Commit: Julien Nabet
CommitDate: Tue Feb 25 07:08:28 2020 +0100
Fix typo
Change-Id: If3ba0858340e66294eff8aeec58f6252ce1e6227
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89406
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 89cd63a9144d..f8fb4d6fc847 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3215,7 +3215,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions(
void ScCellRangesBase::ForceChartListener_Impl()
{
// call Update immediately so the caller to setData etc. can
-// regognize the listener call
+// recognize the listener call
if (!pDocShell)
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gdb
solenv/gdb/six.py | 69 +-
1 file changed, 48 insertions(+), 21 deletions(-)
New commits:
commit 8324f9284c840ae1cde7cda584bf30531f484b01
Author: Jens Carl
AuthorDate: Sat Jan 25 16:35:42 2020 -0800
Commit: Jens Carl
CommitDate: Tue Feb 25 06:56:23 2020 +0100
six: upgrade release to 1.14.0 used by gdb
Change-Id: I450f5cd83e116baab8d1750a9ed7def002e234c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89317
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/solenv/gdb/six.py b/solenv/gdb/six.py
index 47ecf52bd2d5..5fe9f8e141ee 100644
--- a/solenv/gdb/six.py
+++ b/solenv/gdb/six.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2018 Benjamin Peterson
+# Copyright (c) 2010-2020 Benjamin Peterson
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ import sys
import types
__author__ = "Benjamin Peterson "
-__version__ = "1.12.0"
+__version__ = "1.14.0"
# Useful for very coarse version differentiation.
@@ -255,9 +255,11 @@ _moved_attributes = [
MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest",
"zip_longest"),
MovedModule("builtins", "__builtin__"),
MovedModule("configparser", "ConfigParser"),
+MovedModule("collections_abc", "collections", "collections.abc" if
sys.version_info >= (3, 3) else "collections"),
MovedModule("copyreg", "copy_reg"),
MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
-MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
+MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"),
+MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread" if
sys.version_info < (3, 9) else "_thread"),
MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
MovedModule("http_cookies", "Cookie", "http.cookies"),
MovedModule("html_entities", "htmlentitydefs", "html.entities"),
@@ -642,9 +644,11 @@ if PY3:
if sys.version_info[1] <= 1:
_assertRaisesRegex = "assertRaisesRegexp"
_assertRegex = "assertRegexpMatches"
+_assertNotRegex = "assertNotRegexpMatches"
else:
_assertRaisesRegex = "assertRaisesRegex"
_assertRegex = "assertRegex"
+_assertNotRegex = "assertNotRegex"
else:
def b(s):
return s
@@ -666,6 +670,7 @@ else:
_assertCountEqual = "assertItemsEqual"
_assertRaisesRegex = "assertRaisesRegexp"
_assertRegex = "assertRegexpMatches"
+_assertNotRegex = "assertNotRegexpMatches"
_add_doc(b, """Byte literal""")
_add_doc(u, """Text literal""")
@@ -682,6 +687,10 @@ def assertRegex(self, *args, **kwargs):
return getattr(self, _assertRegex)(*args, **kwargs)
+def assertNotRegex(self, *args, **kwargs):
+return getattr(self, _assertNotRegex)(*args, **kwargs)
+
+
if PY3:
exec_ = getattr(moves.builtins, "exec")
@@ -717,16 +726,7 @@ else:
""")
-if sys.version_info[:2] == (3, 2):
-exec_("""def raise_from(value, from_value):
-try:
-if from_value is None:
-raise value
-raise value from from_value
-finally:
-value = None
-""")
-elif sys.version_info[:2] > (3, 2):
+if sys.version_info[:2] > (3,):
exec_("""def raise_from(value, from_value):
try:
raise value from from_value
@@ -806,13 +806,33 @@ if sys.version_info[:2] < (3, 3):
_add_doc(reraise, """Reraise an exception.""")
if sys.version_info[0:2] < (3, 4):
+# This does exactly the same what the :func:`py3:functools.update_wrapper`
+# function does on Python versions after 3.2. It sets the ``__wrapped__``
+# attribute on ``wrapper`` object and it doesn't raise an error if any of
+# the attributes mentioned in ``assigned`` and ``updated`` are missing on
+# ``wrapped`` object.
+def _update_wrapper(wrapper, wrapped,
+assigned=functools.WRAPPER_ASSIGNMENTS,
+updated=functools.WRAPPER_UPDATES):
+for attr in assigned:
+try:
+value = getattr(wrapped, attr)
+except AttributeError:
+continue
+else:
+setattr(wrapper, attr, value)
+for attr in updated:
+getattr(wrapper, attr).update(getattr(wrapped, attr, {}))
+wrapper.__wrapped__ = wrapped
+return wrapper
+_update_wrapper.__doc__ = functools.update_wrapper.__doc__
+
def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
updated=functools.WRAPPER_UPDATES):
-def wrapper(f):
-f = functools.wraps(wrapped, assigned, updated)(f)
-f.__wrapped__ = wrapped
-return f
-return wrapper
+return functools.partial(_update_wrapper, wrapped=wrapped,
+ assigned=assigned, updated=updated)
+wraps.__doc__ = functools.wraps.__doc__
+
else:
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/docuno.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f32a59a52e3ee2a0a8df9bb76bc1ff0ada7c7f1d Author: Jens Carl AuthorDate: Sun Feb 23 22:28:05 2020 -0800 Commit: Adolfo Jayme Barrientos CommitDate: Mon Feb 24 09:19:03 2020 +0100 Fix typo Change-Id: I9f114aeb0e512ca5cdf0e0cf905e9ad76c7fe836 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89318 Tested-by: Adolfo Jayme Barrientos Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 475cf5573aea..75aa90ea9e6d 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -2854,7 +2854,7 @@ css::uno::Reference ScModelObj::create( default: break; } -// #i64497# If a chart is in a temporary document during clipoard paste, +// #i64497# If a chart is in a temporary document during clipboard paste, // there should be no data provider, so that own data is used bool bCreate = ! ( nType == ServiceType::CHDATAPROV && ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: testtools/source uitest/packaging
testtools/source/bridgetest/pyuno/samplecomponent.py | 122 +-- uitest/packaging/setup.py| 46 +++ 2 files changed, 84 insertions(+), 84 deletions(-) New commits: commit de077efae8265661905a47abb63dbfd6a69e1563 Author: Jens Carl AuthorDate: Sat Nov 23 23:22:05 2019 -0800 Commit: Jens Carl CommitDate: Tue Dec 10 08:43:13 2019 +0100 Fix IdentationError and mixture of spaces and tabs Fix IdentationError and mixture of spaces and tabs found by python -m py_compile . Change-Id: I1dc99196410d736ca33ead5deadfc61bc6584428 Reviewed-on: https://gerrit.libreoffice.org/83594 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/testtools/source/bridgetest/pyuno/samplecomponent.py b/testtools/source/bridgetest/pyuno/samplecomponent.py index 736af9bee858..a434cd0b479c 100644 --- a/testtools/source/bridgetest/pyuno/samplecomponent.py +++ b/testtools/source/bridgetest/pyuno/samplecomponent.py @@ -28,10 +28,10 @@ g_implName = "org.openoffice.comp.pyuno.PythonTestObject" g_attribs = "RuntimeException", "Bool", "Char", "Byte", "Short", "UShort", \ "Long", "ULong", "Hyper", "UHyper", "Float", "Double", "Enum", \ - "String", "Interface", "Any" , "Sequence" , "Struct" +"String", "Interface", "Any" , "Sequence" , "Struct" def assign( rData, bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper,\ - nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny ): + nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny ): rData.Bool = bBool; rData.Char = cChar; rData.Byte = nByte; @@ -50,96 +50,96 @@ def assign( rData, bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper,\ class MyRecursiveCall( XRecursiveCall, unohelper.Base ): def callRecursivly( xCall, nToCall ): - if nToCall: -xCall.callRecursivly( self, nToCall -1 ) - + if nToCall: + xCall.callRecursivly( self, nToCall -1 ) + class SampleUnoComponent( XBridgeTestBase,XServiceInfo ): def __init__(self,ctx): - self.__dict__["callid"] = 0 - self.__dict__["sequenceBroken"] = 0 + self.__dict__["callid"] = 0 + self.__dict__["sequenceBroken"] = 0 def transportAny( self, value ): - return value + return value def raiseException( self, ArgumentPosition, Message, Context ): - raise IllegalArgumentException( Message, Context, ArgumentPosition ) - + raise IllegalArgumentException( Message, Context, ArgumentPosition ) + def raiseRuntimeExceptionOneway(self, Message, Context ): - raise RuntimeException( Message, Context ) + raise RuntimeException( Message, Context ) def setValues( self, bBool, cChar, nByte, nShort, nUShort, nLong,\ -nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, \ -aString, xInterface, aAny, aSequence, aStruct ): + nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, \ + aString, xInterface, aAny, aSequence, aStruct ): self.__dict__["data"] = TestDataElements( bBool, cChar, nByte, nShort, nUShort, nLong, - nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface, - aAny, aSequence ) - self.__dict__["Struct"] = aStruct + nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface, + aAny, aSequence ) + self.__dict__["Struct"] = aStruct def setValues2( self, bBool, cChar, nByte, nShort, nUShort, nLong, nULong,\ - nHyper, nUHyper, fFloat, fDouble, eEnum, \ - aString, xInterface, aAny, aSequence, aStruct ): + nHyper, nUHyper, fFloat, fDouble, eEnum, \ + aString, xInterface, aAny, aSequence, aStruct ): self.__dict__["Struct"] = TestData( cChar, nByte, nShort, nUShort, nLong, nULong, nHyper,\ - nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface,\ - aAny, aSequence ) + nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface,\ + aAny, aSequence ) self.__dict__["Struct"] = aStruct - return bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, nULong, \ -nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface, aAny, \ -(aSequence[1],aSequence[0]), aStruct - + return bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, nULong, \ + nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct,
[Libreoffice-commits] core.git: bin/update
bin/update/create_partial_update.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4dc85b98d7d84ac0d50f6f64833b667fb48236c7
Author: Jens Carl
AuthorDate: Sun Nov 17 10:55:15 2019 -0800
Commit: Jens Carl
CommitDate: Sun Nov 24 07:41:58 2019 +0100
Fix 'is' operator for comparison
The 'is' operator should not be used for comparison on some types of
literals. In CPython this works by accident and CPython 3.8 introduced a
SyntaxWarning (see https://bugs.python.org/issue34850).
Change-Id: I5cb7470132b26d87848c2bdc382b05477eb56afb
Reviewed-on: https://gerrit.libreoffice.org/83032
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/bin/update/create_partial_update.py
b/bin/update/create_partial_update.py
index 28e6cf510c42..9412bcd6e962 100755
--- a/bin/update/create_partial_update.py
+++ b/bin/update/create_partial_update.py
@@ -58,7 +58,7 @@ def download_mar_for_update_channel_and_platform(config,
platform, temp_dir):
base_url = config.server_url + "update/partial-targets/1/"
url = base_url + platform + "/" + config.channel
r = requests.get(url)
-if r.status_code is not 200:
+if r.status_code != 200:
print(r.content)
raise Exception("download failed")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: uitest/test_main.py uitest/writer_tests
uitest/test_main.py|2 +-
uitest/writer_tests/customizeDialog.py |4 ++--
uitest/writer_tests/start.py |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c0e720bfd209b50ca7dc2082e340f9b6288a6216
Author: Jens Carl
AuthorDate: Sun Nov 17 10:55:29 2019 -0800
Commit: Muhammet Kara
CommitDate: Mon Nov 18 13:35:44 2019 +0100
Fix 'is' operator for comparison
The 'is' operator should not be used for comparison on some types of
literals. In CPython this works by accident and CPython 3.8 introduced a
SyntaxWarning (see https://bugs.python.org/issue34850).
Change-Id: Ic4ba481579d13fd1496431ded59dd626a05fc0c6
Reviewed-on: https://gerrit.libreoffice.org/83033
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/uitest/test_main.py b/uitest/test_main.py
index 851a44f8e929..ab173c32476c 100644
--- a/uitest/test_main.py
+++ b/uitest/test_main.py
@@ -54,7 +54,7 @@ def find_test_files(dir_path):
# ignore the __init__.py file
# it is obviously not a test file
-if f is "__init__.py":
+if f == "__init__.py":
continue
valid_files.append(file_path)
diff --git a/uitest/writer_tests/customizeDialog.py
b/uitest/writer_tests/customizeDialog.py
index 9d2311eb46a6..fa187c36ac35 100644
--- a/uitest/writer_tests/customizeDialog.py
+++ b/uitest/writer_tests/customizeDialog.py
@@ -34,7 +34,7 @@ class ConfigureDialog(UITestCase):
xSearch = xDialog.getChild("searchEntry")
initialEntryCount = get_state_as_dict(xfunc)["Children"]
-self.assertTrue(initialEntryCount is not 0)
+self.assertTrue(initialEntryCount != 0)
xSearch.executeAction("SET", mkPropertyValues({"TEXT":"format"}))
@@ -67,7 +67,7 @@ class ConfigureDialog(UITestCase):
xCategory = xDialog.getChild("commandcategorylist")
initialEntryCount = get_state_as_dict(xFunc)["Children"]
-self.assertTrue(initialEntryCount is not 0)
+self.assertTrue(initialEntryCount != 0)
select_pos(xCategory, "1")
filteredEntryCount = get_state_as_dict(xFunc)["Children"]
diff --git a/uitest/writer_tests/start.py b/uitest/writer_tests/start.py
index c8cbcbba4884..5851e8eff7c9 100644
--- a/uitest/writer_tests/start.py
+++ b/uitest/writer_tests/start.py
@@ -45,7 +45,7 @@ class SimpleWriterTest(UITestCase):
xWriterEdit = xWriterDoc.getChild("writer_edit")
state = get_state_as_dict(xWriterEdit)
-while state["CurrentPage"] is "1":
+while state["CurrentPage"] == "1":
xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"RETURN"}))
state = get_state_as_dict(xWriterEdit)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/common/FileAccess.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f09d88e8f8f599938e78adf72fc96cedb261afef Author: Jens Carl AuthorDate: Sun Nov 17 10:55:39 2019 -0800 Commit: Xisco Faulà CommitDate: Mon Nov 18 10:15:07 2019 +0100 Fix 'is' operator for comparison The 'is' operator should not be used for comparison on some types of literals. In CPython this works by accident and CPython 3.8 introduced a SyntaxWarning (see https://bugs.python.org/issue34850). Change-Id: Ifabe22e4ae3b9e1d3bfd5a663f39500e381cfa6e Reviewed-on: https://gerrit.libreoffice.org/83034 Tested-by: Jenkins Reviewed-by: Xisco Faulà diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py index 2740b7aa3c3e..c58f6d4b424c 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.py +++ b/wizards/com/sun/star/wizards/common/FileAccess.py @@ -129,7 +129,7 @@ class FileAccess(object): def getPath(self, parentURL, childURL): string = "" -if childURL is not None and childURL is not "": +if childURL is not None and childURL != "": string = "/" + childURL return self.filenameConverter.getSystemPathFromFileURL( parentURL + string) ___ 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.ScStyleObj.csv |7
sc/qa/extras/scstyleobj.cxx| 19 -
2 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit e6109939b448f070848bfcf11ac013e05f71767a
Author: Jens Carl
AuthorDate: Sun Oct 27 10:53:45 2019 -0700
Commit: Jens Carl
CommitDate: Sun Oct 27 22:04:11 2019 +0100
tdf#45904 Move XPropertySet Java tests to C++
Move XPropertySet Java tests to C++ for ScStyleObj.
Change-Id: Ic4f2d69d0b569de9fe99c8af41370b0699f2ab1b
Reviewed-on: https://gerrit.libreoffice.org/81556
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv
index fbcfe7e91ac5..30c529f00d97 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv
@@ -12,13 +12,6 @@
"ScStyleObj";"com::sun::star::style::Style";"FollowStyle#optional"
"ScStyleObj";"com::sun::star::style::Style";"DisplayName#optional"
"ScStyleObj";"com::sun::star::style::Style";"IsAutoUpdate#optional"
-"ScStyleObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"ScStyleObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"ScStyleObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"ScStyleObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"ScStyleObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"ScStyleObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScStyleObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
"ScStyleObj";"com::sun::star::beans::XMultiPropertyStates#optional";"getPropertyStates()"
"ScStyleObj";"com::sun::star::beans::XMultiPropertyStates#optional";"setAllPropertiesToDefault()"
"ScStyleObj";"com::sun::star::beans::XMultiPropertyStates#optional";"setPropertiesToDefault()"
diff --git a/sc/qa/extras/scstyleobj.cxx b/sc/qa/extras/scstyleobj.cxx
index a29243882ffc..3ba41df3042f 100644
--- a/sc/qa/extras/scstyleobj.cxx
+++ b/sc/qa/extras/scstyleobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
@@ -30,7 +31,7 @@ using namespace css;
namespace sc_apitest
{
-class ScStyleObj : public CalcUnoApiTest, public apitest::XNamed
+class ScStyleObj : public CalcUnoApiTest, public apitest::XNamed, public
apitest::XPropertySet
{
public:
ScStyleObj();
@@ -46,6 +47,13 @@ public:
CPPUNIT_TEST(testGetName);
CPPUNIT_TEST(testSetName);
+// XPropertySet
+CPPUNIT_TEST(testGetPropertySetInfo);
+CPPUNIT_TEST(testGetPropertyValue);
+CPPUNIT_TEST(testSetPropertyValue);
+CPPUNIT_TEST(testPropertyChangeListener);
+CPPUNIT_TEST(testVetoableChangeListener);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -55,6 +63,15 @@ private:
ScStyleObj::ScStyleObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XNamed("ScStyleObj")
+, XPropertySet({
+ "BottomBorder", "BottomBorder2", "CellProtection",
"CharLocale",
+ "CharLocaleAsian", "CharLocaleComplex", "CharPosture",
"CharPostureAsian",
+ "CharPostureComplex","DiagonalBLTR", "DiagonalBLTR2",
"DiagonalTLBR",
+ "DiagonalTLBR2", "HoriJustify", "LeftBorder",
"LeftBorder2",
+ "NumberFormat", "Orientation", "RightBorder",
"RightBorder2",
+ "ShadowFormat", "TableBorder", "TopBorder",
"TopBorder2",
+ "UserDefinedAttributes",
+ })
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_styleobj.mk sc/Module_sc.mk sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv |2
sc/CppunitTest_sc_styleobj.mk | 45 +
sc/Module_sc.mk|1
sc/qa/extras/scstyleobj.cxx| 111 +
4 files changed, 157 insertions(+), 2 deletions(-)
New commits:
commit b7735d9c705bdec53ddb0077b93ae70ce4c2df48
Author: Jens Carl
AuthorDate: Sat Oct 26 21:54:16 2019 -0700
Commit: Jens Carl
CommitDate: Sun Oct 27 06:49:18 2019 +0100
tdf#45904 Move XNamed Java tests to C++
Move XNamed Java tests to C++ for ScStyleObj.
Change-Id: Idaff7307d15ca2665005e866dff36a033aa91354
Reviewed-on: https://gerrit.libreoffice.org/81553
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv
index cd24c8c8f6bc..fbcfe7e91ac5 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScStyleObj.csv
@@ -12,8 +12,6 @@
"ScStyleObj";"com::sun::star::style::Style";"FollowStyle#optional"
"ScStyleObj";"com::sun::star::style::Style";"DisplayName#optional"
"ScStyleObj";"com::sun::star::style::Style";"IsAutoUpdate#optional"
-"ScStyleObj";"com::sun::star::container::XNamed";"getName()"
-"ScStyleObj";"com::sun::star::container::XNamed";"setName()"
"ScStyleObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScStyleObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScStyleObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/sc/CppunitTest_sc_styleobj.mk b/sc/CppunitTest_sc_styleobj.mk
new file mode 100644
index ..59595a8f402b
--- /dev/null
+++ b/sc/CppunitTest_sc_styleobj.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_styleobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_styleobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_styleobj))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_styleobj, \
+ sc/qa/extras/scstyleobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_styleobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_styleobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_styleobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_styleobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_styleobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_styleobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_styleobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 1b2ca6bfc399..cbe32e32ebc2 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -191,6 +191,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_sortdescriptorbaseobj \
CppunitTest_sc_spreadsheetsettings \
CppunitTest_sc_spreadsheetsettingsobj \
+ CppunitTest_sc_styleobj \
CppunitTest_sc_stylefamiliesobj \
CppunitTest_sc_stylefamilyobj \
CppunitTest_sc_subtotaldescriptorbase \
diff --git a/sc/qa/extras/scstyleobj.cxx b/sc/qa/extras/scstyleobj.cxx
new file mode 100644
index ..a29243882ffc
--- /dev/null
+++ b/sc/qa/extras/scstyleobj.cxx
@@ -0,0 +1,111 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+using namespace css;
+
+namespace sc_apitest
+{
+class ScStyleObj : public CalcUnoApiTest, public apitest::XNamed
+{
+public:
+ScStyleObj();
+
+virtual void setUp() override;
+virtual void tearDown() override;
+
+virtual uno::Reference init() override;
+
+CPPUNIT_TEST_SUITE(ScStyleObj);
+
+// XNamed
+CPPUNIT_TEST(testGetName);
+CPPUNIT_TEST(testSetName);
+
+CPPUNIT_TEST_SUITE_END();
+
+private:
+uno::Reference m_xComponent;
+};
+
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv |5
-
sc/qa/extras/scannotationshapeobj.cxx| 10
+-
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 7fe58f64cd8b58918cae92aed536d266f63b4c71
Author: Jens Carl
AuthorDate: Mon Oct 21 21:39:30 2019 -0700
Commit: Jens Carl
CommitDate: Wed Oct 23 03:36:53 2019 +0200
tdf#45904 Move XTextRange Java test to C++
Move XTextRange Java test to C++ for ScAnnotationShapeObj.
Change-Id: If280b4e621fedd1023457ff626c6db8ef9a9f7ad
Reviewed-on: https://gerrit.libreoffice.org/81295
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 fa1477b94f04..16d4d6f432d7 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
@@ -152,11 +152,6 @@
"ScAnnotationShapeObj";"com::sun::star::drawing::ShadowProperties";"ShadowTransparence"
"ScAnnotationShapeObj";"com::sun::star::drawing::ShadowProperties";"ShadowXDistance"
"ScAnnotationShapeObj";"com::sun::star::drawing::ShadowProperties";"ShadowYDistance"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"getText()"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"getStart()"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"getEnd()"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"getString()"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"setString()"
"ScAnnotationShapeObj";"com::sun::star::style::CharacterProperties";"CharFontName"
"ScAnnotationShapeObj";"com::sun::star::style::CharacterProperties";"CharFontStyleName"
"ScAnnotationShapeObj";"com::sun::star::style::CharacterProperties";"CharFontFamily"
diff --git a/sc/qa/extras/scannotationshapeobj.cxx
b/sc/qa/extras/scannotationshapeobj.cxx
index 567a7a904d3e..5a7a7258e04a 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
@@ -42,7 +43,8 @@ class ScAnnotationShapeObj : public CalcUnoApiTest,
public apitest::XShape,
public apitest::XShapeDescriptor,
public apitest::XSimpleText,
- public apitest::XText
+ public apitest::XText,
+ public apitest::XTextRange
{
public:
ScAnnotationShapeObj();
@@ -76,6 +78,12 @@ public:
// XText
CPPUNIT_TEST(testInsertRemoveTextContent);
+// XTextRange
+CPPUNIT_TEST(testGetEnd);
+CPPUNIT_TEST(testGetSetString);
+CPPUNIT_TEST(testGetStart);
+CPPUNIT_TEST(testGetText);
+
CPPUNIT_TEST_SUITE_END();
private:
___
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|5
+
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 3874ac30beeb65a7048ff31bf052ecc87c185b69
Author: Jens Carl
AuthorDate: Sun Oct 20 01:47:24 2019 -0700
Commit: Jens Carl
CommitDate: Mon Oct 21 01:34:05 2019 +0200
tdf#45904 Move XGluePointsSupplier Java test to C++
Move XGluePointsSupplier Java test to C++ for ScAnnotationShapeObj.
Change-Id: I573f28f1b1bdf8e8fa41ef14cfd3d8ea4deaf751
Reviewed-on: https://gerrit.libreoffice.org/81150
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 c83b8f6f107f..fa1477b94f04 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
@@ -125,7 +125,6 @@
"ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"TextAnimationStartInside"
"ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"TextAnimationStopInside"
"ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"TextWritingMode"
-"ScAnnotationShapeObj";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"ScAnnotationShapeObj";"com::sun::star::drawing::FillProperties";"FillStyle"
"ScAnnotationShapeObj";"com::sun::star::drawing::FillProperties";"FillColor"
"ScAnnotationShapeObj";"com::sun::star::drawing::FillProperties";"FillTransparence"
diff --git a/sc/qa/extras/scannotationshapeobj.cxx
b/sc/qa/extras/scannotationshapeobj.cxx
index f8e0fa0d93d9..567a7a904d3e 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
#include
@@ -37,6 +38,7 @@ namespace sc_apitest
{
class ScAnnotationShapeObj : public CalcUnoApiTest,
public apitest::CaptionShape,
+ public apitest::XGluePointsSupplier,
public apitest::XShape,
public apitest::XShapeDescriptor,
public apitest::XSimpleText,
@@ -55,6 +57,9 @@ public:
// CaptionShape
CPPUNIT_TEST(testCaptionShapeProperties);
+// XGluePointsSupplier
+CPPUNIT_TEST(testGetGluePoints);
+
// XShape
CPPUNIT_TEST(testGetSetSize);
CPPUNIT_TEST(testGetSetPosition);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv |2 -- 1 file changed, 2 deletions(-) New commits: commit ba3147f09c8749dc1250e16d432beae6b9d5342b Author: Jens Carl AuthorDate: Sat Sep 14 23:19:21 2019 -0700 Commit: Jens Carl CommitDate: Sun Sep 15 19:43:00 2019 +0200 tdf#45904 Remove/disable obsolete XText Java tests The XText tests are already written and enabled in C++ since commit 7b773d9c25fbda03f6fd97503a4af6361a2a5e87. Change-Id: Iad5e22251ad33cfb32c68e32770a1dbf294dd01a Reviewed-on: https://gerrit.libreoffice.org/78927 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 76fb02c79042..c83b8f6f107f 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv @@ -216,8 +216,6 @@ "ScAnnotationShapeObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()" "ScAnnotationShapeObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()" "ScAnnotationShapeObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()" -"ScAnnotationShapeObj";"com::sun::star::text::XText";"insertTextContent()" -"ScAnnotationShapeObj";"com::sun::star::text::XText";"removeTextContent()" "ScAnnotationShapeObj";"com::sun::star::style::ParagraphPropertiesAsian#optional";"ParaIsHangingPunctuation" "ScAnnotationShapeObj";"com::sun::star::style::ParagraphPropertiesAsian#optional";"ParaIsCharacterDistance" "ScAnnotationShapeObj";"com::sun::star::style::ParagraphPropertiesAsian#optional";"ParaIsForbiddenRules" ___ 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 |4
sc/qa/extras/scannotationshapeobj.cxx|8
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit b3e98730b324c6343a024e18075817241fe25437
Author: Jens Carl
AuthorDate: Sat Sep 14 23:09:32 2019 -0700
Commit: Jens Carl
CommitDate: Sun Sep 15 19:42:39 2019 +0200
tdf#45904 Move XSimpleText Java tests to C++
Move XSimpleText Java tests to C++ for ScAnnotationShapeObj.
Change-Id: Ib8d071dce2ee5906b85537b3fca7bcf7b238e735
Reviewed-on: https://gerrit.libreoffice.org/78926
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 3a76ca37b9f5..76fb02c79042 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
@@ -101,10 +101,6 @@
"ScAnnotationShapeObj";"com::sun::star::drawing::LineProperties";"LineStartWidth#optional"
"ScAnnotationShapeObj";"com::sun::star::drawing::LineProperties";"LineEndCenter#optional"
"ScAnnotationShapeObj";"com::sun::star::drawing::LineProperties";"LineEndWidth#optional"
-"ScAnnotationShapeObj";"com::sun::star::text::XSimpleText";"createTextCursor()"
-"ScAnnotationShapeObj";"com::sun::star::text::XSimpleText";"createTextCursorByRange()"
-"ScAnnotationShapeObj";"com::sun::star::text::XSimpleText";"insertString()"
-"ScAnnotationShapeObj";"com::sun::star::text::XSimpleText";"insertControlCharacter()"
"ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"IsNumbering#optional"
"ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"NumberingRules#optional"
"ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"TextAutoGrowHeight"
diff --git a/sc/qa/extras/scannotationshapeobj.cxx
b/sc/qa/extras/scannotationshapeobj.cxx
index 48f97b1be887..f8e0fa0d93d9 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -38,6 +39,7 @@ class ScAnnotationShapeObj : public CalcUnoApiTest,
public apitest::CaptionShape,
public apitest::XShape,
public apitest::XShapeDescriptor,
+ public apitest::XSimpleText,
public apitest::XText
{
public:
@@ -60,6 +62,12 @@ public:
// XShapeDescriptor
CPPUNIT_TEST(testGetShapeType);
+// XSimpleText
+CPPUNIT_TEST(testCreateTextCursor);
+CPPUNIT_TEST(testCreateTextCursorByRange);
+CPPUNIT_TEST(testInsertControlCharacter);
+CPPUNIT_TEST(testInsertString);
+
// XText
CPPUNIT_TEST(testInsertRemoveTextContent);
___
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
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa solenv/clang-format
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv |4
sc/qa/extras/scannotationshapeobj.cxx| 88
++
solenv/clang-format/blacklist|1
3 files changed, 54 insertions(+), 39 deletions(-)
New commits:
commit 0d0e8533afe565564835e6d51500e64066fd565b
Author: Jens Carl
AuthorDate: Fri Sep 13 22:19:32 2019 -0700
Commit: Jens Carl
CommitDate: Sat Sep 14 08:17:59 2019 +0200
tdf#45904 Move XShape Java tests to C++
Move XShape Java tests to C++ for ScAnnotationShapeObj.
Change-Id: I26658ea7b0b26f68659024100c4d3c40e383899e
Reviewed-on: https://gerrit.libreoffice.org/78898
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 8709cf403bc5..c65940379cc2 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
@@ -221,10 +221,6 @@
"ScAnnotationShapeObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScAnnotationShapeObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScAnnotationShapeObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScAnnotationShapeObj";"com::sun::star::drawing::XShape";"getPosition()"
-"ScAnnotationShapeObj";"com::sun::star::drawing::XShape";"setPosition()"
-"ScAnnotationShapeObj";"com::sun::star::drawing::XShape";"getSize()"
-"ScAnnotationShapeObj";"com::sun::star::drawing::XShape";"setSize()"
"ScAnnotationShapeObj";"com::sun::star::text::XText";"insertTextContent()"
"ScAnnotationShapeObj";"com::sun::star::text::XText";"removeTextContent()"
"ScAnnotationShapeObj";"com::sun::star::style::ParagraphPropertiesAsian#optional";"ParaIsHangingPunctuation"
diff --git a/sc/qa/extras/scannotationshapeobj.cxx
b/sc/qa/extras/scannotationshapeobj.cxx
index 77fce301ce1f..5cf3fc927464 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -8,22 +8,35 @@
*/
#include
-#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
-#include
#include
-#include
+#include
+#include
#include
+#include
#include
+#include
+#include
+#include
-using namespace css;
-using namespace css::uno;
+#include
-namespace sc_apitest {
+using namespace css;
-class ScAnnotationShapeObj : public CalcUnoApiTest, public apitest::XText,
public apitest::CaptionShape
+namespace sc_apitest
+{
+class ScAnnotationShapeObj : public CalcUnoApiTest,
+ public apitest::CaptionShape,
+ public apitest::XShape,
+ public apitest::XText
{
public:
ScAnnotationShapeObj();
@@ -35,20 +48,24 @@ public:
CPPUNIT_TEST_SUITE(ScAnnotationShapeObj);
-// XText
-CPPUNIT_TEST(testInsertRemoveTextContent);
-
// CaptionShape
CPPUNIT_TEST(testCaptionShapeProperties);
+// XShape
+CPPUNIT_TEST(testGetSetSize);
+CPPUNIT_TEST(testGetSetPosition);
+
+// XText
+CPPUNIT_TEST(testInsertRemoveTextContent);
+
CPPUNIT_TEST_SUITE_END();
private:
-uno::Reference mxComponent;
-static uno::Reference mxField;
+uno::Reference m_xComponent;
+static uno::Reference m_xField;
};
-uno::Reference ScAnnotationShapeObj::mxField;
+uno::Reference ScAnnotationShapeObj::m_xField;
ScAnnotationShapeObj::ScAnnotationShapeObj()
: CalcUnoApiTest("sc/qa/extras/testdocuments")
@@ -58,58 +75,61 @@ ScAnnotationShapeObj::ScAnnotationShapeObj()
void ScAnnotationShapeObj::setUp()
{
CalcUnoApiTest::setUp();
-mxComponent = loadFromDesktop("private:factory/scalc");
+m_xComponent = loadFromDesktop("private:factory/scalc");
}
void ScAnnotationShapeObj::tearDown()
{
-mxField.clear();
-closeDocument(mxComponent);
+m_xField.clear();
+closeDocument(m_xComponent);
CalcUnoApiTest::tearDown();
}
uno::Reference ScAnnotationShapeObj::init()
{
-uno::Reference xDoc(mxComponent,
UNO_QUERY_THROW);
+uno::Reference xDoc(m_xComponent,
uno::UNO_QUERY_THROW);
-uno::Reference xIA(xDoc->getSheets(),
UNO_QUERY_THROW);
-uno::Reference xSheet(xIA->getByIndex(0),
UNO_QUERY_THROW);
+uno::Reference xIA(xDoc->getSheets(),
uno::UNO_QUERY_THROW);
+uno::Reference xSheet(xIA->getByIndex(0),
uno::UNO_QUERY_THROW);
// Use cell A1 for this.
-
table::CellAddress aNotePos(0, 0, 0);
-Reference xAnnosSupp(xSheet,
UNO_QUERY_THROW);
-Reference
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv |2 -
sc/qa/extras/sctabviewobj.cxx| 16 ---
2 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit d3b81a27e2bb7c8a3de8cd5fabe8d3734b5a3d3d
Author: Jens Carl
AuthorDate: Wed Jun 26 20:39:49 2019 -0700
Commit: Jens Carl
CommitDate: Thu Jun 27 06:30:28 2019 +0200
tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScTabViewObj.
Change-Id: Iee151264033bee61a6a88ec0acb932ae069ede56
Reviewed-on: https://gerrit.libreoffice.org/74774
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
index ffd0cf5a2114..45986718864f 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
@@ -10,8 +10,6 @@
"ScTabViewObj";"com::sun::star::sheet::XEnhancedMouseClickBroadcaster#optional";"removeEnhancedMouseClickHandler()"
"ScTabViewObj";"com::sun::star::ui::XContextMenuInterception#optional";"registerContextMenuInterceptor()"
"ScTabViewObj";"com::sun::star::ui::XContextMenuInterception#optional";"releaseContextMenuInterceptor()"
-"ScTabViewObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScTabViewObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"startRangeSelection()"
"ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"abortRangeSelection()"
"ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"addRangeSelectionListener()"
diff --git a/sc/qa/extras/sctabviewobj.cxx b/sc/qa/extras/sctabviewobj.cxx
index fef454f8899a..b2002655610b 100644
--- a/sc/qa/extras/sctabviewobj.cxx
+++ b/sc/qa/extras/sctabviewobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
#include
@@ -18,14 +19,17 @@
#include
#include
-#include
#include
-#include
+#include
#include
-
+#include
+#include
#include
+
#include
+#include
+
using namespace css;
using namespace css::uno;
@@ -35,6 +39,7 @@ class ScTabViewObj : public CalcUnoApiTest,
public apitest::SpreadsheetViewSettings,
public apitest::XActivationBroadcaster,
public apitest::XCellRangeReferrer,
+ public apitest::XElementAccess,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XSpreadsheetView,
@@ -62,6 +67,10 @@ public:
//Disabled till it's clear why it fails on some machines.
//CPPUNIT_TEST(testGetReferredCells);
+// XElementAccess
+CPPUNIT_TEST(testGetElementType);
+CPPUNIT_TEST(testHasElements);
+
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
@@ -86,6 +95,7 @@ private:
ScTabViewObj::ScTabViewObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XElementAccess(cppu::UnoType::get())
, XIndexAccess(1)
{
}
___
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.ScTabViewObj.csv |2 --
sc/qa/extras/sctabviewobj.cxx|7 +++
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 8567d3d2567e83d1a8769651295384cfe5d68ce1
Author: Jens Carl
AuthorDate: Sat Jun 22 13:34:05 2019 -0700
Commit: Jens Carl
CommitDate: Sun Jun 23 02:30:34 2019 +0200
tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java tests to C++ for ScTabViewObj.
Change-Id: Ic3364f405e4e4c42443a7f439a257ed6328f32a8
Reviewed-on: https://gerrit.libreoffice.org/74586
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
index eee960dcfa3e..ffd0cf5a2114 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
@@ -1,5 +1,3 @@
-"ScTabViewObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScTabViewObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScTabViewObj";"com::sun::star::lang::XComponent";"dispose()"
"ScTabViewObj";"com::sun::star::lang::XComponent";"addEventListener()"
"ScTabViewObj";"com::sun::star::lang::XComponent";"removeEventListener()"
diff --git a/sc/qa/extras/sctabviewobj.cxx b/sc/qa/extras/sctabviewobj.cxx
index 14b46abc725e..fef454f8899a 100644
--- a/sc/qa/extras/sctabviewobj.cxx
+++ b/sc/qa/extras/sctabviewobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
#include
@@ -35,6 +36,7 @@ class ScTabViewObj : public CalcUnoApiTest,
public apitest::XActivationBroadcaster,
public apitest::XCellRangeReferrer,
public apitest::XEnumerationAccess,
+ public apitest::XIndexAccess,
public apitest::XSpreadsheetView,
public apitest::XViewFreezable,
public apitest::XViewSplitable
@@ -63,6 +65,10 @@ public:
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
+// XIndexAccess
+CPPUNIT_TEST(testGetByIndex);
+CPPUNIT_TEST(testGetCount);
+
// XSpreadsheetView
CPPUNIT_TEST(testGetSetActiveSheet);
@@ -80,6 +86,7 @@ private:
ScTabViewObj::ScTabViewObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XIndexAccess(1)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f7a6b7a82469f2b4bd6cec3e7aa697aefd5775b7 Author: Jens Carl AuthorDate: Thu Jun 20 23:25:31 2019 -0700 Commit: Jens Carl CommitDate: Sat Jun 22 21:52:09 2019 +0200 tdf#45904 Correct mishap with removed converted tests Deleted the wrong test and also forgot to remove a test with commit 0e73f9eb4157. Change-Id: I31257908e935b2130c46436e8d5425bc058b21c5 Reviewed-on: https://gerrit.libreoffice.org/74484 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv index be9506938cdc..5c145a956d1b 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv @@ -15,4 +15,4 @@ "ScShapeObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()" "ScShapeObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()" "ScShapeObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()" -"ScShapeObj";"com::sun::star::drawing::XShape";"setSize()" +"ScShapeObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/fwe/xml/toolboxdocumenthandler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1fcbab24c610d6308a51649e2fa814cdf8636e26
Author: Jens Carl
AuthorDate: Wed Jun 19 22:26:10 2019 -0700
Commit: Jens Carl
CommitDate: Thu Jun 20 08:45:03 2019 +0200
Revert "Fix typo"
Revent commit 693e8d1eb28c916ea8bb91667ed5511ff0907d2b
Change-Id: I87618aad941d92aca2801e1c2b7dfcdbdc007474
Reviewed-on: https://gerrit.libreoffice.org/74408
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index b1f05058a27e..e8f0fb1fde21 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -206,7 +206,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
}
else
{
-// Check if we have an UI name set in our XML file
+// Check if we have a UI name set in our XML file
OUString aUIName;
for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/drawing/xshape.hxx| 41 +
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv |4
sc/qa/extras/scshapeobj.cxx|6 +
test/Library_subsequenttest.mk |1
test/source/drawing/xshape.cxx | 56 +
5 files changed, 104 insertions(+), 4 deletions(-)
New commits:
commit 0e73f9eb415793c1c7503021c40fd746b2ef7ba2
Author: Jens Carl
AuthorDate: Wed Jun 19 05:18:55 2019 +
Commit: Jens Carl
CommitDate: Wed Jun 19 08:10:10 2019 +0200
tdf#45904 Move XShape Java tests to C++
Move XShape Java tests to C++ for ScShapeObj.
Change-Id: I349c4abb09c3e9e43285b63ee5f19f55d967b38f
Reviewed-on: https://gerrit.libreoffice.org/74331
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/drawing/xshape.hxx b/include/test/drawing/xshape.hxx
new file mode 100644
index ..7da565355635
--- /dev/null
+++ b/include/test/drawing/xshape.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XShape
+{
+public:
+XShape(bool bObjSupportsPosition = true)
+: m_bObjSupportsPosition(bObjSupportsPosition)
+{
+}
+virtual css::uno::Reference init() = 0;
+
+void testGetSetPosition();
+void testGetSetSize();
+
+protected:
+~XShape() {}
+
+private:
+bool const m_bObjSupportsPosition;
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
index 4e59e44415b9..be9506938cdc 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
@@ -15,8 +15,4 @@
"ScShapeObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScShapeObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScShapeObj";"com::sun::star::drawing::XShape";"getPosition()"
-"ScShapeObj";"com::sun::star::drawing::XShape";"setPosition()"
-"ScShapeObj";"com::sun::star::drawing::XShape";"getSize()"
"ScShapeObj";"com::sun::star::drawing::XShape";"setSize()"
diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx
index 723d71a3f1c4..ef8761a657d9 100644
--- a/sc/qa/extras/scshapeobj.cxx
+++ b/sc/qa/extras/scshapeobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
#include
@@ -35,6 +36,7 @@ class ScShapeObj : public CalcUnoApiTest,
public apitest::Shape,
public apitest::XComponent,
public apitest::XGluePointsSupplier,
+ public apitest::XShape,
public apitest::XShapeDescriptor
{
public:
@@ -60,6 +62,10 @@ public:
// XGluePointsSupplier
CPPUNIT_TEST(testGetGluePoints);
+// XShape
+CPPUNIT_TEST(testGetSetPosition);
+CPPUNIT_TEST(testGetSetSize);
+
// XShapeDescriptor
CPPUNIT_TEST(testGetShapeType);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index c03cb7b9d8c4..aaa357ef63b8 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -59,6 +59,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/drawing/xgluepointssupplier \
test/source/drawing/xshapedescriptor \
test/source/drawing/xshapegrouper \
+ test/source/drawing/xshape \
test/source/drawing/xshapes \
test/source/lang/xserviceinfo \
test/source/lang/xcomponent \
diff --git a/test/source/drawing/xshape.cxx b/test/source/drawing/xshape.cxx
new file mode 100644
index ..6992663f56d0
--- /dev/null
+++ b/test/source/drawing/xshape.cxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+
+#include
+
+using namespace css;
+
+namespace
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/drawing/xgluepointssupplier.hxx | 33 +
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv |1
sc/qa/extras/scshapeobj.cxx|5 +
test/Library_subsequenttest.mk |1
test/source/drawing/xgluepointssupplier.cxx| 32
5 files changed, 71 insertions(+), 1 deletion(-)
New commits:
commit 8a453f96f0181b1eae227ebdadea6ee458d53eb4
Author: Jens Carl
AuthorDate: Mon Jun 17 05:50:26 2019 +
Commit: Jens Carl
CommitDate: Tue Jun 18 06:52:14 2019 +0200
tdf#45904 Move XGluePointsSupplier Java test to C++
Move XGluePointsSupplier Java test to C++ for ScShapeObj.
Change-Id: I75babf46b664cccbb4d1df2af1764c3fa296903a
Reviewed-on: https://gerrit.libreoffice.org/74140
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/drawing/xgluepointssupplier.hxx
b/include/test/drawing/xgluepointssupplier.hxx
new file mode 100644
index ..0dd8bf58a138
--- /dev/null
+++ b/include/test/drawing/xgluepointssupplier.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XGluePointsSupplier
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetGluePoints();
+
+protected:
+~XGluePointsSupplier() {}
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
index 6a5cd6fc7345..4e59e44415b9 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
@@ -9,7 +9,6 @@
"ScShapeObj";"com::sun::star::drawing::Shape";"Transformation#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
-"ScShapeObj";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx
index 91ab4adc79af..723d71a3f1c4 100644
--- a/sc/qa/extras/scshapeobj.cxx
+++ b/sc/qa/extras/scshapeobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
#include
@@ -33,6 +34,7 @@ namespace sc_apitest
class ScShapeObj : public CalcUnoApiTest,
public apitest::Shape,
public apitest::XComponent,
+ public apitest::XGluePointsSupplier,
public apitest::XShapeDescriptor
{
public:
@@ -55,6 +57,9 @@ public:
CPPUNIT_TEST(testDispose);
CPPUNIT_TEST(testRemoveEventListener);
+// XGluePointsSupplier
+CPPUNIT_TEST(testGetGluePoints);
+
// XShapeDescriptor
CPPUNIT_TEST(testGetShapeType);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index bdd8900fd61b..c03cb7b9d8c4 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -56,6 +56,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/document/xlinktargetsupplier \
test/source/drawing/captionshape \
test/source/drawing/xdrawpages \
+ test/source/drawing/xgluepointssupplier \
test/source/drawing/xshapedescriptor \
test/source/drawing/xshapegrouper \
test/source/drawing/xshapes \
diff --git a/test/source/drawing/xgluepointssupplier.cxx
b/test/source/drawing/xgluepointssupplier.cxx
new file mode 100644
index ..68d6b6fb6269
--- /dev/null
+++ b/test/source/drawing/xgluepointssupplier.cxx
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+#include
+
+#include
+
+#include
+
+using namespace css;
+
+namespace apitest
+{
+void XGluePointsSupplier::testGetGluePoints()
+{
+uno::Reference xGPS(init(),
uno::UNO_QUERY_THROW);
+
+uno::Reference xIC =
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/drawing/xshapedescriptor.hxx | 41 +
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv |1
sc/qa/extras/scshapeobj.cxx| 10 ++-
test/Library_subsequenttest.mk |1
test/source/drawing/xshapedescriptor.cxx | 30 +
5 files changed, 81 insertions(+), 2 deletions(-)
New commits:
commit c77a1e1c039c863e6fdb47b92ce315b87fc73d0d
Author: Jens Carl
AuthorDate: Mon Jun 17 05:13:27 2019 +
Commit: Jens Carl
CommitDate: Mon Jun 17 08:03:15 2019 +0200
tdf#45904 Move XShapeDescriptor Java test to C++
Move XShapeDescriptor Java test to C++ for ScShapeObj.
Change-Id: I2d530ea73c6f25e36665db0bd65f734e509d97a6
Reviewed-on: https://gerrit.libreoffice.org/74139
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/drawing/xshapedescriptor.hxx
b/include/test/drawing/xshapedescriptor.hxx
new file mode 100644
index ..cb7c37e3a5ba
--- /dev/null
+++ b/include/test/drawing/xshapedescriptor.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#include
+
+#include
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XShapeDescriptor
+{
+public:
+XShapeDescriptor(const OUString& rShapeType)
+: m_aShapeType(rShapeType)
+{
+}
+virtual css::uno::Reference init() = 0;
+
+void testGetShapeType();
+
+protected:
+~XShapeDescriptor() {}
+
+private:
+OUString const m_aShapeType;
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
index 47138b49c5ea..6a5cd6fc7345 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
@@ -9,7 +9,6 @@
"ScShapeObj";"com::sun::star::drawing::Shape";"Transformation#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
-"ScShapeObj";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
"ScShapeObj";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScShapeObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx
index 2a1bebb1..91ab4adc79af 100644
--- a/sc/qa/extras/scshapeobj.cxx
+++ b/sc/qa/extras/scshapeobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
@@ -29,7 +30,10 @@ using namespace css;
namespace sc_apitest
{
-class ScShapeObj : public CalcUnoApiTest, public apitest::Shape, public
apitest::XComponent
+class ScShapeObj : public CalcUnoApiTest,
+ public apitest::Shape,
+ public apitest::XComponent,
+ public apitest::XShapeDescriptor
{
public:
ScShapeObj();
@@ -51,6 +55,9 @@ public:
CPPUNIT_TEST(testDispose);
CPPUNIT_TEST(testRemoveEventListener);
+// XShapeDescriptor
+CPPUNIT_TEST(testGetShapeType);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -59,6 +66,7 @@ private:
ScShapeObj::ScShapeObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XShapeDescriptor("com.sun.star.drawing.RectangleShape")
{
}
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 2ad096c59c32..bdd8900fd61b 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -56,6 +56,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/document/xlinktargetsupplier \
test/source/drawing/captionshape \
test/source/drawing/xdrawpages \
+ test/source/drawing/xshapedescriptor \
test/source/drawing/xshapegrouper \
test/source/drawing/xshapes \
test/source/lang/xserviceinfo \
diff --git a/test/source/drawing/xshapedescriptor.cxx
b/test/source/drawing/xshapedescriptor.cxx
new file mode 100644
index ..37c95e75eff0
--- /dev/null
+++ b/test/source/drawing/xshapedescriptor.cxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg
dev/null |binary icon-themes/sifr/links.txt |2 -- icon-themes/sifr_svg/cmd/sc_toolsmacroedit.svg |1 - 3 files changed, 3 deletions(-) New commits: commit dc9d11e20aca4f7df7bd3d11d84e963ce4abf2bc Author: Jens Carl AuthorDate: Thu Jun 13 18:52:42 2019 -0700 Commit: Jens Carl CommitDate: Sat Jun 15 19:36:21 2019 +0200 sifr: Rename icon toolsmacroedit to basicideappear The icon isn't needed at two places anymore and it's a follow up of daba09df247c09db715ca86a6b78365e49bfe034, which removed the menu entry toolsmacroedit. Also clean the links.txt file. Change-Id: If9a8a85733fb7994d22e31c2a591b1e4943e16a0 Reviewed-on: https://gerrit.libreoffice.org/74012 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/icon-themes/sifr/cmd/lc_toolsmacroedit.png b/icon-themes/sifr/cmd/lc_basicideappear.png similarity index 100% rename from icon-themes/sifr/cmd/lc_toolsmacroedit.png rename to icon-themes/sifr/cmd/lc_basicideappear.png diff --git a/icon-themes/sifr/cmd/sc_toolsmacroedit.png b/icon-themes/sifr/cmd/sc_toolsmacroedit.png deleted file mode 100644 index 273db1084123.. Binary files a/icon-themes/sifr/cmd/sc_toolsmacroedit.png and /dev/null differ diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index dbba09576cf5..9c2fc5d23627 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -1769,10 +1769,8 @@ cmd/sc_tableevents.png cmd/sc_animationeffects.png cmd/lc_macrosmenu.png cmd/lc_choosemacro.png -cmd/lc_basicideappear.png cmd/lc_toolsmacroedit.png cmd/sc_macrosmenu.png cmd/sc_choosemacro.png -cmd/sc_basicideappear.png cmd/sc_toolsmacroedit.png cmd/lc_donation.png cmd/lc_currencyfield.png cmd/sc_donation.png cmd/sc_currencyfield.png diff --git a/icon-themes/sifr_dark/cmd/lc_toolsmacroedit.png b/icon-themes/sifr_dark/cmd/lc_basicideappear.png similarity index 100% rename from icon-themes/sifr_dark/cmd/lc_toolsmacroedit.png rename to icon-themes/sifr_dark/cmd/lc_basicideappear.png diff --git a/icon-themes/sifr_dark/cmd/sc_toolsmacroedit.png b/icon-themes/sifr_dark/cmd/sc_toolsmacroedit.png deleted file mode 100644 index ada1e4f1c97c.. Binary files a/icon-themes/sifr_dark/cmd/sc_toolsmacroedit.png and /dev/null differ diff --git a/icon-themes/sifr_svg/cmd/lc_toolsmacroedit.svg b/icon-themes/sifr_svg/cmd/lc_basicideappear.svg similarity index 100% rename from icon-themes/sifr_svg/cmd/lc_toolsmacroedit.svg rename to icon-themes/sifr_svg/cmd/lc_basicideappear.svg diff --git a/icon-themes/sifr_svg/cmd/sc_toolsmacroedit.svg b/icon-themes/sifr_svg/cmd/sc_toolsmacroedit.svg deleted file mode 100644 index 537ea3de4996.. --- a/icon-themes/sifr_svg/cmd/sc_toolsmacroedit.svg +++ /dev/null @@ -1 +0,0 @@ -http://www.w3.org/2000/svg;> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg
icon-themes/breeze/links.txt |3 --- 1 file changed, 3 deletions(-) New commits: commit 20592b62d6a723ca1d6ee02572be48e55cc9a02e Author: Jens Carl AuthorDate: Thu Jun 13 18:42:42 2019 -0700 Commit: Jens Carl CommitDate: Sat Jun 15 19:35:45 2019 +0200 breeze: Rename icon toolsmacroedit to basicideappear The icon isn't needed at two places anymore and it's follow-up of daba09df247c09db715ca86a6b78365e49bfe034, which remove the menu entry toolsmacroedit. Also clean the links.txt file. Change-Id: I0275b66d37297cb0c1996654a8ea16bcd31f3d17 Reviewed-on: https://gerrit.libreoffice.org/74011 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/icon-themes/breeze/cmd/lc_toolsmacroedit.png b/icon-themes/breeze/cmd/lc_basicideappear.png similarity index 100% rename from icon-themes/breeze/cmd/lc_toolsmacroedit.png rename to icon-themes/breeze/cmd/lc_basicideappear.png diff --git a/icon-themes/breeze/cmd/sc_toolsmacroedit.png b/icon-themes/breeze/cmd/sc_basicideappear.png similarity index 100% rename from icon-themes/breeze/cmd/sc_toolsmacroedit.png rename to icon-themes/breeze/cmd/sc_basicideappear.png diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index e19b54cea006..1c3aa5fc2b0c 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1772,13 +1772,10 @@ cmd/sc_convertmenu.png cmd/sc_bezierconvert.png # Macro cmd/32/macrosmenu.png cmd/32/choosemacro.png -cmd/32/basicideappear.png cmd/32/toolsmacroedit.png cmd/lc_macrosmenu.png cmd/lc_choosemacro.png -cmd/lc_basicideappear.png cmd/lc_toolsmacroedit.png cmd/sc_macrosmenu.png cmd/sc_choosemacro.png -cmd/sc_basicideappear.png cmd/sc_toolsmacroedit.png cmd/sc_macrosmenu.png res/im30821.png cmd/sc_macrodialog.png cmd/sc_scriptorganizer.png diff --git a/icon-themes/breeze_dark/cmd/lc_toolsmacroedit.png b/icon-themes/breeze_dark/cmd/lc_basicideappear.png similarity index 100% rename from icon-themes/breeze_dark/cmd/lc_toolsmacroedit.png rename to icon-themes/breeze_dark/cmd/lc_basicideappear.png diff --git a/icon-themes/breeze_dark/cmd/sc_toolsmacroedit.png b/icon-themes/breeze_dark/cmd/sc_basicideappear.png similarity index 100% rename from icon-themes/breeze_dark/cmd/sc_toolsmacroedit.png rename to icon-themes/breeze_dark/cmd/sc_basicideappear.png diff --git a/icon-themes/breeze_svg/cmd/lc_toolsmacroedit.svg b/icon-themes/breeze_svg/cmd/lc_basicideappear.svg similarity index 100% rename from icon-themes/breeze_svg/cmd/lc_toolsmacroedit.svg rename to icon-themes/breeze_svg/cmd/lc_basicideappear.svg diff --git a/icon-themes/breeze_svg/cmd/sc_toolsmacroedit.svg b/icon-themes/breeze_svg/cmd/sc_basicideappear.svg similarity index 100% rename from icon-themes/breeze_svg/cmd/sc_toolsmacroedit.svg rename to icon-themes/breeze_svg/cmd/sc_basicideappear.svg ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/links.txt |3 --- 1 file changed, 3 deletions(-) New commits: commit 876e247e047bdacd5b0b98c19e96d2cdf3c30881 Author: Jens Carl AuthorDate: Fri Jun 7 00:04:18 2019 -0700 Commit: Rizal Muttaqin CommitDate: Thu Jun 13 05:20:42 2019 +0200 elementary: Rename icon toolsmacroedit to basicideappear The icon isn't needed at two places anymore and it's a follow up of daba09df247c09db715ca86a6b78365e49bfe034, which removed the menu entry toolsmacroedit. Also clean the links.txt file. Change-Id: I700aebab5f3049ab43b778de8ae6e3e3476ae2a1 Reviewed-on: https://gerrit.libreoffice.org/73642 Tested-by: Jenkins Reviewed-by: Jens Carl (cherry picked from commit ab09fa72f2b7b1ce9da00b4e9cb12bd0841f7820) Reviewed-on: https://gerrit.libreoffice.org/73918 Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/elementary/cmd/32/toolsmacroedit.png b/icon-themes/elementary/cmd/32/basicideappear.png similarity index 100% rename from icon-themes/elementary/cmd/32/toolsmacroedit.png rename to icon-themes/elementary/cmd/32/basicideappear.png diff --git a/icon-themes/elementary/cmd/lc_toolsmacroedit.png b/icon-themes/elementary/cmd/lc_basicideappear.png similarity index 100% rename from icon-themes/elementary/cmd/lc_toolsmacroedit.png rename to icon-themes/elementary/cmd/lc_basicideappear.png diff --git a/icon-themes/elementary/cmd/sc_toolsmacroedit.png b/icon-themes/elementary/cmd/sc_basicideappear.png similarity index 100% rename from icon-themes/elementary/cmd/sc_toolsmacroedit.png rename to icon-themes/elementary/cmd/sc_basicideappear.png diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index d915ff854461..35026e85455a 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -1165,15 +1165,12 @@ cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png # Macro cmd/32/macrodialog.png cmd/32/scriptorganizer.png cmd/32/macrosmenu.png cmd/32/choosemacro.png -cmd/32/basicideappear.png cmd/32/toolsmacroedit.png cmd/lc_macrodialog.png cmd/lc_scriptorganizer.png cmd/lc_macrosmenu.png cmd/lc_choosemacro.png -cmd/lc_basicideappear.png cmd/lc_toolsmacroedit.png cmd/sc_macrodialog.png cmd/sc_scriptorganizer.png cmd/sc_macrosmenu.png cmd/sc_choosemacro.png -cmd/sc_basicideappear.png cmd/sc_toolsmacroedit.png # Outline diff --git a/icon-themes/elementary_svg/cmd/32/toolsmacroedit.svg b/icon-themes/elementary_svg/cmd/32/basicideappear.svg similarity index 100% rename from icon-themes/elementary_svg/cmd/32/toolsmacroedit.svg rename to icon-themes/elementary_svg/cmd/32/basicideappear.svg diff --git a/icon-themes/elementary_svg/cmd/lc_toolsmacroedit.svg b/icon-themes/elementary_svg/cmd/lc_basicideappear.svg similarity index 100% rename from icon-themes/elementary_svg/cmd/lc_toolsmacroedit.svg rename to icon-themes/elementary_svg/cmd/lc_basicideappear.svg diff --git a/icon-themes/elementary_svg/cmd/sc_toolsmacroedit.svg b/icon-themes/elementary_svg/cmd/sc_basicideappear.svg similarity index 100% rename from icon-themes/elementary_svg/cmd/sc_toolsmacroedit.svg rename to icon-themes/elementary_svg/cmd/sc_basicideappear.svg ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 1 file changed, 8 deletions(-) New commits: commit daba09df247c09db715ca86a6b78365e49bfe034 Author: Jens Carl AuthorDate: Thu Jun 6 00:12:39 2019 -0700 Commit: Julien Nabet CommitDate: Fri Jun 7 06:50:54 2019 +0200 Remove .uno:ToolsMacroEdit command A search with git grep ".uno:ToolsMacroEdit" showed that the entry isn't used anywhere (also .uno:BasicIDEAppear provides a similar functionality). Change-Id: Ib97f4ebd6707d82f9077dd2f4e6c05e537f8154d Reviewed-on: https://gerrit.libreoffice.org/73582 Tested-by: Jenkins Reviewed-by: Julien Nabet Reviewed-by: andreas_kainz diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index ee1f797e7a1d..af45ccfc01a9 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4541,14 +4541,6 @@ 8 - - - Edit Macros - - - 1 - - Internet Options ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/dbmetadata.cxx | 25 +
1 file changed, 17 insertions(+), 8 deletions(-)
New commits:
commit af36ccc2143a7181964cc87077303ac5a5be205e
Author: Jens Carl
AuthorDate: Fri May 31 20:57:52 2019 +
Commit: Jens Carl
CommitDate: Sat Jun 1 21:31:00 2019 +0200
tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)
Replace OSL_VERIFY with if-statement and SAL_WARN.
Change-Id: Iccc7e079d9f8778060bbebba3f8e9204fc351d8e
Reviewed-on: https://gerrit.libreoffice.org/73289
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/connectivity/source/commontools/dbmetadata.cxx
b/connectivity/source/commontools/dbmetadata.cxx
index 4f4aa1e09353..026381e0377b 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include
@@ -278,7 +279,8 @@ namespace dbtools
bool restrict( false );
Any setting;
if ( lcl_getConnectionSetting( "EnableSQL92Check", *m_pImpl, setting )
)
-OSL_VERIFY( setting >>= restrict );
+if( ! (setting >>= restrict) )
+SAL_WARN("connectivity.commontools",
"restrictIdentifiersToSQL92: unable to assign EnableSQL92Check");
return restrict;
}
@@ -288,7 +290,8 @@ namespace dbtools
bool doGenerate( false );
Any setting;
if ( lcl_getConnectionSetting( "GenerateASBeforeCorrelationName",
*m_pImpl, setting ) )
-OSL_VERIFY( setting >>= doGenerate );
+if( ! (setting >>= doGenerate) )
+SAL_WARN("connectivity.commontools",
"generateASBeforeCorrelationName: unable to assign
GenerateASBeforeCorrelationName");
return doGenerate;
}
@@ -297,7 +300,8 @@ namespace dbtools
bool doGenerate( true );
Any setting;
if ( lcl_getConnectionSetting( "EscapeDateTime", *m_pImpl, setting ) )
-OSL_VERIFY( setting >>= doGenerate );
+if( ! (setting >>= doGenerate) )
+SAL_WARN("connectivity.commontools", "shouldEscapeDateTime:
unable to assign EscapeDateTime");
return doGenerate;
}
@@ -306,7 +310,8 @@ namespace dbtools
bool doSubstitute( true );
Any setting;
if ( lcl_getConnectionSetting( "ParameterNameSubstitution", *m_pImpl,
setting ) )
-OSL_VERIFY( setting >>= doSubstitute );
+if( ! (setting >>= doSubstitute) )
+SAL_WARN("connectivity.commontools",
"shouldSubstituteParameterNames: unable to assign ParameterNameSubstitution");
return doSubstitute;
}
@@ -315,7 +320,8 @@ namespace dbtools
bool is( true );
Any setting;
if ( lcl_getDriverSetting( "AutoIncrementIsPrimaryKey", *m_pImpl,
setting ) )
-OSL_VERIFY( setting >>= is );
+if( ! (setting >>= is) )
+SAL_WARN("connectivity.commontools",
"isAutoIncrementPrimaryKey: unable to assign AutoIncrementIsPrimaryKey");
return is;
}
@@ -324,7 +330,8 @@ namespace dbtools
sal_Int32 mode( BooleanComparisonMode::EQUAL_INTEGER );
Any setting;
if ( lcl_getConnectionSetting( "BooleanComparisonMode", *m_pImpl,
setting ) )
-OSL_VERIFY( setting >>= mode );
+if( ! (setting >>= mode) )
+SAL_WARN("connectivity.commontools",
"getBooleanComparisonMode: unable to assign BooleanComparisonMode");
return mode;
}
@@ -361,7 +368,8 @@ namespace dbtools
bool doGenerate( true );
Any setting;
if ( lcl_getConnectionSetting( "ColumnAliasInOrderBy", *m_pImpl,
setting ) )
-OSL_VERIFY( setting >>= doGenerate );
+if( ! (setting >>= doGenerate) )
+SAL_WARN("connectivity.commontools",
"supportsColumnAliasInOrderBy: unable to assign ColumnAliasInOrderBy");
return doGenerate;
}
@@ -401,7 +409,8 @@ namespace dbtools
#ifdef IMPLEMENTED_LATER
Any setting;
if ( lcl_getConnectionSetting( "DisplayEmptyTableFolders", *m_pImpl,
setting ) )
-OSL_VERIFY( setting >>= doDisplay );
+if( ! (setting >>= doDisplay) )
+SAL_WARN("connectivity.commontools",
"displayEmptyTableFolders: unable to assign DisplayEmptyTableFolders");
#else
try
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/flat/EConnection.cxx | 22 +-
1 file changed, 17 insertions(+), 5 deletions(-)
New commits:
commit d376c09f0100e6545b4804a6698bcc746ea9427c
Author: Jens Carl
AuthorDate: Tue May 28 17:36:48 2019 +
Commit: Stephan Bergmann
CommitDate: Wed May 29 09:14:01 2019 +0200
tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)
Replace OSL_VERIFY with if-statement and SAL_WARN.
Change-Id: Ib5459a365231514efa0e8a33a880857378cd239e
Reviewed-on: https://gerrit.libreoffice.org/73121
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/connectivity/source/drivers/flat/EConnection.cxx
b/connectivity/source/drivers/flat/EConnection.cxx
index ace657fd642d..8091c435ac4c 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
using namespace connectivity::flat;
using namespace connectivity::file;
@@ -67,29 +68,40 @@ void OFlatConnection::construct(const OUString& url,const
Sequence< PropertyValu
for(;pBegin != pEnd;++pBegin)
{
if(pBegin->Name == "HeaderLine")
-OSL_VERIFY( pBegin->Value >>= m_bHeaderLine );
+{
+if( ! (pBegin->Value >>= m_bHeaderLine) )
+SAL_WARN("connectivity.flat", "construct: unable to get
property HeaderLine");
+}
else if(pBegin->Name == "FieldDelimiter")
{
OUString aVal;
-OSL_VERIFY( pBegin->Value >>= aVal );
+if( ! (pBegin->Value >>= aVal) )
+SAL_WARN("connectivity.flat", "construct: unable to get
property FieldDelimiter");
+
m_cFieldDelimiter = aVal.toChar();
}
else if(pBegin->Name == "StringDelimiter")
{
OUString aVal;
-OSL_VERIFY( pBegin->Value >>= aVal );
+if( ! (pBegin->Value >>= aVal) )
+SAL_WARN("connectivity.flat", "construct: unable to get
property StringDelimiter");
+
m_cStringDelimiter = aVal.toChar();
}
else if(pBegin->Name == "DecimalDelimiter")
{
OUString aVal;
-OSL_VERIFY( pBegin->Value >>= aVal );
+if( ! (pBegin->Value >>= aVal) )
+SAL_WARN("connectivity.flat", "construct: unable to get
property DecimalDelimiter");
+
m_cDecimalDelimiter = aVal.toChar();
}
else if(pBegin->Name == "ThousandDelimiter")
{
OUString aVal;
-OSL_VERIFY( pBegin->Value >>= aVal );
+if( ! (pBegin->Value >>= aVal) )
+SAL_WARN("connectivity.flat", "construct: unable to get
property ThousandDelimiter");
+
m_cThousandDelimiter = aVal.toChar();
}
else if ( pBegin->Name == "MaxRowScan" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gdb
solenv/gdb/six.py | 536 +-
1 file changed, 456 insertions(+), 80 deletions(-)
New commits:
commit 1c7a2eff17f09feaa2709eaab60855f8e1aa7469
Author: Jens Carl
AuthorDate: Mon May 27 20:17:24 2019 +
Commit: Michael Stahl
CommitDate: Tue May 28 11:30:06 2019 +0200
six: upgrade release to 1.12.0 used by gdb
Change-Id: I816ccde944903e0ff3ac23e92632056a3192b060
Reviewed-on: https://gerrit.libreoffice.org/73069
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/solenv/gdb/six.py b/solenv/gdb/six.py
index 85898ec71275..47ecf52bd2d5 100644
--- a/solenv/gdb/six.py
+++ b/solenv/gdb/six.py
@@ -1,6 +1,4 @@
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-# Copyright (c) 2010-2013 Benjamin Peterson
+# Copyright (c) 2010-2018 Benjamin Peterson
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +18,24 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+from __future__ import absolute_import
+
+import functools
+import itertools
import operator
import sys
import types
__author__ = "Benjamin Peterson "
-__version__ = "1.4.1"
+__version__ = "1.12.0"
# Useful for very coarse version differentiation.
PY2 = sys.version_info[0] == 2
PY3 = sys.version_info[0] == 3
+PY34 = sys.version_info[0:2] >= (3, 4)
if PY3:
string_types = str,
@@ -53,6 +58,7 @@ else:
else:
# It's possible to have sizeof(long) != sizeof(Py_ssize_t).
class X(object):
+
def __len__(self):
return 1 << 31
try:
@@ -84,9 +90,13 @@ class _LazyDescr(object):
def __get__(self, obj, tp):
result = self._resolve()
-setattr(obj, self.name, result)
-# This is a bit ugly, but it avoids running this again.
-delattr(tp, self.name)
+setattr(obj, self.name, result) # Invokes __set__.
+try:
+# This is a bit ugly, but it avoids running this again by
+# removing this descriptor.
+delattr(obj.__class__, self.name)
+except AttributeError:
+pass
return result
@@ -104,6 +114,27 @@ class MovedModule(_LazyDescr):
def _resolve(self):
return _import_module(self.mod)
+def __getattr__(self, attr):
+_module = self._resolve()
+value = getattr(_module, attr)
+setattr(self, attr, value)
+return value
+
+
+class _LazyModule(types.ModuleType):
+
+def __init__(self, name):
+super(_LazyModule, self).__init__(name)
+self.__doc__ = self.__class__.__doc__
+
+def __dir__(self):
+attrs = ["__doc__", "__name__"]
+attrs += [attr.name for attr in self._moved_attributes]
+return attrs
+
+# Subclasses should override this
+_moved_attributes = []
+
class MovedAttribute(_LazyDescr):
@@ -130,9 +161,75 @@ class MovedAttribute(_LazyDescr):
return getattr(module, self.attr)
+class _SixMetaPathImporter(object):
+
+"""
+A meta path importer to import six.moves and its submodules.
+
+This class implements a PEP302 finder and loader. It should be compatible
+with Python 2.5 and all existing versions of Python3
+"""
+
+def __init__(self, six_module_name):
+self.name = six_module_name
+self.known_modules = {}
+
+def _add_module(self, mod, *fullnames):
+for fullname in fullnames:
+self.known_modules[self.name + "." + fullname] = mod
+
+def _get_module(self, fullname):
+return self.known_modules[self.name + "." + fullname]
+
+def find_module(self, fullname, path=None):
+if fullname in self.known_modules:
+return self
+return None
+
+def __get_module(self, fullname):
+try:
+return self.known_modules[fullname]
+except KeyError:
+raise ImportError("This loader does not know module " + fullname)
+
+def load_module(self, fullname):
+try:
+# in case of a reload
+return sys.modules[fullname]
+except KeyError:
+pass
+mod = self.__get_module(fullname)
+if isinstance(mod, MovedModule):
+mod = mod._resolve()
+else:
+mod.__loader__ = self
+sys.modules[fullname] = mod
+return mod
+
+def is_package(self, fullname):
+"""
+Return true, if the named module is a package.
+
+We need this method to get correct spec objects with
+Python 3.4 (see PEP451)
+"""
+return hasattr(self.__get_module(fullname), "__path__")
+
+def get_code(self, fullname):
+"""Return None
+
+Required, if is_package is implemented"""
+
[Libreoffice-commits] core.git: solenv/gdb
solenv/gdb/autoload.template | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 84d8b0b7c442490a00925073950fb07d834eaf97
Author: Jens Carl
AuthorDate: Wed May 15 10:11:47 2019 -0700
Commit: Michael Stahl
CommitDate: Thu May 16 11:23:00 2019 +0200
Make gdb autoload template more pythonic
Replace vim modeline with Python specific one to avoid problems with
tabs and spaces, and also make code more pythonic.
Change-Id: Ia0959787ceea740b5c97f500c60ef423fbed0651
Reviewed-on: https://gerrit.libreoffice.org/72375
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/solenv/gdb/autoload.template b/solenv/gdb/autoload.template
index 816380e5cf8e..fdbcce200233 100644
--- a/solenv/gdb/autoload.template
+++ b/solenv/gdb/autoload.template
@@ -1,4 +1,4 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
#
# This file is part of the LibreOffice project.
#
@@ -7,20 +7,20 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+import importlib
import os.path
import sys
-import importlib
import gdb
-pythondir = os.path.normpath('%PYTHONDIR%')
+PP_PATH = os.path.normpath('%PYTHONDIR%')
if gdb.current_objfile():
-if pythondir not in sys.path:
-sys.path.insert(0, pythondir)
+if PP_PATH not in sys.path:
+sys.path.insert(0, PP_PATH)
-for mod in str.split("%MODULES%"):
-module=importlib.import_module("libreoffice."+mod)
+for mod in '%MODULES%'.split():
+module = importlib.import_module('libreoffice.' + mod)
module.register_pretty_printers(gdb.current_objfile())
try:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/definitioncolumn.cxx | 47 ++
1 file changed, 34 insertions(+), 13 deletions(-)
New commits:
commit 48ee3cce67d028d6e6e97405f6add22a80a3fc98
Author: Jens Carl
AuthorDate: Tue May 14 20:37:47 2019 -0700
Commit: Stephan Bergmann
CommitDate: Thu May 16 08:30:11 2019 +0200
tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)
Replace OSL_VERIFY with if-statement and SAL_WARN.
Change-Id: Ib286a2151fe19a91b4e9db8db9f92ac0d5264d36
Reviewed-on: https://gerrit.libreoffice.org/72330
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx
b/dbaccess/source/core/api/definitioncolumn.cxx
index af31bcfde41b..520d8ca50958 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
@@ -172,20 +173,36 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet
>& _rxParserColumn, co
registerProperty( PROPERTY_LABEL, PROPERTY_ID_LABEL, nPropAttr, _sLabel,
cppu::UnoType::get() );
-OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_TYPENAME ) >>=
m_aTypeName );
-OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_ISNULLABLE ) >>=
m_nIsNullable );
-OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_PRECISION ) >>=
m_nPrecision );
-OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_SCALE ) >>=
m_nScale );
-OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_TYPE ) >>= m_nType
);
-OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_ISAUTOINCREMENT )
>>= m_bAutoIncrement );
-OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_ISCURRENCY ) >>=
m_bCurrency );
-OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_NAME ) >>= m_sName
);
+if( ! (_rxParserColumn->getPropertyValue( PROPERTY_TYPENAME ) >>=
m_aTypeName) )
+SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property "
PROPERTY_TYPENAME);
+
+if( ! (_rxParserColumn->getPropertyValue( PROPERTY_ISNULLABLE ) >>=
m_nIsNullable) )
+SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property "
PROPERTY_ISNULLABLE);
+
+if( ! (_rxParserColumn->getPropertyValue( PROPERTY_PRECISION ) >>=
m_nPrecision) )
+SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property "
PROPERTY_PRECISION);
+
+if( ! (_rxParserColumn->getPropertyValue( PROPERTY_SCALE ) >>= m_nScale) )
+SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property "
PROPERTY_SCALE);
+
+if( ! (_rxParserColumn->getPropertyValue( PROPERTY_TYPE ) >>= m_nType) )
+SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property "
PROPERTY_TYPE);
+
+if( ! (_rxParserColumn->getPropertyValue( PROPERTY_ISAUTOINCREMENT ) >>=
m_bAutoIncrement) )
+SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property "
PROPERTY_ISAUTOINCREMENT);
+
+if( ! (_rxParserColumn->getPropertyValue( PROPERTY_ISCURRENCY ) >>=
m_bCurrency) )
+SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property "
PROPERTY_ISCURRENCY);
+
+if( ! (_rxParserColumn->getPropertyValue( PROPERTY_NAME ) >>= m_sName) )
+SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property "
PROPERTY_NAME);
m_bRowVersion = false;
Reference< XPropertySetInfo > xPSI( _rxParserColumn->getPropertySetInfo(),
UNO_SET_THROW );
if ( xPSI->hasPropertyByName( PROPERTY_DEFAULTVALUE ) )
-OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_DEFAULTVALUE )
>>= m_aDefaultValue );
+if( ! (_rxParserColumn->getPropertyValue( PROPERTY_DEFAULTVALUE ) >>=
m_aDefaultValue) )
+SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property "
PROPERTY_DEFAULTVALUE);
// copy some optional properties from the parser column
struct PropertyDescriptor
@@ -230,9 +247,12 @@ Reference< XPropertySet >
OQueryColumn::impl_determineOriginalTableColumn( const
// determine the composed table name, plus the column name, as
indicated by the
// respective properties
OUString sCatalog, sSchema, sTable;
-OSL_VERIFY( getPropertyValue( PROPERTY_CATALOGNAME ) >>= sCatalog );
-OSL_VERIFY( getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema );
-OSL_VERIFY( getPropertyValue( PROPERTY_TABLENAME ) >>= sTable );
+if( ! (getPropertyValue( PROPERTY_CATALOGNAME ) >>= sCatalog) )
+SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn:
unable to get property " PROPERTY_CATALOGNAME);
+if( ! (getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema) )
+SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn:
unable to get property " PROPERTY_SCHEMANAME);
+if( ! (getPropertyValue( PROPERTY_TABLENAME ) >>= sTable) )
+SAL_WARN("dbaccess.core",
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/odbc/OConnection.cxx | 43 +--
1 file changed, 32 insertions(+), 11 deletions(-)
New commits:
commit 19573d94074a3ce296bacf35a21242ff8b75cad4
Author: Jens Carl
AuthorDate: Sat May 11 10:30:57 2019 -0700
Commit: Stephan Bergmann
CommitDate: Tue May 14 10:24:47 2019 +0200
tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)
Replace OSL_VERIFY with if-statement and SAL_WARN.
Change-Id: Icf6a0b81aca489b25520c9f6837d1b482179cad5
Reviewed-on: https://gerrit.libreoffice.org/72155
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx
b/connectivity/source/drivers/odbc/OConnection.cxx
index b385538d8da0..f024e156c597 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -31,6 +31,8 @@
#include
#include
+#include
+
#include
using namespace connectivity::odbc;
@@ -185,49 +187,68 @@ SQLRETURN OConnection::Construct(const OUString&
url,const Sequence< PropertyVal
for(;pBegin != pEnd;++pBegin)
{
if( pBegin->Name == "Timeout")
-OSL_VERIFY( pBegin->Value >>= nTimeout );
+{
+if( ! (pBegin->Value >>= nTimeout) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property Timeout");
+}
else if( pBegin->Name == "Silent")
-OSL_VERIFY( pBegin->Value >>= bSilent );
+{
+if( ! (pBegin->Value >>= bSilent) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property Silent");
+}
else if( pBegin->Name == "IgnoreDriverPrivileges")
-OSL_VERIFY( pBegin->Value >>= m_bIgnoreDriverPrivileges );
+{
+if( ! (pBegin->Value >>= m_bIgnoreDriverPrivileges) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property IgnoreDriverPrivileges");
+}
else if( pBegin->Name == "PreventGetVersionColumns")
-OSL_VERIFY( pBegin->Value >>= m_bPreventGetVersionColumns );
+{
+if( ! (pBegin->Value >>= m_bPreventGetVersionColumns) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property PreventGetVersionColumns");
+}
else if( pBegin->Name == "IsAutoRetrievingEnabled")
{
bool bAutoRetrievingEnabled = false;
-OSL_VERIFY( pBegin->Value >>= bAutoRetrievingEnabled );
+if( ! (pBegin->Value >>= bAutoRetrievingEnabled) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property IsAutoRetrievingEnabled");
enableAutoRetrievingEnabled(bAutoRetrievingEnabled);
}
else if( pBegin->Name == "AutoRetrievingStatement")
{
OUString sGeneratedValueStatement;
-OSL_VERIFY( pBegin->Value >>= sGeneratedValueStatement );
+if( ! (pBegin->Value >>= sGeneratedValueStatement) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property AutoRetrievingStatement");
setAutoRetrievingStatement(sGeneratedValueStatement);
}
else if( pBegin->Name == "user")
{
-OSL_VERIFY( pBegin->Value >>= aUID );
+if( ! (pBegin->Value >>= aUID) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property user");
aDSN = aDSN + ";UID=" + aUID;
}
else if( pBegin->Name == "password")
{
-OSL_VERIFY( pBegin->Value >>= aPWD );
+if( ! (pBegin->Value >>= aPWD) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property password");
aDSN = aDSN + ";PWD=" + aPWD;
}
else if( pBegin->Name == "UseCatalog")
{
- OSL_VERIFY( pBegin->Value >>= m_bUseCatalog );
+ if( !( pBegin->Value >>= m_bUseCatalog) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property UseCatalog");
}
else if( pBegin->Name == "SystemDriverSettings")
{
-OSL_VERIFY( pBegin->Value >>= aSysDrvSettings );
+if( ! (pBegin->Value >>= aSysDrvSettings) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property SystemDriverSettings");
aDSN += ";";
aDSN += aSysDrvSettings;
}
else if( pBegin->Name == "CharSet")
{
OUString sIanaName;
-OSL_VERIFY( pBegin->Value >>= sIanaName );
+if( ! (pBegin->Value >>= sIanaName) )
+SAL_WARN("connectivity.odbc", "Construct: unable to get
property CharSet");
::dbtools::OCharsetMap aLookupIanaName;
::dbtools::OCharsetMap::const_iterator aLookup =
aLookupIanaName.findIanaName(sIanaName);
___
Libreoffice-commits mailing
[Libreoffice-commits] core.git: extensions/source
extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit c338638eeabbc959a4d71e04774365e628a093c2
Author: Jens Carl
AuthorDate: Wed May 8 00:01:38 2019 -0700
Commit: Stephan Bergmann
CommitDate: Thu May 9 20:08:21 2019 +0200
tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)
Replace OSL_VERIFY with if-statement and SAL_WARN.
Change-Id: Ibeef67f21dc9e18d3bc614cb838a6188bb58fff2
Reviewed-on: https://gerrit.libreoffice.org/72025
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index 3a2390b26845..00814017184b 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include "MasterDetailLinkDialog.hxx"
@@ -112,27 +113,32 @@ namespace pcr
{
if (aProperty.Name == "Detail")
{
-OSL_VERIFY( aProperty.Value >>= m_xDetail );
+if ( ! (aProperty.Value >>= m_xDetail) )
+SAL_WARN("extensions.propctrlr", "implInitialize: unable
to get property Detail");
return;
}
else if (aProperty.Name == "Master")
{
-OSL_VERIFY( aProperty.Value >>= m_xMaster );
+if ( ! (aProperty.Value >>= m_xMaster) )
+SAL_WARN("extensions.propctrlr", "implInitialize: unable
to get property Master");
return;
}
else if (aProperty.Name == "Explanation")
{
-OSL_VERIFY( aProperty.Value >>= m_sExplanation );
+if ( ! (aProperty.Value >>= m_sExplanation) )
+SAL_WARN("extensions.propctrlr", "implInitialize: unable
to get property Explanation");
return;
}
else if (aProperty.Name == "DetailLabel")
{
-OSL_VERIFY( aProperty.Value >>= m_sDetailLabel );
+if ( ! (aProperty.Value >>= m_sDetailLabel) )
+SAL_WARN("extensions.propctrlr", "implInitialize: unable
to get property DetailLabel");
return;
}
else if (aProperty.Name == "MasterLabel")
{
-OSL_VERIFY( aProperty.Value >>= m_sMasterLabel );
+if ( ! (aProperty.Value >>= m_sMasterLabel) )
+SAL_WARN("extensions.propctrlr", "implInitialize: unable
to get property MasterLabel");
return;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_commontools.mk
connectivity/CppunitTest_connectivity_commontools.mk | 46 ++- 1 file changed, 6 insertions(+), 40 deletions(-) New commits: commit 43249c07adaf3f66bf47193c7aa08b941751e8d5 Author: Jens Carl AuthorDate: Tue May 7 09:13:18 2019 -0700 Commit: Michael Stahl CommitDate: Thu May 9 11:13:26 2019 +0200 Clean up makefile (remove some cargo-cult copied stuff) Change-Id: Iafbb69a405a3c9ee8d0ae7dbe8a24a75d237519d Reviewed-on: https://gerrit.libreoffice.org/71924 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index 80e5d1ce5277..15a9d7e4633e 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -17,56 +17,22 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_commontools,\ $(eval $(call gb_CppunitTest_use_ure,connectivity_commontools)) $(eval $(call gb_CppunitTest_use_vcl,connectivity_commontools)) -$(eval $(call gb_CppunitTest_use_external,connectivity_commontools,boost_headers)) - $(eval $(call gb_CppunitTest_use_sdk_api,connectivity_commontools)) -ifeq ($(COM),GCC) -ifneq ($(COM_IS_CLANG),TRUE) -$(eval $(call gb_CppunitTest_add_cxxflags,connectivity_commontools,\ - -fpermissive \ -)) -endif -endif - -# In mergedlibs mode we have multiply-defined symbols, which Visual Studio -# does not like. There is no good solution, so just force it. -ifeq ($(COM),MSC) -ifneq (,$(MERGELIBS)) -$(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\ -/FORCE:MULTIPLE \ -)) -endif -endif - $(eval $(call gb_CppunitTest_add_exception_objects,connectivity_commontools, \ connectivity/qa/connectivity/commontools/FValue_test \ )) -$(eval $(call gb_CppunitTest_use_library_objects,connectivity_commontools,dbtools)) - $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \ -comphelper \ -cppu \ -cppuhelper \ -i18nlangtag \ -$(if $(ENABLE_JAVA), \ -jvmaccess) \ -sal \ -salhelper \ -test \ -unotest \ -utl \ -tl \ -svt \ -vcl \ + cppu \ + dbtools \ + sal \ + test \ + unotest \ )) $(eval $(call gb_CppunitTest_use_components,connectivity_commontools,\ -configmgr/source/configmgr \ -i18npool/util/i18npool \ -ucb/source/core/ucb1 \ -ucb/source/ucp/file/ucpfile1 \ + configmgr/source/configmgr \ )) $(eval $(call gb_CppunitTest_use_configuration,connectivity_commontools)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/uiconfig dbaccess/uiconfig extensions/uiconfig reportdesign/uiconfig sd/uiconfig starmath/uiconfig
chart2/uiconfig/menubar/menubar.xml |2 ++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml |2 +- extensions/uiconfig/sbibliography/menubar/menubar.xml |4 reportdesign/uiconfig/dbreport/menubar/menubar.xml|5 - sd/uiconfig/sdraw/menubar/menubar.xml |3 ++- sd/uiconfig/simpress/menubar/menubar.xml |3 ++- starmath/uiconfig/smath/menubar/menubar.xml |4 7 files changed, 19 insertions(+), 4 deletions(-) New commits: commit 62b7faa167162b5e35746c546be1a758dd8f29d2 Author: Jens Carl AuthorDate: Sun May 5 11:15:39 2019 -0700 Commit: andreas_kainz CommitDate: Thu May 9 09:38:37 2019 +0200 Related tdf#38889: Sync sub menus Tools > Macros Synchronize sub menu Tools > Macros by adding "Edit Macros" across the different applications menus. Change-Id: I16185034955d889afe8a508a3522bb0a63f29545 Reviewed-on: https://gerrit.libreoffice.org/71827 Reviewed-by: Heiko Tietze Tested-by: andreas_kainz diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 105d8c4fae7c..d3dbf57b54a5 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -139,6 +139,8 @@ + + diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index 7753a9d57b7d..31c3f1c06d44 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -59,7 +59,7 @@ - 2 + diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml index 898d893a18b9..e3b241e1131d 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml @@ -34,9 +34,13 @@ + + + + diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index 2bd3344fd94a..28e2847610ba 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -251,10 +251,13 @@ + - + + + diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 402362960937..0815d8595b28 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -612,9 +612,10 @@ + - + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 05288f9c14ba..1aaa09786d0c 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -640,9 +640,10 @@ + - + diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 7e90d811c5c2..343a634bb1f2 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -127,9 +127,13 @@ + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal toolkit/source
include/sal/log-areas.dox |1
toolkit/source/helper/formpdfexport.cxx | 70 +---
2 files changed, 49 insertions(+), 22 deletions(-)
New commits:
commit bfdb5a2d96483907cd4b757398b3df159a9e7af2
Author: Jens Carl
AuthorDate: Tue May 7 08:56:00 2019 -0700
Commit: Stephan Bergmann
CommitDate: Wed May 8 08:23:16 2019 +0200
tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)
Replace OSL_VERIFY with if-statement and SAL_WARN.
Change-Id: I356a875e1364f3d16f562f3cfa0b41e0939e43d5
Reviewed-on: https://gerrit.libreoffice.org/71923
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d72710a1f79e..1f007b0c2944 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -405,6 +405,7 @@ certain functionality.
@li @c toolkit
@li @c toolkit.controls
+@li @c toolkit.helper
@section tools
diff --git a/toolkit/source/helper/formpdfexport.cxx
b/toolkit/source/helper/formpdfexport.cxx
index 796de3d56a2a..24cd1e02ccf6 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -78,7 +78,9 @@ namespace toolkitform
xPSI = _rxModel->getPropertySetInfo();
if ( xPSI.is() && xPSI->hasPropertyByName( FM_PROP_CLASSID ) )
{
-OSL_VERIFY( _rxModel->getPropertyValue( FM_PROP_CLASSID ) >>=
nControlType );
+if( ! (_rxModel->getPropertyValue( FM_PROP_CLASSID ) >>=
nControlType) ) {
+SAL_WARN("toolkit.helper", "classifyFormControl: unable to
get property " << FM_PROP_CLASSID);
+}
}
return nControlType;
@@ -233,7 +235,7 @@ namespace toolkitform
DBG_UNHANDLED_EXCEPTION("toolkit");
}
}
-SAL_WARN("toolkit","determineRadioGroupId: did not
find the radios element's group!" );
+SAL_WARN("toolkit.helper","determineRadioGroupId: did
not find the radios element's group!" );
}
}
@@ -268,7 +270,9 @@ namespace toolkitform
void getStringItemVector( const Reference< XPropertySet >& _rxModel,
::std::vector< OUString >& _rVector )
{
Sequence< OUString > aListEntries;
-OSL_VERIFY( _rxModel->getPropertyValue( "StringItemList" ) >>=
aListEntries );
+if( ! (_rxModel->getPropertyValue( "StringItemList" ) >>=
aListEntries) ) {
+SAL_WARN("toolkit.helper", "getStringItemVector: unable to get
property StringItemList");
+}
::std::copy( aListEntries.begin(), aListEntries.end(),
::std::back_insert_iterator< ::std::vector< OUString
> >( _rVector ) );
}
@@ -305,8 +309,12 @@ namespace toolkitform
// Name, Description, Text
-OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_NAME ) >>=
Descriptor->Name );
-OSL_VERIFY( xModelProps->getPropertyValue( "HelpText" ) >>=
Descriptor->Description );
+if( ! (xModelProps->getPropertyValue( FM_PROP_NAME ) >>=
Descriptor->Name) ) {
+SAL_WARN("toolkit.helper", "describePDFControl: unable to get
property " << FM_PROP_NAME);
+}
+if( ! (xModelProps->getPropertyValue( "HelpText" ) >>=
Descriptor->Description) ) {
+SAL_INFO("toolkit.helper", "describePDFControl: unable to get
property HelpText");
+}
Any aText;
static const char FM_PROP_TEXT[] = "Text";
static const char FM_PROP_LABEL[] = "Label";
@@ -314,14 +322,18 @@ namespace toolkitform
aText = xModelProps->getPropertyValue( FM_PROP_TEXT );
else if ( xPSI->hasPropertyByName( FM_PROP_LABEL ) )
aText = xModelProps->getPropertyValue( FM_PROP_LABEL );
-if ( aText.hasValue() )
-OSL_VERIFY( aText >>= Descriptor->Text );
+if ( aText.hasValue() ) {
+if( ! (aText >>= Descriptor->Text) ) {
+SAL_WARN("toolkit.helper", "describePDFControl: unable to
assign aText to Descriptor->Text");
+}
+}
// readonly
static const char FM_PROP_READONLY[] = "ReadOnly";
if ( xPSI->hasPropertyByName( FM_PROP_READONLY ) )
-OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_READONLY )
>>= Descriptor->ReadOnly );
+if( ! (xModelProps->getPropertyValue( FM_PROP_READONLY ) >>=
Descriptor->ReadOnly) )
+SAL_WARN("toolkit.helper", "describePDFControl: unable to
get property " << FM_PROP_READONLY);
// border
@@ -330,7 +342,8 @@ namespace toolkitform
if ( xPSI->hasPropertyByName( FM_PROP_BORDER ) )
[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_sharedresources.mk connectivity/Module_connectivity.mk connectivity/qa connectivity/source include/sal
connectivity/CppunitTest_connectivity_sharedresources.mk | 41 +++
connectivity/Module_connectivity.mk|1
connectivity/qa/connectivity/resource/sharedresources_test.cxx | 107
++
connectivity/source/resource/sharedresources.cxx | 22 +-
include/sal/log-areas.dox |1
5 files changed, 165 insertions(+), 7 deletions(-)
New commits:
commit 187174d5c18f80f2e6fe03355379e5e14117791e
Author: Jens Carl
AuthorDate: Thu May 2 13:48:20 2019 -0700
Commit: Stephan Bergmann
CommitDate: Tue May 7 15:47:22 2019 +0200
tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)
Replace OSL_VERIFY with if-statement and SAL_WARN and add some unit
tests to ensure the implementation works and the replacements don't
introduce some side effects.
Change-Id: I4ed50eee53e4dba4d392ed2486186d48f919ce1d
Reviewed-on: https://gerrit.libreoffice.org/71712
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/connectivity/CppunitTest_connectivity_sharedresources.mk
b/connectivity/CppunitTest_connectivity_sharedresources.mk
new file mode 100644
index ..78209cfbbdf0
--- /dev/null
+++ b/connectivity/CppunitTest_connectivity_sharedresources.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column:
100 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,connectivity_sharedresources))
+
+$(eval $(call gb_CppunitTest_set_include,connectivity_sharedresources,\
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,connectivity_sharedresources))
+$(eval $(call gb_CppunitTest_use_vcl,connectivity_sharedresources))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,connectivity_sharedresources))
+
+$(eval $(call
gb_CppunitTest_add_exception_objects,connectivity_sharedresources, \
+ connectivity/qa/connectivity/resource/sharedresources_test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,connectivity_sharedresources, \
+ dbtools \
+ sal \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_use_components,connectivity_sharedresources,\
+configmgr/source/configmgr \
+i18npool/util/i18npool \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,connectivity_sharedresources))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk
b/connectivity/Module_connectivity.mk
index a604345a4735..1a29e0798948 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -140,6 +140,7 @@ endif
# general tests
$(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_commontools \
+ CppunitTest_connectivity_sharedresources \
))
endif
diff --git a/connectivity/qa/connectivity/resource/sharedresources_test.cxx
b/connectivity/qa/connectivity/resource/sharedresources_test.cxx
new file mode 100644
index ..2ef68eca8be8
--- /dev/null
+++ b/connectivity/qa/connectivity/resource/sharedresources_test.cxx
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+using namespace css;
+
+namespace connectivity_test
+{
+#define TEST_SOURCE_STRING NC_("TEST_SOURCE_STRING", "UnitTest")
+#define TEST_SOURCE_ONE_SUBSTITUTION NC_("TEST_SOURCE_ONE_SUBSTITUTION", "One
substitution $sub$")
+#define TEST_SOURCE_TWO_SUBSTITUTION
\
+NC_("TEST_SOURCE_TWO_SUBSTITUTION", "Two substitution $sub0$ $sub1$")
+#define TEST_SOURCE_THREE_SUBSTITUTION
\
+NC_("TEST_SOURCE_THREE_SUBSTITUTION", "Three substitution $sub0$ $sub1$
$sub2$")
+
+class SharedResourcesTest : public test::BootstrapFixture
+{
+public:
+SharedResourcesTest();
+
+void testGetSourceString();
+void testGetSourceStringWithSubstitutionOne();
+void testGetSourceStringWithSubstitutionTwo();
+void testGetSourceStringWithSubstitutionThree();
+void testGetSourceStringWithSubstitutionVector();
+
+CPPUNIT_TEST_SUITE(SharedResourcesTest);
+
+CPPUNIT_TEST(testGetSourceString);
+CPPUNIT_TEST(testGetSourceStringWithSubstitutionOne);
+
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/source
include/test/lang/xcomponent.hxx |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv |3 -
sc/qa/extras/scshapeobj.cxx| 26 -
test/source/lang/xcomponent.cxx| 10 +
4 files changed, 27 insertions(+), 13 deletions(-)
New commits:
commit 35608a192df5529d8a0df4ad2f6bce42fc64a9ab
Author: Jens Carl
AuthorDate: Sat May 4 06:27:17 2019 +
Commit: Jens Carl
CommitDate: Sat May 4 17:37:47 2019 +0200
tdf#45904 Move XComponent Java tests to C++
Move XComponent Java tests to C++ for ScShapeObj.
Change-Id: Ib692827729dbe38eaceb76aa042d76e14d9614f8
Reviewed-on: https://gerrit.libreoffice.org/71787
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/lang/xcomponent.hxx b/include/test/lang/xcomponent.hxx
index 347a36e2925c..fdbeccc6cf7b 100644
--- a/include/test/lang/xcomponent.hxx
+++ b/include/test/lang/xcomponent.hxx
@@ -26,6 +26,7 @@ public:
void testAddEventListener();
void testRemoveEventListener();
+void testDispose();
void testDisposedByDesktopTerminate();
protected:
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
index e7385e4ec6f7..47138b49c5ea 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
@@ -1,6 +1,3 @@
-"ScShapeObj";"com::sun::star::lang::XComponent";"dispose()"
-"ScShapeObj";"com::sun::star::lang::XComponent";"addEventListener()"
-"ScShapeObj";"com::sun::star::lang::XComponent";"removeEventListener()"
"ScShapeObj";"com::sun::star::drawing::Shape";"ZOrder#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"LayerID#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"LayerName#optional"
diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx
index 279b07dead3d..2a1bebb1 100644
--- a/sc/qa/extras/scshapeobj.cxx
+++ b/sc/qa/extras/scshapeobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
@@ -25,17 +26,17 @@
#include
using namespace css;
-using namespace css::uno;
namespace sc_apitest
{
-class ScShapeObj : public CalcUnoApiTest, public apitest::Shape
+class ScShapeObj : public CalcUnoApiTest, public apitest::Shape, public
apitest::XComponent
{
public:
ScShapeObj();
virtual uno::Reference init() override;
virtual uno::Reference getXSheetDocument() override;
+virtual void triggerDesktopTerminate() override{};
virtual void setUp() override;
virtual void tearDown() override;
@@ -45,6 +46,11 @@ public:
CPPUNIT_TEST(testShapePropertiesAnchor);
CPPUNIT_TEST(testShapePropertiesPosition);
+// XComponent
+CPPUNIT_TEST(testAddEventListener);
+CPPUNIT_TEST(testDispose);
+CPPUNIT_TEST(testRemoveEventListener);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -58,18 +64,18 @@ ScShapeObj::ScShapeObj()
uno::Reference ScShapeObj::init()
{
-uno::Reference xDoc(mxComponent,
UNO_QUERY_THROW);
+uno::Reference xDoc(mxComponent,
uno::UNO_QUERY_THROW);
-uno::Reference xMSF(xDoc, UNO_QUERY_THROW);
+uno::Reference xMSF(xDoc,
uno::UNO_QUERY_THROW);
uno::Reference xShape(
-xMSF->createInstance("com.sun.star.drawing.RectangleShape"),
UNO_QUERY_THROW);
+xMSF->createInstance("com.sun.star.drawing.RectangleShape"),
uno::UNO_QUERY_THROW);
xShape->setPosition(awt::Point(5000, 3500));
xShape->setSize(awt::Size(7500, 5000));
-uno::Reference xDPS(xDoc, UNO_QUERY_THROW);
+uno::Reference xDPS(xDoc,
uno::UNO_QUERY_THROW);
uno::Reference xDrawPages = xDPS->getDrawPages();
-uno::Reference xDrawPage(xDrawPages->getByIndex(0),
UNO_QUERY_THROW);
-uno::Reference xShapes(xDrawPage, UNO_QUERY_THROW);
+uno::Reference xDrawPage(xDrawPages->getByIndex(0),
uno::UNO_QUERY_THROW);
+uno::Reference xShapes(xDrawPage, uno::UNO_QUERY_THROW);
xShapes->add(xShape);
for (auto i = 0; i < 10; i++)
@@ -84,7 +90,7 @@ uno::Reference ScShapeObj::init()
uno::Reference ScShapeObj::getXSheetDocument()
{
-uno::Reference xDoc(mxComponent,
UNO_QUERY_THROW);
+uno::Reference xDoc(mxComponent,
uno::UNO_QUERY_THROW);
return xDoc;
}
@@ -103,7 +109,7 @@ void ScShapeObj::tearDown()
CPPUNIT_TEST_SUITE_REGISTRATION(ScShapeObj);
-} // end namespace
+} // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/test/source/lang/xcomponent.cxx b/test/source/lang/xcomponent.cxx
index 386fa45f232f..ef0049d5953c 100644
--- a/test/source/lang/xcomponent.cxx
+++ b/test/source/lang/xcomponent.cxx
@@ -57,6 +57,16 @@ void XComponent::testRemoveEventListener()
CPPUNIT_ASSERT_EQUAL(false,
pListenerAddedAndRemoved->m_hasDisposingCalled);
}
+void XComponent::testDispose()
+{
+Reference xComponent(init(), uno::UNO_QUERY_THROW);
+auto
[Libreoffice-commits] core.git: sc/qa
sc/qa/unoapi/knownissues.xcl | 30 -- 1 file changed, 30 deletions(-) New commits: commit 0d2252b2a975c0b4113fbef47881932120e881b4 Author: Jens Carl AuthorDate: Fri May 3 21:52:16 2019 + Commit: Jens Carl CommitDate: Sat May 4 08:12:52 2019 +0200 Related tdf#45904: Remove already converted tests Change-Id: I86da1a0d85e2c08e654877b66c733f7548c29397 Reviewed-on: https://gerrit.libreoffice.org/71771 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/sc/qa/unoapi/knownissues.xcl b/sc/qa/unoapi/knownissues.xcl index ca1efe74688c..7da16e74cf43 100644 --- a/sc/qa/unoapi/knownissues.xcl +++ b/sc/qa/unoapi/knownissues.xcl @@ -19,12 +19,6 @@ ### i84702 ### sc.AccessibleEditableTextPara_PreviewCell::com::sun::star::accessibility::XAccessibleEditableText -### i84701 ### -sc.ScAreaLinksObj::com::sun::star::sheet::XAreaLinks - -### i84711 ### -sc.ScAreaLinkObj::com::sun::star::util::XRefreshable - ### i84674 ### sc.ScCellTextCursor::com::sun::star::beans::XMultiPropertyStates sc.ScHeaderFooterTextCursor::com::sun::star::beans::XMultiPropertyStates @@ -45,8 +39,6 @@ sc.ScTableSheetObj::com::sun::star::sheet::XCellRangeData sc.ScTabViewObj::com::sun::star::sheet::XRangeSelection ### i23594 ### -sc.ScAutoFormatsObj::com::sun::star::container::XNameReplace -sc.ScStyleFamilyObj::com::sun::star::container::XNameReplace sc.ScTableSheetsObj::com::sun::star::container::XNameReplace ### i31378 ### @@ -64,9 +56,6 @@ sc.ScTableSheetObj::com::sun::star::sheet::XPrintAreas ### i42534 ### sc.ScAccessibleDocument::com::sun::star::accessibility::XAccessibleSelection -### i46730 ### -sc.ScDataPilotFieldGroupObj::com::sun::star::container::XNameAccess - ### i53606 ### sc.ScTabViewObj::com::sun::star::awt::XUserInputInterception @@ -107,9 +96,6 @@ sc.ScAnnotationShapeObj::com::sun::star::drawing::FillProperties ### i84727 ### sc.ScAccessibleCsvGrid::com::sun::star::accessibility::XAccessibleTable -### i84761 ### -sc.ScRecentFunctionsObj::com::sun::star::sheet::XRecentFunctions - ### i85566 ### sc.ScStyleObj::com::sun::star::style::Style @@ -124,10 +110,6 @@ sc.AccessibleEditableTextPara_PreviewNote sc.ScAccessibleCsvRuler #-> disabled in sc.sce -### i84653 ### -sc.ScPageObj -#-> disabled in sc.sce - ### i84656 ### sc.ScTabViewObj #-> disabled in sc.sce @@ -163,9 +145,6 @@ sc.XMLMetaExporter sc.XMLMetaImporter #-> disabled in sc.sce -### i90346 ### -sc.ScTableValidationObj::com::sun::star::sheet::TableValidation - ### i91043 ### sc.ScModelObj::com::sun::star::document::XEventBroadcaster @@ -181,9 +160,6 @@ sc.ScAccessibleDocumentPagePreview ### i109517 ### sc.AccessibleEditableTextPara_PreviewCell::com::sun::star::accessibility::XAccessibleComponent sc.ScAccessiblePageHeaderArea::com::sun::star::accessibility::XAccessibleEventBroadcaster -sc.ScAnnotationObj::com::sun::star::sheet::XSheetAnnotation -sc.ScAnnotationObj::com::sun::star::text::XSimpleText -sc.ScAnnotationObj::com::sun::star::text::XTextRange sc.ScAnnotationShapeObj::com::sun::star::beans::XPropertySet sc.ScAnnotationShapeObj::com::sun::star::drawing::CaptionShape sc.ScAnnotationShapeObj::com::sun::star::drawing::LineProperties @@ -202,7 +178,6 @@ sc.ScAnnotationShapeObj::com::sun::star::text::XSimpleText sc.ScAnnotationShapeObj::com::sun::star::text::XTextRange sc.ScAnnotationsObj::com::sun::star::container::XElementAccess sc.ScCellObj::com::sun::star::sheet::XSheetAnnotationAnchor -sc.ScDataPilotFieldObj::com::sun::star::sheet::XDataPilotFieldGrouping ### i111032 ### sc.ScAccessibleCell::com::sun::star::accessibility::XAccessibleText @@ -249,11 +224,6 @@ sc.ScTableSheetsObj::com::sun::star::sheet::XSpreadsheet2 # # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE # -sc.ScAnnotationObj::com::sun::star::text::XSimpleText -sc.ScAnnotationObj::com::sun::star::text::XTextRange -sc.ScAnnotationObj::com::sun::star::sheet::XSheetAnnotationShapeSupplier -sc.ScAnnotationObj::com::sun::star::sheet::XSheetAnnotation -sc.ScAnnotationObj::com::sun::star::container::XChild sc.ScAnnotationShapeObj::com::sun::star::style::CharacterPropertiesAsian sc.ScAnnotationShapeObj::com::sun::star::lang::XComponent sc.ScAnnotationShapeObj::com::sun::star::style::ParagraphProperties ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/CppunitTest_basic_macros.mk basic/qa basic/source
basic/CppunitTest_basic_macros.mk |1
basic/qa/cppunit/test_language_conditionals.cxx | 174
basic/qa/cppunit/test_scanner.cxx |8 +
basic/source/comp/exprtree.cxx |3
4 files changed, 186 insertions(+)
New commits:
commit 9f71d0f3f98db02ad28712f229665ce910dc0e6e
Author: Jens Carl
AuthorDate: Thu Apr 25 15:04:57 2019 -0700
Commit: Jens Carl
CommitDate: Fri May 3 08:24:18 2019 +0200
tdf#68339 Other: BASIC Syntax error
Allow expressions (operands) of comparison operators prefixed with the
Logical Operator "Not".
Change-Id: I1b070e2288dac26b1f1186d38cf5d2f4ad99a406
Reviewed-on: https://gerrit.libreoffice.org/71332
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-by: Jens Carl
diff --git a/basic/CppunitTest_basic_macros.mk
b/basic/CppunitTest_basic_macros.mk
index 7b9aed16dfaf..0ca767e1ddba 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -15,6 +15,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,basic_macros, \
basic/qa/cppunit/basictest \
basic/qa/cppunit/basic_coverage \
basic/qa/cppunit/test_append \
+ basic/qa/cppunit/test_language_conditionals \
basic/qa/cppunit/test_nested_struct \
basic/qa/cppunit/test_vba \
))
diff --git a/basic/qa/cppunit/test_language_conditionals.cxx
b/basic/qa/cppunit/test_language_conditionals.cxx
new file mode 100644
index ..1723a98bae5c
--- /dev/null
+++ b/basic/qa/cppunit/test_language_conditionals.cxx
@@ -0,0 +1,174 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "basictest.hxx"
+#include
+
+#include
+#include
+#include
+#include
+
+namespace
+{
+class Language_Conditionals : public CppUnit::TestFixture
+{
+public:
+void testIfNot();
+void testIfAndNot();
+void testNENot();
+
+CPPUNIT_TEST_SUITE(Language_Conditionals);
+
+CPPUNIT_TEST(testIfNot);
+CPPUNIT_TEST(testIfAndNot);
+CPPUNIT_TEST(testNENot);
+
+CPPUNIT_TEST_SUITE_END();
+};
+
+void Language_Conditionals::testIfNot()
+{
+{ // need a block to ensure MacroSnippet is cleaned properly
+const OUString aSnippet("Option VBASupport 1\n"
+"Option Explicit\n"
+"\n"
+"Function doUnitTest() As Integer\n"
+"Dim op1 As Boolean\n"
+"op1 = False\n"
+"If Not op1 Then\n"
+"doUnitTest = 1\n"
+"Else\n"
+"doUnitTest = 0\n"
+"End If\n"
+"End Function\n");
+MacroSnippet myMacro(aSnippet);
+myMacro.Compile();
+CPPUNIT_ASSERT(!myMacro.HasError());
+SbxVariableRef pNew = myMacro.Run();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pNew->GetInteger());
+}
+{ // need a block to ensure MacroSnippet is cleaned properly
+const OUString aSnippet("Option VBASupport 0\n"
+"Option Explicit\n"
+"\n"
+"Function doUnitTest() As Integer\n"
+"Dim op1 As Boolean\n"
+"op1 = False\n"
+"If Not op1 Then\n"
+"doUnitTest = 1\n"
+"Else\n"
+"doUnitTest = 0\n"
+"End If\n"
+"End Function\n");
+MacroSnippet myMacro(aSnippet);
+myMacro.Compile();
+CPPUNIT_ASSERT(!myMacro.HasError());
+SbxVariableRef pNew = myMacro.Run();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pNew->GetInteger());
+}
+}
+
+void Language_Conditionals::testIfAndNot()
+{
+{ // need a block to ensure MacroSnippet is cleaned properly
+const OUString aSnippet("Option VBASupport 1\n"
+"Option Explicit\n"
+"\n"
+"Function doUnitTest() As Integer\n"
+"Dim op1 As Boolean\n"
+"Dim op2 As Boolean\n"
+"op1 = True\n"
+"op2 = False\n"
+"If op1 And Not op2 Then\n"
+"doUnitTest = 1\n"
+
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/sccellsearchobj.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 2f9cd77c1cd480244f8c17221c2f74f3f97df57f
Author: Jens Carl
AuthorDate: Fri May 3 00:39:49 2019 +
Commit: Jens Carl
CommitDate: Fri May 3 04:32:12 2019 +0200
Add XServiceInfo tests to ScCellSearchObj
Change-Id: I0ce55a8a6771a0c774c0009f0001fb00cfcc23b7
Reviewed-on: https://gerrit.libreoffice.org/71714
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/sccellsearchobj.cxx b/sc/qa/extras/sccellsearchobj.cxx
index a06010ca0c32..f91046072e66 100644
--- a/sc/qa/extras/sccellsearchobj.cxx
+++ b/sc/qa/extras/sccellsearchobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
#include
@@ -31,7 +32,8 @@ class ScCellSearchObj : public CalcUnoApiTest,
public apitest::SearchDescriptor,
public apitest::XPropertySet,
public apitest::XReplaceDescriptor,
-public apitest::XSearchDescriptor
+public apitest::XSearchDescriptor,
+public apitest::XServiceInfo
{
public:
ScCellSearchObj();
@@ -58,6 +60,11 @@ public:
// XSearchDescriptor
CPPUNIT_TEST(testGetSetSearchString);
+// XServiceInfo
+CPPUNIT_TEST(testGetImplementationName);
+CPPUNIT_TEST(testGetSupportedServiceNames);
+CPPUNIT_TEST(testSupportsService);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -66,6 +73,8 @@ private:
ScCellSearchObj::ScCellSearchObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XServiceInfo("ScCellSearchObj",
+ { "com.sun.star.util.ReplaceDescriptor",
"com.sun.star.util.SearchDescriptor" })
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test test/source
include/test/lang/xserviceinfo.hxx | 11 +--
test/source/lang/xserviceinfo.cxx |4 ++--
2 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit de529f32120e2eaa73d804a53ce519979da38438
Author: Jens Carl
AuthorDate: Fri May 3 00:33:02 2019 +
Commit: Jens Carl
CommitDate: Fri May 3 03:32:45 2019 +0200
Enable testing of multiple service names
Enable testing of multiple service names of the object supports this, by
storing all possible names in a vector.
Change-Id: Iff2c974cc30a0729cb26b07002582e0786a4de44
Reviewed-on: https://gerrit.libreoffice.org/71713
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/lang/xserviceinfo.hxx
b/include/test/lang/xserviceinfo.hxx
index 498e5ed8387f..86a92480d970 100644
--- a/include/test/lang/xserviceinfo.hxx
+++ b/include/test/lang/xserviceinfo.hxx
@@ -10,6 +10,8 @@
#ifndef INCLUDED_TEST_LANG_XSERVICEINFO_HXX
#define INCLUDED_TEST_LANG_XSERVICEINFO_HXX
+#include
+
#include
#include
@@ -24,7 +26,12 @@ class OOO_DLLPUBLIC_TEST XServiceInfo
public:
XServiceInfo(const OUString& rImplName, const OUString& rServiceName)
: m_aImplName(rImplName)
-, m_aServiceName(rServiceName)
+{
+m_aServiceNames.push_back(rServiceName);
+}
+XServiceInfo(const OUString& rImplName, const std::vector
rServiceNames)
+: m_aImplName(rImplName)
+, m_aServiceNames(rServiceNames)
{
}
@@ -39,7 +46,7 @@ protected:
private:
OUString const m_aImplName;
-OUString const m_aServiceName;
+std::vector m_aServiceNames;
};
} // namespace apitest
diff --git a/test/source/lang/xserviceinfo.cxx
b/test/source/lang/xserviceinfo.cxx
index 9db9e4b1cbe3..3f7e6541fa85 100644
--- a/test/source/lang/xserviceinfo.cxx
+++ b/test/source/lang/xserviceinfo.cxx
@@ -18,7 +18,6 @@
#include
using namespace css;
-using namespace css::uno;
namespace apitest
{
@@ -41,7 +40,8 @@ void XServiceInfo::testSupportsService()
{
uno::Reference xSI(init(), uno::UNO_QUERY_THROW);
-CPPUNIT_ASSERT(xSI->supportsService(m_aServiceName));
+for (const auto& aServiceName : m_aServiceNames)
+CPPUNIT_ASSERT(xSI->supportsService(aServiceName));
}
} // namespace apitest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/qa include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
framework/qa/complex/api_internal/api.lst |1
include/test/util/xreplacedescriptor.hxx| 33 ++
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv |2
qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java| 122
--
sc/qa/extras/sccellsearchobj.cxx|5
sc/qa/unoapi/sc_3.sce |1
test/Library_subsequenttest.mk |1
test/source/util/xreplacedescriptor.cxx | 37 +++
9 files changed, 76 insertions(+), 127 deletions(-)
New commits:
commit f07e91ac739edf846ae9dda9b2305bae6dde489e
Author: Jens Carl
AuthorDate: Wed May 1 23:08:14 2019 +
Commit: Jens Carl
CommitDate: Thu May 2 02:53:26 2019 +0200
tdf#45904 Move XReplaceDescriptor Java tests to C++
Move XReplaceDescriptor Java tests to C++ for ScCellSearchObj.
Change-Id: Ica5042ce8b5eac3663a0fb5f66ae0a2830c89d93
Reviewed-on: https://gerrit.libreoffice.org/71645
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/framework/qa/complex/api_internal/api.lst
b/framework/qa/complex/api_internal/api.lst
index f64d961474b4..f19edba01394 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -73,7 +73,6 @@ job73=sc.ScAccessiblePreviewTable
job74=sc.ScAccessibleSpreadsheet
job78=sc.ScAutoFormatFieldObj
job81=sc.ScCellFieldObj
-job85=sc.ScCellSearchObj
job88=sc.ScDatabaseRangeObj
job98=sc.ScHeaderFieldObj
job99=sc.ScHeaderFieldsObj
diff --git a/include/test/util/xreplacedescriptor.hxx
b/include/test/util/xreplacedescriptor.hxx
new file mode 100644
index ..878ee7126f52
--- /dev/null
+++ b/include/test/util/xreplacedescriptor.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XReplaceDescriptor
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetSetReplaceString();
+
+protected:
+~XReplaceDescriptor() {}
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 4c12f9aa9994..36a156f0cdcc 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -953,7 +953,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScCellObj \
qadevOOo/tests/java/mod/_sc/ScCellRangeObj \
qadevOOo/tests/java/mod/_sc/ScCellRangesObj \
-qadevOOo/tests/java/mod/_sc/ScCellSearchObj \
qadevOOo/tests/java/mod/_sc/ScCellTextCursor \
qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
deleted file mode 100644
index 0ba1e44ec269..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"getReplaceString()"
-"ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"setReplaceString()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java
b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java
deleted file mode 100644
index 349eed1da44d..
--- a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/util/searchdescriptor.hxx | 33 +
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv | 10 -
sc/qa/extras/sccellsearchobj.cxx|5
test/Library_subsequenttest.mk |1
test/source/util/searchdescriptor.cxx | 65
++
5 files changed, 104 insertions(+), 10 deletions(-)
New commits:
commit 6f763a3fcd420ddd147459db0f836ef3e05e710f
Author: Jens Carl
AuthorDate: Wed May 1 22:48:02 2019 +
Commit: Jens Carl
CommitDate: Thu May 2 02:52:28 2019 +0200
tdf#45904 Move SearchDescriptor Java tests to C++
Move SearchDescriptor Java tests to C++ for ScCellSearchObj.
Change-Id: I3c9ffbfc80c7fdc39d0e67fe8aae12605a8d04f5
Reviewed-on: https://gerrit.libreoffice.org/71644
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/util/searchdescriptor.hxx
b/include/test/util/searchdescriptor.hxx
new file mode 100644
index ..b2f5d5bd62fa
--- /dev/null
+++ b/include/test/util/searchdescriptor.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST SearchDescriptor
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testSearchDescriptorProperties();
+
+protected:
+~SearchDescriptor() {}
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
index 04f296d22cbf..0ba1e44ec269 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
@@ -1,12 +1,2 @@
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchBackwards"
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchCaseSensitive"
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchWords"
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchRegularExpression"
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchStyles"
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchSimilarity"
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchSimilarityRelax"
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchSimilarityRemove"
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchSimilarityAdd"
-"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchSimilarityExchange"
"ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"getReplaceString()"
"ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"setReplaceString()"
diff --git a/sc/qa/extras/sccellsearchobj.cxx b/sc/qa/extras/sccellsearchobj.cxx
index 0dfb94a8c245..7d376a5b5262 100644
--- a/sc/qa/extras/sccellsearchobj.cxx
+++ b/sc/qa/extras/sccellsearchobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
@@ -26,6 +27,7 @@ using namespace css;
namespace sc_apitest
{
class ScCellSearchObj : public CalcUnoApiTest,
+public apitest::SearchDescriptor,
public apitest::XPropertySet,
public apitest::XSearchDescriptor
{
@@ -38,6 +40,9 @@ public:
CPPUNIT_TEST_SUITE(ScCellSearchObj);
+// SearchDescriptor
+CPPUNIT_TEST(testSearchDescriptorProperties);
+
// XPropertSet
CPPUNIT_TEST(testGetPropertySetInfo);
CPPUNIT_TEST(testGetPropertyValue);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 2d8a876d6a95..6bdde7dece5b 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -186,6 +186,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/text/textprintersettings \
test/source/text/textsettings \
test/source/text/textdocumentindex \
+ test/source/util/searchdescriptor \
test/source/util/xindent \
test/source/util/xmergeable \
test/source/util/xrefreshable \
diff --git a/test/source/util/searchdescriptor.cxx
b/test/source/util/searchdescriptor.cxx
new file mode 100644
index ..a2b72ce588dc
--- /dev/null
+++ b/test/source/util/searchdescriptor.cxx
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/util/xsearchdescriptor.hxx | 33
+
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv |2
sc/qa/extras/sccellsearchobj.cxx|8 +-
test/Library_subsequenttest.mk |1
test/source/util/xsearchdescriptor.cxx | 36
++
5 files changed, 77 insertions(+), 3 deletions(-)
New commits:
commit 976bb31199baf8ded562323e35626c61ef5bffbe
Author: Jens Carl
AuthorDate: Wed May 1 03:55:35 2019 +
Commit: Jens Carl
CommitDate: Thu May 2 01:19:34 2019 +0200
tdf#45904 Move XSearchDescriptor Java tests to C++
Move XSearchDescriptor Java tests to C++ for ScCellSearchObj.
Change-Id: I1ae50bb586fd742b7cc19f71bcae018ca42139e6
Reviewed-on: https://gerrit.libreoffice.org/71643
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/util/xsearchdescriptor.hxx
b/include/test/util/xsearchdescriptor.hxx
new file mode 100644
index ..1bad973753db
--- /dev/null
+++ b/include/test/util/xsearchdescriptor.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XSearchDescriptor
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetSetSearchString();
+
+protected:
+~XSearchDescriptor() {}
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
index 8f8a0add5ae6..04f296d22cbf 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv
@@ -1,5 +1,3 @@
-"ScCellSearchObj";"com::sun::star::util::XSearchDescriptor";"getSearchString()"
-"ScCellSearchObj";"com::sun::star::util::XSearchDescriptor";"setSearchString()"
"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchBackwards"
"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchCaseSensitive"
"ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchWords"
diff --git a/sc/qa/extras/sccellsearchobj.cxx b/sc/qa/extras/sccellsearchobj.cxx
index 21ece504221b..0dfb94a8c245 100644
--- a/sc/qa/extras/sccellsearchobj.cxx
+++ b/sc/qa/extras/sccellsearchobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
@@ -24,7 +25,9 @@ using namespace css;
namespace sc_apitest
{
-class ScCellSearchObj : public CalcUnoApiTest, public apitest::XPropertySet
+class ScCellSearchObj : public CalcUnoApiTest,
+public apitest::XPropertySet,
+public apitest::XSearchDescriptor
{
public:
ScCellSearchObj();
@@ -42,6 +45,9 @@ public:
CPPUNIT_TEST(testPropertyChangeListener);
CPPUNIT_TEST(testVetoableChangeListener);
+// XSearchDescriptor
+CPPUNIT_TEST(testGetSetSearchString);
+
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 95341a5f91f5..2d8a876d6a95 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -191,6 +191,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/util/xrefreshable \
test/source/util/xreplaceable \
test/source/util/xsearchable \
+ test/source/util/xsearchdescriptor \
test/source/view/xcontrolaccess \
test/source/view/xformlayeraccess \
))
diff --git a/test/source/util/xsearchdescriptor.cxx
b/test/source/util/xsearchdescriptor.cxx
new file mode 100644
index ..b42ed7f90a44
--- /dev/null
+++ b/test/source/util/xsearchdescriptor.cxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+
+#include
+
+#include
+
+using namespace css;
+
+namespace apitest
+{
+void XSearchDescriptor::testGetSetSearchString()
+{
+uno::Reference xDS(init(), uno::UNO_QUERY_THROW);
+const OUString aSearchStringOld = xDS->getSearchString();
+CPPUNIT_ASSERT(aSearchStringOld.isEmpty());
+
+xDS->setSearchString("_XSearchDescriptor");
+const
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/sctablecolumnobj.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 0b8ac2d3c84043789783d3b4f04639323b9d3bb9
Author: Jens Carl
AuthorDate: Wed May 1 01:04:29 2019 +
Commit: Jens Carl
CommitDate: Wed May 1 19:30:40 2019 +0200
Add XServiceInfo tests to ScTableColumnObj
Change-Id: Id8f78e2b114945f2c2499739711db9223828314a
Reviewed-on: https://gerrit.libreoffice.org/71609
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/sctablecolumnobj.cxx
b/sc/qa/extras/sctablecolumnobj.cxx
index f64b2c0b1822..dff0384fe42a 100644
--- a/sc/qa/extras/sctablecolumnobj.cxx
+++ b/sc/qa/extras/sctablecolumnobj.cxx
@@ -10,6 +10,7 @@
#include
#include
#include
+#include
#include
#include
@@ -32,7 +33,8 @@ class ScTableColumnObj : public CalcUnoApiTest,
public apitest::TableColumn,
public apitest::XCellRange,
public apitest::XNamed,
- public apitest::XPropertySet
+ public apitest::XPropertySet,
+ public apitest::XServiceInfo
{
public:
ScTableColumnObj();
@@ -63,6 +65,11 @@ public:
CPPUNIT_TEST(testPropertyChangeListener);
CPPUNIT_TEST(testVetoableChangeListener);
+// XServiceInfo
+CPPUNIT_TEST(testGetImplementationName);
+CPPUNIT_TEST(testGetSupportedServiceNames);
+CPPUNIT_TEST(testSupportsService);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -108,6 +115,7 @@ ScTableColumnObj::ScTableColumnObj()
"ValidationXML",
"WritingMode",
})
+, XServiceInfo("ScTableColumnObj", "com.sun.star.table.TableColumn")
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_cellsearchobj.mk sc/Module_sc.mk sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv |7 sc/CppunitTest_sc_cellsearchobj.mk | 43 + sc/Module_sc.mk |3 sc/qa/extras/sccellsearchobj.cxx| 86 ++ 4 files changed, 131 insertions(+), 8 deletions(-) New commits: commit 4931a1e5e365c018a271fcd94f0a743b4fc38c6c Author: Jens Carl AuthorDate: Wed May 1 00:58:31 2019 + Commit: Jens Carl CommitDate: Wed May 1 09:30:00 2019 +0200 tdf#45904 Move XPropertSet Java tests to C++ Move XPropertSet Java tests to C++ for ScCellSearchObj. Change-Id: I46e55794fe0b205173c3b208ba84c90d70aa2de0 Reviewed-on: https://gerrit.libreoffice.org/71608 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv index 3af1d2feb37e..8f8a0add5ae6 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellSearchObj.csv @@ -12,10 +12,3 @@ "ScCellSearchObj";"com::sun::star::util::SearchDescriptor";"SearchSimilarityExchange" "ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"getReplaceString()" "ScCellSearchObj";"com::sun::star::util::XReplaceDescriptor";"setReplaceString()" -"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()" -"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()" -"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()" -"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()" -"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()" -"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()" -"ScCellSearchObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()" diff --git a/sc/CppunitTest_sc_cellsearchobj.mk b/sc/CppunitTest_sc_cellsearchobj.mk new file mode 100644 index ..a6bc54d1e9aa --- /dev/null +++ b/sc/CppunitTest_sc_cellsearchobj.mk @@ -0,0 +1,43 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#* + +$(eval $(call gb_CppunitTest_CppunitTest,sc_cellsearchobj)) + +$(eval $(call gb_CppunitTest_use_external,sc_cellsearchobj,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellsearchobj, \ + sc/qa/extras/sccellsearchobj \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_cellsearchobj, \ + cppu \ + sal \ + subsequenttest \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_cellsearchobj,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellsearchobj)) + +$(eval $(call gb_CppunitTest_use_ure,sc_cellsearchobj)) +$(eval $(call gb_CppunitTest_use_vcl,sc_cellsearchobj)) + +$(eval $(call gb_CppunitTest_use_components,sc_cellsearchobj,\ + $(sc_unoapi_common_components) \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_cellsearchobj)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 633fa010982e..0b424cd0a381 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -114,10 +114,11 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_cellformatsenumeration \ CppunitTest_sc_cellformatsobj \ CppunitTest_sc_cellobj \ - CppunitTest_sc_cellsobj \ CppunitTest_sc_cellrangeobj \ CppunitTest_sc_cellrangesobj \ + CppunitTest_sc_cellsearchobj \ CppunitTest_sc_cellsenumeration \ + CppunitTest_sc_cellsobj \ CppunitTest_sc_chart2dataprovider \ CppunitTest_sc_chartobj \ CppunitTest_sc_chartsobj \ diff --git a/sc/qa/extras/sccellsearchobj.cxx b/sc/qa/extras/sccellsearchobj.cxx new file mode 100644 index ..21ece504221b --- /dev/null +++ b/sc/qa/extras/sccellsearchobj.cxx @@ -0,0 +1,86 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +using namespace css; +
[Libreoffice-commits] core.git: comphelper/CppunitTest_comphelper_test.mk comphelper/qa comphelper/source
comphelper/CppunitTest_comphelper_test.mk |1
comphelper/qa/unit/types_test.cxx | 97 ++
comphelper/source/misc/types.cxx | 19 -
3 files changed, 111 insertions(+), 6 deletions(-)
New commits:
commit 516983b7798a3ecc4d9e443ef5d8e573e01f5e53
Author: Jens Carl
AuthorDate: Wed Apr 24 10:52:00 2019 -0700
Commit: Stephan Bergmann
CommitDate: Fri Apr 26 09:48:18 2019 +0200
tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)
Replace OSL_VERIFY with SAL_WARN_IF and add some unit tests to ensure
the replacements don't some side effects.
Change-Id: I96eb00e2856e767e83596a21d30ae12a0efddf6d
Reviewed-on: https://gerrit.libreoffice.org/71252
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/comphelper/CppunitTest_comphelper_test.mk
b/comphelper/CppunitTest_comphelper_test.mk
index 956aeb374a63..20503e65bd06 100644
--- a/comphelper/CppunitTest_comphelper_test.mk
+++ b/comphelper/CppunitTest_comphelper_test.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,comphelper_test, \
comphelper/qa/container/testifcontainer \
comphelper/qa/unit/test_hash \
comphelper/qa/unit/base64_test \
+comphelper/qa/unit/types_test \
))
$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_test))
diff --git a/comphelper/qa/unit/types_test.cxx
b/comphelper/qa/unit/types_test.cxx
new file mode 100644
index ..89ad6cae870f
--- /dev/null
+++ b/comphelper/qa/unit/types_test.cxx
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+using namespace css;
+
+namespace
+{
+class TypesTest : public CppUnit::TestFixture
+{
+public:
+void testGetINT64();
+void testGetINT32();
+void testGetINT16();
+void testGetDouble();
+void testGetFloat();
+void testGetString();
+
+CPPUNIT_TEST_SUITE(TypesTest);
+
+CPPUNIT_TEST(testGetINT64);
+CPPUNIT_TEST(testGetINT32);
+CPPUNIT_TEST(testGetINT16);
+CPPUNIT_TEST(testGetDouble);
+CPPUNIT_TEST(testGetFloat);
+CPPUNIT_TEST(testGetString);
+
+CPPUNIT_TEST_SUITE_END();
+};
+
+void TypesTest::testGetINT64()
+{
+CPPUNIT_ASSERT_EQUAL(sal_Int64(1337),
::comphelper::getINT64(uno::makeAny(sal_Int64(1337;
+
+uno::Any aValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int64(0), ::comphelper::getINT64(aValue));
+}
+
+void TypesTest::testGetINT32()
+{
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1337),
::comphelper::getINT32(uno::makeAny(sal_Int32(1337;
+
+uno::Any aValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ::comphelper::getINT32(aValue));
+}
+
+void TypesTest::testGetINT16()
+{
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1337),
::comphelper::getINT16(uno::makeAny(sal_Int16(1337;
+
+uno::Any aValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), ::comphelper::getINT16(aValue));
+}
+
+void TypesTest::testGetDouble()
+{
+CPPUNIT_ASSERT_EQUAL(1337.1337,
::comphelper::getDouble(uno::makeAny(1337.1337)));
+
+uno::Any aValue;
+CPPUNIT_ASSERT_EQUAL(0.0, ::comphelper::getDouble(aValue));
+}
+
+void TypesTest::testGetFloat()
+{
+CPPUNIT_ASSERT_EQUAL(static_cast(1337.0),
+
::comphelper::getFloat(uno::makeAny(static_cast(1337.0;
+
+uno::Any aValue;
+CPPUNIT_ASSERT_EQUAL(static_cast(0.0),
::comphelper::getFloat(aValue));
+}
+
+void TypesTest::testGetString()
+{
+CPPUNIT_ASSERT_EQUAL(OUString("1337"),
::comphelper::getString(uno::makeAny(OUString("1337";
+
+uno::Any aValue;
+CPPUNIT_ASSERT_EQUAL(OUString(""), ::comphelper::getString(aValue));
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(TypesTest);
+
+} // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index eb5eec0b5343..291c590ba488 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
namespace comphelper
@@ -38,7 +39,8 @@ using namespace ::com::sun::star::lang;
sal_Int64 getINT64(const Any& _rAny)
{
sal_Int64 nReturn = 0;
-OSL_VERIFY( _rAny >>= nReturn );
+if(!(_rAny >>= nReturn))
+SAL_WARN("comphelper", "conversion from Any to sal_Int64 failed");
return nReturn;
}
@@ -46,7 +48,8 @@ sal_Int64 getINT64(const Any& _rAny)
sal_Int32 getINT32(const Any& _rAny)
{
sal_Int32 nReturn = 0;
-OSL_VERIFY( _rAny >>= nReturn );
+if(!(_rAny >>= nReturn))
+SAL_WARN("comphelper", "conversion from Any to sal_Int32 failed");
[Libreoffice-commits] core.git: sc/qa
sc/qa/unoapi/knownissues.xcl |3 --- 1 file changed, 3 deletions(-) New commits: commit 8dabb2ae2d34f94a50ef5f94bf4bf01b2aca2071 Author: Jens Carl AuthorDate: Thu Apr 25 15:34:08 2019 -0700 Commit: Jens Carl CommitDate: Fri Apr 26 07:11:31 2019 +0200 Related tdf#43309 Enable test Enable test sc.ScCellRangeObj::com::sun::star::chart::XChartData as of commit eb7a731bcfbacec15b77889f0ac545d36ef5ad19 the test is ported to C++ and discussed with sberg in https://bugs.documentfoundation.org/show_bug.cgi?id=43309#c7. Change-Id: I2652122bd61f7586d6afa190eaece8edf938e28d Reviewed-on: https://gerrit.libreoffice.org/71335 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/sc/qa/unoapi/knownissues.xcl b/sc/qa/unoapi/knownissues.xcl index b400fef1ee8c..ca1efe74688c 100644 --- a/sc/qa/unoapi/knownissues.xcl +++ b/sc/qa/unoapi/knownissues.xcl @@ -218,9 +218,6 @@ sc.ScCellObj::com::sun::star::beans::XPropertySet sc.ScCellRangesObj::com::sun::star::table::CellProperties sc.ScCellRangesObj::com::sun::star::beans::XPropertySet -### fdo43309 ### -sc.ScCellRangeObj::com::sun::star::chart::XChartData - ### fdo44167 ### sc.ScDatabaseRangeObj::com::sun::star::sheet::XDatabaseRange sc.ScDatabaseRangeObj::com::sun::star::util::XRefreshable ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/qa include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
framework/qa/complex/api_internal/api.lst|1
include/test/table/tablecolumn.hxx | 41 +++
qadevOOo/Jar_OOoRunner.mk|2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv |4
qadevOOo/tests/java/ifc/table/_TableColumn.java | 64
qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java| 135
--
sc/qa/extras/sctablecolumnobj.cxx|6
sc/qa/unoapi/sc_7.sce|1
test/Library_subsequenttest.mk |1
test/source/table/tablecolumn.cxx| 55
10 files changed, 103 insertions(+), 207 deletions(-)
New commits:
commit 7c88700b74346d58084b48656f1c7e28f891cf09
Author: Jens Carl
AuthorDate: Wed Apr 24 21:04:10 2019 +
Commit: Jens Carl
CommitDate: Thu Apr 25 01:21:49 2019 +0200
tdf#45904 Move TableColumn Java tests to C++
Move TableColumn Java tests to C++ for ScTableColumnObj.
Change-Id: I3f17fa1f25c2676124b56c384364e36736fac849
Reviewed-on: https://gerrit.libreoffice.org/71261
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/framework/qa/complex/api_internal/api.lst
b/framework/qa/complex/api_internal/api.lst
index 4e4166ee9835..f64d961474b4 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -79,7 +79,6 @@ job98=sc.ScHeaderFieldObj
job99=sc.ScHeaderFieldsObj
job126=sc.ScSheetLinkObj
job132=sc.ScStyleObj
-job134=sc.ScTableColumnObj
job140=sc.XMLContentExporter
job141=sc.XMLContentImporter
job142=sc.XMLImporter
diff --git a/include/test/table/tablecolumn.hxx
b/include/test/table/tablecolumn.hxx
new file mode 100644
index ..a6ea3a01b4fb
--- /dev/null
+++ b/include/test/table/tablecolumn.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST TableColumn
+{
+public:
+virtual css::uno::Reference init() = 0;
+void setSpreadsheet(const css::uno::Reference&
r_xSheet)
+{
+m_xSheet = r_xSheet;
+}
+
+void testTableColumnProperties();
+
+protected:
+~TableColumn() {}
+
+private:
+css::uno::Reference m_xSheet;
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index d235320fd5d7..4c12f9aa9994 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -582,7 +582,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier \
qadevOOo/tests/java/ifc/system/_XSystemShellExecute \
qadevOOo/tests/java/ifc/table/_CellProperties \
-qadevOOo/tests/java/ifc/table/_TableColumn \
qadevOOo/tests/java/ifc/table/_XAutoFormattable \
qadevOOo/tests/java/ifc/table/_XCellRange \
qadevOOo/tests/java/ifc/table/_XTableChart \
@@ -967,7 +966,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScShapeObj \
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
qadevOOo/tests/java/mod/_sc/ScStyleObj \
-qadevOOo/tests/java/mod/_sc/ScTableColumnObj \
qadevOOo/tests/java/mod/_sc/ScTableSheetObj \
qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \
qadevOOo/tests/java/mod/_sc/ScTabViewObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
deleted file mode 100644
index 5a12a914c4c4..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"ScTableColumnObj";"com::sun::star::table::TableColumn";"Width"
-"ScTableColumnObj";"com::sun::star::table::TableColumn";"OptimalWidth"
-"ScTableColumnObj";"com::sun::star::table::TableColumn";"IsVisible"
-"ScTableColumnObj";"com::sun::star::table::TableColumn";"IsStartOfNewPage"
diff --git a/qadevOOo/tests/java/ifc/table/_TableColumn.java
b/qadevOOo/tests/java/ifc/table/_TableColumn.java
deleted file mode 100644
index b94a29017a22..
--- a/qadevOOo/tests/java/ifc/table/_TableColumn.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at
[Libreoffice-commits] core.git: test/source
test/source/beans/xpropertyset.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 47e094c3b14f19fe719d4de56f1f14606efe4885
Author: Jens Carl
AuthorDate: Wed Apr 24 21:10:00 2019 +
Commit: Jens Carl
CommitDate: Thu Apr 25 01:18:08 2019 +0200
Improve error messages
Change-Id: I08d5b060b6756a89972eeec57c1f9c85e6f65500
Reviewed-on: https://gerrit.libreoffice.org/71262
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/test/source/beans/xpropertyset.cxx
b/test/source/beans/xpropertyset.cxx
index 993b609ec4b4..f8ac7d17f206 100644
--- a/test/source/beans/xpropertyset.cxx
+++ b/test/source/beans/xpropertyset.cxx
@@ -244,8 +244,12 @@ bool XPropertySet::isPropertyValueChangeable(const
OUString& rName)
}
else
{
-std::cout << type.getTypeName() << std::endl;
-std::cout << rName << std::endl;
+std::cout << "Unknown type:\n"
+ "Type: "
+ << type.getTypeName()
+ << "\n"
+ "Name: "
+ << rName << "\n";
CPPUNIT_ASSERT_MESSAGE(
"XPropertySet::isPropertyValueChangeable: unknown type in Any
tested.", false);
}
@@ -255,6 +259,7 @@ bool XPropertySet::isPropertyValueChangeable(const
OUString& rName)
}
catch (const uno::Exception&)
{
+std::cout << "Exception thrown while retrieving with property: " <<
rName << "\n";
CPPUNIT_ASSERT_MESSAGE("XPropertySet::isPropertyValueChangeable:
exception thrown while "
"retrieving the property value.",
false);
___
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.ScTableColumnObj.csv |2 --
sc/qa/extras/sctablecolumnobj.cxx|9
-
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit a7c72b3725f38bba8463ebf10958574a4334837e
Author: Jens Carl
AuthorDate: Sun Apr 21 04:56:46 2019 +
Commit: Jens Carl
CommitDate: Sun Apr 21 08:07:37 2019 +0200
tdf#45904 Move XNamed Java tests to C++
Move XNamed Java tests to C++ for ScTableColumnObj.
Change-Id: I6037db86d917a5a64f19dc799d80e175e971b90d
Reviewed-on: https://gerrit.libreoffice.org/71033
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
index a20406eb6b9a..70a50be2c57c 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
@@ -1,5 +1,3 @@
-"ScTableColumnObj";"com::sun::star::container::XNamed";"getName()"
-"ScTableColumnObj";"com::sun::star::container::XNamed";"setName()"
"ScTableColumnObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScTableColumnObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScTableColumnObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/sc/qa/extras/sctablecolumnobj.cxx
b/sc/qa/extras/sctablecolumnobj.cxx
index 9a8b8c79e556..c65a8683b89c 100644
--- a/sc/qa/extras/sctablecolumnobj.cxx
+++ b/sc/qa/extras/sctablecolumnobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
@@ -25,7 +26,7 @@ using namespace css;
namespace sc_apitest
{
-class ScTableColumnObj : public CalcUnoApiTest, public apitest::XCellRange
+class ScTableColumnObj : public CalcUnoApiTest, public apitest::XCellRange,
public apitest::XNamed
{
public:
ScTableColumnObj();
@@ -41,6 +42,11 @@ public:
CPPUNIT_TEST(testGetCellRangeByName);
CPPUNIT_TEST(testGetCellRangeByPosition);
+// XNamed
+CPPUNIT_TEST(testGetName);
+// because TableColumnNames are fixed, test for an exception
+CPPUNIT_TEST(testSetNameThrowsException);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -50,6 +56,7 @@ private:
ScTableColumnObj::ScTableColumnObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XCellRange("K1:K1")
+, XNamed("K")
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_tablecolumnobj.mk sc/Module_sc.mk sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv |3
sc/CppunitTest_sc_tablecolumnobj.mk | 43
sc/Module_sc.mk |1
sc/qa/extras/sctablecolumnobj.cxx| 90
++
4 files changed, 134 insertions(+), 3 deletions(-)
New commits:
commit 2b307927f028eeefcec41a8bc8daae392521f9df
Author: Jens Carl
AuthorDate: Fri Apr 19 07:47:12 2019 +
Commit: Jens Carl
CommitDate: Sat Apr 20 21:41:19 2019 +0200
tdf#45904 Move XCellRange Java test to C++
mOve XCellRange Java test to C++ for ScTableColumnObj.
Change-Id: I165e5752fb679be6790c305a99f35da644e17d56
Reviewed-on: https://gerrit.libreoffice.org/70968
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
index 72c9345a266b..a20406eb6b9a 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableColumnObj.csv
@@ -1,6 +1,3 @@
-"ScTableColumnObj";"com::sun::star::table::XCellRange";"getCellByPosition()"
-"ScTableColumnObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()"
-"ScTableColumnObj";"com::sun::star::table::XCellRange";"getCellRangeByName()"
"ScTableColumnObj";"com::sun::star::container::XNamed";"getName()"
"ScTableColumnObj";"com::sun::star::container::XNamed";"setName()"
"ScTableColumnObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
diff --git a/sc/CppunitTest_sc_tablecolumnobj.mk
b/sc/CppunitTest_sc_tablecolumnobj.mk
new file mode 100644
index ..6f18e8070285
--- /dev/null
+++ b/sc/CppunitTest_sc_tablecolumnobj.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_tablecolumnobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_tablecolumnobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_tablecolumnobj, \
+ sc/qa/extras/sctablecolumnobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_tablecolumnobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_tablecolumnobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_tablecolumnobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_tablecolumnobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_tablecolumnobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_tablecolumnobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_tablecolumnobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 8a7484a824dd..633fa010982e 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -194,6 +194,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_stylefamilyobj \
CppunitTest_sc_subtotaldescriptorbase \
CppunitTest_sc_subtotalfieldobj \
+ CppunitTest_sc_tablecolumnobj \
CppunitTest_sc_tablecolumnsobj \
CppunitTest_sc_tableconditionalentryobj \
CppunitTest_sc_tableconditionalformat \
diff --git a/sc/qa/extras/sctablecolumnobj.cxx
b/sc/qa/extras/sctablecolumnobj.cxx
new file mode 100644
index ..9a8b8c79e556
--- /dev/null
+++ b/sc/qa/extras/sctablecolumnobj.cxx
@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+using namespace css;
+
+namespace sc_apitest
+{
+class ScTableColumnObj : public CalcUnoApiTest, public apitest::XCellRange
+{
+public:
+ScTableColumnObj();
+
+virtual uno::Reference init() override;
+virtual void setUp() override;
+virtual void tearDown() override;
+
+CPPUNIT_TEST_SUITE(ScTableColumnObj);
+
+// XCellRange
+CPPUNIT_TEST(testGetCellByPosition);
+CPPUNIT_TEST(testGetCellRangeByName);
+CPPUNIT_TEST(testGetCellRangeByPosition);
+
+CPPUNIT_TEST_SUITE_END();
+
+private:
+
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/chart/xchartdata.hxx | 35 ++
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv |4
sc/qa/extras/sccellrangeobj.cxx| 134
+-
test/Library_subsequenttest.mk |1
test/source/chart/xchartdata.cxx | 93 ++
5 files changed, 201 insertions(+), 66 deletions(-)
New commits:
commit eb7a731bcfbacec15b77889f0ac545d36ef5ad19
Author: Jens Carl
AuthorDate: Thu Apr 18 14:47:40 2019 -0700
Commit: Jens Carl
CommitDate: Fri Apr 19 05:00:46 2019 +0200
tdf#45904 Move XChartData Java tests to C++
Fix tdf#43309: Move XChartData Java tests to C++ for ScCellRangeObj.
Change-Id: I6b57db53fdddab2ff382354d32809404224a2e1e
Reviewed-on: https://gerrit.libreoffice.org/70956
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/chart/xchartdata.hxx
b/include/test/chart/xchartdata.hxx
new file mode 100644
index ..315d727ed5a3
--- /dev/null
+++ b/include/test/chart/xchartdata.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XChartData
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testChartDataChangeEventListener();
+void testGetNotANumber();
+void testIsNotANumber();
+
+protected:
+~XChartData() {}
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index 3e2bbaf97550..0e3a7ab8191e 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -35,10 +35,6 @@
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsCharacterDistance"
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsForbiddenRules"
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsHangingPunctuation"
-"ScCellRangeObj";"com::sun::star::chart::XChartData";"addChartDataChangeEventListener()"
-"ScCellRangeObj";"com::sun::star::chart::XChartData";"removeChartDataChangeEventListener()"
-"ScCellRangeObj";"com::sun::star::chart::XChartData";"getNotANumber()"
-"ScCellRangeObj";"com::sun::star::chart::XChartData";"isNotANumber()"
"ScCellRangeObj";"com::sun::star::style::ParagraphProperties";"ParaAdjust"
"ScCellRangeObj";"com::sun::star::style::ParagraphProperties";"ParaLineSpacing#optional"
"ScCellRangeObj";"com::sun::star::style::ParagraphProperties";"ParaBackColor#optional"
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index a529c9b4eb1f..aba1a458b9eb 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
#include
@@ -30,60 +31,62 @@
#include
#include
#include
-
-#include
-#include
-#include
-#include
-#include
#include
#include
#include
#include
-#include
#include
+#include
+#include
+#include
+#include
#include
#include
+#include
+#include
+
+#include
#include
#include
using namespace css;
-using namespace css::uno;
-
-namespace sc_apitest {
-
-class ScCellRangeObj : public CalcUnoApiTest, public apitest::CellProperties,
- public apitest::SheetCellRange,
- public
apitest::XArrayFormulaRange,
- public
apitest::XCellFormatRangesSupplier,
- public
apitest::XCellRangeAddressable,
- public apitest::XCellRangeData,
- public
apitest::XCellRangeFormula,
- public apitest::XCellRangesQuery,
- public apitest::XCellSeries,
- public apitest::XColumnRowRange,
- public apitest::XFormulaQuery,
- public apitest::XIndent,
- public apitest::XMergeable,
- public
apitest::XMultipleOperation,
- public
[Libreoffice-commits] core.git: qadevOOo/objdsc
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv |4 1 file changed, 4 deletions(-) New commits: commit 91ff3d136a9841607d815713081583b6a4e1da9d Author: Jens Carl AuthorDate: Thu Apr 18 13:17:12 2019 -0700 Commit: Jens Carl CommitDate: Thu Apr 18 23:48:13 2019 +0200 tdf#45904 Remove already converted tests Change-Id: I0f7ed57336a4cfa5f143b3c49626dfa8dd590905 Reviewed-on: https://gerrit.libreoffice.org/70953 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv index 179c8841d4ae..3e2bbaf97550 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv @@ -22,8 +22,6 @@ "ScCellRangeObj";"com::sun::star::table::CellProperties";"DiagonalBLTR#optional" "ScCellRangeObj";"com::sun::star::table::CellProperties";"ShrinkToFit#optional" "ScCellRangeObj";"com::sun::star::util::XSearchable";"createSearchDescriptor()" -"ScCellRangeObj";"com::sun::star::util::XSearchable";"findAll()" -"ScCellRangeObj";"com::sun::star::util::XSearchable";"findFirst()" "ScCellRangeObj";"com::sun::star::util::XSearchable";"findNext()" "ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"CharHeightAsian" "ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"CharWeightAsian" @@ -37,8 +35,6 @@ "ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsCharacterDistance" "ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsForbiddenRules" "ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsHangingPunctuation" -"ScCellRangeObj";"com::sun::star::util::XReplaceable";"createReplaceDescriptor()" -"ScCellRangeObj";"com::sun::star::util::XReplaceable";"replaceAll()" "ScCellRangeObj";"com::sun::star::chart::XChartData";"addChartDataChangeEventListener()" "ScCellRangeObj";"com::sun::star::chart::XChartData";"removeChartDataChangeEventListener()" "ScCellRangeObj";"com::sun::star::chart::XChartData";"getNotANumber()" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal vcl/unx
include/sal/log-areas.dox |1 +
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx |8
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 2a8f2fd072c9de7b5dc538419565e3351bd0936a
Author: Jens Carl
AuthorDate: Wed Apr 17 15:41:20 2019 -0700
Commit: Stephan Bergmann
CommitDate: Thu Apr 18 13:47:27 2019 +0200
tdf#43157 Clean up OSL_TRACE (replace with SAL_INFO)
Change-Id: Ifa196dec38d1b84ef14e9bb3a6b45d5ead72064a
Reviewed-on: https://gerrit.libreoffice.org/70904
Reviewed-by: Stephan Bergmann
Tested-by: Jenkins
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 9ee69be03b6f..da6fd1c4a171 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -470,6 +470,7 @@ certain functionality.
@li @c vcl.gdi.fontmetric
@li @c vcl.gtk - Gtk+ 2/3 plugin
@li @c vcl.gtk3
+@li @c vcl.gtkkde5
@li @c vcl.harfbuzz - HarfBuzz text layout
@li @c vcl.headless - bitmap-based backend
@li @c vcl.helper
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index 8006bc37c7dc..47398d01f5c0 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -177,7 +177,7 @@ void SAL_CALL Gtk3KDE5FilePicker::setValue(sal_Int16
controlId, sal_Int16 nContr
}
else
{
-OSL_TRACE("set value of unhandled type %d", controlId);
+SAL_INFO("vcl.gtkkde5", "set value of unhandled type " << controlId);
}
}
@@ -403,7 +403,7 @@ void SAL_CALL Gtk3KDE5FilePicker::initialize(const
uno::Sequence& args
break;
default:
-OSL_TRACE("Unknown templates %d", templateId);
+SAL_INFO("vcl.gtkkde5", "unknown templates " << templateId);
return;
}
@@ -446,7 +446,7 @@ void Gtk3KDE5FilePicker::filterChanged()
{
FilePickerEvent aEvent;
aEvent.ElementId = LISTBOX_FILTER;
-OSL_TRACE("filter changed");
+SAL_INFO("vcl.gtkkde5", "filter changed");
if (m_xListener.is())
m_xListener->controlStateChanged(aEvent);
}
@@ -454,7 +454,7 @@ void Gtk3KDE5FilePicker::filterChanged()
void Gtk3KDE5FilePicker::selectionChanged()
{
FilePickerEvent aEvent;
-OSL_TRACE("file selection changed");
+SAL_INFO("vcl.gtkkde5", "file selection changed");
if (m_xListener.is())
m_xListener->fileSelectionChanged(aEvent);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/source
include/test/text/xtextfield.hxx | 17 ---
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv |1
sc/qa/extras/sceditfieldobj-header.cxx |7 ++-
test/source/text/xtextfield.cxx | 23
+++---
4 files changed, 34 insertions(+), 14 deletions(-)
New commits:
commit 5696272f9055b9b15c94d70a0dea7cee299c23ed
Author: Jens Carl
AuthorDate: Tue Apr 16 19:21:58 2019 +
Commit: Jens Carl
CommitDate: Wed Apr 17 01:11:58 2019 +0200
tdf#45904 Move XTextField Java tests to C++
Move XTextField Java tests to C++ for ScEditFieldObj_Header (formerly
ScHeaderFieldObj).
Change-Id: I36b723945d9306720846b4a4e2d3eaddb1a1c063
Reviewed-on: https://gerrit.libreoffice.org/70841
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/text/xtextfield.hxx b/include/test/text/xtextfield.hxx
index 870d51d20da5..6d717b1ead06 100644
--- a/include/test/text/xtextfield.hxx
+++ b/include/test/text/xtextfield.hxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -10,25 +10,28 @@
#ifndef INCLUDED_TEST_TEXT_XTEXTFIELD_HXX
#define INCLUDED_TEST_TEXT_XTEXTFIELD_HXX
+#include
+
#include
#include
namespace apitest
{
-
class OOO_DLLPUBLIC_TEST XTextField
{
public:
-virtual ~XTextField() {}
-
-virtual css::uno::Reference< css::uno::XInterface > init() = 0;
+virtual css::uno::Reference init() = 0;
void testGetPresentation();
+void testGetPresentationEmptyString();
+
+protected:
+~XTextField() {}
};
-}
+} // namespace apitest
#endif // INCLUDED_TEST_TEXT_XTEXTFIELD_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
index 343631dee5b6..e4f37d6e1016 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv
@@ -1,4 +1,3 @@
"ScHeaderFieldObj";"com::sun::star::lang::XComponent";"dispose()"
"ScHeaderFieldObj";"com::sun::star::lang::XComponent";"addEventListener()"
"ScHeaderFieldObj";"com::sun::star::lang::XComponent";"removeEventListener()"
-"ScHeaderFieldObj";"com::sun::star::text::XTextField";"getPresentation()"
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx
b/sc/qa/extras/sceditfieldobj-header.cxx
index a38b3a122ebb..f8d1e5d5a0d4 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++ b/sc/qa/extras/sceditfieldobj-header.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -38,7 +39,8 @@ namespace sc_apitest
class ScEditFieldObj_Header : public CalcUnoApiTest,
public apitest::TextContent,
public apitest::XPropertySet,
- public apitest::XTextContent
+ public apitest::XTextContent,
+ public apitest::XTextField
{
public:
ScEditFieldObj_Header();
@@ -66,6 +68,9 @@ public:
CPPUNIT_TEST(testGetAnchor);
CPPUNIT_TEST(testAttach);
+// XTextField
+CPPUNIT_TEST(testGetPresentationEmptyString);
+
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/test/source/text/xtextfield.cxx b/test/source/text/xtextfield.cxx
index 1d0abb22dad0..87fff9db3f83 100644
--- a/test/source/text/xtextfield.cxx
+++ b/test/source/text/xtextfield.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -8,24 +8,37 @@
*/
#include
+#include
+
#include
+
+#include
+
#include
using namespace css;
-using namespace css::uno;
namespace apitest
{
-
void XTextField::testGetPresentation()
{
-uno::Reference< text::XTextField > xTextField(init(), UNO_QUERY_THROW);
+uno::Reference xTextField(init(), uno::UNO_QUERY_THROW);
+
OUString aString = xTextField->getPresentation(true);
CPPUNIT_ASSERT(!aString.isEmpty());
aString = xTextField->getPresentation(false);
CPPUNIT_ASSERT(!aString.isEmpty());
}
+void XTextField::testGetPresentationEmptyString()
+{
+uno::Reference xTextField(init(), uno::UNO_QUERY_THROW);
+
+OUString aString = xTextField->getPresentation(true);
+CPPUNIT_ASSERT(aString.isEmpty());
+aString = xTextField->getPresentation(false);
+CPPUNIT_ASSERT(aString.isEmpty());
}
+} // namespace apitest
-/* vim:set shiftwidth=4
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/scheaderfieldsobj.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 8f13b0d3f1d72aab85665bccf409a3d6fdeb4272
Author: Jens Carl
AuthorDate: Mon Apr 15 03:56:26 2019 +
Commit: Jens Carl
CommitDate: Mon Apr 15 17:20:35 2019 +0200
Rename ScCellFieldsObj to ScHeaderFieldsObj
Correct class name to mirror the name of the object we are testing
against.
Change-Id: I72f29c765990b1693533de8150bfbededf045925
Reviewed-on: https://gerrit.libreoffice.org/70753
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/scheaderfieldsobj.cxx
b/sc/qa/extras/scheaderfieldsobj.cxx
index e38e88fc0080..c105d3a56437 100644
--- a/sc/qa/extras/scheaderfieldsobj.cxx
+++ b/sc/qa/extras/scheaderfieldsobj.cxx
@@ -33,18 +33,18 @@ using namespace css;
namespace sc_apitest
{
-class ScCellFieldsObj : public CalcUnoApiTest,
-public apitest::XEnumerationAccess,
-public apitest::XRefreshable
+class ScHeaderFieldsObj : public CalcUnoApiTest,
+ public apitest::XEnumerationAccess,
+ public apitest::XRefreshable
{
public:
-ScCellFieldsObj();
+ScHeaderFieldsObj();
virtual uno::Reference init() override;
virtual void setUp() override;
virtual void tearDown() override;
-CPPUNIT_TEST_SUITE(ScCellFieldsObj);
+CPPUNIT_TEST_SUITE(ScHeaderFieldsObj);
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
@@ -58,12 +58,12 @@ private:
uno::Reference m_xComponent;
};
-ScCellFieldsObj::ScCellFieldsObj()
+ScHeaderFieldsObj::ScHeaderFieldsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
-uno::Reference ScCellFieldsObj::init()
+uno::Reference ScHeaderFieldsObj::init()
{
uno::Reference xDoc(m_xComponent,
uno::UNO_QUERY_THROW);
@@ -87,20 +87,20 @@ uno::Reference ScCellFieldsObj::init()
return xTFS->getTextFields();
}
-void ScCellFieldsObj::setUp()
+void ScHeaderFieldsObj::setUp()
{
CalcUnoApiTest::setUp();
// create calc document
m_xComponent = loadFromDesktop("private:factory/scalc");
}
-void ScCellFieldsObj::tearDown()
+void ScHeaderFieldsObj::tearDown()
{
closeDocument(m_xComponent);
CalcUnoApiTest::tearDown();
}
-CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFieldsObj);
+CPPUNIT_TEST_SUITE_REGISTRATION(ScHeaderFieldsObj);
} // namespace sc_apitest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv | 12 -- 1 file changed, 12 deletions(-) New commits: commit 4ce6590223ab9a615afcf55ebc0e9cdb3ff2a73a Author: Jens Carl AuthorDate: Mon Apr 15 04:14:20 2019 + Commit: Jens Carl CommitDate: Mon Apr 15 07:02:28 2019 +0200 tdf#45904 Remove obsolete tests for ScHeaderFieldObj These tests are already ported to C++ in ScEditFieldObj_Header. Change-Id: I548a50b6e717f706ff89dce530542a0a710185a7 Reviewed-on: https://gerrit.libreoffice.org/70754 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv index 3ae50e42ac18..343631dee5b6 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScHeaderFieldObj.csv @@ -1,16 +1,4 @@ "ScHeaderFieldObj";"com::sun::star::lang::XComponent";"dispose()" "ScHeaderFieldObj";"com::sun::star::lang::XComponent";"addEventListener()" "ScHeaderFieldObj";"com::sun::star::lang::XComponent";"removeEventListener()" -"ScHeaderFieldObj";"com::sun::star::text::TextContent";"AnchorType#optional" -"ScHeaderFieldObj";"com::sun::star::text::TextContent";"AnchorTypes#optional" -"ScHeaderFieldObj";"com::sun::star::text::TextContent";"TextWrap#optional" "ScHeaderFieldObj";"com::sun::star::text::XTextField";"getPresentation()" -"ScHeaderFieldObj";"com::sun::star::beans::XPropertySet#optional";"getPropertySetInfo()" -"ScHeaderFieldObj";"com::sun::star::beans::XPropertySet#optional";"setPropertyValue()" -"ScHeaderFieldObj";"com::sun::star::beans::XPropertySet#optional";"getPropertyValue()" -"ScHeaderFieldObj";"com::sun::star::beans::XPropertySet#optional";"addPropertyChangeListener()" -"ScHeaderFieldObj";"com::sun::star::beans::XPropertySet#optional";"removePropertyChangeListener()" -"ScHeaderFieldObj";"com::sun::star::beans::XPropertySet#optional";"addVetoableChangeListener()" -"ScHeaderFieldObj";"com::sun::star::beans::XPropertySet#optional";"removeVetoableChangeListener()" -"ScHeaderFieldObj";"com::sun::star::text::XTextContent";"attach()" -"ScHeaderFieldObj";"com::sun::star::text::XTextContent";"getAnchor()" ___ 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.ScPageObj.csv | 11 --- sc/qa/unoapi/sc_1.sce |1 - 2 files changed, 12 deletions(-) New commits: commit 527c400ef0654761ac1a3835dc06f2373523ef64 Author: Jens Carl AuthorDate: Mon Apr 15 03:31:41 2019 + Commit: Jens Carl CommitDate: Mon Apr 15 06:41:52 2019 +0200 tdf#45904 Remove obsolete ScPageObj tests As mentioned i#84653 ScPageObj and ScDrawPageObj are supporting the same service and the later one was convert to C++ with commits ed6a71eafa61bade50219d2ff6233a42ab6d1c17, f897e80d063436be07356049f595efe5afb04859, eb0653ee80ad7249fde9ff752b56316fb98c4592, ee503c36199d225f4c906fe43c927f911c2097c7 and b99ea0ff33b78ba76d1ae436895efac490252e0f. Change-Id: Icb05b2a03893f47e5f3816366cb9f3c94fd6faeb Reviewed-on: https://gerrit.libreoffice.org/70751 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScPageObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScPageObj.csv deleted file mode 100644 index 4a2f50a0b2f6.. --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScPageObj.csv +++ /dev/null @@ -1,11 +0,0 @@ -"ScPageObj";"com::sun::star::container::XIndexAccess";"getCount()" -"ScPageObj";"com::sun::star::container::XIndexAccess";"getByIndex()" -"ScPageObj";"com::sun::star::lang::XServiceInfo";"getImplementationName()" -"ScPageObj";"com::sun::star::lang::XServiceInfo";"supportsService()" -"ScPageObj";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()" -"ScPageObj";"com::sun::star::container::XElementAccess";"getElementType()" -"ScPageObj";"com::sun::star::container::XElementAccess";"hasElements()" -"ScPageObj";"com::sun::star::drawing::XShapes";"add()" -"ScPageObj";"com::sun::star::drawing::XShapes";"remove()" -"ScPageObj";"com::sun::star::drawing::XShapeGrouper";"group()" -"ScPageObj";"com::sun::star::drawing::XShapeGrouper";"ungroup()" diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce index d11354465534..1bc68eabbced 100644 --- a/sc/qa/unoapi/sc_1.sce +++ b/sc/qa/unoapi/sc_1.sce @@ -15,7 +15,6 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# i84653 -o sc.ScPageObj # i84554 -o sc.AccessibleEditableTextPara_PreviewNote # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter -o sc.AccessibleEditableTextPara_PreviewCell ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/scheaderfieldsobj.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit e11dcc7e599830bedd3595c8b1427f47e5525c11
Author: Jens Carl
AuthorDate: Mon Apr 15 03:37:57 2019 +
Commit: Jens Carl
CommitDate: Mon Apr 15 06:42:08 2019 +0200
Remove unnecessary calls to Reference::is() after an UNO_QUERY_THROW
Change-Id: I43f7e328b45d0058f867f3296c5a34740d51b4da
Reviewed-on: https://gerrit.libreoffice.org/70752
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/scheaderfieldsobj.cxx
b/sc/qa/extras/scheaderfieldsobj.cxx
index 89521b5270e1..e38e88fc0080 100644
--- a/sc/qa/extras/scheaderfieldsobj.cxx
+++ b/sc/qa/extras/scheaderfieldsobj.cxx
@@ -30,7 +30,6 @@
#include
using namespace css;
-using namespace css::uno;
namespace sc_apitest
{
@@ -67,7 +66,6 @@ ScCellFieldsObj::ScCellFieldsObj()
uno::Reference ScCellFieldsObj::init()
{
uno::Reference xDoc(m_xComponent,
uno::UNO_QUERY_THROW);
-CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference xSFS(xDoc,
uno::UNO_QUERY_THROW);
uno::Reference xNA(xSFS->getStyleFamilies(),
uno::UNO_QUERY_THROW);
@@ -92,8 +90,8 @@ uno::Reference ScCellFieldsObj::init()
void ScCellFieldsObj::setUp()
{
CalcUnoApiTest::setUp();
+// create calc document
m_xComponent = loadFromDesktop("private:factory/scalc");
-CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
}
void ScCellFieldsObj::tearDown()
@@ -103,6 +101,7 @@ void ScCellFieldsObj::tearDown()
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFieldsObj);
+
} // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sal/osl sal/qa sal/rtl solenv/gdb
sal/osl/unx/file_misc.cxx |8 +---
sal/osl/unx/mutex.cxx | 14 ++-
sal/osl/unx/profile.cxx |4 --
sal/osl/unx/socket.cxx |4 --
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx |6 +--
sal/qa/osl/file/osl_File.cxx|5 +-
sal/qa/osl/process/osl_Thread.cxx | 51 +---
sal/qa/osl/security/osl_Security.cxx|6 +--
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 12 ++
sal/qa/rtl/oustring/rtl_OUString2.cxx |3 -
sal/qa/rtl/process/rtl_Process.cxx |3 -
sal/rtl/random.cxx |4 --
solenv/gdb/libreoffice/basegfx.py | 41 +++---
13 files changed, 67 insertions(+), 94 deletions(-)
New commits:
commit 3b3c10cee0d38f9396fdb6cf028ceb8917822bb7
Author: Jens Carl
AuthorDate: Wed Apr 10 10:50:10 2019 -0700
Commit: Noel Grandin
CommitDate: Sat Apr 13 21:14:49 2019 +0200
Fix Python exception in gdb pretty-printer basegfx
Add single quotes around the namespace::class construct, when calling
gdb.parse_and_eval(), otherwise this exception is thrown:
"Python Exception A syntax error in expression, near
`)xxx)->count($'.:"
The reason is a possible conflict with '::' referring a static variable
(https://sourceware.org/gdb/onlinedocs/gdb/Variables.html).
Also improved the B2DPolyPolygonPrinter::children method to avoid a
segmentation fault, when accessing member m_value.
Change-Id: I1c15a4b786e1e374c67ace445d28c1ce210a4c04
Reviewed-on: https://gerrit.libreoffice.org/70537
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/solenv/gdb/libreoffice/basegfx.py
b/solenv/gdb/libreoffice/basegfx.py
index 81901fe8dae8..c14968c91eb2 100644
--- a/solenv/gdb/libreoffice/basegfx.py
+++ b/solenv/gdb/libreoffice/basegfx.py
@@ -58,15 +58,19 @@ class B2DPolygonPrinter(object):
self.typename)
def _count(self):
+# It's a call into the inferior (being debugged) process.
+# Will not work with core dumps and can cause a deadlock.
return int(gdb.parse_and_eval(
-'((basegfx::B2DPolygon*)%d)->count()' % self.value.address))
+"(('basegfx::B2DPolygon' *)
{})->count()".format(self.value.address)))
def _isEmpty(self):
return self._count() == 0
def _hasCurves(self):
+# It's a call into the inferior (being debugged) process.
+# Will not work with core dumps and can cause a deadlock.
return int(gdb.parse_and_eval(
-'((basegfx::B2DPolygon*)%d)->areControlPointsUsed()' %
self.value.address)) != 0
+"(('basegfx::B2DPolygon' *)
{})->areControlPointsUsed()".format(self.value.address))) != 0
def _children(self):
if self._hasCurves():
@@ -113,12 +117,15 @@ class B2DPolygonPrinter(object):
#currPoint = gdb.parse_and_eval(
#'((basegfx::B2DPolygon*)%d)->getB2DPoint(%d)' % (
# self.value.address, self.index))
+
+# It's a call into the inferior (being debugged) process.
+# Will not work with core dumps and can cause a deadlock.
prevControl = gdb.parse_and_eval(
-'((basegfx::B2DPolygon*)%d)->getPrevControlPoint(%d)' % (
- self.value.address, self.index))
+"(('basegfx::B2DPolygon' *)
{})->getPrevControlPoint({:d})".format(self.value.address, self.index))
+# It's a call into the inferior (being debugged) process.
+# Will not work with core dumps and can cause a deadlock.
nextControl = gdb.parse_and_eval(
-'((basegfx::B2DPolygon*)%d)->getNextControlPoint(%d)' % (
- self.value.address, self.index))
+"(('basegfx::B2DPolygon' *)
{})->getNextControlPoint({:d})".format(self.value.address, self.index))
self.index += 1
return ('point %d' % (self.index-1),
'p: (%15f, %15f) c-1: (%15f, %15f) c1: (%15f, %15f)' %
@@ -142,21 +149,31 @@ class B2DPolyPolygonPrinter(object):
self._count())
def _count(self):
+# It's a call into the inferior (being debugged) process.
+# Will not work with core dumps and can cause a deadlock.
return int(gdb.parse_and_eval(
-'((basegfx::B2DPolyPolygon*)%d)->count()' %
self.value.address))
+"(('basegfx::B2DPolyPolygon' *)
{})->count()".format(self.value.address)))
def _isClosed(self):
+# It's a call into the inferior (being debugged) process.
+# Will not work with core dumps and can cause a deadlock.
return int(gdb.parse_and_eval(
-'((basegfx::B2DPolyPolygon*)%d)->isClosed()' %
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/text/textcontent.hxx | 51 +++
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv |3
sc/qa/extras/sceditfieldobj-cell.cxx | 12 +
sc/qa/extras/sceditfieldobj-header.cxx | 14 +-
test/Library_subsequenttest.mk |1
test/source/text/textcontent.cxx | 68
++
6 files changed, 143 insertions(+), 6 deletions(-)
New commits:
commit c498e548ee45430b31cb63df17818ba39771ef7c
Author: Jens Carl
AuthorDate: Thu Apr 11 22:24:00 2019 +
Commit: Jens Carl
CommitDate: Fri Apr 12 06:12:19 2019 +0200
tdf#45904 Move TextContent Java tests to C++
Move TextContent Java tests to C++ for ScEditFieldObj_Cell and
ScEditFieldObj_Header (formerly ScCellFieldObj).
Change-Id: Ieed5cdbc128490e66d1797c817d998a932317dd4
Reviewed-on: https://gerrit.libreoffice.org/70615
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/text/textcontent.hxx
b/include/test/text/textcontent.hxx
new file mode 100644
index ..e6333d60e478
--- /dev/null
+++ b/include/test/text/textcontent.hxx
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#include
+#include
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST TextContent
+{
+public:
+TextContent(const css::text::TextContentAnchorType aExpectedTCAT,
+const css::text::TextContentAnchorType aNewTCAT,
+const css::text::WrapTextMode aExpectedWTM, const
css::text::WrapTextMode aNewWTM)
+: m_aExpectedTCAT(aExpectedTCAT)
+, m_aNewTCAT(aNewTCAT)
+, m_aExpectedWTM(aExpectedWTM)
+, m_aNewWTM(aNewWTM)
+{
+}
+
+virtual css::uno::Reference init() = 0;
+
+void testTextContentProperties();
+
+protected:
+~TextContent() {}
+
+private:
+css::text::TextContentAnchorType const m_aExpectedTCAT;
+css::text::TextContentAnchorType const m_aNewTCAT;
+css::text::WrapTextMode const m_aExpectedWTM;
+css::text::WrapTextMode const m_aNewWTM;
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
index 1912ae235b3b..35be57d9423c 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
@@ -1,6 +1,3 @@
"ScCellFieldObj";"com::sun::star::lang::XComponent";"dispose()"
"ScCellFieldObj";"com::sun::star::lang::XComponent";"addEventListener()"
"ScCellFieldObj";"com::sun::star::lang::XComponent";"removeEventListener()"
-"ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorType#optional"
-"ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorTypes#optional"
-"ScCellFieldObj";"com::sun::star::text::TextContent";"TextWrap#optional"
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx
b/sc/qa/extras/sceditfieldobj-cell.cxx
index 071be82489ff..4852fcc1ca41 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -9,15 +9,18 @@
#include
#include
+#include
#include
#include
#include
-#include
#include
+#include
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -33,6 +36,7 @@ using namespace css;
namespace sc_apitest
{
class ScEditFieldObj_Cell : public CalcUnoApiTest,
+public apitest::TextContent,
public apitest::XPropertySet,
public apitest::XTextContent,
public apitest::XTextField
@@ -51,6 +55,9 @@ public:
CPPUNIT_TEST_SUITE(ScEditFieldObj_Cell);
+// TextContent
+CPPUNIT_TEST(testTextContentProperties);
+
// XPropertySet
CPPUNIT_TEST(testGetPropertySetInfo);
CPPUNIT_TEST(testGetPropertyValue);
@@ -79,6 +86,9 @@ uno::Reference ScEditFieldObj_Cell::mxField;
ScEditFieldObj_Cell::ScEditFieldObj_Cell()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, TextContent(text::TextContentAnchorType_AS_CHARACTER,
+ text::TextContentAnchorType_AS_CHARACTER,
text::WrapTextMode_NONE,
+ text::WrapTextMode_NONE)
{
}
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx
b/sc/qa/extras/sceditfieldobj-header.cxx
index e04f5087f17f..a38b3a122ebb 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv |4
sc/qa/extras/sceditfieldobj-cell.cxx | 78
+-
sc/qa/extras/sceditfieldobj-header.cxx | 57 ---
3 files changed, 79 insertions(+), 60 deletions(-)
New commits:
commit 6c50ee3377756ae7da1ae039da35775c0a97ef2f
Author: Jens Carl
AuthorDate: Mon Apr 8 21:45:18 2019 +
Commit: Jens Carl
CommitDate: Tue Apr 9 01:29:36 2019 +0200
tdf#45904 Move XPropertySet Java tests to C++
Move remaining XPropertySet Java tests to ScEditFieldObj_Cell and
ScEditFieldObj_Header.
Change-Id: I43640c6ea5a35fcc1aa8e15be17dae7611551776
Reviewed-on: https://gerrit.libreoffice.org/70434
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
index 8ca686fff172..1912ae235b3b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv
@@ -4,7 +4,3 @@
"ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorType#optional"
"ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorTypes#optional"
"ScCellFieldObj";"com::sun::star::text::TextContent";"TextWrap#optional"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"addPropertyChangeListener()"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"removePropertyChangeListener()"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"addVetoableChangeListener()"
-"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"removeVetoableChangeListener()"
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx
b/sc/qa/extras/sceditfieldobj-cell.cxx
index 7f39e88f1752..071be82489ff 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -13,19 +13,29 @@
#include
#include
+#include
#include
+#include
+#include
+#include
#include
+#include
+#include
#include
#include
-#include
-#include
+#include
+#include
-using namespace css;
-using namespace css::uno;
+#include
-namespace sc_apitest {
+using namespace css;
-class ScEditFieldObj_Cell : public CalcUnoApiTest, public apitest::XTextField,
public apitest::XTextContent, public apitest::XPropertySet
+namespace sc_apitest
+{
+class ScEditFieldObj_Cell : public CalcUnoApiTest,
+public apitest::XPropertySet,
+public apitest::XTextContent,
+public apitest::XTextField
{
public:
ScEditFieldObj_Cell();
@@ -45,6 +55,8 @@ public:
CPPUNIT_TEST(testGetPropertySetInfo);
CPPUNIT_TEST(testGetPropertyValue);
CPPUNIT_TEST(testSetPropertyValue);
+CPPUNIT_TEST(testPropertyChangeListener);
+CPPUNIT_TEST(testVetoableChangeListener);
// XTextField
CPPUNIT_TEST(testGetPresentation);
@@ -66,7 +78,7 @@ private:
uno::Reference ScEditFieldObj_Cell::mxField;
ScEditFieldObj_Cell::ScEditFieldObj_Cell()
- : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
@@ -84,41 +96,41 @@ void ScEditFieldObj_Cell::tearDown()
CalcUnoApiTest::tearDown();
}
-namespace {
-
+namespace
+{
uno::Reference getNewField(const
uno::Reference& xSM)
{
-uno::Reference xField(
-xSM->createInstance("com.sun.star.text.TextField.URL"),
UNO_QUERY_THROW);
-uno::Reference xPropSet(xField, UNO_QUERY_THROW);
+uno::Reference
xField(xSM->createInstance("com.sun.star.text.TextField.URL"),
+uno::UNO_QUERY_THROW);
+uno::Reference xPropSet(xField, uno::UNO_QUERY_THROW);
xPropSet->setPropertyValue("Representation",
uno::makeAny(OUString("LibreOffice")));
xPropSet->setPropertyValue("URL",
uno::makeAny(OUString("http://www.libreoffice.org/;)));
return xField;
}
-}
+} // namespace
uno::Reference ScEditFieldObj_Cell::init()
{
// Return a field that's already in the cell.
if (!mxField.is())
{
-uno::Reference xSM(mxComponent,
UNO_QUERY_THROW);
+uno::Reference xSM(mxComponent,
uno::UNO_QUERY_THROW);
// Create a new URL field object, and populate it with name and URL.
mxField = getNewField(xSM);
// Insert this field into a cell.
-uno::Reference xDoc(mxComponent,
UNO_QUERY_THROW);
-uno::Reference xIA(xDoc->getSheets(),
UNO_QUERY_THROW);
-uno::Reference xSheet(xIA->getByIndex(0),
UNO_QUERY_THROW);
+uno::Reference xDoc(mxComponent,
uno::UNO_QUERY_THROW);
+uno::Reference xIA(xDoc->getSheets(),
uno::UNO_QUERY_THROW);
+uno::Reference xSheet(xIA->getByIndex(0),
uno::UNO_QUERY_THROW);
// Use cell A1 for this.
uno::Reference xCell = xSheet->getCellByPosition(0, 0);
-uno::Reference
[Libreoffice-commits] core.git: qadevOOo/objdsc
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv |6 -- 1 file changed, 6 deletions(-) New commits: commit a496096b4ecc4ffb45bc7dc25753c970bf5ca487 Author: Jens Carl AuthorDate: Mon Apr 8 21:25:48 2019 + Commit: Jens Carl CommitDate: Tue Apr 9 01:29:06 2019 +0200 tdf#45904 Remove obsolete/disabled tests The some of the ScCellFieldObj tests are already written in C++ since commit d0af33e87db753d6d171548f75c2e242cde00497. Change-Id: I91dd688452d9374810096a89ed3ddf148df0b996 Reviewed-on: https://gerrit.libreoffice.org/70432 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv index bcb16d0a0c59..8ca686fff172 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellFieldObj.csv @@ -4,13 +4,7 @@ "ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorType#optional" "ScCellFieldObj";"com::sun::star::text::TextContent";"AnchorTypes#optional" "ScCellFieldObj";"com::sun::star::text::TextContent";"TextWrap#optional" -"ScCellFieldObj";"com::sun::star::text::XTextField";"getPresentation()" -"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"getPropertySetInfo()" -"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"setPropertyValue()" -"ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"getPropertyValue()" "ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"addPropertyChangeListener()" "ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"removePropertyChangeListener()" "ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"addVetoableChangeListener()" "ScCellFieldObj";"com::sun::star::beans::XPropertySet#optional";"removeVetoableChangeListener()" -"ScCellFieldObj";"com::sun::star::text::XTextContent";"attach()" -"ScCellFieldObj";"com::sun::star::text::XTextContent";"getAnchor()" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table2.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 7f37bfa25a16bc66af4c236850503de1d0fb8336
Author: Jens Carl
AuthorDate: Sun Apr 7 22:43:01 2019 -0700
Commit: Noel Grandin
CommitDate: Mon Apr 8 10:29:59 2019 +0200
Fix out-of-bounds error when adding a comment
The error is related to tdf#50916 and since commit
7282014e362a1529a36c88eb308df8ed359c2cfa it's necessary to retrieve the
EndCol via ScTable::ClampToAllocatedColumns() otherwise this error
occurs:
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/8.2.1/../../../../include/c++/8.2.1/debug/vector:417:
Error: attempt to subscript container with out-of-bounds index 64, but
container only holds 64 elements.
Objects involved in the operation:
sequence "this" @ 0x0x56b28340 {
type = std::__debug::vector >, std::allocator > > >;
}
The backtrace shows where the error occurs
0 0x77b0ed7f in raise () at /usr/lib/libc.so.6
1 0x77af9672 in abort () at /usr/lib/libc.so.6
2 0x779a16c6 in __gnu_debug::_Error_formatter::_M_error() const
(this=0x7fffdf156928 <__gnu_debug::_Error_formatter::_M_at(char const*,
unsigned int)::__formatter>)
at /build/gcc/src/gcc/libstdc++-v3/src/c++11/debug.cc:1069
3 0x7fffdcd43fb3 in std::__debug::vector >, std::allocator > > >::operator[](unsigned long)
(this=0x56b28340, __n=64)
at
/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/8.2.1/../../../../include/c++/8.2.1/debug/vector:417
4 0x7fffdce75f5d in ScColContainer::operator[](unsigned long)
(this=0x56b28340, nIndex=64) at sc/inc/colcontainer.hxx:44
5 0x7fffdcfb45f1 in ScDocument::HasColNotes(short, short) const
(this=0x56b1f9a0, nCol=64, nTab=0) at sc/source/core/data/document.cxx:6563
6 0x7fffdd2b5473 in ScTable::GetAllNoteCaptionsState(ScRange const&,
std::__debug::vector >&)
(this=0x56b28340, rRange=...,
rNotes=std::__debug::vector of length 2, capacity 2 = {...}) at
sc/source/core/data/table2.cxx:1668
7 0x7fffdcfb4d85 in ScDocument::GetAllNoteCaptionsState(ScRangeList
const&) (this=0x56b1f9a0, rRanges=...) at
sc/source/core/data/document.cxx:6662
8 0x7fffde20449e in ScCellShell::GetState(SfxItemSet&)
(this=0x56c99fc0, rSet=...) at sc/source/ui/view/cellsh.cxx:1121
9 0x7fffde200fb8 in SfxStubScCellShellGetState(SfxShell*, SfxItemSet&)
(pShell=0x56c99fc0, rSet=...) at workdir/SdiTarget/sc/sdi/scslots.hxx:7286
Change-Id: I568546cd7a3de510625c6c5d189d84f5f0a7bdb2
Reviewed-on: https://gerrit.libreoffice.org/70399
Reviewed-by: Noel Grandin
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 9839763e8a14..2a288c46423f 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1656,7 +1656,9 @@ CommentCaptionState
ScTable::GetAllNoteCaptionsState(const ScRange& rRange, std:
bool bIsFirstNoteShownState = true; // because of error:
-Werror=maybe-uninitialized
bool bFirstControl = true;
-for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
+ScTable* pTab = pDocument->FetchTable(nTab);
+const SCCOL nEndCol = pTab->ClampToAllocatedColumns(rRange.aEnd.Col());
+for (SCCOL nCol = rRange.aStart.Col(); nCol <= nEndCol; ++nCol)
{
if (bFirstControl && pDocument->HasColNotes(nCol, nTab)) // detect
status of first note caption
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source filter/source framework/source include/comphelper include/registry include/ucbhelper odk/examples offapi/com reportbuilder/java sw/source
comphelper/source/property/MasterPropertySet.cxx
|2 +-
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
|2 +-
framework/source/fwe/classes/addonsoptions.cxx
|2 +-
framework/source/services/autorecovery.cxx
|2 +-
framework/source/services/frame.cxx
|4 ++--
include/comphelper/numberedcollection.hxx
|4 ++--
include/registry/refltype.hxx
|2 +-
include/ucbhelper/interceptedinteraction.hxx
|2 +-
odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
|2 +-
odk/examples/DevelopersGuide/Drawing/DrawingDemo.java
|2 +-
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
|4 ++--
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java
|2 +-
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
|2 +-
offapi/com/sun/star/awt/XSimpleTabController.idl
|4 ++--
offapi/com/sun/star/frame/XModuleManager2.idl
|2 +-
offapi/com/sun/star/smarttags/XSmartTagAction.idl
|2 +-
offapi/com/sun/star/text/XFlatParagraphIteratorProvider.idl
|2 +-
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java
|2 +-
sw/source/filter/ww8/docxsdrexport.cxx
|2 +-
19 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 68dd147bd3eb33fc74590113e7082d00119e733e
Author: Jens Carl
AuthorDate: Wed Apr 3 02:00:14 2019 +
Commit: Julien Nabet
CommitDate: Wed Apr 3 08:54:15 2019 +0200
Fix typos
Change indefinite article "an" to "a" before
the word unique and some variants.
Change-Id: Ia14a6f3b9ec6b257ad8bed3b089faa9b6f07d44f
Reviewed-on: https://gerrit.libreoffice.org/70174
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/comphelper/source/property/MasterPropertySet.cxx
b/comphelper/source/property/MasterPropertySet.cxx
index f379276a0e66..3c339ef6d6f0 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -255,7 +255,7 @@ Sequence< Any > SAL_CALL
MasterPropertySet::getPropertyValues( const Sequence< O
const OUString * pString = aPropertyNames.getConstArray();
PropertyDataHash::const_iterator aEnd = mxInfo->maMap.end(), aIter;
-//!! have an unique_ptr to an array of OGuards in order to have the
+//!! have a unique_ptr to an array of OGuards in order to have the
//!! allocated memory properly freed (exception safe!).
//!! Since the array itself has unique_ptrs as members we have to use a
//!! helper class 'AutoOGuardArray' in order to have
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index c21840e1689e..541417b2f36e 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1224,7 +1224,7 @@
-
diff --git a/framework/source/fwe/classes/addonsoptions.cxx
b/framework/source/fwe/classes/addonsoptions.cxx
index 6652b1972ca5..a9822bc3f110 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -760,7 +760,7 @@ void AddonsOptions_Impl::ReadImages( ImageManager&
aImageManager )
OUString AddonsOptions_Impl::GeneratePrefixURL()
{
-// Create an unique prefixed Add-On popup menu URL so it can be identified
later as a runtime popup menu.
+// Create a unique prefixed Add-On popup menu URL so it can be identified
later as a runtime popup menu.
// They use a different image manager, so they must be identified by the
sfx2/framework code.
OUString aPopupMenuURL;
OUStringBuffer aBuf( m_aRootAddonPopupMenuURLPrexfix.getLength() + 3 );
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 778a9228d4d7..c3c7735afeaf 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3420,7 +3420,7 @@ void AutoRecovery::implts_generateNewTempURL(const
OUString& sBack
AutoRecovery::TDocumentInfo& rInfo )
{
// specify URL for saving (which points to a temp file inside backup
[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/tests
qadevOOo/Jar_OOoRunner.mk|1
qadevOOo/tests/java/ifc/table/_TableRow.java | 38 ---
2 files changed, 39 deletions(-)
New commits:
commit 429e6560d000f454fdb23d52fdddfbc84c5cf0a8
Author: Jens Carl
AuthorDate: Tue Apr 2 22:45:22 2019 +
Commit: Jens Carl
CommitDate: Wed Apr 3 03:48:26 2019 +0200
Remove now obsolete _TableRow interface tests
Remove obsolete _TableRow.java file, missed it with commit
cc9a8c13dad6f3d82a2386554bd6113b486a1752.
Change-Id: I900ae9368d145dbe95b144323459ba05e38f6766
Reviewed-on: https://gerrit.libreoffice.org/70165
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index c9e63df3ac7f..d235320fd5d7 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -583,7 +583,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/system/_XSystemShellExecute \
qadevOOo/tests/java/ifc/table/_CellProperties \
qadevOOo/tests/java/ifc/table/_TableColumn \
-qadevOOo/tests/java/ifc/table/_TableRow \
qadevOOo/tests/java/ifc/table/_XAutoFormattable \
qadevOOo/tests/java/ifc/table/_XCellRange \
qadevOOo/tests/java/ifc/table/_XTableChart \
diff --git a/qadevOOo/tests/java/ifc/table/_TableRow.java
b/qadevOOo/tests/java/ifc/table/_TableRow.java
deleted file mode 100644
index 1d71a631124e..
--- a/qadevOOo/tests/java/ifc/table/_TableRow.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.table;
-
-import lib.MultiPropertyTest;
-
-/**
-* Testing com.sun.star.table.TableRow
-* service properties :
-*
-* Height
-* OptimalHeight
-* IsVisible
-* IsStartOfNewPage
-*
-* Properties testing is automated by lib.MultiPropertyTest.
-* @see com.sun.star.table.TableRow
-*/
-public class _TableRow extends MultiPropertyTest {
-
-} // finish class _TableRow
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/sctablerowobj.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit ada3b7712a90900bf36235168ce4cfa77dfdc642
Author: Jens Carl
AuthorDate: Tue Apr 2 22:01:59 2019 +
Commit: Jens Carl
CommitDate: Wed Apr 3 03:48:09 2019 +0200
Add XServiceInfo tests to ScTableRowObj
Change-Id: Ia3ad25e5e401abd3b27687a951a8c00fe710e57f
Reviewed-on: https://gerrit.libreoffice.org/70164
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/sctablerowobj.cxx b/sc/qa/extras/sctablerowobj.cxx
index 45a974a3207e..ddda25834d6b 100644
--- a/sc/qa/extras/sctablerowobj.cxx
+++ b/sc/qa/extras/sctablerowobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
@@ -30,7 +31,8 @@ namespace sc_apitest
class ScTableRowObj : public CalcUnoApiTest,
public apitest::TableRow,
public apitest::XCellRange,
- public apitest::XPropertySet
+ public apitest::XPropertySet,
+ public apitest::XServiceInfo
{
public:
ScTableRowObj();
@@ -56,6 +58,11 @@ public:
CPPUNIT_TEST(testPropertyChangeListener);
CPPUNIT_TEST(testVetoableChangeListener);
+// XServiceInfo
+CPPUNIT_TEST(testGetImplementationName);
+CPPUNIT_TEST(testGetSupportedServiceNames);
+CPPUNIT_TEST(testSupportsService);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -98,6 +105,7 @@ ScTableRowObj::ScTableRowObj()
"ValidationLocal",
"ValidationXML",
"WritingMode" })
+, XServiceInfo("ScTableRowObj", "com.sun.star.table.TableRow")
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/qa include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
framework/qa/complex/api_internal/api.lst |1
include/test/table/xcellrange.hxx | 50
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv |3
qadevOOo/tests/java/mod/_sc/ScTableRowObj.java| 124 --
sc/qa/extras/sctablerowobj.cxx| 12
sc/qa/unoapi/sc_7.sce |1
test/Library_subsequenttest.mk|1
test/source/table/xcellrange.cxx | 56
9 files changed, 118 insertions(+), 131 deletions(-)
New commits:
commit 6a7350f856e50ce3d091bda9f4f00219b5521333
Author: Jens Carl
AuthorDate: Tue Apr 2 21:42:28 2019 +
Commit: Jens Carl
CommitDate: Wed Apr 3 03:47:56 2019 +0200
tdf#45904 Move XCellRange Java tests to C++
Move XCellRange Java tests to C++ for ScTableRowObj.
Change-Id: I2735779cae777c5af4e622bc1b538df2d8bf70df
Reviewed-on: https://gerrit.libreoffice.org/70163
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/framework/qa/complex/api_internal/api.lst
b/framework/qa/complex/api_internal/api.lst
index a159f3a33114..4e4166ee9835 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -80,7 +80,6 @@ job99=sc.ScHeaderFieldsObj
job126=sc.ScSheetLinkObj
job132=sc.ScStyleObj
job134=sc.ScTableColumnObj
-job138=sc.ScTableRowObj
job140=sc.XMLContentExporter
job141=sc.XMLContentImporter
job142=sc.XMLImporter
diff --git a/include/test/table/xcellrange.hxx
b/include/test/table/xcellrange.hxx
new file mode 100644
index ..eec00c88abd5
--- /dev/null
+++ b/include/test/table/xcellrange.hxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_TABLE_XCELLRANGE_HXX
+#define INCLUDED_TEST_TABLE_XCELLRANGE_HXX
+
+#include
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XCellRange
+{
+public:
+XCellRange()
+: m_aRangeName("A1:A1")
+{
+}
+XCellRange(const OUString& aRangeName)
+: m_aRangeName(aRangeName)
+{
+}
+
+virtual css::uno::Reference init() = 0;
+
+void testGetCellByPosition();
+void testGetCellRangeByName();
+void testGetCellRangeByPosition();
+
+protected:
+~XCellRange() {}
+
+private:
+OUString const m_aRangeName;
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_TABLE_XCELLRANGE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 3815a067b2e8..c9e63df3ac7f 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -969,7 +969,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
qadevOOo/tests/java/mod/_sc/ScStyleObj \
qadevOOo/tests/java/mod/_sc/ScTableColumnObj \
-qadevOOo/tests/java/mod/_sc/ScTableRowObj \
qadevOOo/tests/java/mod/_sc/ScTableSheetObj \
qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \
qadevOOo/tests/java/mod/_sc/ScTabViewObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
deleted file mode 100644
index 3b6fe9714ae4..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellByPosition()"
-"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()"
-"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java
b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java
deleted file mode 100644
index 6a1434ed74fe..
--- a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/table/tablerow.hxx | 36
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv |4
sc/qa/extras/sctablerowobj.cxx|6 +
test/Library_subsequenttest.mk|1
test/source/table/tablerow.cxx| 43 ++
5 files changed, 85 insertions(+), 5 deletions(-)
New commits:
commit cc9a8c13dad6f3d82a2386554bd6113b486a1752
Author: Jens Carl
AuthorDate: Tue Apr 2 21:14:33 2019 +
Commit: Jens Carl
CommitDate: Wed Apr 3 00:39:08 2019 +0200
tdf#45904 Move TableRow Java tests to C++
Move TableRow Java tests to C++ for ScTableRowObj.
Change-Id: I72cd8006b8ad932bab56681de9aac66fb40542fe
Reviewed-on: https://gerrit.libreoffice.org/70159
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/table/tablerow.hxx b/include/test/table/tablerow.hxx
new file mode 100644
index ..150534bb2227
--- /dev/null
+++ b/include/test/table/tablerow.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_TABLE_TABLEROW_HXX
+#define INCLUDED_TEST_TABLE_TABLEROW_HXX
+
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST TableRow
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testTableRowProperties();
+
+protected:
+~TableRow() {}
+};
+
+} // namespace apitest
+
+#endif // INCLUDED_TEST_TABLE_TABLEROW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
index 59f7efd6554a..3b6fe9714ae4 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
@@ -1,7 +1,3 @@
-"ScTableRowObj";"com::sun::star::table::TableRow";"Height"
-"ScTableRowObj";"com::sun::star::table::TableRow";"OptimalHeight"
-"ScTableRowObj";"com::sun::star::table::TableRow";"IsVisible"
-"ScTableRowObj";"com::sun::star::table::TableRow";"IsStartOfNewPage"
"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellByPosition()"
"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()"
"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByName()"
diff --git a/sc/qa/extras/sctablerowobj.cxx b/sc/qa/extras/sctablerowobj.cxx
index 381c4dc3a78c..d264d24ca69f 100644
--- a/sc/qa/extras/sctablerowobj.cxx
+++ b/sc/qa/extras/sctablerowobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
@@ -25,7 +26,7 @@ using namespace css;
namespace sc_apitest
{
-class ScTableRowObj : public CalcUnoApiTest, public apitest::XPropertySet
+class ScTableRowObj : public CalcUnoApiTest, public apitest::TableRow, public
apitest::XPropertySet
{
public:
ScTableRowObj();
@@ -36,6 +37,9 @@ public:
CPPUNIT_TEST_SUITE(ScTableRowObj);
+// TableRow
+CPPUNIT_TEST(testTableRowProperties);
+
// XPropertySet
CPPUNIT_TEST(testGetPropertySetInfo);
CPPUNIT_TEST(testGetPropertyValue);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index c636235913bf..796fbcef122c 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -162,6 +162,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/sheet/xviewpane \
test/source/sheet/xviewsplitable \
test/source/style/xstyleloader \
+ test/source/table/tablerow \
test/source/table/xcell \
test/source/table/xcellcursor \
test/source/table/xcolumnrowrange \
diff --git a/test/source/table/tablerow.cxx b/test/source/table/tablerow.cxx
new file mode 100644
index ..f07f6e2f67a7
--- /dev/null
+++ b/test/source/table/tablerow.cxx
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+
+#include
+
+#include
+
+using namespace css;
+
+namespace apitest
+{
+void TableRow::testTableRowProperties()
+{
+uno::Reference xPS(init(), uno::UNO_QUERY_THROW);
+
+OUString aPropName;
+
+aPropName = "Height";
+testLongProperty(xPS, aPropName);
+
+aPropName =
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_tablerowobj.mk sc/Module_sc.mk sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv |7
sc/CppunitTest_sc_tablerowobj.mk | 43 +++
sc/Module_sc.mk |1
sc/qa/extras/sctablerowobj.cxx| 124 ++
4 files changed, 168 insertions(+), 7 deletions(-)
New commits:
commit ee268253163c4f9f00fd5182c97d9d488c637dfc
Author: Jens Carl
AuthorDate: Tue Apr 2 20:50:56 2019 +
Commit: Jens Carl
CommitDate: Tue Apr 2 23:53:32 2019 +0200
tdf#45904 Move XPropertySet Java tests to C++
Move XPropertySet Java tests to C++ for ScTableRowObj.
Change-Id: Ib448d6440cd6a285cd55297669bb19bd8aec6b07
Reviewed-on: https://gerrit.libreoffice.org/70156
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
index 23e159b4768a..59f7efd6554a 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
@@ -5,10 +5,3 @@
"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellByPosition()"
"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()"
"ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByName()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/sc/CppunitTest_sc_tablerowobj.mk b/sc/CppunitTest_sc_tablerowobj.mk
new file mode 100644
index ..861f6fd5ce3f
--- /dev/null
+++ b/sc/CppunitTest_sc_tablerowobj.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_tablerowobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_tablerowobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_tablerowobj, \
+ sc/qa/extras/sctablerowobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_tablerowobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_tablerowobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_tablerowobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_tablerowobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_tablerowobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_tablerowobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_tablerowobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index b56484c798a5..8a7484a824dd 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -197,6 +197,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_tablecolumnsobj \
CppunitTest_sc_tableconditionalentryobj \
CppunitTest_sc_tableconditionalformat \
+ CppunitTest_sc_tablerowobj \
CppunitTest_sc_tablerowsobj \
CppunitTest_sc_tablesheetobj \
CppunitTest_sc_tablesheetsobj \
diff --git a/sc/qa/extras/sctablerowobj.cxx b/sc/qa/extras/sctablerowobj.cxx
new file mode 100644
index ..381c4dc3a78c
--- /dev/null
+++ b/sc/qa/extras/sctablerowobj.cxx
@@ -0,0 +1,124 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+using namespace css;
+
+namespace sc_apitest
+{
+class ScTableRowObj : public CalcUnoApiTest, public apitest::XPropertySet
+{
+public:
+ScTableRowObj();
+
+virtual uno::Reference init() override;
+virtual void setUp() override;
+virtual void tearDown() override;
+
[Libreoffice-commits] core.git: 2 commits - framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
framework/qa/complex/api_internal/api.lst |1
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv |7
qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java| 93
--
sc/qa/extras/scautoformatobj.cxx| 19 +-
sc/qa/unoapi/sc_2.sce |1
6 files changed, 18 insertions(+), 104 deletions(-)
New commits:
commit 33e264832001286eae1f55a3382b704bbb1a7ac6
Author: Jens Carl
AuthorDate: Tue Apr 2 00:22:31 2019 +
Commit: Jens Carl
CommitDate: Tue Apr 2 06:43:37 2019 +0200
Add XServiceInfo tests to ScAutoFormatObj
include/test/sheet/xenhancedmouseclickbroadcaster.hxx
Change-Id: I614756e19d25c692093de47d364af4b0e521cf31
Reviewed-on: https://gerrit.libreoffice.org/70098
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index cc48c036ce81..76db8c6a3592 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
#include
@@ -35,7 +36,8 @@ class ScAutoFormatObj : public CalcUnoApiTest,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XNamed,
-public apitest::XPropertySet
+public apitest::XPropertySet,
+public apitest::XServiceInfo
{
public:
ScAutoFormatObj();
@@ -71,6 +73,11 @@ public:
CPPUNIT_TEST(testPropertyChangeListener);
CPPUNIT_TEST(testVetoableChangeListener);
+// XServiceInfo
+CPPUNIT_TEST(testGetImplementationName);
+CPPUNIT_TEST(testGetSupportedServiceNames);
+CPPUNIT_TEST(testSupportsService);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -82,6 +89,7 @@ ScAutoFormatObj::ScAutoFormatObj()
, XElementAccess(cppu::UnoType::get())
, XIndexAccess(16)
, XNamed("Default")
+, XServiceInfo("ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat")
{
}
commit a790aafde5aad4b3bd366f487e793268351c5636
Author: Jens Carl
AuthorDate: Tue Apr 2 00:18:17 2019 +
Commit: Jens Carl
CommitDate: Tue Apr 2 06:43:27 2019 +0200
tdf#45904 Move XPropertySet Java tests to C++
Move XPropertySet Java tests to C++ for ScAutoFormatObj.
Change-Id: I01ad72f7f48b3626085203ceac4f49bca847cdab
Reviewed-on: https://gerrit.libreoffice.org/70097
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/framework/qa/complex/api_internal/api.lst
b/framework/qa/complex/api_internal/api.lst
index 946bc59bea97..a159f3a33114 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -72,7 +72,6 @@ job72=sc.ScAccessiblePageHeader
job73=sc.ScAccessiblePreviewTable
job74=sc.ScAccessibleSpreadsheet
job78=sc.ScAutoFormatFieldObj
-job79=sc.ScAutoFormatObj
job81=sc.ScCellFieldObj
job85=sc.ScCellSearchObj
job88=sc.ScDatabaseRangeObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 6a2a933132a8..3815a067b2e8 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -950,7 +950,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj \
qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor \
qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj \
-qadevOOo/tests/java/mod/_sc/ScAutoFormatObj \
qadevOOo/tests/java/mod/_sc/ScCellCursorObj \
qadevOOo/tests/java/mod/_sc/ScCellFieldObj \
qadevOOo/tests/java/mod/_sc/ScCellObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
deleted file mode 100644
index 96344c70f53d..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java
b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java
deleted file mode 100644
index 7790499eb62f..
--- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * This file is part of the
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv |2 --
sc/qa/extras/scautoformatobj.cxx|9
-
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 8f29f31b41136acbea8ca21525f9623948a1a4b8
Author: Jens Carl
AuthorDate: Tue Apr 2 00:12:28 2019 +
Commit: Jens Carl
CommitDate: Tue Apr 2 03:09:35 2019 +0200
tdf#45904 Move XNamed Java tests to C++
Move XNamed Java tests to C++ for ScAutoFormatObj.
Change-Id: I9ef1ec50c7decbc610a60cdc487b11cad2791b1b
Reviewed-on: https://gerrit.libreoffice.org/70096
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
index ac08c66f293c..96344c70f53d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
@@ -1,5 +1,3 @@
-"ScAutoFormatObj";"com::sun::star::container::XNamed";"getName()"
-"ScAutoFormatObj";"com::sun::star::container::XNamed";"setName()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 1f64c0b9c295..525160e86ffc 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -31,7 +32,8 @@ class ScAutoFormatObj : public CalcUnoApiTest,
public apitest::TableAutoFormat,
public apitest::XElementAccess,
public apitest::XEnumerationAccess,
-public apitest::XIndexAccess
+public apitest::XIndexAccess,
+public apitest::XNamed
{
public:
ScAutoFormatObj();
@@ -56,6 +58,10 @@ public:
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
+// XNamed
+CPPUNIT_TEST(testGetName);
+CPPUNIT_TEST(testSetName);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -66,6 +72,7 @@ ScAutoFormatObj::ScAutoFormatObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType::get())
, XIndexAccess(16)
+, XNamed("Default")
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv |4 -
sc/qa/extras/scautoformatobj.cxx| 34
++
2 files changed, 23 insertions(+), 15 deletions(-)
New commits:
commit 321607572f0880d1cd6c6de9ee931c33d90bae7c
Author: Jens Carl
AuthorDate: Tue Apr 2 00:06:44 2019 +
Commit: Jens Carl
CommitDate: Tue Apr 2 03:09:14 2019 +0200
tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScAutoFormatObj.
Change-Id: I926052ed79d6639ef3898f6486b626ca6cc042c3
Reviewed-on: https://gerrit.libreoffice.org/70095
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
index 694fd818058d..ac08c66f293c 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
@@ -1,5 +1,3 @@
-"ScAutoFormatObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScAutoFormatObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScAutoFormatObj";"com::sun::star::container::XNamed";"getName()"
"ScAutoFormatObj";"com::sun::star::container::XNamed";"setName()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 8f86f46d2f9c..1f64c0b9c295 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -8,9 +8,11 @@
*/
#include
+#include
#include
#include
#include
+#include
#include
#include
@@ -27,6 +29,7 @@ namespace sc_apitest
{
class ScAutoFormatObj : public CalcUnoApiTest,
public apitest::TableAutoFormat,
+public apitest::XElementAccess,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess
{
@@ -42,6 +45,10 @@ public:
// TableAutoFormat
CPPUNIT_TEST(testTableAutoFormatProperties);
+// XElementAccess
+CPPUNIT_TEST(testGetElementType);
+CPPUNIT_TEST(testHasElements);
+
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
@@ -57,6 +64,7 @@ private:
ScAutoFormatObj::ScAutoFormatObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XElementAccess(cppu::UnoType::get())
, XIndexAccess(16)
{
}
commit 331e0c83466edef000ffb02b3e55cb49c5580347
Author: Jens Carl
AuthorDate: Tue Apr 2 00:02:14 2019 +
Commit: Jens Carl
CommitDate: Tue Apr 2 03:09:04 2019 +0200
tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java tests to C++ for ScAutoFormatObj.
Change-Id: Ifa88b55b4691accb19c18a8c5f9c880d26a3d078
Reviewed-on: https://gerrit.libreoffice.org/70094
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
index c4a036d9c3f2..694fd818058d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
@@ -1,5 +1,3 @@
-"ScAutoFormatObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScAutoFormatObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScAutoFormatObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScAutoFormatObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScAutoFormatObj";"com::sun::star::container::XNamed";"getName()"
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 518b967335b1..8f86f46d2f9c 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
@@ -21,15 +22,13 @@
#include
using namespace css;
-using namespace css::uno;
-using namespace com::sun::star;
namespace sc_apitest
{
class ScAutoFormatObj : public CalcUnoApiTest,
+public apitest::TableAutoFormat,
public apitest::XEnumerationAccess,
-public apitest::TableAutoFormat
-
+public apitest::XIndexAccess
{
public:
ScAutoFormatObj();
@@ -40,11 +39,15 @@ public:
CPPUNIT_TEST_SUITE(ScAutoFormatObj);
+// TableAutoFormat
+CPPUNIT_TEST(testTableAutoFormatProperties);
+
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
-// TableAutoFormat
-CPPUNIT_TEST(testTableAutoFormatProperties);
+// XIndexAccess
+CPPUNIT_TEST(testGetByIndex);
+CPPUNIT_TEST(testGetCount);
CPPUNIT_TEST_SUITE_END();
@@ -54,19 +57,20 @@ private:
ScAutoFormatObj::ScAutoFormatObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XIndexAccess(16)
{
}
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/scsubtotaldescriptorbase.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 5f04be8d385f100d0775549cbdd7295cec1d1423
Author: Jens Carl
AuthorDate: Mon Apr 1 06:35:13 2019 +
Commit: Jens Carl
CommitDate: Mon Apr 1 22:42:55 2019 +0200
Add XServiceInfo tests to ScSubTotalDescriptorBase
Change-Id: I1460f6f205bab736d4107675b05cec5654fdb673
Reviewed-on: https://gerrit.libreoffice.org/70042
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/scsubtotaldescriptorbase.cxx
b/sc/qa/extras/scsubtotaldescriptorbase.cxx
index 96c6170a8cf1..24d282ba9c7f 100644
--- a/sc/qa/extras/scsubtotaldescriptorbase.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx
@@ -12,6 +12,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -41,6 +42,7 @@ class ScSubTotalDescriptorBase : public CalcUnoApiTest,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XPropertySet,
+ public apitest::XServiceInfo,
public apitest::XSubTotalDescriptor
{
public:
@@ -77,6 +79,11 @@ public:
CPPUNIT_TEST(testAddNew);
CPPUNIT_TEST(testClear);
+// XServiceInfo
+CPPUNIT_TEST(testGetImplementationName);
+CPPUNIT_TEST(testGetSupportedServiceNames);
+CPPUNIT_TEST(testSupportsService);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -87,6 +94,7 @@ ScSubTotalDescriptorBase::ScSubTotalDescriptorBase()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType::get())
, XIndexAccess(1)
+, XServiceInfo("ScSubTotalDescriptorBase",
"com.sun.star.sheet.SubTotalDescriptor")
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
qadevOOo/Jar_OOoRunner.mk|
1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv |
7
qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java|
122 --
sc/qa/extras/scsubtotaldescriptorbase.cxx|
9
sc/qa/unoapi/sc_7.sce|
1
5 files changed, 9 insertions(+), 131 deletions(-)
New commits:
commit 554bae3e550fb3c64473851bf9a24cb4a2eabdd8
Author: Jens Carl
AuthorDate: Mon Apr 1 06:28:54 2019 +
Commit: Jens Carl
CommitDate: Mon Apr 1 16:41:48 2019 +0200
tdf#45904 Move XPropertySet Java tests to C++
Move XPropertySet Java tests to C++ for ScSubTotalDescriptorBase.
Change-Id: I7fbfd244a9777b256098a1a7b8d3b2577cb71ebe
Reviewed-on: https://gerrit.libreoffice.org/70041
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 3539ddbfce9d..6a2a933132a8 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -969,7 +969,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScShapeObj \
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
qadevOOo/tests/java/mod/_sc/ScStyleObj \
-qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase \
qadevOOo/tests/java/mod/_sc/ScTableColumnObj \
qadevOOo/tests/java/mod/_sc/ScTableRowObj \
qadevOOo/tests/java/mod/_sc/ScTableSheetObj \
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
deleted file mode 100644
index 1bcb85bf438f..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java
b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java
deleted file mode 100644
index f8254abb2700..
--- a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.GeneralFunction;
-import com.sun.star.sheet.SubTotalColumn;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.sheet.XSubTotalCalculatable;
-import com.sun.star.sheet.XSubTotalDescriptor;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-
-/**
-* Test for object which is represented by service
-* com.sun.star.sheet.SubTotalDescriptor.
-* Object implements the following interfaces :
-*
-* com::sun::star::sheet::XSubTotalDescriptor
-* com::sun::star::sheet::SubTotalDescriptor
-* com::sun::star::beans::XPropertySet
-*
-* @see com.sun.star.sheet.XSubTotalDescriptor
-* @see com.sun.star.sheet.SubTotalDescriptor
-* @see com.sun.star.beans.XPropertySet
-* @see ifc.sheet._XSubTotalDescriptor
-* @see ifc.sheet._SubTotalDescriptor
-* @see ifc.beans._XPropertySet
-*/
-public class ScSubTotalDescriptorBase extends TestCase {
-private
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv |
2 --
sc/qa/extras/scsubtotaldescriptorbase.cxx|
9 +
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 5e67b38309b4c9c925530cafa6b9476f9839a48e
Author: Jens Carl
AuthorDate: Mon Apr 1 06:20:03 2019 +
Commit: Jens Carl
CommitDate: Mon Apr 1 09:27:55 2019 +0200
tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScSubTotalDescriptorBase.
Change-Id: I49a599b3670e709ee3170fd62c4c06295645b278
Reviewed-on: https://gerrit.libreoffice.org/70040
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
index a001e7a8497c..1bcb85bf438f 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
@@ -1,5 +1,3 @@
-"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"hasElements()"
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/sc/qa/extras/scsubtotaldescriptorbase.cxx
b/sc/qa/extras/scsubtotaldescriptorbase.cxx
index 93ff4de17081..54176abd6ea1 100644
--- a/sc/qa/extras/scsubtotaldescriptorbase.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx
@@ -8,10 +8,12 @@
*/
#include
+#include
#include
#include
#include
#include
+#include
#include
#include
@@ -22,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
@@ -33,6 +36,7 @@ namespace sc_apitest
{
class ScSubTotalDescriptorBase : public CalcUnoApiTest,
public apitest::SubTotalDescriptor,
+ public apitest::XElementAccess,
public apitest::XEnumerationAccess,
public apitest::XIndexAccess,
public apitest::XSubTotalDescriptor
@@ -49,6 +53,10 @@ public:
// SubTotalDescriptor
CPPUNIT_TEST(testSubTotalDescriptorProperties);
+// XElementAccess
+CPPUNIT_TEST(testGetElementType);
+CPPUNIT_TEST(testHasElements);
+
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
@@ -68,6 +76,7 @@ private:
ScSubTotalDescriptorBase::ScSubTotalDescriptorBase()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XElementAccess(cppu::UnoType::get())
, XIndexAccess(1)
{
}
___
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.ScSubTotalDescriptorBase.csv |
2 --
sc/qa/extras/scsubtotaldescriptorbase.cxx|
7 +++
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit ae75372dbdb74eaf959b566f1d9c2b77043e736a
Author: Jens Carl
AuthorDate: Mon Apr 1 05:28:57 2019 +
Commit: Jens Carl
CommitDate: Mon Apr 1 08:19:21 2019 +0200
tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java tests to C++ for ScSubTotalDescriptorBase.
Change-Id: I86f39c2ef5559f8b5ac4d45daeb6bcad1ab01c8c
Reviewed-on: https://gerrit.libreoffice.org/70039
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
index 2ba64e29988c..a001e7a8497c 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
@@ -1,5 +1,3 @@
-"ScSubTotalDescriptorBase";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScSubTotalDescriptorBase";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"getElementType()"
"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"hasElements()"
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
diff --git a/sc/qa/extras/scsubtotaldescriptorbase.cxx
b/sc/qa/extras/scsubtotaldescriptorbase.cxx
index 5d77331f3801..93ff4de17081 100644
--- a/sc/qa/extras/scsubtotaldescriptorbase.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
@@ -33,6 +34,7 @@ namespace sc_apitest
class ScSubTotalDescriptorBase : public CalcUnoApiTest,
public apitest::SubTotalDescriptor,
public apitest::XEnumerationAccess,
+ public apitest::XIndexAccess,
public apitest::XSubTotalDescriptor
{
public:
@@ -50,6 +52,10 @@ public:
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
+// XIndexAccess
+CPPUNIT_TEST(testGetByIndex);
+CPPUNIT_TEST(testGetCount);
+
// XSubTotalDescriptor
CPPUNIT_TEST(testAddNew);
CPPUNIT_TEST(testClear);
@@ -62,6 +68,7 @@ private:
ScSubTotalDescriptorBase::ScSubTotalDescriptorBase()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XIndexAccess(1)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/CppunitTest_sc_subtotaldescriptorbase.mk sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk sc/Module_sc.mk sc/qa
sc/CppunitTest_sc_subtotaldescriptorbase.mk | 22 +--
sc/Module_sc.mk |2 -
sc/qa/extras/scsubtotaldescriptorbase.cxx | 55 +---
3 files changed, 39 insertions(+), 40 deletions(-)
New commits:
commit af5f02ec27e3403c1e4c43bca621e2a0d261aa0e
Author: Jens Carl
AuthorDate: Mon Apr 1 03:58:12 2019 +
Commit: Jens Carl
CommitDate: Mon Apr 1 08:14:30 2019 +0200
Rename ScSubTotalDescriptorBaseObj to ScSubTotalDescriptorBase
Correct class name to mirror the name of the object we are testing
against.
Change-Id: If26dc045f67df7725043f1b0ccd0d3c8ba73f4ed
Reviewed-on: https://gerrit.libreoffice.org/70030
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
b/sc/CppunitTest_sc_subtotaldescriptorbase.mk
similarity index 76%
rename from sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
rename to sc/CppunitTest_sc_subtotaldescriptorbase.mk
index 6a4ed6a951f7..e20d002735aa 100644
--- a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_subtotaldescriptorbase.mk
@@ -9,15 +9,15 @@
#
#*
-$(eval $(call gb_CppunitTest_CppunitTest,sc_subtotaldescriptorbaseobj))
+$(eval $(call gb_CppunitTest_CppunitTest,sc_subtotaldescriptorbase))
-$(eval $(call
gb_CppunitTest_use_external,sc_subtotaldescriptorbaseobj,boost_headers))
+$(eval $(call
gb_CppunitTest_use_external,sc_subtotaldescriptorbase,boost_headers))
-$(eval $(call
gb_CppunitTest_add_exception_objects,sc_subtotaldescriptorbaseobj, \
- sc/qa/extras/scsubtotaldescriptorbaseobj \
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_subtotaldescriptorbase, \
+ sc/qa/extras/scsubtotaldescriptorbase \
))
-$(eval $(call gb_CppunitTest_use_libraries,sc_subtotaldescriptorbaseobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_subtotaldescriptorbase, \
cppu \
sal \
subsequenttest \
@@ -25,22 +25,22 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_subtotaldescriptorbaseobj, \
unotest \
))
-$(eval $(call gb_CppunitTest_set_include,sc_subtotaldescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_set_include,sc_subtotaldescriptorbase,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sc_subtotaldescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_subtotaldescriptorbase,\
offapi \
udkapi \
))
-$(eval $(call gb_CppunitTest_use_ure,sc_subtotaldescriptorbaseobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_subtotaldescriptorbaseobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_subtotaldescriptorbase))
+$(eval $(call gb_CppunitTest_use_vcl,sc_subtotaldescriptorbase))
-$(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbase,\
$(sc_unoapi_common_components) \
))
-$(eval $(call gb_CppunitTest_use_configuration,sc_subtotaldescriptorbaseobj))
+$(eval $(call gb_CppunitTest_use_configuration,sc_subtotaldescriptorbase))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 7e014431f6a5..b56484c798a5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -192,7 +192,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_spreadsheetsettingsobj \
CppunitTest_sc_stylefamiliesobj \
CppunitTest_sc_stylefamilyobj \
- CppunitTest_sc_subtotaldescriptorbaseobj \
+ CppunitTest_sc_subtotaldescriptorbase \
CppunitTest_sc_subtotalfieldobj \
CppunitTest_sc_tablecolumnsobj \
CppunitTest_sc_tableconditionalentryobj \
diff --git a/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
b/sc/qa/extras/scsubtotaldescriptorbase.cxx
similarity index 58%
rename from sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
rename to sc/qa/extras/scsubtotaldescriptorbase.cxx
index 25236174837a..5d77331f3801 100644
--- a/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx
@@ -21,36 +21,35 @@
#include
#include
#include
+#include
#include
#include
-#include
using namespace css;
-using namespace css::uno;
-using namespace com::sun::star;
-
-namespace sc_apitest {
-class ScSubTotalDescriptorBaseObj : public CalcUnoApiTest,public
apitest::XEnumerationAccess,
- public
apitest::SubTotalDescriptor,
- public
apitest::XSubTotalDescriptor
+namespace sc_apitest
+{
+class ScSubTotalDescriptorBase : public CalcUnoApiTest,
+ public apitest::SubTotalDescriptor,
+ public apitest::XEnumerationAccess,
+ public apitest::XSubTotalDescriptor
{
public:
-ScSubTotalDescriptorBaseObj();
+ScSubTotalDescriptorBase();
-virtual
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/scviewpaneobj.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 74fce77c1f05de306037ceeeb2efa5e8cb736d3f
Author: Jens Carl
AuthorDate: Fri Mar 29 22:27:56 2019 +
Commit: Jens Carl
CommitDate: Mon Apr 1 05:58:43 2019 +0200
Add XServiceInfo tests to ScViewPaneObj
Change-Id: I3764dd54f0ddb86166028a6c9c824e58ff0a88a6
Reviewed-on: https://gerrit.libreoffice.org/70029
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/scviewpaneobj.cxx b/sc/qa/extras/scviewpaneobj.cxx
index 779b019e2506..a233cc90050b 100644
--- a/sc/qa/extras/scviewpaneobj.cxx
+++ b/sc/qa/extras/scviewpaneobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
#include
@@ -38,6 +39,7 @@ class ScViewPaneObj : public CalcUnoApiTest,
public apitest::XCellRangeReferrer,
public apitest::XControlAccess,
public apitest::XFormLayerAccess,
+ public apitest::XServiceInfo,
public apitest::XViewPane
{
public:
@@ -61,6 +63,11 @@ public:
CPPUNIT_TEST(testIsFormDesignMode);
CPPUNIT_TEST(testSetFormDesignMode);
+// XServiceInfo
+CPPUNIT_TEST(testGetImplementationName);
+CPPUNIT_TEST(testGetSupportedServiceNames);
+CPPUNIT_TEST(testSupportsService);
+
// XViewPane
CPPUNIT_TEST(testFirstVisibleColumn);
CPPUNIT_TEST(testFirstVisibleRow);
@@ -74,6 +81,7 @@ private:
ScViewPaneObj::ScViewPaneObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XServiceInfo("ScViewPaneObj", "com.sun.star.sheet.SpreadsheetViewPane")
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa solenv/clang-format test/Library_subsequenttest.mk test/source
include/test/helper/form.hxx | 15
include/test/view/xformlayeraccess.hxx| 43 ++
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv |4
qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java| 174 --
sc/qa/extras/scviewpaneobj.cxx| 65 ++-
sc/qa/unoapi/sc_7.sce |1
solenv/clang-format/blacklist |1
test/Library_subsequenttest.mk|1
test/source/helper/form.cxx |8
test/source/view/xformlayeraccess.cxx | 58 +++
11 files changed, 171 insertions(+), 200 deletions(-)
New commits:
commit 2e0e7a15f66f5cb55f2a424fae6a9050c2c7f9ca
Author: Jens Carl
AuthorDate: Fri Mar 29 22:06:59 2019 +
Commit: Jens Carl
CommitDate: Sat Mar 30 22:40:23 2019 +0100
tdf#45904 Move XFormLayerAccess Java tests to C++
Move XFormLayerAccess Java tests to C++ for ScViewPaneObj.
Change-Id: I7ed6ff51d435b6f3de85daec99a13583e50a450a
Reviewed-on: https://gerrit.libreoffice.org/69942
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/helper/form.hxx b/include/test/helper/form.hxx
index f6e035d64fec..d84794cc5b6d 100644
--- a/include/test/helper/form.hxx
+++ b/include/test/helper/form.hxx
@@ -26,6 +26,19 @@ namespace helper
{
namespace form
{
+/** @brief Create a XControlShape of kind "CommandButton".
+ *
+ * @param r_xComponent The document.
+ * @param nXThe x-position of the shape.
+ * @param nYThe y-position of the shape.
+ * @param nHeight The height of the shape.
+ * @param nWidthThe width of the shape.
+ * @return The created XControlShape.
+ */
+css::uno::Reference OOO_DLLPUBLIC_TEST
createCommandButton(
+const css::uno::Reference& r_xComponent, const
sal_Int32 nX,
+const sal_Int32 nY, const sal_Int32 nHeight, const sal_Int32 nWidth);
+
/** @brief Create a XControlShape
*
* @param r_xComponent The document.
@@ -34,7 +47,7 @@ namespace form
* @param nYThe y-position of the shape.
* @param nHeight The height of the shape.
* @param nWidthThe width of the shape.
- * @return The create XControlShape.
+ * @return The created XControlShape.
*/
css::uno::Reference OOO_DLLPUBLIC_TEST
createControlShape(
const css::uno::Reference& r_xComponent, const
OUString& r_aKind,
diff --git a/include/test/view/xformlayeraccess.hxx
b/include/test/view/xformlayeraccess.hxx
new file mode 100644
index ..ddd2542ab8ef
--- /dev/null
+++ b/include/test/view/xformlayeraccess.hxx
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_VIEW_XFORMLAYERACCESS_HXX
+#define INCLUDED_TEST_VIEW_XFORMLAYERACCESS_HXX
+
+#include
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XFormLayerAccess
+{
+public:
+virtual css::uno::Reference init() = 0;
+void setForm(const css::uno::Reference& r_xForm) {
m_xForm = r_xForm; }
+
+void testGetFormController();
+void testIsFormDesignMode();
+void testSetFormDesignMode();
+
+protected:
+~XFormLayerAccess() {}
+
+private:
+css::uno::Reference m_xForm;
+};
+
+} // namespace apitest
+
+#endif // INCLUDED_TEST_VIEW_XFORMLAYERACCESS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 3cb59e2c61de..3539ddbfce9d 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -975,7 +975,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScTableSheetObj \
qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \
qadevOOo/tests/java/mod/_sc/ScTabViewObj \
-qadevOOo/tests/java/mod/_sc/ScViewPaneObj \
qadevOOo/tests/java/mod/_sc/XMLContentExporter \
qadevOOo/tests/java/mod/_sc/XMLContentImporter \
qadevOOo/tests/java/mod/_sc/XMLExporter \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv
deleted file mode 100644
index a4a3586f943f..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScViewPaneObj.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"ScViewPaneObj";"com::sun::star::view::XFormLayerAccess#optional";"getFromController()"
[Libreoffice-commits] core.git: include/test test/inc test/Library_subsequenttest.mk test/Library_test.mk test/source
include/test/helper/form.hxx|6 +++--- test/Library_subsequenttest.mk |1 - test/Library_test.mk|1 - test/source/helper/form.cxx |2 +- test/source/view/xcontrolaccess.cxx |2 +- 5 files changed, 5 insertions(+), 7 deletions(-) New commits: commit 413bfc34423b950fa5a9f9a6edc2f3d36b1e638b Author: Jens Carl AuthorDate: Fri Mar 29 18:54:53 2019 + Commit: Jens Carl CommitDate: Fri Mar 29 23:04:32 2019 +0100 Move UNO Api helper form to include/ Move UNO Api helper form to include/, so it can be used outside of directory test/. Change-Id: I9392f44df8a93d2b5ee092b0458aeef12f99fc7a Reviewed-on: https://gerrit.libreoffice.org/69936 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/test/inc/helper/form.hxx b/include/test/helper/form.hxx similarity index 91% rename from test/inc/helper/form.hxx rename to include/test/helper/form.hxx index 271f06be0b7e..f6e035d64fec 100644 --- a/test/inc/helper/form.hxx +++ b/include/test/helper/form.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_TEST_INC_HELPER_FORM_HXX -#define INCLUDED_TEST_INC_HELPER_FORM_HXX +#ifndef INCLUDED_TEST_HELPER_FORM_HXX +#define INCLUDED_TEST_HELPER_FORM_HXX #include #include @@ -44,6 +44,6 @@ css::uno::Reference OOO_DLLPUBLIC_TEST createContro } // namespace helper } // namespace apitest -#endif // INCLUDED_TEST_INC_HELPER_FORM_HXX +#endif // INCLUDED_TEST_HELPER_FORM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 65d9d1f7efd8..42cec9343c75 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Library_Library,subsequenttest)) $(eval $(call gb_Library_set_include,subsequenttest,\ - -I$(SRCDIR)/test/inc \ $$(INCLUDE) \ )) diff --git a/test/Library_test.mk b/test/Library_test.mk index f80cacf6ed9a..ce318d95471c 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Library_Library,test)) $(eval $(call gb_Library_set_include,test,\ - -I$(SRCDIR)/test/inc \ $$(INCLUDE) \ )) diff --git a/test/source/helper/form.cxx b/test/source/helper/form.cxx index 610bd43f1a51..3dbf079af59d 100644 --- a/test/source/helper/form.cxx +++ b/test/source/helper/form.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include #include #include diff --git a/test/source/view/xcontrolaccess.cxx b/test/source/view/xcontrolaccess.cxx index 5f00e88a5f63..2c24d85328c8 100644 --- a/test/source/view/xcontrolaccess.cxx +++ b/test/source/view/xcontrolaccess.cxx @@ -8,7 +8,7 @@ */ #include -#include +#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/source
include/test/container/xnamed.hxx |2 +
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv |2 -
sc/qa/extras/scsheetlinkobj.cxx|7 +
test/source/container/xnamed.cxx | 14
++
4 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit d757b121e3f0f5de03da1be430ed51bf830dce67
Author: Jens Carl
AuthorDate: Fri Mar 29 00:30:18 2019 +
Commit: Jens Carl
CommitDate: Fri Mar 29 02:47:05 2019 +0100
tdf#45904 Move XNamed Java tests to C++
Move XNamed Java tests to C++ for ScSheetLinkObj.
Change-Id: I64904ed6bae1b96767f8b0a65b0850a8694b10c2
Reviewed-on: https://gerrit.libreoffice.org/69907
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/container/xnamed.hxx
b/include/test/container/xnamed.hxx
index 1b1a762ef8b4..de8618ce4436 100644
--- a/include/test/container/xnamed.hxx
+++ b/include/test/container/xnamed.hxx
@@ -30,6 +30,8 @@ public:
void testGetName();
void testSetName();
+// special case, here name is equal to links URL
+void testSetNameByScSheetLinkObj();
void testSetNameThrowsException();
virtual css::uno::Reference< css::uno::XInterface > init() = 0;
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
index 2d72f6819568..63be54e69d85 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
@@ -1,5 +1,3 @@
-"ScSheetLinkObj";"com::sun::star::container::XNamed";"getName()"
-"ScSheetLinkObj";"com::sun::star::container::XNamed";"setName()"
"ScSheetLinkObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"ScSheetLinkObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"ScSheetLinkObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/sc/qa/extras/scsheetlinkobj.cxx b/sc/qa/extras/scsheetlinkobj.cxx
index 2819c915b6f0..5239a3288cee 100644
--- a/sc/qa/extras/scsheetlinkobj.cxx
+++ b/sc/qa/extras/scsheetlinkobj.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
#include
@@ -31,6 +32,7 @@ namespace sc_apitest
{
class ScSheetLinkObj : public CalcUnoApiTest,
public apitest::SheetLink,
+ public apitest::XNamed,
public apitest::XRefreshable
{
public:
@@ -46,6 +48,10 @@ public:
// SheetLink
CPPUNIT_TEST(testSheetLinkProperties);
+// XNamed
+CPPUNIT_TEST(testGetName);
+CPPUNIT_TEST(testSetNameByScSheetLinkObj);
+
// XRefreshable
CPPUNIT_TEST(testRefreshListener);
@@ -57,6 +63,7 @@ private:
ScSheetLinkObj::ScSheetLinkObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+,
XNamed(m_directories.getURLFromSrc("/sc/qa/extras/testdocuments/ScSheetLinkObj.ods"))
{
}
diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx
index c8234f6dde4f..3b8023b6bc95 100644
--- a/test/source/container/xnamed.cxx
+++ b/test/source/container/xnamed.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
@@ -40,6 +41,19 @@ void XNamed::testSetName()
CPPUNIT_ASSERT_EQUAL(m_aTestName, xNamed->getName());
}
+void XNamed::testSetNameByScSheetLinkObj()
+{
+uno::Reference xNamed(init(), uno::UNO_QUERY_THROW);
+OUString aTestName(m_aTestName.replaceAll("ScSheetLinkObj",
"NewScSheetLinkObj"));
+
+xNamed->setName(aTestName);
+CPPUNIT_ASSERT_EQUAL(aTestName, xNamed->getName());
+
+// restore old name
+xNamed->setName(m_aTestName);
+CPPUNIT_ASSERT_EQUAL(m_aTestName, xNamed->getName());
+}
+
void XNamed::testSetNameThrowsException()
{
uno::Reference xNamed(init(), uno::UNO_QUERY_THROW);
___
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.ScSheetLinkObj.csv |3 -
sc/qa/extras/scsheetlinkobj.cxx| 30
+-
sc/qa/extras/testdocuments/ScSheetLinkObj.ods |binary
3 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 8d45d5ee399d0148672e79c379f5d29e1c8ba6f3
Author: Jens Carl
AuthorDate: Thu Mar 28 22:21:59 2019 +
Commit: Jens Carl
CommitDate: Fri Mar 29 01:36:42 2019 +0100
tdf#45904 Move XRefreshable Java tests to C++
Move XRefreshable Java tests to C++ for ScSheetLinkObj.
Change-Id: I8225a3eb8be903ebcf51950431a5f6810a5aaa4f
Reviewed-on: https://gerrit.libreoffice.org/69906
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
index fb11276d69cb..2d72f6819568 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSheetLinkObj.csv
@@ -1,6 +1,3 @@
-"ScSheetLinkObj";"com::sun::star::util::XRefreshable";"refresh()"
-"ScSheetLinkObj";"com::sun::star::util::XRefreshable";"addRefreshListener()"
-"ScSheetLinkObj";"com::sun::star::util::XRefreshable";"removeRefreshListener()"
"ScSheetLinkObj";"com::sun::star::container::XNamed";"getName()"
"ScSheetLinkObj";"com::sun::star::container::XNamed";"setName()"
"ScSheetLinkObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
diff --git a/sc/qa/extras/scsheetlinkobj.cxx b/sc/qa/extras/scsheetlinkobj.cxx
index fbad33a9f18c..2819c915b6f0 100644
--- a/sc/qa/extras/scsheetlinkobj.cxx
+++ b/sc/qa/extras/scsheetlinkobj.cxx
@@ -9,6 +9,8 @@
#include
#include
+#include
+#include
#include
#include
@@ -24,12 +26,12 @@
#include
using namespace css;
-using namespace css::uno;
-using namespace com::sun::star;
namespace sc_apitest
{
-class ScSheetLinkObj : public CalcUnoApiTest, public apitest::SheetLink
+class ScSheetLinkObj : public CalcUnoApiTest,
+ public apitest::SheetLink,
+ public apitest::XRefreshable
{
public:
ScSheetLinkObj();
@@ -44,6 +46,9 @@ public:
// SheetLink
CPPUNIT_TEST(testSheetLinkProperties);
+// XRefreshable
+CPPUNIT_TEST(testRefreshListener);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -57,18 +62,17 @@ ScSheetLinkObj::ScSheetLinkObj()
uno::Reference ScSheetLinkObj::init()
{
-uno::Reference xDoc(mxComponent,
UNO_QUERY_THROW);
+uno::Reference xDoc(mxComponent,
uno::UNO_QUERY_THROW);
-uno::Reference xSheets(xDoc->getSheets(),
UNO_QUERY_THROW);
-uno::Reference xIA(xSheets, UNO_QUERY_THROW);
-uno::Reference xSheet(xIA->getByIndex(0),
UNO_QUERY_THROW);
+uno::Reference xSheets(xDoc->getSheets(),
uno::UNO_QUERY_THROW);
+uno::Reference xIA(xSheets, uno::UNO_QUERY_THROW);
+uno::Reference xSheet(xIA->getByIndex(0),
uno::UNO_QUERY_THROW);
-uno::Reference xSL(xSheet, UNO_QUERY_THROW);
-OUString aFileURL;
-createFileURL("ScSheetLinkObj.ods", aFileURL);
-xSL->link(aFileURL, "Sheet1", "", "", sheet::SheetLinkMode_VALUE);
+uno::Reference xSL(xSheet, uno::UNO_QUERY_THROW);
+
xSL->link(m_directories.getURLFromSrc("/sc/qa/extras/testdocuments/ScSheetLinkObj.ods"),
+ "Sheet1", "", "", sheet::SheetLinkMode_VALUE);
-uno::Reference xPropSet(xDoc, UNO_QUERY_THROW);
+uno::Reference xPropSet(xDoc, uno::UNO_QUERY_THROW);
uno::Reference sheetLinks;
CPPUNIT_ASSERT(xPropSet->getPropertyValue("SheetLinks") >>= sheetLinks);
CPPUNIT_ASSERT(sheetLinks.is());
@@ -94,7 +98,7 @@ void ScSheetLinkObj::tearDown()
CPPUNIT_TEST_SUITE_REGISTRATION(ScSheetLinkObj);
-} // end namespace
+} // namespace sc_apitest
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/qa/extras/testdocuments/ScSheetLinkObj.ods
b/sc/qa/extras/testdocuments/ScSheetLinkObj.ods
new file mode 100644
index ..7f09e0d978eb
Binary files /dev/null and b/sc/qa/extras/testdocuments/ScSheetLinkObj.ods
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
include/test/drawing/xshapes.hxx | 43 +++
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv |2
qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java| 130 --
sc/qa/extras/scdrawpageobj.cxx|9
sc/qa/unoapi/sc_4.sce |1
test/Library_subsequenttest.mk|1
test/source/drawing/xshapes.cxx | 38 ++
8 files changed, 90 insertions(+), 135 deletions(-)
New commits:
commit b99ea0ff33b78ba76d1ae436895efac490252e0f
Author: Jens Carl
AuthorDate: Thu Mar 28 21:24:35 2019 +
Commit: Jens Carl
CommitDate: Fri Mar 29 00:45:46 2019 +0100
tdf#45904 Move XShapes Java tests to C++
Move XShapes Java tests to C++ for ScDrawPageObj.
Change-Id: I1b65e8ad685c3d387a5023e8e8e9b9e06627af11
Reviewed-on: https://gerrit.libreoffice.org/69904
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/drawing/xshapes.hxx b/include/test/drawing/xshapes.hxx
new file mode 100644
index ..f04131dc41f7
--- /dev/null
+++ b/include/test/drawing/xshapes.hxx
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_DRAWING_XSHAPES_HXX
+#define INCLUDED_TEST_DRAWING_XSHAPES_HXX
+
+#include
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XShapes
+{
+public:
+virtual css::uno::Reference init() = 0;
+void setShape(const css::uno::Reference& r_xShape)
+{
+m_xShape = r_xShape;
+}
+
+void testAddRemove();
+
+protected:
+~XShapes() {}
+
+private:
+css::uno::Reference m_xShape;
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_DRAWING_XSHAPES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 4bc4edde3ba3..3cb59e2c61de 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -961,7 +961,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration \
-qadevOOo/tests/java/mod/_sc/ScDrawPageObj \
qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj \
qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
deleted file mode 100644
index b39d7b6062be..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScDrawPageObj";"com::sun::star::drawing::XShapes";"add()"
-"ScDrawPageObj";"com::sun::star::drawing::XShapes";"remove()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java
b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java
deleted file mode 100644
index 0619ca7533c4..
--- a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.DrawTools;
-import util.InstCreator;
-import util.SOfficeFactory;
-import util.ShapeDsc;
-
-import com.sun.star.drawing.XDrawPage;
-import com.sun.star.drawing.XDrawPages;
-import com.sun.star.drawing.XDrawPagesSupplier;
-import com.sun.star.drawing.XShape;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
[Libreoffice-commits] core.git: include/test
include/test/helper/shape.hxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit ee92196179d7697a514e55774be09cbf60f2c466 Author: Jens Carl AuthorDate: Thu Mar 28 20:12:35 2019 + Commit: Jens Carl CommitDate: Thu Mar 28 22:18:48 2019 +0100 Fix header guard and improve comments Change-Id: I7ddef04a88381e3e58a6604de35694dea658c81d Reviewed-on: https://gerrit.libreoffice.org/69900 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/include/test/helper/shape.hxx b/include/test/helper/shape.hxx index 9f8bd9e8b73b..e4322bec1357 100644 --- a/include/test/helper/shape.hxx +++ b/include/test/helper/shape.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_TEST_HELPER_SHAPEFACTORY_HXX -#define INCLUDED_TEST_HELPER_SHAPEFACTORY_HXX +#ifndef INCLUDED_TEST_HELPER_SHAPE_HXX +#define INCLUDED_TEST_HELPER_SHAPE_HXX #include #include @@ -33,7 +33,7 @@ namespace shape * @param nYThe y-position of the shape. * @param nHeight The height of the shape. * @param nWidthThe width of the shape. - * @return The create XShape. + * @return The created XShape. */ css::uno::Reference OOO_DLLPUBLIC_TEST createEllipse(const css::uno::Reference& r_xComponent, @@ -47,7 +47,7 @@ css::uno::Reference * @param nYThe y-position of the shape. * @param nHeight The height of the shape. * @param nWidthThe width of the shape. - * @return The create XShape. + * @return The created XShape. */ css::uno::Reference OOO_DLLPUBLIC_TEST createLine(const css::uno::Reference& r_xComponent, @@ -61,7 +61,7 @@ css::uno::Reference * @param nYThe y-position of the shape. * @param nHeight The height of the shape. * @param nWidthThe width of the shape. - * @return The create XShape. + * @return The created XShape. */ css::uno::Reference OOO_DLLPUBLIC_TEST createRectangle(const css::uno::Reference& r_xComponent, const sal_Int32 nX, @@ -75,7 +75,7 @@ createRectangle(const css::uno::Reference& r_xComponent, * @param nYThe y-position of the shape. * @param nHeight The height of the shape. * @param nWidthThe width of the shape. - * @return The create XShape. + * @return The created XShape. */ css::uno::Reference OOO_DLLPUBLIC_TEST createShape(const css::uno::Reference& r_xComponent, @@ -86,6 +86,6 @@ css::uno::Reference } // namespace helper } // namespace apitest -#endif // INCLUDED_TEST_HELPER_SHAPEFACTORY_HXX +#endif // INCLUDED_TEST_HELPER_SHAPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: test/inc test/source
test/inc/helper/form.hxx| 17 -
test/source/helper/form.cxx | 25 +++--
test/source/view/xcontrolaccess.cxx |5 +++--
3 files changed, 30 insertions(+), 17 deletions(-)
New commits:
commit 1e2868296730d3548574f61a3c6e323aa5c0598a
Author: Jens Carl
AuthorDate: Wed Mar 27 19:34:16 2019 +
Commit: Jens Carl
CommitDate: Thu Mar 28 19:55:35 2019 +0100
Be consistent with namespaces and parameter order for UNO Api helpers
Have this file the same namespaces as the new introduced helpers in
include/test/helper/shape.hxx and also change the order of the parameter
be the same to avoid confusion.
Change-Id: I5614e9a79dff3ee9aca96ff2e50ddfafa83de539
Reviewed-on: https://gerrit.libreoffice.org/69870
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/test/inc/helper/form.hxx b/test/inc/helper/form.hxx
index 173306b118c8..271f06be0b7e 100644
--- a/test/inc/helper/form.hxx
+++ b/test/inc/helper/form.hxx
@@ -22,19 +22,26 @@
namespace apitest
{
+namespace helper
+{
+namespace form
+{
/** @brief Create a XControlShape
*
* @param r_xComponent The document.
- * @param nHeight The height of the shape.
- * @param nWidthThe width of the shape.
+ * @param r_aKind The kind of the shape.
* @param nXThe x-position of the shape.
* @param nYThe y-position of the shape.
- * @param r_aKind The kind of the shape.
+ * @param nHeight The height of the shape.
+ * @param nWidthThe width of the shape.
+ * @return The create XControlShape.
*/
css::uno::Reference OOO_DLLPUBLIC_TEST
createControlShape(
-const css::uno::Reference& r_xComponent, const
sal_Int32 nHeight,
-const sal_Int32 nWidth, const sal_Int32 nX, const sal_Int32 nY, const
OUString& r_aKind);
+const css::uno::Reference& r_xComponent, const
OUString& r_aKind,
+const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nHeight, const
sal_Int32 nWidth);
+} // namespace form
+} // namespace helper
} // namespace apitest
#endif // INCLUDED_TEST_INC_HELPER_FORM_HXX
diff --git a/test/source/helper/form.cxx b/test/source/helper/form.cxx
index 47da3565f79d..610bd43f1a51 100644
--- a/test/source/helper/form.cxx
+++ b/test/source/helper/form.cxx
@@ -8,6 +8,8 @@
*/
#include
+#include
+#include
#include
#include
@@ -16,19 +18,20 @@
#include
#include
+#include
#include
-#include
-#include
-
using namespace css;
namespace apitest
{
-uno::Reference
-createControlShape(const uno::Reference& r_xComponent, const
sal_Int32 nHeight,
- const sal_Int32 nWidth, const sal_Int32 nX, const sal_Int32
nY,
- const OUString& r_aKind)
+namespace helper
+{
+namespace form
+{
+uno::Reference OOO_DLLPUBLIC_TEST createControlShape(
+const uno::Reference& r_xComponent, const OUString&
r_aKind,
+const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nHeight, const
sal_Int32 nWidth)
{
uno::Reference xMSF(r_xComponent,
uno::UNO_QUERY_THROW);
@@ -38,9 +41,8 @@ createControlShape(const uno::Reference&
r_xComponent, const s
uno::Reference aComponent(
xMSF->createInstance("com.sun.star.form.component." + r_aKind),
uno::UNO_QUERY_THROW);
uno::Reference xPropertySet(aComponent,
uno::UNO_QUERY_THROW);
-uno::Any aValue;
-aValue <<= "com.sun.star.form.control." + r_aKind;
-xPropertySet->setPropertyValue("DefaultControl", aValue);
+xPropertySet->setPropertyValue("DefaultControl",
+ uno::makeAny("com.sun.star.form.control." +
r_aKind));
uno::Reference xControlModel(aComponent,
uno::UNO_QUERY_THROW);
xControlShape->setSize(awt::Size(nHeight, nWidth));
@@ -50,6 +52,9 @@ createControlShape(const uno::Reference&
r_xComponent, const s
return xControlShape;
}
+
+} // namespace form
+} // namespace helper
} // namespace apitest
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/test/source/view/xcontrolaccess.cxx
b/test/source/view/xcontrolaccess.cxx
index 29ca1fa339aa..5f00e88a5f63 100644
--- a/test/source/view/xcontrolaccess.cxx
+++ b/test/source/view/xcontrolaccess.cxx
@@ -21,10 +21,11 @@
#include
#include
+#include
+
#include
using namespace css;
-using namespace css::uno;
namespace apitest
{
@@ -39,7 +40,7 @@ void XControlAccess::testGetControl()
uno::Reference xShapes(xDP, uno::UNO_QUERY_THROW);
uno::Reference xShape(
-createControlShape(xComponent, 100, 100, 1, 5,
"CommandButton"),
+helper::form::createControlShape(xComponent, "CommandButton", 1,
5, 100, 100),
uno::UNO_QUERY_THROW);
xShapes->add(xShape);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/drawing/xshapegrouper.hxx| 44 +++
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv |2
sc/qa/extras/scdrawpageobj.cxx| 10 +
test/Library_subsequenttest.mk|1
test/source/drawing/xshapegrouper.cxx | 58 ++
5 files changed, 112 insertions(+), 3 deletions(-)
New commits:
commit ee503c36199d225f4c906fe43c927f911c2097c7
Author: Jens Carl
AuthorDate: Thu Mar 28 00:22:44 2019 +
Commit: Jens Carl
CommitDate: Thu Mar 28 06:28:16 2019 +0100
tdf#45904 Move XShapeGrouper Java tests to C++
Move XShapeGrouper Java tests to C++ for ScDrawPageObj.
Change-Id: I4a1ed4f14f759fa4214141f0d552e35ccae28035
Reviewed-on: https://gerrit.libreoffice.org/69873
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/drawing/xshapegrouper.hxx
b/include/test/drawing/xshapegrouper.hxx
new file mode 100644
index ..1770d3f76d6c
--- /dev/null
+++ b/include/test/drawing/xshapegrouper.hxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_DRAWING_XSHAPEGROUPER_HXX
+#define INCLUDED_TEST_DRAWING_XSHAPEGROUPER_HXX
+
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XShapeGrouper
+{
+public:
+void setDrawPage(const css::uno::Reference&
r_xDrawPage)
+{
+m_xDrawPage = r_xDrawPage;
+}
+
+virtual css::uno::Reference init() = 0;
+
+void testGroup();
+void testUngroup();
+
+protected:
+~XShapeGrouper() {}
+
+private:
+css::uno::Reference m_xDrawPage;
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_DRAWING_XSHAPEGROUPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
index c742ce529e4f..b39d7b6062be 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
@@ -1,4 +1,2 @@
"ScDrawPageObj";"com::sun::star::drawing::XShapes";"add()"
"ScDrawPageObj";"com::sun::star::drawing::XShapes";"remove()"
-"ScDrawPageObj";"com::sun::star::drawing::XShapeGrouper";"group()"
-"ScDrawPageObj";"com::sun::star::drawing::XShapeGrouper";"ungroup()"
diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx
index de8d8baa4e9c..7d50a783d9d5 100644
--- a/sc/qa/extras/scdrawpageobj.cxx
+++ b/sc/qa/extras/scdrawpageobj.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -32,7 +33,8 @@ namespace sc_apitest
class ScDrawPageObj : public CalcUnoApiTest,
public apitest::XElementAccess,
public apitest::XIndexAccess,
- public apitest::XServiceInfo
+ public apitest::XServiceInfo,
+ public apitest::XShapeGrouper
{
public:
ScDrawPageObj();
@@ -56,6 +58,10 @@ public:
CPPUNIT_TEST(testGetSupportedServiceNames);
CPPUNIT_TEST(testSupportsService);
+// XShapeGrouper
+CPPUNIT_TEST(testGroup);
+CPPUNIT_TEST(testUngroup);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -90,6 +96,8 @@ uno::Reference ScDrawPageObj::init()
uno::UNO_QUERY_THROW);
xShapes->add(xRectangle1);
+// needed for XShapeGrouper tests
+setDrawPage(xDrawPage);
return xDrawPage;
}
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 7fca94314977..c267a1570d1f 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -56,6 +56,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/document/xlinktargetsupplier \
test/source/drawing/captionshape \
test/source/drawing/xdrawpages \
+ test/source/drawing/xshapegrouper \
test/source/lang/xserviceinfo \
test/source/lang/xcomponent \
test/source/sheet/cellarealink \
diff --git a/test/source/drawing/xshapegrouper.cxx
b/test/source/drawing/xshapegrouper.cxx
new file mode 100644
index ..6595050ad418
--- /dev/null
+++ b/test/source/drawing/xshapegrouper.cxx
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
