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

[Kohei Yoshida]

 sc/qa/unit/ucalc.hxx|2 +
 sc/qa/unit/ucalc_column.cxx |   59 
 2 files changed, 61 insertions(+)

New commits:
commit 5233a2c9009533e454a734ac57c764e15f92a229
Author: Kohei Yoshida 
Date:   Tue May 2 19:44:57 2017 -0400

tdf#107255: add test case for the multi-cell query method.

This is the best we can do since the rest of the cell merge code is
in ScViewFunc which cannot be unit-tested currently.

Change-Id: I639f48d5cd05bff015689b0d223684f6f8d302f8
Reviewed-on: https://gerrit.libreoffice.org/37179
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 486bb1064e89..18ddbd58af60 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -518,6 +518,7 @@ public:
 void testUndoDataAnchor();
 void testFormulaErrorPropagation();
 void testSetFormula();
+void testMultipleDataCellsInRange();
 
 void testTdf97369();
 void testTdf97587();
@@ -786,6 +787,7 @@ public:
 CPPUNIT_TEST(testUndoDataAnchor);
 CPPUNIT_TEST(testFormulaErrorPropagation);
 CPPUNIT_TEST(testSetFormula);
+CPPUNIT_TEST(testMultipleDataCellsInRange);
 CPPUNIT_TEST(testTdf97369);
 CPPUNIT_TEST(testTdf97587);
 CPPUNIT_TEST(testEmptyCalcDocDefaults);
diff --git a/sc/qa/unit/ucalc_column.cxx b/sc/qa/unit/ucalc_column.cxx
index 6a70aef3923f..8aeb6f2dbf57 100644
--- a/sc/qa/unit/ucalc_column.cxx
+++ b/sc/qa/unit/ucalc_column.cxx
@@ -126,4 +126,63 @@ void Test::testSetFormula()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testMultipleDataCellsInRange()
+{
+m_pDoc->InsertTab(0, "Test");
+
+ScRange aRange(1,2,0); // B3
+sc::MultiDataCellState aState = m_pDoc->HasMultipleDataCells(aRange);
+CPPUNIT_ASSERT_EQUAL(sc::MultiDataCellState::Empty, aState.meState);
+
+// Set a numeric value to B3.
+m_pDoc->SetValue(ScAddress(1,2,0), 1.0);
+aState = m_pDoc->HasMultipleDataCells(aRange);
+CPPUNIT_ASSERT_EQUAL(sc::MultiDataCellState::HasOneCell, aState.meState);
+CPPUNIT_ASSERT_EQUAL(SCCOL(1), aState.mnCol1);
+CPPUNIT_ASSERT_EQUAL(SCROW(2), aState.mnRow1);
+CPPUNIT_ASSERT_EQUAL(SCTAB(0), aState.mnTab1);
+
+// Set another numeric value to B4.
+m_pDoc->SetValue(ScAddress(1,3,0), 2.0);
+aRange.aEnd.SetRow(3); // B3:B4
+aState = m_pDoc->HasMultipleDataCells(aRange);
+CPPUNIT_ASSERT_EQUAL(sc::MultiDataCellState::HasMultipleCells, 
aState.meState);
+CPPUNIT_ASSERT_EQUAL(SCCOL(1), aState.mnCol1);
+CPPUNIT_ASSERT_EQUAL(SCROW(2), aState.mnRow1);
+CPPUNIT_ASSERT_EQUAL(SCTAB(0), aState.mnTab1);
+
+// Set the query range to B4:B5.  Now it should only report one cell, with
+// B4 being the first non-empty cell.
+aRange.aStart.SetRow(3);
+aRange.aEnd.SetRow(4);
+aState = m_pDoc->HasMultipleDataCells(aRange);
+CPPUNIT_ASSERT_EQUAL(sc::MultiDataCellState::HasOneCell, aState.meState);
+CPPUNIT_ASSERT_EQUAL(SCCOL(1), aState.mnCol1);
+CPPUNIT_ASSERT_EQUAL(SCROW(3), aState.mnRow1);
+CPPUNIT_ASSERT_EQUAL(SCTAB(0), aState.mnTab1);
+
+// Set the query range to A1:C3.  The first non-empty cell should be B3.
+aRange = ScRange(0,0,0,2,2,0);
+aState = m_pDoc->HasMultipleDataCells(aRange);
+CPPUNIT_ASSERT_EQUAL(sc::MultiDataCellState::HasOneCell, aState.meState);
+CPPUNIT_ASSERT_EQUAL(SCCOL(1), aState.mnCol1);
+CPPUNIT_ASSERT_EQUAL(SCROW(2), aState.mnRow1);
+CPPUNIT_ASSERT_EQUAL(SCTAB(0), aState.mnTab1);
+
+// Set string cells to D4 and F5, and query D3:F5.  D4 should be the first
+// non-empty cell.
+m_pDoc->SetString(ScAddress(3,3,0), "foo");
+m_pDoc->SetString(ScAddress(5,4,0), "bar");
+aRange = ScRange(3,2,0,5,4,0);
+aState = m_pDoc->HasMultipleDataCells(aRange);
+CPPUNIT_ASSERT_EQUAL(sc::MultiDataCellState::HasMultipleCells, 
aState.meState);
+CPPUNIT_ASSERT_EQUAL(SCCOL(3), aState.mnCol1);
+CPPUNIT_ASSERT_EQUAL(SCROW(3), aState.mnRow1);
+CPPUNIT_ASSERT_EQUAL(SCTAB(0), aState.mnTab1);
+
+// TODO : add more test cases as needed.
+
+m_pDoc->DeleteTab(0);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/mar-updater' - 591 commits - accessibility/inc accessibility/source avmedia/inc avmedia/source basctl/inc basctl/source basegfx/source basegfx/test basi

[Markus Mohrhard]

Rebased ref, commits from common ancestor:
commit 047ae4b3e9003bf6dfe513869cb4caf5595ffc7b
Author: Markus Mohrhard 
Date:   Wed May 3 00:36:06 2017 +0200

without the wb+ reading the patch file will fail

Change-Id: I61be299647d41bb464bea039630ddd4ff545f412

diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 57ac77507a8b..3c5baca1e3ac 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -1610,7 +1610,7 @@ PatchFile::Prepare()
 
 NS_tremove(spath);
 
-mPatchStream = NS_tfopen(spath, NS_T("wb"));
+mPatchStream = NS_tfopen(spath, NS_T("wb+"));
 if (!mPatchStream)
 return WRITE_ERROR;
 
commit ee992c1549fa0ec9b570b43caee8f84899703e38
Author: Markus Mohrhard 
Date:   Fri Apr 28 01:28:28 2017 +0200

log all the updater actions

Change-Id: Ia7b08c4e93d5b3b65b0f44af9c92f5e6f6fafd96

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index cad36200daaa..b57b3d1879ba 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -233,6 +233,7 @@ void update()
 
 void CreateValidUpdateDir(const update_info& update_info)
 {
+Updater::log(OString("Create Update Dir"));
 OUString aInstallDir("$BRAND_BASE_DIR");
 rtl::Bootstrap::expandMacros(aInstallDir);
 OUString aInstallPath = getPathFromURL(aInstallDir);
@@ -255,6 +256,7 @@ void CreateValidUpdateDir(const update_info& update_info)
 {
 // TODO: remove the update directory
 SAL_WARN("desktop.updater", "failed to update");
+Updater::log(OUString("failed to create update dir"));
 }
 else
 {
@@ -471,6 +473,7 @@ size_t WriteCallbackFile(void *ptr, size_t size,
 
 std::string download_content(const OString& rURL, bool bFile, OUString& rHash)
 {
+Updater::log("Download: " + rURL);
 CURL* curl = curl_easy_init();
 
 if (!curl)
@@ -606,7 +609,7 @@ void update_checker()
 OUString aDownloadCheckURL = aDownloadCheckBaseURL + "update/check/1/" + 
aProductName +
 "/" + aBuildID + "/" + aBuildTarget + "/" + "/" + aChannel;
 OString aURL = OUStringToOString(aDownloadCheckURL, RTL_TEXTENCODING_UTF8);
-
+Updater::log("Update check: " + aURL);
 
 try
 {
@@ -620,10 +623,16 @@ void update_checker()
 // No update currently available
 // add entry to updating.log with the message
 SAL_WARN("desktop.updater", "Message received from the 
updater: " << aUpdateInfo.aMessage);
+Updater::log("Server response: " + aUpdateInfo.aMessage);
 }
 else
 {
 download_file(aUpdateInfo.aUpdateFile.aURL, 
aUpdateInfo.aUpdateFile.nSize, aUpdateInfo.aUpdateFile.aHash, "update.mar");
+for (auto& lang_update : aUpdateInfo.aLanguageFiles)
+{
+OUString aFileName = "update_" + lang_update.aLangCode + 
".mar";
+download_file(lang_update.aUpdateFile.aURL, 
lang_update.aUpdateFile.nSize, lang_update.aUpdateFile.aHash, aFileName);
+}
 CreateValidUpdateDir(aUpdateInfo);
 }
 }
@@ -631,22 +640,27 @@ void update_checker()
 catch (const invalid_update_info&)
 {
 SAL_WARN("desktop.updater", "invalid update information");
+Updater::log(OString("warning: invalid update info"));
 }
 catch (const error_updater&)
 {
 SAL_WARN("desktop.updater", "error during the update check");
+Updater::log(OString("warning: error by the updater"));
 }
 catch (const invalid_size& e)
 {
 SAL_WARN("desktop.updater", e.what());
+Updater::log(OString("warning: invalid size"));
 }
 catch (const invalid_hash& e)
 {
 SAL_WARN("desktop.updater", e.what());
+Updater::log(OString("warning: invalid hash"));
 }
 catch (...)
 {
 SAL_WARN("desktop.updater", "unknown error during the update check");
+Updater::log(OString("warning: unknown exception"));
 }
 }
 
@@ -658,6 +672,14 @@ OUString Updater::getUpdateInfoURL()
 return aUpdateInfoURL;
 }
 
+OUString Updater::getUpdateInfoLog()
+{
+OUString aUpdateInfoURL("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/patch/updating.log");
+rtl::Bootstrap::expandMacros(aUpdateInfoURL);
+
+return aUpdateInfoURL;
+}
+
 OUString Updater::getPatchDirURL()
 {
 OUString aPatchDirURL("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/patch/");
@@ -682,4 +704,20 @@ OUString Updater::getExecutableDirURL()
 return aExeDir;
 }
 
+void Updater::log(const OUString& rMessage)
+{
+OUString aUpdateLog = getUpdateInfoLog();
+SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
+aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make s

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

[Kohei Yoshida]

 sc/inc/colcontainer.hxx|   11 --
 sc/inc/column.hxx  |3 +
 sc/inc/document.hxx|8 
 sc/inc/table.hxx   |2 +
 sc/inc/types.hxx   |   14 
 sc/source/core/data/column4.cxx|   48 +++
 sc/source/core/data/document10.cxx |   15 
 sc/source/core/data/table7.cxx |   64 +
 sc/source/core/data/types.cxx  |7 
 sc/source/ui/view/viewfun2.cxx |   22 +---
 10 files changed, 184 insertions(+), 10 deletions(-)

New commits:
commit 93f5cb55349e6de5003182462bfee434dc51f6ad
Author: Kohei Yoshida 
Date:   Mon May 1 19:43:16 2017 -0400

tdf#107255: detect whether the range has only one data cell.

Change-Id: I030961d9d38b092ffdc966baa10decae0c2d070d
Reviewed-on: https://gerrit.libreoffice.org/37178
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/inc/colcontainer.hxx b/sc/inc/colcontainer.hxx
index 925104df2278..21463edb0bd4 100644
--- a/sc/inc/colcontainer.hxx
+++ b/sc/inc/colcontainer.hxx
@@ -20,22 +20,20 @@
 #ifndef INCLUDED_SC_INC_COLCONTAINER_HXX
 #define INCLUDED_SC_INC_COLCONTAINER_HXX
 
-
 #include "types.hxx"
 #include "address.hxx"
 
 #include 
 
-
 class ScColumn;
 class ScDocument;
+
 class ScColContainer
 {
-public:
 typedef std::vector ScColumnVector;
-private:
 ScColumnVectoraCols;
 ScDocument*   pDocument;
+
 public:
 ScColContainer( ScDocument* pDoc, const size_t nSize );
 ~ScColContainer();
@@ -55,6 +53,11 @@ public:
 return static_cast( aCols.size() );
 }
 
+bool empty() const
+{
+return aCols.empty();
+}
+
 void resize( const size_t aNewSize );
 
 void Clear();
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e7a81e877f13..564b6ff8114a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -381,6 +381,9 @@ public:
 boolHasValueData( SCROW nRow ) const;
 boolHasStringCells( SCROW nStartRow, SCROW nEndRow ) const;
 
+sc::MultiDataCellState::StateType HasDataCellsInRange(
+SCROW nRow1, SCROW nRow2, SCROW* pRow1 = nullptr ) const;
+
 bool IsFormulaDirty( SCROW nRow ) const;
 
 void CheckVectorizationState();
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 2a39544cb7a7..cd4c5a237e04 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1077,6 +1077,14 @@ public:
 /** Returns true, if there is any data to create a selection list for 
rPos. */
 boolHasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) 
const;
 
+/**
+ * Check if the specified range contains either: 1) one non-empty cell, 2)
+ * more than one non-empty cells, or 3) totally empty.  In case the range
+ * contains at least one non-empty cell, specify the position of the first
+ * non-empty cell.
+ */
+sc::MultiDataCellState HasMultipleDataCells( const ScRange& rRange ) const;
+
 /** Notes **/
 SC_DLLPUBLIC ScPostIt*   GetNote(const ScAddress& rPos);
 SC_DLLPUBLIC ScPostIt*   GetNote(SCCOL nCol, SCROW nRow, SCTAB nTab);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 7addb6d6bf89..dda88eacdd81 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -557,6 +557,8 @@ public:
 boolHasStringCells( SCCOL nStartCol, SCROW nStartRow,
 SCCOL nEndCol, SCROW nEndRow ) const;
 
+sc::MultiDataCellState HasMultipleDataCells( SCCOL nCol1, SCROW nRow1, 
SCCOL nCol2, SCROW nRow2 ) const;
+
 FormulaErrorGetErrCode( const ScAddress& rPos ) const
 {
 return IsColRowValid(rPos.Col(),rPos.Row()) ?
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index fb86ec361c3d..53bb2616b040 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -102,6 +102,20 @@ struct RangeMatrix
 bool isRangeValid() const;
 };
 
+struct MultiDataCellState
+{
+enum StateType { Invalid = 0, Empty, HasOneCell, HasMultipleCells };
+
+StateType meState;
+
+SCCOL mnCol1; //< first non-empty column
+SCROW mnRow1; //< first non-empty row
+SCTAB mnTab1; //< first non-empty sheet
+
+MultiDataCellState();
+MultiDataCellState( StateType eState );
+};
+
 enum AreaOverlapType
 {
 AreaInside,
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index e848ceb86343..71a33b3cd338 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -39,6 +39,54 @@ bool ScColumn::IsMerged( SCROW nRow ) const
 return pAttrArray->IsMerged(nRow);
 }
 
+sc::MultiDataCellState::StateType ScColumn::HasDataCellsInRange(
+SCROW nRow1, SCROW nRow2, SCROW* pRow1 ) const
+{
+sc::CellStoreType::const_position_type aPos = maCells.position(nRow1);
+sc::CellStoreType::const_iterator it = aPos.first;
+size_t nOffset = aPos.second;
+SCROW nRow = nRow1;
+bool bHasOne = false; // whethe

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

[Andras Timar]

Tag '2.1.0' created by Andras Timar  at 2017-05-02 
21:30 +

2.1.0

Changes since 2.1-rc4-7:
---
 0 files changed
---
___
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-2-1' - debian/changelog debian/control loolwsd.spec.in

[Andras Timar]

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

New commits:
commit 0a8d1128400bbe8f4f82f794841fedf4f677dbba
Author: Andras Timar 
Date:   Tue May 2 23:30:25 2017 +0200

Bump package version for 2.1.0 final (again)

Change-Id: I749c133c9ae749038ac1057199709586791d3672

diff --git a/debian/changelog b/debian/changelog
index 436aa683..49d3b0db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.0-8) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool21
+
+ -- Andras Timar   Wed, 03 May 2017 07:00:00 +0100
+
 loolwsd (2.1.0-7) unstable; urgency=medium
 
   * see the git log: http://col.la/cool21
diff --git a/debian/control b/debian/control
index 03369cfb..db5e71d2 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, 
libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, 
libdbus-glib-1-2, cpio, collaboraofficebasis5.3-calc (>= 5.3.10.8), 
collaboraofficebasis5.3-core (>= 5.3.10.8), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.8), 
collaboraofficebasis5.3-images (>= 5.3.10.8), collaboraofficebasis5.3-impress 
(>= 5.3.10.8), collaboraofficebasis5.3-ooofonts (>= 5.3.10.8), 
collaboraofficebasis5.3-writer (>= 5.3.10.8), collaboraoffice5.3 (>= 5.3.10.8), 
collaboraoffice5.3-ure (>= 5.3.10.8), collaboraofficebasis5.3-en-us (>= 
5.3.10.8), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.8), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.8), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.8), collaboraofficebasis5.3-draw 
(>= 5.3.10.8), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.8)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, 
libdbus-glib-1-2, cpio, collaboraofficebasis5.3-calc (>= 5.3.10.9), 
collaboraofficebasis5.3-core (>= 5.3.10.9), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.9), 
collaboraofficebasis5.3-images (>= 5.3.10.9), collaboraofficebasis5.3-impress 
(>= 5.3.10.9), collaboraofficebasis5.3-ooofonts (>= 5.3.10.9), 
collaboraofficebasis5.3-writer (>= 5.3.10.9), collaboraoffice5.3 (>= 5.3.10.9), 
collaboraoffice5.3-ure (>= 5.3.10.9), collaboraofficebasis5.3-en-us (>= 
5.3.10.9), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.9), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.9), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.9), collaboraofficebasis5.3-draw 
(>= 5.3.10.9), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.9)
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 512cfd87..503c4361 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:7%{?dist}
+Release:8%{?dist}
 Vendor: Collabora
 Summary:LibreOffice On-Line WebSocket Daemon
 License:MPL
@@ -26,7 +26,7 @@ BuildRequires:  libcap-progs systemd-rpm-macros
 %endif
 %endif
 
-Requires:   collaboraoffice5.3 >= 5.3.10.8 collaboraoffice5.3-ure >= 
5.3.10.8 collaboraofficebasis5.3-core >= 5.3.10.8 
collaboraofficebasis5.3-writer >= 5.3.10.8 collaboraofficebasis5.3-impress >= 
5.3.10.8 collaboraofficebasis5.3-graphicfilter >= 5.3.10.8 
collaboraofficebasis5.3-en-US >= 5.3.10.8 collaboraofficebasis5.3-calc >= 
5.3.10.8 collaboraofficebasis5.3-en-US-res >= 5.3.10.8 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.8 collaboraofficebasis5.3-ooofonts 
>= 5.3.10.8 collaboraofficebasis5.3-images >= 5.3.10.8 
collaboraofficebasis5.3-noto-fonts >= 5.3.10.8 collaboraofficebasis5.3-draw >= 
5.3.10.8 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.8
+Requires:   collaboraoffice5.3 >= 5.3.10.9 collaboraoffice5.3-ure >= 
5.3.10.9 collaboraofficebasis5.3-core >= 5.3.10.9 
collaboraofficebasis5.3-writer >= 5.3.10.9 collaboraofficebasis5.3-impress >= 
5.3.10.9 collaboraofficebasis5.3-graphicfilter >= 5.3.10.9 
collaboraofficebasis5.3-en-US >= 5.3.10.9 collaboraofficebasis5.3-calc >= 
5.3.10.9 collaboraofficebasis5.3-en-US-res >= 5.3.10.9 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.9 collaboraofficebasis5.3-ooofonts 
>= 5.3.10.9 collaboraofficebasis5.3-images >= 5.3.10.9 
collaboraofficebasis5.3-noto-fonts >= 5.3.10.9 collaboraofficebasis5.3-draw >= 
5.3.10.9 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.9
 Requires:   systemd
 Requires(post): coreutils grep sed
 %if 0%{?fedora} || 0%{?rhel} >= 7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-comm

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/po

[Andras Timar]

 loleaflet/po/ui-cs.po |   22 ++---
 loleaflet/po/ui-cy.po |   52 --
 loleaflet/po/ui-el.po |8 +++
 loleaflet/po/ui-es.po |6 ++---
 loleaflet/po/ui-gl.po |   13 +---
 5 files changed, 49 insertions(+), 52 deletions(-)

New commits:
commit ea14892e2dfba55c0691c4faaab034a1da358dba
Author: Andras Timar 
Date:   Tue May 2 23:19:07 2017 +0200

loleaflet: updated translations

Change-Id: I3be18c80e57839e2b79d419a9488bf269f3f1e11

diff --git a/loleaflet/po/ui-cs.po b/loleaflet/po/ui-cs.po
index 0241e0c2..1a9bd25e 100644
--- a/loleaflet/po/ui-cs.po
+++ b/loleaflet/po/ui-cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 08:00+\n"
+"POT-Creation-Date: 2017-05-02 08:00+\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 2.0.0\n"
 "X-Pootle-Path: /cs/libo_online/loleaflet-ui-cs.po\n"
-"X-Pootle-Revision: 2490153\n"
+"X-Pootle-Revision: 2522834\n"
 
 #: admin.strings.js:5
 msgid "Admin console"
@@ -737,7 +737,7 @@ msgstr "Opravdu si přejete ukončit tuto relaci?"
 
 #: src/admin/AdminSocketSettings.js:31
 msgid "Are you sure you want to shutdown the server?"
-msgstr ""
+msgstr "Opravdu si přejete vypnout tento server?"
 
 #: src/admin/Util.js:13
 msgid "kB"
@@ -1992,11 +1992,11 @@ msgstr "Vybrat vše"
 
 #: src/control/Control.Menubar.js:31
 msgid "Track Changes"
-msgstr ""
+msgstr "Sledování změn"
 
 #: src/control/Control.Menubar.js:32
 msgid "Record"
-msgstr ""
+msgstr "Záznam"
 
 #: src/control/Control.Menubar.js:33
 msgid "Show"
@@ -2038,7 +2038,7 @@ msgstr "Obrázek"
 #: src/control/Control.Menubar.js:203
 #: src/control/Control.Menubar.js:259
 msgid "Comment..."
-msgstr ""
+msgstr "Komentář..."
 
 #: src/control/Control.Menubar.js:53
 msgid "Footnote"
@@ -2453,15 +2453,15 @@ msgstr ""
 
 #: src/control/Control.MetricInput.js:44
 msgid "Add: "
-msgstr ""
+msgstr "Přidat:"
 
 #: src/control/Control.MetricInput.js:61
 msgid "Default value"
-msgstr ""
+msgstr "Výchozí hodnota"
 
 #: src/control/Control.MetricInput.js:68
 msgid "Submit"
-msgstr ""
+msgstr "Odeslat"
 
 #: src/control/Control.RowHeader.js:37
 msgid "Insert row above"
@@ -2581,11 +2581,11 @@ msgstr ""
 
 #: src/layer/marker/Annotation.js:161
 msgid "Reject change"
-msgstr ""
+msgstr "Odmítnout změnu"
 
 #: src/layer/marker/Annotation.js:169
 msgid "Open menu"
-msgstr ""
+msgstr "Otevřít nabídku"
 
 #: src/layer/tile/TileLayer.js:182
 msgid "Modify"
diff --git a/loleaflet/po/ui-cy.po b/loleaflet/po/ui-cy.po
index d83cdb8a..f9120652 100644
--- a/loleaflet/po/ui-cy.po
+++ b/loleaflet/po/ui-cy.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-24 18:26+\n"
+"POT-Creation-Date: 2017-05-02 08:00+\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 2.0.0\n"
 "X-Pootle-Path: /cy/libo_online/loleaflet-ui-cy.po\n"
-"X-Pootle-Revision: 2438486\n"
+"X-Pootle-Revision: 2518990\n"
 
 #: admin.strings.js:5
 msgid "Admin console"
@@ -724,7 +724,7 @@ msgstr "Chi"
 
 #: dist/toolbar/toolbar.js:1604
 msgid "Readonly"
-msgstr ""
+msgstr "Darllen y unig"
 
 #: src/admin/AdminSocketBase.js:46
 msgid "Connection error"
@@ -736,7 +736,7 @@ msgstr "Ydych chi'n siŵr eich bod eisiau dileu'r sesiwn 
hwn?"
 
 #: src/admin/AdminSocketSettings.js:31
 msgid "Are you sure you want to shutdown the server?"
-msgstr ""
+msgstr "Ydych chi'n siŵr eich bod eisiau cau'r gweinydd?"
 
 #: src/admin/Util.js:13
 msgid "kB"
@@ -1870,19 +1870,19 @@ msgstr "Lled Colofn Gorau"
 
 #: src/control/Control.ContextMenu.js:135
 msgid "Internal Cut"
-msgstr ""
+msgstr "Toriad Mewnol"
 
 #: src/control/Control.ContextMenu.js:138
 msgid "Internal Copy"
-msgstr ""
+msgstr "Copi Mewnol"
 
 #: src/control/Control.ContextMenu.js:141
 msgid "Internal Paste"
-msgstr ""
+msgstr "Gludo Mewnol"
 
 #: src/control/Control.ContextMenu.js:163
 msgid "Internal Paste Special"
-msgstr ""
+msgstr "Gludo Mewnol Arbennig"
 
 #: src/control/Control.DocumentRepair.js:32
 msgid "Repair Document"
@@ -1991,22 +1991,21 @@ msgstr "Dewis popeth"
 
 #: src/control/Control.Menubar.js:31
 msgid "Track Changes"
-msgstr ""
+msgstr "Tracio Newid"
 
 #: src/control/Control.Menubar.js:32
 msgid "Record"
-msgstr ""
+msgstr "Recordio"
 
 #: src/control/Control.Menubar.js:33
 msgid "Show"
-msgstr ""
+msgstr "Dangos"
 
 #: src/control/Control.Menubar.js:35
 msgid "Previous"
-msgstr ""
+msgstr "Blaenorol"
 
 #: src/control/Control.Menubar.js:36
-#, fuzzy
 msgid "Next"
 msgstr "Testun"
 
@@ -2023,9 +2022,8 @@ msgid "Full screen"
 msgstr 

[Libreoffice-commits] core.git: 2 commits - basic/source tools/source

[Eike Rathke]

 basic/source/inc/date.hxx |4 -
 basic/source/runtime/methods.cxx  |  100 +++---
 basic/source/runtime/methods1.cxx |   10 +--
 basic/source/sbx/sbxscan.cxx  |2 
 tools/source/datetime/tdate.cxx   |2 
 5 files changed, 61 insertions(+), 57 deletions(-)

New commits:
commit 6d424f07701bf26d8fb173563b567d5f097c33e2
Author: Eike Rathke 
Date:   Tue May 2 23:08:03 2017 +0200

Replace mouth-painted "inaccurate around leap year" rollover algorithm

... with proper tools::Date methods Normalize() and AddMonths().

Also prepare functionality to easily switch on rollover for StarBASIC as 
well,
i.e. when called by DateSerial() runtime function.

For StarBASIC, invalid date for day > daysinmonthofyear is now (or better 
since
a previous commit 94bb96ada421b423e9ed30526fe5a6aac95f00b9 from today) 
properly
detected, not just dumb 1<=day<=31.

Change-Id: Ibb44f7247726f1e1168f0e66c5ae18e073d19f08

diff --git a/basic/source/inc/date.hxx b/basic/source/inc/date.hxx
index eb44aa1ec76c..6173a0b44dd0 100644
--- a/basic/source/inc/date.hxx
+++ b/basic/source/inc/date.hxx
@@ -24,11 +24,11 @@
 #include 
 #include 
 
-bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool 
bUseTwoDigitYear, double& rdRet );
+bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool 
bUseTwoDigitYear, bool bRollOver, double& rdRet );
 double implTimeSerial( sal_Int16 nHour, sal_Int16 nMinute, sal_Int16 nSecond);
 bool implDateTimeSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
  sal_Int16 nHour, sal_Int16 nMinute, sal_Int16 nSecond,
- bool bUseTwoDigitYear, double& rdRet );
+ bool bUseTwoDigitYear, bool bRollOver, double& rdRet 
);
 
 sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 
nFirstDay = 0 );
 
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 5996d1590903..db6bc2b616cc 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1865,7 +1865,7 @@ css::util::Date SbxDateToUNODate( const SbxValue* const 
pVal )
 void SbxDateFromUNODate( SbxValue *pVal, const css::util::Date& aUnoDate)
 {
 double dDate;
-if( implDateSerial( aUnoDate.Year, aUnoDate.Month, aUnoDate.Day, false, 
dDate ) )
+if( implDateSerial( aUnoDate.Year, aUnoDate.Month, aUnoDate.Day, false, 
false, dDate ) )
 {
 pVal->PutDate( dDate );
 }
@@ -1980,7 +1980,7 @@ void SbxDateFromUNODateTime( SbxValue *pVal, const 
css::util::DateTime& aUnoDT)
 double dDate(0.0);
 if( implDateTimeSerial( aUnoDT.Year, aUnoDT.Month, aUnoDT.Day,
 aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds,
-false, dDate ) )
+false, false, dDate ) )
 {
 pVal->PutDate( dDate );
 }
@@ -2111,7 +2111,7 @@ RTLFUNC(CDateFromIso)
 
 double dDate;
 if (!implDateSerial( (sal_Int16)(nSign * aYearStr.toInt32()),
-(sal_Int16)aMonthStr.toInt32(), 
(sal_Int16)aDayStr.toInt32(), false, dDate ))
+(sal_Int16)aMonthStr.toInt32(), 
(sal_Int16)aDayStr.toInt32(), false, false, dDate ))
 break;
 
 rPar.Get(0)->PutDate( dDate );
@@ -2143,7 +2143,7 @@ RTLFUNC(DateSerial)
 sal_Int16 nDay = rPar.Get(3)->GetInteger();
 
 double dDate;
-if( implDateSerial( nYear, nMonth, nDay, true, dDate ) )
+if( implDateSerial( nYear, nMonth, nDay, true, true, dDate ) )
 {
 rPar.Get(0)->PutDate( dDate );
 }
@@ -4912,7 +4912,8 @@ sal_Int16 implGetDateYear( double aDate )
 return nRet;
 }
 
-bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool 
bUseTwoDigitYear, double& rdRet )
+bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
+bool bUseTwoDigitYear, bool bRollOver, double& rdRet )
 {
 // XXX NOTE: For VBA years<0 are invalid and years in the range 0..29 and
 // 30..99 can not be input as they are 2-digit for 2000..2029 and
@@ -4945,58 +4946,59 @@ bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, 
sal_Int16 nDay, bool bUs
 }
 }
 
