date:20181128

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

2018-11-28 Thread Libreoffice Gerrit user

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

New commits:
commit 12877c3ec0bb503dcd0d6d9b9aa83e2a1e5e7ac4
Author: Armin Le Grand 
AuthorDate: Tue Nov 27 13:53:59 2018 +0100
Commit: Armin Le Grand 
CommitDate: Thu Nov 29 08:55:54 2018 +0100

No GridOffset support for PDF or Print

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

diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 28af22f58c34..a19d7ce48c84 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -1181,6 +1181,18 @@ namespace sdr
 
 bool ObjectContactOfScDrawView::supportsGridOffsets() const
 {
+// no GridOffset support for printer
+if(isOutputToPrinter())
+{
+return false;
+}
+
+// no GridOffset support for PDF export
+if(isOutputToPDFFile())
+{
+return false;
+}
+
 // yes - we support it
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp

2018-11-28 Thread Libreoffice Gerrit user

 wsd/DocumentBroker.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dc4712c3f9e3ad541f5d4348a47604665050596f
Author: Miklos Vajna 
AuthorDate: Thu Nov 29 08:52:57 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 29 08:52:57 2018 +0100

wsd: limit_load_secs is not interesting for the mobile case, either

Change-Id: I92ad4bea80c261cc802ccdbebc1ce2990260853e

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 87eff69b6..c2dda9221 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -250,12 +250,12 @@ void DocumentBroker::pollThread()
 uint64_t adminSent = 0;
 uint64_t adminRecv = 0;
 auto lastBWUpdateTime = std::chrono::steady_clock::now();
+
+int limit_load_secs = 
LOOLWSD::getConfigValue("per_document.limit_load_secs", 100);
 auto loadDeadline = std::chrono::steady_clock::now() + 
std::chrono::seconds(limit_load_secs);
 #endif
 auto last30SecCheckTime = std::chrono::steady_clock::now();
 
-int limit_load_secs = 
LOOLWSD::getConfigValue("per_document.limit_load_secs", 100);
-
 // Main polling loop goodness.
 while (!_stop && _poll->continuePolling() && !TerminationFlag)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp

2018-11-28 Thread Libreoffice Gerrit user

 wsd/DocumentBroker.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e312f90169b35a0ad7db48252a9d6d8c526140a
Author: Miklos Vajna 
AuthorDate: Thu Nov 29 08:51:26 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 29 08:51:26 2018 +0100

Fix gtk build: -Werror=unused-but-set-variable

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 8235c073c..87eff69b6 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -250,11 +250,11 @@ void DocumentBroker::pollThread()
 uint64_t adminSent = 0;
 uint64_t adminRecv = 0;
 auto lastBWUpdateTime = std::chrono::steady_clock::now();
+auto loadDeadline = std::chrono::steady_clock::now() + 
std::chrono::seconds(limit_load_secs);
 #endif
 auto last30SecCheckTime = std::chrono::steady_clock::now();
 
 int limit_load_secs = 
LOOLWSD::getConfigValue("per_document.limit_load_secs", 100);
-auto loadDeadline = std::chrono::steady_clock::now() + 
std::chrono::seconds(limit_load_secs);
 
 // Main polling loop goodness.
 while (!_stop && _poll->continuePolling() && !TerminationFlag)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

 external/xmlsec/README |   37 -
 1 file changed, 4 insertions(+), 33 deletions(-)

New commits:
commit 6ddc2fb9f476895706915bddbe7431400e773597
Author: Miklos Vajna 
AuthorDate: Wed Nov 28 21:28:54 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 29 08:45:53 2018 +0100

libxmlsec: rewrite README now that we no longer patch the library

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

diff --git a/external/xmlsec/README b/external/xmlsec/README
index 2484bf2300e4..9f2c5e5e7162 100644
--- a/external/xmlsec/README
+++ b/external/xmlsec/README
@@ -1,34 +1,5 @@
-XML signing, etc. From [http://www.aleksey.com/xmlsec/]. Heavily patched.
-
-The XML Security library has been modified, so that there is NO verification of
-the certificate during sign or verification operation. On Windows this was done
-in the function xmlSecMSCryptoX509StoreVerify (file src/mscrypto/x509vfy.c) and
-on UNIX in xmlSecNssX509StoreVerify (file src/nss/x509vfy.c).
-
-The implementation creates certificates from all of the X509Data children, such
-as X509IssuerSerial and X509Certificate and stores them in a certificate store
-(see xmlsec/src/mscrypto/x509.c:xmlSecMSCryptoX509DataNodeRead). It must then
-find the certificate containing the public key which is used for validation
-within that store. This is done in xmlSecMSCryptoX509StoreVerify. This function
-however only takes those certificates into account which can be validated. This
-was changed by the patch xmlsec1-noverify.patch, which prevents this 
certificate
-validation.
-
-xmlSecMSCryptoX509StoreVerify iterates over all certificates contained or
-referenced in the X509Data elements and selects one which is no issuer of any 
of
-the other certificates. This certificate is not necessarily the one which was
-used for signing but it must contain the proper validation key, which is
-sufficient to validate the signature. See 
-http://www.w3.org/TR/xmldsig-core/#sec-X509Data 
-for details.
-
-There is a flag XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS that can be set
-in a xmlSecKeyInfoCtx (see function xmlSecNssKeyDataX509XmlRead, in file
-src/nss/x509.c), which indicates that one can turn off the validation. However,
-setting it will cause that the validation key is not found. If the flag is set,
-then the key is not extracted from the certificate store which contains all the
-certificates of the X509Data elements. In other words, the certificates which
-are delivered within the XML signature are not used when looking for suitable
-validation key.
-
+XML signing, etc. From [http://www.aleksey.com/xmlsec/].
 
+The certificate vertification functionality of libxmlsec is not used, both the
+mscng and nss backends specify the
+XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS flag during verification.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/Storage.cpp wsd/Storage.hpp

2018-11-28 Thread Libreoffice Gerrit user

 wsd/DocumentBroker.cpp |   18 +-
 wsd/Storage.cpp|   12 ++--
 wsd/Storage.hpp|   17 -
 3 files changed, 27 insertions(+), 20 deletions(-)

New commits:
commit ae3fec55d41bde6c8e7e50986ae30a58d87a
Author: Miklos Vajna 
AuthorDate: Thu Nov 29 08:42:43 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 29 08:43:02 2018 +0100

StorageBase::FileInfo: make members private

Which shows that the _size member was unused.

Change-Id: Ic6e74659050b86cd9057971ec21623fad75f0c39

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index fed34213e..8235c073c 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -526,7 +526,7 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 if (wopifileinfo->getDisableExport())
 wopifileinfo->setHideExportOption(true);
 
-wopiInfo->set("BaseFileName", wopiStorage->getFileInfo()._filename);
+wopiInfo->set("BaseFileName", 
wopiStorage->getFileInfo().getFilename());
 wopiInfo->set("HidePrintOption", wopifileinfo->getHidePrintOption());
 wopiInfo->set("HideSaveOption", wopifileinfo->getHideSaveOption());
 wopiInfo->set("HideExportOption", wopifileinfo->getHideExportOption());
@@ -551,7 +551,7 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 session->sendMessage("wopi: " + wopiInfoString);
 
 // Mark the session as 'Document owner' if WOPI hosts supports it
-if (userId == _storage->getFileInfo()._ownerId)
+if (userId == _storage->getFileInfo().getOwnerId())
 {
 LOG_DBG("Session [" << sessionId << "] is the document owner");
 session->setDocumentOwner(true);
@@ -604,21 +604,21 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 
 if (firstInstance)
 {
-_documentLastModifiedTime = fileInfo._modifiedTime;
+_documentLastModifiedTime = fileInfo.getModifiedTime();
 LOG_DBG("Document timestamp: " << _documentLastModifiedTime);
 }
 else
 {
 // Check if document has been modified by some external action
-LOG_TRC("Document modified time: " << fileInfo._modifiedTime);
+LOG_TRC("Document modified time: " << fileInfo.getModifiedTime());
 static const Poco::Timestamp Zero(Poco::Timestamp::fromEpochTime(0));
 if (_documentLastModifiedTime != Zero &&
-fileInfo._modifiedTime != Zero &&
-_documentLastModifiedTime != fileInfo._modifiedTime)
+fileInfo.getModifiedTime() != Zero &&
+_documentLastModifiedTime != fileInfo.getModifiedTime())
 {
 LOG_DBG("Document " << _docKey << "] has been modified behind our 
back. " <<
 "Informing all clients. Expected: " << 
_documentLastModifiedTime <<
-", Actual: " << fileInfo._modifiedTime);
+", Actual: " << fileInfo.getModifiedTime());
 
 _documentChangedInStorage = true;
 std::string message = "close: documentconflict";
@@ -703,7 +703,7 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 _uriJailed = Poco::URI(Poco::URI("file://"), 
localPathEncoded).toString();
 _uriJailedAnonym = Poco::URI(Poco::URI("file://"), 
LOOLWSD::anonymizeUrl(localPath)).toString();
 
-_filename = fileInfo._filename;
+_filename = fileInfo.getFilename();
 
 // Use the local temp file's timestamp.
 _lastFileModifiedTime = 
Poco::File(_storage->getRootFilePath()).getLastModified();
@@ -840,7 +840,7 @@ bool DocumentBroker::saveToStorageInternal(const 
std::string& sessionId,
 _lastSaveTime = std::chrono::steady_clock::now();
 
 // Save the storage timestamp.
-_documentLastModifiedTime = _storage->getFileInfo()._modifiedTime;
+_documentLastModifiedTime = 
_storage->getFileInfo().getModifiedTime();
 
 // After a successful save, we are sure that document in the 
storage is same as ours
 _documentChangedInStorage = false;
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 7ed86bc3c..b40bebfb3 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -350,8 +350,8 @@ StorageBase::SaveResult 
LocalStorage::saveLocalFileToStorage(const Authorization
 
 // update its fileinfo object. This is used later to check if someone 
else changed the
 // document while we are/were editing it
-getFileInfo()._modifiedTime = 
Poco::File(getUri().getPath()).getLastModified();
-LOG_TRC("New FileInfo modified time in storage " << 
getFileInfo()._modifiedTime);
+
getFileInfo().setModifiedTime(Poco::File(getUri().getPath()).getLastModified());
+LOG_TRC("New FileInfo modified time in storage " << 
getFileInfo().getModifiedTime());
 }
 catch (const Poco::Exception& exc)
 {
@@ -660,7 +660,7 @@ std::string WopiSt

Re: Tinberbox MacOSX-x86_64_49-TDF failure - ld: file not found

2018-11-28 Thread Stephan Bergmann


On 28/11/2018 19:50, Luke Benes wrote:

In this range: 
https://cgit.freedesktop.org/libreoffice/core/log/?qt=range&q=313a0efb1d703a36030a7e5e55bd308c7e4650f3..ae3309c908311248f1580a894f197732964bfac2

@49 started failing with:

https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&full-log=1543237201.21995

   [build LOC] vcl
   [build SED] CustomTarget/wizards/share/dialog.xlc
   [build SED] CustomTarget/wizards/share/script.xlc
   [build PKG] wizards_properties
   [build LOC] wizards
   [build LOC] writerperfect
   [build LOC] xmlsecurity
   [build CUS] instsetoo_native/setup
   [build LOC] external
   [build CHK] external
   [build SLC] external
   [build UPK] boost_1_66_0.tar.bz2
   [build LNK] Library/libuno_sal.dylib.3
   [build UPK] icu4c-63_1-src.tgz
   [build UPK] nss-3.38-with-nspr-4.19.tar.gz
   NEXTld: file not found: 
/Users/cloph/tb/workdir/CObject/sal/osl/unx/backtrace.o/Users/cloph/tb/workdir/CxxObject/sal/osl/all/compat.o/Users/cloph/tb/workdir/CxxObject/sal/osl/all/debugbase.o/Users/cloph/tb/workdir/CxxObject/sal/osl/all/filepath.o/Users/cloph/tb/workdir/CxxObject/sal/osl/all/loadmodulerelative.o/Users/cloph/tb/workdir/CxxObject/sal/osl/all/log.o/Users/cloph/tb/workdir/CxxObject/sal/osl/all/signalshared.o/Users/cloph/tb/workdir/CxxObject/sal/osl/all/utility.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/alloc_arena.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/alloc_cache.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/alloc_fini.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/alloc_global.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/bootstrap.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/byteseq.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/cipher.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/cmdargs.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/crc.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/digest.o/Users/cloph/tb/workdir/CxxObject/sal/rtl/hash.
7157  NEXTclang: error: linker command failed with exit code 1 (use -v to 
see invocation)
7158  NEXTmake[1]: *** 
[/Users/cloph/tb/instdir/LibreOfficeDev.app/Contents/Frameworks/libuno_sal.dylib.3]
 Error 1
7159  make[1]: *** Waiting for unfinished jobs
7160  NEXTmake: *** [build] Error 2


possibility caused by this commit?
https://cgit.freedesktop.org/libreoffice/core/commit/?id=ab9d95e6073d

Use -filelist with macOS linker


Yes, and likely fixed with 
 
"gbuild: MacOSX: use tr instead of sed for newlines", I'd guess.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/source

2018-11-28 Thread Libreoffice Gerrit user

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

New commits:
commit 5908f1ea0a19482a999c2e00aeaae05eabc1e8e6
Author: Markus Mohrhard 
AuthorDate: Thu Nov 29 00:04:58 2018 +0100
Commit: Markus Mohrhard 
CommitDate: Thu Nov 29 07:40:06 2018 +0100

tdf#105236, only take number format from numeric cells

Change-Id: I55deaa1f0579582a45dc1e10bb578b680eb98647
Reviewed-on: https://gerrit.libreoffice.org/64200
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit fb04e7180cdf656dbbd3daa9c81615d9478229e0)
Reviewed-on: https://gerrit.libreoffice.org/64203

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 448652397cee..5fc78815f602 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3145,7 +3145,7 @@ sal_uInt32 getDisplayNumberFormat(const ScDocument* pDoc, 
const ScAddress& rPos)
 for (const Item& rItem : m_aDataArray)
 {
 ScRefCellValue aCell(*m_pDocument, rItem.mAddress);
-if (!aCell.isEmpty())
+if (!aCell.isEmpty() && aCell.hasNumeric())
 {
 return 
static_cast(getDisplayNumberFormat(m_pDocument, rItem.mAddress));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

 compilerplugins/clang/unusedenumconstants.readonly.results |2 --
 include/svx/svdedtv.hxx|3 +--
 svx/source/svdraw/svdedtv.cxx  |6 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 07c607b8a20cfa3c0022204db201fe2739f7b8cc
Author: Noel Grandin 
AuthorDate: Mon Nov 26 10:59:57 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 29 07:19:03 2018 +0100

remove unused SdrInsertFlags enum value

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

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results 
b/compilerplugins/clang/unusedenumconstants.readonly.results
index bbb57be316e4..a54619908b6d 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -492,8 +492,6 @@ include/svx/ruler.hxx:60
 enum SvxRulerDragFlags OBJECT_LEFT_INDENT_ONLY
 include/svx/sdtakitm.hxx:31
 enum SdrTextAniKind Blink
-include/svx/svdedtv.hxx:65
-enum SdrInsertFlags NOBROADCAST
 include/svx/svdhdl.hxx:108
 enum BitmapMarkerKind RectPlus_7x7
 include/svx/svdograf.hxx:52
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 6fc2e1aab75f..af60deaac0f6 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -62,11 +62,10 @@ enum class SdrInsertFlags
 ADDMARK = 0x0002, /* object will be added an existing selection  */
 SETDEFATTR  = 0x0004, /* actual attributes (+StyleSheet) are assigned to 
the object */
 SETDEFLAYER = 0x0008, /* actual layer is assigned to the object */
-NOBROADCAST = 0x0010, /* insert with NbcInsertObject() for SolidDragging */
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 class SVX_DLLPUBLIC SdrEditView : public SdrMarkView
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 2197c3fbc42e..a3b20b853068 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -971,11 +971,7 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, 
SdrPageView& rPV, SdrInser
 pObj->SetMergedItemSet(maDefaultAttr);
 }
 if (!pObj->IsInserted()) {
-if (nOptions & SdrInsertFlags::NOBROADCAST) {
-rPV.GetObjList()->NbcInsertObject(pObj, SAL_MAX_SIZE);
-} else {
-rPV.GetObjList()->InsertObject(pObj, SAL_MAX_SIZE);
-}
+rPV.GetObjList()->InsertObject(pObj, SAL_MAX_SIZE);
 }
 if( IsUndoEnabled() )
 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source basic/source desktop/source fpicker/source framework/source helpcompiler/source l10ntools/source oox/source package/source scripting/source sc/source sd/s

2018-11-28 Thread Libreoffice Gerrit user

 basctl/source/basicide/bastype3.cxx   |   95 -
 basic/source/classes/sb.cxx   |   29 
 desktop/source/migration/services/oo3extensionmigration.cxx   |7 
 fpicker/source/office/OfficeFilePicker.cxx|6 
 framework/source/dispatch/interceptionhelper.cxx  |2 
 framework/source/layoutmanager/toolbarlayoutmanager.cxx   |7 
 helpcompiler/source/HelpLinker.cxx|4 
 l10ntools/source/po.cxx   |7 
 oox/source/helper/propertymap.cxx |   17 
 oox/source/ole/axbinaryreader.cxx |4 
 oox/source/ole/axbinarywriter.cxx |   24 
 package/source/xstor/xstorage.cxx |   17 
 sc/source/core/data/table5.cxx|   18 
 sc/source/core/tool/addincol.cxx  |   17 
 sc/source/core/tool/adiasync.cxx  |   25 
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx|   21 
 sc/source/ui/app/inputwin.cxx |   20 
 sc/source/ui/dbgui/sfiltdlg.cxx   |   19 
 sc/source/ui/docshell/docfunc.cxx |   11 
 sc/source/ui/navipi/content.cxx   |   20 
 sc/source/ui/unoobj/cellsuno.cxx  |   31 
 sc/source/ui/unoobj/listenercalls.cxx |   33 
 sc/source/ui/view/gridwin2.cxx|2 
 scripting/source/provider/BrowseNodeFactoryImpl.cxx   |   21 
 sd/source/ui/func/smarttag.cxx|7 
 sfx2/source/doc/saveastemplatedlg.cxx |7 
 sfx2/source/doc/templatedlg.cxx   |   14 
 slideshow/source/engine/slide/slideimpl.cxx   |   13 
 svx/source/form/fmvwimp.cxx   |7 
 svx/source/svdraw/svddrgmt.cxx|   33 
 svx/source/svdraw/svdmark.cxx |2 
 svx/source/svdraw/svdobj.cxx  |9 
 sw/source/core/access/accmap.cxx  |   14 
 sw/source/core/undo/undel.cxx |   17 
 sw/source/core/unocore/unoportenum.cxx|   35 
 sw/source/filter/html/swhtml.cxx  |   10 
 sw/source/filter/ww8/docxattributeoutput.cxx  |   32 
 sw/source/filter/ww8/wrtw8esh.cxx |   17 
 sw/source/filter/ww8/ww8graf.cxx  |   15 
 sw/source/ui/dialog/uiregionsw.cxx|   39 
 sw/source/ui/frmdlg/frmpage.cxx   |9 
 sw/source/uibase/app/docsh2.cxx   |   11 
 sw/source/uibase/docvw/PostItMgr.cxx  |   13 
 ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx|7 
 unodevtools/source/skeletonmaker/cppcompskeleton.cxx  |   20 
 unotools/source/misc/fontdefs.cxx |2 
 vcl/opengl/gdiimpl.cxx|7 
 vcl/source/control/notebookbar.cxx|2 
 vcl/source/filter/ipdf/pdfdocument.cxx|9 
 vcl/unx/generic/fontmanager/fontmanager.cxx   |   13 
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx  |4 
 xmloff/source/draw/sdxmlexp.cxx   |  719 --
 xmloff/source/draw/shapeimport.cxx|   67 
 xmloff/source/table/XMLTableImport.cxx|   21 
 xmloff/source/text/txtparai.cxx   |2 
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx|7 
 xmlsecurity/source/framework/saxeventkeeperimpl.cxx   |   10 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |6 
 58 files changed, 748 insertions(+), 909 deletions(-)

New commits:
commit 21de55596c0fdc2be736c6d0369bd9d3783020be
Author: Noel Grandin 
AuthorDate: Wed Nov 28 15:13:42 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 29 07:17:37 2018 +0100

remove unnecessary "if (!empty()" checks before loops

found with
   git grep -n -A4 'if.*!.*empty' | grep -B3 -P
'(\bfor)|(\bwhile)|(\bdo)'

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

diff --git a/basctl/source/basicide/bastype3.cxx 
b/basctl/source/basicide/bastype3.cxx
index 90bbcbe44e83..c8f9506014ad 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -486,60 +486,57 @@ EntryDescriptor TreeListBox::GetEntryDescriptor(

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

2018-11-28 Thread Libreoffice Gerrit user

 compilerplugins/clang/compat.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit da9fb5d6d9ebf9363981c370ce937d8848989fcb
Author: Noel Grandin 
AuthorDate: Wed Nov 28 12:36:29 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 29 07:17:07 2018 +0100

comment out the EvaluateAsInt compat code for now

sberg: Note how that Clang change keeps getting reverted; latest one is

"Revert r347417 'Re-Reinstate 347294 with a fix for the failures.'"  But
lets wait a little while to see how things settle there.

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

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 97410fcbdc7a..7a518770a3b6 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -157,7 +157,8 @@ inline bool CPlusPlus17(clang::LangOptions const & opts) {
 }
 
 inline bool EvaluateAsInt(clang::Expr const * expr, llvm::APSInt& intRes, 
const clang::ASTContext& ctx) {
-#if CLANG_VERSION >= 8
+// this keeps getting landed and then reverted in clang
+#if 0 && CLANG_VERSION >= 8
 clang::Expr::EvalResult res;
 bool b = expr->EvaluateAsInt(res, ctx);
 if (b && res.Val.isInt())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

 sw/source/filter/ww8/ww8atr.cxx |   15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 1215b3cf095e5baa73bd422ef396eb6245b95303
Author: Justin Luth 
AuthorDate: Tue Nov 27 21:07:49 2018 +0300
Commit: Justin Luth 
CommitDate: Thu Nov 29 05:34:07 2018 +0100

doc sprmPShd documentation.

sprmPShd (0xC64D) is a SHDOperand value that specifies
the background shading for the paragraph. The SDHOperand
structure is an operand that is used by several Sprm structures
to specify the background shading to be applied.

ShdAuto is a special value for Shd that specifies that no shading
is applied and is defined as 0xFF00 / 0x

ShdNil is a special value for Shd. If ShdNil is used in a Table Style
definition, ShdNil is ignored and the shading of the cell is not affected.
If ShdNil is applied outside of a Table Style, ShdNil
specifies that no shading is applied. ShdNil is defined as 0x

Change-Id: I66ec3cbccae60eb658ee00cb01b22cfae36482d0
Reviewed-on: https://gerrit.libreoffice.org/64184
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b911ef83b6a7..64e10f03ee74 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4195,19 +4195,16 @@ void WW8AttributeOutput::FormatBackground( const 
SvxBrushItem& rBrush )
 if ( !m_rWW8Export.m_bOutPageDescs )
 {
 WW8_SHD aSHD;
-
 WW8Export::TransBrush( rBrush.GetColor(), aSHD );
-// sprmPShd
+
 m_rWW8Export.InsUInt16( NS_sprm::sprmPShd80 );
 m_rWW8Export.InsUInt16( aSHD.GetValue() );
 
-// Quite a few unknowns, some might be transparency or something
-// of that nature...
-m_rWW8Export.InsUInt16( 0xC64D );
-m_rWW8Export.pO->push_back( 10 );
-m_rWW8Export.InsUInt32( 0xFF00 );
-m_rWW8Export.InsUInt32( SuitableBGColor( rBrush.GetColor() ) );
-m_rWW8Export.InsUInt16( 0x );
+m_rWW8Export.InsUInt16( NS_sprm::sprmPShd );
+m_rWW8Export.pO->push_back( 10 ); //size of operand: MUST be 10
+m_rWW8Export.InsUInt32( 0xFF00 ); //cvFore: Foreground BGR = cvAuto
+m_rWW8Export.InsUInt32( SuitableBGColor( rBrush.GetColor() ) ); 
//cvBack
+m_rWW8Export.InsUInt16( 0x ); //iPat: specifies the pattern used 
for shading = clear/100% background
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - icon-themes/colibre icon-themes/colibre_svg officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig

2018-11-28 Thread Libreoffice Gerrit user

 icon-themes/colibre/cmd/32/toolsmacroedit.png|binary
 icon-themes/colibre/cmd/lc_scriptorganizer.png   |binary
 icon-themes/colibre/cmd/sc_scriptorganizer.png   |binary
 icon-themes/colibre/links.txt|   11 
+
 icon-themes/colibre/res/lx03252.png  |binary
 icon-themes/colibre_svg/cmd/32/toolsmacroedit.svg|   21 
++
 icon-themes/colibre_svg/cmd/lc_scriptorganizer.svg   |   14 
++
 icon-themes/colibre_svg/cmd/sc_scriptorganizer.svg   |   14 
++
 icon-themes/colibre_svg/res/lx03252.svg  |2 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 +
 sc/uiconfig/scalc/ui/notebookbar.ui  |4 -
 sd/uiconfig/sdraw/ui/notebookbar.ui  |4 -
 sd/uiconfig/simpress/ui/notebookbar.ui   |4 -
 sw/uiconfig/swriter/ui/notebookbar.ui|   11 
++---
 14 files changed, 75 insertions(+), 13 deletions(-)

New commits:
commit 19ed06f3e22a9f088a72633d6dc3b40116007f25
Author: andreas kainz 
AuthorDate: Wed Nov 28 13:16:23 2018 +0100
Commit: andreas_kainz 
CommitDate: Thu Nov 29 04:42:44 2018 +0100

tdf#121581 change organize dialoogs to organize macro

add missing colibre icons
improve layout for large icons

Change-Id: Id9d003b945654f958ec43d530083e2070d4b580e
Reviewed-on: https://gerrit.libreoffice.org/64159
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 2c154667ff257a9aaec2baa386cec7b9e129132d)
Reviewed-on: https://gerrit.libreoffice.org/64193

diff --git a/icon-themes/colibre/cmd/32/toolsmacroedit.png 
b/icon-themes/colibre/cmd/32/toolsmacroedit.png
new file mode 100644
index ..3b3061988c22
Binary files /dev/null and b/icon-themes/colibre/cmd/32/toolsmacroedit.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_scriptorganizer.png 
b/icon-themes/colibre/cmd/lc_scriptorganizer.png
new file mode 100644
index ..cd202cf2eed0
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_scriptorganizer.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_scriptorganizer.png 
b/icon-themes/colibre/cmd/sc_scriptorganizer.png
new file mode 100644
index ..734d8a401f6e
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_scriptorganizer.png 
differ
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 7c12157267c1..7d498f287ab0 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1801,3 +1801,14 @@ cmd/lc_tableevents.png cmd/lc_animationeffects.png
 cmd/sc_sheetlefttoright.png cmd/sc_paralefttoright.png
 cmd/sc_sheetrighttoleft.png cmd/sc_pararighttoleft.png
 cmd/sc_tableevents.png cmd/sc_animationeffects.png
+
+
+# Macro
+cmd/32/macrosmenu.png cmd/32/choosemacro.png
+cmd/32/basicideappear.png cmd/32/toolsmacroedit.png
+
+cmd/lc_macrosmenu.png cmd/lc_choosemacro.png
+cmd/lc_basicideappear.png cmd/lc_toolsmacroedit.png
+
+cmd/sc_macrosmenu.png cmd/sc_choosemacro.png
+cmd/sc_basicideappear.png cmd/sc_toolsmacroedit.png
diff --git a/icon-themes/colibre/res/lx03252.png 
b/icon-themes/colibre/res/lx03252.png
index 007769c55c7d..edac6bc02f4a 100644
Binary files a/icon-themes/colibre/res/lx03252.png and 
b/icon-themes/colibre/res/lx03252.png differ
diff --git a/icon-themes/colibre_svg/cmd/32/toolsmacroedit.svg 
b/icon-themes/colibre_svg/cmd/32/toolsmacroedit.svg
new file mode 100644
index ..87054391316c
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/32/toolsmacroedit.svg
@@ -0,0 +1,21 @@
+http://www.w3.org/2000/svg";>
+  
+  
+  
+
+
+  
+
diff --git a/icon-themes/colibre_svg/cmd/lc_scriptorganizer.svg 
b/icon-themes/colibre_svg/cmd/lc_scriptorganizer.svg
new file mode 100644
index ..4075bd463f20
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/lc_scriptorganizer.svg
@@ -0,0 +1,14 @@
+http://www.w3.org/2000/svg";>
+
+
+  
+
diff --git a/icon-themes/colibre_svg/cmd/sc_scriptorganizer.svg 
b/icon-themes/colibre_svg/cmd/sc_scriptorganizer.svg
new file mode 100644
index ..13ac6d6dc4cd
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/sc_scriptorganizer.svg
@@ -0,0 +1,14 @@
+http://www.w3.org/2000/svg";>
+  
+  
+
+
diff --git a/icon-themes/colibre_svg/res/lx03252.svg 
b/icon-themes/colibre_svg/res/lx03252.svg
index a2ca91cfcfc8..6fae78de924e 100644
--- a/icon-themes/colibre_svg/res/lx03252.svg
+++ b/icon-themes/colibre_svg/res/lx03252.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index b0387cfefee1..69856aa6362e 100644
--- a/officecfg/reg

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

2018-11-28 Thread Libreoffice Gerrit user

 chart2/qa/extras/chart2import.cxx   |   14 ++
 chart2/qa/extras/data/xls/source_number_format_axis.xls |binary
 2 files changed, 14 insertions(+)

New commits:
commit 92c25a6163dca79987fd8fe7c3efd5527edc29b5
Author: Markus Mohrhard 
AuthorDate: Thu Nov 29 01:53:12 2018 +0100
Commit: Markus Mohrhard 
CommitDate: Thu Nov 29 03:32:31 2018 +0100

add test for tdf#105236

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

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index d0a5c344a1e6..64e343c6d639 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -118,6 +118,7 @@ public:
 void testDeletedDataLabel();
 void testDataPointInheritedColorDOCX();
 void testExternalStrRefsXLSX();
+void testSourceNumberFormatComplexCategoriesXLS();
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
@@ -190,6 +191,7 @@ public:
 CPPUNIT_TEST(testDeletedDataLabel);
 CPPUNIT_TEST(testDataPointInheritedColorDOCX);
 CPPUNIT_TEST(testExternalStrRefsXLSX);
+CPPUNIT_TEST(testSourceNumberFormatComplexCategoriesXLS);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1700,6 +1702,18 @@ void Chart2ImportTest::testExternalStrRefsXLSX()
 CPPUNIT_ASSERT_EQUAL(OUString("test2"), aValues[1].get());
 }
 
+void Chart2ImportTest::testSourceNumberFormatComplexCategoriesXLS()
+{
+load("/chart2/qa/extras/data/xls/", "source_number_format_axis.xls");
+uno::Reference< chart2::XChartDocument > xChartDoc( getChartCompFromSheet( 
0, mxComponent ), UNO_QUERY_THROW );
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
+chart2::ScaleData aScaleData = xAxis->getScaleData();
+sal_Int32 nNumberFormat =  
aScaleData.Categories->getValues()->getNumberFormatKeyByIndex(-1);
+CPPUNIT_ASSERT(nNumberFormat != 0);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xls/source_number_format_axis.xls 
b/chart2/qa/extras/data/xls/source_number_format_axis.xls
new file mode 100644
index ..bc54593ac150
Binary files /dev/null and 
b/chart2/qa/extras/data/xls/source_number_format_axis.xls differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

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

New commits:
commit fb04e7180cdf656dbbd3daa9c81615d9478229e0
Author: Markus Mohrhard 
AuthorDate: Thu Nov 29 00:04:58 2018 +0100
Commit: Markus Mohrhard 
CommitDate: Thu Nov 29 03:30:46 2018 +0100

tdf#105236, only take number format from numeric cells

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

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 448652397cee..5fc78815f602 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3145,7 +3145,7 @@ sal_uInt32 getDisplayNumberFormat(const ScDocument* pDoc, 
const ScAddress& rPos)
 for (const Item& rItem : m_aDataArray)
 {
 ScRefCellValue aCell(*m_pDocument, rItem.mAddress);
-if (!aCell.isEmpty())
+if (!aCell.isEmpty() && aCell.hasNumeric())
 {
 return 
static_cast(getDisplayNumberFormat(m_pDocument, rItem.mAddress));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

 sc/qa/unit/data/ods/tdf121612.ods |binary
 sc/qa/unit/subsequent_export-test.cxx |   20 
 sc/source/filter/excel/xepivotxml.cxx |   11 +--
 3 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 6481bda69ade61cb5420156272fcf17edd43d620
Author: Vasily Melenchuk 
AuthorDate: Thu Nov 22 11:30:29 2018 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Nov 29 00:57:59 2018 +0100

tdf#121612: update pivot caches during saving to XLSX

Cache was empty so pivot table was not exported completely
and pivot table filter were missing.

Change-Id: Ib0b9e98a5588159c5c7de1e2e5d2bdcbfe986d8d
Reviewed-on: https://gerrit.libreoffice.org/63785
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sc/qa/unit/data/ods/tdf121612.ods 
b/sc/qa/unit/data/ods/tdf121612.ods
new file mode 100644
index ..6afc4e0c931c
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf121612.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 1425ff330954..f084ad015f29 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -206,6 +207,7 @@ public:
 void testKeepSettingsOfBlankRows();
 
 void testTdf118990();
+void testTdf121612();
 
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
@@ -319,6 +321,7 @@ public:
 CPPUNIT_TEST(testKeepSettingsOfBlankRows);
 
 CPPUNIT_TEST(testTdf118990);
+CPPUNIT_TEST(testTdf121612);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -4169,6 +4172,23 @@ void ScExportTest::testTdf118990()
 xDocSh->DoClose();
 }
 
+void ScExportTest::testTdf121612()
+{
+ScDocShellRef xDocSh = loadDoc("tdf121612.", FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+xDocSh = saveAndReload(xDocSh.get(), FORMAT_XLSX);
+
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// There should be a pivot table
+CPPUNIT_ASSERT(rDoc.HasPivotTable());
+
+// DP collection is not lost after export and has one entry
+ScDPCollection* pDPColl = rDoc.GetDPCollection();
+CPPUNIT_ASSERT(pDPColl);
+CPPUNIT_ASSERT_EQUAL(size_t(1), pDPColl->GetCount());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xepivotxml.cxx 
b/sc/source/filter/excel/xepivotxml.cxx
index b7e790eca6da..271b4cb8fdf4 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -418,15 +418,22 @@ XclExpXmlPivotTableManager::XclExpXmlPivotTableManager( 
const XclExpRoot& rRoot
 
 void XclExpXmlPivotTableManager::Initialize()
 {
-const ScDocument& rDoc = GetDoc();
+ScDocument& rDoc = GetDoc();
 if (!rDoc.HasPivotTable())
 // No pivot table to export.
 return;
 
-const ScDPCollection* pDPColl = rDoc.GetDPCollection();
+ScDPCollection* pDPColl = rDoc.GetDPCollection();
 if (!pDPColl)
 return;
 
+// Update caches from DPObject
+for (size_t i = 0; i < pDPColl->GetCount(); ++i)
+{
+ScDPObject& rDPObj = (*pDPColl)[i];
+rDPObj.SyncAllDimensionMembers();
+}
+
 // Go through the caches first.
 
 std::vector aCaches;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

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

New commits:
commit 00caf3994cab5a25fd4ff147e2860a439b69c731
Author: Andrea Gelmini 
AuthorDate: Wed Nov 28 17:47:58 2018 +0100
Commit: Jens Carl 
CommitDate: Thu Nov 29 00:08:52 2018 +0100

Fix typo

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

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index f1ad7192aabf..c079d4efa3db 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1043,7 +1043,7 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, 
const OUString& rLibName,
 aNewLibName += "_";
 }
 BasicLibInfo* pLibInfo = CreateLibInfo();
-// Use original name otherwise ImpLoadLibrary failes...
+// Use original name otherwise ImpLoadLibrary fails...
 pLibInfo->SetLibName( rLibName );
 // but doesn't work this way if name exists twice
 sal_uInt16 nLibId = static_cast(mpImpl->aLibs.size()) - 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 4 commits - common/MessageQueue.cpp ios/Mobile wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp

2018-11-28 Thread Libreoffice Gerrit user

 common/MessageQueue.cpp  |   18 +-
 ios/Mobile/Document.mm   |4 +++-
 ios/Mobile/DocumentViewController.mm |6 +-
 wsd/DocumentBroker.cpp   |4 ++--
 wsd/DocumentBroker.hpp   |6 +++---
 5 files changed, 22 insertions(+), 16 deletions(-)

New commits:
commit b4e3110d7b60d6dc58e716d86fb18fe8fed23ba7
Author: Tor Lillqvist 
AuthorDate: Thu Nov 29 01:01:12 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 29 01:07:03 2018 +0200

Truncate for logging at a bit higher limit

Change-Id: I352ef6476a9cde767b4076ad9a2ab8cf3c9bdf2b

diff --git a/ios/Mobile/Document.mm b/ios/Mobile/Document.mm
index 720aaab79..241e2cb3d 100644
--- a/ios/Mobile/Document.mm
+++ b/ios/Mobile/Document.mm
@@ -92,7 +92,7 @@
 js = @"window.TheFakeWebSocket.onmessage({'data': 
Base64ToArrayBuffer('";
 js = [js stringByAppendingString: [[NSData dataWithBytes:buffer 
length:length] base64EncodedStringWithOptions:0]];
 js = [js stringByAppendingString:@"')});"];
-NSString *subjs = [js substringToIndex:std::min(40ul, js.length)];
+NSString *subjs = [js substringToIndex:std::min(100ul, js.length)];
 if (subjs.length < js.length)
 subjs = [subjs stringByAppendingString:@"..."];
 
diff --git a/ios/Mobile/DocumentViewController.mm 
b/ios/Mobile/DocumentViewController.mm
index f858a0a5a..f60e31bbc 100644
--- a/ios/Mobile/DocumentViewController.mm
+++ b/ios/Mobile/DocumentViewController.mm
@@ -150,7 +150,7 @@
 } else if ([message.name isEqualToString:@"debug"]) {
 LOG_TRC_NOFILE("==> " << [message.body UTF8String]);
 } else if ([message.name isEqualToString:@"lool"]) {
-NSString *subBody = [message.body substringToIndex:std::min(40ul, 
((NSString*)message.body).length)];
+NSString *subBody = [message.body substringToIndex:std::min(100ul, 
((NSString*)message.body).length)];
 if (subBody.length < ((NSString*)message.body).length)
 subBody = [subBody stringByAppendingString:@"..."];
 
commit 235c9b8a6070c0ffefc0aa5a80534e6f5c9f5af5
Author: Tor Lillqvist 
AuthorDate: Thu Nov 29 00:57:34 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 29 01:07:03 2018 +0200

Use getAbbreviatedMessage() for its intended purpose

Don't log a potentially very long message in its entirety.

Change-Id: I01fbf76465d99bbab117d1dcacc6c7239a1da518

diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index 0a473d0e4..44781d118 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -31,7 +31,7 @@ void TileQueue::put_impl(const Payload& value)
 
 if (firstToken == "canceltiles")
 {
-LOG_TRC("Processing [" << msg << "]. Before canceltiles have " << 
getQueue().size() << " in queue.");
+LOG_TRC("Processing [" << LOOLProtocol::getAbbreviatedMessage(msg) << 
"]. Before canceltiles have " << getQueue().size() << " in queue.");
 const std::string seqs = msg.substr(12);
 StringTokenizer tokens(seqs, ",", StringTokenizer::TOK_IGNORE_EMPTY | 
StringTokenizer::TOK_TRIM);
 getQueue().erase(std::remove_if(getQueue().begin(), getQueue().end(),
@@ -119,7 +119,7 @@ void TileQueue::removeTileDuplicate(const std::string& 
tileMsg)
 if (it.size() > newMsgPos &&
 strncmp(tileMsg.data(), it.data(), newMsgPos) == 0)
 {
-LOG_TRC("Remove duplicate tile request: " << 
std::string(it.data(), it.size()) << " -> " << tileMsg);
+LOG_TRC("Remove duplicate tile request: " << 
std::string(it.data(), it.size()) << " -> " << 
LOOLProtocol::getAbbreviatedMessage(tileMsg));
 getQueue().erase(getQueue().begin() + i);
 break;
 }
@@ -334,7 +334,7 @@ std::string TileQueue::removeCallbackDuplicate(const 
std::string& callbackMsg)
 
 if (unoCommand == queuedUnoCommand)
 {
-LOG_TRC("Remove obsolete uno command: " << 
std::string(it.data(), it.size()) << " -> " << callbackMsg);
+LOG_TRC("Remove obsolete uno command: " << 
std::string(it.data(), it.size()) << " -> " << 
LOOLProtocol::getAbbreviatedMessage(callbackMsg));
 getQueue().erase(getQueue().begin() + i);
 break;
 }
@@ -371,7 +371,7 @@ std::string TileQueue::removeCallbackDuplicate(const 
std::string& callbackMsg)
 
 if (!isViewCallback && (queuedTokens[1] == tokens[1] && 
queuedTokens[2] == tokens[2]))
 {
-LOG_TRC("Remove obsolete callback: " << std::string(it.data(), 
it.size()) << " -> " << callbackMsg);
+LOG_TRC("Remove obsolete callback: " << std::string(it.data(), 
it.size()) << " -> " << LOOLProtocol::getAbbreviatedMessage(callbackMsg));
 getQueue().erase(getQueue().begin() + i);
 break;
 }
@@ -384,7 +384,7 @@ std::string TileQueue::removeCallbackDuplicate(const 
std

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.1.4.1'

2018-11-28 Thread Libreoffice Gerrit user

Tag 'libreoffice-6.1.4.1' created by Christian Lohmaier 
 at 2018-11-28 22:02 +

Tag libreoffice-6.1.4.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJb/xCAAAoJEPQ0oe+v7q6j7j8QAIjULK+YbG8LJsqpSjgv4y9t
zRfJcPuUPtUzEB+ZajqszwefoHnfLs6ol6NTZdUkaMgZQY7ueVaF6yREhNGmu8b/
Govgkl8sHKhZ7HqfRlB83srSv+9ZI/SCs4qcTpQNxdGvnhDp0bcPxSWxoXaf9we1
ikP1RiPLXGEwCpH3IPg2x6pBJYUi7eZFaAuz4aZjM1wXmDHZHnek5w0neFXh42lj
QeFXWkhSsavqeIaxkjAlrKE/PxXjar/9vc+YuKDp/ZP4+BI1k96i6IzqRmcL7mgr
fMqce0jY8lYy6PJ++GL65ICovQnYEGLchqQPEEeCzmEFNznrreIiQn4huK2Qs1dh
l5C6T/Tw6wT/zBZDTxkHsSaRl0fCqinBx/SjpUedovDv7mcrOsMLMBEnL8x8lt7y
Z8Yc3u8mlxEMwPp5x9y/fq46mcfApcNpdoULVhs1gnvo9PiFIa8mwv33Wh+52GtT
TtkBdeHCyGIHUpO0Im5JuSHrET6UzvxdfeLJrovZ+alaa1SZ91VJDWuSLyH65Ova
CaVhLF85rqhMF4LMx48idAvcAeNbOsjy00IF5YsyYOikxCK5PgJkUfx+s63U7tyo
OvtwM8CVZK/XpF+UWklGf1DfUQQQOQoP91oDbvroVGm3C1sfFg/ub5RdNyHJzcVa
Eclt+kOGfV3bVy4p0Rbk
=SM/6
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.1.4.1'

2018-11-28 Thread Libreoffice Gerrit user

Tag 'libreoffice-6.1.4.1' created by Christian Lohmaier 
 at 2018-11-28 22:02 +

Tag libreoffice-6.1.4.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJb/xCEAAoJEPQ0oe+v7q6jItcP/2z6vYk3QyPcmXePcLuunP0f
ggv42NRNmNSNdf7rIkg9W3snwrT69LWoMv+T04Jnh9lHAqZ+rGHqwDJekfuAuCP1
9MItCK8QA6oYsfC2ji5nMFA/DEa8DhkTv7eVsnducjvfGQUB/+DH1y7w7Cr9ZL7R
k2Ts3CK5+fhIfFpgllIo5iHq5cWzAf2I4V09Xi+R9y0K/uEe/8M4wHee9pK2l+pO
NsP0KowxBVRzWkGVtE3jervCNajqQte6kXyW2xOqvBJmkZmAPAvXc/pqE5FPP7cS
DkZNNkVvvTOIZ9tjzhegfeBPE40MfUduPGdfkqKM8hK9Koo3WiLlbCiQkyEfeMY9
UYNK/EEaD/9qxEmOmX9b3jGBsaMiKSKphgQ8o79gcCNdU81v9ym+GnFYjWKn9DsQ
cQOJ5Jp9lJwoEEcCvtPiOjpx/Zud2dNUsVgdMFnMVfjMWIX0rtrUlK5IxECXSMaQ
bvINf8W5wJ6oqfNL+qJqIQRBSsJW89N2SVpFA38skcO1JO37R0k4nO9kJO0r5uCP
QFzn2O762rwOFHettYI71bhOTpGN8Dl+jgpjWJoJL+0AwSzLZxCbL6OaUM7/z3jB
5MYMKcHO5yQ1nMtjZhyDhBw9APdJrgRH42xvlHSwP7HlAUqttASvpthXR1XH9jd2
afeOEvz/oW6FV40+6nGH
=QXOM
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-4' - configure.ac

2018-11-28 Thread Libreoffice Gerrit user

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

New commits:
commit 0b8986992c7c092ec4f85d60c22db3603a474571
Author: Christian Lohmaier 
AuthorDate: Wed Nov 28 23:03:27 2018 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 28 23:03:27 2018 +0100

bump product version to 6.1.4.1.0+

Change-Id: I2057b37cd228d17fc336e3137f39c4cfa0595a0d

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.1.4.1'

2018-11-28 Thread Libreoffice Gerrit user

Tag 'libreoffice-6.1.4.1' created by Christian Lohmaier 
 at 2018-11-28 22:02 +

Tag libreoffice-6.1.4.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJb/xBxAAoJEPQ0oe+v7q6jZ9wQALzsHeBQ9LY0u6ERQS/FZGWj
qi2tlNM5kF6Cs1gRVEiPRdth4Xov9GJ9M9XVDZujjm/wjVAlSLjcBrq/KoV3ZGsi
yUN5Xz7/jSNmIll/L0vMePRP8LpJFQmIiZc5p4g5dI0USzaEZ/6bHxLPCeLNhkXx
XOVw6MmKPochk1VH3sfznR2UjnJfhjmbq0FUotskWiw2DAY9WLbwwrxgGD4iTwr9
xEKfk2DSxJuXK7vsBUzcTXSmRuzohWh7axOR4Q2JW03bTmI8axS39szYgklzVAp8
TYkHsoiJy5459TU+2zWsLK7cl4Pw5NHAOxuG9jS3lWWfyqFuzUvkWMRcsMLSW7Sy
HHEsgTz526mT82UfCjd2KJ2pGm0jfv0AWTrlMHD/sb1pn4rmImMpuQv4Rj7ao5RA
wN6g0hcj13x+xB4F8LKTr9yfIarstXogV9XKlGWNcwBeUZ6trn26wRrFTANBZO4n
vfVAIQmU3E0jI6wtC0RIc9AEuHW6WMtmJ4T7wEqVtq0ak39RUBOIUN7OPTwWcr9t
e6eczcBNqm0wkUZs7urXs26TAqFmKU/3OC8Lb0paGTBXKntaPCAOo4ohYk7sdMjR
IhsS5dPGQ6+rWKi9VsdBmztS216vG5c68saWuYt6c+d3qtwaY94m/PuGcqOOkLaL
hvBUg6D3+bxG7A3vw/Pt
=4QFg
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.1.4.1'

2018-11-28 Thread Libreoffice Gerrit user

Tag 'libreoffice-6.1.4.1' created by Christian Lohmaier 
 at 2018-11-28 22:02 +

Tag libreoffice-6.1.4.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJb/xCHAAoJEPQ0oe+v7q6jxrAP/3FFwnWHYP+BlWrDqUXKmCP9
r/sYPW5ST1M/wEAtpCiZRdr1dumfQcAharfklMw7c1J82e+5w2+5UBc4sB9LlQGS
hfeTbO0iSe9eXbSSkgmumaUqNtN6nH6A4FvUTEfQOgcEvo8uvuPZdxkgoKfDS5Tt
2/L7CslUViGfCVDhmIGZdHMuDFK2xTCXYrhRG3mJBWp05auM3XI/eR3+q+GP2OLC
fOp60g1ARQmMb8XtVvCq4+v4C+2xazlPfciskTSlWT7XMWspNqGo/XXlVA66r0Kg
4yGu1T+M0efX9fjZi5ZsJGAm4/WEph9kPy4teeLB5tyACDKkR7rN2WAwsncbwtGy
rpEEXR0HgvqwIRpJS5R5DrgkmFHdP+PTv8cTsABUIPM9x3/kwCKfimNSC/5sdT98
Z1lPtOpuDmUvW0bkGCFLvnalwxorfVQeUqfyVlCvrxvW+QigRhQhZJ8j/DyS9DvW
cOiRImJ0+fFRsMpMloSCG/Q7PBAq0gdwg9SEY9w9rUOxFagK/Odm8ZT38Tddvkug
vtqxb4DR9NGhacHmB7UTv0CfF3ZKB7LH/ALuUSy1zLxJERWxt7D9V+aebDEB/4d6
tqVIOmFrN9XNqs4iEwI1447UGPSpwtoVdABCMga/mXBaUncLrG5GsopUBQcZilwd
NUs2e2T68t0eGkpVmlLU
=uZG2
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-11-28 Thread Libreoffice Gerrit user

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

New commits:
commit b2a5d84d0e4ce1ce85459398a6eca63b49c93dd1
Author: Christian Lohmaier 
AuthorDate: Wed Nov 28 23:00:50 2018 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 28 23:00:50 2018 +0100

bump product version to 6.1.5.0.0+

Change-Id: Ic5e5b929c353a1a438268ba01b40b70fc85a9bd7

diff --git a/configure.ac b/configure.ac
index f1c76828a4df..4c213dc3fd47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.5.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-6-1-4'

2018-11-28 Thread Libreoffice Gerrit user

New branch 'libreoffice-6-1-4' available with the following commits:
commit f2e4d3902c187b8907f29f947d16a47bd4a5d0ff
Author: Christian Lohmaier 
Date:   Wed Nov 28 22:58:12 2018 +0100

Branch libreoffice-6-1-4

This is 'libreoffice-6-1-4' - the stable branch for the 6.1.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.1.x release,
please use the 'libreoffice-6-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic08d9aca1473a5abff4ce4833c5f755d43434b83

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-6-1-4'

2018-11-28 Thread Libreoffice Gerrit user

New branch 'libreoffice-6-1-4' available with the following commits:
commit 4027902fbe3cb82ed91554fca0ad9b19be9c2271
Author: Christian Lohmaier 
Date:   Wed Nov 28 22:56:48 2018 +0100

Branch libreoffice-6-1-4

This is 'libreoffice-6-1-4' - the stable branch for the 6.1.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.1.x release,
please use the 'libreoffice-6-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I008f93a76d17d073b98485b31fc6221db11700af

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-6-1-4'

2018-11-28 Thread Libreoffice Gerrit user

New branch 'libreoffice-6-1-4' available with the following commits:
commit caf4a58dfec875a1b161d810a61b91cdee0debd4
Author: Christian Lohmaier 
Date:   Wed Nov 28 22:56:47 2018 +0100

Branch libreoffice-6-1-4

This is 'libreoffice-6-1-4' - the stable branch for the 6.1.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.1.x release,
please use the 'libreoffice-6-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: If5bbce4f2e790a02277196606da38ff73e69795b

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-6-1-4'

2018-11-28 Thread Libreoffice Gerrit user

New branch 'libreoffice-6-1-4' available with the following commits:
commit 625c711472cce9e6df2288d431e68b04a9b337bc
Author: Christian Lohmaier 
Date:   Wed Nov 28 22:56:48 2018 +0100

Branch libreoffice-6-1-4

This is 'libreoffice-6-1-4' - the stable branch for the 6.1.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.1.x release,
please use the 'libreoffice-6-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I6858e5cc1462a4952624f8caec73319ea9f3a348

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

 editeng/source/editeng/impedit3.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a25245b37437e66f501338f17d6b54825a266d3
Author: AlicVB 
AuthorDate: Wed Oct 17 22:03:24 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Nov 28 22:47:59 2018 +0100

tdf#120525 fix linespacing <100% for impress

apply linespacing changes even for fonts with big descent values

Change-Id: If1763da1ea015822d90a5c7410ca90dcaa71d22f
Reviewed-on: https://gerrit.libreoffice.org/61894
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 87239dbf7d57d812cdecbf75f6e86afaa4864abb)
Reviewed-on: https://gerrit.libreoffice.org/64190
Reviewed-by: Christian Lohmaier 

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 7cc6dfddb695..fc383b9555ad 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1451,10 +1451,10 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, 
sal_uInt32 nStartPosY )
 sal_uInt16 nNewAscent = pLine->GetTxtHeight() * 
nPropLineSpace / 100 * 4 / 5; // 80%
 if ( !nAscent || nAscent > nNewAscent )
 {
-sal_uInt16 nHeight = pLine->GetHeight() * 
nPropLineSpace / 100;
-pLine->SetHeight( nHeight, pLine->GetTxtHeight() );
 pLine->SetMaxAscent( nNewAscent );
 }
+sal_uInt16 nHeight = pLine->GetHeight() * nPropLineSpace / 
100;
+pLine->SetHeight( nHeight, pLine->GetTxtHeight() );
 }
 else if ( rLSItem.GetPropLineSpace() && ( 
rLSItem.GetPropLineSpace() != 100 ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/print_revamp' - 1977 commits - accessibility/inc accessibility/Library_acc.mk accessibility/source android/source avmedia/inc avmedia/source basctl/inc

2018-11-28 Thread Libreoffice Gerrit user

Rebased ref, commits from common ancestor:
commit 9bb0ce088108e6326b5cd66ad4eae3191b6ba418
Author: Daniel 
AuthorDate: Tue Jul 31 09:49:07 2018 -0300
Commit: Daniel Silva 
CommitDate: Wed Nov 28 09:36:56 2018 -0200

Print dialog UI adjustments

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

diff --git a/sd/uiconfig/simpress/ui/impressprinteroptions.ui 
b/sd/uiconfig/simpress/ui/impressprinteroptions.ui
index 70e48f940aa8..c40508ae3b3f 100644
--- a/sd/uiconfig/simpress/ui/impressprinteroptions.ui
+++ b/sd/uiconfig/simpress/ui/impressprinteroptions.ui
@@ -21,115 +21,83 @@
 False
 6
 12
+7
 
-  
+  
 True
 False
-vertical
-3
+5
+6
 
-  
+  
 True
 False
-6
-
-  
-True
-False
-Type:
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-  
-  
-False
-True
-1
-  
-
+start
+Type:
+True
+impressdocument
   
   
-False
-True
-0
+0
+0
   
 
 
-  
+  
 True
 False
-6
-
-  
-True
-False
-Slides per page:
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-  
-  
-False
-True
-1
-  
-
+start
+Slides per page:
+True
+slidesperpage
   
   
-False
-True
-1
+0
+1
   
 
 
-  
+  
 True
 False
-6
-
-  
-True
-False
-Order:
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-  
-  
-False
-True
-1
-  
-
+start
+Order:
+True
+slidesperpageorder
   
   
-False
-True
-2
+0
+2
+  
+
+
+  
+True
+False
+  
+  
+1
+0
+  
+
+
+  
+True
+False
+  
+  
+1
+1
+  
+
+
+  
+True
+False
+  
+  
+1
+2
   
 
   
diff --git a/sw/uiconfig/swriter/ui/printeroptions.ui 
b/sw/uiconfig/swriter/ui/printeroptions.ui
index d3efd6be93f1..36f9d87bff2e 100644
--- a/sw/uiconfig/swriter/ui/printeropti

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

2018-11-28 Thread Libreoffice Gerrit user

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

New commits:
commit dd929d99dd86a0ed8587adc5b8b6bff5b4dafbf3
Author: Caolán McNamara 
AuthorDate: Wed Nov 28 17:44:14 2018 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 28 22:14:34 2018 +0100

drop WB_SIMPLEMODE for TreeView

multi selections are weird with this set

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index ce2204fee71b..44795670be9c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1904,7 +1904,7 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 //   everything over to SvHeaderTabListBox/SvTabListBox
 //c) remove the users of makeSvTabListBox and makeSvTreeListBox
 extractModel(id, rMap);
-WinBits nWinStyle = 
WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
 if (m_bLegacy)
 {
 OUString sBorder = BuilderUtils::extractCustomProperty(rMap);
@@ -1917,7 +1917,7 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 nWinStyle |= WB_BORDER;
 if (m_bLegacy)
 {
-xWindow = VclPtr::Create(pRealParent, nWinStyle);
+xWindow = VclPtr::Create(pRealParent, nWinStyle | 
WB_SIMPLEMODE);
 xWindowForPackingProps = xWindow;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

 loleaflet/src/layer/AnnotationManager.js |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 0998cabbe758a9b2a43d34e1c45a506080c12406
Author: Tor Lillqvist 
AuthorDate: Wed Nov 28 23:13:54 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Nov 28 23:13:54 2018 +0200

Fix mis-merge (?), remove duplicated function definition

Change-Id: I7652515241f156d1722d2f626ec627d166d7b4ca

diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index a410598de..206f7ae71 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -472,19 +472,6 @@ L.AnnotationManager = L.Class.extend({
 
},
 
-   layout: function (zoom) {
-   if (zoom)
-   this.doLayout(zoom);
-   else if (!this._layoutTimer) {
-   var me = this;
-   me._layoutTimer = setTimeout(function() {
-   delete me._layoutTimer;
-   me.doLayout(zoom);
-   }, 250 /* ms */);
-   } // else - avoid excessive re-layout
-
-   },
-
add: function (comment) {
var annotation = 
L.annotation(this._map._docLayer._twipsToLatLng(comment.anchorPos.getTopRight()),
 comment,
comment.id === 'new' ? {noMenu: true} : 
{}).addTo(this._map);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

 sw/source/core/frmedt/feshview.cxx |   17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 30a07561c19da050c7ca0a7a67868a6f6229a449
Author: Caolán McNamara 
AuthorDate: Wed Nov 28 15:47:12 2018 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 28 22:13:46 2018 +0100

Revert "Resolves: tdf#112696 survive missing SwDrawContact"

This reverts commit 2cb9c55e4da18fbfb2f578c46d094e6ca0d56fa1.

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

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 4abc8f16aea1..b05698242f55 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2241,11 +2241,6 @@ RndStdIds SwFEShell::GetAnchorId() const
 break;
 }
 SwDrawContact *pContact = 
static_cast(GetUserCall(pObj));
-if (!pContact)
-{
-nRet = RndStdIds::UNKNOWN;
-break;
-}
 RndStdIds nId = pContact->GetFormat()->GetAnchor().GetAnchorId();
 if ( nRet == RndStdIds(SHRT_MAX) )
 nRet = nId;
@@ -2350,13 +2345,11 @@ bool SwFEShell::IsGroupSelected()
 SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
 // consider 'virtual' drawing objects.
 // Thus, use corresponding method instead of checking type.
-if (!pObj->IsGroupObject())
-continue;
-// --> #i38505# No ungroup allowed for 3d objects
-if (pObj->Is3DObj())
-continue;
-SwDrawContact *pContact = 
static_cast(GetUserCall(pObj));
-if (!pContact || RndStdIds::FLY_AS_CHAR != 
pContact->GetFormat()->GetAnchor().GetAnchorId())
+if ( pObj->IsGroupObject() &&
+ // --> #i38505# No ungroup allowed for 3d objects
+ !pObj->Is3DObj() &&
+ RndStdIds::FLY_AS_CHAR != 
static_cast(GetUserCall(pObj))->
+  GetFormat()->GetAnchor().GetAnchorId() )
 {
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

 loleaflet/js/toolbar.js |   14 --
 1 file changed, 14 deletions(-)

New commits:
commit 5eaaeb5bb2654af99aeca15e3303aed9226cd91a
Author: Thorsten Behrens 
AuthorDate: Wed Nov 28 17:28:36 2018 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 28 21:20:33 2018 +0100

loleaflet: remove TextWrap menu from toolbar

Since it's available already from the context menu.

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

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 2fac097ff..eb4be1346 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -173,11 +173,6 @@ function onClick(e, id, item, subItem) {
else if (id === 'lastrecord') {

$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft()
 + 120);
}
-   else if (id.startsWith('menu-wrap:wrap-'))
-   {
-   var wrapType = id.substring('menu-wrap:wrap-'.length);
-   map.toggleCommandState(wrapType);
-   }
else if (id === 'insertgraphic' || item.id === 'localgraphic') {
L.DomUtil.get('insertgraphic').click();
}
@@ -622,15 +617,6 @@ var fontsizesSelectValue;
 
 function createToolbar() {
var toolItems = [
-   {type: 'menu', id: 'menu-wrap', caption: _('Textwrap'), mobile: 
false, items: [
-   { text: _('No wrap'), id: 'wrap-WrapOff' },
-   { text: _('Page wrap'), id: 'wrap-WrapOn' },
-   { text: _('Wrap anchor only'), id: 
'wrap-WrapAnchorOnly' },
-   { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
-   { text: _('Left wrap'), id: 'wrap-WrapLeft' },
-   { text: _('Right wrap'), id: 'wrap-WrapRight' },
-   { text: _('Wrap through'), id: 'wrap-WrapThrough' }
-   ]},
{type: 'button',  id: 'save', img: 'save', hint: 
_UNO('.uno:Save')},
{type: 'break', id: 'savebreak'},
{type: 'button',  id: 'undo',  img: 'undo', hint: 
_UNO('.uno:Undo'), uno: 'Undo', disabled: true, mobile: false},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - loleaflet/js

2018-11-28 Thread Libreoffice Gerrit user

 loleaflet/js/toolbar.js |   14 --
 1 file changed, 14 deletions(-)

New commits:
commit 5e5221bd92e2bb229d988be4a0ad86fa12b6
Author: Thorsten Behrens 
AuthorDate: Wed Nov 28 17:28:36 2018 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 28 21:20:45 2018 +0100

loleaflet: remove TextWrap menu from toolbar

Since it's available already from the context menu.

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

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 0b293580b..f4fc46c87 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -172,11 +172,6 @@ function onClick(e, id, item, subItem) {
else if (id === 'lastrecord') {

$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft()
 + 120);
}
-   else if (id.startsWith('menu-wrap:wrap-'))
-   {
-   var wrapType = id.substring('menu-wrap:wrap-'.length);
-   map.toggleCommandState(wrapType);
-   }
else if (id === 'insertgraphic' || item.id === 'localgraphic') {
L.DomUtil.get('insertgraphic').click();
}
@@ -618,15 +613,6 @@ var fontsizesSelectValue;
 
 function createToolbar() {
var toolItems = [
-   {type: 'menu', id: 'menu-wrap', caption: _('Textwrap'), mobile: 
false, items: [
-   { text: _('No wrap'), id: 'wrap-WrapOff' },
-   { text: _('Page wrap'), id: 'wrap-WrapOn' },
-   { text: _('Wrap anchor only'), id: 
'wrap-WrapAnchorOnly' },
-   { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
-   { text: _('Left wrap'), id: 'wrap-WrapLeft' },
-   { text: _('Right wrap'), id: 'wrap-WrapRight' },
-   { text: _('Wrap through'), id: 'wrap-WrapThrough' }
-   ]},
{type: 'button',  id: 'save', img: 'save', hint: 
_UNO('.uno:Save')},
{type: 'break', id: 'savebreak'},
{type: 'button',  id: 'undo',  img: 'undo', hint: 
_UNO('.uno:Undo'), uno: 'Undo', disabled: true, mobile: false},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-28 Thread Libreoffice Gerrit user

 sw/source/core/doc/docredln.cxx   |4 +-
 sw/source/uibase/uno/unotxdoc.cxx |   69 ++
 2 files changed, 44 insertions(+), 29 deletions(-)

New commits:
commit fc98dac9eeff15a0d04e643017cb1d49a69bca00
Author: Ashod Nakashian 
AuthorDate: Thu Nov 8 11:02:26 2018 -0500
Commit: Andras Timar 
CommitDate: Wed Nov 28 21:17:22 2018 +0100

LOK: don't emit redline comments

Change tracking can be quite numerous. Showing the
markers (and their comments" as comment-boxes is
sensible where there is limited change in a doc.

However with extensively modified doc, this becomes
overwhelming both in terms of browser load and
editing performance. As such, we disable them
as they don't add much value. The user can still
access them from the Track Changes > Manage menu.

Use a rather nasty env. var hack to propagate this
setting from WSD for now.

Change-Id: I3f964816b4a10f565012b273added8a8413cd309
Signed-off-by: Michael Meeks 
(cherry picked from commit d4f821b7a385953542e90b2749690b9f8f4cc782)
Reviewed-on: https://gerrit.libreoffice.org/64176
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 02774b88002e..c1873fbaad74 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -351,7 +351,9 @@ void lcl_LOKInvalidateStartEndFrames(SwShellCursor& rCursor)
 /// Emits LOK notification about one addition / removal of a redline item.
 void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, 
SwRangeRedline* pRedline)
 {
-if (!comphelper::LibreOfficeKit::isActive())
+// Disable since usability is very low beyond some small number of changes.
+static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+if (!comphelper::LibreOfficeKit::isActive() || bDisableRedlineComments)
 return;
 
 boost::property_tree::ptree aRedline;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index e7ae142d9bf1..b4ecdc0649f7 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3275,40 +3275,53 @@ Pointer SwXTextDocument::getPointer()
 
 OUString SwXTextDocument::getTrackedChanges()
 {
-const SwRedlineTable& rRedlineTable = 
pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
 boost::property_tree::ptree aTrackedChanges;
-for (SwRedlineTable::size_type i = 0; i < rRedlineTable.size(); ++i)
-{
-boost::property_tree::ptree aTrackedChange;
-aTrackedChange.put("index", rRedlineTable[i]->GetId());
-aTrackedChange.put("author", 
rRedlineTable[i]->GetAuthorString(1).toUtf8().getStr());
-aTrackedChange.put("type", 
nsRedlineType_t::SwRedlineTypeToOUString(rRedlineTable[i]->GetRedlineData().GetType()).toUtf8().getStr());
-aTrackedChange.put("comment", 
rRedlineTable[i]->GetRedlineData().GetComment().toUtf8().getStr());
-aTrackedChange.put("description", 
rRedlineTable[i]->GetDescr().toUtf8().getStr());
-OUString sDateTime = 
utl::toISO8601(rRedlineTable[i]->GetRedlineData().GetTimeStamp().GetUNODateTime());
-aTrackedChange.put("dateTime", sDateTime.toUtf8().getStr());
-
-SwContentNode* pContentNd = rRedlineTable[i]->GetContentNode();
-SwView* pView = dynamic_cast(SfxViewShell::Current());
-if (pView && pContentNd)
+
+// Disable since usability is very low beyond some small number of changes.
+static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+if (!bDisableRedlineComments)
+{
+const SwRedlineTable& rRedlineTable
+= 
pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+for (SwRedlineTable::size_type i = 0; i < rRedlineTable.size(); ++i)
 {
-SwShellCursor aCursor(pView->GetWrtShell(), 
*(rRedlineTable[i]->Start()));
-aCursor.SetMark();
-aCursor.GetMark()->nNode = *pContentNd;
-aCursor.GetMark()->nContent.Assign(pContentNd, 
rRedlineTable[i]->End()->nContent.GetIndex());
+boost::property_tree::ptree aTrackedChange;
+aTrackedChange.put("index", rRedlineTable[i]->GetId());
+aTrackedChange.put("author", 
rRedlineTable[i]->GetAuthorString(1).toUtf8().getStr());
+aTrackedChange.put("type", 
nsRedlineType_t::SwRedlineTypeToOUString(
+   
rRedlineTable[i]->GetRedlineData().GetType())
+   .toUtf8()
+   .getStr());
+aTrackedChange.put("comment",
+   
rRedlineTable[i]->GetRedlineData().GetComment().toUtf8().getStr());
+aTrackedChange.put("description", 
rRedlineTable[i]->GetDescr().toUtf8().getStr());
+OUString sDateTime = utl:

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/uiconfig sw/uiconfig

2018-11-28 Thread Libreoffice Gerrit user

 sc/uiconfig/scalc/ui/notebookbar_compact.ui   |   59 ++
 sw/uiconfig/swriter/ui/notebookbar_compact.ui |   47 
 2 files changed, 62 insertions(+), 44 deletions(-)

New commits:
commit 16c739eb500eec27c0e2d040a492456ee1c7cbbe
Author: andreas kainz 
AuthorDate: Wed Nov 28 13:22:18 2018 +0100
Commit: andreas_kainz 
CommitDate: Wed Nov 28 21:07:10 2018 +0100

NB tabbed compact: update toolbar

Change-Id: I5c2cd3339634cbb88f2c89226ff46d342eebc3a1
Reviewed-on: https://gerrit.libreoffice.org/64160
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 22f2d93f1626765b16e390a18a267f9c46dab59c)
Reviewed-on: https://gerrit.libreoffice.org/64173

diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 97ed18278bf8..e9eab32b947b 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -1150,6 +1150,13 @@
   
 
 
+  
+True
+False
+.uno:VerticalText
+  
+
+
   
 True
 False
@@ -2607,8 +2614,8 @@
 
   
 True
-True
-~File
+False
+File
 True
   
   
@@ -3843,8 +3850,8 @@
 
   
 True
-True
-~Home
+False
+Home
 True
 
   
@@ -4500,8 +4507,8 @@
 
   
   
@@ -5032,8 +5039,8 @@
 
   
   
@@ -5720,8 +5727,8 @@
 
   
   
@@ -6128,8 +6135,8 @@
 
   
   
@@ -6657,8 +6664,8 @@
 
   
   
@@ -7352,8 +7359,8 @@

1 2 >

1 - 100 of 111 matches

Mail list logo