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.
4 new defect(s) introduced to LibreOffice found with Coverity Scan.
17 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 4 of 4 defect(s)
** CID 1398527: Error handling issues (UNCAUGHT_EXCEPT)
/scripting/source/dlgprov/dlgprov.cxx: 615 in
dlgprov::DialogProviderImpl::createDialogImpl(const rtl::OUString &, const
com::sun::star::uno::Reference &, const
com::sun::star::uno::Reference &, bool)()
*** CID 1398527: Error handling issues (UNCAUGHT_EXCEPT)
/scripting/source/dlgprov/dlgprov.cxx: 615 in
dlgprov::DialogProviderImpl::createDialogImpl(const rtl::OUString &, const
com::sun::star::uno::Reference &, const
com::sun::star::uno::Reference &, bool)()
609
610 // XDialogProvider
611
612
613 static const char aDecorationPropName[] = "Decoration";
614
>>> CID 1398527: Error handling issues (UNCAUGHT_EXCEPT)
>>> An exception of type "std::length_error" is thrown but the throw list
>>> "throw(com::sun::star::uno::RuntimeException,
>>> com::sun::star::lang::IllegalArgumentException)" doesn't allow it to be
>>> thrown. This will cause a call to unexpected() which usually calls
>>> terminate().
615 Reference < XControl > DialogProviderImpl::createDialogImpl(
616 const OUString& URL, const Reference< XInterface >& xHandler,
617 const Reference< XWindowPeer >& xParent, bool
bDialogProviderMode )
618 throw (IllegalArgumentException, RuntimeException)
619 {
620 // if the dialog is located in a document, the document must
already be open!
** CID 1398526: Error handling issues (UNCAUGHT_EXCEPT)
/i18npool/source/localedata/localedata.cxx: 602 in
com::sun::star::i18n::LocaleDataImpl::getCalendarItemByName(const rtl::OUString
&, const com::sun::star::lang::Locale &, const
com::sun::star::uno::Sequence &, short)()
*** CID 1398526: Error handling issues (UNCAUGHT_EXCEPT)
/i18npool/source/localedata/localedata.cxx: 602 in
com::sun::star::i18n::LocaleDataImpl::getCalendarItemByName(const rtl::OUString
&, const com::sun::star::lang::Locale &, const
com::sun::star::uno::Sequence &, short)()
596 #define REF_MONTHS 1
597 #define REF_GMONTHS 2
598 #define REF_PMONTHS 3
599 #define REF_ERAS 4
600 #define REF_OFFSET_COUNT 5
601
>>> CID 1398526: Error handling issues (UNCAUGHT_EXCEPT)
>>> An exception of type "std::length_error" is thrown but the throw list
>>> "throw(com::sun::star::uno::RuntimeException)" doesn't allow it to be
>>> thrown. This will cause a call to unexpected() which usually calls
>>> terminate().
602 Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const
OUString& name,
603 const Locale& rLocale, const Sequence< Calendar2 >&
calendarsSeq, sal_Int16 item)
604 throw(RuntimeException)
605 {
606 if (!ref_name.equals(name)) {
607 OUString aLocStr, id;
** CID 1398525: Error handling issues (UNCAUGHT_EXCEPT)
/filter/source/config/cache/filtercache.cxx: 1516 in
filter::config::FilterCache::impl_readPatchUINames(const
com::sun::star::uno::Reference &,
filter::config::CacheItem &)()
*** CID 1398525: Error handling issues (UNCAUGHT_EXCEPT)
/filter/source/config/cache/filtercache.cxx: 1516 in
filter::config::FilterCache::impl_readPatchUINames(const
com::sun::star::uno::Reference &,
filter::config::CacheItem &)()
1510 default: break;
1511 }
1512 }
1513 }
1514
1515
>>> CID 1398525: Error handling issues (UNCAUGHT_EXCEPT)
>>> An exception of type "std::length_error" is thrown but the throw list
>>> "throw(com::sun::star::uno::Exception)" doesn't allow it to be thrown. This
>>> will cause a call to unexpected() which usually calls terminate().
1516 void FilterCache::impl_readPatchUINames(const css::uno::Reference<
css::container::XNameAccess >& xNode,
1517 CacheItem&
rItem)
1518 throw(css::uno::Exception)
1519 {
1520
1521 // SAFE -> --
** CID 1398524: Error handling issues (UNCAUGHT_EXCEPT)
/linguistic/source/lngsvcmgr.cxx: 2019 in LngSvcMgr_CreateInstance(const
com::sun::star::uno::Reference &)()
*** C
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/financial/fods/tbilleq.fods | 3125 ++ 1 file changed, 3125 insertions(+) New commits: commit ea56ac812f254a62c1ad4d2fe4651c07269b40ba Author: ZdenÄk Crhonek Date: Sat Jan 7 12:21:10 2017 +0100 add TBILLEQ test case Change-Id: I2a58b90f050007347489299073bc4eef339af678 Reviewed-on: https://gerrit.libreoffice.org/32815 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/financial/fods/tbilleq.fods b/sc/qa/unit/data/functions/financial/fods/tbilleq.fods new file mode 100644 index 000..9057f93 --- /dev/null +++ b/sc/qa/unit/data/functions/financial/fods/tbilleq.fods @@ -0,0 +1,3125 @@ + + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns: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: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:form x="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.spreadsheet"> + 2016-07-19T11:56:05.71800P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64 LibreOffice_project/92a1ad1f36b6d3cc13135a8c0805508933011577 + + + 0 + 0 + 53793 + 12387 + + + view1 + + + 2 + 8 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 75 + 60 + true + false + + + 1 + 26 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 75 + 60 + true + false + + + Sheet2 + 1241 + 0 + 75 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + false + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + cs + CZ + + + + + + en + US + + + + + + nl + NL + + + + + + true + true + 3 + 1 + true + 1 + true + lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg== + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + + + + + + + ( + + ) + + + + - + + + + + + + + + + + + + + KÄ + + + - + + + KÄ + + + + + + KÄ + + + - + + + KÄ + + + + + + KÄ + + + + - + + + KÄ + + + + + +
[Libreoffice-commits] core.git: 27 commits - basegfx/test compilerplugins/clang connectivity/source desktop/source filter/source helpcompiler/source i18nlangtag/source i18npool/source linguistic/sourc
basegfx/test/basegfx2d.cxx | 26 - basegfx/test/boxclipper.cxx | 36 +- basegfx/test/clipstate.cxx | 15 - basegfx/test/genericclipper.cxx |8 compilerplugins/clang/conststringvar.cxx| 136 ++ compilerplugins/clang/stringconstant.cxx| 14 + connectivity/source/drivers/calc/CConnection.cxx|4 connectivity/source/drivers/evoab2/NConnection.cxx |4 connectivity/source/drivers/jdbc/Array.cxx | 16 - connectivity/source/drivers/jdbc/Blob.cxx | 12 connectivity/source/drivers/jdbc/CallableStatement.cxx | 14 - connectivity/source/drivers/jdbc/Clob.cxx | 12 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 24 - connectivity/source/drivers/jdbc/InputStream.cxx|4 connectivity/source/drivers/jdbc/JBigDecimal.cxx|4 connectivity/source/drivers/jdbc/JConnection.cxx|8 connectivity/source/drivers/jdbc/JStatement.cxx | 14 - connectivity/source/drivers/jdbc/PreparedStatement.cxx | 30 +- connectivity/source/drivers/jdbc/Reader.cxx |8 connectivity/source/drivers/jdbc/ResultSet.cxx | 24 - connectivity/source/drivers/jdbc/Timestamp.cxx |6 connectivity/source/drivers/jdbc/tools.cxx | 10 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |4 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |2 desktop/source/migration/services/wordbookmigration.cxx |2 filter/source/msfilter/escherex.cxx |2 filter/source/msfilter/msdffimp.cxx |2 helpcompiler/source/HelpLinker.cxx |2 i18nlangtag/source/isolang/inunx.cxx|4 i18npool/source/nativenumber/nativenumbersupplier.cxx |6 linguistic/source/dicimp.cxx|6 oox/source/export/chartexport.cxx |4 oox/source/export/drawingml.cxx |8 opencl/source/openclwrapper.cxx |2 sal/osl/unx/profile.cxx |2 sal/qa/rtl/strings/test_oustring_compare.cxx|6 sax/source/tools/converter.cxx | 10 sc/qa/unit/tiledrendering/tiledrendering.cxx|2 sc/qa/unit/ucalc_sharedformula.cxx |6 sc/source/core/opencl/formulagroupcl.cxx|2 sc/source/filter/dif/difexp.cxx | 32 +- sc/source/ui/unoobj/dispuno.cxx | 16 - scaddins/source/analysis/analysishelper.cxx |2 sd/qa/unit/tiledrendering/tiledrendering.cxx|2 sd/source/filter/html/htmlex.cxx| 16 - sd/source/ui/remotecontrol/BluetoothServer.cxx |2 sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx |2 sdext/source/pdfimport/test/tests.cxx | 12 sfx2/source/appl/sfxhelp.cxx|8 sfx2/source/doc/SfxDocumentMetaData.cxx | 37 +- sfx2/source/sidebar/Deck.cxx|2 shell/source/unix/sysshell/recently_used_file_handler.cxx | 10 starmath/qa/cppunit/test_nodetotextvisitors.cxx |4 svx/source/dialog/hexcolorcontrol.cxx |2 svx/source/form/fmsrccfg.cxx|2 sw/qa/extras/tiledrendering/tiledrendering.cxx |2 sw/qa/extras/uiwriter/uiwriter.cxx |2 sw/source/core/text/xmldump.cxx |2 sw/source/filter/html/css1atr.cxx |2 sw/source/filter/html/wrthtml.cxx |2 sw/source/uibase/uno/unodispatch.cxx| 34 +- unodevtools/source/skeletonmaker/javacompskeleton.cxx |2 unodevtools/source/skeletonmaker/skeletonmaker.cxx |4 unoxml/source/rdf/librdf_repository.cxx |2 vcl/source/font/font.cxx| 10 vcl/source/fontsubset/sft.cxx | 42 +-- vcl/source/opengl/OpenGLHelper.cxx |2 vcl/unx/generic/fontmanager/fontmanager.cxx |2
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 841f48fcb5431b241eca406209cd67df9dccd9ec
Author: Arnaud Versini
Date: Sun Dec 18 15:48:45 2016 +0100
accessibility: prevent possible deadlock
Change-Id: I1dc409644ed2e2bdd0cd38c8343c4ada1af7127b
Reviewed-on: https://gerrit.libreoffice.org/32137
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index e9fc495..2f70633 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -50,7 +50,8 @@
AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR
*/
::utl::AccessibleStateSetHelper*
AccessibleBrowseBoxHeaderCell::implCreateStateSetHelper()
{
-::osl::MutexGuard aGuard( getMutex() );
+SolarMethodGuard aGuard( getMutex() );
+
::utl::AccessibleStateSetHelper*
pStateSetHelper = new ::utl::AccessibleStateSetHelper;
@@ -60,7 +61,6 @@
AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR
if( implIsShowing() )
pStateSetHelper->AddState( AccessibleStateType::SHOWING );
-SolarMutexGuard aSolarGuard;
mpBrowseBox->FillAccessibleStateSet( *pStateSetHelper, getType() );
pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/qa sw/source
sw/qa/extras/uiwriter/data/tdf104814.docx |binary
sw/qa/extras/uiwriter/uiwriter.cxx| 14 ++
sw/source/core/doc/DocumentRedlineManager.cxx |4
3 files changed, 18 insertions(+)
New commits:
commit 5b5f351785670e7310e0c074d8b96f2538cf0f2f
Author: Noel Grandin
Date: Tue Dec 20 15:57:43 2016 +0200
tdf#104814 Writer: accepting change tracking changes get stuck
Reviewed-on: https://gerrit.libreoffice.org/32273
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit b7b5c23e6979205a662d857bc1c83270fb4a43ec)
Reviewed-on: https://gerrit.libreoffice.org/32276
Change-Id: Ie8e0919b53c0b21f480b62eec7c394554757a061
Reviewed-on: https://gerrit.libreoffice.org/32887
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/qa/extras/uiwriter/data/tdf104814.docx
b/sw/qa/extras/uiwriter/data/tdf104814.docx
new file mode 100644
index 000..1f1c524
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf104814.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 5dcb81e..bbd1670 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -200,6 +200,7 @@ public:
void testTdf84695();
void testTdf84695NormalChar();
void testTdf78727();
+void testTdf104814();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -302,6 +303,7 @@ public:
CPPUNIT_TEST(testTdf84695);
CPPUNIT_TEST(testTdf84695NormalChar);
CPPUNIT_TEST(testTdf78727);
+CPPUNIT_TEST(testTdf104814);
CPPUNIT_TEST_SUITE_END();
private:
@@ -3716,6 +3718,18 @@ void SwUiWriterTest::testTdf78727()
CPPUNIT_ASSERT(SwTextBoxHelper::getCount(pPage, aSet) > 1);
}
+// accepting change tracking gets stuck on change
+void SwUiWriterTest::testTdf104814()
+{
+SwDoc* const pDoc1(createDoc("tdf104814.docx"));
+
+SwEditShell* const pEditShell(pDoc1->GetEditShell());
+
+// accept all redlines
+while(pEditShell->GetRedlineCount())
+pEditShell->AcceptRedline(0);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 99e9fcb..3841491 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -274,6 +274,10 @@ namespace
rArr.DeleteAndDestroy( rPos-- );
break;
+case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT:
+rArr.DeleteAndDestroy( rPos-- );
+break;
+
default:
bRet = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal sal/inc sal/osl sal/util
include/sal/detail/log.h |1 -
include/sal/log.hxx | 24 +---
sal/inc/misc.hxx |2 +-
sal/osl/all/log.cxx | 29 -
sal/osl/unx/backtraceapi.cxx |2 +-
sal/osl/w32/backtrace.cxx|6 +++---
sal/util/sal.map |5 +
7 files changed, 51 insertions(+), 18 deletions(-)
New commits:
commit 56d071c10ca8016848f1f059aa3eb197fe928844
Author: Noel Grandin
Date: Thu Dec 8 11:22:37 2016 +0200
rename SAL_DEBUG_TRACE to SAL_DEBUG_BACKTRACE
since "trace" is such a generic term, this makes it easier to actually find
the feature when you need it.
And add feature to limit stack depth of the reported backtrace.
Change-Id: Iab3e4ceb2e8480e7b5e2b920eb6c5d7631e21c43
Reviewed-on: https://gerrit.libreoffice.org/31752
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/include/sal/detail/log.h b/include/sal/detail/log.h
index ab97185..11ece36 100644
--- a/include/sal/detail/log.h
+++ b/include/sal/detail/log.h
@@ -52,7 +52,6 @@ extern "C" {
enum sal_detail_LogLevel {
SAL_DETAIL_LOG_LEVEL_INFO, SAL_DETAIL_LOG_LEVEL_WARN,
-SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE = SAL_MAX_ENUM - 1,
SAL_DETAIL_LOG_LEVEL_DEBUG = SAL_MAX_ENUM
};
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 8b4ef0a..4438ec5 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -30,6 +30,10 @@ extern "C" SAL_DLLPUBLIC void SAL_CALL sal_detail_log(
enum sal_detail_LogLevel level, char const * area, char const * where,
char const * message);
+extern "C" SAL_DLLPUBLIC void SAL_CALL sal_detail_log_backtrace(
+enum sal_detail_LogLevel level, char const * area, char const * where,
+char const * message, int maxNoStackFramesToDisplay);
+
namespace sal { namespace detail {
inline void SAL_CALL log(
@@ -343,9 +347,23 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER
StreamIgnore const &) {
See @ref sal_log "basic logging functionality" for details.
*/
-#define SAL_DEBUG_TRACE(stream) \
-SAL_DETAIL_LOG_STREAM( \
-SAL_LOG_TRUE, ::SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE, NULL, NULL, stream)
+#define SAL_DEBUG_BACKTRACE(stream, maxNoStackFramesToDisplay) \
+do { \
+if (sizeof ::sal::detail::getResult(::sal::detail::StreamStart() <<
stream) == 1) \
+{ \
+::sal_detail_log_backtrace( \
+::SAL_DETAIL_LOG_LEVEL_DEBUG, NULL, NULL, \
+::sal::detail::unwrapStream( \
+::sal::detail::StreamStart() << stream)); \
+} else { \
+::std::ostringstream sal_detail_stream; \
+sal_detail_stream << stream; \
+::sal::detail::log( \
+::SAL_DETAIL_LOG_LEVEL_DEBUG, NULL, NULL, sal_detail_stream); \
+} \
+} while (false)
+
+
#endif
diff --git a/sal/inc/misc.hxx b/sal/inc/misc.hxx
index b93868e..440c00c 100644
--- a/sal/inc/misc.hxx
+++ b/sal/inc/misc.hxx
@@ -12,7 +12,7 @@
#include
/// Build a debugging backtrace from current PC location.
-rtl_uString *osl_backtraceAsString(void);
+rtl_uString *osl_backtraceAsString(int maxNoStackFramesToDisplay);
#endif // INCLUDED_SAL_INC_INTERNAL_MISC_H
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 23f45cd..7245a51 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -68,7 +68,6 @@ char const * toString(sal_detail_LogLevel level) {
case SAL_DETAIL_LOG_LEVEL_WARN:
return "warn";
case SAL_DETAIL_LOG_LEVEL_DEBUG:
-case SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE:
return "debug";
default:
assert(false); // this cannot happen
@@ -188,8 +187,7 @@ void maybeOutputTimestamp(std::ostringstream &s) {
#endif
bool isDebug(sal_detail_LogLevel level) {
-return level == SAL_DETAIL_LOG_LEVEL_DEBUG ||
-level == SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE;
+return level == SAL_DETAIL_LOG_LEVEL_DEBUG;
}
bool report(sal_detail_LogLevel level, char const * area) {
@@ -298,10 +296,6 @@ void log(
}
s << message;
-if (level == SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE) {
-s << " at:\n";
-s << OUString(osl_backtraceAsString(), SAL_NO_ACQUIRE);
-}
s << '\n';
#if defined ANDROID
@@ -314,7 +308,6 @@ void log(
android_log_level = ANDROID_LOG_WARN;
break;
case SAL_DETAIL_LOG_LEVEL_DEBUG:
-case SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE:
android_log_level = ANDROID_LOG_DEBUG;
break;
default:
@@ -336,7 +329,6 @@ void log(
prio = LOG_WARNING;
break;
case SAL_DETAIL_LOG_LEVEL_DEBUG:
-case SAL_DETAIL_LOG_LEVEL_DEBUG_TRACE:
prio = LOG_DEBUG;
break;
default:
@@ -359,6 +351,16 @@ void log(
#endif
}
+void log_backtrace(
+sal_detail_LogLevel level, char const * area, char const * where,
+char const * message, int maxNoStackFramesToDisplay)
+{
+OUStr
[Libreoffice-commits] core.git: framework/source include/svl sc/source svl/source vcl/inc vcl/source vcl/unx
framework/source/uiconfiguration/ImageList.cxx | 24 ---
framework/source/uiconfiguration/ImageList.hxx |2
include/svl/languageoptions.hxx|1
sc/source/filter/inc/biffcodec.hxx | 21 --
sc/source/filter/oox/biffcodec.cxx | 47 --
svl/source/config/languageoptions.cxx |6 -
vcl/inc/unx/fc_fontoptions.hxx |4 -
vcl/source/gdi/impvect.cxx | 83 -
vcl/source/gdi/impvect.hxx |1
vcl/unx/generic/print/psputil.cxx | 42
vcl/unx/generic/print/psputil.hxx | 13 ---
11 files changed, 244 deletions(-)
New commits:
commit 014b9ac2e4ec22a1eed2fde806edd7a840035a45
Author: Noel Grandin
Date: Mon Jan 9 10:35:25 2017 +0200
loplugin:unusedmethods
Change-Id: Ibe11923601760ded53a277c48631e4893606b2d6
Reviewed-on: https://gerrit.libreoffice.org/32875
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/uiconfiguration/ImageList.cxx
b/framework/source/uiconfiguration/ImageList.cxx
index 389c016..cdceb4b 100644
--- a/framework/source/uiconfiguration/ImageList.cxx
+++ b/framework/source/uiconfiguration/ImageList.cxx
@@ -229,11 +229,6 @@ sal_uInt16 ImageList::GetImagePos( sal_uInt16 nId ) const
return IMAGELIST_IMAGE_NOTFOUND;
}
-bool ImageList::HasImageForId( sal_uInt16 nId ) const
-{
-return GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND;
-}
-
sal_uInt16 ImageList::GetImagePos( const OUString& rImageName ) const
{
if( mpImplData && !rImageName.isEmpty() )
@@ -281,25 +276,6 @@ void ImageList::GetImageNames( std::vector< OUString >&
rNames ) const
}
}
-Size ImageList::GetImageSize() const
-{
-Size aRet;
-
-if( mpImplData )
-{
-aRet = mpImplData->maImageSize;
-
-// force load of 1st image to see - uncommon case.
-if( aRet.Width() == 0 && aRet.Height() == 0 &&
-!mpImplData->maImages.empty() )
-{
-Image aTmp = GetImage( mpImplData->maImages[ 0 ]->mnId );
-aRet = mpImplData->maImageSize = aTmp.GetSizePixel();
-}
-}
-return aRet;
-}
-
bool ImageList::operator==( const ImageList& rImageList ) const
{
bool bRet = false;
diff --git a/framework/source/uiconfiguration/ImageList.hxx
b/framework/source/uiconfiguration/ImageList.hxx
index 426a626..d6db88c 100644
--- a/framework/source/uiconfiguration/ImageList.hxx
+++ b/framework/source/uiconfiguration/ImageList.hxx
@@ -31,7 +31,6 @@ public:
const std::vector< OUString > &rNameVector
);
BitmapExGetAsHorizontalStrip() const;
sal_uInt16 GetImageCount() const;
-SizeGetImageSize() const;
voidAddImage( const OUString& rImageName, const Image& rImage
);
@@ -43,7 +42,6 @@ public:
Image GetImage( const OUString& rImageName ) const;
sal_uInt16 GetImagePos( sal_uInt16 nId ) const;
-boolHasImageForId( sal_uInt16 nId ) const;
sal_uInt16 GetImagePos( const OUString& rImageName ) const;
sal_uInt16 GetImageId( sal_uInt16 nPos ) const;
diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index f223904..9967080 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
@@ -128,7 +128,6 @@ public:
LanguageTypeGetWin16SystemLanguage() const;
-boolisCTLKeyboardLayoutInstalled() const;
boolisCJKKeyboardLayoutInstalled() const;
};
diff --git a/sc/source/filter/inc/biffcodec.hxx
b/sc/source/filter/inc/biffcodec.hxx
index 959fed5..fed33b8 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -50,13 +50,6 @@ private:
virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword(
const OUString& rPassword ) = 0;
virtual bool implVerifyEncryptionData( const css::uno::Sequence<
css::beans::NamedValue >& rEncryptionData ) = 0;
-/** Implementation of decryption of a memory block. */
-virtual voidimplDecode(
-sal_uInt8* pnDestData,
-const sal_uInt8* pnSrcData,
-sal_Int64 nStreamPos,
-sal_uInt16 nBytes ) = 0;
-
private:
boolmbValid;/// True = decoder is correctly
initialized.
};
@@ -74,13 +67,6 @@ private:
virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword(
const OUString& rPassword ) override;
virtual bool implVerifyEncryptionData( const css::uno::Sequence<
css::beans::NamedValue >& rEncryptionData ) override;
-/** Implementation of decryption of a memory block. */
-virtual voidimplDecode(
-sal_uInt8* pnDestData,
-const sal_uInt8* pnSrcDa
[Libreoffice-commits] core.git: chart2/source sw/inc sw/source vcl/inc vcl/source vcl/unx xmlsecurity/inc xmlsecurity/source
chart2/source/model/template/BubbleChartTypeTemplate.cxx |2 -
chart2/source/model/template/BubbleDataInterpreter.cxx |5 +---
chart2/source/model/template/BubbleDataInterpreter.hxx |3 --
chart2/source/model/template/ChartTypeTemplate.cxx |2 -
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx |2 -
chart2/source/model/template/ColumnLineDataInterpreter.cxx |5 +---
chart2/source/model/template/ColumnLineDataInterpreter.hxx |3 --
chart2/source/model/template/DataInterpreter.cxx |4 ---
chart2/source/model/template/DataInterpreter.hxx |5
chart2/source/model/template/ScatterChartTypeTemplate.cxx|2 -
chart2/source/model/template/StockChartTypeTemplate.cxx |2 -
chart2/source/model/template/StockDataInterpreter.cxx|5 +---
chart2/source/model/template/StockDataInterpreter.hxx|3 --
chart2/source/model/template/XYDataInterpreter.cxx |5 +---
chart2/source/model/template/XYDataInterpreter.hxx |2 -
sw/inc/unocrsr.hxx | 10 +++--
sw/source/core/unocore/unoobj.cxx|2 -
vcl/inc/unx/fontmanager.hxx |1
vcl/inc/unx/glyphcache.hxx |6 -
vcl/source/gdi/pdfwriter_impl.hxx| 12 ---
vcl/unx/generic/fontmanager/fontmanager.cxx |1
vcl/unx/generic/glyphs/freetype_glyphcache.cxx |1
xmlsecurity/inc/framework/signaturecreatorimpl.hxx |2 -
xmlsecurity/inc/framework/signatureengine.hxx|5
xmlsecurity/inc/framework/signatureverifierimpl.hxx |3 --
xmlsecurity/inc/pdfsignaturehelper.hxx |3 --
xmlsecurity/inc/xsecctl.hxx |6 -
xmlsecurity/source/framework/signaturecreatorimpl.cxx|8 +++
xmlsecurity/source/framework/signatureengine.cxx |4 +--
xmlsecurity/source/framework/signatureverifierimpl.cxx |8 +++
xmlsecurity/source/helper/documentsignaturemanager.cxx |2 -
xmlsecurity/source/helper/pdfsignaturehelper.cxx |3 --
xmlsecurity/source/helper/xsecctl.cxx|1
xmlsecurity/source/helper/xsecsign.cxx |2 -
xmlsecurity/source/helper/xsecverify.cxx |2 -
35 files changed, 43 insertions(+), 89 deletions(-)
New commits:
commit b0229855057ed4d73e73ecd8c501a4564f2237ce
Author: Noel Grandin
Date: Mon Jan 9 09:22:34 2017 +0200
loplugin:unusedfields
Change-Id: I9611511cb3480734dea3c3cbaf0d659071366ad1
Reviewed-on: https://gerrit.libreoffice.org/32873
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 1d03e50..dfda9be 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -206,7 +206,7 @@ Reference< chart2::XDataInterpreter > SAL_CALL
BubbleChartTypeTemplate::getDataI
throw (uno::RuntimeException, std::exception)
{
if( ! m_xDataInterpreter.is())
-m_xDataInterpreter.set( new BubbleDataInterpreter(
GetComponentContext()) );
+m_xDataInterpreter.set( new BubbleDataInterpreter );
return m_xDataInterpreter;
}
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx
b/chart2/source/model/template/BubbleDataInterpreter.cxx
index ac29630..76b2028 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -36,9 +36,8 @@ using ::com::sun::star::uno::Sequence;
namespace chart
{
-BubbleDataInterpreter::BubbleDataInterpreter(
-const uno::Reference< uno::XComponentContext > & xContext ) :
-DataInterpreter( xContext )
+BubbleDataInterpreter::BubbleDataInterpreter() :
+DataInterpreter()
{
}
diff --git a/chart2/source/model/template/BubbleDataInterpreter.hxx
b/chart2/source/model/template/BubbleDataInterpreter.hxx
index 4f08d05..59ad9a8 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.hxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.hxx
@@ -27,8 +27,7 @@ namespace chart
class BubbleDataInterpreter : public DataInterpreter
{
public:
-explicit BubbleDataInterpreter(
-const css::uno::Reference< css::uno::XComponentContext > & xContext );
+explicit BubbleDataInterpreter();
virtual ~BubbleDataInterpreter() override;
protected:
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 1b62e7a..06915ba 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/so
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slideshow/slideshowimpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bce35b8e13b0d82ba54bf3d380f448dad0ee13bb
Author: Julien Nabet
Date: Mon Jan 9 18:24:35 2017 +0100
Related tdf#100151: use disposeAndClear for mpShowWindow (sd)
See https://bugs.documentfoundation.org/show_bug.cgi?id=100151#c33
Change-Id: I81e483189eacee086b680367148f8dd3ca2d3493
Reviewed-on: https://gerrit.libreoffice.org/32904
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index f7402f5..350ca3e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -716,7 +716,7 @@ void SAL_CALL SlideshowImpl::disposing()
if( mpShowWindow )
{
-mpShowWindow.clear();
+mpShowWindow.disposeAndClear();
}
setActiveXToolbarsVisible( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/MessageQueue.cpp common/MessageQueue.hpp
common/MessageQueue.cpp | 70 -
common/MessageQueue.hpp | 90 +---
2 files changed, 72 insertions(+), 88 deletions(-)
New commits:
commit 09fe0b689a28b50b5652fda0be46c7e478babdf4
Author: Ashod Nakashian
Date: Mon Jan 9 13:38:07 2017 -0500
wsd: templatized MessageQueue
Change-Id: Ieb6b6c289d8348cafc82041e6e719409cc329edd
Reviewed-on: https://gerrit.libreoffice.org/32919
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index d6e1eed..4d26a5a 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -19,74 +19,6 @@
using Poco::StringTokenizer;
-MessageQueue::~MessageQueue()
-{
-clear();
-}
-
-void MessageQueue::put(const Payload& value)
-{
-std::unique_lock lock(_mutex);
-put_impl(value);
-lock.unlock();
-_cv.notify_one();
-}
-
-MessageQueue::Payload MessageQueue::get(const unsigned timeoutMs)
-{
-std::unique_lock lock(_mutex);
-
-if (timeoutMs > 0)
-{
-if (!_cv.wait_for(lock, std::chrono::milliseconds(timeoutMs),
- [this] { return wait_impl(); }))
-{
-throw std::runtime_error("Timed out waiting to get queue item.");
-}
-}
-else
-{
-_cv.wait(lock, [this] { return wait_impl(); });
-}
-
-return get_impl();
-}
-
-void MessageQueue::clear()
-{
-std::unique_lock lock(_mutex);
-clear_impl();
-}
-
-void MessageQueue::remove_if(const std::function& pred)
-{
-std::unique_lock lock(_mutex);
-std::remove_if(_queue.begin(), _queue.end(), pred);
-}
-
-void MessageQueue::put_impl(const Payload& value)
-{
-const auto msg = std::string(value.data(), value.size());
-_queue.push_back(value);
-}
-
-bool MessageQueue::wait_impl() const
-{
-return _queue.size() > 0;
-}
-
-MessageQueue::Payload MessageQueue::get_impl()
-{
-Payload result = _queue.front();
-_queue.erase(_queue.begin());
-return result;
-}
-
-void MessageQueue::clear_impl()
-{
-_queue.clear();
-}
-
void TileQueue::put_impl(const Payload& value)
{
const auto msg = std::string(value.data(), value.size());
@@ -302,7 +234,7 @@ bool TileQueue::shouldPreferTiles() const
return false;
}
-MessageQueue::Payload TileQueue::get_impl()
+TileQueue::Payload TileQueue::get_impl()
{
LOG_TRC("MessageQueue depth: " << _queue.size());
diff --git a/common/MessageQueue.hpp b/common/MessageQueue.hpp
index 6eb07c0..0ae4658 100644
--- a/common/MessageQueue.hpp
+++ b/common/MessageQueue.hpp
@@ -17,25 +17,34 @@
#include
#include
-/** Thread-safe message queue (FIFO).
-*/
-class MessageQueue
+/// Thread-safe message queue (FIFO).
+template
+class MessageQueueBase
{
public:
+typedef T Payload;
-typedef std::vector Payload;
-
-MessageQueue()
+MessageQueueBase()
{
}
-virtual ~MessageQueue();
+virtual ~MessageQueueBase()
+{
+clear();
+}
-MessageQueue(const MessageQueue&) = delete;
-MessageQueue& operator=(const MessageQueue&) = delete;
+MessageQueueBase(const MessageQueueBase&) = delete;
+MessageQueueBase& operator=(const MessageQueueBase&) = delete;
/// Thread safe insert the message.
-void put(const Payload& value);
+void put(const Payload& value)
+{
+std::unique_lock lock(_mutex);
+put_impl(value);
+lock.unlock();
+_cv.notify_one();
+}
+
void put(const std::string& value)
{
put(Payload(value.data(), value.data() + value.size()));
@@ -43,22 +52,64 @@ public:
/// Thread safe obtaining of the message.
/// timeoutMs can be 0 to signify infinity.
-Payload get(const unsigned timeoutMs = 0);
+Payload get(const unsigned timeoutMs = 0)
+{
+std::unique_lock lock(_mutex);
+
+if (timeoutMs > 0)
+{
+if (!_cv.wait_for(lock, std::chrono::milliseconds(timeoutMs),
+[this] { return wait_impl(); }))
+{
+throw std::runtime_error("Timed out waiting to get queue
item.");
+}
+}
+else
+{
+_cv.wait(lock, [this] { return wait_impl(); });
+}
+
+return get_impl();
+}
+
/// Thread safe removal of all the pending messages.
-void clear();
+void clear()
+{
+std::unique_lock lock(_mutex);
+clear_impl();
+}
/// Thread safe remove_if.
-void remove_if(const std::function& pred);
+void remove_if(const std::function& pred)
+{
+std::unique_lock lock(_mutex);
+std::remove_if(_queue.begin(), _queue.end(), pred);
+}
protected:
-virtual void put_impl(const Payload& value);
+virtual void put_impl(const Payload& value)
+{
+const auto msg = std::string(value.data(), value.size());
+_queue.push_back(value);
+}
[Libreoffice-commits] online.git: common/Log.cpp
common/Log.cpp | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 89bd85fbba9855a607619bbda279c14da3d9cc5f
Author: Ashod Nakashian
Date: Mon Jan 9 12:33:01 2017 -0500
wsd: put_time is not supported by gcc4.8
Change-Id: Ib3b6a115ba669051474e327944cb4677575d15f3
Reviewed-on: https://gerrit.libreoffice.org/32917
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/common/Log.cpp b/common/Log.cpp
index 3141abd..380b0ed 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -158,9 +158,22 @@ namespace Log
const std::time_t t = std::time(nullptr);
oss.str("");
oss.clear();
-oss << "Initializing " << name << ". Local time: " <<
std::put_time(std::localtime(&t), "%c %Z")
-<< ". UTC: " << std::put_time(std::gmtime(&t), "%c %Z")
-<< ". Log level is [" << logger.getLevel() << "].";
+
+oss << "Initializing " << name << ".";
+
+// TODO: replace with std::put_time when we move to gcc 5+.
+char buf[32];
+if (strftime(buf, sizeof(buf), "%a %F %T%z", std::localtime(&t)) > 0)
+{
+oss << " Local time: " << buf << ".";
+}
+
+if (strftime(buf, sizeof(buf), "%a %F %T%z", std::gmtime(&t)) > 0)
+{
+oss << " UTC time: " << buf << ".";
+}
+
+oss << " Log level is [" << logger.getLevel() << "].";
info(oss.str());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/CalcTileLayer.js|2 +-
loleaflet/src/layer/tile/ImpressTileLayer.js |2 +-
loleaflet/src/layer/tile/WriterTileLayer.js |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f41c4c6e83764027aae83cf5ab77a722279c
Author: Ashod Nakashian
Date: Mon Jan 9 13:06:13 2017 -0500
loleaflet: on invalidation check the part before intersection
Shortcircuiting when the part doesn't match is
much faster than intersecting rects first.
Change-Id: I9038eb5cafd141e75e8b18a5308b30216e4c9653
Reviewed-on: https://gerrit.libreoffice.org/32918
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 5d6e6e4..cd4ed60 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -50,7 +50,7 @@ L.CalcTileLayer = L.TileLayer.extend({
var tileTopLeft = this._coordsToTwips(coords);
var tileBottomRight = new L.Point(this._tileWidthTwips,
this._tileHeightTwips);
var bounds = new L.Bounds(tileTopLeft,
tileTopLeft.add(tileBottomRight));
- if (invalidBounds.intersects(bounds) && coords.part ===
command.part) {
+ if (coords.part === command.part &&
invalidBounds.intersects(bounds)) {
if (this._tiles[key]._invalidCount) {
this._tiles[key]._invalidCount += 1;
}
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index da0166c..3326fa2 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -34,7 +34,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
var tileTopLeft = this._coordsToTwips(coords);
var tileBottomRight = new L.Point(this._tileWidthTwips,
this._tileHeightTwips);
var bounds = new L.Bounds(tileTopLeft,
tileTopLeft.add(tileBottomRight));
- if (invalidBounds.intersects(bounds) && coords.part ===
command.part) {
+ if (coords.part === command.part &&
invalidBounds.intersects(bounds)) {
if (this._tiles[key]._invalidCount) {
this._tiles[key]._invalidCount += 1;
}
diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js
b/loleaflet/src/layer/tile/WriterTileLayer.js
index 9402f6c..0e546d0 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -33,7 +33,7 @@ L.WriterTileLayer = L.TileLayer.extend({
var tileTopLeft = this._coordsToTwips(coords);
var tileBottomRight = new L.Point(this._tileWidthTwips,
this._tileHeightTwips);
var bounds = new L.Bounds(tileTopLeft,
tileTopLeft.add(tileBottomRight));
- if (invalidBounds.intersects(bounds) && coords.part ===
command.part) {
+ if (coords.part === command.part &&
invalidBounds.intersects(bounds)) {
if (this._tiles[key]._invalidCount) {
this._tiles[key]._invalidCount += 1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - cui/source
cui/source/tabpages/tparea.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 5dbeccbe96f1cace62665523e49b5e693839d265 Author: Tomaž Vajngerl Date: Mon Jan 9 22:59:29 2017 +0100 tdf#103225 revert setting of a fixed size for the dialog Setting fixed size of a dialog causes a mess with HiDPI and could also cause problems with certain languages because the translated strings could streach the dialog size. It is better to let the dialog calculate its ideal size depending on the content, which in some cases is not ideal but at least it shouldn't create a mess. The decision to revert this was done in design hangout on 2016-12-22. Change-Id: I0ad1e38e1625cdbbf65b846118995bd5d3ebb47e Reviewed-on: https://gerrit.libreoffice.org/32912 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl (cherry picked from commit 62a94dcf0c750e335d6ce272d8a5df9813910d5a) Reviewed-on: https://gerrit.libreoffice.org/32913 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 22bb3c9..9972ca5 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -125,9 +125,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs m_pBtnPattern->SetClickHdl(aLink); SetExchangeSupport(); - -m_pFillTab->set_width_request(750); -m_pFillTab->set_height_request(550); } SvxAreaTabPage::~SvxAreaTabPage() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/graph.hxx|1 -
vcl/source/gdi/graph.cxx |4
2 files changed, 5 deletions(-)
New commits:
commit 4434b0029009d6d0327eaca1ff22a0c39711291d
Author: Caolán McNamara
Date: Mon Jan 9 13:10:37 2017 +
defaults are good enough
Change-Id: I4520e00b8c48938a4ff1ed89e3c61948d886972c
Reviewed-on: https://gerrit.libreoffice.org/32889
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 8191405..3869db5 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -121,7 +121,6 @@ public:
Graphic( const Animation& rAnimation );
Graphic( const GDIMetaFile& rMtf );
Graphic( const css::uno::Reference< css::graphic::XGraphic
>& rxGraphic );
- ~Graphic();
Graphic&operator=( const Graphic& rGraphic );
Graphic&operator=( Graphic&& rGraphic );
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 1583212f..cd10764 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -244,10 +244,6 @@ Graphic::Graphic( const css::uno::Reference<
css::graphic::XGraphic >& rxGraphic
mxImpGraphic.reset(new ImpGraphic);
}
-Graphic::~Graphic()
-{
-}
-
void Graphic::ImplTestRefCount()
{
if (!mxImpGraphic.unique())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source svx/source vcl/source
svtools/source/graphic/grfmgr2.cxx |6 +++---
svtools/source/misc/transfer.cxx|2 +-
svx/source/xml/xmlgrhlp.cxx |6 +++---
vcl/source/filter/graphicfilter.cxx |2 +-
vcl/source/gdi/print2.cxx |4 ++--
vcl/source/outdev/transparent.cxx | 24
6 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 5adab0927483d039037b0f93894627e41a2c72f2
Author: Jochen Nitschke
Date: Mon Jan 2 21:57:23 2017 +0100
replace C-style casts with const_cast
Change-Id: Ica6522b4bfe2aa4517469e89cabe5d4d057cb6b7
Reviewed-on: https://gerrit.libreoffice.org/32657
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke
diff --git a/svtools/source/graphic/grfmgr2.cxx
b/svtools/source/graphic/grfmgr2.cxx
index 408bee5..e2608bb 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -1622,9 +1622,9 @@ void GraphicManager::ImplDraw( OutputDevice* pOut, const
Point& rPt, const Size&
pOut->Push( PushFlags::CLIPREGION );
pOut->IntersectClipRegion( Rectangle( aOutPt, aOutSz ) );
-( (GDIMetaFile&) rMtf ).WindStart();
-( (GDIMetaFile&) rMtf ).Play( pOut, aOutPt, aOutSz );
-( (GDIMetaFile&) rMtf ).WindStart();
+const_cast(rMtf).WindStart();
+const_cast(rMtf).Play( pOut, aOutPt, aOutSz );
+const_cast(rMtf).WindStart();
pOut->Pop();
}
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index ade1bc0..08195e6 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -690,7 +690,7 @@ bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile&
rMtf, const DataFlav
{
SvMemoryStream aMemStm( 65535, 65535 );
-( (GDIMetaFile&) rMtf ).Write( aMemStm );
+const_cast(rMtf).Write( aMemStm );
maAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >(
aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) );
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index e9271fb..0212dc9 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -134,7 +134,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const
OUString& rGraphicId )
{
pStm->SetVersion( SOFFICE_FILEFORMAT_8 );
pStm->SetCompressMode( SvStreamCompressFlags::ZBITMAP );
-( (GDIMetaFile&) aGraphic.GetGDIMetaFile() ).Write( *pStm
);
+const_cast( aGraphic.GetGDIMetaFile()
).Write( *pStm );
bRet = ( pStm->GetError() == 0 );
}
}
@@ -581,7 +581,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString&
rPictureStorageName,
pStream->SetCompressMode( SvStreamCompressFlags::ZBITMAP );
// SJ: first check if this metafile is just a eps file,
then we will store the eps instead of svm
-GDIMetaFile& rMtf( (GDIMetaFile&)aGraphic.GetGDIMetaFile()
);
+GDIMetaFile& rMtf(const_cast(
aGraphic.GetGDIMetaFile() ));
const MetaCommentAction* pComment = ImplCheckForEPS( rMtf
);
if ( pComment )
{
@@ -706,7 +706,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const
OUString& rURLStr, sal_uInt
else if( aGrfObject.GetType() == GraphicType::GdiMetafile )
{
// SJ: first check if this metafile is just a eps
file, then we will store the eps instead of svm
-GDIMetaFile& rMtf(
(GDIMetaFile&)aGraphic.GetGDIMetaFile() );
+GDIMetaFile& rMtf(const_cast(
aGraphic.GetGDIMetaFile() ));
if ( ImplCheckForEPS( rMtf ) )
aExtension = ".eps";
else
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 40c0e1c..50506fe 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2058,7 +2058,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic&
rGraphic, const OUString
SvMemoryStream aMemStm( 65535, 65535 );
// #i119735# just use GetGDIMetaFile, it will
create a buffered version of contained bitmap now automatically
-( (GDIMetaFile&) aGraphic.GetGDIMetaFile()
).Write( aMemStm );
+const_cast(
aGraphic.GetGDIMetaFile() ).Write( aMemStm );
xActiveDataSource->setOutputStream(
css::uno::Reference< css::io::XOutputStream >(
xStmIf, css::uno::UNO_QUERY ) );
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 5ee886c..0e909a0 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -667,9 +
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tparea.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 62a94dcf0c750e335d6ce272d8a5df9813910d5a Author: Tomaž Vajngerl Date: Mon Jan 9 22:59:29 2017 +0100 tdf#103225 revert setting of a fixed size for the dialog Setting fixed size of a dialog causes a mess with HiDPI and could also cause problems with certain languages because the translated strings could streach the dialog size. It is better to let the dialog calculate its ideal size depending on the content, which in some cases is not ideal but at least it shouldn't create a mess. The decision to revert this was done in design hangout on 2016-12-22. Change-Id: I0ad1e38e1625cdbbf65b846118995bd5d3ebb47e Reviewed-on: https://gerrit.libreoffice.org/32912 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 0032e28..fbe4600 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -125,9 +125,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs m_pBtnPattern->SetClickHdl(aLink); SetExchangeSupport(); - -m_pFillTab->set_width_request(750); -m_pFillTab->set_height_request(550); } SvxAreaTabPage::~SvxAreaTabPage() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - configure.ac debian/changelog loleaflet/Makefile
configure.ac |2 +-
debian/changelog |6 ++
loleaflet/Makefile |2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 14a576dff642f5888bf2e3b432d87d0cc4b8a6e5
Author: Andras Timar
Date: Mon Jan 9 22:40:09 2017 +0100
Bump version to 2.0.2
Change-Id: Iabc2514893542b0817d9d066749074e84f4f0d59
diff --git a/configure.ac b/configure.ac
index af85b90..444929c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [2.0.1], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [2.0.2], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
diff --git a/debian/changelog b/debian/changelog
index babec6c..49d769d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.0.2-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool20
+
+ -- Andras Timar Wed, 11 Jan 2017 11:40:00 +0100
+
loolwsd (2.0.1-1) unstable; urgency=medium
* see the git log: http://col.la/cool20
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 7615e05..430d24c 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=2.0.1
+VERSION=2.0.2
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/resourceprovider.mm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 20c16740b19a028624388a0d4961659a2a9d8b55
Author: Stephan Bergmann
Date: Mon Jan 9 22:36:52 2017 +0100
loplugin:externvar
Change-Id: I6cf0b0c6b3a6a214fd0c1b835be491901deb2495
diff --git a/fpicker/source/aqua/resourceprovider.mm
b/fpicker/source/aqua/resourceprovider.mm
index f7531cc..ab406b3 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -46,7 +46,7 @@ struct Entry
sal_Int16 resId;
};
-Entry CtrlIdToResIdTable[] = {
+Entry const CtrlIdToResIdTable[] = {
{ CHECKBOX_AUTOEXTENSION,
STR_SVT_FILEPICKER_AUTO_EXTENSION },
{ CHECKBOX_PASSWORD,STR_SVT_FILEPICKER_PASSWORD },
{ CHECKBOX_FILTEROPTIONS,
STR_SVT_FILEPICKER_FILTER_OPTIONS },
@@ -64,7 +64,7 @@ Entry CtrlIdToResIdTable[] = {
{ LISTBOX_FILTER_LABEL,
STR_SVT_FILEPICKER_FILTER_TITLE}
};
-Entry OtherCtrlIdToResIdTable[] = {
+Entry const OtherCtrlIdToResIdTable[] = {
{ FILE_PICKER_TITLE_OPEN, STR_FILEDLG_OPEN },
{ FILE_PICKER_TITLE_SAVE, STR_FILEDLG_SAVE },
{ FILE_PICKER_FILE_TYPE,STR_FILEDLG_TYPE }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/data/ppt/FillPatterns.ppt |binary
sd/qa/unit/import-tests.cxx | 339 +++
2 files changed, 339 insertions(+)
New commits:
commit 0b87e17a4e122d53a765a9db2ae54908e0803b65
Author: Tomaž Vajngerl
Date: Sun Jan 8 23:32:05 2017 +0100
Test that patterns are correctly imported for MS binary format
Change-Id: I8335ee35bae11c8014d6591744199e55bc3ec41b
Reviewed-on: https://gerrit.libreoffice.org/32854
Reviewed-by: Tomaž Vajngerl
Tested-by: Tomaž Vajngerl
diff --git a/sd/qa/unit/data/ppt/FillPatterns.ppt
b/sd/qa/unit/data/ppt/FillPatterns.ppt
new file mode 100644
index 000..bbd353b
Binary files /dev/null and b/sd/qa/unit/data/ppt/FillPatterns.ppt differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index dd5f2e0..f0f523c 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -69,6 +69,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -137,6 +138,9 @@ public:
void testTdf105150();
void testTdf105150PPT();
+bool checkPattern(sd::DrawDocShellRef& rDocRef, int nShapeNumber,
std::vector& rExpected);
+void testPatternImport();
+
CPPUNIT_TEST_SUITE(SdImportTest);
CPPUNIT_TEST(testDocumentLayout);
@@ -196,6 +200,7 @@ public:
CPPUNIT_TEST(testTdf104445);
CPPUNIT_TEST(testTdf105150);
CPPUNIT_TEST(testTdf105150PPT);
+CPPUNIT_TEST(testPatternImport);
CPPUNIT_TEST_SUITE_END();
};
@@ -1719,6 +1724,340 @@ void SdImportTest::testTdf104445()
xDocShRef->DoClose();
}
+namespace
+{
+
+bool checkPatternValues(std::vector& rExpected, Bitmap& rBitmap)
+{
+bool bResult = true;
+
+Color aFGColor(0xFF);
+Color aBGColor(0xFF);
+
+Bitmap::ScopedReadAccess pAccess(rBitmap);
+for (long y = 0; y < pAccess->Height(); ++y)
+{
+for (long x = 0; x < pAccess->Width(); ++x)
+{
+Color aColor = pAccess->GetPixel(y, x);
+sal_uInt8 aValue = rExpected[y*8+x];
+
+if (aValue == 1 && aColor != aFGColor)
+bResult = false;
+else if (aValue == 0 && aColor != aBGColor)
+bResult = false;
+}
+}
+
+return bResult;
+}
+
+} // end anonymous namespace
+
+bool SdImportTest::checkPattern(sd::DrawDocShellRef& rDocRef, int
nShapeNumber, std::vector& rExpected)
+{
+uno::Reference xShape(getShapeFromPage(nShapeNumber,
0, rDocRef));
+CPPUNIT_ASSERT_MESSAGE("Not a shape", xShape.is());
+
+Bitmap aBitmap;
+if (xShape.is())
+{
+uno::Any aBitmapAny = xShape->getPropertyValue("FillBitmap");
+uno::Reference xBitmap;
+if (aBitmapAny >>= xBitmap)
+{
+uno::Sequence aBitmapSequence(xBitmap->getDIB());
+SvMemoryStream aBitmapStream(aBitmapSequence.getArray(),
+ aBitmapSequence.getLength(),
+ StreamMode::READ);
+ReadDIB(aBitmap, aBitmapStream, true);
+}
+}
+CPPUNIT_ASSERT_EQUAL(8L, aBitmap.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(8L, aBitmap.GetSizePixel().Height());
+return checkPatternValues(rExpected, aBitmap);
+}
+
+/* Test checks that importing a PPT file with all supported fill patterns is
+ * correctly imported as a tiled fill bitmap with the expected pattern.
+ */
+void SdImportTest::testPatternImport()
+{
+sd::DrawDocShellRef xDocRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/FillPatterns.ppt"),
PPT);
+
+std::vector aExpectedPattern1 = {
+1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+};
+std::vector aExpectedPattern2 = {
+1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+};
+std::vector aExpectedPattern3 = {
+1,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+};
+std::vector aExpectedPattern4 = {
+1,0,0,0,1,0,0,0,
+0,0,1,0,0,0,1,0,
+1,0,0,0,1,0,0,0,
+0,0,1,0,0,0,1,0,
+1,0,0,0,1,0,0,0,
+0,0,1,0,0,0,1,0,
+1,0,0,0,1,0,0,0,
+0,0,1,0,0,0,1,0,
+};
+std::vector aExpectedPattern5 = {
+1,0,1,0,1,0,1,0,
+0,1,0,0,0,1,0,0,
+1,0,1,0,1,0,1,0,
+0,0,0,1,0,0,0,1,
+1,0,1,0,1,0,1,0,
+0,1,0,0,0,1,0,0,
+1,0,1,0,1,0,1,0,
+0,0,0,1,0,0,0,1,
+};
+std::vector aExpectedPattern6 = {
+1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,
+1,0,1,0,1,0,1,0,
+0,1
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx | 38
1 file changed, 22 insertions(+), 16 deletions(-)
New commits:
commit 735941713c81ec8ca9ac796b832d776f6ef633ef
Author: Tomaž Vajngerl
Date: Sun Jan 8 23:35:44 2017 +0100
Fix import of patterns for MS binary formats
Don't use XOBitmap, which in some cases doesn't import the pattern
correctly (on Linux and with a different issue on Windows too) - it
doesn't seem to be necessary to use it, just convert the pattern
bitmap to a bitmap that has the expected colors applied.
Change-Id: Ide7d5ce0115b63e882b3544b10fd00d5582cf7d3
Reviewed-on: https://gerrit.libreoffice.org/32855
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 841c546..651e94b 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1369,24 +1369,30 @@ void DffPropertyReader::ApplyFillAttributes( SvStream&
rIn, SfxItemSet& rSet, co
if ( IsProperty( DFF_Prop_fillBackColor ) )
aCol2 = rManager.MSO_CLR_ToColor(
GetPropertyValue( DFF_Prop_fillBackColor, 0 ), DFF_Prop_fillBackColor );
-XOBitmap aXOBitmap( aBmp );
-aXOBitmap.Bitmap2Array();
-aXOBitmap.SetBitmapType( XBitmapType::N8x8 );
-aXOBitmap.SetPixelSize( aBmp.GetSizePixel() );
-
-if( aXOBitmap.GetBackgroundColor() == COL_BLACK )
+// Create a bitmap for the pattern with expected
colors
+Bitmap aResult(Size(8, 8), 24);
{
-aXOBitmap.SetPixelColor( aCol1 );
-aXOBitmap.SetBackgroundColor( aCol2 );
-}
-else
-{
-aXOBitmap.SetPixelColor( aCol2 );
-aXOBitmap.SetBackgroundColor( aCol1 );
-}
+Bitmap::ScopedReadAccess pRead(aBmp);
+Bitmap::ScopedWriteAccess pWrite(aResult);
-aXOBitmap.Array2Bitmap();
-aGraf = Graphic( aXOBitmap.GetBitmap() );
+for (long y = 0; y < pWrite->Height(); ++y)
+{
+for (long x = 0; x < pWrite->Width(); ++x)
+{
+Color aReadColor;
+if (pRead->HasPalette())
+aReadColor =
pRead->GetPaletteColor(pRead->GetPixelIndex(y, x));
+else
+aReadColor = pRead->GetPixel(y, x);
+
+if (aReadColor.GetColor() == 0)
+pWrite->SetPixel(y, x, aCol2);
+else
+pWrite->SetPixel(y, x, aCol1);
+}
+}
+}
+aGraf = Graphic(aResult);
}
rSet.Put(XFillBitmapItem(OUString(), aGraf));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/HtmlFmtFlt.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a0a42ade2137348a83c05f01fe25ebadab69a9e2
Author: Stephan Bergmann
Date: Mon Jan 9 22:08:52 2017 +0100
loplugin:externvar
Change-Id: Ie6834e7cb1e65a2e24c6250126c24463e6e49354
diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index 9804dbd..e068a45 100644
--- a/vcl/osx/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
@@ -115,7 +115,7 @@ Sequence SAL_CALL
TextHtmlToHTMLFormat(Sequence& aTextHtml)
return byteSequence;
}
-const char* HtmlStartTag = " HTMLFormatToTextHtml(const Sequence& aHTMLFormat)
{
@@ -149,7 +149,7 @@ Sequence HTMLFormatToTextHtml(const
Sequence& aHTMLFormat)
can improve this
*/
const char HtmlFormatStart[] = "Version:";
-int HtmlFormatStartLen = (sizeof(HtmlFormatStart) - 1);
+int const HtmlFormatStartLen = (sizeof(HtmlFormatStart) - 1);
bool isHTMLFormat(const Sequence& aHtmlSequence)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/fontmap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4f36a2fbe6287281122aff2e781b9b7de9a41b88
Author: Stephan Bergmann
Date: Mon Jan 9 21:57:02 2017 +0100
loplugin:externvar
Change-Id: Iedb9b26dbe33d447de309a763eaeeeb57d1fcdd1
diff --git a/hwpfilter/source/fontmap.cxx b/hwpfilter/source/fontmap.cxx
index 7207e75..6ef93e7 100644
--- a/hwpfilter/source/fontmap.cxx
+++ b/hwpfilter/source/fontmap.cxx
@@ -134,7 +134,7 @@ const char* const RepFontTab[] =
"\xb9\xe9\xb9\xac \xc7\xec\xb5\xe5\xb6\xf3\xc0\xce"
/* 3 */
};
#else
-const char* RepFontTab[] =
+const char* const RepFontTab[] =
{
"Batang", /* 0 */
"Dotum", /* 1 */
___
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_pcdfuzzer.mk vcl/Module_vcl.mk vcl/workben
Makefile.in |2 - Repository.mk |1 vcl/Executable_pcdfuzzer.mk | 47 vcl/Module_vcl.mk |1 vcl/workben/pcdfuzzer.cxx | 24 ++ 5 files changed, 74 insertions(+), 1 deletion(-) New commits: commit 4fcf17f89bc45e5e850f48efe274e6ea24ff8a86 Author: Caolán McNamara Date: Mon Jan 9 17:04:27 2017 + add pcd fuzzer Change-Id: Id21659687952ec5e868733fbca12353dd71b8153 Reviewed-on: https://gerrit.libreoffice.org/32902 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/Makefile.in b/Makefile.in index 6aa00d0..38c2742 100644 --- a/Makefile.in +++ b/Makefile.in @@ -424,7 +424,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_jpeg StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi Library_clew Library_gie Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer +fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi Library_clew Library_gie Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer endif # MAKE_RESTARTS diff --git a/Repository.mk b/Repository.mk index f891da0..3b3491f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -101,6 +101,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,pngfuzzer) \ $(call gb_Helper_optional,FUZZERS,bmpfuzzer) \ $(call gb_Helper_optional,FUZZERS,svmfuzzer) \ + $(call gb_Helper_optional,FUZZERS,pcdfuzzer) \ $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ soffice_bin \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ diff --git a/vcl/Executable_pcdfuzzer.mk b/vcl/Executable_pcdfuzzer.mk new file mode 100644 index 000..0df86dd --- /dev/null +++ b/vcl/Executable_pcdfuzzer.mk @@ -0,0 +1,47 @@ +# -*- 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/. +# + +include $(SRCDIR)/vcl/commonfuzzer.mk + +$(eval $(call gb_Executable_Executable,pcdfuzzer)) + +$(eval $(call gb_Executable_use_api,pcdfuzzer,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_Executable_use_externals,pcdfuzzer,\ + $(fuzzer_externals) \ +)) + +$(eval $(call gb_Executable_set_include,pcdfuzzer,\ +$$(INCLUDE) \ +-I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_Executable_use_libraries,pcdfuzzer,\ + $(fuzzer_libraries) \ +)) + +$(eval $(call gb_Executable_use_static_libraries,pcdfuzzer,\ +findsofficepath \ +ulingu \ +fuzzer \ +)) + +$(eval $(call gb_Executable_add_exception_objects,pcdfuzzer,\ + vcl/workben/pcdfuzzer \ +)) + +$(eval $(call gb_Executable_add_libs,pcdfuzzer,\ + -lFuzzingEngine \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 571c046..4afb842 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -114,6 +114,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ Executable_pngfuzzer \ Executable_bmpfuzzer \ Executable_svmfuzzer \ +Executable_pcdfuzzer \ )) endif diff --git a/vcl/workben/pcdfuzzer.cxx b/vcl/workben/pcdfuzzer.cxx new file mode 100644 index 000..bcfe48b --- /dev/null +++ b/vcl/workben/pcdfuzzer.cxx @@ -0,0 +1,24 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include +#include "commonfuzzer.hxx" + +extern "C" bool i
[Libreoffice-commits] core.git: include/svtools svtools/qa svtools/source
include/svtools/grfmgr.hxx|2 +-
svtools/qa/unit/GraphicObjectTest.cxx |2 +-
svtools/source/graphic/grfmgr.cxx |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 855fbe4edccf5c8299373087eb2cee5342ba4097
Author: Caolán McNamara
Date: Mon Jan 9 15:22:36 2017 +
second arg of deformed copy ctor isn't used
except in the qa test
Change-Id: I84d1a06194e4c11b218c417663f12195c9f76526
Reviewed-on: https://gerrit.libreoffice.org/32890
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 0c01023..929fe89 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -323,7 +323,7 @@ protected:
public:
GraphicObject();
GraphicObject( const Graphic& rGraphic );
-GraphicObject( const GraphicObject& rCacheObj,
const GraphicManager* pMgr = nullptr );
+GraphicObject( const GraphicObject& rCacheObj );
explicit GraphicObject( const OString& rUniqueID );
~GraphicObject();
diff --git a/svtools/qa/unit/GraphicObjectTest.cxx
b/svtools/qa/unit/GraphicObjectTest.cxx
index 43cf3b7..7d93874 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -293,7 +293,7 @@ void GraphicObjectTest::testTdf88935()
// Create and remove some copy of the first image
for( int i = 0; i < 50; ++i )
{
-GraphicObject aGraphObj3(*pGraphObj1,
&pGraphObj1->GetGraphicManager());
+GraphicObject aGraphObj3(*pGraphObj1);
CPPUNIT_ASSERT(aGraphObj3.SwapOut());
CPPUNIT_ASSERT(aGraphObj3.SwapIn());
}
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 2fde691..0b04656 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -90,7 +90,7 @@ GraphicObject::GraphicObject( const Graphic& rGraphic ) :
ImplSetGraphicManager( nullptr );
}
-GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const
GraphicManager* pMgr ) :
+GraphicObject::GraphicObject( const GraphicObject& rGraphicObj ) :
maGraphic ( rGraphicObj.GetGraphic() ),
maAttr ( rGraphicObj.maAttr ),
maLink ( rGraphicObj.maLink ),
@@ -98,7 +98,7 @@ GraphicObject::GraphicObject( const GraphicObject&
rGraphicObj, const GraphicMan
{
ImplConstruct();
ImplAssignGraphicData();
-ImplSetGraphicManager( pMgr, nullptr, &rGraphicObj );
+ImplSetGraphicManager( nullptr, nullptr, &rGraphicObj );
if( rGraphicObj.HasUserData() && rGraphicObj.IsSwappedOut() )
SetSwapState();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/src
loleaflet/src/map/handler/Map.Keyboard.js | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit af53438aeda514c74b17cebcc9a879a64f49d9df
Author: Pranav Kant
Date: Thu Jan 5 13:13:20 2017 +0530
loleaflet: Don't forward shift+insert/delete key events
This are converted to 'cut', 'paste' events which are
automatically handled by us using uno commands, so avoid
double-handling them.
Change-Id: If97e9f4efabbb929e7a5dd87c1228ee6a0df9e61
(cherry picked from commit 5374b6c6ff440b4016f393557b8e8846481a1355)
Reviewed-on: https://gerrit.libreoffice.org/32883
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Keyboard.js
index 9422a9b..0da5e09 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -119,7 +119,7 @@ L.Map.Keyboard = L.Handler.extend({
222 : null // single quote : UNKOWN
},
- handleOnKeyDown: {
+ handleOnKeyDownKeys: {
// these keys need to be handled on keydown in order for them
// to work on chrome
8 : true, // backspace
@@ -180,6 +180,19 @@ L.Map.Keyboard = L.Handler.extend({
this._map.off('compositionstart compositionupdate
compositionend textInput', this._onKeyDown, this);
},
+ _handleOnKeyDown: function (keyCode, modifier) {
+ if (modifier & this.keyModifier.shift) {
+ // don't handle shift+insert, shift+delete
+ // These are converted to 'cut', 'paste' events which
are
+ // automatically handled by us, so avoid double-handling
+ if (keyCode === 45 || keyCode === 46) {
+ return false;
+ }
+ }
+
+ return this.handleOnKeyDownKeys[keyCode];
+ },
+
_setPanOffset: function (pan) {
var keys = this._panKeys = {},
codes = this.navigationKeyCodes,
@@ -295,12 +308,12 @@ L.Map.Keyboard = L.Handler.extend({
this._keyHandled = false;
this._bufferedTextInputEvent = null;
- if (this.handleOnKeyDown[keyCode] && charCode
=== 0) {
+ if (this._handleOnKeyDown(keyCode,
this.modifier) && charCode === 0) {
docLayer._postKeyboardEvent('input',
charCode, unoKeyCode);
}
}
else if ((e.type === 'keypress' || e.type ===
'compositionend') &&
- (!this.handleOnKeyDown[keyCode] || charCode !==
0)) {
+(!this._handleOnKeyDown(keyCode,
this.modifier) || charCode !== 0)) {
if (charCode === keyCode && charCode !== 13) {
// Chrome sets keyCode = charCode for
printable keys
// while LO requires it to be 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f25f434be3c4a4f873b00b800f64934c3ab6cf9c Author: Andras Timar Date: Mon Jan 9 21:17:25 2017 +0100 change version to 'master' Change-Id: Ic842f811e86d3d910226fcd07ec44981917b8303 diff --git a/configure.ac b/configure.ac index 386fe3a..b029d53 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [2.0.1+], [libreoffice@lists.freedesktop.org]) +AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org]) LT_INIT([shared, disable-static, dlopen]) AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: rsc/source
rsc/source/rscpp/cpp1.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit aecd984ad1c0dc29e15891bca227a96aedbde154
Author: Stephan Bergmann
Date: Mon Jan 9 21:14:57 2017 +0100
loplugin:externvar
Change-Id: Icaa7d1f10aafbb1b143252eca565f332eb040e82
diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index f277b6b..4724b53 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -25,7 +25,7 @@
#include "cpp.h"
FILE* pCppOut = NULL;
-FILE* pCppIn = NULL;
+static FILE* pCppIn = NULL;
#if OSL_DEBUG_LEVEL > 1
FILE* pDefOut = NULL; /* ER evtl. #define's dump */
@@ -187,7 +187,7 @@ char* magic[] =
static char* sharpfilename = NULL;
-int nRunde = 0;
+static int nRunde = 0;
void InitCpp1()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - debian/control loolwsd.spec.in
debian/control |2 +-
loolwsd.spec.in |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 42ee67db4c5dd648a98476927f1024d43e2cec29
Author: László Németh
Date: Mon Jan 9 16:40:59 2017 +0100
fix dependency
Change-Id: I3b2faaf78f57b58c3626135db7df65294e1624e2
Reviewed-on: https://gerrit.libreoffice.org/32886
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/debian/control b/debian/control
index df54dac..dacb416 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, collaboraofficebasis5.1-base (>= 5.1.10.15), collaboraofficebasis5.1-calc
(>= 5.1.10.15), collaboraofficebasis5.1-core (>= 5.1.10.15),
collaboraofficebasis5.1-draw (>= 5.1.10.15),
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.15),
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.15),
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.15),
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.15),
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.15),
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.15),
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.15),
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.15),
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.15),
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.15), collaboraofficebasi
s5.1-images (>= 5.1.10.15), collaboraofficebasis5.1-impress (>= 5.1.10.15),
collaboraofficebasis5.1-librelogo (>= 5.1.10.15), collaboraofficebasis5.1-math
(>= 5.1.10.15), collaboraofficebasis5.1-ogltrans (>= 5.1.10.15),
collaboraofficebasis5.1-ooofonts (>= 5.1.10.15),
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.15),
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.15),
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.15),
collaboraofficebasis5.1-pyuno (>= 5.1.10.15), collaboraofficebasis5.1-writer
(>= 5.1.10.15), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.15),
collaboraoffice5.1 (>= 5.1.10.15), collaboraoffice5.1-base (>= 5.1.10.15),
collaboraoffice5.1-calc (>= 5.1.10.15), collaboraoffice5.1-dict-en (>=
5.1.10.15), collaboraoffice5.1-draw (>= 5.1.10.15),
collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress (>= 5.1.10.15),
collaboraoffice5.1-math (>= 5.1.10.15), collaboraoffice5.1-ure (>= 5.1.10.15),
collaboraoffice5.1-writer (>= 5.1.10.15), collaboraofficeb
asis5.1-en-us (>= 5.1.10.15), collaboraofficebasis5.1-en-us-base (>=
5.1.10.15), collaboraofficebasis5.1-en-us-calc (>= 5.1.10.15),
collaboraofficebasis5.1-en-us-math (>= 5.1.10.15),
collaboraofficebasis5.1-en-us-res (>= 5.1.10.15),
collaboraofficebasis5.1-en-us-writer (>= 5.1.10.15), collaboraoffice5.1-en-us
(>= 5.1.10.15), collaboraofficebasis5.1-noto-fonts (>= 5.1.10.15)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, collaboraofficebasis5.1-calc (>= 5.1.10.15), collaboraofficebasis5.1-core
(>= 5.1.10.15), collaboraofficebasis5.1-graphicfilter (>= 5.1.10.15),
collaboraofficebasis5.1-images (>= 5.1.10.15), collaboraofficebasis5.1-impress
(>= 5.1.10.15), collaboraofficebasis5.1-ooofonts (>= 5.1.10.15),
collaboraofficebasis5.1-writer (>= 5.1.10.15), collaboraoffice5.1 (>=
5.1.10.15), collaboraoffice5.1-ure (>= 5.1.10.15),
collaboraofficebasis5.1-en-us (>= 5.1.10.15),
collaboraofficebasis5.1-en-us-calc (>= 5.1.10.15),
collaboraofficebasis5.1-en-us-res (>= 5.1.10.15),
collaboraofficebasis5.1-noto-fonts (>= 5.1.10.15)
Description: LibreOffice On-Line WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index ac82d2a..a793f74 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -27,7 +27,7 @@ BuildRequires: libcap-progs systemd-rpm-macros
%endif
%endif
-Requires: collaboraoffice5.1 >= 5.1.10.15 collaboraoffice5.1-en-US >=
5.1.10.15 collaboraoffice5.1-ure >= 5.1.10.15 collaboraofficebasis5.1-core >=
5.1.10.15 collaboraofficebasis5.1-writer >= 5.1.10.15
collaboraofficebasis5.1-impress >= 5.1.10.15
collaboraofficebasis5.1-graphicfilter >= 5.1.10.15
collaboraofficebasis5.1-en-US >= 5.1.10.15 collaboraofficebasis5.1-calc >=
5.1.10.15 collaboraofficebasis5.1-en-US-res >= 5.1.10.15
collaboraofficebasis5.1-en-US-calc >= 5.1.10.15
collaboraofficebasis5.1-ooofonts >= 5.1.10.15 collaboraofficebasis5.1-images >=
5.1.10.15 collaboraofficebasis5.1-filter-data >= 5.1.10.15
collaboraofficebasis5.1-draw >= 5.1.10.15 collaboraofficebasis5.1-base >=
5.1.10.15 collaboraofficebasis5.1-en-US-writer >= 5.1.10.15
collaboraofficebasis5.1-en-US-math >= 5.1.10.15
collabo
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/pt/DocumentList.xml | 34 1 file changed, 34 insertions(+) New commits: commit b98f08669391b54fd5090158c589c871afc0419c Author: Marco A.G.Pinto Date: Mon Jan 9 12:15:26 2017 + Added 34 new pt_PT autocorrect words Change-Id: Ibd2703d651b9af1e9baf7c9a1541acf70d2415da Reviewed-on: https://gerrit.libreoffice.org/32882 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml b/extras/source/autocorr/lang/pt/DocumentList.xml index 29a26b8..790c51e 100644 --- a/extras/source/autocorr/lang/pt/DocumentList.xml +++ b/extras/source/autocorr/lang/pt/DocumentList.xml @@ -3259,4 +3259,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: soltools/cpp soltools/mkdepend
soltools/cpp/_eval.c|3 ++-
soltools/cpp/_getopt.c |2 +-
soltools/cpp/_lex.c |2 +-
soltools/cpp/_nlist.c |3 ++-
soltools/cpp/_tokens.c |2 +-
soltools/mkdepend/def.h | 16
soltools/mkdepend/include.c |5 +
soltools/mkdepend/main.c| 10 +-
soltools/mkdepend/parse.c |3 +--
soltools/mkdepend/pr.c |8 +---
10 files changed, 31 insertions(+), 23 deletions(-)
New commits:
commit 62ee434e336dac7523cace3b3acea6894ef3a509
Author: Stephan Bergmann
Date: Mon Jan 9 20:19:22 2017 +0100
loplugin:externvar
Change-Id: I304144c0ae6b51656ad326a77e9402cc34d5aa18
diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c
index f10fa79..84d8a79b 100644
--- a/soltools/cpp/_eval.c
+++ b/soltools/cpp/_eval.c
@@ -46,8 +46,9 @@ struct pri
char pri;
char arity;
char ctype;
-} priority[] =
+};
+static struct pri priority[] =
{
{
0, 0, 0
diff --git a/soltools/cpp/_getopt.c b/soltools/cpp/_getopt.c
index 24a6cfb..4e609ba 100644
--- a/soltools/cpp/_getopt.c
+++ b/soltools/cpp/_getopt.c
@@ -25,7 +25,7 @@
#define EPR fprintf(stderr,
#define ERR(str, chr) if(opterr) { EPR "%s%c\n", str, chr); }
-int opterr = 1;
+static int opterr = 1;
int optind = 1;
int optopt;
char *optarg;
diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c
index fde7605..a8f874d 100644
--- a/soltools/cpp/_lex.c
+++ b/soltools/cpp/_lex.c
@@ -73,7 +73,7 @@ struct fsm
int nextstate; /* enter this state if +ve */
};
- /*const*/ struct fsm fsm[] = {
+static /*const*/ struct fsm fsm[] = {
/* start state */
{START, {C_XX}, ACT(UNCLASS, S_SELF)},
{START, {' ', '\t', '\v'}, WS1},
diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c
index 83516f4..3bd1a65 100644
--- a/soltools/cpp/_nlist.c
+++ b/soltools/cpp/_nlist.c
@@ -42,8 +42,9 @@ struct kwtab
char *kw;
int val;
int flag;
-} kwtab[] =
+};
+static struct kwtab kwtab[] =
{
{"if", KIF, ISKW},
{"ifdef", KIFDEF, ISKW},
diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c
index c764886..bac4216 100644
--- a/soltools/cpp/_tokens.c
+++ b/soltools/cpp/_tokens.c
@@ -34,7 +34,7 @@ static char *wbp = wbuf;
static int EBCDIC_ExternTokenDetected = 0;
static int EBCDIC_StartTokenDetected = 0;
-unsigned char toLatin1[256] =
+static unsigned char toLatin1[256] =
{
0x00, 0x01, 0x02, 0x03, 0x9c, 0x09, 0x86, 0x7f, 0x97, 0x8d,
0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 74445a2..5e96a2b 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -191,4 +191,20 @@ void warning1(char *, ...);
void convert_slashes(char *);
char *append_slash(char *);
+extern char * directives[];
+
+extern struct inclist * inclistp;
+
+extern char * objprefix;
+
+extern char * objsuffix;
+
+extern boolean printed;
+
+extern boolean verbose;
+
+extern boolean show_where_not;
+
+extern boolean warn_multiple;
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index 6712b1a..e83ac0f 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -38,12 +38,9 @@ int issymbolic(char * dir, char * component);
int exists_path(struct IncludesCollection*, char*);
-extern struct inclist inclist[ MAXFILES ],
- *inclistp;
+extern struct inclist inclist[ MAXFILES ];
extern char *includedirs[ ];
extern char *notdotdot[ ];
-extern boolean show_where_not;
-extern boolean warn_multiple;
struct inclist *inc_path(char *file, char *include, boolean dot, struct
IncludesCollection *incCollection)
{
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index c156c19..997ba6d 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -120,16 +120,16 @@ void redirect(char * makefile);
struct inclist inclist[ MAXFILES ],
*inclistp = inclist;
-struct symhash *maininclist = NULL;
+static struct symhash *maininclist = NULL;
char*filelist[ MAXFILES ];
char*includedirs[ MAXDIRS + 1 ];
char*notdotdot[ MAXDIRS ];
char*objprefix = "";
char*objsuffix = OBJSUFFIX;
-char*startat = "# DO NOT DELETE";
-int width = 78;
-boolean append = FALSE;
+static char*startat = "# DO NOT DELETE";
+static int width = 78;
+static boolean append = FALSE;
boolean printed = FALSE;
boolean verbose = FALSE;
boolean show_where_not = FALSE;
@@ -161,7 +161,7 @@ catch (int sig)
struct sigaction sig_act;
#endif /* USGISH */
-boolean native_win_slashes = FALSE;
+static boolean native_win_slashes = FALSE;
int main(int argc, char**argv)
{
diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c
index 01adafbb..250a6a6 100644
--- a/soltools/mkdepend/parse.c
+++ b/soltools/mkdepend/parse.c
@@ -38
[Libreoffice-commits] core.git: apple_remote/source
apple_remote/source/AppleRemote.m |2 +- apple_remote/source/MultiClickRemoteBehavior.m |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 04900bf971196a3b27473fd35d4726cd8cadd0e0 Author: Stephan Bergmann Date: Mon Jan 9 20:02:01 2017 +0100 loplugin:externvar Change-Id: I35449ee2d7294024fde83e36af83311a08a7ccae diff --git a/apple_remote/source/AppleRemote.m b/apple_remote/source/AppleRemote.m index 48dd9ef..fe50af4 100644 --- a/apple_remote/source/AppleRemote.m +++ b/apple_remote/source/AppleRemote.m @@ -37,7 +37,7 @@ #import #import -const char* AppleRemoteDeviceName = "AppleIRController"; +static const char* AppleRemoteDeviceName = "AppleIRController"; @implementation AppleRemote diff --git a/apple_remote/source/MultiClickRemoteBehavior.m b/apple_remote/source/MultiClickRemoteBehavior.m index 0972a5a..f69f13a 100644 --- a/apple_remote/source/MultiClickRemoteBehavior.m +++ b/apple_remote/source/MultiClickRemoteBehavior.m @@ -31,8 +31,8 @@ #import "MultiClickRemoteBehavior.h" -const NSTimeInterval DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE = 0.35; -const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL = 0.4; +static const NSTimeInterval DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE = 0.35; +static const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL = 0.4; @implementation MultiClickRemoteBehavior ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/concat-deps.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e5c324016dcbadeb7664052124cc927246c2953f Author: Stephan Bergmann Date: Mon Jan 9 20:00:00 2017 +0100 loplugin:externvar Change-Id: I63571c0003e6e0d7bd7a0c71a7dd47955a8871e0 diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index cfaac07..c63d5a7 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -108,7 +108,7 @@ #define FALSE 0 #endif -int internal_boost = 0; +static int internal_boost = 0; static char* base_dir; static char* work_dir; size_t work_dir_len; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx |6
accessibility/source/extended/AccessibleBrowseBox.cxx | 14 --
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 18 +-
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 60
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx |4
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 39 ++---
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 24 +--
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 69
--
accessibility/source/extended/accessiblebrowseboxcell.cxx |4
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 38 -
accessibility/source/extended/accessibletablistbox.cxx |3
11 files changed, 135 insertions(+), 144 deletions(-)
New commits:
commit 62affdd4bf8ac45dfe6ce5274623e659895fdafa
Author: Arnaud Versini
Date: Sun Dec 18 15:18:31 2016 +0100
accessibility: simplify locking
Change-Id: I87580eabf87fffd86068b5b2e44672aa1f9ffe84
Reviewed-on: https://gerrit.libreoffice.org/32136
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 32bc207..dd65a8e 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -406,12 +406,10 @@ protected:
class SolarMethodGuard : public SolarMutexGuard, public osl::MutexGuard
{
public:
-inline SolarMethodGuard( AccessibleBrowseBoxBase& _rOwner, bool
_bEnsureAlive = true )
+inline SolarMethodGuard( osl::Mutex& rMutex )
:SolarMutexGuard( )
-,osl::MutexGuard( _rOwner.getMutex( ) )
+,osl::MutexGuard( rMutex )
{
-if ( _bEnsureAlive )
-_rOwner.ensureIsAlive( );
}
};
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index fea9965..377dc0a 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -112,9 +112,9 @@ void SAL_CALL AccessibleBrowseBox::disposing()
sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount()
throw ( uno::RuntimeException, std::exception )
{
-SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard( getMutex() );
+SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
+
return BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount();
}
@@ -123,8 +123,7 @@ css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL
AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex )
throw ( lang::IndexOutOfBoundsException, uno::RuntimeException,
std::exception )
{
-SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard( getMutex() );
+SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
css::uno::Reference< css::accessibility::XAccessible > xRet;
@@ -152,8 +151,7 @@ css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL
AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
throw ( uno::RuntimeException, std::exception )
{
-SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard( getMutex() );
+SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
css::uno::Reference< css::accessibility::XAccessible > xChild;
@@ -183,9 +181,9 @@ AccessibleBrowseBox::getAccessibleAtPoint( const
awt::Point& rPoint )
void SAL_CALL AccessibleBrowseBox::grabFocus()
throw ( uno::RuntimeException, std::exception )
{
-SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard( getMutex() );
+SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
+
mpBrowseBox->GrabFocus();
}
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index a13e23f..ccb2c37 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -187,8 +187,7 @@ Reference< css::accessibility::XAccessibleStateSet >
SAL_CALL
AccessibleBrowseBoxBase::getAccessibleStateSet()
throw ( uno::RuntimeException, std::exception )
{
-SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard( getMutex() );
+SolarMethodGuard aGuard( getMutex() );
// don't check whether alive -> StateSet may contain DEFUNC
return implCreateStateSetHelper();
}
@@ -404,9 +403,9 @@ void AccessibleBrowseBoxBase::ensureIsAlive() const
Rectangle AccessibleBrowseBoxBase::getBoundingBox()
throw ( lang::DisposedException )
{
-SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard( getMutex() );
+SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
+
Rectangle aRect = implGetBoundingBox();
if ( 0 == aR
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7168a1aa7429eae8249622ea19acc4cd564a18f Author: Olivier Date: Mon Jan 9 16:08:36 2017 -0200 Updated core Project: help 32c3b487b2abbfe65282178ba89c2606f71f4c98 Fix typos in help texts Change-Id: I89400e762b9798bbf451c1f41b6792e21e7a81f1 Reviewed-on: https://gerrit.libreoffice.org/32908 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index fce5517..32c3b48 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fce5517eb405ef8288d4d421259716d99b817eb1 +Subproject commit 32c3b487b2abbfe65282178ba89c2606f71f4c98 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0210.xhp|4 ++-- source/text/shared/01/05020301.xhp|2 +- source/text/swriter/classificationbar.xhp |3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) New commits: commit 32c3b487b2abbfe65282178ba89c2606f71f4c98 Author: Olivier Date: Mon Jan 9 16:08:36 2017 -0200 Fix typos in help texts Change-Id: I89400e762b9798bbf451c1f41b6792e21e7a81f1 Reviewed-on: https://gerrit.libreoffice.org/32908 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/shared/01/0210.xhp b/source/text/shared/01/0210.xhp index 5599f2f..9bf20f6 100644 --- a/source/text/shared/01/0210.xhp +++ b/source/text/shared/01/0210.xhp @@ -92,10 +92,10 @@ Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents). Find Previous -Finds and selects the previous occurrence of the text or format that you searching for in the document. +Finds and selects the previous occurrence of the text or format that you are searching for in the document. Find Next -Finds and selects the next occurrence of the text or format that you searching for in the document. +Finds and selects the next occurrence of the text or format that you are searching for in the document. Replace diff --git a/source/text/shared/01/05020301.xhp b/source/text/shared/01/05020301.xhp index 0be6eec..9c5ba98 100644 --- a/source/text/shared/01/05020301.xhp +++ b/source/text/shared/01/05020301.xhp @@ -275,7 +275,7 @@ Fraction Representation To represent a value as a fraction, format consists of two or three parts: integer optional part, numerator and denominator. Integer and numerator are separated by a blank or any quoted text. Numerator and denominator are separated by a slash character. Each part can consist of a combination of #, ? and 0 as placeholders. -Denominator is calculated to get the nearest value of the fraction with repsect to the number of placeholders. For example, PI value is represented as 3 16/113 with format: +Denominator is calculated to get the nearest value of the fraction with respect to the number of placeholders. For example, PI value is represented as 3 16/113 with format: # ?/??? Denominator value can also be forced to the value replacing placeholders. For example, to get PI value as a multiple of 1/16th (i.e. 50/16), use format: ?/16 diff --git a/source/text/swriter/classificationbar.xhp b/source/text/swriter/classificationbar.xhp index 9f8fddf..cc2ff73 100644 --- a/source/text/swriter/classificationbar.xhp +++ b/source/text/swriter/classificationbar.xhp @@ -91,7 +91,8 @@ %PRODUCTNAME allows customization of the levels of classification for your business. To customize the number and the name of the levels, copy the file example.xml located in Tools - Options - LibreOffice - Paths - Classification into a local folder and edit the contents. Use the file with your %PRODUCTNAME locale in the name as example. -Save the file and make the classification path above access the file. +Save the file and make the adequate changes to the classification +path above to access the file. Your system administrator can place the file in a network folder and make all users access the classification settings file. Pasting contents in documents with different levels of classification. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/cmis/cmis_datasupplier.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 84de69638362c7b575560e0da3efbc709b7ac476
Author: Michael Stahl
Date: Mon Jan 9 18:42:22 2017 +0100
ucb: cmis::DataSupplier::queryContent() looks rather questionable
It's not immediately obvious if the caller is responsible for
checking the index validity here, but all the other sub-classes of
ResultSetDataSupplier that i looked at do check the index so do
the same here.
Change-Id: Ib0c5c38cb28282f08752cdb03202e4d6f3566693
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx
b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
index 19754f8..14b3385 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
@@ -68,18 +68,20 @@ namespace cmis
OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
{
-return queryContentIdentifier( nIndex )->getContentIdentifier( );
+auto const xTemp(queryContentIdentifier(nIndex));
+return (xTemp.is()) ? xTemp->getContentIdentifier() : OUString();
}
uno::Reference< ucb::XContentIdentifier >
DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
{
-return queryContent( nIndex )->getIdentifier( );
+auto const xTemp(queryContent(nIndex));
+return (xTemp.is()) ? xTemp->getIdentifier() :
uno::Reference();
}
uno::Reference< ucb::XContent > DataSupplier::queryContent( sal_uInt32
nIndex )
{
-if ( nIndex > maResults.size() )
-getData( );
+if (!getResult(nIndex))
+return uno::Reference();
return maResults[ nIndex ]->xContent;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac xmloff/Library_xo.mk
configure.ac | 13 + xmloff/Library_xo.mk |6 ++ 2 files changed, 19 insertions(+) New commits: commit 22779b136058934f1af0dcfa50ba23ea6220db87 Author: Rene Engelhard Date: Sat Jan 7 16:46:14 2017 +0100 use (new) -mlong-jump-table-offsets on m68k for libxo Change-Id: I6e2886e2de4f3502c74f1e367216066352994865 diff --git a/configure.ac b/configure.ac index e808f14..dce6892 100644 --- a/configure.ac +++ b/configure.ac @@ -3778,6 +3778,19 @@ if test "$GCC" = "yes"; then AC_MSG_RESULT([no]) fi fi + +if test "$host_cpu" = "m68k"; then +AC_MSG_CHECKING([whether $CC supports -mlong-jump-table-offsets]) +save_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS -Werror -mlong-jump-table-offsets" +AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_LONG_JUMP_TABLE_OFFSETS=TRUE ],[]) +CFLAGS=$save_CFLAGS +if test "$HAVE_GCC_LONG_JUMP_TABLE_OFFSETS" = "TRUE"; then +AC_MSG_RESULT([yes]) +else +AC_MSG_ERROR([no]) +fi +fi fi AC_SUBST(HAVE_GCC_GGDB2) AC_SUBST(HAVE_GCC_FINLINE_LIMIT) diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 2feb3cf..d8cf948 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -368,4 +368,10 @@ $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/xforms/xformsimport \ )) +ifeq ($(CPUNAME),M68K) +$(eval $(call gb_Library_add_cxxflags,xo,\ +-mlong-jump-table-offsets \ +)) +endif + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.1-16'
Tag 'cp-5.1-16' created by Andras Timar at 2017-01-09 17:15 + cp-5.1-16 Changes since cp-5.1-15-19: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/cacher/cachedcontentresultset.cxx | 83 +++---
ucb/source/cacher/contentresultsetwrapper.cxx | 34 --
ucb/source/cacher/contentresultsetwrapper.hxx | 39
3 files changed, 76 insertions(+), 80 deletions(-)
New commits:
commit a5a94537d804f20a0d6472ef2e5995cee2d5b2fe
Author: Michael Stahl
Date: Mon Jan 9 17:35:32 2017 +0100
ucb: ReacquireableGuard::reacquire() is a no-op
So remove this junk and use osl::ResettableGuard instead which actually
works.
Change-Id: Ieb49fab16c94f0a2847ee5a1b95b52f2c141c674
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx
b/ucb/source/cacher/cachedcontentresultset.cxx
index 06e9b5b..584d975 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -53,12 +53,13 @@ template T CachedContentResultSet::rowOriginGet(
T (SAL_CALL css::sdbc::XRow::* f)(sal_Int32), sal_Int32 columnIndex)
{
impl_EnsureNotDisposed();
-ReacquireableGuard aGuard( m_aMutex );
+osl::ResettableMutexGuard aGuard(m_aMutex);
sal_Int32 nRow = m_nRow;
sal_Int32 nFetchSize = m_nFetchSize;
sal_Int32 nFetchDirection = m_nFetchDirection;
if( !m_aCache.hasRow( nRow ) )
{
+bool isCleared = false;
if( !m_aCache.hasCausedException( nRow ) )
{
if( !m_xFetchProvider.is() )
@@ -67,12 +68,16 @@ template T CachedContentResultSet::rowOriginGet(
throw SQLException();
}
aGuard.clear();
+isCleared = true;
if( impl_isForwardOnly() )
applyPositionToOrigin( nRow );
impl_fetchData( nRow, nFetchSize, nFetchDirection );
}
-aGuard.reacquire();
+if (isCleared)
+{
+aGuard.reset();
+}
if( !m_aCache.hasRow( nRow ) )
{
m_bLastReadWasFromCache = false;
@@ -718,7 +723,7 @@ bool SAL_CALL CachedContentResultSet
the result set.
*/
-ReacquireableGuard aGuard( m_aMutex );
+osl::ResettableMutexGuard aGuard(m_aMutex);
OSL_ENSURE( nRow >= 0, "only positive values supported" );
if( !m_xResultSetOrigin.is() )
{
@@ -749,7 +754,7 @@ bool SAL_CALL CachedContentResultSet
break;
}
-aGuard.reacquire();
+aGuard.reset();
m_nLastAppliedPos += nM;
m_bAfterLastApplied = nRow != m_nLastAppliedPos;
return nRow == m_nLastAppliedPos;
@@ -759,7 +764,7 @@ bool SAL_CALL CachedContentResultSet
{
m_xResultSetOrigin->beforeFirst();
-aGuard.reacquire();
+aGuard.reset();
m_nLastAppliedPos = 0;
m_bAfterLastApplied = false;
return false;
@@ -772,7 +777,7 @@ bool SAL_CALL CachedContentResultSet
{
bool bValid = m_xResultSetOrigin->absolute( nRow );
-aGuard.reacquire();
+aGuard.reset();
m_nLastAppliedPos = nRow;
m_bAfterLastApplied = !bValid;
return bValid;
@@ -781,7 +786,7 @@ bool SAL_CALL CachedContentResultSet
{
bool bValid = m_xResultSetOrigin->relative( nRow -
nLastAppliedPos );
-aGuard.reacquire();
+aGuard.reset();
m_nLastAppliedPos += ( nRow - nLastAppliedPos );
m_bAfterLastApplied = !bValid;
return bValid;
@@ -799,7 +804,7 @@ bool SAL_CALL CachedContentResultSet
break;
}
-aGuard.reacquire();
+aGuard.reset();
m_nLastAppliedPos += nM;
m_bAfterLastApplied = nRow != m_nLastAppliedPos;
}
@@ -1264,7 +1269,7 @@ void SAL_CALL CachedContentResultSet
#define XCONTENTACCESS_queryXXX( queryXXX, XXX, TYPE ) \
impl_EnsureNotDisposed(); \
-ReacquireableGuard aGuard( m_aMutex ); \
+osl::ResettableMutexGuard aGuard(m_aMutex); \
sal_Int32 nRow = m_nRow;\
sal_Int32 nFetchSize = m_nFetchSize;\
sal_Int32 nFetchDirection = m_nFetchDirection; \
@@ -1272,6 +1277,7 @@ if( !m_aCache##XXX.hasRow( nRow ) )
\
{ \
try \
{ \
+bool isCleared = false; \
if( !m_aCache##XXX.hasCausedException( nRow ) ) \
{ \
if( !m_xFetchProviderForContentAccess.is() )\
@@ -1280,12 +1286,16 @@ if( !m_aCache##XXX.hasRow( nRow ) )
\
th
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.1-16'
Tag 'cp-5.1-16' created by Andras Timar at 2017-01-09 17:15 + cp-5.1-16 Changes since cp-5.1-9-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.1-16'
Tag 'cp-5.1-16' created by Andras Timar at 2017-01-09 17:15 + cp-5.1-16 Changes since libreoffice-5-1-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.1-16'
Tag 'cp-5.1-16' created by Andras Timar at 2017-01-09 17:15 + cp-5.1-16 Changes since cp-5.1-15: Andras Timar (1): tdf#97349: typo fixes in control words --- fr_FR/hyph_fr.dic |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/Library_cui.mk external_deps.lst python/makefile.mk python/prj python/python-2.7.12-mingw.patch python/python-2.7.12-nohardlink.pat
cui/Library_cui.mk|2 external_deps.lst |6 python/makefile.mk|2 python/prj/d.lst | 108 +- python/python-2.7.12-mingw.patch | 571 --- python/python-2.7.12-nohardlink.patch | 11 python/python-2.7.12-pcbuild.patch| 1710 -- python/python-2.7.12-sysbase.patch| 14 python/python-2.7.13-mingw.patch | 571 +++ python/python-2.7.13-nohardlink.patch | 11 python/python-2.7.13-pcbuild.patch| 1710 ++ python/python-2.7.13-sysbase.patch| 14 python/python-freebsd.patch | 46 python/python-md5.patch |6 python/python-solaris.patch |4 python/python-solver-before-std.patch |6 python/python-ssl.patch | 12 python/pyversion.mk |2 18 files changed, 2403 insertions(+), 2403 deletions(-) New commits: commit 27f0c3366b4fb7c667d400e953c033f07de675f3 Author: Damjan Jovanovic Date: Mon Jan 9 01:47:34 2017 + Fix a missing bracket problem in a main/cui makefile when BUILD_VER_STRING is set. Patch by: me diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 8d448ad..c4e56c4 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,cui,\ )) ifneq ($(BUILD_VER_STRING),) -$(eval $(call gb_Library_add_defs,cui,-DBUILD_VER_STRING="$(BUILD_VER_STRING")) +$(eval $(call gb_Library_add_defs,cui,-DBUILD_VER_STRING="$(BUILD_VER_STRING)")) endif $(eval $(call gb_Library_add_defs,cui,\ commit d6e0c30370effa6326fd174f6f05227a1c86c8d6 Author: Pedro Giffuni Date: Mon Jan 9 00:45:26 2017 + Bring new Python bugfix release version 2.7.13. Release Notes: https://hg.python.org/cpython/raw-file/v2.7.13/Misc/NEWS Tested on FreeBSD but since it is a minor update, we don't expect problems on other platforms. diff --git a/external_deps.lst b/external_deps.lst index 0eb7931b..5a02e6a 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -201,9 +201,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) -MD5 = 88d61f82e3616a4be952828b3694109d -name = Python-2.7.12.tgz -URL1 = http://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz +MD5 = 17add4bf0ad0ec2f08e0cae6d205c700 +name = Python-2.7.13.tgz +URL1 = http://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 5580971..22ab60e 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=88d61f82e3616a4be952828b3694109d +TARFILE_MD5=17add4bf0ad0ec2f08e0cae6d205c700 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index 157aca8..b521c1e 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.12\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Pyth
[Libreoffice-commits] core.git: svl/source
svl/source/items/poolitem.cxx | 73 --
1 file changed, 1 insertion(+), 72 deletions(-)
New commits:
commit de77b1b22b60a98363886339c4038df7f652d92e
Author: Stephan Bergmann
Date: Mon Jan 9 17:48:08 2017 +0100
Wow! The ultimate Easter Egg
Instantiate one million SfxPoolItems to reach the next level!
Change-Id: Ib600f6f2ece080eb98d7f8d284080b5584b0a9d1
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index d23bbe2..ba27df6 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -24,51 +24,12 @@
#include
#include
-
-#if OSL_DEBUG_LEVEL > 0
-static sal_uLong nItemCount = 0;
-
-static const char* pw1 = "Wow! 10.000 items!";
-static const char* pw2 = "Wow! 100.000 items!";
-static const char* pw3 = "Wow! 1.000.000 items!";
-static const char* pw4 = "Wow! 50.000.000 items!";
-static const char* pw5 = "Wow! 10.000.000 items!";
-#endif
-
SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich)
: m_nRefCount(0)
, m_nWhich(nWhich)
, m_nKind(SfxItemKind::NONE)
{
assert(nWhich <= SHRT_MAX);
-#if OSL_DEBUG_LEVEL > 0
-++nItemCount;
-if ( pw1 && nItemCount>=1 )
-{
-SAL_INFO( "svl", pw1 );
-pw1 = nullptr;
-}
-if ( pw2 && nItemCount>=10 )
-{
-SAL_INFO( "svl", pw2 );
-pw2 = nullptr;
-}
-if ( pw3 && nItemCount>=100 )
-{
-SAL_INFO( "svl", pw3 );
-pw3 = nullptr;
-}
-if ( pw4 && nItemCount>=500 )
-{
-SAL_INFO( "svl", pw4 );
-pw4 = nullptr;
-}
-if ( pw5 && nItemCount>=1000 )
-{
-SAL_INFO( "svl", pw5 );
-pw5 = nullptr;
-}
-#endif
}
@@ -76,45 +37,13 @@ SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy )
: m_nRefCount(0) // don't copy that
, m_nWhich(rCpy.m_nWhich)
, m_nKind(SfxItemKind::NONE)
-{
-#if OSL_DEBUG_LEVEL > 0
-++nItemCount;
-if ( pw1 && nItemCount>=1 )
-{
-SAL_INFO( "svl", pw1 );
-pw1 = nullptr;
-}
-if ( pw2 && nItemCount>=10 )
-{
-SAL_INFO( "svl", pw2 );
-pw2 = nullptr;
-}
-if ( pw3 && nItemCount>=100 )
-{
-SAL_INFO( "svl", pw3 );
-pw3 = nullptr;
-}
-if ( pw4 && nItemCount>=500 )
-{
-SAL_INFO( "svl", pw4 );
-pw4 = nullptr;
-}
-if ( pw5 && nItemCount>=1000 )
-{
-SAL_INFO( "svl", pw5 );
-pw5 = nullptr;
-}
-#endif
-}
+{}
SfxPoolItem::~SfxPoolItem()
{
assert((m_nRefCount == 0 || m_nRefCount > SFX_ITEMS_MAXREF)
&& "destroying item in use");
-#if OSL_DEBUG_LEVEL > 0
---nItemCount;
-#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit f1b786bdd2576f584c62bfa797d3849eb5330c2c
Author: Maxim Monastirsky
Date: Wed Dec 28 01:02:33 2016 +0200
tdf#104944 gtk3: Ignore mouse up event if the wrong frame
Change-Id: I3d0aad6d2b434866df9110d3b8493fec2d2c94fe
Reviewed-on: https://gerrit.libreoffice.org/32465
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
(cherry picked from commit 23a13694a5a70098b5ecd58b99d99618111f3ea5)
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index ab10260..56a74ac 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2610,11 +2610,12 @@ gboolean GtkSalFrame::signalButton( GtkWidget*,
GdkEventButton* pEvent, gpointer
vcl::DeletionListener aDel( pThis );
-if (pEvent->type == GDK_BUTTON_PRESS && pThis->isFloatGrabWindow())
+if (pThis->isFloatGrabWindow() && pEvent->window !=
widget_get_window(pThis->getMouseEventWidget()))
{
-bool bClosePopups = (pEvent->window !=
widget_get_window(pThis->getMouseEventWidget()));
-if (bClosePopups)
+if (pEvent->type == GDK_BUTTON_PRESS)
pThis->closePopup();
+else if (pEvent->type == GDK_BUTTON_RELEASE)
+return true;
}
if (!aDel.isDeleted())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/uiconfig
extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui |2 +- extensions/uiconfig/sabpilot/ui/tableselectionpage.ui |8 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 0c9f0f3c17a03b305f9d55ad40cc7e4111269760 Author: heiko tietze Date: Sun Jan 8 10:36:52 2017 +0100 tdf#105160: word wrap at wizard Vertical spacing fill now Change-Id: I1463df1a0b345a39c10ef83b2fa0c558bd135cdc Reviewed-on: https://gerrit.libreoffice.org/32829 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui b/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui index 3c30089..4d09d35 100644 --- a/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui +++ b/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui @@ -1,5 +1,5 @@ - + diff --git a/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui b/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui index c27aa8d..73914ba 100644 --- a/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui +++ b/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui @@ -1,5 +1,5 @@ - + @@ -37,10 +37,8 @@ True False start -start +True True -0 -0 Currently, the form the control belongs to is not (or not completely) bound to a data source. Please choose a data source and a table. @@ -49,6 +47,8 @@ Please choose a data source and a table. Please note that the settings made on this page will take effect immediately upon leaving the page. True 45 +0 +0 False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk Repository.mk scp2/AutoInstall.mk scp2/InstallModule_base.mk scp2/source
Repository.mk |5 - RepositoryExternal.mk |4 scp2/AutoInstall.mk |1 + scp2/InstallModule_base.mk|1 + scp2/source/base/firebird.scp | 13 +++-- 5 files changed, 13 insertions(+), 11 deletions(-) New commits: commit e014213ae42da5e5464724bc79956e684f7f20cd Author: Michael Stahl Date: Mon Jan 9 14:49:38 2017 +0100 scp2: move firebird_sdbc library to firebirdsdbc module Change-Id: Ie57ae3452947a8454eca5d83f2e80d168ef2fa6d diff --git a/Repository.mk b/Repository.mk index 560716d..f891da0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -334,7 +334,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ flat \ file) \ filterconfig \ - $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \ fps_office \ for \ forui \ @@ -457,6 +456,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \ postgresql-sdbc-impl) \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,firebirdsdbc, \ + $(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \ +)) + ifneq ($(ENABLE_PDFIMPORT),) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \ pdfimport \ commit 2c78d4965a8ddd77b926edc0e0aa4a19577e2453 Author: Michael Stahl Date: Mon Jan 9 14:45:11 2017 +0100 tdf#90753 scp2: move firebirdsdbc packages to AutoInstall Change-Id: Ifabb9fa65115fcc1728fa16e142ef008834eedda diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f4732df..02392ae 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2925,6 +2925,10 @@ endef else # !SYSTEM_FIREBIRD +$(eval $(call gb_Helper_register_packages_for_install,firebirdsdbc,\ + firebird \ +)) + #$(call gb_LinkTarget__use_libatomic_ops,$(1)) #$(call gb_LinkTarget__use_libtommath,$(1)) diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 43c53ab..409ceb9 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -22,6 +22,7 @@ $(eval $(call gb_AutoInstall_add_module,extensions_ct2n)) $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,extensions_numbertext)) $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE)) +$(eval $(call gb_AutoInstall_add_module,firebirdsdbc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk index 2efba18..709d149 100644 --- a/scp2/InstallModule_base.mk +++ b/scp2/InstallModule_base.mk @@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\ base \ base_brand \ + firebirdsdbc \ postgresqlsdbc \ )) diff --git a/scp2/source/base/firebird.scp b/scp2/source/base/firebird.scp index dd7288f..61cfff9 100644 --- a/scp2/source/base/firebird.scp +++ b/scp2/source/base/firebird.scp @@ -18,6 +18,8 @@ #include "macros.inc" +#include "AutoInstall/firebirdsdbc" + #if defined( ENABLE_FIREBIRD_SDBC ) && !defined( SYSTEM_FIREBIRD ) Module gid_Module_Optional_Firebird @@ -25,17 +27,8 @@ Module gid_Module_Optional_Firebird Description = "Firebird embedded database"; PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Root_Brand; -Files = ( -File gid_File_Firebird -); +Files = (auto_firebirdsdbc_ALL); Styles = (HIDDEN_ROOT); End -File gid_File_Firebird -TXT_FILE_BODY; -Styles = (FILELIST, PACKED); -Dir = FILELIST_DIR; -Name = "firebird.filelist"; -End - #endif ___ 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.1' - external/curl
external/curl/curl-7.26.0_win-proxy.patch |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 19ebc120625671dfea2c5b18e3440c1cbed0fe78
Author: Michael Meeks
Date: Mon Jan 9 15:41:53 2017 +
Fix strange whitespace related compiler warning.
Change-Id: I715db29afde57ffc8fe99614507bce5675f07a6a
diff --git a/external/curl/curl-7.26.0_win-proxy.patch
b/external/curl/curl-7.26.0_win-proxy.patch
index 580479a..7aea9c0 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -27,7 +27,7 @@
}
+#ifdef WIN32
-+static char* wstrToCstr( LPWSTR wStr )
++static char* wstrToCstr(LPWSTR wStr)
+{
+ int bufSize;
+ char* out = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/source
vcl/source/filter/ixbm/xbmread.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 864e59042bf4475428e182aa93256aaef2ac4e2e Author: Caolán McNamara Date: Mon Jan 9 09:05:12 2017 + ofz#394 xbm ParseDefine problem Change-Id: I75fb761d23fdb3780088a9d209200429edb57a26 Reviewed-on: https://gerrit.libreoffice.org/32878 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index a8a59a7..96e7ae3 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -174,11 +174,11 @@ long XBMReader::ParseDefine( const sal_Char* pDefine ) cTmp = *pTmp--; // search last digit -while( pHexTable[ cTmp ] == -1 ) +while (pHexTable[ cTmp ] == -1 && pTmp >= pDefine) cTmp = *pTmp--; // move before number -while( pHexTable[ cTmp ] != -1 ) +while (pHexTable[ cTmp ] != -1 && pTmp >= pDefine) cTmp = *pTmp--; // move to start of number ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/Makefile.am loleaflet/po
loleaflet/Makefile.am |2 loleaflet/po/templates/loleaflet-help.pot | 745 -- 2 files changed, 123 insertions(+), 624 deletions(-) New commits: commit fdb71825c4c8351a12cd74ab5a2fa610961b278c Author: Andras Timar Date: Mon Jan 9 15:48:16 2017 +0100 loleaflet: use --duplicates=merge option of html2po Change-Id: Id2bba4580910a7dd02c0a11302e4ae1dd2c15acb diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 4e3ed35..f47f495 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -64,7 +64,7 @@ pot: src/map/Map.js \ src/map/handler/Map.FileInserter.js - html2po --pot --input=dist/loleaflet-help.html --output=po/templates/loleaflet-help.pot + html2po --pot --input=dist/loleaflet-help.html --output=po/templates/loleaflet-help.pot --duplicates=merge l10n: pot for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot --template=$$i --output=$$i.new; mv $$i.new $$i;done diff --git a/loleaflet/po/templates/loleaflet-help.pot b/loleaflet/po/templates/loleaflet-help.pot index 00ecfc5..889045d 100644 --- a/loleaflet/po/templates/loleaflet-help.pot +++ b/loleaflet/po/templates/loleaflet-help.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 12:59+0200\n" +"POT-Creation-Date: 2017-01-09 15:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -69,37 +69,43 @@ msgid "Ctrl + Shift + ?" msgstr "" #: dist/loleaflet-help.html+div.div.h2:38 -msgctxt "dist/loleaflet-help.html div.div.h2:38" +#: dist/loleaflet-help.html+div.div.h2:160 msgid "Text formatting" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:40 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:40" +#: dist/loleaflet-help.html+div.div.table.tr.td:137 +#: dist/loleaflet-help.html+div.div.table.tr.td:162 msgid "Bold" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:40 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:40" +#: dist/loleaflet-help.html+div.div.table.tr.td:137 +#: dist/loleaflet-help.html+div.div.table.tr.td:162 msgid "Ctrl + B" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:41 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:41" +#: dist/loleaflet-help.html+div.div.table.tr.td:138 +#: dist/loleaflet-help.html+div.div.table.tr.td:163 msgid "Italic" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:41 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:41" +#: dist/loleaflet-help.html+div.div.table.tr.td:138 +#: dist/loleaflet-help.html+div.div.table.tr.td:163 msgid "Ctrl + I" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:42 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:42" +#: dist/loleaflet-help.html+div.div.table.tr.td:139 +#: dist/loleaflet-help.html+div.div.table.tr.td:164 msgid "Underline" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:42 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:42" +#: dist/loleaflet-help.html+div.div.table.tr.td:139 +#: dist/loleaflet-help.html+div.div.table.tr.td:164 msgid "Ctrl + U" msgstr "" @@ -108,92 +114,102 @@ msgid "Double Underline" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:43 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:43" +#: dist/loleaflet-help.html+div.div.table.tr.td:144 msgid "Ctrl + D" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:44 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:44" +#: dist/loleaflet-help.html+div.div.table.tr.td:140 +#: dist/loleaflet-help.html+div.div.table.tr.td:165 msgid "Strikethrough" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:44 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:44" +#: dist/loleaflet-help.html+div.div.table.tr.td:140 +#: dist/loleaflet-help.html+div.div.table.tr.td:165 msgid "Ctrl + Alt + 5" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:45 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:45" +#: dist/loleaflet-help.html+div.div.table.tr.td:166 msgid "Superscript" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:45 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:45" +#: dist/loleaflet-help.html+div.div.table.tr.td:166 msgid "Ctrl + Shift + P" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:46 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:46" +#: dist/loleaflet-help.html+div.div.table.tr.td:167 msgid "Subscript" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:46 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:46" +#: dist/loleaflet-help.html+div.div.table.tr.td:167 msgid "Ctrl + Shift + B" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:47 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:47" +#: dist/loleaflet-help.html+div.div.t
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sw/source
sw/source/core/doc/DocumentStateManager.cxx |4 ++--
sw/source/core/doc/DocumentStatisticsManager.cxx | 13 -
sw/source/core/inc/DocumentStatisticsManager.hxx |4 ++--
3 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 33cc1bf84df83d31d1963d0d9a51f8d7413e3117
Author: Oliver Specht
Date: Tue Mar 29 10:17:57 2016 +0200
tdf#94570: document statistic of none odf files fixed
The fix allows first time calculation of the document statistic.
Change-Id: I54d2f208fa75e6c3502c27678b85a9995d4daec5
Reviewed-on: https://gerrit.libreoffice.org/23589
Tested-by: Jenkins
Reviewed-by: Oliver Specht
(cherry picked from commit 49152948ddfb1a457ab2fc149fcede57dc2c255b)
Reviewed-on: https://gerrit.libreoffice.org/32884
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/sw/source/core/doc/DocumentStateManager.cxx
b/sw/source/core/doc/DocumentStateManager.cxx
index 80869a6..5375da9 100644
--- a/sw/source/core/doc/DocumentStateManager.cxx
+++ b/sw/source/core/doc/DocumentStateManager.cxx
@@ -41,7 +41,7 @@ void DocumentStateManager::SetModified()
{
m_rDoc.GetDocumentLayoutManager().ClearSwLayouterEntries();
mbModified = true;
-m_rDoc.GetDocumentStatisticsManager().GetDocStat().bModified = true;
+m_rDoc.GetDocumentStatisticsManager().SetDocStatModified( true );
if( m_rDoc.GetOle2Link().IsSet() )
{
mbInCallModified = true;
@@ -60,7 +60,7 @@ void DocumentStateManager::ResetModified()
// Bit 1: -> new state
bool bOldModified = mbModified;
mbModified = false;
-m_rDoc.GetDocumentStatisticsManager().GetDocStat().bModified = false;
+m_rDoc.GetDocumentStatisticsManager().SetDocStatModified( false );
m_rDoc.GetIDocumentUndoRedo().SetUndoNoModifiedPosition();
if( bOldModified && m_rDoc.GetOle2Link().IsSet() )
{
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx
b/sw/source/core/doc/DocumentStatisticsManager.cxx
index d5c24dd..81ed9f4 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -70,7 +70,8 @@ namespace sw
{
DocumentStatisticsManager::DocumentStatisticsManager( SwDoc& i_rSwdoc ) :
m_rDoc( i_rSwdoc ),
-
mpDocStat( new SwDocStat )
+
mpDocStat( new SwDocStat ),
+
mbInitialized( false )
{
maStatsUpdateTimer.SetTimeout( 1 );
maStatsUpdateTimer.SetPriority( SchedulerPriority::LOWEST );
@@ -92,14 +93,14 @@ const SwDocStat& DocumentStatisticsManager::GetDocStat()
const
return *mpDocStat;
}
-SwDocStat& DocumentStatisticsManager::GetDocStat()
+void DocumentStatisticsManager::SetDocStatModified(bool bSet)
{
-return *mpDocStat;
+mpDocStat->bModified = bSet;
}
const SwDocStat& DocumentStatisticsManager::GetUpdatedDocStat( bool
bCompleteAsync, bool bFields )
{
-if( mpDocStat->bModified )
+if( mpDocStat->bModified || !mbInitialized)
{
UpdateDocStat( bCompleteAsync, bFields );
}
@@ -109,11 +110,12 @@ const SwDocStat&
DocumentStatisticsManager::GetUpdatedDocStat( bool bCompleteAsy
void DocumentStatisticsManager::SetDocStat( const SwDocStat& rStat )
{
*mpDocStat = rStat;
+mbInitialized = true;
}
void DocumentStatisticsManager::UpdateDocStat( bool bCompleteAsync, bool
bFields )
{
-if( mpDocStat->bModified )
+if( mpDocStat->bModified || !mbInitialized)
{
if (!bCompleteAsync)
{
@@ -131,6 +133,7 @@ void DocumentStatisticsManager::UpdateDocStat( bool
bCompleteAsync, bool bFields
// returns true while there is more to do
bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool
bFields)
{
+mbInitialized = true;
mpDocStat->Reset();
mpDocStat->nPara = 0; // default is 1!
diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx
b/sw/source/core/inc/DocumentStatisticsManager.hxx
index b35aaf5..97ad4c1 100644
--- a/sw/source/core/inc/DocumentStatisticsManager.hxx
+++ b/sw/source/core/inc/DocumentStatisticsManager.hxx
@@ -39,11 +39,10 @@ public:
void DocInfoChgd(bool isEnableSetModified) override;
const SwDocStat &GetDocStat() const override;
-SwDocStat & GetDocStat(); //Non const version of the above, not part of
the interface.
+void SetDocStatModified(bool bSet);
const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool
bFields = true) override;
void SetDocStat(const SwDocStat& rStat) override;
void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true)
override;
-
virtual ~DocumentStatisticsManager();
private:
@@ -64,6 +63,7 @@ private:
SwDocStat *mpDocStat; //< Statistics information.
+boolmbInitialized
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source
sw/source/core/access/accfrmobj.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 97b9f00e3a443f636416d047e7fdcb7a91fac937
Author: Michael Stahl
Date: Fri Jan 6 22:37:17 2017 +0100
tdf#105009 sw: fix a11y crash when removing drawing object
SwFrame::RemoveDrawObj() calls SwAnchoredObject::ChgAnchorFrame(0)
so the SwAnchoredDrawObj has no anchor frame later when
SwAccessibleMap::InvalidateCursorPosition() asks for the parent.
(regression from 76c549eb01dcb7b5bf28a271ce00e386f3d388ba)
Change-Id: Id55cb5fc41a4e37e863498265d1565e1621d508e
(cherry picked from commit ade1d4c36053c2a7aed959e3dd09ebc1b8430ea8)
Reviewed-on: https://gerrit.libreoffice.org/32802
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/access/accfrmobj.cxx
b/sw/source/core/access/accfrmobj.cxx
index cf3e295..5b59078 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -367,10 +367,14 @@ const SwFrame* SwAccessibleChild::GetParent( const bool
bInPagePreview ) const
else
{
// In any other case the parent is the root frm
-if( bInPagePreview )
-pParent = pContact->GetAnchorFrame()->FindPageFrame();
-else
-pParent = pContact->GetAnchorFrame()->getRootFrame();
+SwFrame const*const pAnchor(pContact->GetAnchorFrame());
+if (pAnchor) // null if object removed from layout
+{
+if (bInPagePreview)
+pParent = pAnchor->FindPageFrame();
+else
+pParent = pAnchor->getRootFrame();
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/source
vcl/source/window/window2.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 62b77a31119c23a8617e161a2d4f4d4e1e97eb2c Author: Michael Meeks Date: Fri Jan 6 15:23:30 2017 + tdf#105151 - be more conservative about EndTracking / Tracking calls. We really shouldn't be emitting these into widgets after they are disposed - it serves only to confuse things. Restore behaviour to how it was before the VclPtr change for this. Change-Id: Ife666929f8aac0e4431a5e43970769692c11888c Reviewed-on: https://gerrit.libreoffice.org/32785 Tested-by: Jenkins Reviewed-by: Michael Meeks (cherry picked from commit d788d37a16d382d7ff32a19e8d65e5c605ac55dd) Reviewed-on: https://gerrit.libreoffice.org/32819 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 79ae5c5..5d427cc 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -371,7 +371,11 @@ void Window::EndTracking( TrackingEventFlags nFlags ) mpWindowImpl->mpFrameData->mnMouseCode, mpWindowImpl->mpFrameData->mnMouseCode ); TrackingEvent aTEvt( aMEvt, nFlags | TrackingEventFlags::End ); -Tracking( aTEvt ); +// CompatTracking effectively +if (!mpWindowImpl || mpWindowImpl->mbInDispose) +return Window::Tracking( aTEvt ); +else +return Tracking( aTEvt ); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source
sw/source/core/access/accfrmobj.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 017991fac36433fb909de83cad63b5ed98b71acf
Author: Michael Stahl
Date: Fri Jan 6 22:37:17 2017 +0100
tdf#105009 sw: fix a11y crash when removing drawing object
SwFrame::RemoveDrawObj() calls SwAnchoredObject::ChgAnchorFrame(0)
so the SwAnchoredDrawObj has no anchor frame later when
SwAccessibleMap::InvalidateCursorPosition() asks for the parent.
(regression from 76c549eb01dcb7b5bf28a271ce00e386f3d388ba)
Change-Id: Id55cb5fc41a4e37e863498265d1565e1621d508e
(cherry picked from commit ade1d4c36053c2a7aed959e3dd09ebc1b8430ea8)
Reviewed-on: https://gerrit.libreoffice.org/32803
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/access/accfrmobj.cxx
b/sw/source/core/access/accfrmobj.cxx
index c6986d9..4a093bdd 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -368,10 +368,14 @@ const SwFrame* SwAccessibleChild::GetParent( const bool
bInPagePreview ) const
else
{
// In any other case the parent is the root frm
-if( bInPagePreview )
-pParent = pContact->GetAnchorFrame()->FindPageFrame();
-else
-pParent = pContact->GetAnchorFrame()->getRootFrame();
+SwFrame const*const pAnchor(pContact->GetAnchorFrame());
+if (pAnchor) // null if object removed from layout
+{
+if (bInPagePreview)
+pParent = pAnchor->FindPageFrame();
+else
+pParent = pAnchor->getRootFrame();
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
Hi *, On Thu, Jan 5, 2017 at 6:07 PM, Michael Meeks wrote: > […] > * Release Engineering update (Christian) > + 5.2.5 RC1 schedule acceleration ? > + fixes for both regressions in 5.2 > + Markus’ fix may help a lot with lots of shutdown crashes. > + Xisco mailed QA guys to test this hard → nothing bad so far. > => Recommend move 5.2.5 in one week – to freeze Monday/Tuesday. A possibility is to only have one rc, and accelerate the release even further. > + 5.3.0 RC2 update > => Push this out one week, unless we can do both in one week. I'm fine with doing both this week, moving the 5.3.0 to end of the week then (tagging Thu evening) > * l10n (Sophie) > + still debugging the new pootle. > + LibreOffice Online pot update in Pootle? FYI: has been done today. (also libo_ui and libo_help have been triple-checked to be up-to-date :-)) Also Guilhem did switch to qemu with native gluster support that also gives better performance. A few upstream patches available that fix some of the issues we have (mainly stats on the overview pages not being updated, and login issues with usernames containing special characters), will update after pulling translations for the tags later this week. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Android app translation
Hi *, On Thu, Jan 5, 2017 at 2:03 PM, Necdet Yücel wrote: > Hi, > > It would be nice to use LO Android app in our language. Could we use > Document Foundation's pootle server for translations? Right now it doesn't have any translations, and the strings likely would be part of the main libo_ui / libo_help projects. So otherwise put: Once translations will be provided for the Android Viewer, then you'll also be able to translate it via pootle. Whether part of the main projects or in a separate one then is a implementation detail. But ATM it is english-only. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: bridge other build logs to our tinderbox page
Hi Caolán, *,
On Sun, Jan 8, 2017 at 10:15 PM, Caolán McNamara wrote:
> LibreOffice is also continuously built now in a (somewhat bizarro)
> configuration by oss-fuzz, here's the build log from there
> https://oss-fuzz-build-logs.storage.googleapis.com/build_logs/libreoffi
> ce/latest.txt
>
> It'd be nice to get that build status and log on the same page as the
> rest of our builds. What are my best options to get that working ?
Tinderbox works by sending mail to the tinderbox server, tinderbox
then parses the mail and creates the summary logs.
the mail needs some annotation lines and a header to be set in the mail.
The instructions are here:
https://wiki.openoffice.org/wiki/Tinderbox_Setup#Setting_up_a_build_slave
(not sure we bothered to move the manual setup over to our wiki...)
So you need the annotations ("tinderbox: administrator: …" and the
others), and the X-Tinder mail header, telling whether to look for the
log in the plaintext body or in a gzipped attachment.
and send to the tinder...@gimli.documentfoundation.org address.
For naming the tinderboxes, refer to
https://wiki.documentfoundation.org/Development/Tinderbox
ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Infra call on Tue, Jan 17 at 17:30 UTC
Hi there, The next infra call will take place at `date -d 'Tue Jan 17 17:30:00 UTC 2017'` (18:30:00 Berlin time). See https://pad.documentfoundation.org/p/infra for details and a preliminary agenda. See you there! Cheers, -- Guilhem. signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/qa
basic/qa/basic_coverage/test_getsystemticks_method.vb | 15 +++ 1 file changed, 15 insertions(+) New commits: commit b6988293c1c27dae8524ee0095d5e4c22ca62553 Author: Stephan Bergmann Date: Mon Jan 9 14:25:54 2017 +0100 Revert "Remove test_getsystemticks_method.vb for now" This reverts commit 93a8ebac2d6eb124bf57223069765af08fcd5c85, now that fce604c8ae11b462113305aba080d77f8193cfea "[API CHANGE] return unsigned 64-bit value from GetSystemTicks in basic code" is in. diff --git a/basic/qa/basic_coverage/test_getsystemticks_method.vb b/basic/qa/basic_coverage/test_getsystemticks_method.vb new file mode 100644 index 000..878b38b --- /dev/null +++ b/basic/qa/basic_coverage/test_getsystemticks_method.vb @@ -0,0 +1,15 @@ +' 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/. +' + +Function doUnitTest as Integer +' GETSYSTEMTICKS +If ( GetSystemTicks < 0 ) Then +doUnitTest = 0 +Else +doUnitTest = 1 +End If +End Function ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 245349ddaa51630e1dfec4037c0b8dd2f51e9651 Author: Jan-Marek Glogowski Date: Mon Jan 9 13:53:20 2017 +0100 Add missing "test" to -Og configure check Change-Id: Ida6cc4fa96b60e50c261aa2c81fb6d2fc0484b10 diff --git a/configure.ac b/configure.ac index 9f266a8..e808f14 100644 --- a/configure.ac +++ b/configure.ac @@ -3764,7 +3764,7 @@ if test "$GCC" = "yes"; then fi # clang as of version 4.0.0 (trunk 289424) doesn't do this very well (missing locals, bad param info in stack frame) -if "$COM_IS_CLANG" != "TRUE"; then +if test "$COM_IS_CLANG" != "TRUE"; then AC_MSG_CHECKING([whether $CC supports -Og]) # Note that clang-3.1 reports a real error for this option # so we do not need a special case for clang<=3.1 as above. ___ 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/dpobject.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9dd7999a480b2c9af652fbd0cd2d68df8d16e60d Author: Tamás Zolnai Date: Mon Jan 9 13:47:21 2017 +0100 Revert "PivotTable: Avoid adding useless 'Data' column field to table layout" This reverts commit ad86820a2bc99ede49875f8b03d6e64624e7b5f4. diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index e9b321b..ab220f1 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2308,7 +2308,7 @@ void ScDPObject::FillOldParam(ScPivotParam& rParam) const rParam.nTab = aOutRange.aStart.Tab(); // ppLabelArr / nLabels is not changed -bool bAddData = ( lcl_GetDataGetOrientation( xSource ) != sheet::DataPilotFieldOrientation_HIDDEN ); +bool bAddData = ( lcl_GetDataGetOrientation( xSource ) == sheet::DataPilotFieldOrientation_HIDDEN ); lcl_FillOldFields( rParam.maPageFields, xSource, sheet::DataPilotFieldOrientation_PAGE, false); lcl_FillOldFields( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sot sot/source
include/sot/filelist.hxx | 11 +++
sot/source/base/filelist.cxx | 31 +--
2 files changed, 4 insertions(+), 38 deletions(-)
New commits:
commit ea86f1ca5c627da45da49e20f27ef112febc41e8
Author: Caolán McNamara
Date: Mon Jan 9 12:02:28 2017 +
defaults are good enough
and protected isn't necessary
Change-Id: I6219632fe1da36d484864c2500e9ac14978f2cb8
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index 1939f71..e12fb36 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -27,19 +27,14 @@
class SOT_DLLPUBLIC FileList
{
-::std::vector< OUString > aStrList;
+std::vector< OUString > aStrList;
-protected:
+private:
// Liste loeschen;
-voidClearAll();
+void clear() { aStrList.clear(); }
public:
-FileList() {};
-~FileList();
-
-// Zuweisungsoperator
-FileList& operator=( const FileList& rFileList );
// Im-/Export
SOT_DLLPUBLIC friend SvStream& ReadFileList( SvStream& rIStm, FileList&
rFileList );
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index b22e2c6..8760d7a 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -24,35 +24,6 @@
#include
#include
-/*
-|*
-|*FileList - Ctor/Dtor
-|*
-\*/
-
-FileList::~FileList()
-{
-ClearAll();
-}
-
-void FileList::ClearAll()
-{
-aStrList.clear();
-}
-
-/*
-|*
-|*FileList - Zuweisungsoperator
-|*
-\*/
-
-FileList& FileList::operator=( const FileList& rFileList )
-{
-for (const auto & i : rFileList.aStrList)
-aStrList.push_back( i );
-return *this;
-}
-
/**
|*
|* Stream-Operatoren
@@ -67,7 +38,7 @@ FileList& FileList::operator=( const FileList& rFileList )
resolved by the Windows clipboard bridge.*/
SvStream& ReadFileList( SvStream& rIStm, FileList& rFileList )
{
-rFileList.ClearAll();
+rFileList.clear();
OUStringBuffer sBuf(512);
sal_uInt16 c;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/po
loleaflet/po/templates/loleaflet-help.pot | 706 +++--- loleaflet/po/templates/loleaflet-ui.pot | 150 +++--- 2 files changed, 432 insertions(+), 424 deletions(-) New commits: commit eea6a7c6d5b58d5ba0b0b08302c56c43099701b2 Author: Andras Timar Date: Mon Jan 9 13:00:34 2017 +0100 loleaflet: pot update Change-Id: I99d88b563cb0254d472887ea2f93c5b16baa7217 diff --git a/loleaflet/po/templates/loleaflet-help.pot b/loleaflet/po/templates/loleaflet-help.pot index 73b4474..00ecfc5 100644 --- a/loleaflet/po/templates/loleaflet-help.pot +++ b/loleaflet/po/templates/loleaflet-help.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-19 19:19+0200\n" +"POT-Creation-Date: 2017-01-09 12:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -60,1369 +60,1377 @@ msgstr "" msgid "Ctrl + P" msgstr "" -#: dist/loleaflet-help.html+div.div.h2:37 -msgctxt "dist/loleaflet-help.html div.div.h2:37" -msgid "Text formatting" +#: dist/loleaflet-help.html+div.div.table.tr.td:34 +msgid "Display the Keyboard shortcuts help" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:39 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:39" -msgid "Bold" +#: dist/loleaflet-help.html+div.div.table.tr.td:34 +msgid "Ctrl + Shift + ?" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:39 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:39" -msgid "Ctrl + B" +#: dist/loleaflet-help.html+div.div.h2:38 +msgctxt "dist/loleaflet-help.html div.div.h2:38" +msgid "Text formatting" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:40 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:40" -msgid "Italic" +msgid "Bold" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:40 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:40" -msgid "Ctrl + I" +msgid "Ctrl + B" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:41 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:41" -msgid "Underline" +msgid "Italic" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:41 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:41" -msgid "Ctrl + U" +msgid "Ctrl + I" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:42 -msgid "Double Underline" +msgctxt "dist/loleaflet-help.html div.div.table.tr.td:42" +msgid "Underline" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:42 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:42" -msgid "Ctrl + D" +msgid "Ctrl + U" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:43 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:43" -msgid "Strikethrough" +msgid "Double Underline" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:43 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:43" -msgid "Ctrl + Alt + 5" +msgid "Ctrl + D" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:44 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:44" -msgid "Superscript" +msgid "Strikethrough" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:44 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:44" -msgid "Ctrl + Shift + P" +msgid "Ctrl + Alt + 5" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:45 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:45" -msgid "Subscript" +msgid "Superscript" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:45 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:45" -msgid "Ctrl + Shift + B" +msgid "Ctrl + Shift + P" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:46 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:46" -msgid "Remove direct formatting" +msgid "Subscript" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:46 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:46" -msgid "Ctrl + M" +msgid "Ctrl + Shift + B" msgstr "" -#: dist/loleaflet-help.html+div.div.h2:48 -msgctxt "dist/loleaflet-help.html div.div.h2:48" -msgid "Paragraph formatting" +#: dist/loleaflet-help.html+div.div.table.tr.td:47 +msgctxt "dist/loleaflet-help.html div.div.table.tr.td:47" +msgid "Remove direct formatting" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:50 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:50" -msgid "Align Center" +#: dist/loleaflet-help.html+div.div.table.tr.td:47 +msgctxt "dist/loleaflet-help.html div.div.table.tr.td:47" +msgid "Ctrl + M" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:50 -msgctxt "dist/loleaflet-help.html div.div.table.tr.td:50" -msgid "Ctrl + E" +#: dist/loleaflet-help.html+div.div.h2:49 +msgctxt "dist/loleaflet-help.html div.div.h2:49" +msgid "Paragraph formatting" msgstr "" #: dist/loleaflet-help.html+div.div.table.tr.td:51 msgctxt "dist/loleaflet-help.html div.div.table.tr.td:51" -msgid "Align Left" +msgid "Align C
[Libreoffice-commits] core.git: 3 commits - connectivity/Library_dbtools.mk connectivity/source Makefile.in Repository.mk svtools/source vcl/Executable_svmfuzzer.mk vcl/Module_vcl.mk vcl/workben
Makefile.in |2 -
Repository.mk |1
connectivity/Library_dbtools.mk |2 -
connectivity/source/parse/sqlflex.l |2 +
svtools/source/contnr/treelistbox.cxx |2 -
vcl/Executable_svmfuzzer.mk | 47 ++
vcl/Module_vcl.mk |1
vcl/workben/svmfuzzer.cxx | 22 +++
8 files changed, 75 insertions(+), 4 deletions(-)
New commits:
commit 9a30cb2161506e003f14592d83075ab9d30516c1
Author: Caolán McNamara
Date: Mon Jan 9 10:38:28 2017 +
hack to silence -Wunused-function
Change-Id: I585839c05ca3b0336ffbe2c60a2f58c34b0aae78
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 57127b7..8fc596b 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -67,8 +67,6 @@ connectivity/source/parse/sqlflex \
$(call gb_LexTarget_get_scanner_target,connectivity/source/parse/sqlflex) :
T_LEXFLAGS := -i -8 -PSQLyy -L
-
-
$(eval $(call gb_Library_add_exception_objects,dbtools,\
connectivity/source/commontools/AutoRetrievingBase \
connectivity/source/commontools/BlobHelper \
diff --git a/connectivity/source/parse/sqlflex.l
b/connectivity/source/parse/sqlflex.l
index 84edfd9..5e80f2a 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -87,6 +87,8 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = nullptr;
#define YY_FATAL_ERROR(msg) \
{ \
xxx_pGLOBAL_SQLSCAN->SQLyyerror(msg); \
+/*hack to silence -Wunused-function*/ \
+if (0) yy_fatal_error(msg); \
}
%}
commit 1f8ee857dcd5f6591d060746c805fdcc036a112b
Author: Caolán McNamara
Date: Mon Jan 9 10:23:11 2017 +
non debug warning -Wmaybe-uninitialized
Change-Id: I16c04585ee2c411ae362230590a06bdc9e22443d
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index 215661b..b359859 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2905,7 +2905,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry,
long nLine, vcl::Render
rRenderContext.SetFont(aBackupFont);
}
-sal_uInt16 nFirstDynTabPos;
+sal_uInt16 nFirstDynTabPos(0);
SvLBoxTab* pFirstDynamicTab = GetFirstDynamicTab(nFirstDynTabPos);
long nDynTabPos = GetTabPos(&rEntry, pFirstDynamicTab);
nDynTabPos += pImpl->nNodeBmpTabDistance;
commit 1f5a2f7a915375667ac390f80858eefcff799887
Author: Caolán McNamara
Date: Mon Jan 9 10:06:07 2017 +
add svm fuzzer
Change-Id: I56606605e7ce7e282960432384057f2986d3a187
diff --git a/Makefile.in b/Makefile.in
index 1469e4d..6aa00d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -424,7 +424,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_jpeg
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi
Library_clew Library_gie Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer
Executable_bmpfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper
Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi
Library_clew Library_gie Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer
Executable_bmpfuzzer Executable_svmfuzzer
endif # MAKE_RESTARTS
diff --git a/Repository.mk b/Repository.mk
index ff4876e..560716d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -100,6 +100,7 @@ $(eval $(call
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,xpmfuzzer) \
$(call gb_Helper_optional,FUZZERS,pngfuzzer) \
$(call gb_Helper_optional,FUZZERS,bmpfuzzer) \
+ $(call gb_Helper_optional,FUZZERS,svmfuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_svmfuzzer.mk b/vcl/Executable_svmfuzzer.mk
new fi
[Libreoffice-commits] core.git: include/sot include/svtools include/tools include/vcl svtools/source
include/sot/filelist.hxx |4 ++--
include/svtools/grfmgr.hxx|4 ++--
include/tools/stream.hxx | 12
include/vcl/graph.hxx |4 ++--
svtools/source/graphic/grfmgr.cxx |1 -
5 files changed, 6 insertions(+), 19 deletions(-)
New commits:
commit eef56fc73b5c3ddc02ca7192532748e8d60c3ac6
Author: Caolán McNamara
Date: Sun Jan 8 21:28:17 2017 +
Related: coverity#1371305 unnecessary inheritence
SvDataCopyStream used to do extra Load/Save things that are long
gone, so there is no reason for the common base anymore
Change-Id: Ib321021002adb480bb96298f199141dc3fe2ec2b
Reviewed-on: https://gerrit.libreoffice.org/32851
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index 430568c..1939f71 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -25,7 +25,7 @@
#include
-class SOT_DLLPUBLIC FileList : public SvDataCopyStream
+class SOT_DLLPUBLIC FileList
{
::std::vector< OUString > aStrList;
@@ -36,7 +36,7 @@ protected:
public:
FileList() {};
-virtual ~FileList() override;
+~FileList();
// Zuweisungsoperator
FileList& operator=( const FileList& rFileList );
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index c264ef8..0c01023 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -166,7 +166,7 @@ public:
}
};
-class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream
+class SVT_DLLPUBLIC GraphicObject
{
friend class GraphicManager;
friend class SdrGrafObj;
@@ -325,7 +325,7 @@ public:
GraphicObject( const Graphic& rGraphic );
GraphicObject( const GraphicObject& rCacheObj,
const GraphicManager* pMgr = nullptr );
explicit GraphicObject( const OString& rUniqueID );
-virtual ~GraphicObject() override;
+~GraphicObject();
GraphicObject& operator=( const GraphicObject& rCacheObj );
booloperator==( const GraphicObject& rCacheObj ) const;
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 56be8a7..3a1843d 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -679,18 +679,6 @@ public:
virtual bool good() const override;
};
-/** Data Copy Stream
-
-This class is the foundation for all classes, using SvData
-(SO2\DTRANS.HXX/CXX) for transportation (e.g., graphics).
-*/
-class TOOLS_DLLPUBLIC SvDataCopyStream
-{
-public:
-// repeated execution of Load or Assign is allowed
-virtual ~SvDataCopyStream(){}
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 3bd6a2c..8191405 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -100,7 +100,7 @@ public:
boolgetSnapHorVerLines() const { return mbSnapHorVerLines; }
};
-class VCL_DLLPUBLIC Graphic : public SvDataCopyStream
+class VCL_DLLPUBLIC Graphic
{
private:
@@ -121,7 +121,7 @@ public:
Graphic( const Animation& rAnimation );
Graphic( const GDIMetaFile& rMtf );
Graphic( const css::uno::Reference< css::graphic::XGraphic
>& rxGraphic );
-virtual ~Graphic() override;
+ ~Graphic();
Graphic&operator=( const Graphic& rGraphic );
Graphic&operator=( Graphic&& rGraphic );
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 7c0d55d..2fde691 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -91,7 +91,6 @@ GraphicObject::GraphicObject( const Graphic& rGraphic ) :
}
GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const
GraphicManager* pMgr ) :
-SvDataCopyStream(),
maGraphic ( rGraphicObj.GetGraphic() ),
maAttr ( rGraphicObj.maAttr ),
maLink ( rGraphicObj.maLink ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods1.cxx |2 +-
basic/source/runtime/stdobj.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fce604c8ae11b462113305aba080d77f8193cfea
Author: Noel Grandin
Date: Mon Jan 9 11:20:48 2017 +0200
[API CHANGE] return unsigned 64-bit value from GetSystemTicks in basic code
instead of 32-bit value.
looks like this has been incorrect since
commit 9f2104e1f3a1ef8a37406b39188234df309241bc
Author: Jens-Heiner Rechtien
Date: Mon Jun 19 16:46:13 2006 +
INTEGRATION: CWS warnings01 (1.23.26); FILE MERGED
but nobody cared, since the values would previously fit into a 32-bit
number.
Change-Id: I4c121085977b5e7ff3e33c8ad57749b925ad31b9
Reviewed-on: https://gerrit.libreoffice.org/32879
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 34ead7f..eb0f245 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1415,7 +1415,7 @@ RTLFUNC(GetSystemTicks)
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
return;
}
-rPar.Get(0)->PutLong( tools::Time::GetSystemTicks() );
+rPar.Get(0)->PutUInt64( tools::Time::GetSystemTicks() );
}
RTLFUNC(GetPathSeparator)
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 0eac637..34ce7d8 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -307,7 +307,7 @@ static Methods aMethods[] = {
{ "GetPathSeparator", SbxSTRING, FUNCTION_,RTLNAME(GetPathSeparator),0 },
{ "GetProcessServiceManager", SbxOBJECT, 0 | FUNCTION_,
RTLNAME(GetProcessServiceManager),0 },
{ "GetSolarVersion", SbxLONG, FUNCTION_,RTLNAME(GetSolarVersion),0 },
-{ "GetSystemTicks", SbxLONG, FUNCTION_,RTLNAME(GetSystemTicks),0 },
+{ "GetSystemTicks", SbxSALUINT64,FUNCTION_,RTLNAME(GetSystemTicks),0 },
{ "GetSystemType", SbxINTEGER,FUNCTION_,RTLNAME(GetSystemType),0 },
{ "GlobalScope",SbxOBJECT, FUNCTION_,RTLNAME(GlobalScope),0 },
{ "Green", SbxINTEGER, 1 | FUNCTION_ | NORMONLY_, RTLNAME(Green),0
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - 2 commits - loleaflet/dist loleaflet/src
loleaflet/dist/loleaflet-help.html|1 +
loleaflet/src/map/handler/Map.Keyboard.js |6 ++
2 files changed, 7 insertions(+)
New commits:
commit 2cfa01a57325e6dcb495628276306c760fded3b3
Author: Henry Castro
Date: Sat Jan 7 08:44:35 2017 -0400
tdf#103779: Help menu accessibility, part 3
Change shortcut to Ctrl + Shift + ?
(cherry picked from commit e1b7e53b3a6f006eec5728c3ec88079c34b4f3c6)
Signed-off-by: Andras Timar
diff --git a/loleaflet/dist/loleaflet-help.html
b/loleaflet/dist/loleaflet-help.html
index bfed701..15c79d3 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -31,7 +31,7 @@
Cut Ctrl +
X
Paste as unformatted text Ctrl + Alt + Shift + V
Print (Download as PDF) Ctrl + P
- Display the Keyboard shortcuts help
Ctrl + H
+ Display the Keyboard shortcuts help
Ctrl + Shift + ?
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Keyboard.js
index 1d91309..9422a9b 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -385,7 +385,7 @@ L.Map.Keyboard = L.Handler.extend({
e.originalEvent.preventDefault();
}
- if (e.originalEvent.ctrlKey && (e.originalEvent.key === 'h' ||
e.originalEvent.key === 'H')) {
+ if (e.originalEvent.ctrlKey && e.originalEvent.shiftKey &&
e.originalEvent.key === '?') {
map.showLOKeyboardHelp();
e.originalEvent.preventDefault();
return true;
commit 1484ed44e0569c96967e5b5e659d9d3ad4c42ba9
Author: Henry Castro
Date: Fri Jan 6 23:11:48 2017 -0400
tdf#103779: Help menu accessibility, part 2
Add a keyboard shortcut ctrl + h to display the
Keyboard shortcuts help
(cherry picked from commit 73cf6f71fbe1ccb1946958b06e8deab16176a82c)
Signed-off-by: Andras Timar
diff --git a/loleaflet/dist/loleaflet-help.html
b/loleaflet/dist/loleaflet-help.html
index 2184635..bfed701 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -31,6 +31,7 @@
Cut Ctrl +
X
Paste as unformatted text Ctrl + Alt + Shift + V
Print (Download as PDF) Ctrl + P
+ Display the Keyboard shortcuts help
Ctrl + H
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Keyboard.js
index 62e61db..1d91309 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -385,6 +385,12 @@ L.Map.Keyboard = L.Handler.extend({
e.originalEvent.preventDefault();
}
+ if (e.originalEvent.ctrlKey && (e.originalEvent.key === 'h' ||
e.originalEvent.key === 'H')) {
+ map.showLOKeyboardHelp();
+ e.originalEvent.preventDefault();
+ return true;
+ }
+
if (e.originalEvent.ctrlKey && (e.originalEvent.key === 'z' ||
e.originalEvent.key === 'Z')) {
this._map._socket.sendMessage('uno .uno:Undo');
e.originalEvent.preventDefault();
___
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_bmpfuzzer.mk vcl/Module_vcl.mk vcl/workben
Makefile.in |2 -
Repository.mk |1
vcl/Executable_bmpfuzzer.mk | 47
vcl/Module_vcl.mk |1
vcl/workben/bmpfuzzer.cxx | 22
5 files changed, 72 insertions(+), 1 deletion(-)
New commits:
commit 4df12fe5236c8ab98ee29b655aa3c18b28617f74
Author: Caolán McNamara
Date: Sun Jan 8 21:20:56 2017 +
add bmp fuzzer
Change-Id: I5a564402b7a0b6ae1fcbeef6d84f85f1d3e4f4ce
Reviewed-on: https://gerrit.libreoffice.org/32850
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/Makefile.in b/Makefile.in
index cd79572..1469e4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -424,7 +424,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_jpeg
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi
Library_clew Library_gie Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper
Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi
Library_clew Library_gie Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer
Executable_bmpfuzzer
endif # MAKE_RESTARTS
diff --git a/Repository.mk b/Repository.mk
index cfd1e99..ff4876e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -99,6 +99,7 @@ $(eval $(call
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,xbmfuzzer) \
$(call gb_Helper_optional,FUZZERS,xpmfuzzer) \
$(call gb_Helper_optional,FUZZERS,pngfuzzer) \
+ $(call gb_Helper_optional,FUZZERS,bmpfuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_bmpfuzzer.mk b/vcl/Executable_bmpfuzzer.mk
new file mode 100644
index 000..bfa7fb3
--- /dev/null
+++ b/vcl/Executable_bmpfuzzer.mk
@@ -0,0 +1,47 @@
+# -*- 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/.
+#
+
+include $(SRCDIR)/vcl/commonfuzzer.mk
+
+$(eval $(call gb_Executable_Executable,bmpfuzzer))
+
+$(eval $(call gb_Executable_use_api,bmpfuzzer,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_externals,bmpfuzzer,\
+ $(fuzzer_externals) \
+))
+
+$(eval $(call gb_Executable_set_include,bmpfuzzer,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,bmpfuzzer,\
+ $(fuzzer_libraries) \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,bmpfuzzer,\
+findsofficepath \
+ulingu \
+fuzzer \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,bmpfuzzer,\
+ vcl/workben/bmpfuzzer \
+))
+
+$(eval $(call gb_Executable_add_libs,bmpfuzzer,\
+ -lFuzzingEngine \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index f833ebb..b873823 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -112,6 +112,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Executable_xbmfuzzer \
Executable_xpmfuzzer \
Executable_pngfuzzer \
+Executable_bmpfuzzer \
))
endif
diff --git a/vcl/workben/bmpfuzzer.cxx b/vcl/workben/bmpfuzzer.cxx
new file mode 100644
index 000..acd5414
--- /dev/null
+++ b/vcl/workben/bmpfuzzer.cxx
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include "commonfuzzer.hxx"
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+SvMemoryStream aStream(con
[Libreoffice-commits] core.git: Makefile.in Repository.mk vcl/Executable_pngfuzzer.mk vcl/Module_vcl.mk vcl/workben
Makefile.in |2 -
Repository.mk |1
vcl/Executable_pngfuzzer.mk | 47
vcl/Module_vcl.mk |1
vcl/workben/pngfuzzer.cxx | 22
5 files changed, 72 insertions(+), 1 deletion(-)
New commits:
commit 1413ab328a08af526dac51881905e8d313bee502
Author: Caolán McNamara
Date: Sun Jan 8 20:54:02 2017 +
add png fuzzer
Change-Id: I06a92aff55f4e107781b5e7b2b95eb61692a929b
Reviewed-on: https://gerrit.libreoffice.org/32849
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/Makefile.in b/Makefile.in
index 0c871fb..cd79572 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -424,7 +424,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_jpeg
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi
Library_clew Library_gie Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper
Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi
Library_clew Library_gie Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer
endif # MAKE_RESTARTS
diff --git a/Repository.mk b/Repository.mk
index 0323210..cfd1e99 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -98,6 +98,7 @@ $(eval $(call
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,giffuzzer) \
$(call gb_Helper_optional,FUZZERS,xbmfuzzer) \
$(call gb_Helper_optional,FUZZERS,xpmfuzzer) \
+ $(call gb_Helper_optional,FUZZERS,pngfuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_pngfuzzer.mk b/vcl/Executable_pngfuzzer.mk
new file mode 100644
index 000..8e6519c
--- /dev/null
+++ b/vcl/Executable_pngfuzzer.mk
@@ -0,0 +1,47 @@
+# -*- 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/.
+#
+
+include $(SRCDIR)/vcl/commonfuzzer.mk
+
+$(eval $(call gb_Executable_Executable,pngfuzzer))
+
+$(eval $(call gb_Executable_use_api,pngfuzzer,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_externals,pngfuzzer,\
+ $(fuzzer_externals) \
+))
+
+$(eval $(call gb_Executable_set_include,pngfuzzer,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,pngfuzzer,\
+ $(fuzzer_libraries) \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,pngfuzzer,\
+findsofficepath \
+ulingu \
+fuzzer \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,pngfuzzer,\
+ vcl/workben/pngfuzzer \
+))
+
+$(eval $(call gb_Executable_add_libs,pngfuzzer,\
+ -lFuzzingEngine \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index be0557d..f833ebb 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Executable_giffuzzer \
Executable_xbmfuzzer \
Executable_xpmfuzzer \
+Executable_pngfuzzer \
))
endif
diff --git a/vcl/workben/pngfuzzer.cxx b/vcl/workben/pngfuzzer.cxx
new file mode 100644
index 000..fbeb2ac
--- /dev/null
+++ b/vcl/workben/pngfuzzer.cxx
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include "commonfuzzer.hxx"
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+SvMemoryStream aStream(const_cast(data), size, StreamMode::READ);
+
[Libreoffice-commits] core.git: basic/qa
basic/qa/basic_coverage/test_getsystemticks_method.vb | 15 --- 1 file changed, 15 deletions(-) New commits: commit 93a8ebac2d6eb124bf57223069765af08fcd5c85 Author: Stephan Bergmann Date: Mon Jan 9 10:52:00 2017 +0100 Remove test_getsystemticks_method.vb for now Introduced with 060c2b9b1b0d3c9cf27f1b289a620cfa82b5b060 "QA Basic: split tests of methods in different files", but GetSystemTicks appears to routinely return negative values. Change-Id: Ibccdf753aea581e05e9d4e1bf551ae72dc70c959 diff --git a/basic/qa/basic_coverage/test_getsystemticks_method.vb b/basic/qa/basic_coverage/test_getsystemticks_method.vb deleted file mode 100644 index 878b38b..000 --- a/basic/qa/basic_coverage/test_getsystemticks_method.vb +++ /dev/null @@ -1,15 +0,0 @@ -' 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/. -' - -Function doUnitTest as Integer -' GETSYSTEMTICKS -If ( GetSystemTicks < 0 ) Then -doUnitTest = 0 -Else -doUnitTest = 1 -End If -End Function ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf105143.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8
writerfilter/source/filter/WriterFilter.cxx |1 +
3 files changed, 9 insertions(+)
New commits:
commit 68c05e360a65a3984d3839f563daa34e2cce0b14
Author: Miklos Vajna
Date: Fri Jan 6 13:49:06 2017 +0100
tdf#105143 DOCX import: enable DoNotCaptureDrawObjsOnPage layout compat
option
Because that's what Word does to show only part of the shape in the
bugdoc.
Conflicts:
writerfilter/source/filter/WriterFilter.cxx
Change-Id: Ic5cb84cace9237671d71eda0c64e9dadfe244cb9
Reviewed-on: https://gerrit.libreoffice.org/32782
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/32784
Reviewed-by: Jan Holesovsky
diff --git a/sw/qa/extras/ooxmlimport/data/tdf105143.docx
b/sw/qa/extras/ooxmlimport/data/tdf105143.docx
new file mode 100644
index 000..aa4bf40
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf105143.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0acf8f0..2d1c66b 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -699,6 +699,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105127, "tdf105127.docx")
CPPUNIT_ASSERT_EQUAL(static_cast(3257),
aPolyPolygon.Coordinates[0][0].Y);
}
+DECLARE_OOXMLIMPORT_TEST(testTdf105143, "tdf105143.docx")
+{
+OUString aTop =
parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top");
+// This was 6272, i.e. the shape was moved up (incorrect position) to be
+// inside the page rectangle.
+CPPUNIT_ASSERT_EQUAL(OUString("6674"), aTop);
+}
+
DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx")
{
// The problem was that the floating table was imported as a non-floating
one.
diff --git a/writerfilter/source/filter/WriterFilter.cxx
b/writerfilter/source/filter/WriterFilter.cxx
index c59718f..b50a8f4 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -300,6 +300,7 @@ void WriterFilter::setTargetDocument(const uno::Reference<
lang::XComponent >& x
xSettings->setPropertyValue("TreatSingleColumnBreakAsPageBreak",
uno::makeAny(true));
xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine",
uno::makeAny(true));
xSettings->setPropertyValue("AllowPaddingWithoutBorders",
uno::makeAny(true));
+xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage",
uno::makeAny(true));
}
void WriterFilter::setSourceDocument(const uno::Reference< lang::XComponent >&
xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException,
std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Weekly QA Report (W01-2017)
Hello, What have happened in QA in the last 7 days? * 161 have been created, of which, 48 are still unconfirmed ( Total Unconfirmed bugs: 488 ) Link: http://tinyurl.com/gkv72rx * 1990 comments have been written. == STATUS CHANGED == * 6 bugs have been changed to 'ASSIGNED'. Link: http://tinyurl.com/gv7ogkl Done by: Miklos Vajna ( 1 ), Andras Timar ( 1 ), Pierre Lepage ( 1 ), Markus Mohrhard ( 1 ), Gabor Kelemen ( 1 ), Eike Rathke ( 1 ) * 3 bugs have been changed to 'CLOSED'. Link: http://tinyurl.com/hnvzz4o Done by: Regina Henschel ( 1 ), Kiyotaka Nishibori ( 1 ), Adolfo Jayme ( 1 ) * 29 bugs have been changed to 'NEEDINFO'. Link: http://tinyurl.com/jg8z8cm Done by: Alex Thurgood ( 6 ), Aron Budea ( 5 ), Buovjaga ( 4 ), Xisco Faulí ( 3 ), m.a.riosv ( 2 ), steve -_- ( 2 ), tommy27 ( 2 ), Heiko Tietze ( 1 ), Julien Nabet ( 1 ), Regina Henschel ( 1 ), qa-admin ( 1 ), Cor Nouws ( 1 ) * 87 bugs have been changed to 'NEW'. Link: http://tinyurl.com/ze3gg6u Done by: Buovjaga ( 30 ), Alex Thurgood ( 9 ), Xisco Faulí ( 7 ), Heiko Tietze ( 6 ), Aron Budea ( 6 ), Julien Nabet ( 5 ), V Stuart Foote ( 4 ), Telesto ( 3 ), robert ( 2 ), Yousuf Philips (jay) ( 2 ), sebeboof ( 1 ), Stephan Bergmann ( 1 ), Robert Gonzalez MX ( 1 ), odinatlas ( 1 ), OfficeUser ( 1 ), Michael Meeks ( 1 ), mdk917 ( 1 ), steve -_- ( 1 ), Jacques Guilleron ( 1 ), Bartosz ( 1 ), Cor Nouws ( 1 ), tommy27 ( 1 ), abhilash300singh ( 1 ) * 2 bugs have been changed to 'REOPENED'. Link: http://tinyurl.com/gnh368u Done by: karsten.henning ( 1 ), Bob Briscoe ( 1 ) * 26 bugs have been changed to 'RESOLVED DUPLICATE'. Link: http://tinyurl.com/hfqpcnh Done by: V Stuart Foote ( 4 ), Xisco Faulí ( 3 ), Alex Thurgood ( 3 ), Heiko Tietze ( 2 ), Julien Nabet ( 2 ), Khaled Hosny ( 2 ), Aron Budea ( 2 ), Telesto ( 1 ), raal ( 1 ), Emersson Augusto Suarez Ortiz ( 1 ), Markus Mohrhard ( 1 ), Jacques Guilleron ( 1 ), Gabriele Bertolucci ( 1 ), Adolfo Jayme ( 1 ), Michael Bauer ( 1 ) * 35 bugs have been changed to 'RESOLVED FIXED'. Link: http://tinyurl.com/hj7v6ad Done by: Miklos Vajna ( 5 ), Justin L ( 4 ), Winfried Donkers ( 3 ), Andras Timar ( 3 ), Gabor Kelemen ( 3 ), Tamás Zolnai ( 2 ), Eike Rathke ( 2 ), Yerlan ( 1 ), V Stuart Foote ( 1 ), Telesto ( 1 ), Yousuf Philips (jay) ( 1 ), Michael Stahl ( 1 ), Mike Kaganski ( 1 ), Michael Meeks ( 1 ), Jan Holesovsky ( 1 ), Hans Deragon ( 1 ), Bartosz ( 1 ), Adolfo Jayme ( 1 ), Erik ( 1 ), Caolán McNamara ( 1 ) * 5 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'. Link: http://tinyurl.com/h3qlzjv Done by: Heiko Tietze ( 4 ), m.a.riosv ( 1 ) * 6 bugs have been changed to 'RESOLVED INVALID'. Link: http://tinyurl.com/hxcfpx2 Done by: Xisco Faulí ( 2 ), V Stuart Foote ( 1 ), Telesto ( 1 ), qa-admin ( 1 ), Edmund ( 1 ) * 3 bugs have been changed to 'RESOLVED MOVED'. Link: http://tinyurl.com/gt3x887 Done by: Buovjaga ( 2 ), tommy27 ( 1 ) * 15 bugs have been changed to 'RESOLVED NOTABUG'. Link: http://tinyurl.com/hk37tfc Done by: Telesto ( 3 ), V Stuart Foote ( 2 ), Xisco Faulí ( 1 ), touchrank ( 1 ), Buovjaga ( 1 ), Tor Lillqvist ( 1 ), Stefan Grotz ( 1 ), m.a.riosv ( 1 ), Michael Meeks ( 1 ), DavidO ( 1 ), Aron Budea ( 1 ), NARAYAN ( 1 ) * 1 bug has been changed to 'RESOLVED NOTOURBUG'. Link: http://tinyurl.com/hzclg5e Done by: Roeland ( 1 ) * 3 bugs have been changed to 'RESOLVED WONTFIX'. Link: http://tinyurl.com/hlqr9pa Done by: V Stuart Foote ( 1 ), Heiko Tietze ( 1 ), jan iversen ( 1 ) * 50 bugs have been changed to 'RESOLVED WORKSFORME'. Link: http://tinyurl.com/jv8nyxl Done by: Buovjaga ( 5 ), Xisco Faulí ( 4 ), Aron Budea ( 4 ), tommy27 ( 3 ), Heiko Tietze ( 2 ), Telesto ( 2 ), robert ( 2 ), Regina Henschel ( 2 ), Timur ( 2 ), V Stuart Foote ( 1 ), rpz ( 1 ), Aprax ( 1 ), Richard Dawson ( 1 ), punya ( 1 ), Patrick Welche ( 1 ), pasqual milvaques ( 1 ), odinatlas ( 1 ), m.a.riosv ( 1 ), Boris Dušek ( 1 ), Aitor Pazos ( 1 ), Luke ( 1 ), Nino ( 1 ), Hans Deragon ( 1 ), gmarco ( 1 ), Gerd ( 1 ), Fiorenzo De Santis ( 1 ), fakabbir ( 1 ), Cor Nouws ( 1 ), catherine.riou36 ( 1 ), Bob Briscoe ( 1 ), bgadaleta ( 1 ), bernie ( 1 ), Arnaud Versini ( 1 ) * 10 bugs have been changed to 'UNCONFIRMED'. Link: http://tinyurl.com/h8obbfh Done by: MrKing ( 2 ), oris1024 ( 2 ), Telesto ( 1 ), Pineau ( 1 ), o.schuierer ( 1 ), hb ( 1 ), Edward Ahlsen-Girard ( 1 ), amit.finkler ( 1 ) * 4 bugs have been changed to 'VERIFIED FIXED'. Link: http://tinyurl.com/gveqult Done by: Timur ( 2 ), Timur I. Davletshin ( 1 ), Luke ( 1 ) == KEYWORDS ADDED == * 'accessibility' has been added to 1 bugs. Link: http://tinyurl.com/jdyesry Done by: Michael Stahl ( 1 ) * 'bibisectNotNeeded' has been added to 1 bugs. Link: http://tinyurl.com/zyf5cwk Done by: Aron Budea ( 1 ) * 'bibisectRequest' has been adde
[Libreoffice-commits] core.git: include/rtl
include/rtl/byteseq.h |6 ++
include/rtl/byteseq.hxx | 18 ++
2 files changed, 24 insertions(+)
New commits:
commit e497d4d49033239869a3ad9f7c388e4c2acc3401
Author: Caolán McNamara
Date: Sun Jan 8 16:55:08 2017 +
coverity#1371227 Missing move assignment operator
Change-Id: I2de6b5e2910ff570c08e662769d5e6ee188825a7
Reviewed-on: https://gerrit.libreoffice.org/32843
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/rtl/byteseq.h b/include/rtl/byteseq.h
index 3c05745..ef00302 100644
--- a/include/rtl/byteseq.h
+++ b/include/rtl/byteseq.h
@@ -189,6 +189,9 @@ public:
@param rSeq another byte sequence
*/
inline ByteSequence( const ByteSequence & rSeq );
+#if defined LIBO_INTERNAL_ONLY
+inline ByteSequence( ByteSequence && rSeq );
+#endif
/** Copy constructor Creates a copy from the C-Handle.
@param pSequence another byte sequence handle
@@ -232,6 +235,9 @@ public:
@return this sequence
*/
inline ByteSequence & SAL_CALL operator = ( const ByteSequence & rSeq );
+#if defined LIBO_INTERNAL_ONLY
+inline ByteSequence & SAL_CALL operator = ( ByteSequence && rSeq );
+#endif
/** Gets the length of sequence.
diff --git a/include/rtl/byteseq.hxx b/include/rtl/byteseq.hxx
index 041b8bc..122d1bc 100644
--- a/include/rtl/byteseq.hxx
+++ b/include/rtl/byteseq.hxx
@@ -40,6 +40,14 @@ inline ByteSequence::ByteSequence( const ByteSequence & rSeq
)
::rtl_byte_sequence_assign( &_pSequence, rSeq._pSequence );
}
+#if defined LIBO_INTERNAL_ONLY
+inline ByteSequence::ByteSequence( ByteSequence && rSeq )
+: _pSequence(rSeq._pSequence)
+{
+rSeq._pSequence = nullptr;
+}
+#endif
+
inline ByteSequence::ByteSequence( sal_Sequence *pSequence)
: _pSequence( pSequence )
{
@@ -86,6 +94,16 @@ inline ByteSequence & ByteSequence::operator = ( const
ByteSequence & rSeq )
return *this;
}
+#if defined LIBO_INTERNAL_ONLY
+inline ByteSequence & ByteSequence::operator = ( ByteSequence && rSeq )
+{
+::rtl_byte_sequence_release(_pSequence);
+_pSequence = rSeq._pSequence;
+rSeq._pSequence = nullptr;
+return *this;
+}
+#endif
+
inline bool ByteSequence::operator == ( const ByteSequence & rSeq ) const
{
return ::rtl_byte_sequence_equals( _pSequence, rSeq._pSequence );
___
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/filter/ixbm/xbmread.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5aa8569b8412f86ff4c1e00d9cefeeaac9bc3c7c
Author: Caolán McNamara
Date: Mon Jan 9 09:00:10 2017 +
unnecessary const cast
Change-Id: Ib88b8de40184b13cd7aa0ae4787e6b6477996d67
diff --git a/vcl/source/filter/ixbm/xbmread.cxx
b/vcl/source/filter/ixbm/xbmread.cxx
index 1c29a1f..6e66d9e 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -153,7 +153,7 @@ OString XBMReader::FindTokenLine( SvStream* pInStm, const
char* pTok1,
long XBMReader::ParseDefine( const sal_Char* pDefine )
{
longnRet = 0;
-char* pTmp = const_cast(pDefine);
+const char* pTmp = pDefine;
unsigned char cTmp;
// move to end
___
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/svg/presentation_engine.js | 82 +--
1 file changed, 78 insertions(+), 4 deletions(-)
New commits:
commit 4a1d52e7e434269e1331e6fdd6c24d45703a9711
Author: Rohan Kumar
Date: Thu Dec 29 00:10:36 2016 +0530
tdf#51358 Support for IrisWipe transition animation in SVG Export
Ported the class IrisWipe
Change-Id: If56f846e9a48941cdd240adfb15f5b36674cadd3
Reviewed-on: https://gerrit.libreoffice.org/32421
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 9de750a..2f59ea3 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -5127,6 +5127,11 @@ TRANSITION_SPECIAL = 2;// Transition
expressed by hand-crafted
aTransitionClassOutMap = ['invalid', 'clip polypolygon', 'special'];
+/*
+ * All Transition types should be in sync with aTransitionTypeInMap:
+ * Comments '//' followed by integers represent the transition values in their
+ * C++ implementations.
+ */
// Transition Types
BARWIPE_TRANSITION = 1;
@@ -5141,6 +5146,7 @@ FADE_TRANSITION = 9; // 37
RANDOMBARWIPE_TRANSITION= 10; // 38
CHECKERBOARDWIPE_TRANSITION = 11; // 39
DISSOLVE_TRANSITION = 12; // 40
+IRISWIPE_TRANSITION = 14; // 12
aTransitionTypeInMap = {
'barWipe' : BARWIPE_TRANSITION,
@@ -5154,14 +5160,20 @@ aTransitionTypeInMap = {
'fade' : FADE_TRANSITION,
'randomBarWipe' : RANDOMBARWIPE_TRANSITION,
'checkerBoardWipe' : CHECKERBOARDWIPE_TRANSITION,
-'dissolve' : DISSOLVE_TRANSITION
+'dissolve' : DISSOLVE_TRANSITION,
+'irisWipe' : IRISWIPE_TRANSITION
};
aTransitionTypeOutMap = [ '', 'barWipe', 'boxWipe', 'fourBoxWipe',
'ellipseWipe',
'clockWipe', 'pinWheelWipe', 'pushWipe', 'slideWipe',
- 'fade', 'randomBarWipe', 'checkerBoardWipe',
'dissolve' ];
+ 'fade', 'randomBarWipe', 'checkerBoardWipe',
'dissolve' , 'irisWipe'];
+/*
+ * All Transition subtypes should be in sync with aTransitionSubtypeInMap:
+ * Comments '//' followed by integers represent the transition values in their
+ * C++ implementations.
+ */
// Transition Subtypes
DEFAULT_TRANS_SUBTYPE = 0;
LEFTTORIGHT_TRANS_SUBTYPE = 1;
@@ -5191,6 +5203,8 @@ THREEBLADE_TRANS_SUBTYPE= 24;
EIGHTBLADE_TRANS_SUBTYPE= 25;
ONEBLADE_TRANS_SUBTYPE = 26; // 107
ACROSS_TRANS_SUBTYPE= 27;
+RECTANGLE_TRANS_SUBTYPE = 34; // 101
+DIAMOND_TRANS_SUBTYPE = 35; // 102
aTransitionSubtypeInMap = {
'default' : DEFAULT_TRANS_SUBTYPE,
@@ -5220,7 +5234,9 @@ aTransitionSubtypeInMap = {
'threeBlade': THREEBLADE_TRANS_SUBTYPE,
'eightBlade': EIGHTBLADE_TRANS_SUBTYPE,
'oneBlade' : ONEBLADE_TRANS_SUBTYPE,
-'across': ACROSS_TRANS_SUBTYPE
+'across': ACROSS_TRANS_SUBTYPE,
+'rectangle' : RECTANGLE_TRANS_SUBTYPE,
+'diamond' : DIAMOND_TRANS_SUBTYPE
};
aTransitionSubtypeOutMap = [ 'default', 'leftToRight', 'topToBottom',
'cornersIn',
@@ -5230,7 +5246,7 @@ aTransitionSubtypeOutMap = [ 'default', 'leftToRight',
'topToBottom', 'cornersIn
'fourBlade', 'fromLeft', 'fromTop', 'fromRight',
'fromBottom', 'crossfade', 'fadeToColor',
'fadeFromColor',
'fadeOverColor', 'threeBlade', 'eightBlade',
'oneBlade',
- 'across' ];
+ 'across', 'rectangle', 'diamond' ];
// Transition Modes
@@ -5282,6 +5298,28 @@ aTransitionInfoTable[0][0] =
'scaleIsotropically' : false
};
+aTransitionInfoTable[IRISWIPE_TRANSITION] = {};
+aTransitionInfoTable[IRISWIPE_TRANSITION][RECTANGLE_TRANS_SUBTYPE] =
+{
+'class' : TRANSITION_CLIP_POLYPOLYGON,
+'rotationAngle': 0.0,
+'scaleX': 1.0,
+'scaleY': 1.0,
+'reverseMethod': REVERSEMETHOD_SUBTRACT_AND_INVERT,
+'outInvertsSweep': true,
+'scaleIsotropically': false
+};
+
+aTransitionInfoTable[IRISWIPE_TRANSITION][DIAMOND_TRANS_SUBTYPE] =
+{
+'class' : TRANSITION_CLIP_POLYPOLYGON,
+'rotationAngle': 45.0,
+'scaleX': Math.SQRT2,
+'scaleY': Math.SQRT2,
+'reverseMethod': REVERSEMETHOD_SUBTRACT_AND_INVERT,
+'outInvertsSweep': true,
+'scaleIsotropically': false
+};
aTransitionInfoTable[BARWIPE_TRANSITION] = {};
aTransitionInfoTable[BARWIPE_TRANSITION][LEFTTORIGHT_TRANS_SUBTYPE] =
@@ -9108,6 +9146,17 @@ function createClipPolyPolygon( nType, nSubtype )
return new RandomWipePath( 128, true /* bars */ );
case CHECKERBOARDWIPE_TRANSITION:
return new CheckerBoardWipePath( 10 );
+case IRISWIPE_TRAN
[Libreoffice-commits] core.git: sfx2/qa
sfx2/qa/python/check_sidebar.py | 10 +-
sfx2/qa/python/check_sidebar_registry.py |6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 9f18ee7fd912a6ba600985c5fcbe1e8672dfa993
Author: kerem
Date: Sun Jan 8 13:15:53 2017 +0200
tdf#97361: Changed method calls in sfx2 python tests
Change-Id: Id47bf9c6bb6330bf964ca3272487a077fb664137
Reviewed-on: https://gerrit.libreoffice.org/32838
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/sfx2/qa/python/check_sidebar.py b/sfx2/qa/python/check_sidebar.py
index 40ca194..e8fd503 100644
--- a/sfx2/qa/python/check_sidebar.py
+++ b/sfx2/qa/python/check_sidebar.py
@@ -59,10 +59,10 @@ class CheckSidebar(unittest.TestCase):
assert ( first_deck_name in deck_element_names )
assert ( xDecks.hasByName(first_deck_name) )
-decks_count = xDecks.getCount()
+decks_count = len(xDecks)
self.assertEqual ( 5, decks_count )
-xDeck = xDecks.getByName(first_deck_name)
+xDeck = xDecks[first_deck_name]
assert ( xDeck )
assert ( xDeck.getId() == first_deck_name )
@@ -91,7 +91,7 @@ class CheckSidebar(unittest.TestCase):
xPanels = xDeck.getPanels()
-panels_count = xPanels.getCount()
+panels_count = len(xPanels)
self.assertEqual ( panels_count, 5 )
first_panel_name = self.getFirstPanel(xPanels)
@@ -100,7 +100,7 @@ class CheckSidebar(unittest.TestCase):
assert ( first_panel_name in panel_element_names )
assert ( xPanels.hasByName(first_panel_name) )
-xPanel = xPanels.getByName(first_panel_name)
+xPanel = xPanels[first_panel_name]
assert ( xPanel )
assert ( xPanel.getId() == first_panel_name )
@@ -129,7 +129,7 @@ class CheckSidebar(unittest.TestCase):
last_panel_name = self.getLastPanel(xPanels)
-other_panel = xPanels.getByName(last_panel_name)
+other_panel = xPanels[last_panel_name]
other_panel.expand(False)
assert( other_panel.isExpanded() )
diff --git a/sfx2/qa/python/check_sidebar_registry.py
b/sfx2/qa/python/check_sidebar_registry.py
index e77c08f..97cc1aa 100644
--- a/sfx2/qa/python/check_sidebar_registry.py
+++ b/sfx2/qa/python/check_sidebar_registry.py
@@ -45,7 +45,7 @@ class CheckSidebarRegistry(unittest.TestCase):
(param, ))
for nodeName in sidebar_decks_settings:
-node = sidebar_decks_settings.getByName(nodeName)
+node = sidebar_decks_settings[nodeName]
if (node.Id != nodeName):
print("\nNon-consistent sidebar.xcu Deck registry names",
nodeName, node.Id)
@@ -59,7 +59,7 @@ class CheckSidebarRegistry(unittest.TestCase):
(param, ))
for nodeName in sidebar_panels_settings:
-node = sidebar_panels_settings.getByName(nodeName)
+node = sidebar_panels_settings[nodeName]
if (node.Id != nodeName):
print("\nNon-consistent sidebar.xcu Panel registry names",
nodeName, node.Id)
@@ -68,7 +68,7 @@ class CheckSidebarRegistry(unittest.TestCase):
# is panel bound to an existing Deck ?
FoundDeckId = False
for deckNodeName in sidebar_decks_settings:
-deck_node = sidebar_decks_settings.getByName(deckNodeName)
+deck_node = sidebar_decks_settings[deckNodeName]
if (node.DeckId == deck_node.Id):
FoundDeckId = True
if not FoundDeckId:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
