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

[Stephan Bergmann]

 include/android/compatibility.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 587f0b03c3ba5bdea12cd3cfc9564a70b77a54e9
Author: Stephan Bergmann 
Date:   Fri Jan 19 09:02:22 2018 +0100

Blind fix for Android

...after 022588bf2060a53ae70db6b0f1de713e4ba3ee6a "Include
android/compatibility.hxx from ubiquitous sal/config.h"

Change-Id: I58c620fd25add4758ec981c9812811916fa09db5

diff --git a/include/android/compatibility.hxx 
b/include/android/compatibility.hxx
index a3fdb0d256b4..a60d59cfd653 100644
--- a/include/android/compatibility.hxx
+++ b/include/android/compatibility.hxx
@@ -20,6 +20,7 @@
 #include 
 
 #if defined(ARM)
+#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc2ee044d9fc34d112842ca6e4150567238c7e4f
Author: Stephan Bergmann 
Date:   Fri Jan 19 09:05:45 2018 +0100

Blind fix for sal_Int32 = long

...after 252ce90e39648c47bcfdb39547d0ac82bacdbae6 "sw lokit: add page syles 
to
header & footer"

Change-Id: Ia0b3f8194d889fc1022da08bac06c85cbb22dd3b

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 3a9c1c6f9985..3cbb48c6f26e 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1953,7 +1953,7 @@ void checkPageHeaderOrFooter(const SfxViewShell* 
pViewShell, sal_uInt16 nWhich,
 pListItem->GetStringList(aSeq);
 if (bValue)
 {
-CPPUNIT_ASSERT_EQUAL(1, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aSeq.getLength());
 CPPUNIT_ASSERT_EQUAL(OUString("Default Style"), aSeq[0]);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerperfect/qa/unit/EPUBExportTest.cxx  |   11 ++
 writerperfect/qa/unit/data/writer/epubexport/image-link.fodt  |2 
 writerperfect/qa/unit/data/writer/epubexport/link-invalid.odt |binary
 writerperfect/source/writer/exp/txtparai.cxx  |   30 +--
 writerperfect/source/writer/exp/xmlimp.cxx|   39 +-
 writerperfect/source/writer/exp/xmlimp.hxx|   15 +++
 6 files changed, 68 insertions(+), 29 deletions(-)

New commits:
commit 5c4d5021000584ac541e4d0323586c4ff926173f
Author: Miklos Vajna 
Date:   Thu Jan 18 11:49:45 2018 +0100

EPUB export: fix validation error on invalid relative links

It's valid to have a relative link that points nowhere in ODF, but the
same is not true for EPUB.

Change-Id: I7884032e277a0c53d0c513cea70dd2ee29ccd85c

diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index f52667a9b6ce..5a1c21c0e48f 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -85,6 +85,7 @@ public:
 void testTableCellWidth();
 void testTableRowHeight();
 void testLink();
+void testLinkInvalid();
 void testLinkCharFormat();
 void testLinkNamedCharFormat();
 void testTableWidth();
@@ -129,6 +130,7 @@ public:
 CPPUNIT_TEST(testTableCellWidth);
 CPPUNIT_TEST(testTableRowHeight);
 CPPUNIT_TEST(testLink);
+CPPUNIT_TEST(testLinkInvalid);
 CPPUNIT_TEST(testLinkCharFormat);
 CPPUNIT_TEST(testLinkNamedCharFormat);
 CPPUNIT_TEST(testTableWidth);
@@ -662,6 +664,15 @@ void EPUBExportTest::testLink()
 assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a", "href", 
"https://libreoffice.org/";);
 }
 
+void EPUBExportTest::testLinkInvalid()
+{
+createDoc("link-invalid.odt", {});
+
+mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+// This was 1, invalid relative link was not filtered out.
+assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a", 0);
+}
+
 void EPUBExportTest::testLinkCharFormat()
 {
 createDoc("link-charformat.fodt", {});
diff --git a/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt 
b/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt
index 9414e36fd723..0796cea3e4b1 100644
--- a/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt
+++ b/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt
@@ -16,7 +16,7 @@
   
   
 
-  iVBORw0KGgoNSUhEUgAAAEBACAQAYLlVBGdBTUEAALGPC/xhBQFz
+  http://libreoffice.org/";>iVBORw0KGgoNSUhEUgAAAEBACAQAYLlVBGdBTUEAALGPC/xhBQFz
 
UkdCAK7OHOkgY0hSTQAAeiYAAICEAAD6gOgAAHUwAADqYAAAOpgAABdwnLpRPAAA
 
AAJiS0dEAACqjSMyCW9GRnMGAAAMc1XTCXBIWXMAAA3XAAAN1wFCKJt4
 
CXZwQWcAAABMQACdMTgbAAABzUlEQVRo3u3ZPU/CQBjA8X+Jxs3ESUDj4iK+LA5+
diff --git a/writerperfect/qa/unit/data/writer/epubexport/link-invalid.odt 
b/writerperfect/qa/unit/data/writer/epubexport/link-invalid.odt
new file mode 100644
index ..3bbbdeb921e3
Binary files /dev/null and 
b/writerperfect/qa/unit/data/writer/epubexport/link-invalid.odt differ
diff --git a/writerperfect/source/writer/exp/txtparai.cxx 
b/writerperfect/source/writer/exp/txtparai.cxx
index 309f80ce607a..904c865bf90d 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -237,6 +237,7 @@ public:
 
 private:
 librevenge::RVNGPropertyList m_aPropertyList;
+PopupState m_ePopupState = PopupState::NONE;
 };
 
 XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(XMLImport &rImport, 
const librevenge::RVNGPropertyList &rPropertyList)
@@ -265,8 +266,12 @@ void XMLTextFrameHyperlinkContext::startElement(const 
OUString &/*rName*/, const
 FillStyles(rAttributeValue, mrImport.GetAutomaticTextStyles(), 
mrImport.GetTextStyles(), m_aPropertyList);
 else
 {
-if (rAttributeName == "xlink:href" && 
mrImport.FillPopupData(rAttributeValue, aPropertyList))
-continue;
+if (rAttributeName == "xlink:href")
+{
+m_ePopupState = mrImport.FillPopupData(rAttributeValue, 
aPropertyList);
+if (m_ePopupState != PopupState::NotConsumed)
+continue;
+}
 
 // This affects the link's properties.
 OString sName = OUStringToOString(rAttributeName, 
RTL_TEXTENCODING_UTF8);
@@ -275,12 +280,14 @@ void XMLTextFrameHyperlinkContext::startElement(const 
OUString &/*rName*/, const
 }
 }
 
-mrImport.GetGenerator().openLink(aPropertyList);
+if (m_ePopupState != PopupState::Ignore)
+mrImport.GetGenerator().openLink(aPropertyList);
 }
 
 void XMLTextFrameHyperlinkContext::endElement(const OUString &/*rName*/)
 {
-mrImport.GetGenerator().closeLink();
+if (m_ePopupState != PopupState::Ignore)
+mrImport.GetGenerator()

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

[Stephan Bergmann]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49785da100cbb9950023d9d81a767f1583a6ea9e
Author: Stephan Bergmann 
Date:   Fri Jan 19 09:07:49 2018 +0100

...and another

Change-Id: I06aa51f0f46f3708540ebb218387cb028b9e65d3

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 3cbb48c6f26e..5a90230be574 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1957,7 +1957,7 @@ void checkPageHeaderOrFooter(const SfxViewShell* 
pViewShell, sal_uInt16 nWhich,
 CPPUNIT_ASSERT_EQUAL(OUString("Default Style"), aSeq[0]);
 }
 else
-CPPUNIT_ASSERT_EQUAL(0, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSeq.getLength());
 };
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 external/libepubgen/libepubgen-epub3.patch.1 |   30 +++
 1 file changed, 30 insertions(+)

New commits:
commit d5d4166df8ad189761387146966c91d58c28076f
Author: Miklos Vajna 
Date:   Thu Jan 18 15:05:55 2018 +0100

EPUB export: handle text frame and image width

So that an image and its caption in a text frame always go to separate
lines.

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

diff --git a/external/libepubgen/libepubgen-epub3.patch.1 
b/external/libepubgen/libepubgen-epub3.patch.1
index 7ea3a365737f..4b7fe5215f05 100644
--- a/external/libepubgen/libepubgen-epub3.patch.1
+++ b/external/libepubgen/libepubgen-epub3.patch.1
@@ -167,3 +167,33 @@ index bc9c1b7..59ded90 100644
 -- 
 2.13.6
 
+From 51e17dc87d85f1dc71b380906f9260de4cd0371c Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Thu, 18 Jan 2018 14:54:06 +0100
+Subject: [PATCH] EPUBImageManager: handle relative and absolute width
+
+---
+ src/lib/EPUBImageManager.cpp   |  6 +
+ src/test/EPUBTextGeneratorTest.cpp | 54 ++
+ 2 files changed, 60 insertions(+)
+
+diff --git a/src/lib/EPUBImageManager.cpp b/src/lib/EPUBImageManager.cpp
+index bdf3bf0..cb4efee 100644
+--- a/src/lib/EPUBImageManager.cpp
 b/src/lib/EPUBImageManager.cpp
+@@ -171,6 +171,12 @@ void 
EPUBImageManager::extractImageProperties(librevenge::RVNGPropertyList const
+   continue;
+ cssProps[type[i]] =  pList[field.c_str()]->getStr().cstr();
+   }
++
++  // Extract size.
++  if (auto pRelWidth = pList["style:rel-width"])
++cssProps["width"] = pRelWidth->getStr().cstr();
++  else if (auto pWidth = pList["svg:width"])
++cssProps["width"] = pWidth->getStr().cstr();
+ }
+ 
+ std::string EPUBImageManager::getWrapStyle(librevenge::RVNGPropertyList const 
&pList)
+-- 
+2.13.6
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerperfect/qa/unit/EPUBExportTest.cxx |   
14 ++
 writerperfect/qa/unit/data/writer/epubexport/popup-media.odt 
|binary
 writerperfect/qa/unit/data/writer/epubexport/popup-media/libreoffice.png 
|binary
 writerperfect/source/writer/exp/xmlimp.cxx   |   
22 --
 4 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit 9035ee7c90ed5ff78864145fd92241491033c074
Author: Miklos Vajna 
Date:   Thu Jan 18 15:53:54 2018 +0100

EPUB export: accept relative links for image popup from default media dir

Previously:

- the user had to copy the linked image to the same dir as the doc
- set a relative link on the image (in ODF, it resulted in "../foo.png")
- copy the image to the media dir ("test" by default for "test.odt")
- export to EPUB to have the image popup

Now, additionally:

- relative link may point to the default media dir (in ODF, it results
  in "../test/foo.png")
- no need to copy the image
- export to EPUB creates the popup

So one less step is necessary. The downside is that this way the
relative URL contain the base name of the document, so renaming the
document breaks these relative links.

Change-Id: I93894a28393d36a33dcec7bfe7c4a54fd83768da

diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index 5a1c21c0e48f..176324b0dff7 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -94,6 +94,7 @@ public:
 void testImageLink();
 void testFootnote();
 void testPopup();
+void testPopupMedia();
 void testPopupAPI();
 void testPageSize();
 void testSVG();
@@ -139,6 +140,7 @@ public:
 CPPUNIT_TEST(testImageLink);
 CPPUNIT_TEST(testFootnote);
 CPPUNIT_TEST(testPopup);
+CPPUNIT_TEST(testPopupMedia);
 CPPUNIT_TEST(testPopupAPI);
 CPPUNIT_TEST(testPageSize);
 CPPUNIT_TEST(testSVG);
@@ -791,6 +793,18 @@ void EPUBExportTest::testPopup()
 assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside[2]/xhtml:img", 1);
 }
 
+void EPUBExportTest::testPopupMedia()
+{
+// This is the same as testPopup(), but the links point to images in the
+// default media directory, not in the document directory.
+createDoc("popup-media.odt", {});
+
+mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+// Test image popup anchor. This failed, number of XPath nodes was 0.
+assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a", "type", 
"noteref");
+assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a/xhtml:img", 1);
+}
+
 void EPUBExportTest::testPopupAPI()
 {
 // Make sure that the popup works with data from a media directory.
diff --git a/writerperfect/qa/unit/data/writer/epubexport/popup-media.odt 
b/writerperfect/qa/unit/data/writer/epubexport/popup-media.odt
new file mode 100644
index ..5f45e7ce8aef
Binary files /dev/null and 
b/writerperfect/qa/unit/data/writer/epubexport/popup-media.odt differ
diff --git 
a/writerperfect/qa/unit/data/writer/epubexport/popup-media/libreoffice.png 
b/writerperfect/qa/unit/data/writer/epubexport/popup-media/libreoffice.png
new file mode 100644
index ..cc74f136fbdf
Binary files /dev/null and 
b/writerperfect/qa/unit/data/writer/epubexport/popup-media/libreoffice.png 
differ
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx 
b/writerperfect/source/writer/exp/xmlimp.cxx
index f600840be1d7..f001bd667e5a 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -367,6 +367,16 @@ const librevenge::RVNGPropertyList 
&XMLImport::GetMetaData()
 return maMetaData;
 }
 
