[Libreoffice-commits] core.git: sc/qa sc/source

[Vikas]

 sc/qa/unit/datatransformation_test.cxx   |   70 
 sc/source/ui/dataprovider/datatransformation.cxx |   95 +++
 sc/source/ui/inc/datatransformation.hxx  |   16 +++
 3 files changed, 180 insertions(+), 1 deletion(-)

New commits:
commit 483ca6e6bb9c920cc96212c7042e13fbbb5fa767
Author: Vikas 
Date:   Mon Jul 2 01:29:09 2018 +0530

Added text transformations for external data

 - Uppercase, which sets all text in the selected columns to upper case.
 - Lowercase, which sets all text in the selected columns to lower case.
 - Capitalize Each Word, which makes all words in the selected column start 
with a capital letter and sets all subsequent letters in a word to lower case.
 - Trim, which removes any leading or trailing whitespace characters from 
text.

Change-Id: I6da37bec9d820887a155da57d0b0c75f36e8ac69
Reviewed-on: https://gerrit.libreoffice.org/56780
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/datatransformation_test.cxx 
b/sc/qa/unit/datatransformation_test.cxx
index d4c0e11a2642..8cec163eeb43 100644
--- a/sc/qa/unit/datatransformation_test.cxx
+++ b/sc/qa/unit/datatransformation_test.cxx
@@ -31,11 +31,19 @@ public:
 void testColumnRemove();
 void testColumnSplit();
 void testColumnMerge();
+void testTextToLower();
+void testTextToUpper();
+void testTextCapitalize();
+void testTextTrim();
 
 CPPUNIT_TEST_SUITE(ScDataTransformationTest);
 CPPUNIT_TEST(testColumnRemove);
 CPPUNIT_TEST(testColumnSplit);
 CPPUNIT_TEST(testColumnMerge);
+CPPUNIT_TEST(testTextToLower);
+CPPUNIT_TEST(testTextToUpper);
+CPPUNIT_TEST(testTextCapitalize);
+CPPUNIT_TEST(testTextTrim);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -123,6 +131,68 @@ void ScDataTransformationTest::testColumnMerge()
 }
 }
 
+void ScDataTransformationTest::testTextToLower()
+{
+m_pDoc->SetString(2, 0, 0, "Berlin");
+m_pDoc->SetString(2, 1, 0, "Brussels");
+m_pDoc->SetString(2, 2, 0, "Paris");
+m_pDoc->SetString(2, 3, 0, "Peking");
+
+sc::TextTransformation aTransform(2, sc::TEXT_TRANSFORM_TYPE::TO_LOWER);
+aTransform.Transform(*m_pDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("berlin"), m_pDoc->GetString(2, 0, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("brussels"), m_pDoc->GetString(2, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("paris"), m_pDoc->GetString(2, 2, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("peking"), m_pDoc->GetString(2, 3, 0));
+}
+
+void ScDataTransformationTest::testTextToUpper()
+{
+m_pDoc->SetString(2, 0, 0, "Berlin");
+m_pDoc->SetString(2, 1, 0, "Brussels");
+m_pDoc->SetString(2, 2, 0, "Paris");
+m_pDoc->SetString(2, 3, 0, "Peking");
+
+sc::TextTransformation aTransform(2, sc::TEXT_TRANSFORM_TYPE::TO_UPPER);
+aTransform.Transform(*m_pDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("BERLIN"), m_pDoc->GetString(2, 0, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("BRUSSELS"), m_pDoc->GetString(2, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("PARIS"), m_pDoc->GetString(2, 2, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("PEKING"), m_pDoc->GetString(2, 3, 0));
+}
+
+void ScDataTransformationTest::testTextCapitalize()
+{
+m_pDoc->SetString(2, 0, 0, "hello woRlD");
+m_pDoc->SetString(2, 1, 0, "qUe vA");
+m_pDoc->SetString(2, 2, 0, "si tu la ves");
+m_pDoc->SetString(2, 3, 0, "cUaNdO mE EnAmOro");
+
+sc::TextTransformation aTransform(2, sc::TEXT_TRANSFORM_TYPE::CAPITALIZE);
+aTransform.Transform(*m_pDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Hello World"), m_pDoc->GetString(2, 0, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("Que Va"), m_pDoc->GetString(2, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("Si Tu La Ves"), m_pDoc->GetString(2, 2, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("Cuando Me Enamoro"), m_pDoc->GetString(2, 
3, 0));
+}
+
+void ScDataTransformationTest::testTextTrim()
+{
+m_pDoc->SetString(2, 0, 0, " Berlin");
+m_pDoc->SetString(2, 1, 0, "Brussels ");
+m_pDoc->SetString(2, 2, 0, " Paris ");
+
+sc::TextTransformation aTransform(2, sc::TEXT_TRANSFORM_TYPE::TRIM);
+aTransform.Transform(*m_pDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Berlin"), m_pDoc->GetString(2, 0, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("Brussels"), m_pDoc->GetString(2, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("Paris"), m_pDoc->GetString(2, 2, 0));
+}
+
 ScDataTransformationTest::ScDataTransformationTest() :
 ScBootstrapFixture( "sc/qa/unit/data/dataprovider" ),
 m_pDoc(nullptr)
diff --git a/sc/source/ui/dataprovider/datatransformation.cxx 
b/sc/source/ui/dataprovider/datatransformation.cxx
index 09370a8e82c7..84df313aacdc 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -173,6 +173,101 @@ ScSortParam SortTransformation::getSortParam() const
 return maSortParam;
 }
 
+TextTransformation::TextTransformation(SCCOL nCol, const TEXT_TRANSFO

[Libreoffice-commits] core.git: sc/CppunitTest_sc_tableconditionalentryobj.mk

[Jens Carl]

 sc/CppunitTest_sc_tableconditionalentryobj.mk |   30 --
 1 file changed, 1 insertion(+), 29 deletions(-)

New commits:
commit fadc32c3bc7baaefd1538605a3900b73e8d95638
Author: Jens Carl 
Date:   Fri Jul 6 04:38:48 2018 +

Remove obsolete (cargo-cult copied) dependencies

Change-Id: I72d34c875951a8b4a349d92b0d893fdaecd718e7
Reviewed-on: https://gerrit.libreoffice.org/57033
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/sc/CppunitTest_sc_tableconditionalentryobj.mk 
b/sc/CppunitTest_sc_tableconditionalentryobj.mk
index aa38663970c4..62f5665d1296 100644
--- a/sc/CppunitTest_sc_tableconditionalentryobj.mk
+++ b/sc/CppunitTest_sc_tableconditionalentryobj.mk
@@ -18,42 +18,14 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,sc_tableconditionalentryobj,
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_tableconditionalentryobj, \
-   basegfx \
-   comphelper \
cppu \
-   cppuhelper \
-   drawinglayer \
-   editeng \
-   for \
-   forui \
-   i18nlangtag \
-   msfilter \
-   oox \
sal \
-   salhelper \
-   sax \
-   sb \
-   sc \
-   sfx \
-   sot \
subsequenttest \
-   svl \
-   svt \
-   svx \
-   svxcore \
test \
-   tk \
-   tl \
-   ucbhelper \
unotest \
-   utl \
-   vbahelper \
-   vcl \
-   xo \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_tableconditionalentryobj,\
-   -I$(SRCDIR)/sc/source/ui/inc \
-I$(SRCDIR)/sc/inc \
$$(INCLUDE) \
 ))
@@ -64,7 +36,7 @@ $(eval $(call 
gb_CppunitTest_use_ure,sc_tableconditionalentryobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_tableconditionalentryobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tableconditionalentryobj,\
-$(sc_unoapi_common_components) \
+   $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tableconditionalentryobj))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Samuel Mehrbrodt]

 cui/source/dialogs/SignatureLineDialog.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 8905ae9f0fc8b0e4a95113fd81e88d4e7db57bcc
Author: Samuel Mehrbrodt 
Date:   Thu Jul 5 21:48:49 2018 +0200

Writer: Insert signature line at current cursor position

Change-Id: Ic7cbcd409372a2d8222f57e67e1109a74f6f5ce3
Reviewed-on: https://gerrit.libreoffice.org/57026
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/source/dialogs/SignatureLineDialog.cxx 
b/cui/source/dialogs/SignatureLineDialog.cxx
index 3089830ef7a4..7cf512d83265 100644
--- a/cui/source/dialogs/SignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignatureLineDialog.cxx
@@ -30,6 +30,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace css;
 using namespace css::uno;
@@ -174,11 +176,12 @@ void SignatureLineDialog::Apply()
 const Reference xTextDocument(m_xModel, UNO_QUERY);
 if (xTextDocument.is())
 {
-// Insert into document
-Reference const xEnd
-= Reference(m_xModel, 
UNO_QUERY)->getText()->getEnd();
-Reference const xShapeContent(xShapeProps, 
UNO_QUERY);
-xShapeContent->attach(xEnd);
+Reference xText = xTextDocument->getText();
+Reference xTextContent(xShape, UNO_QUERY_THROW);
+Reference 
xViewCursorSupplier(m_xModel->getCurrentController(),
+   
UNO_QUERY_THROW);
+Reference xCursor = 
xViewCursorSupplier->getViewCursor();
+xText->insertTextContent(xCursor, xTextContent, true);
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Mike Kaganski]

 sw/source/uibase/dbui/dbmgr.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 3aa4edb1028bfafff38efda8843f8ebe43a38155
Author: Mike Kaganski 
Date:   Fri Jul 6 05:45:25 2018 +0200

Simplify string concatenation.

Change-Id: Ib478a7371599309f68b6fffd4dbed0f17c9ecb01
Reviewed-on: https://gerrit.libreoffice.org/57032
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 90499f74dd59..2119b825ef5c 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2782,10 +2782,7 @@ OUString LoadAndRegisterDataSource_Impl(DBConnURIType 
type, const uno::Reference
 sFind = sNewName;
 sal_Int32 nIndex = 0;
 while (xDBContext->hasByName(sFind))
-{
-sFind = sNewName;
-sFind += OUString::number(++nIndex);
-}
+sFind = sNewName + OUString::number(++nIndex);
 
 uno::Reference xNewInstance;
 if (!bStore)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sc/sdi sc/source sc/uiconfig xmloff/source

[Samuel Mehrbrodt]

 cui/source/dialogs/SignatureLineDialog.cxx |   44 ---
 sc/sdi/tabvwsh.sdi |3 +
 sc/source/ui/inc/tabvwsh.hxx   |1 
 sc/source/ui/view/tabvwshb.cxx |   54 +
 sc/uiconfig/scalc/menubar/menubar.xml  |1 
 sc/uiconfig/scalc/popupmenu/graphic.xml|3 +
 xmloff/source/draw/ximpshap.cxx|   13 ++
 7 files changed, 114 insertions(+), 5 deletions(-)

New commits:
commit 9891fd076c30d353e9edfee9678f0b8e96d26238
Author: Samuel Mehrbrodt 
Date:   Fri Jun 29 09:10:48 2018 +0200

tdf#117903 Add signature line feature to calc

Change-Id: I4e9121803a26cba1f40f8f1c673c7809543ef2ec
Reviewed-on: https://gerrit.libreoffice.org/57015
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/source/dialogs/SignatureLineDialog.cxx 
b/cui/source/dialogs/SignatureLineDialog.cxx
index bd3d2a75003a..3089830ef7a4 100644
--- a/cui/source/dialogs/SignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignatureLineDialog.cxx
@@ -16,12 +16,17 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -29,10 +34,12 @@
 using namespace css;
 using namespace css::uno;
 using namespace css::beans;
+using namespace css::container;
 using namespace css::frame;
 using namespace css::io;
 using namespace css::lang;
 using namespace css::frame;
+using namespace css::sheet;
 using namespace css::text;
 using namespace css::drawing;
 using namespace css::graphic;
@@ -161,11 +168,38 @@ void SignatureLineDialog::Apply()
 // Default anchoring
 xShapeProps->setPropertyValue("AnchorType", 
Any(TextContentAnchorType_AT_PARAGRAPH));
 
-// Insert into document
-Reference const xEnd
-= Reference(m_xModel, 
UNO_QUERY)->getText()->getEnd();
-Reference const xShapeContent(xShapeProps, UNO_QUERY);
-xShapeContent->attach(xEnd);
+const Reference xServiceInfo(m_xModel, UNO_QUERY);
+
+// Writer
+const Reference xTextDocument(m_xModel, UNO_QUERY);
+if (xTextDocument.is())
+{
+// Insert into document
+Reference const xEnd
+= Reference(m_xModel, 
UNO_QUERY)->getText()->getEnd();
+Reference const xShapeContent(xShapeProps, 
UNO_QUERY);
+xShapeContent->attach(xEnd);
+return;
+}
+
+// Calc
+const Reference xSpreadsheetDocument(m_xModel, 
UNO_QUERY);
+if (xSpreadsheetDocument.is())
+{
+Reference 
xSheetCell(m_xModel->getCurrentSelection(), UNO_QUERY_THROW);
+awt::Point aCellPosition;
+xSheetCell->getPropertyValue("Position") >>= aCellPosition;
+xShape->setPosition(aCellPosition);
+
+Reference 
xView(m_xModel->getCurrentController(), UNO_QUERY_THROW);
+Reference xSheet(xView->getActiveSheet(), 
UNO_QUERY_THROW);
+Reference xDrawPageSupplier(xSheet, 
UNO_QUERY_THROW);
+Reference xDrawPage(xDrawPageSupplier->getDrawPage(), 
UNO_QUERY_THROW);
+Reference xShapes(xDrawPage, UNO_QUERY_THROW);
+
+xShapes->add(xShape);
+return;
+}
 }
 }
 
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 8df105eb28ec..7f33a247a394 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -56,6 +56,9 @@ interface BaseSelection
 SID_INSERT_OBJECT   [ ExecMethod = ExecDrawIns; StateMethod = 
GetDrawInsState; ]
 SID_INSERT_FLOATINGFRAME[ ExecMethod = ExecDrawIns; StateMethod = 
GetDrawInsState; ]
 SID_INSERT_AVMEDIA  [ ExecMethod = ExecDrawIns; StateMethod = 
GetDrawInsState; ]
+SID_INSERT_SIGNATURELINE[ ExecMethod = ExecDrawIns; StateMethod = 
GetDrawInsState; ]
+SID_EDIT_SIGNATURELINE  [ ExecMethod = ExecDrawIns; StateMethod = 
GetDrawInsState; ]
+SID_SIGN_SIGNATURELINE  [ ExecMethod = ExecDrawIns; StateMethod = 
GetDrawInsState; ]
 
 SID_IMAP[ ExecMethod = ExecImageMap; StateMethod = 
GetImageMapState; ]
 SID_IMAP_EXEC   [ ExecMethod = ExecImageMap; StateMethod = 
GetImageMapState; ]
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 8b4753e18c42..a59a0ae265ac 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -174,6 +174,7 @@ private:
 
 voidDoReadUserData( const OUString& rData );
 voidDoReadUserDataSequence( const css::uno::Sequence< 
css::beans::PropertyValue >& rSettings );
+boolIsSignatureLineSelected();
 
 DECL_LINK( SimpleRefClose, const OUString*, void );
 DECL_LINK( SimpleRefDone, const OUString&, void );
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index ae40de856b47..c52bf0b3d1d5 100644
--- a/sc/source/ui/

[Libreoffice-commits] core.git: sc/inc sc/qa sc/source sc/uiconfig

[Markus Mohrhard]

 sc/inc/datamapper.hxx  |2 
 sc/qa/unit/dataproviders_test.cxx  |6 +-
 sc/source/filter/xml/xmlmappingi.cxx   |   14 ++---
 sc/source/ui/dataprovider/dataprovider.cxx |6 +-
 sc/source/ui/inc/dataproviderdlg.hxx   |5 +-
 sc/source/ui/miscdlgs/dataproviderdlg.cxx  |   23 -
 sc/source/ui/view/cellsh2.cxx  |4 -
 sc/uiconfig/scalc/ui/dataproviderdlg.ui|   68 ++---
 8 files changed, 98 insertions(+), 30 deletions(-)

New commits:
commit 3f66d987ce3a46eb836f2c11bbaf360bd6195e27
Author: Markus Mohrhard 
Date:   Thu Feb 8 22:49:55 2018 +0100

add a selection for the DB range to Dataprovider dlg

Change-Id: I02c63b46e21cd8d04e6b515e2cbbee08743d5657
Reviewed-on: https://gerrit.libreoffice.org/49459
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/inc/datamapper.hxx b/sc/inc/datamapper.hxx
index 75b04440153e..1d7e710051c0 100644
--- a/sc/inc/datamapper.hxx
+++ b/sc/inc/datamapper.hxx
@@ -89,7 +89,7 @@ public:
 const OUString& getID() const;
 double getUpdateFrequency() const;
 OUString getDBName() const;
-void setDBData(const ScDBData* pDBData);
+void setDBData(const OUString& rDBName);
 ScDBDataManager* getDBManager();
 
 void refresh(ScDocument* pDoc, bool bDeterministic = false);
diff --git a/sc/qa/unit/dataproviders_test.cxx 
b/sc/qa/unit/dataproviders_test.cxx
index d0df69c96d5c..1960fa59eecf 100644
--- a/sc/qa/unit/dataproviders_test.cxx
+++ b/sc/qa/unit/dataproviders_test.cxx
@@ -50,7 +50,7 @@ void ScDataProvidersTest::testCSVImport()
 OUString aFileURL;
 createFileURL("test1.", "csv", aFileURL);
 sc::ExternalDataSource aDataSource(aFileURL, "org.libreoffice.calc.csv", 
m_pDoc);
-aDataSource.setDBData(pDBData);
+aDataSource.setDBData(pDBData->GetName());
 
 
 m_pDoc->GetExternalDataMapper().insertDataSource(aDataSource);
@@ -78,7 +78,7 @@ void ScDataProvidersTest::testDataLargerThanDB()
 OUString aFileURL;
 createFileURL("test1.", "csv", aFileURL);
 sc::ExternalDataSource aDataSource(aFileURL, "org.libreoffice.calc.csv", 
m_pDoc);
-aDataSource.setDBData(pDBData);
+aDataSource.setDBData(pDBData->GetName());
 
 
 m_pDoc->GetExternalDataMapper().insertDataSource(aDataSource);
@@ -107,7 +107,7 @@ void ScDataProvidersTest::testHTMLImport()
 createFileURL("test1.", "html", aFileURL);
 sc::ExternalDataSource aDataSource(aFileURL, "org.libreoffice.calc.html", 
m_pDoc);
 aDataSource.setID("//table");
-aDataSource.setDBData(pDBData);
+aDataSource.setDBData(pDBData->GetName());
 
 
 m_pDoc->GetExternalDataMapper().insertDataSource(aDataSource);
diff --git a/sc/source/filter/xml/xmlmappingi.cxx 
b/sc/source/filter/xml/xmlmappingi.cxx
index c40734afc177..c2f8b4004213 100644
--- a/sc/source/filter/xml/xmlmappingi.cxx
+++ b/sc/source/filter/xml/xmlmappingi.cxx
@@ -105,15 +105,11 @@ ScXMLMappingContext::ScXMLMappingContext( ScXMLImport& 
rImport,
 if (!aProvider.isEmpty())
 {
 ScDocument* pDoc = GetScImport().GetDocument();
-ScDBData* pDBData = 
pDoc->GetDBCollection()->getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(aDBName));
-if (pDBData)
-{
-auto& rDataMapper = pDoc->GetExternalDataMapper();
-sc::ExternalDataSource aSource(aURL, aProvider, pDoc);
-aSource.setID(aID);
-aSource.setDBData(pDBData);
-rDataMapper.insertDataSource(aSource);
-}
+auto& rDataMapper = pDoc->GetExternalDataMapper();
+sc::ExternalDataSource aSource(aURL, aProvider, pDoc);
+aSource.setID(aID);
+aSource.setDBData(aDBName);
+rDataMapper.insertDataSource(aSource);
 }
 }
 
diff --git a/sc/source/ui/dataprovider/dataprovider.cxx 
b/sc/source/ui/dataprovider/dataprovider.cxx
index 161aaf502fa9..22a3be99475e 100644
--- a/sc/source/ui/dataprovider/dataprovider.cxx
+++ b/sc/source/ui/dataprovider/dataprovider.cxx
@@ -111,15 +111,15 @@ OUString ExternalDataSource::getDBName() const
 return OUString();
 }
 
-void ExternalDataSource::setDBData(const ScDBData* pDBData)
+void ExternalDataSource::setDBData(const OUString& rDBName)
 {
 if (!mpDBDataManager)
 {
-mpDBDataManager.reset(new ScDBDataManager(pDBData->GetName(), false, 
mpDoc));
+mpDBDataManager.reset(new ScDBDataManager(rDBName, false, mpDoc));
 }
 else
 {
-mpDBDataManager->SetDatabase(pDBData->GetName());
+mpDBDataManager->SetDatabase(rDBName);
 }
 }
 
diff --git a/sc/source/ui/inc/dataproviderdlg.hxx 
b/sc/source/ui/inc/dataproviderdlg.hxx
index a56f4f612b45..5b5c444d13d8 100644
--- a/sc/source/ui/inc/dataproviderdlg.hxx
+++ b/sc/source/ui/inc/dataproviderdlg.hxx
@@ -36,6 +36,7 @@ private:
 VclPtr mpList;
 VclPtr mpBar;
 VclPtr mpDataProviderCtrl;
+VclPtr mpDBRanges;
 
 ScDBData* pDBData;
 
@@ -47,7 +48,7 @@ private:
 
 pub

[Libreoffice-commits] core.git: sc/source