+sal_Int32 nAddMonths = 0;
+sal_Int32 nAddDays = 0;
+// Always sanitize values to set date and to use for validity detection.
+if (nMonth < 1 || 12 < nMonth)
+{
+sal_Int16 nM = ((nMonth < 1) ? (12 + (nMonth % 12)) : (nMonth % 12));
+nAddMonths = nMonth - nM;
+nMonth = nM;
+}
+// Day 0 would already be normalized during Date::Normalize(), include
+// it in negative days, also to detect non-validity. The actual day of
+// month is 1+(nDay-1)
+if (nDay < 1)
+{
+nAddDays = nDay - 1;
+nDay = 1;
+}
+else if (nDay > 31)
+{
+nAddDays = nDay - 31;
+nDay = 31;
+}

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

[David Tardon]

 writerperfect/qa/unit/WpftImpressFilterTest.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9daa6e293d24694cb6102a15f228a6c008acf79d
Author: David Tardon 
Date:   Tue May 2 23:07:45 2017 +0200

fix file name

Change-Id: I43f4f0281d83c402fb7ced9fe0b01ef8a59d7aa5

diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx 
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index ebcc1f1d2d1d..2da1195d30c5 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -43,7 +43,7 @@ void WpftImpressFilterTest::test()
 {"PowerPoint_Mac_1", REQUIRE_MWAW_VERSION(0, 3, 9)},
 {"PowerPoint_Mac_2", REQUIRE_MWAW_VERSION(0, 3, 9)},
 {"PowerPoint_Mac_3", REQUIRE_MWAW_VERSION(0, 3, 9)},
-{"PowerPoint_Mac_4", REQUIRE_MWAW_VERSION(0, 3, 10)},
+{"PowerPoint_Mac_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
 {"PowerPoint_2.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
 {"PowerPoint_3.ppt", REQUIRE_MWAW_VERSION(0, 3, 9)},
 {"PowerPoint_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
___
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-9'

[Christian Lohmaier]

Tag 'cp-5.3-9' created by Andras Timar  at 
2017-05-02 21:08 +

cp-5.3-9

Changes since cp-5.3-4-3:
---
 0 files changed
---
___
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-9'

[Andras Timar]

Tag 'cp-5.3-9' created by Andras Timar  at 
2017-05-02 21:08 +

cp-5.3-9

Changes since cp-5.3-8-win-4:
---
 0 files changed
---
___
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-9'

[Andras Timar]

Tag 'cp-5.3-9' created by Andras Timar  at 
2017-05-02 21:08 +

cp-5.3-9

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 bd4fd10cb6a71a00412fb876b5d0de880545a305
Author: Andras Timar 
Date:   Tue May 2 23:07:30 2017 +0200

Bump version to 5.3-9

Change-Id: I3409182f608b50803947e9d7adbb74271d153c97

diff --git a/configure.ac b/configure.ac
index 968a6f500dde..0e4f7c4f1b5d 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.8],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.9],[],[],[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] dictionaries.git: Changes to 'refs/tags/cp-5.3-9'

[Krunoslav Šebetić]

Tag 'cp-5.3-9' created by Andras Timar  at 
2017-05-02 21:08 +

cp-5.3-9

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

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

[Markus Mohrhard]

 vcl/source/window/builder.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b82e0fed4b21b06e11aa5f8413710676ce7111e4
Author: Markus Mohrhard 
Date:   Sun Apr 30 21:48:06 2017 +0200

log exception that results in crash for crashreporter

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a65919836d21..83d61fbbad93 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef DISABLE_DYNLOADING
 #include 
@@ -214,6 +215,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const 
OUString& sUIDir, const OUStr
 catch (const css::uno::Exception &rExcept)
 {
 SAL_WARN("vcl.layout", "Unable to read .ui file: " << rExcept.Message);
+CrashReporter::AddKeyValue("VclBuilderException", "Unable to read .ui 
file: " + rExcept.Message);
 throw;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/docs

[Muhammet Kara]

 odk/docs/tools.html |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0ef94e2b559547bc4e906e7f24e57ff5d642e108
Author: Muhammet Kara 
Date:   Tue May 2 14:40:17 2017 +0300

Fix typos

Change-Id: Ib6a65c21916d808adfabb1c400937c4ebf12ce2d
Reviewed-on: https://gerrit.libreoffice.org/37150
Reviewed-by: Cor Nouws 
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 171adf165f87..0a7cdcc82d57 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -72,14 +72,14 @@
   
   regmerge
   Tool to merge several registry (e.g. type
- libraries) files into one file. Note: Since 
OpenOffice.org 3 it is not longer part of the SDK but it comes directly with 
the office as part of the ure.
+ libraries) files into one file. Note: Since 
OpenOffice.org 3 it is no longer part of the SDK but it comes directly with the 
office as part of the ure.
 
 
   
   regview
   Tool to view the content of a registry file
  in a human readable manner. Special support for type 
library
- nodes. Note: Since OpenOffice.org 3 it is not 
longer part of the SDK but it comes directly with the office as part of the 
ure.
+ nodes. Note: Since OpenOffice.org 3 it is no 
longer part of the SDK but it comes directly with the office as part of the 
ure.
 
 
   
@@ -151,12 +151,12 @@
  
  'unopkg' is a tool for easy deployment of UNO packages in 
an existing
  office installation. UNO packages are UNO components (single 
libraries or
- Jar files or more complex zip files that contains one or more 
libraries|
+ Jar files or more complex zip files that contain one or more 
libraries|
  Jar files, type libraries and configuration items), scripts  
and
  LibreOffice %PRODUCT_RELEASE% Basic libraries as zip package. 
'unopkg' is not part of the
  SDK but comes with the office directly and is a development 
tool as well
  as an end user tool to deploy extension into an office 
installation.
- More details concerning deployment and this tool can be 
find in the
+ More details concerning deployment and this tool can be 
found in the
  Developer's Guide: http://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/unopkg"; 
title="link to the "Extension Manager - unopkg" chapter in the 
Developer's Guide">Extension Manager - unopkg.
  Note: This tool works only in the 
/program
  directory!
@@ -184,7 +184,7 @@
   
  
 reinstall
-   export feature: reinstall all 
deployed
+   expert feature: reinstall all 
deployed
packages
   
  
___
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' - sc/qa

[Jan Holesovsky]

 sc/qa/unit/tiledrendering/data/cursor-away.ods |binary
 sc/qa/unit/tiledrendering/tiledrendering.cxx   |   45 +
 2 files changed, 45 insertions(+)

New commits:
commit 9c2daa30dc8743515e78665bcb02a4a0dc13c469
Author: Jan Holesovsky 
Date:   Tue May 2 16:32:28 2017 +0200

sc lok: Unit test that pgdown grows the document size for the new view.

Test based on the online.git test by Ashod Nakashian, thanks for the repro
steps there!

Change-Id: I225127e953b0dade0b1bd4e12c131dc984b7e3fc
Reviewed-on: https://gerrit.libreoffice.org/37169
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sc/qa/unit/tiledrendering/data/cursor-away.ods 
b/sc/qa/unit/tiledrendering/data/cursor-away.ods
new file mode 100644
index ..c593fc7db033
Binary files /dev/null and b/sc/qa/unit/tiledrendering/data/cursor-away.ods 
differ
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index cb0f5aea7b9b..577e79aeb41c 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -75,6 +75,7 @@ public:
 void testUndoLimiting();
 void testUndoRepairDispatch();
 void testInsertGraphicInvalidations();
+void testDocumentSizeWithTwoViews();
 
 CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
 CPPUNIT_TEST(testRowColumnSelections);
@@ -100,6 +101,7 @@ public:
 CPPUNIT_TEST(testUndoLimiting);
 CPPUNIT_TEST(testUndoRepairDispatch);
 CPPUNIT_TEST(testInsertGraphicInvalidations);
+CPPUNIT_TEST(testDocumentSizeWithTwoViews);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1307,6 +1309,49 @@ void 
ScTiledRenderingTest::testInsertGraphicInvalidations()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
+{
+comphelper::LibreOfficeKit::setActive();
+
+// Open a document that has the cursor far away & paint a tile
+ScModelObj* pModelObj = createDoc("cursor-away.ods");
+
+// Set the visible area, and press page down
+pModelObj->setClientVisibleArea(Rectangle(750, 1861, 20583, 6997));
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::PAGEDOWN);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::PAGEDOWN);
+Scheduler::ProcessEventsToIdle();
+
+Size aDocSize = pModelObj->getDocumentSize();
+
+int nCanvasWidth = 256;
+int nCanvasHeight = 256;
+std::vector aBuffer1(nCanvasWidth * nCanvasHeight * 4);
+ScopedVclPtrInstance pDevice1(nullptr, Size(1, 1), 
DeviceFormat::DEFAULT);
+pDevice1->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, 
nCanvasHeight), Fraction(1.0), Point(), aBuffer1.data());
+pModelObj->paintTile(*pDevice1.get(), nCanvasWidth, nCanvasHeight, 
/*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, 
/*nTileHeight=*/3840);
+Scheduler::ProcessEventsToIdle();
+
+// Create a new view
+SfxLokHelper::createView();
+Size aViewSize = pModelObj->getDocumentSize();
+
+std::vector aBuffer2(nCanvasWidth * nCanvasHeight * 4);
+ScopedVclPtrInstance pDevice2(nullptr, Size(1, 1), 
DeviceFormat::DEFAULT);
+pDevice2->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, 
nCanvasHeight), Fraction(1.0), Point(), aBuffer2.data());
+pModelObj->paintTile(*pDevice2.get(), nCanvasWidth, nCanvasHeight, 
/*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, 
/*nTileHeight=*/3840);
+Scheduler::ProcessEventsToIdle();
+
+// Make sure the newly created view has the same size as the original one
+CPPUNIT_ASSERT_EQUAL(aDocSize, aViewSize);
+
+// and that the tiles actually have the same content
+for (size_t i = 0; i < aBuffer1.size(); ++i)
+CPPUNIT_ASSERT_EQUAL(aBuffer1[i], aBuffer2[i]);
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/coinmp external/redland

[Stephan Bergmann]

 external/coinmp/UnpackedTarball_coinmp.mk   |1 
 external/coinmp/libtool.patch   |  162 
 external/redland/UnpackedTarball_raptor.mk  |1 
 external/redland/UnpackedTarball_rasqal.mk  |1 
 external/redland/UnpackedTarball_redland.mk |1 
 external/redland/raptor/libtool.patch   |   27 
 external/redland/rasqal/libtool.patch   |   27 
 external/redland/redland/libtool.patch  |   27 
 8 files changed, 247 insertions(+)

New commits:
commit 69578399e2a7192f55834e133b5d4f119b9cc5ad
Author: Stephan Bergmann 
Date:   Tue May 2 22:48:11 2017 +0200

Make some externals' libtool copies cope with -mllvm

...as needed e.g. for  
"r294897 +
NewGVN cause build failure with LibreOffice", by applying
 "libtool: Discard '-mllvm 
$arg'
options when linking."

Change-Id: Id2afc3c8af3c6c9595e7cb33cef5084a74f78cb0

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 0bf3f8cfb60b..b643b8e5d7d4 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/werror-format-pedantic.patch.0 \
external/coinmp/ubsan.patch.0 \
external/coinmp/rpath.patch \
+   external/coinmp/libtool.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/libtool.patch b/external/coinmp/libtool.patch
new file mode 100644
index ..ca1716f5fdb2
--- /dev/null
+++ b/external/coinmp/libtool.patch
@@ -0,0 +1,162 @@
+--- Cbc/ltmain.sh
 Cbc/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- Cgl/ltmain.sh
 Cgl/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- Clp/ltmain.sh
 Clp/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- CoinMP/ltmain.sh
 CoinMP/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- CoinUtils/ltmain.sh
 CoinUtils/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607,6 +1613,11 @@
+   continue
+   ;;
+ 
++  -mllvm)
++  prev=mllvm
++  continue
++  ;;
++
+   -module)
+   module=yes
+   continue
+--- Osi/ltmain.sh
 Osi/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ prev=
+ continue
+ ;;
++  mllvm)
++# Clang does not use LLVM to link, so we can simply discard any
++# '-mllvm $arg' options when doing the link step.
++prev=
++continue
++;;
+   objectlist)
+ if test -f "$arg"; then
+   save_arg=$arg
+@@ -1607

[Libreoffice-commits] core.git: sc/Module_sc.mk sd/Module_sd.mk sw/Module_sw.mk

[Markus Mohrhard]

 sc/Module_sc.mk |2 ++
 sd/Module_sd.mk |2 ++
 sw/Module_sw.mk |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit d9ee61f0adda79ef0886fdf487b5ec01e8e7
Author: Markus Mohrhard 
Date:   Tue May 2 19:57:53 2017 +0200

disable the tiledrendering tests in the headless build mode

This was pointed out by the Random Config tb.

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

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index ef82147d781b..4ab8f50489e7 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -44,11 +44,13 @@ $(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_core \
 ))
 
+ifneq ($(ENABLE_HEADLESS),TRUE)
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_check_targets,sc,\
 CppunitTest_sc_tiledrendering \
 ))
 endif
+endif
 
 $(eval $(call gb_Module_add_slowcheck_targets,sc, \
CppunitTest_sc_condformats \
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 62bfd8988778..dde16d7c4c40 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -39,12 +39,14 @@ $(eval $(call gb_Module_add_check_targets,sd,\
 ))
 endif
 
+ifneq ($(ENABLE_HEADLESS),TRUE)
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_check_targets,sd,\
 CppunitTest_sd_svg_export_tests \
 CppunitTest_sd_tiledrendering \
 ))
 endif
+endif
 
 # screenshots
 $(eval $(call gb_Module_add_screenshot_targets,sd, \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 8ef8a26fcf04..a003ae57c454 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -79,11 +79,13 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_globalfilter \
 ))
 
+ifneq ($(ENABLE_HEADLESS),TRUE)
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_tiledrendering \
 ))
 endif
+endif
 
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/inc/doc.hxx |1 +
 sw/inc/docary.hxx  |2 +-
 sw/source/core/tox/tox.cxx |2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 925dabe8fd42d85e5d8e610dc75252372161d1b3
Author: Noel Grandin 
Date:   Tue May 2 19:03:46 2017 +0200

Revert "SwTOXTypes can just be a std::vector typedef"

This reverts commit f894da4e687302702d14218138f96ed1c4983124.

the default behaviour of SwVectorModifyBase is to free the
elements in it's destructor

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

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 61d57940d2f9..f75ed2775890 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -117,6 +117,7 @@ class SwSectionData;
 class SwSelBoxes;
 class SwTableAutoFormatTable;
 class SwTOXBaseSection;
+class SwTOXTypes;
 class SwTabCols;
 class SwTable;
 class SwTableAutoFormat;
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 255bc8127ff7..6d25e85dcc74 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -300,7 +300,7 @@ public:
 void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-typedef std::vector SwTOXTypes;
+class SwTOXTypes : public SwVectorModifyBase {};
 
 class SW_DLLPUBLIC SwNumRuleTable : public SwVectorModifyBase {
 public:
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 5b00f54c474a..cb26ad4a6d1b 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -457,7 +457,7 @@ void SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& 
rSource )
 {
 maMSTOCExpression = rSource.maMSTOCExpression;
 SwTOXType* pType = const_cast(rSource.GetTOXType());
-if( pDoc && std::find(pDoc->GetTOXTypes().begin(), 
pDoc->GetTOXTypes().end(), pType) == pDoc->GetTOXTypes().end())
+if( pDoc && !pDoc->GetTOXTypes().Contains( pType ))
 {
 // type not in pDoc, so create it now
 const SwTOXTypes& rTypes = pDoc->GetTOXTypes();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 tools/qa/cppunit/test_date.cxx  |   33 +
 tools/source/datetime/tdate.cxx |   16 
 2 files changed, 49 insertions(+)

New commits:
commit 4c6876582d864897c3ebd4d00bd9fb5c6334edc1
Author: Eike Rathke 
Date:   Tue May 2 21:11:38 2017 +0200

Add more unit tests for Date::Normalize()

Change-Id: I013317bfa9dad02194177cca0907b0ffbb171ccd

diff --git a/tools/qa/cppunit/test_date.cxx b/tools/qa/cppunit/test_date.cxx
index 2ea3673082a2..054b38b1a727 100644
--- a/tools/qa/cppunit/test_date.cxx
+++ b/tools/qa/cppunit/test_date.cxx
@@ -78,6 +78,35 @@ void DateTest::testDate()
 aDate.Normalize();
 CPPUNIT_ASSERT_EQUAL( Date(4,3,1999).GetDate(), aDate.GetDate());
 
+// Empty date is not normalized and stays empty date.
+aDate = Date( Date::EMPTY );
+aDate.Normalize();
+CPPUNIT_ASSERT_EQUAL( Date(Date::EMPTY).GetDate(), aDate.GetDate());
+CPPUNIT_ASSERT( !aDate.IsValidDate());  // GetDate() also shall have no 
normalizing side effect
+
+// -01-00 normalized to -0001-12-31
+// SetYear(0) asserts, use empty date to force.
+aDate = Date( Date::EMPTY );
+aDate.SetMonth(1);
+aDate.SetDay(0);
+aDate.Normalize();
+CPPUNIT_ASSERT_EQUAL( Date(31,12,-1).GetDate(), aDate.GetDate());
+
+// 1999-00-00 normalized to 1998-12-31 (not 1998-11-30, or otherwise
+// also 0001-00-00 should be -0001-11-30 which it should not, should it?)
+aDate.SetYear(1999);
+aDate.SetMonth(0);
+aDate.SetDay(0);
+aDate.Normalize();
+CPPUNIT_ASSERT_EQUAL( Date(31,12,1998).GetDate(), aDate.GetDate());
+
+// 0001-00-00 normalized to -0001-12-31
+aDate.SetYear(1);
+aDate.SetMonth(0);
+aDate.SetDay(0);
+aDate.Normalize();
+CPPUNIT_ASSERT_EQUAL( Date(31,12,-1).GetDate(), aDate.GetDate());
+
 // Year -1 is a leap year.
 aDate = Date(28,2,-1);
 CPPUNIT_ASSERT_EQUAL( Date(29,2,-1).GetDate(), (aDate += 1).GetDate());
commit 1edd4229904575ea103730ac15254b402eb86709
Author: Eike Rathke 
Date:   Tue May 2 20:52:02 2017 +0200

Date::Normalize: handle day 0 and empty date

* Empty date (initialized with Date::EMPTY == all 0) stays empty.
* Day 0 is normalized to the last day of the previous month.
* Day 0 AND month 0 is also normalized to the last day of the previous month
  (and not the last day of the previous-1 month).
* Before,
  * all day 0 cases weren't handled at all and day 0 stayed day 0, which
doesn't make sense in a Normalize() context
  * empty date wasn't detected and resulted in nonsense date -0001-12-00

Change-Id: Ib12ff7694e1adb17724af038a266f6f284285f36

diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 9815716ebe3f..3dd8f68b3ced 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -493,6 +493,18 @@ bool Date::Normalize( sal_uInt16 & rDay, sal_uInt16 & 
rMonth, sal_Int16 & rYear
 if (IsValidDate( rDay, rMonth, rYear))
 return false;
 
+if (rDay == 0 && rMonth == 0 && rYear == 0)
+return false;   // empty date
+
+if (rDay == 0)
+{
+if (rMonth == 0)
+;   // nothing, handled below
+else
+--rMonth;
+// Last day of month is determined at the end.
+}
+
 if (rMonth > 12)
 {
 rYear += rMonth / 12;
@@ -550,6 +562,10 @@ bool Date::Normalize( sal_uInt16 & rDay, sal_uInt16 & 
rMonth, sal_Int16 & rYear
 }
 }
 }
+
+if (rDay == 0)
+rDay = ImplDaysInMonth( rMonth, rYear);
+
 return true;
 }
 
commit 246a2a54662eb52468f9a411b315a4300aaa17c0
Author: Eike Rathke 
Date:   Tue May 2 17:53:13 2017 +0200

Test that empty date is not a valid date

Change-Id: If5f2db3d4bae9158b482b01ce7dbb7335b4cb16b

diff --git a/tools/qa/cppunit/test_date.cxx b/tools/qa/cppunit/test_date.cxx
index c2c31e10b51c..2ea3673082a2 100644
--- a/tools/qa/cppunit/test_date.cxx
+++ b/tools/qa/cppunit/test_date.cxx
@@ -61,6 +61,10 @@ void DateTest::testDate()
 aDate.Normalize();
 CPPUNIT_ASSERT_EQUAL( aMax.GetDate(), aDate.GetDate());
 
+// Empty date is not a valid date.
+aDate = Date( Date::EMPTY );
+CPPUNIT_ASSERT( !aDate.IsValidDate());
+
 // 0001-00-x normalized to -0001-12-x
 aDate.SetYear(1);
 aDate.SetMonth(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - external/redland

[Michael Stahl]

 external/redland/UnpackedTarball_raptor.mk 
   |1 
 
external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1
 |   43 ++
 2 files changed, 44 insertions(+)

New commits:
commit 39573b1b973a03e40f915d64df9a3ff4f629e986
Author: Michael Stahl 
Date:   Wed Apr 19 16:47:56 2017 +0200

redland: add raptor patch to fix some bugs

Change-Id: I4e3db61fdfe0b984d36b4f67f8e891da48f79ddb
(cherry picked from commit 8af6e5e0c4191b12d830b20f72ec3552eea15747)
Reviewed-on: https://gerrit.libreoffice.org/36694
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 8044b81f1eaa8ac40acf405d5de450e011c4a34c)
Reviewed-on: https://gerrit.libreoffice.org/36740
Reviewed-by: Eike Rathke 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/external/redland/UnpackedTarball_raptor.mk 
b/external/redland/UnpackedTarball_raptor.mk
index 762903018d43..a6260715588e 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
external/redland/raptor/ubsan.patch \
$(if $(SYSTEM_LIBXML),,external/redland/raptor/rpath.patch) \
external/redland/raptor/xml2-config.patch \
+   
external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1
 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git 
a/external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1
 
b/external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1
new file mode 100644
index ..6fa726cae6da
--- /dev/null
+++ 
b/external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1
@@ -0,0 +1,43 @@
+From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
+From: Dave Beckett 
+Date: Sun, 16 Apr 2017 23:15:12 +0100
+Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer
+
+(raptor_xml_writer_start_element_common): Calculate max including for
+each attribute a potential name and value.
+
+Fixes Issues #617 http://bugs.librdf.org/mantis/view.php?id=617
+and #618 http://bugs.librdf.org/mantis/view.php?id=618
+---
+ src/raptor_xml_writer.c | 7 ---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
+index 693b946..0d3a36a 100644
+--- a/src/raptor_xml_writer.c
 b/src/raptor_xml_writer.c
+@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* 
xml_writer,
+   size_t nspace_declarations_count = 0;  
+   unsigned int i;
+ 
+-  /* max is 1 per element and 1 for each attribute + size of declared */
+   if(nstack) {
+-int nspace_max_count = element->attribute_count+1;
++int nspace_max_count = element->attribute_count * 2; /* attr and value */
++if(element->name->nspace)
++  nspace_max_count++;
+ if(element->declared_nspaces)
+   nspace_max_count += raptor_sequence_size(element->declared_nspaces);
+ if(element->xml_language)
+@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* 
xml_writer,
+ }
+   }
+ 
+-  /* Add the attribute + value */
++  /* Add the attribute's value */
+   nspace_declarations[nspace_declarations_count].declaration=
+ raptor_qname_format_as_xml(element->attributes[i],
+
&nspace_declarations[nspace_declarations_count].length);
+-- 
+2.9.3
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sc/uiconfig/scalc/menubar/menubar.xml |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 961fae9d75caf0cf52af62fdf9d9676ab0ab556f
Author: Yousuf Philips 
Date:   Thu Apr 27 17:34:58 2017 +0400

tdf#91820 Add design mode and image original size to menu

Change-Id: Ie5462446fee738c11f944bc2dab7da6f6a454954
Reviewed-on: https://gerrit.libreoffice.org/37032
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 362c879a08df..3f61a0220218 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -128,6 +128,7 @@
 
 
 
+
 
 
 
@@ -418,6 +419,7 @@
 
 
 
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bbc6d66effa62d0ef69c0422595c43f3821cd3bb
Author: Yousuf Philips 
Date:   Thu Apr 27 17:40:04 2017 +0400

tdf#107455 Fix accelerators in the Slide menu

Change-Id: I89eae1da902ccb64247eb294450bc300d055ece0
Reviewed-on: https://gerrit.libreoffice.org/37034
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d88339f110d0..8449066f4579 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -686,7 +686,7 @@
   
   
 
-  New Slid~e
+  ~New Slide
 
 
   .uno:InsertPage
@@ -954,7 +954,7 @@
   
   
 
-  D~elete Slide
+  ~Delete Slide
 
 
   .uno:DeletePage
@@ -1577,7 +1577,7 @@
   
   
 
-  Master ~Elements...
+  ~Master Elements...
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Question about one of your recent commits

[Jan Iversen]

Hi

You are as such not breaking a protocol, but I have added the list as CC, so 
that others can learn from the thread.

It is correct I worked on the Xcode integration, and have a solution that works 
partly. In the base version we simply call make for each step. I do think you 
refer to gbuild-to-ideNS which is called for Xcode.


I did however put that work aside a while ago, due to a change of priorities at 
TDF. I assume I will return to it, to make life easier for myself.


> In Xcode v8.2.1, those targets fail with message "Target specifies product 
> type 'com.apple.product-type.cppunit', but there's no such product type for 
> the 'macosx’ platform ». 
I am not sure the product type should be com.apple more correct would be  
org.libreoffice.product-type.cppunit.

> I understand this product type is right and has been introduced purposefully, 
> but how comes Xcode doesn’t know about it? (not defined in 
> /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Xcode/Specifications/MacOSXProduct
>  Types.xcspec,  which is consistent with the failure message). 
Because the reference to com.apple is not correct.

> Should it be part of the standard configuration of Xcode? Was it in a 
> previous version? Should I somehow define or load it? I couldn’t find any 
> reference to it in the Apple documentation, nor in the LibreOffice 
> documentation, except for very old posts related to Xcode v3 or before, and 
> clearly out of date.
I use Xcode 8.3 but to not run unit tests.

Please file a bug on bugs.documentfoundation.org 


> 
> I’ve successfully used cppunit with Xcode before, but always with targets 
> using type « Command-line tool », which is obviously not the idea here. Any 
> pointer or hint would be greatly appreciated.
This is what runs on my Mac (command-line tool is a simple make.

rgds
jan I.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tamás Zolnai]

 svx/source/svdraw/svdedxv.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61d5a42cf4c65a9da38b91d33a98ea46d4b4d1ea
Author: Tamás Zolnai 
Date:   Fri Apr 28 22:16:27 2017 +0200

tdf#107505: Impress - crash with two people co-editing one slide

Deleting outliner view removes the pointed Cursor (pTECursorMerker).

Change-Id: Iac17386d1d02bf52bd5322073e49da05c6e89d9b
Reviewed-on: https://gerrit.libreoffice.org/37085
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit 44555103217df34b218787f3dc6a2634b41fe52e)
Reviewed-on: https://gerrit.libreoffice.org/37097
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b413f51e34e0..9a55be46c27e 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1228,7 +1228,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool 
bDontDeleteReally)
 // and now the Outliner itself
 if (!bTextEditDontDelete) delete pTEOutliner;
 else pTEOutliner->Clear();