+namespace
+{
+/// Finds out if a file URL exists.
+bool FileURLExists(const OUString& rURL)
+{
+SvFileStream aStream(rURL, StreamMode::READ);
+return aStream.IsOpen();
+}
+}
+
 PopupState XMLImport::FillPopupData(const OUString &rURL, 
librevenge::RVNGPropertyList &rPropList)
 {
 uno::Reference xUriRef;
@@ -384,16 +394,20 @@ PopupState XMLImport::FillPopupData(const OUString &rURL, 
librevenge::RVNGProper
 if (bAbsolute)
 return PopupState::NotConsumed;
 
+// Default case: relative URL, popup data was in the same directory as the
+// document at insertion time.
 OUString aAbs = maMediaDir + rURL;
-if (aAbs.isEmpty())
-return PopupState::NotConsumed;
+if (!FileURLExists(aAbs))
+// Fallback case: relative URL, popup data was in the default media
+// directory at insertion time.
+aAbs = maMediaDir + "../" + rURL;
 
-SvFileStream aStream(aAbs, StreamMode::READ);
-if (!aStream.IsOpen())
+if (!FileURLExists(aAbs))
 // Relative link, but points to non-existing file: don't emit that to
 // librevenge, since it will be invalid anyway.
 return PopupState::Ignore;
 
+SvFileStream aStream(aAbs,

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

[Miklos Vajna]

 writerperfect/source/writer/EPUBExportDialog.cxx  |   14 --
 writerperfect/source/writer/EPUBExportDialog.hxx  |3 ++-
 writerperfect/source/writer/EPUBExportUIComponent.cxx |7 ++-
 writerperfect/source/writer/EPUBExportUIComponent.hxx |8 +++-
 writerperfect/source/writer/exp/xmlimp.cxx|2 +-
 5 files changed, 28 insertions(+), 6 deletions(-)

New commits:
commit 9bca3cc18655d02f3c111d692b26339a6e3669d4
Author: Miklos Vajna 
Date:   Thu Jan 18 18:04:45 2018 +0100

EPUB export UI: show title from the doc model

It was a bit confusing that the doc model had a title set, it was
written to the EPUB file but the UI did not show it.

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

diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx 
b/writerperfect/source/writer/EPUBExportDialog.cxx
index 2add78c6389f..09ab58499a26 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -13,6 +13,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -68,10 +69,11 @@ sal_Int32 PositionToVersion(sal_Int32 nPosition)
 namespace writerperfect
 {
 
-EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent, 
comphelper::SequenceAsHashMap &rFilterData, 
uno::Reference xContext)
+EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent, 
comphelper::SequenceAsHashMap &rFilterData, 
uno::Reference xContext, const 
css::uno::Reference &xDocument)
 : ModalDialog(pParent, "EpubDialog", "writerperfect/ui/exportepub.ui"),
   mxContext(std::move(xContext)),
-  mrFilterData(rFilterData)
+  mrFilterData(rFilterData),
+  mxSourceDocument(xDocument)
 {
 get(m_pVersion, "versionlb");
 assert(PositionToVersion(m_pVersion->GetSelectedEntryPos()) == 
EPUBExportFilter::GetDefaultVersion());
@@ -124,7 +126,15 @@ EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent, 
comphelper::SequenceAsH
 m_pMediaButton->SetClickHdl(LINK(this, EPUBExportDialog, MediaClickHdl));
 
 get(m_pIdentifier, "identifier");
+
 get(m_pTitle, "title");
+uno::Reference 
xDPS(mxSourceDocument, uno::UNO_QUERY);
+uno::Reference xDP;
+if (xDPS.is())
+xDP = xDPS->getDocumentProperties();
+if (xDP.is())
+m_pTitle->SetText(xDP->getTitle());
+
 get(m_pInitialCreator, "author");
 get(m_pLanguage, "language");
 get(m_pDate, "date");
diff --git a/writerperfect/source/writer/EPUBExportDialog.hxx 
b/writerperfect/source/writer/EPUBExportDialog.hxx
index 8180e4a24366..7d7f016b1a18 100644
--- a/writerperfect/source/writer/EPUBExportDialog.hxx
+++ b/writerperfect/source/writer/EPUBExportDialog.hxx
@@ -27,7 +27,7 @@ namespace writerperfect
 class EPUBExportDialog : public ModalDialog
 {
 public:
-EPUBExportDialog(vcl::Window *pParent, comphelper::SequenceAsHashMap 
&rFilterData, css::uno::Reference xContext);
+EPUBExportDialog(vcl::Window *pParent, comphelper::SequenceAsHashMap 
&rFilterData, css::uno::Reference xContext, const 
css::uno::Reference &xDocument);
 ~EPUBExportDialog() override;
 void dispose() override;
 
@@ -41,6 +41,7 @@ private:
 
 css::uno::Reference mxContext;
 comphelper::SequenceAsHashMap &mrFilterData;
+css::uno::Reference mxSourceDocument;
 VclPtr m_pVersion;
 VclPtr m_pSplit;
 VclPtr m_pLayout;
diff --git a/writerperfect/source/writer/EPUBExportUIComponent.cxx 
b/writerperfect/source/writer/EPUBExportUIComponent.cxx
index 66d8506fa771..4df8ea4a1946 100644
--- a/writerperfect/source/writer/EPUBExportUIComponent.cxx
+++ b/writerperfect/source/writer/EPUBExportUIComponent.cxx
@@ -76,12 +76,17 @@ sal_Int16 EPUBExportUIComponent::execute()
 {
 SolarMutexGuard aGuard;
 
-ScopedVclPtrInstance 
pDialog(Application::GetDefDialogParent(), maFilterData, mxContext);
+ScopedVclPtrInstance 
pDialog(Application::GetDefDialogParent(), maFilterData, mxContext, 
mxSourceDocument);
 if (pDialog->Execute() == RET_OK)
 return ui::dialogs::ExecutableDialogResults::OK;
 return ui::dialogs::ExecutableDialogResults::CANCEL;
 }
 
+void SAL_CALL EPUBExportUIComponent::setSourceDocument(const 
css::uno::Reference &xDocument)
+{
+mxSourceDocument = xDocument;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface 
*com_sun_star_comp_Writer_EPUBExportUIComponent_get_implementation(uno::XComponentContext
 *pCtx, uno::Sequence const &/*rSeq*/)
 {
 return cppu::acquire(new EPUBExportUIComponent(pCtx));
diff --git a/writerperfect/source/writer/EPUBExportUIComponent.hxx 
b/writerperfect/source/writer/EPUBExportUIComponent.hxx
index 3ef6d7cc1b2f..865571dde97b 100644
--- a/writerperfect/source/writer/EPUBExportUIComponent.hxx
+++ b/writerperfect/source/writer/EPUBExportUIComponent.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -26,7

[Libreoffice-commits] core.git: include/o3tl include/osl include/sal include/svl sal/osl sal/rtl

[Stephan Bergmann]

 include/o3tl/strong_int.hxx |2 ++
 include/osl/interlck.h  |4 
 include/sal/config.h|5 +
 include/sal/types.h |4 
 include/svl/itemset.hxx |1 +
 sal/osl/all/log.cxx |1 +
 sal/osl/unx/interlck.cxx|1 +
 sal/osl/unx/salinit.cxx |1 +
 sal/rtl/math.cxx|1 +
 9 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 64c9bda0b9d43a4b4cc1d40068f0d0fb261fb5b4
Author: Stephan Bergmann 
Date:   Thu Jan 18 20:06:18 2018 +0100

Remove include of config_global.h from sal/config.h

(where it is not actually needed), and instead include it where needed

Change-Id: I107f8d4002d3001393b89834dd30a30b0c53a792
Reviewed-on: https://gerrit.libreoffice.org/48152
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/include/o3tl/strong_int.hxx b/include/o3tl/strong_int.hxx
index 2c9177b405e0..c0378e344c69 100644
--- a/include/o3tl/strong_int.hxx
+++ b/include/o3tl/strong_int.hxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+
 namespace o3tl
 {
 
diff --git a/include/osl/interlck.h b/include/osl/interlck.h
index a98c08cb511c..c0e06fd6f659 100644
--- a/include/osl/interlck.h
+++ b/include/osl/interlck.h
@@ -29,6 +29,10 @@
 #include 
 #endif
 
+#if defined LIBO_INTERNAL_ONLY
+#include "config_global.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/sal/config.h b/include/sal/config.h
index 7fcdbfab45ad..03a2f5b9fa21 100644
--- a/include/sal/config.h
+++ b/include/sal/config.h
@@ -20,12 +20,9 @@
 #ifndef INCLUDED_SAL_CONFIG_H
 #define INCLUDED_SAL_CONFIG_H
 
-#if defined LIBO_INTERNAL_ONLY
-#include "config_global.h"
-#if defined ANDROID && defined __cplusplus
+#if defined LIBO_INTERNAL_ONLY && defined ANDROID && defined __cplusplus
 #include 
 #endif
-#endif
 
 #include 
 
diff --git a/include/sal/types.h b/include/sal/types.h
index 5f6331709af3..8678562ccc76 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -27,6 +27,10 @@
 #include "sal/macros.h"
 #include "sal/typesizes.h"
 
+#if defined LIBO_INTERNAL_ONLY
+#include "config_global.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index d5a2b5eb5ad7..c8e32863ba84 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 66722662af80..83ff23e42add 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/sal/osl/unx/interlck.cxx b/sal/osl/unx/interlck.cxx
index e114485877db..81404cb57a7a 100644
--- a/sal/osl/unx/interlck.cxx
+++ b/sal/osl/unx/interlck.cxx
@@ -19,6 +19,7 @@
 
 #include "system.hxx"
 
+#include 
 #include 
 
 #if  ( defined (__sun) || defined ( NETBSD ) ) && defined ( SPARC )
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index cfc612b8b77c..5e95c2bab532 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -28,6 +28,7 @@
 #include 
 #endif
 
+#include 
 #include 
 #include 
 #include 
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 387ae3b2b4aa..9f25d653f3f1 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -19,6 +19,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 package/source/zipapi/XUnbufferedStream.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 713b261b59e3636890b6a5736c6a3fcc0be647a8
Author: Caolán McNamara 
Date:   Thu Jan 18 20:54:22 2018 +

crashtesting: failure on import with bogus values

regression from...

commit 7d8e9d989d0ac4a4055b207726708e9ec0da
Date:   Thu Jan 11 08:47:15 2018 +0200

convert ahttps://gerrit.libreoffice.org/48155
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/package/source/zipapi/XUnbufferedStream.cxx 
b/package/source/zipapi/XUnbufferedStream.cxx
index 1f992ca14e58..0aedfac09402 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -210,7 +210,7 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< 
sal_Int8 >& aData, sa
 
 nRead = mxZipStream->readBytes (
 aData,
-std::min(nDiff, 
nRequestedBytes) );
+std::min(nDiff, 
nRequestedBytes) );
 
 mnZipCurrent += nRead;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpparastyle.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d4bb2a9e17c0ce5188cefae8dd6cc16564b29521
Author: Caolán McNamara 
Date:   Thu Jan 18 10:44:11 2018 +

ofz#5468 Integer-overflow

Change-Id: Ie2792b7dffaffe939778a1546653424ac03ea30e
Reviewed-on: https://gerrit.libreoffice.org/48105
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx 
b/lotuswordpro/source/filter/lwpparastyle.cxx
index 9ebf5e7b3303..ea8ff180c0b8 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -440,8 +440,8 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* 
pParaStyle, LwpInden
 {
 if (pPara->GetBulletFlag())
 {
-pTotalIndent->SetMAll(pParentIndent->GetMAll() + 
pTotalIndent->GetMAll());
-pTotalIndent->SetMRight(pParentIndent->GetMRight()+ 
pTotalIndent->GetMRight());
+
pTotalIndent->SetMAll(o3tl::saturating_add(pParentIndent->GetMAll(), 
pTotalIndent->GetMAll()));
+
pTotalIndent->SetMRight(o3tl::saturating_add(pParentIndent->GetMRight(), 
pTotalIndent->GetMRight()));
 
pParaStyle->SetMargins(LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(
 pTotalIndent->GetMAll())), pTotalIndent->GetRight());
 pPara->SetIndent(pTotalIndent.release());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/html/htmltab.cxx |   58 +++---
 1 file changed, 29 insertions(+), 29 deletions(-)

New commits:
commit d216219e69b20341cebcfae2c4aa11b0248993c7
Author: Caolán McNamara 
Date:   Wed Jan 10 12:55:28 2018 +

pack these without holes

Change-Id: Idb5184e141c5a15d4d77268f8d45ee549c6e9a7f
Reviewed-on: https://gerrit.libreoffice.org/47714
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index f79e405e75b4..d3fdc714b5c7 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -209,14 +209,14 @@ class HTMLTableCell
 std::shared_ptr m_xBGBrush; // cell background
 std::shared_ptr m_xBoxItem;
 
-sal_uInt32 nNumFormat;
-sal_uInt16 nRowSpan;// cell ROWSPAN
-sal_uInt16 nColSpan;// cell COLSPAN
-sal_uInt16 nWidth;  // cell WIDTH
 double nValue;
-sal_Int16 eVertOri; // vertical alignment of the cell
-bool bProtected : 1;// cell must not filled
-bool bRelWidth : 1; // nWidth is given in %
+sal_uInt32 nNumFormat;
+sal_uInt16 nRowSpan;   // cell ROWSPAN
+sal_uInt16 nColSpan;   // cell COLSPAN
+sal_uInt16 nWidth; // cell WIDTH
+sal_Int16 eVertOri; // vertical alignment of the cell
+bool bProtected : 1;   // cell must not filled
+bool bRelWidth : 1;// nWidth is given in %
 bool bHasNumFormat : 1;
 bool bHasValue : 1;
 bool bNoWrap : 1;
@@ -271,22 +271,22 @@ typedef std::vector HTMLTableCells;
 class HTMLTableRow
 {
 HTMLTableCells m_aCells;///< cells of the row
+std::unique_ptr xBGBrush; // background of cell from STYLE
 
-bool bIsEndOfGroup : 1;
-
+SvxAdjust eAdjust;
 sal_uInt16 nHeight; // options of /
 sal_uInt16 nEmptyRows;  // number of empty rows are 
following
-
-SvxAdjust eAdjust;
 sal_Int16 eVertOri;
-std::unique_ptr xBGBrush; // background of cell 
from STYLE
+bool bIsEndOfGroup : 1;
+bool bBottomBorder : 1;// Is there a line after the row?
 
 public:
 
-bool bBottomBorder; // Is there a line after the row?
-
 explicit HTMLTableRow( sal_uInt16 nCells );// cells of the row are 
empty
 
+void SetBottomBorder(bool bIn) { bBottomBorder = bIn; }
+bool GetBottomBorder() const { return bBottomBorder; }
+
 inline void SetHeight( sal_uInt16 nHeight );
 sal_uInt16 GetHeight() const { return nHeight; }
 
@@ -683,11 +683,11 @@ const std::shared_ptr& 
HTMLTableCnts::CreateLayoutInfo()
 }
 
 HTMLTableCell::HTMLTableCell():
+nValue(0),
 nNumFormat(0),
 nRowSpan(1),
 nColSpan(1),
 nWidth( 0 ),
-nValue(0),
 eVertOri( text::VertOrientation::NONE ),
 bProtected(false),
 bRelWidth( false ),
@@ -763,14 +763,14 @@ std::unique_ptr 
HTMLTableCell::CreateLayoutInfo()
   bRelWidth, bNoWrap));
 }
 
-HTMLTableRow::HTMLTableRow(sal_uInt16 const nCells) :
-m_aCells(nCells),
-bIsEndOfGroup(false),
-nHeight(0),
-nEmptyRows(0),
-eAdjust(SvxAdjust::End),
-eVertOri(text::VertOrientation::TOP),
-bBottomBorder(false)
+HTMLTableRow::HTMLTableRow(sal_uInt16 const nCells)
+: m_aCells(nCells)
+, eAdjust(SvxAdjust::End)
+, nHeight(0)
+, nEmptyRows(0)
+, eVertOri(text::VertOrientation::TOP)
+, bIsEndOfGroup(false)
+, bBottomBorder(false)
 {
 assert(nCells == m_aCells.size() &&
 "wrong Cell count in new HTML table row");
@@ -1286,7 +1286,7 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
 }
 
 bTopLine = 0==nRow && m_bTopBorder && bFirstPara;
-if (m_aRows[nRow+nRowSpan-1].bBottomBorder && bLastPara)
+if (m_aRows[nRow+nRowSpan-1].GetBottomBorder() && bLastPara)
 {
 nEmptyRows = m_aRows[nRow+nRowSpan-1].GetEmptyRows();
 if( nRow+nRowSpan == m_nRows )
@@ -1779,9 +1779,9 @@ void HTMLTable::InheritBorders( const HTMLTable *pParent,
 m_bFillerTopBorder = true; // fillers get a border too
 m_aTopBorderLine = pParent->m_aTopBorderLine;
 }
-if (pParent->m_aRows[nRow+nRowSpan-1].bBottomBorder && bLastPara)
+if (pParent->m_aRows[nRow+nRowSpan-1].GetBottomBorder() && bLastPara)
 {
-m_aRows[m_nRows-1].bBottomBorder = true;
+m_aRows[m_nRows-1].SetBottomBorder(true);
 m_bFillerBottomBorder = true; // fillers get a border too
 m_aBottomBorderLine =
 nRow+nRowSpan==pParent->m_nRows ? pParent->m_aBottomBorderLine
@@ -1791,7 +1791,7 @@ void HTMLTable::InheritBorders( const HTMLTable *pParent,
 // The child table mustn't get an upper or lower border, if that's already 
done by the sur

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

[Caolán McNamara]

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

New commits:
commit 545984812e1cad17c28eb412ffd2cd9cf85cda0f
Author: Caolán McNamara 
Date:   Thu Jan 18 21:33:19 2018 +

SfxReqest::Done takes a SfxItemSet& or a boolean, not a SfxItemSet*

regression from

commit c40dfabd56ade10fe35690dc9810955c2e99e2c0
Date:   Fri Jan 12 11:57:22 2018 +

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

diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 06c7ef175f83..97f2c252722f 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -563,7 +563,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, 
const OString &rName
 
 ApplyAttributes(pOutSet, pOldSet.get());
 
-pRequest->Done(pOutSet);
+pRequest->Done(*pOutSet);
 }
 }, pDlg);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cppu/source/uno/sequence.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2ee4a46be759489328eb29feeb02880aab1e1331
Author: Caolán McNamara 
Date:   Thu Jan 18 20:50:12 2018 +

convert these to true asserts

Change-Id: Ifd602f47dd57cdecff3c175d892993072fb82891
Reviewed-on: https://gerrit.libreoffice.org/48154
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 7d54c4244bdb..3420e5c8ec27 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -744,8 +744,8 @@ sal_Bool SAL_CALL uno_type_sequence_realloc(
 sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release )
 SAL_THROW_EXTERN_C()
 {
-OSL_ENSURE( ppSequence, "### null ptr!" );
-OSL_ENSURE( nSize >= 0, "### new size must be at least 0!" );
+assert(ppSequence && "### null ptr!");
+assert(nSize >= 0 && "### new size must be at least 0!");
 
 bool ret = true;
 if (nSize != (*ppSequence)->nElements)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/view/tabvwsha.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit e720e90174cb141531d79c715373fa92f9a9834a
Author: Caolán McNamara 
Date:   Thu Jan 18 21:33:19 2018 +

SfxReqest::Done takes a SfxItemSet& or a boolean, not a SfxItemSet*

regression from

commit c40dfabd56ade10fe35690dc9810955c2e99e2c0
Date:   Fri Jan 12 11:57:22 2018 +

Change-Id: Ia97ba286a2da0584a2e806ad7396a3633f9d913e
Reviewed-on: https://gerrit.libreoffice.org/48160
Reviewed-by: Jan Holesovsky 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index e391c28ffeda..67911a29c91d 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -551,8 +551,6 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, 
const OString &rName
 {
 const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 
-assert(pOutSet);
-
 const SfxPoolItem* pItem=nullptr;
 
if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,true,&pItem)==SfxItemState::SET)
 {
@@ -561,7 +559,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, 
const OString &rName
 
 ApplyAttributes(pOutSet, pOldSet.get());
 
-pRequest->Done(pOutSet);
+pRequest->Done(*pOutSet);
 }
 }, pDlg);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/filter/html/htmltab.cxx |  279 +-
 1 file changed, 70 insertions(+), 209 deletions(-)

New commits:
commit a86db7b2b6f7bc8125db5d9c87348d6a9591c872
Author: Michael Stahl 
Date:   Thu Jan 18 20:49:13 2018 +0100

sw: HTMLTable::m_pTopTable is always "this"

Ever since commit cc144e5544a41acdc703f7d243ad1747b0a2b33d fix for
i#76959 the pTopTable parameter of HTMLTable was always null.

Simplify HTMLTable by removing dead code.

Change-Id: Ie13313f54d6ee656e56a209bc29bcc77132de269

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index d3fdc714b5c7..8a52695029fc 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -433,7 +433,6 @@ class HTMLTable
 bool m_bPrcWidth; // width is declared in %
 
 SwHTMLParser *m_pParser;  // the current parser
-HTMLTable *m_pTopTable;   // the table on the Top-Level
 std::unique_ptr m_xParentContents;
 
 HTMLTableContext *m_pContext;// the context of the table
@@ -518,7 +517,7 @@ public:
 
 bool m_bFirstCell;// is there a cell created already?
 
-HTMLTable(SwHTMLParser* pPars, HTMLTable *pTopTab,
+HTMLTable(SwHTMLParser* pPars,
   bool bParHead, bool bHasParentSec,
   bool bHasToFly,
   const HTMLTableOptions& rOptions);
@@ -1015,7 +1014,7 @@ void HTMLTable::InitCtor(const HTMLTableOptions& rOptions)
 m_aDir = rOptions.aDir;
 }
 
-HTMLTable::HTMLTable(SwHTMLParser* pPars, HTMLTable *pTopTab,
+HTMLTable::HTMLTable(SwHTMLParser* pPars,
  bool bParHead,
  bool bHasParentSec, bool bHasToFlw,
  const HTMLTableOptions& rOptions) :
@@ -1026,22 +1025,21 @@ HTMLTable::HTMLTable(SwHTMLParser* pPars, HTMLTable 
*pTopTab,
 m_nCellSpacing(rOptions.nCellSpacing),
 m_nBoxes( 1 ),
 m_pCaptionStartNode( nullptr ),
-m_bTableAdjustOfTag( !pTopTab && rOptions.bTableAdjust ),
+m_bTableAdjustOfTag( rOptions.bTableAdjust ),
 m_bIsParentHead( bParHead ),
 m_bHasParentSection( bHasParentSec ),
 m_bHasToFly( bHasToFlw ),
 m_bFixedCols( rOptions.nCols>0 ),
 m_bPrcWidth( rOptions.bPrcWidth ),
 m_pParser( pPars ),
-m_pTopTable( pTopTab ? pTopTab : this ),
 m_nWidth( rOptions.nWidth ),
-m_nHeight( pTopTab ? 0 : rOptions.nHeight ),
+m_nHeight( rOptions.nHeight ),
 m_eTableAdjust( rOptions.eAdjust ),
 m_eVertOrientation( rOptions.eVertOri ),
 m_eFrame( rOptions.eFrame ),
 m_eRules( rOptions.eRules ),
 m_bTopCaption( false ),
-m_bFirstCell( !pTopTab )
+m_bFirstCell(true)
 {
 InitCtor(rOptions);
 m_pParser->RegisterHTMLTable(this);
@@ -1270,18 +1268,9 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
 if( !pBGBrushItem )
 {
 // If a cell spans multiple rows, a background to that row should 
be copied to the cell.
-// If it's a table in a table and that cell goes over the whole 
height of that table,
-// the row's background has to be copied to the cell as well,
-// since the line is gonna be GC-ed (correctly).
-if( nRowSpan > 1 || (this != m_pTopTable && nRowSpan==m_nRows) )
+if (nRowSpan > 1)
 {
 pBGBrushItem = m_aRows[nRow].GetBGBrush().get();
-if( !pBGBrushItem && this != m_pTopTable )
-{
-pBGBrushItem = GetBGBrush().get();
-if( !pBGBrushItem )
-pBGBrushItem = GetInhBGBrush().get();
-}
 }
 }
 
@@ -1507,10 +1496,10 @@ SwTableBox *HTMLTable::NewTableBox( const SwStartNode 
*pStNd,
 {
 SwTableBox *pBox;
 
-if (m_pTopTable->m_xBox1 && m_pTopTable->m_xBox1->GetSttNd() == pStNd)
+if (m_xBox1 && m_xBox1->GetSttNd() == pStNd)
 {
 // If the StartNode is the StartNode of the initially created box, we 
take that box
-pBox = m_pTopTable->m_xBox1.release();
+pBox = const_cast(this)->m_xBox1.release();
 pBox->SetUpper(pUpper);
 }
 else
@@ -1534,7 +1523,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
sal_uInt16 nBottomRow, sal_uInt16 
nRightCol )
 {
 SwTableLine *pLine;
-if( this==m_pTopTable && !pUpper && 0==nTopRow )
+if (!pUpper && 0 == nTopRow)
 pLine = (m_pSwTable->GetTabLines())[0];
 else
 pLine = new SwTableLine( m_pLineFrameFormatNoHeight ? 
m_pLineFrameFormatNoHeight
@@ -1544,20 +1533,11 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox 
*pUpper,
 const HTMLTableRow& rTopRow = m_aRows[nTopRow];
 sal_uInt16 nRowHeight = rTopRow.GetHeight();
 const SvxBrushItem *pBGBrushItem = nullptr;
-if( this == m_pTopTable || nTopRow>0 || nBottomRow 0 || nBottomRow < m_nRows)
 {
 // It does

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

[Mike Kaganski]

 sw/source/core/frmedt/fetab.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 0f46830130bfd139af35a787133b778b85c96b89
Author: Mike Kaganski 
Date:   Thu Jan 18 18:05:59 2018 +0100

Remove noop

IsTableNode() is true when m_pTableCursor is not nullptr.
So, GetCursor() is only called when it is nullptr.
In turn, GetCursor() only does something if m_pTableCursor is not nullptr.

This is so from the beginning (commit 84a3db80 from 2000 already has it).

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

diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 3de36c61ad2d..e5a7728c9f19 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -1215,9 +1215,6 @@ bool SwFEShell::UpdateTableStyleFormatting(SwTableNode 
*pTableNode,
 
 SwSelBoxes aBoxes;
 
-if ( !IsTableMode() )   // if cursors are not current
-GetCursor();
-
 // whole table or only current selection
 if( IsTableMode() )
 ::GetTableSelCrs( *this, aBoxes );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 src/lib/MSPUBParser.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5cd502a195c713c1d64efcaa5ebc82cd422a5f5e
Author: David Tardon 
Date:   Fri Jan 19 10:18:52 2018 +0100

ofz#5224 avoid signed integer overflow

Change-Id: I0110730e2d3e8bc329b0599554fa4017d7a214f0

diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 30b6e7d..05e0e11 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1972,8 +1972,8 @@ void 
MSPUBParser::parseEscherShape(librevenge::RVNGInputStream *input, const Esc
   {
 int initialX = absolute.m_xs;
 int initialY = absolute.m_ys;
-int initialWidth = absolute.m_xe - absolute.m_xs;
-int initialHeight = absolute.m_ye - absolute.m_ys;
+int initialWidth = int64_t(absolute.m_xe) - absolute.m_xs;
+int initialHeight = int64_t(absolute.m_ye) - absolute.m_ys;
 int centerX = initialX + initialWidth / 2;
 int centerY = initialY + initialHeight / 2;
 int xs = centerX - initialHeight / 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/CppunitTest_sd_import_tests.mk sd/qa

[Samuel Mehrbrodt]

 sd/CppunitTest_sd_import_tests.mk  |2 
 sd/qa/unit/data/odg/tdf114488.fodg |  365 +
 sd/qa/unit/import-tests.cxx|   15 +
 3 files changed, 382 insertions(+)

New commits:
commit acab4a99dcab546927712657c3ca4399a1b06fbb
Author: Samuel Mehrbrodt 
Date:   Thu Jan 18 15:01:29 2018 +0100

Unit test for tdf#114488

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

diff --git a/sd/CppunitTest_sd_import_tests.mk 
b/sd/CppunitTest_sd_import_tests.mk
index f12e200a29d6..27c7f9181b71 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
 configmgr/source/configmgr \
 dbaccess/util/dba \
 desktop/source/deployment/deployment \
+drawinglayer/drawinglayer \
 embeddedobj/util/embobj \
 emfio/emfio \
 filter/source/config/cache/filterconfig1 \
@@ -108,6 +109,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sd_import_tests,\
 unoxml/source/rdf/unordf \
 unoxml/source/service/unoxml \
 uui/util/uui \
+xmlscript/util/xmlscript \
 xmloff/util/xo \
 xmlsecurity/util/xmlsecurity \
 ))
diff --git a/sd/qa/unit/data/odg/tdf114488.fodg 
b/sd/qa/unit/data/odg/tdf114488.fodg
new file mode 100644
index ..41a3c497d380
--- /dev/null
+++ b/sd/qa/unit/data/odg/tdf114488.fodg
@@ -0,0 +1,365 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xml
 ns:calcext:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.graphics">
+ 
2016-12-14T10:36:44.07900PT2M21S1LibreOfficeDev/6.1.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/d36007ffd98bc9ed2f8ca6151a5283bd46a92485
+ 
+  
+   -817
+   -127
+   10457
+   6649
+   
+
+ view1
+ false
+ false
+ true
+ true
+ false
+ false
+ false
+ false
+ true
+ 1500
+ false
+ //8=
+ //8=
+ 
+ false
+ true
+ true
+ 0
+ 0
+ true
+ true
+ true
+ 4
+ 0
+ -940
+ 787
+ 8624
+ 6889
+ 1270
+ 1270
+ 127
+ 127
+ 127
+ 1
+ 127
+ 1
+ false
+ 1500
+ false
+ false
+
+   
+  
+  
+   true
+   $(brandbaseurl)/share/palette%3B$(userpath)/config/standard.sob
+   0
+   $(brandbaseurl)/share/palette%3B$(userpath)/config/standard.soc
+   $(brandbaseurl)/share/palette%3B$(userpath)/config/standard.sod
+   1270
+   false
+   $(brandbaseurl)/share/palette%3B$(userpath)/config/standard.sog
+   $(brandbaseurl)/share/palette%3B$(userpath)/config/standard.soh
+   false
+   false
+   true
+   true
+   false
+   false
+   true
+   false
+   false
+   false
+   $(brandbaseurl)/share/palette%3B$(userpath)/config/standard.soe
+   false
+   7
+   4
+   false
+   0
+   low-resolution
+   
+   false
+   
+   false
+   1
+   1
+   true
+  
+ 
+ 
+  
+   http://openoffice.org/200

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

[Andrea Gelmini]

 sc/source/core/data/column.cxx |2 +-
 solenv/bin/native-code.py  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cc4d41fb7c3566177e30c9e6b5e2bb5c2191e5fb
Author: Andrea Gelmini 
Date:   Fri Jan 19 09:58:05 2018 +0100

Fix typos

Change-Id: Icadf5cb88024b8889d49dc9c5210d0de8deaed3b
Reviewed-on: https://gerrit.libreoffice.org/48172
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index b0c70999767b..16e2dd089d20 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1149,7 +1149,7 @@ void ScColumn::CopyStaticToDocument(
 break;
 }
 
-// Dont' forget to copy the number formats over.  Charts may reference 
them.
+// Don't forget to copy the number formats over. Charts may reference them.
 for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
 {
 sal_uInt32 nNumFmt = 
GetNumberFormat(pDocument->GetNonThreadedContext(), nRow);
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 6571b24f27de..0cab8a26e096 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -424,7 +424,7 @@ opts.add_option("-C", "--pure-c", action="store_true", 
help="do not print extern
 
 (options, args) = opts.parse_args()
 
-# dict of all the contructors that we need according to -g's
+# dict of all the constructors that we need according to -g's
 full_constructor_map = {}
 if options.groups:
 for constructor_group in options.groups:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 
android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
   |2 +-
 
android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
 |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2a6bf230e2efaca24076773b1789765eed4e83c2
Author: Andrea Gelmini 
Date:   Fri Jan 19 09:50:41 2018 +0100

Fix typos

Change-Id: I98279a1f4020be95c57390fd163ebe740f8cca9d
Reviewed-on: https://gerrit.libreoffice.org/48171
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git 
a/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
 
b/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
index 72599ec0d17b..f21dc258474a 100644
--- 
a/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
@@ -129,7 +129,7 @@ public class ExtsdDocumentsProvider implements 
IExternalDocumentProvider,
 }
 
 private RuntimeException buildRuntimeExceptionForInvalidFileURI(Context 
context) {
-// ToDo: discarding the original excpeption / catch-all handling is 
bad style
+// ToDo: discarding the original exception / catch-all handling is bad 
style
 return new 
RuntimeException(context.getString(R.string.ext_document_provider_error));
 }
 
diff --git 
a/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
 
b/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
index 02d58d329122..d8e6e1870044 100644
--- 
a/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
@@ -50,7 +50,7 @@ public class LocalDocumentsDirectoryProvider extends 
LocalDocumentsProvider {
 if (!documentsDirectory.exists()) {
 // might be a little counter-intuitive: if we were granted READ 
permission already, we're also granted the write-permission
 // when we ask for it, since they are both in the same storage 
group (for 5.1 and lower it is granted at install-time already)
-// 
seehttps://developer.android.com/guide/topics/permissions/requesting.html#perm-groups
+// see 
https://developer.android.com/guide/topics/permissions/requesting.html#perm-groups
 if (ContextCompat.checkSelfPermission(context, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) == 
PackageManager.PERMISSION_GRANTED) {
 if(!documentsDirectory.mkdirs()) {
 // fallback to the toplevel dir - might be due to the dir 
not mounted/used as USB-Mass-Storage or similar
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8e/0650e18f94d9dec1c5c854bd3a93fa97b1964b

[Caolán McNamara]

 8e/0650e18f94d9dec1c5c854bd3a93fa97b1964b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5a2840342676ecca2f4988e4e28259533fcebc10
Author: Caolán McNamara 
Date:   Fri Jan 19 09:49:06 2018 +

Notes added by 'git notes add'

diff --git a/8e/0650e18f94d9dec1c5c854bd3a93fa97b1964b 
b/8e/0650e18f94d9dec1c5c854bd3a93fa97b1964b
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/8e/0650e18f94d9dec1c5c854bd3a93fa97b1964b
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 84/97b3ed351f2316bea7b735826723148931291a

[Caolán McNamara]

 84/97b3ed351f2316bea7b735826723148931291a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e18513c02e76e9f7bbadb2548df138c30a7e8781
Author: Caolán McNamara 
Date:   Fri Jan 19 09:50:12 2018 +

Notes added by 'git notes add'

diff --git a/84/97b3ed351f2316bea7b735826723148931291a 
b/84/97b3ed351f2316bea7b735826723148931291a
new file mode 100644
index ..7fb436146bdd
--- /dev/null
+++ b/84/97b3ed351f2316bea7b735826723148931291a
@@ -0,0 +1 @@
+prefer: 6dc98de97f6bc4325407b098bb153f359000c717
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f9/d7fc5c44d66faf19262e6ee0c13d4167acf158

[Caolán McNamara]

 f9/d7fc5c44d66faf19262e6ee0c13d4167acf158 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3280a88411d6afdb54da13cf43b21d2529273246
Author: Caolán McNamara 
Date:   Fri Jan 19 09:52:20 2018 +

Notes added by 'git notes add'

diff --git a/f9/d7fc5c44d66faf19262e6ee0c13d4167acf158 
b/f9/d7fc5c44d66faf19262e6ee0c13d4167acf158
new file mode 100644
index ..c431cc794bd9
--- /dev/null
+++ b/f9/d7fc5c44d66faf19262e6ee0c13d4167acf158
@@ -0,0 +1 @@
+prefer: 7f56e58148602f75b7b5f1860dc65c4620d0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b5/7158fc128c7f0bba3d8708004348d9e7ff749c

[Caolán McNamara]

 b5/7158fc128c7f0bba3d8708004348d9e7ff749c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f1c5fb02f003b10bdde4857ee6bf8e37b766c7ed
Author: Caolán McNamara 
Date:   Fri Jan 19 09:54:03 2018 +

Notes added by 'git notes add'

diff --git a/b5/7158fc128c7f0bba3d8708004348d9e7ff749c 
b/b5/7158fc128c7f0bba3d8708004348d9e7ff749c
new file mode 100644
index ..e95b17218191
--- /dev/null
+++ b/b5/7158fc128c7f0bba3d8708004348d9e7ff749c
@@ -0,0 +1 @@
+prefer: f5ca04caca1b6888cdc6b00b8465a53e6d5cf38d
___
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/filter/ww8/ww8toolbar.cxx |  334 
 sw/source/filter/ww8/ww8toolbar.hxx |   57 --
 2 files changed, 391 deletions(-)

New commits:
commit f2fd69e3c95723eb41ee35c9ff288bef027d2d8b
Author: Miklos Vajna 
Date:   Thu Jan 18 23:02:24 2018 +0100

sw: remove no longer building ww8toolbar dump code

Such dumper code for other ww8 features is in the separate mso-dumper
repo.  If it is found really useful later, it can be still restored and
fixed up to actually build, though.

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

diff --git a/sw/source/filter/ww8/ww8toolbar.cxx 
b/sw/source/filter/ww8/ww8toolbar.cxx
index 8011a640410c..fbaf35979faf 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -179,48 +179,6 @@ SwTBC* SwCTBWrapper::GetTBCAtOffset( sal_uInt32 
nStreamOffset )
 return nullptr;
 }
 
-#if OSL_DEBUG_LEVEL > 1
-void SwCTBWrapper::Print( FILE* fp )
-{
-Indent a;
-indent_printf(fp,"[ 0x%x ] SwCTBWrapper - dump\n", nOffSet );
-bool bRes = ( ch == 0x12 && reserved2 == 0x0 && reserved3 == 0x7 && 
reserved4 == 0x6 && reserved5 == 0xC );
-if ( bRes )
-indent_printf(fp,"  sanity check ( first 8 bytes conform )\n");
-else
-{
-indent_printf(fp,"reserved1(0x%x)\n",ch);
-indent_printf(fp,"reserved2(0x%x)\n",reserved2);
-indent_printf(fp,"reserved3(0x%x)\n",reserved3);
-indent_printf(fp,"reserved4(0x%x)\n",reserved4);
-indent_printf(fp,"reserved5(0x%x)\n",reserved5);
-indent_printf(fp,"Quitting dump");
-return;
-}
-indent_printf(fp,"  size of TBDelta structures 0x%x\n", cbTBD );
-indent_printf(fp,"  cCust: no. of cCust structures 0x%x\n",cCust);
-indent_printf(fp,"  cbDTBC: no. of bytes in rtbdc array 0x%x\n", 
static_cast< unsigned int >( cbDTBC ));
-
-sal_Int32 index = 0;
-
-for ( std::vector< SwTBC >::iterator it = rtbdc.begin(); it != 
rtbdc.end(); ++it, ++index )
-{
-indent_printf(fp,"  Dumping rtbdc[%d]\n", static_cast< int >( index ));
-Indent b;
-it->Print( fp );
-}
-
-index = 0;
-
-for ( std::vector< Customization >::iterator it = rCustomizations.begin(); 
it != rCustomizations.end(); ++it, ++index )
-{
-indent_printf(fp,"  Dumping customization [%d]\n", static_cast< int >( 
index ));
-Indent c;
-it->Print(fp);
-}
-}
-#endif
-
 bool SwCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
 {
 for ( std::vector< Customization >::iterator it = rCustomizations.begin(); 
it != rCustomizations.end(); ++it )
@@ -292,40 +250,6 @@ bool Customization::Read( SvStream &rS)
 return rS.good();
 }
 
-#if OSL_DEBUG_LEVEL > 1
-void Customization::Print( FILE* fp )
-{
-Indent a;
-indent_printf( fp,"[ 0x%x ] Customization -- dump \n", nOffSet );
-indent_printf( fp,"  tbidForTBD 0x%x ( should be 0 for CTBs )\n", 
static_cast< unsigned int >( tbidForTBD ));
-indent_printf( fp,"  reserved1 0x%x \n", reserved1);
-indent_printf( fp,"  ctbds - number of customisations %d(0x%x) \n", ctbds, 
ctbds );
-if ( !tbidForTBD && !ctbds )
-customizationDataCTB->Print( fp );
-else
-{
-const char* pToolBar = NULL;
-switch ( tbidForTBD )
-{
-case 0x9:
-pToolBar = "Standard";
-break;
-case 0x25:
-pToolBar = "Builtin-Menu";
-break;
-default:
-pToolBar = "Unknown toolbar";
-break;
-}
-
-indent_printf( fp,"  TBDelta(s) are associated with %s toolbar.\n", 
pToolBar);
-std::vector< TBDelta >::iterator it = customizationDataTBDelta.begin();
-for (sal_uInt16 index = 0; index < ctbds; ++it, ++index)
-it->Print( fp );
-}
-}
-#endif
-
 bool Customization::ImportMenu( SwCTBWrapper& rWrapper, 
CustomToolBarImportHelper& helper )
 {
 if ( tbidForTBD == 0x25 )  // we can handle in a limited way additions the 
built-in menu bar
@@ -452,28 +376,6 @@ bool TBDelta::Read(SvStream &rS)
 return rS.good();
 }
 
-#if OSL_DEBUG_LEVEL > 1
-void TBDelta::Print( FILE* fp )
-{
-// Like most of the debug output, it's raw and little ( no )
-// interpretation of the data is output ( e.g. flag values etc. )
-indent_printf( fp, "[ 0x%x ] TBDelta -- dump\n", nOffSet );
-indent_printf( fp, " doprfatendFlags 0x%x\n",doprfatendFlags );
-
-indent_printf( fp, " ibts 0x%x\n",ibts );
-indent_printf( fp, " cidNext 0x%x\n", static_cast< unsigned int >( cidNext 
) );
-indent_printf( fp, " cid 0x%x\n", static_cast< unsigned int >( cid ) );
-indent_printf( fp, " fc 0x%x\n", static_cast< unsigned int >( fc ) );
-indent_printf( fp, " CiTBDE 0x%x\n",CiTBDE );
-ind

[Libreoffice-commits] core.git: Branch 'feature/useuniqueptr-3' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/useuniqueptr-5' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/useuniqueptr-6' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/useuniqueptr-4' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/useuniqueptr-7' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kshitij Pathania]

 cui/source/inc/swpossizetabpage.hxx  |2 +-
 cui/source/tabpages/swpossizetabpage.cxx |   13 +
 cui/source/tabpages/transfrm.cxx |   25 +++--
 3 files changed, 37 insertions(+), 3 deletions(-)

New commits:
commit 4f344f025a2fe0b8f2359aaf74a91f209e196923
Author: Kshitij Pathania 
Date:   Sun Dec 10 22:28:48 2017 +0530

tdf#111747 Enabled position protection immediately after protection is 
checked

Change-Id: I10409fe9e6eb7b932496346224952a7c4012cb38
Reviewed-on: https://gerrit.libreoffice.org/46192
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/cui/source/inc/swpossizetabpage.hxx 
b/cui/source/inc/swpossizetabpage.hxx
index cbcb39274673..0f8924a9d7fd 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -93,7 +93,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
 boolm_bPositioningDisabled;
 boolm_bIsMultiSelection;
 boolm_bIsInRightToLeft;
-
+TriStatem_nProtectSizeState;
 
 DECL_LINK(RangeModifyHdl, Control&, void);
 DECL_LINK(RangeModifyClickHdl, Button*, void);
diff --git a/cui/source/tabpages/swpossizetabpage.cxx 
b/cui/source/tabpages/swpossizetabpage.cxx
index 16126a4ea367..5b35baf2ecf0 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -525,6 +525,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* 
pParent, const SfxItemSet&
 , m_bPositioningDisabled(false)
 , m_bIsMultiSelection(false)
 , m_bIsInRightToLeft(false)
+, m_nProtectSizeState(TRISTATE_FALSE)
 {
 get(m_pWidthMF, "width");
 get(m_pHeightMF, "height");
@@ -1087,7 +1088,13 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet)
 DeactivateRC SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
 if( _pSet )
+{
+_pSet->Put(SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ),
+m_pPositionCB->GetState() == TRISTATE_TRUE ));
+_pSet->Put(SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ),
+m_pSizeCB->GetState() == TRISTATE_TRUE ));
 FillItemSet( _pSet );
+}
 return DeactivateRC::LeavePage;
 }
 
@@ -1393,6 +1400,12 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit&, rEdit, 
void )
 
 IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl, Button*, void)
 {
+if( m_pSizeCB->IsEnabled() )
+{
+m_nProtectSizeState = m_pSizeCB->GetState();
+}
+
+m_pSizeCB->SetState( m_pPositionCB->GetState() == TRISTATE_TRUE ?  
TRISTATE_TRUE : m_nProtectSizeState );
 m_pSizeCB->Enable(m_pPositionCB->IsEnabled() && 
!m_pPositionCB->IsChecked());
 }
 
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 245e823ba6c3..7ce63c79aa0d 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -327,8 +327,14 @@ VclPtr SvxAngleTabPage::Create( vcl::Window* 
pWindow, const SfxItemS
 }
 
 
-void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/)
+void SvxAngleTabPage::ActivatePage(const SfxItemSet& rSet)
 {
+SfxBoolItem const * bPosProtect = nullptr;
+if(SfxItemState::SET == rSet.GetItemState( 
GetWhich(SID_ATTR_TRANSFORM_PROTECT_POS  ) , false, 
reinterpret_cast(&bPosProtect) ))
+{
+m_pFlPosition->Enable(!bPosProtect->GetValue());
+m_pFlAngle->Enable(!bPosProtect->GetValue());
+}
 }
 
 
@@ -698,6 +704,18 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet 
)
 const ::tools::Rectangle aTempRect(pRectItem->GetValue());
 maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), 
aTempRect.Right(), aTempRect.Bottom());
 }
+
+SfxBoolItem const * bPosProtect = nullptr;
+if(SfxItemState::SET == rSet.GetItemState( 
GetWhich(SID_ATTR_TRANSFORM_PROTECT_POS  ) , false, 
reinterpret_cast(&bPosProtect) ))
+{
+m_pFlAngle->Enable(!bPosProtect->GetValue());
+}
+SfxBoolItem const * bSizeProtect = nullptr;
+if(SfxItemState::SET == rSet.GetItemState( 
GetWhich(SID_ATTR_TRANSFORM_PROTECT_SIZE ) , false, 
reinterpret_cast(&bSizeProtect) ))
+{
+m_pFlAngle->Enable(!bSizeProtect->GetValue());
+}
+
 }
 
 
@@ -1168,7 +1186,10 @@ DeactivateRC SvxPositionSizeTabPage::DeactivatePage( 
SfxItemSet* _pSet )
 basegfx::fround(fX), basegfx::fround(fY),
 basegfx::fround(fX + maRange.getWidth()), basegfx::fround(fY + 
maRange.getHeight()));
 _pSet->Put(SfxRectangleItem(SID_ATTR_TRANSFORM_INTERN, aOutRectangle));
