[Libreoffice-commits] core.git: basctl/source
0 files changed New commits: commit 893d22e11b78cc0d34af7d96d0ff2d0c3a34f9fb Author: Andrea Gelmini AuthorDate: Sun Aug 4 01:10:47 2019 +0200 Commit: Andrea Gelmini CommitDate: Sun Aug 4 07:50:05 2019 +0200 Removed executable permission on file Change-Id: If47f2960372668b1d34ac28df09b6efe7b11eada Reviewed-on: https://gerrit.libreoffice.org/76907 Tested-by: Jenkins Reviewed-by: Andrea Gelmini diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx old mode 100755 new mode 100644 diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jurt/com jvmfwk/inc lingucomponent/source offapi/com sw/source
jurt/com/sun/star/comp/servicemanager/ServiceManager.java |2 +-
jvmfwk/inc/elements.hxx |2 +-
lingucomponent/source/spellcheck/spell/sspellimp.cxx |2 +-
offapi/com/sun/star/report/ForceNewPage.idl |2 +-
sw/source/core/layout/ftnfrm.cxx |2 +-
sw/source/filter/ww8/ww8scan.cxx |2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 87f5719d60027d6415e9406ced161f9cd8026f45
Author: Andrea Gelmini
AuthorDate: Sun Aug 4 01:16:23 2019 +0200
Commit: Andrea Gelmini
CommitDate: Sun Aug 4 07:49:31 2019 +0200
Fix typo
Change-Id: I2991d07cb777ee83c24931798035fcc17ae48662
Reviewed-on: https://gerrit.libreoffice.org/76908
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index fd1978018ec7..574983f1e238 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -585,7 +585,7 @@ public class ServiceManager implements XMultiServiceFactory,
* The ServiceEnumerationImpl class provides an
* implementation of the @see com.sun.star.container.XEnumeration
interface.
*
- * It is a inner wrapper for a java.util.Enumeration object.
+ * It is an inner wrapper for a java.util.Enumeration object.
*
* @see com.sun.star.lang.XSingleServiceFactory
* @see com.sun.star.lang.XServiceInfo
diff --git a/jvmfwk/inc/elements.hxx b/jvmfwk/inc/elements.hxx
index 2bdaf4a7033a..4ec2e5c2fb28 100644
--- a/jvmfwk/inc/elements.hxx
+++ b/jvmfwk/inc/elements.hxx
@@ -90,7 +90,7 @@ public:
/** reads the node /java/javaInfo.
If javaInfo@xsi:nil = true then member bNil is set to true
-an no further elements are read.
+and no further elements are read.
*/
void loadFromNode(xmlDoc * pDoc,xmlNode * pJavaInfo);
/** The attribute nil will be set to false. The function gets the value
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 43f6bef717a0..3bbf8cc66f36 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -139,7 +139,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
// to prefer dictionaries with configuration entries we will only
// use those old style dictionaries that add a language that
-// is not yet supported by the list od new style dictionaries
+// is not yet supported by the list of new style dictionaries
MergeNewStyleDicsAndOldStyleDics( aDics, aOldStyleDics );
if (!aDics.empty())
diff --git a/offapi/com/sun/star/report/ForceNewPage.idl
b/offapi/com/sun/star/report/ForceNewPage.idl
index 8cc0b03c12c9..76dd0e4a963e 100644
--- a/offapi/com/sun/star/report/ForceNewPage.idl
+++ b/offapi/com/sun/star/report/ForceNewPage.idl
@@ -24,7 +24,7 @@
module com { module sun { module star { module report {
-/** Specifies if the section will be printed on an separate page.
+/** Specifies if the section will be printed on a separate page.
This does not apply to page header or page footer.
@see XSection
*/
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 89f52716e4f0..9826cf7f9e08 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2757,7 +2757,7 @@ bool SwContentFrame::MoveFootnoteCntFwd( bool bMakePage,
SwFootnoteBossFrame *pO
// then move the content inside of it.
// If it is a container or the reference differs, create a new
footnote and add
// it into the container.
-// Create also a SectionFrame if currently in a area inside a footnote.
+// Create also a SectionFrame if currently in an area inside a
footnote.
SwFootnoteFrame* pTmpFootnote = pNewUpper->IsFootnoteFrame() ?
static_cast(pNewUpper) : nullptr;
if( !pTmpFootnote )
{
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 3e2e802b1abf..e74a6907bec1 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7058,7 +7058,7 @@ static void lcl_checkFontname( OUString& sString )
// for efficiency, we'd like to use String methods as far as possible.
// Hence, we will:
// 1) convert all invalid chars to \u0001
-// 2) then erase all \u0001 chars (if anywere found), and
+// 2) then erase all \u0001 chars (if anywhere found), and
// 3) erase leading/trailing ';', in case a font name was
//completely removed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2019-04-08 02:38:11 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/mmeeks/cp-6.2-bits' - 89 commits - chart2/source comphelper/source cui/source desktop/inc desktop/Library_offacc.mk desktop/qa desktop/source filter/sou
Rebased ref, commits from common ancestor:
commit 6842ac2f7fec565b2e38a7d7fc8ded853440348b
Author: Michael Meeks
AuthorDate: Sat Aug 3 18:53:15 2019 -0400
Commit: Michael Meeks
CommitDate: Sat Aug 3 19:05:04 2019 -0400
Fix certificate test mis-merging.
Change-Id: Iea997c8eab371f278d181de0cc61323a25f0d1ae
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index de11c867412b..9101619f9ef1 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2346,7 +2346,6 @@ void DesktopLOKTest::testInsertCertificate_DER_ODT()
CPPUNIT_ASSERT_EQUAL(int(1), nState);
}
-
void DesktopLOKTest::testInsertCertificate_PEM_ODT()
{
comphelper::LibreOfficeKit::setActive();
@@ -2370,7 +2369,23 @@ void DesktopLOKTest::testInsertCertificate_PEM_ODT()
std::vector aPrivateKey;
{
-readFileIntoByteVector("rootCA.der", aCertificate);
+readFileIntoByteVector("test-cert-chain-1.pem", aCertificate);
+
+bool bResult = pDocument->m_pDocumentClass->addCertificate(
+pDocument, aCertificate.data(),
int(aCertificate.size()));
+CPPUNIT_ASSERT(bResult);
+}
+
+{
+readFileIntoByteVector("test-cert-chain-2.pem", aCertificate);
+
+bool bResult = pDocument->m_pDocumentClass->addCertificate(
+pDocument, aCertificate.data(),
int(aCertificate.size()));
+CPPUNIT_ASSERT(bResult);
+}
+
+{
+readFileIntoByteVector("test-cert-chain-3.pem", aCertificate);
bool bResult = pDocument->m_pDocumentClass->addCertificate(
pDocument, aCertificate.data(),
int(aCertificate.size()));
@@ -2391,6 +2406,66 @@ void DesktopLOKTest::testInsertCertificate_PEM_ODT()
CPPUNIT_ASSERT_EQUAL(int(1), nState);
}
+void DesktopLOKTest::testInsertCertificate_PEM_DOCX()
+{
+comphelper::LibreOfficeKit::setActive();
+
+// Load the document, save it into a temp file and load that file again
+LibLODocument_Impl* pDocument = loadDoc("blank_text.docx");
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument,
aTempFile.GetURL().toUtf8().getStr(), "docx", nullptr));
+closeDoc();
+
+mxComponent = loadFromDesktop(aTempFile.GetURL(),
"com.sun.star.text.TextDocument");
+pDocument = new LibLODocument_Impl(mxComponent);
+
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT(mxComponent.is());
+pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}");
+Scheduler::ProcessEventsToIdle();
+
+std::vector aCertificate;
+std::vector aPrivateKey;
+
+{
+readFileIntoByteVector("test-cert-chain-1.pem", aCertificate);
+
+bool bResult = pDocument->m_pDocumentClass->addCertificate(
+pDocument, aCertificate.data(),
int(aCertificate.size()));
+CPPUNIT_ASSERT(bResult);
+}
+
+{
+readFileIntoByteVector("test-cert-chain-2.pem", aCertificate);
+
+bool bResult = pDocument->m_pDocumentClass->addCertificate(
+pDocument, aCertificate.data(),
int(aCertificate.size()));
+CPPUNIT_ASSERT(bResult);
+}
+
+{
+readFileIntoByteVector("test-cert-chain-3.pem", aCertificate);
+
+bool bResult = pDocument->m_pDocumentClass->addCertificate(
+pDocument, aCertificate.data(),
int(aCertificate.size()));
+CPPUNIT_ASSERT(bResult);
+}
+
+{
+readFileIntoByteVector("test-cert-signing.pem", aCertificate);
+readFileIntoByteVector("test-PK-signing.pem", aPrivateKey);
+
+bool bResult =
pDocument->m_pDocumentClass->insertCertificate(pDocument,
+aCertificate.data(), int(aCertificate.size()),
+aPrivateKey.data(), int(aPrivateKey.size()));
+CPPUNIT_ASSERT(bResult);
+}
+
+int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument);
+CPPUNIT_ASSERT_EQUAL(int(5), nState);
+}
+
void DesktopLOKTest::testSignDocument_PEM_PDF()
{
comphelper::LibreOfficeKit::setActive();
@@ -2575,192 +2650,13 @@ void DesktopLOKTest::testComplexSelection()
CPPUNIT_ASSERT_EQUAL(static_cast(LOK_SELTYPE_COMPLEX),
pDocument->pClass->getSelectionType(pDocument));
}
-void DesktopLOKTest::testInsertCertificate_PEM_ODT()
-{
-comphelper::LibreOfficeKit::setActive();
-
-// Load the document, save it into a temp file and load that file again
-LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
-utl::TempFile aTempFile;
-aTempFile.EnableKillingFile();
-CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument,
aTempFile.GetURL().toUtf8().getStr(), "odt", nullptr));
-closeDoc();
-
-mxComponent = loadFromDesktop(aTempFile.GetURL(),
"com.sun.star.text.TextDocument");
-pDocument = new LibLODocume
[Libreoffice-commits] core.git: Branch 'private/mmeeks/cp-6.2-bits' - 86 commits - chart2/source comphelper/source cui/source desktop/inc desktop/Library_offacc.mk desktop/qa desktop/source filter/sou
Rebased ref, commits from common ancestor:
commit 633d3d470c361dbd5d720b8af5d0ed22690a5754
Author: Ashod Nakashian
AuthorDate: Tue Jun 25 23:45:37 2019 -0400
Commit: Michael Meeks
CommitDate: Sat Aug 3 16:17:04 2019 -0400
LOK: Improved selection complexity detection
Only Graphics and OLE now unconditionally
trigger 'complex' case, and for all others,
we actually tally the number of text characters.
Currently anything above 512KB is flagged as 'complex'.
Change-Id: I19fbef72f2eb725648b2a18c1ee41b1612d2bac0
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 283f77dbe221..1b0b594609d0 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -356,7 +356,7 @@ public:
*
* @return an element of the LibreOfficeKitSelectionType enum.
*/
-int getSelectionType(LibreOfficeKitDocument* pThis)
+int getSelectionType()
{
return mpDoc->pClass->getSelectionType(mpDoc);
}
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 2b79e897eca6..d47e3c4d4209 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -383,6 +383,42 @@ namespace
}
}
+sal_Bool SwTransferable::isComplex()
+{
+// Copy into a new Doc so we don't mess with the existing one.
+//FIXME: We *should* be able to avoid this and improve the performance.
+m_pClpDocFac.reset(new SwDocFac);
+SwDoc* const pTmpDoc = lcl_GetDoc(*m_pClpDocFac);
+
+pTmpDoc->getIDocumentFieldsAccess()
+.LockExpFields(); // never update fields - leave text as it is
+lclOverWriteDoc(*m_pWrtShell, *pTmpDoc);
+
+sal_Int32 nTextLength = 0;
+const SwNode* pEndOfContent =
&m_pWrtShell->GetDoc()->GetNodes().GetEndOfContent();
+SwNodes& aNodes = pTmpDoc->GetNodes();
+for( sal_uLong nIndex = 0; nIndex < aNodes.Count(); ++nIndex)
+{
+SwNode& rNd = *aNodes[nIndex];
+if (&rNd == pEndOfContent)
+break;
+
+if (rNd.IsOLENode() || rNd.IsGrfNode())
+return true; // Complex
+
+SwTextNode* pTextNode = rNd.GetTextNode();
+if (pTextNode)
+{
+nTextLength += pTextNode->GetText().getLength();
+if (nTextLength >= 1024 * 512)
+return true; // Complex
+}
+}
+
+// Simple
+return false;
+}
+
bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString&
rDestDoc )
{
SotClipboardFormatId nFormat = SotExchange::GetFormat( rFlavor );
commit 0347ea63073e4d18d983885bec3c9f9225267ba7
Author: Marco Cecchetti
AuthorDate: Tue Mar 26 15:11:33 2019 +0100
Commit: Michael Meeks
CommitDate: Sat Aug 3 16:14:01 2019 -0400
lok: update graphic selection callback description
Change-Id: I1ae073cc8e307b5c42aed9b17d405ef36ce4dc43
Reviewed-on: https://gerrit.libreoffice.org/70569
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index f2b9ea70018d..61bf237c1caa 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -171,11 +171,40 @@ typedef enum
*/
LOK_CALLBACK_CURSOR_VISIBLE = 5,
/**
- * The size and/or the position of the graphic selection changed and
- * the rotation angle of the embedded graphic object
+ * The size and/or the position of the graphic selection changed,
+ * the rotation angle of the embedded graphic object, and a property list
+ * which can be used for informing the client about severl properties.
*
- * Format is "x, y, width, height, angle", where angle is in 100th
- * of degree.
+ * Format is "x, y, width, height, angle, { list of properties }",
+ * where angle is in 100th of degree, and the property list is optional.
+ *
+ * The "{ list of properties }" part is in JSON format.
+ * Follow some examples of the property list part:
+ *
+ * 1) when the selected object is an image inserted in Writer:
+ *
+ * { "isWriterGraphic": true }
+ *
+ * 2) when the selected object is a chart legend:
+ *
+ * { "isDraggable": true, "isResizable": true, "isRotatable": false }
+ *
+ * 3) when the selected object is a pie segment in a chart:
+ *
+ * {
+ * "isDraggable": true,
+ * "isResizable": false,
+ * "isRotatable": false,
+ * "dragInfo": {
+ * "dragMethod": "PieSegmentDragging",
+ * "initialOffset": 50,
+ * "dragDirection": [x, y],
+ * "svg": "
AuthorDate: Wed Apr 10 21:04:51 2019 +0200
Commit: Michael Meeks
CommitDate: Sat Aug 3 16:14:00 2019 -0400
lok: chart: informing the client about selection ha
[Libreoffice-commits] core.git: Branch 'private/mmeeks/cp-6.2-bits' - 1880 commits - accessibility/inc accessibility/Library_acc.mk accessibility/source avmedia/source basctl/source basctl/uiconfig ba
Rebased ref, commits from common ancestor:
commit 2aac1b29877901ac78c1a04fbed518ed8e73f155
Author: Marco Cecchetti
AuthorDate: Tue Mar 26 15:11:33 2019 +0100
Commit: Michael Meeks
CommitDate: Sat Aug 3 16:07:48 2019 -0400
lok: update graphic selection callback description
Change-Id: I1ae073cc8e307b5c42aed9b17d405ef36ce4dc43
Reviewed-on: https://gerrit.libreoffice.org/70569
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index f2b9ea70018d..61bf237c1caa 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -171,11 +171,40 @@ typedef enum
*/
LOK_CALLBACK_CURSOR_VISIBLE = 5,
/**
- * The size and/or the position of the graphic selection changed and
- * the rotation angle of the embedded graphic object
+ * The size and/or the position of the graphic selection changed,
+ * the rotation angle of the embedded graphic object, and a property list
+ * which can be used for informing the client about severl properties.
*
- * Format is "x, y, width, height, angle", where angle is in 100th
- * of degree.
+ * Format is "x, y, width, height, angle, { list of properties }",
+ * where angle is in 100th of degree, and the property list is optional.
+ *
+ * The "{ list of properties }" part is in JSON format.
+ * Follow some examples of the property list part:
+ *
+ * 1) when the selected object is an image inserted in Writer:
+ *
+ * { "isWriterGraphic": true }
+ *
+ * 2) when the selected object is a chart legend:
+ *
+ * { "isDraggable": true, "isResizable": true, "isRotatable": false }
+ *
+ * 3) when the selected object is a pie segment in a chart:
+ *
+ * {
+ * "isDraggable": true,
+ * "isResizable": false,
+ * "isRotatable": false,
+ * "dragInfo": {
+ * "dragMethod": "PieSegmentDragging",
+ * "initialOffset": 50,
+ * "dragDirection": [x, y],
+ * "svg": "
AuthorDate: Wed Apr 10 21:04:51 2019 +0200
Commit: Michael Meeks
CommitDate: Sat Aug 3 16:06:06 2019 -0400
lok: chart: informing the client about selection handling properties
We hijack the chart CID protocol (CID:/classification/ObjectID) by
inserting information about selection handling properties (draggable,
resizable, rotatable) btw the classification section and the ObjectID
section.
This new section has the form: /Draggable=?:Resizable=?:Rotatable=?
where in place of '?' there is 0 or 1.
The hijacking occurs at the ChartController.getSelection method which
is available through the XSelectionSupplier interface.
Change-Id: Iaf920fe68e59c2595000e43d3fc1f976632cef18
Reviewed-on: https://gerrit.libreoffice.org/70567
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti
diff --git a/chart2/source/controller/inc/ChartController.hxx
b/chart2/source/controller/inc/ChartController.hxx
index 19500d034afa..22469e396480 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -319,6 +319,10 @@ public:
static bool isObjectDeleteable( const css::uno::Any& rSelection );
+bool isSelectedObjectDraggable() const;
+bool isSelectedObjectResizable() const;
+bool isSelectedObjectRotatable() const;
+
void setDrawMode( ChartDrawMode eMode ) { m_eDrawMode = eMode; }
bool isShapeContext() const;
diff --git a/chart2/source/controller/inc/SelectionHelper.hxx
b/chart2/source/controller/inc/SelectionHelper.hxx
index b9fe3fc20377..19a40c9a5af2 100644
--- a/chart2/source/controller/inc/SelectionHelper.hxx
+++ b/chart2/source/controller/inc/SelectionHelper.hxx
@@ -38,9 +38,9 @@ public: //methods
css::uno::Reference< css::drawing::XShape > const &
getSelectedAdditionalShape();
const ObjectIdentifier& getSelectedOID() const { return m_aSelectedOID;}
-bool isResizeableObjectSelected();
-bool isRotateableObjectSelected( const css::uno::Reference<
css::frame::XModel >& xChartModel );
-bool isDragableObjectSelected();
+bool isResizeableObjectSelected() const;
+bool isRotateableObjectSelected( const css::uno::Reference<
css::frame::XModel >& xChartModel ) const;
+bool isDragableObjectSelected() const;
bool isAdditionalShapeSelected() const;
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx
b/chart2/source/controller/main/ChartController_Tools.cxx
index 625c41c9617f..b1d26f3425ab 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -571,6 +571,23 @@ bool ChartController::isObjectDeleteable( const uno::Any&
rSelection )
return false;
}
+bool Cha
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/dptabsrc.cxx | 16 +++-
1 file changed, 3 insertions(+), 13 deletions(-)
New commits:
commit 3ab2df3cf755ecd0e3e31ad06872426d24222c31
Author: Arkadiy Illarionov
AuthorDate: Sat Aug 3 21:15:57 2019 +0300
Commit: Arkadiy Illarionov
CommitDate: Sat Aug 3 21:00:59 2019 +0200
tdf#39593 Drop lcl_GetIndexFromName
Use comphelper::findValue instead
Change-Id: Id8490034b0f957084680fef18ba07974b5373fb2
Reviewed-on: https://gerrit.libreoffice.org/76896
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 0b3f79e35a0d..c72f34a559cc 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include
#include
@@ -589,17 +590,6 @@ static long lcl_CountMinMembers(const
vector& ppDim, const vecto
return nTotal;
}
-static long lcl_GetIndexFromName( const OUString& rName, const
uno::Sequence& rElements )
-{
-long nCount = rElements.getLength();
-const OUString* pArray = rElements.getConstArray();
-for (long nPos=0; nPos& rDims = bIsRow ? maRowDims : maColDims;
@@ -796,8 +786,8 @@ void ScDPSource::CreateRes_Impl()
eRefType ==
sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE_DIFFERENCE ||
eRefType == sheet::DataPilotFieldReferenceType::RUNNING_TOTAL )
{
-long nColumn = lcl_GetIndexFromName(
-aDataRefValues.back().ReferenceField,
GetDimensionsObject()->getElementNames());
+long nColumn = comphelper::findValue(
+GetDimensionsObject()->getElementNames(),
aDataRefValues.back().ReferenceField);
if ( nColumn >= 0 )
{
nDataRefOrient = GetOrientation(nColumn);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/mgetempl.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 30c551416d23ff09b8bfe09b69059c052c25c4e6
Author: Jim Raykowski
AuthorDate: Thu Aug 1 08:57:08 2019 -0800
Commit: Jim Raykowski
CommitDate: Sat Aug 3 20:40:53 2019 +0200
tdf#120286 Disable edit style if inherit from is disabled or None
Change-Id: Ia08adef09292d330d570a5a931d83317ffa7c3f2
Reviewed-on: https://gerrit.libreoffice.org/76825
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 4b022a8eddc0..817174cf1b99 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -505,7 +505,10 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet*
/*rAttrSet*/ )
pStyle->SetParent( aParent );
if ( aParent.isEmpty() )
+{
m_xBaseLb->set_active_text( SfxResId(STR_NONE) );
+m_xEditLinkStyleBtn->set_sensitive( false );
+}
else
m_xBaseLb->set_active_text( aParent );
@@ -516,6 +519,8 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet*
/*rAttrSet*/ )
m_xBaseLb->set_sensitive(false);
}
}
+else
+m_xEditLinkStyleBtn->set_sensitive( false );
if (m_xFilterLb->get_sensitive())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/basobj2.cxx| 24 ++--
basctl/source/basicide/scriptdocument.cxx | 29 ++---
2 files changed, 28 insertions(+), 25 deletions(-)
New commits:
commit 087f778579900998e8a37e2e9581ea230870a26e
Author: Andreas Heinisch
AuthorDate: Fri Aug 2 15:04:22 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 3 20:23:06 2019 +0200
tdf#93476 Sort Macro library list after creating/importing a macro
Moved sorting to inline functions, so the sorter is created only once
Change-Id: I5f06e8d94d2b93f8856cacfd42257f62b84d6e73
Reviewed-on: https://gerrit.libreoffice.org/76867
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
old mode 100644
new mode 100755
index 4131f7a6453d..801be80507b4
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -91,17 +91,12 @@ bool IsValidSbxName( const OUString& rName )
return true;
}
-static bool StringCompareLessThan( const OUString& rStr1, const OUString&
rStr2 )
+Sequence< OUString > GetMergedLibraryNames( const Reference<
script::XLibraryContainer >& xModLibContainer, const Reference<
script::XLibraryContainer >& xDlgLibContainer )
{
+// create a sorted list of module library names
auto const sort = comphelper::string::NaturalStringSorter(
comphelper::getProcessComponentContext(),
Application::GetSettings().GetUILanguageTag().getLocale());
-return sort.compare(rStr1, rStr2) < 0;
-}
-
-Sequence< OUString > GetMergedLibraryNames( const Reference<
script::XLibraryContainer >& xModLibContainer, const Reference<
script::XLibraryContainer >& xDlgLibContainer )
-{
-// create a sorted list of module library names
std::vector aModLibList;
if ( xModLibContainer.is() )
{
@@ -110,7 +105,10 @@ Sequence< OUString > GetMergedLibraryNames( const
Reference< script::XLibraryCon
const OUString* pModLibNames = aModLibNames.getConstArray();
for ( sal_Int32 i = 0 ; i < nModLibCount ; i++ )
aModLibList.push_back( pModLibNames[ i ] );
-std::sort( aModLibList.begin() , aModLibList.end() ,
StringCompareLessThan );
+std::sort(aModLibList.begin(), aModLibList.end(),
+ [&sort](const OUString& rLHS, const OUString& rRHS) {
+ return sort.compare(rLHS, rRHS) < 0;
+ });
}
// create a sorted list of dialog library names
@@ -122,12 +120,18 @@ Sequence< OUString > GetMergedLibraryNames( const
Reference< script::XLibraryCon
const OUString* pDlgLibNames = aDlgLibNames.getConstArray();
for ( sal_Int32 i = 0 ; i < nDlgLibCount ; i++ )
aDlgLibList.push_back( pDlgLibNames[ i ] );
-std::sort( aDlgLibList.begin() , aDlgLibList.end() ,
StringCompareLessThan );
+std::sort(aDlgLibList.begin(), aDlgLibList.end(),
+ [&sort](const OUString& rLHS, const OUString& rRHS) {
+ return sort.compare(rLHS, rRHS) < 0;
+ });
}
// merge both lists
std::vector aLibList( aModLibList.size() + aDlgLibList.size() );
-std::merge( aModLibList.begin(), aModLibList.end(), aDlgLibList.begin(),
aDlgLibList.end(), aLibList.begin(), StringCompareLessThan );
+std::merge(aModLibList.begin(), aModLibList.end(), aDlgLibList.begin(),
aDlgLibList.end(),
+ aLibList.begin(), [&sort](const OUString& rLHS, const OUString&
rRHS) {
+ return sort.compare(rLHS, rRHS) < 0;
+ });
std::vector::iterator aIterEnd = std::unique( aLibList.begin(),
aLibList.end() ); // move unique elements to the front
aLibList.erase( aIterEnd, aLibList.end() ); // remove duplicates
diff --git a/basctl/source/basicide/scriptdocument.cxx
b/basctl/source/basicide/scriptdocument.cxx
old mode 100644
new mode 100755
index 3146da2be9d1..2ecc4a2ab23e
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -116,14 +116,6 @@ namespace basctl
namespace
{
-bool StringCompareLessThan( const OUString& lhs, const OUString& rhs )
-{
-auto const sort = comphelper::string::NaturalStringSorter(
-comphelper::getProcessComponentContext(),
-Application::GetSettings().GetUILanguageTag().getLocale());
-return sort.compare(lhs, rhs) < 0;
-}
-
class FilterDocuments : public docs::IDocumentDescriptorFilter
{
public:
@@ -1138,11 +1130,13 @@ namespace basctl
// sort document list by doc title?
if ( _eListType == DocumentsSorted )
{
-std::sort( aScriptDocs.begin(), aScriptDocs.end(),
-[]( const ScriptDocument& lhs, const ScriptDocument& rhs )
-{
-return StringCompareLessThan( lhs.getTitle(),
Re: Crash test update
On Sat, 2019-08-03 at 04:45 +, Crashtest VM wrote: > New crashtest update available at > http://dev-builds.libreoffice.org/crashtest/2207269a84c7c9920af3385b837ce67978c720 FWIW the new bazillion export failures on export to odt seem to be triggered by beec1594587d0bf1ea2268f9a435c948b5580278 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source
cui/source/dialogs/scriptdlg.cxx | 26 +++---
1 file changed, 19 insertions(+), 7 deletions(-)
New commits:
commit 60b6288bc1aec17d04b45f62ba6f117fc43f8ab4
Author: Mike Kaganski
AuthorDate: Fri Aug 2 07:08:04 2019 +1000
Commit: Caolán McNamara
CommitDate: Sat Aug 3 20:15:58 2019 +0200
tdf#126643: avoid unnecessary asking for JRE in script organizer dialog
Use two-pass search for the needed language node; if it fails with Java
interaction disabled, only then repeat the search with it enabled, like
in commit f3ce30ec75a4d7116b9cd4d7b21d9aaa0e237eeb.
Change-Id: Icde5dbeb552a6837af02182f7b8cbbc90765c5a5
Reviewed-on: https://gerrit.libreoffice.org/76831
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 1a1f4e73b7ab9e5b071aab74c8d7e27ba2b2d29c)
Reviewed-on: https://gerrit.libreoffice.org/76878
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 11ef3a8820e2..99ac608b17af 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
@@ -47,6 +48,7 @@
#include
#include
+#include
#include
#include
@@ -247,14 +249,24 @@ SvxScriptOrgDialog::getLangNodeFromRootNode( Reference<
browse::XBrowseNode > co
try
{
-Sequence < Reference< browse::XBrowseNode > > children =
rootNode->getChildNodes();
-for ( sal_Int32 n = 0; n < children.getLength(); n++ )
+auto tryFind = [&] {
+const Sequence> children =
rootNode->getChildNodes();
+const auto it = std::find_if(children.begin(), children.end(),
+ [&](const
Reference& child) {
+ return child->getName() ==
language;
+ });
+return (it != children.end()) ? *it : nullptr;
+};
{
-if ( children[ n ]->getName() == language )
-{
-langNode = children[ n ];
-break;
-}
+// First try without Java interaction, to avoid warnings for
non-JRE-dependent providers
+css::uno::ContextLayer layer(
+new
comphelper::NoEnableJavaInteractionContext(css::uno::getCurrentContext()));
+langNode = tryFind();
+}
+if (!langNode)
+{
+// Now try with Java interaction enabled
+langNode = tryFind();
}
}
catch ( Exception& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/StaticLibrary_fuzzerstubs.mk vcl/workben
vcl/StaticLibrary_fuzzerstubs.mk|1
vcl/workben/localestub/localedata_en_LK.cxx | 144
2 files changed, 145 insertions(+)
New commits:
commit b6dd7f8af5c8da1f5e337be53381860166da575e
Author: Caolán McNamara
AuthorDate: Sat Aug 3 16:22:51 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Aug 3 20:15:25 2019 +0200
ofz#16191 add en_LK locale data stub
Change-Id: I0a4fd74e9f50e5d62d2bbd294a42cd272af90e44
Reviewed-on: https://gerrit.libreoffice.org/76891
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/StaticLibrary_fuzzerstubs.mk b/vcl/StaticLibrary_fuzzerstubs.mk
index d96d67ec3c85..aef8a9059386 100644
--- a/vcl/StaticLibrary_fuzzerstubs.mk
+++ b/vcl/StaticLibrary_fuzzerstubs.mk
@@ -30,6 +30,7 @@ $(eval $(call
gb_StaticLibrary_add_exception_objects,fuzzerstubs,\
vcl/workben/localestub/localedata_en_IE \
vcl/workben/localestub/localedata_en_IN \
vcl/workben/localestub/localedata_en_JM \
+vcl/workben/localestub/localedata_en_LK \
vcl/workben/localestub/localedata_en_MW \
vcl/workben/localestub/localedata_en_MY \
vcl/workben/localestub/localedata_en_NA \
diff --git a/vcl/workben/localestub/localedata_en_LK.cxx
b/vcl/workben/localestub/localedata_en_LK.cxx
new file mode 100644
index ..aa71f3abdd15
--- /dev/null
+++ b/vcl/workben/localestub/localedata_en_LK.cxx
@@ -0,0 +1,144 @@
+#include
+
+#include
+
+extern "C" {
+
+static const sal_Unicode langID[] = { 0x65, 0x6e, 0x0 };
+static const sal_Unicode langDefaultName[] = { 0x45, 0x6e, 0x67, 0x6c, 0x69,
0x73, 0x68, 0x0 };
+static const sal_Unicode countryID[] = { 0x4c, 0x4b, 0x0 };
+static const sal_Unicode countryDefaultName[]
+= { 0x53, 0x72, 0x69, 0x20, 0x4c, 0x61, 0x6e, 0x6b, 0x61, 0x0 };
+static const sal_Unicode Variant[] = { 0x0 };
+
+static const sal_Unicode* LCInfoArray[]
+= { langID, langDefaultName, countryID, countryDefaultName, Variant };
+
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getLCInfo_en_LK(sal_Int16& count)
+{
+count = SAL_N_ELEMENTS(LCInfoArray);
+return (sal_Unicode**)LCInfoArray;
+}
+extern sal_Unicode** SAL_CALL getLocaleItem_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getLocaleItem_en_LK(sal_Int16&
count)
+{
+return getLocaleItem_en_GB(count);
+}
+static const sal_Unicode replaceTo0[]
+= { 0x5b, 0x24, 0x52, 0x73, 0x2d, 0x41, 0x34, 0x30, 0x39, 0x5d, 0x0 };
+extern sal_Unicode const* const* SAL_CALL getAllFormats0_en_GB(sal_Int16&
count,
+ const
sal_Unicode*& from,
+ const
sal_Unicode*& to);
+SAL_DLLPUBLIC_EXPORT sal_Unicode const* const* SAL_CALL
+getAllFormats0_en_LK(sal_Int16& count, const sal_Unicode*& from, const
sal_Unicode*& to)
+{
+to = replaceTo0;
+const sal_Unicode* tmp;
+return getAllFormats0_en_GB(count, from, tmp);
+}
+extern sal_Unicode** SAL_CALL getDateAcceptancePatterns_en_GB(sal_Int16&
count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL
getDateAcceptancePatterns_en_LK(sal_Int16& count)
+{
+return getDateAcceptancePatterns_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getCollatorImplementation_en_GB(sal_Int16&
count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL
getCollatorImplementation_en_LK(sal_Int16& count)
+{
+return getCollatorImplementation_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getCollationOptions_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL
getCollationOptions_en_LK(sal_Int16& count)
+{
+return getCollationOptions_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getSearchOptions_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getSearchOptions_en_LK(sal_Int16&
count)
+{
+return getSearchOptions_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getIndexAlgorithm_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getIndexAlgorithm_en_LK(sal_Int16&
count)
+{
+return getIndexAlgorithm_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getUnicodeScripts_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getUnicodeScripts_en_LK(sal_Int16&
count)
+{
+return getUnicodeScripts_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getFollowPageWords_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL
getFollowPageWords_en_LK(sal_Int16& count)
+{
+return getFollowPageWords_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getAllCalendars_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getAllCalendars_en_LK(sal_Int16&
count)
+{
+return getAllCalendars_en_GB(count);
+}
+static const sal_Unicode defaultCurrency0[] = { 1 };
+static const sal_Unicode defaultCurrencyUsedInCompatibleFormatCodes0[] = { 1 };
+static const sal_Unicode defaultCurrencyLegacyOnly0[] = { 0 };
+static const sal_Unicode curre
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/generalpage.cxx |2 +-
dbaccess/source/ui/dlg/generalpage.hxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit da4f0083bf9d554edc758073099d176911ad9dfd
Author: Caolán McNamara
AuthorDate: Sat Aug 3 17:28:36 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Aug 3 20:14:42 2019 +0200
some missed vcl::Window->TabPageParent opportunities
Change-Id: Idb652586ff659874750779d30cb2b38b3df8892e
Reviewed-on: https://gerrit.libreoffice.org/76893
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index 2cf8d121999e..2ed044a43795 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -443,7 +443,7 @@ namespace dbaui
}
// OGeneralPageWizard
-OGeneralPageWizard::OGeneralPageWizard( vcl::Window* pParent, const
SfxItemSet& _rItems )
+OGeneralPageWizard::OGeneralPageWizard(TabPageParent pParent, const
SfxItemSet& _rItems)
: OGeneralPage( pParent, "dbaccess/ui/generalpagewizard.ui", _rItems )
, m_xRB_CreateDatabase(m_xBuilder->weld_radio_button("createDatabase"))
,
m_xRB_OpenExistingDatabase(m_xBuilder->weld_radio_button("openExistingDatabase"))
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx
b/dbaccess/source/ui/dlg/generalpage.hxx
index bc6b477caf42..359ed6641f82 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -117,7 +117,7 @@ namespace dbaui
class OGeneralPageWizard final : public OGeneralPage
{
public:
-OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems );
+OGeneralPageWizard( TabPageParent pParent, const SfxItemSet& _rItems );
virtual ~OGeneralPageWizard() override;
enum CreationMode
___
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/tool/addincol.cxx | 42 ---
1 file changed, 18 insertions(+), 24 deletions(-)
New commits:
commit 9307a23a40a0a18d86dade102354ba4871825c5a
Author: Arkadiy Illarionov
AuthorDate: Sat Aug 3 19:25:32 2019 +0300
Commit: Arkadiy Illarionov
CommitDate: Sat Aug 3 19:28:12 2019 +0200
tdf#39593 extract getting max row length to template function
Change-Id: I23c81ac7dbd8785b12620aaf8ae2c090ae1785f8
Reviewed-on: https://gerrit.libreoffice.org/76894
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 78104c11ef2e..7279aa4029ec 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -1463,6 +1463,18 @@ void
ScUnoAddInCall::ExecuteCallWithArgs(uno::Sequence& rCallArgs)
}
}
+template
+static long lcl_GetMaxColCount(const uno::Sequence< uno::Sequence >*
pRowSeq)
+{
+if (!pRowSeq->hasElements())
+return 0;
+
+auto pRow = std::max_element(pRowSeq->begin(), pRowSeq->end(),
+[](const uno::Sequence& a, const uno::Sequence& b) {
+return a.getLength() < b.getLength(); });
+return pRow->getLength();
+}
+
void ScUnoAddInCall::SetResult( const uno::Any& rNewRes )
{
nErrCode = FormulaError::NONE;
@@ -1528,16 +1540,10 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes
)
if ( pRowSeq )
{
long nRowCount = pRowSeq->getLength();
-const uno::Sequence* pRowArr =
pRowSeq->getConstArray();
-long nMaxColCount = 0;
-for (long nRow=0; nRow nMaxColCount )
-nMaxColCount = nTmp;
-}
+long nMaxColCount = lcl_GetMaxColCount(pRowSeq);
if ( nMaxColCount && nRowCount )
{
+const uno::Sequence* pRowArr =
pRowSeq->getConstArray();
xMatrix = new ScMatrix(
static_cast(nMaxColCount),
static_cast(nRowCount), 0.0);
@@ -1569,16 +1575,10 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes
)
if ( pRowSeq )
{
long nRowCount = pRowSeq->getLength();
-const uno::Sequence* pRowArr =
pRowSeq->getConstArray();
-long nMaxColCount = 0;
-for (long nRow=0; nRow nMaxColCount )
-nMaxColCount = nTmp;
-}
+long nMaxColCount = lcl_GetMaxColCount(pRowSeq);
if ( nMaxColCount && nRowCount )
{
+const uno::Sequence* pRowArr =
pRowSeq->getConstArray();
xMatrix = new ScMatrix(
static_cast(nMaxColCount),
static_cast(nRowCount), 0.0);
@@ -1610,16 +1610,10 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes
)
if ( pRowSeq )
{
long nRowCount = pRowSeq->getLength();
-const uno::Sequence* pRowArr =
pRowSeq->getConstArray();
-long nMaxColCount = 0;
-for (long nRow=0; nRow nMaxColCount )
-nMaxColCount = nTmp;
-}
+long nMaxColCount = lcl_GetMaxColCount(pRowSeq);
if ( nMaxColCount && nRowCount )
{
+const uno::Sequence* pRowArr =
pRowSeq->getConstArray();
xMatrix = new ScMatrix(
static_cast(nMaxColCount),
static_cast(nRowCount), 0.0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/mmeeks/cp-6.2-bits'
New branch 'private/mmeeks/cp-6.2-bits' available with the following commits: commit c1860dc7ce113418f5248a232ea55f1f415ef22c Author: Marco Cecchetti Date: Fri Nov 30 17:20:37 2018 +0100 lok: shape selection: perform the needed unit conversion in a clever way Change-Id: I505bd41801b5fd1898a9eddc81b102f2f7ae20b5 Reviewed-on: https://gerrit.libreoffice.org/70563 Tested-by: Jenkins Reviewed-by: Marco Cecchetti commit 6e1dd8c3624bd35bf6802270f75a13650ea9358c Author: Tor Lillqvist Date: Tue May 14 10:20:50 2019 +0300 We apparently need to drop the Solar Mutex when exiting lo_runLoop() on iOS It seems to be held after soffice_main() returns for the first document opened, but not subsequent ones, for some reason. So acquire it an extra time to be able to use Application::ReleaseSolarMutex()... Without this, when opening a subsequent document, the loleaflet loading progress bar just hangs. Change-Id: I4e4e7b814f0dba836b790b6f68470aab54f8bbb9 commit 9c2dceef6ae27d82424aa3160c7974245220ea73 Author: Andrea Gelmini Date: Wed May 8 10:13:07 2019 + Fix typo Change-Id: Ia8f5ca10c974a0ba2d1686b341ef2a1dd44b824d Reviewed-on: https://gerrit.libreoffice.org/72260 Tested-by: Jenkins Reviewed-by: Julien Nabet commit 2690fe5ac576ddc0afc6672fa28b05af564fdcf0 Author: Tor Lillqvist Date: Mon May 13 18:06:13 2019 +0300 Fix comment to match reality lo_runLoop() *is* used in the "Unipoll" case (i.e. current Online and mobile apps). Change-Id: I01ef3d8bc8140531f697952ef142150fc905a8d4 commit 54a79f80ca4d5cb4f88ef515d7b3a8462eea3cd6 Author: Michael Meeks Date: Thu May 9 18:24:18 2019 +0100 unipoll: let InitVCL tolerate double init. We need to get VCL initialized early in UniPoll mode, since the main setup doesn't occur until runPoll is invoked, and we want to call lots of virtual methods that take the SolarMutex before then - which requires VCL to be initialized. Change-Id: Id9c1b74c126cf7bb71d6560b7585d37327a9f5ef Reviewed-on: https://gerrit.libreoffice.org/72071 Tested-by: Jenkins Reviewed-by: Michael Meeks commit d0ca35c9446296fa1bc747e64ae761ccd3bd46b2 Author: Miklos Vajna Date: Thu May 9 18:13:20 2019 +0200 CppunitTest_desktop_lib: close the document while LOK is still active Otherwise the LOK notifiers won't be released (since LOK is not active), and we leak vcl::Windows in GetLOKWindowsMap()::s_pLOKWindowsMap. In dbgutil builds, this leads to an assertion failure if the sidebar is active. Change-Id: Idedb9578478ff4a9f2e17c0cfd203da6f007bdbd Reviewed-on: https://gerrit.libreoffice.org/72065 Reviewed-by: Miklos Vajna Tested-by: Jenkins commit d78fa76cee13be72824b2091a093332d0be9262d Author: Miklos Vajna Date: Tue May 7 21:10:19 2019 +0200 desktop: can pass by value in LOKTransferable Change-Id: Iba7c216f28700e8899d76942a4a0a8b77ed3c549 Reviewed-on: https://gerrit.libreoffice.org/71930 Tested-by: Jenkins Reviewed-by: Miklos Vajna commit 8f7a56d9410456ccd64928f66fa023f62f7ab6fc Author: Michael Meeks Date: Sat Apr 27 13:37:52 2019 +0100 unipoll: emit user input-events & uno commands directly when in unipoll mode. Rather than emitting asynchronously at idle. Change-Id: I6c72e9fad0b5587941e3a4a4d17d331a0d889942 Reviewed-on: https://gerrit.libreoffice.org/71809 Tested-by: Jenkins Reviewed-by: Michael Meeks commit c2fa3f2d90a517661f29ae7054c6094b977a4197 Author: Miklos Vajna Date: Mon May 6 14:27:04 2019 +0200 desktop: turn on clang-format for lokclipboard This had manual consistent formatting. Recently it was broken, so bring back consisency by using clang-format. Change-Id: If4303e379ddc77e5190f8e8e42737b4f7d680a71 Reviewed-on: https://gerrit.libreoffice.org/71857 Reviewed-by: Miklos Vajna Tested-by: Jenkins commit 34524f0f013fe019628a1fd95a3c9ee9b94ecaaa Author: Michael Meeks Date: Fri May 3 17:24:13 2019 +0100 unipoll: cleanup runPoll. Setting a custom thread name is a terrible idea for online unit tests. Change-Id: I1f5843255ab59072f806587ffcf655958380fe8e Reviewed-on: https://gerrit.libreoffice.org/71762 Reviewed-by: Michael Meeks Tested-by: Michael Meeks commit 251d1e54a1ef8ede2a122f1a0cd84f7dd7a8bfa7 Author: Michael Meeks Date: Fri May 3 13:36:56 2019 +0100 unipoll: get SolarMutex lock counting right. lo_startmain drops the SolarMutex without taking it, interestingly. Change-Id: I2280e2fa6acb8739f970983032db72a8241d1c4f Reviewed-on: https://gerrit.libreoffice.org/71741 Tested-by: Michael Meeks Reviewed-by: Michael Meeks commit f5fdae1faa9a80d863bc7bb26a6fa50650e2f0db Author: Henry Castro Date: Thu Apr 18 18:10:13 2019 -0400 lok: allow paste content to popup dialog Chang
[Libreoffice-commits] libvisio.git: 16 commits - src/lib src/test
src/lib/Makefile.am |1
src/lib/VSDFieldList.cpp |4
src/lib/VSDParser.cpp| 18
src/lib/VSDParser.h |1
src/lib/VSDStyles.cpp| 200 +++
src/lib/VSDStyles.h | 10 ++
src/lib/VSDTypes.cpp | 80 ++
src/lib/VSDTypes.h |6 +
src/test/importtest.cpp | 64 +++
9 files changed, 349 insertions(+), 35 deletions(-)
New commits:
commit 8480dedbe1a5fd27df4c0bfc0ecbb868ad081a8b
Author: David Tardon
AuthorDate: Sat Aug 3 18:59:23 2019 +0200
Commit: David Tardon
CommitDate: Sat Aug 3 18:59:52 2019 +0200
WaE: implicitly-declared Pointer::operator= is deprecated
Change-Id: I1a092b3e976bd31b1764698001b9f320757d2cc4
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 03b24fd..5ad8aa3 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -23,6 +23,24 @@
#include "VSDStylesCollector.h"
#include "VSDMetaData.h"
+namespace libvisio
+{
+
+const Pointer &Pointer::operator=(const Pointer &ptr)
+{
+ if (this != &ptr)
+ {
+Type = ptr.Type;
+Offset = ptr.Offset;
+Length = ptr.Length;
+Format = ptr.Format;
+ListSize = ptr.ListSize;
+ }
+ return *this;
+}
+
+}
+
libvisio::VSDParser::VSDParser(librevenge::RVNGInputStream *input,
librevenge::RVNGDrawingInterface *painter, librevenge::RVNGInputStream
*container)
: m_input(input), m_painter(painter), m_container(container), m_header(),
m_collector(nullptr), m_shapeList(), m_currentLevel(0),
m_stencils(), m_currentStencil(nullptr), m_shape(),
m_isStencilStarted(false), m_isInStyles(false),
diff --git a/src/lib/VSDParser.h b/src/lib/VSDParser.h
index be8515b..e8fd64c 100644
--- a/src/lib/VSDParser.h
+++ b/src/lib/VSDParser.h
@@ -37,6 +37,7 @@ struct Pointer
: Type(0), Offset(0), Length(0), Format(0), ListSize(0) {}
Pointer(const Pointer &ptr)
: Type(ptr.Type), Offset(ptr.Offset), Length(ptr.Length),
Format(ptr.Format), ListSize(ptr.ListSize) {}
+ const Pointer &operator=(const Pointer &ptr);
unsigned Type;
unsigned Offset;
unsigned Length;
commit 3a1c047b8de4c354b4fb866a7c14012e124067ee
Author: David Tardon
AuthorDate: Sat Aug 3 18:56:11 2019 +0200
Commit: David Tardon
CommitDate: Sat Aug 3 18:56:44 2019 +0200
WaE: implicitly-declared VSDOptionalFillStyle::operator= is deprecated
Change-Id: Iabc5a0e4fa4b223fd39405829257cce35d44d92e
diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp
index 7c9d339..c04ea1a 100644
--- a/src/lib/VSDStyles.cpp
+++ b/src/lib/VSDStyles.cpp
@@ -87,6 +87,26 @@ const VSDLineStyle &VSDLineStyle::operator=(const
VSDLineStyle &style)
return *this;
}
+const VSDOptionalFillStyle &VSDOptionalFillStyle::operator=(const
VSDOptionalFillStyle &style)
+{
+ if (this != &style)
+ {
+fgColour = style.fgColour;
+bgColour = style.bgColour;
+pattern = style.pattern;
+fgTransparency = style.fgTransparency;
+bgTransparency = style.bgTransparency;
+shadowFgColour = style.shadowFgColour;
+shadowPattern = style.shadowPattern;
+shadowOffsetX = style.shadowOffsetX;
+shadowOffsetY = style.shadowOffsetY;
+qsFillColour = style.qsFillColour;
+qsShadowColour = style.qsShadowColour;
+qsFillMatrix = style.qsFillMatrix;
+ }
+ return *this;
+}
+
const VSDFillStyle &VSDFillStyle::operator=(const VSDFillStyle &style)
{
if (this != &style)
diff --git a/src/lib/VSDStyles.h b/src/lib/VSDStyles.h
index 338d641..dc229af 100644
--- a/src/lib/VSDStyles.h
+++ b/src/lib/VSDStyles.h
@@ -130,6 +130,7 @@ struct VSDOptionalFillStyle
qsFillColour(style.qsFillColour), qsShadowColour(style.qsShadowColour),
qsFillMatrix(style.qsFillMatrix) {}
~VSDOptionalFillStyle() {}
+ const VSDOptionalFillStyle &operator=(const VSDOptionalFillStyle &style);
void override(const VSDOptionalFillStyle &style)
{
ASSIGN_OPTIONAL(style.pattern, pattern);
commit f860cf6342530b80248f9c054fa16d1b293509a0
Author: David Tardon
AuthorDate: Sat Aug 3 18:50:01 2019 +0200
Commit: David Tardon
CommitDate: Sat Aug 3 18:54:00 2019 +0200
WaE: implicitly-declared VSDTextBlockStyle::operator= is deprecated
Change-Id: Ic482a4bdd3386504ec65fb04c5d302bc2218ecf9
diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp
index 3bf28ca..7c9d339 100644
--- a/src/lib/VSDStyles.cpp
+++ b/src/lib/VSDStyles.cpp
@@ -216,6 +216,23 @@ const VSDOptionalTextBlockStyle
&VSDOptionalTextBlockStyle::operator=(const VSDO
return *this;
}
+const VSDTextBlockStyle &VSDTextBlockStyle::operator=(const VSDTextBlockStyle
&style)
+{
+ if (this != &style)
+ {
+leftMargin = style.leftMargin;
+rightMargin = style.rightMargin;
+topMargin = style.topMargin;
+bottomMargin = style.bottomMargin;
+verticalAlign = style.verticalAlign;
+isTextBkgndFilled = style.isTextBkgndFilled;
+textBkgndColour = style.textBkgndColour;
+defaultTabStop = style.defaultTabSt
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f59b2a66001272fc4d3350f7f9918fe0311c6f81 Author: Andras Timar AuthorDate: Tue Jul 30 18:11:54 2019 +0200 Commit: Gerrit Code Review CommitDate: Sat Aug 3 15:09:04 2019 +0200 Update git submodules * Update dictionaries from branch 'master' - Updated Slovenian thesaurus Change-Id: I92b7d40652ce056b627fdac251a36976a2a9301c Reviewed-on: https://gerrit.libreoffice.org/76708 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/dictionaries b/dictionaries index 86b4b5bfbff9..358cce8e6243 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 86b4b5bfbff91c2eb223806825e5fa5fec9654d2 +Subproject commit 358cce8e6243ce539b3a2e2b5505c9b7271389c4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: sl_SI/description.xml sl_SI/README_th_sl_SI.txt sl_SI/th_sl_SI_v2.dat
sl_SI/README_th_sl_SI.txt |4 sl_SI/description.xml |2 sl_SI/th_sl_SI_v2.dat | 1472 +++--- 3 files changed, 1273 insertions(+), 205 deletions(-) New commits: commit 358cce8e6243ce539b3a2e2b5505c9b7271389c4 Author: Andras Timar AuthorDate: Tue Jul 30 18:11:54 2019 +0200 Commit: Andras Timar CommitDate: Sat Aug 3 15:09:04 2019 +0200 Updated Slovenian thesaurus Change-Id: I92b7d40652ce056b627fdac251a36976a2a9301c Reviewed-on: https://gerrit.libreoffice.org/76708 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/sl_SI/README_th_sl_SI.txt b/sl_SI/README_th_sl_SI.txt index e09343e..2b4cdfe 100644 --- a/sl_SI/README_th_sl_SI.txt +++ b/sl_SI/README_th_sl_SI.txt @@ -2,7 +2,7 @@ The Slovenian thesaurus is developed as a part of project/ Slovenski tezaver nastaja v okviru projekta: OdprtiTezaver (www.tezaver.si) This dictionary pack includes version/Paket vsebuje različico: - 1.9.19001 + 1.9.19500 Thesaurus managed and edited by/Tezaver pripravlja in ureja: Martin Srebotnjak (miles at filmsi net) Thesaurus data licensed under both/Podatki tezavra so izdani pod licencama: @@ -18,7 +18,7 @@ Bug report/O napakah poročajte: http://external.openoffice.org/ form data: Product Name: Slovenian thesaurus -Product Version: 1.9.19001 +Product Version: 1.9.19500 Vendor or Owner Name: Martin Srebotnjak Vendor or Owner Contact: mi...@filmsi.net OpenOffice.org Contact: fil...@openoffice.org diff --git a/sl_SI/description.xml b/sl_SI/description.xml index e71ec63..8ebcba9 100644 --- a/sl_SI/description.xml +++ b/sl_SI/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + Slovenian spelling dictionary, hyphenation rules, and thesaurus diff --git a/sl_SI/th_sl_SI_v2.dat b/sl_SI/th_sl_SI_v2.dat index 49b5d67..c0c15cc 100644 --- a/sl_SI/th_sl_SI_v2.dat +++ b/sl_SI/th_sl_SI_v2.dat @@ -203,8 +203,10 @@ ISO8859-2 (sam.)|�karjevec|�karnik|�pirovec|lemez|ro�enica �karnik|1 (sam.)|�karjevec|�karnica|�pirovec|lemez|ro�enica +�karpena|1 +(sam.)|�karpina|bodeljka|bodika|zmajeglav �karpina|1 -(sam.)|bodeljka|bodika +(sam.)|�karpena|bodeljka|bodika|zmajeglav �kilast|1 (prid.)|�kilav|kri�emgled|krivogled|prekogled (zastarelo) �kilav|1 @@ -295,6 +297,8 @@ ISO8859-2 (sam.)|voznik �ofirati|1 (gl.)|voziti +�ola|1 +(sam.)|hram u�enosti (starinsko)|u�ilna (zastarelo)|u�ilnica (zastarelo) �olmo�ter|1 (sam.)|u�itelj �otori��e|2 @@ -506,6 +510,8 @@ ISO8859-2 (sam.)|�aba|�abura (slab�alno)|rega (ekspresivno)|reglja� (ekspresivno) �afran|1 (sam.)|krokus +�ajfa|1 +(sam.)|�ajfa (neknji�no)|milo �ale|1 (sam.)|britof (nizko)|pokopali��e �ale�e|1 @@ -733,6 +739,12 @@ ISO8859-2 �lehtnoba|2 (sam.)|�kodo�eljnost|�lehtnoba (neknji�no)|hudobnost|malicioznost|zlobnost (sam.)|�lehtnoba (neknji�no)|hudobne�|zlobne� +�lezna bula|1 +(sam.)|�lezni tumor|adenom +�lezni tumor|1 +(sam.)|�lezna bula|adenom +�lobudranje|1 +(sam.)|blebetanje �ogobrc|2 (sam.)|nogomet (sam.)|nogometa� @@ -747,6 +759,8 @@ ISO8859-2 (sam.)|celak �relen|1 (prid.)|faringalen +�relni�en|1 +(prid.)|adenoiden �relo|1 (sam.)|farinks �rtvenik|1 @@ -783,35 +797,77 @@ ISO8859-2 (gl.)|gostoleti|peti a�uren|1 (prid.)|pravo�asen|sproten +abak|1 +(sam.)|abakus|ra�unalo +abakus|1 +(sam.)|abak|ra�unalo abalineacija|1 (sam.)|alienacija|odtujevanje|odtujitev +abdicirati|1 +(gl.)|odstopiti abdikacija|1 (sam.)|demisija|odreka|odstop|odstopitev|ostavka abdomen|2 (sam.)|trebuh (sam.)|zadek +abdominalen|1 +(prid.)|trebu�en +abducirati|1 +(gl.)|odmikati +abdukcija|1 +(sam.)|odmikanje|adukcija (protipomenka) +abduktor|2 +(sam.)|odmikalka +(sam.)|odtegovalka abeceda|2 (sam.)|�rkopis|pisava (sam.)|alfabet abeceden|1 -(prid.)|alfabeti�en +(prid.)|alfabeti�en|alfabetski +abecednik|2 +(sam.)|berilo|�itanka +(sam.)|prvo berilo +abecedno|1 +(prisl.)|po abecedi|po abecednem redu +aberacija|3 +(sam.)|nenavadnost|netipi�nost +(sam.)|odklon|odmik +(sam.)|zarisba abesinija|1 (sam.)|Etiopija abesinski|1 (prid.)|etiopski +abhazij��ina|1 +(sam.)|abhazijski jezik +abhazijski jezik|1 +(sam.)|abhazij��ina +abiogeneza|1 +(sam.)|praploditev +abioti�en|1 +(prid.)|abiotski|ne�iv +abiotski|1 +(prid.)|abioti�en|ne�iv abisalen|1 (prid.)|batialen|globinski|globokomorski -ablacija|1 +abiturient|2 +(sam.)|diplomant|diplomiranec +(sam.)|maturant +abiturientka|2 +(sam.)|diplomantka|diplomiranka +(sam.)|maturantka +ablacija|2 +(sam.)|kirur�ka odstranitev (sam.)|odna�anje|odplakovanje ablativ|1 (sam.)|lo�ilnik abnormalen|1 (prid.)|abnormen|nenormalen|nepravilen abnormalno|1 -(prisl.)|nenormalno -abnormalnost|3 +(prisl.)|nenormalno|nepravilno +abnormalnost|4 (sam.)|abnormiteta|abnormnost (sam.)|anomalija|anomalnost|izjemnost|nepravilnost +(sam.)|anomalija|deformacija|hiba (sam.)|bizarnost|�ud
[Libreoffice-commits] translations.git: Branch 'libreoffice-6-3' - source/sl
source/sl/cui/messages.po | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) New commits: commit fb3c00ffcfbf0108893095fcbbf9d81216c421f1 Author: Andras Timar AuthorDate: Sat Aug 3 15:06:41 2019 +0200 Commit: Andras Timar CommitDate: Sat Aug 3 15:06:41 2019 +0200 Updated Slovenian translation Change-Id: I12d126a9c1c823b95a9e4a6a0dd845df75bb09b4 diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po index ad0d003be7b..44fbaa35624 100644 --- a/source/sl/cui/messages.po +++ b/source/sl/cui/messages.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: LibreOffice 6.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; "POT-Creation-Date: 2019-07-22 09:02+0200\n" -"PO-Revision-Date: 2019-07-01 00:39+0200\n" +"PO-Revision-Date: 2019-07-29 01:30+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" @@ -1834,7 +1834,7 @@ msgstr "Če želite program začasno zagnati s svežim uporabniškim profilom al #: cui/inc/tipoftheday.hrc:51 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Change the basic fonts for the predefined template or current document per Tools > Options > %PRODUCTNAME Writer > Basic Fonts." -msgstr "Spremenite osnovne pisave za vnaprej določeno predlogo ali trenutni dokument prek ukaza %PRODUCTNAME > NastavitveOrodja > Možnosti > %PRODUCTNAME Writer > Osnovne pisave." +msgstr "Spremenite osnovne pisave za vnaprej določeno predlogo ali trenutni dokument prek ukaza Orodja > Možnosti > %PRODUCTNAME Writer > Osnovne pisave." #. https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01040300.html #: cui/inc/tipoftheday.hrc:52 @@ -1846,7 +1846,7 @@ msgstr "Pogosto uporabljena besedila definirajte kot samobesedilo. Poimensko, pr #: cui/inc/tipoftheday.hrc:53 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "%PRODUCTNAME can automatically add a numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME Writer > AutoCaption." -msgstr "Ko vstavljate predmete, lahko %PRODUCTNAME samodejno doda oštevilčeni napis. Glejte %PRODUCTNAME > NastavitveOrodja > Možnosti > %PRODUCTNAME Writer > Samodejni napis." +msgstr "Ko vstavljate predmete, lahko %PRODUCTNAME samodejno doda oštevilčeni napis. Glejte Orodja > Možnosti > %PRODUCTNAME Writer > Samodejni napis." #. https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01041100.html #: cui/inc/tipoftheday.hrc:54 @@ -1888,7 +1888,7 @@ msgstr "Želite v %PRODUCTNAME Calc razvrstiti niz, kot je A1, A2, A3, A11, A15, #: cui/inc/tipoftheday.hrc:60 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Enable massive parallel calculations of formula cells via Tools > Options > OpenCL." -msgstr "Omogočite množične vzporedne izračune formul v celicah prek %PRODUCTNAME > NastavitveOrodja > Možnosti > OpenCL." +msgstr "Omogočite množične vzporedne izračune formul v celicah prek Orodja > Možnosti > OpenCL." #. https://help.libreoffice.org/6.2/en-US/text/shared/optionen/opencl.html #: cui/inc/tipoftheday.hrc:61 @@ -1954,7 +1954,7 @@ msgstr "Želite zapolniti niz? Izberite obseg celic in ukaz Delovni list > Zapol #: cui/inc/tipoftheday.hrc:72 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "With %PRODUCTNAME you can use your Google Mail account to do a mail merge. Fill in Tools > Options > %PRODUCTNAME Writer > Mail Merge Email." -msgstr "Z %PRODUCTNAME lahko za spajanje pošte uporabite svoj račun Google Mail. Izpolnite potrebne podatke v %PRODUCTNAME > NastavitveOrodja > Možnosti > %PRODUCTNAME Writer > Spajanje e-pošte." +msgstr "Z %PRODUCTNAME lahko za spajanje pošte uporabite svoj račun Google Mail. Izpolnite potrebne podatke v Orodja > Možnosti > %PRODUCTNAME Writer > Spajanje e-pošte." #. local help missing #: cui/inc/tipoftheday.hrc:73 @@ -2144,7 +2144,7 @@ msgstr "Svoje dokumente enostavno pretvorite v zapis PDF z enim samim klikom, č #: cui/inc/tipoftheday.hrc:109 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Select a different icon set from Tools > Options > %PRODUCTNAME > View > User Interface > Icon size and style." -msgstr "Drug nabor ikon lahko izberete prek %PRODUCTNAME > NastavitveOrodja > Možnosti > %PRODUCTNAME > Pogled > Uporabniški vmesnik > Velikost in slog ikon." +msgstr "Drug nabor ikon lahko izberete prek Orodja > Možnosti > %PRODUCTNAME > Pogled > Uporabniški vmesnik > Velikost in slog ikon." #: cui/inc/tipoftheday.hrc:110 msgctxt "RID_CUI_TIPOFTHEDAY" @@ -2194,7 +2194,7 @@ msgstr "Pretvorite več dokumentov programa Microsoft Office v obliko zapisa Ope #: cui/inc/tipoftheday.hrc:119 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Uncheck Tools > Option
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e32058fbd5fb9025e0d2799905aa0a2d1d2a1488 Author: Andras Timar AuthorDate: Sat Aug 3 15:06:41 2019 +0200 Commit: Gerrit Code Review CommitDate: Sat Aug 3 15:06:47 2019 +0200 Update git submodules * Update translations from branch 'libreoffice-6-3' - Updated Slovenian translation Change-Id: I12d126a9c1c823b95a9e4a6a0dd845df75bb09b4 diff --git a/translations b/translations index f7fd1330c8cf..fb3c00ffcfbf 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit f7fd1330c8cfdefab2a8a61f0a53f171f7f2f130 +Subproject commit fb3c00ffcfbf0108893095fcbbf9d81216c421f1 ___ 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' - connectivity/qa
connectivity/qa/connectivity/mysql/mysql.cxx | 45 +++
1 file changed, 45 insertions(+)
New commits:
commit fbaa95177333c8ca5cb4c0f07c7bf9f53a01af26
Author: Tamas Bunth
AuthorDate: Wed Jul 31 14:20:21 2019 +0200
Commit: Xisco Faulí
CommitDate: Sat Aug 3 14:22:13 2019 +0200
mysqlc: Add test for textual blob types
Test setting and querying the following data types:
TINYTEXT, TEXT, MEDIUMTEXT, LONGTEXT
Test them using prepared statements.
Change-Id: I43387034ad8c32c3731cde70a22cc8b3dd652b78
Reviewed-on: https://gerrit.libreoffice.org/76747
Tested-by: Jenkins
Reviewed-by: Tamás Bunth
(cherry picked from commit cbbda5b9267f9f7c7028ebc3f0867ddc6715543a)
Reviewed-on: https://gerrit.libreoffice.org/76874
Reviewed-by: Xisco Faulí
diff --git a/connectivity/qa/connectivity/mysql/mysql.cxx
b/connectivity/qa/connectivity/mysql/mysql.cxx
index 24af725b0110..47d1d7929e44 100644
--- a/connectivity/qa/connectivity/mysql/mysql.cxx
+++ b/connectivity/qa/connectivity/mysql/mysql.cxx
@@ -55,6 +55,7 @@ public:
void testTimestampField();
void testNumericConversionPrepared();
void testPreparedStmtIsAfterLast();
+void testGetStringFromBloColumnb();
CPPUNIT_TEST_SUITE(MysqlTestDriver);
CPPUNIT_TEST(testDBConnection);
@@ -65,6 +66,7 @@ public:
CPPUNIT_TEST(testTimestampField);
CPPUNIT_TEST(testNumericConversionPrepared);
CPPUNIT_TEST(testPreparedStmtIsAfterLast);
+CPPUNIT_TEST(testGetStringFromBloColumnb);
CPPUNIT_TEST_SUITE_END();
};
@@ -444,6 +446,49 @@ void MysqlTestDriver::testPreparedStmtIsAfterLast()
bool hasData = xResultSet->next();
CPPUNIT_ASSERT(!hasData); // now we are on "AfterLast"
CPPUNIT_ASSERT(xResultSet->isAfterLast());
+xStatement->executeUpdate("DROP TABLE IF EXISTS myTestTable");
+}
+
+void MysqlTestDriver::testGetStringFromBloColumnb()
+{
+Reference xConnection = m_xDriver->connect(m_sUrl, m_infos);
+if (!xConnection.is())
+CPPUNIT_ASSERT_MESSAGE("cannot connect to data source!",
xConnection.is());
+uno::Reference xStatement = xConnection->createStatement();
+CPPUNIT_ASSERT(xStatement.is());
+xStatement->executeUpdate("DROP TABLE IF EXISTS myTestTable");
+
+// create test table
+xStatement->executeUpdate("CREATE TABLE myTestTable (id INTEGER PRIMARY
KEY, tinytexty "
+ "TINYTEXT, texty TEXT, mediumTexty MEDIUMTEXT,
longtexty LONGTEXT)");
+Reference xPrepared = xConnection->prepareStatement(
+OUString{ "INSERT INTO myTestTable VALUES (?, ?, ?, ?, ?)" });
+Reference xParams(xPrepared, UNO_QUERY);
+constexpr int ROW_COUNT = 6;
+for (int i = 0; i < ROW_COUNT; ++i)
+{
+xParams->setShort(1, i);
+xParams->setString(2, OUString::number(i));
+xParams->setString(3, OUString::number(i));
+xParams->setString(4, OUString::number(i));
+xParams->setString(5, OUString::number(i));
+xPrepared->executeUpdate();
+}
+
+// query test table
+xPrepared = xConnection->prepareStatement(
+"SELECT tinytexty, texty, mediumtexty, longtexty from myTestTable
where texty LIKE '3'");
+Reference xResultSet = xPrepared->executeQuery();
+xResultSet->next();
+Reference xRow(xResultSet, UNO_QUERY);
+
+// all the textual blob types should be able to be queried via getString().
+CPPUNIT_ASSERT_EQUAL(OUString("3"), xRow->getString(1));
+CPPUNIT_ASSERT_EQUAL(OUString("3"), xRow->getString(2));
+CPPUNIT_ASSERT_EQUAL(OUString("3"), xRow->getString(3));
+CPPUNIT_ASSERT_EQUAL(OUString("3"), xRow->getString(4));
+
+xStatement->executeUpdate("DROP TABLE IF EXISTS myTestTable");
}
CPPUNIT_TEST_SUITE_REGISTRATION(MysqlTestDriver);
___
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' - 2 commits - connectivity/source filter/source sw/source
connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |7 -
filter/source/pdf/impdialog.cxx| 12
+++---
sw/source/core/view/printdata.cxx |3 +-
3 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 587c828640c799729b00e1d96c96c161f97293c5
Author: Tamas Bunth
AuthorDate: Wed Sep 12 17:31:26 2018 +0200
Commit: Xisco Faulí
CommitDate: Sat Aug 3 14:21:54 2019 +0200
mysqlc: getTablePrivileges not implemented, so..
it should throw an exception.
Reviewed-on: https://gerrit.libreoffice.org/60460
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit 19f8ea668833a4dc90244792cbf91881b0ca9a07)
Change-Id: I32b0b5dde0bcfd8cc59d0814a9f35d43c0f58ae1
Reviewed-on: https://gerrit.libreoffice.org/76750
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit acafd1ac87cb23a447353b8f0419a25fbe1c4430)
Reviewed-on: https://gerrit.libreoffice.org/76873
Reviewed-by: Xisco Faulí
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 3bdc27e7744b..f04b8928714b 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -1046,14 +1046,9 @@ Reference SAL_CALL
ODatabaseMetaData::getBestRowIdentifier(const Any
Reference SAL_CALL ODatabaseMetaData::getTablePrivileges(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString&
/*tableNamePattern*/)
{
-Reference
xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
-
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
- UNO_QUERY);
-std::vector> rRows;
// TODO
SAL_WARN("connectivity.mysqlc", "method not implemented");
-lcl_setRows_throw(xResultSet, 12, rRows);
-return xResultSet;
+throw SQLException("getTablePrivileges method not implemented", *this,
"IM001", 0, Any());
}
Reference SAL_CALL ODatabaseMetaData::getCrossReference(
commit 87d5c863109f7991e3f2f3a1eb970c00d5a27bd5
Author: Daniel Silva
AuthorDate: Sat Dec 8 10:15:26 2018 -0200
Commit: Xisco Faulí
CommitDate: Sat Aug 3 14:21:41 2019 +0200
tdf#54908 Make selection active if there's a selection (Writer)
If the user make a selection in Writer and then opens print dialog or PDF
export dialog, Print Selection is the default option.
Change-Id: I46ba90cfeabafef1c05dd3e5008ecf55f177a146
Reviewed-on: https://gerrit.libreoffice.org/64804
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit f50363c7008c239d302944144beb256de6a55f38)
Reviewed-on: https://gerrit.libreoffice.org/76879
Reviewed-by: Xisco Faulí
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 213f2cc2dc02..14738ff2e723 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -503,8 +503,9 @@ void
ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
mxRbAll->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleAllHdl )
);
TogglePagesHdl();
-mxRbSelection->set_sensitive( pParent->mbSelectionPresent );
-if ( pParent->mbSelectionPresent )
+const bool bSelectionPresent = pParent->mbSelectionPresent;
+mxRbSelection->set_sensitive( bSelectionPresent );
+if ( bSelectionPresent )
mxRbSelection->connect_toggled( LINK( this, ImpPDFTabGeneralPage,
ToggleSelectionHdl ) );
mbIsPresentation = pParent->mbIsPresentation;
mbIsWriter = pParent->mbIsWriter;
@@ -611,7 +612,12 @@ void
ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
}
mxCbExportPlaceholders->set_visible(mbIsWriter);
-if( !mbIsWriter )
+if( mbIsWriter )
+{
+// tdf#54908 Make selection active if there is a selection in Writer's
version
+mxRbSelection->set_active( bSelectionPresent );
+}
+else
{
mxCbExportPlaceholders->set_active(false);
}
diff --git a/sw/source/core/view/printdata.cxx
b/sw/source/core/view/printdata.cxx
index 44f34d1e2a5f..2e9d9d3a7606 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -301,7 +301,8 @@ SwPrintUIOptions::SwPrintUIOptions(
aWidgetIds[4] = "rbRangeSelection";
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds,
OUString(),
aHelpIds,
aPrintRangeName,
-aChoices, 0 /* always
default to 'All pages' */,
+aChoices,
+bHasSelection ? 4 : 0,
[Libreoffice-commits] core.git: sw/source
sw/source/filter/docx/swdocxreader.cxx |2 +-
sw/source/filter/html/css1atr.cxx|2 +-
sw/source/filter/html/htmlatr.cxx| 12 ++--
sw/source/filter/html/htmlgrin.cxx |2 +-
sw/source/filter/html/htmlsect.cxx |2 +-
sw/source/filter/html/htmltab.cxx|2 +-
sw/source/filter/html/htmltabw.cxx |2 +-
sw/source/filter/html/parcss1.cxx|2 +-
sw/source/filter/html/swhtml.cxx |4 ++--
sw/source/filter/html/wrthtml.cxx|2 +-
sw/source/filter/inc/msfilter.hxx|4 ++--
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
sw/source/filter/ww8/docxsdrexport.cxx |2 +-
sw/source/filter/ww8/writerhelper.cxx|2 +-
sw/source/filter/ww8/wrtw8esh.cxx|6 +++---
sw/source/filter/ww8/wrtw8nds.cxx|6 +++---
sw/source/filter/ww8/wrtw8sty.cxx|4 ++--
sw/source/filter/ww8/wrtww8.cxx |4 ++--
sw/source/filter/ww8/wrtww8.hxx |2 +-
sw/source/filter/ww8/wrtww8gr.cxx|2 +-
sw/source/filter/ww8/ww8atr.cxx |2 +-
sw/source/filter/ww8/ww8glsy.cxx |2 +-
sw/source/filter/ww8/ww8graf.cxx |4 ++--
sw/source/filter/ww8/ww8par.cxx | 18 +-
sw/source/filter/ww8/ww8par.hxx |2 +-
sw/source/filter/ww8/ww8par2.cxx | 12 ++--
sw/source/filter/ww8/ww8scan.cxx | 12 ++--
sw/source/filter/ww8/ww8scan.hxx |2 +-
sw/source/filter/xml/xmlimp.cxx |6 +++---
sw/source/filter/xml/xmltble.cxx |2 +-
sw/source/filter/xml/xmltbli.cxx | 18 +-
31 files changed, 73 insertions(+), 73 deletions(-)
New commits:
commit d05b2b91952927ec40d6ea2f482f76c7ccd25ed3
Author: Andrea Gelmini
AuthorDate: Thu Aug 1 13:01:26 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 3 09:55:58 2019 +0200
Fix typos
Change-Id: Ia6a6d93bade801fab77bfba701b64a905328c695
Reviewed-on: https://gerrit.libreoffice.org/76774
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/sw/source/filter/docx/swdocxreader.cxx
b/sw/source/filter/docx/swdocxreader.cxx
index ea3a2a1065d6..d9f16f087b76 100644
--- a/sw/source/filter/docx/swdocxreader.cxx
+++ b/sw/source/filter/docx/swdocxreader.cxx
@@ -229,7 +229,7 @@ bool SwDOCXReader::MakeEntries( SwDoc *pD, SwTextBlocks
&rBlocks )
while( sal_uInt16(-1) != nCurPos )
{
-// add an Number to it
+// add a Number to it
sShortcut = aLNm + OUString::number( ++nStart );
nCurPos = rBlocks.GetIndex( sShortcut );
}
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 53fe8ef3c76e..6aea83c11b60 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1511,7 +1511,7 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const
SwFormat& rFormat,
const SfxItemSet& rFormatItemSet = rFormat.GetAttrSet();
SfxItemSet aItemSet( *rFormatItemSet.GetPool(), rFormatItemSet.GetRanges()
);
aItemSet.Set( rFormatItemSet ); // Was nDeep!=1 that is not working
-// for script dependent items buts should
+// for script dependent items but should
// not make a difference for any other
bool bSetDefaults = true, bClearSame = true;
diff --git a/sw/source/filter/html/htmlatr.cxx
b/sw/source/filter/html/htmlatr.cxx
index 56bf878addad..29254ad651c8 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1103,7 +1103,7 @@ class HTMLEndPosLst
bool ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos,
sal_Int32 nEndPos );
-// adapt the end of a splitted item
+// adapt the end of a split item
void FixSplittedItem( HTMLStartEndPos *pPos, sal_Int32 nNewEnd,
HTMLStartEndPositions::size_type nStartPos );
@@ -1422,13 +1422,13 @@ void HTMLEndPosLst::FixSplittedItem( HTMLStartEndPos
*pPos, sal_Int32 nNewEnd,
if( pTest->GetStart() >= nNewEnd )
{
// the Test attribute and all the following ones start, after the
-// splitted attribute ends
+// split attribute ends
break;
}
else if( nTestEnd > nNewEnd )
{
-// the Test attribute starts before the splitted attribute
-// ends, and ends afterwards, i.e., it must be splitted, as well
+// the Test attribute starts before the split attribute
+// ends, and ends afterwards, i.e., it must be split, as well
[Libreoffice-commits] core.git: svx/source
svx/source/accessibility/ChildrenManagerImpl.hxx |8 svx/source/accessibility/SvxShapeTypes.cxx|4 ++-- svx/source/customshapes/EnhancedCustomShape2d.cxx |4 ++-- svx/source/customshapes/EnhancedCustomShape3d.cxx |2 +- svx/source/dialog/connctrl.cxx|2 +- svx/source/dialog/docrecovery.cxx |2 +- svx/source/dialog/svxruler.cxx|2 +- svx/source/engine3d/helperhittest3d.cxx |4 ++-- svx/source/engine3d/helperminimaldepth3d.cxx |4 ++-- svx/source/engine3d/view3d.cxx|4 ++-- svx/source/fmcomp/fmgridcl.cxx|2 +- svx/source/fmcomp/fmgridif.cxx|8 svx/source/fmcomp/gridctrl.cxx| 14 +++--- svx/source/form/filtnav.cxx |2 +- svx/source/form/fmscriptingenv.cxx|2 +- svx/source/form/fmshell.cxx |2 +- svx/source/form/fmshimp.cxx |4 ++-- 17 files changed, 35 insertions(+), 35 deletions(-) New commits: commit f7613d2132e8115b7741e9397b111508f24615cc Author: Andrea Gelmini AuthorDate: Fri Aug 2 11:47:52 2019 +0200 Commit: Julien Nabet CommitDate: Sat Aug 3 09:47:55 2019 +0200 Fix typos Change-Id: Iaf2691b60796300f6c3acf56f60dcc526685eeb9 Reviewed-on: https://gerrit.libreoffice.org/76855 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 5998486e7cf9..f0abbfdff22c 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -91,7 +91,7 @@ public: @param rxShapeList List of UNO shapes to manage. @param rShapeTreeInfo -Bundel of information passed down the shape tree. +Bundle of information passed down the shape tree. @param rContext An accessible context object that is called for fireing events for new and deleted children, i.e. that holds a list of @@ -182,7 +182,7 @@ public: void Update (bool bCreateNewObjectsOnDemand); /** Set the list of UNO shapes to the given list. This removes the old -list and does not add to it. The list of accessible shapes that is +list and does not add to it. The list of accessible shapes that is build up by calls to AddAccessibleShape is not modified. Neither is the list of visible children. Accessible objects are created on demand. @@ -191,7 +191,7 @@ public: */ void SetShapeList (const css::uno::Reference& xShapeList); -/** Add a accessible shape. This does not modify the list of UNO shapes +/** Add an accessible shape. This does not modify the list of UNO shapes or the list of visible shapes. Accessible shapes are, at the moment, not tested against the visible area but are always appended to the list of visible children. @@ -320,7 +320,7 @@ private: */ css::uno::Reference mxParent; -/** Bundel of information passed down the shape tree. +/** Bundle of information passed down the shape tree. */ AccessibleShapeTreeInfo maShapeTreeInfo; diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index 142a9d36b60c..5ca2804b5d7f 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -57,10 +57,10 @@ static AccessibleShape* CreateSvxAccessibleShape ( case DRAWING_POLY_LINE_PATH: case DRAWING_RECTANGLE: case DRAWING_TEXT: -// Default accessiblility shape for +// Default accessibility shape for // css::drawing::CustomShape (#i37790#) case DRAWING_CUSTOM: -// Default accessiblility shape for +// Default accessibility shape for // css::drawing::MediaShape (#i85429#) case DRAWING_MEDIA: return new AccessibleShape (rShapeInfo, rShapeTreeInfo); diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index a23d95386ce3..cb226c3c9333 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -2205,7 +2205,7 @@ void EnhancedCustomShape2d::CreateSubPath( // MS shapes and independent of the meaning of commands U and T in ODF specification. // The WordArt shape 'RingOutside' has already angles in degree, all other need -// convertion from fixed-point number. +// conversion from fixed-point number. double fSwingAngle = fEndAngle; if (sShpType !