-if (pTEWin!=nullptr) {
+if (bTextEditDontDelete && pTEWin!=nullptr) {
 pTEWin->SetCursor(pTECursorMerker);
 }
 maHdlList.SetMoveOutside(false);
___
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' - sc/source

[Ashod Nakashian]

 sc/source/ui/view/tabvwsh4.cxx |   35 +++
 1 file changed, 35 insertions(+)

New commits:
commit a70c34ccf5c446967bf9a258b8da2bd7addc9695
Author: Ashod Nakashian 
Date:   Tue May 2 08:21:29 2017 -0400

Calc Lok: prevent a new view from resetting tiled view dimensions

When creating a new view the document tiled view dimensions
are also reset to the original. When an existing view had
grown said dimensions, this results in tiles that
previously (before creating the new view) rendered fine
to start rendering blank (transparent) as they are now
outside of the doc bounds.

This makes sure that the new view inherits the largest
doc tiled view dimensions of all existing views.

Change-Id: Ie10e85ad1eb9501ddd8a901188a2c822a0952a00
Reviewed-on: https://gerrit.libreoffice.org/37155
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index e8f4491ae26e..2f31b44dcfb1 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1684,6 +1684,32 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
 pAccessibilityBroadcaster(nullptr),
 mbInSwitch(false)
 {
+// FIXME this is just a workaround, the real fix is to move the
+// CurMaxCol/Row to ScTable, so that we maintain them consistently
+// for all the views:
+// If another view had enlarged the dimensions, preserve it
+// lest we reduce it to the original, and they get blank tiles
+// (in the area outside the original dimensions).
+long nMaxTiledRow = 0;
+long nMaxTiledCol = 0;
+SfxViewShell* pViewShell = SfxViewShell::GetFirst();
+while (pViewShell)
+{
+ScTabViewShell* pTabViewShell = 
dynamic_cast(pViewShell);
+if (pTabViewShell && getPart() == pTabViewShell->getPart())
+{
+ScViewData& rViewData = pTabViewShell->GetViewData();
+const long nCurMaxTiledRow = rViewData.GetMaxTiledRow();
+const long nCurMaxTiledCol = rViewData.GetMaxTiledCol();
+SAL_INFO("sc.lok.docsize", "sfxlokhelper::createview: maxTiledRow: 
" <<
+ nCurMaxTiledRow << ", maxTiledCol: " << nCurMaxTiledCol);
+nMaxTiledRow = std::max(nCurMaxTiledRow, nMaxTiledRow);
+nMaxTiledCol = std::max(nCurMaxTiledCol, nMaxTiledCol);
+}
+
+pViewShell = SfxViewShell::GetNext(*pViewShell);
+}
+
 const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
 
 //  if switching back from print preview,
@@ -1744,6 +1770,15 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
 //put things back as we found them
 if (bInstalledScTabViewObjAsTempController)
 GetViewData().GetDocShell()->GetModel()->setCurrentController(nullptr);
+
+// Set the maximum dimensions as explained above, but only if they have
+// the default values.
+SAL_INFO("sc.lok.docsize", "sfxlokhelper::createview: overwriting new 
view's maxTiledRow: " <<
+ nMaxTiledRow << ", maxTiledCol: " << nMaxTiledCol);
+if (GetViewData().GetMaxTiledRow() == 50 && nMaxTiledRow > 0)
+GetViewData().SetMaxTiledRow(nMaxTiledRow);
+if (GetViewData().GetMaxTiledCol() == 20 && nMaxTiledCol > 0)
+GetViewData().SetMaxTiledCol(nMaxTiledCol);
 }
 
 ScTabViewShell::~ScTabViewShell()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - sw/source

[Michael Stahl]

 sw/source/core/layout/flowfrm.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 253a345ccd0bd499950759c792da62fe9dc437ee
Author: Michael Stahl 
Date:   Wed Apr 26 17:10:09 2017 +0200

tdf#107398 sw: do not leave empty footnote container in layout

... when applying loop control in SwFlowFrame::MoveBwd().

The SwFootnoteContFrame is newly created in MoveBwd(), line 2062:
pNewUpper = m_rThis.GetLeaf( MAKEPAGE_FTN, false );

If it stays empty, that is not a valid layout so delete it again.

Since the idle/timer refactoring in VCL the invalid layout stays
until the document is closed; presumably before LO 5.0 the timer
based layout would reformat things again.

(regression from af41b7f91f22052d49654d41ae9916d6981db3f6)

Change-Id: I841f42b465f8123f9246f1fa70d1417ffdd57700
(cherry picked from commit e15b8997f0d2e54fa7b8345063755616d0b100b9)
Reviewed-on: https://gerrit.libreoffice.org/37008
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 27bbee974eaf59f722c115c9717faa8c74b9d815)
Reviewed-on: https://gerrit.libreoffice.org/37058
Reviewed-by: Christian Lohmaier 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 29e1300a4a98..7ab8e85c7119 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2404,6 +2404,12 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
  ( pNextNewUpper == m_rThis.GetUpper() ||
pNextNewUpper->GetType() != m_rThis.GetUpper()->GetType() ) )
 {
+// tdf#107398 do not leave empty footnote container around
+if (!pNewUpper->Lower() && pNewUpper->IsFootnoteContFrame())
+{
+pNewUpper->Cut();
+SwFrame::DestroyFrame(pNewUpper);
+}
 pNewUpper = nullptr;
 OSL_FAIL( " - layout loop control for 
layout action  applied!" );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - sw/source

[Michael Stahl]

 sw/source/uibase/wrtsh/wrtsh1.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 6d5b1ba501771cfa693b46d82ec8802f02bb
Author: Michael Stahl 
Date:   Fri Apr 28 13:26:01 2017 +0200

tdf#107474 sw: fix crash when deleting header with active SdrObject

The problem is that the SdrView's text edit mode remains active when
the header is deleted, which deletes the active SdrObject that is
anchored in the header.

Then the next call to SdrBeginTextEdit() will call SdrEndTextEdit()
but the mxTextEditObj WeakReference is null then and so the cleanup
code that resets the SdrOutliner's UndoManager is not called,
but then the SdrOutliner is deleted.

What's really horrible about this is that while text editing is active,
both SdrObjEditView and ImpEditEngine consider themselves the
exclusive owner of SwDoc's UndoManager.

(regression from 12a4200e8ff7f045efcc7e9d15a24b15b248c437
 and d7b7c9fdfe63deec26c420efc3ff1fd73c21bb27)

Change-Id: I17c5165a03d2de1eaba8a335dfbfded56573f8a2
(cherry picked from commit 7f207fca577ef820be2aec0a442df7e8ab6e14a6)
Reviewed-on: https://gerrit.libreoffice.org/37069
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit e07c2c3861f47946ed72fc9b67aafeaa8598468d)
Reviewed-on: https://gerrit.libreoffice.org/37156
Reviewed-by: Christian Lohmaier 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 7695865d8e16..1f8ae7ba9023 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1765,6 +1765,11 @@ void SwWrtShell::SetReadonlyOption(bool bSet)
 void SwWrtShell::ChangeHeaderOrFooter(
 const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning)
 {
+SdrView *const pSdrView = GetDrawView();
+if (pSdrView && pSdrView->IsTextEdit())
+{   // tdf#107474 deleting header may delete active drawing object
+pSdrView->SdrEndTextEdit(true);
+}
 addCurrentPosition();
 StartAllAction();
 StartUndo( UNDO_HEADER_FOOTER ); // #i7983#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - download.lst external/nss

[Michael Stahl]

 download.lst |3 +-
 external/nss/ExternalProject_nss.mk  |1 
 external/nss/UnpackedTarball_nss.mk  |1 
 external/nss/nss-ios.patch   |4 +-
 external/nss/nss-more-static.patch   |   34 -
 external/nss/nss.patch   |   47 ++-
 external/nss/nss.utf8bom.patch.1 |9 --
 external/nss/nss.windowbuild.patch.0 |   20 +++---
 external/nss/nss_macosx.patch|   19 +-
 external/nss/ubsan-alignment.patch.0 |   40 -
 external/nss/ubsan.patch.0   |   11 
 11 files changed, 53 insertions(+), 136 deletions(-)

New commits:
commit 67fe6ae146385d880c47c25a289e9a6b54333b1c
Author: Michael Stahl 
Date:   Thu Apr 20 22:19:45 2017 +0200

nss: upgrade to release 3.29.5

- fixes CVE-2017-5461 and CVE-2017-5462
- drop ubsan-alignment.patch.0, there is apparently now some
  NO_SANITIZE_ALIGNMENT macro upstream to get this effect
- drop some hunks to prevent hard-coding CC/CCC vars, upstream now
  respects environment vars (but doesn't quote them...)
- drop first hunk of ubsan.patch.0, fixed upstream
- drop hunk for gtest-internal.h, header looks much newer anyway

Change-Id: I5c484c02c1235e185af1ef5166b069303d3378e1
Reviewed-on: https://gerrit.libreoffice.org/36756
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 0cdf41419af854acccee0f819d4add7e8cafb7dc)
Reviewed-on: https://gerrit.libreoffice.org/36795
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit fd957eadfa1a042ceccc4083c275fcc43dfea458)
Reviewed-on: https://gerrit.libreoffice.org/37055
Reviewed-by: Christian Lohmaier 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/download.lst b/download.lst
index f91a3384aa14..c8b95c4dc6cb 100644
--- a/download.lst
+++ b/download.lst
@@ -111,7 +111,8 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
-export NSS_TARBALL := 
0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz
+export NSS_MD5SUM := e55ee06b22687df68fafc6a30c0554b2
+export NSS_TARBALL := nss-3.29.5-with-nspr-4.13.1.tar.gz
 export ODFGEN_MD5SUM := 32572ea48d9021bbd6fa317ddb697abc
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 07cc472b9fb2..b7bdf4b26ac9 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -77,6 +77,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject
$(MAKE) -j1 AR="$(AR)" \
RANLIB="$(RANLIB)" \
NMEDIT="$(NM)edit" \
+   CCC="$(CXX)" \
$(if 
$(CROSS_COMPILING),NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
nss_build_all \
&& rm -f $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index a0ac57173fd1..4a90853f543a 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -44,7 +44,6 @@ ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/asan.patch.1 \
-   external/nss/ubsan-alignment.patch.0 \
 ))
 endif
 endif
diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch
index d4107d77f954..9d4af2c724e9 100644
--- a/external/nss/nss-ios.patch
+++ b/external/nss/nss-ios.patch
@@ -52,8 +52,8 @@
 --- a/a/nss/coreconf/Darwin.mk
 +++ a/a/nss/coreconf/Darwin.mk
 @@ -124,7 +124,7 @@
- # May override this with -bundle to create a loadable module.
- DSO_LDOPTS= -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name 
@__OOO/$(notdir $@) 
-headerpad_max_install_names
+DSO_LDOPTS += --coverage
+ endif
  
 -MKSHLIB   = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
 +MKSHLIB   = touch $@; echo
diff --git a/external/nss/nss-more-static.patch 
b/external/nss/nss-more-static.patch
index 6b06a4e4a226..26948f0be24c 100644
--- a/external/nss/nss-more-static.patch
+++ b/external/nss/nss-more-static.patch
@@ -9,30 +9,30 @@
  /*  determine if hybrid platform, then actually load the DSO. */
  static PRStatus
 @@ -136,9 +136,9 @@
- return PR_FAILURE;
-   }
+ return PR_FAILURE;
+ }
  
--  handle = l

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - filter/source

[Caolán McNamara]

 filter/source/graphicfilter/icgm/class2.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 330e0c04594bdf7de6501a0eb90ffb04778639ad
Author: Caolán McNamara 
Date:   Thu Apr 27 21:45:31 2017 +0100

ofz#1284 InsertBundle may delete the bundle that pMarkerBundle is pointing 
to

Change-Id: Ic8bd538e80469b672ddd9c5fcceb2f5aac81d2a1
Reviewed-on: https://gerrit.libreoffice.org/37053
Reviewed-by: Michael Stahl 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/filter/source/graphicfilter/icgm/class2.cxx 
b/filter/source/graphicfilter/icgm/class2.cxx
index 93b3679381b6..bedcd2e37de2 100644
--- a/filter/source/graphicfilter/icgm/class2.cxx
+++ b/filter/source/graphicfilter/icgm/class2.cxx
@@ -147,7 +147,10 @@ void CGM::ImplDoClass2()
 aTempLineBundle.eLineType = (LineType)ImplGetI( 
pElement->nIndexPrecision );
 aTempLineBundle.nLineWidth = ImplGetFloat( 
pElement->eRealPrecision, pElement->nRealSize );
 aTempLineBundle.SetColor( ImplGetBitmapColor() );
+const bool bUpdateLineBundle = aTempLineBundle.GetIndex() == 
pElement->pLineBundle->GetIndex();
 CGMElements::InsertBundle( pElement->aLineList, aTempLineBundle );
+if (bUpdateLineBundle)
+pElement->pLineBundle = 
static_cast(CGMElements::GetBundleIndex(aTempLineBundle.GetIndex(),
 pElement->aLineList, pElement->aLineBundle));
 }
 break;
 case 0x0c : /*Marker Representation*/
@@ -157,7 +160,10 @@ void CGM::ImplDoClass2()
 aTempMarkerBundle.eMarkerType = (MarkerType)ImplGetI( 
pElement->nIndexPrecision );
 aTempMarkerBundle.nMarkerSize = ImplGetFloat( 
pElement->eRealPrecision, pElement->nRealSize );
 aTempMarkerBundle.SetColor( ImplGetBitmapColor() );
+const bool bUpdateMarkerBundle = aTempMarkerBundle.GetIndex() == 
pElement->pMarkerBundle->GetIndex();
 CGMElements::InsertBundle( pElement->aMarkerList, 
aTempMarkerBundle );
+if (bUpdateMarkerBundle)
+pElement->pMarkerBundle = 
static_cast(CGMElements::GetBundleIndex(aTempMarkerBundle.GetIndex(),
 pElement->aMarkerList, pElement->aMarkerBundle));
 }
 break;
 case 0x0d : /*Text Representation*/
@@ -169,7 +175,10 @@ void CGM::ImplDoClass2()
 aTempTextBundle.nCharacterSpacing = ImplGetFloat( 
pElement->eRealPrecision, pElement->nRealSize );
 aTempTextBundle.nCharacterExpansion = ImplGetFloat( 
pElement->eRealPrecision, pElement->nRealSize );
 aTempTextBundle.SetColor( ImplGetBitmapColor() );
+const bool bUpdateTextBundle = aTempTextBundle.GetIndex() == 
pElement->pTextBundle->GetIndex();
 CGMElements::InsertBundle( pElement->aTextList, aTempTextBundle );
+if (bUpdateTextBundle)
+pElement->pTextBundle = 
static_cast(CGMElements::GetBundleIndex(aTempTextBundle.GetIndex(),
 pElement->aTextList, pElement->aTextBundle));
 }
 break;
 case 0x0e : /*Fill Representation*/
@@ -180,7 +189,10 @@ void CGM::ImplDoClass2()
 aTempFillBundle.SetColor( ImplGetBitmapColor() );
 aTempFillBundle.nFillPatternIndex = ImplGetI( 
pElement->nIndexPrecision );
 aTempFillBundle.nFillHatchIndex = ImplGetI( 
pElement->nIndexPrecision );
+const bool bUpdateFillBundle = aTempFillBundle.GetIndex() == 
pElement->pFillBundle->GetIndex();
 CGMElements::InsertBundle( pElement->aFillList, aTempFillBundle );
+if (bUpdateFillBundle)
+pElement->pFillBundle = 
static_cast(CGMElements::GetBundleIndex(aTempFillBundle.GetIndex(),
 pElement->aFillList, pElement->aFillBundle));
 }
 break;
 case 0x0f : /*Edge Representation*/
@@ -190,7 +202,10 @@ void CGM::ImplDoClass2()
 aTempEdgeBundle.eEdgeType = (EdgeType)ImplGetI( 
pElement->nIndexPrecision );
 aTempEdgeBundle.nEdgeWidth = ImplGetFloat( 
pElement->eRealPrecision, pElement->nRealSize );
 aTempEdgeBundle.SetColor( ImplGetBitmapColor() );
+const bool bUpdateEdgeBundle = aTempEdgeBundle.GetIndex() == 
pElement->pEdgeBundle->GetIndex();
 CGMElements::InsertBundle( pElement->aEdgeList, aTempEdgeBundle );
+if (bUpdateEdgeBundle)
+pElement->pEdgeBundle = 
static_cast(CGMElements::GetBundleIndex(aTempEdgeBundle.GetIndex(),
 pElement->aEdgeList, pElement->aEdgeBundle));
 }
 break;
 case 0x10 : /*Interior Style Specification Mode */break;// NS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00ff43f12d6ecb811b48d4d235fd4ddc9922d0f0
Author: Caolán McNamara 
Date:   Mon Apr 24 15:06:10 2017 +0100

ofz#1220 sanitize nTyp to legal values

Change-Id: Iad71c4f79dbe03e2e325453eb0506a2d92d67c2d
Reviewed-on: https://gerrit.libreoffice.org/36895
Reviewed-by: Michael Stahl 
Reviewed-by: Christian Lohmaier 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 718faff1c16c..bd1a8ca64cad 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1294,7 +1294,7 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD* 
pHd, SfxAllItemSet &rSet)
 else// nein -> Nimm Linie
 SetStdAttr( rSet, aCallB.dpPolyLine.aLnt, aCallB.dptxbx.aShd );
 SetFill( rSet, aCallB.dptxbx.aFill );
-rSet.Put( SdrCaptionTypeItem( aCaptA[nTyp] ) );
+rSet.Put(SdrCaptionTypeItem(aCaptA[nTyp % SAL_N_ELEMENTS(aCaptA)]));
 
 return pObj;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - sc/source

[Eike Rathke]

 sc/source/core/tool/parclass.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c4ad6a24329446b374a7f01ab9a2214219d3590e
Author: Eike Rathke 
Date:   Thu Apr 20 13:52:18 2017 +0200

Resolves: tdf#99625 add parameter classification for TEXTJOIN and CONCAT

So in array context the functions return a single string instead of an 
array of
identical strings.

Change-Id: Ia6ada10be4912745b60e281fac1736c560162d3a
(cherry picked from commit f0fef88b747cc4f4de7a5ccb93da9c062545dcfb)
Reviewed-on: https://gerrit.libreoffice.org/36743
Reviewed-by: Michael Stahl 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index bd8ca5544a8d..66ca8e5c3a48 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -80,6 +80,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocCell,{{ Value, Reference   
  }, 0 }},
 { ocColumn,  {{ Reference  
  }, 0 }},
 { ocColumns, {{ Reference  
  }, 1 }},
+{ ocConcat_MS,   {{ Reference  
  }, 1 }},
 { ocCorrel,  {{ ForceArray, ForceArray 
  }, 0 }},
 { ocCount,   {{ Reference  
  }, 1 }},
 { ocCount2,  {{ Reference  
  }, 1 }},
@@ -195,6 +196,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocSumXMY2, {{ ForceArray, ForceArray 
  }, 0 }},
 { ocSheet,   {{ Reference  
  }, 0 }},
 { ocSheets,  {{ Reference  
  }, 1 }},