[Manuj Vashist]

 sc/source/ui/miscdlgs/dataproviderdlg.cxx |   59 +++---
 1 file changed, 55 insertions(+), 4 deletions(-)

New commits:
commit eac72845f5c9aac0fb346b2d48cee697006c057b
Author: Manuj Vashist 
Date:   Mon Jul 2 04:21:03 2018 +0530

Added Delete Column Transformation in Data Provider Dialog

Change-Id: Ibebd92c426d1653642c5b9d037d6368636561fcd
Reviewed-on: https://gerrit.libreoffice.org/56786
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx 
b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 8e07d04b8145..a94a5d4d41e1 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -271,6 +271,59 @@ void ScDataTransformationBaseControl::setAllocation(const 
Size &rAllocation)
 setLayoutPosSize(*maGrid, Point(0, 0), rAllocation);
 }
 
+class ScDeleteColumnTransformationControl : public 
ScDataTransformationBaseControl
+{
+private:
+VclPtr maColumnNums;
+
+public:
+ScDeleteColumnTransformationControl(vcl::Window* pParent);
+~ScDeleteColumnTransformationControl() override;
+
+virtual void dispose() override;
+
+virtual std::shared_ptr getTransformation() 
override;
+};
+
+ScDeleteColumnTransformationControl::ScDeleteColumnTransformationControl(vcl::Window*
 pParent):
+ScDataTransformationBaseControl(pParent, 
"modules/scalc/ui/deletecolumnentry.ui")
+{
+get(maColumnNums, "ed_columns");
+}
+
+ScDeleteColumnTransformationControl::~ScDeleteColumnTransformationControl()
+{
+disposeOnce();
+}
+
+void ScDeleteColumnTransformationControl::dispose()
+{
+maColumnNums.clear();
+
+ScDataTransformationBaseControl::dispose();
+}
+
+std::shared_ptr 
ScDeleteColumnTransformationControl::getTransformation()
+{
+OUString aColumnString = maColumnNums->GetText();
+std::vector aSplitColumns = 
comphelper::string::split(aColumnString, ';');
+std::set ColNums;
+for (auto& rColStr : aSplitColumns)
+{
+sal_Int32 nCol = rColStr.toInt32();
+if (nCol <= 0)
+continue;
+
+if (nCol > MAXCOL)
+continue;
+
+// translate from 1-based column notations to internal Calc one
+ColNums.insert(nCol - 1);
+}
+
+return std::make_shared(ColNums);
+}
+
 class ScSplitColumnTransformationControl : public 
