[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/filter/xml/xmlfilter.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 719f2e8462faf102f780fd2cfa932c84a776bbc6 Author: Stephan Bergmann Date: Fri Dec 1 09:02:12 2017 +0100 -Werror,-Wimplicit-fallthrough Change-Id: I9aae6c5689db2b13830915b683baa8667dfe1068 diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index b7223bd0ef0d..bf246129d9e3 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -714,6 +714,7 @@ public: break; case XML_TOK_CONTENT_BODY: pContext = new RptXMLDocumentBodyContext(rImport, nPrefix, rLocalName); +break; default: break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/Library_sw.mk sw/source
sw/Library_sw.mk |1
sw/source/core/text/itrform2.cxx |1
sw/source/core/text/pordrop.hxx |2
sw/source/core/text/porexp.hxx |5
sw/source/core/text/porfld.hxx |9
sw/source/core/text/porfly.hxx |2
sw/source/core/text/porftn.hxx |6
sw/source/core/text/porglue.hxx |4
sw/source/core/text/porhyph.hxx |7
sw/source/core/text/porlay.hxx |2
sw/source/core/text/porlin.hxx | 11
sw/source/core/text/pormulti.hxx |2
sw/source/core/text/porref.hxx |3
sw/source/core/text/porrst.hxx |6
sw/source/core/text/portab.hxx |7
sw/source/core/text/portox.hxx |3
sw/source/core/text/portxt.hxx |2
sw/source/core/text/txtio.cxx| 610 ---
18 files changed, 683 deletions(-)
New commits:
commit 035fad219e1729c9e4fe8a54fd85f23c065de616
Author: Miklos Vajna
Date: Thu Nov 30 23:01:33 2017 +0100
sw: remove SvStream operator<< functions of layout classes
This could be useful debugging functionality, but:
- we have a layout dump feature already, which is available in
dbglevel<2 (and even non-dbgutil) builds already
- for SAL_DEBUG() these functions would have to work with an STL stream,
not with an SvStream
So there is little value in keeping these.
Change-Id: I1d894f79d3e637f5a56d68abda275ea66d5d0635
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 7c8e8a43c829..7ca75085cc74 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -392,7 +392,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/text/txtftn \
sw/source/core/text/txthyph \
sw/source/core/text/txtinit \
-sw/source/core/text/txtio \
sw/source/core/text/txtpaint \
sw/source/core/text/txttab \
sw/source/core/text/widorp \
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index d25fcc2ba0b1..e43cec544a02 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -814,7 +814,6 @@ class SwMetaPortion : public SwTextPortion
public:
SwMetaPortion() { SetWhichPor( POR_META ); }
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
-//OUTPUT_OPERATOR
};
void SwMetaPortion::Paint( const SwTextPaintInfo &rInf ) const
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 030a9b5f2435..e72e22302cd4 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -99,8 +99,6 @@ public:
SwFont* GetFnt() const { return pPart ? &pPart->GetFont() : nullptr; }
static void DeleteDropCapCache();
-
-OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 2688836509f6..5a18544c2fd8 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -34,8 +34,6 @@ public:
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const override;
-
-OUTPUT_OPERATOR_OVERRIDE
};
class SwBlankPortion : public SwExpandPortion
@@ -57,8 +55,6 @@ public:
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const override;
-
-OUTPUT_OPERATOR_OVERRIDE
};
class SwPostItsPortion : public SwExpandPortion
@@ -71,7 +67,6 @@ public:
virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const
override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText )
const override;
bool IsScript() const { return bScript; }
-OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 38fc08993c0d..16847773a40e 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -99,8 +99,6 @@ public:
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const override;
-
-OUTPUT_OPERATOR_OVERRIDE
};
/**
@@ -117,7 +115,6 @@ public:
// Field cloner for SplitGlue
virtual SwFieldPortion *Clone( const OUString &rExpand ) const override;
-OUTPUT_OPERATOR_OVERRIDE
};
class SwNumberPortion : public SwFieldPortion
@@ -141,8 +138,6 @@ public:
// Field cloner for SplitGlue
virtual SwFieldPortion *Clone( const OUString &rExpand ) const override;
virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
-
-OUTPUT_OPERATOR_OVERRIDE
};
class SwBulletPortion : public SwNumberPortion
@@ -155,7 +150,6 @@ public:
const bool bCenter,
const sal_uInt16 nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
-OUTPUT_OPERATOR_OVERRIDE
};
class SwGrfNumPortion : public SwNumberPortion
@@ -191,8 +185,6 @@ public:
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDContentCollector.cpp |1 - 1 file changed, 1 deletion(-) New commits: commit 803830beed106e9de8d727a5e7eedd53e8dbf414 Author: Miklos Vajna Date: Fri Dec 1 09:14:08 2017 +0100 VSDContentCollector: remove dead isParagraphOpened assignment Local variable, not read later, so it can go. Change-Id: Ide6c1b6976c43a3b9714d79d46631b7a80ddb300 diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp index 190f5a2..9b4b39e 100644 --- a/src/lib/VSDContentCollector.cpp +++ b/src/lib/VSDContentCollector.cpp @@ -1104,7 +1104,6 @@ void libvisio::VSDContentCollector::_flushText() m_shapeOutputText->addCloseParagraph(); else m_shapeOutputText->addCloseListElement(); -isParagraphOpened = false; } /* Last paragraph style had a bullet and we have to close ___ 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
writerperfect/qa/unit/EPUBExportTest.cxx | 11 +
writerperfect/qa/unit/data/writer/epubexport/image-link.fodt | 37 +
writerperfect/source/writer/exp/txtparai.cxx | 68 +++
3 files changed, 116 insertions(+)
New commits:
commit 8f0f8f80c1712fdc2ebb178cb88c5bd43db50fb7
Author: Miklos Vajna
Date: Thu Nov 30 16:31:18 2017 +0100
EPUB export: don't loose images with links
And actually handle the link around the image.
Change-Id: Ic9b7b9497becf677dbf550c67074c5c588ef8922
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx
b/writerperfect/qa/unit/EPUBExportTest.cxx
index 1760caa05096..d04c2eeeaaa3 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -87,6 +87,7 @@ public:
void testTableWidth();
void testTextBox();
void testFontEmbedding();
+void testImageLink();
CPPUNIT_TEST_SUITE(EPUBExportTest);
CPPUNIT_TEST(testOutlineLevel);
@@ -122,6 +123,7 @@ public:
CPPUNIT_TEST(testTableWidth);
CPPUNIT_TEST(testTextBox);
CPPUNIT_TEST(testFontEmbedding);
+CPPUNIT_TEST(testImageLink);
CPPUNIT_TEST_SUITE_END();
};
@@ -679,6 +681,15 @@ void EPUBExportTest::testFontEmbedding()
#endif
}
+void EPUBExportTest::testImageLink()
+{
+createDoc("image-link.fodt", {});
+
+mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+// This failed, image was missing.
+assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:img", 1);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest);
}
diff --git a/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt
b/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt
new file mode 100644
index ..9414e36fd723
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/epubexport/image-link.fodt
@@ -0,0 +1,37 @@
+
+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: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:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:config="urn:oas
is: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: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:xmlns: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.text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ iVBORw0KGgoNSUhEUgAAAEBACAQAYLlVBGdBTUEAALGPC/xhBQFz
+
UkdCAK7OHOkgY0hSTQAAeiYAAICEAAD6gOgAAHUwAADqYAAAOpgAABdwnLpRPAAA
+
AAJiS0dEAACqjSMyCW9GRnMGAAAMc1XTCXBIWXMAAA3XAAAN1wFCKJt4
+
CXZwQWcAAABMQACdMTgbAAABzUlEQVRo3u3ZPU/CQBjA8X+Jxs3ESUDj4iK+LA5+
+
BBfjqBE1cXB2MlFAEqMgxvhNNL4sLsK3UPQL6ObkoAETz+FKW2mxCPRYnucWUu76/OC59C49
+
cGOCKqrD9kHRc6ddPv7oW2WCwMh0nF63Myz7Tm8hPTNu0pgHMER3scepTbgK6enJNND83RLn
+
/878yRaPmgBZFDuMsNLeWB9gmFQHP77MIg9gsYciR50NFKvtjIy10yk84pSZA7DYpwR8scmF
+
QQCMuoQMpzbh0iAARrlnVn90CWHTsZcAiHPPdINQAuqsc2MQAAnKDUKWEhZ10twaBEDSJWQo
+
YlFj7S9CzwEegkXWIbQsRAQASFJhpplwbRAACS+hANRJBxMiAkDcJeQ4sQkBhYgMoJ+Ozlwo
+
2YQ7AJ6CRxyiUGnVy3hVKb0Af9v7hUG2Wy9TEQCUelFTDULB2S+YKYGOMcpM6UIccOQnRA6A
+
cSp6ibfI+wkGADBGpTEd8xz1AaAfTQ7huA8AvUw5hVjuA0D/C5OaMN8XACRZ8F0zCggKAQhA
+
AAIQgAAEIAABCEAAAhCAAAQgAAH4zg3feY4w3Xs44M5+oW0qvCWoGcvaIlM3x/f/ab+O738A
+
hOCNQr34oD4ldEVYdGNyZWF0ZS1kYXRlADIwMTAtMTItMjBUMTc6MDg6MzYrMDE6MDB6
+
5RscJXRFWHRtb2RpZnktZGF0ZQAyMDEwLTEyLTIwVDE3OjA4OjM3KzAxOjAwgyNmnAAA
+AABJRU5ErkJggg==
+
+
+
+
diff --git a/writ
[Libreoffice-commits] core.git: 4 commits - external/libepubgen writerperfect/Library_wpftwriter.mk writerperfect/qa writerperfect/source writerperfect/uiconfig
external/libepubgen/libepubgen-epub3.patch.1 | 857
++
writerperfect/Library_wpftwriter.mk|1
writerperfect/qa/uitest/epubexport/epubexport.py | 14
writerperfect/qa/unit/EPUBExportTest.cxx | 57
writerperfect/qa/unit/data/writer/epubexport/footnote.fodt |8
writerperfect/qa/unit/data/writer/epubexport/popup-api.odt |binary
writerperfect/qa/unit/data/writer/epubexport/popup.odt |binary
writerperfect/qa/unit/data/writer/epubexport/popup/libreoffice.png |binary
writerperfect/source/writer/EPUBExportDialog.cxx | 23
writerperfect/source/writer/EPUBExportDialog.hxx |6
writerperfect/source/writer/EPUBExportFilter.cxx | 16
writerperfect/source/writer/EPUBExportUIComponent.cxx |5
writerperfect/source/writer/EPUBExportUIComponent.hxx |2
writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx | 121 +
writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx | 44
writerperfect/source/writer/exp/txtparai.cxx | 10
writerperfect/source/writer/exp/xmlimp.cxx | 78
writerperfect/source/writer/exp/xmlimp.hxx |5
writerperfect/uiconfig/ui/exportepub.ui| 89 -
19 files changed, 1322 insertions(+), 14 deletions(-)
New commits:
commit 3ed60d22c3c2a43d0460520485c3b6ecca00e239
Author: Miklos Vajna
Date: Thu Nov 30 16:35:04 2017 +0100
EPUB export: add UI to test custom media directory
Sets the RVNGMediaDir filter data key at UNO level.
Change-Id: I9919e5ca39c9f4f126d1d67946c8bec99ce0381d
Reviewed-on: https://gerrit.libreoffice.org/45603
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/writerperfect/qa/uitest/epubexport/epubexport.py
b/writerperfect/qa/uitest/epubexport/epubexport.py
index 196556b2fb8d..301f090e3362 100644
--- a/writerperfect/qa/uitest/epubexport/epubexport.py
+++ b/writerperfect/qa/uitest/epubexport/epubexport.py
@@ -83,6 +83,20 @@ class EPUBExportTest(UITestCase):
coverImage = [i.Value for i in filterData if i.Name ==
"RVNGCoverImage"][0]
self.assertEqual("cover.png", coverImage)
+def testMediaDir(self):
+def handleDialog(dialog):
+dialog.getChild("mediadir").executeAction("TYPE",
mkPropertyValues({"TEXT": "file:///foo/bar"}))
+dialog.getChild("ok").executeAction("CLICK", tuple())
+
+uiComponent =
self.ui_test._xContext.ServiceManager.createInstanceWithContext("com.sun.star.comp.Writer.EPUBExportUIComponent",
self.ui_test._xContext)
+
+self.ui_test.execute_blocking_action(action=uiComponent.execute,
dialog_handler=handleDialog)
+propertyValues = uiComponent.getPropertyValues()
+filterData = [i.Value for i in propertyValues if i.Name ==
"FilterData"][0]
+# The RVNGMediaDir key was missing, EPUBExportDialog::OKClickHdl() did
not set it.
+mediaDir = [i.Value for i in filterData if i.Name == "RVNGMediaDir"][0]
+self.assertEqual("file:///foo/bar", mediaDir)
+
def testMeta(self):
def handleDialog(dialog):
dialog.getChild("identifier").executeAction("TYPE",
mkPropertyValues({"TEXT": "baddcafe-e394-4cd6-9b83-7172794612e5"}))
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx
b/writerperfect/source/writer/EPUBExportDialog.cxx
index c0e316e1f32a..acc1f9a9182d 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -9,6 +9,8 @@
#include "EPUBExportDialog.hxx"
+#include
+#include
#include
#include "EPUBExportFilter.hxx"
@@ -63,8 +65,9 @@ sal_Int32 PositionToVersion(sal_Int32 nPosition)
namespace writerperfect
{
-EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent,
comphelper::SequenceAsHashMap &rFilterData)
+EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent,
comphelper::SequenceAsHashMap &rFilterData, const
uno::Reference &xContext)
: ModalDialog(pParent, "EpubDialog", "writerperfect/ui/exportepub.ui"),
+ mxContext(xContext),
mrFilterData(rFilterData)
{
get(m_pVersion, "versionlb");
@@ -98,6 +101,11 @@ EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent,
comphelper::SequenceAsH
get(m_pCoverButton, "coverbutton");
m_pCoverButton->SetClickHdl(LINK(this, EPUBExportDialog, CoverClickHdl));
+get(m_pMediaDir, "mediadir");
+
+get(m_pMediaButton, "mediabutton");
+m_pMediaButton->SetClickHdl(LINK(this, EPUBExportDialog, MediaClickHdl));
+
get(m_pIdentifier, "identifier");
get(m_pTitle, "title");
get(m_pInitialCreator, "author");
@@ -128,11 +136,22 @@ IMPL_LINK_NOARG(EPUBExportDialog, CoverClickHdl, Button
*, void)
m_pCoverPath->SetText(aDlg.GetPath());
}
+IMPL_LIN
[Libreoffice-commits] core.git: writerperfect/qa writerperfect/source
writerperfect/source/writer/exp/xmlimp.cxx | 88 +++--
1 file changed, 35 insertions(+), 53 deletions(-)
New commits:
commit 1a0a026a5770ca2e8ca66e1e8daed101301c7e30
Author: Miklos Vajna
Date: Thu Nov 30 16:36:03 2017 +0100
EPUB export: handle custom media dir in cover image / XMP metadata
By changing the default to /cover. and /.xmp.
Change-Id: I736aefafba5aa5208917d9ed40119ca7721cdde3
Reviewed-on: https://gerrit.libreoffice.org/45604
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/writerperfect/qa/unit/data/writer/epubexport/meta-xmp.xmp
b/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp
similarity index 100%
rename from writerperfect/qa/unit/data/writer/epubexport/meta-xmp.xmp
rename to writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp
diff --git a/writerperfect/qa/unit/data/writer/epubexport/meta.cover-image.png
b/writerperfect/qa/unit/data/writer/epubexport/meta/cover.png
similarity index 100%
rename from writerperfect/qa/unit/data/writer/epubexport/meta.cover-image.png
rename to writerperfect/qa/unit/data/writer/epubexport/meta/cover.png
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx
b/writerperfect/source/writer/exp/xmlimp.cxx
index f933487a59b8..ad4928f17a65 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -49,6 +49,37 @@ OUString GetMimeType(const OUString &rExtension)
return it == vMimeTypes.end() ? OUString() : it->second;
}
+/// Determines the base directory for cover images, XMP metadata, popup images.
+OUString FindMediaDir(const OUString &rDocumentBaseURL, const
uno::Sequence &rFilterData)
+{
+OUString aMediaDir;
+
+// See if filter data contains a media directory explicitly.
+for (sal_Int32 i = 0; i < rFilterData.getLength(); ++i)
+{
+if (rFilterData[i].Name == "RVNGMediaDir")
+{
+rFilterData[i].Value >>= aMediaDir;
+break;
+}
+}
+
+if (!aMediaDir.isEmpty())
+return aMediaDir + "/";
+
+// Not set explicitly, try to pick it up from the base directory.
+INetURLObject aURL(rDocumentBaseURL);
+try
+{
+aMediaDir = rtl::Uri::convertRelToAbs(rDocumentBaseURL,
aURL.GetBase()) + "/";
+}
+catch (const rtl::MalformedUriException &rException)
+{
+SAL_WARN("writerperfect", "FindMediaDir: convertRelToAbs() failed:" <<
rException.getMessage());
+}
+return aMediaDir;
+}
+
/// Picks up a cover image from the base directory.
OUString FindCoverImage(const OUString &rDocumentBaseURL, OUString &rMimeType,
const uno::Sequence &rFilterData)
{
@@ -75,8 +106,6 @@ OUString FindCoverImage(const OUString &rDocumentBaseURL,
OUString &rMimeType, c
if (rDocumentBaseURL.isEmpty())
return aRet;
-INetURLObject aDocumentBaseURL(rDocumentBaseURL);
-
static const std::initializer_list vExtensions =
{
"gif",
@@ -85,17 +114,10 @@ OUString FindCoverImage(const OUString &rDocumentBaseURL,
OUString &rMimeType, c
"svg"
};
+OUString aMediaDir = FindMediaDir(rDocumentBaseURL, rFilterData);
for (const auto &rExtension : vExtensions)
{
-try
-{
-aRet = rtl::Uri::convertRelToAbs(rDocumentBaseURL,
aDocumentBaseURL.GetBase() + ".cover-image." + rExtension);
-}
-catch (const rtl::MalformedUriException &rException)
-{
-SAL_WARN("writerperfect", "FindCoverImage: convertRelToAbs()
failed:" << rException.getMessage());
-}
-
+aRet = aMediaDir + "cover." + rExtension;
if (!aRet.isEmpty())
{
SvFileStream aStream(aRet, StreamMode::READ);
@@ -113,37 +135,6 @@ OUString FindCoverImage(const OUString &rDocumentBaseURL,
OUString &rMimeType, c
return aRet;
}
-/// Determines the base directory for cover images, XMP metadata, popup images.
-OUString FindMediaDir(const OUString &rDocumentBaseURL, const
uno::Sequence &rFilterData)
-{
-OUString aMediaDir;
-
-// See if filter data contains a media directory explicitly.
-for (sal_Int32 i = 0; i < rFilterData.getLength(); ++i)
-{
-if (rFilterData[i].Name == "RVNGMediaDir")
-{
-rFilterData[i].Value >>= aMediaDir;
-break;
-}
-}
-
-if (!aMediaDir.isEmpty())
-return aMediaDir + "/";
-
-// Not set explicitly, try to pick it up from the base directory.
-INetURLObject aURL(rDocumentBaseURL);
-try
-{
-aMediaDir = rtl::Uri::convertRelToAbs(rDocumentBaseURL,
aURL.GetBase()) + "/";
-}
-catch (const rtl::MalformedUriException &rException)
-{
-SAL_WARN("writerperfect", "FindMediaDir: convertRelToAbs() failed:" <<
rException.getMessage());
-}
-return aMediaDir;
-}
-
/// Picks up XMP metadata from the base directory.
void FindXMPMetadata(const uno::Reference &xContext,
const OU
[Libreoffice-commits] core.git: 2 commits - sc/source sw/source
sc/source/filter/xml/xmlcondformat.cxx |7 ---
sw/source/core/swg/SwXMLSectionList.cxx |4
2 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 2b0ff1adeb13efbf7fb0f46939738e3f895d7caf
Author: Tor Lillqvist
Date: Thu Nov 30 19:55:18 2017 +0200
Need to use dynamic_cast and not static_cast here, thanks UBSan and sberg
Change-Id: I95748f75fc4337481ec6574511bf4b1f47fc4587
Reviewed-on: https://gerrit.libreoffice.org/45611
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sc/source/filter/xml/xmlcondformat.cxx
b/sc/source/filter/xml/xmlcondformat.cxx
index 2e8a2a66d1a3..08e8dbf827b5 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -232,10 +232,11 @@ void SAL_CALL
ScXMLConditionalFormatContext::endFastElement( sal_Int32 /*nElemen
for (size_t nFormatEntryIx = 0; nFormatEntryIx < pFormat->size();
++nFormatEntryIx)
{
auto pFormatEntry = pFormat->GetEntry(nFormatEntryIx);
-auto pCondFormatEntry = static_cast(pFormatEntry);
+auto pCondFormatEntry = dynamic_cast(pFormatEntry);
-if (pCondFormatEntry->GetOperation() != ScConditionMode::Equal &&
-pCondFormatEntry->GetOperation() != ScConditionMode::Direct)
+if (pCondFormatEntry == nullptr ||
+(pCondFormatEntry->GetOperation() != ScConditionMode::Equal &&
+ pCondFormatEntry->GetOperation() != ScConditionMode::Direct))
{
bEligibleForCache = false;
break;
commit a1087bace1aa2f91adebe9cd89e25189b222baed
Author: Stephan Bergmann
Date: Fri Dec 1 09:36:03 2017 +0100
loplugin:unnecessaryoverride
Change-Id: I7a685a82dd6452591d4e5460954366bd31acb268
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx
b/sw/source/core/swg/SwXMLSectionList.cxx
index cad35a9958bd..1ac8c1d083f1 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -39,7 +39,6 @@ public:
virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference & xAttrList)
override;
-virtual ~SvXMLSectionListContext() override;
};
class SwXMLParentContext : public SvXMLImportContext
@@ -149,8 +148,5 @@ SvXMLImportContextRef
SvXMLSectionListContext::CreateChildContext(
pContext = new SvXMLSectionListContext(m_rImport, nPrefix, rLocalName,
xAttrList);
return pContext;
}
-SvXMLSectionListContext::~SvXMLSectionListContext()
-{
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_fodfexport.mk sw/Module_sw.mk sw/qa
sw/CppunitTest_sw_fodfexport.mk| 57 +
sw/Module_sw.mk|1
sw/qa/extras/fodfexport/data/tdf113696.odt |binary
sw/qa/extras/fodfexport/fodfexport.cxx | 44 ++
sw/qa/extras/inc/swmodeltestbase.hxx | 11 +
5 files changed, 113 insertions(+)
New commits:
commit bb1fd2c9819d1ee5ba26c181d8fea8272b89b673
Author: Samuel Mehrbrodt
Date: Thu Nov 30 10:28:33 2017 +0100
Unit test for tdf#113696
Change-Id: I566cd5d38cf86547b664f0ae9a1c2f8c37edc0ca
Reviewed-on: https://gerrit.libreoffice.org/45560
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/CppunitTest_sw_fodfexport.mk b/sw/CppunitTest_sw_fodfexport.mk
new file mode 100644
index ..4703b85435f7
--- /dev/null
+++ b/sw/CppunitTest_sw_fodfexport.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_fodfexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_fodfexport, \
+ sw/qa/extras/fodfexport/fodfexport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_fodfexport, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ sw \
+ test \
+ tl \
+ unotest \
+ utl \
+ vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_fodfexport,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_fodfexport,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_fodfexport))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_fodfexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_fodfexport))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_fodfexport,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_fodfexport,\
+ officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_fodfexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 39772b8b930e..966c71d097fd 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sw_uwriter) \
CppunitTest_sw_docbookexport \
+CppunitTest_sw_fodfexport \
CppunitTest_sw_htmlexport \
CppunitTest_sw_htmlimport \
CppunitTest_sw_macros_test \
diff --git a/sw/qa/extras/fodfexport/data/tdf113696.odt
b/sw/qa/extras/fodfexport/data/tdf113696.odt
new file mode 100644
index ..03e0612a3d14
Binary files /dev/null and b/sw/qa/extras/fodfexport/data/tdf113696.odt differ
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx
b/sw/qa/extras/fodfexport/fodfexport.cxx
new file mode 100644
index ..6cd00b49ba47
--- /dev/null
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/extras/fodfexport/data/", "OpenDocument Text
Flat XML")
+{
+}
+
+/**
+ * Blacklist handling
+ */
+bool mustTestImportOf(const char* filename) const override
+{
+// Only test import of .fodt document
+return OString(filename).endsWith(".odt") ||
OString(filename).endsWith(".fodt");
+}
+};
+
+DECLARE_FODFEXPORT_TEST(testTdf113696, "tdf113696.odt")
+{
+// Test that an image which is written in svm format (image/x-vclgraphic)
+// is accompanied by a png fallback graphic.
+if (xmlDocPtr pXmlDoc = parseExportedFile())
+{
+assertXPath(pXmlDoc,
"/office:document/office:body/office:text/text:p/draw:frame/"
+
"draw:image[@loext:mime-type='image/x-vclgraphic']");
+assertXPath(pXmlDoc,
"/office:document/office:body/office:text/text:p/draw:frame/"
+ "draw:image[@loext:mime-type='image/png']");
+}
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/table/tableproperties.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 7d1d5a847db8d3245a2694295a7c369586695ff8
Author: Caolán McNamara
Date: Fri Dec 1 09:02:04 2017 +
ofz: check col/row bounds
Change-Id: Idaa38f400873372330dd06c14800c4a5018c79db
Reviewed-on: https://gerrit.libreoffice.org/45639
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/drawingml/table/tableproperties.cxx
b/oox/source/drawingml/table/tableproperties.cxx
index e5bc4f0cc3d5..527b65829d17 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -58,7 +58,8 @@ void CreateTableRows( const uno::Reference< XTableRows >&
xTableRows, const std:
xTableRows->insertByIndex( 0, rvTableRows.size() - 1 );
std::vector< TableRow >::const_iterator aTableRowIter( rvTableRows.begin()
);
uno::Reference< container::XIndexAccess > xIndexAccess( xTableRows,
UNO_QUERY_THROW );
-for ( sal_Int32 n = 0; n < xIndexAccess->getCount(); n++ )
+sal_Int32 nCols = std::min(xIndexAccess->getCount(),
rvTableRows.size());
+for (sal_Int32 n = 0; n < nCols; ++n)
{
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ),
UNO_QUERY_THROW );
xPropSet->setPropertyValue( "Height", Any( static_cast< sal_Int32 >(
aTableRowIter->getHeight() / 360 ) ) );
@@ -72,7 +73,8 @@ void CreateTableColumns( const Reference< XTableColumns >&
xTableColumns, const
xTableColumns->insertByIndex( 0, rvTableGrid.size() - 1 );
std::vector< sal_Int32 >::const_iterator aTableGridIter(
rvTableGrid.begin() );
uno::Reference< container::XIndexAccess > xIndexAccess( xTableColumns,
UNO_QUERY_THROW );
-for ( sal_Int32 n = 0; n < xIndexAccess->getCount(); n++ )
+sal_Int32 nCols = std::min(xIndexAccess->getCount(),
rvTableGrid.size());
+for (sal_Int32 n = 0; n < nCols; ++n)
{
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ),
UNO_QUERY_THROW );
xPropSet->setPropertyValue( "Width", Any( static_cast< sal_Int32 >(
*aTableGridIter++ / 360 ) ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/writer/exp/xmlimp.cxx |3 +--
writerperfect/source/writer/exp/xmlimp.hxx |1 -
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 09d96767a405a7d2bb338dbb5af3d781cdddb50d
Author: Stephan Bergmann
Date: Fri Dec 1 10:07:05 2017 +0100
-Werror,-Wunused-private-field
Change-Id: Ia265d565bbc6b9e4c03aa9be66916b926b54bed8
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx
b/writerperfect/source/writer/exp/xmlimp.cxx
index ad4928f17a65..7b6cc2791459 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -256,8 +256,7 @@ rtl::Reference
XMLOfficeDocContext::CreateChildContext(const O
XMLImport::XMLImport(const uno::Reference &xContext,
librevenge::RVNGTextInterface &rGenerator, const OUString &rURL, const
uno::Sequence &rDescriptor)
: mrGenerator(rGenerator),
- mxContext(xContext),
- maDocumentBaseURL(rURL)
+ mxContext(xContext)
{
uno::Sequence aFilterData;
for (sal_Int32 i = 0; i < rDescriptor.getLength(); ++i)
diff --git a/writerperfect/source/writer/exp/xmlimp.hxx
b/writerperfect/source/writer/exp/xmlimp.hxx
index 0777e71953a4..de9fa58d7e1f 100644
--- a/writerperfect/source/writer/exp/xmlimp.hxx
+++ b/writerperfect/source/writer/exp/xmlimp.hxx
@@ -57,7 +57,6 @@ class XMLImport : public cppu::WeakImplHelper
librevenge::RVNGPropertyList maMetaData;
const css::uno::Reference &mxContext;
css::uno::Reference mxUriReferenceFactory;
-OUString maDocumentBaseURL;
OUString maMediaDir;
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [CREATE] freieFarbe/freeColour HLC colour system to be accepted as a national standard for "Open Colour Communication" in Germany
1 дек. 2017 г. 6:36 пользователь Christoph Schäfer написал: We're currently cooperating with ink manufacturers in Germany and Switzerland to establish ink formulas for HLC colours that cannot be reproduced in CMYK, aka as spot colours Since you already have a prototype, are you talking about metallic inks? This is a real colour system and not just a colour collection like Pantone or RAL. How do you define a real color system? Most importantly, it is a free and open alternative to Pantone & co, which is not only better, Better in what way? At what stage of work within DIN will ink formulas be published one way or another? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - oox/source
oox/source/drawingml/fillproperties.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d48ab02bd3bdb8f33ad9b5ca6b2a641614da6ae4
Author: Caolán McNamara
Date: Thu Nov 30 20:29:36 2017 +
ofz: handle empty Gradient Stops
Change-Id: I7e719b21bd21085ffdd0226a4a25d406a4e69351
Reviewed-on: https://gerrit.libreoffice.org/45619
Reviewed-by: Thorsten Behrens
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 314ff5822695..7786f26cda79 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -378,7 +378,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
::std::swap( aGradient.StartColor, aGradient.EndColor
);
::std::swap( nStartTrans, nEndTrans );
}
-else
+else if (!maGradientProps.maGradientStops.empty())
{
// A copy of the gradient stops for local modification
GradientFillProperties::GradientStopMap
aGradientStops(maGradientProps.maGradientStops);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - oox/source
oox/source/drawingml/fillproperties.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 937e292367d447a709d15646a2a354aade5ad6aa
Author: Caolán McNamara
Date: Thu Nov 30 20:29:36 2017 +
ofz: handle empty Gradient Stops
Change-Id: I7e719b21bd21085ffdd0226a4a25d406a4e69351
Reviewed-on: https://gerrit.libreoffice.org/45618
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 5d7575724275..50e042d8623b 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -372,7 +372,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
::std::swap( aGradient.StartColor, aGradient.EndColor
);
::std::swap( nStartTrans, nEndTrans );
}
-else
+else if (!maGradientProps.maGradientStops.empty())
{
// A copy of the gradient stops for local modification
GradientFillProperties::GradientStopMap
aGradientStops(maGradientProps.maGradientStops);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/CppunitTest_sc_macros_test.mk sc/qa sc/sdi sc/source
sc/CppunitTest_sc_macros_test.mk |1
sc/qa/extras/macros-test.cxx | 40 +++
sc/qa/extras/testdocuments/StarBasic.ods |binary
sc/qa/unit/tiledrendering/tiledrendering.cxx | 29 ---
sc/sdi/scalc.sdi |4 +-
sc/source/ui/view/cellsh3.cxx| 30 ++--
6 files changed, 72 insertions(+), 32 deletions(-)
New commits:
commit 6fea94f8c2b31ac9ab7c92ae81b6dc07ffe6dd28
Author: Henry Castro
Date: Fri Aug 25 08:11:16 2017 -0400
tdf#107806: Semantic and syntax for .uno:RowHeight have been changed
Change-Id: If9ce7ff36ef3ba8e55103765f3260e74ab2eebd4
Reviewed-on: https://gerrit.libreoffice.org/41567
Tested-by: Jenkins
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/45632
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 8e241681ce57..7861290cd40a 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
filter/source/storagefilterdetect/storagefd \
forms/util/frm \
framework/util/fwk \
+framework/util/fwl \
i18npool/source/search/i18nsearch \
i18npool/util/i18npool \
linguistic/source/lng \
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 064dccd09c55..9a1c600d8ccd 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -41,6 +41,7 @@ public:
void testVba();
void testMSP();
void testPasswordProtectedStarBasic();
+void testRowColumn();
#endif
CPPUNIT_TEST_SUITE(ScMacrosTest);
#if !defined(MACOSX)
@@ -50,6 +51,7 @@ public:
CPPUNIT_TEST(testMSP);
CPPUNIT_TEST(testVba);
CPPUNIT_TEST(testPasswordProtectedStarBasic);
+CPPUNIT_TEST(testRowColumn);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -344,6 +346,44 @@ void ScMacrosTest::testVba()
}
}
+void ScMacrosTest::testRowColumn()
+{
+const OUString aFileNameBase("StarBasic.ods");
+OUString aFileName;
+createFileURL(aFileNameBase, aFileName);
+uno::Reference< css::lang::XComponent > xComponent =
loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
+
+CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
+
+Any aRet;
+Sequence< sal_Int16 > aOutParamIndex;
+Sequence< Any > aOutParam;
+Sequence< uno::Any > aParams;
+
+SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(xComponent);
+
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+ScDocShell* pDocSh = static_cast(pFoundShell);
+ScDocument& rDoc = pDocSh->GetDocument();
+
+SfxObjectShell::CallXScript(
+xComponent,
+
"vnd.sun.Star.script:Standard.Module1.Macro_RowHeight?language=Basic&location=document",
+aParams, aRet, aOutParamIndex, aOutParam);
+
+sal_uInt16 nHeight = rDoc.GetRowHeight(0, 0) * HMM_PER_TWIPS;
+CPPUNIT_ASSERT_EQUAL(static_cast(2000), nHeight);
+
+SfxObjectShell::CallXScript(
+xComponent,
+
"vnd.sun.Star.script:Standard.Module1.Macro_ColumnWidth?language=Basic&location=document",
+aParams, aRet, aOutParamIndex, aOutParam);
+sal_uInt16 nWidth = rDoc.GetColWidth(0, 0) * HMM_PER_TWIPS;
+CPPUNIT_ASSERT_EQUAL(static_cast(4000), nWidth);
+
+pDocSh->DoClose();
+}
+
#endif
ScMacrosTest::ScMacrosTest()
diff --git a/sc/qa/extras/testdocuments/StarBasic.ods
b/sc/qa/extras/testdocuments/StarBasic.ods
index a4b74b350364..6b94f0684e25 100644
Binary files a/sc/qa/extras/testdocuments/StarBasic.ods and
b/sc/qa/extras/testdocuments/StarBasic.ods differ
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 32ccf698e872..6e5fdbe646a9 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -639,29 +639,26 @@ void ScTiledRenderingTest::testColRowResize()
uno::Sequence aArgs(2);
ScDocument& rDoc = pDocSh->GetDocument();
-// Col 3, Tab 0
-int nOldWidth = rDoc.GetColWidth(static_cast(2),
static_cast(0), false);
-aArgs[0].Name = OUString::fromUtf8("Column");
-aArgs[0].Value <<= static_cast(3);
-aArgs[1].Name = OUString::fromUtf8("Width");
-aArgs[1].Value <<= static_cast(nOldWidth + 100);
+// Col 3, Tab 0
+aArgs[0].Name = OUString::fromUtf8("ColumnWidth");
+aArgs[0].Value <<= static_cast(4000); // 4cm
+aArgs[1].Name = OUString::fromUtf8("Column");
+aArgs[1].Value <<= static_cast(3);
comphelper::dispatchCommand(".uno:ColumnWidth", aArgs);
-int nNewWidth = rDoc.GetColWidth(static_cast(2),
static_cast(0), false);
-CPPUNIT_ASSERT(nNewWidth > nOldWidth);
+sal_uInt16 nWidth = rDoc.GetColWidth(static_cast(2),
sta
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e1/44b9671ddbac5c2cce1187f4d391899396d2b2
e1/44b9671ddbac5c2cce1187f4d391899396d2b2 |1 + 1 file changed, 1 insertion(+) New commits: commit ceaa2a65899516a7f3863b6e5d2b7b79178ecf25 Author: Caolán McNamara Date: Fri Dec 1 09:53:40 2017 + Notes added by 'git notes add' diff --git a/e1/44b9671ddbac5c2cce1187f4d391899396d2b2 b/e1/44b9671ddbac5c2cce1187f4d391899396d2b2 new file mode 100644 index ..d1995cc1c394 --- /dev/null +++ b/e1/44b9671ddbac5c2cce1187f4d391899396d2b2 @@ -0,0 +1 @@ +prefer: a4104344f48eb27651d4d88317bceb10b49c033d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/tokstack.cxx | 79 +++-
sc/source/filter/inc/tokstack.hxx | 24 ++
sc/source/filter/lotus/lotform.cxx |6 ++
3 files changed, 69 insertions(+), 40 deletions(-)
New commits:
commit 889c72a7e54f241342f42b1b0a05858902228cbc
Author: Eike Rathke
Date: Fri Dec 1 10:54:01 2017 +0100
ofz: guard against binary crap argument counts and ID/OpCode generation
Change-Id: I60e181729713f3b202e880707a79e9da80d9d85d
diff --git a/sc/source/filter/excel/tokstack.cxx
b/sc/source/filter/excel/tokstack.cxx
index 39a334d5..4129b50f2287 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -108,6 +108,21 @@ bool TokenPool::GrowId()
return true;
}
+bool TokenPool::CheckElementOrGrow()
+{
+// Last possible ID to be assigned somewhere is nElementAkt+1
+if (nElementAkt + 1 == nScTokenOff - 1)
+{
+SAL_WARN("sc.filter","TokenPool::CheckElementOrGrow - last possible ID
" << nElementAkt+1);
+return false;
+}
+
+if (nElementAkt >= nElement)
+return GrowElement();
+
+return true;
+}
+
bool TokenPool::GrowElement()
{
sal_uInt16 nElementNew = lcl_canGrow( nElement);
@@ -161,9 +176,11 @@ bool TokenPool::GrowMatrix()
bool TokenPool::GetElement( const sal_uInt16 nId )
{
-OSL_ENSURE( nId < nElementAkt, "*TokenPool::GetElement(): Id too large!?"
);
if (nId >= nElementAkt)
+{
+SAL_WARN("sc.filter","TokenPool::GetElement - Id too large, " << nId
<< " >= " << nElementAkt);
return false;
+}
bool bRet = true;
if( pType[ nId ] == T_Id )
@@ -394,9 +411,8 @@ void TokenPool::operator >>( TokenId& rId )
{
rId = static_cast( nElementAkt + 1 );
-if( nElementAkt >= nElement )
-if (!GrowElement())
-return;
+if (!CheckElementOrGrow())
+return;
pElement[ nElementAkt ] = nP_IdLast;// Start of Token-sequence
pType[ nElementAkt ] = T_Id;// set Typeinfo
@@ -409,9 +425,8 @@ void TokenPool::operator >>( TokenId& rId )
const TokenId TokenPool::Store( const double& rDouble )
{
-if( nElementAkt >= nElement )
-if (!GrowElement())
-return static_cast(nElementAkt+1);
+if (!CheckElementOrGrow())
+return static_cast(nElementAkt+1);
if( pP_Dbl.m_writemark >= pP_Dbl.m_capacity )
if (!pP_Dbl.Grow())
@@ -438,9 +453,8 @@ const TokenId TokenPool::Store( const sal_uInt16 nIndex )
const TokenId TokenPool::Store( const OUString& rString )
{
// mostly copied to Store( const sal_Char* ), to avoid a temporary string
-if( nElementAkt >= nElement )
-if (!GrowElement())
-return static_cast(nElementAkt+1);
+if (!CheckElementOrGrow())
+return static_cast(nElementAkt+1);
if( ppP_Str.m_writemark >= ppP_Str.m_capacity )
if (!ppP_Str.Grow())
@@ -468,9 +482,8 @@ const TokenId TokenPool::Store( const OUString& rString )
const TokenId TokenPool::Store( const ScSingleRefData& rTr )
{
-if( nElementAkt >= nElement )
-if (!GrowElement())
-return static_cast(nElementAkt+1);
+if (!CheckElementOrGrow())
+return static_cast(nElementAkt+1);
if( ppP_RefTr.m_writemark >= ppP_RefTr.m_capacity )
if (!ppP_RefTr.Grow())
@@ -492,9 +505,8 @@ const TokenId TokenPool::Store( const ScSingleRefData& rTr )
const TokenId TokenPool::Store( const ScComplexRefData& rTr )
{
-if( nElementAkt >= nElement )
-if (!GrowElement())
-return static_cast(nElementAkt+1);
+if (!CheckElementOrGrow())
+return static_cast(nElementAkt+1);
if( ppP_RefTr.m_writemark + 1 >= ppP_RefTr.m_capacity )
if (!ppP_RefTr.Grow(2))
@@ -522,9 +534,8 @@ const TokenId TokenPool::Store( const ScComplexRefData& rTr
)
const TokenId TokenPool::Store( const DefTokenId e, const OUString& r )
{
-if( nElementAkt >= nElement )
-if (!GrowElement())
-return static_cast(nElementAkt+1);
+if (!CheckElementOrGrow())
+return static_cast(nElementAkt+1);
if( ppP_Ext.m_writemark >= ppP_Ext.m_capacity )
if (!ppP_Ext.Grow())
@@ -549,9 +560,8 @@ const TokenId TokenPool::Store( const DefTokenId e, const
OUString& r )
const TokenId TokenPool::StoreNlf( const ScSingleRefData& rTr )
{
-if( nElementAkt >= nElement )
-if (!GrowElement())
-return static_cast(nElementAkt+1);
+if (!CheckElementOrGrow())
+return static_cast(nElementAkt+1);
if( ppP_Nlf.m_writemark >= ppP_Nlf.m_capacity )
if (!ppP_Nlf.Grow())
@@ -575,9 +585,8 @@ const TokenId TokenPool::StoreNlf( const ScSingleRefData&
rTr )
const TokenId TokenPool::StoreMatrix()
{
-if( nElementAkt >= nElement )
-if (!GrowElement())
-return static_cast(nElementAkt+1);
+if (!CheckElementOrGrow())
+return static_cast(nElementAkt+1);
if( nP_Mat
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sc/source
sc/source/ui/docshell/docfunc.cxx |3 +++
sc/source/ui/inc/notemark.hxx |5 +++--
sc/source/ui/view/gridwin5.cxx| 21 +
sc/source/ui/view/notemark.cxx| 10 --
4 files changed, 15 insertions(+), 24 deletions(-)
New commits:
commit 6324f4bbbcc7ef22435be205e6f313888e76c258
Author: Vasily Melenchuk
Date: Wed Nov 8 16:53:12 2017 +0300
tdf#113901: Grid offset for notes and temporary notes modified.
Older calculations for gird offset were incomplete: are not used for notes
(only for temporary ones on mouse over), were not taken into account during
temporary note disappear and contain duplicated code from
ScDrawView::SyncForGrid()
New approach elminate described above problems.
Reviewed-on: https://gerrit.libreoffice.org/44464
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
Conflicts:
sc/source/ui/docshell/docfunc.cxx
sc/source/ui/inc/notemark.hxx
sc/source/ui/view/notemark.cxx
Change-Id: I5f92971e156f37f052b4e6d47b2f16480bdbaf7e
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index c42f04e1bb31..4065a8ddb2cf 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -27,6 +27,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -1224,6 +1226,7 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool
bShow )
if (rDoc.IsStreamValid(rPos.Tab()))
rDoc.SetStreamValid(rPos.Tab(), false);
+
ScDocShell::GetViewData()->GetScDrawView()->SyncForGrid(pNote->GetCaption());
rDocShell.SetDocumentModified();
return true;
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index b6f8f8d70d00..60d599794f01 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -27,6 +27,7 @@
class SdrModel;
class SdrObject;
+class ScDrawView;
class ScNoteMarker
{
@@ -45,6 +46,7 @@ private:
boolbByKeyboard;
Rectangle aRect;
+ScDrawView* aDrawView;
SdrModel* pModel;
SdrObject* pObject;
boolbVisible;
@@ -54,7 +56,7 @@ private:
public:
ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight,
vcl::Window* pBottom, vcl::Window* pDiagonal,
ScDocument* pD, ScAddress aPos, const
OUString& rUser,
-const MapMode& rMap, bool bLeftEdge, bool
bForce, bool bKeyboard );
+const MapMode& rMap, bool bLeftEdge, bool
bForce, bool bKeyboard, ScDrawView * pDrawView );
~ScNoteMarker();
voidDraw();
@@ -62,7 +64,6 @@ public:
const ScAddress& GetDocPos() const { return aDocPos; }
boolIsByKeyboard() const{ return bByKeyboard; }
-voidSetGridOff( const Point& rOff ) { aGridOff = rOff; }
};
#endif
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 2d853957135f..6c460d83300e 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -208,26 +208,7 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW
nPosY, bool bKeyboard )
mpNoteMarker.reset(new ScNoteMarker(pLeft, pRight, pBottom,
pDiagonal,
pDoc, aCellPos, aTrackText,
-aMapMode, bLeftEdge, bFast,
bKeyboard));
-if ( pViewData->GetScDrawView() )
-{
-// get position for aCellPos
-// get draw position in hmm for aCellPos
-Point aOldPos( pDoc->GetColOffset( aCellPos.Col(),
aCellPos.Tab() ), pDoc->GetRowOffset( aCellPos.Row(), aCellPos.Tab() ) );
-aOldPos.X() = sc::TwipsToHMM( aOldPos.X() );
-aOldPos.Y() = sc::TwipsToHMM( aOldPos.Y() );
-// get screen pos in hmm for aCellPos
-// and equiv screen pos
-Point aScreenPos = pViewData->GetScrPos( aCellPos.Col(),
aCellPos.Row(), eWhich, true );
-MapMode aDrawMode = GetDrawMapMode();
-Point aCurPosHmm = PixelToLogic(aScreenPos, aDrawMode );
-Point aGridOff = aCurPosHmm -aOldPos;
-// fdo#63323 fix the X Position for the showing comment when
-// the mouse over the cell when the sheet are RTL
-if ( pDoc->IsNegativePage(nTab))
-aGridOff.setX(aCurPosHmm.getX() + aOldPos.getX());
-mpNoteMarker->SetGridOff( aGridOff );
-}
+aMapMode, bLeftEdge, bFast,
bKeyboard, pViewData->GetScDrawView()));
}
bDone = true; // something is shown (old or new)
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index c9d12e421c24..767b958
[Libreoffice-commits] core.git: 2 commits - extras/source include/svx sc/source sw/inc sw/source
extras/source/misc_config/autotbl.fmt |binary
include/svx/strings.hrc | 12
sc/source/core/tool/autoform.cxx| 12
sw/inc/poolfmt.hxx | 12
sw/inc/strings.hrc | 18 --
sw/source/core/doc/DocumentStylePoolManager.cxx | 63
sw/source/core/doc/SwStyleNameMapper.cxx| 13
7 files changed, 93 insertions(+), 37 deletions(-)
New commits:
commit b56cd8050137ed4555a5aca50d4949d941e1f132
Author: Eike Rathke
Date: Wed Nov 29 23:54:26 2017 +0100
Prepare for translated new AutoFormat Table Styles, tdf#101349
Stored in file are resource IDs for predefined style names, user
defined styles are stored with ID 0x and display the given
name. The 16 old styles have IDs 0..15, so add strings for the 10
new styles and append those to the already existing IDs assigning
them the range 16..25
Once the final autotbl.fmt file with only new styles will be
available, patch that to change the 0x user defined to those
16..25 (0x10 to 0x19) IDs, it is the uint16 immediately following
the style name (Little Endian). Order of styles should match the
one in this change, if not, change the change..
Also, this eliminates the duplicated translation entries in
sw/inc/strings.hrc and instead in
sw/source/core/doc/DocumentStylePoolManager.cxx pulls the
translations from include/svx/strings.hrc
Change-Id: I7827ae22ab05901e6580ff1b9cd812db55f94f7f
Reviewed-on: https://gerrit.libreoffice.org/45544
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 048cdc6c681e..2aad6c092bdc 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -640,6 +640,7 @@
#define RID_SVXSTR_COLOR_YELLOWGREEN
NC_("RID_SVXSTR_COLOR_YELLOWGREEN", "Yellow green")
#define RID_SVXSTR_COLOR_PINK
NC_("RID_SVXSTR_COLOR_PINK", "Pink")
#define RID_SVXSTR_COLOR_TURQUOISE
NC_("RID_SVXSTR_COLOR_TURQUOISE", "Turquoise")
+/* 16 old AutoFormat Table Styles */
#define RID_SVXSTR_TBLAFMT_3D
NC_("RID_SVXSTR_TBLAFMT_3D", "3D")
#define RID_SVXSTR_TBLAFMT_BLACK1
NC_("RID_SVXSTR_TBLAFMT_BLACK1", "Black 1")
#define RID_SVXSTR_TBLAFMT_BLACK2
NC_("RID_SVXSTR_TBLAFMT_BLACK2", "Black 2")
@@ -656,6 +657,17 @@
#define RID_SVXSTR_TBLAFMT_RED
NC_("RID_SVXSTR_TBLAFMT_RED", "Red")
#define RID_SVXSTR_TBLAFMT_TURQUOISE
NC_("RID_SVXSTR_TBLAFMT_TURQUOISE", "Turquoise")
#define RID_SVXSTR_TBLAFMT_YELLOW
NC_("RID_SVXSTR_TBLAFMT_YELLOW", "Yellow")
+/* 10 new AutoFormat Table Styles since LibreOffice 6.0 */
+#define RID_SVXSTR_TBLAFMT_LO6_ACADEMIC
NC_("RID_SVXSTR_TBLAFMT_LO6_ACADEMIC", "Academic")
+#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE
NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE", "Box List Blue")
+#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN
NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN", "Box List Green")
+#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED
NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED", "Box List Red")
+#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW
NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW", "Box List Yellow")
+#define RID_SVXSTR_TBLAFMT_LO6_ELEGANT
NC_("RID_SVXSTR_TBLAFMT_LO6_ELEGANT", "Elegant")
+#define RID_SVXSTR_TBLAFMT_LO6_FINANCIAL
NC_("RID_SVXSTR_TBLAFMT_LO6_FINANCIAL", "Financial")
+#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS
NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS", "Simple Grid Columns")
+#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS
NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS", "Simple Grid Rows")
+#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED
NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED", "Simple List Shaded")
#define RID_SVXSTR_LINEJOINT_MIDDLE
NC_("RID_SVXSTR_LINEJOINT_MIDDLE", "Line joint averaged")
#define RID_SVXSTR_LINEJOINT_BEVEL
NC_("RID_SVXSTR_LINEJOINT_BEVEL", "Line joint bevel")
#define RID_SVXSTR_LINEJOINT_MITER
NC_("RID_SVXSTR_LINEJOINT_MITER", "Line joint miter")
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 296dae5b9026..371cf8c2347f 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -762,7 +762,17 @@ static const char* RID_SVXSTR_TBLAFMT[] =
RID_SVXSTR_TBLAFMT_LAVENDER,
RID_SVXSTR_TBLAFMT_RED,
RID_SVXSTR_TBLAFMT_TURQUOISE,
-RID_SVXSTR_TBLAFMT_YELLOW
+RID_SVXSTR_TBLAFMT_YELLOW,
+RID_SVXSTR_TBLAFMT_LO6_ACADEM
[Libreoffice-commits] core.git: Branch 'feature/lok_dialog2' - 9 commits - desktop/source include/LibreOfficeKit include/sfx2 include/vcl libreofficekit/qa libreofficekit/source sfx2/source vcl/source
desktop/source/lib/init.cxx | 109 +- include/LibreOfficeKit/LibreOfficeKit.h | 32 - include/LibreOfficeKit/LibreOfficeKit.hxx | 58 --- include/LibreOfficeKit/LibreOfficeKitEnums.h| 27 - include/sfx2/lokhelper.hxx |6 include/sfx2/viewsh.hxx |1 include/vcl/IDialogRenderable.hxx |2 include/vcl/dialog.hxx |5 include/vcl/floatwin.hxx|2 include/vcl/window.hxx |7 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx | 37 +- libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx |4 libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx| 19 - libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx| 23 + libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx | 179 +- libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.hxx |6 libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx | 110 ++ libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx |3 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx | 60 +++ libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx |6 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx| 34 + libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx|2 libreofficekit/qa/gtktiledviewer/gtv.ui | 49 ++ libreofficekit/source/gtk/lokdocview.cxx| 55 --- sfx2/source/dialog/basedlgs.cxx |3 sfx2/source/dialog/tabdlg.cxx |1 sfx2/source/view/lokhelper.cxx | 20 - sfx2/source/view/viewsh.cxx |5 vcl/source/control/ctrl.cxx |2 vcl/source/window/dialog.cxx| 23 - vcl/source/window/floatwin.cxx | 35 + vcl/source/window/window.cxx| 111 ++ 32 files changed, 490 insertions(+), 546 deletions(-) New commits: commit 0d4baee564982711ec628afb207bdd632613654f Author: Pranav Kant Date: Fri Dec 1 14:27:21 2017 +0530 lokdialog: Merge dialog & dialog child mouse event APIs into one Change-Id: I91aaa6a58f33dd2d817e02533de96e0c8191f2ca diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 05cf36165a96..0b3cc7ab8a68 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -555,7 +555,7 @@ static void doc_postMouseEvent (LibreOfficeKitDocument* pThis, int nCount, int nButtons, int nModifier); -static void doc_postDialogMouseEvent (LibreOfficeKitDocument* pThis, +static void doc_postWindowMouseEvent (LibreOfficeKitDocument* pThis, unsigned nLOKWindowId, int nType, int nX, @@ -563,14 +563,6 @@ static void doc_postDialogMouseEvent (LibreOfficeKitDocument* pThis, int nCount, int nButtons, int nModifier); -static void doc_postDialogChildMouseEvent (LibreOfficeKitDocument* pThis, - unsigned nLOKWindowId, - int nType, - int nX, - int nY, - int nCount, - int nButtons, - int nModifier); static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pCommand, const char* pArguments, @@ -644,8 +636,7 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference postKeyEvent = doc_postKeyEvent; m_pDocumentClass->postWindowKeyEvent = doc_postWindowKeyEvent; m_pDocumentClass->postMouseEvent = doc_postMouseEvent; -m_pDocumentClass->postDialogMouseEvent = doc_postDialogMouseEvent; -m_pDocumentClass->postDialogChildMouseEvent = doc_postDialogChildMouseEvent; +m_pDocumentClass->postWindowMouseEvent = doc_postWindowMouseEvent; m_pDocumentClass->postUnoCommand = doc_postUnoCommand; m_pDocumen
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/core/tool/interpr1.cxx | 18 +-
1 file changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 664d40fb24bf500a22efd1f1aff58a96b3c3cf2c
Author: Winfried Donkers
Date: Wed Nov 29 17:43:14 2017 +0100
tdf#97198 follow up: improve efficiency for Calc function RIGHT.
Change-Id: Ie2d5011f9ff73bd42a6f3ced1f709fab65d23c18
Reviewed-on: https://gerrit.libreoffice.org/45517
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit c5d0cffbf42f41349a8575ba52456d9cb07e91c7)
Reviewed-on: https://gerrit.libreoffice.org/45598
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 164c1185e1b8..d3b5829a5db8 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8901,23 +8901,15 @@ void ScInterpreter::ScRight()
n = 1;
OUString aStr = GetString().getString();
sal_Int32 nLen = aStr.getLength();
-sal_Int32 nIdx = 0;
-sal_Int32 nCnt = 0;
-while ( nIdx < nLen )
-{
-aStr.iterateCodePoints( &nIdx );
-++nCnt;
-}
-if ( nCnt <= n )
+if ( nLen <= n )
PushString( aStr );
else
{
-sal_Int32 nCLen = nCnt;
-nIdx = 0;
-nCnt = 0;
-while ( nIdx < nLen && n < ( nCLen - nCnt ) )
+sal_Int32 nIdx = nLen;
+sal_Int32 nCnt = 0;
+while ( nIdx > 0 && n > nCnt )
{
-aStr.iterateCodePoints( &nIdx );
+aStr.iterateCodePoints( &nIdx, -1 );
++nCnt;
}
aStr = aStr.copy( nIdx, nLen - nIdx );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
1 new defect(s) introduced to LibreOffice found with Coverity Scan.
9 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)
** CID 1424880:(UNCAUGHT_EXCEPT)
/svx/source/unodraw/unomod.cxx: 690 in SvxCreateNumRule(SdrModel *)()
/svx/source/unodraw/unomod.cxx: 690 in SvxCreateNumRule(SdrModel *)()
*** CID 1424880:(UNCAUGHT_EXCEPT)
/svx/source/unodraw/unomod.cxx: 690 in SvxCreateNumRule(SdrModel *)()
684 {
685 OUString aService( "com.sun.star.drawing.DrawPages" );
686 uno::Sequence< OUString > aSeq( &aService, 1 );
687 return aSeq;
688 }
689
>>> CID 1424880:(UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown
>>> but the throw list "throw()" doesn't allow it to be thrown. This will cause
>>> a call to unexpected() which usually calls terminate().
690 css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(
SdrModel* pModel ) throw()
691 {
692 const SvxNumRule* pDefaultRule = nullptr;
693 if( pModel )
694 {
695 const SvxNumBulletItem* pItem =
pModel->GetItemPool().GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET);
/svx/source/unodraw/unomod.cxx: 690 in SvxCreateNumRule(SdrModel *)()
684 {
685 OUString aService( "com.sun.star.drawing.DrawPages" );
686 uno::Sequence< OUString > aSeq( &aService, 1 );
687 return aSeq;
688 }
689
>>> CID 1424880:(UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown
>>> but the throw list "throw()" doesn't allow it to be thrown. This will cause
>>> a call to unexpected() which usually calls terminate().
690 css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(
SdrModel* pModel ) throw()
691 {
692 const SvxNumRule* pDefaultRule = nullptr;
693 if( pModel )
694 {
695 const SvxNumBulletItem* pItem =
pModel->GetItemPool().GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET);
To view the defects in Coverity Scan visit,
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyCsxuTVTf6JjzjKL0D6zBFXLrFZmb1jsbYVTC3Y5FgQMgW-2BLqhyzscTchRKk9bFcCL4C7tLuAq64nlrF-2BVoVWZEkV-2BhaYODHCMvkZNGiaKtdcwNrrbFiUWYTSeLod-2BV-2FAk9ds1d1RUOIjhn6zPolJuXvo0Tstmxdlxoo0vkGUSN0-3D
To manage Coverity Scan email notifications for
"libreoffice@lists.freedesktop.org", click
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRbVDbis712qZDP-2FA8y06Nq4k1FZJSDV-2FTHi5VQof9xGafB4oBwGYxuHHknceo2QLpCrZ44Ciy7AqBR2QyX6OCB5lwWgMDuK-2FivqaohkU3M9kT-2Fww10Qt2GoaCJAOQCa0Wv4ijH4oV8jCt0XXa7QeAwh_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyCsxuTVTf6JjzjKL0D6zBFUUkBiifps1rkcExAHFnCbC-2FaZm77-2F2a-2FtOgWWutt1iDyJOmOE6w2-2Bx6xh96N4n2fJ0ONNZ2pbpBytXVG9FynM-2B7KyCfpzq2kk-2B7AoYCTl40af8LRqD1ZwBACyWkknZimvFmni7ob-2BfYNeSiCv-2FX270-3D
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: .editorconfig
.editorconfig |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 54d73c33eb80f18a1600c7f60dae106738349cd1
Author: Samuel Mehrbrodt
Date: Fri Dec 1 09:09:12 2017 +0100
editorconfig: xsl files now also use 4 space indentation
Change-Id: I0368f56d1846731d4ec6453aa967cb4907f7df69
Reviewed-on: https://gerrit.libreoffice.org/45633
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/.editorconfig b/.editorconfig
index be10d26ceddc..1ca7843d26fb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,7 +11,7 @@ charset = utf-8
trim_trailing_whitespace = true
# Source code files
-[*.{c,cxx,cpp,h,hxx,hpp,java,py}]
+[*.{c,cxx,cpp,h,hxx,hpp,java,py,xsl}]
indent_style = space
indent_size = 4
@@ -23,7 +23,3 @@ trim_trailing_whitespace = false
# Patch files
[*.patch.*]
trim_trailing_whitespace = false
-
-# XSL files
-[*.xsl]
-indent_style = tab
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/conditio.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 50acacae130fcc795c8bd1cc9e829d8332149390 Author: Mike Kaganski Date: Fri Dec 1 10:12:02 2017 +0200 Remove nonsensical loop The comphelper::ContainerUniquePtrEquals loops through containers itself Change-Id: I78181d9b4b951bebcd31f40abedcda0cd3e91973 Reviewed-on: https://gerrit.libreoffice.org/45634 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 5be3688bfe6a..7bb41c29575d 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1750,9 +1750,8 @@ bool ScConditionalFormat::EqualEntries( const ScConditionalFormat& r ) const return false; //TODO: Test for same entries in reverse order? -for (size_t i=0; ihttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/lok_dialog2' - desktop/source
desktop/source/lib/init.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 25bb6cf5dc65712a9444becfa0d493f1708c6efb
Author: Pranav Kant
Date: Fri Dec 1 16:09:43 2017 +0530
fixup! lokdialog: Allow closing a dialog from LOK client
Change-Id: I353336fcabf56518d391289c8d10b4ed62333c7f
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0b3cc7ab8a68..2eb2693ac244 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3265,7 +3265,7 @@ static void doc_postWindow(LibreOfficeKitDocument*
/*pThis*/, unsigned nLOKWindo
if (Dialog* pDialog = dynamic_cast(pWindow.get()))
{
if (nAction == LOK_WINDOW_CLOSE)
-pDialog->EndDialog( RET_OK );
+pDialog->EndDialog( RET_CANCEL );
}
}
___
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' - sw/source
sw/source/ui/fldui/fldvar.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0471edee5f47c6bca74895b7b9f8968a922cb954 Author: Caolán McNamara Date: Thu Nov 30 16:19:26 2017 + Resolves: tdf#114112 sort 'select' list Change-Id: I0b80b2f7e8377f92a397b6557d2c3fad3e63f16a Reviewed-on: https://gerrit.libreoffice.org/45607 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 46fd6eb88802..cf3434c42e80 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -48,6 +48,7 @@ SwFieldVarPage::SwFieldVarPage(vcl::Window* pParent, const SfxItemSet *const pCo get(m_pTypeLB, "type"); get(m_pSelection, "selectframe"); get(m_pSelectionLB, "select"); +m_pSelectionLB->SetStyle(m_pSelectionLB->GetStyle() | WB_SORT); get(m_pFormat, "formatframe"); get(m_pChapterFrame, "chapterframe"); get(m_pNameFT, "nameft"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .editorconfig
.editorconfig |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a7a13045bc73f3fd510db7665cf2b354ae8958cf
Author: Tor Lillqvist
Date: Fri Dec 1 12:58:08 2017 +0200
We have Objective-C++ and Swift source files, too
Change-Id: I28dadb64b09e5781d4c28c2c5395f448d4b71e44
diff --git a/.editorconfig b/.editorconfig
index 1ca7843d26fb..e75921e64de0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,7 +11,7 @@ charset = utf-8
trim_trailing_whitespace = true
# Source code files
-[*.{c,cxx,cpp,h,hxx,hpp,java,py,xsl}]
+[*.{c,cxx,cpp,h,hxx,hpp,java,mm,py,swift,xsl}]
indent_style = space
indent_size = 4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .editorconfig
.editorconfig |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ff84c8a890bf782e9e4f0557c117277289c2360
Author: Tor Lillqvist
Date: Fri Dec 1 12:59:43 2017 +0200
We have some Objective-C source files, too
Change-Id: I0e8319596c11f7dc2ed9b5660eebe55aaa9ec493
diff --git a/.editorconfig b/.editorconfig
index e75921e64de0..226e4c219186 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,7 +11,7 @@ charset = utf-8
trim_trailing_whitespace = true
# Source code files
-[*.{c,cxx,cpp,h,hxx,hpp,java,mm,py,swift,xsl}]
+[*.{c,cxx,cpp,h,hxx,hpp,java,m,mm,py,swift,xsl}]
indent_style = space
indent_size = 4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/headless
vcl/headless/svpgdi.cxx | 48
1 file changed, 44 insertions(+), 4 deletions(-)
New commits:
commit 335ae97f4fdb70d3325a8337d27232ca610228fc
Author: Caolán McNamara
Date: Wed Nov 29 15:32:39 2017 +
Resolves: tdf#114117 draw page shadow mangled
when cairo had to stretch the 1 pixel dimension to fit the area.
When its this 1 pixel case set the same settings we use for the stipple
effect
to get the expected interpolation
Change-Id: I42d87d6d01ebdb44083351a9632860f5f0a3bf63
Reviewed-on: https://gerrit.libreoffice.org/45512
Reviewed-by: Michael Meeks
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index b9c7ba9a11f5..bcb0e46e8bec 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -282,10 +282,32 @@ bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&
rTR, const SalBitmap& rS
cairo_clip(cr);
+cairo_pattern_t* maskpattern = cairo_pattern_create_for_surface(mask);
cairo_translate(cr, rTR.mnDestX, rTR.mnDestY);
-cairo_scale(cr, (double)(rTR.mnDestWidth)/rTR.mnSrcWidth,
((double)rTR.mnDestHeight)/rTR.mnSrcHeight);
+double fXScale = (double)(rTR.mnDestWidth)/rTR.mnSrcWidth;
+double fYScale = ((double)rTR.mnDestHeight)/rTR.mnSrcHeight;
+cairo_scale(cr, fXScale, fYScale);
cairo_set_source_surface(cr, source, -rTR.mnSrcX, -rTR.mnSrcY);
-cairo_mask_surface(cr, mask, -rTR.mnSrcX, -rTR.mnSrcY);
+
+//tdf#114117 when stretching a single pixel width/height source to fit an
area
+//set extend and filter to stretch it with simplest expected interpolation
+if ((fXScale != 1.0 && rTR.mnSrcWidth == 1) || (fYScale != 1.0 &&
rTR.mnSrcHeight == 1))
+{
+cairo_pattern_t* sourcepattern = cairo_get_source(cr);
+cairo_pattern_set_extend(sourcepattern, CAIRO_EXTEND_REPEAT);
+cairo_pattern_set_filter(sourcepattern, CAIRO_FILTER_NEAREST);
+cairo_pattern_set_extend(maskpattern, CAIRO_EXTEND_REPEAT);
+cairo_pattern_set_filter(maskpattern, CAIRO_FILTER_NEAREST);
+}
+
+//this block is just "cairo_mask_surface", but we have to make it explicit
+//because of the cairo_pattern_set_filter etc we may want applied
+cairo_matrix_t matrix;
+cairo_matrix_init_translate(&matrix, rTR.mnSrcX, rTR.mnSrcY);
+cairo_pattern_set_matrix(maskpattern, &matrix);
+cairo_mask(cr, maskpattern);
+
+cairo_pattern_destroy(maskpattern);
releaseCairoContext(cr, false, extents);
@@ -993,12 +1015,22 @@ static basegfx::B2DRange renderSource(cairo_t* cr, const
SalTwoRect& rTR,
cairo_clip(cr);
cairo_translate(cr, rTR.mnDestX, rTR.mnDestY);
+double fXScale = 1.0f;
+double fYScale = 1.0f;
if (rTR.mnSrcWidth != 0 && rTR.mnSrcHeight != 0) {
-cairo_scale(cr, (double)(rTR.mnDestWidth)/rTR.mnSrcWidth,
((double)rTR.mnDestHeight)/rTR.mnSrcHeight);
+fXScale = (double)(rTR.mnDestWidth)/rTR.mnSrcWidth;
+fYScale = ((double)rTR.mnDestHeight)/rTR.mnSrcHeight;
+cairo_scale(cr, fXScale, fYScale);
}
cairo_save(cr);
cairo_set_source_surface(cr, source, -rTR.mnSrcX, -rTR.mnSrcY);
+if ((fXScale != 1.0 && rTR.mnSrcWidth == 1) || (fYScale != 1.0 &&
rTR.mnSrcHeight == 1))
+{
+cairo_pattern_t* sourcepattern = cairo_get_source(cr);
+cairo_pattern_set_extend(sourcepattern, CAIRO_EXTEND_REPEAT);
+cairo_pattern_set_filter(sourcepattern, CAIRO_FILTER_NEAREST);
+}
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_paint(cr);
cairo_restore(cr);
@@ -1135,8 +1167,16 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR,
cairo_clip(cr);
cairo_translate(cr, rTR.mnDestX, rTR.mnDestY);
-cairo_scale(cr, (double)(rTR.mnDestWidth)/rTR.mnSrcWidth,
((double)rTR.mnDestHeight)/rTR.mnSrcHeight);
+double fXScale = (double)(rTR.mnDestWidth)/rTR.mnSrcWidth;
+double fYScale = ((double)rTR.mnDestHeight)/rTR.mnSrcHeight;
+cairo_scale(cr, fXScale, fYScale);
cairo_set_source_surface(cr, aSurface.getSurface(), -rTR.mnSrcX,
-rTR.mnSrcY);
+if ((fXScale != 1.0 && rTR.mnSrcWidth == 1) || (fYScale != 1.0 &&
rTR.mnSrcHeight == 1))
+{
+cairo_pattern_t* sourcepattern = cairo_get_source(cr);
+cairo_pattern_set_extend(sourcepattern, CAIRO_EXTEND_REPEAT);
+cairo_pattern_set_filter(sourcepattern, CAIRO_FILTER_NEAREST);
+}
cairo_paint(cr);
releaseCairoContext(cr, false, extents);
___
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' - sc/inc sc/source sc/uiconfig
sc/inc/strings.hrc |2 +
sc/source/ui/dialogs/searchresults.cxx | 45 +
sc/source/ui/inc/searchresults.hxx |4 ++
sc/uiconfig/scalc/ui/searchresults.ui | 25 +-
4 files changed, 42 insertions(+), 34 deletions(-)
New commits:
commit ad4abd949de51cd66288bdb4f884cc5ab2b6a59a
Author: heiko tietze
Date: Sat Nov 25 12:35:59 2017 +0100
tdf#113831 Show number of search results
Skipped label used to show the number via resource strings
Change-Id: I6f57799565126c202041d0bf6a9f361d4e64cdfd
Reviewed-on: https://gerrit.libreoffice.org/45269
Tested-by: Jenkins
Reviewed-by: Michael Meeks
(cherry picked from commit 470682b3abf0622f5e9663d62d8641f63ceb6f30)
Reviewed-on: https://gerrit.libreoffice.org/45320
Reviewed-by: Heiko Tietze
Tested-by: Heiko Tietze
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index e82b9d1f5362..a29c93b54a7c 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -47,6 +47,8 @@
#define SCSTR_NO_TAB_BG_COLOR
NC_("SCSTR_NO_TAB_BG_COLOR", "Default")
#define SCSTR_RENAMEOBJECT NC_("SCSTR_RENAMEOBJECT",
"Name Object")
#define STR_INSERTGRAPHIC NC_("STR_INSERTGRAPHIC",
"Insert Image")
+#define SCSTR_TOTAL NC_("SCSTR_TOTAL", "%1
results found")
+#define SCSTR_SKIPPED NC_("SCSTR_SKIPPED",
"(only %1 are listed)")
// Attribute
#define SCSTR_PROTECTDOCNC_("SCSTR_PROTECTDOC",
"Protect Document")
#define SCSTR_UNPROTECTDOC NC_("SCSTR_UNPROTECTDOC",
"Unprotect document")
diff --git a/sc/source/ui/dialogs/searchresults.cxx
b/sc/source/ui/dialogs/searchresults.cxx
index d9cf33f1a4be..f72bb7423388 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -25,9 +25,11 @@ namespace sc {
SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window*
pParent ) :
ModelessDialog(pParent, "SearchResultsDialog",
"modules/scalc/ui/searchresults.ui"),
+aSkipped( ScResId( SCSTR_SKIPPED ) ),
+aTotal( ScResId( SCSTR_TOTAL ) ),
mpBindings(_pBindings), mpDoc(nullptr)
{
-get(mpLabel, "skipped");
+get(mpSearchResults, "lbSearchResults");
SvSimpleTableContainer *pContainer =
get("results");
Size aControlSize(150, 120);
@@ -50,23 +52,19 @@ SearchResultsDlg::~SearchResultsDlg()
void SearchResultsDlg::dispose()
{
mpList.disposeAndClear();
-mpLabel.disposeAndClear();
+mpSearchResults.disposeAndClear();
ModelessDialog::dispose();
}
namespace
{
class ListWrapper {
-size_t mnCount;
-static const size_t mnMaximum = 1000;
OUStringBuffer maName;
-VclPtr mpLabel;
VclPtr mpList;
public:
-ListWrapper(const VclPtr &pList,
-const VclPtr &pLabel) :
-mnCount(0),
-mpLabel(pLabel),
+size_t mnCount = 0;
+static const size_t mnMaximum = 1000;
+ListWrapper(const VclPtr &pList) :
mpList(pList)
{
mpList->Clear();
@@ -88,33 +86,19 @@ namespace
mpList->InsertEntry(maName.makeStringAndClear());
}
}
-void Update()
-{
-if (mnCount > mnMaximum)
-{
-if (mpLabel)
-{
-size_t nSkipped = mnCount - mnMaximum;
-OUString aSkipped(mpLabel->GetText());
-mpList->InsertEntry(
-aSkipped.replaceFirst("$1",
OUString::number(nSkipped)));
-}
-}
-mpList->SetUpdateMode(true);
-}
};
}
void SearchResultsDlg::FillResults( ScDocument* pDoc, const ScRangeList
&rMatchedRanges, bool bCellNotes )
{
-ListWrapper aList(mpList, mpLabel);
+ListWrapper aList(mpList);
std::vector aTabNames = pDoc->GetAllTableNames();
SCTAB nTabCount = aTabNames.size();
// tdf#92160 - too many results blow the widget's mind
size_t nMatchMax = rMatchedRanges.size();
-if (nMatchMax > 1000)
-nMatchMax = 1000;
+if (nMatchMax > ListWrapper::mnMaximum)
+nMatchMax = ListWrapper::mnMaximum;
if (bCellNotes)
{
@@ -163,7 +147,14 @@ void SearchResultsDlg::FillResults( ScDocument* pDoc,
const ScRangeList &rMatche
}
}
}
-aList.Update();
+
+OUString aSearchResults = ScGlobal::ReplaceOrAppend( aTotal, "%1",
OUString::number( aList.mnCount ) );
+if (aList.mnCount > ListWrapper::mnMaximum)
+aSearchResults += " " + ScGlobal::ReplaceOrAppend( aSkipped, "%1",
OUString::number( ListWrapper::mnMaximum ) );
+mpSearchResults->SetText(aSearchResults);
+
+mpList->SetUpdateMode(true);
+
mpDoc = pDoc;
}
diff --git a/sc/source/ui
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/core/tool/compiler.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 547230e672e179539b2477ff36acb00076149f55
Author: Caolán McNamara
Date: Wed Nov 29 17:05:07 2017 +
ofz#4484 don't set mnRangeOpPosInSymbol on StringOverflow case
Change-Id: I35d86c97e4fb082a676a5eeadf8375738cecd7bd
Reviewed-on: https://gerrit.libreoffice.org/45565
Reviewed-by: Eike Rathke
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 65780e5ad1e2..dce7841b80cd 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2214,14 +2214,16 @@ Label_MaskStateMachine:
{
// One range operator may form Sheet1.A:A, which we need to
// pass as one entity to IsReference().
-mnRangeOpPosInSymbol = pSym - &cSymbol[0];
if( pSym == &cSymbol[ MAXSTRLEN ] )
{
SetError(FormulaError::StringOverflow);
eState = ssStop;
}
else
+{
+mnRangeOpPosInSymbol = pSym - &cSymbol[0];
*pSym++ = c;
+}
}
else if ( 128 <= c || '\'' == c )
{ // High values need reparsing with i18n,
___
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' - external/more_fonts extras/source postprocess/CustomTarget_fontconfig.mk postprocess/Module_postprocess.mk postprocess/Package_fontconfig.mk
Repository.mk |2 - external/more_fonts/Module_more_fonts.mk |1 external/more_fonts/Package_conf.mk| 14 --- external/more_fonts/fc_local.snippet |6 - extras/source/truetype/symbol/fc_local.snippet |6 + postprocess/CustomTarget_fontconfig.mk | 30 + postprocess/Module_postprocess.mk | 13 ++ postprocess/Package_fontconfig.mk | 18 +++ vcl/unx/generic/fontmanager/fontconfig.cxx |2 + 9 files changed, 70 insertions(+), 22 deletions(-) New commits: commit 011dc2d0ecfa022ab0df2d9081a2d68e62cfc3cf Author: Stephan Bergmann Date: Fri Sep 22 17:14:56 2017 +0200 Compensate for loss of Type 1 "Standard Symbols L" substitute for "Symbol" At least for me on Linux since LO 5.3, 'soffice sw/qa/extras/rtfexport/data/fdo72031.rtf' shows "Ã " (rendered in "DejaVu Sans") instead of "â" (rendered in "Standard Symbols L"). That's presumably because 47ea13ef8dc8ab9aeded6121845e3ebd1d28b292 "Kill the old Unix layout engines" removed support for Type 1 fonts (see "Ignore Type 1 fonts" in FontCfgWrapper::addFontSet, vcl/unx/generic/fontmanager/fontconfig.cxx), and my (Fedora 25) /usr/share/fonts/default/Type1/s05l.pfb "Standard Symbols L" is a Type 1 font. So we fell back to fontconfig's generic (weak) suggestion of "DejaVu Sans" as a substitute for "Symbol". So extend our fc_local.conf to suggest our "OpenSymbol" as a substitute for "Symbol". As that fc_local.conf was originally brought along by --with-fonts, which is enabled by default but can be disabled, compilation of fc_local.conf from the various snippets is moved to postprocess. macOS and Windows were never affected, as they both come with a "Symbol" font installed in the system. (And we don't install fc_local.conf on Windows at all.) Reviewed-on: https://gerrit.libreoffice.org/42670 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann (cherry picked from commit e79f1261549d9c497a38ea1af8843a86883b02cd) Change-Id: I8d6d87f24974577fd66f5f3989f606237ebb3d75 Reviewed-on: https://gerrit.libreoffice.org/44979 Tested-by: Jenkins Reviewed-by: Michael Stahl Reviewed-by: Christian Lohmaier diff --git a/Repository.mk b/Repository.mk index a1e9cb7b6cf1..963d58695d50 100644 --- a/Repository.mk +++ b/Repository.mk @@ -797,10 +797,10 @@ $(eval $(call gb_Helper_register_packages, \ cli_basetypes_copy \ desktop_install \ $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ + $(if $(filter-out WNT,$(OS)),postprocess_fontconfig) \ extras_fonts \ extras_wordbook \ $(if $(filter MSC,$(COM)),msvc_dlls) \ - more_fonts_conf \ instsetoo_native_setup \ $(if $(ENABLE_OOENV),instsetoo_native_ooenv) \ odk_headers_generated \ diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index f584a8fec4a5..6e5224752fe6 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,more_fonts)) $(eval $(call gb_Module_add_targets,more_fonts,\ - Package_conf \ ExternalPackage_caladea \ ExternalPackage_carlito \ ExternalPackage_dejavu \ diff --git a/external/more_fonts/Package_conf.mk b/external/more_fonts/Package_conf.mk deleted file mode 100644 index 2d259c2175c3.. --- a/external/more_fonts/Package_conf.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/external/more_fonts/fonts)) - -$(eval $(call gb_Package_add_file,more_fonts_conf,$(LIBO_SHARE_FOLDER)/fonts/truetype/fc_local.conf,fc_local.conf)) - -# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/fonts/fc_local.conf b/external/more_fonts/fc_local.snippet similarity index 84% rename from external/more_fonts/fonts/fc_local.conf rename to external/more_fonts/fc_local.snippet index 6af763c0b0f0..cb49929b0a4a 100644 --- a/external/more_fonts/fonts/fc_local.conf +++ b/external/more_fonts/fc_local.snippet @@ -1,7 +1,3 @@ - - - - @@ -31,5 +27,3 @@ Caladea - - diff --git a/extras/source/truetype/symbol/fc_local.snippet b/extras/source/truetype/symbol/fc_local.snippet new file mode 100644 index ..5b29e1d58744 --- /dev/null +++ b/extras/source/truetype/symbol/fc_local.snippet @@ -0,0 +1,6 @@ + + Symbol +
[Libreoffice-commits] core.git: Branch 'feature/lok_dialog2' - include/vcl vcl/source
include/vcl/window.hxx |2 --
vcl/source/control/ctrl.cxx| 22 ++
vcl/source/window/floatwin.cxx | 14 ++
vcl/source/window/window.cxx | 25 -
4 files changed, 16 insertions(+), 47 deletions(-)
New commits:
commit 9047e50b701af33d61ec51730c388cc7a6cdb8df
Author: Pranav Kant
Date: Fri Dec 1 16:42:12 2017 +0530
fixup! lokdialog: Simplify; make the LOK dialog API more generic
Change-Id: I62078d2a060015dce0b3b275783ff65143bd1c81
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 644d9c16e37e..41040263a76f 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1207,8 +1207,6 @@ public:
voidSetComponentInterface( css::uno::Reference<
css::awt::XWindowPeer > const & xIFace );
/// Interface to register for dialog / window tunneling.
-voidLOKRegisterWindow();
-voidLOKUnregisterWindow();
voidSetLOKNotifier(const
vcl::ILibreOfficeKitNotifier* pNotifier);
const vcl::ILibreOfficeKitNotifier* GetLOKNotifier() const;
vcl::LOKWindowIdGetLOKWindowId() const;
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 977003a14d16..37dc3dcdad8a 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -421,25 +421,15 @@ void Control::LogicInvalidate(const tools::Rectangle*
/*pRectangle*/)
// ignore all of those
if (comphelper::LibreOfficeKit::isActive() &&
!comphelper::LibreOfficeKit::isDialogPainting())
{
-// If parent is a floating window, trigger an invalidate there
-vcl::Window* pWindow = this;
-while (pWindow)
+if (vcl::Window* pParent = GetParentWithLOKNotifier())
{
-if (pWindow->ImplIsFloatingWindow() && pWindow->GetLOKWindowId())
-{
-
static_cast(pWindow)->LogicInvalidate(nullptr);
-return;
-}
+// invalidate the complete floating window for now
+if (pParent->ImplIsFloatingWindow())
+return pParent->LogicInvalidate(nullptr);
-pWindow = pWindow->GetParent();
+const tools::Rectangle aRect(Point(GetOutOffXPixel(),
GetOutOffYPixel()), Size(GetOutputWidthPixel(), GetOutputHeightPixel()));
+pParent->LogicInvalidate(&aRect);
}
-
-// otherwise, for now, just invalidate the whole dialog
-Dialog* pParentDlg = GetParentDialog();
-
-const tools::Rectangle aRect(Point(GetOutOffXPixel(),
GetOutOffYPixel()), Size(GetOutputWidthPixel(), GetOutputHeightPixel()));
-if (pParentDlg)
-pParentDlg->LogicInvalidate(&aRect);
}
}
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 8e0a0e426306..57021be2f8cd 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -590,9 +590,6 @@ void FloatingWindow::LogicInvalidate(const
tools::Rectangle* /*pRectangle*/)
if (vcl::Window* pParent = GetParentWithLOKNotifier())
{
const vcl::ILibreOfficeKitNotifier* pNotifier =
pParent->GetLOKNotifier();
-// if we haven't yet created a LOK window id yet for ourself, we are
-// doing soemthing wrong
-assert(GetLOKWindowId());
pNotifier->notifyWindow(GetLOKWindowId(), "invalidate");
}
}
@@ -611,7 +608,7 @@ void FloatingWindow::StateChanged( StateChangedType nType )
const vcl::ILibreOfficeKitNotifier* pNotifier =
pParent->GetLOKNotifier();
if (nType == StateChangedType::InitShow && IsVisible())
{
-LOKRegisterWindow();
+SetLOKNotifier(pNotifier);
std::vector aItems;
aItems.emplace_back(std::make_pair("type", "child"));
@@ -623,7 +620,7 @@ void FloatingWindow::StateChanged( StateChangedType nType )
else if (!IsVisible())
{
pNotifier->notifyWindow(GetLOKWindowId(), "close");
-LOKUnregisterWindow();
+ReleaseLOKNotifier();
}
}
@@ -735,13 +732,6 @@ void FloatingWindow::StartPopupMode( const
tools::Rectangle& rRect, FloatWinPopu
GrabFocus();
}
Show( true, ShowFlags::NoActivate );
-
-if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
-{
-std::vector aItems;
-aItems.emplace_back(std::make_pair("size",
rRect.GetSize().toString()));
-pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
-}
}
void FloatingWindow::StartPopupMode( ToolBox* pBox, FloatWinPopupFlags nFlags )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index aa26519288d2..615b44dc3102 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3174,22 +3174,16 @@ void Window::SetComponentInterface( Reference<
css::a
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - oox/source
oox/source/drawingml/table/tableproperties.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d7f27f26ceaed2b307c2bdb9894dca3cb23d51bc
Author: Caolán McNamara
Date: Fri Dec 1 09:02:04 2017 +
ofz: check col/row bounds
Change-Id: Idaa38f400873372330dd06c14800c4a5018c79db
Reviewed-on: https://gerrit.libreoffice.org/45640
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/drawingml/table/tableproperties.cxx
b/oox/source/drawingml/table/tableproperties.cxx
index e5bc4f0cc3d5..527b65829d17 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -58,7 +58,8 @@ void CreateTableRows( const uno::Reference< XTableRows >&
xTableRows, const std:
xTableRows->insertByIndex( 0, rvTableRows.size() - 1 );
std::vector< TableRow >::const_iterator aTableRowIter( rvTableRows.begin()
);
uno::Reference< container::XIndexAccess > xIndexAccess( xTableRows,
UNO_QUERY_THROW );
-for ( sal_Int32 n = 0; n < xIndexAccess->getCount(); n++ )
+sal_Int32 nCols = std::min(xIndexAccess->getCount(),
rvTableRows.size());
+for (sal_Int32 n = 0; n < nCols; ++n)
{
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ),
UNO_QUERY_THROW );
xPropSet->setPropertyValue( "Height", Any( static_cast< sal_Int32 >(
aTableRowIter->getHeight() / 360 ) ) );
@@ -72,7 +73,8 @@ void CreateTableColumns( const Reference< XTableColumns >&
xTableColumns, const
xTableColumns->insertByIndex( 0, rvTableGrid.size() - 1 );
std::vector< sal_Int32 >::const_iterator aTableGridIter(
rvTableGrid.begin() );
uno::Reference< container::XIndexAccess > xIndexAccess( xTableColumns,
UNO_QUERY_THROW );
-for ( sal_Int32 n = 0; n < xIndexAccess->getCount(); n++ )
+sal_Int32 nCols = std::min(xIndexAccess->getCount(),
rvTableGrid.size());
+for (sal_Int32 n = 0; n < nCols; ++n)
{
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ),
UNO_QUERY_THROW );
xPropSet->setPropertyValue( "Width", Any( static_cast< sal_Int32 >(
*aTableGridIter++ / 360 ) ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.in Repository.mk vcl/Executable_pptxfuzzer.mk vcl/Module_vcl.mk vcl/workben
Makefile.in |2 - Repository.mk|1 vcl/Executable_pptxfuzzer.mk | 49 +++ vcl/Module_vcl.mk|1 vcl/workben/pptxfuzzer.cxx | 33 5 files changed, 85 insertions(+), 1 deletion(-) New commits: commit 324af6236800eaa540f0d32484c05e82e7aaf317 Author: Caolán McNamara Date: Wed Nov 29 10:44:09 2017 + add pptx fuzzer Change-Id: I50495496914929f9279a455d1acbffab833bf3f5 Reviewed-on: https://gerrit.libreoffice.org/45482 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/Makefile.in b/Makefile.in index c16e1f8dc328..004d1007f371 100644 --- a/Makefile.in +++ b/Makefile.in @@ -483,7 +483,7 @@ $(foreach ide,\ eclipsecdt,\ $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide -fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer Library_forui Library_binaryurp Library_io Library_invocation Library_namingservice Library_proxyfac Library_uuresolver Module_ure Exe cutable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer +fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer Library_forui Library_binaryurp Library_io Library_invocation Library_namingservice Library_proxyfac Library_uuresolver Module_ure Exe cutable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer Executable_pptxfuzzer endif # MAKE_RESTARTS diff --git a/Repository.mk b/Repository.mk index 7d3ee93971ae..bf86319025f4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -139,6 +139,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,diffuzzer) \ $(call gb_Helper_optional,FUZZERS,
[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py
bin/find-unused-defines-in-hrc-files.py | 158
1 file changed, 158 deletions(-)
New commits:
commit af5f86b2c1d895803ba79136609417c151100ec1
Author: Caolán McNamara
Date: Fri Dec 1 11:33:12 2017 +
Related: tdf#100226 unused hrc defines are the same as hxx defines now
since the gettextization, so they can be treated the same as normal ones
with
something like find-unused-defines.sh
Change-Id: I2915b76fc79ff5c0eb0dc2b35b1c0421e86462da
Reviewed-on: https://gerrit.libreoffice.org/45653
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/bin/find-unused-defines-in-hrc-files.py
b/bin/find-unused-defines-in-hrc-files.py
deleted file mode 100755
index f51b8d0fcfd6..
--- a/bin/find-unused-defines-in-hrc-files.py
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/usr/bin/python
-
-# Search for unused constants in .hrc files.
-#
-# Note that sometimes these constants are calculated, so some careful checking
of the output is necessary.
-#
-# Takes about 4 hours to run this on a fast machine with an SSD
-#
-
-import subprocess
-import sys
-
-exclusionSet = set([
-# List of RID constants where we compute a value using a base before
calling one of the RESSTR methods
-# Found with: git grep -P 'RID_\w+\s*\+' -- :/ ':!*.hrc' ':!*.src'
':!*.java' ':!*.py' ':!*.xba'
-"RID_SVXSTR_KEY_",
-"RID_UPDATE_BUBBLE_TEXT_",
-"RID_UPDATE_BUBBLE_T_TEXT_",
-"RID_SVXSTR_TBLAFMT_",
-"RID_BMP_CONTENT_",
-"RID_DROPMODE_",
-"RID_BMP_LEVEL",
-"RID_SVXSTR_BULLET_DESCRIPTION",
-"RID_SVXSTR_SINGLENUM_DESCRIPTION",
-"RID_SVXSTR_OUTLINENUM_DESCRIPTION",
-"RID_SVXSTR_RULER_",
-"RID_GALLERYSTR_THEME_",
-"RID_SVXSTR_BULLET_DESCRIPTION",
-"RID_SVXSTR_SINGLENUM_DESCRIPTION",
-"RID_SVXSTR_OUTLINENUM_DESCRIPTION",
-# doing some weird stuff in svx/source/unodraw/unoprov.cxx involving
mapping of UNO api names to translated names and back again
-"RID_SVXSTR_GRDT",
-"RID_SVXSTR_HATCH",
-"RID_SVXSTR_BMP",
-"RID_SVXSTR_DASH",
-"RID_SVXSTR_LEND",
-"RID_SVXSTR_TRASNGR",
-# other places doing calculations
-"RID_SVXSTR_DEPTH",
-"RID_SUBSETSTR_",
-"ANALYSIS_",
-"FLD_DOCINFO_CHANGE",
-"FLD_EU_",
-"FLD_INPUT_",
-"FLD_PAGEREF_",
-"FLD_STAT_",
-"FMT_AUTHOR_",
-"FMT_CHAPTER_",
-"FMT_DBFLD_",
-"FMT_FF_",
-"FMT_GETVAR_",
-"FMT_MARK_",
-"FMT_REF_",
-"FMT_SETVAR_",
-"STR_AUTH_FIELD_ADDRESS_",
-"STR_AUTH_TYPE_",
-"STR_AUTOFMTREDL_",
-"STR_CONTENT_TYPE_",
-"STR_UPDATE_ALL",
-"STR_UPDATE_INDEX",
-"STR_UPDATE_LINK",
-"BMP_PLACEHOLDER_",
-"STR_RPT_HELP_",
-"STR_TEMPLATE_NAME",
-"UID_BRWEVT_",
-"HID_EVT_",
-"HID_PROP_",
-"STR_VOBJ_MODE_",
-"STR_COND_",
-"SCSTR_CONTENT_",
-"DATE_FUNCDESC_",
-"DATE_FUNCNAME_",
-"DATE_DEFFUNCNAME_",
-"PRICING_DEFFUNCNAME_",
-"PRICING_FUNCDESC_",
-"PRICING_FUNCNAME_",
-"STR_ItemValCAPTION",
-"STR_ItemValCIRC",
-"STR_ItemValEDGE",
-"STR_ItemValFITTOSIZE",
-"STR_ItemValMEASURE_",
-"STR_ItemValMEASURETEXT_",
-"STR_ItemValTEXTANI_",
-"STR_ItemValTEXTHADJ",
-"STR_ItemValTEXTVADJ",
-])
-
-
-def in_exclusion_set( a ):
-for f in exclusionSet:
-if a.startswith(f):
-return True;
-return False;
-
-a = subprocess.Popen("git grep -hP '^#define\s+\w+\s+' -- *.hrc | sort -u",
stdout=subprocess.PIPE, shell=True)
-
-with a.stdout as txt:
-for line in txt:
-idx1 = line.find("#define ")
-idx2 = line.find(" ", idx1 + 9)
-idName = line[idx1+8 : idx2].strip()
-# the various _START and _END constants are normally unused outside of
the .hrc and .src files, and that's fine
-if idName.endswith("_START"): continue
-if idName.endswith("_BEGIN"): continue
-if idName.endswith("_END"): continue
-if idName.startswith("RID_"):
-if idName == "RID_SVX_FIRSTFREE": continue
-if in_exclusion_set(idName): continue
-# search for the constant
-b = subprocess.Popen(["git", "grep", "-w", idName],
stdout=subprocess.PIPE)
-found_reason_to_exclude = False
-with b.stdout as txt2:
-cnt = 0
-for line2 in txt2:
-line2 = line2.strip() # otherwise the comparisons below will
not work
-# check if we found one in actual code
-if idName.startswith("SID_"):
-if not ".hrc:" in line2 and not ".src:" in line2 and not
".sdi:" in line2: found_reason_to_exclude = True
-else:
-if not ".hrc:" in line2 and not ".src:" in line2:
found_reason_to_exclude = True
-if idName.startswith("RID_"):
-# is the constant being used as an identifier by
entries in .src files?
-if ".src:" in line2 and
Re: IDE integration with qtcreator
Jim Raykowski brought me on the right track. After removing the line with qmake from projects > build steps everything works now with the ordinary make. signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8ef56abfba1fe3ce5dc37fc9ed5ba4fbcf4390af Author: Christian Lohmaier Date: Fri Dec 1 12:59:49 2017 +0100 Updated core Project: translations f14dbe367fbd95092538121400fbeb029336fdfa update translations for 5.4.4 rc1 and force-fix errors unsing pocheck Change-Id: If21dc53231a40cb8ddcd70e177ea13f43d1d5f46 diff --git a/translations b/translations index 540114dbce53..f14dbe367fbd 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 540114dbce535a42b1c6c76488d8b5920455c385 +Subproject commit f14dbe367fbd95092538121400fbeb029336fdfa ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-4' - source/ab source/bg source/ca source/da source/de source/eo source/es source/et source/eu source/fr source/ga source/ja source/jv sou
source/ab/accessibility/source/helper.po | 12 source/ab/avmedia/source/framework.po| 10 source/ab/basctl/source/basicide.po | 36 source/ab/basctl/source/dlged.po | 6 source/ab/basctl/uiconfig/basicide/ui.po | 34 source/ab/basic/source/classes.po| 42 source/ab/chart2/source/controller/dialogs.po| 130 source/ab/chart2/uiconfig/ui.po | 42 source/ab/connectivity/source/resource.po| 18 source/ab/cui/source/customize.po| 32 source/ab/cui/source/dialogs.po | 32 source/ab/cui/source/options.po | 14 source/ab/cui/source/tabpages.po | 16 source/ab/cui/uiconfig/ui.po | 478 +- source/ab/dbaccess/source/core/resource.po | 20 source/ab/dbaccess/source/ext/macromigration.po | 12 source/ab/dbaccess/source/ui/app.po | 34 source/ab/dbaccess/source/ui/browser.po | 16 source/ab/dbaccess/source/ui/dlg.po | 62 source/ab/dbaccess/source/ui/misc.po | 18 source/ab/dbaccess/source/ui/querydesign.po | 24 source/ab/dbaccess/source/ui/tabledesign.po | 37 source/ab/dbaccess/uiconfig/ui.po| 196 source/ab/desktop/source/app.po | 18 source/ab/desktop/source/deployment/gui.po | 12 source/ab/desktop/source/deployment/manager.po | 15 source/ab/desktop/source/deployment/misc.po | 11 source/ab/desktop/source/deployment/registry.po | 13 source/ab/desktop/source/deployment/unopkg.po| 18 source/ab/desktop/uiconfig/ui.po | 50 source/ab/editeng/source/editeng.po | 6 source/ab/editeng/source/items.po| 144 source/ab/editeng/source/outliner.po | 6 source/ab/extensions/source/abpilot.po | 15 source/ab/extensions/source/bibliography.po | 39 source/ab/extensions/source/dbpilots.po | 23 source/ab/extensions/source/propctrlr.po | 188 source/ab/extensions/source/update/check.po | 56 source/ab/extensions/source/update/check/org/openoffice/Office.po| 10 source/ab/extensions/uiconfig/sabpilot/ui.po | 20 source/ab/extensions/uiconfig/sbibliography/ui.po| 12 source/ab/extensions/uiconfig/spropctrlr/ui.po | 12 source/ab/extras/source/autocorr/emoji.po| 797 +-- source/ab/filter/source/config/fragments/filters.po | 116 source/ab/filter/source/config/fragments/internalgraphicfilters.po | 50 source/ab/filter/source/config/fragments/types.po| 30 source/ab/filter/source/pdf.po | 15 source/ab/filter/source/t602.po | 13 source/ab/filter/source/xsltdialog.po| 16 source/ab/filter/uiconfig/ui.po | 96 source/ab/forms/source/resource.po | 38 source/ab/formula/source/core/resource.po| 140 source/ab/formula/source/ui/dlg.po | 12 source/ab/formula/uiconfig/ui.po | 12 source/ab/fpicker/source/office.po | 12 source/ab/fpicker/uiconfig/ui.po | 12 source/ab/framework/source/classes.po| 8 source/ab/instsetoo_native/inc_ope
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source
sc/source/filter/excel/xlescher.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 845bcfdcede2c59c592f0894ee29aed8241fa16a Author: Caolán McNamara Date: Thu Nov 30 15:55:00 2017 + ofz#4406 limit escher object cell area to calc's limits Change-Id: I9b9b198f1f96c952692d052a9a527086e453779f Reviewed-on: https://gerrit.libreoffice.org/45616 Reviewed-by: Thorsten Behrens Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index dc25c1bdc0d7..a0ce92bee5b8 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -146,10 +146,10 @@ tools::Rectangle XclObjAnchor::GetRect( const XclRoot& rRoot, SCTAB nScTab, MapU ScDocument& rDoc = rRoot.GetDoc(); double fScale = lclGetTwipsScale( eMapUnit ); tools::Rectangle aRect( -lclGetXFromCol( rDoc, nScTab, maFirst.mnCol, mnLX, fScale ), -lclGetYFromRow( rDoc, nScTab, maFirst.mnRow, mnTY, fScale ), -lclGetXFromCol( rDoc, nScTab, maLast.mnCol, mnRX + 1, fScale ), -lclGetYFromRow( rDoc, nScTab, maLast.mnRow, mnBY, fScale ) ); +lclGetXFromCol(rDoc, nScTab, std::min(maFirst.mnCol, MAXCOL), mnLX, fScale), +lclGetYFromRow(rDoc, nScTab, std::min(maFirst.mnRow, MAXROW), mnTY, fScale), +lclGetXFromCol(rDoc, nScTab, std::min(maLast.mnCol, MAXCOL), mnRX + 1, fScale), +lclGetYFromRow(rDoc, nScTab, std::min(maLast.mnRow, MAXROW), mnBY, fScale)); // adjust coordinates in mirrored sheets if( rDoc.IsLayoutRTL( nScTab ) ) ___ 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' - sc/source
sc/source/filter/excel/xlescher.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 9f5788fec088afbbf9e3168dfdad40c747da0dd6 Author: Caolán McNamara Date: Thu Nov 30 15:55:00 2017 + ofz#4406 limit escher object cell area to calc's limits Change-Id: I9b9b198f1f96c952692d052a9a527086e453779f Reviewed-on: https://gerrit.libreoffice.org/45615 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 8f2919b2f72b..eb70bc590ce7 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -146,10 +146,10 @@ tools::Rectangle XclObjAnchor::GetRect( const XclRoot& rRoot, SCTAB nScTab, MapU ScDocument& rDoc = rRoot.GetDoc(); double fScale = lclGetTwipsScale( eMapUnit ); tools::Rectangle aRect( -lclGetXFromCol( rDoc, nScTab, maFirst.mnCol, mnLX, fScale ), -lclGetYFromRow( rDoc, nScTab, maFirst.mnRow, mnTY, fScale ), -lclGetXFromCol( rDoc, nScTab, maLast.mnCol, mnRX + 1, fScale ), -lclGetYFromRow( rDoc, nScTab, maLast.mnRow, mnBY, fScale ) ); +lclGetXFromCol(rDoc, nScTab, std::min(maFirst.mnCol, MAXCOL), mnLX, fScale), +lclGetYFromRow(rDoc, nScTab, std::min(maFirst.mnRow, MAXROW), mnTY, fScale), +lclGetXFromCol(rDoc, nScTab, std::min(maLast.mnCol, MAXCOL), mnRX + 1, fScale), +lclGetYFromRow(rDoc, nScTab, std::min(maLast.mnRow, MAXROW), mnBY, fScale)); // adjust coordinates in mirrored sheets if( rDoc.IsLayoutRTL( nScTab ) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dialog.cxx | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit a246dc116a534cacef34c0e376a54391341b36e8
Author: Michael Stahl
Date: Wed Nov 29 15:24:50 2017 +0100
Revert "tdf#114025 - avoid deadlock between x11 clipboard and ...
... the lock dialog."
SolarMutexReleaser hack can be avoided with the rtl_Instance fix
from commit fa9c083c6071a0a4dc812f3c34731f347ddbabf7.
This reverts commit b0e37303df56472fdc7782b977326c2391fdab07.
Change-Id: Ib90cdec1420807afbadfd526a1ddb68d58db79c1
Reviewed-on: https://gerrit.libreoffice.org/45624
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e0bfc6cc1b06..59fcf1518eff 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -939,15 +939,13 @@ short Dialog::Execute()
return 0;
VclPtr xWindow = this;
-{
-SolarMutexReleaser aReleaser; // tdf#114025
-css::uno::Reference< css::uno::XComponentContext > xContext(
+
+css::uno::Reference< css::uno::XComponentContext > xContext(
comphelper::getProcessComponentContext() );
-css::uno::Reference
xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext),
css::uno::UNO_QUERY_THROW);
-css::document::DocumentEvent aObject;
-aObject.EventName = "DialogExecute";
-xEventBroadcaster->documentEventOccured(aObject);
-}
+css::uno::Reference
xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext),
css::uno::UNO_QUERY_THROW);
+css::document::DocumentEvent aObject;
+aObject.EventName = "DialogExecute";
+xEventBroadcaster->documentEventOccured(aObject);
UITestLogger::getInstance().log("DialogExecute");
// Yield util EndDialog is called or dialog gets destroyed
// (the latter should not happen, but better safe than sorry
___
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' - sc/source
sc/source/core/tool/compiler.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 6d67cc8299f17ecd50c2257f0022de85606a15f4
Author: Caolán McNamara
Date: Wed Nov 29 17:05:07 2017 +
ofz#4484 don't set mnRangeOpPosInSymbol on StringOverflow case
Change-Id: I35d86c97e4fb082a676a5eeadf8375738cecd7bd
Reviewed-on: https://gerrit.libreoffice.org/45566
Reviewed-by: Eike Rathke
Tested-by: Michael Stahl
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index d4eda96b2cae..62200282b2f0 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2225,14 +2225,16 @@ Label_MaskStateMachine:
{
// One range operator may form Sheet1.A:A, which we need to
// pass as one entity to IsReference().
-mnRangeOpPosInSymbol = pSym - &cSymbol[0];
if( pSym == &cSymbol[ MAXSTRLEN-1 ] )
{
SetError(FormulaError::StringOverflow);
eState = ssStop;
}
else
+{
+mnRangeOpPosInSymbol = pSym - &cSymbol[0];
*pSym++ = c;
+}
}
else if ( 128 <= c || '\'' == c )
{ // High values need reparsing with i18n,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/misc_config/autotbl.fmt |binary 1 file changed New commits: commit 86df47658a277521f51a1e22e92dcc632124745c Author: Eike Rathke Date: Fri Dec 1 13:39:14 2017 +0100 tdf#101349 patch new resource IDs into autotbl.fmt 0x10 to 0x19, see commit b56cd8050137ed4555a5aca50d4949d941e1f132 Date: Wed Nov 29 23:54:26 2017 +0100 Prepare for translated new AutoFormat Table Styles, tdf#101349 Change-Id: If4424336f74a76a8dff48c7bb502ac4f34dfa4f6 diff --git a/extras/source/misc_config/autotbl.fmt b/extras/source/misc_config/autotbl.fmt index 395e2ac33114..dbdb767dde82 100644 Binary files a/extras/source/misc_config/autotbl.fmt and b/extras/source/misc_config/autotbl.fmt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
min version of gtk3
There was a theming change in gtk3 3.20.0 and we support the old scheme before that point and the new scheme after that point. Things would be a lot simpler if the min version of gtk3 was 3.20.0, is there any distributions or individual devs for whom that would cause a problem ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sc/source
sc/source/ui/view/notemark.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aa3f2a94e05e19c8afeea09491f86cffdfd8c40c
Author: Vasily Melenchuk
Date: Fri Dec 1 15:30:05 2017 +0300
tdf#113901: adopting changes to 5.2
Change-Id: I795dcbb55b9be30e86a293c3ff62e640f48918a5
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 767b9588c2ec..ac72593b1477 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -99,7 +99,7 @@ IMPL_LINK_NOARG_TYPED(ScNoteMarker, TimeHdl, Timer *, void)
pObject = ScNoteUtil::CreateTempCaption( *pDoc, aDocPos, *pPage,
aUserText, aVisRect, bLeft );
if( pObject )
{
-aDrawView->SyncForGrid(pObject.get());
+aDrawView->SyncForGrid(pObject);
aRect = pObject->GetCurrentBoundRect();
// Need to include grid offset: GetCurrentBoundRect is
removing it
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 41 -
1 file changed, 9 insertions(+), 32 deletions(-)
New commits:
commit 268d019c4b05f37e99e1da85472dc9255f186a27
Author: Michael Meeks
Date: Wed Nov 29 21:22:51 2017 +
Writer page shadow - avoid scaling stored bitmaps at all.
Change-Id: Iad18da20c3ee03cbafd191ddd722f58bd45911be
Reviewed-on: https://gerrit.libreoffice.org/45538
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 776a5b492883..48534137c6c7 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5876,7 +5876,6 @@ bool SwPageFrame::IsLeftShadowNeeded() const
}
enum PaintArea {LEFT, RIGHT, TOP, BOTTOM};
-#define BORDER_TILE_SIZE 512
/// Wrapper around pOut->DrawBitmapEx.
static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point&
aPoint, const Size& aSize, const BitmapEx& rBitmapEx, PaintArea eArea)
@@ -5898,24 +5897,14 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext
*pOut, const Point& aPoin
pOut->SetLineColor();
pOut->DrawRect(pOut->PixelToLogic(aRect));
-// Tiled render if necessary
-tools::Rectangle aComplete(aPoint, aSize);
-Size aTileSize(BORDER_TILE_SIZE, BORDER_TILE_SIZE);
-
-long iterX = eArea != RIGHT && eArea != LEFT ? BORDER_TILE_SIZE : 0;
-long iterY = eArea == RIGHT || eArea == LEFT ? BORDER_TILE_SIZE : 0;
-
-for (tools::Rectangle aTile = tools::Rectangle(aPoint, aTileSize); true;
aTile.Move(iterX, iterY))
-{
-tools::Rectangle aRender = aComplete.GetIntersection(aTile);
-if (aRender.IsEmpty())
-break;
-pOut->DrawBitmapEx(pOut->PixelToLogic(aRender.TopLeft()),
- pOut->PixelToLogic(aRender.GetSize()),
- Point(0, 0), aRender.GetSize(),
- rBitmapEx);
-}
+Size aOutSize = pOut->PixelToLogic(aSize);
+Point aOutPoint = pOut->PixelToLogic(aPoint);
+pOut->DrawTransformedBitmapEx(
+basegfx::utils::createScaleTranslateB2DHomMatrix(
+aOutSize.Width(), aOutSize.Height(),
+aOutPoint.X(), aOutPoint.Y()),
+rBitmapEx);
}
/**
@@ -6027,9 +6016,6 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext
*pOut, const Point& aPoin
{
const long nWidth = aPageRightShadow.GetSizePixel().Width();
const long nHeight = aPagePxRect.Height() - 2 * (mnShadowPxWidth -
1);
-if (aPageRightShadow.GetSizePixel().Height() < BORDER_TILE_SIZE)
-aPageRightShadow.Scale(Size(nWidth, BORDER_TILE_SIZE),
BmpScaleFlag::Fast);
-
lcl_paintBitmapExToRect(pOut,
Point(aPaintRect.Right() + mnShadowPxWidth,
aPagePxRect.Top() + mnShadowPxWidth - 1),
Size(nWidth, nHeight),
@@ -6048,9 +6034,6 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext
*pOut, const Point& aPoin
{
const long nWidth = aPageLeftShadow.GetSizePixel().Width();
const long nHeight = aPagePxRect.Height() - 2 * (mnShadowPxWidth -
1);
-if (aPageLeftShadow.GetSizePixel().Height() < BORDER_TILE_SIZE)
-aPageLeftShadow.Scale(Size(nWidth, BORDER_TILE_SIZE),
BmpScaleFlag::Fast);
-
lcl_paintBitmapExToRect(pOut,
Point(lLeft, aPagePxRect.Top() + mnShadowPxWidth - 1),
Size(nWidth, nHeight),
@@ -6060,22 +6043,16 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext
*pOut, const Point& aPoin
// Bottom shadow
const long nBottomHeight = aPageBottomShadow.GetSizePixel().Height();
-if (aPageBottomShadow.GetSizePixel().Width() < BORDER_TILE_SIZE)
-aPageBottomShadow.Scale(Size(BORDER_TILE_SIZE, nBottomHeight),
BmpScaleFlag::Fast);
-
lcl_paintBitmapExToRect(pOut,
Point(aPaintRect.Left(), aPagePxRect.Bottom() + 2),
-Size(aPaintRect.Width(), nBottomHeight),
+Size(aPaintRect.Width() - 1, nBottomHeight),
aPageBottomShadow, BOTTOM);
// Top shadow
const long nTopHeight = aPageTopShadow.GetSizePixel().Height();
-if (aPageTopShadow.GetSizePixel().Width() < BORDER_TILE_SIZE)
-aPageTopShadow.Scale(Size(BORDER_TILE_SIZE, nTopHeight),
BmpScaleFlag::Fast);
-
lcl_paintBitmapExToRect(pOut,
Point(aPaintRect.Left(), aPagePxRect.Top() - mnShadowPxWidth),
-Size(aPaintRect.Width(), nTopHeight),
+Size(aPaintRect.Width() - 1, nTopHeight),
aPageTopShadow, TOP);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/svtools svtools/source
include/svtools/strings.hrc|1 +
svtools/source/dialogs/PlaceEditDialog.cxx |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f8d9ca3848b5d5224c2e4391eaf56940e93bcd01
Author: Andras Timar
Date: Thu Nov 30 13:51:03 2017 +0100
tdf#102160 make 'Other CMIS' string localizable
Change-Id: I58cf9eea05f15223e32ff1542b946c5962041e6c
Reviewed-on: https://gerrit.libreoffice.org/45578
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index ebda4b746df8..7580610f79bc 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -213,6 +213,7 @@
#define STR_SVT_ESTIMATED_SIZE_VEC
NC_("STR_SVT_ESTIMATED_SIZE_VEC", "The file size is %1 KB.")
#define STR_SVT_HOSTNC_("STR_SVT_HOST", "host")
#define STR_SVT_PORTNC_("STR_SVT_PORT", "port")
+#define STR_SVT_OTHER_CMIS NC_("STR_SVT_OTHER_CMIS",
"Other CMIS")
#define STR_SVT_PRNDLG_READYNC_("STR_SVT_PRNDLG_READY",
"Ready")
#define STR_SVT_PRNDLG_PAUSED NC_("STR_SVT_PRNDLG_PAUSED",
"Paused")
#define STR_SVT_PRNDLG_PENDING NC_("STR_SVT_PRNDLG_PENDING",
"Pending deletion")
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx
b/svtools/source/dialogs/PlaceEditDialog.cxx
index e1318d1aa5dc..a8a09a739485 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -185,7 +185,7 @@ void PlaceEditDialog::InitDetails( )
continue;
}
-nPos = m_pLBServerType->InsertEntry( aTypesNamesList[i], nPos );
+nPos = m_pLBServerType->InsertEntry(
aTypesNamesList[i].replaceFirst("Other CMIS", SvtResId(STR_SVT_OTHER_CMIS)),
nPos );
std::shared_ptr
xCmisDetails(std::make_shared(this, this, sUrl));
xCmisDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: min version of gtk3
Am 01.12.2017 um 13:43 schrieb Caolán McNamara: > There was a theming change in gtk3 3.20.0 and we support the old scheme > before that point and the new scheme after that point. > > Things would be a lot simpler if the min version of gtk3 was 3.20.0, is > there any distributions or individual devs for whom that would cause a > problem ? Ubuntu Xenial (16.04) has 3.18.9-1ubuntu3, which I backported for our trusty master tinderbox. I guess we won't deliver any 6+ version of LO for trusty and won't have problems with our next OS release. You want to drop Gtk+ < 3.20.0 support in or after 6.0? Jan-Marek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - fpicker/source
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 22
1 file changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 40b17fe38fc3c9a4d8ac9830ef2f59e930aac701
Author: Andras Timar
Date: Thu Nov 30 14:52:14 2017 +0100
tdf#89713 localize Windows file picker extensions
Change-Id: Ic56df1aeaeee1f027e8b11e8109dd1a3b3708697
Reviewed-on: https://gerrit.libreoffice.org/45586
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit c1fbc21a45859d3e8a082cf410898ccfcc124425)
Reviewed-on: https://gerrit.libreoffice.org/45635
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 430ac9d208b1..2b0fffe337d7 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -27,6 +27,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -549,7 +551,7 @@ void
VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
if ((nFeatures & FEATURE_VERSION) == FEATURE_VERSION)
{
-iCustom->StartVisualGroup (GROUP_VERSION, L"Version");
+iCustom->StartVisualGroup (GROUP_VERSION,
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_VERSION).replaceFirst("~","").getStr()));
iCustom->AddComboBox
(css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_VERSION);
iCustom->EndVisualGroup ();
iCustom->MakeProminent(GROUP_VERSION);
@@ -557,7 +559,7 @@ void
VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
if ((nFeatures & FEATURE_TEMPLATE) == FEATURE_TEMPLATE)
{
-iCustom->StartVisualGroup (GROUP_TEMPLATE, L"Template");
+iCustom->StartVisualGroup (GROUP_TEMPLATE,
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_TEMPLATES).replaceFirst("~","").getStr()));
iCustom->AddComboBox
(css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_TEMPLATE);
iCustom->EndVisualGroup ();
iCustom->MakeProminent(GROUP_TEMPLATE);
@@ -565,7 +567,7 @@ void
VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
if ((nFeatures & FEATURE_IMAGETEMPLATE) == FEATURE_IMAGETEMPLATE)
{
-iCustom->StartVisualGroup (GROUP_IMAGETEMPLATE, L"Style");
+iCustom->StartVisualGroup (GROUP_IMAGETEMPLATE,
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_IMAGE_TEMPLATE).replaceFirst("~","").getStr()));
iCustom->AddComboBox
(css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE);
iCustom->EndVisualGroup ();
iCustom->MakeProminent(GROUP_IMAGETEMPLATE);
@@ -577,42 +579,42 @@ void
VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
if ((nFeatures & FEATURE_AUTOEXTENSION) == FEATURE_AUTOEXTENSION)
{
nControlId =
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION;
-iCustom->AddCheckButton (nControlId, L"Auto Extension", true);
+iCustom->AddCheckButton (nControlId,
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_AUTO_EXTENSION).replaceFirst("~","").getStr()),
true);
setLabelToControl(iCustom, nControlId);
}
if ((nFeatures & FEATURE_PASSWORD) == FEATURE_PASSWORD)
{
nControlId =
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PASSWORD;
-iCustom->AddCheckButton (nControlId, L"Password", false);
+iCustom->AddCheckButton (nControlId,
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_PASSWORD).replaceFirst("~","").getStr()),
false);
setLabelToControl(iCustom, nControlId);
}
if ((nFeatures & FEATURE_READONLY) == FEATURE_READONLY)
{
nControlId =
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_READONLY;
-iCustom->AddCheckButton (nControlId, L"Readonly", false);
+iCustom->AddCheckButton (nControlId,
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_READONLY).replaceFirst("~","").getStr()),
false);
setLabelToControl(iCustom, nControlId);
}
if ((nFeatures & FEATURE_FILTEROPTIONS) == FEATURE_FILTEROPTIONS)
{
nControlId =
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS;
-iCustom->AddCheckButton (nControlId, L"Filter Options", false);
+iCustom->AddCheckButton (nControlId,
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_FILTER_OPTIONS).replaceFirst("~","").getStr()),
false);
setLabelToControl(iCustom, nControlId);
}
if ((nFeatures & FEATURE_LINK) == FEATURE_LINK)
{
nControlId =
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK;
-iCustom->AddCheckButton (nControlId, L"Link", false);
+iCustom->AddCheckButton (nControlId,
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_INSERT_AS_LINK).replaceFirst("~","").getStr()),
false);
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - extras/source
extras/source/misc_config/autotbl.fmt |binary 1 file changed New commits: commit 0b22d3e8b34c14a01d97057478d18d4209356cb3 Author: Eike Rathke Date: Fri Dec 1 13:39:14 2017 +0100 tdf#101349 patch new resource IDs into autotbl.fmt 0x10 to 0x19, see commit b56cd8050137ed4555a5aca50d4949d941e1f132 Date: Wed Nov 29 23:54:26 2017 +0100 Prepare for translated new AutoFormat Table Styles, tdf#101349 Change-Id: If4424336f74a76a8dff48c7bb502ac4f34dfa4f6 (cherry picked from commit 86df47658a277521f51a1e22e92dcc632124745c) Reviewed-on: https://gerrit.libreoffice.org/45657 Reviewed-by: Eike Rathke Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/misc_config/autotbl.fmt b/extras/source/misc_config/autotbl.fmt index 395e2ac33114..dbdb767dde82 100644 Binary files a/extras/source/misc_config/autotbl.fmt and b/extras/source/misc_config/autotbl.fmt differ ___ 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' - extras/source
extras/source/misc_config/autotbl.fmt |binary 1 file changed New commits: commit 5370989dc654bd99337e1dad534c6a38f42c9027 Author: heiko tietze Date: Wed Nov 29 19:54:11 2017 +0100 tdf#101349 Rework of table styles for use in Calc All table styles formatted with General number format except first row/column as text; financial defined with Currency Change-Id: Ib4085230b10d398838b42a449e1166780251f9b4 Reviewed-on: https://gerrit.libreoffice.org/45523 Reviewed-by: Heiko Tietze Tested-by: Heiko Tietze Tested-by: Jenkins Reviewed-by: Eike Rathke Tested-by: Eike Rathke (cherry picked from commit 7d12aa833aec8e9a5c453104a23bff70cec54a45) Reviewed-on: https://gerrit.libreoffice.org/45650 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/misc_config/autotbl.fmt b/extras/source/misc_config/autotbl.fmt index 9d4ce085c146..395e2ac33114 100644 Binary files a/extras/source/misc_config/autotbl.fmt and b/extras/source/misc_config/autotbl.fmt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3655 +--- 1 file changed, 2133 insertions(+), 1522 deletions(-) New commits: commit 4cd6f40d3f5844a40de5acb0ba7ede29c19a2af5 Author: Christian Lohmaier Date: Fri Dec 1 14:26:50 2017 +0100 update credits Change-Id: I255926c8df8969e3b5346675175a403bbd0ce317 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e1fb0a3c00f9..d031023aa74c 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ 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: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:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is: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: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:xmlns: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.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.4.2.2$Linux_X86_64 LibreOffice_project/22b09f6418e8c2d508a9eaf86b2399209b0990f42012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.4.3.2$Linux_X86_64 LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 647 + 658 501 41965 21327 @@ -16,9 +16,9 @@ 3649 3471 501 - 647 + 658 42464 - 21973 + 21983 0 0 false @@ -71,7 +71,7 @@ false false true - 7209331 + 7254539 false false false @@ -317,21 +317,24 @@ - + - + - + - + + + + - + @@ -395,13 +398,13 @@ - + - + - + @@ -412,7 +415,7 @@ - + @@ -1044,14 +1047,14 @@ Credits -1290 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-11-02 22:13:32. +1296 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-11-29 15:24:50. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 @@ -1071,10 +1074,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 22889Joined: 2000-10-10 + Caolán McNamaraCommits: 23112Joined: 2000-10-10 - Stephan BergmannCommits: 15196Joined: 2000-10-04 + Stephan BergmannCommits: 15327Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1082,35 +1085,35 @@ - *Noel GrandinCommits: 8297Joined: 2011-12-12 + *Noel GrandinCommits: 8388Joined: 2011-12-12 - Tor LillqvistCommits: 8001Joined: 2010-03-23 + Tor LillqvistCommits: 8068Joined: 2010-03-23 - Miklos VajnaCommits: 6605Joined: 2010-07-29 + Miklos VajnaCommits: 6676Joined: 2010-07-29 - Mich
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3655 +--- 1 file changed, 2133 insertions(+), 1522 deletions(-) New commits: commit a7d05b67775fac5c6d2d92a2a37871860aa630c0 Author: Christian Lohmaier Date: Fri Dec 1 14:26:50 2017 +0100 update credits Change-Id: I255926c8df8969e3b5346675175a403bbd0ce317 (cherry picked from commit 4cd6f40d3f5844a40de5acb0ba7ede29c19a2af5) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e1fb0a3c00f9..d031023aa74c 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ 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: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:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is: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: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:xmlns: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.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.4.2.2$Linux_X86_64 LibreOffice_project/22b09f6418e8c2d508a9eaf86b2399209b0990f42012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.4.3.2$Linux_X86_64 LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 647 + 658 501 41965 21327 @@ -16,9 +16,9 @@ 3649 3471 501 - 647 + 658 42464 - 21973 + 21983 0 0 false @@ -71,7 +71,7 @@ false false true - 7209331 + 7254539 false false false @@ -317,21 +317,24 @@ - + - + - + - + + + + - + @@ -395,13 +398,13 @@ - + - + - + @@ -412,7 +415,7 @@ - + @@ -1044,14 +1047,14 @@ Credits -1290 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-11-02 22:13:32. +1296 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-11-29 15:24:50. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 @@ -1071,10 +1074,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 22889Joined: 2000-10-10 + Caolán McNamaraCommits: 23112Joined: 2000-10-10 - Stephan BergmannCommits: 15196Joined: 2000-10-04 + Stephan BergmannCommits: 15327Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1082,35 +1085,35 @@ - *Noel GrandinCommits: 8297Joined: 2011-12-12 + *Noel GrandinCommits: 8388Joined: 2011-12-12 - Tor LillqvistCommits: 8001Joined: 2010-03-23 + Tor LillqvistCommits: 8068Joined: 2010-03-23 - Miklos VajnaCommits: 6605Joined: 2010-07-29 + M
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3655 +--- 1 file changed, 2133 insertions(+), 1522 deletions(-) New commits: commit ba0dad96cdaa64d1a0f9ad2f0256cd72ca9cb9f4 Author: Christian Lohmaier Date: Fri Dec 1 14:26:50 2017 +0100 update credits Change-Id: I255926c8df8969e3b5346675175a403bbd0ce317 (cherry picked from commit 4cd6f40d3f5844a40de5acb0ba7ede29c19a2af5) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e1fb0a3c00f9..d031023aa74c 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ 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: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:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is: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: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:xmlns: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.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.4.2.2$Linux_X86_64 LibreOffice_project/22b09f6418e8c2d508a9eaf86b2399209b0990f42012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.4.3.2$Linux_X86_64 LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 647 + 658 501 41965 21327 @@ -16,9 +16,9 @@ 3649 3471 501 - 647 + 658 42464 - 21973 + 21983 0 0 false @@ -71,7 +71,7 @@ false false true - 7209331 + 7254539 false false false @@ -317,21 +317,24 @@ - + - + - + - + + + + - + @@ -395,13 +398,13 @@ - + - + - + @@ -412,7 +415,7 @@ - + @@ -1044,14 +1047,14 @@ Credits -1290 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-11-02 22:13:32. +1296 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-11-29 15:24:50. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 @@ -1071,10 +1074,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 22889Joined: 2000-10-10 + Caolán McNamaraCommits: 23112Joined: 2000-10-10 - Stephan BergmannCommits: 15196Joined: 2000-10-04 + Stephan BergmannCommits: 15327Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1082,35 +1085,35 @@ - *Noel GrandinCommits: 8297Joined: 2011-12-12 + *Noel GrandinCommits: 8388Joined: 2011-12-12 - Tor LillqvistCommits: 8001Joined: 2010-03-23 + Tor LillqvistCommits: 8068Joined: 2010-03-23 - Miklos VajnaCommits: 6605Joined: 2010-07-29 + M
Re: min version of gtk3
On Fri, 2017-12-01 at 14:25 +0100, Jan-Marek Glogowski wrote: > Am 01.12.2017 um 13:43 schrieb Caolán McNamara: > > There was a theming change in gtk3 3.20.0 and we support the old > > scheme before that point and the new scheme after that point. > > > > Things would be a lot simpler if the min version of gtk3 was > > 3.20.0, is there any distributions or individual devs for whom that > > would cause a problem ? > > Ubuntu Xenial (16.04) has 3.18.9-1ubuntu3, which I backported for our > trusty master tinderbox. > > I guess we won't deliver any 6+ version of LO for trusty and won't > have problems with our next OS release. > > You want to drop Gtk+ < 3.20.0 support in or after 6.0? For me I was thinking for > 6.0, scarabeus (for suse) was wondering additionally about 6.0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - extras/source
extras/source/autocorr/lang/en-GB/DocumentList.xml | 16 extras/source/autocorr/lang/hr/DocumentList.xml|6 extras/source/autocorr/lang/ru/DocumentList.xml|2 extras/source/autocorr/lang/zh-TW/DocumentList.xml | 1042 ++--- 4 files changed, 917 insertions(+), 149 deletions(-) New commits: commit 2ce7b8c097bdce78f99fe9e38f8da00ff04ac844 Author: Christian Lohmaier Date: Fri Dec 1 14:37:26 2017 +0100 update emoji autocorrect files from po-files Change-Id: I52d2e8c9ea2db485347ec94c4c7ea43b4e64807b diff --git a/extras/source/autocorr/lang/en-GB/DocumentList.xml b/extras/source/autocorr/lang/en-GB/DocumentList.xml index bc13c47aafd2..6a7cf92842bd 100644 --- a/extras/source/autocorr/lang/en-GB/DocumentList.xml +++ b/extras/source/autocorr/lang/en-GB/DocumentList.xml @@ -825,35 +825,47 @@ + + + + + + + + + + + + @@ -952,10 +964,10 @@ + - @@ -1016,7 +1028,6 @@ - @@ -1104,6 +1115,7 @@ + diff --git a/extras/source/autocorr/lang/hr/DocumentList.xml b/extras/source/autocorr/lang/hr/DocumentList.xml index 8a520b497948..4b8e2b43d1ec 100644 --- a/extras/source/autocorr/lang/hr/DocumentList.xml +++ b/extras/source/autocorr/lang/hr/DocumentList.xml @@ -19,6 +19,8 @@ + + @@ -74,8 +76,6 @@ - - @@ -845,9 +845,9 @@ - + diff --git a/extras/source/autocorr/lang/ru/DocumentList.xml b/extras/source/autocorr/lang/ru/DocumentList.xml index 7612490be284..024d15ceb8f7 100644 --- a/extras/source/autocorr/lang/ru/DocumentList.xml +++ b/extras/source/autocorr/lang/ru/DocumentList.xml @@ -1037,7 +1037,6 @@ - @@ -1054,6 +1053,7 @@ + diff --git a/extras/source/autocorr/lang/zh-TW/DocumentList.xml b/extras/source/autocorr/lang/zh-TW/DocumentList.xml index 84a01f9cafa2..0d879e27b0fc 100644 --- a/extras/source/autocorr/lang/zh-TW/DocumentList.xml +++ b/extras/source/autocorr/lang/zh-TW/DocumentList.xml @@ -811,23 +811,80 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -835,21 +892,31 @@ + + - + + + + + + + + + @@ -859,29 +926,61 @@ + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + @@ -889,318 +988,975 @@ - + + + + + + + + + + + + + + + + - + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + - + + - + + - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + - + + + + + + + + - - - - - + + + + + + + + + + + + + + + - + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - + + + + + + + - + + + + + + + + + + + + - + + - + + + + + + + + + - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + - + + + + + + - + + - + + + - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - + + +
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 0c4ec6ad42e2197fbea2aa5f64bdf0e9e6393107
Author: Caolán McNamara
Date: Fri Dec 1 13:37:30 2017 +
we already don't run gtk3 if < 3.14
Change-Id: I6bc3cacb12fef6dd607f6c38612c270ecf845221
Reviewed-on: https://gerrit.libreoffice.org/45664
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index f37ed7cb93dd..7b4d9da569fc 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2116,8 +2116,7 @@ namespace
GtkStateFlags CHECKED()
{
#if GTK_CHECK_VERSION(3,14,0)
-if (gtk_check_version(3, 14, 0) == nullptr)
-return GTK_STATE_FLAG_CHECKED;
+return GTK_STATE_FLAG_CHECKED;
#endif
return GTK_STATE_FLAG_ACTIVE;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [CREATE] freieFarbe/freeColour HLC colour system to be accepted as a national standard for "Open Colour Communication" in Germany
Hi! On Fri, Dec 1, 2017 at 10:15 AM, Alexandre Prokoudine wrote: > > > 1 дек. 2017 г. 6:36 пользователь Christoph Schäfer написал: > > We're currently cooperating with ink manufacturers in Germany and > Switzerland to establish ink formulas for HLC colours that cannot be > reproduced in CMYK, aka as spot colours > > > Since you already have a prototype, are you talking about metallic inks? > > > This is a real colour system and not just a colour collection like Pantone > or RAL. > > > How do you define a real color system? > > Most importantly, it is a free and open alternative to Pantone & co, which > is not only better, > > > Better in what way? Though I still think it is a very cool news, I actually join Alexandre's questions above. You seem to think that your color system is better and "real" because it is based off sorted numerical values, with meaning in color science (LCH). Yet the real power of Pantone is that they were not born out of numbers but from actual physical inks (the 18 basic Pantone colors). So with the basic colors being "approved" by the company, getting any color is a matter of precisely following a recipe. This ensures that *theoretically* you should always get the same color at every printshop. This is based off real life and somehow meets expectations of people. I'm not saying that Pantone is great. They have tried for years to copyright colors and stuff. They are just trying to squeeze money because that's what most companies do. Colors should indeed be managed by a non-profit with the goal to improve accuracy and reproducibility. Yet saying that such companies don't have a real system is wrong IMO. Somehow people who want to print may not care that much about numbers, sorting and stuff. They mostly want reproducible colors. And from the printshop point of view, getting any spot color from the catalog is just about following a mixing recipe accurately, so it's easy and not too bothersome. So my question is: from your LCH representation, can you ensure the creation of an ink so that 2 unrelated people could create the same color? I'm not a color expert so I may be missing something. But physical colors can be measured and get a LCH representation. But here we need to do the opposite. Can it be done accurately and easily? Jehan P.S.: I believe I met you in some summit in Berlin a few years ago and raised similar concerns. > At what stage of work within DIN will ink formulas be published one way or > another? > > Alex > > ___ > CREATE mailing list > cre...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/create > -- ZeMarmot open animation film http://film.zemarmot.net Patreon: https://patreon.com/zemarmot Tipeee: https://www.tipeee.com/zemarmot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sc/source
Rebased ref, commits from common ancestor:
commit 23fa3482d9506544f5f345f38000267798ac1231
Author: Vasily Melenchuk
Date: Wed Nov 8 16:53:12 2017 +0300
tdf#113901: Grid offset for notes and temporary notes modified.
Older calculations for gird offset were incomplete: are not used for notes
(only for temporary ones on mouse over), were not taken into account during
temporary note disappear and contain duplicated code from
ScDrawView::SyncForGrid()
New approach elminate described above problems.
Reviewed-on: https://gerrit.libreoffice.org/44464
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
Conflicts:
sc/source/ui/docshell/docfunc.cxx
sc/source/ui/inc/notemark.hxx
sc/source/ui/view/notemark.cxx
Change-Id: I5f92971e156f37f052b4e6d47b2f16480bdbaf7e
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index c42f04e1bb31..4065a8ddb2cf 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -27,6 +27,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -1224,6 +1226,7 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool
bShow )
if (rDoc.IsStreamValid(rPos.Tab()))
rDoc.SetStreamValid(rPos.Tab(), false);
+
ScDocShell::GetViewData()->GetScDrawView()->SyncForGrid(pNote->GetCaption());
rDocShell.SetDocumentModified();
return true;
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index b6f8f8d70d00..60d599794f01 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -27,6 +27,7 @@
class SdrModel;
class SdrObject;
+class ScDrawView;
class ScNoteMarker
{
@@ -45,6 +46,7 @@ private:
boolbByKeyboard;
Rectangle aRect;
+ScDrawView* aDrawView;
SdrModel* pModel;
SdrObject* pObject;
boolbVisible;
@@ -54,7 +56,7 @@ private:
public:
ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight,
vcl::Window* pBottom, vcl::Window* pDiagonal,
ScDocument* pD, ScAddress aPos, const
OUString& rUser,
-const MapMode& rMap, bool bLeftEdge, bool
bForce, bool bKeyboard );
+const MapMode& rMap, bool bLeftEdge, bool
bForce, bool bKeyboard, ScDrawView * pDrawView );
~ScNoteMarker();
voidDraw();
@@ -62,7 +64,6 @@ public:
const ScAddress& GetDocPos() const { return aDocPos; }
boolIsByKeyboard() const{ return bByKeyboard; }
-voidSetGridOff( const Point& rOff ) { aGridOff = rOff; }
};
#endif
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 2d853957135f..6c460d83300e 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -208,26 +208,7 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW
nPosY, bool bKeyboard )
mpNoteMarker.reset(new ScNoteMarker(pLeft, pRight, pBottom,
pDiagonal,
pDoc, aCellPos, aTrackText,
-aMapMode, bLeftEdge, bFast,
bKeyboard));
-if ( pViewData->GetScDrawView() )
-{
-// get position for aCellPos
-// get draw position in hmm for aCellPos
-Point aOldPos( pDoc->GetColOffset( aCellPos.Col(),
aCellPos.Tab() ), pDoc->GetRowOffset( aCellPos.Row(), aCellPos.Tab() ) );
-aOldPos.X() = sc::TwipsToHMM( aOldPos.X() );
-aOldPos.Y() = sc::TwipsToHMM( aOldPos.Y() );
-// get screen pos in hmm for aCellPos
-// and equiv screen pos
-Point aScreenPos = pViewData->GetScrPos( aCellPos.Col(),
aCellPos.Row(), eWhich, true );
-MapMode aDrawMode = GetDrawMapMode();
-Point aCurPosHmm = PixelToLogic(aScreenPos, aDrawMode );
-Point aGridOff = aCurPosHmm -aOldPos;
-// fdo#63323 fix the X Position for the showing comment when
-// the mouse over the cell when the sheet are RTL
-if ( pDoc->IsNegativePage(nTab))
-aGridOff.setX(aCurPosHmm.getX() + aOldPos.getX());
-mpNoteMarker->SetGridOff( aGridOff );
-}
+aMapMode, bLeftEdge, bFast,
bKeyboard, pViewData->GetScDrawView()));
}
bDone = true; // something is shown (old or new)
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index c9d12e421c24..ac72593b1477 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -30,13 +30,14 @@
#include "notemark.hxx"
#include "document.hxx"
#include "postit.hxx"
+#include "drawview.hxx"
#define SC_NOTEMARK_TIME
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gtkinst.cxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 1d44bcf18712d899f9e53676b9bc54ddc88147eb
Author: Caolán McNamara
Date: Fri Dec 1 14:22:27 2017 +
we already don't run with < 3.14
Change-Id: I07adad73285bfd8550cc29ff0145cfc971cc7c71
Reviewed-on: https://gerrit.libreoffice.org/45671
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index 62b02a36a33f..9896aa5bdbad 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -87,13 +87,6 @@ extern "C"
g_warning("require a newer gtk than 3.%d for theme expectations",
gtk_minor_version);
return nullptr;
}
-
-const gchar* pVersion = gtk_check_version( 3, 2, 0 );
-if( pVersion )
-{
-SAL_WARN("vcl.gtk", "gtk version conflict: " << pVersion);
-return nullptr;
-}
#endif
GtkYieldMutex *pYieldMutex;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
osx 10.13 build failure
Hi, Today I updated my mac build to 4cd6f40d3f5844a40de5acb0ba7ede29c19a2af5 and now I get this error when I try to build it ( even after a make clean) -> https://pastebin.com/wMtpS6Q4 My autogen.input is --without-java --disable-csv-tests --disable-firebird-sdbc and I use lode. Anybody else has the same problem? Cheers -- Xisco Faulí Libreoffice QA Team IRC: x1sc0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 7 commits - comphelper/Library_comphelper.mk comphelper/source filter/source include/comphelper include/xmloff svx/sour
comphelper/Library_comphelper.mk|1
comphelper/source/misc/graphicmimetype.cxx | 105
filter/source/xslt/odf2xhtml/export/common/body.xsl | 52 +
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 50 +
include/comphelper/graphicmimetype.hxx | 35 ++
include/xmloff/xmlexp.hxx |2
svx/source/svdraw/svdograf.cxx |5
sw/CppunitTest_sw_fodfexport.mk | 57 ++
sw/Module_sw.mk |1
sw/qa/extras/fodfexport/data/tdf113696.odt |binary
sw/qa/extras/fodfexport/fodfexport.cxx | 44
sw/qa/extras/inc/swmodeltestbase.hxx| 11 ++
sw/qa/extras/odfexport/data/image-mimetype.odt |binary
sw/qa/extras/odfexport/odfexport.cxx| 10 +
xmloff/source/core/xmlexp.cxx | 18 +++
xmloff/source/draw/shapeexport.cxx | 26
xmloff/source/text/txtparae.cxx | 10 +
17 files changed, 378 insertions(+), 49 deletions(-)
New commits:
commit a62d4111fd8f740612f4fd4a7ffabb72776c929a
Author: Samuel Mehrbrodt
Date: Thu Nov 30 10:28:33 2017 +0100
Unit test for tdf#113696
Change-Id: I566cd5d38cf86547b664f0ae9a1c2f8c37edc0ca
Reviewed-on: https://gerrit.libreoffice.org/45560
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/CppunitTest_sw_fodfexport.mk b/sw/CppunitTest_sw_fodfexport.mk
new file mode 100644
index ..4703b85435f7
--- /dev/null
+++ b/sw/CppunitTest_sw_fodfexport.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_fodfexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_fodfexport, \
+ sw/qa/extras/fodfexport/fodfexport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_fodfexport, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ sw \
+ test \
+ tl \
+ unotest \
+ utl \
+ vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_fodfexport,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_fodfexport,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_fodfexport))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_fodfexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_fodfexport))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_fodfexport,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_fodfexport,\
+ officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_fodfexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index f4371dfa20cf..a9de6cd82943 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sw_uwriter) \
CppunitTest_sw_docbookexport \
+CppunitTest_sw_fodfexport \
CppunitTest_sw_htmlexport \
CppunitTest_sw_htmlimport \
CppunitTest_sw_macros_test \
diff --git a/sw/qa/extras/fodfexport/data/tdf113696.odt
b/sw/qa/extras/fodfexport/data/tdf113696.odt
new file mode 100644
index ..03e0612a3d14
Binary files /dev/null and b/sw/qa/extras/fodfexport/data/tdf113696.odt differ
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx
b/sw/qa/extras/fodfexport/fodfexport.cxx
new file mode 100644
index ..6cd00b49ba47
--- /dev/null
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/extras/fodfexport/data/", "OpenDocument Text
Flat XML")
+{
+}
+
+/**
+ * Blacklist handling
+ */
+bool mustTestImportOf(const char* filename) const override
+{
+// Only test import of .fodt document
+return OString(filename).endsWith("
[Libreoffice-commits] core.git: Branch 'feature/SwFrameBorder' - sw/source
sw/source/core/layout/paintfrm.cxx | 405 -
1 file changed, 228 insertions(+), 177 deletions(-)
New commits:
commit d463f51086814982d35542bee904efa254dd2d94
Author: Armin Le Grand
Date: Fri Dec 1 16:08:10 2017 +0100
SwFrameBorder: Replaced BorderGeometry creation partially
Replaced BorderGeometry creation in SwFrame::PaintSwFrameShadowAndBorder,
moved to tooling method CreateBorderLinePrimitivesForRectangle. Preparing
using that tooling method also in PaintCharacterBorder to make borders
work in TextPassages, too
Change-Id: I73fe3d04597bd0e6dc83ac719548a44d0637b622
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index d1735d9d98b9..df5d5d3aeda7 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4752,143 +4752,6 @@ static void lcl_MakeBorderLine(SwRect const& rRect,
properties.pBLines->AddBorderLine(aLine);
}
-/**
- * OD 19.05.2003 #109667# - merge and
- * into new method
- */
-static void lcl_PaintLeftRightLine( const bool _bLeft,
- const SwFrame& _rFrame,
- const SwRect& _rOutRect,
- const SwBorderAttrs& _rAttrs,
- const SwRectFn&_rRectFn,
- SwPaintProperties& properties)
-{
-const SvxBoxItem& rBox = _rAttrs.GetBox();
-const bool bR2L = _rFrame.IsCellFrame() && _rFrame.IsRightToLeft();
-const SvxBorderLine* pLeftRightBorder = nullptr;
-const SvxBorderLine* pTopBorder = rBox.GetTop();
-const SvxBorderLine* pBottomBorder = rBox.GetBottom();
-
-if ( _bLeft )
-{
-pLeftRightBorder = bR2L ? rBox.GetRight() : rBox.GetLeft();
-}
-else
-{
-pLeftRightBorder = bR2L ? rBox.GetLeft() : rBox.GetRight();
-}
-
-if ( !pLeftRightBorder )
-{
-return;
-}
-
-SwRect aRect( _rOutRect );
-if ( _bLeft )
-{
-(aRect.*_rRectFn->fnAddRight)( ::lcl_AlignWidth( lcl_GetLineWidth(
pLeftRightBorder ), properties ) -
- (aRect.*_rRectFn->fnGetWidth)() );
-
-// Shift the left border to the left.
-Point aCurPos = aRect.Pos();
-const sal_uInt16 nOffset = pLeftRightBorder->GetDistance();
-aCurPos.X() -= nOffset;
-aCurPos.Y() -= nOffset;
-aRect.Pos(aCurPos);
-Size aCurSize = aRect.SSize();
-aCurSize.Height() += nOffset * 2;
-aRect.SSize(aCurSize);
-}
-else
-{
-(aRect.*_rRectFn->fnSubLeft)( ::lcl_AlignWidth( lcl_GetLineWidth(
pLeftRightBorder ), properties ) -
- (aRect.*_rRectFn->fnGetWidth)() );
-}
-
-if ( _rFrame.IsContentFrame() )
-{
-::lcl_ExtendLeftAndRight( aRect, _rFrame, _rAttrs, _rRectFn );
-
-// No Top / bottom borders for joint borders
-if ( _rAttrs.JoinedWithPrev( _rFrame ) ) pTopBorder = nullptr;
-if ( _rAttrs.JoinedWithNext( _rFrame ) ) pBottomBorder = nullptr;
-}
-
-if ( !pLeftRightBorder->GetInWidth() )
-{
-// OD 06.05.2003 #107169# - init boolean indicating printer output
device.
-const bool bPrtOutputDev =
-( OUTDEV_PRINTER ==
properties.pSGlobalShell->GetOut()->GetOutDevType() );
-
-// OD 06.05.2003 #107169# - add 6th parameter
-::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrame, _rRectFn,
bPrtOutputDev, properties);
-}
-
-if ( lcl_GetLineWidth( pLeftRightBorder ) > 0 )
-{
-lcl_MakeBorderLine(
-aRect, true, _bLeft, aRect.Height() > aRect.Width(),
-*pLeftRightBorder, pTopBorder, pBottomBorder, properties);
-}
-}
-
-/**
- * OD 19.05.2003 #109667# - merge and
- * into
- */
-static void lcl_PaintTopBottomLine( const bool _bTop,
- const SwRect& _rOutRect,
- const SwBorderAttrs& _rAttrs,
- const SwRectFn&_rRectFn,
- SwPaintProperties& properties)
-{
-const SvxBoxItem& rBox = _rAttrs.GetBox();
-const SvxBorderLine* pTopBottomBorder = nullptr;
-
-if ( _bTop )
-{
-pTopBottomBorder = rBox.GetTop();
-}
-else
-{
-pTopBottomBorder = rBox.GetBottom();
-}
-
-if ( !pTopBottomBorder )
-{
-return;
-}
-
-SwRect aRect( _rOutRect );
-if ( _bTop )
-{
-(aRect.*_rRectFn->fnAddBottom)( ::lcl_AlignHeight( lcl_GetLineWidth(
pTopBottomBorder ), properties ) -
-(aRect.*_rRectFn->fnGetHeight)() );
-
-// Push the top border up a bit.
-const sal_uInt16 nOffset = pTopBottomBorder->GetDistance();
-Point aCurPos = aRect.Pos();
-aCurPos.X() -= nOffset;
-aCurPos.Y() -= nOffset;
-aRect.Pos(aCurPos)
Re: osx 10.13 build failure
Do you have some weird Strings.hrc file somewhere that gets included instead of the correct strings.hrc? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - compilerplugins/clang solenv/clang-format
solenv/clang-format/blacklist |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit faf10d47142d6dde25b6d6c5f7994340075ab7ac Author: Stephan Bergmann Date: Thu Nov 30 08:43:10 2017 +0100 Move loplugin:fpcomparison to store/ ...after bc4e8de8eea1ccebda479c8e2db2f3c6dfff60d2 "Silence new loplugin:fpcomparison for now": > Nov 30 08:33:16 noelgrandin, thoughts on whether fpcomparison is actually worth it, seeing the lng blacklist there? > Nov 30 08:34:11 sberg, that's wasn't my idea, can't remember who came up with it. vmiklos was that you? > Nov 30 08:34:36 sberg, the original commit message was "Find code that compares floating point values with == or != > Nov 30 08:34:36 It should rather use rtl::math::approxEqual" > Nov 30 08:34:45 so in theory the replacement should be fairly manual > Nov 30 08:34:48 i don't think so :) > Nov 30 08:35:15 might have been moggi, but he's not around so just disable it > Nov 30 08:36:19 noelgrandin, yeah, in theory; in practice, I guess there's also cases where x==1.0 is what you want exactly (given x tends not to be a computed value after all, but some literal that's being passed around) > Nov 30 08:36:33 noelgrandin, yeah, I'll disable it then Change-Id: I35f5328efa0ec02d9be837c12efab2b03a3dae52 Reviewed-on: https://gerrit.libreoffice.org/45550 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann (cherry picked from commit bf59f89d8818f62b03acaf7820e1a9560a388252) Reviewed-on: https://gerrit.libreoffice.org/45658 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/compilerplugins/clang/fpcomparison.cxx b/compilerplugins/clang/store/fpcomparison.cxx similarity index 100% rename from compilerplugins/clang/fpcomparison.cxx rename to compilerplugins/clang/store/fpcomparison.cxx diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index c8709b81d8c3..e89ca821ba24 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -1741,7 +1741,6 @@ compilerplugins/clang/faileddyncast.cxx compilerplugins/clang/finalclasses.cxx compilerplugins/clang/finalprotected.cxx compilerplugins/clang/flatten.cxx -compilerplugins/clang/fpcomparison.cxx compilerplugins/clang/fragiledestructor.cxx compilerplugins/clang/functionaddress.hxx compilerplugins/clang/getimplementationname.cxx @@ -1800,6 +1799,7 @@ compilerplugins/clang/store/defaultparams.cxx compilerplugins/clang/store/deletedspecial.cxx compilerplugins/clang/store/derivedclass.cxx compilerplugins/clang/store/findoncontainer.cxx +compilerplugins/clang/store/fpcomparison.cxx compilerplugins/clang/store/lclstaticfix.cxx compilerplugins/clang/store/lclstaticfix.hxx compilerplugins/clang/store/manualrefcount.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/sanitize-blacklist.txt
bin/sanitize-blacklist.txt |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6af2cd34404ef6b19fb218931de0b42a2731c57f Author: Caolán McNamara Date: Fri Dec 1 15:20:26 2017 + ofz#4480 silence Bad-cast Change-Id: I7417d36e532fbe315dab1d3cbd070472bc16ed6a Reviewed-on: https://gerrit.libreoffice.org/45683 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/bin/sanitize-blacklist.txt b/bin/sanitize-blacklist.txt index 7c97ff4abd51..eb7b4088da77 100644 --- a/bin/sanitize-blacklist.txt +++ b/bin/sanitize-blacklist.txt @@ -3,3 +3,5 @@ src:*/sc/source/core/tool/interpr1.cxx src:*/sc/source/core/tool/interpr2.cxx src:*/scaddins/source/analysis/analysis.cxx src:*/scaddins/source/analysis/financial.cxx +[vptr] +fun:_ZN4cppu14throwExceptionERKN3com3sun4star3uno3AnyE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - external/libepubgen writerperfect/qa writerperfect/source writerperfect/uiconfig
external/libepubgen/libepubgen-epub3.patch.1 | 304 +++
writerperfect/qa/uitest/epubexport/epubexport.py | 16 +
writerperfect/qa/unit/EPUBExportTest.cxx | 16 +
writerperfect/source/writer/EPUBExportDialog.cxx | 24 +
writerperfect/source/writer/EPUBExportDialog.hxx |2
writerperfect/source/writer/EPUBExportFilter.cxx | 15 +
writerperfect/source/writer/EPUBExportFilter.hxx |2
writerperfect/uiconfig/ui/exportepub.ui | 57
8 files changed, 433 insertions(+), 3 deletions(-)
New commits:
commit 913fbc822c0f0e285cd0dc3f919a2fb43a94c7ad
Author: Miklos Vajna
Date: Fri Dec 1 10:55:09 2017 +0100
EPUB export: add UI to request fixed layout
Sets the EPUBLayoutMethod filter data key at UNO level.
Change-Id: Ia07029bd83fec02e98cb6a3cc2bfea2ab742d769
Reviewed-on: https://gerrit.libreoffice.org/45644
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/writerperfect/qa/uitest/epubexport/epubexport.py
b/writerperfect/qa/uitest/epubexport/epubexport.py
index 301f090e3362..b8e7d3f52fd9 100644
--- a/writerperfect/qa/uitest/epubexport/epubexport.py
+++ b/writerperfect/qa/uitest/epubexport/epubexport.py
@@ -97,6 +97,22 @@ class EPUBExportTest(UITestCase):
mediaDir = [i.Value for i in filterData if i.Name == "RVNGMediaDir"][0]
self.assertEqual("file:///foo/bar", mediaDir)
+def testFixedLayout(self):
+def handleDialog(dialog):
+# Select the second entry to request fixed, not reflowable layout.
+dialog.getChild("layoutlb").executeAction("SELECT",
mkPropertyValues({"POS": "1"}))
+dialog.getChild("ok").executeAction("CLICK", tuple())
+
+uiComponent =
self.ui_test._xContext.ServiceManager.createInstanceWithContext("com.sun.star.comp.Writer.EPUBExportUIComponent",
self.ui_test._xContext)
+
+self.ui_test.execute_blocking_action(action=uiComponent.execute,
dialog_handler=handleDialog)
+propertyValues = uiComponent.getPropertyValues()
+filterData = [i.Value for i in propertyValues if i.Name ==
"FilterData"][0]
+# The EPUBLayoutMethod key was missing, EPUBExportDialog::OKClickHdl()
did not set it.
+layout = [i.Value for i in filterData if i.Name ==
"EPUBLayoutMethod"][0]
+# 1 stands for libepubgen::EPUB_LAYOUT_METHOD_FIXED.
+self.assertEqual(1, layout)
+
def testMeta(self):
def handleDialog(dialog):
dialog.getChild("identifier").executeAction("TYPE",
mkPropertyValues({"TEXT": "baddcafe-e394-4cd6-9b83-7172794612e5"}))
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx
b/writerperfect/source/writer/EPUBExportDialog.cxx
index acc1f9a9182d..232ca4128fec 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -90,12 +90,26 @@ EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent,
comphelper::SequenceAsH
if (it->second >>= nSplitMethod)
// No conversion, 1:1 mapping between libepubgen::EPUBSplitMethod
// and entry positions.
-m_pVersion->SelectEntryPos(nSplitMethod);
+m_pSplit->SelectEntryPos(nSplitMethod);
}
else
m_pSplit->SelectEntryPos(EPUBExportFilter::GetDefaultSplitMethod());
m_pSplit->SetSelectHdl(LINK(this, EPUBExportDialog, SplitSelectHdl));
+get(m_pLayout, "layoutlb");
+it = rFilterData.find("EPUBLayoutMethod");
+if (it != rFilterData.end())
+{
+sal_Int32 nLayoutMethod = 0;
+if (it->second >>= nLayoutMethod)
+// No conversion, 1:1 mapping between libepubgen::EPUBLayoutMethod
+// and entry positions.
+m_pLayout->SelectEntryPos(nLayoutMethod);
+}
+else
+m_pLayout->SelectEntryPos(EPUBExportFilter::GetDefaultLayoutMethod());
+m_pLayout->SetSelectHdl(LINK(this, EPUBExportDialog, LayoutSelectHdl));
+
get(m_pCoverPath, "coverpath");
get(m_pCoverButton, "coverbutton");
@@ -128,6 +142,13 @@ IMPL_LINK_NOARG(EPUBExportDialog, SplitSelectHdl, ListBox
&, void)
mrFilterData["EPUBSplitMethod"] <<= m_pSplit->GetSelectedEntryPos();
}
+IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, ListBox &, void)
+{
+// No conversion, 1:1 mapping between entry positions and
+// libepubgen::EPUBLayoutMethod.
+mrFilterData["EPUBLayoutMethod"] <<= m_pLayout->GetSelectedEntryPos();
+}
+
IMPL_LINK_NOARG(EPUBExportDialog, CoverClickHdl, Button *, void)
{
SvxOpenGraphicDialog aDlg("Import", this);
@@ -187,6 +208,7 @@ void EPUBExportDialog::dispose()
m_pDate.clear();
m_pMediaDir.clear();
m_pMediaButton.clear();
+m_pLayout.clear();
ModalDialog::dispose();
}
diff --git a/writerperfect/source/writer/EPUBExportDialog.hxx
b/writerperfect/source/writer/EPUBExportDialog.hxx
index 1181d096bd03..aafdbbb35105 100644
--- a/writerperfect/source/writer/EPUBExportDialog.hxx
+++ b/writerper
[Libreoffice-commits] core.git: 2 commits - external/libepubgen writerperfect/qa writerperfect/source
external/libepubgen/libepubgen-epub3.patch.1 | 173 +++
writerperfect/qa/unit/EPUBExportTest.cxx | 35
writerperfect/source/writer/EPUBExportFilter.cxx | 11 +
writerperfect/source/writer/exp/txtparai.cxx |7
writerperfect/source/writer/exp/txtstyli.cxx | 96
writerperfect/source/writer/exp/txtstyli.hxx | 29 +++
writerperfect/source/writer/exp/xmlfmt.cxx | 27 ++-
writerperfect/source/writer/exp/xmlfmt.hxx | 13 +
writerperfect/source/writer/exp/xmlimp.cxx | 31 +++-
writerperfect/source/writer/exp/xmlimp.hxx |7
10 files changed, 413 insertions(+), 16 deletions(-)
New commits:
commit 01283fe86cc523f1bed38bdfc5fbcb1694972169
Author: Miklos Vajna
Date: Fri Dec 1 10:57:35 2017 +0100
EPUB export allow requesting fixed layout from cmdline
FilterData is a typed map of options, suitable for UNO API clients, also
that's what the UI uses. OTOH the --convert-to cmdline option can only
set a FilterOptions string, so support that way as well.
--convert-to epub:EPUB:layout=fixed
can be used to trigger this.
Change-Id: I9f429107ae1db3dc4b6ab3b2b75665f096a1a33a
Reviewed-on: https://gerrit.libreoffice.org/45646
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx
b/writerperfect/qa/unit/EPUBExportTest.cxx
index a9c3db57c299..ac6e25efc2ae 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -42,6 +42,7 @@ class EPUBExportTest : public test::BootstrapFixture, public
unotest::MacrosTest
utl::TempFile maTempFile;
xmlDocPtr mpXmlDoc = nullptr;
uno::Reference mxZipFile;
+OUString maFilterOptions;
public:
void setUp() override;
@@ -58,6 +59,7 @@ public:
void testMimetype();
void testEPUB2();
void testEPUBFixedLayout();
+void testEPUBFixedLayoutOption();
void testPageBreakSplit();
void testSpanAutostyle();
void testParaAutostyleCharProps();
@@ -99,6 +101,7 @@ public:
CPPUNIT_TEST(testMimetype);
CPPUNIT_TEST(testEPUB2);
CPPUNIT_TEST(testEPUBFixedLayout);
+CPPUNIT_TEST(testEPUBFixedLayoutOption);
CPPUNIT_TEST(testPageBreakSplit);
CPPUNIT_TEST(testSpanAutostyle);
CPPUNIT_TEST(testParaAutostyleCharProps);
@@ -177,7 +180,10 @@ void EPUBExportTest::createDoc(const OUString &rFile,
const uno::SequencestoreToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
mxZipFile =
packages::zip::ZipFileAccess::createWithURL(mxComponentContext,
maTempFile.GetURL());
}
@@ -310,6 +316,17 @@ void EPUBExportTest::testEPUBFixedLayout()
assertXPathContent(mpXmlDoc,
"/opf:package/opf:metadata/opf:meta[@property='rendition:layout']",
"pre-paginated");
}
+void EPUBExportTest::testEPUBFixedLayoutOption()
+{
+// Explicitly request fixed layout, this time via FilterOptions.
+maFilterOptions = "layout=fixed";
+createDoc("hello.fodt", {});
+
+// This failed, fixed layout was only working via the FilterData map.
+mpXmlDoc = parseExport("OEBPS/content.opf");
+assertXPathContent(mpXmlDoc,
"/opf:package/opf:metadata/opf:meta[@property='rendition:layout']",
"pre-paginated");
+}
+
void EPUBExportTest::testPageBreakSplit()
{
uno::Sequence
aFilterData(comphelper::InitPropertySequence(
diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx
b/writerperfect/source/writer/EPUBExportFilter.cxx
index 8ebf5994aedc..627d5a4af18f 100644
--- a/writerperfect/source/writer/EPUBExportFilter.cxx
+++ b/writerperfect/source/writer/EPUBExportFilter.cxx
@@ -63,15 +63,20 @@ sal_Bool EPUBExportFilter::filter(const
uno::Sequence &rDe
sal_Int32 nSplitMethod = EPUBExportFilter::GetDefaultSplitMethod();
sal_Int32 nLayoutMethod = EPUBExportFilter::GetDefaultLayoutMethod();
uno::Sequence aFilterData;
+OUString aFilterOptions;
for (sal_Int32 i = 0; i < rDescriptor.getLength(); ++i)
{
if (rDescriptor[i].Name == "FilterData")
-{
rDescriptor[i].Value >>= aFilterData;
-break;
-}
+else if (rDescriptor[i].Name == "FilterOptions")
+rDescriptor[i].Value >>= aFilterOptions;
}
+#if LIBEPUBGEN_VERSION_SUPPORT
+if (aFilterOptions == "layout=fixed")
+nLayoutMethod = libepubgen::EPUB_LAYOUT_METHOD_FIXED;
+#endif
+
for (sal_Int32 i = 0; i < aFilterData.getLength(); ++i)
{
if (aFilterData[i].Name == "EPUBVersion")
commit 89e7a00080aadeba08ee649877b2507dc312f9f8
Author: Miklos Vajna
Date: Fri Dec 1 10:56:03 2017 +0100
EPUB export: handle page size in fixed layout
Requires parsing master pages and page layouts.
Change-Id: Ia8b9e59a9355396d3776af06e8e67ec88033754b
Reviewed-on: https://gerrit.libreoffice.org/45645
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/external/libepubge
[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source
compilerplugins/clang/refcounting.cxx|3 +++
compilerplugins/clang/test/refcounting.cxx |5 +
dbaccess/source/core/dataaccess/databasedocument.hxx |3 ++-
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 5066377bbeab1000f31e3fa689bad2ff8bf35295
Author: Stephan Bergmann
Date: Fri Dec 1 11:24:04 2017 +0100
Don't prevent ODatabaseDocument refcount from dropping to zero
...preventing the dtor from ever being called. (DocumentEvents forwards its
acquire/release calls to its m_pData->rParent, i.e., the ODatabaseDocument,
for
better or worse.) This caused ODatabaseDocument instances to be leaked
during
e.g. JunitTest_dbaccess_complex. Regression introduced with
de2ac128da025502c533f8cede5862e054dd9c44 "loplugin:useuniqueptr in
dbaccess".
Change-Id: Ida073c7e576b88e0d1d1a90253445e946e6eac99
Reviewed-on: https://gerrit.libreoffice.org/45652
Reviewed-by: Noel Grandin
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/refcounting.cxx
b/compilerplugins/clang/refcounting.cxx
index 8091fb3ee0cd..58a9884ede0d 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -479,6 +479,8 @@ bool RefCounting::VisitFieldDecl(const FieldDecl *
fieldDecl) {
<< fieldDecl->getSourceRange();
}
+// Not in general (dbaccess::DocumentEvents,
dbaccess/source/core/dataaccess/databasedocument.hxx):
+#if 0
if (!firstTemplateParamType.isNull() &&
containsXInterfaceSubclass(firstTemplateParamType))
{
report(
@@ -490,6 +492,7 @@ bool RefCounting::VisitFieldDecl(const FieldDecl *
fieldDecl) {
<< fieldDecl->getParent()
<< fieldDecl->getSourceRange();
}
+#endif
checkUnoReference(
fieldDecl->getType(), fieldDecl,
diff --git a/compilerplugins/clang/test/refcounting.cxx
b/compilerplugins/clang/test/refcounting.cxx
index 48fb94c694c4..4bcb03e2eef6 100644
--- a/compilerplugins/clang/test/refcounting.cxx
+++ b/compilerplugins/clang/test/refcounting.cxx
@@ -13,11 +13,16 @@
#include
#include
+// expected-no-diagnostics
+
struct Foo
{
+// Not in general (dbaccess::DocumentEvents,
dbaccess/source/core/dataaccess/databasedocument.hxx):
+#if 0
std::unique_ptr m_foo1; // expected-error
{{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart
pointer, should be managed via uno::Reference, parent is 'Foo'
[loplugin:refcounting]}}
std::shared_ptr m_foo2; // expected-error
{{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart
pointer, should be managed via uno::Reference, parent is 'Foo'
[loplugin:refcounting]}}
boost::intrusive_ptr m_foo3; // expected-error
{{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart
pointer, should be managed via uno::Reference, parent is 'Foo'
[loplugin:refcounting]}}
+#endif
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx
b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 8f9c8693433b..9479511367ce 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
#include "documenteventnotifier.hxx"
@@ -171,7 +172,7 @@ class ODatabaseDocument :public ModelDependentComponent
// ModelDepe
::comphelper::OInterfaceContainerHelper2
m_aCloseListener;
::comphelper::OInterfaceContainerHelper2
m_aStorageListeners;
-rtl::Reference
m_pEventContainer;
+std::unique_ptr
m_pEventContainer;
::rtl::Reference< DocumentEventExecutor >
m_pEventExecutor;
DocumentEventNotifier
m_aEventNotifier;
___
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' - oox/source
oox/source/drawingml/table/tableproperties.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 7f81a748d2860968c3843984da24426e9806e436
Author: Caolán McNamara
Date: Fri Dec 1 09:02:04 2017 +
ofz: check col/row bounds
Change-Id: Idaa38f400873372330dd06c14800c4a5018c79db
Reviewed-on: https://gerrit.libreoffice.org/45641
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/oox/source/drawingml/table/tableproperties.cxx
b/oox/source/drawingml/table/tableproperties.cxx
index d4c5bdc56d39..a692ea3682c1 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -58,7 +58,8 @@ void CreateTableRows( const uno::Reference< XTableRows >&
xTableRows, const std:
xTableRows->insertByIndex( 0, rvTableRows.size() - 1 );
std::vector< TableRow >::const_iterator aTableRowIter( rvTableRows.begin()
);
uno::Reference< container::XIndexAccess > xIndexAccess( xTableRows,
UNO_QUERY_THROW );
-for ( sal_Int32 n = 0; n < xIndexAccess->getCount(); n++ )
+sal_Int32 nCols = std::min(xIndexAccess->getCount(),
rvTableRows.size());
+for (sal_Int32 n = 0; n < nCols; ++n)
{
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ),
UNO_QUERY_THROW );
xPropSet->setPropertyValue( "Height", Any( static_cast< sal_Int32 >(
aTableRowIter->getHeight() / 360 ) ) );
@@ -72,7 +73,8 @@ void CreateTableColumns( const Reference< XTableColumns >&
xTableColumns, const
xTableColumns->insertByIndex( 0, rvTableGrid.size() - 1 );
std::vector< sal_Int32 >::const_iterator aTableGridIter(
rvTableGrid.begin() );
uno::Reference< container::XIndexAccess > xIndexAccess( xTableColumns,
UNO_QUERY_THROW );
-for ( sal_Int32 n = 0; n < xIndexAccess->getCount(); n++ )
+sal_Int32 nCols = std::min(xIndexAccess->getCount(),
rvTableGrid.size());
+for (sal_Int32 n = 0; n < nCols; ++n)
{
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ),
UNO_QUERY_THROW );
xPropSet->setPropertyValue( "Width", Any( static_cast< sal_Int32 >(
*aTableGridIter++ / 360 ) ) );
___
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' - package/source
package/source/zippackage/ZipPackage.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 4bb69973a66e1a8ba7499c23e556eaf400be24cb
Author: Caolán McNamara
Date: Fri Dec 1 13:16:46 2017 +
ofz#4491 Bad-Cast
Change-Id: Ibee0c3e51ecd2b976d67c3ab28cabf0acb10c6b8
Reviewed-on: https://gerrit.libreoffice.org/45663
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/package/source/zippackage/ZipPackage.cxx
b/package/source/zippackage/ZipPackage.cxx
index 90272bbee62b..28006a43c15c 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -524,7 +524,12 @@ void ZipPackage::getZipFileContents()
pCurrent = pPkgFolder;
}
else
-pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
+{
+ZipContentInfo& rInfo = pCurrent->doGetByName(sTemp);
+if (!rInfo.bFolder)
+throw css::packages::zip::ZipIOException("Bad Zip
File, stream as folder");
+pCurrent = rInfo.pFolder;
+}
nOldIndex = nIndex+1;
}
if ( nStreamIndex != -1 && !sDirName.isEmpty() )
@@ -825,7 +830,10 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const
OUString& aName )
if ( pCurrent->hasByName( sTemp ) )
{
pPrevious = pCurrent;
-pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
+ZipContentInfo& rInfo = pCurrent->doGetByName(sTemp);
+if (!rInfo.bFolder)
+throw css::packages::zip::ZipIOException("Bad Zip File, stream
as folder");
+pCurrent = rInfo.pFolder;
}
else
throw NoSuchElementException(THROW_WHERE );
@@ -908,7 +916,10 @@ sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const
OUString& aName )
if ( pCurrent->hasByName( sTemp ) )
{
pPrevious = pCurrent;
-pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
+ZipContentInfo& rInfo = pCurrent->doGetByName(sTemp);
+if (!rInfo.bFolder)
+throw css::packages::zip::ZipIOException("Bad Zip File,
stream as folder");
+pCurrent = rInfo.pFolder;
}
else
return false;
___
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' - scp2/source
scp2/source/ooo/file_font_ooo.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6cf99dfd0c9753372def784990d760f0c930f498 Author: Christian Lohmaier Date: Fri Dec 1 17:04:21 2017 +0100 fix installset packaging after fc_local.conf move Change-Id: I77de58c3dd532df895c7e7e172515df929859f25 diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 6dfe05538c10..08ba609ff397 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -75,7 +75,7 @@ File gid_File_FcLocal_Conf Dir = FILELIST_DIR; USER_FILE_BODY; Styles = (FILELIST); -Name = "more_fonts_conf.filelist"; +Name = "postprocess_fontconfig.filelist"; End #endif #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/uiconfig
svtools/uiconfig/ui/addresstemplatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit be40df24b26827057e5303b612196a3ded84bebd Author: Xisco Fauli Date: Fri Dec 1 16:55:48 2017 +0100 tdf#114098 Show vertical scrollbar Change-Id: I03b94d6860e559a4074a3a23fcc0407f22c21df4 Reviewed-on: https://gerrit.libreoffice.org/45686 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui b/svtools/uiconfig/ui/addresstemplatedialog.ui index 58edfc7a11bc..07c36b7021ce 100644 --- a/svtools/uiconfig/ui/addresstemplatedialog.ui +++ b/svtools/uiconfig/ui/addresstemplatedialog.ui @@ -216,6 +216,7 @@ True True True +always in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/xml
sd/xml/layoutlist.xml |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit dccfe8765c25caf8485e659711a6df6c43ed63a9 Author: Marina Latini Date: Fri Dec 1 10:01:27 2017 +0100 tdf#101014 Keyboard navigation between textboxes The tab sequence in layouts AUTOLAYOUT_TITLE_4CONTENT and AUTOLAYOUT_TITLE_6CONTENT has been modified from left to right on each line for a better a11y Change-Id: I92379358860d6866414ceda430a9bd90b63e2743 Reviewed-on: https://gerrit.libreoffice.org/45638 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/sd/xml/layoutlist.xml b/sd/xml/layoutlist.xml index c458b11507b0..a7b12821b999 100644 --- a/sd/xml/layoutlist.xml +++ b/sd/xml/layoutlist.xml @@ -31,8 +31,8 @@ - - + + @@ -45,9 +45,9 @@ - + - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Let failed Jenkins builds set Verified: -1 in Gerrit?
On Thu, Nov 30, 2017 at 2:00 AM, Miklos Vajna wrote: > > I think this was a decision from Norbert, probably because he was worried > about false negatives. A workaround is to watch your inbox (which gets a > mail, whatever is the outcome), rather than the above URL. > > (I would have no problem if Jenkins would put a Verified-1, though.) Indeed False positive is a problem, especially since verify is a -1/+1 range and "By default, a change is submittable when it gets at least one highest vote in each voting category and has no lowest vote (aka veto vote) in any category." so if jenkins did put a -1 that would be blocking until _jenkins_ reverse its vote. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Let failed Jenkins builds set Verified: -1 in Gerrit?
On Fri, Dec 1, 2017 at 1:32 AM, David Ostrovsky wrote: > On Thu Nov 30 08:25:40 UTC 2017, Stephan Bergmann wrote: > >>Does "(with a help of maintainers)" imply that there are change >>owners who could not override a VRFY-1 from Jenkins themselves? > > Yes. I believe that "registered users" group members will not be > able to remove VRFY-1 vote. I do not know of anyway, anyone can remove it using the ui, short of impersonating jenkins' user. the only available way to remove the -1 is to rebase the patch, since hte -1 is bound to the particular patcheset version... then hope that jenkins will not put another -1, or at least quickly +2/+1 the rebased patch and submit... neither are desirable. hence the choice of +1/0 rather than +1/-1 for jenkins. For all practical purpose: 0 means jenkins has not yet try or was not successful. to submit one would have to manually add a verify +1. to do that you need to go the the change view, and jenkins activity or lack thereof is pretty apparent there. I suspect the intent is to quicky avoid changeset that failed jenkins... but then whether the change set has failed or has not yet been built, what is the difference wrt to avoiding going in the details of the change ? from a review perspective no verification or failed verification means the same thing: not ready ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: Changes to 'libreoffice-5-4-4'
New branch 'libreoffice-5-4-4' available with the following commits: commit 16b3293a53b202a7baddbda76da5368118bc91e1 Author: Christian Lohmaier Date: Fri Dec 1 18:29:14 2017 +0100 Branch libreoffice-5-4-4 This is 'libreoffice-5-4-4' - the stable branch for the 5.4.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.4.x release, please use the 'libreoffice-5-4' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I952266f4a8d117983c508a17792b3e2261c57112 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-4-4'
New branch 'libreoffice-5-4-4' available with the following commits: commit c05c7f010e6c90e88ebf3999da94bc18fd127d01 Author: Christian Lohmaier Date: Fri Dec 1 18:29:14 2017 +0100 Branch libreoffice-5-4-4 This is 'libreoffice-5-4-4' - the stable branch for the 5.4.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.4.x release, please use the 'libreoffice-5-4' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I3d587c512aa5b7c9324dfd1ab8ee469583f11fb5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-4-4'
New branch 'libreoffice-5-4-4' available with the following commits: commit 4285e3cf33168671b755dc7c7950e46a8ba63191 Author: Christian Lohmaier Date: Fri Dec 1 18:29:14 2017 +0100 Branch libreoffice-5-4-4 This is 'libreoffice-5-4-4' - the stable branch for the 5.4.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.4.x release, please use the 'libreoffice-5-4' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: If3e31bb333233827dcba9dd657f266539c9640da ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-5-4-4'
New branch 'libreoffice-5-4-4' available with the following commits: commit 531f8785d96e8364be73ecc2e575a074a557249a Author: Christian Lohmaier Date: Fri Dec 1 18:29:36 2017 +0100 Branch libreoffice-5-4-4 This is 'libreoffice-5-4-4' - the stable branch for the 5.4.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.4.x release, please use the 'libreoffice-5-4' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I42dbf53dd9e103200e751a8db56c56a3cfa9c5b0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/svx sc/source sw/inc sw/source
include/svx/strings.hrc | 12
sc/source/core/tool/autoform.cxx| 12
sw/inc/poolfmt.hxx | 12
sw/inc/strings.hrc | 18 --
sw/source/core/doc/DocumentStylePoolManager.cxx | 63
sw/source/core/doc/SwStyleNameMapper.cxx| 13
6 files changed, 93 insertions(+), 37 deletions(-)
New commits:
commit a2d5b912e103c680339162ccfd15783ba6bfa232
Author: Eike Rathke
Date: Wed Nov 29 23:54:26 2017 +0100
Prepare for translated new AutoFormat Table Styles, tdf#101349
Stored in file are resource IDs for predefined style names, user
defined styles are stored with ID 0x and display the given
name. The 16 old styles have IDs 0..15, so add strings for the 10
new styles and append those to the already existing IDs assigning
them the range 16..25
Once the final autotbl.fmt file with only new styles will be
available, patch that to change the 0x user defined to those
16..25 (0x10 to 0x19) IDs, it is the uint16 immediately following
the style name (Little Endian). Order of styles should match the
one in this change, if not, change the change..
Also, this eliminates the duplicated translation entries in
sw/inc/strings.hrc and instead in
sw/source/core/doc/DocumentStylePoolManager.cxx pulls the
translations from include/svx/strings.hrc
Change-Id: I7827ae22ab05901e6580ff1b9cd812db55f94f7f
Reviewed-on: https://gerrit.libreoffice.org/45544
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit b56cd8050137ed4555a5aca50d4949d941e1f132)
Reviewed-on: https://gerrit.libreoffice.org/45651
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 048cdc6c681e..2aad6c092bdc 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -640,6 +640,7 @@
#define RID_SVXSTR_COLOR_YELLOWGREEN
NC_("RID_SVXSTR_COLOR_YELLOWGREEN", "Yellow green")
#define RID_SVXSTR_COLOR_PINK
NC_("RID_SVXSTR_COLOR_PINK", "Pink")
#define RID_SVXSTR_COLOR_TURQUOISE
NC_("RID_SVXSTR_COLOR_TURQUOISE", "Turquoise")
+/* 16 old AutoFormat Table Styles */
#define RID_SVXSTR_TBLAFMT_3D
NC_("RID_SVXSTR_TBLAFMT_3D", "3D")
#define RID_SVXSTR_TBLAFMT_BLACK1
NC_("RID_SVXSTR_TBLAFMT_BLACK1", "Black 1")
#define RID_SVXSTR_TBLAFMT_BLACK2
NC_("RID_SVXSTR_TBLAFMT_BLACK2", "Black 2")
@@ -656,6 +657,17 @@
#define RID_SVXSTR_TBLAFMT_RED
NC_("RID_SVXSTR_TBLAFMT_RED", "Red")
#define RID_SVXSTR_TBLAFMT_TURQUOISE
NC_("RID_SVXSTR_TBLAFMT_TURQUOISE", "Turquoise")
#define RID_SVXSTR_TBLAFMT_YELLOW
NC_("RID_SVXSTR_TBLAFMT_YELLOW", "Yellow")
+/* 10 new AutoFormat Table Styles since LibreOffice 6.0 */
+#define RID_SVXSTR_TBLAFMT_LO6_ACADEMIC
NC_("RID_SVXSTR_TBLAFMT_LO6_ACADEMIC", "Academic")
+#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE
NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE", "Box List Blue")
+#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN
NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN", "Box List Green")
+#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED
NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED", "Box List Red")
+#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW
NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW", "Box List Yellow")
+#define RID_SVXSTR_TBLAFMT_LO6_ELEGANT
NC_("RID_SVXSTR_TBLAFMT_LO6_ELEGANT", "Elegant")
+#define RID_SVXSTR_TBLAFMT_LO6_FINANCIAL
NC_("RID_SVXSTR_TBLAFMT_LO6_FINANCIAL", "Financial")
+#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS
NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS", "Simple Grid Columns")
+#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS
NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS", "Simple Grid Rows")
+#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED
NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED", "Simple List Shaded")
#define RID_SVXSTR_LINEJOINT_MIDDLE
NC_("RID_SVXSTR_LINEJOINT_MIDDLE", "Line joint averaged")
#define RID_SVXSTR_LINEJOINT_BEVEL
NC_("RID_SVXSTR_LINEJOINT_BEVEL", "Line joint bevel")
#define RID_SVXSTR_LINEJOINT_MITER
NC_("RID_SVXSTR_LINEJOINT_MITER", "Line joint miter")
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 296dae5b9026..371cf8c2347f 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -762,7 +762,17 @@ static const char* RID_SVXSTR_TBLAFMT[] =
RID_SVXSTR_TBLAFMT_LAVENDER,
RID_SVXSTR_TBLAFMT_RED,
RID_SVXSTR_TBLAFMT_TURQUOISE,
-RID_SVXSTR_TBLAFMT_YEL
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 127f1c3f2a1d068f25f26a5ae9d5c6dcf528cdce Author: Christian Lohmaier Date: Fri Dec 1 18:31:36 2017 +0100 bump product version to 5.4.5.0.0+ Change-Id: I19961869a1a4fbdbcfdae3c52012ace1c593c243 diff --git a/configure.ac b/configure.ac index b1fc13887658..25b1b322e751 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([LibreOffice],[5.4.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.4.5.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 14d9e242c5ce6102970ea19729c0f8867a80bdb2 Author: Christian Lohmaier Date: Fri Dec 1 18:35:34 2017 +0100 bump product version to 5.4.4.1.0+ Change-Id: Iadd0faa2613cd8363cebe198a4cf836f01f1ffb3 diff --git a/configure.ac b/configure.ac index b1fc13887658..aa1a5527a71f 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([LibreOffice],[5.4.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.4.4.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.4.4.1'
Tag 'libreoffice-5.4.4.1' created by Christian Lohmaier at 2017-12-01 17:34 + Tag libreoffice-5.4.4.1 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJaIZK6AAoJEPQ0oe+v7q6jyQAQAMYInHbcW0cQFJarwkihOVsx KO9cgu9CtljFxkDymKoEAKWzt5pd6HrfYY+xBkDPr4oyMrNlkhJjqPnhNhCqgP/8 fjuTTaPMqILzKPI/pIOC8UVi9VZhtGritkJL0x0FZDJWzEQubNIhSiW+igznGTCN ea8BLpIl3QIDtpoUwU7Tp+SH7Rh1b15WV3/dguOv3wqJTJa0eCdaKb43HcS1TggO ZfoiyYBfGNJ06aNmBHJFbmBwq8mlj81zeeHNCyD8ZamesF8a9wRPHXcw3Aj8ThMk kYzOxDyUPLGTFoC5kjNpqp9HBEYGlBT4hguAbwFonF5p48UXNxnNm6OJO2bZbxyt 26m463aVAFjWqF++ea7AWC8JqyBTTPQGLj+3B4KHu7lI0uM3To/ZyIMTTtzv4kuR v7cmvDRt5vGKWcFKll2fEq4GSi4gfAXoCv99nSUy6I99u+kPJ+QwBkgcWWGPsI6G WmtlVk/39YLB+scJ4UzzrAHAudSuhl9yB3Jp/TCGr3ZwlyfqdyhxJ+ZOpryevjLa K76gJ0kLV7+7o+G4B2/7CPnzUK+7nMStNU5OjFztX14oZGm6THLqyEY9MzzCX72u ndrXcu4VR0/RBhWWPzr+n/y1seg7wF6rkqMEyfiLleaa4F5jZkXfk6OorcECWNui jXq0IcSMnpqkObNkR23h =sAFO -END PGP SIGNATURE- Changes since libreoffice-5-4-branch-point-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/libreoffice-5.4.4.1'
Tag 'libreoffice-5.4.4.1' created by Christian Lohmaier at 2017-12-01 17:35 + Tag libreoffice-5.4.4.1 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJaIZLGAAoJEPQ0oe+v7q6jHNIQALj0jG+rv8WEqVP57fDnrySO Ejb3YZEF+1DKch33jGkzGXAIPHU67rnN+wmV26I7K0ZU41iDA6yAJiroCuQhYIN/ +M8t/6QxbMj4EnsfiRlKegopSYXo0Rr5/rrGkHkh6w1Wk/4uvFEiYjWT2lGfHCHK NJqnLcngiUJk3CEd3fGSk5ddshEKAqH5ApHi1Jxd22WZ9Ovm+xSQUjjaRFguBUjd EiNZ5ZpckYp+BWSwtewPrN3SJkzqAQmxhPrm8i66iJMBMuku0Zq3xzlox5GQV/Hm AvCEEllLi5Lq6utwaWpD7HuuTTesPG+TQ90i78ndotdIWHhIJewuIkmWewQ/FNdI wSnhB1qNmharK/ZFmF294tzpJXmoVEeeNLiufopmIbeAKZpiKkLnBamDYIEDlhxA jhvV/5ll9VVI6mRSwa0z+xHe+ukXie4cybJfwjm4v/jpvW62Xj1P282PfpESTkRz faPNcR0pSZu8SZVP0+0MmZ3oFp+SXQRsKeT3bKs1CjA5tC3vnk4M4qa++whnIUu9 tmmo1KaWhN972klzSWSKJZ7qatND17ndPWgmhkVrQTJRAST/HIkykrcoyOXkyQ71 g00VqZGgGa++OqOKfixfgpw90ZS+5ejJF5z3627oT2bXf9VUehbK0RDOBaNoqDNl 5br/1EhjlmLLWuPVrUGM =iahR -END PGP SIGNATURE- Changes since libreoffice-5-4-branch-point-858: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.4.4.1'
Tag 'libreoffice-5.4.4.1' created by Christian Lohmaier at 2017-12-01 17:34 + Tag libreoffice-5.4.4.1 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJaIZK/AAoJEPQ0oe+v7q6jaPkP/iUloWt4ewlxDZjyyoHqDph6 K4jrJnff8aasDUlG/tXBdRcESzw4aju6xrf/VpA3UzCqPBSmp+qAkxphuvFX/xM5 2X6X2JO4BavRPNSdh8drDbohyV3mccj7Frazz587+eRS8qNBTVJVLwCfhsclcbF/ R22SBqdNrQy8vdKtyChPof/5rgL06axKmxSdSeZcRmjI5NfE4L+Wfn05+0Embeia 9BFKJ6JfSy0LIuwEkO6nyjNQPQM25Dht+R5diQ1mjueNVz6tc1mc6d2Lizy70w7y eNX1m0e4WWH1C+/JnPjtwnYLotBzT4VyfVBSTcrlnxiagV6aC0NyLKN9CiICUF5x JYRc9YgllrRI7qpWqPbifCUw4IFIvo14RG8X2wNzis0QXpZAk0vSNDxjTm50O3OW IApppUUe6YPShmVy9jeu7JqTbielVO6bST4oklSOsI/mSRot5FKgAgwPkVLFLrsB 8gc4IszsR2bGwkS6WJ/IaTp4VnQukrcXHAcNuU8KHmdi2zpYqz7gIE1coHR3YK3/ oyNFXuSnScHzNjytnaiJnsyfu8VnG/yTC6FuctQZr8+yXOVVh1ZmNDKlXG0X4LYY +jOZ7U6wraWpUpKK/1Fa7OGuLqPE3m1f5/yvspa99U/pBcyVhfqa61c21eXKL0Fi lJ7LxS2g9dSvEEBkpHU+ =0WAF -END PGP SIGNATURE- Changes since libreoffice-5-4-branch-point-54: --- 0 files changed --- ___ 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/libreoffice-5.4.4.1'
Tag 'libreoffice-5.4.4.1' created by Christian Lohmaier at 2017-12-01 17:34 + Tag libreoffice-5.4.4.1 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJaIZLDAAoJEPQ0oe+v7q6jGrMP/RSSIgnkaHKN5kNLBB/QAN2n J/J7f/fk7WqBy7n+uPjxmDL2Ubz+/bQ85lqSyLoJMIWKasin+gmwHtkQ0CqeTJ3S ZEPdxJtFZzG9/bV2WhmFk9Okxq5LmcazJfuhLahxwhpZJtXxCS0G2E0M7eYfbKFK hZ/0qYxpM23Y8dR92ZiZDkF8lYNFDqdhq8fidOShsEHOvxpBfQixBAhFXBmV0jCd HiR6UMFsu3wSn36nuTv7Z0quaG447lwP9ud3dsfAtTrnzdxffn1tKcXU/s8HOj3o 6KxQB3kEsjFOrMw7sNrG19VbUKaCICmtY51+T/Rs6n1rsut5OVnKA4GycMfI+KaE +tXzBWCm6XCPKo33wLAnhiD+NSPF088KGrhx43bYgQJT8A15QxCcK0+AnFH+am1l YaqdOXLjBDt0FyJpsIhN2G1HiPmX8YyBkwrSdFK6HsesNci9zTHyzCaxa+Ow62lY Sptt9Mnk9N68w+XkxJJ0jrZoCKnf2USGxLwSTPNUoP6ufX/gTEYcW2v1mvyKSMie 2cTVV+/lrcLzYpKQMWUYgiQw6zC5aOuZsL/a4EmMY/6nUtPM3GJtkSHv4Kwh+vPm hxMIXeo5yBQhQyctkU8ksUa6lxNpRocTPKQgwGU6NMWb/tPLz5YV/5Cjk0y2iQfp kj4rSPDnS62nhYXeciHU =ryyC -END PGP SIGNATURE- Changes since libreoffice-5-4-branch-point-25: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: tools/map.cpp
tools/map.cpp | 91 +-
1 file changed, 71 insertions(+), 20 deletions(-)
New commits:
commit 886a8a7ab8d7a259a0a6af8e85f27f2ec413b1ad
Author: Michael Meeks
Date: Fri Dec 1 17:37:46 2017 +
loolmap - improve page annotation, and page diffs, count dirty bytes.
Change-Id: Iaaae8fca2bdd11961682d6f8dafa38e4ca51c44c
diff --git a/tools/map.cpp b/tools/map.cpp
index 1e1b4de6..5ef1b00a 100644
--- a/tools/map.cpp
+++ b/tools/map.cpp
@@ -30,6 +30,7 @@
typedef unsigned long long addr_t;
bool DumpHex = false;
+bool DumpAll = false;
#define MAP_SIZE 20
#define PATH_SIZE 1000 // No harm in having it much larger than strictly
necessary. Avoids compiler warning.
@@ -105,12 +106,6 @@ static std::vector lineBreak(std::string str)
static void dumpDiff(const std::string &pageStr, const std::string &parentStr)
{
-if (pageStr == parentStr)
-{
-printf ("unusual: page identical to parent\n");
-printf ("%s", pageStr.c_str());
-return;
-}
std::vector page = lineBreak(pageStr);
std::vector parent = lineBreak(parentStr);
assert(page.size() == parent.size());
@@ -125,14 +120,23 @@ static void dumpDiff(const std::string &pageStr, const
std::string &parentStr)
{
if (page[i][j] == parent[i][j])
printf(" ");
-else
+else {
printf("%c", parent[i][j]);
+}
}
printf("\n");
}
}
}
+static bool pageIsZero(const std::vector &page)
+{
+for (char c : page)
+if (c != 0)
+return false;
+return true;
+}
+
static void dumpPages(unsigned proc_id, unsigned parent_id, const char *type,
const std::vector &pages)
{
char path_proc[PATH_SIZE];
@@ -146,7 +150,11 @@ static void dumpPages(unsigned proc_id, unsigned
parent_id, const char *type, co
if (parent_fd < 0)
error(EXIT_FAILURE, errno, "Failed to open %s", path_proc);
+if (DumpHex)
+printf ("\nUn-shared data dump\n");
+
size_t cnt = 0;
+long long int bytesTouched = 0;
for (auto page : pages)
{
std::vector pageData, parentData;
@@ -169,18 +177,59 @@ static void dumpPages(unsigned proc_id, unsigned
parent_id, const char *type, co
std::stringstream parentStr;
Util::dumpHex(parentStr, "", "", parentData, false);
-printf ("%s page: 0x%.8llx (%d/%d) %s\n",
-type, page, (int)++cnt, (int)pages.size(),
-parentData.size() == 0 ? "- unique" : "- was shared");
-
-if (parentData.size() == 0)
-printf("%s", pageStr.str().c_str());
+bool matchesParent = pageStr == parentStr;
+const char *style;
+if (parentData.size() > 0)
+{
+if (pageIsZero(parentData))
+{
+style = "was shared with zeros";
+parentData.resize(0);
+}
+if (matchesParent)
+{
+if (DumpAll)
+style = "dump unchanged";
+else
+style = "un-shared but matches parent";
+parentData.resize(0);
+}
+else
+style = "was shared";
+}
else
-dumpDiff(pageStr.str(), parentStr.str());
+style = "unique";
+
+int touched = 0;
+if (parentData.size() > 0)
+{
+for (size_t i = 0; i < pageData.size(); ++i)
+{
+if (pageData[i] != parentData[i])
+touched++;
+}
+}
+
+if (DumpHex)
+{
+printf ("%s page: 0x%.8llx (%d/%d) - touched: %d - %s\n",
+type, page, (int)++cnt, (int)pages.size(), touched,
+style);
+
+if (parentData.size() == 0)
+printf("%s", pageStr.str().c_str());
+else
+dumpDiff(pageStr.str(), parentStr.str());
+}
+
+bytesTouched += touched;
}
close (mem_fd);
close (parent_fd);
+
+printf ("\tdirtied bytes touched %5lld per page %.2f\n\n",
+bytesTouched, (double)bytesTouched / pages.size());
}
static std::vector compressBitmap(const std::vector &bitmap)
@@ -244,6 +293,8 @@ static void dump_unshared(unsigned proc_id, unsigned
parent_id,
{
numShared++;
bitmap.push_back('.');
+if (DumpAll)
+vunshared.push_back(p);
}
}
}
@@ -254,13 +305,9 @@ static void dump_unshared(unsigned proc_id, unsigned
parent_id,
printf ("\tunshared %5lld (%lldkB)\n", numOwn, numOwn * 4);
std::vector compressed = compressBitmap(bitmap);
-printf ("RLE sharing bitmap:\n%s\n\n", &compressed[0]);
+printf ("\tRLE sharing bitmap:\n%s\n", &compressed[0]);
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
include/test/sheet/xmultipleoperation.hxx | 39 ++
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |1
qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java | 175
--
sc/qa/extras/sccellcursorobj.cxx|7
sc/qa/extras/sccellrangeobj.cxx | 42 +-
sc/qa/extras/sctablesheetobj.cxx| 48 ++
test/Library_subsequenttest.mk |1
test/source/sheet/xmultipleoperation.cxx| 96 +
11 files changed, 207 insertions(+), 205 deletions(-)
New commits:
commit 350eec67a5989365560e38e9270990dcd0a019e8
Author: Jens Carl
Date: Fri Dec 1 01:00:41 2017 +
tdf#45904 Move _XMultipleOperation Java tests to C++
Change-Id: I102b726e673f69bfe64eff7e28e380dd6f15f1f8
Reviewed-on: https://gerrit.libreoffice.org/45629
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/sheet/xmultipleoperation.hxx
b/include/test/sheet/xmultipleoperation.hxx
new file mode 100644
index ..50d4d144edc1
--- /dev/null
+++ b/include/test/sheet/xmultipleoperation.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XMULTIPLEOPERATION_HXX
+#define INCLUDED_TEST_SHEET_XMULTIPLEOPERATION_HXX
+
+#include
+#include
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XMultipleOperation
+{
+public:
+virtual css::uno::Reference init() = 0;
+virtual css::uno::Reference getXSpreadsheet() = 0;
+
+void testSetTableOperation();
+
+protected:
+~XMultipleOperation() {}
+
+private:
+void fillCells(css::uno::Reference&);
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XMULTIPLEOPERATION_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index ca7efb955432..d7476b028d5a 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -604,7 +604,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster \
qadevOOo/tests/java/ifc/sheet/_XFormulaQuery \
qadevOOo/tests/java/ifc/sheet/_XFunctionDescriptions \
-qadevOOo/tests/java/ifc/sheet/_XMultipleOperation \
qadevOOo/tests/java/ifc/sheet/_XRangeSelection \
qadevOOo/tests/java/ifc/sheet/_XRecentFunctions \
qadevOOo/tests/java/ifc/sheet/_XScenario \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index 0e5e6448c72b..e6b2ef052fd0 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -123,7 +123,6 @@
"ScCellCursorObj";"com::sun::star::sheet::XCellRangeFormula#optional";"setFormulaArray()"
"ScCellCursorObj";"com::sun::star::util::XIndent";"decrementIndent()"
"ScCellCursorObj";"com::sun::star::util::XIndent";"incrementIndent()"
-"ScCellCursorObj";"com::sun::star::sheet::XMultipleOperation";"setTableOperation()"
"ScCellCursorObj";"com::sun::star::table::XAutoFormattable";"autoFormat()"
"ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryVisibleCells()"
"ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryEmptyCells()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index 95186af1d9a2..deddc503556a 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -118,7 +118,6 @@
"ScCellRangeObj";"com::sun::star::sheet::XCellRangeFormula#optional";"setFormulaArray()"
"ScCellRangeObj";"com::sun::star::util::XIndent";"decrementIndent()"
"ScCellRangeObj";"com::sun::star::util::XIndent";"incrementIndent()"
-"ScCellRangeObj";"com::sun::star::sheet::XMultipleOperation";"setTableOperation()"
"ScCellRangeObj";"com::sun::star::table::XAutoFormattable";"autoFormat()"
"ScCellRangeObj";"com::sun::star::sheet::XCellRangesQuery";"queryVisibleCells()"
"ScCellRangeObj";"com::sun::star::sheet::XCellRangesQuery";"queryEmptyCells()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
b/qadevOOo/objdsc/sc/com.sun.star
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - svtools/uiconfig
svtools/uiconfig/ui/addresstemplatedialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit eed2c5d7fc7e96a06bf5862f023f08f5e2446343 Author: Xisco Fauli Date: Fri Dec 1 16:55:48 2017 +0100 tdf#114098 Show vertical scrollbar Change-Id: I03b94d6860e559a4074a3a23fcc0407f22c21df4 Reviewed-on: https://gerrit.libreoffice.org/45686 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit be40df24b26827057e5303b612196a3ded84bebd) Reviewed-on: https://gerrit.libreoffice.org/45693 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui b/svtools/uiconfig/ui/addresstemplatedialog.ui index 58edfc7a11bc..07c36b7021ce 100644 --- a/svtools/uiconfig/ui/addresstemplatedialog.ui +++ b/svtools/uiconfig/ui/addresstemplatedialog.ui @@ -216,6 +216,7 @@ True True True +always in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: osx 10.13 build failure
Yep, it seems that was the problem. Thanks for the help! El 01/12/17 a les 16:20, Tor Lillqvist ha escrit: > Do you have some weird Strings.hrc file somewhere that gets included > instead of the correct strings.hrc? > > --tml > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice -- Xisco Faulí Libreoffice QA Team IRC: x1sc0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/table/swtable.cxx | 27 +--
1 file changed, 25 insertions(+), 2 deletions(-)
New commits:
commit acf7e4c0a3dc0cca986bf4d4b7a65bafe7e70abc
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
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 1312f5dce36a..dc3c749fd802 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2268,6 +2268,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(
@@ -2280,6 +2282,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
@@ -2289,7 +2292,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 ))
{
@@ -2322,7 +2324,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;
@@ -2333,7 +2338,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
Re: IDE integration with qtcreator
Hello Heiko, Could you please provide us the right procedure in this case ? Thank you in advance Le 1 déc. 2017 1:05 PM, "Heiko Tietze" a écrit : > Jim Raykowski brought me on the right track. After removing the line with > qmake from projects > build steps everything works now with the ordinary > make. > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source
extras/source/misc_config/autotbl.fmt |binary 1 file changed New commits: commit dcd14963c3f3de9599dbb12d738a26feb5f56df5 Author: Eike Rathke Date: Fri Dec 1 21:07:28 2017 +0100 Ditch the hard coded red font attribute, tdf#101349 follow-up Color RED is a number format property for negative currency amount, not a cell's font propertry. Change-Id: Ibbba150edacca52d07bbdf1e78d43601c64ff1cd diff --git a/extras/source/misc_config/autotbl.fmt b/extras/source/misc_config/autotbl.fmt index dbdb767dde82..611ac0df41c7 100644 Binary files a/extras/source/misc_config/autotbl.fmt and b/extras/source/misc_config/autotbl.fmt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/strings.hrc|1 +
svtools/source/dialogs/PlaceEditDialog.cxx |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ae745789704fd7ad86c84ff9875cda810ff915b0
Author: Andras Timar
Date: Thu Nov 30 13:51:03 2017 +0100
tdf#102160 make 'Other CMIS' string localizable
Change-Id: I58cf9eea05f15223e32ff1542b946c5962041e6c
Reviewed-on: https://gerrit.libreoffice.org/45577
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index ebda4b746df8..7580610f79bc 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -213,6 +213,7 @@
#define STR_SVT_ESTIMATED_SIZE_VEC
NC_("STR_SVT_ESTIMATED_SIZE_VEC", "The file size is %1 KB.")
#define STR_SVT_HOSTNC_("STR_SVT_HOST", "host")
#define STR_SVT_PORTNC_("STR_SVT_PORT", "port")
+#define STR_SVT_OTHER_CMIS NC_("STR_SVT_OTHER_CMIS",
"Other CMIS")
#define STR_SVT_PRNDLG_READYNC_("STR_SVT_PRNDLG_READY",
"Ready")
#define STR_SVT_PRNDLG_PAUSED NC_("STR_SVT_PRNDLG_PAUSED",
"Paused")
#define STR_SVT_PRNDLG_PENDING NC_("STR_SVT_PRNDLG_PENDING",
"Pending deletion")
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx
b/svtools/source/dialogs/PlaceEditDialog.cxx
index e1318d1aa5dc..a8a09a739485 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -185,7 +185,7 @@ void PlaceEditDialog::InitDetails( )
continue;
}
-nPos = m_pLBServerType->InsertEntry( aTypesNamesList[i], nPos );
+nPos = m_pLBServerType->InsertEntry(
aTypesNamesList[i].replaceFirst("Other CMIS", SvtResId(STR_SVT_OTHER_CMIS)),
nPos );
std::shared_ptr
xCmisDetails(std::make_shared(this, this, sUrl));
xCmisDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/filters/DocBook_File.xcu |2 +- filter/source/config/fragments/filters/ODG_FlatXML.xcu |2 +- filter/source/config/fragments/filters/ODP_FlatXML.xcu |2 +- filter/source/config/fragments/filters/ODS_FlatXML.xcu |2 +- filter/source/config/fragments/filters/ODT_FlatXML.xcu |2 +- 5 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 1764c0358d7de602d6efaca940bde9081f7a0b65 Author: Gabor Kelemen Date: Wed Nov 29 23:23:25 2017 +0100 tdf#80713 Translate a few file format names These are visible in Tools > Options > Load/Save > General > 'Always save as' Change-Id: I879200a535b46b54653c9e0947a2e8064c72ac91 Reviewed-on: https://gerrit.libreoffice.org/45543 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/filter/source/config/fragments/filters/DocBook_File.xcu b/filter/source/config/fragments/filters/DocBook_File.xcu index 724e6ebe7114..da278f4c688f 100644 --- a/filter/source/config/fragments/filters/DocBook_File.xcu +++ b/filter/source/config/fragments/filters/DocBook_File.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor ../$(share_subdir_name)/xslt/docbook/DocBookTemplate.stw -DocBook +DocBook IMPORT EXPORT ALIEN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODG_FlatXML.xcu b/filter/source/config/fragments/filters/ODG_FlatXML.xcu index ff5fefca2f4b..c246e0a478a0 100644 --- a/filter/source/config/fragments/filters/ODG_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODG_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -Flat XML ODF Drawing +Flat XML ODF Drawing IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODP_FlatXML.xcu b/filter/source/config/fragments/filters/ODP_FlatXML.xcu index d568b432ce52..e5052aa14439 100644 --- a/filter/source/config/fragments/filters/ODP_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODP_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -Flat XML ODF Presentation +Flat XML ODF Presentation IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODS_FlatXML.xcu b/filter/source/config/fragments/filters/ODS_FlatXML.xcu index e7b1ed748a43..d18197bdd8a2 100644 --- a/filter/source/config/fragments/filters/ODS_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODS_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -Flat XML ODF Spreadsheet +Flat XML ODF Spreadsheet IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODT_FlatXML.xcu b/filter/source/config/fragments/filters/ODT_FlatXML.xcu index e23b17e1f299..e113d742c2d2 100644 --- a/filter/source/config/fragments/filters/ODT_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODT_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -Flat XML ODF Text Document +Flat XML ODF Text Document IMPORT EXPORT OWN 3RDPARTYFILTER ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/data/xlsx/built-in_ranges.xlsx |binary
sc/qa/unit/subsequent_export-test.cxx | 28
sc/source/filter/excel/xltools.cxx|6 +-
sc/source/filter/inc/xltools.hxx |4 ++--
4 files changed, 35 insertions(+), 3 deletions(-)
New commits:
commit f8b9d0fb0767d8bbe8477f92abaf6b8e0ff65546
Author: Aron Budea
Date: Tue Nov 28 07:23:12 2017 +0100
tdf#109240, tdf#112571: don't export dupe built-in named ranges
XclTools::GetBuiltInDefNameIndex(...) only checked for prefix used in
binary Excel format, and didn't recognize OOXML built-in names, which
resulted in saving them twice in OOXML files.
Adapt to check both binary and OOXML prefixes, similarly to
XclTools::IsBuiltInStyleName(...).
Saving "bad" files after the fix will purge bad "_0", "_0_0" etc.
suffixed built-in names due to how GetBuiltInDefNameIndex(...) works.
Change-Id: I1bbe11f9c654a142a4626003df4cb0fd2a0f9c71
Reviewed-on: https://gerrit.libreoffice.org/45381
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/qa/unit/data/xlsx/built-in_ranges.xlsx
b/sc/qa/unit/data/xlsx/built-in_ranges.xlsx
new file mode 100644
index ..b18a4862fdd6
Binary files /dev/null and b/sc/qa/unit/data/xlsx/built-in_ranges.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 0e7a3913ba35..06ed9dcdf9ad 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -103,6 +103,7 @@ public:
void testConditionalFormatRangeListXLSX();
void testMiscRowHeightExport();
void testNamedRangeBugfdo62729();
+void testBuiltinRangesXLSX();
void testRichTextExportODS();
void testRichTextCellFormatXLSX();
void testFormulaRefSheetNameODS();
@@ -212,6 +213,7 @@ public:
CPPUNIT_TEST(testConditionalFormatRangeListXLSX);
CPPUNIT_TEST(testMiscRowHeightExport);
CPPUNIT_TEST(testNamedRangeBugfdo62729);
+CPPUNIT_TEST(testBuiltinRangesXLSX);
CPPUNIT_TEST(testRichTextExportODS);
CPPUNIT_TEST(testRichTextCellFormatXLSX);
CPPUNIT_TEST(testFormulaRefSheetNameODS);
@@ -1159,6 +1161,32 @@ void ScExportTest::testNamedRangeBugfdo62729()
xDocSh->DoClose();
}
+void ScExportTest::testBuiltinRangesXLSX()
+{
+ScDocShellRef xShell = loadDoc("built-in_ranges.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xShell.is());
+ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+xShell->DoClose();
+
+xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/workbook.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+
+//assert the existing OOXML built-in names are still there
+assertXPathContent(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase'][@localSheetId='0']",
"'Sheet1 Test'!$A$1:$A$5");
+assertXPathContent(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase'][@localSheetId='1']",
"'Sheet2 Test'!$K$10:$K$14");
+assertXPathContent(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area'][@localSheetId='0']",
"'Sheet1 Test'!$A$1:$A$5");
+assertXPathContent(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area'][@localSheetId='1']",
"'Sheet2 Test'!$K$10:$M$18");
+
+//...and that no extra ones are added (see tdf#112571)
+assertXPath(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase_0'][@localSheetId='0']",
0);
+assertXPath(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase_0'][@localSheetId='1']",
0);
+assertXPath(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area_0'][@localSheetId='0']",
0);
+assertXPath(pDoc,
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area_0'][@localSheetId='1']",
0);
+
+xDocSh->DoClose();
+}
+
void ScExportTest::testRichTextExportODS()
{
struct
diff --git a/sc/source/filter/excel/xltools.cxx
b/sc/source/filter/excel/xltools.cxx
index 34e572460f4a..cffb346ec27b 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -482,8 +482,12 @@ OUString XclTools::GetBuiltInDefNameXml( sal_Unicode
cBuiltIn )
sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName )
{
-sal_Int32 nPrefixLen = strlen(maDefNamePrefix);
+sal_Int32 nPrefixLen = 0;
if( rDefName.startsWithIgnoreAsciiCase( maDefNamePrefix ) )
+nPrefixLen = strlen(maDefNamePrefix);
+else if( rDefName.startsWithIgnoreAsciiCase( maDefNamePrefixXml ) )
+nPrefixLen = strlen(maDefNamePrefixXml);
+if( nPrefixLen > 0 )
{
for( sal_Unicode cBuiltIn = 0; cBuiltIn < EXC_BUILTIN_UNKNOWN;
++cBuiltIn )
{
diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx
index a4a930e9fe47..497cdf9b3c60 100644
--- a
[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - kit/Delta.hpp kit/Kit.cpp loleaflet/src test/data test/DeltaTests.cpp test/Makefile.am wsd/TileDesc.hpp
dev/null |binary
kit/Delta.hpp | 221 --
kit/Kit.cpp | 10 -
loleaflet/src/core/Socket.js | 20 ---
loleaflet/src/layer/tile/TileLayer.js | 96 --
test/DeltaTests.cpp | 209
test/Makefile.am |1
wsd/TileDesc.hpp |1
8 files changed, 6 insertions(+), 552 deletions(-)
New commits:
commit 05bff893c96a57ede75576658159223ebfa02ad6
Author: Michael Meeks
Date: Fri Dec 1 21:32:18 2017 +
Revert incomplete deltas work with blue surrounds.
Pushed in error, and not ready for prime-time:
Revert "Deltas - collapse multiple rows to a single row."
This reverts commit 74f44251b782e5cab42960d1e328102a1538e72f.
Revert "Convert Javascript to row deltas."
This reverts commit fa86ba9ec5ecb418bd025c0bc7bbea8456409c07.
Revert "Make delta-builder row-based."
This reverts commit 5efb59db50a49374bcf53198f7c0a1e120754cc9.
Revert "Start of Delta unit-tests."
This reverts commit 42d264eeb00fc14bb89104c7dc8b3bcd53897e30.
Revert "Move the Delta generator out into its own file."
This reverts commit 78398d4482a5a39c87d7c0ec88fc9d357f73408c.
Revert "Insert pixels from 'new' not 'old'."
This reverts commit ed8807a1a5a613f54dfc5a204294e870969254e2.
Revert "Deltas should be pixel based, add debugging."
This reverts commit b1124c05a89007bd00f29be3e1a42d7817458048.
Revert "Start of delta creator."
This reverts commit 0bfbbf98510f82eb9a8ff3dc44254bd848458d53.
diff --git a/kit/Delta.hpp b/kit/Delta.hpp
deleted file mode 100644
index 1cc3afba..
--- a/kit/Delta.hpp
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-#ifndef INCLUDED_DELTA_HPP
-#define INCLUDED_DELTA_HPP
-
-#include
-#include
-#include
-
-#ifndef TILE_WIRE_ID
-# define TILE_WIRE_ID
- typedef uint32_t TileWireId;
-#endif
-
-/// A quick and dirty delta generator for last tile changes
-class DeltaGenerator {
-
-struct DeltaBitmapRow {
-uint64_t _crc;
-std::vector _pixels;
-
-bool identical(const DeltaBitmapRow &other) const
-{
-if (_crc != other._crc)
-return false;
-return _pixels == other._pixels;
-}
-};
-
-struct DeltaData {
-TileWireId _wid;
-int _width;
-int _height;
-std::vector _rows;
-};
-std::vector> _deltaEntries;
-
-bool makeDelta(
-const DeltaData &prev,
-const DeltaData &cur,
-std::vector& output)
-{
-// TODO: should we split and compress alpha separately ?
-if (prev._width != cur._width || prev._height != cur._height)
-{
-LOG_ERR("mis-sized delta: " << prev._width << "x" << prev._height
<< " vs "
-<< cur._width << "x" << cur._height);
-return false;
-}
-
-output.push_back('D');
-LOG_TRC("building delta of a " << cur._width << "x" << cur._height <<
" bitmap");
-
-// row move/copy src/dest is a byte.
-assert (prev._height <= 256);
-// column position is a byte.
-assert (prev._width <= 256);
-
-// How do the rows look against each other ?
-size_t lastMatchOffset = 0;
-size_t lastCopy = 0;
-for (int y = 0; y < prev._height; ++y)
-{
-// Life is good where rows match:
-if (prev._rows[y].identical(cur._rows[y]))
-continue;
-
-// Hunt for other rows
-bool matched = false;
-for (int yn = 0; yn < prev._height && !matched; ++yn)
-{
-size_t match = (y + lastMatchOffset + yn) % prev._height;
-if (prev._rows[match].identical(cur._rows[y]))
-{
-// TODO: if offsets are >256 - use 16bits?
-if (lastCopy > 0)
-{
-char cnt = output[lastCopy];
-if (output[lastCopy + 1] + cnt == (char)(match) &&
-output[lastCopy + 2] + cnt == (char)(y))
-{
-output[lastCopy]++;
-matched = true;
-continue;
-}
-}
-
-lastMatchOffset = match - y;
-output.push_back('c'); // copy-row
-
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - framework/source
framework/source/services/desktop.cxx | 30 +-
1 file changed, 25 insertions(+), 5 deletions(-)
New commits:
commit 0cf210ce702d8a9fc99c326962b05c10cf4cedde
Author: Michael Stahl
Date: Wed Nov 29 15:18:12 2017 +0100
tdf#114025 framework: avoid deadlock between Desktop init ...
... and SolarMutex: the problem is that rtl::StaticWithArg will
first lock the implicit mutex of the C++11 static variable, and
then the SolarMutex.
So if one thread creates the Desktop singleton with SolarMutex
locked and another thread without SolarMutex locked, this can
deadlock.
If we use rtl_Instance directly with SolarMutex, then there is
still a static variable, but the SolarMutex will always be locked
first, preventing this deadlock.
Change-Id: Ibd37fdfa96a4a2b57f661be3814dd597eb52d338
Reviewed-on: https://gerrit.libreoffice.org/45508
Reviewed-by: Michael Meeks
Tested-by: Jenkins
(cherry picked from commit fa9c083c6071a0a4dc812f3c34731f347ddbabf7)
Reviewed-on: https://gerrit.libreoffice.org/45672
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/framework/source/services/desktop.cxx
b/framework/source/services/desktop.cxx
index 20afab1ef700..81c29ab973c3 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1789,10 +1789,30 @@ struct Instance {
rtl::Reference instance;
};
-struct Singleton:
-public rtl::StaticWithArg<
-Instance, css::uno::Reference, Singleton>
-{};
+struct InstanceInit {
+Instance * operator() (css::uno::Reference
const& xContext) {
+static Instance instance(xContext);
+return &instance;
+}
+};
+
+struct GetSolarMutex {
+comphelper::SolarMutex * operator() ()
+{
+return &Application::GetSolarMutex();
+}
+};
+
+Instance & getInstance(css::uno::Reference const&
xContext)
+{
+// tdf#114025 init with SolarMutex to avoid deadlock
+return *rtl_Instance,
+ GetSolarMutex,
+ css::uno::Reference
const>
+::create(InstanceInit(), GetSolarMutex(), xContext);
+}
}
@@ -1801,7 +1821,7 @@ com_sun_star_comp_framework_Desktop_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence const &)
{
-return cppu::acquire(Singleton::get(context).instance.get());
+return cppu::acquire(getInstance(context).instance.get());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [CREATE] freieFarbe/freeColour HLC colour system to be accepted as a national standard for "Open Colour Communication" in Germany
Congratulations Christoph! Do you have an article we could link to on social media for the Fashion Freedom Initiative (https://fashionfreedom.eu)? This will beneficially affect many industries. Best, Susan On Nov 30, 2017 19:36, Christoph Schäfer wrote: > Hi all, > > > > I have some incredible news for you. > > > Yesterday freieFarbe/freeColour received a message from the German > industrial standards organisation (DIN) that our proposal for an open > standard for "Open Colour Communication" based on the HLC colour model (aka > as Lhc) has been accepted and will become a German national standard soon > (because we have prepared this carefully during 2016 and 2017). > > > What does this mean? First, it will no longer be an initiative by a tiny > non-profit organisation, but a national standard, and since DIN is very > influential internationally, it will become a de-facto standard in other > countries as well. Plus, it may be possible to make this an ISO standard > via DIN. > > > In addition, DIN will support the formulation of the standard and our work > with substantial sums, not the least because the creation of a standard and > pushing its way through all the respective instances and expert checks is > expensive (would've been 25,000 EUR in our case, which has been reduced to > zero, because it's an open and non-commercial project). We will also > receive some money for meetings, travel expenses etc. from DIN. > > > One of the reasons we got so far is support by parts of the printing > industry in Germany and Switzerland. The prototype of the printed colour > reference, which we presented to DIN, was only possible thanks to a > donation of inks by an international manufacturer of digitial printing > machines. We're currently cooperating with ink manufacturers in Germany and > Switzerland to establish ink formulas for HLC colours that cannot be > reproduced in CMYK, aka as spot colours, so printing companies can actually > order spot colour inks by just inserting the HLC colour code in their order > forms. > > > The printed colour reference has the form a ring binder. Colours are > sorted by their H-values (H=Hue) in steps of ten. Luminacity (L) uses steps > of five, and chroma (C) also steps of ten. We plan to refine this later to > also present the H-values in steps of five. > > > This is a real colour system and not just a colour collection like Pantone > or RAL. Most importantly, it is a free and open alternative to Pantone & > co, which is not only better, but also supported by a national standards > organisation and some major players in the industry. There are no licensing > costs to pay for anyone who wants to use the colour system, not for > software producers and neither for the ink mixing formulas. The latter is > important, because vendors like Pantone ask for a lot of money from ink > producers for the mixing formulas, whilst the open HLC system is gratis. > > > The PDF version of the colour reference and the digital colour palettes > will be published under a CC licence (CC BY-ND 4.0). The printed colour > reference will cost some money to cover the production costs, but it will > be much cheaper than the ones from Pantone & co, because we only need to > cover our expenses and do not intend/aren't allowed to as a non-profit > organisation to commercialise it. Moreover, everyone else will be free to > print their own references, and there are no trademarks involved. > > > Another important aspect is that the HLC colour system, being a national > standard, will be very hard to attack legally by commercial vendors like > Pantone or RAL, who are known to play hardball when it comes to > competition. They would have to take on DIN, which I'm sure they'll think > about twice. > > > We'll start with Germany and Switzerland, because that's where most of our > members and supporters are from, but we plan to release an English version > of the colour reference as soon as the colour system has been formally > adapted as a standard. > > > Currently, an older version of the HLC palette is already included in > Scribus 1.5.3+ (L*a*b*) and the latest LibreOffice (sRGB). And speaking of > Scribus, the juicy bit is that the colour reference will most likely be > produced with Scribus 1.5.4svn, because it offers the highest colour > precision for fill colours (64 bit). No other DTP software comes close in > this regard. > > > > Christoph > ___ > CREATE mailing list > cre...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/create > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