+{ ocTextJoin_MS, {{ Reference, Value, Reference
  }, 1 }},
 { ocTrend,   {{ Reference, Reference, Reference, Value 
  }, 0 }},
 { ocTrimMean,{{ Reference, Value   
  }, 0 }},
 { ocTTest,   {{ ForceArray, ForceArray, Value, Value   
  }, 0 }},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Link error: undefined reference to `__mulodi4' with Clang 32-bit

[slacka]

> Whatever the trouble with your toolchain 

If you have access to a Fedora x86 box with Clang, I'm sure you'd see this
too as I'm seeing this on both my 32-bit Fedora box with Clang 5.0 master
and 32-bit Ubuntu box with clang 3.9. 

> tweak the  #elif so that you use the #else fallback implementation

So you don't think  this sound like a compiler issue? Anything else you
suggest I try or look into before working on a patch for this?




--
View this message in context: 
http://nabble.documentfoundation.org/Link-error-undefined-reference-to-mulodi4-with-Clang-32-bit-tp4213636p4213680.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - external/icu

[Eike Rathke]

 external/icu/UnpackedTarball_icu.mk|1 
 external/icu/icu4c-changeset-39671.patch.1 |  189 +
 2 files changed, 190 insertions(+)

New commits:
commit c9deb223767647b6a317a76f1ea676e7f514b723
Author: Eike Rathke 
Date:   Thu Apr 20 22:06:23 2017 +0200

add ICU changeset-39671 fix for CVE-2017-7867 CVE-2017-7868

http://bugs.icu-project.org/trac/changeset/39671
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=213
https://bugzilla.redhat.com/show_bug.cgi?id=1444101

Reviewed-on: https://gerrit.libreoffice.org/36754
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 
(cherry picked from commit c7de8233d15ed0c90fef6c49a54d60cf10119f58)

Backported to older MSVC using the UGLY_SIZEOF_MAPTOUCHARS macro instead
of sizeof(UTF8Buf::mapToUChars).

Change-Id: I4e776ad4fe63c77057b0c823f8672a2b6703346f
Reviewed-on: https://gerrit.libreoffice.org/36775
Reviewed-by: Michael Stahl 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 0e4a6455a0a3..58fedc9f3951 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
$(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \
external/icu/khmerbreakengine.patch \
+   external/icu/icu4c-changeset-39671.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-changeset-39671.patch.1 
b/external/icu/icu4c-changeset-39671.patch.1
new file mode 100644
index ..b8ac1385364e
--- /dev/null
+++ b/external/icu/icu4c-changeset-39671.patch.1
@@ -0,0 +1,189 @@
+diff -ur icu.org/source/common/utext.cpp icu/source/common/utext.cpp
+--- icu.org/source/common/utext.cpp2016-06-15 20:58:17.0 +0200
 icu/source/common/utext.cpp2017-04-21 16:38:15.993398034 +0200
+@@ -847,9 +847,15 @@
+ 
//--
+ 
+ // Chunk size.
+-// Must be less than 85, because of byte mapping from UChar indexes to 
native indexes.
+-// Worst case is three native bytes to one UChar.  (Supplemenaries are 4 
native bytes
+-// to two UChars.)
++// Must be less than 42  (256/6), because of byte mapping from UChar 
indexes to native indexes.
++// Worst case there are six UTF-8 bytes per UChar.
++// obsolete 6 byte form fd + 5 trails maps to fffd
++// obsolete 5 byte form fc + 4 trails maps to fffd
++// non-shortest 4 byte forms maps to fffd
++// normal supplementaries map to a pair of utf-16, two utf8 bytes per 
utf-16 unit
++// mapToUChars array size must allow for the worst case, 6.
++// This could be brought down to 4, by treating fd and fc as pure illegal,
++// rather than obsolete lead bytes. But that is not compatible with the 
utf-8 access macros.
+ //
+ enum { UTF8_TEXT_CHUNK_SIZE=32 };
+ 
+@@ -867,6 +873,15 @@
+ // pair.  Doing this is simpler than checking for the edge case.
+ //
+ 
++// erAck: older MSVC used on libreoffice-5-3 and 5-2 bails out with
++// error C2070: 'unknown': illegal sizeof operand
++// for sizeof(UTF8Buf::mapToUChars)
++// so have an ugly workaround:
++// First define a macro of the original size expression, so a follow-up patch
++// on the original code would fail..
++#define UGLY_MAPTOUCHARS_SIZE (UTF8_TEXT_CHUNK_SIZE*6+6)
++#define UGLY_SIZEOF_MAPTOUCHARS (sizeof(uint8_t)*(UGLY_MAPTOUCHARS_SIZE))
++
+ struct UTF8Buf {
+ int32_t   bufNativeStart;// Native index of first 
char in UChar buf
+ int32_t   bufNativeLimit;// Native index 
following last char in buf.
+@@ -889,7 +904,7 @@
+  //  Requires two extra 
slots,
+  //one for a 
supplementary starting in the last normal position,
+  //and one for an 
entry for the buffer limit position.
+-uint8_t   mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset 
from bufNativeStart to
++uint8_t   mapToUChars[UGLY_MAPTOUCHARS_SIZE];// Map native offset 
from bufNativeStart to
+  //   correspoding offset 
in filled part of buf.
+ int32_t   align;
+ };
+@@ -1032,6 +1047,7 @@
+ // Requested index is in this buffer.
+ u8b = (UTF8Buf *)ut->p;   // the current buffer
+ mapIndex = ix - u8b->toUCharsMapStart;
++U_ASSERT(mapIndex < (int32_t)UGLY_SIZEOF_MAPTOUCHARS);
+ ut->chunkOffset = u8b->mapToUChars[mapIndex

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - vcl/inc vcl/win

[Michael Stahl]

 vcl/inc/win/saldata.hxx   |4 +++-
 vcl/win/gdi/winlayout.cxx |   18 --
 2 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit f3c235aba752786c5114dae42587f38dbb1f335b
Author: Michael Stahl 
Date:   Mon Apr 24 18:21:50 2017 +0200

tdf#107205 vcl: don't always use D2DWriteTextOutRenderer

... because it cannot rotate text.

(regression from commit df556aa47da22f96b3fcd356c12419d3035cba3c)

Change-Id: If9bc6e98b8979c5eb02f1a5cfc12b4d19bdc481b
(cherry picked from commit 2eb91035c2f60e9dc476336474d51b23b666bb04)
Reviewed-on: https://gerrit.libreoffice.org/36904
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit 8f51b4272450b6220f563740538f143c0bc70175)
Reviewed-on: https://gerrit.libreoffice.org/36990
Reviewed-by: V Stuart Foote 
Reviewed-by: Tamás Zolnai 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index cf11a04ddace..61a5d91d9b88 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -121,7 +121,9 @@ public:
 std::map< UINT,sal_uInt16 > maVKMap;  // map some dynamic VK_* entries
 
 // must be deleted before exit(), so delete it in DeInitSalData()
-std::unique_ptr m_pTextOutRenderer;
+std::unique_ptr m_pD2DWriteTextOutRenderer;
+// tdf#107205 need 2 instances because D2DWrite can't rotate text
+std::unique_ptr m_pExTextOutRenderer;
 };
 
 inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; 
}
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 22a6fb268f55..782f56c31e48 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3080,18 +3080,24 @@ TextOutRenderer & TextOutRenderer::get(bool bUseDWrite)
 abort();
 }
 
-if (!pSalData->m_pTextOutRenderer)
+if (bUseDWrite)
 {
-if (bUseDWrite && D2DWriteTextOutRenderer::InitModules())
+static bool const bSuccess(D2DWriteTextOutRenderer::InitModules());
+if (bSuccess && !pSalData->m_pD2DWriteTextOutRenderer)
 {
-pSalData->m_pTextOutRenderer.reset(new D2DWriteTextOutRenderer());
+pSalData->m_pD2DWriteTextOutRenderer.reset(new 
D2DWriteTextOutRenderer());
 }
-else
+if (pSalData->m_pD2DWriteTextOutRenderer)
 {
-pSalData->m_pTextOutRenderer.reset(new ExTextOutRenderer());
+return *pSalData->m_pD2DWriteTextOutRenderer;
 }
+// else: fall back to GDI
+}
+if (!pSalData->m_pExTextOutRenderer)
+{
+pSalData->m_pExTextOutRenderer.reset(new ExTextOutRenderer);
 }
-return *pSalData->m_pTextOutRenderer;
+return *pSalData->m_pExTextOutRenderer;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Eike Rathke]

 sc/source/core/tool/parclass.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9e76cc9da61dbe8ee5bbcac5c4378c5ba4fb4d21
Author: Eike Rathke 
Date:   Thu Apr 20 13:52:18 2017 +0200

Resolves: tdf#99625 add parameter classification for TEXTJOIN and CONCAT

So in array context the functions return a single string instead of an 
array of
identical strings.

Change-Id: Ia6ada10be4912745b60e281fac1736c560162d3a
(cherry picked from commit f0fef88b747cc4f4de7a5ccb93da9c062545dcfb)
Reviewed-on: https://gerrit.libreoffice.org/36742
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index bd8ca5544a8d..66ca8e5c3a48 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -80,6 +80,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocCell,{{ Value, Reference   
  }, 0 }},
 { ocColumn,  {{ Reference  
  }, 0 }},
 { ocColumns, {{ Reference  
  }, 1 }},
+{ ocConcat_MS,   {{ Reference  
  }, 1 }},
 { ocCorrel,  {{ ForceArray, ForceArray 
  }, 0 }},
 { ocCount,   {{ Reference  
  }, 1 }},
 { ocCount2,  {{ Reference  
  }, 1 }},
@@ -195,6 +196,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocSumXMY2, {{ ForceArray, ForceArray 
  }, 0 }},
 { ocSheet,   {{ Reference  
  }, 0 }},
 { ocSheets,  {{ Reference  
  }, 1 }},
+{ ocTextJoin_MS, {{ Reference, Value, Reference
  }, 1 }},
 { ocTrend,   {{ Reference, Reference, Reference, Value 
  }, 0 }},
 { ocTrimMean,{{ Reference, Value   
  }, 0 }},
 { ocTTest,   {{ ForceArray, ForceArray, Value, Value   
  }, 0 }},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-3' - hwpfilter/source

[Caolán McNamara]

 hwpfilter/source/hbox.cxx|2 --
 hwpfilter/source/hbox.h  |2 --
 hwpfilter/source/hwpfile.cxx |   10 --
 hwpfilter/source/hwpread.cxx |1 +
 4 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 0dae5454104c568d73ce108a1003a382e2a2d418
Author: Caolán McNamara 
Date:   Fri Apr 21 10:51:19 2017 +0100

ofz#1193 we only set these values, never read them

Change-Id: Ia2f54b536a4262e19abe260e8e19c9b15cc2d0ec
Reviewed-on: https://gerrit.libreoffice.org/36782
Reviewed-by: Michael Stahl 
Reviewed-by: Eike Rathke 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index 04d5497ce1f3..0cde055d7345 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -332,8 +332,6 @@ FBox::FBox(hchar hch)
 , pgy(0)
 , pgno(0)
 , showpg(0)
-, prev(nullptr)
-, next(nullptr)
 {
 }
 
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index a9aa2b452892..b642665dc520 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -316,8 +316,6 @@ struct FBox: public HBox
 short pgx, pgy;   // physical xpos, ypos
 short pgno, showpg;   // pageno where code is
 
-FBox  *prev, *next;
-
 explicit FBox( hchar hch );
 virtual ~FBox() override;
 };
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 929a783d0761..96395da5c6da 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -441,18 +441,8 @@ EmPicture *HWPFile::GetEmPictureByName(char * name)
 return nullptr;
 }
 
-
 void HWPFile::AddBox(FBox * box)
 {
-// LATER if we don't use box->next(),
-// AddBox() and GetBoxHead() are useless;
-if (!blist.empty())
-{
-box->prev = blist.back();
-box->prev->next = box;
-}
-else
-box->prev = nullptr;
 blist.push_back(box);
 }
 
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index abeaca660d53..608fd0371da2 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -221,6 +221,7 @@ bool TxtBox::Read(HWPFile & hwpf)
 hwpf.AddBox(this);
 hwpf.Read2b(&style.cap_len, 1);
 hwpf.Read2b(&dummy1, 1);
+unsigned short next;
 hwpf.Read2b(&next, 1);
 hwpf.Read2b(&dummy2, 1);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Seccomp.cpp

[Jan Holesovsky]

 common/Seccomp.cpp |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2a2d863321f6009cd472ac607d4c185da8b86eef
Author: Jan Holesovsky 
Date:   Tue May 2 17:24:44 2017 +0200

Fix build with older kernel versions.

Change-Id: I28fc6687a42ac428413d644e9fd55870cd5936fa

diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index b0709cd6..092f1a5d 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -173,8 +173,12 @@ bool lockdown(Type type)
 KILL_SYSCALL(perf_event_open), // profiling
 KILL_SYSCALL(fanotify_init),
 KILL_SYSCALL(fanotify_mark),
+#ifdef __NR_seccomp
 KILL_SYSCALL(seccomp), // no further fiddling
+#endif
+#ifdef __NR_bpf
 KILL_SYSCALL(bpf), // no further fiddling
+#endif
 
 // allow the rest.
 BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 tools/source/datetime/tdate.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8ea7253327b70adb2c497bfd3a1734d9abd0c65b
Author: Eike Rathke 
Date:   Tue May 2 17:23:23 2017 +0200

Date::IsValidDate: year 0 is not

Change-Id: I44e476f354d04a1d070a7348e3b00d75497231c2

diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 46e5ad62469e..9815716ebe3f 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -464,6 +464,8 @@ bool Date::IsValidDate() const
 //static
 bool Date::IsValidDate( sal_uInt16 nDay, sal_uInt16 nMonth, sal_Int16 nYear )
 {
+if (nYear == 0)
+return false;
 if ( !nMonth || (nMonth > 12) )
 return false;
 if ( !nDay || (nDay > ImplDaysInMonth( nMonth, nYear )) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/inc/IDocumentFieldsAccess.hxx|3 -
 sw/inc/doc.hxx  |1 
 sw/inc/docary.hxx   |6 +-
 sw/source/core/doc/docfmt.cxx   |2 
 sw/source/core/fields/dbfld.cxx |7 +--
 sw/source/core/fields/fldbas.cxx|6 +-
 sw/source/filter/ww8/ww8toolbar.cxx |   80 ++--
 7 files changed, 54 insertions(+), 51 deletions(-)

New commits:
commit de9106a511ed9c202423e3c3a9754feb4f969364
Author: Caolán McNamara 
Date:   Tue May 2 15:28:11 2017 +0100

Revert "SwFieldTypes can just be a std::vector typedef"

This reverts commit 5eaad8eb1d46b6f85605c5ac210e8b1397b18b22.

cause it now leaks as the ~SwVectorModifyBase base deletes the entries

Change-Id: I02374f4b439b9cf3e8f331aa9c6892b4418f37f0

diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 7d999d955a29..c78e5a249b3b 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -22,10 +22,9 @@
 
 #include 
 #include 
-#include 
 
+class SwFieldTypes;
 class SwFieldType;
-typedef std::vector SwFieldTypes;
 class SfxPoolItem;
 struct SwPosition;
 class SwDocUpdateField;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index d1e1073cd522..61d57940d2f9 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -88,6 +88,7 @@ class SwEditShell;
 class SwFieldType;
 class SwField;
 class SwTextField;
+class SwFieldTypes;
 class SwFlyFrameFormat;
 class SwFormatsBase;
 class SwFormat;
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 8e0131516a11..255bc8127ff7 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -295,8 +295,10 @@ public:
 void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
-typedef std::vector SwFieldTypes;
-void dumpAsXml(struct _xmlTextWriter* pWriter, SwFieldTypes const &);
+class SwFieldTypes : public SwVectorModifyBase {
+public:
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+};
 
 typedef std::vector SwTOXTypes;
 
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 0e27f6140fb8..5dff133d929f 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1940,7 +1940,7 @@ void SwDoc::dumpAsXml(xmlTextWriterPtr pWriter) const
 maDBData.dumpAsXml(pWriter);
 mpMarkManager->dumpAsXml(pWriter);
 m_pUndoManager->dumpAsXml(pWriter);
-::dumpAsXml(pWriter, *getIDocumentFieldsAccess().GetFieldTypes());
+getIDocumentFieldsAccess().GetFieldTypes()->dumpAsXml(pWriter);
 mpTextFormatCollTable->dumpAsXml(pWriter);
 mpCharFormatTable->dumpAsXml(pWriter);
 mpFrameFormatTable->dumpAsXml(pWriter, "frmFormatTable");
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 151dfe79c507..e6724c228c7b 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -90,12 +90,11 @@ void SwDBFieldType::ReleaseRef()
 
 if (--nRefCnt <= 0)
 {
-auto pFieldTypes = 
GetDoc()->getIDocumentFieldsAccess().GetFieldTypes();
-auto it = std::find(pFieldTypes->begin(), pFieldTypes->end(), this);
+size_t nPos = 
GetDoc()->getIDocumentFieldsAccess().GetFieldTypes()->GetPos(this);
 
-if (it != pFieldTypes->end())
+if (nPos != SIZE_MAX)
 {
-GetDoc()->getIDocumentFieldsAccess().RemoveFieldType(it - 
pFieldTypes->begin());
+GetDoc()->getIDocumentFieldsAccess().RemoveFieldType(nPos);
 delete this;
 }
 }
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 27627dddee55..4dcb10a43843 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -155,11 +155,13 @@ bool SwFieldType::PutValue( const uno::Any& , sal_uInt16 )
 return false;
 }
 
-void dumpAsXml(xmlTextWriterPtr pWriter, SwFieldTypes const & rTypes)
+void SwFieldTypes::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
 xmlTextWriterStartElement(pWriter, BAD_CAST("SwFieldTypes"));
-for (auto pCurType : rTypes)
+sal_uInt16 nCount = size();
+for (sal_uInt16 nType = 0; nType < nCount; ++nType)
 {
+const SwFieldType *pCurType = (*this)[nType];
 SwIterator aIter(*pCurType);
 for (const SwFormatField* pFormatField = aIter.First(); pFormatField; 
pFormatField = aIter.Next())
 pFormatField->dumpAsXml(pWriter);
commit 4778f39ece4b41625b876e5e7673893e1e011a62
Author: Caolán McNamara 
Date:   Tue May 2 15:17:58 2017 +0100

ofz fix leak

Change-Id: I237f19f237e6b78f98798352c1f881b0d27a6a9e

diff --git a/sw/source/filter/ww8/ww8toolbar.cxx 
b/sw/source/filter/ww8/ww8toolbar.cxx
index 86663ea36ede..b269f013da52 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -825,48 +825,48 @@ Tcg255::~Tcg255()
 
 bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream &rS )
 {
-Tcg255SubStruct* pSubStruct = nullptr;
+std::unique_ptr xSubStruct;
 swi

[Libreoffice-commits] libmspub.git: 2 commits - src/lib

[David Tardon]

 src/lib/Coordinate.h  |4 ++--
 src/lib/MSPUBParser97.cpp |   12 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit fcfdbdf6d0481e8c709f8033181e8da09142cff9
Author: David Tardon 
Date:   Tue May 2 16:31:18 2017 +0200

ofz#1004 fix signed integer overflow

Change-Id: I2cb4414464fe62c2b88b6cdcda3a9ba52cf82800

diff --git a/src/lib/Coordinate.h b/src/lib/Coordinate.h
index f15ffb4..336eb09 100644
--- a/src/lib/Coordinate.h
+++ b/src/lib/Coordinate.h
@@ -27,11 +27,11 @@ struct Coordinate
   }
   double getWidthIn() const
   {
-return double(m_xe - m_xs) / EMUS_IN_INCH;
+return double(int64_t(m_xe) - m_xs) / EMUS_IN_INCH;
   }
   double getHeightIn() const
   {
-return double(m_ye - m_ys) / EMUS_IN_INCH;
+return double(int64_t(m_ye) - m_ys) / EMUS_IN_INCH;
   }
 };
 }
commit 6a7bc865eac08ab145b15e504b931e040700015e
Author: David Tardon 
Date:   Tue May 2 16:26:40 2017 +0200

ofz#1288 fix signed integer overflow

Change-Id: I282a6c1b1c5d4ce95d73e6bc59c4e5be574f0802

diff --git a/src/lib/MSPUBParser97.cpp b/src/lib/MSPUBParser97.cpp
index f3b29a2..867a1cf 100644
--- a/src/lib/MSPUBParser97.cpp
+++ b/src/lib/MSPUBParser97.cpp
@@ -9,6 +9,7 @@
 
 #include "MSPUBParser97.h"
 
+#include 
 #include 
 #include 
 
@@ -263,14 +264,11 @@ MSPUBParser97::TextInfo97 
MSPUBParser97::getTextInfo(librevenge::RVNGInputStream
 
 int MSPUBParser97::translateCoordinateIfNecessary(int coordinate) const
 {
-  if (m_isBanner)
-  {
-return coordinate - 120 * EMUS_IN_INCH;
-  }
+  const int offset = (m_isBanner ? 120 : 25) * EMUS_IN_INCH;
+  if (std::numeric_limits::min() + offset > coordinate)
+return std::numeric_limits::min();
   else
-  {
-return coordinate - 25 * EMUS_IN_INCH;
-  }
+return coordinate - offset;
 }
 
 unsigned MSPUBParser97::getFirstLineOffset() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes of the Design Hangout: 2017-Apr-27

[Heiko Tietze]

(Forgot to send out the minutes last week, sorry)

Present: Tomaz, Jay, Heiko

Organization

* Newly introduced telegram channels
  + LibreOffice Design EN (English only)
https://t.me/joinchat/AAx1jkAG95bMPMKh8Q
  + LibreOffice Design DE (German only)
https://t.me/joinchat/AAxsR8PjxfJxtsnLfQ

Tickets

 * Auto compression of images
   + https://bugs.documentfoundation.org/show_bug.cgi?id=77407
   + https://bugs.documentfoundation.org/show_bug.cgi?id=34133
   + Proposed solution is a dropdown to reduce DPI / compress image on insert
 + Requires some settings under Tools > Load/Save
   + Having options for each and every function is suboptimal
   + Alternatively select all (ctrl+A) and compress (all) images could be useful
   + Close 77407 as DUP of 34133
   + When
 + a) on insert, b) manually
 + have a checkbox in the insert image dialog to disable the autocompression
 + insert with a fix dpi as defined in tools > options
 + select all and use the known dialog should work too
   + Where
 + tools > options
   + What
 + apply compression to only jpg?
 + no, every image above the defined dpi level
   + What option needs to be provided
 + auto compression on/off
 + dpi with steps from 50 to 600
 + bmp and tiff should be converted & compressed as png or jpg
based on their size (jay)
   + Default values
 + on by default
 + 300 dpi
   + jpg compression defaults - gimp 90%, pinta 85%, krita 80%, LO
compression dialog 90%
   + png compression defaults - gimp 9, krita 9, LO compression dialog 9
   + Competitors:
 + Word: 
http://www.virtualmv.com/wiki/index.php?title=MS-Word2007%3A_Compressing_Pictures
+ in options dialog - http://imgur.com/yD4SJaN

 * Default set of table styles
   + Start the survey
   /done
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist

[Pranav Kant]

 loleaflet/dist/admin/admin.html  |2 
 loleaflet/dist/admin/adminAnalytics.html |2 
 loleaflet/dist/admin/adminSettings.html  |2 
 loleaflet/dist/l10n/admin-localizations.json |  121 +++
 4 files changed, 124 insertions(+), 3 deletions(-)

New commits:
commit d4b62a9051ec5a994f2230763047cdc4264b1ddd
Author: Pranav Kant 
Date:   Tue May 2 19:38:04 2017 +0530

Make admin l10n work again

The localization.json file contains path like 'l10n/lang.json' which
means path relative the html file being accessed. This works when we
access .../loleaflet.html but not so when we access .../admin/admin.html 
because
then it tries to access .../admin/l10n/lang.json while it should look for
this file one directory up. One could think to change the paths in
localization.json file to something like '/loleaflet/dist/l10n/lang.json' so
that same path is accessed always for loleaflet UI as well as admin, but
it has repercussions that we access l10n data always using 'dist' prefix
and not using git hash, so browser caching the l10n data across multiple
versions.

Ideal would be to split the admin localization completely from the
loleaflet-ui localization. No point in fetching whole of the loleaflet
localizations strings when we are only accessing the admin console. This
would also solve problem mentioned previously.

For now, just split the admin localization file only while still
allowing admin console to fetch the same l10n files.

Change-Id: I0824fb05b9b4123b58d6fd8edafb374ee7128229
(cherry picked from commit 163e04af0b6253445f91f1803f4e4a47e786eca9)
Reviewed-on: https://gerrit.libreoffice.org/37161
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/admin/admin.html b/loleaflet/dist/admin/admin.html
index 0d44ea4e..ac68b753 100644
--- a/loleaflet/dist/admin/admin.html
+++ b/loleaflet/dist/admin/admin.html
@@ -15,7 +15,7 @@
   https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js";>
   https://oss.maxcdn.com/respond/1.4.2/respond.min.js";>
 

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

[Jens Carl]

 sw/source/core/text/txthyph.cxx |   35 ---
 1 file changed, 16 insertions(+), 19 deletions(-)

New commits:
commit 3f4613353405be1665e138992e4bba7e83ec8130
Author: Jens Carl 
Date:   Sat Apr 29 07:28:35 2017 +

tdf#39468: Translate German comments in sw/source/core/text/txthyph.cxx

Change-Id: I55df1deaf3a44bb8be0225756761da2f7d2667aa
Reviewed-on: https://gerrit.libreoffice.org/37095
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index ebe0e154743b..b8e62040b3a7 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -158,14 +158,13 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo 
&rHyphInf )
 
 nWrdStart = FormatLine( nWrdStart );
 
-// Man muss immer im Hinterkopf behalten, dass es z.B.
-// Felder gibt, die aufgetrennt werden koennen ...
+// You always should keep in mind that for example there are fields
+// which can be hyphenated
 if( m_pCurr->PrtWidth() && m_pCurr->GetLen() )
 {
-// Wir muessen uns darauf einstellen, dass in der Zeile
-// FlyFrames haengen, an denen auch umgebrochen werden darf.
-// Wir suchen also die erste HyphPortion in dem angegebenen
-// Bereich.
+// We must be prepared that there are FlyFrames in the line,
+// at which line breaking is possible. So we search for the first
+// HyphPortion in the specified range.
 
 SwLinePortion *pPos = m_pCurr->GetPortion();
 const sal_Int32 nPamStart = rHyphInf.nStart;
@@ -173,8 +172,8 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
 const sal_Int32 nEnd = rHyphInf.GetEnd();
 while( pPos )
 {
-// Entweder wir liegen drueber oder wir laufen gerade auf eine
-// Hyphportion die am Ende der Zeile oder vor einem Flys steht.
+// Either we are above or we are running into a HyphPortion
+// at the end of line or before a Fly.
 if( nWrdStart >= nEnd )
 {
 nWrdStart = 0;
@@ -192,7 +191,7 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
 nWrdStart = nWrdStart + pPos->GetLen();
 pPos = pPos->GetPortion();
 }
-// Wenn pPos 0 ist, wurde keine Trennstelle ermittelt.
+// When pPos is null, no hyphen position was found.
 if( !pPos )
 nWrdStart = 0;
 }
@@ -202,7 +201,7 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
 // from the loop.
 nWrdStart = 0;
 
-// Das alte LineLayout wird wieder eingestellt ...
+// the old LineLayout is set again ...
 delete m_pCurr;
 m_pCurr = pOldCurr;
 
@@ -215,15 +214,13 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo 
&rHyphInf )
 if( nWrdStart==0 )
 return false;
 
-// nWrdStart bezeichnet nun die Position im String, der
-// fuer eine Trennung zur Debatte steht.
-// Start() hangelt sich zum End()
+// nWrdStart contains the position in string that should be hyphenated
 rHyphInf.nWordStart = nWrdStart;
 
 sal_Int32 nLen = 0;
 const sal_Int32 nEnd = nWrdStart;
 
-// Wir suchen vorwaerts
+// we search forwards
 Reference< XHyphenatedWord > xHyphWord;
 
 Boundary aBound =
@@ -237,7 +234,7 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
 OUString aSelText( rInf.GetText().copy(nWrdStart, nLen) );
 const sal_Int32 nMinTrail = ( nWrdStart + nLen > nEnd ) ? nWrdStart + nLen 
- nEnd - 1 : 0;
 
-//!! rHyphInf.SetHyphWord( ... ) mu??? hier geschehen
+//!! rHyphInf.SetHyphWord( ... ) must done here
 xHyphWord = rInf.HyphWord( aSelText, nMinTrail );
 if ( xHyphWord.is() )
 {
@@ -265,7 +262,7 @@ bool SwTextPortion::CreateHyphen( SwTextFormatInfo &rInf, 
SwTextGuess &rGuess )
 if( rInf.IsHyphForbud() ||
 pPortion || // robust
 !xHyphWord.is() || // more robust
-// Mehrzeilige Felder duerfen nicht interaktiv getrennt werden.
+// multi-line fields can't be hyphenated interactively
 ( rInf.IsInterHyph() && InFieldGrp() ) )
 return false;
 
@@ -457,7 +454,7 @@ bool SwSoftHyphPortion::Format( SwTextFormatInfo &rInf )
 {
 bool bFull = true;
 
-// special case for old german spelling
+// special case for old German spelling
 if( rInf.IsUnderflow()  )
 {
 if( rInf.GetSoftHyphPos() )
@@ -468,8 +465,8 @@ bool SwSoftHyphPortion::Format( SwTextFormatInfo &rInf )
 {
 rInf.SetSoftHyphPos( rInf.GetIdx() );
 Width(0);
-// if the soft hyphend word has an alternative spelling
-// when hyphenated (old german spelling), the soft hyphen
+// if the soft hyphened word has an alternative spelling
+// when hyphenated (old German spelling), the soft hyphen
 // portio

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

[Pranav Kant]

 loleaflet/dist/admin/admin.html  |2 
 loleaflet/dist/admin/adminAnalytics.html |2 
 loleaflet/dist/admin/adminHistory.html   |2 
 loleaflet/dist/admin/adminSettings.html  |2 
 loleaflet/dist/l10n/admin-localizations.json |  121 +++
 5 files changed, 125 insertions(+), 4 deletions(-)

New commits:
commit 163e04af0b6253445f91f1803f4e4a47e786eca9
Author: Pranav Kant 
Date:   Tue May 2 19:38:04 2017 +0530

Make admin l10n work again

The localization.json file contains path like 'l10n/lang.json' which
means path relative the html file being accessed. This works when we
access .../loleaflet.html but not so when we access .../admin/admin.html 
because
then it tries to access .../admin/l10n/lang.json while it should look for
this file one directory up. One could think to change the paths in
localization.json file to something like '/loleaflet/dist/l10n/lang.json' so
that same path is accessed always for loleaflet UI as well as admin, but
it has repercussions that we access l10n data always using 'dist' prefix
and not using git hash, so browser caching the l10n data across multiple
versions.

Ideal would be to split the admin localization completely from the
loleaflet-ui localization. No point in fetching whole of the loleaflet
localizations strings when we are only accessing the admin console. This
would also solve problem mentioned previously.

For now, just split the admin localization file only while still
allowing admin console to fetch the same l10n files.

Change-Id: I0824fb05b9b4123b58d6fd8edafb374ee7128229

diff --git a/loleaflet/dist/admin/admin.html b/loleaflet/dist/admin/admin.html
index 98a99eb8..1e65699e 100644
--- a/loleaflet/dist/admin/admin.html
+++ b/loleaflet/dist/admin/admin.html
@@ -15,7 +15,7 @@
   https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js";>
   https://oss.maxcdn.com/respond/1.4.2/respond.min.js";>
 

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

[Eike Rathke]

 basic/source/runtime/methods.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b5483b46f6190dd22d327313dfbee22897e8732b
Author: Eike Rathke 
Date:   Tue May 2 16:06:25 2017 +0200

SbiRuntime::isVBAEnabled() needs to be guarded with #if 
HAVE_FEATURE_SCRIPTING

Change-Id: I7fab0c946c13a9779fad05f88be6ae6a9da93775

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 0b1698b9eabc..5996d1590903 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4935,7 +4935,11 @@ bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, 
sal_Int16 nDay, bool bUs
 else
 #endif
 {
-if ( 0 <= nYear && nYear < 100 && (bUseTwoDigitYear || 
SbiRuntime::isVBAEnabled()) )
+if ( 0 <= nYear && nYear < 100 && (bUseTwoDigitYear
+#if HAVE_FEATURE_SCRIPTING
+|| SbiRuntime::isVBAEnabled()
+#endif
+) )
 {
 nYear += 1900;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jens Carl]

 sw/source/filter/html/css1atr.cxx  |   14 +++---
 sw/source/filter/html/htmlfld.cxx  |   23 +++
 sw/source/filter/writer/writer.cxx |2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit ed831436cdc4513add55324a9cd2c125e8bb7f2e
Author: Jens Carl 
Date:   Sat Apr 29 05:03:59 2017 +

tdf#39468: Translate German comments in sw

Translate German comments and terms in:

sw/source/filter/html/css1atr.cxx
sw/source/filter/html/htmlfld.cxx
sw/source/filter/writer/writer.cxx

Change-Id: I05228ea5369e0d1e7f06158dc5369ba89284c2c9
Reviewed-on: https://gerrit.libreoffice.org/37093
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 8f5aa484af96..c67fcb8ec292 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -69,7 +69,7 @@
 #include 
 #include 
 #include 
-// OTES
+// NOTES
 #include 
 #include 
 #include 
@@ -1654,7 +1654,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const 
SwPageDesc& rPageDesc,
  &aSelector );
 
 // Size: If the only difference is the Landscape-Flag,
-// only export Portrait oder Landscape. Otherwise export size.
+// only export Portrait or Landscape. Otherwise export size.
 bool bRefLandscape = pRefPageDesc && pRefPageDesc->GetLandscape();
 Size aRefSz;
 const Size& rSz = rPageDesc.GetMaster().GetFrameSize().GetSize();
@@ -2876,7 +2876,7 @@ static Writer& OutCSS1_SwFormatFrameSize( Writer& rWrt, 
const SfxPoolItem& rHt,
 bOutHeight = bool(nMode & Css1FrameSize::VarHeight);
 break;
 default:
-OSL_ENSURE( bOutHeight, "Hoehe wird nicht exportiert" );
+OSL_ENSURE( bOutHeight, "Height will not be exported" );
 break;
 }
 
@@ -3504,9 +3504,9 @@ static SwAttrFnTab const aCSS1AttrFnTab = {
 /* RES_CHRATR_WORDLINEMODE  */  nullptr,
 /* RES_CHRATR_AUTOKERN  */  nullptr,
 /* RES_CHRATR_BLINK */  OutCSS1_SvxBlink,
-/* RES_CHRATR_NOHYPHEN  */  nullptr, // Neu: nicht trennen
-/* RES_CHRATR_NOLINEBREAK */nullptr, // Neu: nicht umbrechen
-/* RES_CHRATR_BACKGROUND */ OutCSS1_SvxBrush, // Neu: 
Zeichenhintergrund
+/* RES_CHRATR_NOHYPHEN  */  nullptr, // new: don't separate
+/* RES_CHRATR_NOLINEBREAK */nullptr, // new: don't wrap
+/* RES_CHRATR_BACKGROUND */ OutCSS1_SvxBrush, // new: character 
background
 /* RES_CHRATR_CJK_FONT */   OutCSS1_SvxFont,
 /* RES_CHRATR_CJK_FONTSIZE */   OutCSS1_SvxFontHeight,
 /* RES_CHRATR_CJK_LANGUAGE */   OutCSS1_SvxLanguage,
@@ -3559,7 +3559,7 @@ static SwAttrFnTab const aCSS1AttrFnTab = {
 /* RES_PARATR_TABSTOP   */  nullptr,
 /* RES_PARATR_HYPHENZONE*/  nullptr,
 /* RES_PARATR_DROP */   OutCSS1_SwFormatDrop,
-/* RES_PARATR_REGISTER */   nullptr, // neu:  Registerhaltigkeit
+/* RES_PARATR_REGISTER */   nullptr, // new: register-true
 /* RES_PARATR_NUMRULE */nullptr,
 /* RES_PARATR_SCRIPTSPACE */nullptr,
 /* RES_PARATR_HANGINGPUNCTUATION */ nullptr,
diff --git a/sw/source/filter/html/htmlfld.cxx 
b/sw/source/filter/html/htmlfld.cxx
index b5ef5f9be9fe..f1286dce22b2 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -251,10 +251,9 @@ void SwHTMLParser::NewField()
 if( !bKnownType )
 return;
 
-// Autor und Absender werden nur als als variables Feld eingefuegt,
-// wenn man das Dok selbst als letztes geaendert hat oder es noch
-// niemend geandert hat und man das Dok erstellt hat. Sonst
-// wird ein Fixed-Feld daraus gemacht.
+// Author and sender are only inserted as a variable field if the document
+// was last changed by ourself or nobody changed it and it was created
+// by ourself. Otherwise it will be a fixed field.
 if( !bFixed &&
 (SwFieldIds::ExtUser == nType ||
  SwFieldIds::Author == nType) )
@@ -536,25 +535,25 @@ void SwHTMLParser::EndField()
 {
 case SwFieldIds::DocInfo:
 OSL_ENSURE( static_cast(m_pField)->IsFixed(),
-"DokInfo-Feld haette nicht gemerkt werden muessen" );
+"Field DocInfo should not have been saved" );
 static_cast(m_pField)->SetExpansion( m_aContents 
);
 break;
 
 case SwFieldIds::ExtUser:
 OSL_ENSURE( static_cast(m_pField)->IsFixed(),
-"ExtUser-Feld haette nicht gemerkt werden muessen" );
+"Field ExtUser should not have been saved" );
 static_cast(m_pField)->SetExpansion( m_aContents 
);
 break;
 
 case SwFieldIds::Author:
 OSL_ENSURE( static_cast(m_pField)->IsFixed(),
-"Author-Feld haette nicht gemerkt werden muessen" );
+ 

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

[Eike Rathke]

 basic/qa/basic_coverage/test_cdatetofromiso_methods.vb |   20 +++
 basic/source/inc/date.hxx  |4 
 basic/source/runtime/methods.cxx   |  105 ++---
 basic/source/runtime/methods1.cxx  |   15 --
 basic/source/sbx/sbxscan.cxx   |2 
 5 files changed, 95 insertions(+), 51 deletions(-)

New commits:
commit 1b13548f33720d80f53d493f6d70cbcce6b1a0fb
Author: Eike Rathke 
Date:   Tue May 2 15:53:04 2017 +0200

BASIC: handle the full tools::Date range from -32768-01-01 to 32767-12-31

* Input of two-digit years only possible through CDateFromIso() though to
  maintain compatibility with previous behavior and also VBA mode.
* VBA mode restricted to years 1..

Change-Id: Ia9574c3bf136619b4831b349d263c96b162d1ed4

diff --git a/basic/qa/basic_coverage/test_cdatetofromiso_methods.vb 
b/basic/qa/basic_coverage/test_cdatetofromiso_methods.vb
index 3eb5e63e83ff..7036762743e1 100644
--- a/basic/qa/basic_coverage/test_cdatetofromiso_methods.vb
+++ b/basic/qa/basic_coverage/test_cdatetofromiso_methods.vb
@@ -12,6 +12,26 @@ Function doUnitTest as Integer
 doUnitTest = 0
 ElseIf ( CDateToIso( CDateFromIso("2016-10-16") ) <> "20161016" ) Then
 doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("-2016-10-16") ) <> "-20161016" ) Then
+doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("-20161016") ) <> "-20161016" ) Then
+doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("12016-10-16") ) <> "120161016" ) Then
+doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("120161016") ) <> "120161016" ) Then
+doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("-12016-10-16") ) <> "-120161016" ) Then
+doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("-120161016") ) <> "-120161016" ) Then
+doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("0001-01-01") ) <> "00010101" ) Then
+doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("00010101") ) <> "00010101" ) Then
+doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("-0001-12-31") ) <> "-00011231" ) Then
+doUnitTest = 0
+ElseIf ( CDateToIso( CDateFromIso("-00011231") ) <> "-00011231" ) Then
+doUnitTest = 0
 Else
 doUnitTest = 1
 End If
diff --git a/basic/source/inc/date.hxx b/basic/source/inc/date.hxx
index 9611f3aab9c4..eb44aa1ec76c 100644
--- a/basic/source/inc/date.hxx
+++ b/basic/source/inc/date.hxx
@@ -24,11 +24,11 @@
 #include 
 #include 
 
-bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, 
double& rdRet );
+bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool 
bUseTwoDigitYear, double& rdRet );
 double implTimeSerial( sal_Int16 nHour, sal_Int16 nMinute, sal_Int16 nSecond);
 bool implDateTimeSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
  sal_Int16 nHour, sal_Int16 nMinute, sal_Int16 nSecond,
- double& rdRet );
+ bool bUseTwoDigitYear, double& rdRet );
 
 sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 
nFirstDay = 0 );
 
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 82bd2ce03134..0b1698b9eabc 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1865,7 +1865,7 @@ css::util::Date SbxDateToUNODate( const SbxValue* const 
pVal )
 void SbxDateFromUNODate( SbxValue *pVal, const css::util::Date& aUnoDate)
 {
 double dDate;
-if( implDateSerial( aUnoDate.Year, aUnoDate.Month, aUnoDate.Day, dDate ) )
+if( implDateSerial( aUnoDate.Year, aUnoDate.Month, aUnoDate.Day, false, 
dDate ) )
 {
 pVal->PutDate( dDate );
 }
@@ -1980,7 +1980,7 @@ void SbxDateFromUNODateTime( SbxValue *pVal, const 
css::util::DateTime& aUnoDT)
 double dDate(0.0);
 if( implDateTimeSerial( aUnoDT.Year, aUnoDT.Month, aUnoDT.Day,
 aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds,
-dDate ) )
+false, dDate ) )
 {
 pVal->PutDate( dDate );
 }
@@ -2021,7 +2021,7 @@ RTLFUNC(CDateFromUnoDateTime)
 SbxBase::SetError( ERRCODE_SBX_CONVERSION );
 }
 
-// Function to convert date to ISO 8601 date format
+// Function to convert date to ISO 8601 date format MMDD
 RTLFUNC(CDateToIso)
 {
 (void)pBasic;
@@ -2031,11 +2031,13 @@ RTLFUNC(CDateToIso)
 {
 double aDate = rPar.Get(1)->GetDate();
 
+// Date may actually even be -YMMDD
 char Buffer[11];
-snprintf( Buffer, sizeof( Buffer ), "%04d%02d%02d",
-implGetDateYear( aDate ),
-implGetDateMonth( aDate ),
-implGetDateDay( aDate ) );
+sal_Int16 nYear = implGetDateYear( aDate );
+snprintf( Buffer, sizeof( Buffer ), (nYear < 0 ? "%05d%02d%02d" : 
"%04d

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

[Andrea Gelmini]

 sw/source/core/layout/atrfrm.cxx |1 -
 sw/source/uibase/dbui/dbtree.cxx |1 -
 unotools/source/config/bootstrap.cxx |3 ---
 3 files changed, 5 deletions(-)

New commits:
commit d2007136587a8722d0e7045828bca6a6d82fd244
Author: Andrea Gelmini 
Date:   Mon May 1 14:51:20 2017 +0200

Removed duplicated include

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

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index c6521ae769f3..412d3a775fe1 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -78,7 +78,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #ifndef NDEBUG
 #include 
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 3e2c0994de8e..b54f58a8b1f0 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -43,7 +43,6 @@
 #include 
 #include 
 #include "bitmaps.hlst"
-#include "bitmaps.hlst"
 
 #include 
 
diff --git a/unotools/source/config/bootstrap.cxx 
b/unotools/source/config/bootstrap.cxx
index 50bfa18fb5ae..f74185572544 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -35,9 +35,6 @@
 #include 
 #include 
 
-#include 
-#include 
-
 // #define this to true, if remembering defaults is not supported properly
 #define RTL_BOOTSTRAP_DEFAULTS_BROKEN true
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - cui/source cui/uiconfig officecfg/registry

[Tor Lillqvist]

 cui/source/inc/cuioptgenrl.hxx   |1 
 cui/source/options/optgenrl.cxx  |  104 +++
 cui/uiconfig/ui/optuserpage.ui   |  204 ++-
 officecfg/registry/schema/org/openoffice/UserProfile.xcs |8 
 4 files changed, 249 insertions(+), 68 deletions(-)

New commits:
commit dc19bd9224850e8dd8ca873bc86a7e7945f95b08
Author: Tor Lillqvist 
Date:   Fri Apr 28 14:07:56 2017 +0300

tdf#105841: Avoid REGRESSION!!!

Let's reinstate the name charade instead. Pitäkää tunkkinne.

This reverts commit 5941496601600269296dde3e4ff8b615a8bb45ca.

This reverts commit db231633af4667e24281e0be69ab63ad3081fdc3.

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

diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 5f1065ada287..0c56b6cdcde6 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -47,6 +47,7 @@ private:
 struct Field;
 std::vector > vFields;
 // "name" fields
+unsigned nNameRow;
 unsigned nShortNameField;
 
 DECL_LINK( ModifyHdl_Impl, Edit&, void );
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 385f5805b462..a830fa1d1dad 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -41,6 +41,8 @@ enum RowType
 {
 Row_Company,
 Row_Name,
+Row_Name_Russian,
+Row_Name_Eastern,
 Row_Street,
 Row_Street_Russian,
 Row_City,
@@ -58,6 +60,7 @@ namespace Lang
 {
 unsigned const Others = 1;
 unsigned const Russian = 2;
+unsigned const Eastern = 4;
 unsigned const US = 8;
 unsigned const All = static_cast(-1);
 }
@@ -77,7 +80,9 @@ struct
 const vRowInfo[] =
 {
 { "companyft",   Lang::All },
-{ "nameft",  Lang::All },
+{ "nameft",  Lang::All & ~Lang::Russian & ~Lang::Eastern },
+{ "rusnameft",   Lang::Russian },
+{ "eastnameft",  Lang::Eastern },
 { "streetft",Lang::All & ~Lang::Russian },
 { "russtreetft", Lang::Russian },
 { "icityft", Lang::All & ~Lang::US },
@@ -108,8 +113,18 @@ const vFieldInfo[] =
 // Company
 { Row_Company, "company", UserOptToken::Company, EditPosition::COMPANY },
 // Name
+{ Row_Name, "firstname", UserOptToken::FirstName, EditPosition::FIRSTNAME 
},
 { Row_Name, "lastname", UserOptToken::LastName, EditPosition::LASTNAME  },
 { Row_Name, "shortname", UserOptToken::ID, EditPosition::SHORTNAME },
+// Name (russian)
+{ Row_Name_Russian, "ruslastname", UserOptToken::LastName, 
EditPosition::LASTNAME  },
+{ Row_Name_Russian, "rusfirstname", UserOptToken::FirstName, 
EditPosition::FIRSTNAME },
+{ Row_Name_Russian, "rusfathersname", UserOptToken::FathersName, 
EditPosition::UNKNOWN },
+{ Row_Name_Russian, "russhortname", UserOptToken::ID, 
EditPosition::SHORTNAME },
+// Name (eastern: reversed name ord
+{ Row_Name_Eastern, "eastlastname", UserOptToken::LastName, 
EditPosition::LASTNAME  },
+{ Row_Name_Eastern, "eastfirstname", UserOptToken::FirstName, 
EditPosition::FIRSTNAME },
+{ Row_Name_Eastern, "eastshortname", UserOptToken::ID, 
EditPosition::SHORTNAME },
 // Street
 { Row_Street, "street", UserOptToken::Street, EditPosition::STREET },
 // Street (russian)
@@ -211,7 +226,7 @@ void SvxGeneralTabPage::InitControls ()
 {
 // which language bit do we use? (see Lang and vRowInfo[] above)
 unsigned LangBit;
-switch (Application::GetSettings().GetUILanguageTag().getLanguageType())
+switch (LanguageType const eLang = 
Application::GetSettings().GetUILanguageTag().getLanguageType())
 {
 case LANGUAGE_ENGLISH_US:
 LangBit = Lang::US;
@@ -220,7 +235,10 @@ void SvxGeneralTabPage::InitControls ()
 LangBit = Lang::Russian;
 break;
 default:
-LangBit = Lang::Others;
+if (MsLangId::isFamilyNameFirst(eLang))
+LangBit = Lang::Eastern;
+else
+LangBit = Lang::Others;
 break;
 }
 
@@ -251,6 +269,7 @@ void SvxGeneralTabPage::InitControls ()
 // "short name" field?
 if (vFieldInfo[iField].nUserOptionsId == UserOptToken::ID)
 {
+nNameRow = vRows.size() - 1;
 nShortNameField = vFields.size() - 1;
 }
 }
@@ -263,7 +282,7 @@ void SvxGeneralTabPage::SetLinks ()
 {
 // link for updating the initials
 Link aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
-Row& rNameRow = *vRows[Row_Name];
+Row& rNameRow = *vRows[nNameRow];
 for (unsigned i = rNameRow.nFirstField; i != rNameRow.nLastField - 1; ++i)
 vFields[i]->pEdit->SetModifyHdl(aLink);
 }
@@ -316,22 +335,36 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet

[Libreoffice-commits] core.git: include/oox

[Stephan Bergmann]

 include/oox/export/utils.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 7d0680d5d5e164246066077637921297006b37ba
Author: Stephan Bergmann 
Date:   Tue May 2 15:37:23 2017 +0200

No compelling reason for an unnamed namespace in an include file here

Change-Id: Ib5660bde8108808a24c3863952bf6e0dfffaf288

diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 50e488ec2d6e..a66941f9dc07 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -24,10 +24,8 @@
 #include 
 #include 
 
-namespace {
 inline OString I32S_(sal_Int32 x) { return OString::number(x); }
 inline OString I64S_(sal_Int64 x) { return OString::number(x); }
-}
 #define I32S(x) I32S_(x).getStr()
 #define I64S(x) I64S_(x).getStr()
 #define IS(x) OString::number( x ).getStr()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/vcl/errinf.hxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 98b21691f4991899eb33249183a5ce2be83a8a26
Author: Stephan Bergmann 
Date:   Tue May 2 15:36:38 2017 +0200

ODR violation

Change-Id: Ic442d59c3066b7de8280d5719dd4da806b7a8092

diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index b4bd6db323b9..c55011dd0b5d 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -42,9 +42,7 @@ class DynamicErrorInfo;
 class ImplDynamicErrorInfo;
 enum class DialogMask;
 
-namespace {
-  typedef void (* DisplayFnPtr)();
-}
+typedef void (* DisplayFnPtr)();
 
 typedef DialogMask WindowDisplayErrorFunc(
 vcl::Window*, DialogMask eMask, const OUString &rErr, const OUString 
&rAction);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/checkconfigmacros.cxx |   12 ++--
 compilerplugins/clang/oslendian.cxx |6 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 4f6563b50856899eb52648a4d062f5df8d0491ce
Author: Stephan Bergmann 
Date:   Tue May 2 15:33:05 2017 +0200

Adapt to Clang 5 change of PPCallbacks::MacroUndefined signature

...since 
"PPCallbacks::MacroUndefined, change signature and add test."

Change-Id: I6a420dc4ca33607fef1356e8869cedee87192e93

diff --git a/compilerplugins/clang/checkconfigmacros.cxx 
b/compilerplugins/clang/checkconfigmacros.cxx
index 855755999a70..d35008c70c20 100644
--- a/compilerplugins/clang/checkconfigmacros.cxx
+++ b/compilerplugins/clang/checkconfigmacros.cxx
@@ -37,7 +37,11 @@ class CheckConfigMacros
 explicit CheckConfigMacros( const InstantiationData& data );
 virtual void run() override;
 virtual void MacroDefined( const Token& macroToken, const 
MacroDirective* info ) override;
-virtual void MacroUndefined( const Token& macroToken, 
compat::MacroDefinitionParam ) override;
+virtual void MacroUndefined( const Token& macroToken, 
compat::MacroDefinitionParam
+#if CLANG_VERSION >= 5
+, MacroDirective const *
+#endif
+) override;
 virtual void Ifdef( SourceLocation location, const Token& macroToken, 
compat::MacroDefinitionParam ) override;
 virtual void Ifndef( SourceLocation location, const Token& macroToken, 
compat::MacroDefinitionParam ) override;
 virtual void Defined( const Token& macroToken, 
compat::MacroDefinitionParam, SourceRange Range ) override;
@@ -71,7 +75,11 @@ void CheckConfigMacros::MacroDefined( const Token& 
macroToken, const MacroDirect
 }
 }
 
-void CheckConfigMacros::MacroUndefined( const Token& macroToken, 
compat::MacroDefinitionParam )
+void CheckConfigMacros::MacroUndefined( const Token& macroToken, 
compat::MacroDefinitionParam
+#if CLANG_VERSION >= 5
+, MacroDirective const *
+#endif
+)
 {
 configMacros.erase( macroToken.getIdentifierInfo()->getName());
 }
diff --git a/compilerplugins/clang/oslendian.cxx 
b/compilerplugins/clang/oslendian.cxx
index 705a7bcc987a..ce71c9cf39e1 100644
--- a/compilerplugins/clang/oslendian.cxx
+++ b/compilerplugins/clang/oslendian.cxx
@@ -59,7 +59,11 @@ private:
 }
 
 void MacroUndefined(
-Token const & MacroNameTok, compat::MacroDefinitionParam) override
+Token const & MacroNameTok, compat::MacroDefinitionParam
+#if CLANG_VERSION >= 5
+, MacroDirective const *
+#endif
+) override
 {
 auto id = MacroNameTok.getIdentifierInfo()->getName();
 if (id == "OSL_BIGENDIAN" || id == "OSL_LITENDIAN") {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gen-boost-headers external/boost

[Stephan Bergmann]

 bin/gen-boost-headers  |1 +
 external/boost/include/boost/algorithm/string.hpp  |1 +
 external/boost/include/boost/algorithm/string/case_conv.hpp|1 +
 external/boost/include/boost/algorithm/string/classification.hpp   |1 +
 external/boost/include/boost/algorithm/string/predicate.hpp|1 +
 external/boost/include/boost/algorithm/string/split.hpp|1 +
 external/boost/include/boost/any.hpp   |1 +
 external/boost/include/boost/archive/iterators/base64_from_binary.hpp  |1 +
 external/boost/include/boost/archive/iterators/binary_from_base64.hpp  |1 +
 external/boost/include/boost/archive/iterators/remove_whitespace.hpp   |1 +
 external/boost/include/boost/archive/iterators/transform_width.hpp |1 +
 external/boost/include/boost/asio.hpp  |1 +
 external/boost/include/boost/assign.hpp|1 +
 external/boost/include/boost/bind.hpp  |1 +
 external/boost/include/boost/cast.hpp  |1 +
 external/boost/include/boost/circular_buffer.hpp   |1 +
 external/boost/include/boost/config.hpp|1 +
 external/boost/include/boost/container/deque.hpp   |1 +
 external/boost/include/boost/cstdint.hpp   |1 +
 external/boost/include/boost/current_function.hpp  |1 +
 external/boost/include/boost/date_time.hpp |1 +
 external/boost/include/boost/date_time/posix_time/posix_time.hpp   |1 +
 external/boost/include/boost/enable_shared_from_this.hpp   |1 +
 external/boost/include/boost/filesystem.hpp|1 +
 external/boost/include/boost/filesystem/path.hpp   |1 +
 external/boost/include/boost/foreach.hpp   |1 +
 external/boost/include/boost/format.hpp|1 +
 external/boost/include/boost/function.hpp  |1 +
 external/boost/include/boost/functional/hash.hpp   |1 +
 external/boost/include/boost/fusion/adapted/std_pair.hpp   |1 +
 external/boost/include/boost/fusion/include/adapt_struct.hpp   |1 +
 external/boost/include/boost/intrusive/circular_list_algorithms.hpp|1 +
 external/boost/include/boost/intrusive_ptr.hpp |1 +
 external/boost/include/boost/io/ios_state.hpp  |1 +
 external/boost/include/boost/iostreams/device/file_descriptor.hpp  |1 +
 external/boost/include/boost/iostreams/filter/gzip.hpp |1 +
 external/boost/include/boost/iostreams/filtering_stream.hpp|1 +
 external/boost/include/boost/iterator/iterator_facade.hpp  |1 +
 external/boost/include/boost/lexical_cast.hpp  |1 +
 external/boost/include/boost/locale.hpp|1 +
 external/boost/include/boost/locale/gnu_gettext.hpp|1 +
 external/boost/include/boost/logic/tribool.hpp |1 +
 external/boost/include/boost/make_shared.hpp   |1 +
 external/boost/include/boost/math/constants/constants.hpp  |1 +
 external/boost/include/boost/math/special_functions/expm1.hpp  |1 +
 external/boost/include/boost/math/special_functions/log1p.hpp  |1 +
 external/boost/include/boost/math/special_functions/sinc.hpp   |1 +
 external/boost/include/boost/multi_array.hpp   |1 +
 external/boost/include/boost/multi_index/composite_key.hpp |1 +
 external/boost/include/boost/multi_index/identity.hpp  |1 +
 external/boost/include/boost/multi_index/mem_fun.hpp   |1 +
 external/boost/include/boost/multi_index/ordered_index.hpp |1 +
 external/boost/include/boost/multi_index/random_access_index.hpp   |1 +
 external/boost/include/boost/multi_index_container.hpp |1 +
 external/boost/include/boost/noncopyable.hpp   |1 +
 external/boost/include/boost/none.hpp  |1 +
 external/boost/include/boost/numeric/conversion/cast.hpp   |1 +
 external/boost/include/boost/operators.hpp |1 +
 external/boost/include/boost/optional.hpp  |1 +
 external/boost/include/boost/optional/optional.hpp |1 +
 external/boost/include/boost/preprocessor/stringize.hpp|1 +
 external/boost/include/boost/program_options.hpp 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkinst.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit a090322721222c98f7ccd194eac84e5a76579f8e
Author: Caolán McNamara 
Date:   Tue May 2 12:13:41 2017 +0100

Resolves: tdf#99467 pasting text from java apps to gtk3 gives bad results

Change-Id: Ib2625c900def20baa470f0a15e4f72a3f763099e
(cherry picked from commit c881756fcfdc1fa63ff534bf4538d551b2139515)
Reviewed-on: https://gerrit.libreoffice.org/37147
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7148882c1796..9190ee63ca13 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -103,6 +103,10 @@ std::vector 
GtkTransferable::getTransferDataFlavo
 const char* pFinalName = pName;
 css::datatransfer::DataFlavor aFlavor;
 
+// omit text/plain;charset=unicode since it is not well defined
+if (rtl_str_compare(pName, "text/plain;charset=unicode") == 0)
+continue;
+
 for (size_t j = 0; j < SAL_N_ELEMENTS(aConversionTab); ++j)
 {
 if (rtl_str_compare(pName, aConversionTab[j].pNativeType) == 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/inc

[Michael Stahl]

 sw/inc/swevent.hxx |   39 +++
 1 file changed, 35 insertions(+), 4 deletions(-)

New commits:
commit 4601cae591ee83ec83d707d7b82f5d61aa979c71
Author: Michael Stahl 
Date:   Fri Apr 28 18:54:27 2017 +0200

tdf#107494 sw: fix crash in SwCallMouseEvent when deleting header

The problem is that SwCallMouseEvent::PTR.pFormat is not cleared
when the format is destroyed; instead SwDoc::CallEvent() checks via
SwFrameFormats::Contains() that the format is still alive,
which uses dynamic_cast on the deleted format.

(presumably regression from 0f98299f7aa44bbb55c1bfeddca7799f727d14b0)

Change-Id: I0d155c162d75b5687b58329a2a862ad57a4eb72e
(cherry picked from commit 32403675bf9d2d0380956f9a82da71593edbb53c)
Reviewed-on: https://gerrit.libreoffice.org/37084
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 567928739b1d..df4478c5de84 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -22,6 +22,8 @@
 
 #include 
 #include 
+#include 
+#include 
 
 #define SW_EVENT_OBJECT_SELECT( EVENT_APP_START + 0 )
 #define SW_EVENT_START_INS_GLOSSARY   ( EVENT_APP_START + 1 )
@@ -68,6 +70,7 @@ enum SwCallEventObjectType
 // Structure for the exchange between UI/CORE.
 
 struct SwCallMouseEvent
+: public SwClient
 {
 SwCallEventObjectType eType;
 union
@@ -90,14 +93,21 @@ struct SwCallMouseEvent
 : eType( EVENT_OBJECT_NONE )
 { PTR.pFormat = nullptr; PTR.IMAP.pIMapObj = nullptr; }
 
+SwCallMouseEvent(SwCallMouseEvent const& rOther)
+: SwClient(rOther.GetRegisteredInNonConst())
+, eType(rOther.eType)
+{
+memcpy(&PTR, &rOther.PTR, sizeof(PTR));
+}
+
 void Set( SwCallEventObjectType eTyp, const SwFrameFormat* pFormat )
-{ eType = eTyp; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = nullptr; }
+{ Clear(); eType = eTyp; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = 
nullptr; assert(pFormat); const_cast(pFormat)->Add(this); }
 
 void Set( const SwFrameFormat* pFormat, const IMapObject* pIMapObj )
-{ eType = EVENT_OBJECT_IMAGEMAP; PTR.pFormat = pFormat; 
PTR.IMAP.pIMapObj = pIMapObj; }
+{ Clear(); eType = EVENT_OBJECT_IMAGEMAP; PTR.pFormat = pFormat; 
PTR.IMAP.pIMapObj = pIMapObj; assert(pFormat); 
const_cast(pFormat)->Add(this); }
 
 void Set( const SwFormatINetFormat* pINetAttr )
-{ eType = EVENT_OBJECT_INETATTR; PTR.pINetAttr = pINetAttr; 
PTR.IMAP.pIMapObj = nullptr; }
+{ Clear(); eType = EVENT_OBJECT_INETATTR; PTR.pINetAttr = pINetAttr; 
PTR.IMAP.pIMapObj = nullptr; }
 
 bool operator==( const SwCallMouseEvent& rEvent ) const
 {
@@ -109,9 +119,30 @@ struct SwCallMouseEvent
 {   return !( *this == rEvent );}
 
 void Clear()
-{ eType = EVENT_OBJECT_NONE; PTR.pFormat = nullptr; PTR.IMAP.pIMapObj 
= nullptr; }
+{
+if (EVENT_OBJECT_IMAGE == eType || EVENT_OBJECT_URLITEM == eType 
|| EVENT_OBJECT_IMAGEMAP == eType)
+{
+// note: pFormat is not necessarily the same as
+// GetRegisteredIn() here; see ~SwFormat()
+assert(PTR.pFormat);
+GetRegisteredInNonConst()->Remove(this);
+}
+eType = EVENT_OBJECT_NONE; PTR.pFormat = nullptr; 
PTR.IMAP.pIMapObj = nullptr;
+}
 
 bool HasEvent() const { return EVENT_OBJECT_NONE != eType; }
+
+virtual void Modify(SfxPoolItem const*const pOldValue, SfxPoolItem 
const*const pNewValue) override
+{
+assert(EVENT_OBJECT_IMAGE == eType || EVENT_OBJECT_URLITEM == eType || 
EVENT_OBJECT_IMAGEMAP == eType);
+SwClient::Modify(pOldValue, pNewValue);
+if (!GetRegisteredIn() ||
+(RES_FMT_CHG == pOldValue->Which()
+ && static_cast(pOldValue)->pChangedFormat == 
PTR.pFormat))
+{
+Clear();
+}
+}
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/commontools/parameters.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b78cabc850e0a71873714c892c46c9edb25fd364
Author: Lionel Elie Mamane 
Date:   Fri Apr 28 17:19:44 2017 +0200

tdf#107457 don't quote columns referred by expression (not by name)

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

diff --git a/connectivity/source/commontools/parameters.cxx 
b/connectivity/source/commontools/parameters.cxx
index 32c2cc0a520a..fa57c5750424 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -224,7 +224,12 @@ namespace dbtools
 {
 OUString colName;
 xDetailField->getPropertyValue("RealName") >>= colName;
-sFilter += quoteName( m_sIdentifierQuoteString, colName ) + " = :";
+sal_Bool isFunction(false);
+xDetailField->getPropertyValue("Function") >>= isFunction;
+if (isFunction)
+sFilter += colName;
+else
+sFilter += quoteName( m_sIdentifierQuoteString, colName );
 }
 
 // generate a parameter name which is not already used
@@ -235,7 +240,7 @@ namespace dbtools
 o_rNewParamName += "_";
 }
 
-return sFilter += o_rNewParamName;
+return sFilter += " =:" + o_rNewParamName;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti]

 loleaflet/src/layer/tile/TileLayer.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7aeb66be8853bd347e623687fd6c699fa0268cc3
Author: Marco Cecchetti 
Date:   Wed Apr 26 11:38:27 2017 +0200

loleaflet: Calc, Impress: should not show Reply entry in annotation menu

There is no `reply` support in Desktop for Calc and Impress comments.

Change-Id: I827ae99148cf8f65446e23e13e2588ce0ced788e
Reviewed-on: https://gerrit.libreoffice.org/36979
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index ee9408f8..0d2bb93a 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -184,8 +184,8 @@ L.TileLayer = L.GridLayer.extend({

that.onAnnotationModify.call(that, options.$trigger.get(0).annotation);
}
},
-   reply: {
-   name:_('Reply'),
+   reply: (this._docType !== 'text') ? undefined : 
{
+   name: _('Reply'),
callback: function (key, options) {

that.onAnnotationReply.call(that, options.$trigger.get(0).annotation);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - basic/source

[Eike Rathke]

 basic/source/runtime/methods.cxx |   57 ---
 1 file changed, 47 insertions(+), 10 deletions(-)

New commits:
commit 039705ec1a215ff83ea707e5fc642d0e63f6b48d
Author: Eike Rathke 
Date:   Fri Apr 28 15:37:17 2017 +0200

Resolves: tdf#106956 CDateFromIso accept also -MM-DD form

 This is a combination of 2 commits.

Resolves: tdf#106956 CDateFromIso accept also -MM-DD form

Previous implementation was over-simplified and accepted all sort of 
malformed
input to yield some arbitrary date, including longer and shorter and not
strictly numeric strings.

Change-Id: I2158429aeff7431f5ec5a1c9125018a5455a4730
(cherry picked from commit cdcbdf88b7f74184b532925eaf140dbf65a2cd21)

Use invalid parameter error for malformed input, tdf#106956 follow-up

... instead of invalid procedure call.

Change-Id: I812f4c7041db9a116e65a24afb85164b4dd498b6
(cherry picked from commit d6fd4252bf248d2872c713a1d83817a2dc88a9d2)
Reviewed-on: https://gerrit.libreoffice.org/37074
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 4ac3935885c7..e3ba6bb64fde 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2051,7 +2051,7 @@ RTLFUNC(CDateToIso)
 }
 }
 
-// Function to convert date from ISO 8601 date format
+// Function to convert date from ISO 8601 date format MMDD or -MM-DD
 RTLFUNC(CDateFromIso)
 {
 (void)pBasic;
@@ -2059,18 +2059,55 @@ RTLFUNC(CDateFromIso)
 
 if ( rPar.Count() == 2 )
 {
-OUString aStr = rPar.Get(1)->GetOUString();
-const sal_Int32 iMonthStart = aStr.getLength() - 4;
-OUString aYearStr  = aStr.copy( 0, iMonthStart );
-OUString aMonthStr = aStr.copy( iMonthStart, 2 );
-OUString aDayStr   = aStr.copy( iMonthStart+2, 2 );
-
-double dDate;
-if( implDateSerial( (sal_Int16)aYearStr.toInt32(),
-(sal_Int16)aMonthStr.toInt32(), (sal_Int16)aDayStr.toInt32(), 
dDate ) )
+do
 {
+OUString aStr = rPar.Get(1)->GetOUString();
+const sal_Int32 nLen = aStr.getLength();
+if (nLen != 8 && nLen != 10)
+break;
+
+OUString aYearStr, aMonthStr, aDayStr;
+if (nLen == 8)
+{
+// MMDD
+if (!comphelper::string::isdigitAsciiString(aStr))
+break;
+
+aYearStr  = aStr.copy( 0, 4 );
+aMonthStr = aStr.copy( 4, 2 );
+aDayStr   = aStr.copy( 6, 2 );
+}
+else
+{
+// -MM-DD
+const sal_Int32 nSep1 = aStr.indexOf('-');
+if (nSep1 != 4)
+break;
+const sal_Int32 nSep2 = aStr.indexOf('-', nSep1+1);
+if (nSep2 != 7)
+break;
+
+aYearStr  = aStr.copy( 0, 4 );
+aMonthStr = aStr.copy( 5, 2 );
+aDayStr   = aStr.copy( 8, 2 );
+if (!comphelper::string::isdigitAsciiString(aYearStr) ||
+!comphelper::string::isdigitAsciiString(aMonthStr) ||
+!comphelper::string::isdigitAsciiString(aDayStr))
+break;
+}
+
+double dDate;
+if (!implDateSerial( (sal_Int16)aYearStr.toInt32(),
+(sal_Int16)aMonthStr.toInt32(), 
(sal_Int16)aDayStr.toInt32(), dDate ))
+break;
+
 rPar.Get(0)->PutDate( dDate );
+
+return;
 }
+while (false);
+
+SbxBase::SetError( ERRCODE_SBX_BAD_PARAMETER );
 }
 else
 {
___
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-2-1' - wsd/LOOLWSD.cpp wsd/TraceFile.hpp

[Ashod Nakashian]

 wsd/LOOLWSD.cpp   |1 -
 wsd/TraceFile.hpp |7 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 16d6c1bc8f69c6f91322907b8777ccdfc21e1652
Author: Ashod Nakashian 
Date:   Mon May 1 15:33:37 2017 -0400

wsd: trace file cleanups

Change-Id: I72ccbb9f01d4e27b59d88cca9da05c1472008825
Reviewed-on: https://gerrit.libreoffice.org/37130
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
(cherry picked from commit c31bf89976a14d5dbfb8c4bd012f959284c9344b)
Reviewed-on: https://gerrit.libreoffice.org/37151
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b4db3636..c6e009c8 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -787,7 +787,6 @@ void LOOLWSD::initialize(Application& self)
 const auto compress = getConfigValue(conf, 
"trace.path[@compress]", false);
 const auto takeSnapshot = getConfigValue(conf, 
"trace.path[@snapshot]", false);
 TraceDumper.reset(new TraceFileWriter(path, recordOutgoing, compress, 
takeSnapshot, filters));
-LOG_INF("Command trace dumping enabled to file: " << path);
 }
 
 StorageBase::initialize();
diff --git a/wsd/TraceFile.hpp b/wsd/TraceFile.hpp
index 23d46763..d19c0103 100644
--- a/wsd/TraceFile.hpp
+++ b/wsd/TraceFile.hpp
@@ -35,7 +35,7 @@ public:
 Invalid = 0,
 Incoming = '>',
 Outgoing = '<',
-Event = '-'
+Event = '~'
 };
 
 TraceFileRecord() :
@@ -115,7 +115,7 @@ public:
 // Create a snapshot file.
 const Poco::Path origPath(localPath);
 std::string filename = origPath.getBaseName();
-filename += '_' + 
Poco::DateTimeFormatter::format(Poco::DateTime(), "%Y%m%d_%H~%M~%S");
+filename += '_' + 
Poco::DateTimeFormatter::format(Poco::DateTime(), "%Y%m%d_%H-%M-%S");
 filename += '.' + origPath.getExtension();
 snapshot = Poco::Path(_path, filename).toString();
 
@@ -273,8 +273,9 @@ private:
 }
 
 std::string res = path.substr(0, pos);
-res += Poco::DateTimeFormatter::format(Poco::DateTime(), 
"%Y%m%d_%H~%M~%S");
+res += Poco::DateTimeFormatter::format(Poco::DateTime(), 
"%Y%m%d_%H-%M-%S");
 res += path.substr(pos + 1);
+LOG_INF("Command trace dumping enabled to file: " << res);
 return res;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

[Michael Stahl]

 sw/source/uibase/wrtsh/wrtsh1.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit e07c2c3861f47946ed72fc9b67aafeaa8598468d
Author: Michael Stahl 
Date:   Fri Apr 28 13:26:01 2017 +0200

tdf#107474 sw: fix crash when deleting header with active SdrObject

The problem is that the SdrView's text edit mode remains active when
the header is deleted, which deletes the active SdrObject that is
anchored in the header.

Then the next call to SdrBeginTextEdit() will call SdrEndTextEdit()
but the mxTextEditObj WeakReference is null then and so the cleanup
code that resets the SdrOutliner's UndoManager is not called,
but then the SdrOutliner is deleted.

What's really horrible about this is that while text editing is active,
both SdrObjEditView and ImpEditEngine consider themselves the
exclusive owner of SwDoc's UndoManager.

(regression from 12a4200e8ff7f045efcc7e9d15a24b15b248c437
 and d7b7c9fdfe63deec26c420efc3ff1fd73c21bb27)

Change-Id: I17c5165a03d2de1eaba8a335dfbfded56573f8a2
(cherry picked from commit 7f207fca577ef820be2aec0a442df7e8ab6e14a6)
Reviewed-on: https://gerrit.libreoffice.org/37069
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 7695865d8e16..1f8ae7ba9023 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1765,6 +1765,11 @@ void SwWrtShell::SetReadonlyOption(bool bSet)
 void SwWrtShell::ChangeHeaderOrFooter(
 const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning)
 {
+SdrView *const pSdrView = GetDrawView();
+if (pSdrView && pSdrView->IsTextEdit())
+{   // tdf#107474 deleting header may delete active drawing object
+pSdrView->SdrEndTextEdit(true);
+}
 addCurrentPosition();
 StartAllAction();
 StartUndo( UNDO_HEADER_FOOTER ); // #i7983#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Moving away from tools module

[Stephan Bergmann]

On 05/01/2017 01:05 AM, Chris Sherlock wrote:

On 28 Apr 2017, at 8:22 pm, Michael Stahl  wrote:

i really don't see the point of this.  the tools module is primarily a toxic 
waste dump, and distributing the toxic waste across all the other
modules does not look like an improvement to me.  better to remove the toxic 
waste from our git repo and dump it in some landfill where nobody lives, or at 
least nobody that we know :)


That does seem to be the consensus :-) however, at least one of the classes is 
used extensively through our codebase, and I'm not sure what would replace 
it.., I'm speaking of SvStream.

Whilst it's not useless or deprecated, I wonder if it was placed in tools 
because nobody was quite sure where else to put it?


I think you're looking at it from the wrong angle.  Long ago, tools used 
to be the natural choice where to put generic low-level stuff (it being 
the lowest module in the hierarchy).  That's how many of the tools 
include files came about.


Things have changed since them.  Some parts of tools don't make much 
sense any more, some parts are known to be so bad that they shouldn't be 
used any more, some parts have been superseded by facilities elsewhere 
(where that "elsewhere" is often just due to historical reasons, too), 
etc.  And some parts (like SvStream) are likely to stay with us for 
quite some time still.


So while it makes sense to clean away parts that are no longer needed 
and have good replacements elsewhere, it IMO makes no sense to e.g. move 
existing functionality from tools to o3tl.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

[Thorsten Behrens]

 sw/source/core/undo/unattr.cxx |   22 +++---
 sw/source/core/undo/unfmco.cxx |2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit e7068a7d9b945e0c6d4965445b6d951038e9c987
Author: Thorsten Behrens 
Date:   Thu Apr 27 18:07:54 2017 +0200

tdf#88555: band-aid fix, using GetPos/find instead of Contains

to find out whether given format still exists.

GetPos was replaced by Contains on multiple places in commit
98436c4b53639d86f261ac630c46d32e3c7b8e28 but sometimes after
series of undos/redos, vtable of some items in those format arrays
becomes corrupt and it makes dynamic_cast (as used by Contains)
fail and Writer falls flat on its face.

This is just a workaround, no idea about the root cause.

Change-Id: I1e02fd932dbac741687c15900841b9b7c778e2d4
Reviewed-on: https://gerrit.libreoffice.org/37038
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 1df637bde32c484b681ecdfebf56fdca03db7fc1)
Reviewed-on: https://gerrit.libreoffice.org/37043
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 4641aa08cd39..58087e2c0aa0 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -200,21 +200,21 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc )
 {
 // search for the Format in the Document; if it does not exist any more,
 // the attribute is not restored!
-bool bFound = false;
+size_t nPos = SIZE_MAX;
 switch ( m_nFormatWhich )
 {
 case RES_TXTFMTCOLL:
 case RES_CONDTXTFMTCOLL:
-bFound = pDoc->GetTextFormatColls()->Contains( m_pFormat );
+nPos = pDoc->GetTextFormatColls()->GetPos( m_pFormat );
 break;
 
 case RES_GRFFMTCOLL:
-bFound = pDoc->GetGrfFormatColls()->Contains(
+nPos = pDoc->GetGrfFormatColls()->GetPos(
 static_cast(m_pFormat) );
 break;
 
 case RES_CHRFMT:
-bFound = pDoc->GetCharFormats()->Contains( m_pFormat );
+nPos = pDoc->GetCharFormats()->GetPos( m_pFormat );
 break;
 
 case RES_FRMFMT:
@@ -225,14 +225,14 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc )
 {
 m_pFormat =
 
static_cast(pNd)->GetTable().GetFrameFormat();
-bFound = true;
+nPos = 0;
 break;
 }
 else if ( pNd->IsSectionNode() )
 {
 m_pFormat =
 
static_cast(pNd)->GetSection().GetFormat();
-bFound = true;
+nPos = 0;
 break;
 }
 else if ( pNd->IsStartNode() && (SwTableBoxStartNode ==
@@ -246,7 +246,7 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc )
 if ( pBox )
 {
 m_pFormat = pBox->GetFrameFormat();
-bFound = true;
+nPos = 0;
 break;
 }
 }
@@ -255,13 +255,13 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc )
 SAL_FALLTHROUGH;
 case RES_DRAWFRMFMT:
 case RES_FLYFRMFMT:
-if (pDoc->GetSpzFrameFormats()->Contains( m_pFormat )
-|| pDoc->GetFrameFormats()->Contains( m_pFormat ))
-bFound = true;
+if ( ( pDoc->GetSpzFrameFormats()->find( 
static_cast(m_pFormat) ) != pDoc->GetSpzFrameFormats()->end() )
+|| ( pDoc->GetFrameFormats()->find( 
static_cast( m_pFormat ) ) != pDoc->GetFrameFormats()->end() ) )
+nPos = 0;
 break;
 }
 
-if ( !bFound )
+if ( nPos == SIZE_MAX )
 {
 // Format does not exist; reset
 m_pFormat = nullptr;
diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx
index 5aeaf87e70d5..c473f630ab92 100644
--- a/sw/source/core/undo/unfmco.cxx
+++ b/sw/source/core/undo/unfmco.cxx
@@ -74,7 +74,7 @@ void SwUndoFormatColl::DoSetFormatColl(SwDoc & rDoc, SwPaM & 
rPaM)
 // this array.
 
 // does the format still exist?
-if( 
rDoc.GetTextFormatColls()->Contains(static_cast(pFormatColl))
 )
+if( SIZE_MAX != 
rDoc.GetTextFormatColls()->GetPos(static_cast(pFormatColl)) )
 {
 rDoc.SetTextFormatColl(rPaM, 
static_cast(pFormatColl), mbReset,
mbResetListAttrs);
___
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-2-1' - wsd/Storage.cpp

[Michael Meeks]

 wsd/Storage.cpp |   26 ++
 1 file changed, 26 insertions(+)

New commits:
commit 9e621dce1c9a47b5ebb4c4946d1f037551c47167
Author: Michael Meeks 
Date:   Thu Apr 27 18:47:35 2017 +0100

Initialize Poco's SSL-ness; the WOPI Storage code still uses it.

Change-Id: I4c4ee7847159abb3de2656244ddec27b3d282f45
Reviewed-on: https://gerrit.libreoffice.org/37039
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-by: Jan Holesovsky 

diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index a125c1d7..f0f525eb 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -31,6 +31,12 @@
 #include 
 #include 
 
+// For residual Poco SSL usage.
+#include 
+#include 
+#include 
+#include 
+
 #include "Auth.hpp"
 #include "Common.hpp"
 #include "Exceptions.hpp"
@@ -98,6 +104,24 @@ void StorageBase::initialize()
 }
 }
 }
+
+#if ENABLE_SSL
+// FIXME: should use our own SSL socket implementation here.
+Poco::Crypto::initializeCrypto();
+Poco::Net::initializeSSL();
+
+// Init client
+Poco::Net::Context::Params sslClientParams;
+
+// TODO: Be more strict and setup SSL key/certs for remove server and us
+sslClientParams.verificationMode = Poco::Net::Context::VERIFY_NONE;
+
+Poco::SharedPtr 
consoleClientHandler = new Poco::Net::KeyConsoleHandler(false);
+Poco::SharedPtr 
invalidClientCertHandler = new Poco::Net::AcceptCertificateHandler(false);
+
+Poco::Net::Context::Ptr sslClientContext = new 
Poco::Net::Context(Poco::Net::Context::CLIENT_USE, sslClientParams);
+Poco::Net::SSLManager::instance().initializeClient(consoleClientHandler, 
invalidClientCertHandler, sslClientContext);
+#endif
 }
 
 bool isLocalhost(const std::string& targetHost)
@@ -283,6 +307,8 @@ namespace {
 inline
 Poco::Net::HTTPClientSession* getHTTPClientSession(const Poco::URI& uri)
 {
+// FIXME: if we're configured for http - we can still use an https:// wopi
+// host surely; of course - the converse is not true / sensible.
 return (LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination())
 ? new Poco::Net::HTTPSClientSession(uri.getHost(), uri.getPort(),
 
Poco::Net::SSLManager::instance().defaultClientContext())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/headless vcl/inc vcl/null vcl/unx

[Caolán McNamara]

 vcl/headless/svpprn.cxx  |2 +-
 vcl/inc/unx/cupsmgr.hxx  |2 +-
 vcl/null/printerinfomanager.cxx  |2 +-
 vcl/unx/generic/plugadapt/salplug.cxx|2 +-
 vcl/unx/generic/print/common_gfx.cxx |2 +-
 vcl/unx/generic/print/genprnpsp.cxx  |2 +-
 vcl/unx/generic/print/genpspgraphics.cxx |2 +-
 vcl/unx/generic/print/printerjob.cxx |2 +-
 vcl/unx/generic/print/prtsetup.hxx   |2 +-
 vcl/unx/generic/printer/jobdata.cxx  |2 +-
 vcl/unx/generic/window/salframe.cxx  |2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit fd04a78d71f17eecae254e025508a57d34c9aa5a
Author: Caolán McNamara 
Date:   Tue May 2 13:33:28 2017 +0100

printerinfomanager.hxx can be moved into vcl

probably was exposed while padmin was still a thing

Change-Id: I9605b7ae0c5bc59aa998580f5a28dc7b527219e9

diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index dfef1239dc0f..09b43a37ae28 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -19,7 +19,7 @@
 
 #include 
 #include 
-#include 
+#include "printerinfomanager.hxx"
 
 #include "jobset.h"
 #include "print.h"
diff --git a/include/vcl/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
similarity index 100%
rename from include/vcl/printerinfomanager.hxx
rename to vcl/inc/printerinfomanager.hxx
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index 2890d5dcffb1..f0dd91171ae2 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
 #define INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
 
-#include 
+#include "printerinfomanager.hxx"
 #include "osl/module.h"
 #include "osl/thread.h"
 #include "osl/mutex.hxx"
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index 4cc7e78f3bb1..6545ffb2a898 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -18,7 +18,7 @@
  */
 
 #include 
-#include 
+#include "printerinfomanager.hxx"
 
 #include "unx/gendata.hxx"
 
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index ce032538044b..65f721730941 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -28,7 +28,7 @@
 #include "unx/gendata.hxx"
 #include "headless/svpinst.hxx"
 #include "unx/desktops.hxx"
-#include 
+#include "printerinfomanager.hxx"
 #include 
 #include 
 
diff --git a/vcl/unx/generic/print/common_gfx.cxx 
b/vcl/unx/generic/print/common_gfx.cxx
index c9be5dde750c..ef1a767e3414 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -28,7 +28,7 @@
 #include "unx/printerjob.hxx"
 #include "unx/fontmanager.hxx"
 #include 
-#include 
+#include "printerinfomanager.hxx"
 
 #include "tools/debug.hxx"
 #include "tools/color.hxx"
diff --git a/vcl/unx/generic/print/genprnpsp.cxx 
b/vcl/unx/generic/print/genprnpsp.cxx
index 43948c8da01e..1feccabbd013 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -45,7 +45,7 @@
 #include 
 #include 
 #include 
-#include 
+#include "printerinfomanager.hxx"
 #include 
 #include "svids.hrc"
 #include "saldatabasic.hxx"
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx 
b/vcl/unx/generic/print/genpspgraphics.cxx
index 85f81cc4454b..ed50638a45b4 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -33,7 +33,7 @@
 #include 
 #include 
 #include 
-#include 
+#include "printerinfomanager.hxx"
 #include 
 #include 
 #include 
diff --git a/vcl/unx/generic/print/printerjob.cxx 
b/vcl/unx/generic/print/printerjob.cxx
index cb1133ac0724..8a0fa92bb3f3 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -30,7 +30,7 @@
 #include "unx/printergfx.hxx"
 #include 
 #include 
-#include 
+#include "printerinfomanager.hxx"
 
 #include "rtl/ustring.hxx"
 #include "rtl/strbuf.hxx"
diff --git a/vcl/unx/generic/print/prtsetup.hxx 
b/vcl/unx/generic/print/prtsetup.hxx
index fa22a4417ab3..f7f7a29fabf2 100644
--- a/vcl/unx/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
@@ -32,7 +32,7 @@
 #include 
 #include 
 #include 
-#include 
+#include "printerinfomanager.hxx"
 
 class RTSPaperPage;
 class RTSDevicePage;
diff --git a/vcl/unx/generic/printer/jobdata.cxx 
b/vcl/unx/generic/printer/jobdata.cxx
index b9359429fd8a..a6e5af0f5dd5 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -19,7 +19,7 @@
 
 #include 
 #include 
-#include 
+#include "printerinfomanager.hxx"
 #include "tools/stream.hxx"
 
 #include 
diff --git a/vcl/unx/generic/window/salframe.cxx 
b/vcl/unx/generic/window/salframe.cxx
index 6a2c8ca1cf0f..4667d4076c7f 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -31,7 +31,7 @@
 #include 
 #include 
 #include 
-#i

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - basic/source

[Eike Rathke]

 basic/source/runtime/methods.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33ec6df9e7f8bf70c1c1c2fe5dd89ba37b57bae2
Author: Eike Rathke 
Date:   Fri Apr 28 22:12:31 2017 +0200

CDateToIso: larger buffer for possible year range

Theoretically tools::Date can hold five digits years and even negative,
though Basic internally accepts only 100<=year<=. Might be that some
date calculations may result in years out of those margins, so at least
don't truncate those.

Change-Id: I3c217cc42476ce1cf8f9046111a1281288dc5bb6
(cherry picked from commit 38d9919432898c114d38022c2eb0d9fa9fea948c)
Reviewed-on: https://gerrit.libreoffice.org/37087
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index d93c95aade98..4ac3935885c7 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2037,7 +2037,7 @@ RTLFUNC(CDateToIso)
 {
 double aDate = rPar.Get(1)->GetDate();
 
-char Buffer[9];
+char Buffer[11];
 snprintf( Buffer, sizeof( Buffer ), "%04d%02d%02d",
 implGetDateYear( aDate ),
 implGetDateMonth( aDate ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Google Summer of Code 2017 - Some help needed

[Caolán McNamara]

On Fri, 2017-04-28 at 12:58 -0300, Till Kamppeter wrote:
> On 04/28/2017 05:59 AM, Caolán McNamara wrote:
> > The main question for me is what format/mechanism is provided by
> > the user of the backend as the print transport

> The backends simply need the PDF to be printed and the key/value-
> pair list of the option settings, nothing more. So integration should
> be easy.

That makes things easier.

> So as the backends will simply take the job in PDF and spreadsheet 
> printing support is too complex to get into external print dialogs,
> let us go the way of making LO's original print dialog ready for the
> backends.
> 
> The dialog will have to look up the available backends and then do

So, I would expect that the actual dialog won't need to be changed at
all. We have a PrinterInfoManager for unix which I think is the best
place to start and try to integrate this. There is one class
CUPSManager that inherits from this for "cups" I suggest adding another
for whatever this is called and there the implementation to get the
list of printers and printer properties can be added following the
existing cups implementation.

> 4. If LO provides some kind of job monitoring, use the backend's
> list jobs functions (does LO do a thing like that?)

I don't think we do, its just fire and forget I think, i.e. we call
cupsPrintFile and hope for the best.

One thing that might turn into a problem is getting the list of
available printers. IIRC for cups we start a thread to collect the list
of printers fairly early in the process and it can get a little
complicated. Nothing too serious to worry about at the start, just keep
it simple and collect freshly the list of printers when requested to
get up and running, but maybe something to consider once basic
functionality is working.

> What I need from you is help in mentoring the student or even
> someone fully mentoring the student (this would be the best). Google
> says that mentoring a student will take around 5 hours/week.
> 
> I also need help where to find the relevant code to modify (ideally
> so that it can make it into Ubuntu 17.10 with Feature Freeze mid-
> August), how to most efficiently test-build (not needing to build the
> whole LO after each little change), coding policy guidelines, how to
> provide patches for upstream inclusion, ...

https://wiki.documentfoundation.org/Development/gerrit Aveek should
follow the setup there to get registered in gerrit and patches can be
submitted there. gerrit builds the patches and typically the various
clang plugins active will flag code policy gotchas. Should really only
need to get libreoffice built fully once, at that point there's
probably no need to keep up to date with head, so once the full thing
is built and modifications are made in vcl, incremental builds of make
vcl.build will be sufficient and the in-tree ./instdir/program/soffice
will "just work"

I won't commit to being a full time mentor, but I can help and be the
LibreOffice contact. So you can put me on CC on anything submitted to
gerrit and I'll help get things bootstrapped and working. I'm on
freenode irc most work days for anything that may arise.

I've outlined the relevant classes above, so I'd suggest, get
libreoffice built once, copy the CUPSManager class and add trying this
new backend before falling back to the cups one, stub out the new
implementations methods and make sure its getting called and fill out
the stubs with the new backend.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - debian/loolwsd.postinst loolwsd.spec.in

[Andras Timar]

 debian/loolwsd.postinst |2 ++
 loolwsd.spec.in |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2f23611e79ce01b6a2d88c96a515d043f3d7e476
Author: Andras Timar 
Date:   Sat Apr 29 20:34:44 2017 +0200

non-world-readable loolwsd.xml in packages

Change-Id: Ibe91699f8d126dd34c1041fcfaaf471974387e47
Reviewed-on: https://gerrit.libreoffice.org/37102
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit f8ae6243dde0c2fdd9bc048020d386de07145bfd)
Reviewed-on: https://gerrit.libreoffice.org/37137
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/debian/loolwsd.postinst b/debian/loolwsd.postinst
index ad4f7ec8..8c640005 100755
--- a/debian/loolwsd.postinst
+++ b/debian/loolwsd.postinst
@@ -10,6 +10,8 @@ case "$1" in
adduser --quiet --system --group --home /opt/lool lool
mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
rm -rf /var/cache/loolwsd/*
+   chown lool: /etc/loolwsd/loolwsd.xml
+   chmod 640 /etc/loowsd/loolwsd.xml
 
# We assume that the LibreOffice to be used is built TDF-style
# and installs in /opt/collaboraoffice5.1, and that /opt/lool is
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index b3dc5ac9..57f2773b 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -120,7 +120,7 @@ tar cf - . | (cd %{buildroot}/usr/share/loolwsd/loleaflet 
&& tar xf -)
 %endif
 
 %config(noreplace) /etc/cron.d/loolwsd.cron
-%config(noreplace) /etc/loolwsd/loolwsd.xml
+%config(noreplace) %attr(640, lool, root) /etc/loolwsd/loolwsd.xml
 %config(noreplace) %attr(400, lool, lool) /etc/loolwsd/key.pem
 %if %{ssl_support} == "YES"
 %config(noreplace) /etc/loolwsd/cert.pem
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 framework/inc/services/layoutmanager.hxx|2 -
 framework/inc/uielement/statusbarmerger.hxx |1 
 framework/inc/uielement/toolbarmerger.hxx   |1 
 framework/inc/xml/statusbardocumenthandler.hxx  |1 
 framework/source/fwe/xml/statusbardocumenthandler.cxx   |3 --
 framework/source/layoutmanager/layoutmanager.cxx|4 +--
 framework/source/layoutmanager/toolbarlayoutmanager.cxx |3 --
 framework/source/layoutmanager/toolbarlayoutmanager.hxx |2 -
 framework/source/services/autorecovery.cxx  |   20 
 framework/source/services/frame.cxx |   18 +-
 framework/source/services/pathsettings.cxx  |   20 +++-
 framework/source/uielement/statusbarmanager.cxx |1 
 framework/source/uielement/statusbarmerger.cxx  |1 
 framework/source/uielement/toolbarmanager.cxx   |1 
 framework/source/uielement/toolbarmerger.cxx|1 
 15 files changed, 32 insertions(+), 47 deletions(-)

New commits:
commit 666403a4b66fa94d2014b4688b2e6a7b085bd2cc
Author: Noel Grandin 
Date:   Tue May 2 10:43:19 2017 +0200

loplugin:checkunusedparams in framework

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

diff --git a/framework/inc/services/layoutmanager.hxx 
b/framework/inc/services/layoutmanager.hxx
index c24455695c13..6b151785eefa 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -209,7 +209,7 @@ namespace framework
 bool implts_resizeContainerWindow( const css::awt::Size& 
rContainerSize, const css::awt::Point& rComponentPos );
 ::Size  implts_getContainerWindowOutputSize();
 
-void implts_setDockingAreaWindowSizes( const css::awt::Rectangle& 
rBorderSpace );
+void implts_setDockingAreaWindowSizes();
 css::awt::Rectangle implts_calcDockingAreaSizes();
 bool implts_doLayout( bool bForceRequestBorderSpace, bool 
bOuterResize );
 void implts_doLayout_notify( bool bOuterResize );
diff --git a/framework/inc/uielement/statusbarmerger.hxx 
b/framework/inc/uielement/statusbarmerger.hxx
index fc296d512be8..ab5f532193f8 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.hxx
@@ -63,7 +63,6 @@ namespace StatusbarMerger
const AddonStatusbarItemContainer& 
rItems );
 
 bool ProcessMergeFallback( StatusBar* pStatusbar,
-  sal_uInt16 nPos,
   sal_uInt16& rItemId,
   const ::rtl::OUString& rModuleIdentifier,
   const ::rtl::OUString& rMergeCommand,
diff --git a/framework/inc/uielement/toolbarmerger.hxx 
b/framework/inc/uielement/toolbarmerger.hxx
index 665f37b3e086..2c2890fb4e1d 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -97,7 +97,6 @@ class ToolBarMerger
  const 
AddonToolbarItemContainer& rItems );
 
 static bool   ProcessMergeFallback( ToolBox*   
  pToolbar,
-
ToolBox::ImplToolItems::size_type nPos,
 sal_uInt16&
  rItemId,
 CommandToInfoMap&  
  rCommandMap,
 const OUString&   
rModuleIdentifier,
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx 
b/framework/inc/xml/statusbardocumenthandler.hxx
index 321d3d352d85..896c71ff6fef 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -117,7 +117,6 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler final
 /// @throws css::uno::RuntimeException
 void WriteStatusBarItem(
 const OUString& rCommandURL,
-const OUString& rHelpURL,
 sal_Int16nOffset,
 sal_Int16nStyle,
 sal_Int16nWidth );
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx 
b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 2122c3949400..9bc38a5d82ec 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -541,7 +541,7 @@ void 
OWriteStatusBarDocumentHandler::WriteStatusBarDocument()
 nWidth );
 
 if ( !aCommandURL.isEmpty() )
-WriteStatusBarItem( aCommandURL, aHelpURL, nOffset, nStyle, 
nWidth );
+WriteStatusBarItem( aCommandURL, nOffset,

Re: Link error: undefined reference to `__mulodi4' with Clang 32-bit