ScDataTransformationBaseControl
 {
 private:
@@ -497,10 +550,8 @@ void ScDataProviderDlg::cancelAndQuit()
 
 void ScDataProviderDlg::deleteColumn()
 {
-VclPtr mpText = VclPtr::Create(mpList);
-mpText->SetText("Delete Column");
-mpText->SetSizePixel(Size(400, 20));
-mpList->addEntry(mpText);
+VclPtr pDeleteColumnEntry = 
VclPtr::Create(mpList);
+mpList->addEntry(pDeleteColumnEntry);
 }
 
 void ScDataProviderDlg::splitColumn()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/core/data/table1.cxx |  183 +
 1 file changed, 98 insertions(+), 85 deletions(-)

New commits:
commit cef1e0986a66dd95b3fd4cf61c4cda1a1c4c8234
Author: Eike Rathke 
Date:   Thu Jul 5 21:45:18 2018 +0200

Limit GetNextPos() loops to range also for nMoveX, tdf#68290 follow-up

And straighten the code a bit to use one init block and return
early if nothing marked or not protected.

Change-Id: I4c9247479a137cb7f9435180f3f54667d28a29ef
Reviewed-on: https://gerrit.libreoffice.org/57025
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index ff58624e5743..8bfba4521de0 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1367,64 +1367,73 @@ bool ScTable::SkipRow( const SCCOL nCol, SCROW& rRow, 
const SCROW nMovY,
 void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCCOL nMovX, SCROW nMovY,
 bool bMarked, bool bUnprotected, const 
ScMarkData& rMark ) const
 {
-bool bSheetProtected = IsProtected();
+// Ensure bMarked is set only if there is a mark.
+assert( !bMarked || rMark.IsMarked() || rMark.IsMultiMarked());
+
+const bool bSheetProtected = IsProtected();
 
 if ( bUnprotected && !bSheetProtected ) // Is sheet really protected?
 bUnprotected = false;
 
-sal_uInt16 nWrap = 0;
-SCCOL nCol = rCol;
-SCROW nRow = rRow;
-
-nCol = sal::static_int_cast( nCol + nMovX );
-nRow = sal::static_int_cast( nRow + nMovY );
+SCCOL nCol = rCol + nMovX;
+SCROW nRow = rRow + nMovY;
 
-if ( nMovY && (bMarked || bUnprotected))
+SCCOL nStartCol, nEndCol;
+SCROW nStartRow, nEndRow;
+if (bMarked)
 {
-bool  bUp= ( nMovY < 0 );
-const SCCOL nColAdd = (bUp ? -1 : 1);
-SCCOL nStartCol, nEndCol;
-SCROW nStartRow, nEndRow;
-if (bMarked && rMark.IsMarked())
-{
-ScRange aRange( ScAddress::UNINITIALIZED);
+ScRange aRange( ScAddress::UNINITIALIZED);
+if (rMark.IsMarked())
 rMark.GetMarkArea( aRange);
-nStartCol = aRange.aStart.Col();
-nStartRow = aRange.aStart.Row();
-nEndCol = aRange.aEnd.Col();
-nEndRow = aRange.aEnd.Row();
-}
-else if (bMarked && rMark.IsMultiMarked())
-{
-ScRange aRange( ScAddress::UNINITIALIZED);
+else if (rMark.IsMultiMarked())
 rMark.GetMultiMarkArea( aRange);
-nStartCol = aRange.aStart.Col();
-nStartRow = aRange.aStart.Row();
-nEndCol = aRange.aEnd.Col();
-nEndRow = aRange.aEnd.Row();
-}
-else if (bUnprotected)
+else
 {
-nStartCol = 0;
-nStartRow = 0;
-nEndCol = nCol;
-nEndRow = nRow;
-pDocument->GetPrintArea( nTab, nEndCol, nEndRow, true );
-// Add some cols/rows to the print area (which is "content or
-// visually different from empty") to enable travelling through
-// protected forms with empty cells and no visual indicator.
-// 42 might be good enough and not too much..
-nEndCol = std::min( nEndCol+42, MAXCOL);
-nEndRow = std::min( nEndRow+42, MAXROW);
+// Covered by assert() above, but for NDEBUG build.
+if (ValidColRow(nCol,nRow))
+{
+rCol = nCol;
+rRow = nRow;
+}
+return;
 }
-else
+nStartCol = aRange.aStart.Col();
+nStartRow = aRange.aStart.Row();
+nEndCol = aRange.aEnd.Col();
+nEndRow = aRange.aEnd.Row();
+}
+else if (bUnprotected)
+{
+nStartCol = 0;
+nStartRow = 0;
+nEndCol = nCol;
+nEndRow = nRow;
+pDocument->GetPrintArea( nTab, nEndCol, nEndRow, true );
+// Add some cols/rows to the print area (which is "content or
+// visually different from empty") to enable travelling through
+// protected forms with empty cells and no visual indicator.
+// 42 might be good enough and not too much..
+nEndCol = std::min( nEndCol+42, MAXCOL);
+nEndRow = std::min( nEndRow+42, MAXROW);
+}
+else
+{
+// Invalid values show up for instance for Tab, when nothing is
+// selected and not protected (left / right edge), then leave values
+// unchanged.
+if (ValidColRow(nCol,nRow))
 {
-assert(!"ScTable::GetNextPos - bMarked but not marked");
-nStartCol = 0;
-nStartRow = 0;
-nEndCol = MAXCOL;
-nEndRow = MAXROW;
+rCol = nCol;
+rRow = nRow;
 }
+return;
+}
+
+if ( nMovY && (bMarked || bUnprotected))
+{
+bool bUp = (nMovY < 0);
+const 

Minutes of ESC call 2017-07-05

[Thorsten Behrens]

* Present:
  + Thorsten, Miklos, Heiko, Michael W, Sophie, Cloph, Xisco, Stephan,
Eike, Olivier

* Completed Action Items:
+ enable new help for tinderboxes (Christian) → in distro-config
+ disable HSQLDB auto-migration for now except for experimental (Tamas B)
+ provide distro name for MIMO branch (Jean-Sebastien)

* Pending Action Items:
+ on ESC share - “Budget2018” - add your ranking before this week’s call [!]

* Release Engineering update (Christian)
+ 6.0.6 – rc1 due next week (Jul 10)
+ 6.1.0 RC1
+ tagged on Wednesday,
  builds are on pre-releases and now being synced to mirrors
+ 6.1.0 RC2 with libreoffice-6-1-0 branch week after the next
  marks hard code freeze  (Jul 17)
+ from now on, commits to 6-1 branch need one mandatory review
+ also string freeze
+ also includes html help switch for distro branches
+ ATTENTION for distro branch maintainers – there was a prob
  with gerrit, submodule changes might not have created
  the correct auto-commit on core
  + this was a problem since last weekend, fixed now
+ 6.1 late features
+ calc threading default / fixing (Miklos)
   + *DONE*, just bugfixing from now on
   + Eike: question to disable precautiously?
   + Miklos: if needed can be done at the last moment
+ writer – red-lining re-factoring (Michael S)
   + merged and done, included in beta 2 → remove here
+ Help format (Stephan/Olivier)
   + done and working
   + small gbuild make pattern rule prob on Mac, fixed now
AI + Olivier will release-note it
+ Remotes
+ Android viewer
+ Online
+ simplifying iOS build re translations

* Documentation (Olivier)
+ New help
+ Testing in bug hunting session tomorrow (installs)
+ Small corrections in XSLT filter
+ tweaks in CSS by fitoshido – people start contributing
+ Help contents
+ cosmetic refactor by SophiaS
+ Contents for [NatNum12] by Lazlo Nemetz
+ Contents fixes (ohallot, fitoshido)
+ Guides
+ Assembling & revising GS 6.0
+ Extras
+ some tweaks in UI dialog after help review.

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
248(248) (topicUI) bugs open, 281(281) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months   12 months  
 added  1(-4) 7(-1) 16(-6)  80(-4) 
 commented 21(-17)   69(1) 258(-60)   1659(-30)
   removed  0(0)  0(0)   0(0)   10(0)  
  resolved  1(-2) 6(0)  21(-3) 170(-2) 
+ top 10 contributors:
  Tietze, Heiko made 31 changes in 1 month, and 728 changes in 1 year
  Buovjaga made 24 changes in 1 month, and 171 changes in 1 year
  Foote, V Stuart made 12 changes in 1 month, and 241 changes in 1 year
  Kainz, Andreas made 10 changes in 1 month, and 34 changes in 1 year
  Xisco Faulí made 8 changes in 1 month, and 322 changes in 1 year
  Henschel, Regina made 7 changes in 1 month, and 99 changes in 1 year
  *UNKNOWN* made 7 changes in 1 month, and 9 changes in 1 year
  Raal made 6 changes in 1 month, and 17 changes in 1 year
  kompilainenn made 6 changes in 1 month, and 26 changes in 1 year
  Thomas Lendo made 5 changes in 1 month, and 248 changes in 1 year 
+ cont’d the discussion around CTL/CJK tdf#104318
  + Suggestion is to remove the binding to languages completely,
which has bearing on default style
  + rethink default styles completely
  + Franklin and Khaled are involved in the thinking

+ positive feedback tdf#118516
  “And, I should have added my personal thanks and on behalf of the
   whole user base (if I may be so bold) to the whole LO team for
   the incredible work being done.”
+ German magazine compared LibreOffice vs. Softmaker, highlighting the
  Notebookbar/Ribbon interface
  + 
https://www.heise.de/ct/ausgabe/2018-14-LibreOffice-6-0-gegen-SoftMaker-Office-2018-fuer-Linux-4084433.html
  + discussion the German ML pointing out a few badly investigated
aspects
+ personal note: Heiko on vacation for the next two weeks

* Fuzz / Crash Testing (Caolan on vacation)
+ 60(-16) import failure, 3(+1) export failures
+ coverity
+ ??
+ forcepoint ??
+ oss-fuzz ?? (?? outstanding, ?? minor)
+ ODF validation has landed, validation errors will now show up in
  crashtesting logs – fixing howto on the dev list

* Crash Reporting (Xisco)
+ Update notification was enabled, incoming reports start to look
  better than for previous version

+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
 + 489 (last 7 days) (-26)

 

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[andreas kainz]

 icon-themes/colibre/cmd/32/animationmode.png |binary
 icon-themes/colibre/cmd/32/attributepagesize.png |binary
 icon-themes/colibre/cmd/32/backward.png  |binary
 icon-themes/colibre/cmd/32/duplicatepage.png |binary
 icon-themes/colibre/cmd/32/entergroup.png|binary
 icon-themes/colibre/cmd/32/expandpage.png|binary
 icon-themes/colibre/cmd/32/fillshadow.png|binary
 icon-themes/colibre/cmd/32/fontwork.png  |binary
 icon-themes/colibre/cmd/32/fontworkgalleryfloater.png|binary
 icon-themes/colibre/cmd/32/formatgroup.png   |binary
 icon-themes/colibre/cmd/32/formatungroup.png |binary
 icon-themes/colibre/cmd/32/forward.png   |binary
 icon-themes/colibre/cmd/32/group.png |binary
 icon-themes/colibre/cmd/32/hidewhitespace.png|binary
 icon-themes/colibre/cmd/32/insertcaptiondialog.png   |binary
 icon-themes/colibre/cmd/32/insertobjectfloatingframe.png |binary
 icon-themes/colibre/cmd/32/insertvideo.png   |binary
 icon-themes/colibre/cmd/32/leavegroup.png|binary
 icon-themes/colibre/cmd/32/menubar.png   |binary
 icon-themes/colibre/cmd/32/pagecolumntype.png|binary
 icon-themes/colibre/cmd/32/pagemargin.png|binary
 icon-themes/colibre/cmd/32/rotateleft.png|binary
 icon-themes/colibre/cmd/32/rotateright.png   |binary
 icon-themes/colibre/cmd/32/ruler.png |binary
 icon-themes/colibre/cmd/32/showmultiplepages.png |binary
 icon-themes/colibre/cmd/32/ungroup.png   |binary
 icon-themes/colibre/cmd/32/zoompanning.png   |binary
 icon-themes/colibre_svg/cmd/32/animationmode.svg |1 +
 icon-themes/colibre_svg/cmd/32/attributepagesize.svg |1 +
 icon-themes/colibre_svg/cmd/32/backward.svg  |1 +
 icon-themes/colibre_svg/cmd/32/duplicatepage.svg |1 +
 icon-themes/colibre_svg/cmd/32/entergroup.svg|1 +
 icon-themes/colibre_svg/cmd/32/expandpage.svg|1 +
 icon-themes/colibre_svg/cmd/32/fillshadow.svg|1 +
 icon-themes/colibre_svg/cmd/32/fontwork.svg  |1 +
 icon-themes/colibre_svg/cmd/32/fontworkgalleryfloater.svg|1 +
 icon-themes/colibre_svg/cmd/32/formatgroup.svg   |1 +
 icon-themes/colibre_svg/cmd/32/formatungroup.svg |1 +
 icon-themes/colibre_svg/cmd/32/forward.svg   |1 +
 icon-themes/colibre_svg/cmd/32/group.svg |1 +
 icon-themes/colibre_svg/cmd/32/hidewhitespace.svg|1 +
 icon-themes/colibre_svg/cmd/32/insertcaptiondialog.svg   |1 +
 icon-themes/colibre_svg/cmd/32/insertobjectfloatingframe.svg |1 +
 icon-themes/colibre_svg/cmd/32/insertvideo.svg   |1 +
 icon-themes/colibre_svg/cmd/32/leavegroup.svg|1 +
 icon-themes/colibre_svg/cmd/32/menubar.svg   |1 +
 icon-themes/colibre_svg/cmd/32/pagecolumntype.svg|1 +
 icon-themes/colibre_svg/cmd/32/pagemargin.svg|1 +
 icon-themes/colibre_svg/cmd/32/rotateleft.svg|1 +
 icon-themes/colibre_svg/cmd/32/rotateright.svg   |1 +
 icon-themes/colibre_svg/cmd/32/ruler.svg |1 +
 icon-themes/colibre_svg/cmd/32/showmultiplepages.svg |1 +
 icon-themes/colibre_svg/cmd/32/ungroup.svg   |1 +
 icon-themes/colibre_svg/cmd/32/zoompanning.svg   |1 +
 54 files changed, 27 insertions(+)

New commits:
commit ab51458f35eb55ec006156a9ad9383e0358ccbfb
Author: andreas kainz 
Date:   Thu Jul 5 20:19:16 2018 +0200

Colibre icons: add 32px size icons

Change-Id: Ib9b16fe037d1ecaac3c52723a002d0b6c440ba31
Reviewed-on: https://gerrit.libreoffice.org/57019
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/colibre/cmd/32/animationmode.png 
b/icon-themes/colibre/cmd/32/animationmode.png
new file mode 100644
index ..84f9740204ca
Binary files /dev/null and b/icon-themes/colibre/cmd/32/animationmode.png differ
diff --git a/icon-themes/colibre/cmd/32/attributepagesize.png 
b/icon-themes/colibre/cmd/32/attributepagesize.png
new file mode 100644
index ..9382b6b59b61
Binary files /dev/null and b/icon-themes/colibre/cmd/32/attributepagesize.png 
differ
diff --git a/icon-themes/colibre/cmd/32/backward.png 
b/icon-themes/colibre/cmd/32/backward.png
new file mode 100644
index ..f2a41086be49
Binary files /dev/null and b/icon-themes/colibre/cmd/32/backward.png differ
diff --git a/icon-themes/colibre/cmd/32/duplicatepage.png 
b/icon-themes/colibre/cmd/32/duplicatepag

[Libreoffice-commits] online.git: Changes to 'refs/tags/3.3.1-rc2'

[Andras Timar]

Tag '3.3.1-rc2' created by Andras Timar  at 
2018-07-05 20:39 +

3.3.1-rc2

Changes since 3.3.1-rc1-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source

[Matthias Seidel]

 sd/source/ui/dlg/copydlg.src |  147 ++-
 1 file changed, 49 insertions(+), 98 deletions(-)

New commits:
commit 2338f76f8746a7e33a853a1ede042d8634dff32f
Author: Matthias Seidel 
Date:   Thu Jul 5 19:40:37 2018 +

Cleaned up dialog for Duplicate

diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src
index 36b96b8ab049..e547683631d4 100644
--- a/sd/source/ui/dlg/copydlg.src
+++ b/sd/source/ui/dlg/copydlg.src
@@ -31,40 +31,40 @@ ModalDialog DLG_COPY
 HelpID = CMD_SID_COPYOBJECTS ;
 OutputSize = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 204 , 177 ) ;
+Size = MAP_APPFONT ( 204, 177 ) ;
 Text [ en-US ] = "Duplicate" ;
 Moveable = TRUE ;
 OKButton BTN_OK
 {
-Pos = MAP_APPFONT ( 148 , 6  ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 148, 6 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 DefButton = TRUE ;
 };
 CancelButton BTN_CANCEL
 {
-Pos = MAP_APPFONT ( 148 , 23  ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 148, 23 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 };
 HelpButton BTN_HELP
 {
-Pos = MAP_APPFONT ( 148 , 43  ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 148, 43 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 };
 FixedText FT_COPIES
 {
-Pos = MAP_APPFONT ( 6 , 9 ) ;
-Size = MAP_APPFONT ( 60 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 9 ) ;
+Size = MAP_APPFONT ( 60, 8 ) ;
 Text [ en-US ] = "Number of ~copies" ;
 };
 NumericField NUM_FLD_COPIES
 {
 HelpID = "sd:NumericField:DLG_COPY:NUM_FLD_COPIES";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 7 ) ;
-Size = MAP_APPFONT ( 35 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 7 ) ;
+Size = MAP_APPFONT ( 35, 12 ) ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -78,8 +78,8 @@ ModalDialog DLG_COPY
 ImageButton BTN_SET_VIEWDATA
 {
 HelpID = "sd:ImageButton:DLG_COPY:BTN_SET_VIEWDATA";
-Pos = MAP_APPFONT ( 122 , 6 ) ;
-Size = MAP_APPFONT ( 14 , 14 ) ;
+Pos = MAP_APPFONT ( 122, 6 ) ;
+Size = MAP_APPFONT ( 14, 14 ) ;
 ButtonImage = Image
 {
 ImageBitmap = Bitmap { File = "pipette.bmp" ; };
@@ -91,8 +91,8 @@ ModalDialog DLG_COPY
 PushButton BTN_SET_DEFAULT
 {
 HelpID = "sd:PushButton:DLG_COPY:BTN_SET_DEFAULT";
-Pos = MAP_APPFONT ( 148 , 63  ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 148, 63 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 Text [ en-US ] = "~Default";
 };
@@ -100,8 +100,8 @@ ModalDialog DLG_COPY
 {
 HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_ANGLE";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 69 ) ;
-Size = MAP_APPFONT ( 45 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 69 ) ;
+Size = MAP_APPFONT ( 45, 12 ) ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -114,22 +114,22 @@ ModalDialog DLG_COPY
 };
 FixedText FT_ANGLE
 {
-Pos = MAP_APPFONT ( 12 , 71 ) ;
-Size = MAP_APPFONT ( 60 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 71 ) ;
+Size = MAP_APPFONT ( 60, 8 ) ;
 Text [ en-US ] = "~Angle" ;
 };
 FixedText FT_MOVE_X
 {
-Pos = MAP_APPFONT ( 12 , 39 ) ;
-Size = MAP_APPFONT ( 60 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 39 ) ;
+Size = MAP_APPFONT ( 60, 8 ) ;
 Text [ en-US ] = "~X axis" ;
 };
 MetricField MTR_FLD_MOVE_X
 {
 HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 37 ) ;
-Size = MAP_APPFONT ( 45 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 37 ) ;
+Size = MAP_APPFONT ( 45, 12 ) ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -146,8 +146,8 @@ ModalDialog DLG_COPY
 {
 HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 53 ) ;
-Size = MAP_APPFONT ( 45 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 53 ) ;
+Size = MAP_APPFONT ( 45, 12 ) ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -164,8 +164,8 @@ ModalDialog DLG_COPY
 {
 HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_WIDTH";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 76 , 98 ) ;
-Size = MAP_APPFONT ( 45 , 12 ) ;
+Pos = MAP_APPFONT ( 76, 98 ) ;
+Size = MAP_APPFONT ( 45, 12 ) ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -182,8 +182,8 @@ ModalDialog DLG_COPY
 {
 HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_HEIGHT";
 Border = TRUE ;
-  

[Libreoffice-commits] core.git: scripting/java

[Stephan Bergmann]

 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java 
|   11 +++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 8b17679fca3564643ff248149e9d9d895e28dda5
Author: Stephan Bergmann 
Date:   Thu Jul 5 16:47:00 2018 +0200

cid#1437407: create class loader in doPrivileged

Change-Id: Iade079e44c8d88a13830258157d9481f4b8b3358
Reviewed-on: https://gerrit.libreoffice.org/57013
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index 5434945ed41e..b5e6e3085bd2 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -23,6 +23,8 @@ import com.sun.star.script.framework.log.LogUtils;
 
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 /**
  *  Class Loader Factory
@@ -43,8 +45,11 @@ public class ClassLoaderFactory {
 return getURLClassLoader(parent, classPath);
 }
 
-public static ClassLoader getURLClassLoader(ClassLoader parent,
-URL[] classpath) {
-return new URLClassLoader(classpath, parent);
+public static ClassLoader getURLClassLoader(final ClassLoader parent,
+final URL[] classpath) {
+return AccessController.doPrivileged(
+new PrivilegedAction() {
+public URLClassLoader run() { return new 
URLClassLoader(classpath, parent); }
+});
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - debian/changelog debian/control loolwsd.spec.in

[Andras Timar]

 debian/changelog |8 +++-
 debian/control   |2 +-
 loolwsd.spec.in  |4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 603da5a7cf6ba23585e70b4d59325f4b2170913c
Author: Andras Timar 
Date:   Thu Jul 5 21:28:29 2018 +0200

Bump package version to 3.3.1-2

Change-Id: I503cb6028cd76baa7e7511668b4de5a38f49879b

diff --git a/debian/changelog b/debian/changelog
index abab34bae..f62281dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+loolwsd (3.3.1-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool3
+
+ -- Andras Timar   Thu, 05 Jul 2018 21:10:00 +0200
+
 loolwsd (3.3.1-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool3
 
- -- Andras Timar   Wed, 03 Jul 2018 23:10:00 +0200
+ -- Andras Timar   Tue, 03 Jul 2018 23:10:00 +0200
 
 loolwsd (3.3.0-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index c00db80dd..396b565fc 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, 
libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.50), 
collaboraofficebasis5.3-core (>= 5.3.10.50), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.50), 
collaboraofficebasis5.3-images (>= 5.3.10.50), collaboraofficebasis5.3-impress 
(>= 5.3.10.50), collaboraofficebasis5.3-ooofonts (>= 5.3.10.50), 
collaboraofficebasis5.3-writer (>= 5.3.10.50), collaboraoffice5.3 (>= 
5.3.10.50), collaboraoffice5.3-ure (>= 5.3.10.50), 
collaboraofficebasis5.3-en-us (>= 5.3.10.50), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.50), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.50), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.50), collaboraofficebasis5.3-draw 
(>= 5.3.10.50), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.50), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.50), 
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.50)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, 
libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.52), 
collaboraofficebasis5.3-core (>= 5.3.10.52), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.52), 
collaboraofficebasis5.3-images (>= 5.3.10.52), collaboraofficebasis5.3-impress 
(>= 5.3.10.52), collaboraofficebasis5.3-ooofonts (>= 5.3.10.52), 
collaboraofficebasis5.3-writer (>= 5.3.10.52), collaboraoffice5.3 (>= 
5.3.10.52), collaboraoffice5.3-ure (>= 5.3.10.52), 
collaboraofficebasis5.3-en-us (>= 5.3.10.52), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.52), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.52), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.52), collaboraofficebasis5.3-draw 
(>= 5.3.10.52), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.52), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.52), 
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.52)
 Conflicts: collaboraofficebasis5.3-gnome-integration, 
collaboraofficebasis5.3-kde-integration
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 83b1a3ba0..1badb1e65 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:2%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires:  libcap-progs linux-glibc-devel 
systemd-rpm-macros
 BuildRequires:  libcap-progs
 %endif
 
-Requires:   collaboraoffice5.3 >= 5.3.10.50 collaboraoffice5.3-ure >= 
5.3.10.50 collaboraofficebasis5.3-core >= 5.3.10.50 
collaboraofficebasis5.3-writer >= 5.3.10.50 collaboraofficebasis5.3-impress >= 
5.3.10.50 collaboraofficebasis5.3-graphicfilter >= 5.3.10.50 
collaboraofficebasis5.3-en-US >= 5.3.10.50 collaboraofficebasis5.3-calc >= 
5.3.10.50 collaboraofficebasis5.3-en-US-res >= 5.3.10.50 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.50 
collaboraofficebasis5.3-ooofonts >= 5.3.10.50 collaboraofficebasis5.3-images >= 
5.3.10.50 collaboraofficebasis5.3-noto-fonts >= 5.3.10.50 
collaboraofficebasis5.3-draw >= 5.3.10.50 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.50 
collaboraofficebasis5.3-filter-data >= 5.3.10.50 
collaboraofficebasis5.3-ooolinguistic >= 5.3.10.50
+Requires:   collaboraoffice5.3 >= 5.3.10.52 collaboraoffice5.3-ure >= 
5.3.10.52 collaboraofficebasis5.3-core >= 5.3.10.52 
collaboraofficebasis5.3-writer >= 5.3.10.52 collaboraofficebasis5.3-impress >= 
5.3.10.52 collaboraofficebasis5.3-graphicfilter >= 5.3.10.52 
collaboraofficebas

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - rat-excludes sd/source solenv/gbuild

[Matthias Seidel]

 rat-excludes |   12 ++--
 sd/source/ui/dlg/layeroptionsdlg.src |   95 +--
 solenv/gbuild/platform/macosx.mk |9 +++
 3 files changed, 40 insertions(+), 76 deletions(-)

New commits:
commit 8018da421604d0f0e72db93b024b818aa21ef068
Author: Matthias Seidel 
Date:   Thu Jul 5 17:56:35 2018 +

Cleaned up dialog for layers

diff --git a/sd/source/ui/dlg/layeroptionsdlg.src 
b/sd/source/ui/dlg/layeroptionsdlg.src
index 1a88a772dbe5..3dc7e2f28bd5 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.src
+++ b/sd/source/ui/dlg/layeroptionsdlg.src
@@ -30,14 +30,14 @@ ModalDialog DLG_INSERT_LAYER
 HelpID = CMD_SID_INSERTLAYER ;
 OutputSize = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 200 , 172 ) ;
+Size = MAP_APPFONT ( 200, 172 ) ;
 Text [ en-US ] = "Insert Layer" ;
 Moveable = TRUE ;
 
 FixedText FT_NAME
 {
-Pos = MAP_APPFONT ( 6 , 6 ) ;
-Size = MAP_APPFONT ( 188 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 6 ) ;
+Size = MAP_APPFONT ( 188, 8 ) ;
 Text [ en-US ] = "~Name" ;
 };
 
@@ -45,15 +45,15 @@ ModalDialog DLG_INSERT_LAYER
 {
 HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_NAME";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 17 ) ;
-Size = MAP_APPFONT ( 188 , 12 ) ;
+Pos = MAP_APPFONT ( 6, 17 ) ;
+Size = MAP_APPFONT ( 188, 12 ) ;
 TabStop = TRUE ;
 };
 
 FixedText FT_TITLE
 {
-Pos = MAP_APPFONT ( 6 , 32 ) ;
-Size = MAP_APPFONT ( 188 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 32 ) ;
+Size = MAP_APPFONT ( 188, 8 ) ;
 Text [ en-US ] = "~Title" ;
 };
 
@@ -61,15 +61,15 @@ ModalDialog DLG_INSERT_LAYER
 {
 HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_TITLE";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 43 ) ;
-Size = MAP_APPFONT ( 188 , 12 ) ;
+Pos = MAP_APPFONT ( 6, 43 ) ;
+Size = MAP_APPFONT ( 188, 12 ) ;
 TabStop = TRUE ;
 };
 
 FixedText FT_DESCRIPTION
 {
-Pos = MAP_APPFONT ( 6 , 58 ) ;
-Size = MAP_APPFONT ( 188 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 58 ) ;
+Size = MAP_APPFONT ( 188, 8 ) ;
 Text [ en-US ] = "~Description" ;
 };
 
@@ -77,8 +77,8 @@ ModalDialog DLG_INSERT_LAYER
 {
 HelpID = "sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 69 ) ;
-Size = MAP_APPFONT ( 188 , 34 ) ;
+Pos = MAP_APPFONT ( 6, 69 ) ;
+Size = MAP_APPFONT ( 188, 34 ) ;
 TabStop = TRUE ;
 IgnoreTab = TRUE;
 VScroll = TRUE;
@@ -87,8 +87,8 @@ ModalDialog DLG_INSERT_LAYER
 CheckBox CBX_VISIBLE
 {
 HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE";
-Pos = MAP_APPFONT ( 6 , 106 ) ;
-Size = MAP_APPFONT ( 188 , 10 ) ;
+Pos = MAP_APPFONT ( 6, 106 ) ;
+Size = MAP_APPFONT ( 188, 10 ) ;
 Text [ en-US ] = "~Visible" ;
 TabStop = TRUE ;
 };
@@ -96,8 +96,8 @@ ModalDialog DLG_INSERT_LAYER
 CheckBox CBX_PRINTABLE
 {
 HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE";
-Pos = MAP_APPFONT ( 6 , 119 ) ;
-Size = MAP_APPFONT ( 188 , 10 ) ;
+Pos = MAP_APPFONT ( 6, 119 ) ;
+Size = MAP_APPFONT ( 188, 10 ) ;
 Text [ en-US ] = "~Printable" ;
 TabStop = TRUE ;
 };
@@ -105,82 +105,37 @@ ModalDialog DLG_INSERT_LAYER
 CheckBox CBX_LOCKED
 {
 HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED";
-Pos = MAP_APPFONT ( 6 , 132 ) ;
-Size = MAP_APPFONT ( 188 , 10 ) ;
+Pos = MAP_APPFONT ( 6, 132 ) ;
+Size = MAP_APPFONT ( 188, 10 ) ;
 Text [ en-US ] = "~Locked" ;
 TabStop = TRUE ;
 };
 
-// divider
+// Divider
 FixedLine FL_SEPARATOR_B
 {
-Pos = MAP_APPFONT ( 0 , 144 ) ;
-Size = MAP_APPFONT ( 200 , 4 ) ;
+Pos = MAP_APPFONT ( 0, 144 ) ;
+Size = MAP_APPFONT ( 200, 4 ) ;
 };
 
 // Buttons
 HelpButton BTN_HELP
 {
 Pos = MAP_APPFONT ( 6, 152 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 };
 OKButton BTN_OK
 {
 Pos = MAP_APPFONT ( 200 - (50 + 50 + 9), 152) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 DefButton = TRUE ;
 };
 CancelButton BTN_CANCEL
 {
 Pos = MAP_APPFONT ( 200 - (50 + 6), 152) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
commit 891d5f8f1b7dea5436fde2c22d24aa20997f6f56
Author: Jim Jagielski 
Date:   Thu Jul 5 17:56:20 2018 +

Ugg. It looks like versioning has also crept in other

places so we need 

[Libreoffice-commits] core.git: basegfx/source filter/source

[Armin Le Grand]

 basegfx/source/polygon/b2dpolygontools.cxx |  136 ++---
 filter/source/msfilter/escherex.cxx|  122 --
 2 files changed, 90 insertions(+), 168 deletions(-)

New commits:
commit f73eeabf6e584e4a1414ecb0878bb46143f90ff5
Author: Armin Le Grand 
Date:   Wed Jul 4 10:13:16 2018 +0200

Only access css::drawing::PointSequence when not empty

Had to adapt EscherPropertyContainer::GetPolyPolygon due
to it using conversions from UNO API drawing::PointSequence
to old tools::polygon, containing unsafe memory accesses.
It is not useful to fix that, use new tooling instead.

Before correctly testing nCount for zero in b2dpolygontools.cxx
when you look closely always a point was added - a random
one due to accessing random memory.
This is corrected, so in test case for "tdf104115.docx"
a PolyPolygon with two polys is used, the first being
empty (had one point due to the error mentioned above).
When having no points, CreatePolygonProperties in escherex.cxx
does badly calculate and alloc the pSegmentBuf array used
to write to doc formats (in the test case - 20 bytes alloced,
22 written). This did not happen before due to having
always a point due to the error before - argh!
Corrected that and hopefully this will work now.

To be on the safe side and to not need to redefine that whole
CreatePolygonProperties I will turn back that little change
and better sort-out empty polygons inside GetPolyPolygon
alrteady. That should bring us back to the original state,
at the same time avoiding that CreatePolygonProperties has
to handle empty Polygons at all.
That stuff urgently needs cleanup - I took a look and thought
about using std::vector so no wrong alloc or write
too much could happen, but that nTotalBezPoints needs to be
pre-calculated because it gets itself written to that
buffers...

Change-Id: Iefc885928f5bb29bceaf36c2a1555346bb21fd26
Reviewed-on: https://gerrit.libreoffice.org/56927
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/basegfx/source/polygon/b2dpolygontools.cxx 
b/basegfx/source/polygon/b2dpolygontools.cxx
index db3365eee313..94590d7483a8 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3285,90 +3285,94 @@ namespace basegfx
 
 // prepare new polygon
 B2DPolygon aRetval;
-const css::awt::Point* pPointSequence = 
rPointSequenceSource.getConstArray();
-const css::drawing::PolygonFlags* pFlagSequence = 
rFlagSequenceSource.getConstArray();
 
-// get first point and flag
-B2DPoint aNewCoordinatePair(pPointSequence->X, pPointSequence->Y); 
pPointSequence++;
-css::drawing::PolygonFlags ePolygonFlag(*pFlagSequence); 
pFlagSequence++;
-B2DPoint aControlA;
-B2DPoint aControlB;
+if(0 != nCount)
+{
+const css::awt::Point* pPointSequence = 
rPointSequenceSource.getConstArray();
+const css::drawing::PolygonFlags* pFlagSequence = 
rFlagSequenceSource.getConstArray();
 
-// first point is not allowed to be a control point
-OSL_ENSURE(ePolygonFlag != css::drawing::PolygonFlags_CONTROL,
-"UnoPolygonBezierCoordsToB2DPolygon: Start point is a control 
point, illegal input polygon (!)");
+// get first point and flag
+B2DPoint aNewCoordinatePair(pPointSequence->X, 
pPointSequence->Y); pPointSequence++;
+css::drawing::PolygonFlags ePolygonFlag(*pFlagSequence); 
pFlagSequence++;
+B2DPoint aControlA;
+B2DPoint aControlB;
 
-// add first point as start point
-aRetval.append(aNewCoordinatePair);
+// first point is not allowed to be a control point
+OSL_ENSURE(ePolygonFlag != css::drawing::PolygonFlags_CONTROL,
+"UnoPolygonBezierCoordsToB2DPolygon: Start point is a 
control point, illegal input polygon (!)");
 
-for(sal_uInt32 b(1); b < nCount;)
-{
-// prepare loop
-bool bControlA(false);
-bool bControlB(false);
+// add first point as start point
+aRetval.append(aNewCoordinatePair);
 
-// get next point and flag
-aNewCoordinatePair = B2DPoint(pPointSequence->X, 
pPointSequence->Y);
-ePolygonFlag = *pFlagSequence;
-pPointSequence++; pFlagSequence++; b++;
-
-if(b < nCount && ePolygonFlag == 
css::drawing::PolygonFlags_CONTROL)
+for(sal_uInt32 b(1); b < nCount;)
 {
-aControlA = aNewCoordinatePair;
-bControlA = true;
+// prepare loop
+ 

[Libreoffice-commits] core.git: Branch 'private/jmux/qt5_fixes' - 9 commits - basctl/source include/vcl sfx2/source solenv/bin vcl/inc vcl/qt5 vcl/source

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit 27336990223c7198b043f2522538356134f1fb4f
Author: Jan-Marek Glogowski 
Date:   Thu Jul 5 18:33:40 2018 +0200

Qt5 rest

Change-Id: I24b37228321ec38db704c32cd7e5164ad230b695

diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index c9fd565b823f..6a6082e72fe8 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -11,6 +11,15 @@ ctags="ctags $@"
 saloptions="-ISAL_DELETED_FUNCTION -ISAL_OVERRIDE -ISAL_FINAL"
 omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
 
+if [ "$1" = "-e" ]; then
+tagfile="TAGS"
+else
+tagfile="tags"
+fi
+
+tmpfile=$(mktemp)
+ctags="$ctags -f $tmpfile"
+
 $ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $saloptions 
$omnicppoptions \
   --languages=-HTML,Java,JavaScript \
   --langdef=UNOIDL \
@@ -39,3 +48,5 @@ $ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl 
$saloptions $omnicppoption
   $w/UnoApiHeadersTarget/udkapi/normal \
   $w/UnoApiHeadersTarget/offapi/normal \
   $w/CustomTarget/officecfg/registry
+
+mv "$tmpfile" "$tagfile"
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index c45b678d88a5..a4de90fffe12 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -446,6 +446,8 @@ void Qt5Graphics::drawBitmap(const SalTwoRect& rPosAry, 
const SalBitmap& /*rSalB
 
 assert(rPosAry.mnSrcWidth == rPosAry.mnDestWidth);
 assert(rPosAry.mnSrcHeight == rPosAry.mnDestHeight);
+
+assert(0 && "Qt5Graphics::drawBitmap");
 }
 
 void Qt5Graphics::drawMask(const SalTwoRect& rPosAry, const SalBitmap& 
/*rSalBitmap*/,
@@ -457,6 +459,8 @@ void Qt5Graphics::drawMask(const SalTwoRect& rPosAry, const 
SalBitmap& /*rSalBit
 
 assert(rPosAry.mnSrcWidth == rPosAry.mnDestWidth);
 assert(rPosAry.mnSrcHeight == rPosAry.mnDestHeight);
+
+assert(0 && "Qt5Graphics::drawMask");
 }
 
 std::shared_ptr Qt5Graphics::getBitmap(long nX, long nY, long 
nWidth, long nHeight)
@@ -494,6 +498,7 @@ void Qt5Graphics::invert(long nX, long nY, long nWidth, 
long nHeight, SalInvert
 
 void Qt5Graphics::invert(sal_uInt32 /*nPoints*/, const SalPoint* /*pPtAry*/, 
SalInvert /*nFlags*/)
 {
+assert(0 && "Qt5Graphics::invert 2");
 }
 
 bool Qt5Graphics::drawEPS(long /*nX*/, long /*nY*/, long /*nWidth*/, long 
/*nHeight*/,
diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx
index 92e9a416d74a..0fc5c9cc550b 100644
--- a/vcl/qt5/Qt5Graphics_Text.cxx
+++ b/vcl/qt5/Qt5Graphics_Text.cxx
@@ -132,6 +132,7 @@ void Qt5Graphics::ClearDevFontCache() {}
 bool Qt5Graphics::AddTempDevFont(PhysicalFontCollection*, const OUString& 
/*rFileURL*/,
  const OUString& /*rFontName*/)
 {
+assert(0 && "Qt5Graphics::AddTempDevFont");
 return false;
 }
 
@@ -148,11 +149,15 @@ const void* Qt5Graphics::GetEmbedFontData(const 
PhysicalFontFace*, long* /*pData
 return nullptr;
 }
 
-void Qt5Graphics::FreeEmbedFontData(const void* /*pData*/, long /*nDataLen*/) 
{}
+void Qt5Graphics::FreeEmbedFontData(const void* /*pData*/, long /*nDataLen*/)
+{
+assert(0 && "Qt5Graphics::FreeEmbedFontData");
+}
 
 void Qt5Graphics::GetGlyphWidths(const PhysicalFontFace* /*pPFF*/, bool 
/*bVertical*/,
  std::vector& /*rWidths*/, 
Ucs2UIntMap& /*rUnicodeEnc*/)
 {
+assert(0 && "Qt5Graphics::GetGlyphWidths");
 }
 
 bool Qt5Graphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& 
rRect)
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 318b9ffe116a..c50ee6098c84 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -199,7 +199,7 @@ bool 
OutputDevice::GetFontFeatures(std::vector& rFontFeature
 FontMetric OutputDevice::GetFontMetric() const
 {
 FontMetric aMetric;
-if( mbNewFont && !ImplNewFont() )
+if( !ImplNewFont() )
 return aMetric;
 
 LogicalFontInstance* pFontInstance = mpFontInstance.get();
@@ -262,10 +262,8 @@ bool OutputDevice::GetFontCharMap( FontCharMapRef& 
rxFontCharMap ) const
 if( !mpGraphics && !AcquireGraphics() )
 return false;
 
-if( mbNewFont )
-ImplNewFont();
-if( mbInitFont )
-InitFont();
+ImplNewFont();
+InitFont();
 if( !mpFontInstance )
 return false;
 
@@ -287,10 +285,8 @@ bool OutputDevice::GetFontCapabilities( 
vcl::FontCapabilities& rFontCapabilities
 if( !mpGraphics && !AcquireGraphics() )
 return false;
 
-if( mbNewFont )
-ImplNewFont();
-if( mbInitFont )
-InitFont();
+ImplNewFont();
+InitFont();
 if( !mpFontInstance )
 return false;
 
@@ -995,28 +991,25 @@ void OutputDevice::ImplInitFontList() const
 
 void OutputDevice::InitFont() const
 {
-DBG_TESTSOLARMUTEX();
-
-if (!mpFontInstance)
+if (!mpFontInstance || !mbInitFont)
 return;
 
-if ( mbInitFont )
-{
-// decide if antialiasing is appropriate
-bool bNonAntialiased

[Libreoffice-commits] core.git: sc/source

[Takeshi Abe]

 sc/source/core/data/formulacell.cxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 7e971b500f164cf07728cc128f63b50d9e56f909
Author: Takeshi Abe 
Date:   Thu Jul 5 18:09:07 2018 +0900

sc: Prefer std::vector to std::deque

There seems no need for choosing deque in the first place
5099046dccb69af04e2a3adafad8e06c0832bd06.

Change-Id: I194e6bee37d8f6f177aee96681b3014119aa11c1
Reviewed-on: https://gerrit.libreoffice.org/56997
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 9d697e2a4e6b..96aabc5ae07c 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -75,6 +75,7 @@
 
 #include 
 #include 
+#include 
 
 using namespace formula;
 
@@ -230,8 +231,6 @@ namespace {
 // Allow for a year's calendar (366).
 const sal_uInt16 MAXRECURSION = 400;
 
-using std::deque;
-
 typedef SCCOLROW(*DimensionSelector)(const ScAddress&, const ScSingleRefData&);
 
 SCCOLROW lcl_GetCol(const ScAddress& rPos, const ScSingleRefData& rData)
@@ -286,11 +285,11 @@ lcl_checkRangeDimensions(
 bool
 lcl_checkRangeDimensions(
 const ScAddress& rPos,
-const deque::const_iterator& rBegin,
-const deque::const_iterator& rEnd,
+const std::vector::const_iterator& rBegin,
+const std::vector::const_iterator& rEnd,
 bool& bCol, bool& bRow, bool& bTab)
 {
-deque::const_iterator aCur(rBegin);
+std::vector::const_iterator aCur(rBegin);
 ++aCur;
 const SingleDoubleRefProvider aRef(**rBegin);
 bool bOk(false);
@@ -351,7 +350,7 @@ public:
 
 bool
 lcl_checkIfAdjacent(
-const ScAddress& rPos, const deque& rReferences, 
const DimensionSelector aWhich)
+const ScAddress& rPos, const std::vector& 
rReferences, const DimensionSelector aWhich)
 {
 auto aBegin(rReferences.cbegin());
 auto aEnd(rReferences.cend());
@@ -363,7 +362,7 @@ lcl_checkIfAdjacent(
 
 void
 lcl_fillRangeFromRefList(
-const ScAddress& aPos, const deque& rReferences, 
ScRange& rRange)
+const ScAddress& aPos, const std::vector& 
rReferences, ScRange& rRange)
 {
 const ScSingleRefData aStart(
 SingleDoubleRefProvider(*rReferences.front()).Ref1);
@@ -375,7 +374,7 @@ lcl_fillRangeFromRefList(
 
 bool
 lcl_refListFormsOneRange(
-const ScAddress& rPos, deque& rReferences,
+const ScAddress& rPos, std::vector& 
rReferences,
 ScRange& rRange)
 {
 if (rReferences.size() == 1)
@@ -2977,7 +2976,7 @@ 
ScFormulaCell::HasRefListExpressibleAsOneReference(ScRange& rRange) const
 {
 // Collect all consecutive references, starting by the one
 // already found
-std::deque aReferences;
+std::vector aReferences;
 aReferences.push_back(pFirstReference);
 FormulaToken* pToken(aIter.NextRPN());
 FormulaToken* pFunction(nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/CppunitTest_sc_tableconditionalformatobj.mk

[Jens Carl]

 sc/CppunitTest_sc_tableconditionalformatobj.mk |   28 -
 1 file changed, 28 deletions(-)

New commits:
commit 87f3d6cdff977bf3f90b84ce2078e933f9a322a2
Author: Jens Carl 
Date:   Thu Jul 5 06:12:43 2018 +

Remove obsolete (cargo-cult copied) dependencies

Change-Id: I9696a9ad3c0f5c3e6bb12a81dd2386e927eebed2
Reviewed-on: https://gerrit.libreoffice.org/56987
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/sc/CppunitTest_sc_tableconditionalformatobj.mk 
b/sc/CppunitTest_sc_tableconditionalformatobj.mk
index 9079945792c8..07e53f82b787 100644
--- a/sc/CppunitTest_sc_tableconditionalformatobj.mk
+++ b/sc/CppunitTest_sc_tableconditionalformatobj.mk
@@ -18,42 +18,14 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,sc_tableconditionalformatobj,
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_tableconditionalformatobj, \
-   basegfx \
-   comphelper \
cppu \
-   cppuhelper \
-   drawinglayer \
-   editeng \
-   for \
-   forui \
-   i18nlangtag \
-   msfilter \
-   oox \
sal \
-   salhelper \
-   sax \
-   sb \
-   sc \
-   sfx \
-   sot \
subsequenttest \
-   svl \
-   svt \
-   svx \
-   svxcore \
test \
-   tk \
-   tl \
-   ucbhelper \
unotest \
-   utl \
-   vbahelper \
-   vcl \
-   xo \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_tableconditionalformatobj,\
-   -I$(SRCDIR)/sc/source/ui/inc \
-I$(SRCDIR)/sc/inc \
$$(INCLUDE) \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - lingucomponent/Library_MacOSXSpell.mk lingucomponent/Library_spell.mk rat-excludes

[Matthias Seidel]

 lingucomponent/Library_MacOSXSpell.mk |5 -
 lingucomponent/Library_spell.mk   |   13 +
 rat-excludes  |   33 +
 3 files changed, 30 insertions(+), 21 deletions(-)

New commits:
commit 2db33b2791a2189d9e6a8e2a4c7f0da7822eb4c2
Author: Matthias Seidel 
Date:   Thu Jul 5 15:43:08 2018 +

Updated excludes

See:
https://ci.apache.org/projects/openoffice/rat-output.html

diff --git a/rat-excludes b/rat-excludes
index e628a2fae662..d9ac3d17c2db 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -10,8 +10,8 @@ ext_libraries/
 ##
 #
 # external libraries that are not part of the source release, but may be built
-# for the binary AOO incarnations dependent on the used configure switches. 
-# Each subproject contains a framework to get the library as tarball (from 
+# for the binary AOO incarnations dependent on the used configure switches.
+# Each subproject contains a framework to get the library as tarball (from
 # ext_sources), patch and build it. It does not contain the external libraries
 # themselves.
 #
@@ -170,11 +170,11 @@ 
main/testautomation/writer/optional/input/import/amipro3.sam
 # AOO specific OpenSymbol source file, (S)ource(F)orge(D)ata, recently called 
(S)pline(F)ont(D)ata
 main/extras/source/truetype/symbol/OpenSymbol.sfd
 
-# used in main/writerfilter/source/rtftok/RTFScanner.skl (1), part of SGA 
+# used in main/writerfilter/source/rtftok/RTFScanner.skl (1), part of SGA
 # binary file (?)
 main/writerfilter/source/rtftok/RTFScanner.skl
 
-# used in 
main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk (1), 
part of SGA 
+# used in 
main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk (1), 
part of SGA
 # SYLK spreadsheet, ascii. Comments possible (see in file), ALv2 may be added 
here
 main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk
 
@@ -234,7 +234,7 @@ main/migrationanalysis/src/wizard/Wizard.DCA
 # Delphi Form
 main/odk/examples/OLE/delphi/InsertTables/SampleUI.dfm
 
-# used  in main/wizards/source/gimmicks/readdirs.dlg (1), part of SGA
+# used in main/wizards/source/gimmicks/readdirs.dlg (1), part of SGA
 # Dialog Creation Template (for Excel) (?)
 main/wizards/source/gimmicks/readdirs.dlg
 
@@ -266,7 +266,7 @@ main/odk/examples/OLE/delphi/InsertTables/Project1.dpr
 # Library definition files (21), no creative content
 **/*.def
 
-#  Developer Studio project file (4), no creative content
+# Developer Studio project file (4), no creative content
 **/*.dsp
 
 # Defines library export symbols (36), no creative content
@@ -275,7 +275,7 @@ main/odk/examples/OLE/delphi/InsertTables/Project1.dpr
 # symbnol export filter files (20), no creative content
 **/*.flt
 
-#  (>50), part of SGA
+# (>50), part of SGA
 # Install Definition Tables, ascii, not sure about comment support
 #**/*.idt
 main/instsetoo_native/inc_ooolangpack/windows/msi_templates/*.idt
@@ -293,7 +293,7 @@ main/instsetoo_native/inc_ure/windows/msi_templates/*.idt
 # no creative content
 **/*.mf
 
-# (3) used as *.patch.mingw, a diff for preparing external stuff for build, 
all  in SGA
+# (3) used as *.patch.mingw, a diff for preparing external stuff for build, 
all in SGA
 # no creative content
 **/*.mingw
 
@@ -351,9 +351,9 @@ 
main/testautomation/framework/optional/input/menu/en-us_writer.txt
 main/automation/source/miniapp/test.win
 main/testautomation/global/win/*.win
 
-# (7), part of SGA 
+# (7), part of SGA
 # ascii, ALv2 may be added here
-# Added ALv2 in these files 
+# Added ALv2 in these files
 # main/testautomation/global/sid/*.sid
 
 # (158), part of SGA
@@ -446,7 +446,7 @@ main/xmlsecurity/test_docs/CAs/*/*.pem
 main/bean/test/applet/oooapplet/bean.policy
 main/stoc/test/security/test_security.policy
 
-# Postscript files, used for configuration 
+# Postscript files, used for configuration
 main/psprint_config/configuration/ppds/**/*.PS
 main/testgraphical/references/**/*.PS
 
@@ -515,7 +515,7 @@ 
main/testautomation/writer/optional/input/export/filter/*.w95
 # patch files
 main/redland/raptor/raptor-1.4.18.patch.win32
 main/redland/rasqal/rasqal-0.9.16.patch.win32
-main/redland/redland/redland-1.0.8.patch.win32
+main/redland/redland/redland-1.0.17.patch.win32
 
 # (1000+), part of SGA
 # AOO library files, XML, ALv2 could be added
@@ -726,7 +726,7 @@ main/odk/examples/OLE/vbscript/WriterDemo.vbs
 
 ##
 #
-# files not requiring a header - empty or generated files 
+# files not requiring a header - empty or generated files
 #
 
 main/accessibility/bridge/org/openoffice/accessibility/manifest
@@ -853,7 +853,7 @@ main/qadevOOo/testdocs/qadevlibs/source/test/manifest
 main/rat-excludes
 main/redland/raptor/raptor-1.4.18.patch.os2
 main/redland/rasqal/rasqal-0.9.16.patch.os2
-main/redland/redland/redland-1.0.8.

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - svx/sdi

[Xisco Fauli]

 svx/sdi/svx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3aaca9586a566a52210212bd2c8b54f2b6e358ab
Author: Xisco Fauli 
Date:   Tue Jul 3 16:34:49 2018 +0200

tdf#118506: Disable orientation page in read only

Change-Id: I30994b95e65ddd70df7872f5cc41c339bf906f19
Reviewed-on: https://gerrit.libreoffice.org/56875
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit 0c3f7154f4d2919f7d28a5db9578fc308f2c0d02)
Reviewed-on: https://gerrit.libreoffice.org/56999
Reviewed-by: Michael Stahl 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index eed15720caa9..e1532468af95 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6214,7 +6214,7 @@ SvxPageItem Orientation SID_ATTR_PAGE_ORIENTATION
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - oox/source sd/qa

[Justin Luth]

 oox/source/export/shapes.cxx |5 +++
 sd/qa/unit/export-tests.cxx  |   56 +++
 sd/qa/unit/import-tests.cxx  |   56 ---
 3 files changed, 60 insertions(+), 57 deletions(-)

New commits:
commit fb043986ca8d2d1b7b6179ef7e2412aa677d5c7d
Author: Justin Luth 
Date:   Tue Jun 19 11:35:21 2018 +0300

tdf#104199 sd: export non-borders as noFill

...followup to commit 76505bbd862b17b9b02a2d6e68bac308890dec70
which made the border invisible by setting the color to COL_AUTO.

But being invisible isn't good enough because on a round-trip
we are now losing the "noFill" attribute and saving a defined
border. However, COL_AUTO is turned into white during import,
in both LO and in MSO, so round-tripping displayed a
white border instead of an invisible one.

Reviewed-on: https://gerrit.libreoffice.org/55658
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 
(cherry picked from commit 4087130d0531a31456310bfe5c41a028dacd5a4d)

Change-Id: If6cb513ca6e4336e49bc56a9509aede2e1937063
Reviewed-on: https://gerrit.libreoffice.org/56751
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Michael Stahl 

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 2f0f142995dc..a1cc45dbaa6f 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1737,7 +1737,10 @@ void ShapeExport::WriteBorderLine(const sal_Int32 
XML_line, const BorderLine2& r
 if ( nBorderWidth > 0 )
 {
 mpFS->startElementNS( XML_a, XML_line, XML_w, I32S(nBorderWidth), 
FSEND );
-DrawingML::WriteSolidFill( util::Color(rBorderLine.Color) );
+if ( rBorderLine.Color == sal_Int32( COL_AUTO ) )
+mpFS->singleElementNS( XML_a, XML_noFill, FSEND );
+else
+DrawingML::WriteSolidFill( util::Color(rBorderLine.Color) );
 mpFS->endElementNS( XML_a, XML_line );
 }
 }
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 8fccd93e127a..57178b88d1d3 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -82,6 +82,7 @@ public:
 void testTdf97630();
 void testSwappedOutImageExport();
 void testOOoXMLAnimations();
+void testBnc480256();
 void testUnknownAttributes();
 void testTdf80020();
 void testLinkedGraphicRT();
@@ -103,6 +104,7 @@ public:
 CPPUNIT_TEST(testTdf97630);
 CPPUNIT_TEST(testSwappedOutImageExport);
 CPPUNIT_TEST(testOOoXMLAnimations);
+CPPUNIT_TEST(testBnc480256);
 CPPUNIT_TEST(testUnknownAttributes);
 CPPUNIT_TEST(testTdf80020);
 CPPUNIT_TEST(testLinkedGraphicRT);
@@ -440,6 +442,60 @@ void SdExportTest::testOOoXMLAnimations()
 assertXPath(pXmlDoc, "//anim:par", 223);
 }
 
+void SdExportTest::testBnc480256()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc480256.pptx"), 
PPTX);
+// In the document, there are two tables with table background properties.
+// Make sure colors are set properly for individual cells.
+
+// TODO: If you are working on improving table background support, expect
+// this unit test to fail. In that case, feel free to change the numbers.
+
+const SdrPage *pPage = GetPage( 1, xDocShRef );
+
+sdr::table::SdrTableObj *pTableObj;
+uno::Reference< table::XCellRange > xTable;
+uno::Reference< beans::XPropertySet > xCell;
+sal_Int32 nColor;
+table::BorderLine2 aBorderLine;
+
+pTableObj = dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT( pTableObj );
+xTable.set(pTableObj->getTable(), uno::UNO_QUERY_THROW);
+
+xCell.set(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW);
+xCell->getPropertyValue("FillColor") >>= nColor;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(10208238), nColor);
+xCell->getPropertyValue("LeftBorder") >>= aBorderLine;
+CPPUNIT_ASSERT_EQUAL(util::Color(5609427), aBorderLine.Color);
+
+xCell.set(xTable->getCellByPosition(0, 1), uno::UNO_QUERY_THROW);
+xCell->getPropertyValue("FillColor") >>= nColor;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(13032959), nColor);
+xCell->getPropertyValue("TopBorder") >>= aBorderLine;
+CPPUNIT_ASSERT_EQUAL(util::Color(5609427), aBorderLine.Color);
+
+pTableObj = dynamic_cast(pPage->GetObj(1));
+CPPUNIT_ASSERT( pTableObj );
+xTable.set(pTableObj->getTable(), uno::UNO_QUERY_THROW);
+
+xCell.set(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW);
+xCell->getPropertyValue("FillColor") >>= nColor;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(7056614), nColor);
+xCell->getPropertyValue("LeftBorder") >>= aBorderLine;
+CPPUNIT_ASSERT_EQUAL(util::Color(12505062), aBorderLine.Color);
+
+xCell.set(xTable->getCellByPosition(0, 1), uno::UNO_QUERY_THROW);
+xCell->getPropertyValue("FillColor") >>= nColor;
+CPPUNIT_ASSERT_

[Libreoffice-commits] core.git: vcl/qa

[Tomaž Vajngerl]

 vcl/qa/cppunit/FontFeatureTest.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 07cac0079fce384ce0e97875d84bc7c9888ed94a
Author: Tomaž Vajngerl 
Date:   Thu Jul 5 15:21:51 2018 +0200

FontFeatureTest set weight/italcs explicitly

Font featrues can depend on the state. To make the state more
stable we need to set the the font properties explicitly. This
sets the weight, italics, width type to "NORMAL", which changes
the number of available features.

Change-Id: Ida6be4191762c3acfeb7b95182b80717e9774c62
Reviewed-on: https://gerrit.libreoffice.org/57011
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx 
b/vcl/qa/cppunit/FontFeatureTest.cxx
index 018c3ee222e4..b37cac87a283 100644
--- a/vcl/qa/cppunit/FontFeatureTest.cxx
+++ b/vcl/qa/cppunit/FontFeatureTest.cxx
@@ -43,8 +43,15 @@ void FontFeatureTest::testGetFontFeatures()
   DeviceFormat::DEFAULT, 
DeviceFormat::DEFAULT);
 aVDev->SetOutputSizePixel(Size(10, 10));
 
+OUString aFontName("Linux Libertine G");
+if (aVDev->IsFontAvailable(aFontName))
+return; // Can't test this because the font is not available, so exit
+
 vcl::Font aFont = aVDev->GetFont();
 aFont.SetFamilyName("Linux Libertine G");
+aFont.SetWeight(FontWeight::WEIGHT_NORMAL);
+aFont.SetItalic(FontItalic::ITALIC_NORMAL);
+aFont.SetWidthType(FontWidth::WIDTH_NORMAL);
 aVDev->SetFont(aFont);
 
 std::vector rFontFeatures;
@@ -63,12 +70,11 @@ void FontFeatureTest::testGetFontFeatures()
 }
 }
 
-CPPUNIT_ASSERT_EQUAL(size_t(27), rDefaultFontFeatures.size());
+CPPUNIT_ASSERT_EQUAL(size_t(20), rDefaultFontFeatures.size());
 
 OUString aExpectedFeaturesString = "aalt c2sc case dlig frac hlig liga 
lnum "
-   "nalt onum pnum salt sinf smcp ss01 
ss02 "
-   "ss03 ss04 ss05 ss06 sups tnum zero 
cpsp "
-   "kern lfbd rtbd ";
+   "onum pnum salt sinf smcp ss01 ss02 
ss03 "
+   "sups tnum zero cpsp ";
 CPPUNIT_ASSERT_EQUAL(aExpectedFeaturesString, aFeaturesString);
 
 // Check C2SC feature
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/9a7d3313591c330ba19d4e7356cecff987ffc7cb/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk

[Rene Engelhard]

 scp2/InstallModule_ooo.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab87f61b61d72a5d69ba4d4ef543953164848ac2
Author: Rene Engelhard 
Date:   Sun Jun 10 11:43:34 2018 +0200

fix HSQLDB_JAR define in scp2/InstallModule_ooo.mk

for one HSQLDB_JAR is already a path and secondly, gb_Helper_make_path
doesn't even exist (anymore). It's supposed to end up in
URE_MORE_JAVA_CLASSPATH_URLS so use gb_Helper_make_url

Change-Id: I52c6117299caeb4fac8c894fc54564befc673e67
Reviewed-on: https://gerrit.libreoffice.org/2
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index f7f3c80867b2..8739b86cfdf9 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
$(if $(SYSTEM_HSQLDB),\
-   -DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \
+   -DHSQLDB_JAR=\""$(call gb_Helper_make_url,$(HSQLDB_JAR))"\" \
) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/source

[Thorsten Behrens]

 vcl/source/window/status.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01161d411e4dfacb36c8889a91430ed44161447c
Author: Thorsten Behrens 
Date:   Thu Jul 5 17:06:49 2018 +0200

vcl: fix -Werror=shadow

Change-Id: If8897bc7e7a20961b2a325f20351ae9b6942563e

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 09ab700d7a5e..16350be3c052 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -226,7 +226,6 @@ void StatusBar::ImplInitSettings()
 
 void StatusBar::ImplFormat()
 {
-ImplStatusItem* pItem;
 longnExtraWidth;
 longnExtraWidth2;
 longnX;
@@ -312,6 +311,7 @@ void StatusBar::ImplFormat()
 nX += ImplGetSVData()->maNWFData.mnStatusBarLowerRightOffset;
 }
 
+ImplStatusItem* pItem;
 for (ImplStatusItem* i : *mpItemList) {
 pItem = i;
 if ( pItem->mbVisible ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/tools svx/source vcl/source

[Caolán McNamara]

 include/tools/wintypes.hxx   |3 ++-
 svx/source/gallery2/galbrws2.cxx |2 ++
 vcl/source/control/button.cxx|1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 74b897f9c578cb0b64124ef9563f2355680c8d84
Author: Caolán McNamara 
Date:   Thu Jun 21 09:14:33 2018 +0100

Resolves: tdf#115816 second 'Insert' menu is paste

reuse existing translation to be backportable wrt no new translations

Change-Id: I1fb94f66d696f836e8f6a10ba2d6933f69cfac95
Reviewed-on: https://gerrit.libreoffice.org/56245
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 897e63e520e1..7a984389cc41 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -259,7 +259,8 @@ enum class StandardButtonType
 Ignore   = 8,
 Abort= 9,
 Less = 10,
-Count= 11,
+Paste= 11,
+Count= 12,
 };
 
 // prominent place for ListBox window types
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 0a77441323f4..add5495ed895 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -259,6 +259,8 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, 
const ::Point &aPos
 mpPopupMenu->EnableItem(mpPopupMenu->GetItemId("paste"));
 }
 
+mpPopupMenu->SetItemText(mpPopupMenu->GetItemId("paste"), 
Button::GetStandardText(StandardButtonType::Paste));
+
 // update status
 css::uno::Reference< css::frame::XDispatchProvider> xDispatchProvider(
 GalleryBrowser2::GetFrame(), css::uno::UNO_QUERY );
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index d39a9f72de1b..a4948e6c833a 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -146,6 +146,7 @@ OUString Button::GetStandardText(StandardButtonType eButton)
 SV_BUTTONTEXT_IGNORE,
 SV_BUTTONTEXT_ABORT,
 SV_BUTTONTEXT_LESS,
+SV_BUTTONTEXT_PASTE,
 };
 
 return VclResId(aResIdAry[(sal_uInt16)eButton]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Mike Kaganski]

 sw/source/uibase/uiview/pview.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 8a20bf4a7df90d789753026c1e5b1b6fcf319d6c
Author: Mike Kaganski 
Date:   Thu Jul 5 14:00:33 2018 +0200

tdf#118546: GetNotebookBar() may return nullptr

Change-Id: I411ea0abcb5fd5fac0db7fe0c4bad16a0c1b9d77
Reviewed-on: https://gerrit.libreoffice.org/57006
Reviewed-by: Kshitij Pathania 
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/sw/source/uibase/uiview/pview.cxx 
b/sw/source/uibase/uiview/pview.cxx
index 2a83ada829e0..d43a0460fd48 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1164,7 +1164,8 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, 
SfxViewShell* pOldSh):
 
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Printpreview));
 SfxShell::BroadcastContextForActivation(true);
 //removelisteners for notebookbar
-
SfxViewFrame::Current()->GetWindow().GetSystemWindow()->GetNotebookBar()->ControlListener(true);
+if (auto& pBar = 
SfxViewFrame::Current()->GetWindow().GetSystemWindow()->GetNotebookBar())
+pBar->ControlListener(true);
 
 SfxObjectShell* pObjShell = pViewFrame->GetObjectShell();
 if ( !pOldSh )
@@ -1230,7 +1231,8 @@ SwPagePreview::~SwPagePreview()
 delete pVShell;
 
 m_pViewWin.disposeAndClear();
-
SfxViewFrame::Current()->GetWindow().GetSystemWindow()->GetNotebookBar()->ControlListener(false);
+if (auto& pBar = 
SfxViewFrame::Current()->GetWindow().GetSystemWindow()->GetNotebookBar())
+pBar->ControlListener(false);
 m_pScrollFill.disposeAndClear();
 m_pHScrollbar.disposeAndClear();
 m_pVScrollbar.disposeAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |   44 --
 1 file changed, 38 insertions(+), 6 deletions(-)

New commits:
commit 89c8673755646e631469f8031a9785cdcc99ff75
Author: Caolán McNamara 
Date:   Tue Jun 5 14:57:19 2018 +0100

tdf#117981 translate embedded video window mouse events to parent 
coordinates

Change-Id: I0d8fb6c6adc44389332434f9f6a8396a4d1817cf
Reviewed-on: https://gerrit.libreoffice.org/55339
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 2e4f447f69b5..49ec49862164 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2612,11 +2612,28 @@ void GtkSalFrame::closePopup()
 
pSVData->maWinData.mpFirstFloat->EndPopupMode(FloatWinPopupEndFlags::Cancel | 
FloatWinPopupEndFlags::CloseAll);
 }
 
+namespace
+{
+//tdf#117981 translate embedded video window mouse events to parent 
coordinates
+void translate_coords(GdkWindow* pSourceWindow, GtkWidget* pTargetWidget, 
int& rEventX, int& rEventY)
+{
+gpointer user_data=nullptr;
+gdk_window_get_user_data(pSourceWindow, &user_data);
+GtkWidget* pRealEventWidget = static_cast(user_data);
+if (pRealEventWidget)
+{
+gtk_widget_translate_coordinates(pRealEventWidget, pTargetWidget, 
rEventX, rEventY, &rEventX, &rEventY);
+}
+}
+}
+
 gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, 
gpointer frame )
 {
 UpdateLastInputEventTime(pEvent->time);
 
 GtkSalFrame* pThis = static_cast(frame);
+GtkWidget* pEventWidget = pThis->getMouseEventWidget();
+bool bDifferentEventWindow = pEvent->window != 
widget_get_window(pEventWidget);
 
 SalMouseEvent aEvent;
 SalEvent nEventType = SalEvent::NONE;
@@ -2645,7 +2662,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, 
GdkEventButton* pEvent, gpointer
 {
 //rhbz#1505379 if the window that got the event isn't our one, or 
there's none
 //of our windows under the mouse then close this popup window
-if (pEvent->window != widget_get_window(pThis->getMouseEventWidget()) 
||
+if (bDifferentEventWindow ||
 gdk_device_get_window_at_position(pEvent->device, nullptr, 
nullptr) == nullptr)
 {
 if (pEvent->type == GDK_BUTTON_PRESS)
@@ -2655,10 +2672,16 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, 
GdkEventButton* pEvent, gpointer
 }
 }
 
+int nEventX = pEvent->x;
+int nEventY = pEvent->y;
+
+if (bDifferentEventWindow)
+translate_coords(pEvent->window, pEventWidget, nEventX, nEventY);
+
 if (!aDel.isDeleted())
 {
-int frame_x = (int)(pEvent->x_root - pEvent->x);
-int frame_y = (int)(pEvent->y_root - pEvent->y);
+int frame_x = static_cast(pEvent->x_root - nEventX);
+int frame_y = static_cast(pEvent->y_root - nEventY);
 if (pThis->m_bGeometryIsProvisional || frame_x != pThis->maGeometry.nX 
|| frame_y != pThis->maGeometry.nY)
 {
 pThis->m_bGeometryIsProvisional = false;
@@ -2872,18 +2895,27 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, 
GdkEventMotion* pEvent, gpointer
 UpdateLastInputEventTime(pEvent->time);
 
 GtkSalFrame* pThis = static_cast(frame);
+GtkWidget* pEventWidget = pThis->getMouseEventWidget();
+bool bDifferentEventWindow = pEvent->window != 
widget_get_window(pEventWidget);
 
 //If a menu, e.g. font name dropdown, is open, then under wayland moving 
the
 //mouse in the top left corner of the toplevel window in a
 //0,0,float-width,float-height area generates motion events which are
 //delivered to the dropdown
-if (pThis->isFloatGrabWindow() && pEvent->window != 
widget_get_window(pThis->getMouseEventWidget()))
+if (pThis->isFloatGrabWindow() && bDifferentEventWindow)
 return true;
 
 vcl::DeletionListener aDel( pThis );
 
-int frame_x = (int)(pEvent->x_root - pEvent->x);
-int frame_y = (int)(pEvent->y_root - pEvent->y);
+int nEventX = pEvent->x;
+int nEventY = pEvent->y;
+
+if (bDifferentEventWindow)
+translate_coords(pEvent->window, pEventWidget, nEventX, nEventY);
+
+int frame_x = static_cast(pEvent->x_root - nEventX);
+int frame_y = static_cast(pEvent->y_root - nEventY);
+
 if (pThis->m_bGeometryIsProvisional || frame_x != pThis->maGeometry.nX || 
frame_y != pThis->maGeometry.nY)
 {
 pThis->m_bGeometryIsProvisional = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - nlpsolver/src

[Julien Nabet]

 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java |   
 6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 12e092b414208ba4342f20fe190681d73d9c6ff9
Author: Julien Nabet 
Date:   Sun Jun 24 21:35:06 2018 +0200

tdf#43388: add missing info for Evolutionary Algorithm Solver

Add SolverConstraintOperator.INTEGER_value case and in the same time
the also missing SolverConstraintOperator.BINARY_value case

Change-Id: I18b826e74a2381dedaea3090919118b8d5dad072
Reviewed-on: https://gerrit.libreoffice.org/56359
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 02a66f29fec36aed5fb1e800a08c1390d3674b59)
Reviewed-on: https://gerrit.libreoffice.org/56435
Reviewed-by: Michael Stahl 

diff --git 
a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java 
b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
index 701e6ba63226..c0b10c2f4951 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
@@ -105,6 +105,12 @@ public abstract class BaseEvolutionarySolver extends 
BaseNLPSolver {
 case SolverConstraintOperator.LESS_EQUAL_value:
 setDefaultYAt(i + 1, BasicBound.MINDOUBLE, 
constraint.Data);
 break;
+case SolverConstraintOperator.INTEGER_value:
+setDefaultYAt(i + 1, BasicBound.MINDOUBLE, 
BasicBound.MAXDOUBLE);
+break;
+case SolverConstraintOperator.BINARY_value:
+setDefaultYAt(i + 1, 0, 1);
+break;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - pyuno/source

[Stephan Bergmann]

 pyuno/source/module/pyuno_impl.hxx |2 +-
 pyuno/source/module/pyuno_type.cxx |2 +-
 pyuno/source/module/pyuno_util.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 19ff1064c84f1e5e5081ff624b3abd5e6ad99367
Author: Stephan Bergmann 
Date:   Tue Jul 3 08:33:34 2018 +0200

const fixes for python3-devel-3.7.0-1.fc29.x86_64

Change-Id: Ia16a8b828e11ce36e9bb77ecf9e8a1179bd9b90c
Reviewed-on: https://gerrit.libreoffice.org/56841
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 76a29148be63cb006a7e25e312dc93acc93e071f)
Reviewed-on: https://gerrit.libreoffice.org/56913
Reviewed-by: Michael Stahl 

diff --git a/pyuno/source/module/pyuno_impl.hxx 
b/pyuno/source/module/pyuno_impl.hxx
index ea0e419ffb1b..73acabdf4a16 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -80,7 +80,7 @@ inline PyObject* PyStr_FromString(const char *string)
 return PyUnicode_FromString(string);
 }
 
-inline char * PyStr_AsString(PyObject *object)
+inline char const * PyStr_AsString(PyObject *object)
 {
 return PyUnicode_AsUTF8(object);
 }
diff --git a/pyuno/source/module/pyuno_type.cxx 
b/pyuno/source/module/pyuno_type.cxx
index e54400ba6d8d..3c09e24243b6 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -157,7 +157,7 @@ Any PyEnum2Enum( PyObject *obj )
 }
 
 OUString strTypeName( OUString::createFromAscii( PyStr_AsString( 
typeName.get() ) ) );
-char *stringValue = PyStr_AsString( value.get() );
+char const *stringValue = PyStr_AsString( value.get() );
 
 TypeDescription desc( strTypeName );
 if( !desc.is() )
diff --git a/pyuno/source/module/pyuno_util.cxx 
b/pyuno/source/module/pyuno_util.cxx
index e92dad2e8bca..9bb48cf38747 100644
--- a/pyuno/source/module/pyuno_util.cxx
+++ b/pyuno/source/module/pyuno_util.cxx
@@ -69,7 +69,7 @@ OUString pyString2ustring( PyObject *pystr )
 #else
 #if PY_MAJOR_VERSION >= 3
 Py_ssize_t size(0);
-char *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
+char const *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
 ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
 #else
 PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Samuel Mehrbrodt]

 sc/source/ui/view/cellsh1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25b74c5b725a2c76ce5b1d513e868a488628a7a8
Author: Samuel Mehrbrodt 
Date:   Thu Jun 28 11:22:43 2018 +0200

Adjust indentation to match surrounding code

Change-Id: I631fe8553907c5ddc979a139c8cc77d3902d204a
Reviewed-on: https://gerrit.libreoffice.org/57014
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 35bb8dcf1a73..b7d5486a8ab7 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2661,7 +2661,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 }
 break;
 
-case SID_SELECT_UNPROTECTED_CELLS:
+case SID_SELECT_UNPROTECTED_CELLS:
 {
 ScViewData* pData = GetViewData();
 SCTAB aTab = pData->GetTabNo();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lingucomponent/Library_MacOSXSpell.mk lingucomponent/source

[Jim Jagielski]

 lingucomponent/Library_MacOSXSpell.mk|6 ++
 lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx |2 ++
 2 files changed, 8 insertions(+)

New commits:
commit 6d1023002af66a4f7453ffdf50ff50f79d443b24
Author: Jim Jagielski 
Date:   Thu Jul 5 14:04:55 2018 +

This is a start in the right direction... Now try to track down why we

are getting these undefined symbol errors:

Undefined symbols for architecture x86_64:
"std::string::find(char const*, unsigned long, unsigned long) const", 
referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::_Rep::_M_destroy(std::allocator const&)", referenced 
from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::_Rep::_S_empty_rep_storage", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::append(char const*, unsigned long)", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::append(std::string const&)", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::replace(unsigned long, unsigned long, char const*, unsigned 
long)", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::basic_string, std::allocator 
>::basic_string(char const*, std::allocator const&)", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::__throw_length_error(char const*)", referenced from:
std::vector 
>::_M_fill_insert(__gnu_cxx::__normal_iterator > >, unsigned long, affentry const&) in 
libhunspell-1.3.a(affixmgr.o)
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see 
invocation)
make: *** [/Users/jim/src/asf/AOO420/main/solenv/gbuild/LinkTarget.mk:251: 
/Users/jim/src/asf/AOO420/main/solver/420/unxmaccx.pro/workdir/LinkTarget/Library/libspell.uno.dylib]
 Error 1
dmake:  Error code 2, while making 'all'

diff --git a/lingucomponent/Library_MacOSXSpell.mk 
b/lingucomponent/Library_MacOSXSpell.mk
index cd3a7dc098ea..7b33e3a7a725 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -56,6 +56,8 @@ $(eval $(call gb_Library_add_linked_libs,MacOSXSpell,\
 
 $(eval $(call gb_Library_add_libs,MacOSXSpell,\
-framework Cocoa \
+   -framework Carbon \
+   -framework CoreFoundation \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,MacOSXSpell,\
@@ -63,5 +65,9 @@ $(eval $(call gb_Library_add_exception_objects,MacOSXSpell,\
lingucomponent/source/spellcheck/macosxspell/macspellimp \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,MacOSXSpell,\
+-x -objective-c++ -stdlib=libc++ \
+))
+
 # vim: set noet sw=4 ts=4:
 
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx 
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 9ad776439f7c..db51849fda59 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -31,7 +31,9 @@
 #ifdef MACOSX
 #include 
 #include 
+#include 
 #import 
+#import 
 #include 
 #endif
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/source

[Andrea Gelmini]

 wizards/source/access2base/Application.xba |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fd8690213e79d406f2a8e74f29b16b0e1dc9b468
Author: Andrea Gelmini 
Date:   Thu Jul 5 14:01:48 2018 +0200

Fix for commit ae412b4

In commit ae412b486e02aa5890769bebcfc46e485a72103c
I missed a '>', to close tag.

Change-Id: Id60b88b5b2a38ede2a2c0680abcc8af32f900586
Reviewed-on: https://gerrit.libreoffice.org/57007
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/wizards/source/access2base/Application.xba 
b/wizards/source/access2base/Application.xba
index 008fc1cb5e44..7877b7b45c90 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -1,6 +1,6 @@
 
 
-http://openoffice.org/2000/script"; 
script:name="Application" script:language="StarBasic"
+http://openoffice.org/2000/script"; 
script:name="Application" script:language="StarBasic">
 REM 
===
 REM ===The Access2Base library is a 
part of the LibreOffice project.
   ===
 REM ===Full documentation is available 
on http://www.access2base.com   
===
@@ -1640,4 +1640,4 @@ Public Sub _RootInit(Optional ByVal pbForce As Boolean)

 End Sub'  _RootInit   V1.1.0
 
-
\ 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: Branch 'libreoffice-6-1' - sd/uiconfig

[andreas kainz]

 sd/uiconfig/simpress/menubar/menubar.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2000a0d6d4a0d130a7ff822d64ba941de1c761e0
Author: andreas kainz 
Date:   Wed Jul 4 23:31:24 2018 +0200

Impress Menu -> Insert -> Slide Number fixed wrong command

Impress
Menubar -> Insert -> Slide Number open the Header and Fooder Dialog

Change-Id: Ie6c03358254265422ef2b760aa182515a44480d4
Reviewed-on: https://gerrit.libreoffice.org/56976
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit c50e4badfcb701d9e3927dae6617bb0d33f386e0)
Reviewed-on: https://gerrit.libreoffice.org/56994
Reviewed-by: andreas_kainz 

diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 227045f76e9d..a6d39c4c3020 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -240,7 +240,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/filter/ww8/ww8par.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fe8fc25e0673c9b27816c19d35915594074187d3
Author: Stephan Bergmann 
Date:   Thu Jul 5 09:59:51 2018 +0200

-Werror=deprecated-copy (GCC trunk towards GCC 9)

Change-Id: I97cbb82fc0912e9b9ccdfdf78c424c478251362b
Reviewed-on: https://gerrit.libreoffice.org/56993
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index c50e9c6484af..f43797213631 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1048,6 +1048,9 @@ struct WW8TabBandDesc
 void ReadNewShd(const sal_uInt8* pS, bool bVer67);
 
 enum wwDIR {wwTOP = 0, wwLEFT = 1, wwBOTTOM = 2, wwRIGHT = 3};
+
+private:
+WW8TabBandDesc & operator =(WW8TabBandDesc const &) = default; // only for 
use in copy ctor
 };
 
 //Storage-Reader
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Tor Lillqvist]

 loleaflet/src/dom/DomEvent.js  |1 +
 loleaflet/src/dom/Draggable.js |1 +
 loleaflet/src/map/handler/Map.Tap.js   |1 +
 loleaflet/src/map/handler/Map.TouchZoom.js |1 +
 4 files changed, 4 insertions(+)

New commits:
commit ed69ecf81f8c39deeab188dc7eac310fff29bd67
Author: Tor Lillqvist 
Date:   Thu Jul 5 12:53:35 2018 +0300

Add Emacs mode lines to get the indent level right

It's irritating to have to manually align lines even when just adding
temporary console.debug() calls. Sure, these mode lines should be
added in all .js files; these are just some I happened to be touching
now.

Change-Id: I13b3a62e66e4430878713fd64a459c72c014ded1

diff --git a/loleaflet/src/dom/DomEvent.js b/loleaflet/src/dom/DomEvent.js
index 59a7ce559..67e04c4ce 100644
--- a/loleaflet/src/dom/DomEvent.js
+++ b/loleaflet/src/dom/DomEvent.js
@@ -1,3 +1,4 @@
+/* -*- js-indent-level: 8 -*- */
 /*
  * L.DomEvent contains functions for working with DOM events.
  * Inspired by John Resig, Dean Edwards and YUI addEvent implementations.
diff --git a/loleaflet/src/dom/Draggable.js b/loleaflet/src/dom/Draggable.js
index 99cd6a95f..f7aa5b31a 100644
--- a/loleaflet/src/dom/Draggable.js
+++ b/loleaflet/src/dom/Draggable.js
@@ -1,3 +1,4 @@
+/* -*- js-indent-level: 8 -*- */
 /*
  * L.Draggable allows you to add dragging capabilities to any element. 
Supports mobile devices too.
  */
diff --git a/loleaflet/src/map/handler/Map.Tap.js 
b/loleaflet/src/map/handler/Map.Tap.js
index bc0b27e6e..d5d25d570 100644
--- a/loleaflet/src/map/handler/Map.Tap.js
+++ b/loleaflet/src/map/handler/Map.Tap.js
@@ -1,3 +1,4 @@
+/* -*- js-indent-level: 8 -*- */
 /*
  * L.Map.Tap is used to enable mobile hacks like quick taps and long hold.
  */
diff --git a/loleaflet/src/map/handler/Map.TouchZoom.js 
b/loleaflet/src/map/handler/Map.TouchZoom.js
index 43f758947..5e33162dd 100644
--- a/loleaflet/src/map/handler/Map.TouchZoom.js
+++ b/loleaflet/src/map/handler/Map.TouchZoom.js
@@ -1,3 +1,4 @@
+/* -*- js-indent-level: 8 -*- */
 /*
  * L.Handler.TouchZoom is used by L.Map to add pinch zoom on supported mobile 
browsers.
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sw/source

[Michael Stahl]

 sw/source/core/inc/scriptinfo.hxx |1 +
 sw/source/core/text/itrform2.cxx  |4 
 sw/source/core/text/porlay.cxx|   12 
 3 files changed, 17 insertions(+)

New commits:
commit 088d73b863b151ca11e23fd924c8d5a86c074e47
Author: Michael Stahl 
Date:   Wed Jul 4 12:53:56 2018 +0200

tdf#101856 sw: hidden bookmark portions in SwTextFormatter::NewTextPortion()

All other hidden-text features already have a AUTOFMT hint or a TXTFIELD
hint, so the SwAttrIter already creates new portions for them.

The bookmarks aren't considered by SwTextFormatter currently, but
SwScriptInfo already has all of the required info.

Change-Id: I451ce331110aa58df8955e1a3ffa339e6f905b22
Reviewed-on: https://gerrit.libreoffice.org/56937
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/core/inc/scriptinfo.hxx 
b/sw/source/core/inc/scriptinfo.hxx
index 865bac95bb24..17ec3f67059f 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -173,6 +173,7 @@ public:
 OSL_ENSURE( nCnt < aHiddenChg.size(),"No HiddenChg today!");
 return aHiddenChg[ nCnt ];
 }
+sal_Int32 NextHiddenChg(sal_Int32 nPos) const;
 static void CalcHiddenRanges(const SwTextNode& rNode, MultiSelection& 
rHiddenMulti);
 static void selectHiddenTextProperty(const SwTextNode& rNode, 
MultiSelection &rHiddenMulti);
 static void selectRedLineDeleted(const SwTextNode& rNode, MultiSelection 
&rHiddenMulti, bool bSelect=true);
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 4adfddceef88..437b80b3794e 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -939,6 +939,10 @@ SwTextPortion *SwTextFormatter::NewTextPortion( 
SwTextFormatInfo &rInf )
 const sal_Int32 nNextDir = pScriptInfo->NextDirChg( rInf.GetIdx() );
 nNextChg = std::min( nNextChg, nNextDir );
 
+// hidden change (potentially via bookmark):
+const sal_Int32 nNextHidden = pScriptInfo->NextHiddenChg(rInf.GetIdx());
+nNextChg = std::min( nNextChg, nNextHidden );
+
 // Turbo boost:
 // We assume that a font's characters are not larger than twice
 // as wide as heigh.
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 66d86985e653..5a415e11da9d 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1287,6 +1287,18 @@ sal_uInt8 SwScriptInfo::DirType(const sal_Int32 nPos) 
const
 return 0;
 }
 
+sal_Int32 SwScriptInfo::NextHiddenChg(sal_Int32 const nPos) const
+{
+for (auto const it : aHiddenChg)
+{
+if (nPos < it)
+{
+return it;
+}
+}
+return COMPLETE_STRING;
+}
+
 // Takes a string and replaced the hidden ranges with cChar.
 sal_Int32 SwScriptInfo::MaskHiddenRanges( const SwTextNode& rNode, 
OUStringBuffer & rText,
const sal_Int32 nStt, const sal_Int32 
nEnd,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-52'

[Andras Timar]

Tag 'cp-5.3-52' created by Andras Timar  at 
2018-07-05 12:51 +

cp-5.3-52

Changes since cp-5.3-51-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.3-52'

[Olivier R]

Tag 'cp-5.3-52' created by Andras Timar  at 
2018-07-05 12:51 +

cp-5.3-52

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.3-52'

[Andras Timar]

Tag 'cp-5.3-52' created by Andras Timar  at 
2018-07-05 12:51 +

cp-5.3-52

Changes since cp-5.3-46:
Andras Timar (1):
  remove extra ~ characters from German translation

---
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.3-52'

[Andras Timar]

Tag 'cp-5.3-52' created by Andras Timar  at 
2018-07-05 12:51 +

cp-5.3-52

Changes since libreoffice-5-3-branch-point-28:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - configure.ac

[Andras Timar]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41dd7b005f2bfc1d2f56205f6a14ca6a5a6a33d5
Author: Andras Timar 
Date:   Thu Jul 5 14:51:23 2018 +0200

Bump version to 5.3-52

Change-Id: I8423c2ba9f88f0c9fb6f119527ac2f84292c91d5

diff --git a/configure.ac b/configure.ac
index ed7a553683ed..6ca9152ff9e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.3.10.51],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.52],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Luboš Luňák]

 sc/source/core/tool/token.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fbd79a36ca8110e37434bb2eb5cc83e892710392
Author: Luboš Luňák 
Date:   Thu Jul 5 14:39:56 2018 +0200

block ocText for calc's threading

It may end up calling XColorList::CreateStdColorList(), and
XPropertyList is not thread-safe (gnome#627759-1 with disabled
mnOpenCLMinimumFormulaGroupSize).

Change-Id: I79c8335c6e8e3aaf39e01c68e6dbf6011820971a

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 062cfc455729..f16b5339f266 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1322,6 +1322,7 @@ void ScTokenArray::CheckForThreading( const FormulaToken& 
r )
 ocInfo,
 ocStyle,
 ocDBSum,
+ocText,
 ocExternal,
 ocDde,
 ocWebservice,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/latency' - wsd/ClientSession.hpp wsd/DocumentBroker.cpp

[Tamás Zolnai]

 wsd/ClientSession.hpp  |4 
 wsd/DocumentBroker.cpp |   13 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 7acf86c53008e00d09229e777c97e8d73d61c6fc
Author: Tamás Zolnai 
Date:   Thu Jul 5 14:40:28 2018 +0200

Calculate TilesOnFly limit based on visible area

Use 10 as a minimum value.

Change-Id: I9442a427fd25e1a7a32c3d1d06aa34d2c4ca2472

diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 5b3e62bc3..92589ea6b 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -114,6 +114,10 @@ public:
 void clearTilesOnFly();
 size_t getTilesOnFlyCount() const { return _tilesOnFly.size(); }
 
+Util::Rectangle getVisibleArea() const { return _clientVisibleArea; }
+int getTileWidthInTwips() const { return _tileWidthTwips; }
+int getTileHeightInTwips() const { return _tileHeightTwips; }
+
 
 private:
 
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 9b176501d..0028d8749 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -41,7 +41,7 @@
 #include 
 #include 
 
-#define TILES_ON_FLY_UPPER_LIMIT 25
+#define TILES_ON_FLY_MIN_UPPER_LIMIT 10u
 
 using namespace LOOLProtocol;
 
@@ -1366,13 +1366,22 @@ void DocumentBroker::sendRequestedTiles(const 
std::shared_ptr& se
 {
 std::unique_lock lock(_mutex);
 
+// How many tiles we have on the visible area, set the upper limit 
accordingly
+const unsigned tilesFitOnWidth = 
static_cast(std::ceil(static_cast(session->getVisibleArea().getWidth())
 /
+
static_cast(session->getTileWidthInTwips(;
+const unsigned tilesFitOnHieght = 
static_cast(std::ceil(static_cast(session->getVisibleArea().getHeight())
 /
+ 
static_cast(session->getTileHeightInTwips(;
+const unsigned tilesInVisArea = tilesFitOnWidth * tilesFitOnHieght;
+
+const unsigned tilesInFlyUpperLimit = 
std::max(TILES_ON_FLY_MIN_UPPER_LIMIT, tilesInVisArea);
+
 // All tiles were processed on client side what we sent last time, so we 
can send a new banch of tiles
 // which was invalidated / requested in the meantime
 boost::optional>& requestedTiles = 
session->getRequestedTiles();
 if(requestedTiles != boost::none && !requestedTiles.get().empty())
 {
 std::vector tilesNeedsRendering;
-while(session->getTilesOnFlyCount() < TILES_ON_FLY_UPPER_LIMIT && 
!requestedTiles.get().empty())
+while(session->getTilesOnFlyCount() < tilesInFlyUpperLimit && 
!requestedTiles.get().empty())
 {
 TileDesc& tile = *(requestedTiles.get().begin());
 session->addTileOnFly(tile);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/latency' - 4 commits - wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/TileCache.cpp wsd/TileCache.hpp

[Tamás Zolnai]

 wsd/ClientSession.cpp  |   44 
 wsd/ClientSession.hpp  |   16 +++-
 wsd/DocumentBroker.cpp |   33 +
 wsd/TileCache.cpp  |5 +
 wsd/TileCache.hpp  |3 +++
 5 files changed, 40 insertions(+), 61 deletions(-)

New commits:
commit 769359d27f078ab9c57b504db5a625fb8368a1f7
Author: Tamás Zolnai 
Date:   Thu Jun 28 18:20:14 2018 +0200

Use an upper limit for number of tiles we push to the network

I used number 25 as this limit. It's an approximate value. It's enough
to handle the first 5-10 character input without waiting for tileprocessed
messages. After the first 5-10 characters the tileprocessed messages are
arriving continuously (same frequency as the typing speed), so for the later
character inputs we always have some tileprocessed messages arrived so
we can push new tiles to the network again.
This 25 upper limit also seems enough to send all tiles when a whole page is
requested (e.g. zoom os scroll).

We store the requested tiles in a list, used as a queue. I don't use 
std::queue
because sometimes we need to do deduplication (replace older versions of the
same tile with a newer version).

Change-Id: I22ff3e35c8ded6001c7fc160abdc1f1b12ce3bae

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index ea4d7e95d..1acc06155 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -76,8 +76,6 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 const std::string firstLine = getFirstLine(buffer, length);
 const std::vector tokens = 
LOOLProtocol::tokenize(firstLine.data(), firstLine.size());
 
-checkTileRequestTimout();
-
 std::shared_ptr docBroker = getDocumentBroker();
 if (!docBroker)
 {
@@ -342,10 +340,6 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 if(iter != _tilesOnFly.end())
 _tilesOnFly.erase(iter);
 
-if(_tilesOnFly.empty())
-{
-_tileCounterStartTime = boost::none;
-}
 docBroker->sendRequestedTiles(shared_from_this());
 return true;
 }
@@ -1000,25 +994,17 @@ Authorization ClientSession::getAuthorization() const
 return Authorization();
 }
 
-void ClientSession::setTilesOnFly(boost::optional tiles)
+void ClientSession::addTileOnFly(const TileDesc& tile)
 {
+std::ostringstream tileID;
+tileID << tile.getPart() << ":" << tile.getTilePosX() << ":" << 
tile.getTilePosY() << ":"
+   << tile.getTileWidth() << ":" << tile.getTileHeight();
+_tilesOnFly.push_back(tileID.str());
+}
 
+void ClientSession::clearTilesOnFly()
+{
 _tilesOnFly.clear();
-if(tiles == boost::none)
-{
-_tileCounterStartTime = boost::none;
-}
-else
-{
-for (auto& tile : tiles.get().getTiles())
-{
-std::ostringstream tileID;
-tileID << tile.getPart() << ":" << tile.getTilePosX() << ":" << 
tile.getTilePosY() << ":"
-   << tile.getTileWidth() << ":" << tile.getTileHeight();
-_tilesOnFly.push_back(tileID.str());
-}
-_tileCounterStartTime = std::chrono::steady_clock::now();
-}
 }
 
 void ClientSession::onDisconnect()
@@ -1152,17 +1138,4 @@ void ClientSession::handleTileInvalidation(const 
std::string& message,
 }
 }
 
-void ClientSession::checkTileRequestTimout()
-{
-if(_tileCounterStartTime != boost::none)
-{
-const auto duration = std::chrono::steady_clock::now() - 
_tileCounterStartTime.get();
-if( std::chrono::duration_cast(duration).count() 
> 5)
-{
-LOG_WRN("Tile request timeout: server waits too long for 
tileprocessed messages.");
-_tileCounterStartTime = boost::none;
-}
-}
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 2ecb09e8f..5b3e62bc3 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -18,7 +18,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 class DocumentBroker;
 
@@ -108,10 +108,11 @@ public:
 /// Set WOPI fileinfo object
 void setWopiFileInfo(std::unique_ptr& 
wopiFileInfo) { _wopiFileInfo = std::move(wopiFileInfo); }
 
-boost::optional& getRequestedTiles() { return 
_requestedTiles; }
+boost::optional>& getRequestedTiles() { return 
_requestedTiles; }
 
-const std::vector& getTilesOnFly() const { return 
_tilesOnFly; }
-void setTilesOnFly(boost::optional tiles);
+void addTileOnFly(const TileDesc& tile);
+void clearTilesOnFly();
+size_t getTilesOnFlyCount() const { return _tilesOnFly.size(); }
 
 
 private:
@@ -154,8 +155,6 @@ private:
 void handleTileInvalidation(const std::string& message,
 const std::shared_ptr& 
docBroker);
 
-void checkTileRequestTimout();
-
 private:
 std::weak_ptr _docBroker;
 
@@ -197

[Libreoffice-commits] core.git: sc/source

[Jim Raykowski]

 sc/source/ui/view/tabvwsha.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f432d96eb30c91578f11491778a7c3fb823f166a
Author: Jim Raykowski 
Date:   Wed Jul 4 19:38:03 2018 -0800

tdf#105225 fix new background tab page in calc format cells dialog

Change-Id: I56cca8d22e98364eb369f3ccf54ca1acb3eb8516
Reviewed-on: https://gerrit.libreoffice.org/56983
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 90c30f148695..0acd574a396a 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -483,7 +483,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, 
const OString &rName
 std::shared_ptr pOldSet(new 
SfxItemSet(pOldAttrs->GetItemSet()));
 std::shared_ptr pNumberInfoItem;
 
-pOldSet->MergeRange(XATTR_FILLCOLOR, XATTR_FILLCOLOR);
+pOldSet->MergeRange(XATTR_FILLSTYLE, XATTR_FILLCOLOR);
 
 sal_uInt16 nWhich = pOldSet->GetPool()->GetWhich( SID_ATTR_BRUSH );
 SvxBrushItem aBrushItem(static_cast(pOldSet->Get(nWhich)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - svtools/source svx/uiconfig vcl/unx

[Maxim Monastirsky]

 svtools/source/control/valueset.cxx |3 ---
 svx/uiconfig/ui/colorwindow.ui  |3 +--
 vcl/unx/gtk3/gtk3gtkinst.cxx|3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 2113992e740ec5ba58b150acef04c355cb10bdad
Author: Maxim Monastirsky 
Date:   Wed Jul 4 19:39:05 2018 +0300

Honor border width in a welded color picker for gtk3/x11

Change-Id: I1b59e85edb8e9df5be453dc0be1d7d1ffd100ceb
Reviewed-on: https://gerrit.libreoffice.org/56996
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e2bc52fc922a..4d1c42f7f1dd 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2939,6 +2939,9 @@ private:
 }
 else
 {
+//set border width
+gtk_container_set_border_width(GTK_CONTAINER(m_pMenuHack), 
gtk_container_get_border_width(GTK_CONTAINER(m_pPopover)));
+
 //steal popover contents and smuggle into toplevel display window
 GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pPopover));
 g_object_ref(pChild);
commit 8161d9cf7649e1183e51aaa2525a9c0374205a3d
Author: Maxim Monastirsky 
Date:   Wed Jul 4 19:38:54 2018 +0300

Fix initial width of the color palette in welded picker

Problem can be seen with non-gtk3, if the initial
palette has no scrollbar (e.g. "standard" palette).

The cause is that in non-gtk3 we don't have overlay
scrollbars, so the palette area needs to be enlarged
when switching from a palette with a scrollbar to a
palette without a scrollbar. In practise, this was
happening also on initial show, although the palette
already had the correct width.

To fix that, start with a never scrollbar policy by
default, and add the scrollbar later if needed.

Change-Id: I5286f301b3c7ef5c72b650290ace784222f7922d
Reviewed-on: https://gerrit.libreoffice.org/56995
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index ef76d4bd2f60..bd2cb8e0b427 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -3634,9 +3634,6 @@ Size SvtValueSet::CalcWindowSizePixel( const Size& 
rItemSize, sal_uInt16 nDesire
 aSize.AdjustHeight(nTxtHeight + n + mnSpacing );
 }
 
-// sum possible ScrollBar width
-aSize.AdjustWidth(GetScrollWidth());
-
 return aSize;
 }
 
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 1c2e815eba12..8ec1d1be10ec 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -22,8 +22,6 @@
   
   
 False
-True
-True
 4
 bottom
 none
@@ -106,6 +104,7 @@
 True
 True
 never
+never
 in
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - 2 commits - vcl/inc vcl/Library_vclplug_qt5.mk vcl/qt5 vcl/unx

[Katarina Behrens]

 vcl/Library_vclplug_qt5.mk   |1 +
 vcl/inc/qt5/Qt5System.hxx|   27 +++
 vcl/qt5/Qt5Instance.cxx  |4 ++--
 vcl/qt5/Qt5System.cxx|   32 
 vcl/unx/kde5/KDE5SalGraphics.cxx |4 
 5 files changed, 66 insertions(+), 2 deletions(-)

New commits:
commit 34fec433197c5ec3e2a0c6603392fd5f1067c44b
Author: Katarina Behrens 
Date:   Thu Jul 5 11:45:45 2018 +0200

Basic Qt5 system display data

copied from dummy headless implementation

Change-Id: I1b184745627acd065b4c0cc54f044c47ec980c93

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 4fcd649e1777..1ad01555ed3a 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
 vcl/qt5/Qt5Object \
 vcl/qt5/Qt5Painter \
 vcl/qt5/Qt5Printer \
+vcl/qt5/Qt5System \
 vcl/qt5/Qt5Timer \
 vcl/qt5/Qt5Tools \
 vcl/qt5/Qt5VirtualDevice \
diff --git a/vcl/inc/qt5/Qt5System.hxx b/vcl/inc/qt5/Qt5System.hxx
new file mode 100644
index ..fbc753757b36
--- /dev/null
+++ b/vcl/inc/qt5/Qt5System.hxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 
+
+class Qt5System : public SalGenericSystem
+{
+public:
+Qt5System();
+virtual ~Qt5System() override;
+
+virtual unsigned int GetDisplayScreenCount() override;
+virtual tools::Rectangle GetDisplayScreenPosSizePixel(unsigned int 
nScreen) override;
+virtual int ShowNativeDialog(const OUString& rTitle, const OUString& 
rMessage,
+ const std::vector& rButtons) 
override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index ef618e18fa7f..c2f2b7eb1566 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -40,7 +41,6 @@
 #include 
 #include 
 
-#include 
 #include 
 
 Qt5Instance::Qt5Instance(SalYieldMutex* pMutex, bool bUseCairo)
@@ -125,7 +125,7 @@ std::unique_ptr 
Qt5Instance::CreateMenuItem(const SalItemParams& rI
 
 SalTimer* Qt5Instance::CreateSalTimer() { return new Qt5Timer(); }
 
-SalSystem* Qt5Instance::CreateSalSystem() { return new SvpSalSystem(); }
+SalSystem* Qt5Instance::CreateSalSystem() { return new Qt5System(); }
 
 std::shared_ptr Qt5Instance::CreateSalBitmap()
 {
diff --git a/vcl/qt5/Qt5System.cxx b/vcl/qt5/Qt5System.cxx
new file mode 100644
index ..0de1940d9eff
--- /dev/null
+++ b/vcl/qt5/Qt5System.cxx
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 
+
+Qt5System::Qt5System() {}
+Qt5System::~Qt5System() {}
+
+unsigned int Qt5System::GetDisplayScreenCount() { return 1; }
+
+tools::Rectangle Qt5System::GetDisplayScreenPosSizePixel(unsigned int nScreen)
+{
+tools::Rectangle aRect;
+if (nScreen == 0)
+aRect = tools::Rectangle(Point(0, 0), Size(1024, 768));
+return aRect;
+}
+
+int Qt5System::ShowNativeDialog(const OUString&, const OUString&, const 
std::vector&)
+{
+return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3d8dbf46e69a00049132108808e0c00cdb5bcc55
Author: Katarina Behrens 
Date:   Thu Jul 5 11:28:39 2018 +0200

Don't draw focus around checkboxes and radiobuttons

it is drawn separately around cb/rb's text

Change-Id: I22737944048c4d501ba4dc5416fa79d4d081e91c

diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 9377a134fdc4..f26e559b921e 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -468,6 +468,8 @@ bool KDE5SalGraphics::drawNativeControl(ControlType type, 
ControlPart part,
 if (part == ControlPart::Entire)
 {
 QStyleOptionButton option;
+// clear FOCUSED bit, focus is drawn separately
+nControlState &= ~(ControlState::FOCUSED);
 draw(QStyle::CE_CheckBox, &option, m_image.get(),
  vclStateValue2StateFlag(nControlState, value));
 }
@@ -548,6 +550,8 @@ bool KDE5SalGraphics::drawNativeControl(ControlType type, 
ControlPart part,
 if (part == ControlPart::Entire)
 {
 QSt

[Libreoffice-commits] core.git: sw/uiconfig

[heiko tietze]

 sw/uiconfig/swriter/ui/optformataidspage.ui |  109 ++--
 1 file changed, 71 insertions(+), 38 deletions(-)

New commits:
commit 0e83efbccc180c957f77291fc0fdc6dd74eae0f4
Author: heiko tietze 
Date:   Tue Jun 19 13:53:52 2018 +0200

tdf#117745 - Split Options/Formatting Aids/"Display of"

Field options moved into another frame

Change-Id: I42a1422617183e5059e66b4f280cbf9cc6daa79d
Reviewed-on: https://gerrit.libreoffice.org/56090
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui 
b/sw/uiconfig/swriter/ui/optformataidspage.ui
index 51378a9373db..24718bf9702e 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -131,7 +131,7 @@
 
 
   
-Hidden text
+Hidden characters
 True
 True
 False
@@ -145,36 +145,6 @@
   
 
 
-  
-Fields: Hidden te_xt
-True
-True
-False
-True
-0
-True
-  
-  
-0
-7
-  
-
-
-  
-Fields: Hidden 
p_aragraphs
-True
-True
-False
-True
-0
-True
-  
-  
-0
-8
-  
-
-
   
 True
 False
@@ -235,21 +205,84 @@
 
   
 
+  
+
+  
+
+
+  
+True
+False
+Display formatting
+
+  
+
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+True
+False
+6
+6
 
-  
+  
+Hidden te_xt
+True
+True
+False
+True
+0
+True
+  
+  
+0
+0
+  
 
 
-  
+  
+Hidden p_aragraphs
+True
+True
+False
+True
+0
+True
+  
+  
+0
+1
+  
 
   
 
   
 
 
-  
+  
 True
 False
-Display of
+Display fields
 
   
 
@@ -259,7 +292,7 @@
   
 False
 True
-0
+1
   
 
 
@@ -312,7 +345,7 @@
   
 False
 True
-1
+2
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesk

[Libreoffice-commits] core.git: sc/inc sc/source

[Noel Grandin]

 sc/inc/document.hxx|2 
 sc/source/core/data/documen2.cxx   |   32 --
 sc/source/core/data/documen3.cxx   |   12 +--
 sc/source/core/data/documen8.cxx   |4 -
 sc/source/core/data/documen9.cxx   |4 -
 sc/source/core/data/document.cxx   |  105 ++---
 sc/source/core/data/document10.cxx |   12 +--
 sc/source/core/data/documentimport.cxx |2 
 8 files changed, 75 insertions(+), 98 deletions(-)

New commits:
commit b8335d6b5b6b0184ed7c5d141c6a956187bcf9cf
Author: Noel Grandin 
Date:   Wed Jul 4 15:35:54 2018 +0200

use std::unique_ptr for ScTable in ScDocument

Change-Id: Ic817fbd7953afe9007f9ec6071f53c8beca6dd18
Reviewed-on: https://gerrit.libreoffice.org/56949
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 4d106792c290..07e16a8388de 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -326,7 +326,7 @@ friend class sc::TableColumnBlockPositionSet;
 friend struct ScMutationGuard;
 friend struct ScMutationDisable;
 
-typedef std::vector TableContainer;
+typedef std::vector> TableContainer;
 
 public:
 enum class HardRecalcState
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 378d97e7ddbd..81ce2170d02d 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -544,16 +544,16 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, const 
ScMarkData* pMarks )
 pSourceDoc->maTabs[i]->GetName(aString);
 if ( i < static_cast(maTabs.size()) )
 {
-maTabs[i] = new ScTable(this, i, aString);
+maTabs[i].reset( new ScTable(this, i, aString) );
 
 }
 else
 {
 if( i > static_cast(maTabs.size()) )
 {
-maTabs.resize(i, nullptr );
+maTabs.resize(i);
 }
-maTabs.push_back(new ScTable(this, i, aString));
+maTabs.emplace_back(new ScTable(this, i, aString));
 }
 maTabs[i]->SetLayoutRTL( 
pSourceDoc->maTabs[i]->IsLayoutRTL() );
 }
@@ -571,9 +571,9 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB 
nTab )
 InitClipPtrs(pSourceDoc);
 if (nTab >= static_cast(maTabs.size()))
 {
-maTabs.resize(nTab+1, nullptr );
+maTabs.resize(nTab+1);
 }
-maTabs[nTab] = new ScTable(this, nTab, "baeh");
+maTabs[nTab].reset( new ScTable(this, nTab, "baeh") );
 if (nTab < static_cast(pSourceDoc->maTabs.size()) && 
pSourceDoc->maTabs[nTab])
 maTabs[nTab]->SetLayoutRTL( 
pSourceDoc->maTabs[nTab]->IsLayoutRTL() );
 }
@@ -587,10 +587,10 @@ void ScDocument::EnsureTable( SCTAB nTab )
 {
 bool bExtras = !bIsUndo;// Column-Widths, Row-Heights, Flags
 if (static_cast(nTab) >= maTabs.size())
-maTabs.resize(nTab+1, nullptr);
+maTabs.resize(nTab+1);
 
 if (!maTabs[nTab])
-maTabs[nTab] = new ScTable(this, nTab, "temp", bExtras, bExtras);
+maTabs[nTab].reset( new ScTable(this, nTab, "temp", bExtras, bExtras) 
);
 }
 
 ScRefCellValue ScDocument::GetRefCellValue( const ScAddress& rPos )
@@ -779,9 +779,9 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, 
ScProgress* pProgress )
 pUnoBroadcaster->Broadcast( ScUpdateRefHint( URM_REORDER,
 aSourceRange, 0,0,nDz ) );
 
-ScTable* pSaveTab = maTabs[nOldPos];
+std::unique_ptr pSaveTab = std::move(maTabs[nOldPos]);
 maTabs.erase(maTabs.begin()+nOldPos);
-maTabs.insert(maTabs.begin()+nNewPos, pSaveTab);
+maTabs.insert(maTabs.begin()+nNewPos, std::move(pSaveTab));
 TableContainer::iterator it = maTabs.begin();
 for (SCTAB i = 0; i < nTabCount; i++)
 if (maTabs[i])
@@ -833,7 +833,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 if (nNewPos >= static_cast(maTabs.size()))
 {
 nNewPos = static_cast(maTabs.size());
-maTabs.push_back(new ScTable(this, nNewPos, aName));
+maTabs.emplace_back(new ScTable(this, nNewPos, aName));
 }
 else
 {
@@ -858,16 +858,12 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 if ( pUnoBroadcaster )
 pUnoBroadcaster->Broadcast( ScUpdateRefHint( URM_INSDEL, 
aRange, 0,0,1 ) );
 
-SCTAB i;
 for (TableContainer::iterator it = maTabs.begin(); it != 
maTabs.end(); ++it)
 if (*it && it != (maTabs.begin() + nOldPos))
   

[Libreoffice-commits] core.git: sw/qa sw/source

[Miklos Vajna]

 sw/qa/extras/htmlexport/data/reqif-ole-img.xhtml |2 +-
 sw/qa/extras/htmlexport/data/reqif-png-img.xhtml |2 +-
 sw/qa/extras/htmlexport/htmlexport.cxx   |3 +++
 sw/source/filter/html/htmlgrin.cxx   |3 ++-
 sw/source/filter/html/htmlplug.cxx   |   20 +++-
 sw/source/filter/html/swhtml.hxx |3 +++
 6 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit bcc9feb94c481ee885c763d8fadfc9209acb117c
Author: Miklos Vajna 
Date:   Thu Jul 5 09:17:18 2018 +0200

sw HTML import: strip query & fragment for  and file URLs

There are two cases: when the  is a child of an outer 
(we create an embedded object) and the non-embedded  case (we
create an image). Call the new SwHTMLParser::StripQueryFromPath() in
both cases.

INetURLObject considers this query/fragment part as "name" (end of
"path"), so just do it manually.

Change-Id: Icb7991082b6e595db5729f3c4c84073c80834f27
Reviewed-on: https://gerrit.libreoffice.org/56989
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/htmlexport/data/reqif-ole-img.xhtml 
b/sw/qa/extras/htmlexport/data/reqif-ole-img.xhtml
index b552783068ae..6217412ae597 100644
--- a/sw/qa/extras/htmlexport/data/reqif-ole-img.xhtml
+++ b/sw/qa/extras/htmlexport/data/reqif-ole-img.xhtml
@@ -1,6 +1,6 @@
 
 
-OLE 
Object
+OLE Object
 
 
 
diff --git a/sw/qa/extras/htmlexport/data/reqif-png-img.xhtml 
b/sw/qa/extras/htmlexport/data/reqif-png-img.xhtml
index f31795e35224..637a7c2ac4b6 100644
--- a/sw/qa/extras/htmlexport/data/reqif-png-img.xhtml
+++ b/sw/qa/extras/htmlexport/data/reqif-png-img.xhtml
@@ -1,4 +1,4 @@
 
-OLE 
Object
+OLE Object
 
 
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 8cb60396691d..5d82b82c9524 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -391,6 +391,7 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testReqIfOleImg, 
"reqif-ole-img.xhtml")
 // This failed, OLE object had no replacement image.
 // And then it also failed when the export lost the replacement image.
 uno::Reference xGraphic = 
xObject->getReplacementGraphic();
+// This failed when query and fragment of file:// URLs were not ignored.
 CPPUNIT_ASSERT(xGraphic.is());
 
 uno::Reference xShape(xObject, uno::UNO_QUERY);
@@ -456,6 +457,8 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testReqIfPngImg, 
"reqif-png-img.xhtml")
 
 // Make sure that both RTF and PNG versions are written.
 CPPUNIT_ASSERT(aStream.indexOf("text/rtf") != -1);
+// This failed when images with a query in their file:// URL failed to
+// import.
 CPPUNIT_ASSERT(aStream.indexOf("image/png") != -1);
 }
 
diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 0a9050f3475a..8b3ddaf0f601 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -349,7 +349,8 @@ void SwHTMLParser::InsertImage()
 case HtmlOptionId::DATA:
 aGraphicData = rOption.GetString();
 if (!InternalImgToPrivateURL(aGraphicData))
-aGraphicData = INetURLObject::GetAbsURL(m_sBaseURL, 
aGraphicData);
+aGraphicData = INetURLObject::GetAbsURL(
+m_sBaseURL, 
SwHTMLParser::StripQueryFromPath(m_sBaseURL, aGraphicData));
 break;
 case HtmlOptionId::ALIGN:
 eVertOri =
diff --git a/sw/source/filter/html/htmlplug.cxx 
b/sw/source/filter/html/htmlplug.cxx
index 30277b8bf3a9..22738a13b934 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -72,6 +72,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -299,6 +300,19 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
 }
 }
 
+OUString SwHTMLParser::StripQueryFromPath(const OUString& rBase, const 
OUString& rPath)
+{
+if (!comphelper::isFileUrl(rBase))
+return rPath;
+
+sal_Int32 nIndex = rPath.indexOf('?');
+
+if (nIndex != -1)
+return rPath.copy(0, nIndex);
+
+return rPath;
+}
+
 bool SwHTMLParser::InsertEmbed()
 {
 OUString aURL, aType, aName, aAlt, aId, aStyle, aClass;
@@ -420,9 +434,13 @@ bool SwHTMLParser::InsertEmbed()
INetURLObject(m_sBaseURL), aURL,
URIHelper::GetMaybeFileHdl()) );
 bool bHasData = !aData.isEmpty();
+
 try
 {
-aURLObj.SetURL(rtl::Uri::convertRelToAbs(m_sBaseURL, aData));
+// Strip query and everything after that for file:// URLs, browsers do
+// the same.
+aURLObj.SetURL(rtl::Uri::convertRelToAbs(
+m_sBaseURL, SwHTMLParser::StripQueryFromPath(m_sBaseURL, aData)));
 }
 catch (const rtl::MalformedUriException& /*rException*/)
 {
diff --git a/sw

[Libreoffice-commits] core.git: icon-themes/colibre officecfg/registry

[andreas kainz]

 icon-themes/colibre/links.txt|
9 +++
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
27 ++
 2 files changed, 36 insertions(+)

New commits:
commit eada59bd3383b1711f3a68030ad52c69746e810a
Author: andreas kainz 
Date:   Thu Jul 5 01:12:58 2018 +0200

Menubar Impress: add missing icons to menubar

Change-Id: I5116e214ab64923c28dda4d10feab1193b5d9d31
Reviewed-on: https://gerrit.libreoffice.org/56978
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 251462981c1d..9c0dc09994b2 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1050,6 +1050,15 @@ cmd/sc_lastslide.png cmd/sc_lastrecord.png
 cmd/sc_previousslide.png cmd/sc_prevrecord.png
 cmd/sc_nextslide.png cmd/sc_nextrecord.png
 cmd/sc_slidesetup.png cmd/sc_pagesetup.png
+cmd/sc_insertslidenumber.png cmd/sc_insertpagenumberfield.png
+cmd/sc_insertslidefield.png cmd/sc_insertpagenumberfield.png
+cmd/sc_insertslidesfield.png cmd/sc_insertpagecountfield.png
+cmd/sc_insertslidetitlefield.png cmd/sc_inserttitlefield.png
+cmd/sc_insertfilefield.png cmd/sc_open.png
+cmd/sc_insertdatefielfix.png cmd/sc_datefield.png
+cmd/sc_insertdatefielvar.png cmd/sc_datefield.png
+cmd/sc_inserttimefieldfix.png cmd/sc_timefield.png
+cmd/sc_inserttimefieldvar.png cmd/sc_timefield.png
 
 # dbaccess
 # ==
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 91b409db9dba..51faca943f2d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -490,21 +490,33 @@
 
   Dat~e (variable)
 
+
+  1
+
   
   
 
   ~Date (fixed)
 
+
+  1
+
   
   
 
   T~ime (variable)
 
+
+  1
+
   
   
 
   ~Time (fixed)
 
+
+  1
+
   
   
 
@@ -518,6 +530,9 @@
 
   .uno:InsertPageField
 
+
+  1
+
   
   
 
@@ -531,6 +546,9 @@
 
   .uno:InsertPageTitleField
 
+
+  1
+
   
   
 
@@ -544,6 +562,9 @@
 
   .uno:InsertPagesField
 
+
+  1
+
   
   
 
@@ -554,6 +575,9 @@
 
   ~File Name
 
+
+  1
+
   
   
 
@@ -1703,6 +1727,9 @@
 
   S~lide Number...
 
+
+  1
+
 
   .uno:InsertPageNumber
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - 2 commits - filter/source include/filter include/vcl sw/qa sw/source vcl/source

[Miklos Vajna]

 filter/source/msfilter/rtfutil.cxx  |   16 +++
 include/filter/msfilter/rtfutil.hxx |3 +
 include/vcl/gfxlink.hxx |1 
 sw/qa/extras/htmlexport/htmlexport.cxx  |   14 --
 sw/source/filter/html/htmlflywriter.cxx |   44 ++-
 sw/source/filter/html/htmlreqifreader.cxx   |   64 
 sw/source/filter/html/htmlreqifreader.hxx   |9 +++
 sw/source/filter/ww8/rtfattributeoutput.cxx |   35 +--
 vcl/source/gdi/gfxlink.cxx  |   16 +++
 9 files changed, 165 insertions(+), 37 deletions(-)

New commits:
commit 6285b8bb18462528b0c0e80e5c57106855b77b1d
Author: Miklos Vajna 
Date:   Thu Jun 7 16:49:58 2018 +0200

sw HTML export: use PNG fallback + RTF native data for all images for ReqIF

ReqIF says the image should be either PNG or has a PNG fallback and then
it can be something else. We used to convert images to PNG to avoid
writing any native data, but results in data loss.

So instead:

1) Write the original image as an RTF fragment, so it's not lost.

2) Some ReqIF parsers expect an RTF fragment even for PNG, so make sure
we always write the RTF fragment, even if that means a small
duplication.

Reviewed-on: https://gerrit.libreoffice.org/55430
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 76abcd5f912f1a9e6f86ffc2a489ba7dba1aac56)

Conflicts:
sw/source/filter/ww8/rtfattributeoutput.cxx

Change-Id: Ida0fcaa58d56b9e11f81992307505599807353b5

diff --git a/filter/source/msfilter/rtfutil.cxx 
b/filter/source/msfilter/rtfutil.cxx
index 57f7ca7ff14b..cdb3d7d4acce 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -283,6 +283,22 @@ bool ExtractOLE2FromObjdata(const OString& rObjdata, 
SvStream& rOle2)
 
 return true;
 }
+
+bool StripMetafileHeader(const sal_uInt8*& rpGraphicAry, sal_uInt64& rSize)
+{
+if (rpGraphicAry && (rSize > 0x22))
+{
+if ((rpGraphicAry[0] == 0xd7) && (rpGraphicAry[1] == 0xcd) && 
(rpGraphicAry[2] == 0xc6)
+&& (rpGraphicAry[3] == 0x9a))
+{
+// we have to get rid of the metafileheader
+rpGraphicAry += 22;
+rSize -= 22;
+return true;
+}
+}
+return false;
+}
 }
 }
 
diff --git a/include/filter/msfilter/rtfutil.hxx 
b/include/filter/msfilter/rtfutil.hxx
index f4699169143a..a448f7b117bc 100644
--- a/include/filter/msfilter/rtfutil.hxx
+++ b/include/filter/msfilter/rtfutil.hxx
@@ -66,6 +66,9 @@ MSFILTER_DLLPUBLIC OString WriteHex(const sal_uInt8* pData, 
sal_uInt32 nSize,
  * Extract OLE2 data from an \objdata hex dump.
  */
 MSFILTER_DLLPUBLIC bool ExtractOLE2FromObjdata(const OString& rObjdata, 
SvStream& rOle2);
+
+/// Strips the header of a WMF file.
+MSFILTER_DLLPUBLIC bool StripMetafileHeader(const sal_uInt8*& rpGraphicAry, 
sal_uInt64& rSize);
 }
 }
 
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index dddf33b945e7..79d5da7875a2 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -434,11 +434,15 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testReqIfPngImg, 
"reqif-png-img.xhtml")
 uno::Reference xShape(getShape(1), uno::UNO_QUERY);
 CPPUNIT_ASSERT(xShape.is());
 
-// This was Object1, PNG without fallback was imported as OLE object.
-CPPUNIT_ASSERT_EQUAL(OUString("Image1"), xShape->getName());
-
 if (!mbExported)
+{
+// Imported PNG image is not an object.
+CPPUNIT_ASSERT_EQUAL(OUString("Image1"), xShape->getName());
 return;
+}
+
+// All images are exported as objects in ReqIF mode.
+CPPUNIT_ASSERT_EQUAL(OUString("Object1"), xShape->getName());
 
 // This was , not , which is not valid in the reqif-xhtml
 // subset.
@@ -449,6 +453,10 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testReqIfPngImg, 
"reqif-png-img.xhtml")
 pStream->Seek(0);
 OString aStream(read_uInt8s_ToOString(*pStream, nLength));
 CPPUNIT_ASSERT(aStream.indexOf(" xGraphic(aGraphic.GetXGraphic(), 
uno::UNO_QUERY);
 if (xGraphic.is() && aMimeType.isEmpty())
 xGraphic->getPropertyValue("MimeType") >>= aMimeType;
+
+if (rHTMLWrt.mbReqIF)
+{
+// Write the original image as an RTF fragment.
+OUString aFileName;
+if (rHTMLWrt.GetOrigFileName())
+aFileName = *rHTMLWrt.GetOrigFileName();
+INetURLObject aURL(aFileName);
+OUString aName(aURL.getBase());
+aName += "_";
+aName += aURL.getExtension();
+aName += "_";
+aName += OUString::number(aGraphic.GetChecksum(), 16);
+aURL.setBase(aName);
+aURL.setExtension("ole");
+aFileName = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
+
+SvFileStream aOutStream(aFileName, StreamMode::WRITE);
+if (!SwRe

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/karasa_jaga

[Rizal Muttaqin]

 icon-themes/karasa_jaga/links.txt |   21 ++---
 1 file changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 70c9bc40470520c5246e007f47fce7e179d11545
Author: Rizal Muttaqin 
Date:   Thu Jul 5 06:19:37 2018 +0700

Karasa Jaga: add icons to some Calc menubar entries

Change-Id: I3730aea8f4b5c14b48bc1020687cb037c06b28eb
Reviewed-on: https://gerrit.libreoffice.org/56964
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 2f5be15efa0f34ab3a8ec27be8bcd9cbe9a7ac7a)
Reviewed-on: https://gerrit.libreoffice.org/56988

diff --git a/icon-themes/karasa_jaga/links.txt 
b/icon-themes/karasa_jaga/links.txt
index 1f044add49e9..7638681c950f 100755
--- a/icon-themes/karasa_jaga/links.txt
+++ b/icon-themes/karasa_jaga/links.txt
@@ -33,6 +33,7 @@ cmd/32/browsebackward.png cmd/32/navigateback.png
 cmd/32/browseforward.png cmd/32/navigateforward.png
 cmd/32/bulletliststyle.png cmd/32/defaultbullet.png
 cmd/32/calloutshapes.png cmd/32/calloutshapes.round-rectangular-callout.png
+cmd/32/cellcontentsmenu.png cmd/32/calculate.png
 cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png
 cmd/32/cellprotection.png cmd/32/protect.png
 cmd/32/cellvertbottom.png cmd/32/alignbottom.png
@@ -65,6 +66,7 @@ cmd/32/ellipse.png cmd/32/basicshapes.ellipse.png
 cmd/32/ellipsetoolbox.png cmd/32/basicshapes.ellipse.png
 cmd/32/es/underlinesimple.png cmd/32/es/underline.png
 cmd/32/exitsearch.png cmd/32/closedoc.png
+cmd/32/fieldmenu.png cmd/32/insertfield.png
 cmd/32/fieldnames.png cmd/32/fields.png
 cmd/32/fillcolor.png cmd/32/formatarea.png
 cmd/32/flowchartshapes.png 
cmd/32/flowchartshapes.flowchart-internal-storage.png
@@ -100,6 +102,7 @@ cmd/32/importfromfile.png cmd/32/importdialog.png
 cmd/32/indexesmenu.png cmd/32/insertindexesentry.png
 cmd/32/inputlinevisible.png cmd/32/insertformula.png
 cmd/32/insertavmedia.png cmd/32/avmediaplayer.png
+cmd/32/insertcell.png cmd/32/insertcellsright.png
 cmd/32/insertcolumndialog.png cmd/32/insertcolumns.png
 cmd/32/insertcolumnsbefore.png cmd/32/insertcolumns.png
 cmd/32/insertcolumnsleft.png cmd/32/insertcolumns.png
@@ -162,15 +165,16 @@ cmd/32/mailmergelastentry.png cmd/32/lastrecord.png
 cmd/32/mailmergenextentry.png cmd/32/nextrecord.png
 cmd/32/mailmergepreventry.png cmd/32/prevrecord.png
 cmd/32/mailmergewizard.png cmd/32/dsbformletter.png
+cmd/32/mergecellsmenu.png cmd/32/mergecells.png
 cmd/32/mirrorhorz.png cmd/32/fliphorizontal.png
 cmd/32/mirrorvert.png cmd/32/flipvertical.png
 cmd/32/nl/underlinesimple.png cmd/32/nl/underline.png
 cmd/32/no.png cmd/32/cancel.png
 cmd/32/numberformatcurrency.png cmd/32/currencyfield.png
 cmd/32/numberformatcurrencysimple.png cmd/32/currencyfield.png
+cmd/32/numberformatmenu.png cmd/32/numberformatstandard.png
 cmd/32/numberformattime.png cmd/32/timefield.png
 cmd/32/numberliststyle.png cmd/32/defaultnumbering.png
-cmd/32/numberformatstandard.png cmd/32/numericfield.png
 cmd/32/objectbackone.png cmd/32/backward.png
 cmd/32/objectforwardone.png cmd/32/forward.png
 cmd/32/objectmirrorhorizontal.png cmd/32/fliphorizontal.png
@@ -192,6 +196,7 @@ cmd/32/pie.png cmd/32/basicshapes.circle-pie.png
 cmd/32/pl/underlinesimple.png cmd/32/pl/underline.png
 cmd/32/pluginsactive.png cmd/32/addons.png
 cmd/32/printpagepreview.png cmd/32/printpreview.png
+cmd/32/printrangesmenu.png cmd/32/defineprintarea.png
 cmd/32/pt/underlinesimple.png cmd/32/pt/underline.png
 cmd/32/pt-BR/underlinesimple.png cmd/32/pt-BR/underline.png
 cmd/32/questionanswers.png cmd/32/webhtml.png
@@ -323,6 +328,7 @@ cmd/lc_browsebackward.png cmd/lc_navigateback.png
 cmd/lc_browseforward.png cmd/lc_navigateforward.png
 cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
 cmd/lc_calloutshapes.png cmd/lc_calloutshapes.round-rectangular-callout.png
+cmd/lc_cellcontentsmenu.png cmd/lc_calculate.png
 cmd/lc_cellprotection.png cmd/lc_protect.png
 cmd/lc_cellvertbottom.png cmd/lc_alignbottom.png
 cmd/lc_cellvertcenter.png cmd/lc_alignverticalcenter.png
@@ -353,6 +359,7 @@ cmd/lc_dsbeditdoc.png cmd/lc_editdoc.png
 cmd/lc_ellipse.png cmd/lc_basicshapes.ellipse.png
 cmd/lc_ellipsetoolbox.png cmd/lc_basicshapes.ellipse.png
 cmd/lc_exitsearch.png cmd/lc_closedoc.png
+cmd/lc_fieldmenu.png cmd/lc_insertfield.png
 cmd/lc_fieldnames.png cmd/lc_fields.png
 cmd/lc_fillcolor.png cmd/lc_formatarea.png
 cmd/lc_flowchartshapes.png 
cmd/lc_flowchartshapes.flowchart-internal-storage.png
@@ -386,6 +393,7 @@ cmd/lc_importfromfile.png cmd/lc_importdialog.png
 cmd/lc_indexesmenu.png cmd/lc_insertindexesentry.png
 cmd/lc_inputlinevisible.png cmd/lc_insertformula.png
 cmd/lc_insertavmedia.png cmd/lc_avmediaplayer.png
+cmd/lc_insertcell.png cmd/lc_insertcellsright.png
 cmd/lc_insertcolumndialog.png cmd/lc_insertcolumns.png
 cmd/lc_insertcolumnsbefore.png cmd/lc_insertcolumns.png
 cmd/lc_insertcolumnsleft.png cmd/lc_insertcolumns.png
@@ -440,14 +448,15 @@ cmd/lc_mailmergelastentry.png cmd/lc_lastrecord.png
 cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png

[Libreoffice-commits] core.git: vcl/win

[Michael Stahl]

 vcl/win/gdi/salfont.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 656bef6ce3626769bd59fc7c46d781af512dfe0e
Author: Michael Stahl 
Date:   Tue Jul 3 18:48:30 2018 +0200

vcl: experiment for font related test fails on WNT

Change-Id: I7471299c1f0d4c0431e9b896cd2fbf5a056f31f8
Reviewed-on: https://gerrit.libreoffice.org/56892
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 77fc91b8b2a4..2796f8686255 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1060,7 +1060,7 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* lpelfe,
 {
 if ((nFontType & RASTER_FONTTYPE) && !(nFontType & 
DEVICE_FONTTYPE))
 {
-SAL_INFO("vcl.gdi", "Unsupported printer font ignored: " << 
OUString(o3tl::toU(pLogFont->elfLogFont.lfFaceName)));
+SAL_WARN("vcl.gdi.font", "Unsupported printer font ignored: " 
<< OUString(o3tl::toU(pLogFont->elfLogFont.lfFaceName)));
 return 1;
 }
 }
@@ -1069,7 +1069,7 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* lpelfe,
  !(pMetric->ntmTm.ntmFlags & NTM_PS_OPENTYPE) &&
  !(pMetric->ntmTm.ntmFlags & NTM_TT_OPENTYPE))
 {
-SAL_INFO("vcl.gdi", "Unsupported font ignored: " << 
OUString(o3tl::toU(pLogFont->elfLogFont.lfFaceName)));
+SAL_WARN("vcl.gdi.font", "Unsupported font ignored: " << 
OUString(o3tl::toU(pLogFont->elfLogFont.lfFaceName)));
 return 1;
 }
 
@@ -1077,6 +1077,7 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* lpelfe,
 pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );
 
 pInfo->mpList->Add( pData.get() );
+SAL_WARN("vcl.gdi.font", "SalEnumFontsProcExW: font added: " << 
pData->GetFamilyName() << " " << pData->GetStyleName());
 }
 
 return 1;
@@ -1243,7 +1244,7 @@ static bool ImplGetFontAttrFromFile( const OUString& 
rFontFileURL,
 bool WinSalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
 const OUString& rFontFileURL, const OUString& rFontName )
 {
-SAL_INFO( "vcl.gdi", "WinSalGraphics::AddTempDevFont(): " << rFontFileURL 
);
+SAL_WARN( "vcl.gdi.font", "WinSalGraphics::AddTempDevFont(): " << 
rFontFileURL );
 
 FontAttributes aDFA;
 aDFA.SetFamilyName(rFontName);
@@ -1287,6 +1288,8 @@ bool WinSalGraphics::AddTempDevFont( 
PhysicalFontCollection* pFontCollection,
 
 void WinSalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection )
 {
+SAL_WARN( "vcl.gdi.font", "WinSalGraphics::GetDevFontList(): enter" );
+
 // make sure all fonts are registered at least temporarily
 static bool bOnce = true;
 if( bOnce )
@@ -1336,6 +1339,8 @@ void WinSalGraphics::GetDevFontList( 
PhysicalFontCollection* pFontCollection )
 static WinPreMatchFontSubstititution aPreMatchFont;
 pFontCollection->SetFallbackHook( &aSubstFallback );
 pFontCollection->SetPreMatchHook(&aPreMatchFont);
+
+SAL_WARN( "vcl.gdi.font", "WinSalGraphics::GetDevFontList(): leave" );
 }
 
 void WinSalGraphics::ClearDevFontCache()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/uiconfig

[andreas kainz]

 sd/uiconfig/simpress/menubar/menubar.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c50e4badfcb701d9e3927dae6617bb0d33f386e0
Author: andreas kainz 
Date:   Wed Jul 4 23:31:24 2018 +0200

Impress Menu -> Insert -> Slide Number fixed wrong command

Impress
Menubar -> Insert -> Slide Number open the Header and Fooder Dialog

Change-Id: Ie6c03358254265422ef2b760aa182515a44480d4
Reviewed-on: https://gerrit.libreoffice.org/56976
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 227045f76e9d..a6d39c4c3020 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -240,7 +240,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Make clean fails for unpackedTarballs in subpath firebird

[Christian Lohmaier]

Hi Regina,

Regina Henschel  schrieb am Mi., 4. Juli 2018,
20:47:

And indeed it has a 0Byte file fb_trace_wj10i8 in
> unpackedTarball/firebird/gen/Debug/firebird.
>
> I can delete the file manually in Windows explorer. But I think it is an
> error.


Yes, it is an error (actually, two) one is in firebird that doesn't clean
up the file (even if you create a file with the temporary attribute, you're
supposed to delete it if no longer used).
The other is the cygwin bug that Mike mentioned.
Workarounds to that are using a snapshot version of the cygwin dll, using
Powershell command to delete the file, or as you did: use Windows explorer
to delete the file.

So if you want to file a bug, then against firebird.

Ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/platform/unxgcc.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 7b101fc549593e2ad8c54f4e53d23fcdf683a4bb
Author: Stephan Bergmann 
Date:   Thu Jul 5 09:47:26 2018 +0200

UBSan apparently still needs --dynamic-list-cpp-typeinfo

...(presumably due to it using -fvisibility-ms-compat, cf.
solenv/gbuild/platform/com_GCC_defs.mk), or else things start to fail like
's
CustomTarget_testtools/uno_test:

> /cpputools/source/unoexe/unoexe.cxx:502:24: runtime error: member call on 
address 0x6060c288 which does not point to an object of type 
'com::sun::star::lang::XMain'
> 0x6060c260: note: object is base class subobject at offset 40 within 
object of type 'bridge_test::TestBridgeImpl'
> #0 0x50dc0b in sal_main() /cpputools/source/unoexe/unoexe.cxx:502:24
> #1 0x507762 in main /cpputools/source/unoexe/unoexe.cxx:348:1
> #2 0x2b2ede591444 in __libc_start_main (/lib64/libc.so.6+0x22444)
> #3 0x429425 in _start (/instdir/program/uno.bin+0x429425)

Change-Id: I7f2c38ef2f3cedae07d71246980ad1f21220db72

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 79144b19763b..a84c095721ff 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -76,6 +76,11 @@ endif
 
 ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
 gb_LinkTarget_LDFLAGS += -Wl,-Bsymbolic-functions
+ifeq ($(COM_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+gb_LinkTarget_LDFLAGS += -Wl,--dynamic-list-cpp-typeinfo
+endif
+endif
 endif
 
 ifneq ($(gb_DEBUGLEVEL),0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Mike Kaganski]

 sw/source/uibase/utlui/content.cxx |   21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 44c0d38a06cd5ab765facef3242e2c0e3e7944b4
Author: Mike Kaganski 
Date:   Thu Jul 5 07:32:18 2018 +0200

tdf#43438: SwContentTree: handle ModeChanged notification

Change-Id: Iebb53af7fb06ebab6d5cdd1ce514480caec1b17e
Reviewed-on: https://gerrit.libreoffice.org/56985
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index c92b39bca0b4..9536891056d7 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2351,8 +2351,25 @@ void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint 
const& rHint)
 {
 SfxListener::Notify(rBC, rHint);
 }
-if (SfxHintId::DocChanged == rHint.GetId())
-m_bViewHasChanged = true;
+switch (rHint.GetId())
+{
+case SfxHintId::DocChanged:
+m_bViewHasChanged = true;
+break;
+case SfxHintId::ModeChanged:
+if (SwWrtShell* pShell = GetWrtShell())
+{
+const bool bReadOnly = 
pShell->GetView().GetDocShell()->IsReadOnly();
+if (bReadOnly != m_bIsLastReadOnly)
+{
+m_bIsLastReadOnly = bReadOnly;
+Select(GetCurEntry());
+}
+}
+break;
+default:
+break;
+}
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/find-unneeded-includes chart2/IwyuFilter_chart2.yaml sc/IwyuFilter_sc.yaml sd/IwyuFilter_sd.yaml

[Gabor Kelemen]

 bin/find-unneeded-includes|9 +
 chart2/IwyuFilter_chart2.yaml |3 ---
 sc/IwyuFilter_sc.yaml |9 -
 sd/IwyuFilter_sd.yaml |6 +-
 4 files changed, 10 insertions(+), 17 deletions(-)

New commits:
commit 450482220a14a5e083f11bfa1c9561994dc91ec8
Author: Gabor Kelemen 
Date:   Thu Jul 5 00:41:53 2018 +0200

find-unneeded-includes: stop proposing internal libstdc++ headers

They wouldn't really compile anyways and only cause unnecessary
blacklist entries.
Some '- memory' entries can already be removed from the blacklists.

Change-Id: Iab53d5a57121f61abe935e712dc23a55390235bf
Reviewed-on: https://gerrit.libreoffice.org/56979
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index b4a2a89e0377..2e3d15f2230c 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -53,6 +53,15 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules):
 if include == k and v in toAdd:
 return True
 
+# Avoid proposing to use libstdc++ internal headers.
+bits = {
+"exception": "bits/exception.h",
+"memory": "bits/shared_ptr.h",
+}
+for k, v in bits.items():
+if include == k and v in toAdd:
+return True
+
 # Follow boost documentation.
 if include == "boost/optional.hpp" and "boost/optional/optional.hpp" in 
toAdd:
 return True
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 92a202f08e4a..f95dad4807b7 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -38,9 +38,6 @@ blacklist:
 - com/sun/star/lang/XUnoTunnel.hpp
 - com/sun/star/qa/XDumper.hpp
 - com/sun/star/util/XModifyListener.hpp
-chart2/source/inc/chartview/ExplicitValueProvider.hxx:
-# base class has to be a complete type
-- memory
 chart2/source/inc/AxisHelper.hxx:
 # base class has to be a complete type
 - com/sun/star/chart2/ScaleData.hpp
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 7941a28d7640..951f833a310a 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -38,9 +38,6 @@ blacklist:
 sc/inc/autoform.hxx:
 # contains macro definitions
 - scitems.hxx
-sc/inc/calcconfig.hxx:
-# needed for std::shared_ptr
-- memory
 sc/inc/chartuno.hxx:
 # base class has to be a complete type
 - com/sun/star/container/XEnumerationAccess.hpp
@@ -253,9 +250,6 @@ blacklist:
 sc/inc/scmatrix.hxx:
 # base class has to be a complete type
 - svl/sharedstringpool.hxx
-sc/inc/simplerangelist.hxx:
-# base class has to be a complete type
-- memory
 sc/inc/spellcheckcontext.hxx:
 # base class has to be a complete type
 - editeng/misspellrange.hxx
@@ -298,9 +292,6 @@ blacklist:
 - com/sun/star/lang/XServiceInfo.hpp
 - com/sun/star/lang/XUnoTunnel.hpp
 - com/sun/star/text/XTextFieldsSupplier.hpp
-sc/inc/token.hxx:
-# needed for std::shared_ptr
-- memory
 sc/inc/tokenuno.hxx:
 # base class has to be a complete type
 - com/sun/star/beans/XPropertySet.hpp
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 9729c1b65af8..963b62da4088 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -70,7 +70,6 @@ blacklist:
 sd/inc/TransitionPreset.hxx:
 # base class has to be a complete type
 - com/sun/star/lang/XMultiServiceFactory.hpp
-- memory
 sd/inc/undoanim.hxx:
 # base class has to be a complete type
 - com/sun/star/animations/XAnimationNode.hpp
@@ -80,9 +79,6 @@ blacklist:
 sd/source/filter/eppt/eppt.hxx:
 # base class has to be a complete type
 - escherex.hxx
-sd/source/filter/eppt/pptexanimations.hxx:
-# base class has to be a complete type
-- memory
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx:
 # base class has to be a complete type
 - com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp
@@ -124,4 +120,4 @@ blacklist:
 - sfx2/sfxbasecontroller.hxx
 sd/source/ui/inc/fupage.hxx:
 # base class has to be a complete type
-- vcl/weld.hxx
\ No newline at end of file
+- vcl/weld.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/pdfium

[Miklos Vajna]

 
external/pdfium/0006-Add-FPDFPath_GetMatrix-and-FPDFPath_SetMatrix-APIs.patch.1 
  |  143 ++
 external/pdfium/0006-svx-improve-path-importing-from-PDF.patch.2   
   |   77 -
 
external/pdfium/0008-svx-correct-the-positioning-of-PDF-Paths-and-the-str.patch.2
 |   27 -
 external/pdfium/UnpackedTarball_pdfium.mk  
   |3 
 4 files changed, 145 insertions(+), 105 deletions(-)

New commits:
commit 2f324e5305ea8d2fb309804cda2195a8e7351133
Author: Miklos Vajna 
Date:   Wed Jul 4 22:47:08 2018 +0200

pdfium: replace FPDFPath_GetMatrix() patch with backport

Change-Id: Ibf358e42f6411777819d0f46a4fe93c9b5ed9594
Reviewed-on: https://gerrit.libreoffice.org/56975
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git 
a/external/pdfium/0006-Add-FPDFPath_GetMatrix-and-FPDFPath_SetMatrix-APIs.patch.1
 
b/external/pdfium/0006-Add-FPDFPath_GetMatrix-and-FPDFPath_SetMatrix-APIs.patch.1
new file mode 100644
index ..655d040f6888
--- /dev/null
+++ 
b/external/pdfium/0006-Add-FPDFPath_GetMatrix-and-FPDFPath_SetMatrix-APIs.patch.1
@@ -0,0 +1,143 @@
+From 97f4d67fbf0707feea298afa2f6471013185e066 Mon Sep 17 00:00:00 2001
+Date: Mon, 4 Jun 2018 14:47:17 +
+Subject: [PATCH] Add FPDFPath_GetMatrix() and FPDFPath_SetMatrix() APIs
+
+This is similar to the existing FPDFImageObj_SetMatrix(), but this
+exposes the matrix of CPDF_PathObject and provides both a getter and a
+setter.
+
+Change-Id: Ib90a64929dae1b2be3889eca57e4af822d7823be
+Reviewed-on: https://pdfium-review.googlesource.com/33670
+Reviewed-by: dsinclair 
+Commit-Queue: dsinclair 
+---
+ fpdfsdk/fpdf_edit_embeddertest.cpp | 30 +++
+ fpdfsdk/fpdf_editpath.cpp  | 49 +
+ fpdfsdk/fpdf_view_c_api_test.c |  2 ++
+ public/fpdf_edit.h | 50 ++
+ 4 files changed, 131 insertions(+)
+
+diff --git a/fpdfsdk/fpdf_editpath.cpp b/fpdfsdk/fpdf_editpath.cpp
+index 558a8e3de..368c37416 100644
+--- a/fpdfsdk/fpdf_editpath.cpp
 b/fpdfsdk/fpdf_editpath.cpp
+@@ -253,6 +253,55 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV 
FPDFPath_GetDrawMode(FPDF_PAGEOBJECT path,
+   return true;
+ }
+ 
++FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_GetMatrix(FPDF_PAGEOBJECT path,
++   double* a,
++   double* b,
++   double* c,
++   double* d,
++   double* e,
++   double* f) {
++  if (!path || !a || !b || !c || !d || !e || !f)
++return false;
++
++  CPDF_PathObject* pPathObj = CPDFPathObjectFromFPDFPageObject(path);
++  if (!pPathObj)
++return false;
++
++  *a = pPathObj->m_Matrix.a;
++  *b = pPathObj->m_Matrix.b;
++  *c = pPathObj->m_Matrix.c;
++  *d = pPathObj->m_Matrix.d;
++  *e = pPathObj->m_Matrix.e;
++  *f = pPathObj->m_Matrix.f;
++
++  return true;
++}
++
++FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_SetMatrix(FPDF_PAGEOBJECT path,
++   double a,
++   double b,
++   double c,
++   double d,
++   double e,
++   double f) {
++  if (!path)
++return false;
++
++  CPDF_PathObject* pPathObj = CPDFPathObjectFromFPDFPageObject(path);
++  if (!pPathObj)
++return false;
++
++  pPathObj->m_Matrix.a = a;
++  pPathObj->m_Matrix.b = b;
++  pPathObj->m_Matrix.c = c;
++  pPathObj->m_Matrix.d = d;
++  pPathObj->m_Matrix.e = e;
++  pPathObj->m_Matrix.f = f;
++  pPathObj->SetDirty(true);
++
++  return true;
++}
++
+ FPDF_EXPORT void FPDF_CALLCONV FPDFPath_SetLineJoin(FPDF_PAGEOBJECT path,
+ int line_join) {
+   if (!path)
+diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
+index 2faa9ecba..4c870149b 100644
+--- a/public/fpdf_edit.h
 b/public/fpdf_edit.h
+@@ -920,6 +920,56 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV 
FPDFPath_GetDrawMode(FPDF_PAGEOBJECT path,
+  int* fillmode,
+  FPDF_BOOL* stroke);
+ 
++// Experimental API.
++// Get the transform matrix of a path.
++//
++//   path - handle to a path.
++//   a- matrix value.
++//   b- matrix value.
++//   c- matrix value.
++//   d- matrix value.
++//   e- matrix value.
++//   f- matrix value.
++//
++// The matrix is composed as:
++//   |a c e|
++//   |b d f|
++// and used to scale, rotate, shear and translate the path.
++//
++// Returns TRU