-
+_pSet->Put(SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ),
+m_pTsbPosProtect->GetState() == TRISTATE_TRUE ));
+_pSet->Put(SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ),
+m_pTsbSizeProtect->GetState() == TRISTATE_TRUE ));
 FillItemSet(_pSet);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedeskt

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit b3fc12b713163428c111e62948c3e40ce931db5a
Author: Olivier Hallot 
Date:   Thu Jan 18 22:36:18 2018 -0200

Updated core
Project: help  ea4a7345bc1cbcbff3fb4355d0e4f4954f8afa7d

Fix detection of bad help call

remove single quotes

Change-Id: Ia7951508cbf0a49ae029588e1d254de5f3942f12
Reviewed-on: https://gerrit.libreoffice.org/48165
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index c4a18626d144..ea4a7345bc1c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c4a18626d14426cbd8884d1028eb248fe3b21c44
+Subproject commit ea4a7345bc1cbcbff3fb4355d0e4f4954f8afa7d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/index2.html

[Olivier Hallot]

 help3xsl/index2.html |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ea4a7345bc1cbcbff3fb4355d0e4f4954f8afa7d
Author: Olivier Hallot 
Date:   Thu Jan 18 22:36:18 2018 -0200

Fix detection of bad help call

remove single quotes

Change-Id: Ia7951508cbf0a49ae029588e1d254de5f3942f12
Reviewed-on: https://gerrit.libreoffice.org/48165
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 6f4fc7f39..f30348b98 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -38,10 +38,10 @@
 var bookmark = rest.slice(rest.indexOf('/')+1, rest.indexOf('?'));
 var file = map[bookmark];
 // rebuild URL
-if (file=='undefined'){
+if (file === undefined){
 file = defaultFile;
 }
-var newURL = lang+'/'+file+'?System='+system+'&DbPAR='+module;
+var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' + module;
 window.open(newURL,'_self');
 }else{
 // URL came from elsewhere, direct access to webroot, we redirect to main 
Help page
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ward van Wanrooij]

 vcl/osx/salframeview.mm |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 52d9378a683c4e33e0a3dd7c6fc6f2c0dfc60125
Author: Ward van Wanrooij 
Date:   Mon Nov 27 19:44:26 2017 +0100

vcl osx: fix decimal separator key when localized

If you use OS X and an international locale (e.g. Locale setting:
Dutch (Netherlands) and select Decimal separator key: Same as
locale setting (,) in Preferences/Language Settings/Languages using
the decimal separator key on the numeric keypad still results in a
'.' instead of the expected ','. Tested and confirmed using latest
LO build on 10.11.6 and 10.12.6 using both the wired and wireless
Apple keyboard.
The cause for this is that the decimal separator key sends a
KEY_POINT (like the regular . key on the alphanumeric part) and
the code expects a KEY_DECIMAL for the decimal separator key.
Fixed by changing the combination of KEY_POINT and mask
NSNumericPadKeyMask to KEY_DECIMAL.

Change-Id: Iaf1ecf538c3e1a49ad512851cf16dd4dd991cb06
Reviewed-on: https://gerrit.libreoffice.org/45362
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index c79244a0011e..e33ccb188616 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -156,6 +156,8 @@ static const struct ExceptionalKey
 {
 const sal_uInt16nKeyCode;
 const unsigned int  nModifierMask;
+const sal_uInt16nModifiedKeyCode;
+const bool  bZeroCharacter;
 } aExceptionalKeys[] =
 {
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -163,8 +165,10 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 // 'NSCommandKeyMask' is deprecated: first deprecated in macOS 10.12
 // 'NSControlKeyMask' is deprecated: first deprecated in macOS 10.12
 // 'NSShiftKeyMask' is deprecated: first deprecated in macOS 10.12
-{ KEY_D, NSControlKeyMask | NSShiftKeyMask | NSAlternateKeyMask },
-{ KEY_D, NSCommandKeyMask | NSShiftKeyMask | NSAlternateKeyMask }
+// 'NSNumericPadKeyMask' is deprecated: first deprecated in macOS 10.12
+{ KEY_D, NSControlKeyMask | NSShiftKeyMask | NSAlternateKeyMask, KEY_D, 
true },
+{ KEY_D, NSCommandKeyMask | NSShiftKeyMask | NSAlternateKeyMask, KEY_D, 
true },
+{ KEY_POINT, NSNumericPadKeyMask, KEY_DECIMAL, false }
 SAL_WNODEPRECATED_DECLARATIONS_POP
 };
 
@@ -1018,7 +1022,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 (mpFrame->mnLastModifierFlags & 
aExceptionalKeys[i].nModifierMask)
 == aExceptionalKeys[i].nModifierMask )
 {
-[self sendKeyInputAndReleaseToFrame: nKeyCode character: 0];
+[self sendKeyInputAndReleaseToFrame: 
aExceptionalKeys[i].nModifiedKeyCode character: 
(aExceptionalKeys[i].bZeroCharacter ? 0 : keyChar) ];
 
 return YES;
 }
___
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-desktop' - 2 commits - external/icu include/sal

[Eike Rathke]

 external/icu/UnpackedTarball_icu.mk|1 +
 external/icu/icu4c-58-icu13329-xlocale.patch.1 |   14 ++
 include/sal/types.h|2 ++
 3 files changed, 17 insertions(+)

New commits:
commit 81dc13dc71045a7d6c3be2f980928544e6385844
Author: Eike Rathke 
Date:   Wed Sep 13 13:42:29 2017 +0200

icu: do not include non-standardized xlocale.h if U_PLATFORM_IS_LINUX_BASED

... should be more platforms ... but be conservative.
U_PLATFORM_IMPLEMENTS_POSIX does not hold what it promises.

"The file and this data structure is not standardized.  Don't rely on it.  
It
can go away without warning."

...

And since glibc 2.26 it's gone.

https://ssl.icu-project.org/trac/ticket/13329

Change-Id: I4c1f6130571f5d094cb35ce70e4d333763cee32a
(cherry picked from commit 9e399bc613bb4ea1470bd52c64af920d4e9bc39b)
Reviewed-on: https://gerrit.libreoffice.org/46584
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 5bbe46ee00921586b9b72297e7be9048e0e921e9)

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index f1658a229586..1254d6fb993c 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/khmerbreakengine.patch \
external/icu/icu4c-changeset-39671.patch.1 \
external/icu/icu4c-changeset-40324.patch.1 \
+   external/icu/icu4c-58-icu13329-xlocale.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-58-icu13329-xlocale.patch.1 
b/external/icu/icu4c-58-icu13329-xlocale.patch.1
new file mode 100644
index ..d9168c1bd1eb
--- /dev/null
+++ b/external/icu/icu4c-58-icu13329-xlocale.patch.1
@@ -0,0 +1,14 @@
+# xlocale.h is gone with glibc 2.26 and should never had been included.
+# https://ssl.icu-project.org/trac/ticket/13329
+diff -ur icu.org/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp
+--- icu.org/source/i18n/digitlst.cpp   2016-10-17 10:40:38.0 +0530
 icu/source/i18n/digitlst.cpp   2017-12-16 10:26:56.477053596 +0530
+@@ -63,6 +63,8 @@
+ #if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API
+ # if U_PLATFORM == U_PF_CYGWIN
+ #   include 
++# elif U_PLATFORM_IS_LINUX_BASED
++#   include // should be for all POSIX.2008 compliant platforms, 
but..
+ # else
+ #   include 
+ # endif
commit 0cbb2e661b51353751d3eed82aeea3dbdd44c05e
Author: Stephan Bergmann 
Date:   Fri Jan 27 18:04:53 2017 +0100

GCC 7 supports [[fallthrough]]

Change-Id: Ic6fb995a76a30b60b597005e714de03d43c36a7c
(cherry picked from commit 9ee0f108ca104ec76d2d73220686fb10c89e78e8)
Reviewed-on: https://gerrit.libreoffice.org/47307
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 8069d8bf63c7dcee4d7724ca943c6dd5739a94f4)

diff --git a/include/sal/types.h b/include/sal/types.h
index 3fc2be349ceb..0aee64874fb6 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -448,6 +448,8 @@ namespace css = ::com::sun::star;
 #if defined LIBO_INTERNAL_ONLY
 #if defined __clang__
 #define SAL_FALLTHROUGH [[clang::fallthrough]]
+#elif defined __GNUC__ && __GNUC__ >= 7
+#define SAL_FALLTHROUGH [[fallthrough]]
 #else
 #define SAL_FALLTHROUGH
 #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-4' - editeng/source

[Caolán McNamara]

 editeng/source/editeng/impedit2.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 4c73f977bc21e2f2c8304c6a331dac6b03339197
Author: Caolán McNamara 
Date:   Thu Jan 18 21:09:53 2018 +