[Stephan Bergmann]

On 05/01/2017 05:09 PM, Luke Benes wrote:

/core/workdir/CxxObject/tools/source/generic/fract.o: In function 
`Fraction::operator*=(Fraction const&)':
/core/tools/source/generic/fract.cxx:(.text+0x695): undefined reference to 
`__mulodi4'
/core/tools/source/generic/fract.cxx:(.text+0x70a): undefined reference to 
`__mulodi4'


I assume the reference to __mulodi4 stems from


#elif (defined __GNUC__ && __GNUC__ >= 5) || 
(__has_builtin(__builtin_mul_overflow))

template inline bool checked_multiply(T a, T b, T& result)
{
return __builtin_mul_overflow(a, b, &result);
}

#else


in include/o3tl/safeint.hxx.  Whatever the trouble with your toolchain 
there, if you cannot get it solved one option would be to tweak the 
#elif so that you use the #else fallback implementation of 
checked_multiply instead.

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

[Libreoffice-commits] core.git: bin/gen-boost-headers

[Stephan Bergmann]

 bin/gen-boost-headers |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 89bdfccc835ad2b09b68b7081c16b14e22d1b407
Author: Stephan Bergmann 
Date:   Tue May 2 14:02:55 2017 +0200

bin/gen-boost-headers: Don't stumble over "boost" in pathname

...like

  workdir/UnpackedTarball/liborcus/m4/boost.m4:#include 

which would then be mis-parsed by

  grep -o '\bboost.*\.\(h\|hpp\|ipp\)'

to a HEADER of

  boost.m4:#include https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 scp2/inc/macros.inc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10a2fd178b9faeb7dd21a42ebfc791e9c0d90ad5
Author: Mike Kaganski 
Date:   Tue May 2 15:01:27 2017 +0300

tdf#106359: missing leading dot

Change-Id: Ibfcbeb0778d9000dad8097384d7f5c7d75be2252
Reviewed-on: https://gerrit.libreoffice.org/37152
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit aebdeb6541e2feea180f9f632e6a626c6ee14957)
Reviewed-on: https://gerrit.libreoffice.org/37153

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 935df547cce8..3593d2e96de5 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -280,7 +280,7 @@ End
 ModuleID = gid_Module_Root_Reg_##name; \
 Subkey = STRING(CONCAT2(MIME\Database\Content Type\,mediatype)); \
 Name = STRING(Extension); \
-Value = STRING(key); \
+Value = STRING(CONCAT2(.,key)); \
 ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
 End
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/inc

[Mike Kaganski]

 scp2/inc/macros.inc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aebdeb6541e2feea180f9f632e6a626c6ee14957
Author: Mike Kaganski 
Date:   Tue May 2 15:01:27 2017 +0300

tdf#106359: missing leading dot

Change-Id: Ibfcbeb0778d9000dad8097384d7f5c7d75be2252
Reviewed-on: https://gerrit.libreoffice.org/37152
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index ae1c82ddbfc8..ce6a5caaf1e8 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -280,7 +280,7 @@ End
 ModuleID = gid_Module_Root_Reg_##name; \
 Subkey = STRING(CONCAT2(MIME\Database\Content Type\,mediatype)); \
 Name = STRING(Extension); \
-Value = STRING(key); \
+Value = STRING(CONCAT2(.,key)); \
 ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
 End
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - bin/oss-fuzz-build.sh Makefile.in Repository.mk vcl/Executable_ww6fuzzer.mk vcl/Module_vcl.mk vcl/workben

[Caolán McNamara]

 Makefile.in |2 -
 Repository.mk   |1 
 bin/oss-fuzz-build.sh   |2 -
 vcl/Executable_ww6fuzzer.mk |   47 
 vcl/Module_vcl.mk   |1 
 vcl/workben/ww6fuzzer.cxx   |   33 ++
 6 files changed, 83 insertions(+), 3 deletions(-)

New commits:
commit 7819838d663c28c80487be08d57cc6e9258bfd5a
Author: Caolán McNamara 
Date:   Tue May 2 12:57:43 2017 +0100

test to see if we have enough space without this

Change-Id: I83c1d83bc3c34e32f3d4564322a5df871d8b73b5

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index e9972578ff93..b0d3d6eb201a 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -20,8 +20,6 @@ export ASAN_OPTIONS="detect_leaks=0"
 
 make fuzzers
 
-rm -rf workdir
-
 #some minimal fonts required
 cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
instdir/share/fonts/truetype/Liberation* $OUT
 #minimal runtime requirements
commit 151914d75a4a21461e489e871f0c5088c8d5fc47
Author: Caolán McNamara 
Date:   Fri Apr 28 12:18:08 2017 +0100

add ww6 fuzzer

Change-Id: I7e84f29b321676c373f86acba375816a0e9ad386

diff --git a/Makefile.in b/Makefile.in
index b18e9dac3201..73ae05882579 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,7 +446,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi 
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer 
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer 
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer 
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer 
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer 
Executable_psdfuzzer
  Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer 
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer 
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer 
Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer 
Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath 
Library_tl Library_basegfx Library_canvastools Library_cppcanvas 
Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng 
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax 
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi 
Library_clew Library_gie Library_icg Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer 
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer 
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer 
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer 
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer 
Executable_psdfuzzer
  Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer 
Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer 
Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer 
Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer 
Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer 
Executable_ww6fuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/Repository.mk b/Repository.mk
index c2cbf381f66a..1a38ab08965e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -119,6 +119,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,rtffuzzer) \
$(call gb_Helper_optional,FUZZERS,cgmfuzzer) \
$(call gb_Helper_optional,FUZZERS,ww2fuzzer) \
+   $(call gb_Helper_optional,FUZZERS,ww6fuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_ww6fuzzer.mk b/vcl/Executable_ww6fuzzer.mk
new file mode 100644
index ..09f3ec46c870
--- /dev/null
+++ b/vcl/Executable_ww6fuzzer.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# T

Re: bitmap resources are disconnected from .src/.res now

[Miklos Vajna]

On Tue, May 02, 2017 at 12:33:54PM +0100, Caolán McNamara  
wrote:
> Yeah, bitmap names are now the id, so no collisions and no need to
> extend a .hrc block or dig around for a free slot.

Cool, thanks a lot. :-)


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Katarina Behrens]

 sd/inc/app.hrc  |1 
 sd/source/ui/animations/CustomAnimationPane.cxx |  105 +---
 sd/source/ui/animations/CustomAnimationPane.hxx |2 
 sd/source/ui/func/fuconbez.cxx  |   13 ++
 sd/source/ui/inc/fuconbez.hxx   |1 
 5 files changed, 113 insertions(+), 9 deletions(-)

New commits:
commit 17495047e53885a224c2180c10ec7ecece35135d
Author: Katarina Behrens 
Date:   Mon May 1 16:43:46 2017 +0200

tdf#105703: Restore user-defined motion paths for animations

Yet another fallback from Google Summer of Regressions.
The rest of the functionality has been removed by loplugin and
other hyperactive code cleaners, so I've restored it, mostly
unmodified.

Change-Id: If0576abe9ce86c6f939d54bcf8f872dfce131e68
Reviewed-on: https://gerrit.libreoffice.org/37138
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 4dfb5122295e..58f0d0bf7afe 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -445,6 +445,7 @@
 
 // Add companion for the SID_HIDE_SLIDE (that is defined in svx)
 #define SID_SHOW_SLIDE  (SID_SD_START+441)
+#define SID_ADD_MOTION_PATH (SID_SD_START+442)
 
 // FREE
 #define SID_ZOOM_MODE   (SID_SD_START+447)
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 86c77ac79387..20bd4c1f23fa 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1988,6 +1988,63 @@ double CustomAnimationPane::getDuration()
 return fDuration;
 }
 
+PathKind CustomAnimationPane::getCreatePathKind() const
+{
+PathKind eKind = PathKind::NONE;
+
+if( mpLBAnimation->GetSelectEntryCount() == 1 )
+{
+const sal_Int32 nPos = mpLBAnimation->GetSelectEntryPos();
+if( nPos == mnCurvePathPos )
+{
+eKind = PathKind::CURVE;
+}
+else if( nPos == mnPolygonPathPos )
+{
+eKind = PathKind::POLYGON;
+}
+else if( nPos == mnFreeformPathPos )
+{
+eKind = PathKind::FREEFORM;
+}
+}
+
+return eKind;
+}
+
+void CustomAnimationPane::createPath( PathKind eKind, std::vector< Any >& 
rTargets, double fDuration)
+{
+sal_uInt16 nSID = 0;
+
+switch( eKind )
+{
+case PathKind::CURVE: nSID = SID_DRAW_BEZIER_NOFILL; break;
+case PathKind::POLYGON:   nSID = SID_DRAW_POLYGON_NOFILL; break;
+case PathKind::FREEFORM:  nSID = SID_DRAW_FREELINE_NOFILL; break;
+default: break;
+}
+
+if( nSID )
+{
+DrawViewShell* pViewShell = dynamic_cast< DrawViewShell* >(
+
FrameworkHelper::Instance(mrBase)->GetViewShell(FrameworkHelper::msCenterPaneURL).get());
+
+if( pViewShell )
+{
+DrawView* pView = pViewShell->GetDrawView();
+if( pView )
+pView->UnmarkAllObj();
+
+std::vector< Any > aTargets( 1, Any( fDuration ) );
+aTargets.insert( aTargets.end(), rTargets.begin(), rTargets.end() 
);
+Sequence< Any > aTargetSequence( comphelper::containerToSequence( 
aTargets ) );
+const SfxUnoAnyItem aItem( SID_ADD_MOTION_PATH, Any( 
aTargetSequence ) );
+pViewShell->GetViewFrame()->GetDispatcher()->ExecuteList( nSID, 
SfxCallMode::ASYNCHRON, {&aItem} );
+}
+}
+}
+
+
 /// this link is called when the property box is modified by the user
 IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void)
 {
@@ -2054,17 +2111,45 @@ IMPL_LINK_NOARG(CustomAnimationPane, 
AnimationSelectHdl, ListBox&, void)
 if( maListSelection.size() == 1 )
 {
 CustomAnimationPresetPtr* pPreset = static_cast< 
CustomAnimationPresetPtr* >(mpLBAnimation->GetSelectEntryData());
+PathKind ePathKind = getCreatePathKind();
+
 // tdf#99137, the selected entry may also be a subcategory title, so 
not an effect
 // just leave in this case
-if (!pPreset)
+if ( !pPreset && ( ePathKind == PathKind::NONE ) )
 return;
-const double fDuration = (*pPreset)->getDuration();
+
+EffectSequence::iterator aIter( maListSelection.begin() );
+const EffectSequence::iterator aEnd( maListSelection.end() );
+
+if ( ePathKind != PathKind::NONE )
+{
+std::vector< Any > aTargets;
+MainSequenceRebuildGuard aGuard( mpMainSequence );
+
+while( aIter != aEnd )
+{
+aTargets.push_back( (*aIter)->getTarget() );
+CustomAnimationEffectPtr pEffect = (*aIter++);
+
+EffectSequenceHelper* pEffectSequence = 
pEffect->getEffectSequence();
+if( !pEffectSequence )
+pEffectSequence = mpMainSequence.get();
+
+// delete the

Re: bitmap resources are disconnected from .src/.res now

[Caolán McNamara]

On Tue, 2017-05-02 at 10:50 +0200, Miklos Vajna wrote:
> Hi,
> 
> On Thu, Apr 27, 2017 at 02:40:26PM +0100, Caolán McNamara  dhat.com> wrote:
> > tl;dr: To use a theme png in C++, add #define NAME "path/to/png" to
> > a .hlst and use BitmapEx foo(NAME)
> 
> If I understand correctly, this is also means it's harder to get this
> wrong, as you don't have to assign an ID to each & every bitmap,
> where the IDs can accidentally collide, correct?

Yeah, bitmap names are now the id, so no collisions and no need to
extend a .hrc block or dig around for a free slot.

As a follow up I've now done the same for non-translatable strings. So
if there's a string which doesn't need to be translated, then don't put
it in a .src just use the string. I've extracted the previously defined
in .src non-translated strings to various module/inc/strings.hxx so in
general only stuff that needs to be translated is in .src files now
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - debian/loolwsd.postinst.in loolwsd.spec.in

[Andras Timar]

 debian/loolwsd.postinst.in |2 ++
 loolwsd.spec.in|2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 33cfc8fb096842dfc3c3aa3a9ba27e597d84a253
Author: Andras Timar 
Date:   Sat Apr 29 20:34:44 2017 +0200

non-world-readable loolwsd.xml in packages

Change-Id: Ibe91699f8d126dd34c1041fcfaaf471974387e47
Reviewed-on: https://gerrit.libreoffice.org/37103
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in
index 75ffb82e..a7cb8133 100755
--- a/debian/loolwsd.postinst.in
+++ b/debian/loolwsd.postinst.in
@@ -10,6 +10,8 @@ case "$1" in
adduser --quiet --system --group --home /opt/lool lool
mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
rm -rf /var/cache/loolwsd/*
+   chown lool: /etc/loolwsd/loolwsd.xml
+   chmod 640 /etc/loowsd/loolwsd.xml
 
# We assume that the LibreOffice to be used is built TDF-style
# and installs in @LO_PATH@, and that /opt/lool is
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 7a345c56..512cfd87 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -110,7 +110,7 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name 
\"*.png\" -a -atime +10 -ex
 %endif
 
 %config(noreplace) /etc/cron.d/loolwsd.cron
-%config(noreplace) /etc/loolwsd/loolwsd.xml
+%config(noreplace) %attr(640, lool, root) /etc/loolwsd/loolwsd.xml
 %config /etc/loolwsd/loolkitconfig.xcu
 
 %doc README
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/inc filter/source include/sfx2 include/svtools include/tools reportdesign/inc reportdesign/source scaddins/source sc/inc sc/source sd/inc sd/source sfx2/inc sfx2

[Caolán McNamara]

 filter/inc/strings.hxx   |   25 +
 filter/source/xsltdialog/xmlfiltercommon.hxx |2 
 filter/source/xsltdialog/xmlfilterdialogstrings.hrc  |   10 
 filter/source/xsltdialog/xmlfilterdialogstrings.src  |   45 -
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |   34 -
 include/sfx2/doctempl.hxx|5 
 include/sfx2/templatelocnames.hrc|   11 
 include/svtools/svtools.hrc  |3 
 include/tools/resmgr.hxx |1 
 reportdesign/inc/RptResId.hrc|5 
 reportdesign/inc/strings.hxx |   22 
 reportdesign/source/core/sdr/RptObject.cxx   |   14 
 reportdesign/source/ui/report/propbrw.cxx|4 
 reportdesign/source/ui/report/report.src |   19 
 sc/inc/scres.hrc |   26 -
 sc/inc/strings.hxx   |   28 +
 sc/source/ui/Accessibility/AccessibleCellBase.cxx|3 
 sc/source/ui/Accessibility/AccessibleDocument.cxx|3 
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |3 
 sc/source/ui/Accessibility/AccessiblePageHeader.cxx  |3 
 sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx  |7 
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx   |5 
 sc/source/ui/Accessibility/AccessiblePreviewTable.cxx|3 
 sc/source/ui/Accessibility/AccessibleTableBase.cxx   |3 
 sc/source/ui/dbgui/scuiasciiopt.cxx  |3 
 sc/source/ui/dbgui/scuiimoptdlg.cxx  |7 
 sc/source/ui/src/scstring.src|   69 --
 scaddins/source/datefunc/datefunc.cxx|   22 
 scaddins/source/datefunc/datefunc.hrc|   11 
 scaddins/source/datefunc/datefunc.hxx|4 
 scaddins/source/datefunc/datefunc.src|   65 --
 scaddins/source/datefunc/deffuncname.hxx |   73 ++
 sd/inc/glob.hrc  |7 
 sd/inc/strings.hxx   |   23 
 sd/source/core/drawdoc3.cxx  |7 
 sd/source/core/drawdoc4.cxx  |3 
 sd/source/core/glob.src  |   30 -
 sd/source/core/sdpage.cxx|   34 -
 sd/source/core/sdpage2.cxx   |3 
 sd/source/core/stlpool.cxx   |   29 -
 sd/source/core/stlsheet.cxx  |   31 -
 sd/source/filter/html/htmlex.cxx |3 
 sd/source/filter/html/pubdlg.cxx |3 
 sd/source/filter/ppt/pptin.cxx   |3 
 sd/source/ui/app/strings.src |4 
 sd/source/ui/dlg/TemplateScanner.cxx |3 
 sd/source/ui/dlg/dlgolbul.cxx|3 
 sd/source/ui/dlg/unchss.cxx  |   14 
 sd/source/ui/func/fuconstr.cxx   |3 
 sd/source/ui/func/fuolbull.cxx   |3 
 sd/source/ui/func/fuprobjs.cxx   |5 
 sd/source/ui/inc/strings.hrc |2 
 sd/source/ui/unoidl/unomodel.cxx |3 
 sd/source/ui/unoidl/unopage.cxx  |5 
 sd/source/ui/view/ViewClipboard.cxx  |3 
 sd/source/ui/view/unmodpg.cxx|5 
 sd/source/ui/view/viewshel.cxx   |3 
 sfx2/inc/strings.hxx |   12 
 sfx2/source/bastyp/frmhtmlw.cxx  |4 
 sfx2/source/doc/doctempl.cxx |   36 -
 sfx2/source/doc/templatelocnames.src |   51 --
 starmath/inc/ElementsDockingWindow.hxx   |   20 
 starmath/inc/cursor.hxx  |3 
 starmath/inc/edit.hxx|1 
 starmath/inc/starmath.hrc|  271 --
 starmath/inc/strings.hxx |  272 +++
 starmath/inc/view.hxx|2 
 starmath/sdi/smath.sdi   |   18 
 starmath/sdi/smslots.sdi |6 
 starmath/source/ElementsDockingWindow.cxx|  248 +-
 starmath/source/action.cxx   

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkinst.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit c881756fcfdc1fa63ff534bf4538d551b2139515
Author: Caolán McNamara 
Date:   Tue May 2 12:13:41 2017 +0100

Resolves: tdf#99467 pasting text from java apps to gtk3 gives bad results

Change-Id: Ib2625c900def20baa470f0a15e4f72a3f763099e

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 0f47ff54af5d..5d1752058a26 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -104,6 +104,10 @@ std::vector 
GtkTransferable::getTransferDataFlavo
 const char* pFinalName = pName;
 css::datatransfer::DataFlavor aFlavor;
 
+// omit text/plain;charset=unicode since it is not well defined
+if (rtl_str_compare(pName, "text/plain;charset=unicode") == 0)
+continue;
+
 for (size_t j = 0; j < SAL_N_ELEMENTS(aConversionTab); ++j)
 {
 if (rtl_str_compare(pName, aConversionTab[j].pNativeType) == 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/oox/drawingml/shape.hxx|4 +---
 include/oox/drawingml/shapepropertymap.hxx |2 +-
 include/oox/export/chartexport.hxx |2 +-
 include/oox/ole/axcontrol.hxx  |4 +---
 oox/inc/drawingml/customshapegeometry.hxx  |2 +-
 oox/inc/drawingml/customshapeproperties.hxx|3 +--
 oox/inc/drawingml/misccontexts.hxx |2 --
 oox/source/drawingml/customshapegeometry.cxx   |2 +-
 oox/source/drawingml/customshapeproperties.cxx |2 +-
 oox/source/drawingml/diagram/constraintlistcontext.cxx |1 -
 oox/source/drawingml/diagram/constraintlistcontext.hxx |2 +-
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx|7 +--
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx|1 -
 oox/source/drawingml/diagram/layoutnodecontext.cxx |2 +-
 oox/source/drawingml/misccontexts.cxx  |8 
 oox/source/drawingml/shape.cxx |   14 --
 oox/source/drawingml/shapepropertiescontext.cxx|2 +-
 oox/source/drawingml/shapepropertymap.cxx  |4 ++--
 oox/source/export/chartexport.cxx  |4 +---
 oox/source/ole/axcontrol.cxx   |4 ++--
 oox/source/ppt/dgmlayout.cxx   |   10 +-
 oox/source/ppt/pptshape.cxx|2 +-
 22 files changed, 27 insertions(+), 57 deletions(-)

New commits:
commit 4cc0b82103e0b1d28a3ada59974aac0e7da18083
Author: Noel Grandin 
Date:   Tue May 2 11:37:07 2017 +0200

loplugin:checkunusedparams in oox

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

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index b908046458a6..6591ebc3b8d1 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -181,8 +181,7 @@ public:
 ::oox::core::XmlFilterBase& rFilterBase,
 const Theme* pTheme,
 const css::uno::Reference< css::drawing::XShapes 
>& rxShapes,
-basegfx::B2DHomMatrix& aTransformation,
-const css::awt::Rectangle* pShapeRect = nullptr );
+basegfx::B2DHomMatrix& aTransformation );
 
 voidsetXShape( const css::uno::Reference< 
css::drawing::XShape >& rXShape )
 { mxShape = rXShape; };
@@ -230,7 +229,6 @@ protected:
 Shape& rMaster,
 const Theme* pTheme,
 const css::uno::Reference< css::drawing::XShapes 
>& rxShapes,
-const css::awt::Rectangle& rClientRect,
 ShapeIdMap* pShapeMap,
 const basegfx::B2DHomMatrix& aTransformation );
 
diff --git a/include/oox/drawingml/shapepropertymap.hxx 
b/include/oox/drawingml/shapepropertymap.hxx
index 3d793a4ee143..382b77b56810 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -137,7 +137,7 @@ private:
 /** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. 
*/
 boolsetFillBitmapUrl( sal_Int32 nPropId, const 
css::uno::Any& rValue );
 /** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName 
*/
-boolsetFillBitmapNameFromUrl( sal_Int32 nPropId, const 
css::uno::Any& rValue );
+boolsetFillBitmapNameFromUrl( const css::uno::Any& rValue 
);
 
 // not implemented, to prevent implicit conversion from enum to int
 css::uno::Any& operator[]( ShapeProperty ePropId ) = delete;
diff --git a/include/oox/export/chartexport.hxx 
b/include/oox/export/chartexport.hxx
index 8efc626cebfa..ef537d688e4a 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -165,7 +165,7 @@ private:
 const css::uno::Sequence<
 css::uno::Reference<
 css::chart2::XDataSeries > > & aSeriesSeq,
-bool bJapaneseCandleSticks, bool& rPrimaryAxes );
+bool& rPrimaryAxes );
 void exportSeriesText(
 const css::uno::Reference< css::chart2::data::XDataSequence >& 
xValueSeq );
 void exportSeriesCategory(
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index eaebe8621e59..25a91398a201 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -307,9 +307,7 @@ public:
 voidconvertAxPicture(
 PropertyMap& rPropMap,
 const StreamDataSequence& rPicData,
-sal_Int32 nPicSizeMode,
-

[Libreoffice-commits] core.git: hwpfilter/source linguistic/source lotuswordpro/source

[Noel Grandin]

 hwpfilter/source/hwpreader.cxx  |   12 
 hwpfilter/source/hwpreader.hxx  |4 ++--
 linguistic/source/convdiclist.cxx   |2 +-
 linguistic/source/dlistimp.cxx  |   11 ---
 linguistic/source/gciterator.cxx|3 +--
 linguistic/source/lngopt.cxx|2 +-
 linguistic/source/lngreg.cxx|   17 ++---
 linguistic/source/lngreg.hxx|   15 +--
 linguistic/source/lngsvcmgr.cxx |3 +--
 lotuswordpro/source/filter/lwpfribframe.cxx |2 +-
 lotuswordpro/source/filter/lwpfribframe.hxx |2 +-
 lotuswordpro/source/filter/lwpfribptr.cxx   |2 +-
 12 files changed, 28 insertions(+), 47 deletions(-)

New commits:
commit 9297aa2c08bdcdf7bf7c132fd908cd8a4cb0fae1
Author: Noel Grandin 
Date:   Tue May 2 11:01:04 2017 +0200

loplugin:checkunusedparams in hwpfilter..lotuswordpro

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

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index fa93b38b1d63..a07afb5a058a 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3005,7 +3005,7 @@ void HwpReader::make_text_p3(HWPPara * para,bool 
bParaStart)
 if( !tstart ) {STARTT;}
 makeChars(str);
 }
-makeTab(static_cast(para->hhstr[n].get()));
+makeTab();
 break;
 case CH_TEXT_BOX: /* 10 - ordered by 
Table/text box/formula/button/hypertext */
 {
@@ -3066,7 +3066,6 @@ void HwpReader::make_text_p3(HWPPara * para,bool 
bParaStart)
 }
 case CH_LINE: // 14
 {
-Line *hbox = static_cast(para->hhstr[n].get());
 if (str.size() > 0)
 {
 if( !pstart ) {STARTP;}
@@ -3075,7 +3074,7 @@ void HwpReader::make_text_p3(HWPPara * para,bool 
bParaStart)
 }
 if( tstart ) {ENDT;}
 if( pstart ) {ENDP;}
-makeLine(hbox);
+makeLine();
 pstart = true;
 break;
 }
@@ -3447,7 +3446,7 @@ void HwpReader::makeDateCode(DateCode * hbox)
 }
 
 
-void HwpReader::makeTab(Tab *  )  /*hbox */
+void HwpReader::makeTab()
 {
 rstartEl("text:tab-stop", mxList.get());
 rendEl("text:tab-stop");
@@ -4582,10 +4581,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject 
*drawobj, Picture * hbox)
 }
 
 
-/**
- *
- */
-void HwpReader::makeLine(Line *   )
+void HwpReader::makeLine()
 {
 padd("text:style-name", sXML_CDATA, "Horizontal Line");
 rstartEl( "text:p", mxList.get());
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index a0c7d0d8c0ee..9500aca6ae14 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -120,14 +120,14 @@ private:
 void makeBookmark(Bookmark *hbox);  //6
 void makeDateFormat(DateCode *hbox);//7
 void makeDateCode(DateCode *hbox);  //8
-void makeTab(Tab *hbox);//9
+void makeTab();//9
 void makeTable(TxtBox *hbox);
 void makeTextBox(TxtBox *hbox);
 void makeFormula(TxtBox *hbox);
 void makeHyperText(TxtBox *hbox);
 void makePicture(Picture *hbox);
 void makePictureDRAW(HWPDrawingObject *drawobj, Picture *hbox);
-void makeLine(Line *hbox);
+void makeLine();
 void makeHidden(Hidden *hbox);
 void makeFootnote(Footnote *hbox);
 void makeAutoNum(AutoNum *hbox);
diff --git a/linguistic/source/convdiclist.cxx 
b/linguistic/source/convdiclist.cxx
index b852077ab3e8..0951d6796ed8 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -568,7 +568,7 @@ uno::Reference< uno::XInterface > SAL_CALL 
ConvDicList_CreateInstance(
 
 void * SAL_CALL ConvDicList_getFactory(
 const sal_Char * pImplName,
-XMultiServiceFactory * pServiceManager, void *  )
+XMultiServiceFactory * pServiceManager  )
 {
 void * pRet = nullptr;
 if ( ConvDicList::getImplementationName_Static().equalsAscii( pImplName ) )
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index e432114d75ab..bff87e2f66ad 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -89,8 +89,7 @@ public:
 voidDisposeAndClear( const EventObject &rEvtObj );
 
 boolAddDicListEvtListener(
-const uno::Reference< XDictionaryListEventListener >& 
rxListener,
-bool bReceiveVerbose );
+const uno::Reference< XDictionaryListEventListener >& 
rxListener );
   

Re: System setup of tinderboxes

[Christian Lohmaier]

Hi Jens,

On Tue, May 2, 2017 at 9:20 AM, Jens Carl  wrote:
>
> is it possible to get the system setup of the tinderboxes so I can recreate
> one for my own gcc test runs. I mean the OS and installed packages.

There are various tinderboxes, not all share the same setup.

The baseline system (used by the TDF provided binaries, and the the
tinderboxes 76 and 77 (x86) is using CentOS 6 and devtools repository
to get newer compiler version:

the salt snippet looks something like the following and should get you
~the same setup except for gstreamer 1.0 stuff, that right now is
local to the build-user/not installed systemwide.
glib, gstreamer and gst-plugins-base are compiled like this (adjust
version accordingly):

export PATH=/opt/rh/devtoolset-2/root/usr/bin:$PATH
for file in *; do tar -xf $file; done
cd glib-2.50.0
./configure --disable-libmount --with-pcre=internal --prefix=$HOME/gst10-deps
make
make install
cd ../gstreamer-1.8.3
PKG_CONFIG_PATH=$HOME/gst10-deps/lib/pkgconfig ./configure
--prefix=$HOME/gst10-deps
make
make install
cd ../gst-plugins-base-1.8.3
PKG_CONFIG_PATH=$HOME/gst10-deps/lib/pkgconfig ./configure
--prefix=$HOME/gst10-deps
make
make install

and then are injected into the LibreOffice build by setting
GSTREAMER_1_0_CFLAGS=-pthread
-I/home/buildslave/gst10-deps/include/gstreamer-1.0
-I/home/buildslave/gst10-deps/lib/gstreamer-1.0/include
-I/home/buildslave/gst10-deps/include/glib-2.0
-I/home/buildslave/gst10-deps/lib/glib-2.0/include
GSTREAMER_1_0_CFLAGS=-pthread
-I/home/buildslave/gst10-deps/include/gstreamer-1.0
-I/home/buildslave/gst10-deps/lib/gstreamer-1.0/include
-I/home/buildslave/gst10-deps/include/glib-2.0
-I/home/buildslave/gst10-deps/lib/glib-2.0/include


rest of the build-deps is covered below:

# https://people.centos.org/tru/devtools-2/
/etc/yum.repos.d/devtools-2.repo:
  file:
- managed
- source: salt://centos6_buildbot/devtools-2.repo
- require_in:
- pkg: lobuilddeps_baseline

# contains updated make and doxygen
# http://dev-downloads.libreoffice.org/centos_builddeps/
/etc/yum.repos.d/tdf-buildtools.repo:
  file:
- managed
- source: salt://centos6_buildbot/tdf-buildtools.repo
- require_in:
- pkg: lobuilddeps_baseline

# byobu and man not really build-dep, but of course nice to have :-)
lobuilddeps_baseline:
  pkg.installed:
- pkgs:
  - GConf2-devel
  - bison
  - ccache
  - cups-devel
  - dbus-glib-devel
  - devtoolset-2-binutils
  - devtoolset-2-gcc-c++
  - devtoolset-2-gdb
  - dpkg-dev
  - doxygen
  - flex
  - gitk
  - gperf
  - gstreamer-plugins-base-devel
  - gtk2-devel
  - java-1.8.0-openjdk-devel
  - kdelibs-devel
  - kdelibs3-devel
  - man
  - perl-Archive-Zip
  - qemu-guest-agent
  - rpm-build
  - byobu
  - zip

# c++11 requires space between macro and literal
/usr/include/QtCore/qobjectdefs.h:
  file.replace:
- pattern: ^# define QLOCATION "\\0"__FILE__":"QTOSTRING\(__LINE__\)$
- repl: '# define QLOCATION "\\0" __FILE__ ":" QTOSTRING(__LINE__)'
- require:
- pkg: lobuilddeps_baseline
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - debian/loolwsd.postinst loolwsd.spec.in

[Andras Timar]

 debian/loolwsd.postinst |2 ++
 loolwsd.spec.in |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7f776c5ecf32f5c0c6a85e280c7b32cc823b8f5b
Author: Andras Timar 
Date:   Sat Apr 29 20:34:44 2017 +0200

non-world-readable loolwsd.xml in packages

Change-Id: Ibe91699f8d126dd34c1041fcfaaf471974387e47
Reviewed-on: https://gerrit.libreoffice.org/37102
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit f8ae6243dde0c2fdd9bc048020d386de07145bfd)
Reviewed-on: https://gerrit.libreoffice.org/37136

diff --git a/debian/loolwsd.postinst b/debian/loolwsd.postinst
index ad4f7ec8..8c640005 100755
--- a/debian/loolwsd.postinst
+++ b/debian/loolwsd.postinst
@@ -10,6 +10,8 @@ case "$1" in
adduser --quiet --system --group --home /opt/lool lool
mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
rm -rf /var/cache/loolwsd/*
+   chown lool: /etc/loolwsd/loolwsd.xml
+   chmod 640 /etc/loowsd/loolwsd.xml
 
# We assume that the LibreOffice to be used is built TDF-style
# and installs in /opt/collaboraoffice5.1, and that /opt/lool is
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 69204c08..0d1143d5 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -120,7 +120,7 @@ tar cf - . | (cd %{buildroot}/usr/share/loolwsd/loleaflet 
&& tar xf -)
 %endif
 
 %config(noreplace) /etc/cron.d/loolwsd.cron
-%config(noreplace) /etc/loolwsd/loolwsd.xml
+%config(noreplace) %attr(640, lool, root) /etc/loolwsd/loolwsd.xml
 %config(noreplace) %attr(400, lool, lool) /etc/loolwsd/key.pem
 %if %{ssl_support} == "YES"
 %config(noreplace) /etc/loolwsd/cert.pem
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/core/layout/laycache.cxx |  272 ++---
 sw/source/core/layout/layhelp.hxx  |   32 ++--
 2 files changed, 152 insertions(+), 152 deletions(-)

New commits:
commit 2859c2541d0da5dc689d912a166f370ced9dc8de
Author: Miklos Vajna 
Date:   Tue May 2 09:24:49 2017 +0200

sw: prefix members of SwLayHelper

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

diff --git a/sw/source/core/layout/laycache.cxx 
b/sw/source/core/layout/laycache.cxx
index a21d2d2b30b9..947bd6b264c1 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -509,49 +509,49 @@ bool sanityCheckLayoutCache(SwLayCacheImpl const& rCache,
 SwLayHelper::SwLayHelper( SwDoc *pD, SwFrame* &rpF, SwFrame* &rpP, 
SwPageFrame* &rpPg,
   SwLayoutFrame* &rpL, SwActualSection* &rpA,
   sal_uLong nNodeIndex, bool bCache )
-: rpFrame( rpF )
-, rpPrv( rpP )
-, rpPage( rpPg )
-, rpLay( rpL )
-, rpActualSection( rpA )
+: mrpFrame( rpF )
+, mrpPrv( rpP )
+, mrpPage( rpPg )
+, mrpLay( rpL )
+, mrpActualSection( rpA )
 , mbBreakAfter(false)
-, pDoc(pD)
-, nMaxParaPerPage( 25 )
-, nParagraphCnt( bCache ? 0 : USHRT_MAX )
-, nFlyIdx( 0 )
-, bFirst( bCache )
+, mpDoc(pD)
+, mnMaxParaPerPage( 25 )
+, mnParagraphCnt( bCache ? 0 : USHRT_MAX )
+, mnFlyIdx( 0 )
+, mbFirst( bCache )
 {
-pImpl = pDoc->GetLayoutCache() ? pDoc->GetLayoutCache()->LockImpl() : 
nullptr;
-if( pImpl )
+mpImpl = mpDoc->GetLayoutCache() ? mpDoc->GetLayoutCache()->LockImpl() : 
nullptr;
+if( mpImpl )
 {
-SwNodes const& rNodes(pDoc->GetNodes());
-if (sanityCheckLayoutCache(*pImpl, rNodes, nNodeIndex))
+SwNodes const& rNodes(mpDoc->GetNodes());
+if (sanityCheckLayoutCache(*mpImpl, rNodes, nNodeIndex))
 {
-nIndex = 0;
-nStartOfContent = 
rNodes.GetEndOfContent().StartOfSectionNode()->GetIndex();
-nMaxParaPerPage = 1000;
+mnIndex = 0;
+mnStartOfContent = 
rNodes.GetEndOfContent().StartOfSectionNode()->GetIndex();
+mnMaxParaPerPage = 1000;
 }
 else
 {
-pDoc->GetLayoutCache()->UnlockImpl();
-pImpl = nullptr;
-nIndex = std::numeric_limits::max();
-nStartOfContent = USHRT_MAX;
+mpDoc->GetLayoutCache()->UnlockImpl();
+mpImpl = nullptr;
+mnIndex = std::numeric_limits::max();
+mnStartOfContent = USHRT_MAX;
 }
 }
 else
 {
-nIndex = std::numeric_limits::max();
-nStartOfContent = ULONG_MAX;
+mnIndex = std::numeric_limits::max();
+mnStartOfContent = ULONG_MAX;
 }
 }
 
 SwLayHelper::~SwLayHelper()
 {
-if( pImpl )
+if( mpImpl )
 {
-OSL_ENSURE( pDoc && pDoc->GetLayoutCache(), "Missing layoutcache" );
-pDoc->GetLayoutCache()->UnlockImpl();
+OSL_ENSURE( mpDoc && mpDoc->GetLayoutCache(), "Missing layoutcache" );
+mpDoc->GetLayoutCache()->UnlockImpl();
 }
 }
 
@@ -562,51 +562,51 @@ SwLayHelper::~SwLayHelper()
 sal_uLong SwLayHelper::CalcPageCount()
 {
 sal_uLong nPgCount;
-SwLayCacheImpl *pCache = pDoc->GetLayoutCache() ?
- pDoc->GetLayoutCache()->LockImpl() : nullptr;
+SwLayCacheImpl *pCache = mpDoc->GetLayoutCache() ?
+ mpDoc->GetLayoutCache()->LockImpl() : nullptr;
 if( pCache )
 {
 nPgCount = pCache->size() + 1;
-pDoc->GetLayoutCache()->UnlockImpl();
+mpDoc->GetLayoutCache()->UnlockImpl();
 }
 else
 {
-nPgCount = pDoc->getIDocumentStatistics().GetDocStat().nPage;
+nPgCount = mpDoc->getIDocumentStatistics().GetDocStat().nPage;
 if ( nPgCount <= 10 ) // no page insertion for less than 10 pages
 nPgCount = 0;
-sal_uLong nNdCount = pDoc->getIDocumentStatistics().GetDocStat().nPara;
+sal_uLong nNdCount = 
mpDoc->getIDocumentStatistics().GetDocStat().nPara;
 if ( nNdCount <= 1 )
 {
 //Estimates the number of paragraphs.
-sal_uLong nTmp = pDoc->GetNodes().GetEndOfContent().GetIndex() -
-pDoc->GetNodes().GetEndOfExtras().GetIndex();
+sal_uLong nTmp = mpDoc->GetNodes().GetEndOfContent().GetIndex() -
+mpDoc->GetNodes().GetEndOfExtras().GetIndex();
 //Tables have a little overhead..
-nTmp -= pDoc->GetTableFrameFormats()->size() * 25;
+nTmp -= mpDoc->GetTableFrameFormats()->size() * 25;
 //Fly frames, too ..
-nTmp -= (pDoc->GetNodes().GetEndOfAutotext().GetIndex() -
-   pDoc->GetNodes().GetEndOfInserts().GetIndex()) / 3 

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

[Noel Grandin]

 basctl/source/basicide/baside3.cxx  |4 +--
 basctl/source/basicide/bastypes.cxx |2 -
 basctl/source/basicide/layout.cxx   |5 
 basctl/source/dlged/dlged.cxx   |5 +---
 basctl/source/dlged/dlgedfunc.cxx   |6 ++---
 basctl/source/dlged/dlgedlist.cxx   |   12 +-
 basctl/source/dlged/dlgedobj.cxx|6 ++---
 basctl/source/inc/dlged.hxx |2 -
 basctl/source/inc/dlgedobj.hxx  |6 ++---
 basctl/source/inc/layout.hxx|1 
 basic/inc/sbstdobj.hxx  |   18 
 basic/source/runtime/stdobj1.cxx|   40 +---
 12 files changed, 49 insertions(+), 58 deletions(-)

New commits:
commit 769d383b06ccf11983cc33887b60dbb1b151fa5a
Author: Noel Grandin 
Date:   Fri Apr 28 11:59:26 2017 +0200

loplugin:checkunusedparams in basctl and basic

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

diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 608ded2c1c68..550bcd3637e9 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -233,9 +233,9 @@ void DialogWindow::DoInit()
 m_pEditor->SetScrollBars( GetHScrollBar(), GetVScrollBar() );
 }
 
-void DialogWindow::DoScroll( ScrollBar* pCurScrollBar )
+void DialogWindow::DoScroll( ScrollBar*  )
 {
-m_pEditor->DoScroll( pCurScrollBar );
+m_pEditor->DoScroll();
 }
 
 void DialogWindow::GetState( SfxItemSet& rSet )
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 0f4210836884..c46320ccb07f 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -410,7 +410,7 @@ void DockingWindow::DockThis ()
 {
 if (!IsFloatingMode() && GetParent() != pLayout)
 SetParent(pLayout);
-pLayout->DockaWindow(this);
+pLayout->ArrangeWindows();
 }
 }
 
diff --git a/basctl/source/basicide/layout.cxx 
b/basctl/source/basicide/layout.cxx
index 5337adf61b3b..9e92c2a247bb 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -113,11 +113,6 @@ void Layout::ArrangeWindows ()
 bInArrangeWindows = false;
 }
 
-void Layout::DockaWindow (DockingWindow*)
-{
-ArrangeWindows();
-}
-
 void Layout::Activating (BaseWindow& rWindow)
 {
 // first activation
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index bb8ddeff03a8..f5cc428272d2 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -287,12 +287,11 @@ void DlgEditor::InitScrollBars()
 pHScroll->SetPageSize( aOutSize.Width() / 2 );
 pVScroll->SetPageSize( aOutSize.Height() / 2 );
 
-DoScroll( pHScroll );
-DoScroll( pVScroll );
+DoScroll();
 }
 
 
-void DlgEditor::DoScroll( ScrollBar* )
+void DlgEditor::DoScroll()
 {
 if( !pHScroll || !pVScroll )
 return;
diff --git a/basctl/source/dlged/dlgedfunc.cxx 
b/basctl/source/dlged/dlgedfunc.cxx
index 0545b7c05faf..6260f8d885f2 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -69,9 +69,9 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
 pVScroll->SetThumbPos( pVScroll->GetThumbPos() + nDeltaY );
 
 if( nDeltaX )
-rParent.DoScroll( pHScroll );
+rParent.DoScroll();
 if( nDeltaY )
-rParent.DoScroll( pVScroll );
+rParent.DoScroll();
 }
 
 aScrollTimer.Start();
@@ -310,7 +310,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
 if ( nThumbPos > nRangeMax )
 nThumbPos = nRangeMax;
 pScrollBar->SetThumbPos( nThumbPos );
-rParent.DoScroll( pScrollBar );
+rParent.DoScroll();
 }
 }
 
diff --git a/basctl/source/dlged/dlgedlist.cxx 
b/basctl/source/dlged/dlgedlist.cxx
index 8cda02a4520e..666e2aa0f6a3 100644
--- a/basctl/source/dlged/dlgedlist.cxx
+++ b/basctl/source/dlged/dlgedlist.cxx
@@ -60,19 +60,19 @@ void SAL_CALL DlgEdEvtContListenerImpl::disposing( const  
css::lang::EventObject
 }
 
 // XContainerListener
-void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const 
css::container::ContainerEvent& Event)
+void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const 
css::container::ContainerEvent& /*Event*/)
 {
-rDlgEdObj._elementInserted( Event );
+rDlgEdObj._elementInserted();
 }
 
-void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const 
css::container::ContainerEvent& Event)
+void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const 
css::container::ContainerEvent& /*Event*/)
 {
-rDlgEdObj._elementReplaced( Event );
+rDlgEdObj._elementReplaced();
 }
 
-void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const 
css::container::ContainerEvent& Event)
+void SAL_C

[Libreoffice-commits] core.git: forms/source formula/source include/formula reportdesign/source sc/source

[Noel Grandin]

 forms/source/richtext/richtextimplcontrol.cxx |2 +-
 forms/source/richtext/richtextimplcontrol.hxx |2 +-
 forms/source/richtext/richtextvclcontrol.cxx  |4 ++--
 formula/source/ui/dlg/formula.cxx |   12 ++--
 include/formula/formula.hxx   |4 ++--
 reportdesign/source/ui/dlg/Formula.cxx|2 +-
 sc/source/ui/formdlg/formula.cxx  |2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 29a72ca674ce9cd3d5c4ede63e2b10044f84247a
Author: Noel Grandin 
Date:   Tue May 2 10:26:44 2017 +0200

loplugin:checkunusedparams in forms..formula

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

diff --git a/forms/source/richtext/richtextimplcontrol.cxx 
b/forms/source/richtext/richtextimplcontrol.cxx
index 655ca5158fcd..d9ba2469e1e4 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -566,7 +566,7 @@ namespace frm
 }
 
 
-void RichTextControlImpl::Draw( OutputDevice* _pDev, const Point& _rPos, 
const Size& _rSize, DrawFlags /*_nFlags*/ )
+void RichTextControlImpl::Draw( OutputDevice* _pDev, const Point& _rPos, 
const Size& _rSize )
 {
 // need to normalize the map mode of the device - every paint 
operation on any device needs
 // to use the same map mode
diff --git a/forms/source/richtext/richtextimplcontrol.hxx 
b/forms/source/richtext/richtextimplcontrol.hxx
index c61c473c9100..89ea51463286 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -142,7 +142,7 @@ namespace frm
 boolGetHideInactiveSelection() const;
 
 /// draws the control onto a given output device
-voidDraw( OutputDevice* _pDev, const Point& _rPos, const Size& 
_rSize, DrawFlags _nFlags );
+voidDraw( OutputDevice* _pDev, const Point& _rPos, const Size& 
_rSize );
 
 /// handles command events arrived at the anti-impl control
 longHandleCommand( const CommandEvent& _rEvent );
diff --git a/forms/source/richtext/richtextvclcontrol.cxx 
b/forms/source/richtext/richtextvclcontrol.cxx
index 5ea1f430ef49..a4abd539646f 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -296,9 +296,9 @@ namespace frm
 }
 
 
-void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, const 
Size& _rSize, DrawFlags _nFlags )
+void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, const 
Size& _rSize, DrawFlags /*_nFlags*/ )
 {
-m_pImpl->Draw( _pDev, _rPos, _rSize, _nFlags );
+m_pImpl->Draw( _pDev, _rPos, _rSize );
 }
 
 
diff --git a/formula/source/ui/dlg/formula.cxx 
b/formula/source/ui/dlg/formula.cxx
index 2e34f5255610..304b9430478c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -77,7 +77,7 @@ class FormulaDlg_Impl
 public:
 ::std::pair
 RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
-voidRefInputStartAfter( RefEdit* pEdit, RefButton* pButton );
+voidRefInputStartAfter();
 voidRefInputDoneAfter( bool bForced );
 boolCalcValue( const OUString& rStrExp, OUString& rStrResult, 
bool bForceMatrixFormula = false );
 boolCalcStruct( const OUString& rStrExp, bool 
bForceRecalcStruct = false );
@@ -1477,7 +1477,7 @@ void FormulaDlg_Impl::UpdateSelection()
 aPair.second = m_pEdRef;
 return aPair;
 }
-void FormulaDlg_Impl::RefInputStartAfter( RefEdit* /*pEdit*/, RefButton* 
/*pButton*/ )
+void FormulaDlg_Impl::RefInputStartAfter()
 {
 m_pRefBtn->SetEndImage();
 
@@ -1727,9 +1727,9 @@ void FormulaModalDialog::Update()
 return m_pImpl->RefInputStartBefore( pEdit, pButton );
 }
 
-void FormulaModalDialog::RefInputStartAfter( RefEdit* pEdit, RefButton* 
pButton )
+void FormulaModalDialog::RefInputStartAfter()
 {
-m_pImpl->RefInputStartAfter( pEdit, pButton );
+m_pImpl->RefInputStartAfter();
 }
 
 void FormulaModalDialog::RefInputDoneAfter()
@@ -1817,9 +1817,9 @@ void FormulaDlg::DoEnter()
 return m_pImpl->RefInputStartBefore( pEdit, pButton );
 }
 
-void FormulaDlg::RefInputStartAfter( RefEdit* pEdit, RefButton* pButton )
+void FormulaDlg::RefInputStartAfter()
 {
-m_pImpl->RefInputStartAfter( pEdit, pButton );
+m_pImpl->RefInputStartAfter();
 }
 
 void FormulaDlg::RefInputDoneAfter( bool bForced )
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 164c673fe6d1..9b6cf62ecd19 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -76,7 +76,7 @@ protected:
 
 virtual boolPreNotify( NotifyEvent& rNEvt ) override;
 ::std::pair RefInputStartBefore( RefEdit* pEdit, 
RefButton* pButton );
-void

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

[Andras Timar]

Tag 'cp-5.3-8-win' created by Andras Timar  at 
2017-05-02 09:13 +

cp-5.3-8-win

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: Changes to 'refs/tags/cp-5.3-8-win'

[Miklos Vajna]

Tag 'cp-5.3-8-win' created by Andras Timar  at 
2017-05-02 09:13 +

cp-5.3-8-win

Changes since cp-5.3-8:
Miklos Vajna (1):
  tdf#107392 ODF import: fix z-order sorting of SVG images

---
 include/xmloff/shapeimport.hxx |3 ++
 include/xmloff/xmlmultiimagehelper.hxx |2 -
 sw/qa/extras/odfimport/data/tdf107392.odt  |binary
 sw/qa/extras/odfimport/odfimport.cxx   |   12 
 xmloff/source/draw/shapeimport.cxx |   40 ++---
 xmloff/source/draw/ximpshap.cxx|2 -
 xmloff/source/draw/ximpshap.hxx|2 -
 xmloff/source/text/XMLTextFrameContext.cxx |7 -
 xmloff/source/text/XMLTextFrameContext.hxx |2 -
 9 files changed, 62 insertions(+), 8 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-8-win'

[Christian Lohmaier]

Tag 'cp-5.3-8-win' created by Andras Timar  at 
2017-05-02 09:13 +

cp-5.3-8-win

Changes since cp-5.3-4-3:
---
 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-8-win'

[Krunoslav Šebetić]

Tag 'cp-5.3-8-win' created by Andras Timar  at 
2017-05-02 09:13 +

cp-5.3-8-win

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

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

[Laurent Balland-Poirier]

 sd/source/ui/func/fucopy.cxx|2 +-
 sd/uiconfig/sdraw/ui/copydlg.ui |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8b56a5ceed41a1bb0a82af71c90973f50f54e4b8
Author: Laurent Balland-Poirier 
Date:   Sat Apr 22 15:41:16 2017 +0200

tdf#77816 Duplicate dlg: enable fractionnal angle

In Duplicate dialog of Draw:
Count angle in 100th of degree

Change-Id: If1af9a42e7c35d39edbdc3fa624489d7e38b42e1
Reviewed-on: https://gerrit.libreoffice.org/36816
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 45490d68f8b3..0edd047c0fed 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -242,7 +242,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
 mpView->ResizeAllMarked( aRect.TopLeft(), aWidth, aHeight );
 
 if( mpView->IsRotateAllowed() )
-mpView->RotateAllMarked( aRect.Center(), lAngle * 100 );
+mpView->RotateAllMarked( aRect.Center(), lAngle );
 
 if( mpView->IsMoveAllowed() )
 mpView->MoveAllMarked( Size( lSizeX, lSizeY ) );
diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui
index ddadc3fdcd77..07c1a506afda 100644
--- a/sd/uiconfig/sdraw/ui/copydlg.ui
+++ b/sd/uiconfig/sdraw/ui/copydlg.ui
@@ -273,6 +273,7 @@
 True
 ●
 adjustment2
+2
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source include/editeng sc/source sd/source starmath/source svx/source sw/source

[Noel Grandin]

 editeng/source/accessibility/AccessibleEditableTextPara.cxx |5 --
 editeng/source/editeng/editdoc.cxx  |4 -
 editeng/source/editeng/editdoc.hxx  |2 
 editeng/source/editeng/editeng.cxx  |   26 +--
 editeng/source/editeng/editundo.cxx |6 +-
 editeng/source/editeng/editundo.hxx |2 
 editeng/source/editeng/editview.cxx |   18 +++
 editeng/source/editeng/edtspell.cxx |2 
 editeng/source/editeng/eehtml.cxx   |   14 +++---
 editeng/source/editeng/eehtml.hxx   |4 -
 editeng/source/editeng/impedit.cxx  |   10 ++--
 editeng/source/editeng/impedit.hxx  |8 +--
 editeng/source/editeng/impedit2.cxx |   28 ++--
 editeng/source/editeng/impedit3.cxx |   17 +++
 editeng/source/editeng/impedit4.cxx |   13 ++---
 editeng/source/editeng/impedit5.cxx |8 +--
 editeng/source/editeng/textconv.cxx |2 
 editeng/source/misc/SvXMLAutoCorrectImport.cxx  |   12 +
 editeng/source/misc/SvXMLAutoCorrectImport.hxx  |8 +--
 editeng/source/misc/svxacorr.cxx|8 +--
 editeng/source/outliner/outleeng.cxx|2 
 editeng/source/outliner/outlin2.cxx |8 +--
 editeng/source/outliner/outliner.cxx|6 +-
 editeng/source/outliner/outlvw.cxx  |   24 +-
 editeng/source/uno/unotext.cxx  |4 -
 include/editeng/AccessibleEditableTextPara.hxx  |2 
 include/editeng/editeng.hxx |4 -
 include/editeng/outliner.hxx|4 -
 include/editeng/svxacorr.hxx|4 -
 include/editeng/unotext.hxx |2 
 sc/source/ui/view/spelldialog.cxx   |2 
 sd/source/core/stlsheet.cxx |2 
 sd/source/ui/func/fuolbull.cxx  |2 
 sd/source/ui/view/Outliner.cxx  |4 -
 starmath/source/view.cxx|2 
 svx/source/table/cell.cxx   |2 
 svx/source/unodraw/unoshape.cxx |2 
 sw/source/core/edit/autofmt.cxx |7 +--
 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx|2 
 39 files changed, 134 insertions(+), 148 deletions(-)

New commits:
commit 591ac7e604fa47304a5ddc1a4f9badbba1199903
Author: Noel Grandin 
Date:   Tue May 2 08:31:23 2017 +0200

loplugin:checkunusedparams in editeng

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

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx 
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 670253270f11..99d605788a80 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1250,7 +1250,7 @@ namespace accessibility
 }
 if( bSupplementalMode )
 {
-_correctValues( nIndex, aRes );
+_correctValues( aRes );
 // NumberingPrefix
 nRes = aRes.getLength();
 aRes.realloc( nRes + 1 );
@@ -1467,8 +1467,7 @@ namespace accessibility
 return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex);
 }
 
-void AccessibleEditableTextPara::_correctValues( const sal_Int32 /* nIndex 
*/,
-   uno::Sequence< PropertyValue >& 
rValues)
+void AccessibleEditableTextPara::_correctValues( uno::Sequence< 
PropertyValue >& rValues)
 {
 SvxTextForwarder& rCacheTF = GetTextForwarder();
 sal_Int32 nRes = rValues.getLength();
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 1ba99bf61fd5..01c6cab35811 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -605,17 +605,15 @@ void ParaPortion::MarkInvalid( sal_Int32 nStart, 
sal_Int32 nDiff )
 aWritingDirectionInfos.clear();
 }
 
-void ParaPortion::MarkSelectionInvalid( sal_Int32 nStart, sal_Int32 /* nEnd */ 
)
+void ParaPortion::MarkSelectionInvalid( sal_Int32 nStart )
 {
 if ( !bInvalid )
 {
 nInvalidPosStart = nStart;
-//  nInvalidPosEnd = nEnd;
 }
 else
 {
 nInvalidPosStart = std::min( nInvalidPosStart, nStart );
-//  nInvalidPosEnd = pNode->L

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

[Caolán McNamara]

 wizards/Package_template.mk  |2 
 wizards/source/template/DialogStyles.xdl |   32 ---
 wizards/source/template/Samples.xba  |  217 --
 wizards/source/template/script.xlb   |1 
 wizards/source/template/template.src |  250 ---
 5 files changed, 502 deletions(-)

New commits:
commit 062e7063a94673d016a91a16a30e86b82c70a03d
Author: Caolán McNamara 
Date:   Tue May 2 09:41:17 2017 +0100

unused wizards basic file and dialog

Change-Id: I56e82ab480b33d3205516e371302b1a091678e22

diff --git a/wizards/Package_template.mk b/wizards/Package_template.mk
index 13728c7160a5..e117ccc1c1a8 100644
--- a/wizards/Package_template.mk
+++ b/wizards/Package_template.mk
@@ -23,9 +23,7 @@ $(eval $(call 
gb_Package_add_files,wizards_basicsrvtemplate,$(LIBO_SHARE_FOLDER)
Autotext.xba \
Correspondence.xba \
dialog.xlb \
-   DialogStyles.xdl \
ModuleAgenda.xba \
-   Samples.xba \
script.xlb \
TemplateDialog.xdl \
 ))
diff --git a/wizards/source/template/DialogStyles.xdl 
b/wizards/source/template/DialogStyles.xdl
deleted file mode 100644
index ec5f71423593..
--- a/wizards/source/template/DialogStyles.xdl
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-http://openoffice.org/2000/dialog"; 
xmlns:script="http://openoffice.org/2000/script"; dlg:id="DialogStyles" 
dlg:left="170" dlg:top="93" dlg:width="120" dlg:height="169" 
dlg:help-url="HID:WIZARDS_HID_DLGSTYLES_DIALOG" dlg:closeable="true" 
dlg:moveable="true">
- 
-  
-   
-  
-  
-   
-  
-  
-   
-  
- 
-
\ No newline at end of file
diff --git a/wizards/source/template/Samples.xba 
b/wizards/source/template/Samples.xba
deleted file mode 100644
index 03f6c68bb107..
--- a/wizards/source/template/Samples.xba
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="Samples" script:language="StarBasic">Option Explicit
-
-Const SAMPLES = 1000
-Const STYLES = 1100
-Const STYLENAME_DEF = 1120
-Const STYLENAME = 1150
-Const NumStyles = 18
-Const aTempFileName = "Berend_Ilko_Tom_Stella_Volker.stc"
-Public Const Twip = 425
-Dim oUcbObject as Object
-Public StylesDir as String
-Public StylesDialog as Object
-Public PathSeparator as String
-Public oFamilies  as Object
-Public aOptions(0) as New com.sun.star.beans.PropertyValue
-Public sQueryPath as String
-Public NoArgs()as New com.sun.star.beans.PropertyValue
-Public aTempURL as String
-
-Public Files(100) as String
-
-
-'--
-'Miscellaneous Section starts here
-
-Function PrepareForEditing(Optional ByVal oDocument)
-'This sub is called when sample documents are loaded (load event).
-'It checks whether the documents is read-only, in which case it
-'offers the user to create a new (writable) document using the original
-'as a template.
-Dim DocPath as String
-Dim MMessage as String
-Dim MTitle as String
-Dim RValue as Integer
-Dim oNewDocument as Object
-Dim mFileProperties(1) as New com.sun.star.beans.PropertyValue
-   PrepareForEditing = NULL
-   BasicLibraries.LoadLibrary( "Tools" )
-   If InitResources("'Template'", "tpl") then
-   If IsMissing(oDocument) Then
-   oDocument = ThisComponent
-   End If
-   If oDocument.IsReadOnly then
-   MMessage = GetResText(SAMPLES)
-   MTitle = GetResText(SAMPLES + 1)
-   RValue = Msgbox(MMessage, (128+48+1), MTitle)
-   If RValue = 1 Then
-   DocPath = oDocument.URL
-   mFileProperties(0).Name = "AsTemplate"
-   mFileProperties(0).Value = True
-   mFileProperties(1).Name = 
"MacroExecutionMode"
-   mFileProperties(1).Value = 
com.sun.star.document.MacroExecMode.USE_CONFIG   
-   
-   oNewDocument = 
StarDesktop.LoadComponentFromURL(DocPath,"_default",0, 
mFileProperties())
-   PrepareForEditing() = oNewDocument
-   DisposeDocument(oDocument)
-   Else
-   PrepareForEditing() = NULL
-   End If
-   Else
-   PrepareForEditing() = oDocument
-   End If
-   End If
-End Function
-
-
-
-'--
-'Calc Style Section starts here
-
-Sub ShowStyles
-'This sub displays the style selection dialog if the current document is 
a calc document.
-Dim TemplateDir, ActFileTitle, DisplayDummy as String
-Dim sFilterName(0) as String
-Dim StyleNames() as String
-Dim LocalizedStyleNames(NumStyles,2) As String
-Dim LocalizedStyleName As String
-Dim t as Integer
-Dim

[Libreoffice-commits] core.git: xmlsecurity/Module_xmlsecurity.mk

[Caolán McNamara]

 xmlsecurity/Module_xmlsecurity.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a0effa00b4b3db15a9c2f80db2da5b54d63b4559
Author: Caolán McNamara 
Date:   Tue May 2 09:46:23 2017 +0100

revert 'tweak for pdfiumless build'

commit 8d747b8cf849b7d705048544ac20eceba7eb5a45
Author: Caolán McNamara 
Date:   Sat Apr 29 20:01:40 2017 +0100

tweak for pdfiumless build

and lets see if

commit 6f53cf281eb3c13fc516ff79decb70b2a87a96d0
Author: Markus Mohrhard 
Date:   Sat Apr 29 05:11:40 2017 +0200

apparently the executable does not need pdfium directly anymore

is sufficient here

Change-Id: I2bf381e1d51d851aa829730b3d13edb1c03ea873

diff --git a/xmlsecurity/Module_xmlsecurity.mk 
b/xmlsecurity/Module_xmlsecurity.mk
index 79675290fcd3..d3fafeb7e4ec 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -46,14 +46,12 @@ $(eval $(call gb_Module_add_screenshot_targets,xmlsecurity,\
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-ifneq (,$(filter PDFIUM,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,xmlsecurity,\
 Executable_pdfverify \
 ))
 
 endif
-endif
 
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: bitmap resources are disconnected from .src/.res now

[Miklos Vajna]

Hi,

On Thu, Apr 27, 2017 at 02:40:26PM +0100, Caolán McNamara  
wrote:
> tl;dr: To use a theme png in C++, add #define NAME "path/to/png" to a
> .hlst and use BitmapEx foo(NAME)

If I understand correctly, this is also means it's harder to get this
wrong, as you don't have to assign an ID to each & every bitmap, where
the IDs can accidentally collide, correct?

Provided the above is true, great -- thanks a lot. :-)

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: xmlsecurity/Module_xmlsecurity.mk

[Caolán McNamara]

On Tue, 2017-05-02 at 09:26 +0200, Miklos Vajna wrote:
> Is this necessary after 6f53cf281eb3c13fc516ff79decb70b2a87a96d0 from
> Markus?

I can find out
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Pranav Kant]

 loleaflet/src/layer/AnnotationManager.js |4 
 1 file changed, 4 insertions(+)

New commits:
commit e713b843a0c9adef78051a7598e88d41b2881957
Author: Pranav Kant 
Date:   Tue May 2 14:16:50 2017 +0530

lolefalet: Animate all annotation elements, not just selected

Change-Id: I5b597b057e5f26e79b4db7aa3b4b5733c34914cf

diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index 01359b0b..3ef0dc8a 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -247,6 +247,7 @@ L.AnnotationManager = L.Class.extend({
if (commentThread.length <= 0)
return;
 
+   (new L.PosAnimation()).run(commentThread[0]._container, 
this._map.latLngToLayerPoint(latLng));
commentThread[0].setLatLng(latLng);
var bounds = commentThread[0].getBounds();
var idx = 1;
@@ -268,6 +269,7 @@ L.AnnotationManager = L.Class.extend({
idx = 0;
for (idx = 0; idx < commentThread.length; ++idx) {
latLng = this._map.layerPointToLatLng(pt);
+   (new 
L.PosAnimation()).run(commentThread[idx]._container, 
this._map.latLngToLayerPoint(latLng));
commentThread[idx].setLatLng(latLng);
commentThread[idx].show();
 
@@ -280,6 +282,7 @@ L.AnnotationManager = L.Class.extend({
if (commentThread.length <= 0)
return;
 
+   (new L.PosAnimation()).run(commentThread[0]._container, 
this._map.latLngToLayerPoint(latLng));
commentThread[0].setLatLng(latLng);
var bounds = commentThread[0].getBounds();
var idx = 1;
@@ -301,6 +304,7 @@ L.AnnotationManager = L.Class.extend({
idx = 0;
for (idx = 0; idx < commentThread.length; ++idx) {
latLng = this._map.layerPointToLatLng(pt);
+   (new 
L.PosAnimation()).run(commentThread[idx]._container, 
this._map.latLngToLayerPoint(latLng));
commentThread[idx].setLatLng(latLng);
commentThread[idx].show();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - dictionaries

[Olivier R]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 57e43ecb08755d571a186334a2b57429a0340a22
Author: Olivier R 
Date:   Tue May 2 03:33:24 2017 -0500

Updated core
Project: dictionaries  94f10f3bdf176cd47f2c2e9ac26f357c2dd2007b

tdf#107558 French spelling dictionary (6.0.3) and thesaurus

Change-Id: Ia3da9c3b2e4a0ca1032edad131838b3a705e0597
(cherry picked from commit c82ad83da55f7c0d4667edea003b8038e473dcd1)
Reviewed-on: https://gerrit.libreoffice.org/37141
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index e90820839661..94f10f3bdf17 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit e90820839661af7a0274fb3d8e89d4c83d8eca97
+Subproject commit 94f10f3bdf176cd47f2c2e9ac26f357c2dd2007b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-5-3' - fr_FR/description.xml fr_FR/fr.aff fr_FR/fr.dic fr_FR/package-description.txt fr_FR/README_fr.txt fr_FR/thes_fr.dat

[Olivier R]

 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(-)

New commits:
commit 94f10f3bdf176cd47f2c2e9ac26f357c2dd2007b
Author: Olivier R 
Date:   Tue May 2 03:33:24 2017 -0500

tdf#107558 French spelling dictionary (6.0.3) and thesaurus

Change-Id: Ia3da9c3b2e4a0ca1032edad131838b3a705e0597
(cherry picked from commit c82ad83da55f7c0d4667edea003b8038e473dcd1)
Reviewed-on: https://gerrit.libreoffice.org/37141
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/fr_FR/README_fr.txt b/fr_FR/README_fr.txt
index 7dccd42..95762ee 100644
--- a/fr_FR/README_fr.txt
+++ b/fr_FR/README_fr.txt
@@ -1,7 +1,7 @@
 ___
 
DICTIONNAIRES ORTHOGRAPHIQUES FRANÇAIS
-   version 5.4.1
+   version 6.0.3
 
Olivier R. - dicollectefreefr
Dicollecte : http://www.dicollecte.org/
@@ -17,8 +17,8 @@ 
___
- Jean-Luc T. ;
- Sylvain P. ;
- Laurent Dubois ;
-   - Pierre Poisson ;
- Dominique Pellé ;
+   - Pierre Poisson ;
- Pierre-Yves ;
- Pierre Choffardet ;
- Leywen ;
diff --git a/fr_FR/description.xml b/fr_FR/description.xml
index a8ecd7b..868a980 100644
--- a/fr_FR/description.xml
+++ b/fr_FR/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 French spelling dictionary, hyphenation rules, and 
thesaurus
diff --git a/fr_FR/fr.aff b/fr_FR/fr.aff
index 3518322..c6d2042 100644
--- a/fr_FR/fr.aff
+++ b/fr_FR/fr.aff
@@ -2,9 +2,9 @@
 # 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/.
 
-# AFFIXES DU DICTIONNAIRE ORTHOGRAPHIQUE FRANÇAIS “CLASSIQUE” v5.4.1
+# AFFIXES DU DICTIONNAIRE ORTHOGRAPHIQUE FRANÇAIS “CLASSIQUE” v6.0.3
 # par Olivier R. -- licence MPL 2.0
-# Généré le 25 08 2015 à 15:05
+# Généré le 25-04-2017 à 13:20
 # Pour améliorer le dictionnaire, allez sur http://www.dicollecte.org/
 
 
@@ -44,7 +44,7 @@ MAP wW
 MAP xX
 MAP zZ
 
-REP 79
+REP 82
 REP ^Ca$ Ça
 REP ^l l'
 REP ^d d'
@@ -110,6 +110,8 @@ REP ett èt
 REP èt ett
 REP ell èl
 REP èl ell
+REP t th
+REP th t
 REP ième$ e
 REP ème$ e
 REP è$ e
@@ -124,14 +126,16 @@ REP sanctionnable punissable
 REP questionnable discutable
 REP antitartre détartrant
 REP email courriel
+REP construirent construisirent
 
 
 
 
 KEY azertyuiop|qsdfghjklmù|wxcvbn|aéz|yèu|iço|oà
p|aqz|zse|edr|rft|tgy|yhu|uji|iko|olpm|qws|sxd|dcf|fvg|gbh|hnj
 
-ICONV 40
+ICONV 41
 ICONV ’ '
+ICONV ʼ '
 ICONV ffi ffi
 ICONV ffl ffl
 ICONV ff ff
@@ -206,1154 +210,428 @@ BREAK ’$
 
 
 
-AM 465
-AM po:nom is:mas
-AM po:nom is:fem
-AM po:adj is:epi
-AM po:adj
-AM po:v1__t___??
-AM po:nom po:adj
-AM po:nom is:mas is:inv
-AM po:adv
-AM po:nom
-AM po:nom is:epi
-AM po:nom po:adj is:epi
-AM po:npr is:epi is:inv
-AM po:v1__t_q_??
-AM po:prn is:mas is:inv
-AM po:prn is:fem is:inv
-AM po:patr is:epi is:inv
-AM po:nom is:mas is:sg
-AM po:v1_i??
-AM po:v1_it___??
-AM po:nom is:fem is:sg
-AM po:nom is:mas is:pl
-AM po:ifut po:3sg
-AM po:cond po:3sg
-AM po:cond po:3pl
-AM po:ifut po:3pl!
-AM po:ifut po:2pl
-AM po:ifut po:1pl
-AM po:cond po:2pl
-AM po:cond po:1pl
-AM po:impe po:2sg
-AM po:ifut po:2sg
-AM po:ifut po:1sg
-AM po:cond po:1sg po:2sg
-AM po:ipre po:spre po:3pl
-AM po:adj is:epi is:inv
-AM po:v1_it_q_??
-AM po:nom is:fem is:pl
-AM po:ipre po:spre po:1sg po:3sg
-AM po:ipre po:spre po:2sg
-AM po:nom is:fem is:inv
-AM po:ppre
-AM po:nb is:epi is:pl
-AM po:iimp po:3sg
-AM po:iimp po:3pl
-AM po:simp po:3sg
-AM po:ipre po:1pl
-AM po:impe po:1pl
-AM po:ipsi po:2pl
-AM po:ipsi po:1pl
-AM po:simp po:3pl
-AM po:iimp po:1sg po:2sg
-AM po:infi
-AM po:interj
-AM po:v1p_e_
-AM po:ipsi po:3sg
-AM po:simp po:2pl
-AM po:simp po:1pl
-AM po:simp po:2sg
-AM po:simp po:1sg
-AM po:ipre po:2pl
-AM po:ipsi po:3pl!
-AM po:impe po:2pl
-AM po:iimp po:spre po:2pl
-AM po:iimp po:spre po:1pl
-AM po:loc.adv
-AM po:adj is:epi is:sg
-AM po:ppas po:adj is:fem is:sg
-AM po:ppas po:adj is:fem is:pl
-AM po:ipre po:3sg
-AM po:ppas po:adj is:mas is:pl
-AM po:ppas po:adj is:mas is:sg
-AM po:spre po:2sg
-AM po:spre po:1sg po:3sg
-AM po:nom is:epi is:inv
-AM po:ipre po:1sg po:2sg
-AM po:v2__t___??
-AM po:ipsi po:1sg po:2sg
-AM po:v3__t___??
-AM po:v2__t_q_??
-AM is:mas is:sg
-AM is:mas is:pl
-AM po:v1__t___?? po:infi
-AM po:ipsi po:2sg
-AM po:ipsi po:1sg
-AM po:v3__t_q_??
-AM po:nom po:adj is:mas
-AM po:mg po:prep
-AM po:prn is:epi is:inv
-