ofz#5477 if the para is already oversize, nums would go negative

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

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index fb18ce45023c..6cbfd5a0e986 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2720,12 +2720,13 @@ EditPaM ImpEditEngine::ImpInsertText(const 
EditSelection& aCurSel, const OUStrin
 if ( nEnd > nStart )
 {
 OUString aLine = aText.copy( nStart, nEnd-nStart );
-sal_Int32 nChars = aPaM.GetNode()->Len() + aLine.getLength();
-if ( nChars > MAXCHARSINPARA )
+sal_Int32 nExistingChars = aPaM.GetNode()->Len();
+sal_Int32 nChars = nExistingChars + aLine.getLength();
+if (nChars > MAXCHARSINPARA)
 {
-sal_Int32 nMaxNewChars = MAXCHARSINPARA-aPaM.GetNode()->Len();
+sal_Int32 nMaxNewChars = std::max(0, MAXCHARSINPARA 
- nExistingChars);
 nEnd -= ( aLine.getLength() - nMaxNewChars ); // Then the 
characters end up in the next paragraph.
-aLine = aLine.copy( 0, nMaxNewChars );// Delete 
the Rest...
+aLine = aLine.copy( 0, nMaxNewChars );// Delete the 
Rest...
 }
 if ( IsUndoEnabled() && !IsInUndo() )
 InsertUndo(new EditUndoInsertChars(pEditEngine, 
CreateEPaM(aPaM), aLine));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 editeng/source/editeng/impedit2.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit aba61f7b4a89db67c475f59101258d6054196545
Author: Caolán McNamara 
Date:   Thu Jan 18 21:09:53 2018 +

ofz#5477 if the para is already oversize, nums would go negative

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

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 0ba0a04e53af..41fec1bf80b3 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2722,12 +2722,13 @@ EditPaM ImpEditEngine::ImpInsertText(const 
EditSelection& aCurSel, const OUStrin
 if ( nEnd > nStart )
 {
 OUString aLine = aText.copy( nStart, nEnd-nStart );
-sal_Int32 nChars = aPaM.GetNode()->Len() + aLine.getLength();
-if ( nChars > MAXCHARSINPARA )
+sal_Int32 nExistingChars = aPaM.GetNode()->Len();
+sal_Int32 nChars = nExistingChars + aLine.getLength();
+if (nChars > MAXCHARSINPARA)
 {
-sal_Int32 nMaxNewChars = MAXCHARSINPARA-aPaM.GetNode()->Len();
+sal_Int32 nMaxNewChars = std::max(0, MAXCHARSINPARA 
- nExistingChars);
 nEnd -= ( aLine.getLength() - nMaxNewChars ); // Then the 
characters end up in the next paragraph.
-aLine = aLine.copy( 0, nMaxNewChars );// Delete 
the Rest...
+aLine = aLine.copy( 0, nMaxNewChars );// Delete the 
Rest...
 }
 if ( IsUndoEnabled() && !IsInUndo() )
 InsertUndo(new EditUndoInsertChars(pEditEngine, 
CreateEPaM(aPaM), aLine));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit b8d48b7051dd3cf971b2e31432477801606ecdee
Author: Olivier Hallot 
Date:   Fri Jan 19 10:04:51 2018 -0200

Updated core
Project: help  02e87fe2b0027c725075154f9172e9fb99ef9589

Add more localized strings for new Help

Change-Id: I8c0cdcf8cf1ce64a407c98f4619a46b08c259b7d
Reviewed-on: https://gerrit.libreoffice.org/48186
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index ea4a7345bc1c..02e87fe2b002 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ea4a7345bc1cbcbff3fb4355d0e4f4954f8afa7d
+Subproject commit 02e87fe2b0027c725075154f9172e9fb99ef9589
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 sfx2/source/appl/sfxhelp.cxx |  259 ++-
 1 file changed, 206 insertions(+), 53 deletions(-)

New commits:
commit 3feafa82dd2cbb16423a69f7bacef5524376cc7a
Author: Olivier Hallot 
Date:   Thu Jan 4 08:32:12 2018 -0200

Call new help

With contributions from Kendy

Call new help
* If LibreOffice online, call help online
* If no local help, call help online
else call offline html help
if offline help return false, call old-help

* left tempfile to be deleted when LO exits (ESC)

* hasHelp function now check if the right locale exist

Change-Id: I14893e8ba4998773706b9cf8164636475d1f2356

Fix HIDs with a ':' inside

Change-Id: I17b7c96b6b0003e8d933131b7b251f3191389a0f

Call new help directly, fix locale issue

Avoid passing by a html file that is necessary only in
the online case.

Fix path location of help/ folder

Implement fall back in languages
locale -> lang -> en-US.
If none of the theree above, call online help with locale.
fix scope

Change-Id: If92673594c92e0d5a6064bc0e0bb4b66a52730ec
Reviewed-on: https://gerrit.libreoffice.org/47748
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index bdfba5d88435..f90e2e7d0a6b 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 
 #include 
@@ -46,9 +47,11 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -98,10 +101,98 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& )
 // do nothing, because no help available
 }
 
-static bool impl_hasHelpInstalled( const OUString &rLang );
+static OUString HelpLocaleString();
+
+namespace {
+
+/// Root path of the help.
+OUString getHelpRootURL()
+{
+static OUString s_instURL;
+if (!s_instURL.isEmpty())
+return s_instURL;
+
+s_instURL = 
officecfg::Office::Common::Path::Current::Help::get(comphelper::getProcessComponentContext());
+if (s_instURL.isEmpty())
+{
+// try to determine path from default
+s_instURL = "$(instpath)/" LIBO_SHARE_HELP_FOLDER;
+}
+
+// replace anything like $(instpath);
+SvtPathOptions aOptions;
+s_instURL = aOptions.SubstituteVariable(s_instURL);
+
+OUString url;
+if (osl::FileBase::getFileURLFromSystemPath(s_instURL, url) == 
osl::FileBase::E_None)
+s_instURL = url;
+
+return s_instURL;
+}
+
+bool impl_checkHelpLocalePath(OUString& rpPath)
+{
+osl::DirectoryItem directoryItem;
+bool bOK = false;
+
+osl::FileStatus fileStatus(osl_FileStatus_Mask_Type | 
osl_FileStatus_Mask_FileURL | osl_FileStatus_Mask_FileName);
+if (osl::DirectoryItem::get(rpPath, directoryItem) == 
osl::FileBase::E_None &&
+directoryItem.getFileStatus(fileStatus) == osl::FileBase::E_None &&
+fileStatus.isDirectory())
+{
+bOK = true;
+}
+return bOK;
+}
+
+/// Check for built-in help
+/// Check if help//lang folder exist
+bool impl_hasHelpInstalled()
+{
+if (comphelper::LibreOfficeKit::isActive())
+return false;
+
+static OUString aLocaleStr;
+
+if (aLocaleStr.isEmpty())
+{
+// detect installed locale
+aLocaleStr = HelpLocaleString();
+}
+
+OUString helpRootURL = getHelpRootURL() + "/" + aLocaleStr;
+
+bool bOK = impl_checkHelpLocalePath( helpRootURL );
+return bOK;
+}
+
+
+/// Check for html built-in help
+/// Check if help/productversion/lang folder exist
+bool impl_hasHTMLHelpInstalled()
+{
+if (comphelper::LibreOfficeKit::isActive())
+return false;
+
+static OUString aLocaleStr;
+
+if (aLocaleStr.isEmpty())
+{
+// detect installed locale
+aLocaleStr = HelpLocaleString();
+}
+
+OUString helpRootURL = getHelpRootURL() + "/" + 
utl::ConfigManager::getProductVersion() + "/" + aLocaleStr;
+
+bool bOK = impl_checkHelpLocalePath( helpRootURL );
+return bOK;
+}
+
+} // namespace
 
 /// Return the locale we prefer for displaying help
-static OUString const & HelpLocaleString()
+// static OUString const & HelpLocaleString()
+static OUString  HelpLocaleString()
 {
 if (comphelper::LibreOfficeKit::isActive())
 return comphelper::LibreOfficeKit::getLanguageTag().getBcp47();
@@ -109,42 +200,66 @@ static OUString const & HelpLocaleString()
 static OUString aLocaleStr;
 if (aLocaleStr.isEmpty())
 {
-const OUString aEnglish( "en"  );
-// obtain selected UI language (/org.openoffice.Setup/L10N/ooLocale)
+const OUString aEnglish("en-US");
+// detect installed locale
 aLocaleStr = utl::ConfigManager::getLocale();
-bool bOk = !aLocaleStr.isEmpty();
-if ( !bO

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

[Tamás Zolnai]

 sw/source/filter/ascii/parasc.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 657da4697379274295e9fd32d3abc1334ebd50d2
Author: Tamás Zolnai 
Date:   Thu Jan 18 13:57:22 2018 +0100

tdf#115088: Pasting multi-line text from external source behaves strangely

Regression from:
e68b6e349c31ac1376e90218013e1e7612f2b522

AppendTextNode might be sufficient for import (when there is no
content in the document), but for clipboard operations better to
use the original SplitNode method.

Change-Id: I7de3e9bc9c5356acb0b4cc43927a0d39079522b2
Reviewed-on: https://gerrit.libreoffice.org/48124
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index 60f5e02759f6..9c038e776fec 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -472,7 +472,10 @@ ErrCode SwASCIIParser::ReadChars()
 {
 // We found a CR/LF, thus save the text
 InsertText( OUString( pLastStt ));
-pDoc->getIDocumentContentOperations().AppendTextNode( 
*pPam->GetPoint() );
+if(bNewDoc)
+pDoc->getIDocumentContentOperations().AppendTextNode( 
*pPam->GetPoint() );
+else
+pDoc->getIDocumentContentOperations().SplitNode( 
*pPam->GetPoint(), false );
 pLastStt = pStt;
 nLineLen = 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: 3 commits - src/lib

[David Tardon]

 src/lib/CMXParser.cpp |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 6568138767bcb1fe88c6331389d1d2dc2757780a
Author: David Tardon 
Date:   Fri Jan 19 13:38:24 2018 +0100

ofz#3494 use correct tag offset for seek

Change-Id: Ic0fc8fc9d10c2a0fb14fb5b0388ba8cfe5c68463

diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index a10a643..14137e5 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -1373,11 +1373,11 @@ bool 
libcdr::CMXParser::readFill(librevenge::RVNGInputStream *input)
 {
 case CMX_Tag_RenderAttr_FillSpec_Texture:
 {
-  long subStartOffset = input->tell();
   unsigned char subTagId = 0;
   unsigned short subTagLength = 0;
   do
   {
+long subStartOffset = input->tell();
 subTagId = readU8(input, m_bigEndian);
 if (subTagId == CMX_Tag_EndTag)
   break;
commit 9d1b9ec71a91fc8f3450c58937cd3fd76e6cb68e
Author: David Tardon 
Date:   Fri Jan 19 13:19:39 2018 +0100

fix seek to the next tag

The old code would use the length of the _preceding_ tag to determine
the offset of the next tag. At best, it would just read the first tag in
the sequence twice (the initial length is 0, so after reading the first
tag, it would seek back to it).

Change-Id: Ic10a2246a02bd27832b1c6aa478e43f40a6ef9d3

diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index 03287cb..a10a643 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -1652,7 +1652,7 @@ void 
libcdr::CMXParser::readJumpAbsolute(librevenge::RVNGInputStream *input)
 unsigned short tagLength = 0;
 do
 {
-  long endOffset = input->tell() + tagLength;
+  long offset = input->tell();
   tagId = readU8(input, m_bigEndian);
   if (tagId == CMX_Tag_EndTag)
   {
@@ -1668,7 +1668,7 @@ void 
libcdr::CMXParser::readJumpAbsolute(librevenge::RVNGInputStream *input)
   default:
 break;
   }
-  input->seek(endOffset, librevenge::RVNG_SEEK_SET);
+  input->seek(offset + tagLength, librevenge::RVNG_SEEK_SET);
 }
 while (tagId != CMX_Tag_EndTag);
   }
commit 8e60690a1e5e2c5eb3a644f093176f9ba9ac3293
Author: David Tardon 
Date:   Fri Jan 19 13:02:58 2018 +0100

ofz#5454 fix stack overflow

Change-Id: I8db432d1338d50d36a60a6a85612088a5d65b359

diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index 33aa40a..03287cb 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -123,6 +123,8 @@ bool 
libcdr::CMXParser::parseRecord(librevenge::RVNGInputStream *input, unsigned
 
 if (fourCC == CDR_FOURCC_RIFF || fourCC == CDR_FOURCC_RIFX || fourCC == 
CDR_FOURCC_LIST)
 {
+  if (length < 4)
+return false;
 #ifdef DEBUG
   unsigned listType = readU32(input, m_bigEndian);
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/filter/html/htmltab.cxx |   34 --
 1 file changed, 34 deletions(-)

New commits:
commit eb98ae7c9b8973b87a58a4a4820cde12c42ada82
Author: Michael Stahl 
Date:   Fri Jan 19 13:35:52 2018 +0100

sw: loplugin:unreffun

HTMLTable::FixFillerFrameFormat is unused now.

Change-Id: Ic09d9585368ead7317325068eabb0171b76b6a9b

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index 8a52695029fc..d2fff4c1a907 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -468,7 +468,6 @@ class HTMLTable
 void FixFrameFormat( SwTableBox *pBox, sal_uInt16 nRow, sal_uInt16 nCol,
   sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
   bool bFirstPara=true, bool bLastPara=true ) const;
-void FixFillerFrameFormat( SwTableBox *pBox, bool bRight ) const;
 
 // Create a table with the content (lines/boxes)
 void MakeTable_( SwTableBox *pUpper );
@@ -1458,39 +1457,6 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
 
 }
 
-void HTMLTable::FixFillerFrameFormat( SwTableBox *pBox, bool bRight ) const
-{
-SwFrameFormat *pFrameFormat = pBox->ClaimFrameFormat();
-
-if( m_bFillerTopBorder || m_bFillerBottomBorder ||
-(!bRight && m_bInheritedLeftBorder) || (bRight && 
m_bInheritedRightBorder) )
-{
-SvxBoxItem aBoxItem( RES_BOX );
-if( m_bFillerTopBorder )
-aBoxItem.SetLine( &m_aTopBorderLine, SvxBoxItemLine::TOP );
-if( m_bFillerBottomBorder )
-aBoxItem.SetLine( &m_aBottomBorderLine, SvxBoxItemLine::BOTTOM );
-if( !bRight && m_bInheritedLeftBorder )
-aBoxItem.SetLine( &m_aInheritedLeftBorderLine, 
SvxBoxItemLine::LEFT );
-if( bRight && m_bInheritedRightBorder )
-aBoxItem.SetLine( &m_aInheritedRightBorderLine, 
SvxBoxItemLine::RIGHT );
-aBoxItem.SetAllDistances(MIN_BORDER_DIST);
-pFrameFormat->SetFormatAttr( aBoxItem );
-}
-else
-{
-pFrameFormat->ResetFormatAttr( RES_BOX );
-}
-
-if( GetInhBGBrush() )
-pFrameFormat->SetFormatAttr( *GetInhBGBrush() );
-else
-pFrameFormat->ResetFormatAttr( RES_BACKGROUND );
-
-pFrameFormat->ResetFormatAttr( RES_VERT_ORIENT );
-pFrameFormat->ResetFormatAttr( RES_BOXATR_FORMAT );
-}
-
 SwTableBox *HTMLTable::NewTableBox( const SwStartNode *pStNd,
 SwTableLine *pUpper ) const
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source dtrans/source sc/inc sc/source sd/inc sd/qa sd/source sw/source

[Noel Grandin]

 dbaccess/source/ui/browser/dsEntriesNoExp.cxx |4 -
 dbaccess/source/ui/browser/unodatbr.cxx   |8 +-
 dbaccess/source/ui/control/dbtreelistbox.cxx  |2 
 dbaccess/source/ui/control/tabletree.cxx  |4 -
 dbaccess/source/ui/inc/listviewitems.hxx  |2 
 dtrans/source/win32/ftransl/ftransl.cxx   |3 -
 sc/inc/global.hxx |3 -
 sc/source/core/data/global.cxx|4 -
 sc/source/ui/docshell/impex.cxx   |4 -
 sd/inc/glob.hxx   |6 --
 sd/qa/unit/import-tests.cxx   |4 -
 sd/source/core/drawdoc.cxx|4 -
 sd/source/core/drawdoc3.cxx   |8 +-
 sd/source/core/drawdoc4.cxx   |   38 ++---
 sd/source/core/sdpage.cxx |   16 ++---
 sd/source/core/sdpage2.cxx|6 +-
 sd/source/core/stlfamily.cxx  |   24 
 sd/source/core/stlpool.cxx|   76 +-
 sd/source/core/stlsheet.cxx   |   32 +-
 sd/source/filter/ppt/pptin.cxx|   12 ++--
 sd/source/filter/xml/sdtransform.cxx  |4 -
 sd/source/ui/dlg/dlgolbul.cxx |2 
 sd/source/ui/dlg/prltempl.cxx |2 
 sd/source/ui/dlg/unchss.cxx   |4 -
 sd/source/ui/docshell/grdocsh.cxx |4 -
 sd/source/ui/func/fuconrec.cxx|2 
 sd/source/ui/func/fuconstr.cxx|4 -
 sd/source/ui/func/fuolbull.cxx|2 
 sd/source/ui/func/fuprobjs.cxx|2 
 sd/source/ui/func/futempl.cxx |   20 +++---
 sd/source/ui/unoidl/unoobj.cxx|4 -
 sd/source/ui/unoidl/unopage.cxx   |4 -
 sd/source/ui/view/drawview.cxx|6 +-
 sd/source/ui/view/drtxtob1.cxx|2 
 sd/source/ui/view/drviews2.cxx|4 -
 sd/source/ui/view/drviewsf.cxx|   18 +++---
 sd/source/ui/view/outlnvsh.cxx|2 
 sd/source/ui/view/viewshe3.cxx|2 
 sd/source/ui/view/viewshel.cxx|2 
 sw/source/core/bastyp/calc.cxx|   15 ++---
 sw/source/filter/xml/xmlithlp.cxx |   52 ++---
 41 files changed, 194 insertions(+), 223 deletions(-)

New commits:
commit d4a066c3e4b7ebcdb16ffcb88b6b2c744c127ea1
Author: Noel Grandin 
Date:   Fri Jan 19 12:16:31 2018 +0200

inline some defines

which don't add any value anymore

Change-Id: I45977d972d4d02926630b749d3ec736416138cf5

diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx 
b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 0df6b7bbcf68..74e07e2a7910 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -106,7 +106,7 @@ SbaTableQueryBrowser::EntryType 
SbaTableQueryBrowser::getEntryType( const SvTree
 
 void SbaTableQueryBrowser::select(SvTreeListEntry* _pEntry, bool _bSelect)
 {
-SvLBoxItem* pTextItem = _pEntry ? 
_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : nullptr;
+SvLBoxItem* pTextItem = _pEntry ? 
_pEntry->GetFirstItem(SvLBoxItemType::String) : nullptr;
 if (pTextItem)
 {
 static_cast(pTextItem)->emphasize(_bSelect);
@@ -128,7 +128,7 @@ void SbaTableQueryBrowser::selectPath(SvTreeListEntry* 
_pEntry, bool _bSelect)
 
 bool SbaTableQueryBrowser::isSelected(SvTreeListEntry* _pEntry)
 {
-SvLBoxItem* pTextItem = _pEntry ? 
_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : nullptr;
+SvLBoxItem* pTextItem = _pEntry ? 
_pEntry->GetFirstItem(SvLBoxItemType::String) : nullptr;
 if (pTextItem)
 return static_cast(pTextItem)->isEmphasized();
 else {
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx 
b/dbaccess/source/ui/browser/unodatbr.cxx
index 2f14c616b6a5..ca2dc64699fe 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2141,7 +2141,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, 
SvTreeListEntry*, _pParent, bool)
 DBTreeListUserData* pData = static_cast< DBTreeListUserData* 
>(_pParent->GetUserData());
 assert(pData && "SbaTableQueryBrowser::OnExpandEntry: No user data!");
 #if OSL_DEBUG_LEVEL > 0
-SvLBoxString* pString = 
static_cast(pFirstParent->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING));
+SvLBoxString* pString = 
static_cast(pFirstParent->GetFirstItem(SvLBoxItemType::String));
 OSL_ENSURE(pString,"SbaTableQueryBrowser::OnExpandEntry: No string item!");
 #endif
 
@@ -2266,7 +2266,7 @@ bool SbaTableQueryBrowser::ensureEntryObject( 
SvTreeListEntry* _pEntry )
 SvTreeListEntry* pParent = 
m_pTreeView->getListBox().GetParent(_pEntry);
 if ( pParent != pDataSourceEntry )
 {
-SvLBoxString* pString = 
static_cast(_pEntry->GetFirstIte

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

[Stephan Bergmann]

 fpicker/source/aqua/SalAquaPicker.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a34a251ca4e4feeb31a96a88e3ac0add3cc22866
Author: Stephan Bergmann 
Date:   Fri Jan 19 13:45:35 2018 +0100

loplugin:redundantcast (after loplugin:cstylecast, macOS)

Change-Id: I349eb6c3c2408729799d35316ab75bb05920021f

diff --git a/fpicker/source/aqua/SalAquaPicker.mm 
b/fpicker/source/aqua/SalAquaPicker.mm
index 0809842cb23e..cb83b21f6b89 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -83,7 +83,7 @@ void SalAquaPicker::implInitialize()
 
 case NAVIGATIONSERVICES_SAVE:
 m_pDialog = [NSSavePanel savePanel];
-[(NSSavePanel*)m_pDialog setCanSelectHiddenExtension:NO]; 
//changed for issue #102102
+[m_pDialog setCanSelectHiddenExtension:NO]; //changed for issue 
#102102
 /* I would have loved to use
  * [(NSSavePanel*)m_pDialog setExtensionHidden:YES];
  * here but unfortunately this
___
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/emptyif.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 5ea8854d3cac2d31b86838f09bdc628ba7b6a4de
Author: Stephan Bergmann 
Date:   Fri Jan 19 13:52:24 2018 +0100

-Werror,-Wunused-variable

Change-Id: I1bcfe0dabd61a2157bc4a48ea54413882ecaaabc

diff --git a/compilerplugins/clang/emptyif.cxx 
b/compilerplugins/clang/emptyif.cxx
index d9348e660378..6eac86b6bcc7 100644
--- a/compilerplugins/clang/emptyif.cxx
+++ b/compilerplugins/clang/emptyif.cxx
@@ -30,13 +30,7 @@ public:
 {
 }
 
-virtual void run() override
-{
-StringRef fn(compiler.getSourceManager()
- 
.getFileEntryForID(compiler.getSourceManager().getMainFileID())
- ->getName());
-TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
-}
+virtual void run() override { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
 
 bool VisitIfStmt(IfStmt const*);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: accessibility/source avmedia/source basctl/source basic/qa compilerplugins/clang connectivity/source desktop/source extensions/source filter/source hwpfilter/source lot

[Noel Grandin]

 accessibility/source/standard/vclxaccessiblebox.cxx |4 
 avmedia/source/viewer/mediaevent_impl.cxx   |   12 --
 basctl/source/basicide/basicbox.cxx |6 -
 basctl/source/basicide/scriptdocument.cxx   |6 -
 basic/qa/cppunit/basic_coverage.cxx |3 
 compilerplugins/clang/emptyif.cxx   |   95 
 compilerplugins/clang/test/emptyif.cxx  |   61 ++
 connectivity/source/commontools/TTableHelper.cxx|5 
 connectivity/source/commontools/predicateinput.cxx  |7 -
 desktop/source/deployment/registry/sfwk/dp_sfwk.cxx |3 
 extensions/source/update/check/updatehdl.cxx|3 
 filter/source/graphicfilter/icgm/cgm.cxx|   20 ---
 hwpfilter/source/lexer.cxx  |2 
 lotuswordpro/source/filter/lwpmarker.cxx|4 
 oox/source/ppt/buildlistcontext.cxx |3 
 reportdesign/source/filter/xml/xmlExport.cxx|3 
 reportdesign/source/ui/report/ReportController.cxx  |4 
 sc/source/core/opencl/op_addin.cxx  |4 
 sc/source/core/opencl/op_financial.cxx  |   32 +
 sc/source/core/opencl/op_math.cxx   |4 
 sc/source/core/opencl/op_statistical.cxx|   71 ++-
 sc/source/core/tool/address.cxx |8 -
 sc/source/filter/oox/extlstcontext.cxx  |5 
 sc/source/ui/inc/prevwsh.hxx|1 
 sc/source/ui/view/prevwsh.cxx   |9 -
 sc/source/ui/view/tabcont.cxx   |3 
 sc/source/ui/view/tabvwshc.cxx  |4 
 sd/source/filter/ppt/pptinanimations.cxx|7 -
 sd/source/ui/func/fuconrec.cxx  |3 
 sd/source/ui/func/futempl.cxx   |3 
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |5 
 sfx2/source/dialog/templdlg.cxx |6 -
 sfx2/source/doc/objstor.cxx |3 
 solenv/CompilerTest_compilerplugins_clang.mk|1 
 sot/source/sdstor/storage.cxx   |3 
 stoc/source/inspect/introspection.cxx   |   23 +--
 sw/source/core/fields/dbfld.cxx |2 
 sw/source/core/fields/docufld.cxx   |4 
 sw/source/core/para/paratr.cxx  |2 
 sw/source/filter/html/htmlflywriter.cxx |4 
 sw/source/ui/dbui/addresslistdialog.cxx |5 
 sw/source/ui/misc/insfnote.cxx  |4 
 sw/source/uibase/ribbar/workctrl.cxx|3 
 sw/source/uibase/utlui/unotools.cxx |2 
 vcl/source/edit/textview.cxx|4 
 vcl/source/filter/jpeg/transupp.c   |2 
 vcl/source/uitest/uiobject.cxx  |3 
 vcl/source/window/brdwin.cxx|5 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |4 
 49 files changed, 203 insertions(+), 277 deletions(-)

New commits:
commit be94207ecb88a9005ee6624e354d70c9613d7653
Author: Noel Grandin 
Date:   Thu Jan 18 15:59:46 2018 +0200

new loplugin:emptyif

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

diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx 
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 35e3f9210563..77cc0e18fab0 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -489,10 +489,6 @@ sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& 
aNumber )
 
 OUString  fValue;
 bool bValid = (aNumber >>= fValue);
-if( bValid )
-{
-
-}
 return bValid;
 
 }
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx 
b/avmedia/source/viewer/mediaevent_impl.cxx
index fac08d070870..100bb0d83466 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -125,23 +125,11 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( 
const css::awt::MouseEvent
 
 void SAL_CALL MediaEventListenersImpl::mouseEntered( const 
css::awt::MouseEvent& )
 {
-const ::osl::MutexGuard aGuard( maMutex );
-const SolarMutexGuard aAppGuard;
-
-if( mpNotifyWindow )
-{
-}
 }
 
 
 void SAL_CALL MediaEventListenersImpl::mouseExited( const 
css::awt::MouseEvent& )
 {
-const ::osl::MutexGuard aGuard( maMutex );
-const SolarMutexGuard aAppGuard;
-
-if( mpNotifyWindow )
-{
-}
 }
 
 
diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index 6af00166696

[Libreoffice-commits] core.git: avmedia/source chart2/source codemaker/source comphelper/source compilerplugins/clang cppcanvas/source dbaccess/source desktop/source framework/source i18npool/inc i18n

[Noel Grandin]

 avmedia/source/vlc/inc/wrapper/Player.hxx |5 -
 avmedia/source/vlc/wrapper/Player.cxx |   18 --
 chart2/source/model/template/ChartType.hxx|3 -
 codemaker/source/cppumaker/cpputype.cxx   |8 +--
 comphelper/source/misc/backupfilehelper.cxx   |4 -
 compilerplugins/clang/unusedmethods.py|3 -
 cppcanvas/source/inc/implrenderer.hxx |2 
 cppcanvas/source/mtfrenderer/implrenderer.cxx |4 -
 dbaccess/source/ui/browser/brwctrlr.cxx   |3 -
 dbaccess/source/ui/browser/unodatbr.cxx   |7 --
 dbaccess/source/ui/inc/QueryViewSwitch.hxx|2 
 dbaccess/source/ui/inc/brwctrlr.hxx   |2 
 dbaccess/source/ui/inc/unodatbr.hxx   |2 
 dbaccess/source/ui/querydesign/QueryViewSwitch.cxx|9 +--
 desktop/source/deployment/gui/dp_gui_dialog2.cxx  |   26 
+++---
 desktop/source/deployment/gui/dp_gui_dialog2.hxx  |6 +-
 framework/source/uiconfiguration/CommandImageResolver.cxx |3 -
 framework/source/uiconfiguration/CommandImageResolver.hxx |2 
 i18npool/inc/cclass_unicode.hxx   |2 
 i18npool/source/characterclassification/cclass_unicode_parser.cxx |3 -
 idl/inc/bastype.hxx   |2 
 idl/inc/lex.hxx   |4 -
 idl/inc/parser.hxx|2 
 idl/source/objects/bastype.cxx|5 -
 idl/source/prj/parser.cxx |7 +-
 idlc/inc/astattribute.hxx |2 
 idlc/inc/astoperation.hxx |2 
 idlc/source/astdump.cxx   |4 -
 idlc/source/astoperation.cxx  |4 -
 lotuswordpro/source/filter/lwptblformula.cxx  |3 -
 lotuswordpro/source/filter/lwptblformula.hxx  |2 
 sdext/source/minimizer/impoptimizer.cxx   |3 -
 sdext/source/minimizer/impoptimizer.hxx   |2 
 sdext/source/presenter/PresenterWindowManager.cxx |4 -
 sdext/source/presenter/PresenterWindowManager.hxx |2 
 starmath/inc/document.hxx |2 
 starmath/source/document.cxx  |4 -
 starmath/source/mathmlattr.hxx|5 -
 svtools/source/contnr/imivctl.hxx |2 
 sw/source/core/text/inftxt.hxx|3 -
 sw/source/filter/ww8/docxattributeoutput.cxx  |   10 ---
 sw/source/filter/ww8/docxattributeoutput.hxx  |2 
 ucb/source/ucp/ftp/ftpcontentprovider.cxx |6 --
 ucb/source/ucp/ftp/ftpcontentprovider.hxx |2 
 xmlsecurity/inc/xmlsignaturehelper.hxx|4 -
 xmlsecurity/source/helper/xmlsignaturehelper.cxx  |8 ---
 46 files changed, 65 insertions(+), 145 deletions(-)

New commits:
commit be8c414567f49242164b1fdfb12764b16be355c1
Author: Noel Grandin 
Date:   Fri Jan 19 09:13:03 2018 +0200

loplugin:unusedmethods also check for functions returning bool

we were previously excluding them

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

diff --git a/avmedia/source/vlc/inc/wrapper/Player.hxx 
b/avmedia/source/vlc/inc/wrapper/Player.hxx
index 740390080d63..84b064493d61 100644
--- a/avmedia/source/vlc/inc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Player.hxx
@@ -51,16 +51,13 @@ namespace wrapper
 
 void setWindow( intptr_t id );
 
-bool takeSnapshot(const rtl::OUString& file);
+void takeSnapshot(const rtl::OUString& file);
 
 bool hasVout() const;
 
 void setScale( float factor );
 void setVideoSize( unsigned width, unsigned height );
 
-unsigned getWidth() const;
-unsigned getHeight() const;
-
 operator libvlc_media_player_t*()
 {
 return mPlayer;
diff --git a/avmedia/source/vlc/wrapper/Player.cxx 
b/avmedia/source/vlc/wrapper/Player.cxx
index 44eed54fca8e..7eb33440e24d 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -180,20 +180,6 @@ namespace wrapper
 libvlc_video_set_scale( mPlayer, factor

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

[Caolán McNamara]

 sw/inc/doc.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 13624b479698b0c1d0c3bc8f95ab632ab9c4c779
Author: Caolán McNamara 
Date:   Fri Jan 19 09:30:27 2018 +

out of date 'define private public' comment

Change-Id: I21663a7eef846244f330b3236a2ff1a2efae15bb
Reviewed-on: https://gerrit.libreoffice.org/48174
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index da91f08d4375..a243aa11125c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -613,7 +613,6 @@ public:
 bool bDrawAlso,
 bool bAsCharAlso = false ) const;
 
-// Because swrtf.cxx and define private public here now.
 SwFlyFrameFormat  *MakeFlyFrameFormat (const OUString &rFormatName, 
SwFrameFormat *pDerivedFrom);
 SwDrawFrameFormat *MakeDrawFrameFormat(const OUString &rFormatName, 
SwFrameFormat *pDerivedFrom);
 
___
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' - sw/source

[Eike Rathke]

 sw/source/core/table/swtable.cxx |   27 +--
 1 file changed, 25 insertions(+), 2 deletions(-)

New commits:
commit f7d3af010bb36f4a1fdf8a936d9d60af14feb38e
Author: Eike Rathke 
Date:   Fri Dec 1 19:46:45 2017 +0100

Resolves: tdf#106322 keep original cell content when assigning number format

... and content can't be parsed as number. Instead of converting 0.

Change-Id: Ief0c0a0284762fc0e801d6cc598720a97d733e31
(cherry picked from commit acf7e4c0a3dc0cca986bf4d4b7a65bafe7e70abc)
Reviewed-on: https://gerrit.libreoffice.org/45695
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit fd2cdd325cd59eb1f967136170503145b1d75936)

diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index f77c8a14d305..f4f32acdef75 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2251,6 +2251,8 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 
 if( (!bNewIsTextFormat && nOldFormat != nNewFormat) || 
pNewFormula )
 {
+bool bIsNumFormat = false;
+OUString aOrigText;
 bool bChgText = true;
 double fVal = 0;
 if( !pNewVal && SfxItemState::SET != GetItemState(
@@ -2263,6 +2265,7 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 sal_uInt32 nTmpFormatIdx = nNewFormat;
 OUString aText( GetDoc()->GetNodes()[ nNdPos ]
 
->GetTextNode()->GetRedlineText());
+aOrigText = aText;
 if( aText.isEmpty() )
 bChgText = false;
 else
@@ -2272,7 +2275,6 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 
 // JP 22.04.98: Bug 49659 -
 //  Special casing for percent
-bool bIsNumFormat = false;
 if( css::util::NumberFormat::PERCENT ==
 pNumFormatr->GetType( nNewFormat ))
 {
@@ -2305,7 +2307,10 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 }
 }
 else
+{
 fVal = pNewVal->GetValue();
+bIsNumFormat = true;
+}
 
 // format contents with the new value assigned and 
write to paragraph
 Color* pCol = nullptr;
@@ -2316,7 +2321,25 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 }
 else
 {
-pNumFormatr->GetOutputString( fVal, nNewFormat, 
sNewText, &pCol );
+if (bIsNumFormat)
+pNumFormatr->GetOutputString( fVal, 
nNewFormat, sNewText, &pCol );
+else
+{
+// Original text could not be parsed as
+// number/date/time/..., so keep the text.
+#if 0
+// Actually the text should be formatted
+// according to the format, which may include
+// additional text from the format, for example
+// in {0;-0;"BAD: "@}. But other places when
+// entering a new value or changing text or
+// changing to a different format of type Text
+// don't do this (yet?).
+pNumFormatr->GetOutputString( aOrigText, 
nNewFormat, sNewText, &pCol );
+#else
+sNewText = aOrigText;
+#endif
+}
 
 if( !bChgText )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/localized.xsl

[Adolfo Jayme Barrientos]

 help3xsl/localized.xsl |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d860405baeffb4cb6b1a32274d2c2b609ef8deea
Author: Adolfo Jayme Barrientos 
Date:   Fri Jan 19 06:23:16 2018 -0600

Correct Catalan spelling

Typo introduced in 01879555450189381cc02517433807056b193af8

Change-Id: I9978ec8b238493a501981e192aa92547f2c1fe5d

diff --git a/help3xsl/localized.xsl b/help3xsl/localized.xsl
index 344ac4cc7..a52474b1b 100644
--- a/help3xsl/localized.xsl
+++ b/help3xsl/localized.xsl
@@ -110,8 +110,8 @@ Stylesheet map language-dependent parameters and translation
 Skoazell %PRODUCTNAME 

 %PRODUCTNAME 
 मदत
 Pomoć za %PRODUCTNAME 

-Ayuda del %PRODUCTNAME 

-Ayuda del %PRODUCTNAME 

+Ajuda del %PRODUCTNAME 

+Ajuda del %PRODUCTNAME 

 Nápověda %PRODUCTNAME 

 Cymorth %PRODUCTNAME 

 %PRODUCTNAME 
Hjælp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit 7d9a5d886f4ba5c61d3c5602a9825510c68eea41
Author: Adolfo Jayme Barrientos 
Date:   Fri Jan 19 06:23:16 2018 -0600

Updated core
Project: help  d860405baeffb4cb6b1a32274d2c2b609ef8deea

Correct Catalan spelling

Typo introduced in 01879555450189381cc02517433807056b193af8

Change-Id: I9978ec8b238493a501981e192aa92547f2c1fe5d

diff --git a/helpcontent2 b/helpcontent2
index 02e87fe2b002..d860405baeff 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 02e87fe2b0027c725075154f9172e9fb99ef9589
+Subproject commit d860405baeffb4cb6b1a32274d2c2b609ef8deea
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/localized.xsl

[Olivier Hallot]

 help3xsl/localized.xsl |   49 -
 1 file changed, 48 insertions(+), 1 deletion(-)

New commits:
commit 02e87fe2b0027c725075154f9172e9fb99ef9589
Author: Olivier Hallot 
Date:   Fri Jan 19 10:04:51 2018 -0200

Add more localized strings for new Help

Change-Id: I8c0cdcf8cf1ce64a407c98f4619a46b08c259b7d
Reviewed-on: https://gerrit.libreoffice.org/48186
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/help3xsl/localized.xsl b/help3xsl/localized.xsl
index e8c494e02..344ac4cc7 100644
--- a/help3xsl/localized.xsl
+++ b/help3xsl/localized.xsl
@@ -98,24 +98,71 @@ Stylesheet map language-dependent parameters and translation
 
 
 
+%PRODUCTNAME 
 
እርዳታ
+مساعدة %PRODUCTNAME 

+%PRODUCTNAME 
 সহায়
 Ayuda de %PRODUCTNAME 

+Даведка %PRODUCTNAME 

 Помощ за %PRODUCTNAME 

+%PRODUCTNAME 
 সহায়িকা 
+%PRODUCTNAME 
 সহায়িকা 
+%PRODUCTNAME 
 རོགས་རམ་སྒེའུ་ཁུང་ 

+Skoazell %PRODUCTNAME 

+%PRODUCTNAME 
 मदत
+Pomoć za %PRODUCTNAME 

 Ayuda del %PRODUCTNAME 

 Ayuda del %PRODUCTNAME 

+Nápověda %PRODUCTNAME 

+Cymorth %PRODUCTNAME 

 %PRODUCTNAME 
Hjælp
 Hilfe für %PRODUCTNAME 

+%PRODUCTNAME 
 རོགས་རམ། 
+Βοήθεια του %PRODUCTNAME 

 Helpo de %PRODUCTNAME 

 Ayuda de %PRODUCTNAME 

 %PRODUCTNAME 
 abi
+%PRODUCTNAME 
 
Laguntza
+%PRODUCTNAME 
 
Ohje
 Aide %PRODUCTNAME 

+Axuda do %PRODUCTNAME 

+%PRODUCTNAME 
 મદદ
+%PRODUCTNAME 
 मदद
+%PRODUCTNAME 
 
pomoć
 %PRODUCTNAME 
 
Súgó
-%PRODUCTNAME 
Hjálp
+Bantuan %PRODUCTNAME 

+%PRODUCTNAME 
 
Hjálp
+Guida di %PRODUCTNAME 

+%PRODUCTNAME 
 ヘルプ
+%PRODUCTNAME 
 
დახმარება
+ជំនួយ %PRODUCTNAME 

+%PRODUCTNAME 
 도움말
+%PRODUCTNAME 
 
žinynas
+%PRODUCTNAME 
 
Palīdzība
+Помош за %PRODUCTNAME 

+%PRODUCTNAME 
 
Hjelp
+%PRODUCTNAME 
 
मद्दत
+Help voor %PRODUCTNAME 

+Hjelp for %PRODUCTNAME 

+Gargaarsa %PRODUCTNAME 

+Pomoc %PRODUCTNAME 

 Ajuda do %PRODUCTNAME 

 Ajuda do %PRODUCTNAME 

+Manualul %PRODUCTNAME 

 Справка %PRODUCTNAME 

+%PRODUCTNAME 
 
උදව්
+%PRODUCTNAME 
 
Kaa'lo
+Pomocník %PRODUCTNAME 

 Pomoč %PRODUCTNAME 

 Ndihma për %PRODUCTNAME 

+%PRODUCTNAME 
-hjälp
+%PRODUCTNAME 
உதவி
+Кӯмаки %PRODUCTNAME 

+%PRODUCTNAME 
Yardım
+%PRODUCTNAME 
 ياردەم 
كۆزنىكى
+Довідка %PRODUCTNAME 

+Trợ giúp %PRODUCTNAME 

 %PRODUCTNAME 
 帮助
+%PRODUCTNAME 
 說明
 %PRODUCTNAME  Help
 
 
___
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-desktop' - sw/source

[Eike Rathke]

 sw/source/core/table/swtable.cxx |   27 +--
 1 file changed, 25 insertions(+), 2 deletions(-)

New commits:
commit e20c9723e278263c6c38603b89021941cceb92ad
Author: Eike Rathke 
Date:   Fri Dec 1 19:46:45 2017 +0100

Resolves: tdf#106322 keep original cell content when assigning number format

... and content can't be parsed as number. Instead of converting 0.

Change-Id: Ief0c0a0284762fc0e801d6cc598720a97d733e31
(cherry picked from commit acf7e4c0a3dc0cca986bf4d4b7a65bafe7e70abc)
Reviewed-on: https://gerrit.libreoffice.org/45695
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit fd2cdd325cd59eb1f967136170503145b1d75936)
(cherry picked from commit f7d3af010bb36f4a1fdf8a936d9d60af14feb38e)

diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index f77c8a14d305..f4f32acdef75 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2251,6 +2251,8 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 
 if( (!bNewIsTextFormat && nOldFormat != nNewFormat) || 
pNewFormula )
 {
+bool bIsNumFormat = false;
+OUString aOrigText;
 bool bChgText = true;
 double fVal = 0;
 if( !pNewVal && SfxItemState::SET != GetItemState(
@@ -2263,6 +2265,7 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 sal_uInt32 nTmpFormatIdx = nNewFormat;
 OUString aText( GetDoc()->GetNodes()[ nNdPos ]
 
->GetTextNode()->GetRedlineText());
+aOrigText = aText;
 if( aText.isEmpty() )
 bChgText = false;
 else
@@ -2272,7 +2275,6 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 
 // JP 22.04.98: Bug 49659 -
 //  Special casing for percent
-bool bIsNumFormat = false;
 if( css::util::NumberFormat::PERCENT ==
 pNumFormatr->GetType( nNewFormat ))
 {
@@ -2305,7 +2307,10 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 }
 }
 else
+{
 fVal = pNewVal->GetValue();
+bIsNumFormat = true;
+}
 
 // format contents with the new value assigned and 
write to paragraph
 Color* pCol = nullptr;
@@ -2316,7 +2321,25 @@ void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew
 }
 else
 {
-pNumFormatr->GetOutputString( fVal, nNewFormat, 
sNewText, &pCol );
+if (bIsNumFormat)
+pNumFormatr->GetOutputString( fVal, 
nNewFormat, sNewText, &pCol );
+else
+{
+// Original text could not be parsed as
+// number/date/time/..., so keep the text.
+#if 0
+// Actually the text should be formatted
+// according to the format, which may include
+// additional text from the format, for example
+// in {0;-0;"BAD: "@}. But other places when
+// entering a new value or changing text or
+// changing to a different format of type Text
+// don't do this (yet?).
+pNumFormatr->GetOutputString( aOrigText, 
nNewFormat, sNewText, &pCol );
+#else
+sNewText = aOrigText;
+#endif
+}
 
 if( !bChgText )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/BorderlineFix' - 136 commits - android/Bootstrap android/CustomTarget_lo_android.mk android/source autogen.sh basctl/source basic/source bin/get-bugzill

[Armin Le Grand]

Rebased ref, commits from common ancestor:
commit 7a8d18ffe54b974c71f52ebb43c1e1d4faa2ac59
Author: Armin Le Grand 
Date:   Fri Jan 19 14:43:24 2018 +0100

BorderlineFix: Corrected missing borders in print

In Print/PDF/PrintPreview border lines were missing, this
happened for merged cells. It has to do with access to the
involved Styles and/or 'Clip' set (to avoid creating everything).
Thus a 'mixed' usage of cell and merged-cell stuff was needed.
As it turns out support for this is already there, need to use
it.

Change-Id: Ic16085b97eef5c79a4501279432f43491bca350e

diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index 2feaab5af8bf..9b532a2d0d29 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -143,10 +143,6 @@ private:
 /// the impl class holding the data
 std::shared_ptr< implStyle >maImplStyle;
 
-/// pointer to Cell using this style. Not member of the
-/// impl class since multiple Cells may use the same style
-const Cell* mpUsingCell;
-
 /// call to set maImplStyle on demand
 void implEnsureImplStyle();
 
diff --git a/svx/source/dialog/framelinkarray.cxx 
b/svx/source/dialog/framelinkarray.cxx
index ecb3eaace1c6..ac47053155ec 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1055,17 +1055,14 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 for (size_t nCol = nFirstCol; nCol <= nLastCol; ++nCol)
 {
 // get Cell and CoordinateSystem (*only* for this Cell), check if 
used (not empty)
-const Cell& rCell = CELL(nCol, nRow);
+const Cell& rCell(CELL(nCol, nRow));
 basegfx::B2DHomMatrix 
aCoordinateSystem(rCell.CreateCoordinateSystem(*this, nCol, nRow, false));
 basegfx::B2DVector aX(basegfx::utils::getColumn(aCoordinateSystem, 
0));
 basegfx::B2DVector aY(basegfx::utils::getColumn(aCoordinateSystem, 
1));
 
 if(!aX.equalZero() && !aY.equalZero())
 {
-// for getting correct Style(s) for merged Cells, we need the 
First(Col/Row)
-// for access (see accessing Styles below)
-const size_t _nFirstCol(mxImpl->GetMergedFirstCol(nCol, nRow));
-const size_t _nFirstRow(mxImpl->GetMergedFirstRow(nCol, nRow));
+// get needed local values
 basegfx::B2DPoint 
aOrigin(basegfx::utils::getColumn(aCoordinateSystem, 2));
 const bool bOverlapX(rCell.mbOverlapX);
 const bool bOverlapY(rCell.mbOverlapY);
@@ -1078,7 +1075,9 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 if (!bOverlapY  // true for first line in merged cells or 
cells
 || bFirstRow)   // true for non_Calc usages of this tooling
 {
-const Style& rTop = GetCellStyleTop(_nFirstCol, 
_nFirstRow);
+// get CellStyle - method will take care to get the 
correct one, e.g.
+// for merged cells (it uses ORIGCELL that works with 
topLeft's of these)
+const Style& rTop(GetCellStyleTop(nCol, nRow));
 
 if(rTop.IsUsed())
 {
@@ -1089,7 +1088,7 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 // create lower line for this Cell
 if (bLastRow)   // true for non_Calc usages of this tooling
 {
-const Style& rBottom = GetCellStyleBottom(_nFirstCol, 
_nFirstRow);
+const Style& rBottom(GetCellStyleBottom(nCol, nRow));
 
 if(rBottom.IsUsed())
 {
@@ -1101,7 +1100,7 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 if (!bOverlapX  // true for first column in merged cells 
or cells
 || bFirstCol)   // true for non_Calc usages of this tooling
 {
-const Style& rLeft(GetCellStyleLeft(_nFirstCol, 
_nFirstRow));
+const Style& rLeft(GetCellStyleLeft(nCol, nRow));
 
 if(rLeft.IsUsed())
 {
@@ -1112,7 +,7 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 // create right line for this Cell
 if (bLastCol)   // true for non_Calc usages of this tooling
 {
-const Style& rRight(GetCellStyleRight(_nFirstCol, 
_nFirstRow));
+const Style& rRight(GetCellStyleRight(nCol, nRow));
 
 if(rRight.IsUsed())
 {
@@ -1122,8 +1121,8 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 
 // check for crossed

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

[Caolán McNamara]

 sw/source/filter/html/svxcss1.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8da8e5bf24bbcaa35d5d58d32ca3c173bda62a65
Author: Caolán McNamara 
Date:   Fri Jan 19 09:06:48 2018 +

ofz#5483 Integer-overflow

Change-Id: If364a961f5e144cc0f3572108020c99db6febfb8
Reviewed-on: https://gerrit.libreoffice.org/48177
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/filter/html/svxcss1.cxx 
b/sw/source/filter/html/svxcss1.cxx
index 79151c635062..773bfc3607d5 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -2979,8 +2979,11 @@ static void ParseCSS1_size( const CSS1Expression *pExpr,
 break;
 
 case CSS1_PIXLENGTH:
+{
+double fHeight = pExpr->GetNumber();
+if (fHeight < SAL_MAX_INT32/2.0 && fHeight > SAL_MIN_INT32/2.0)
 {
-long nPHeight = static_cast(pExpr->GetNumber());
+long nPHeight = static_cast(fHeight);
 long nPWidth = n==0 ? nPHeight : 0;
 SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
 rPropInfo.m_nHeight = nPHeight;
@@ -2989,7 +2992,7 @@ static void ParseCSS1_size( const CSS1Expression *pExpr,
 rPropInfo.m_eSizeType = SVX_CSS1_STYPE_TWIP;
 }
 break;
-
+}
 default:
 ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl

[Caolán McNamara]

 sal/osl/all/log.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d27776a8c570ae4fc525c78ecd135c30dc7ae49
Author: Caolán McNamara 
Date:   Fri Jan 19 09:39:01 2018 +

coverity#1427647 acknowledge Resource leak is deliberate

Change-Id: I9d4beccfa7ca8953360d67d08a3b2f04d2ccfed9
Reviewed-on: https://gerrit.libreoffice.org/48178
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 83ff23e42add..e25136f2002d 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -155,7 +155,7 @@ char const * getLogLevel() {
 
 std::ofstream * getLogFile() {
 // First check the environment variable, then the setting in logging.ini
-char const * logFile = getEnvironmentVariable("SAL_LOG_FILE");
+static char const * logFile = getEnvironmentVariable("SAL_LOG_FILE");
 if (!logFile)
 return nullptr;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 oox/source/export/chartexport.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d633d8455aff440a5b573cfa34557c7310e688a1
Author: Caolán McNamara 
Date:   Fri Jan 19 14:54:57 2018 +

refactor to look prettier

Change-Id: I3bf7ce76516f7c930e564791109ff72fb5b87d52

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 72cfae098c67..0f33bf708a86 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -862,15 +862,9 @@ void ChartExport::exportLegend( const Reference< 
css::chart::XChartDocument >& x
 XML_val, "edge",
 FSEND);
 chart2::RelativePosition aPos = 
aRelativePos.get();
-uno::Any aRelativeSize = xProp->getPropertyValue("RelativeSize");
-chart2::RelativeSize aSize;
-if (aRelativeSize.hasValue())
-aSize = aRelativeSize.get();
 
 const double x = aPos.Primary;
 const double y = aPos.Secondary;
-const double w = aSize.Primary;
-const double h = aSize.Secondary;
 
 pFS->singleElement(FSNS(XML_c, XML_x),
 XML_val, IS(x),
@@ -879,8 +873,14 @@ void ChartExport::exportLegend( const Reference< 
css::chart::XChartDocument >& x
 XML_val, IS(y),
 FSEND);
 
+uno::Any aRelativeSize = xProp->getPropertyValue("RelativeSize");
 if (aRelativeSize.hasValue())
 {
+chart2::RelativeSize aSize = 
aRelativeSize.get();
+
+const double w = aSize.Primary;
+const double h = aSize.Secondary;
+
 pFS->singleElement(FSNS(XML_c, XML_w),
 XML_val, IS(w),
 FSEND);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Implementing accessibility non-regression check tool

[Samuel Thibault]

Hello,

This is a small mail to briefly present the work we (Hypra) will be
doing for accessibility in LibreOffice.

Basically, the idea is to design a tool which will check .ui files for
accessibility issues: missing relations between widgets and labels,
notably. The tool would just use libxml to parse the files and emit
warnings for the found issues.

Such a tool could be called by the LibreOffice build system so that
developers get the warnings along other compiler warnings, and treated
the same way. It could also be used in Continuous Integration reports.

Of course, there are a lot of existing issues, so we plan to add support
for suppression rules, so that when the tool invocation is integrated,
we also integrate an initial set of suppression rules which allows to
start with a zero-warning state, and then for a start developers will
try to stay without warning, and progressively fix existing issues and
their corresponding suppression rules.

One of the remaining questions we have (it's not blocking for our
immediate development, though) is whether this tool should be integrated
within libreoffice, or within glade. The latter would both allow more
widespread use of the tool by other projects, and make the maintenance
happen there, thus less work for LibreOffice :)

We can discuss about it at the ESC call today.

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

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

[Caolán McNamara]

 sw/source/uibase/shells/textsh1.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 432f4369cdb62fd05abbde50804ff4e1d5011f39
Author: Caolán McNamara 
Date:   Thu Jan 18 15:50:23 2018 +

coverity#1427648 Dereference after null check

Change-Id: Ib4be7b819a5ba68d78d98d8ae05d755898f3cad1
Reviewed-on: https://gerrit.libreoffice.org/48136
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index 561ba1de9cea..b7e001cbd769 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -199,9 +199,12 @@ void sw_CharDialog(SwWrtShell &rWrtSh, bool bUseDialog, 
sal_uInt16 nSlot, const
 
 if (bUseDialog)
 {
-std::shared_ptr pRequest(new SfxRequest(*pReq));
-pReq->Ignore(); // the 'old' request is not relevant any more
-
+std::shared_ptr pRequest;
+if (pReq)
+{
+pRequest.reset(new SfxRequest(*pReq));
+pReq->Ignore(); // the 'old' request is not relevant any more
+}
 pDlg->StartExecuteAsync([pDlg, &rWrtSh, pCoreSet, bSel, bSelectionPut, 
pRequest](sal_Int32 nResult){
 if (nResult == RET_OK)
 {
___
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' - sw/source

[Tamás Zolnai]

 sw/source/filter/ascii/parasc.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c163db958f0e105b8d37eaef6388a4f89c57d251
Author: Tamás Zolnai 
Date:   Thu Jan 18 13:57:22 2018 +0100

tdf#115088: Pasting multi-line text from external source behaves strangely

Regression from:
e68b6e349c31ac1376e90218013e1e7612f2b522

AppendTextNode might be sufficient for import (when there is no
content in the document), but for clipboard operations better to
use the original SplitNode method.

Change-Id: I7de3e9bc9c5356acb0b4cc43927a0d39079522b2
Reviewed-on: https://gerrit.libreoffice.org/48124
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 657da4697379274295e9fd32d3abc1334ebd50d2)
Reviewed-on: https://gerrit.libreoffice.org/48204
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index e3045b0edee8..bd9af08c3cb7 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -481,7 +481,10 @@ sal_uLong SwASCIIParser::ReadChars()
 {
 // We found a CR/LF, thus save the text
 InsertText( OUString( pLastStt ));
-pDoc->getIDocumentContentOperations().AppendTextNode( 
*pPam->GetPoint() );
+if(bNewDoc)
+pDoc->getIDocumentContentOperations().AppendTextNode( 
*pPam->GetPoint() );
+else
+pDoc->getIDocumentContentOperations().SplitNode( 
*pPam->GetPoint(), false );
 pLastStt = pStt;
 nLineLen = 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 254c80037a3939c110d5c66fef6c28caf47625e5
Author: Justin Luth 
Date:   Wed Jan 17 16:25:56 2018 +0300

writerfilter: move TopContextType==Para requirement

This is prep work for tdf#95377. I need this function to
run when there is no TopContext. This function doesn't do anything
with the context, so in that regard I wonder if it is even
necessary? My guess would be that it is a leftover piece from
discovering the fix for n75883.

However, to avoid causing a regression, I'm just pulling this test
into the calling functions. (Of the three instances
calling this function, two need to be contextless..)

This is not truly NFC because if the followup patch is reverted,
then this one will cause a change. But that is actually OK, because
if my follow-up patch breaks because of these two functions changing
to become contextless, then I'll be better able to pin-point the
reason for the regression.

Original commit adding this function was
commit 2123ede032ca64f696ef54af4ad3238974ca2b5d

Change-Id: I471aa852aa48527d69e0343a2ac28fa6e8acb209
Reviewed-on: https://gerrit.libreoffice.org/48062
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ee3533bc134e..c66b087eca67 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5409,7 +5409,7 @@ uno::Reference 
DomainMapper_Impl::GetCurrentNumberingRu
 try
 {
 OUString aStyle = GetCurrentParaStyleId();
-if (aStyle.isEmpty() || GetTopContextType() != CONTEXT_PARAGRAPH)
+if (aStyle.isEmpty())
 return xRet;
 const StyleSheetEntryPtr pEntry = 
GetStyleSheetTable()->FindStyleSheetByISTD(aStyle);
 if (!pEntry)
@@ -5446,7 +5446,9 @@ uno::Reference 
DomainMapper_Impl::GetCurrentNumberingCharSt
 try
 {
 sal_Int32 nListLevel = -1;
-uno::Reference xLevels = 
GetCurrentNumberingRules(&nListLevel);
+uno::Reference xLevels;
+if ( GetTopContextType() == CONTEXT_PARAGRAPH )
+xLevels = GetCurrentNumberingRules(&nListLevel);
 if (!xLevels.is())
 {
 PropertyMapPtr pContext = m_pTopContext;
___
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 5a36d0533be4c230c1647710a42f7eee5b464700
Author: Andras Timar 
Date:   Fri Jan 19 17:14:22 2018 +0100

Bump version to 5.3-37

Change-Id: I46a2ed02e39826ae724261a3eedbbf61f99f6fa3

diff --git a/configure.ac b/configure.ac
index 9c30362abcf5..0ddfb27d8668 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.36],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.37],[],[],[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] help.git: Changes to 'refs/tags/cp-5.3-37'

[Andras Timar]

Tag 'cp-5.3-37' created by Andras Timar  at 
2018-01-19 16:14 +

cp-5.3-37

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] dictionaries.git: Changes to 'refs/tags/cp-5.3-37'

[Olivier R]

Tag 'cp-5.3-37' created by Andras Timar  at 
2018-01-19 16:14 +

cp-5.3-37

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

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

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

[Andras Timar]

Tag 'cp-5.3-37' created by Andras Timar  at 
2018-01-19 16:14 +

cp-5.3-37

Changes since cp-5.3-36-8:
---
 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-37'

[Andras Timar]

Tag 'cp-5.3-37' created by Andras Timar  at 
2018-01-19 16:14 +

cp-5.3-37

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

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

[Eike Rathke]

 sc/source/core/tool/interpr3.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2e832eff2fea4005fb43521593f979657ef7c111
Author: Eike Rathke 
Date:   Fri Jan 19 18:30:45 2018 +0100

Don't push error twice

No harm was done as the stack is cleaned up afterwards, but it's wrong
anyway and having to push the result downwards during cleanup is
unnecessary.

Change-Id: I0b2c153c9791ce5c287d340bac466c19cd6a5703

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 55b80a6612e9..cee396128f53 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2704,13 +2704,14 @@ void ScInterpreter::ScTTest()
 }
 else if (fTyp == 2.0)
 {
-CalculateTest(false,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF);
+if (!CalculateTest(false,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF))
+return; // error was pushed
 }
 else if (fTyp == 3.0)
 {
-CalculateTest(true,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF);
+if (!CalculateTest(true,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF))
+return; // error was pushed
 }
-
 else
 {
 PushIllegalArgument();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/inc

[Matthias Seidel]

 svx/inc/galtheme.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 106d959da4cccda4c0342715cc06854f152c99d1
Author: Matthias Seidel 
Date:   Fri Jan 19 18:45:59 2018 +

Fixed wording

diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 713ccfbb240d..2b3d64601550 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -26,7 +26,7 @@
 #define RID_GALLERYSTR_THEME_START  (6000)
 
 // These defines are used to map gallery names to translated string 
ressources. Since
-// galleries may be copied from older offices to newer, do *never* change this
+// galleries may be copied from older offices to newer, do *never* change these
 // IDs except adding new ones (and adapting RID_GALLERYSTR_THEME_LAST). The ID
 // *is* written into the binary file *.thm (which is a gallery theme combined 
of
 // three files, *.thm, *.sdv and *.sdg)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sfx2/source/appl/impldde.cxx   |   23 ++-
 sfx2/source/appl/impldde.hxx   |6 +++---
 sw/qa/extras/uiwriter/uiwriter.cxx |7 ++-
 3 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 8da0832fe5f216768e3c4f17334ed15ef7b4de85
Author: Mike Kaganski 
Date:   Fri Jan 19 10:14:07 2018 +0100

Don't create database files in $HOME

Regression from commit 46b3202bf883618f1585850191c19776861013ed

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

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index f32c512d84de..6f4903f98d2f 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5765,13 +5765,16 @@ void SwUiWriterTest::testTdf115013()
 {
const OUString sColumnName("Name with spaces, \"quotes\" and 
\\backslashes");
 
+   utl::TempFile aTempDir(nullptr, true);
+   const OUString aWorkDir = aTempDir.GetURL();
+
//create new writer document
 SwDoc* pDoc = createDoc();
 
 {
 // Load and register data source
 const OUString 
aDataSourceURI(m_directories.getURLFromSrc(DATA_DIRECTORY) + "datasource.ods");
-OUString sDataSource = 
SwDBManager::LoadAndRegisterDataSource(aDataSourceURI, nullptr);
+OUString sDataSource = 
SwDBManager::LoadAndRegisterDataSource(aDataSourceURI, &aWorkDir);
 CPPUNIT_ASSERT(!sDataSource.isEmpty());
 
 // Insert a new field type for the mailmerge field
@@ -5805,6 +5808,8 @@ void SwUiWriterTest::testTdf115013()
 OUString sColumn = 
static_cast(pField->GetTyp())->GetColumnName();
 // The column name must come correct after round trip
 CPPUNIT_ASSERT_EQUAL(sColumnName, sColumn);
+
+utl::removeTree(aWorkDir);
 }
 
 void SwUiWriterTest::testTdf115065()
commit 57a70245f5ad4b8bb722c1dc0aaa06f3d42965f4
Author: Noel Grandin 
Date:   Tue Jan 16 15:20:17 2018 +0200

loplugin:useuniqueptr in SvDDEObject

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

diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 2ed6388bbe97..4428f875bd08 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -126,9 +126,9 @@ SvDDEObject::SvDDEObject()
 
 SvDDEObject::~SvDDEObject()
 {
-delete pLink;
-delete pRequest;
-delete pConnection;
+pLink.reset();
+pRequest.reset();
+pConnection.reset();
 }
 
 bool SvDDEObject::GetData( css::uno::Any & rData /*out param*/,
@@ -143,8 +143,7 @@ bool SvDDEObject::GetData( css::uno::Any & rData /*out 
param*/,
 OUString sServer( pConnection->GetServiceName() );
 OUString sTopic( pConnection->GetTopicName() );
 
-delete pConnection;
-pConnection = new DdeConnection( sServer, sTopic );
+pConnection.reset( new DdeConnection( sServer, sTopic ) );
 }
 
 if( bWaitForData ) // we are in an rekursive loop, get out again
@@ -172,9 +171,7 @@ bool SvDDEObject::GetData( css::uno::Any & rData /*out 
param*/,
 {
 // otherwise it will be executed asynchronously
 {
-delete pRequest;
-
-pRequest = new DdeRequest( *pConnection, sItem );
+pRequest.reset( new DdeRequest( *pConnection, sItem ) );
 pRequest->SetDataHdl( LINK( this, SvDDEObject, ImplGetDDEData ) );
 pRequest->SetDoneHdl( LINK( this, SvDDEObject, ImplDoneDDEData ) );
 pRequest->SetFormat( SotExchange::GetFormatIdFromMimeType(
@@ -213,7 +210,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
 if( sServer.isEmpty() || sTopic.isEmpty() || sItem.isEmpty() )
 return false;
 
-pConnection = new DdeConnection( sServer, sTopic );
+pConnection.reset( new DdeConnection( sServer, sTopic ) );
 if( pConnection->GetError() )
 {
 // check if the DDE server knows the "SYSTEM" topic
@@ -234,7 +231,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
 if( SfxLinkUpdateMode::ALWAYS == nLinkType && !pLink && 
!pConnection->GetError() )
 {
 // Setting up Hot Link, Data will be available at some point later on
-pLink = new DdeHotLink( *pConnection, sItem );
+pLink.reset( new DdeHotLink( *pConnection, sItem ) );
 pLink->SetDataHdl( LINK( this, SvDDEObject, ImplGetDDEData ) );
 pLink->SetDoneHdl( LINK( this, SvDDEObject, ImplDoneDDEData ) );
 pLink->SetFormat( pSvLink->GetContentType() );
@@ -347,9 +344,9 @@ IMPL_LINK( SvDDEObject, ImplDoneDDEData, bool, bValid, void 
)
 {
 DdeTransaction* pReq = nullptr;
 if( !pLink || ( pLink && pLink->IsBusy() ))
-pReq = pRequest;  // only the one that is ready
+pReq = pRequest.get();  // only the one that is ready
 els

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

[Marco A . G . Pinto]

 extras/source/autocorr/lang/pt/DocumentList.xml |   34 
 1 file changed, 34 insertions(+)

New commits:
commit 8ea2f31429475a40e22d5e86471228308526fb1e
Author: Marco A.G.Pinto 
Date:   Thu Jan 4 17:13:50 2018 +0100

34 new autocorrect words pt_PT

Change-Id: Ic5b13b2d21b7c429782a8c6cbb2be65be3a94aea
Reviewed-on: https://gerrit.libreoffice.org/47405
Tested-by: Jenkins 
Reviewed-by: Aron Budea 

diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml 
b/extras/source/autocorr/lang/pt/DocumentList.xml
index ef543d27f5a5..a3027f163bf8 100644
--- a/extras/source/autocorr/lang/pt/DocumentList.xml
+++ b/extras/source/autocorr/lang/pt/DocumentList.xml
@@ -112,6 +112,7 @@
 
 
 
+
 
 
 
@@ -283,6 +284,7 @@
 
 
 
+
 
 
 
@@ -307,6 +309,8 @@
 
 
 
+
+
 
 
 
@@ -319,6 +323,9 @@
 
 
 
+
+
+
 
 
 
@@ -339,6 +346,8 @@
 
 
 
+
+
 
 
 
@@ -347,6 +356,7 @@
 
 
 
+
 
 
 
@@ -359,6 +369,8 @@
 
 
 
+
+
 
 
 
@@ -394,6 +406,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -406,6 +422,8 @@
 
 
 
+
+
 
 
 
@@ -421,12 +439,14 @@
 
 
 
+
 
 
 
 
 
 
+
 
 
 
@@ -603,6 +623,7 @@
 
 
 
+
 
 
 
@@ -687,6 +708,8 @@
 
 
 
+
+
 
 
 
@@ -709,6 +732,7 @@
 
 
 
+
 
 
 
@@ -845,6 +869,8 @@
 
 
 
+
+
 
 
 
@@ -877,6 +903,7 @@
 
 
 
+
 
 
 
@@ -997,6 +1024,7 @@
 
 
 
+
 
 
 
@@ -1009,9 +1037,12 @@
 
 
 
+
+
 
 
 
+
 
 
 
@@ -1421,6 +1452,7 @@
 
 
 
+
 
 
 
@@ -2240,6 +2272,8 @@
   
   
   
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/macab/MacabAddressBook.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ece0b1adae5e52c4301005514fb54750e860f6f
Author: Stephan Bergmann 
Date:   Fri Jan 19 13:43:54 2018 +0100

loplugin:unnecessaryparen (macOS)

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

diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx 
b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 83c412d74f03..93795cbc7d89 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -99,7 +99,7 @@ MacabAddressBook::~MacabAddressBook()
 iter = m_xMacabGroups.begin();
 end = m_xMacabGroups.end();
 for( ; iter != end; ++iter)
-delete (*iter);
+delete *iter;
 }
 
 m_bRetrievedGroups = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/osx/clipboard.cxx|2 +-
 vcl/osx/salnativewidgets.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 78a5ed18dc3368cfa78cfcfb54a08c600b4c0ab5
Author: Stephan Bergmann 
Date:   Fri Jan 19 13:46:22 2018 +0100

loplugin:redundantcast (after loplugin:cstylecast, macOS)

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

diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx
index 53326fb6634d..d0c047f54ae8 100644
--- a/vcl/osx/clipboard.cxx
+++ b/vcl/osx/clipboard.cxx
@@ -292,7 +292,7 @@ void AquaClipboard::provideDataForType(NSPasteboard* 
sender, const NSString* typ
 
 if (dp.get() != nullptr)
 {
-pBoardData = (NSData*)dp->getSystemData();
+pBoardData = dp->getSystemData();
 [sender setData: pBoardData forType:const_cast(type)];
 }
 }
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 42add9e30d5a..d311526c0168 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -921,8 +921,8 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 ControlState nUpperState = ControlState::ENABLED;//state of 
the upper button
 ControlState nLowerState = ControlState::ENABLED;//and of the 
lower button
 if(pSpinButtonVal) {//pSpinButtonVal is sometimes null
-nUpperState = (ControlState) pSpinButtonVal->mnUpperState;
-nLowerState = (ControlState) pSpinButtonVal->mnLowerState;
+nUpperState = pSpinButtonVal->mnUpperState;
+nLowerState = pSpinButtonVal->mnLowerState;
 
 HIThemeButtonDrawInfo aSpinInfo;
 aSpinInfo.kind = kThemeIncDecButton;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 editeng/source/editeng/impedit2.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 25d159dd764d917a04e46819bb8efcc2a6067cd6
Author: Caolán McNamara 
Date:   Thu Jan 18 21:09:53 2018 +

ofz#5477 if the para is already oversize, nums would go negative

Change-Id: I183e1377747f662da1204e90a24fb4f8f2268699
Reviewed-on: https://gerrit.libreoffice.org/48156
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index c5d8c2ad4830..a7e5ef0c9ceb 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2723,12 +2723,13 @@ EditPaM ImpEditEngine::ImpInsertText(const 
EditSelection& aCurSel, const OUStrin
 if ( nEnd > nStart )
 {
 OUString aLine = aText.copy( nStart, nEnd-nStart );
-sal_Int32 nChars = aPaM.GetNode()->Len() + aLine.getLength();
-if ( nChars > MAXCHARSINPARA )
+sal_Int32 nExistingChars = aPaM.GetNode()->Len();
+sal_Int32 nChars = nExistingChars + aLine.getLength();
+if (nChars > MAXCHARSINPARA)
 {
-sal_Int32 nMaxNewChars = MAXCHARSINPARA-aPaM.GetNode()->Len();
+sal_Int32 nMaxNewChars = std::max(0, MAXCHARSINPARA 
- nExistingChars);
 nEnd -= ( aLine.getLength() - nMaxNewChars ); // Then the 
characters end up in the next paragraph.
-aLine = aLine.copy( 0, nMaxNewChars );// Delete 
the Rest...
+aLine = aLine.copy( 0, nMaxNewChars );// Delete the 
Rest...
 }
 if ( IsUndoEnabled() && !IsInUndo() )
 InsertUndo(new EditUndoInsertChars(pEditEngine, 
CreateEPaM(aPaM), aLine));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 emfio/source/reader/mtftools.cxx |5 -
 include/tools/gen.hxx|4 
 starmath/source/mathmlimport.cxx |4 ++--
 tools/source/generic/gen.cxx |   19 ++-
 4 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit f69e2f739ca3c23c9de055c8600c867e864cd4ff
Author: Caolán McNamara 
Date:   Thu Jan 18 21:28:02 2018 +

ofz#5475 Integer-overflow

Change-Id: I11d706c544698d57b75231e33e3d49f1ac1d4d73
Reviewed-on: https://gerrit.libreoffice.org/48159
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index e3bbb5f6c4b8..44316fd29d0f 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -497,7 +497,10 @@ namespace emfio
 
 tools::Rectangle MtfTools::ImplMap( const tools::Rectangle& rRect )
 {
-return tools::Rectangle( ImplMap( rRect.TopLeft() ), ImplMap( 
rRect.GetSize() ) );
+tools::Rectangle aRect;
+aRect.SetPos(ImplMap(rRect.TopLeft()));
+aRect.SaturatingSetSize(ImplMap(rRect.GetSize()));
+return aRect;
 }
 
 void MtfTools::ImplMap( vcl::Font& rFont )
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 1f72a32078bb..a10b74e03b0b 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -430,6 +430,10 @@ public:
 inline void expand(long nExpandBy);
 inline void shrink(long nShrinkBy);
 
+/**
+ * Sanitizing variants for handling data from the outside
+ */
+voidSaturatingSetSize(const Size& rSize);
 private:
 longnLeft;
 longnTop;
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index bf2caa0a8458..032feb61a260 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -3062,14 +3062,14 @@ void SmXMLImport::SetViewSettings(const 
Sequence& aViewProps)
 pValue->Value >>= nTmp;
 Size aSize( aRect.GetSize() );
 aSize.Width() = nTmp;
-aRect.SetSize( aSize );
+aRect.SaturatingSetSize(aSize);
 }
 else if (pValue->Name == "ViewAreaHeight" )
 {
 pValue->Value >>= nTmp;
 Size aSize( aRect.GetSize() );
 aSize.Height() = nTmp;
-aRect.SetSize( aSize );
+aRect.SaturatingSetSize(aSize);
 }
 pValue++;
 }
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index 2627d9202842..5fe6eeeaa3d6 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -20,7 +20,7 @@
 #include 
 
 #include 
-
+#include 
 #include 
 #include 
 
@@ -68,6 +68,23 @@ void tools::Rectangle::SetSize( const Size& rSize )
 nBottom = RECT_EMPTY;
 }
 
+void tools::Rectangle::SaturatingSetSize(const Size& rSize)
+{
+if (rSize.Width() < 0)
+nRight = o3tl::saturating_add(nLeft, (rSize.Width() + 1));
+else if ( rSize.Width() > 0 )
+nRight = o3tl::saturating_add(nLeft, (rSize.Width() - 1));
+else
+nRight = RECT_EMPTY;
+
+if ( rSize.Height() < 0 )
+nBottom = o3tl::saturating_add(nTop, (rSize.Height() + 1));
+else if ( rSize.Height() > 0 )
+nBottom = o3tl::saturating_add(nTop, (rSize.Height() - 1));
+else
+nBottom = RECT_EMPTY;
+}
+
 tools::Rectangle& tools::Rectangle::Union( const tools::Rectangle& rRect )
 {
 if ( rRect.IsEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - configure.ac external/firebird RepositoryExternal.mk scp2/source solenv/gbuild

[Michael Stahl]

 RepositoryExternal.mk |2 +-
 configure.ac  |7 ++-
 external/firebird/firebird-vs2017.patch.1 |6 ++
 scp2/source/ooo/vc_redist.scp |   19 +++
 solenv/gbuild/Output.mk   |3 +++
 5 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit 2a055c05381824644cc9c71615578dbb9c6976e3
Author: Michael Stahl 
Date:   Fri Jan 19 20:47:03 2018 +0100

scp2: also try VC141_CRT_*.msm

Apparently the MSMs have been renamed in Visual Studio 2017.3 but only
configure was adapted, not scp2.

Not sure if these MSMs are still relevant given the new
gid_File_Vcredist_Exe thing.

Change-Id: I4fe27c8298b3a2024acc62d12ce8ea67e2eca80d

diff --git a/configure.ac b/configure.ac
index 72774d715efd..e60822d9df26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6535,7 +6535,12 @@ if test $_os = "WINNT"; then
 MSVC_DLL_PATH="$msvcdllpath"
 MSVC_DLLS="$msvcdlls"
 MSM_PATH="$msmdir"
-SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
+# MSVC 15.3 changed it to VC141
+if echo "$MSVC_DLL_PATH" | grep -q "VC141.CRT$"; then
+SCPDEFS="$SCPDEFS -DWITH_VC141_REDIST"
+else
+SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
+fi
 if test "$VCREDIST_DIR" = "no"; then
 dnl explicitly disabled
 VCREDIST_DIR=""
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 40c6a7e8902e..9b414b8e39fa 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -58,6 +58,25 @@ End
 
 #endif
 
+#if defined(WITH_VC141_REDIST)
+
+#if defined WINDOWS_X64
+MergeModule gid_MergeModule_Microsoft_VC141_CRT_x64
+#else
+MergeModule gid_MergeModule_Microsoft_VC141_CRT_x86
+#endif
+Feature = gm_Root;
+#if defined WINDOWS_X64
+Name = "Microsoft_VC141_CRT_x64.msm";
+#else
+Name = "Microsoft_VC141_CRT_x86.msm";
+#endif
+RootDir = "TARGETDIR";
+ComponentCondition = "VC_REDIST=1";
+End
+
+#endif
+
 #endif // MSM_PATH
 
 #if defined(VCREDIST_EXE_NAME)
commit c799f159c541fe4835eb02c2e518b54a55d392bb
Author: Michael Stahl 
Date:   Fri Jan 19 14:53:57 2018 +0100

firebird: recognise MSVC 2017.5 (which defines _MSC_VER=1912)

Change-Id: Ic526bc3babfd342fd2ebb10003639d600a668ae5

diff --git a/external/firebird/firebird-vs2017.patch.1 
b/external/firebird/firebird-vs2017.patch.1
index b1d6b1b6b49e..7d140589c881 100644
--- a/external/firebird/firebird-vs2017.patch.1
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -1,13 +1,11 @@
 diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp 
firebird/src/common/os/win32/mod_loader.cpp
 --- firebird.orig/src/common/os/win32/mod_loader.cpp   2017-02-15 
22:11:48.939042400 +0100
 +++ firebird/src/common/os/win32/mod_loader.cpp2017-02-15 
22:12:30.062262700 +0100
-@@ -103,6 +103,10 @@
+@@ -103,6 +103,8 @@
"msvcr120.dll",
  #elif _MSC_VER == 1900
"vcruntime140.dll",
-+#elif _MSC_VER == 1910
-+  "vcruntime140.dll",
-+#elif _MSC_VER == 1911
++#elif _MSC_VER == 1910 || _MSC_VER == 1911 || _MSC_VER == 1912
 +  "vcruntime140.dll",
  #else
  #error Specify CRT DLL name here !
commit 0c3838bd080b47c935f26aed23d6c086fa87b27c
Author: Michael Stahl 
Date:   Fri Jan 19 14:13:34 2018 +0100

fix libxml2 dependency on icu

liblangtag build runs a "reg2xml.exe" which requires the ICU dlls in
instdir.

Change-Id: Icf44c51e802636de613f76a25fb16a567a8d982d

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 30709792c010..a795db70e4a0 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -845,7 +845,7 @@ define gb_ExternalProject__use_libxml2
 $(call gb_ExternalProject_use_package,$(1),libxml2)
 
 ifeq ($(COM),MSC)
-$(call gb_ExternalProject_use_external_project,$(1),icu)
+$(call gb_ExternalProject_use_packages,$(1),icu icu_ure)
 endif
 
 endef
commit b4a7cd3014344d53497283610ce6a06dbc51f053
Author: Michael Stahl 
Date:   Fri Jan 19 12:03:28 2018 +0100

gbuild: disable gb_COLOR on WNT for now

The Cygwin terminal swallows colorful error messages, which is unhelpful.

Change-Id: I2005994eb76fdba1dc49efc2988e38ac460d6724

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 92a277c24561..4fbefdea57a7 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -51,9 +51,12 @@ gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 
}' -)
 # default to color output, if interactive
 ifeq ($(origin gb_COLOR),undefined)
 ifneq ($(MAKE_TERMOUT),)
+# Cygwin mintty has issues where gb_Output_error is swallowed
+ifneq ($(OS),WNT)
 gb_COLOR=$(true)
 endif
 endif
+endif
 
 # only enable colorized output if
 # - gb_COLOR is set
___
Libreoffice-commits mailing list
libr

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit a70a8d26f149f6af6443446a97ac515e0dba0d50
Author: Adolfo Jayme Barrientos 
Date:   Fri Jan 19 15:51:19 2018 -0600

Updated core
Project: help  f8887d3de3a414cd677126484a56f7a29d88af67

Nope, that’s not what the button does

See core commit b1a6a99b9a78689c6d3649ce066fad66912188e2.

Change-Id: I70456817e1956d6e213468583e0e16b06a69b303

diff --git a/helpcontent2 b/helpcontent2
index d860405baeff..f8887d3de3a4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d860405baeffb4cb6b1a32274d2c2b609ef8deea
+Subproject commit f8887d3de3a414cd677126484a56f7a29d88af67
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Adolfo Jayme Barrientos]

 source/text/simpress/guide/presenter_console.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f8887d3de3a414cd677126484a56f7a29d88af67
Author: Adolfo Jayme Barrientos 
Date:   Fri Jan 19 15:51:19 2018 -0600

Nope, that’s not what the button does

See core commit b1a6a99b9a78689c6d3649ce066fad66912188e2.

Change-Id: I70456817e1956d6e213468583e0e16b06a69b303

diff --git a/source/text/simpress/guide/presenter_console.xhp 
b/source/text/simpress/guide/presenter_console.xhp
index 0f2e601c4..d4c50bdc9 100644
--- a/source/text/simpress/guide/presenter_console.xhp
+++ b/source/text/simpress/guide/presenter_console.xhp
@@ -75,7 +75,7 @@
 Slide: display the Presenter Console Slide sorter 
mode
 
 
-Restart: restart the presentation from slide 
one.
+Restart: restart the slide show timer.
 
 
 Exchange: Switch the displays between the 
computer and the presentation display.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 avmedia/source/macavf/player.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 312aaa0f8deb571fd507a0fa7af74b16cd1b7000
Author: Stephan Bergmann 
Date:   Fri Jan 19 13:45:01 2018 +0100

loplugin:redundantcast (after loplugin:cstylecast, macOS)

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

diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index cf94c495911e..2df11fba099b 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -37,7 +37,7 @@ using namespace ::com::sun::star;
 
 - (void)onNotification:(NSNotification*)pNotification
 {
-NSString* pNoteName = (NSString*)[pNotification name];
+NSString* pNoteName = [pNotification name];
 HandlersForObject::iterator it = maHandlersForObject.find( [pNotification 
object]);
 if( it != maHandlersForObject.end() )
 (*it).second->handleObservation( pNoteName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-0' - download.lst external/more_fonts Makefile.fetch Repository.mk

[Yousuf Philips]

 Makefile.fetch  |4 
 Repository.mk   |4 
 download.lst|8 
 external/more_fonts/ExternalPackage_amiri.mk|   20 
 external/more_fonts/ExternalPackage_kacst.mk|   17 +
 external/more_fonts/ExternalPackage_reem.mk |   16 
 external/more_fonts/ExternalPackage_scheherazade.mk |   17 +
 external/more_fonts/Module_more_fonts.mk|8 
 external/more_fonts/UnpackedTarball_amiri.mk|   14 ++
 external/more_fonts/UnpackedTarball_kacst.mk|   14 ++
 external/more_fonts/UnpackedTarball_reem.mk |   14 ++
 external/more_fonts/UnpackedTarball_scheherazade.mk |   14 ++
 12 files changed, 150 insertions(+)

New commits:
commit 539e2efa4e6ef82a1a5e9d58cd36a616c73546fc
Author: Yousuf Philips 
Date:   Thu Dec 21 18:57:02 2017 +0400

tdf#113532 Add Arabic fonts into default installation

Includes these fonts
* Amiri
* KACSTOffice, KACSTBook
* Reem Kufi
* Scheherazade

Change-Id: I2071c4c379b2dc88a205e2c284ae0a65cfdc76c9
Reviewed-on: https://gerrit.libreoffice.org/46624
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 4eaeb8058d75d03e782d37b430b68890aa374f2c)
Reviewed-on: https://gerrit.libreoffice.org/48012
Reviewed-by: Eike Rathke 
Reviewed-by: Khaled Hosny 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/Makefile.fetch b/Makefile.fetch
index 33558239eeb8..42a8ca8684f9 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -180,6 +180,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
+   $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \
+   $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \
+   $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \
+   $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call 
fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 8f5347fac910..92f24a886b98 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -946,19 +946,23 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo_fonts,\
postprocess_fontconfig) \
$(call gb_Helper_optional,MORE_FONTS,\
fonts_alef \
+   fonts_amiri \
fonts_caladea \
fonts_carlito \
fonts_culmus \
fonts_dejavu \
fonts_emojione_color \
fonts_gentium \
+   fonts_kacst \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
fonts_libre_hebrew \
fonts_noto \
+   fonts_reem \
fonts_sourcecode \
fonts_sourcesans \
+   fonts_scheherazade \
) \
 ))
 
diff --git a/download.lst b/download.lst
index f96ddba2582d..4ff5737e3540 100644
--- a/download.lst
+++ b/download.lst
@@ -76,6 +76,14 @@ export FONT_LIBRE_HEBREW_SHA256SUM := 
f596257c1db706ce35795b18d7f66a4db99d427725
 export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
 export FONT_ALEF_SHA256SUM := 
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
 export FONT_ALEF_TARBALL := alef-1.001.tar.gz
+export FONT_AMIRI_SHA256SUM := 
97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6
+export FONT_AMIRI_TARBALL := amiri-0.109.zip
+export FONT_KACST_SHA256SUM := 
dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
+export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz
+export FONT_REEM_SHA256SUM := 
4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b
+export FONT_REEM_TARBALL := ReemKufi-0.6.tar.gz
+export FONT_SCHEHERAZADE_SHA256SUM := 
251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
+export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
 export FREEHAND_SHA256SUM := 
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
 export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
 export FREETYPE_SHA256SUM := 
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
diff --git a/external/more_fonts/ExternalPackage_amiri.mk 
b/external/more_fonts/ExternalPackage_amiri.mk
new file mode 100644
index ..ccf5f1c94c8a
--- /dev/null
+++ b/external/more_fonts/ExternalPacka

Re: University practical exercise about LibreOffice

[Chris Sherlock]

On 15 Jan 2018, at 11:26 pm, Jacobo Aragunde Pérez  wrote:
> 
> Hi Adrián,
> 
> the code base of LibreOffice predates most bibliography about software
> patterns, so you aren't going to find documents like those here!
> 
> Still, I made a presentation some time ago that you may find useful,
> specially the parts that describe the branch model, how releases work, etc.
> 
> https://blogs.igalia.com/jaragunde/2015/11/11/updated-libreoffice-workshop-at-a-coruna-university/
>  
> 
> 
> The Android code is, indeed, modern, but it follows the good old
> development methodology of "hack something together until it works, then
> polish" :) You can still find some patterns, a good developer will find
> ways to reuse code or structures, but sometimes it's not even a
> conscious decision, and you won't find documentation about that
> excepting blog posts from the authors, if they feel like writing about
> that. Maybe check the blogs linked from:
> https://planet.documentfoundation.org/ 
> 
> 
> If you dig a bit more in my blog you will find some posts about the
> Android code that might (or might not!) be interesting. Like I said
> before, they explain the parts I wrote. But please, don't ask about them
> because I've totally forgot at this point! :D
> 
> Hope this helps. Good luck!
> 
> Best,
> -- 
> Jacobo Aragunde
> Software Engineer at Igalia

FWIW, whilst it hasn’t always been designed this way, there are patterns in the 
code. 

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

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

[Matthias Seidel]

 setup_native/source/packinfo/packinfo_brand.txt   |   16 +-
 setup_native/source/packinfo/packinfo_office.txt  |  118 +-
 setup_native/source/packinfo/packinfo_office_lang.txt |   22 +--
 setup_native/source/packinfo/packinfo_sdkoo.txt   |2 
 setup_native/source/packinfo/packinfo_ure.txt |4 
 5 files changed, 81 insertions(+), 81 deletions(-)

New commits:
commit 57aca14ae30f2876a348c7dc06a609f68d10d7ee
Author: Matthias Seidel 
Date:   Sat Jan 20 00:04:08 2018 +

Update the Copyright year to 2012-2018 for packages

diff --git a/setup_native/source/packinfo/packinfo_brand.txt 
b/setup_native/source/packinfo/packinfo_brand.txt
index 3579487d3baa..712775560285 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -34,7 +34,7 @@ packagename = "%UNIXPACKAGENAME"
 linuxreplaces = 
"openoffice.org3,openoffice.org3-dict-es,openoffice.org3-dict-en,openoffice.org3-dict-fr,ooobasis3.0-oooimprovement,ooobasis3.1-oooimprovement,ooobasis3.2-oooimprovement,ooobasis3.3-oooimprovement,ooobasis3.0-kde-integration,ooobasis3.1-kde-integration,ooobasis3.2-kde-integration,ooobasis3.3-kde-integration,ooobasis3.0-binfilter,ooobasis3.1-binfilter,ooobasis3.2-binfilter,ooobasis3.3-binfilter,ooobasis3.4-binfilter,ooobasis3.0-testtool,ooobasis3.1-testtool,ooobasis3.2-testtool,ooobasis3.3-testtool,ooobasis3.4-testtool"
 requires = 
"%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX-core01,%BASISPACKAGEPREFIX-core02,%BASISPACKAGEPREFIX-core03,%BASISPACKAGEPREFIX-core04,%BASISPACKAGEPREFIX-core05,%BASISPACKAGEPREFIX-core06,%BASISPACKAGEPREFIX-core07,%BASISPACKAGEPREFIX-images"
 solarisrequires = "%SOLSUREPACKAGEPREFIX-ure (Name="UNO Runtime Environment"), 
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION"), 
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION"), 
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION"), 
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION"), 
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION"), 
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION"), 
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for 
%PRODUCTNAME %PRODUCTVERSION"), 
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for 
%PRODUCTNAME %PRODUCTVERSION")"
-copyright = "2012 by The Apache Software Foundation"
+copyright = "2012-2018 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
 description = "Brand module for %PRODUCTNAME %PRODUCTVERSION"
@@ -49,7 +49,7 @@ packagename = "%UNIXPACKAGENAME-brand-writer"
 linuxreplaces = "openoffice.org3-writer"
 requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-writer"
 solarisrequires = 
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
-copyright = "2012 by The Apache Software Foundation"
+copyright = "2012-2018 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
 description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION"
@@ -64,7 +64,7 @@ packagename = "%UNIXPACKAGENAME-brand-calc"
 linuxreplaces = "openoffice.org3-calc"
 requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-calc"
 solarisrequires = 
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
-copyright = "2012 by The Apache Software Foundation"
+copyright = "2012-2018 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
 description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION"
@@ -79,7 +79,7 @@ packagename = "%UNIXPACKAGENAME-brand-impress"
 linuxreplaces = "openoffice.org3-impress"
 requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-impress"
 solarisrequires = 
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
-copyright = "2012 by The Apache Software Foundation"
+copyright = "2012-2018 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
 description = "Impress brand module for %PRODUCTNAME %PRODUCTVERSION"
@@ -94,7 +94,7 @@ packagename = "%UNIXPACKAGENAME-brand-draw"
 linuxreplaces = "openoffice.org3-draw"
 requires = "%UNIXPACKAGENAME,%BASISPACKAGEPREFIX-draw"
 solarisrequires = 
"%WITHOUTDOTUNIXPACKAGENAME,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
-copyright = "2012 by The Apache Software Foundation"
+copyright = "2012-2018 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
 description = "Draw brand module for %PRODUCTNAME %PRODUCTVERSION"
@

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/sifr icon-themes/sifr_dark

[Matthias Freund]

 icon-themes/sifr/cmd/32/save.png  |binary
 icon-themes/sifr/cmd/32/xportdirecttopdf.png  |binary
 icon-themes/sifr/cmd/lc_save.png  |binary
 icon-themes/sifr/cmd/lc_xportdirecttopdf.png  |binary
 icon-themes/sifr/cmd/sc_save.png  |binary
 icon-themes/sifr/cmd/sc_xportdirecttopdf.png  |binary
 icon-themes/sifr_dark/cmd/32/save.png |binary
 icon-themes/sifr_dark/cmd/32/xportdirecttopdf.png |binary
 icon-themes/sifr_dark/cmd/lc_save.png |binary
 icon-themes/sifr_dark/cmd/lc_xportdirecttopdf.png |binary
 icon-themes/sifr_dark/cmd/sc_save.png |binary
 icon-themes/sifr_dark/cmd/sc_xportdirecttopdf.png |binary
 12 files changed

New commits:
commit 7d897e233f54ef84cc70d1fcc73082e509a73069
Author: Matthias Freund 
Date:   Tue Jan 16 23:42:11 2018 +0100

tdf#75256 Sifr rework and new 32px icon for save and pdfexport

Change-Id: I565df7e887a3d2dfb8cf0ab7efcb98cd24a5956f
Reviewed-on: https://gerrit.libreoffice.org/48023
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/sifr/cmd/32/save.png b/icon-themes/sifr/cmd/32/save.png
new file mode 100644
index ..7399760147c9
Binary files /dev/null and b/icon-themes/sifr/cmd/32/save.png differ
diff --git a/icon-themes/sifr/cmd/32/xportdirecttopdf.png 
b/icon-themes/sifr/cmd/32/xportdirecttopdf.png
new file mode 100644
index ..a003c5f0fcdf
Binary files /dev/null and b/icon-themes/sifr/cmd/32/xportdirecttopdf.png differ
diff --git a/icon-themes/sifr/cmd/lc_save.png b/icon-themes/sifr/cmd/lc_save.png
index a59608a47394..aa990de14bb4 100644
Binary files a/icon-themes/sifr/cmd/lc_save.png and 
b/icon-themes/sifr/cmd/lc_save.png differ
diff --git a/icon-themes/sifr/cmd/lc_xportdirecttopdf.png 
b/icon-themes/sifr/cmd/lc_xportdirecttopdf.png
new file mode 100644
index ..127bf940d26b
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_xportdirecttopdf.png differ
diff --git a/icon-themes/sifr/cmd/sc_save.png b/icon-themes/sifr/cmd/sc_save.png
index 23066a60fb94..4f0ee231132a 100644
Binary files a/icon-themes/sifr/cmd/sc_save.png and 
b/icon-themes/sifr/cmd/sc_save.png differ
diff --git a/icon-themes/sifr/cmd/sc_xportdirecttopdf.png 
b/icon-themes/sifr/cmd/sc_xportdirecttopdf.png
new file mode 100644
index ..c5c9c522b850
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_xportdirecttopdf.png differ
diff --git a/icon-themes/sifr_dark/cmd/32/save.png 
b/icon-themes/sifr_dark/cmd/32/save.png
new file mode 100644
index ..d72f56c8934a
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/save.png differ
diff --git a/icon-themes/sifr_dark/cmd/32/xportdirecttopdf.png 
b/icon-themes/sifr_dark/cmd/32/xportdirecttopdf.png
new file mode 100644
index ..cc3d1806cb78
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/xportdirecttopdf.png 
differ
diff --git a/icon-themes/sifr_dark/cmd/lc_save.png 
b/icon-themes/sifr_dark/cmd/lc_save.png
index ff84c3dab036..b905858580ad 100644
Binary files a/icon-themes/sifr_dark/cmd/lc_save.png and 
b/icon-themes/sifr_dark/cmd/lc_save.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_xportdirecttopdf.png 
b/icon-themes/sifr_dark/cmd/lc_xportdirecttopdf.png
new file mode 100644
index ..af8178efad4e
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_xportdirecttopdf.png 
differ
diff --git a/icon-themes/sifr_dark/cmd/sc_save.png 
b/icon-themes/sifr_dark/cmd/sc_save.png
index 9cb3875c579f..8b84c88ddf4a 100644
Binary files a/icon-themes/sifr_dark/cmd/sc_save.png and 
b/icon-themes/sifr_dark/cmd/sc_save.png differ
diff --git a/icon-themes/sifr_dark/cmd/sc_xportdirecttopdf.png 
b/icon-themes/sifr_dark/cmd/sc_xportdirecttopdf.png
new file mode 100644
index ..c2604bf60375
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_xportdirecttopdf.png 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[sleepingpillow]

 i18npool/source/localedata/data/sv_SE.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ab1587fc825080ca9e66edba69021d49407687dd
Author: sleepingpillow 
Date:   Sat Jan 20 02:04:59 2018 +0100

tdf#113854 - Switch Cross-reference "above" and "below" in Swedish

These two words is switched for some unknown reason. It looks like it was 
done
by mistake.

Change-Id: I723e91bb93eed054969a09170d8307017187586d
Reviewed-on: https://gerrit.libreoffice.org/48228
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/i18npool/source/localedata/data/sv_SE.xml 
b/i18npool/source/localedata/data/sv_SE.xml
index ec67a49e21d8..449a42076f32 100644
--- a/i18npool/source/localedata/data/sv_SE.xml
+++ b/i18npool/source/localedata/data/sv_SE.xml
@@ -350,8 +350,8 @@
   2 kvartalet
   3 kvartalet
   4 kvartalet
-  nedan
-  ovan
+  ovan
+  nedan
   K1
   K2
   K3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[abstatic]

 lingucomponent/source/spellcheck/spell/sspellimp.cxx |   78 ++-
 lingucomponent/source/spellcheck/spell/sspellimp.hxx |   17 ++--
 2 files changed, 39 insertions(+), 56 deletions(-)

New commits:
commit 4edc58af369244fb734d34fee027237624cca9e6
Author: abstatic 
Date:   Thu Jan 18 16:31:44 2018 +0530

tdf#112373 Using vector of struct to manage hunspell dicts

Currently we use arrays allocated on heap for initializing
available locales and dictionaries.

This patch encapsulates all the different objects
related to a dictionary into a strcut dictItem.

unique_ptr is used for hunspell, also uses o3tl::make_unique for creating 
them.
Used 'reserve' for better memory allocation of vector.
Removed unused member and local variables.

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

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 192e4e2a3bb7..694bc1aa27e4 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace utl;
 using namespace osl;
@@ -69,28 +70,19 @@ using namespace linguistic;
 #endif
 
 SpellChecker::SpellChecker() :
-m_aDicts(nullptr),
-m_aDEncs(nullptr),
-m_aDLocs(nullptr),
-m_aDNames(nullptr),
-m_nNumDict(0),
 m_aEvtListeners(GetLinguMutex()),
 m_pPropHelper(nullptr),
 m_bDisposing(false)
 {
 }
 
+SpellChecker::DictItem::DictItem(OUString i_DName, Locale i_DLoc, 
rtl_TextEncoding i_DEnc):
+m_aDName(i_DName), m_aDLoc(i_DLoc), m_aDEnc(i_DEnc)
+{
+}
+
 SpellChecker::~SpellChecker()
 {
-if (m_aDicts)
-{
-   for (int i = 0; i < m_nNumDict; ++i)
-   {
-delete m_aDicts[i];
-   }
-   delete[] m_aDicts;
-}
-delete[] m_aDLocs;
 if (m_pPropHelper)
 {
 m_pPropHelper->RemoveAsPropListener();
@@ -116,7 +108,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
 
 // this routine should return the locales supported by the installed
 // dictionaries.
-if (!m_nNumDict)
+if (m_DictItems.empty())
 {
 SvtLinguConfig aLinguCfg;
 
@@ -150,7 +142,6 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
 uno::Reference< lang::XMultiServiceFactory > 
xServiceFactory(comphelper::getProcessServiceFactory());
 uno::Reference< ucb::XSimpleFileAccess > 
xAccess(xServiceFactory->createInstance("com.sun.star.ucb.SimpleFileAccess"), 
uno::UNO_QUERY);
 // get supported locales from the dictionaries-to-use...
-sal_Int32 k = 0;
 std::set aLocaleNamesSet;
 for (auto const& dict : aDics)
 {
@@ -178,7 +169,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
 }
 // ... and add them to the resulting sequence
 m_aSuppLocales.realloc( aLocaleNamesSet.size() );
-k = 0;
+sal_Int32 k = 0;
 for (auto const& localeName : aLocaleNamesSet)
 {
 Locale aTmp( LanguageTag::convertToLocale(localeName));
@@ -190,16 +181,12 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
 //! it is undefined which dictionary gets used.
 //! In the future the implementation should support using several 
dictionaries
 //! for one locale.
-m_nNumDict = 0;
+sal_uInt32 nDictSize = 0;
 for (auto const& dict : aDics)
-m_nNumDict = m_nNumDict + dict.aLocaleNames.getLength();
+nDictSize += dict.aLocaleNames.getLength();
 
 // add dictionary information
-m_aDicts  = new Hunspell* [m_nNumDict];
-m_aDEncs.reset( new rtl_TextEncoding [m_nNumDict] );
-m_aDLocs  = new Locale [m_nNumDict];
-m_aDNames.reset( new OUString [m_nNumDict] );
-k = 0;
+m_DictItems.reserve(nDictSize);
 for (auto const& dict : aDics)
 {
 if (dict.aLocaleNames.getLength() > 0 &&
@@ -212,33 +199,22 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
 // Once for each of its supported locales.
 for (auto const& localeName : aLocaleNames)
 {
-m_aDicts[k]  = nullptr;
-m_aDEncs[k]  = RTL_TEXTENCODING_DONTKNOW;
-m_aDLocs[k]  = 
LanguageTag::convertToLocale(localeName);
 // also both files have to be in the same directory 
and the
 // file names must only differ in the extension 
(.aff/.dic).
 // Thus we use the first location only and strip the 
extension part

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

[Julien Nabet]

 sw/qa/extras/odfimport/data/tdf115079.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx  |5 +
 sw/source/core/layout/tabfrm.cxx  |9 -
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit daf1b10f4e266818b6e14f0f1dfddd66f0a3a2f0
Author: Julien Nabet 
Date:   Thu Jan 18 08:37:04 2018 +0100

tdf#115079: check that row frame belongs to table frame to avoid segfault

A row frame may not belong to a table frame, when it is being cut, e.g., in
lcl_PostprocessRowsInCells().
Its SwRowFrame::Cut() has been called; it in turn called 
SwLayoutFrame::Cut(),
which nullified row's upper in RemoveFromLayout(), and then called Shrink()
for its former upper.
Regardless of whether it will be pasted back, or destroyed, currently it's 
not
part of layout, and its height does not count.

See bt https://bugs.documentfoundation.org/attachment.cgi?id=139171

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

diff --git a/sw/qa/extras/odfimport/data/tdf115079.odt 
b/sw/qa/extras/odfimport/data/tdf115079.odt
new file mode 100644
index ..6c1039e71ced
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf115079.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 032a4a5da574..a638dd818574 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -882,5 +882,10 @@ DECLARE_ODFIMPORT_TEST(testBlankBeforeFirstPage, 
"tdf94882.odt")
 );
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf115079, "tdf115079.odt")
+{
+// This document caused segfault when layouting
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 9ff64c1aa162..f1e2e2e56fff 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4083,7 +4083,14 @@ static SwTwips lcl_calcHeightOfRowBeforeThisFrame(const 
SwRowFrame& rRow)
 {
 // We've found another row frame that is part of the same table row
 const SwTabFrame* pCurTab = pCurRow->FindTabFrame();
-if (pCurTab->IsAnFollow(pTab))
+// A row frame may not belong to a table frame, when it is being 
cut, e.g., in
+// lcl_PostprocessRowsInCells().
+// Its SwRowFrame::Cut() has been called; it in turn called 
SwLayoutFrame::Cut(),
+// which nullified row's upper in RemoveFromLayout(), and then 
called Shrink()
+// for its former upper.
+// Regardless of whether it will be pasted back, or destroyed, 
currently it's not
+// part of layout, and its height does not count
+if (pCurTab && pCurTab->IsAnFollow(pTab))
 {
 // The found row frame belongs to a table frame that precedes
 // (above) this one in chain. So, include it in the sum
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/sfx2/lnkbase.hxx  |2 +-
 sfx2/source/appl/lnkbase2.cxx |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d728d5d192e6f100d64ffa2e267055a451e9e403
Author: Noel Grandin 
Date:   Tue Jan 16 15:20:30 2018 +0200

loplugin:useuniqueptr in SvBaseLink

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

diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index eaeebe466f40..6809a1d5ded6 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -88,7 +88,7 @@ protected:
 // Set LinkSourceName without action
 voidSetName( const OUString & rLn );
 
-ImplBaseLinkData* pImplData;
+std::unique_ptr pImplData;
 
 boolm_bIsReadOnly;
 css::uno::Reference
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index faf9e92957c4..5d6ae348cd76 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -125,7 +125,7 @@ SvBaseLink::SvBaseLink()
   m_bIsReadOnly(false)
 {
 nObjType = OBJECT_CLIENT_SO;
-pImplData = new ImplBaseLinkData;
+pImplData.reset( new ImplBaseLinkData );
 bVisible = bSynchron = true;
 bWasLastEditOK = false;
 }
@@ -136,7 +136,7 @@ SvBaseLink::SvBaseLink( SfxLinkUpdateMode nUpdateMode, 
SotClipboardFormatId nCon
  m_bIsReadOnly(false)
 {
 nObjType = OBJECT_CLIENT_SO;
-pImplData = new ImplBaseLinkData;
+pImplData.reset( new ImplBaseLinkData );
 bVisible = bSynchron = true;
 bWasLastEditOK = false;
 
@@ -187,7 +187,7 @@ SvBaseLink::SvBaseLink( const OUString& rLinkName, 
sal_uInt16 nObjectType, SvLin
 bVisible = bSynchron = true;
 bWasLastEditOK = false;
 aLinkName = rLinkName;
-pImplData = new ImplBaseLinkData;
+pImplData.reset( new ImplBaseLinkData );
 nObjType = nObjectType;
 
 if( !pObj )
@@ -231,7 +231,7 @@ SvBaseLink::~SvBaseLink()
 break;
 }
 
-delete pImplData;
+pImplData.reset();
 }
 
 IMPL_LINK( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang cui/source editeng/source include/editeng include/sfx2 include/tools lotuswordpro/source reportdesign/source sc/source sd/source sw/inc sw/source

[Noel Grandin]

 compilerplugins/clang/unusedmethods.results|  190 ++--
 compilerplugins/clang/unusedmethods.unused-returns.results |  532 -
 cui/source/factory/dlgfact.cxx |   21 
 cui/source/factory/dlgfact.hxx |5 
 cui/source/tabpages/chardlg.cxx|1 
 editeng/source/items/textitem.cxx  |   53 -
 editeng/source/rtf/rtfitem.cxx |2 
 include/editeng/nlbkitem.hxx   |   51 -
 include/editeng/prszitem.hxx   |   55 -
 include/sfx2/sfxdlg.hxx|1 
 include/tools/multisel.hxx |1 
 lotuswordpro/source/filter/lwpstory.cxx|4 
 lotuswordpro/source/filter/lwpstory.hxx|1 
 reportdesign/source/ui/misc/UITools.cxx|1 
 sc/source/ui/attrdlg/scdlgfact.cxx |4 
 sc/source/ui/attrdlg/scdlgfact.hxx |1 
 sd/source/ui/dlg/sddlgfact.cxx |   20 
 sd/source/ui/dlg/sddlgfact.hxx |4 
 sw/inc/charatr.hxx |1 
 sw/source/core/bastyp/init.cxx |2 
 sw/source/core/doc/dbgoutsw.cxx|1 
 sw/source/core/text/inftxt.cxx |   21 
 sw/source/core/text/inftxt.hxx |1 
 sw/source/ui/dialog/swdlgfact.cxx  |   20 
 sw/source/ui/dialog/swdlgfact.hxx  |4 
 tools/source/memtools/multisel.cxx |   16 
 26 files changed, 604 insertions(+), 409 deletions(-)

New commits:
commit 73139fe600fc1399ae828077981a2498cb0a0b0c
Author: Noel Grandin 
Date:   Fri Jan 19 13:10:22 2018 +0200

loplugin:unusedmethods

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

diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index b9715589817e..1605c2785cc4 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1,4 +1,4 @@
-basegfx/source/range/b2drangeclipper.cxx:693
+basegfx/source/range/b2drangeclipper.cxx:691
 type-parameter-?-? eraseFromList(type-parameter-?-? &,const 
type-parameter-?-? &)
 basic/source/inc/buffer.hxx:41
 void SbiBuffer::operator+=(signed char)
@@ -8,18 +8,34 @@ basic/source/inc/buffer.hxx:46
 void SbiBuffer::operator+=(int)
 connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:51
 class com::sun::star::uno::Reference 
connectivity::evoab::OEvoabResultSetMetaData::operator Reference()
+connectivity/source/drivers/firebird/Driver.hxx:65
+const class com::sun::star::uno::Reference & 
connectivity::firebird::FirebirdDriver::getContext() const
+connectivity/source/drivers/firebird/Util.hxx:61
+ connectivity::firebird::ColumnTypeInfo::ColumnTypeInfo(short,const class 
rtl::OUString &)
+connectivity/source/drivers/firebird/Util.hxx:66
+short connectivity::firebird::ColumnTypeInfo::getType() const
+connectivity/source/drivers/firebird/Util.hxx:67
+short connectivity::firebird::ColumnTypeInfo::getSubType() const
+connectivity/source/drivers/firebird/Util.hxx:68
+short connectivity::firebird::ColumnTypeInfo::getScale() const
+connectivity/source/drivers/firebird/Util.hxx:69
+const class rtl::OUString & 
connectivity::firebird::ColumnTypeInfo::getCharacterSet() const
+connectivity/source/drivers/mork/mork_helper.cxx:36
+int main(int,char **)
 connectivity/source/inc/dbase/dindexnode.hxx:70
 _Bool connectivity::dbase::ONDXKey::operator<(const class 
connectivity::dbase::ONDXKey &) const
-connectivity/source/inc/OColumn.hxx:119
+connectivity/source/inc/java/sql/Connection.hxx:66
+class rtl::OUString 
connectivity::java_sql_Connection::transFormPreparedStatement(const class 
rtl::OUString &)
+connectivity/source/inc/OColumn.hxx:112
 _Bool connectivity::OColumn::isReadOnly() const
-connectivity/source/inc/OColumn.hxx:120
+connectivity/source/inc/OColumn.hxx:113
 _Bool connectivity::OColumn::isWritable() const
-connectivity/source/inc/OColumn.hxx:121
+connectivity/source/inc/OColumn.hxx:114
 _Bool connectivity::OColumn::isDefinitelyWritable() const
-connectivity/source/inc/OColumn.hxx:131
-const class rtl::OUString & connectivity::OColumn::getSchemaName() const
-connectivity/source/inc/OColumn.hxx:133
-const class rtl::OUString & connectivity::OColumn::getCatalogName() const
+connectivity/source/inc/odbc/OConnection.hxx:127
+class connectivity::odbc::ODBCDriver * 
connectivity::odbc::OConnection::getDriver() const
+connectivity/source/inc/odbc/ODriver.hxx:79

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

[Noel Grandin]

 filter/source/flash/swffilter.cxx  |   20 +---
 filter/source/storagefilterdetect/filterdetect.hxx |2 --
 filter/source/textfilterdetect/filterdetect.hxx|2 --
 include/tools/date.hxx |4 +---
 include/tools/multisel.hxx |2 +-
 include/xmloff/DashStyle.hxx   |2 +-
 include/xmloff/i18nmap.hxx |2 +-
 include/xmloff/txtparae.hxx|2 +-
 tools/source/datetime/tdate.cxx|6 ++
 tools/source/memtools/multisel.cxx |   11 ++-
 xmloff/source/core/i18nmap.cxx |3 +--
 xmloff/source/style/DashStyle.cxx  |3 +--
 xmloff/source/text/txtparae.cxx|4 +---
 13 files changed, 25 insertions(+), 38 deletions(-)

New commits:
commit e725836ec19858be83bf6f7f251dd52dbcdf31d6
Author: Noel Grandin 
Date:   Fri Jan 19 13:23:27 2018 +0200

loplugin:unused-returns in filter,tools,xmloff

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

diff --git a/filter/source/flash/swffilter.cxx 
b/filter/source/flash/swffilter.cxx
index 029c84930937..8812065fd744 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -156,8 +156,8 @@ public:
 // XFilter
 virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& 
aDescriptor ) override;
 
-bool ExportAsMultipleFiles( const Sequence< PropertyValue >& aDescriptor );
-bool ExportAsSingleFile( const Sequence< PropertyValue >& aDescriptor );
+void ExportAsMultipleFiles( const Sequence< PropertyValue >& aDescriptor );
+void ExportAsSingleFile( const Sequence< PropertyValue >& aDescriptor );
 
 virtual void SAL_CALL cancel( ) override;
 
@@ -302,21 +302,21 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const 
css::uno::Sequence< css::bean
 // AS: HACK!  Right now, I create a directory as a sibling to the swf file 
selected in the Export
 //  dialog.  This directory is called presentation.sxi-swf-files.  The name of 
the swf file selected
 //  in the Export dialog has no impact on this.  All files created are placed 
in this directory.
-bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& 
aDescriptor)
+void FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& 
aDescriptor)
 {
 Reference< XDrawPagesSupplier > xDrawPagesSupplier(mxDoc, UNO_QUERY);
 if(!xDrawPagesSupplier.is())
-return false;
+return;
 
 Reference< XIndexAccess > xDrawPages( xDrawPagesSupplier->getDrawPages(), 
UNO_QUERY );
 if(!xDrawPages.is())
-return false;
+return;
 
 Reference< XDesktop2 > rDesktop = Desktop::create( mxContext );
 
 Reference< XStorable > xStorable(rDesktop->getCurrentComponent(), 
UNO_QUERY);
 if (!xStorable.is())
-return false;
+return;
 
 Reference< XDrawPage > xDrawPage;
 
@@ -438,11 +438,9 @@ bool FlashExportFilter::ExportAsMultipleFiles(const 
Sequence< PropertyValue >& a
 
 if (bExportAll)
 osl_closeFile(aBackgroundConfig);
-
-return true;
 }
 
-bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& 
aDescriptor)
+void FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& 
aDescriptor)
 {
 Reference < XOutputStream > xOutputStream = 
findPropertyValue >(aDescriptor, "OutputStream", 
nullptr);
 Sequence< PropertyValue > aFilterData;
@@ -450,7 +448,7 @@ bool FlashExportFilter::ExportAsSingleFile(const Sequence< 
PropertyValue >& aDes
 if (!xOutputStream.is() )
 {
 OSL_ASSERT ( false );
-return false;
+return;
 }
 
 FlashExporter aFlashExporter(
@@ -460,7 +458,7 @@ bool FlashExportFilter::ExportAsSingleFile(const Sequence< 
PropertyValue >& aDes
 findPropertyValue(aFilterData, "CompressMode", 75),
 findPropertyValue(aFilterData, "ExportOLEAsJPEG", false));
 
-return aFlashExporter.exportAll( mxDoc, xOutputStream, mxStatusIndicator );
+aFlashExporter.exportAll( mxDoc, xOutputStream, mxStatusIndicator );
 }
 
 
diff --git a/filter/source/storagefilterdetect/filterdetect.hxx 
b/filter/source/storagefilterdetect/filterdetect.hxx
index b2959851964f..8c13868ff817 100644
--- a/filter/source/storagefilterdetect/filterdetect.hxx
+++ b/filter/source/storagefilterdetect/filterdetect.hxx
@@ -55,8 +55,6 @@ public:
 
 OUString StorageFilterDetect_getImplementationName();
 
-bool StorageFilterDetect_supportsService(const OUString& ServiceName);
-
 css::uno::Sequence StorageFilterDetect_getSupportedServiceNames();
 
 css::uno::Reference
diff --git a/filter/source/textfilterdetect/filterdetect.hxx 
b/filter/source/textfilterdetect/filterdetect.hxx
index 6ae26db71043..173a0bf81cc9 100644
--- a/filt