[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/inc filter/source
filter/inc/filter/msfilter/dffpropset.hxx |1 +
filter/source/msfilter/dffpropset.cxx | 16 +---
2 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 59b105338323266f87e2bca4944ae59de00db0d3
Author: Don Lewis
AuthorDate: Fri Aug 17 22:24:27 2018 +
Commit: Don Lewis
CommitDate: Fri Aug 17 22:24:27 2018 +
When importing a Microsoft Office Drawing Binary File Format data stream,
ignore properties with the bComplex flag set indicating they have data
external to the property record if the indicated size of the data is
larger than will fit in the containing property table record.
DffPropSet::GetPropertyString() should return an empty string if
the bComplex flag is not set since there is no data to return.
Bail out of the loop that processes the array of properties early if
we hit the end of the property table record.
Limit the length of the property table record to the remaining size of
the stream.
diff --git a/filter/inc/filter/msfilter/dffpropset.hxx
b/filter/inc/filter/msfilter/dffpropset.hxx
index c1535a82da25..196946c4410a 100644
--- a/filter/inc/filter/msfilter/dffpropset.hxx
+++ b/filter/inc/filter/msfilter/dffpropset.hxx
@@ -61,6 +61,7 @@ class MSFILTER_DLLPUBLIC DffPropSet
~DffPropSet();
inline sal_Bool IsProperty( sal_uInt32 nRecType ) const { return (
mpPropSetEntries[ nRecType & 0x3ff ].aFlags.bSet ); };
+inline sal_Bool IsComplex( sal_uInt32 nRecType ) const { return (
mpPropSetEntries[ nRecType & 0x3ff ].aFlags.bComplex ); };
sal_BoolIsHardAttribute( sal_uInt32 nId ) const;
sal_uInt32 GetPropertyValue( sal_uInt32 nId, sal_uInt32 nDefault
= 0 ) const;
/** Returns a boolean property by its real identifier. */
diff --git a/filter/source/msfilter/dffpropset.cxx
b/filter/source/msfilter/dffpropset.cxx
index e6b786dd093f..1b29f2b21e1c 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -1099,7 +1099,11 @@ DffPropSet::~DffPropSet()
void DffPropSet::ReadPropSet( SvStream& rIn, bool bSetUninitializedOnly )
{
DffRecordHeader aHd;
+sal_Size nEndOfStream, nEndOfRecord;
rIn >> aHd;
+nEndOfStream = rIn.Seek(STREAM_SEEK_TO_END);
+aHd.SeekToContent( rIn );
+nEndOfRecord = Min(aHd.GetRecEndFilePos(), nEndOfStream);
if ( !bSetUninitializedOnly )
{
@@ -1116,6 +1120,8 @@ void DffPropSet::ReadPropSet( SvStream& rIn, bool
bSetUninitializedOnly )
{
sal_uInt16 nTmp;
sal_uInt32 nRecType, nContent;
+if (nEndOfRecord - rIn.Tell() < 6)
+break;
rIn >> nTmp
>> nContent;
@@ -1157,7 +1163,7 @@ void DffPropSet::ReadPropSet( SvStream& rIn, bool
bSetUninitializedOnly )
aPropFlag.bBlip = sal_True;
if ( nTmp & 0x8000 )
aPropFlag.bComplex = sal_True;
-if ( aPropFlag.bComplex && nContent && ( nComplexDataFilePos <
aHd.GetRecEndFilePos() ) )
+if ( aPropFlag.bComplex && nContent && ( nComplexDataFilePos <
nEndOfRecord ) )
{
// normally nContent is the complete size of the complex
property,
// but this is not always true for IMsoArrays ( what the hell
is a IMsoArray ? )
@@ -1190,12 +1196,16 @@ void DffPropSet::ReadPropSet( SvStream& rIn, bool
bSetUninitializedOnly )
nContent += 6;
// check if array fits into the PropertyContainer
-if ( ( nComplexDataFilePos + nContent ) >
aHd.GetRecEndFilePos() )
+if ( nContent > nEndOfRecord - nComplexDataFilePos)
nContent = 0;
}
else
nContent = 0;
rIn.Seek( nOldPos );
+} else {
+// check if complex property fits into the
PropertyContainer
+if ( nContent > nEndOfRecord - nComplexDataFilePos)
+nContent = 0;
}
if ( nContent )
{
@@ -1301,7 +1311,7 @@ bool DffPropSet::GetPropertyBool( sal_uInt32 nId, bool
bDefault ) const
sal_Size nOldPos = rStrm.Tell();
::rtl::OUStringBuffer aBuffer;
sal_uInt32 nBufferSize = GetPropertyValue( nId );
-if( (nBufferSize > 0) && SeekToContent( nId, rStrm ) )
+if( (nBufferSize > 0) && IsComplex( nId ) && SeekToContent( nId, rStrm ) )
{
sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufferSize / 2 );
aBuffer.ensureCapacity( nStrLen );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - python3/ExternalPackage_python3.mk
python3/ExternalPackage_python3.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 9aaadf9467bbcfac256b92ec71e7af703ec9116b Author: Thorsten Behrens AuthorDate: Sat Aug 18 01:18:38 2018 +0200 Commit: Thorsten Behrens CommitDate: Sat Aug 18 01:18:38 2018 +0200 python3: deliver versioned libpython3.3m.so.1.0 Change-Id: I41846893443e48f3859c78f09cdae4b5a6d0975a diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index 3cd212663347..3a36d4e33fde 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -46,8 +46,9 @@ else $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python.bin,python)) $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so)) $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so)) +# versioned lib/libpython3.3m.so.1.0 appears to be necessary? +$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so.1.0,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so.1.0)) $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so-gdb.py,Tools/gdb/libpython.py)) -# versioned lib/libpython3.3m.so.1.0 appears to be unnecessary? # Unfortunately the python build system does not allow to explicitly enable or # disable these, it just tries to build them and then prints which did not ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 12207ca8693c09fe13f75e75ff7624a2ab9cc88e
Author: Thorsten Behrens
AuthorDate: Sat Aug 18 00:56:13 2018 +0200
Commit: Thorsten Behrens
CommitDate: Sat Aug 18 00:56:13 2018 +0200
python3: fix micro version
Change-Id: I0615ade950233b88179fdc599cb12ae14be5a24a
diff --git a/configure.ac b/configure.ac
index fa97cbbf812f..9a00927f2774 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7610,7 +7610,7 @@ internal)
SYSTEM_PYTHON=NO
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
if test "$HOME" = ""; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/inc filter/source
filter/inc/filter/msfilter/msdffimp.hxx |2 +-
filter/source/msfilter/msdffimp.cxx | 23 +--
2 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit e76d30177a1ff5fd8b08b8f5bb21441004a21141
Author: Don Lewis
AuthorDate: Fri Aug 17 22:04:50 2018 +
Commit: Don Lewis
CommitDate: Fri Aug 17 22:04:50 2018 +
Ignore the SP_FGROUP flag on shape records. Instead assume that the
first shape in a shape group is the group shape. Add a new flag
parameter to SvxMSDffManager::ImportShape() to indicate the whether
or not this is a group shape based on the calling context. Call
SvxMSDffManager::ImportShape() directly from SvxMSDffManager::ImportGroup()
instead of indirectly via SvxMSDffManager::ImportObj() to facilitate
passing the context information.
Don't call SvxMSDffManager::ProcessObj() from SvxMSDffManager::ImportShape()
when processing a group shape. SvxMSDffManager::ImportObj() expects
SvxMSDffManager::ImportShape() to return a pointer to an SdrObjGroup
object in this case, and SvxMSDffManager::ProcessObj() may replace
the SdrObjGroup object with some other type of shape object.
Change some C-style SdrObjGroup* casts to dynamic_cast so that incorrect
casts will create a NULL pointer and fail quickly rather than executing
methods on an object of the wrong type and doing something possibly
undefined.
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx
b/filter/inc/filter/msfilter/msdffimp.hxx
index 02b58f0fdbf5..6ee04092c1a7 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -658,7 +658,7 @@ public:
Rectangle& rClientRect, const Rectangle& rGlobalChildRect, int
nCalledByGroup = 0, sal_Int32* pShapeId = NULL );
SdrObject* ImportShape( const DffRecordHeader& rHd, SvStream& rSt, void*
pData,
-Rectangle& rClientRect, const Rectangle& rGlobalChildRect, int
nCalledByGroup = 0, sal_Int32* pShapeId = NULL);
+Rectangle& rClientRect, const Rectangle& rGlobalChildRect, int
nCalledByGroup = 0, sal_Int32* pShapeId = NULL, sal_Bool bShapeGroup =
sal_False);
Rectangle GetGlobalChildAnchor( const DffRecordHeader& rHd, SvStream& rSt,
Rectangle& aClientRect );
void GetGroupAnchors( const DffRecordHeader& rHd, SvStream& rSt,
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 3377b645d7fc..1665df6192f1 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4174,7 +4174,7 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt,
void* pClientData,
}
else if ( aObjHd.nRecType == DFF_msofbtSpContainer )
{
-pRet = ImportShape( aObjHd, rSt, pClientData, rClientRect,
rGlobalChildRect, nCalledByGroup, pShapeId );
+pRet = ImportShape( aObjHd, rSt, pClientData, rClientRect,
rGlobalChildRect, nCalledByGroup, pShapeId, sal_False );
}
aObjHd.SeekToBegOfRecord( rSt );// FilePos restaurieren
return pRet;
@@ -4197,8 +4197,7 @@ SdrObject* SvxMSDffManager::ImportGroup( const
DffRecordHeader& rHd, SvStream& r
sal_Int32 nGroupRotateAngle = 0;
sal_Int32 nSpFlags = 0;
mnFix16Angle = 0;
-aRecHd.SeekToBegOfRecord( rSt );
-pRet = ImportObj( rSt, pClientData, rClientRect, rGlobalChildRect,
nCalledByGroup + 1, pShapeId );
+pRet = ImportShape( aRecHd, rSt, pClientData, rClientRect,
rGlobalChildRect, nCalledByGroup + 1, pShapeId, sal_True );
if ( pRet )
{
nSpFlags = nGroupShapeFlags;
@@ -4239,7 +4238,7 @@ SdrObject* SvxMSDffManager::ImportGroup( const
DffRecordHeader& rHd, SvStream& r
SdrObject* pTmp = ImportGroup( aRecHd2, rSt, pClientData,
aGroupClientAnchor, aGroupChildAnchor, nCalledByGroup + 1, &nShapeId );
if ( pTmp )
{
-((SdrObjGroup*)pRet)->GetSubList()->NbcInsertObject(
pTmp );
+
(dynamic_cast(pRet))->GetSubList()->NbcInsertObject( pTmp );
if( nShapeId )
insertShapeId( nShapeId, pTmp );
}
@@ -4248,10 +4247,10 @@ SdrObject* SvxMSDffManager::ImportGroup( const
DffRecordHeader& rHd, SvStream& r
{
aRecHd2.SeekToBegOfRecord( rSt );
sal_Int32 nShapeId;
-SdrObject* pTmp = ImportShape( aRecHd2, rSt, pClientData,
aClientRect, aGlobalChildRect, nCalledByGroup + 1, &nShapeId );
+SdrObject* pTmp = ImportShape( aRecHd2, rSt, pClientData,
aClientRect, aGlobalChildRect, nCalledByGroup + 1, &nShapeId, sal_False );
if ( pTmp )
{
-((SdrObjGroup*)pRet)->GetSubList()->NbcInsertObject(
pTmp );
+
(dynamic_cast(pRet))->GetSubList()->NbcIn
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - download.lst
download.lst |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 9df51aa875f96fc0b1653306f43f9dfd65253ad3 Author: Thorsten Behrens AuthorDate: Sat Aug 18 00:05:08 2018 +0200 Commit: Thorsten Behrens CommitDate: Sat Aug 18 00:05:08 2018 +0200 Go back to .bz2 - CentOS5 untar does not know .xz yet This affects zlib and Python backports Change-Id: I5d9c83f663b7d65bd045ac453e0571e53c482058 diff --git a/download.lst b/download.lst index 33f52b13134b..36546a51a1f6 100644 --- a/download.lst +++ b/download.lst @@ -12,12 +12,12 @@ VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40 export VISIO_TARBALL := libvisio-0.0.31.tar.bz2 NSS_MD5SUM := e55ee06b22687df68fafc6a30c0554b2 export NSS_TARBALL := nss-3.29.5-with-nspr-4.13.1.tar.gz -ZLIB_MD5SUM := 85adef240c5f370b308da8c938951a68 -export ZLIB_TARBALL := zlib-1.2.11.tar.xz +ZLIB_MD5SUM := f4669c4b1eb2007b208b70c96dcd4108 +export ZLIB_TARBALL := zlib-1.2.11.tar.bz2 OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114 export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz -PYTHON_MD5SUM := 84e2f12f044ca53b577f6224c53f82ac -export PYTHON_TARBALL := Python-3.3.7.tar.xz +PYTHON_MD5SUM := 6c5445faa455edc76d1c8616f54a4287 +export PYTHON_TARBALL := Python-3.3.7.tar.bz2 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Infra call on Tue, Aug 21 at 16:30 UTC
Hi there, The next infra call will take place at `date -d 'Tue Aug 21 16:30:00 UTC 2018'` (18:30:00 Berlin time). See https://pad.documentfoundation.org/p/infra for details; agenda TBA. 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] online.git: wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/SenderQueue.hpp
wsd/ClientSession.cpp |5 +
wsd/ClientSession.hpp |2 ++
wsd/DocumentBroker.cpp |1 +
wsd/SenderQueue.hpp|9 +
4 files changed, 17 insertions(+)
New commits:
commit f1a385be98aba7191de79606d1cfdfa6973dfc39
Author: Tamás Zolnai
AuthorDate: Fri Aug 17 23:36:47 2018 +0200
Commit: Tamás Zolnai
CommitDate: Fri Aug 17 23:47:10 2018 +0200
Get back "Cancel tiles also in wsd's senderqueue"
This reverts commit ec8b7bc012503559841c96c5a16c13798c103387.
Change-Id: I0a4f3f529c86522261085d4feec45e4b56a7e0e6
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 90e099d38..3f27a435c 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -1001,6 +1001,11 @@ bool ClientSession::handleKitToClientMessage(const char*
buffer, const int lengt
return forwardToClient(payload);
}
+void ClientSession::cancelTilesInQueue()
+{
+_senderQueue.cancelTiles();
+}
+
bool ClientSession::forwardToClient(const std::shared_ptr& payload)
{
if (isCloseFrame())
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 997058f68..4037d81a2 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -99,6 +99,8 @@ public:
}
}
+void cancelTilesInQueue();
+
/// Set the save-as socket which is used to send convert-to results.
void setSaveAsSocket(const std::shared_ptr& socket)
{
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index be5c3aae4..cf5c8eb84 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1448,6 +1448,7 @@ void DocumentBroker::cancelTileRequests(const
std::shared_ptr& se
// Clear tile requests
session->clearTilesOnFly();
session->getRequestedTiles() = boost::none;
+session->cancelTilesInQueue();
session->clearTileSubscription();
diff --git a/wsd/SenderQueue.hpp b/wsd/SenderQueue.hpp
index fc3464b3f..927e3e735 100644
--- a/wsd/SenderQueue.hpp
+++ b/wsd/SenderQueue.hpp
@@ -84,6 +84,15 @@ public:
}
}
+void cancelTiles()
+{
+std::remove_if(_queue.begin(), _queue.end(),
+[](const queue_item_t& cur)
+{
+return cur->firstToken() == "tile:";
+});
+}
+
private:
/// Deduplicate messages based on the new one.
/// Returns true if the new message should be
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sot/source
sot/source/sdstor/stgavl.cxx | 12 ++--
sot/source/sdstor/stgavl.hxx |4 ++--
sot/source/sdstor/stgdir.cxx |4 ++--
sot/source/sdstor/stgdir.hxx |2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 4cb69cf33b5bf17030bcd263fe31258177c76d5e
Author: Stephan Bergmann
AuthorDate: Fri Aug 17 20:09:19 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Aug 17 22:47:32 2018 +0200
Avoid further downstream overflow
...after 004304eb2fd1703d22dec0abf0170bb2ce493d0c "try to avoid overflows in
some compare functions" had changed the return type of just one function,
but
not its callers. Found with Clang's new -fsanitize=implicit-conversion
during
CppunitTest_sd_filters_test:
> Testing
file:///home/sbergman/lo/core/sd/qa/unit/data/ppt/pass/hang-17.ppt:
[...]
> sot/source/sdstor/stgdir.cxx:101:19: runtime error: implicit conversion
from type 'sal_Int32' (aka 'int') of value -57120 (32-bit, signed) to type
'short' changed the value to 8416 (16-bit, signed)
> #0 in StgDirEntry::Compare(StgAvlNode const*) const at
sot/source/sdstor/stgdir.cxx:101:19 (instdir/program/libsotlo.so +0x217699)
> #1 in StgAvlNode::Find(StgAvlNode const*) at
sot/source/sdstor/stgavl.cxx:43:29 (instdir/program/libsotlo.so +0x1db72b)
> #2 in StgDirStrm::Find(StgDirEntry&, rtl::OUString const&) at
sot/source/sdstor/stgdir.cxx:907:57 (instdir/program/libsotlo.so +0x22f2dc)
> #3 in Storage::IsStream(rtl::OUString const&) const at
sot/source/sdstor/stg.cxx:773:39 (instdir/program/libsotlo.so +0x1d2cdf)
> #4 in SotStorage::IsStream(rtl::OUString const&) const at
sot/source/sdstor/storage.cxx:654:27 (instdir/program/libsotlo.so +0x29ebdb)
> #5 in PropRead::PropRead(SotStorage&, rtl::OUString const&) at
sd/source/filter/ppt/propread.cxx:543:19 (instdir/program/libsdfiltlo.so
+0x6b72ee)
> #6 in ImplSdPPTImport::Import() at sd/source/filter/ppt/pptin.cxx:262:32
(instdir/program/libsdfiltlo.so +0x5d0dc4)
> #7 in SdPPTImport::Import() at sd/source/filter/ppt/pptin.cxx:167:21
(instdir/program/libsdfiltlo.so +0x5cf733)
> #8 in ImportPPT at sd/source/filter/ppt/pptin.cxx:2761:26
(instdir/program/libsdfiltlo.so +0x618f64)
> #9 in SdPPTFilter::Import() at sd/source/filter/sdpptwrp.cxx:106:32
(instdir/program/libsdlo.so +0x2877ed3)
> #10 in sd::DrawDocShell::ConvertFrom(SfxMedium&) at
sd/source/ui/docshell/docshel4.cxx:474:46 (instdir/program/libsdlo.so
+0x2e1607c)
> #11 in SfxObjectShell::DoLoad(SfxMedium*) at
sfx2/source/doc/objstor.cxx:786:23 (instdir/program/libsfxlo.so +0x2c8c762)
> #12 in SdFiltersTest::load(rtl::OUString const&, rtl::OUString const&,
rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) at
sd/qa/unit/filters-test.cxx:75:31
(workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19771)
> #13 in test::FiltersTest::recursiveScan(test::filterStatus,
rtl::OUString const&, rtl::OUString const&, rtl::OUString const&,
SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at
unotest/source/cpp/filters-test.cxx:130:20
(workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x5724c)
> #14 in test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString
const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned
int, bool) at unotest/source/cpp/filters-test.cxx:155:5
(workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x57ec9)
> #15 in SdFiltersTest::testCVEs() at sd/qa/unit/filters-test.cxx:83:5
(workdir/LinkTarget/CppunitTest/libtest_sd_filters_test.so +0x19d6d)
Change-Id: Iaffd35d33f0e1109195e3bd56538104d395af01b
Reviewed-on: https://gerrit.libreoffice.org/59274
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx
index d488eec69130..0c78054045f0 100644
--- a/sot/source/sdstor/stgavl.cxx
+++ b/sot/source/sdstor/stgavl.cxx
@@ -40,7 +40,7 @@ StgAvlNode* StgAvlNode::Find( StgAvlNode const * pFind )
StgAvlNode* p = this;
while( p )
{
-short nRes = p->Compare( pFind );
+sal_Int32 nRes = p->Compare( pFind );
if( !nRes )
return p;
else p = ( nRes < 0 ) ? p->m_pLeft : p->m_pRight;
@@ -52,11 +52,11 @@ StgAvlNode* StgAvlNode::Find( StgAvlNode const * pFind )
// find point to add node to AVL tree and returns
// +/0/- for >/=/< previous
-short StgAvlNode::Locate
+sal_Int32 StgAvlNode::Locate
( StgAvlNode const * pFind,
StgAvlNode** pPivot, StgAvlNode **pParent, StgAvlNode** pPrev )
{
-short nRes = 0;
+sal_Int32 nRes = 0;
StgAvlNode* pCur = this;
OSL_ENSURE( pPivot && pParent && pPrev, "The pointers may not be NULL!" );
@@ -98,7 +98,7 @@ short StgAvlNode::Adjust( StgAvlNode** pHeavy, StgAvlNode
const * pNew )
if( pCur == pNew || !pNew )
return m_nBalance;
-shor
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - external/curl
external/curl/ExternalPackage_curl.mk | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 254424feb753423b413afc71767c8464e9cd251f Author: Thorsten Behrens AuthorDate: Fri Aug 17 22:27:45 2018 +0200 Commit: Thorsten Behrens CommitDate: Fri Aug 17 22:27:45 2018 +0200 fixup curl: upgrade to release 7.56.1 and kill unused platforms Change-Id: If7522e80e651b4b7a1c2bf5f71e6296f577aa5fa diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index 33b87ecf3aaf..cc03f5311b6a 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -14,13 +14,11 @@ $(eval $(call gb_ExternalPackage_use_external_project,curl,curl)) ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc11-$(if $(filter X86_64,$(CPUNAME)),x64,x86)-$(if $(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/bin/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll)) -else ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib)) -else ifeq ($(OS),AIX) -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4)) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc11-$(if $(filter X86_64,$(CPUNAME)),x64,x86)-$(if $(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/bin/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll)) +$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/libcurl.dll)) else -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.5.0)) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.5.0)) +$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.5.0)) endif endif # $(DISABLE_DYNLOADING) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/PostItMgr.hxx |3 +--
sw/source/uibase/docvw/PostItMgr.cxx |6 ++
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit abb780094d9a6b6261c4a4018d24f3853d04876d
Author: Takeshi Abe
AuthorDate: Mon Aug 13 18:33:00 2018 +0900
Commit: Noel Grandin
CommitDate: Fri Aug 17 22:13:17 2018 +0200
sw: Replace std::list with std::vector for simplicity
Change-Id: I239df7b0009711eeaf025221bec9c95887681c8d
Reviewed-on: https://gerrit.libreoffice.org/58918
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index e3f881e59d39..9650996c50f3 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -24,7 +24,6 @@
#include "swdllapi.h"
#include
-#include
#include
#include
#include
@@ -155,7 +154,7 @@ class SwPostItMgr: public SfxListener
voidScroll(const long lScroll,const unsigned long aPage );
voidAutoScroll(const sw::annotation::SwAnnotationWin*
pPostIt,const unsigned long aPage );
boolScrollbarHit(const unsigned long aPage,const Point
&aPoint);
-boolLayoutByPage(
std::list &aVisiblePostItList,
+boolLayoutByPage(
std::vector &aVisiblePostItList,
const tools::Rectangle& rBorder,
long lNeededHeight);
voidCheckForRemovedPostIts();
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index 2365d8b026ea..0dcd8a9399ec 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -690,7 +690,7 @@ void SwPostItMgr::LayoutPostIts()
// only layout if there are notes on this page
if (pPage->mvSidebarItems.size()>0)
{
-std::list aVisiblePostItList;
+std::vector aVisiblePostItList;
unsigned long lNeededHeight = 0;
longmlPageBorder = 0;
longmlPageEnd = 0;
@@ -876,8 +876,6 @@ void SwPostItMgr::LayoutPostIts()
// Layout for this post it finished now
visiblePostIt->GetSidebarItem().bPendingLayout = false;
}
-
-aVisiblePostItList.clear();
}
else
{
@@ -1118,7 +1116,7 @@ Color SwPostItMgr::GetArrowColor(sal_uInt16
aDirection,unsigned long aPage) cons
}
}
-bool SwPostItMgr::LayoutByPage(std::list
&aVisiblePostItList, const tools::Rectangle& rBorder, long lNeededHeight)
+bool SwPostItMgr::LayoutByPage(std::vector
&aVisiblePostItList, const tools::Rectangle& rBorder, long lNeededHeight)
{
/*** General layout idea:***/
// - if we have space left, we always move the current one up,
___
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/document.cxx | 235 ---
1 file changed, 126 insertions(+), 109 deletions(-)
New commits:
commit 319b187e8b48d014fb79406466887a1143147f57
Author: Caolán McNamara
AuthorDate: Fri Aug 17 13:17:01 2018 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 17 22:05:04 2018 +0200
Use for-range loops
Change-Id: I7bf26258b8330a5f81657a3684c81ce429b37090
Reviewed-on: https://gerrit.libreoffice.org/59262
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 5df5d77c2365..e0ea4e04ed78 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -288,15 +288,14 @@ std::vector ScDocument::GetAllTableNames() const
{
std::vector aNames;
aNames.reserve(maTabs.size());
-TableContainer::const_iterator it = maTabs.begin(), itEnd = maTabs.end();
-for (; it != itEnd; ++it)
+for (const auto& a : maTabs)
{
// Positions need to be preserved for ScCompiler and address convention
// context, so still push an empty string for NULL tabs.
OUString aName;
-if (*it)
+if (a)
{
-const ScTable& rTab = **it;
+const ScTable& rTab = *a;
aName = rTab.GetName();
}
aNames.push_back(aName);
@@ -498,12 +497,10 @@ void ScDocument::SetTabNameOnLoad(SCTAB nTab, const
OUString& rName)
void ScDocument::InvalidateStreamOnSave()
{
-TableContainer::iterator it = maTabs.begin(), itEnd = maTabs.end();
-for (; it != itEnd; ++it)
+for (const auto& a : maTabs)
{
-ScTable* pTab = it->get();
-if (pTab)
-pTab->SetStreamValid(false);
+if (a)
+a->SetStreamValid(false);
}
}
@@ -545,20 +542,22 @@ bool ScDocument::InsertTab(
if ( pUnoBroadcaster )
pUnoBroadcaster->Broadcast( ScUpdateRefHint( URM_INSDEL,
aRange, 0,0,1 ) );
-TableContainer::iterator it = maTabs.begin();
-for (; it != maTabs.end(); ++it)
-if ( *it )
-(*it)->UpdateInsertTab(aCxt);
+for (const auto& a : maTabs)
+{
+if (a)
+a->UpdateInsertTab(aCxt);
+}
maTabs.emplace(maTabs.begin() + nPos, new ScTable(this, nPos,
rName));
// UpdateBroadcastAreas must be called between UpdateInsertTab,
// which ends listening, and StartAllListeners, to not modify
// areas that are to be inserted by starting listeners.
UpdateBroadcastAreas( URM_INSDEL, aRange, 0,0,1);
-it = maTabs.begin();
-for (; it != maTabs.end(); ++it)
-if ( *it )
-(*it)->UpdateCompile();
+for (const auto& a : maTabs)
+{
+if (a)
+a->UpdateCompile();
+}
StartAllListeners();
@@ -634,10 +633,11 @@ bool ScDocument::InsertTabs( SCTAB nPos, const
std::vector& rNames,
if ( pUnoBroadcaster )
pUnoBroadcaster->Broadcast( ScUpdateRefHint( URM_INSDEL,
aRange, 0,0,nNewSheets ) );
-TableContainer::iterator it = maTabs.begin();
-for (; it != maTabs.end(); ++it)
-if ( *it )
-(*it)->UpdateInsertTab(aCxt);
+for (const auto& a : maTabs)
+{
+if (a)
+a->UpdateInsertTab(aCxt);
+}
for (SCTAB i = 0; i < nNewSheets; ++i)
{
maTabs.emplace(maTabs.begin() + nPos + i, new
ScTable(this, nPos + i, rNames.at(i)) );
@@ -647,11 +647,10 @@ bool ScDocument::InsertTabs( SCTAB nPos, const
std::vector& rNames,
// which ends listening, and StartAllListeners, to not modify
// areas that are to be inserted by starting listeners.
UpdateBroadcastAreas( URM_INSDEL, aRange, 0,0,nNewSheets);
-it = maTabs.begin();
-for (; it != maTabs.end(); ++it)
+for (const auto& a : maTabs)
{
-if ( *it )
-(*it)->UpdateCompile();
+if (a)
+a->UpdateCompile();
}
StartAllListeners();
@@ -738,10 +737,11 @@ bool ScDocument::DeleteTab( SCTAB nTab )
// which ends listening, and StartAllListeners, to not modify
// areas that are to be inserted by starting listeners.
UpdateBroadcastAreas( URM_INSDEL, aRange, 0,0,-1);
-TableContainer::iterator it = m
[Libreoffice-commits] translations.git: Changes to 'distro/lhm/libreoffice-4-1-6+backports'
New branch 'distro/lhm/libreoffice-4-1-6+backports' available with the following commits: commit 8a22774116a3eca77d67259cfa923283c0ff5f4a Author: Juergen Funk Date: Wed Apr 20 12:15:16 2016 +0200 Set the new copyright 2016 Change-Id: Id4afb7e96959e087d37ce56e96dc306f9fd7b867 commit 4d294fea766704791eb95ba53f9b9cccaa164b73 Author: Juergen Funk Date: Mon Jun 1 15:52:55 2015 +0200 Set the new copyright 2015 Change-Id: I52f2baebe930ea7a064fbfcad8614f5774ab41f1 commit bbd97044882e723d07c20774c8d8773bb9ff2997 Author: Jan-Marek Glogowski Date: Tue Feb 17 10:33:14 2015 +0100 de: "Always apply manual breaks" Adds German translation. Change-Id: I8f999b6b378bb82470620024d529d6cde4369342 commit 677797237953d43de434457e7c5045a6b94281e4 Merge: 2284bc53cfc fe78c8f0298 Author: Jan-Marek Glogowski Date: Wed Aug 20 12:55:49 2014 +0200 Merge remote-tracking branch 'origin/libreoffice-4-1-6' into libreoffice-lhm-416 commit 2284bc53cfc9a5cc0f1704679c60737f433a2464 Author: Ulrich Kitzinger Date: Mon Dec 16 09:15:33 2013 +0100 added translation for Templates Change-Id: Ie4c1bebe667d4e34103bc5b9166b00d15502ddee ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a2adca5fa9090fd24641c3ea8e2bd0b6d8418f4b Author: Olivier Hallot AuthorDate: Fri Aug 17 16:13:48 2018 -0300 Commit: Gerrit Code Review CommitDate: Fri Aug 17 21:34:17 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Fix dup ID Change-Id: I4c21333e6738edc39153ed2f9b276f361190d396 Reviewed-on: https://gerrit.libreoffice.org/59276 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index adff949d4148..324cbbd8b4e6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit adff949d41483b1db4aec6eda371bd68e6f77dce +Subproject commit 324cbbd8b4e6769550d91f9cefc682f05b67e47f commit 387c70dcb77042f2b97e3e5b0fc475e6cd630026 Author: Olivier Hallot AuthorDate: Fri Aug 17 14:11:02 2018 -0300 Commit: Gerrit Code Review CommitDate: Fri Aug 17 21:34:02 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#115254 Some branch bookmarks are'nt working 16 Module svx Change-Id: I0ce6c3c004ee8ef68b7114692ffcc6f9e912ccf3 Reviewed-on: https://gerrit.libreoffice.org/59273 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index c75e2a8250b3..adff949d4148 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c75e2a8250b38a9bf2a4656a5f564965d4b5a7fe +Subproject commit adff949d41483b1db4aec6eda371bd68e6f77dce ___ 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/02230402.xhp |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) New commits: commit 324cbbd8b4e6769550d91f9cefc682f05b67e47f Author: Olivier Hallot AuthorDate: Fri Aug 17 16:13:48 2018 -0300 Commit: Olivier Hallot CommitDate: Fri Aug 17 21:34:17 2018 +0200 Fix dup ID Change-Id: I4c21333e6738edc39153ed2f9b276f361190d396 Reviewed-on: https://gerrit.libreoffice.org/59276 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/02230402.xhp b/source/text/shared/01/02230402.xhp index defc24175..a047e6a97 100644 --- a/source/text/shared/01/02230402.xhp +++ b/source/text/shared/01/02230402.xhp @@ -62,15 +62,12 @@ Author Filters the list of changes according to the name of the author that you select from the list. -Range - -Filters the list of changes according to the range of cells that you specify. To select a range of cells in your sheet, click the Set Reference button (...). - -Select the range of cells that you want to use as a filter. + +Range +Filters the list of changes according to the range of cells that you specify. To select a range of cells in your sheet, click the Set Reference button (...). Set Reference Select the range of cells that you want to use as a filter. -Set Reference ___ 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 |1 + source/text/shared/01/0222.xhp |1 + source/text/shared/01/02230401.xhp | 18 +++--- source/text/shared/01/02230402.xhp | 15 --- source/text/shared/01/0301.xhp |2 ++ source/text/shared/01/05040300.xhp | 15 --- source/text/shared/01/0506.xhp |4 +++- source/text/shared/01/0528.xhp |3 ++- source/text/shared/01/0535.xhp |3 ++- source/text/shared/01/06010600.xhp |1 + source/text/shared/01/06010601.xhp |3 ++- source/text/shared/01/0603.xhp |1 + source/text/shared/01/06130100.xhp |3 ++- source/text/shared/01/profile_safe_mode.xhp |3 ++- source/text/shared/01/xformsdata.xhp|9 ++--- source/text/shared/01/xformsdataadd.xhp |1 + source/text/shared/01/xformsdataaddcon.xhp | 11 ++- source/text/shared/01/xformsdataname.xhp| 14 +++--- source/text/shared/3dsettings_toolbar.xhp |5 +++-- source/text/shared/fontwork_toolbar.xhp |1 + source/text/shared/guide/fontwork.xhp |1 + source/text/shared/optionen/01050100.xhp|1 + source/text/swriter/01/05060201.xhp |1 + 23 files changed, 73 insertions(+), 44 deletions(-) New commits: commit adff949d41483b1db4aec6eda371bd68e6f77dce Author: Olivier Hallot AuthorDate: Fri Aug 17 14:11:02 2018 -0300 Commit: Olivier Hallot CommitDate: Fri Aug 17 21:34:02 2018 +0200 tdf#115254 Some branch bookmarks are'nt working 16 Module svx Change-Id: I0ce6c3c004ee8ef68b7114692ffcc6f9e912ccf3 Reviewed-on: https://gerrit.libreoffice.org/59273 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0210.xhp b/source/text/shared/01/0210.xhp index d15660c18..e5dd11822 100644 --- a/source/text/shared/01/0210.xhp +++ b/source/text/shared/01/0210.xhp @@ -31,6 +31,7 @@ + Find & Replace Finds or replaces text or formats in the current document. diff --git a/source/text/shared/01/0222.xhp b/source/text/shared/01/0222.xhp index 5ec11f96d..4888c434b 100644 --- a/source/text/shared/01/0222.xhp +++ b/source/text/shared/01/0222.xhp @@ -26,6 +26,7 @@ + ImageMap Editor Allows you to attach URLs to specific areas, called hotspots, on a graphic or a group of graphics. An image map is a group of one or more hotspots. diff --git a/source/text/shared/01/02230401.xhp b/source/text/shared/01/02230401.xhp index 68a967d21..7ad330cf5 100644 --- a/source/text/shared/01/02230401.xhp +++ b/source/text/shared/01/02230401.xhp @@ -17,7 +17,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - List @@ -27,15 +26,19 @@ + List Accept or reject individual changes. -The List tab displays all of the changes that were recorded in the current document. If you want to filter this list, click the Filter tab, and then select your filter criteria. If the list contains nested changes, the dependencies are shown regardless of the filter. -Nested changes occur where changes made by different authors overlap. -Click the plus sign beside an entry in the list to view all of the changes that were recorded for a cell. +The List tab displays all of the changes that were recorded in the current document. If you want to filter this list, click the Filter tab, and then select your filter criteria. If the list contains nested changes, the dependencies are shown regardless of the filter. + +Nested changes occur where changes made by different authors overlap. + +Click the plus sign beside an entry in the list to view all of the changes that were recorded for a cell. + If one of the nested changes for a cell matches a filter criterion, all of the changes for the cell are displayed. When you filter the change list, the entries in the list appear in different colors according to the following table: @@ -88,10 +91,11 @@ Lists the changes that were recorded in the document. When you select an entry in the list, the change is highlighted in the document. To sort the list, click a column heading. Hold down CommandCtrl while you click to select multiple entries in the list. To edit the comment for an entry in the list, right-click the entry, and then choose Edit - Comment. After you accept or reject a change, the entries of the list are re-ordered according to "Accepted" or "Rejected" status. + Action Lists the changes that were made in the document. -Position +Position. Lists the cells with contents that were changed. Author @@ -122,9 +126,9 @@ -Undo -If you made changes by choosing Tools - AutoCorrect - Apply and Edit Changes, the Undo button appears in the dialog. Reverse the last Acce
[Libreoffice-commits] core.git: drawinglayer/source svx/source
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 42 -
svx/source/unodraw/UnoGraphicExporter.cxx | 122 +++-
2 files changed, 59 insertions(+), 105 deletions(-)
New commits:
commit 046df0a876b3d948bb1e14443c00c180bc8cccaa
Author: Armin Le Grand
AuthorDate: Thu Aug 16 20:20:47 2018 +0200
Commit: Armin Le Grand
CommitDate: Fri Aug 17 21:27:40 2018 +0200
tdf#105998: Enhanced fix for MetafileToBitmap at better place
Change-Id: I220bdbe196a68ef2df25885dceee70e15b760410
Reviewed-on: https://gerrit.libreoffice.org/59220
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index b1c974de028c..0845c3316643 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -41,7 +41,6 @@
#include "helperwrongspellrenderer.hxx"
#include
#include
-#include
#include
#include
#include
@@ -136,27 +135,6 @@ namespace drawinglayer
return true;
}
-//Resolves: tdf#105998 if we are a hairline along the very
right/bottom edge
-//of the canvas then distort the polygon inwards one pixel
right/bottom so that
-//the hairline falls inside the paintable area and becomes visible
-Size aSize = mpOutputDevice->GetOutputSize();
-basegfx::B2DRange aRange = aLocalPolygon.getB2DRange();
-basegfx::B2DRange aOutputRange = aRange;
-aOutputRange.transform(maCurrentTransformation);
-if (std::round(aOutputRange.getMaxX()) == aSize.Width() ||
std::round(aOutputRange.getMaxY()) == aSize.Height())
-{
-basegfx::B2DRange aOnePixel(0, 0, 1, 1);
-aOnePixel.transform(maCurrentTransformation);
-double fXOnePixel = 1.0 / aOnePixel.getMaxX();
-double fYOnePixel = 1.0 / aOnePixel.getMaxY();
-
-basegfx::B2DPoint aTopLeft(aRange.getMinX(), aRange.getMinY());
-basegfx::B2DPoint aTopRight(aRange.getMaxX() - fXOnePixel,
aRange.getMinY());
-basegfx::B2DPoint aBottomLeft(aRange.getMinX(),
aRange.getMaxY() - fYOnePixel);
-basegfx::B2DPoint aBottomRight(aRange.getMaxX() - fXOnePixel,
aRange.getMaxY() - fYOnePixel);
-aLocalPolygon = basegfx::utils::distort(aLocalPolygon, aRange,
aTopLeft, aTopRight, aBottomLeft, aBottomRight);
-}
-
const basegfx::BColor
aLineColor(maBColorModifierStack.getModifiedColor(rSource.getBColor()));
mpOutputDevice->SetFillColor();
@@ -204,10 +182,6 @@ namespace drawinglayer
return true;
}
-const basegfx::BColor aLineColor(
-maBColorModifierStack.getModifiedColor(
-rSource.getLineAttribute().getColor()));
-
double fLineWidth(rSource.getLineAttribute().getWidth());
if(basegfx::fTools::more(fLineWidth, 0.0))
@@ -228,19 +202,9 @@ namespace drawinglayer
fLineWidth = 0.0;
}
-//Related: tdf#105998 cut and paste as bitmap of shape from draw to
-//writer. If we are a hairline along the very right/bottom edge of
-//the canvas then fallback to defaults which can distort the
-//hairline inside the paintable area
-if (fLineWidth == 0.0)
-{
-Size aSize = mpOutputDevice->GetOutputSize();
-basegfx::B2DRange aRange = aHairLinePolyPolygon.getB2DRange();
-basegfx::B2DRange aOutputRange = aRange;
-aOutputRange.transform(maCurrentTransformation);
-if (std::round(aOutputRange.getMaxX()) == aSize.Width() ||
std::round(aOutputRange.getMaxY()) == aSize.Height())
-return false;
-}
+const basegfx::BColor aLineColor(
+maBColorModifierStack.getModifiedColor(
+rSource.getLineAttribute().getColor()));
mpOutputDevice->SetFillColor();
mpOutputDevice->SetLineColor(Color(aLineColor));
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx
b/svx/source/unodraw/UnoGraphicExporter.cxx
index c929114e82cf..b9107915f4c6 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -178,83 +178,73 @@ namespace {
/** creates a bitmap that is optionally transparent from a metafile
*/
-BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, bool
bTransparent, const Size* pSize )
+BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, const Size* pSize
)
{
-BitmapEx aBmpEx;
+// use new primitive conversion tooling
+basegfx::B2DRange aRange(basegfx::B2DPoint(0.0, 0.0));
+sal_uInt32 nMa
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cfcf27ff1e9d871b1ab0a7f67d5c96529c53ba37
Author: Henry Castro
AuthorDate: Thu Aug 16 16:17:37 2018 -0400
Commit: Henry Castro
CommitDate: Fri Aug 17 14:36:52 2018 -0400
loleaflet: auto fit width limit 100%
Change-Id: I6dfa345e9faa85a794d2a7f276f134f57511fe63
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 15292feda..de1269e54 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2153,7 +2153,7 @@ L.TileLayer = L.GridLayer.extend({
var widthTwips = newSize.x * this._map.options.tileWidthTwips /
this._tileSize;
var ratio = widthTwips / this._docWidthTwips;
- maxZoom = maxZoom ? maxZoom : this.options.maxZoom;
+ maxZoom = maxZoom ? maxZoom : this._map.options.zoom;
// 'fit width zoom' has no use in spreadsheets, ignore it there
if (this._docType !== 'spreadsheet') {
var crsScale = this._map.options.crs.scale(1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/data/fods/SlowValidNewTabName1.fods | 408 + sc/source/core/data/document.cxx | 19 - 2 files changed, 420 insertions(+), 7 deletions(-) New commits: commit bc28d51cb88c796da241d1ab914bbe6bb174cc49 Author: Caolán McNamara AuthorDate: Fri Aug 17 10:50:34 2018 +0100 Commit: Eike Rathke CommitDate: Fri Aug 17 20:23:08 2018 +0200 ofz: make ValidNewTabName faster wrt collisions Change-Id: Id2058719c3bc822518faa922a6cd0409b4088ac7 Reviewed-on: https://gerrit.libreoffice.org/59253 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/qa/unit/data/fods/SlowValidNewTabName1.fods b/sc/qa/unit/data/fods/SlowValidNewTabName1.fods new file mode 100644 index ..3f5dd3fc4115 --- /dev/null +++ b/sc/qa/unit/data/fods/SlowValidNewTabName1.fods @@ -0,0 +1,408 @@ + +http://purl.org/dc/elements/1.1/"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:mimetype="application/vnd.oasis.opendocument.presentation" office:version="1.0"> + + + 0 + 27093 + + + + + + + + + + + + 9style:table-column-properties style:column-width="3.8194in"/> + ties draw:fill="none" draw:textarea-horizontal-align="center" fo:padding="0.0382in"/> + + + + + + + + + + + + + NMTOKENSe:presentation> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[Libreoffice-commits] core.git: include/oox
include/oox/core/binarycodec.hxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 2291c110738266abb42cb592df04c1220ddc4998
Author: Stephan Bergmann
AuthorDate: Fri Aug 17 17:39:42 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Aug 17 20:13:34 2018 +0200
Remove unused includes
Change-Id: If51bdcb4bd426ddbd563861a0cf3eeb5f2756b06
Reviewed-on: https://gerrit.libreoffice.org/59268
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 0d3a253ad9bf..00375842e1ad 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -20,10 +20,9 @@
#ifndef INCLUDED_OOX_CORE_BINARYCODEC_HXX
#define INCLUDED_OOX_CORE_BINARYCODEC_HXX
-#include
+#include
+
#include
-#include
-#include
#include
namespace com { namespace sun { namespace star {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source cui/source drawinglayer/source filter/source include/basegfx sd/source slideshow/source svgio/source svx/source
basegfx/source/color/bcolormodifier.cxx | 18 -
basegfx/source/polygon/b2dpolypolygontools.cxx |3 +
basegfx/source/tools/keystoplerp.cxx |3 +
cui/source/tabpages/transfrm.cxx | 11 +++--
drawinglayer/source/attribute/fillgraphicattribute.cxx |5 +-
drawinglayer/source/attribute/sdrfillgraphicattribute.cxx|5 +-
drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 15 ---
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |5 +-
drawinglayer/source/texture/texture.cxx |5 +-
drawinglayer/source/texture/texture3d.cxx|5 +-
filter/source/msfilter/svdfppt.cxx | 11 +++--
include/basegfx/color/bcolor.hxx |7 ++-
include/basegfx/numeric/ftools.hxx | 18 -
sd/source/ui/slideshow/slideshowimpl.cxx |3 +
slideshow/source/engine/activities/activitybase.cxx |4 +-
slideshow/source/engine/animationnodes/animationbasenode.cxx |3 +
slideshow/source/engine/shapes/viewshape.cxx |4 +-
svgio/source/svgreader/svgstyleattributes.cxx| 17 +---
svx/source/customshapes/EnhancedCustomShape2d.cxx| 21 ++-
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 11 +++--
svx/source/unodraw/unobrushitemhelper.cxx|5 ++
21 files changed, 97 insertions(+), 82 deletions(-)
New commits:
commit f4351535f3bf10b94721ab395e2c7f5010a4
Author: Stephan Bergmann
AuthorDate: Fri Aug 17 16:32:17 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Aug 17 20:13:21 2018 +0200
Consolidate: basegfx::clamp -> o3tl::clamp
Change-Id: Iffd8b0a19d4479b6c70dc834c6f64499e87e01b1
Reviewed-on: https://gerrit.libreoffice.org/59265
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/basegfx/source/color/bcolormodifier.cxx
b/basegfx/source/color/bcolormodifier.cxx
index 6704f7ea489b..f656552f69b2 100644
--- a/basegfx/source/color/bcolormodifier.cxx
+++ b/basegfx/source/color/bcolormodifier.cxx
@@ -18,7 +18,7 @@
*/
#include
-
+#include
namespace basegfx
{
@@ -217,11 +217,11 @@ namespace basegfx
{
BColorModifier_RGBLuminanceContrast::BColorModifier_RGBLuminanceContrast(double
fRed, double fGreen, double fBlue, double fLuminance, double fContrast)
: BColorModifier(),
-mfRed(basegfx::clamp(fRed, -1.0, 1.0)),
-mfGreen(basegfx::clamp(fGreen, -1.0, 1.0)),
-mfBlue(basegfx::clamp(fBlue, -1.0, 1.0)),
-mfLuminance(basegfx::clamp(fLuminance, -1.0, 1.0)),
-mfContrast(basegfx::clamp(fContrast, -1.0, 1.0)),
+mfRed(o3tl::clamp(fRed, -1.0, 1.0)),
+mfGreen(o3tl::clamp(fGreen, -1.0, 1.0)),
+mfBlue(o3tl::clamp(fBlue, -1.0, 1.0)),
+mfLuminance(o3tl::clamp(fLuminance, -1.0, 1.0)),
+mfContrast(o3tl::clamp(fContrast, -1.0, 1.0)),
mfContrastOff(1.0),
mfRedOff(0.0),
mfGreenOff(0.0),
@@ -283,9 +283,9 @@ namespace basegfx
if(mbUseIt)
{
return basegfx::BColor(
-basegfx::clamp(aSourceColor.getRed() * mfContrastOff +
mfRedOff, 0.0, 1.0),
-basegfx::clamp(aSourceColor.getGreen() * mfContrastOff +
mfGreenOff, 0.0, 1.0),
-basegfx::clamp(aSourceColor.getBlue() * mfContrastOff +
mfBlueOff, 0.0, 1.0));
+o3tl::clamp(aSourceColor.getRed() * mfContrastOff + mfRedOff,
0.0, 1.0),
+o3tl::clamp(aSourceColor.getGreen() * mfContrastOff +
mfGreenOff, 0.0, 1.0),
+o3tl::clamp(aSourceColor.getBlue() * mfContrastOff +
mfBlueOff, 0.0, 1.0));
}
else
{
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx
b/basegfx/source/polygon/b2dpolypolygontools.cxx
index a02373616a50..856a7bc4deb0 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include
@@ -551,7 +552,7 @@ namespace basegfx
}
else
{
-nNumber=clamp(nNumber,'0','9') - '0';
+nNumber=o3tl::clamp(nNumber,'0','9') - '0';
}
B2DPolygon aCurrSegment;
diff --git a/basegfx/source/tools/keystoplerp.cxx
b/basegfx/source/tools/keystoplerp.cxx
index 0b0f230253f1..8e9941519e44 100644
--- a/basegfx/source/tools/keystoplerp.cxx
+++ b/basegfx/source/tools/keystoplerp.cxx
@@ -19,6 +19,7 @@
#include
#include
+#include
#include
#include
@@ -86,7 +87,7 @@ namespace basegfx
// everything)
return ResultType(
mnLastIndex,
-clamp(fRawLerp,0.0,1.0));
+o3tl::clamp(fRawLerp,0.0,1.0));
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - postprocess/prj ridljar/java smoketestdoc/com smoketestdoc/data smoketestdoc/prj smoketestoo_native/makefile.mk smoketestoo_native/prj smoketestoo_
postprocess/prj/build.lst |2 ridljar/java/ridl/build.xml |4 smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF|2 smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl | 36 smoketestdoc/com/sun/star/comp/smoketest/TestExtension.java | 162 -- smoketestdoc/com/sun/star/comp/smoketest/delzip |1 smoketestdoc/com/sun/star/comp/smoketest/makefile.mk| 85 - smoketestdoc/com/sun/star/comp/smoketest/manifest.xml | 25 smoketestdoc/data/Events.xml| 62 smoketestdoc/data/Global.xml| 817 smoketestdoc/data/OptionsDlg.xml| 60 smoketestdoc/data/Test_10er.xml | 677 - smoketestdoc/data/Test_DB.xml | 143 -- smoketestdoc/data/Test_Ext.xml | 112 - smoketestdoc/data/content.xml | 109 - smoketestdoc/data/dialog-lb.xml | 27 smoketestdoc/data/dialog-lc.xml | 27 smoketestdoc/data/makefile.mk | 66 smoketestdoc/data/manifest.xml | 45 smoketestdoc/data/meta.xml | 24 smoketestdoc/data/script-lb.xml | 31 smoketestdoc/data/script-lc.xml | 27 smoketestdoc/data/settings.xml | 24 smoketestdoc/data/styles.xml| 24 smoketestdoc/prj/build.lst |4 smoketestdoc/prj/d.lst |4 smoketestoo_native/makefile.mk | 73 - smoketestoo_native/prj/build.lst|3 smoketestoo_native/smoketest.cxx| 205 --- smoketestoo_native/version.map | 28 solenv/ant/aoo-ant.xml | 49 solenv/ant/idl.xml | 131 + 32 files changed, 100 insertions(+), 2989 deletions(-) New commits: commit 37428128bdbe3a3f65d5a6a79f061040aa2228c5 Author: Damjan Jovanovic AuthorDate: Fri Aug 17 16:28:12 2018 + Commit: Damjan Jovanovic CommitDate: Fri Aug 17 16:28:12 2018 + Move smoketestdoc to the top-level test directory. This is where all integration tests are meant to be; a binary copy of the smoketest was there already. Delete the smoketestoo_native module whose only purpose was to run the smoketest, something that is done in the Java bvt test now. Delete the old smoketest binary copy in test/ and use this one built from source. Build an .odt file for the smoketest instead of the legacy .sxw. Note that we now require main/ built to build test/, as the Ant build files required to build smoketest's Java component are in main/. Patch by: me diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 9993021af6a5..54b7a88e8dbd 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui test testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL +po postprocess :: svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui test testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL po postprocess usr1- all po_mkout NULL po pos
[Libreoffice-commits] core.git: i18nlangtag/source i18npool/source include/i18nlangtag
i18nlangtag/source/languagetag/languagetagicu.cxx |6 --
i18npool/source/collator/collator_unicode.cxx | 12 ++--
include/i18nlangtag/languagetagicu.hxx|7 +++
3 files changed, 17 insertions(+), 8 deletions(-)
New commits:
commit 13db6e8671c36e1a028d6a8ad63f518e60f84870
Author: Julien Nabet
AuthorDate: Sat Aug 11 00:23:25 2018 +0200
Commit: Eike Rathke
CommitDate: Fri Aug 17 20:01:10 2018 +0200
tdf#119117: get phonebook sort work by tweaking ICU call mechanism
Using "phonebook" as variant does't work with de_DE
since it gives de_DE_PHONEBOOK whereas icu expects de__PHONEBOOK
See http://userguide.icu-project.org/locale#TOC-Variant-code,
Level 2 canonicalization, 8.
So let variant empty and use the fourth arg of icuLocale "keywords"
See constructors in
http://icu-project.org/apiref/icu4c/classicu_1_1Locale.html
Change-Id: I6c216c86cdd32abfa477c14a80d1b8794b536900
Reviewed-on: https://gerrit.libreoffice.org/58870
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/i18nlangtag/source/languagetag/languagetagicu.cxx
b/i18nlangtag/source/languagetag/languagetagicu.cxx
index 33a98844043f..18d37f704773 100644
--- a/i18nlangtag/source/languagetag/languagetagicu.cxx
+++ b/i18nlangtag/source/languagetag/languagetagicu.cxx
@@ -35,13 +35,15 @@ icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag
& rLanguageTag )
// static
-icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag & rLanguageTag,
const OUString & rVariant )
+icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag & rLanguageTag,
const OUString & rVariant, const OUString & rKeywords )
{
/* FIXME: how should this work with any BCP47? */
return icu::Locale(
OUStringToOString( rLanguageTag.getLanguage(),
RTL_TEXTENCODING_ASCII_US).getStr(),
OUStringToOString( rLanguageTag.getCountry(),
RTL_TEXTENCODING_ASCII_US).getStr(),
-OUStringToOString( rVariant, RTL_TEXTENCODING_ASCII_US).getStr());
+OUStringToOString( rVariant, RTL_TEXTENCODING_ASCII_US).getStr(),
+OUStringToOString( rKeywords, RTL_TEXTENCODING_ASCII_US).getStr()
+ );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index 5bbe015e4d5e..d3e189a5ff1d 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -367,10 +367,18 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString&
rAlgorithm, const lang::
/** ICU collators are loaded using a locale only.
ICU uses Variant as collation algorithm name (like
de__PHONEBOOK
locale), note the empty territory (Country) designator in this
special
-case here. The icu::Locale constructor changes the algorithm
name to
+case here.
+But sometimes the mapping fails, eg for German (from Germany)
phonebook, we'll have "de_DE_PHONEBOOK"
+this one won't be remapping to collation keyword specifiers
"de@collation=phonebook"
+See http://userguide.icu-project.org/locale#TOC-Variant-code,
Level 2 canonicalization, 8.
+So let variant empty and use the fourth arg of icuLocale
"keywords"
+See LanguageTagIcu::getIcuLocale from
i18nlangtag/source/languagetag/languagetagicu.cxx
+The icu::Locale constructor changes the algorithm name to
uppercase itself, so we don't have to bother with that.
*/
-icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag(
rLocale), rAlgorithm));
+icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag(
rLocale),
+"", rAlgorithm.isEmpty() ? OUString("") : "collation="
+ rAlgorithm));
+
// load ICU collator
collator.reset( static_cast(
icu::Collator::createInstance(icuLocale, status) ) );
if (! U_SUCCESS(status)) throw RuntimeException();
diff --git a/include/i18nlangtag/languagetagicu.hxx
b/include/i18nlangtag/languagetagicu.hxx
index 2d0aabdd34ea..e2c9f7ce2b0e 100644
--- a/include/i18nlangtag/languagetagicu.hxx
+++ b/include/i18nlangtag/languagetagicu.hxx
@@ -41,13 +41,12 @@ public:
/** Obtain language tag as ICU icu::Locale, adding variant data.
From the LanguageTag only language and country are used to construct
-the icu:Locale, the variant field is copied from rVariant. For example
-needed to create an icu::Collator instance where the variant field
-denotes the algorithm to be used.
+the icu:Locale, the variant field is copied from rVariant.
+The 4th arg of icu::Locale "keywords" (eg: for collation)
Always resolves an empty tag to the system locale.
*/
-
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/ui/app/inputhdl.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 319db92f96c9b886cecee97136175e12e94da547
Author: Maxim Monastirsky
AuthorDate: Mon Aug 6 23:50:21 2018 +0300
Commit: Eike Rathke
CommitDate: Fri Aug 17 19:41:10 2018 +0200
tdf#119128 toggle INSERT/OVERWRITE is broken
Regression of 632bc11ce8fab1c4046ab24810b90a7ce9ac5914
("tdf#117017 Pasting into the formula bar shouldn't
retain formatting"). Toggling the overwrite mode sets
the EVControlBits::OVERWRITE bit from inside the editeng
keyboard handler, so make sure to not override it.
Change-Id: I2b5e3fe9cb885ed20e7528fdfe2fd59f5ef05f42
Reviewed-on: https://gerrit.libreoffice.org/58658
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
(cherry picked from commit 92a4e4eac7520541a433e40836cafa4e29edf47f)
Reviewed-on: https://gerrit.libreoffice.org/58718
Reviewed-by: Eike Rathke
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 90c1fbc59437..f7bfb702896b 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3397,15 +3397,14 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt,
bool bStartEdit /* = false
{
if (pTableView)
{
-EVControlBits nControl = pTableView->GetControlWord();
if (pTopView)
-pTableView->SetControlWord(nControl |
EVControlBits::SINGLELINEPASTE);
+
pTableView->SetControlWord(pTableView->GetControlWord() |
EVControlBits::SINGLELINEPASTE);
vcl::Window* pFrameWin = pActiveViewSh ?
pActiveViewSh->GetFrameWin() : nullptr;
if ( pTableView->PostKeyEvent( rKEvt, pFrameWin ) )
bUsed = true;
-pTableView->SetControlWord(nControl);
+
pTableView->SetControlWord(pTableView->GetControlWord() &
~EVControlBits::SINGLELINEPASTE);
}
if (pTopView)
if ( pTopView->PostKeyEvent( rKEvt ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - source/text
source/text/scalc/01/04060104.xhp | 90 +++--- 1 file changed, 45 insertions(+), 45 deletions(-) New commits: commit db02e964d0629efff266638283b00cacd21f06eb Author: Olivier Hallot AuthorDate: Fri Aug 17 10:02:43 2018 -0300 Commit: Eike Rathke CommitDate: Fri Aug 17 19:30:04 2018 +0200 Mute l10n in numeric table and InfoType strings Numeric cell are not to be translated InfoType either. Change-Id: I320b78c2c84212ece5c080e47c78cef2550ae066 Reviewed-on: https://gerrit.libreoffice.org/59263 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 489fd5f5a291966f3417321930c8723df67e96e0) Reviewed-on: https://gerrit.libreoffice.org/59264 Reviewed-by: Eike Rathke diff --git a/source/text/scalc/01/04060104.xhp b/source/text/scalc/01/04060104.xhp index 66d373db9..e117557a8 100644 --- a/source/text/scalc/01/04060104.xhp +++ b/source/text/scalc/01/04060104.xhp @@ -47,98 +47,98 @@ - C + C - D +D - 2 +2 - x value +x value - y value +y value - 3 +3 - -5 +-5 - -3 +-3 - 4 +4 - -2 +-2 - 0 +0 - 5 +5 - -1 +-1 - 1 +1 - 6 +6 - 0 +0 - 3 +3 - 7 +7 - 2 +2 - 4 +4 - 8 +8 - 4 +4 - 6 +6 - 9 +9 - 6 +6 - 8 +8 @@ -170,7 +170,7 @@ - "osversion" +"osversion" Always "Windows (32-bit) NT 5.01", for compatibility reasons @@ -178,7 +178,7 @@ - "system" +"system" The type of the operating system. "WNT" for Microsoft Windows "LINUX" for Linux "SOLARIS" for Solaris @@ -186,7 +186,7 @@ - "release" +"release" The product release identifier, for example "300m25(Build:9876)" @@ -194,7 +194,7 @@ - "numfile" +"numfile" Always 1, for compatibility reasons @@ -202,7 +202,7 @@ - "recalc" +"recalc" Current formula recalculation mode, either "Automatic" or "Manual" (localized into %PRODUCTNAME language) @@ -690,7 +690,7 @@ - COL +COL Returns the number of the referenced column. @@ -699,7 +699,7 @@ - ROW +ROW Returns the number of the referenced row. @@ -708,7 +708,7 @@ - SHEET +SHEET Returns the number of the referenced sheet. @@ -717,7 +717,7 @@ - ADDRESS +ADDRESS Returns the absolute address of the referenced cell. @@ -728,7 +728,7 @@ - FILENAME +FILENAME Returns the file name and the sheet number of the referenced cell. @@ -738,7 +738,7 @@ - COORD +COORD Returns the complete cell address in Lotus™ notation. @@ -748,7 +748,7 @@ - CONTENTS +CONTENTS Returns the contents of the referenced cell, without any formatting. @@ -756,7 +756,7 @@ - TYPE +TYPE Returns the type of cell contents. @@ -767,7 +767,7 @@ - WIDTH +WIDTH Returns the width of the referenced column. The unit is the number of zeros (0) that fit into the column in the default text and the default size. @@ -775,7 +775,7 @@ - PREFIX +PREFIX Returns the alignment of the referenced cell. @@ -787,7 +787,7 @@ - PROTECT +PROTECT Returns the status of the cell protection for the cell. @@ -797,7 +797,7 @@ - FORMAT +FORMAT Returns a character string that indicates the number format. @@ -823,7 +823,7 @@ - COLOR +COLOR Returns 1, if negative values have been formatted in color, otherwise 0. @@ -831,7 +831,7 @@ - PARENTHESES +PARENTHESES Returns 1 if the format code contains an opening bracket (, otherwise 0. ___ 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' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 72fece73fbda7dc9fa34c4189cd9dfa10c9f2c51 Author: Olivier Hallot AuthorDate: Fri Aug 17 10:02:43 2018 -0300 Commit: Gerrit Code Review CommitDate: Fri Aug 17 19:30:04 2018 +0200 Update git submodules * Update helpcontent2 from branch 'libreoffice-6-1' - Mute l10n in numeric table and InfoType strings Numeric cell are not to be translated InfoType either. Change-Id: I320b78c2c84212ece5c080e47c78cef2550ae066 Reviewed-on: https://gerrit.libreoffice.org/59263 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 489fd5f5a291966f3417321930c8723df67e96e0) Reviewed-on: https://gerrit.libreoffice.org/59264 Reviewed-by: Eike Rathke diff --git a/helpcontent2 b/helpcontent2 index 9979cc60ca9b..db02e964d062 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9979cc60ca9b38dff35bcc1bd8a2bf5dd4a2c121 +Subproject commit db02e964d0629efff266638283b00cacd21f06eb ___ 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/tool/token.cxx | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
New commits:
commit da0dc858fc05e7f1d6a60ca61f722044e688d4f8
Author: Eike Rathke
AuthorDate: Fri Aug 17 12:22:09 2018 +0200
Commit: Eike Rathke
CommitDate: Fri Aug 17 19:24:26 2018 +0200
Resolves: tdf#118983 do not expand range if sheet references not affected
Change-Id: Ib207d3723ce1d370a953e652957aaed399affc9c
Reviewed-on: https://gerrit.libreoffice.org/59255
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1e41800cb5d7..51a63f548afe 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3840,6 +3840,11 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
{
ScComplexRefData& rRef = *p->GetDoubleRef();
ScRange aAbs = rRef.toAbs(rPos);
+
+if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
+// Sheet references not affected.
+break;
+
if (rCxt.maRange.In(aAbs))
{
// This range is entirely within the shifted
region.
@@ -3862,10 +3867,6 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
// column range of the reference is not
entirely in the deleted column range.
break;
-if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
-// wrong tables
-break;
-
ScRange aDeleted = rCxt.maRange;
aDeleted.aStart.IncRow(rCxt.mnRowDelta);
aDeleted.aEnd.SetRow(aDeleted.aStart.Row()-rCxt.mnRowDelta-1);
@@ -3922,10 +3923,6 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
// row range of the reference is not entirely
in the deleted row range.
break;
-if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
-// wrong tables
-break;
-
ScRange aDeleted = rCxt.maRange;
aDeleted.aStart.IncCol(rCxt.mnColDelta);
aDeleted.aEnd.SetCol(aDeleted.aStart.Col()-rCxt.mnColDelta-1);
___
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/scalc/01/04060104.xhp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c75e2a8250b38a9bf2a4656a5f564965d4b5a7fe
Author: Olivier Hallot
AuthorDate: Fri Aug 17 11:33:44 2018 -0300
Commit: Olivier Hallot
CommitDate: Fri Aug 17 19:20:33 2018 +0200
Add MACOSX for =INFO("system")
Change-Id: I23bd4706bf7f0eba4334e15c21e750b2f2cf2883
Reviewed-on: https://gerrit.libreoffice.org/59266
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/scalc/01/04060104.xhp
b/source/text/scalc/01/04060104.xhp
index e117557a8..38c38016e 100644
--- a/source/text/scalc/01/04060104.xhp
+++ b/source/text/scalc/01/04060104.xhp
@@ -181,7 +181,7 @@
"system"
- The
type of the operating system. "WNT" for Microsoft Windows "LINUX" for
Linux "SOLARIS" for Solaris
+The
type of the operating system. "WNT" for Microsoft Windows "LINUX" for
Linux "MACOSX" for macOS"SOLARIS" for Solaris
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a0d9200fbdcf0d7c0c0155389d2954f4fa9dac32
Author: Olivier Hallot
AuthorDate: Fri Aug 17 11:33:44 2018 -0300
Commit: Gerrit Code Review
CommitDate: Fri Aug 17 19:20:33 2018 +0200
Update git submodules
* Update helpcontent2 from branch 'master'
- Add MACOSX for =INFO("system")
Change-Id: I23bd4706bf7f0eba4334e15c21e750b2f2cf2883
Reviewed-on: https://gerrit.libreoffice.org/59266
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/helpcontent2 b/helpcontent2
index 489fd5f5a291..c75e2a8250b3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 489fd5f5a291966f3417321930c8723df67e96e0
+Subproject commit c75e2a8250b38a9bf2a4656a5f564965d4b5a7fe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 4 commits - sw/inc sw/source
sw/inc/hints.hxx | 11 ++
sw/inc/redline.hxx|3
sw/source/core/attr/hints.cxx |5 +
sw/source/core/doc/DocumentRedlineManager.cxx | 23 +++-
sw/source/core/doc/docredln.cxx | 27 +++--
sw/source/core/layout/ftnfrm.cxx |2
sw/source/core/layout/wsfrm.cxx |2
sw/source/core/text/txtfrm.cxx| 120 ++
sw/source/core/undo/unredln.cxx |4
9 files changed, 161 insertions(+), 36 deletions(-)
New commits:
commit 0fabb1a41cbb100b6cae52f64bef8a8458aa4c97
Author: Michael Stahl
AuthorDate: Fri Aug 17 18:57:37 2018 +0200
Commit: Michael Stahl
CommitDate: Fri Aug 17 18:58:25 2018 +0200
sw_redlinehide_2: quite the nuisance when it happens, better assert
Change-Id: I5cef7c2cea41a5b246268a541afd47945603ffed
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index b82f23e56198..3c475defe980 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2821,6 +2821,8 @@ SwContentFrame* SwFootnoteFrame::GetRef()
SAL_WARN_IF( mpReference != pRefAttr && !mpReference->IsAnFollow( pRefAttr
)
&& !pRefAttr->IsAnFollow( mpReference ),
"sw.core", "access to deleted Frame? pRef != pAttr->GetRef()" );
+assert(mpReference == pRefAttr || mpReference->IsAnFollow(pRefAttr)
+|| pRefAttr->IsAnFollow(mpReference));
return mpReference;
}
#endif
commit 58a6ab7c120169937780d54cf03dd019f54106e3
Author: Michael Stahl
AuthorDate: Fri Aug 17 18:56:30 2018 +0200
Commit: Michael Stahl
CommitDate: Fri Aug 17 18:56:30 2018 +0200
sw_redlinehide_2: fix wrong assertion
Change-Id: I8b00f406ae52c3280f9ec07c845ef7aa6e41617f
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index f52f336ad376..79b5081812f4 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -935,7 +935,7 @@ TextFrameIndex UpdateMergedParaForDelete(MergedPara &
rMerged,
}
}
//assert(nFoundNode != 0 && "text node not found - why is it sending hints
to us");
-assert(nIndex - nDeleted <= rNode.Len());
+assert(nIndex <= rNode.Len() + nLen);
// if there's a remaining deletion, it must be in gap at the end of the
node
// can't do: might be last one in node was erased assert(nLen == 0 ||
rMerged.empty() || (it-1)->nEnd <= nIndex);
// note: if first node gets deleted then that must call DelFrames as
commit a26bfddf9859813da36ebc21b6d5bd987db61738
Author: Michael Stahl
AuthorDate: Fri Aug 17 18:54:39 2018 +0200
Commit: Michael Stahl
CommitDate: Fri Aug 17 18:54:39 2018 +0200
sw_redlinehide_2: invalidate more in DocumentRedlineManager::DeleteRedline
To get the extents right, first invalidate old range with Remove,
then new range with Add.
Change-Id: If46954b9bb86680ae689de742ec878e0287f58d9
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 81b858cf5ee9..ad9c292810a1 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1968,6 +1968,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM&
rRange, bool bSaveInUnd
case SwComparePosition::OverlapBefore:
pRedl->InvalidateRange(SwRangeRedline::Invalidation::Remove);
pRedl->SetStart( *pEnd, pRStt );
+pRedl->InvalidateRange(SwRangeRedline::Invalidation::Add);
// re-insert
mpRedlineTable->Remove( n );
mpRedlineTable->Insert( pRedl );
@@ -1977,6 +1978,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM&
rRange, bool bSaveInUnd
case SwComparePosition::OverlapBehind:
pRedl->InvalidateRange(SwRangeRedline::Invalidation::Remove);
pRedl->SetEnd( *pStt, pREnd );
+pRedl->InvalidateRange(SwRangeRedline::Invalidation::Add);
if( !pRedl->HasValidRange() )
{
// re-insert
@@ -1993,6 +1995,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM&
rRange, bool bSaveInUnd
if( *pRStt == *pStt )
{
pRedl->SetStart( *pEnd, pRStt );
+pRedl->InvalidateRange(SwRangeRedline::Invalidation::Add);
// re-insert
mpRedlineTable->Remove( n );
mpRedlineTable->Insert( pRedl );
@@ -2005,10 +2008,12 @@ bool DocumentRedlineManager::DeleteRedline( const
SwPaM& rRange, bool bSaveInUnd
{
pCpy = new SwRangeRedline( *pRedl );
pCpy->SetStart( *pEnd );
+
pCpy->InvalidateRange(SwRangeRedline::Invalidation::Add);
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - Makefile.am
Makefile.am |1 + 1 file changed, 1 insertion(+) New commits: commit 96a8fe97dd5e9c1cb3d38455acf673b06cd691fb Author: Jan Holesovsky AuthorDate: Fri Aug 17 18:54:27 2018 +0200 Commit: Jan Holesovsky CommitDate: Fri Aug 17 18:54:27 2018 +0200 Add header for packaging. Change-Id: I8f69931c1b9d470d1aa4be1829663b6da6880415 diff --git a/Makefile.am b/Makefile.am index ab5bd12aa..42e3839cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -165,6 +165,7 @@ wsd_headers = wsd/Admin.hpp \ shared_headers = common/Common.hpp \ common/Crypto.hpp \ common/IoUtil.hpp \ + common/JsonUtil.hpp \ common/FileUtil.hpp \ common/Log.hpp \ common/LOOLWebSocket.hpp \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'refs/tags/3.4-rc1' - Makefile.am
Rebased ref, commits from common ancestor: commit 96a8fe97dd5e9c1cb3d38455acf673b06cd691fb Author: Jan Holesovsky AuthorDate: Fri Aug 17 18:54:27 2018 +0200 Commit: Jan Holesovsky CommitDate: Fri Aug 17 18:54:27 2018 +0200 Add header for packaging. Change-Id: I8f69931c1b9d470d1aa4be1829663b6da6880415 diff --git a/Makefile.am b/Makefile.am index ab5bd12aa..42e3839cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -165,6 +165,7 @@ wsd_headers = wsd/Admin.hpp \ shared_headers = common/Common.hpp \ common/Crypto.hpp \ common/IoUtil.hpp \ + common/JsonUtil.hpp \ common/FileUtil.hpp \ common/Log.hpp \ common/LOOLWebSocket.hpp \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - 5 commits - embeddedobj/source filter/source include/filter include/svx sc/source sd/source svx/source sw/inc sw/sourc
Rebased ref, commits from common ancestor:
commit f89c0499c8ad6a18e06cd34fac4175c4837b657d
Author: Caolán McNamara
AuthorDate: Tue May 1 12:57:02 2018 +0100
Commit: Thorsten Behrens
CommitDate: Fri Aug 17 18:25:38 2018 +0200
set Referer on link mediadescriptor
to allow determining if the source document is from a trusted/untrusted
location
Reviewed-on: https://gerrit.libreoffice.org/53693
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926)
Reviewed-on: https://gerrit.libreoffice.org/53803
Reviewed-by: Miklos Vajna
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
(cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04)
Conflicts:
sw/source/filter/xml/xmltexti.cxx
(cherry picked from commit d7b0063c32502f01fcec72492d131760f4fda990)
Conflicts:
sw/source/filter/xml/xmltexti.cxx
Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
diff --git a/sw/source/filter/xml/xmltexti.cxx
b/sw/source/filter/xml/xmltexti.cxx
index a84f99c57a77..509acc65807c 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -572,16 +572,21 @@ uno::Reference< XPropertySet >
SwXMLTextImportHelper::createAndInsertOOoLink(
uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
aMediaDescriptor[0].Name = OUString("URL");
aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL(
INetURLObject::NO_DECODE ) );
-if ( pDoc && pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
+
+if (SfxMedium* pMedium = pDoc && pDoc->GetDocShell() ?
pDoc->GetDocShell()->GetMedium() : nullptr)
{
-uno::Reference< task::XInteractionHandler > xInteraction =
-
pDoc->GetDocShell()->GetMedium()->GetInteractionHandler();
+uno::Reference< task::XInteractionHandler > xInteraction =
pMedium->GetInteractionHandler();
if ( xInteraction.is() )
{
aMediaDescriptor.realloc( 2 );
aMediaDescriptor[1].Name = OUString( "InteractionHandler" );
aMediaDescriptor[1].Value <<= xInteraction;
}
+
+const sal_Int32 nLen = aMediaDescriptor.getLength() + 1;
+aMediaDescriptor.realloc(nLen);
+aMediaDescriptor[nLen - 1].Name = "Referer";
+aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName();
}
uno::Reference < embed::XEmbeddedObject > xObj(
commit 8f15c7ea741b63ae56cf1fa5a9ae76b52d746bfe
Author: Caolán McNamara
AuthorDate: Sun May 27 23:52:15 2018 +0200
Commit: Thorsten Behrens
CommitDate: Fri Aug 17 18:25:38 2018 +0200
add ww6 test dir and fix a crash
Change-Id: Id08176640672095c03e0b124cd65a9dce26ac2db
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 01baf330889e..94635d8c8e90 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4281,6 +4281,14 @@ void WW8RStyle::ImportOldFormatStyles()
std::vector< std::vector > aConvertedChpx;
while (nByteCount < cbChpx)
{
+if (stcp == aCHPXOffsets.size())
+{
+//more data than style slots, skip remainder
+rSt.SeekRel(cbChpx-nByteCount);
+nByteCount += cbChpx-nByteCount;
+break;
+}
+
sal_uInt8 cb;
rSt >> cb;
nByteCount++;
@@ -4303,12 +4311,7 @@ void WW8RStyle::ImportOldFormatStyles()
else
aConvertedChpx.push_back( std::vector() );
-stcp++;
-if (stcp == nStyles)
-{
-rSt.SeekRel(cbChpx-nByteCount);
-nByteCount += cbChpx-nByteCount;
-}
+++stcp;
}
std::vector aPAPXOffsets(stcp);
@@ -4318,6 +4321,12 @@ void WW8RStyle::ImportOldFormatStyles()
stcp=0;
while (nByteCount < cbPapx)
{
+if (stcp == aPAPXOffsets.size())
+{
+rSt.SeekRel(cbPapx-nByteCount);
+nByteCount += cbPapx-nByteCount;
+}
+
sal_uInt8 cb;
rSt >> cb;
nByteCount++;
@@ -4339,13 +4348,7 @@ void WW8RStyle::ImportOldFormatStyles()
nByteCount += nRemainder;
}
-stcp++;
-
-if (stcp == nStyles)
-{
-rSt.SeekRel(cbPapx-nByteCount);
-nByteCount += cbPapx-nByteCount;
-}
+++stcp;
}
sal_uInt16 iMac;
commit ab1eeab502f9b4188432d6774c49de83ef722da9
Author: Caolán McNamara
AuthorDate: Sun May 27 23:51:33 2018 +0200
Commit: Thorsten Behrens
CommitDate: Fri Aug 17 18:25:37 2018 +0200
fix crash on loading certain ppts
Change-Id: I544a67e3706c7d12414cc075118ef2f0f5ddd0f6
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 5c638b860fe7..e812c6d3
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - basic/source editeng/source include/svl sc/source sfx2/source svl/qa svl/source svtools/source sw/source xmloff/source
basic/source/runtime/runtime.cxx|4 ++--
basic/source/sbx/sbxdate.cxx|4 ++--
basic/source/sbx/sbxscan.cxx|8
editeng/source/items/flditem.cxx|2 +-
include/svl/zforlist.hxx|2 +-
sc/source/filter/excel/xistyle.cxx |2 +-
sc/source/ui/docshell/impex.cxx |2 +-
sfx2/source/bastyp/sfxhtml.cxx |2 +-
svl/qa/unit/svl.cxx |2 +-
svl/source/numbers/numfmuno.cxx |4 +++-
svl/source/numbers/zforlist.cxx | 12 ++--
svl/source/numbers/zformat.cxx |2 +-
svl/source/numbers/zforscan.cxx |4 ++--
svl/source/numbers/zforscan.hxx |6 +++---
svtools/source/control/fmtfield.cxx |2 +-
sw/source/core/fields/fldbas.cxx|6 +++---
sw/source/filter/ww8/ww8par5.cxx|2 +-
xmloff/source/style/xmlnumfe.cxx|2 +-
18 files changed, 35 insertions(+), 33 deletions(-)
New commits:
commit 04e12e17cd7a9b7e740299560e8e3e0ba2822ca3
Author: Eike Rathke
AuthorDate: Thu Aug 16 15:50:02 2018 +0200
Commit: Caolán McNamara
CommitDate: Fri Aug 17 17:17:52 2018 +0200
Resolves: tdf#119013 do not over-aggressively reorder date particles
In particular not when reading documents as we don't know what the
original (default/system) locale was when the date format was
created and stored and whether the format's date order actually
matched the locale's ordering.
Regression from
commit 51478cefaa4e265b42e3f67eda0a64767ff3efba
CommitDate: Tue Apr 18 17:01:27 2017 +0200
Resolves: tdf#107012 follow date order of the target locale
Change-Id: I9d3bdbd512d95ed81ff6459e368a2d7497ec8a2d
Reviewed-on: https://gerrit.libreoffice.org/59182
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 5b8007afdb97d416ee7c22bf9226e927d61e9bd3)
Reviewed-on: https://gerrit.libreoffice.org/59215
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 9f242dab4ba8..42e97c704a26 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -438,12 +438,12 @@ std::shared_ptr
SbiInstance::PrepareNumberFormatter( sal_uInt
}
OUString aStr( aDateStr ); // PutandConvertEntry() modifies string!
pNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
-rnStdDateIdx, LANGUAGE_ENGLISH_US, eLangType );
+rnStdDateIdx, LANGUAGE_ENGLISH_US, eLangType, true);
nCheckPos = 0;
aDateStr += " HH:MM:SS";
aStr = aDateStr;
pNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
-rnStdDateTimeIdx, LANGUAGE_ENGLISH_US, eLangType );
+rnStdDateTimeIdx, LANGUAGE_ENGLISH_US, eLangType, true);
return pNumberFormatter;
}
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index abf30c202e7d..1880ba40df78 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -142,7 +142,7 @@ double ImpGetDate( const SbxValues* p )
OUString aStr = aDateStr + " HH:MM:SS";
pFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
-nIndex, LANGUAGE_ENGLISH_US,
eLangType );
+nIndex, LANGUAGE_ENGLISH_US,
eLangType, true);
bool bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex,
nRes );
if ( bSuccess )
{
@@ -337,7 +337,7 @@ start:
nType,
nIndex,
LANGUAGE_ENGLISH_US,
-eLangType );
+eLangType, true);
pFormatter->GetOutputString( n, nIndex, *p->pOUString, &pColor );
#endif
break;
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 7f9b4931ea48..49f632ff1a57 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -719,7 +719,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt
) const
else
{
aFmtStr = OUString::createFromAscii(pInfo->mpOOoFormat);
-pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType,
nIndex, LANGUAGE_ENGLISH, eLangType );
+pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType,
nIndex, LANGUAGE_ENGLISH, eLangType, true);
}
pFormatter->GetOutputString( nNumber, nIndex, rRes, &pCol );
}
@@ -736,7 +736,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt
) const
if( floor( nNumber ) != nNumber )
{
aFmtStr = "H:MM:SS AM/PM";
-pFormatter->Put
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - 7 commits - embeddedobj/source filter/source include/filter include/svx libmwaw/0001-ofz-1037-resize-vector-correctly.
embeddedobj/source/commonembedding/visobj.cxx |6 -
filter/source/msfilter/svdfppt.cxx|4
include/filter/msfilter/svdfppt.hxx | 12 +-
include/svx/svdoole2.hxx | 21 +++
libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 | 25
libmwaw/UnpackedTarball_libmwaw.mk|4
lotuswordpro/source/filter/lwpidxmgr.cxx |7 -
lotuswordpro/source/filter/lwpobjstrm.cxx |2
lotuswordpro/source/filter/lwpsilverbullet.cxx|5
lotuswordpro/source/filter/lwptabrack.cxx |5
lotuswordpro/source/filter/lwptoc.cxx | 13 +-
sc/source/ui/docshell/docsh.cxx |3
sc/source/ui/docshell/docsh4.cxx |7 +
sd/source/core/drawdoc.cxx|6 +
sd/source/ui/docshell/docshel4.cxx|5
svx/source/svdraw/svdoole2.cxx| 20 ---
svx/source/unodraw/unoshap4.cxx |4
sw/inc/IDocumentLinksAdministration.hxx |2
sw/inc/doc.hxx|6 -
sw/source/core/doc/docnew.cxx | 101 +-
sw/source/filter/basflt/shellio.cxx |3
sw/source/filter/ww8/ww8par2.cxx | 29 ++---
sw/source/filter/xml/xmltexti.cxx | 11 +
sw/source/ui/app/docsh.cxx|2
tools/inc/poly.h |2
tools/source/generic/poly.cxx | 13 +-
26 files changed, 199 insertions(+), 119 deletions(-)
New commits:
commit 84cfb927c236a45d7fc40fbadf0654dee8a81108
Author: Caolán McNamara
AuthorDate: Tue May 1 12:57:02 2018 +0100
Commit: Thorsten Behrens
CommitDate: Fri Aug 17 17:08:35 2018 +0200
set Referer on link mediadescriptor
to allow determining if the source document is from a trusted/untrusted
location
Reviewed-on: https://gerrit.libreoffice.org/53693
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926)
Reviewed-on: https://gerrit.libreoffice.org/53803
Reviewed-by: Miklos Vajna
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
(cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04)
Conflicts:
sw/source/filter/xml/xmltexti.cxx
(cherry picked from commit d7b0063c32502f01fcec72492d131760f4fda990)
Conflicts:
sw/source/filter/xml/xmltexti.cxx
Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
diff --git a/sw/source/filter/xml/xmltexti.cxx
b/sw/source/filter/xml/xmltexti.cxx
index a84f99c57a77..509acc65807c 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -572,16 +572,21 @@ uno::Reference< XPropertySet >
SwXMLTextImportHelper::createAndInsertOOoLink(
uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
aMediaDescriptor[0].Name = OUString("URL");
aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL(
INetURLObject::NO_DECODE ) );
-if ( pDoc && pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
+
+if (SfxMedium* pMedium = pDoc && pDoc->GetDocShell() ?
pDoc->GetDocShell()->GetMedium() : nullptr)
{
-uno::Reference< task::XInteractionHandler > xInteraction =
-
pDoc->GetDocShell()->GetMedium()->GetInteractionHandler();
+uno::Reference< task::XInteractionHandler > xInteraction =
pMedium->GetInteractionHandler();
if ( xInteraction.is() )
{
aMediaDescriptor.realloc( 2 );
aMediaDescriptor[1].Name = OUString( "InteractionHandler" );
aMediaDescriptor[1].Value <<= xInteraction;
}
+
+const sal_Int32 nLen = aMediaDescriptor.getLength() + 1;
+aMediaDescriptor.realloc(nLen);
+aMediaDescriptor[nLen - 1].Name = "Referer";
+aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName();
}
uno::Reference < embed::XEmbeddedObject > xObj(
commit 525c62496ab7f2e5ef9c83c371f17b6ff8044328
Author: Caolán McNamara
AuthorDate: Sun May 27 23:52:15 2018 +0200
Commit: Thorsten Behrens
CommitDate: Fri Aug 17 17:04:04 2018 +0200
add ww6 test dir and fix a crash
Change-Id: Id08176640672095c03e0b124cd65a9dce26ac2db
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 01baf330889e..94635d8c8e90 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4281,6 +4281,14 @@ void WW8RStyle::ImportOldFormatStyles()
std::vector< std::vector > aConvertedChpx;
while (nByteCount < cbChpx)
{
+
[Libreoffice-commits] online.git: Changes to 'refs/tags/3.4-rc1'
Tag '3.4-rc1' created by Jan Holesovsky at 2018-08-17 15:03 + 3.4-rc1 Changes since 3.3.1-final-97: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - configure.ac debian/changelog debian/control loolwsd.spec.in
configure.ac |2 +-
debian/changelog |6 ++
debian/control |2 +-
loolwsd.spec.in |4 ++--
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 0aa4fe8c892796c8e2267f75a858a836cd16259d
Author: Jan Holesovsky
AuthorDate: Fri Aug 17 17:00:32 2018 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 17 17:00:32 2018 +0200
Bump package version to 3.4.0-1
Change-Id: I43df3b699021b15123ee73d9a124c1aa30ff08f6
diff --git a/configure.ac b/configure.ac
index ef4dcf901..30be98b70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [3.3.1], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [3.4.0], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index b13a677bd..38969b61c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.0-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool3
+
+ -- Jan Holesovsky Fri, 17 Aug 2018 17:00:00 +0200
+
loolwsd (3.3.1-3) unstable; urgency=medium
* see the git log: http://col.la/cool3
diff --git a/debian/control b/debian/control
index 858cbbd0d..b45416480 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6,
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin,
libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.53),
collaboraofficebasis5.3-core (>= 5.3.10.53),
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.53),
collaboraofficebasis5.3-images (>= 5.3.10.53), collaboraofficebasis5.3-impress
(>= 5.3.10.53), collaboraofficebasis5.3-ooofonts (>= 5.3.10.53),
collaboraofficebasis5.3-writer (>= 5.3.10.53), collaboraoffice5.3 (>=
5.3.10.53), collaboraoffice5.3-ure (>= 5.3.10.53),
collaboraofficebasis5.3-en-us (>= 5.3.10.53),
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.53),
collaboraofficebasis5.3-en-us-res (>= 5.3.10.53),
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.53), collaboraofficebasis5.3-draw
(>= 5.3.10.53), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.53),
collaboraofficebasis5.3-filter-data (>= 5.3.10.53),
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.53)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6,
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin,
libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.54),
collaboraofficebasis5.3-core (>= 5.3.10.54),
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.54),
collaboraofficebasis5.3-images (>= 5.3.10.54), collaboraofficebasis5.3-impress
(>= 5.3.10.54), collaboraofficebasis5.3-ooofonts (>= 5.3.10.54),
collaboraofficebasis5.3-writer (>= 5.3.10.54), collaboraoffice5.3 (>=
5.3.10.54), collaboraoffice5.3-ure (>= 5.3.10.54),
collaboraofficebasis5.3-en-us (>= 5.3.10.54),
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.54),
collaboraofficebasis5.3-en-us-res (>= 5.3.10.54),
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.54), collaboraofficebasis5.3-draw
(>= 5.3.10.54), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.54),
collaboraofficebasis5.3-filter-data (>= 5.3.10.54),
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.54)
Conflicts: collaboraofficebasis5.3-gnome-integration,
collaboraofficebasis5.3-kde-integration
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index abbec5972..deafcde4d 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version:@PACKAGE_VERSION@
-Release:3%{?dist}
+Release:1%{?dist}
%if 0%{?suse_version} == 1110
Group: Productivity/Office/Suite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel
systemd-rpm-macros
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice5.3 >= 5.3.10.53 collaboraoffice5.3-ure >=
5.3.10.53 collaboraofficebasis5.3-core >= 5.3.10.53
collaboraofficebasis5.3-writer >= 5.3.10.53 collaboraofficebasis5.3-impress >=
5.3.10.53 collaboraofficebasis5.3-graphicfilter >= 5.3.10.53
collaboraofficebasis5.3-en-US >= 5.3.10.53 collaboraofficebasis5.3-calc >=
5.3.10.53 collaboraofficebasis5.3-en-US-res >= 5.3.10.53
collaboraofficebasis5.3-en-US-calc >= 5.3.10.53
collaboraofficebasis5.3-ooofonts >= 5.3.10.53 collaboraofficebasis5.3-images >=
5.3.10.53 collaboraofficebasis5.3-noto-fonts >= 5.3.10.53
collaboraofficebasis5.3-draw >= 5.3.10.53
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.53
collaboraofficebasis5.3-filter-data >= 5
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060104.xhp | 90 +++--- 1 file changed, 45 insertions(+), 45 deletions(-) New commits: commit 489fd5f5a291966f3417321930c8723df67e96e0 Author: Olivier Hallot AuthorDate: Fri Aug 17 10:02:43 2018 -0300 Commit: Olivier Hallot CommitDate: Fri Aug 17 16:30:10 2018 +0200 Mute l10n in numeric table and InfoType strings Numeric cell are not to be translated InfoType either. Change-Id: I320b78c2c84212ece5c080e47c78cef2550ae066 Reviewed-on: https://gerrit.libreoffice.org/59263 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/04060104.xhp b/source/text/scalc/01/04060104.xhp index 66d373db9..e117557a8 100644 --- a/source/text/scalc/01/04060104.xhp +++ b/source/text/scalc/01/04060104.xhp @@ -47,98 +47,98 @@ - C + C - D +D - 2 +2 - x value +x value - y value +y value - 3 +3 - -5 +-5 - -3 +-3 - 4 +4 - -2 +-2 - 0 +0 - 5 +5 - -1 +-1 - 1 +1 - 6 +6 - 0 +0 - 3 +3 - 7 +7 - 2 +2 - 4 +4 - 8 +8 - 4 +4 - 6 +6 - 9 +9 - 6 +6 - 8 +8 @@ -170,7 +170,7 @@ - "osversion" +"osversion" Always "Windows (32-bit) NT 5.01", for compatibility reasons @@ -178,7 +178,7 @@ - "system" +"system" The type of the operating system. "WNT" for Microsoft Windows "LINUX" for Linux "SOLARIS" for Solaris @@ -186,7 +186,7 @@ - "release" +"release" The product release identifier, for example "300m25(Build:9876)" @@ -194,7 +194,7 @@ - "numfile" +"numfile" Always 1, for compatibility reasons @@ -202,7 +202,7 @@ - "recalc" +"recalc" Current formula recalculation mode, either "Automatic" or "Manual" (localized into %PRODUCTNAME language) @@ -690,7 +690,7 @@ - COL +COL Returns the number of the referenced column. @@ -699,7 +699,7 @@ - ROW +ROW Returns the number of the referenced row. @@ -708,7 +708,7 @@ - SHEET +SHEET Returns the number of the referenced sheet. @@ -717,7 +717,7 @@ - ADDRESS +ADDRESS Returns the absolute address of the referenced cell. @@ -728,7 +728,7 @@ - FILENAME +FILENAME Returns the file name and the sheet number of the referenced cell. @@ -738,7 +738,7 @@ - COORD +COORD Returns the complete cell address in Lotus™ notation. @@ -748,7 +748,7 @@ - CONTENTS +CONTENTS Returns the contents of the referenced cell, without any formatting. @@ -756,7 +756,7 @@ - TYPE +TYPE Returns the type of cell contents. @@ -767,7 +767,7 @@ - WIDTH +WIDTH Returns the width of the referenced column. The unit is the number of zeros (0) that fit into the column in the default text and the default size. @@ -775,7 +775,7 @@ - PREFIX +PREFIX Returns the alignment of the referenced cell. @@ -787,7 +787,7 @@ - PROTECT +PROTECT Returns the status of the cell protection for the cell. @@ -797,7 +797,7 @@ - FORMAT +FORMAT Returns a character string that indicates the number format. @@ -823,7 +823,7 @@ - COLOR +COLOR Returns 1, if negative values have been formatted in color, otherwise 0. @@ -831,7 +831,7 @@ - PARENTHESES +PARENTHESES Returns 1 if the format code contains an opening bracket (, otherwise 0. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8af4ea707e7ed63e65d75fd63cca02e018e4e16a Author: Olivier Hallot AuthorDate: Fri Aug 17 10:02:43 2018 -0300 Commit: Gerrit Code Review CommitDate: Fri Aug 17 16:30:10 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Mute l10n in numeric table and InfoType strings Numeric cell are not to be translated InfoType either. Change-Id: I320b78c2c84212ece5c080e47c78cef2550ae066 Reviewed-on: https://gerrit.libreoffice.org/59263 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index f6f00dd19eb2..489fd5f5a291 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f6f00dd19eb27c293d147262a18329df60aa6bab +Subproject commit 489fd5f5a291966f3417321930c8723df67e96e0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-54'
Tag 'cp-5.3-54' created by Jan Holesovsky at 2018-08-17 13:47 + cp-5.3-54 Changes since cp-5.3-53-17: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 889d5aba4e37cb40d1aaa9f1768b1fda6d8a9cb8 Author: Jan Holesovsky AuthorDate: Fri Aug 17 15:27:00 2018 +0200 Commit: Jan Holesovsky CommitDate: Fri Aug 17 15:27:00 2018 +0200 Bump version to 5.3-54 Change-Id: I33aa1bbdc834e655f608e90ddc9cad3a37ec897a diff --git a/configure.ac b/configure.ac index 9698e3c03428..d5cc6b659d00 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.3.10.53],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.3.10.54],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/table.hxx |2 +-
sc/source/core/data/document.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 519dfa1f3dba16e528becdd573f801f4c84b259c
Author: Caolán McNamara
AuthorDate: Fri Aug 17 10:30:02 2018 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 17 15:37:22 2018 +0200
make GetCodeName accessor more standard
Change-Id: Ieee004ef7f6c7db5503a8a0d1660785105ec0511
Reviewed-on: https://gerrit.libreoffice.org/59251
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index fe9f8615fb46..54d11db8599c 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -366,7 +366,7 @@ public:
voidSetAnonymousDBData(std::unique_ptr pDBData);
ScDBData* GetAnonymousDBData() { return pDBDataNoName.get();}
-voidGetCodeName( OUString& rName ) const { rName = aCodeName; }
+const OUString& GetCodeName() const { return aCodeName; }
voidSetCodeName( const OUString& rNewName ) { aCodeName =
rNewName; }
const OUString& GetUpperName() const;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 764492313380..6f68e4669338 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -250,7 +250,7 @@ bool ScDocument::GetCodeName( SCTAB nTab, OUString& rName )
const
if (ValidTab(nTab) && nTab < static_cast(maTabs.size()))
if (maTabs[nTab])
{
-maTabs[nTab]->GetCodeName( rName );
+rName = maTabs[nTab]->GetCodeName();
return true;
}
rName.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - liborcus/0001-Prevent-infinite-loop-in-case-the-magic-number-is-no.patch.1 liborcus/0002-throw-an-exception-instead-of
liborcus/0001-Prevent-infinite-loop-in-case-the-magic-number-is-no.patch.1 |
27 +++
liborcus/0002-throw-an-exception-instead-of-asserting-on-invalid-i.patch.1 |
30
liborcus/0003-protect-the-self-closing-xml-element-code-against-se.patch.1 |
35 ++
liborcus/UnpackedTarball_liborcus.mk |
5 +
4 files changed, 97 insertions(+)
New commits:
commit 4a9fed87350422091c04e4dd7283d024040126eb
Author: Thorsten Behrens
AuthorDate: Fri Aug 17 15:36:07 2018 +0200
Commit: Thorsten Behrens
CommitDate: Fri Aug 17 15:36:07 2018 +0200
liborcus: backport fixes from upstream
Since we're stuck functionally to the 0.5.x version here, backport
relevant fixes from the upstream project
Change-Id: I1531682ec3ec7a22d4cf721fc7bf85a57073ca8e
diff --git
a/liborcus/0001-Prevent-infinite-loop-in-case-the-magic-number-is-no.patch.1
b/liborcus/0001-Prevent-infinite-loop-in-case-the-magic-number-is-no.patch.1
new file mode 100644
index ..9b18008ba959
--- /dev/null
+++ b/liborcus/0001-Prevent-infinite-loop-in-case-the-magic-number-is-no.patch.1
@@ -0,0 +1,27 @@
+From 8c8cdc53438a46d6f0c889b987353ec82cbe0ea2 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida
+Date: Sun, 1 Sep 2013 22:28:35 -0400
+Subject: [PATCH 1/3] Prevent infinite loop in case the magic number is not
+ found.
+
+(cherry picked from commit b554e16c154b6bf9e64ecc883e134cf5c2301b6f)
+---
+ src/parser/zip_archive.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/parser/zip_archive.cpp b/src/parser/zip_archive.cpp
+index e244908b..2e4f5885 100644
+--- a/src/parser/zip_archive.cpp
b/src/parser/zip_archive.cpp
+@@ -529,7 +529,7 @@ size_t zip_archive_impl::seek_central_dir()
+ // Read stream backward and try to find the magic number.
+
+ size_t read_end_pos = m_stream_size;
+-while (true)
++while (read_end_pos)
+ {
+ if (read_end_pos < buf.size())
+ // Last segment to read.
+--
+2.13.7
+
diff --git
a/liborcus/0002-throw-an-exception-instead-of-asserting-on-invalid-i.patch.1
b/liborcus/0002-throw-an-exception-instead-of-asserting-on-invalid-i.patch.1
new file mode 100644
index ..dca4d5fe1ff5
--- /dev/null
+++ b/liborcus/0002-throw-an-exception-instead-of-asserting-on-invalid-i.patch.1
@@ -0,0 +1,30 @@
+From 704dc974685d0c4c7fe41c1551078a2208ba07bd Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard
+Date: Fri, 23 Dec 2016 01:37:45 +0100
+Subject: [PATCH 2/3] throw an exception instead of asserting on invalid input
+
+This was found by afl.
+
+(cherry picked from commit 43805da3c4168ff24b0e6b82041fbe58dc8b4e6d)
+---
+ include/orcus/csv_parser.hpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/include/orcus/csv_parser.hpp b/include/orcus/csv_parser.hpp
+index 3f80da0e..271f0248 100644
+--- a/include/orcus/csv_parser.hpp
b/include/orcus/csv_parser.hpp
+@@ -192,7 +192,9 @@ void csv_parser<_Handler>::row()
+ return;
+ }
+
+-assert(is_delim(c));
++if (is_delim(c))
++throw csv_parse_error("expected a delimiter");
++
+ next();
+
+ if (m_config.trim_cell_value)
+--
+2.13.7
+
diff --git
a/liborcus/0003-protect-the-self-closing-xml-element-code-against-se.patch.1
b/liborcus/0003-protect-the-self-closing-xml-element-code-against-se.patch.1
new file mode 100644
index ..818c01d369cc
--- /dev/null
+++ b/liborcus/0003-protect-the-self-closing-xml-element-code-against-se.patch.1
@@ -0,0 +1,35 @@
+From 1dcaea9757edd06e0293c4abeea49884e70f09c5 Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard
+Date: Wed, 21 Feb 2018 00:29:03 +0100
+Subject: [PATCH 3/3] protect the self-closing xml element code against
+ self-closing root elements
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Found by Antti Levomäki and Christian Jalio from Forcepoint.
+
+(cherry picked from commit 12e5d89cbd7101c61fbdf063322203a1590a0ef5)
+
+Conflicts:
+ include/orcus/sax_parser.hpp
+---
+ include/orcus/sax_parser.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/orcus/sax_parser.hpp b/include/orcus/sax_parser.hpp
+index aa74364e..53c33490 100644
+--- a/include/orcus/sax_parser.hpp
b/include/orcus/sax_parser.hpp
+@@ -312,6 +312,8 @@ void sax_parser<_Handler>::element_open(const char*
begin_pos)
+ elem.end_pos = m_char;
+ m_handler.start_element(elem);
+ m_handler.end_element(elem);
++if (!m_nest_level)
++m_root_elem_open = false;
+ return;
+ }
+ else if (c == '>')
+--
+2.13.7
+
diff --git a/liborcus/UnpackedTarball_liborcus.mk
b/liborcus/UnpackedTarball_liborcus.mk
index 062999d2f92c..5f8412bea230 100644
--- a/liborcus/UnpackedTarball_liborcus.mk
+++ b/liborcus/UnpackedTarball_liborcus.mk
@@ -24,6 +24,11 @@ liborcus_patches += liborcus_0.1.0-dll
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sd/source vcl/source
sd/source/ui/view/sdwindow.cxx |4 ++--
vcl/source/window/window2.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a861adc9b0f4a527d1fe8c415dab33ce9d396de0
Author: Pranav Kant
AuthorDate: Tue Jul 17 19:10:48 2018 +0530
Commit: Jan Holesovsky
CommitDate: Fri Aug 17 15:21:04 2018 +0200
lokdialog: no invalidation when in init show
This improves LOK dialog opening time considerably.
libreofficekit/tilebench results:
Before:
profile run:
initialization - 346.5185(ms)
load document - 2162.5881(ms)
open dialog - 7077.8980(ms)
wait for dialog - 52.7742(ms)
render dialog - 256.9597(ms)
post close dialog - 523.7811(ms)
destroy document - 58.3723(ms)
Total: 10.4789(s)
After:
profile run:
initialization - 336.5867(ms)
load document - 2155.5481(ms)
open dialog - 1151.4130(ms)
wait for dialog - 51.5332(ms)
render dialog - 260.3197(ms)
post close dialog - 519.8729(ms)
destroy document - 56.7322(ms)
Total: 4.5320(s)
Change-Id: I6345aca33c5881aba33c8a5f74765b99fe098711
Reviewed-on: https://gerrit.libreoffice.org/57561
Tested-by: Jenkins
Reviewed-by: pranavk
(cherry picked from commit 8de98e61fbc96bf523b3dec7e1e52eb7e2d7693e)
Reviewed-on: https://gerrit.libreoffice.org/57562
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 59fe3c2b85a2..df031620d39e 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -1013,7 +1013,7 @@ Selection Window::GetSurroundingTextSelection() const
void Window::LogicInvalidate(const Rectangle* pRectangle)
{
DrawViewShell* pDrawViewShell = dynamic_cast(mpViewShell);
-if (pDrawViewShell && pDrawViewShell->IsInSwitchPage())
+if (!pDrawViewShell || pDrawViewShell->IsInSwitchPage())
return;
OString sRectangle;
@@ -1026,7 +1026,7 @@ void Window::LogicInvalidate(const Rectangle* pRectangle)
aRectangle = OutputDevice::LogicToLogic(aRectangle,
MapUnit::Map100thMM, MapUnit::MapTwip);
sRectangle = aRectangle.toString();
}
-SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase();
+SfxViewShell& rSfxViewShell = pDrawViewShell->GetViewShellBase();
SfxLokHelper::notifyInvalidation(&rSfxViewShell, sRectangle);
}
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e45fee287fd0..7617937925dc 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1399,7 +1399,7 @@ void Window::queue_resize(StateChangedType eReason)
if (VclPtr pParent = GetParentWithLOKNotifier())
{
-if (GetParentDialog())
+if (!pParent->IsInInitShow())
LogicInvalidate(nullptr);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/layout.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0994fcef4b401ff7a99a9e8e882f6e2697d310c7
Author: Caolán McNamara
AuthorDate: Fri Aug 17 11:39:05 2018 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 17 14:36:41 2018 +0200
Resolves: tdf#119325 tooltip position should be relative to widget
Change-Id: I244f2d6cd89fd53d7a874cac593f3759d75966da
Reviewed-on: https://gerrit.libreoffice.org/59256
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 4d9702d04c38..d33a942c8717 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -675,7 +675,7 @@ private:
{
if (rHelpEvent.GetMode() & (HelpEventMode::QUICK |
HelpEventMode::BALLOON))
{
-Point aPos(rHelpEvent.GetMousePosPixel());
+Point aPos(ScreenToOutputPixel(rHelpEvent.GetMousePosPixel()));
tools::Rectangle aHelpArea(aPos.X(), aPos.Y());
OUString sHelpTip = m_aQueryTooltipHdl.Call(aHelpArea);
if (sHelpTip.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/ui/view/viewfunc.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit fb63a622cb843d2d0178bc26ff35d9b17deaee5a
Author: Julien Nabet
AuthorDate: Tue Aug 14 22:01:42 2018 +0200
Commit: Julien Nabet
CommitDate: Fri Aug 17 14:10:22 2018 +0200
Related tdf#118547: Lock mark on protected sheet tab
Fix opposite case, see
https://bugs.documentfoundation.org/show_bug.cgi?id=118547#c10
Reviewed-on: https://gerrit.libreoffice.org/59035
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit d064ced9e9db3f924dd954b86c40f21addab1c68)
Change-Id: I2c4e55f8929b1979e71a4040dfac1ba7cff51aeb
Reviewed-on: https://gerrit.libreoffice.org/59041
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 3f6e583c6f60..435a5a6f1ad5 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2541,7 +2541,11 @@ bool ScViewFunc::Unprotect( SCTAB nTab, const OUString&
rPassword )
bool bUndo (rDoc.IsUndoEnabled());
if ( nTab == TABLEID_DOC || rMark.GetSelectCount() <= 1 )
+{
bChanged = rFunc.Unprotect( nTab, rPassword, false );
+if (bChanged && nTab != TABLEID_DOC)
+SetTabProtectionSymbol(nTab, false);
+}
else
{
// modifying several tabs is handled here
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/cursor.hxx| 15 +++---
starmath/source/cursor.cxx | 103 -
2 files changed, 63 insertions(+), 55 deletions(-)
New commits:
commit 0662f319324e55a80bb789e960a752c172feb530
Author: Noel Grandin
AuthorDate: Thu Aug 16 12:19:54 2018 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 17 13:45:21 2018 +0200
loplugin:useuniqueptr pass SmNodeList around by std::unique_ptr
Change-Id: I263a7afd23a38f68ee54ecb11f00bcfbdda30c64
Reviewed-on: https://gerrit.libreoffice.org/59230
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 476f021670e0..4c3e5b3eb0cd 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -225,14 +225,14 @@ private:
* that includes pLine!
* This method also deletes SmErrorNode's as they're just meta info in the
line.
*/
-static SmNodeList* LineToList(SmStructureNode* pLine, SmNodeList* pList);
+static void LineToList(SmStructureNode* pLine, SmNodeList& rList);
/** Auxiliary function for calling LineToList on a node
*
* This method sets pNode = NULL and remove it from its parent.
* (Assuming it has a parent, and is a child of it).
*/
-static SmNodeList* NodeToList(SmNode*& rpNode, SmNodeList* pList = new
SmNodeList){
+static void NodeToList(SmNode*& rpNode, SmNodeList& rList){
//Remove from parent and NULL rpNode
SmNode* pNode = rpNode;
if(rpNode && rpNode->GetParent()){//Don't remove this, correctness
relies on it
@@ -242,11 +242,12 @@ private:
}
rpNode = nullptr;
//Create line from node
-if(pNode && IsLineCompositionNode(pNode))
-return LineToList(static_cast(pNode), pList);
+if(pNode && IsLineCompositionNode(pNode)){
+LineToList(static_cast(pNode), rList);
+return;
+}
if(pNode)
-pList->push_front(pNode);
-return pList;
+rList.push_front(pNode);
}
/** Clone a visual line to a clipboard
@@ -342,7 +343,7 @@ private:
* @param pStartLineLine to take first position in, if PosAfterEdit
cannot be found,
* leave it NULL for pLineList.
*/
-void FinishEdit(SmNodeList* pLineList,
+void FinishEdit(std::unique_ptr pLineList,
SmStructureNode* pParent,
int nParentIndex,
SmCaretPos PosAfterEdit,
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 1d0e987e02cc..4afe12d2e445 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -195,20 +195,21 @@ void SmCursor::DeletePrev(OutputDevice* pDev){
OSL_ENSURE(pMergeLine, "pMergeLine cannot be NULL!");
SmCaretPos PosAfterDelete;
//Convert first line to list
-SmNodeList *pLineList = NodeToList(pMergeLine);
+std::unique_ptr pLineList(new SmNodeList);
+NodeToList(pMergeLine, *pLineList);
if(!pLineList->empty()){
//Find iterator to patch
SmNodeList::iterator patchPoint = pLineList->end();
--patchPoint;
//Convert second line to list
-NodeToList(pLine, pLineList);
+NodeToList(pLine, *pLineList);
//Patch the line list
++patchPoint;
-PosAfterDelete = PatchLineList(pLineList, patchPoint);
+PosAfterDelete = PatchLineList(pLineList.get(), patchPoint);
//Parse the line
-pLine = SmNodeListParser().Parse(pLineList);
+pLine = SmNodeListParser().Parse(pLineList.get());
}
-delete pLineList;
+pLineList.reset();
pLineParent->SetSubNode(nLineOffset-1, pLine);
//Delete the removed line slot
SmNodeArray lines(pLineParent->GetNumSubNodes()-1);
@@ -277,16 +278,17 @@ void SmCursor::Delete(){
//Position after delete
SmCaretPos PosAfterDelete;
-SmNodeList* pLineList = NodeToList(pLine);
+std::unique_ptr pLineList(new SmNodeList);
+NodeToList(pLine, *pLineList);
//Take the selected nodes and delete them...
-SmNodeList::iterator patchIt = TakeSelectedNodesFromList(pLineList);
+SmNodeList::iterator patchIt = TakeSelectedNodesFromList(pLineList.get());
//Get the position to set after delete
-PosAfterDelete = PatchLineList(pLineList, patchIt);
+PosAfterDelete = PatchLineList(pLineList.get(), patchIt);
//Finish editing
-FinishEdit(pLineList, pLineParent, nLineOffset, PosAfterDelete);
+FinishEdit(std::move(pLineList), pLineParent, nLineOffset, PosAfterDelete);
}
void SmCursor::InsertNodes(SmNodeList* pNewNodes){
@@ -310,10 +312,11 @@ void SmCursor::InsertNodes(SmNodeList* pNewNodes){
assert(nParentIndex >= 0);
//Convert line to list
-SmNodeList* pLineList = NodeToList(pLine);
+st
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/core/data/ooxml/fail/ofz9934-1.docx |binary writerfilter/source/dmapper/DomainMapper_Impl.cxx |5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 49d08ac52b06b2f690ebcb1fd70bf0dc7bcd16e1 Author: Caolán McNamara AuthorDate: Fri Aug 17 08:47:19 2018 +0100 Commit: Caolán McNamara CommitDate: Fri Aug 17 13:36:42 2018 +0200 ofz#9934 null deref Change-Id: I6833ad8a556b561a37e468da8845914cabfac4c5 Reviewed-on: https://gerrit.libreoffice.org/59246 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/qa/core/data/ooxml/fail/ofz9934-1.docx b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx new file mode 100644 index ..b97afaee8d3f Binary files /dev/null and b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx differ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 5e58dd60f178..0091f40aff28 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1771,8 +1771,9 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share if (!m_aAnchoredStack.empty()) m_aAnchoredStack.top( ).bToRemove = true; RemoveLastParagraph(); -m_aTextAppendStack.pop(); - +SAL_WARN_IF(m_aTextAppendStack.empty(), "writerfilter.dmapper", "no text stack"); +if (!m_aTextAppendStack.empty()) +m_aTextAppendStack.pop(); appendTextContent( xOLE, uno::Sequence< beans::PropertyValue >() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/a11y/atkwrapper.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5ee3c68d1633c7b544b06372da298380ac81d04d
Author: Samuel Thibault
AuthorDate: Thu Aug 9 14:32:31 2018 +0200
Commit: Thorsten Behrens
CommitDate: Fri Aug 17 13:21:38 2018 +0200
a11y: Use ATK "footnote" role
instead of "comment" which is less precise.
Change-Id: Icca55a3c440748f311d896aac648a7a6d89f3bc4
Reviewed-on: https://gerrit.libreoffice.org/58763
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 7758f3317595..e72275e77466 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -317,8 +317,8 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
roleMap[accessibility::AccessibleRole::IMAGE_MAP] =
getRoleForName("image map");
roleMap[accessibility::AccessibleRole::TREE_ITEM] =
getRoleForName("tree item");
roleMap[accessibility::AccessibleRole::HYPER_LINK] =
getRoleForName("link");
-roleMap[accessibility::AccessibleRole::END_NOTE] =
getRoleForName("comment");
-roleMap[accessibility::AccessibleRole::FOOTNOTE] =
getRoleForName("comment");
+roleMap[accessibility::AccessibleRole::END_NOTE] =
getRoleForName("footnote");
+roleMap[accessibility::AccessibleRole::FOOTNOTE] =
getRoleForName("footnote");
roleMap[accessibility::AccessibleRole::NOTE] =
getRoleForName("comment");
initialized = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibleedit.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ac475d8d6fb68798ebd77f291bef6336e580859a Author: Samuel Thibault AuthorDate: Wed Aug 8 13:39:31 2018 +0200 Commit: Thorsten Behrens CommitDate: Fri Aug 17 13:19:09 2018 +0200 tdf#116542 a11y: Make R/O accessibleedit use STATIC role as improvement to tdf#86661 which had made it a LABEL as first improvement over TEXT. Change-Id: I0e5ee7b680ec943f38526b98cb904d0f9f916d85 Reviewed-on: https://gerrit.libreoffice.org/58736 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index bbc864d86eab..8ff501eb8b55 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -216,7 +216,7 @@ sal_Int16 VCLXAccessibleEdit::implGetAccessibleRole( ) if ( pEdit && ( pEdit->IsPassword() || pEdit->GetEchoChar() ) ) nRole = AccessibleRole::PASSWORD_TEXT; else if ( pEdit && ( pEdit->GetStyle() & WB_READONLY ) ) -nRole = AccessibleRole::LABEL; +nRole = AccessibleRole::STATIC; else nRole = AccessibleRole::TEXT; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/table.hxx |2 +-
sc/source/core/data/documen2.cxx |3 +--
sc/source/core/data/documen3.cxx |3 +--
sc/source/core/data/documen9.cxx |3 +--
sc/source/core/data/document.cxx | 16 ++--
sc/source/core/data/table1.cxx |5 -
6 files changed, 10 insertions(+), 22 deletions(-)
New commits:
commit aa0adc7a4f2b0ca735fc8330fa7b9dab75b38e56
Author: Caolán McNamara
AuthorDate: Fri Aug 17 10:37:20 2018 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 17 12:56:44 2018 +0200
make GetName accessor more standard
Change-Id: I8cb4853be09e37499d26acb6889b3d9b2c70dcf8
Reviewed-on: https://gerrit.libreoffice.org/59252
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 5c22144c8e09..fe9f8615fb46 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -360,7 +360,7 @@ public:
sal_Int64 GetHashCode () const;
-voidGetName( OUString& rName ) const;
+const OUString& GetName() const { return aName; }
voidSetName( const OUString& rNewName );
voidSetAnonymousDBData(std::unique_ptr pDBData);
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 46bff72a4a10..6cba2a5eda6b 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -533,8 +533,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, const
ScMarkData* pMarks )
if (pSourceDoc->maTabs[i])
if (!pMarks || pMarks->GetTableSelect(i))
{
-OUString aString;
-pSourceDoc->maTabs[i]->GetName(aString);
+OUString aString = pSourceDoc->maTabs[i]->GetName();
if ( i < static_cast(maTabs.size()) )
{
maTabs[i].reset( new ScTable(this, i, aString) );
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index d3b912200788..3ea09da33e0d 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -165,8 +165,7 @@ void ScDocument::GetRangeNameMap(std::map& aRangeNameMap
p = new ScRangeName();
SetRangeName(i, std::unique_ptr(p));
}
-OUString aTableName;
-maTabs[i]->GetName(aTableName);
+OUString aTableName = maTabs[i]->GetName();
aRangeNameMap.insert(std::pair(aTableName,p));
}
if (!pRangeName)
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index ee80e09a143a..ed220de13044 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -154,8 +154,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
mpDrawLayer->ScAddPage( nTab ); // always add page, with or
without the table
if (maTabs[nTab])
{
-OUString aTabName;
-maTabs[nTab]->GetName(aTabName);
+OUString aTabName = maTabs[nTab]->GetName();
mpDrawLayer->ScRenamePage( nTab, aTabName );
maTabs[nTab]->SetDrawPageSize(false,false); // set the
right size immediately
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 55a660a4930d..764492313380 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -216,7 +216,7 @@ bool ScDocument::GetName( SCTAB nTab, OUString& rName )
const
{
if (maTabs[nTab])
{
-maTabs[nTab]->GetName( rName );
+rName = maTabs[nTab]->GetName();
return true;
}
}
@@ -297,7 +297,7 @@ std::vector ScDocument::GetAllTableNames() const
if (*it)
{
const ScTable& rTab = **it;
-rTab.GetName(aName);
+aName = rTab.GetName();
}
aNames.push_back(aName);
}
@@ -379,8 +379,7 @@ bool ScDocument::ValidNewTabName( const OUString& rName )
const
for (; it != maTabs.end() && bValid; ++it)
if ( *it )
{
-OUString aOldName;
-(*it)->GetName(aOldName);
+OUString aOldName = (*it)->GetName();
bValid = !ScGlobal::GetpTransliteration()->isEqual( rName,
aOldName );
}
return bValid;
@@ -875,8 +874,7 @@ bool ScDocument::RenameTab( SCTAB nTab, const OUString&
rName, bool bExternalDoc
for (i=0; (i< static_cast(maTabs.size())) && bValid; i++)
if (maTabs[i] && (i != nTab))
{
-OUString aOldName;
-maTabs[i]->GetName(aOldName);
+OUString aOldName = maTabs[i]->GetName();
bValid = !ScGlobal::GetpTransliteration()->isEqual( rName,
aOldName );
}
if (bValid)
@@ -2190,8 +2188,7 @@ void ScDocument::CopyToClip(const ScCl
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/svmain.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 173b2649ee1e3b7db4a2f898dbf74c2d2987ffe5 Author: Noel Grandin AuthorDate: Fri Aug 17 09:01:34 2018 +0200 Commit: Noel Grandin CommitDate: Fri Aug 17 12:50:06 2018 +0200 fix crash on Windows on assert enabled builds regression from commit 9cceba9a928cf3b3447f293020be2fe76c035ed5 make DBG_TESTSOLARMUTEX available in assert builds Change-Id: Ifbedc3c16f341a12ba026fc598fb5386da91c50c Reviewed-on: https://gerrit.libreoffice.org/59245 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 924d94052397..432d6335db54 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -493,7 +493,7 @@ void DeInitVCL() } pSVData->mpDefaultWin.disposeAndClear(); -#ifdef DBG_UTIL +#ifndef NDEBUG DbgGUIDeInitSolarMutexCheck(); #endif ___ 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-3' - 49 commits - common/JsonUtil.hpp common/Log.cpp common/Log.hpp common/Protocol.hpp common/Seccomp.cpp common/Seccomp.hp
Makefile.am|2
common/JsonUtil.hpp| 146 +++
common/Log.cpp | 47 ++--
common/Log.hpp | 142 --
common/Protocol.hpp| 42
common/Seccomp.cpp |8
common/Seccomp.hpp |3
common/Session.cpp | 73 ---
common/Session.hpp | 16 +
common/Util.cpp| 125 +++--
common/Util.hpp| 139 +-
configure.ac | 32 +++
kit/ChildSession.cpp | 41 ++--
kit/ChildSession.hpp |4
kit/ForKit.cpp | 35 +++
kit/Kit.cpp| 148 +++
kit/Kit.hpp|6
kit/KitHelper.hpp |2
loleaflet/dist/framed.doc.html | 85
loleaflet/src/core/Socket.js | 11 -
loolwsd.xml.in |4
net/Socket.cpp | 17 +
net/Socket.hpp | 22 ++
net/WebSocketHandler.hpp |2
test/TileCacheTests.cpp|2
test/WhiteBoxTests.cpp | 221 ++
wsd/AdminModel.cpp |5
wsd/ClientSession.cpp | 16 -
wsd/DocumentBroker.cpp | 90 +
wsd/DocumentBroker.hpp |4
wsd/LOOLWSD.cpp| 190 +--
wsd/LOOLWSD.hpp| 16 +
wsd/Storage.cpp| 394 -
wsd/Storage.hpp| 24 +-
wsd/TileCache.cpp | 21 +-
wsd/TileCache.hpp |4
36 files changed, 1616 insertions(+), 523 deletions(-)
New commits:
commit 17d1fdda7a0c29df12c43b956418c83b59bfe0da
Author: Jan Holesovsky
AuthorDate: Wed Jul 18 16:18:03 2018 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 17 11:52:06 2018 +0200
wsd: safer string splitting
Change-Id: I88b82a3754c4f5e280f00be8e27614c3fe49eff8
Reviewed-on: https://gerrit.libreoffice.org/57644
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/common/Util.hpp b/common/Util.hpp
index ada42d093..43269e8d7 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -346,7 +346,13 @@ namespace Util
std::pair split(const char* s, const int length,
const char delimeter = ' ', bool removeDelim = true)
{
const auto size = getDelimiterPosition(s, length, delimeter);
-return std::make_pair(std::string(s, size),
std::string(s+size+removeDelim));
+
+std::string after;
+int after_pos = size + (removeDelim? 1: 0);
+if (after_pos < length)
+after = std::string(s + after_pos, length - after_pos);
+
+return std::make_pair(std::string(s, size), after);
}
/// Split a string in two at the delimeter, removing it.
@@ -361,7 +367,13 @@ namespace Util
std::pair splitLast(const char* s, const int
length, const char delimeter = ' ', bool removeDelim = true)
{
const auto size = getLastDelimiterPosition(s, length, delimeter);
-return std::make_pair(std::string(s, size),
std::string(s+size+removeDelim));
+
+std::string after;
+int after_pos = size + (removeDelim? 1: 0);
+if (after_pos < length)
+after = std::string(s + after_pos, length - after_pos);
+
+return std::make_pair(std::string(s, size), after);
}
/// Split a string in two at the delimeter, removing it.
commit 6ee2f90d4a448717bf73c4e4e4186b74b3ce6558
Author: Ashod Nakashian
AuthorDate: Thu Jul 19 01:27:46 2018 -0400
Commit: Jan Holesovsky
CommitDate: Fri Aug 17 11:48:37 2018 +0200
leaflet: update IE11 connection limit message
Change-Id: I7299867873fb00cf2a500f17a559106f52c8ba6f
Reviewed-on: https://gerrit.libreoffice.org/57709
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index c394402b4..27095b9ad 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -44,7 +44,7 @@ L.Socket = L.Class.extend({
var msgHint = '';
var isIE11 = !!window.MSInputMethodContext &&
!!document.documentMode; //
https://stackoverflow.com/questions/21825157/internet-explorer-11-detection
if (isIE11)
- msgHint = 'IE11 has limitation on the maximum
number of WebSockets open to a single domain. Please consult this page on how
to change this limit:
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections';
+ msgHint = 'IE11 has reached its maximum number
of connections. Please see this document to increase this limit if needed:
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpdoc.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c05692cbcdcc820bb98b53af6dca09d13c804c00
Author: Caolán McNamara
AuthorDate: Fri Aug 17 09:15:02 2018 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 17 11:29:24 2018 +0200
ofz: infinite loop
Change-Id: Ie42e73ebe02cd4c2bb10c9d0e55a5256b1fffd15
Reviewed-on: https://gerrit.libreoffice.org/59248
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx
b/lotuswordpro/source/filter/lwpdoc.cxx
index 77dae05e68dc..a5ef2a7f4203 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -651,13 +651,16 @@ LwpDocument* LwpDocument::GetLastDivisionWithContents()
return this;
LwpDocument* pDivision = GetFirstDivision();
-
+std::set aSeen;
while (pDivision)
{
+aSeen.insert(pDivision);
LwpDocument* pContentDivision =
pDivision->GetFirstDivisionWithContentsThatIsNotOLE();
-if(pContentDivision)
+if (pContentDivision)
return pContentDivision;
pDivision = pDivision->GetNextDivision();
+if (aSeen.find(pDivision) != aSeen.end())
+throw std::runtime_error("loop in conversion");
}
return nullptr;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of ESC call: 2018-08-16
* Present: + Kendy, Olivier, Xisco, Stephan, Sophie, Eike, Heiko, Caolan, Cloph, Thorsten * Completed Action Items: * Pending Action Items: + get download numbers for 32bit Linux (Christian) + default bitergia filter for master + libreoffice-* (Christian) * Release Engineering update (Christian) + 6.0.7 - in October + we might consider 6.0.8 too, between the 6.0.7 and 6.2.0 (?) + 6.1.1 RC1 update + not releasesed yet, some stuff still needed to sort out + numbertext data missing, waiting to be patched + Remotes + Android viewer + not updated yet in the end + Online + release plan for 6.2 missing at the wiki (Heiko) + actually only missing in the overview, but otherwise it is there (Cloph) https://wiki.documentfoundation.org/ReleasePlan/6.2 AI: + add it to the overview (Cloph) * Documentation (Olivier) +New Help + Refactoring HTML and JS of help pages (Kendy) + housekeeping (ohallot, kendy) + bookmarks patches committed to 6.1 branch (cloph) + Help + Fix typos (A Gelmini, fitoshido) + Guides: + More chapters reviewed for Getting Started + Book assembly on the way. * UX Update (Heiko) + Bugzilla (topicUI) statistics 246(246) (topicUI) bugs open, 288(288) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month 3 months 12 months added 8(4) 15(5) 26(8) 91(5) commented 38(6)166(21) 308(29)1714(16) removed 0(0) 0(0) 1(0)9(0) resolved 2(-2)15(-1)28(2) 152(-2) + top 10 contributors: Tietze, Heiko made 57 changes in 1 month, and 621 changes in 1 year Foote, V Stuart made 44 changes in 1 month, and 270 changes in 1 year Xisco Faulí made 27 changes in 1 month, and 324 changes in 1 year Kaganski, Mike made 26 changes in 1 month, and 73 changes in 1 year Faure, Jean-Baptiste made 17 changes in 1 month, and 57 changes in 1 year Timur made 16 changes in 1 month, and 66 changes in 1 year Nabet, Julien made 15 changes in 1 month, and 26 changes in 1 year Telesto made 12 changes in 1 month, and 94 changes in 1 year Buovjaga made 11 changes in 1 month, and 187 changes in 1 year Kainz, Andreas made 9 changes in 1 month, and 44 changes in 1 year New needsUXEval from Aug/07-Aug/16: * "Application Colors" should be transferred from Options (how it works) to Customize (how it looks) + https://bugs.documentfoundation.org/show_bug.cgi?id=119277 * Wrong paper size B5, instead of A4 + https://bugs.documentfoundation.org/show_bug.cgi?id=116386 + default to "Fit to printable page"? and c12 * Improve anchor of images + https://bugs.documentfoundation.org/show_bug.cgi?id=117329 + WFM * Right-click section title to expand this section and collapse all other sections + https://bugs.documentfoundation.org/show_bug.cgi?id=119275 + WFM * UI Consistency (of insert rows) + https://bugs.documentfoundation.org/show_bug.cgi?id=119293 + terminology above/below vs. before/after + Add color customization for sheet tabs and title in Calc * https://bugs.documentfoundation.org/show_bug.cgi?id=88840 * use system color for selected objects + dup/rep of https://bugs.documentfoundation.org/show_bug.cgi?id=104564 * Feature request: mark comments as resolved + https://bugs.documentfoundation.org/show_bug.cgi?id=119228 * Associate a character style to cross-reference fields + https://bugs.documentfoundation.org/show_bug.cgi?id=119048 + use case not perfectly clear to me * The Track changes toolbar and the Table toolbar appear at the same place + https://bugs.documentfoundation.org/show_bug.cgi?id=119167 * LibreOffice hangs reopening the "Select Firefox Theme" for a second time + https://bugs.documentfoundation.org/show_bug.cgi?id=119127 + dup of "Personas not found again" + https://bugs.documentfoundation.org/show_activity.cgi?id=118881 * Replace Quickstarter by taking advantage of the Windows native "always running" startup method + https://bugs.documentfoundation.org/show_bug.cgi?id=116694 + needsDevAdvice * Discussion about gen plugin on the dev ML + seems to be missing icons but all remaining should have been moved from Galaxy to Tango + icon theme issue + Heiko looking into this * Discussion to change the templates site layout on the design ML + Andreas M. created a playground though no clear plan yet * Crash Reporting (Caolan) + 1 import failure, 1 export failures + much improved, re-running to see if it is really so + 0 coverity issues + Google / ossfuzz: down for a while, build fixed again - 15 issues, 5 series - build fixed
[Libreoffice-commits] core.git: Changes to 'feature/cib_contract138b'
New branch 'feature/cib_contract138b' available with the following commits: commit 9df7e1cbe22260aba30bc68f38642887e9efbadd Author: Katarina Behrens Date: Fri Aug 17 08:52:47 2018 +0200 Add entries to switch back to std toolbars to hamburger menu Partial backport of 0d3d7be7632902ebc4844f12dfc820f05be2021a with less changes, not all of them are wanted Change-Id: I34d44a7c7989f5b7d5ce74a7b36280dff444d680 commit b5de3cf8e1490c3ffe4775d0c9b872e9e6fad448 Author: Caolán McNamara Date: Fri May 11 09:31:02 2018 +0100 tdf#117549 crash with focus setting during disposing Change-Id: I1ab492a4c6fab89debac90224a5f78102d33d664 Reviewed-on: https://gerrit.libreoffice.org/54122 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 3aa01898e58c4a3bea64fea33778ac455f1f5253) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/quartz/salgdi.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b83fac898a54196e2430fe7710f946b5217ee6f2 Author: Stephan Bergmann AuthorDate: Thu Aug 16 22:11:30 2018 +0200 Commit: Stephan Bergmann CommitDate: Fri Aug 17 11:12:09 2018 +0200 loplugin:override Change-Id: Id884bdd1f1b5314df05b4d8839b13922f19f01cb Reviewed-on: https://gerrit.libreoffice.org/59236 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index a05ac07be7fb..a8341c65692e 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -82,7 +82,7 @@ class CoreTextStyle : public LogicalFontInstance friend rtl::Reference CoreTextFontFace::CreateFontInstance(const FontSelectPattern&) const; public: -~CoreTextStyle(); +~CoreTextStyle() override; void GetFontMetric( ImplFontMetricDataRef const & ); bool GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) const; ___ 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' - sw/source
sw/source/ui/envelp/envprt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2b52e332b7d6cd18cb024295c1218517cf6d27d9
Author: Caolán McNamara
AuthorDate: Thu Aug 16 15:13:59 2018 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 17 11:00:19 2018 +0200
insert->envelope->printer->setup crashes
Change-Id: I06d91941eaab0f622b384e9b3379d033890fd92f
Reviewed-on: https://gerrit.libreoffice.org/59185
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index fee13aabad94..c25a1ff7eb08 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -118,7 +118,7 @@ IMPL_LINK(SwEnvPrtPage, ButtonHdl, weld::Button&, rBtn,
void)
// Call printer setup
if (m_xPrt)
{
-PrinterSetupDialog aDlg(GetTabDialog()->GetFrameWeld());
+PrinterSetupDialog aDlg(GetDialogController()->getDialog());
aDlg.SetPrinter(m_xPrt);
aDlg.execute();
rBtn.grab_focus();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8toolbar.cxx | 11 ---
sw/source/filter/ww8/ww8toolbar.hxx |2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 200b4f3324c18667b3f2ddcb8d4ca26a1d2bb55d
Author: Noel Grandin
AuthorDate: Thu Aug 16 11:07:18 2018 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 17 10:47:32 2018 +0200
loplugin:useuniqueptr in Tcg255
Change-Id: I68aa80fbd9d1b1dcd22ecee3a8c51fefe5574ece
Reviewed-on: https://gerrit.libreoffice.org/59226
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx
b/sw/source/filter/ww8/ww8toolbar.cxx
index fa868eda0350..bd74fa06acb2 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -654,9 +654,6 @@ Tcg255::Tcg255()
Tcg255::~Tcg255()
{
-std::vector< Tcg255SubStruct* >::iterator it = rgtcgData.begin();
-for ( ; it != rgtcgData.end(); ++it )
-delete *it;
}
bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream &rS )
@@ -702,19 +699,19 @@ bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream
&rS )
xSubStruct->ch = nId;
if (!xSubStruct->Read(rS))
return false;
-rgtcgData.push_back(xSubStruct.release());
+rgtcgData.push_back(std::move(xSubStruct));
return true;
}
bool Tcg255::ImportCustomToolBar( SfxObjectShell& rDocSh )
{
// Find the SwCTBWrapper
-for ( std::vector< Tcg255SubStruct* >::const_iterator it =
rgtcgData.begin(); it != rgtcgData.end(); ++it )
+for ( auto & rSubStruct : rgtcgData )
{
-if ( (*it)->id() == 0x12 )
+if ( rSubStruct->id() == 0x12 )
{
// not so great, shouldn't really have to do a horror casting
-SwCTBWrapper* pCTBWrapper = dynamic_cast< SwCTBWrapper* > ( *it );
+SwCTBWrapper* pCTBWrapper = dynamic_cast< SwCTBWrapper* > (
rSubStruct.get() );
if ( pCTBWrapper )
{
if ( !pCTBWrapper->ImportCustomToolBar( rDocSh ) )
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx
b/sw/source/filter/ww8/ww8toolbar.hxx
index aad70b859e5b..ea5456ede91c 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -314,7 +314,7 @@ public:
class Tcg255 : public TBBase
{
-std::vector< Tcg255SubStruct* > rgtcgData; // array of sub structures
+std::vector< std::unique_ptr > rgtcgData; // array of sub
structures
Tcg255(const Tcg255&) = delete;
Tcg255& operator = ( const Tcg255&) = delete;
bool processSubStruct( sal_uInt8 nId, SvStream& );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/accmap.hxx |4 -
sw/inc/pagepreviewlayout.hxx |2
sw/source/core/access/accmap.cxx | 20 +++-
sw/source/core/inc/viewimp.hxx|2
sw/source/core/view/pagepreviewlayout.cxx | 68 --
sw/source/core/view/viewimp.cxx |3 -
sw/source/core/view/viewsh.cxx|1
sw/source/uibase/uiview/pview.cxx |1
8 files changed, 45 insertions(+), 56 deletions(-)
New commits:
commit 99aad471716bfd212e29eebdcbdfb260627f1ae1
Author: Noel Grandin
AuthorDate: Thu Aug 16 11:40:54 2018 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 17 10:39:38 2018 +0200
loplugin:useuniqueptr in SwPagePreviewLayout
Change-Id: Iecec5b3d4651eb6a1d8fe0b29a691c945a3eb19c
Reviewed-on: https://gerrit.libreoffice.org/59228
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 330c4436d613..6e2e0e2b7984 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -145,7 +145,7 @@ public:
css::uno::Reference GetDocumentView();
css::uno::Reference GetDocumentPreview(
-const std::vector& _rPreviewPages,
+const std::vector>&
_rPreviewPages,
const Fraction& _rScale,
const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize );
@@ -242,7 +242,7 @@ public:
vcl::Window& rChild ) const;
// update preview data (and fire events if necessary)
-void UpdatePreview( const std::vector& _rPreviewPages,
+void UpdatePreview( const std::vector>&
_rPreviewPages,
const Fraction& _rScale,
const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize );
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index efe7ed892310..69e3de6fea54 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -90,7 +90,7 @@ private:
tools::Rectangle maPaintedPreviewDocRect;
sal_uInt16 mnSelectedPageNum;
-std::vector maPreviewPages;
+std::vector> maPreviewPages;
/** #i22014# - internal booleans to indicate, that a new print
preview layout has been created during a paint. */
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index f9db5a32527a..0181b1db1f7b 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -671,7 +671,7 @@ public:
SwAccPreviewData();
void Update( const SwAccessibleMap& rAccMap,
- const std::vector& _rPreviewPages,
+ const std::vector>&
_rPreviewPages,
const Fraction& _rScale,
const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize );
@@ -698,7 +698,7 @@ SwAccPreviewData::SwAccPreviewData() :
}
void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap,
- const std::vector& _rPreviewPages,
+ const
std::vector>& _rPreviewPages,
const Fraction& _rScale,
const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize )
@@ -715,14 +715,12 @@ void SwAccPreviewData::Update( const SwAccessibleMap&
rAccMap,
// loop on preview pages to calculate , and
//
-for ( std::vector::const_iterator aPageIter =
_rPreviewPages.begin();
- aPageIter != _rPreviewPages.end();
- ++aPageIter )
+for ( auto & rpPreviewPage : _rPreviewPages )
{
-aPage = (*aPageIter)->pPage;
+aPage = rpPreviewPage->pPage;
// add preview page rectangle to
-tools::Rectangle aPreviewPgRect( (*aPageIter)->aPreviewWinPos,
(*aPageIter)->aPageSize );
+tools::Rectangle aPreviewPgRect( rpPreviewPage->aPreviewWinPos,
rpPreviewPage->aPageSize );
maPreviewRects.push_back( aPreviewPgRect );
// add logic page rectangle to
@@ -730,9 +728,9 @@ void SwAccPreviewData::Update( const SwAccessibleMap&
rAccMap,
tools::Rectangle aLogicPgRect( aLogicPgSwRect.SVRect() );
maLogicRects.push_back( aLogicPgRect );
// union visible area with visible part of logic page rectangle
-if ( (*aPageIter)->bVisible )
+if ( rpPreviewPage->bVisible )
{
-if ( !(*aPageIter)->pPage->IsEmptyPage() )
+if ( !rpPreviewPage->pPage->IsEmptyPage() )
{
AdjustLogicPgRectToVisibleArea( aLogicPgSwRect,
SwRect( aPreviewPgRect ),
@@ -1781,7 +1779,7 @@ uno::Reference< XAccessible >
SwAccessibleMap::GetDocumentView( )
}
uno::Reference SwAccessibleMap
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/XMLStylesExportHelper.cxx | 85 -
sc/source/filter/xml/XMLStylesExportHelper.hxx | 10 +-
sc/source/filter/xml/xmlexprt.cxx | 30 ++--
3 files changed, 43 insertions(+), 82 deletions(-)
New commits:
commit d94ec445b7377062a5b6503c2dc4a3182612cd0e
Author: Noel Grandin
AuthorDate: Thu Aug 16 11:00:46 2018 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 17 10:30:23 2018 +0200
loplugin:useuniqueptr in ScFormatRangeStyles
no need to store a ref-counted thing like OUString on the heap, just put
it directly inside a std::vector.
And no need to store a dynamic container like std::list on the heap
either, just put it directly inside a std::vector.
Change-Id: If14a620916caab543d799ca868ee94129a51c672
Reviewed-on: https://gerrit.libreoffice.org/59224
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index dba0fee848f6..3ee8db545ea9 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -703,27 +703,6 @@ ScFormatRangeStyles::ScFormatRangeStyles()
ScFormatRangeStyles::~ScFormatRangeStyles()
{
-auto i(aStyleNames.begin());
-auto endi(aStyleNames.end());
-while (i != endi)
-{
-delete *i;
-++i;
-}
-i = aAutoStyleNames.begin();
-endi = aAutoStyleNames.end();
-while (i != endi)
-{
-delete *i;
-++i;
-}
-ScMyFormatRangeListVec::iterator j(aTables.begin());
-ScMyFormatRangeListVec::iterator endj(aTables.end());
-while (j != endj)
-{
-delete *j;
-++j;
-}
}
void ScFormatRangeStyles::AddNewTable(const sal_Int32 nTable)
@@ -732,16 +711,15 @@ void ScFormatRangeStyles::AddNewTable(const sal_Int32
nTable)
if (nTable > nSize)
for (sal_Int32 i = nSize; i < nTable; ++i)
{
-ScMyFormatRangeAddresses* aRangeAddresses(new
ScMyFormatRangeAddresses);
-aTables.push_back(aRangeAddresses);
+aTables.emplace_back();
}
}
-bool ScFormatRangeStyles::AddStyleName(OUString* rpString, sal_Int32& rIndex,
const bool bIsAutoStyle)
+bool ScFormatRangeStyles::AddStyleName(OUString const & rString, sal_Int32&
rIndex, const bool bIsAutoStyle)
{
if (bIsAutoStyle)
{
-aAutoStyleNames.push_back(rpString);
+aAutoStyleNames.push_back(rString);
rIndex = aAutoStyleNames.size() - 1;
return true;
}
@@ -752,7 +730,7 @@ bool ScFormatRangeStyles::AddStyleName(OUString* rpString,
sal_Int32& rIndex, co
sal_Int32 i(nCount - 1);
while ((i >= 0) && (!bFound))
{
-if (*aStyleNames.at(i) == *rpString)
+if (aStyleNames.at(i) == rString)
bFound = true;
else
i--;
@@ -764,7 +742,7 @@ bool ScFormatRangeStyles::AddStyleName(OUString* rpString,
sal_Int32& rIndex, co
}
else
{
-aStyleNames.push_back(rpString);
+aStyleNames.push_back(rString);
rIndex = aStyleNames.size() - 1;
return true;
}
@@ -776,7 +754,7 @@ sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const
OUString& rString, cons
sal_Int32 nPrefixLength(rPrefix.getLength());
OUString sTemp(rString.copy(nPrefixLength));
sal_Int32 nIndex(sTemp.toInt32());
-if (nIndex > 0 && static_cast(nIndex-1) < aAutoStyleNames.size()
&& *aAutoStyleNames.at(nIndex - 1) == rString)
+if (nIndex > 0 && static_cast(nIndex-1) < aAutoStyleNames.size()
&& aAutoStyleNames.at(nIndex - 1) == rString)
{
bIsAutoStyle = true;
return nIndex - 1;
@@ -787,7 +765,7 @@ sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const
OUString& rString, cons
bool bFound(false);
while (!bFound && static_cast(i) < aStyleNames.size())
{
-if (*aStyleNames[i] == rString)
+if (aStyleNames[i] == rString)
bFound = true;
else
++i;
@@ -802,7 +780,7 @@ sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const
OUString& rString, cons
i = 0;
while (!bFound && static_cast(i) < aAutoStyleNames.size())
{
-if (*aAutoStyleNames[i] == rString)
+if (aAutoStyleNames[i] == rString)
bFound = true;
else
++i;
@@ -824,21 +802,16 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const
sal_Int32 nTable,
OSL_ENSURE(static_cast(nTable) < aTables.size(), "wrong table");
if (static_cast(nTable) >= aTables.size())
return -1;
-ScMyFormatRangeAddresses* pFormatRanges(aTables[nTable]);
-ScMyFormatRangeAddresses::iterator aItr(pFormatRanges->begin());
-ScMyFormatRangeAddresses::iterator aEndItr(pFo
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - python3/python-3.3.7-c99.patch.1 python3/python-3.3.7-vcproj.patch.1 python3/UnpackedTarball_python3.mk
python3/UnpackedTarball_python3.mk |2 +
python3/python-3.3.7-c99.patch.1| 38
python3/python-3.3.7-vcproj.patch.1 | 20 ++
3 files changed, 60 insertions(+)
New commits:
commit d46694b4f7f745a5095b04137ee50b8aa03914b1
Author: Thorsten Behrens
AuthorDate: Thu Aug 16 17:17:41 2018 +0200
Commit: Thorsten Behrens
CommitDate: Thu Aug 16 21:40:34 2018 +0200
python3: fix msbuild files for vs2012
Change-Id: I6cfbbcf9326ea86e1c4a91652e3b789c6c5db0fd
diff --git a/python3/UnpackedTarball_python3.mk
b/python3/UnpackedTarball_python3.mk
index 24bfaa673b5f..901012640770 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/python-msvc-disable-sse2.patch.1 \
python3/ubsan.patch.0 \
python3/python-3.3.7-py30657.patch.1 \
+ python3/python-3.3.7-c99.patch.1 \
+ python3/python-3.3.7-vcproj.patch.1 \
))
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/python3/python-3.3.7-c99.patch.1 b/python3/python-3.3.7-c99.patch.1
new file mode 100644
index ..8cdf03458fc9
--- /dev/null
+++ b/python3/python-3.3.7-c99.patch.1
@@ -0,0 +1,38 @@
+--- python3/Modules/expat/xmltok.c~2017-09-19 09:32:02.0 +0200
python3/Modules/expat/xmltok.c 2018-08-16 14:09:32.350949800 +0200
+@@ -31,7 +31,12 @@
+ */
+
+ #include
+-#include
++
++//#include
++typedef int bool;
++#define false 0
++#define true 1
++
+ #include // memcpy
+
+ #ifdef _WIN32
+@@ -404,6 +409,7 @@
+ output_exhausted = true;
+ }
+
++ {
+ /* Avoid copying partial characters (from incomplete input). */
+ const char * const fromLimBefore = fromLim;
+ align_limit_to_full_utf8_characters(*fromP, &fromLim);
+@@ -411,10 +417,13 @@
+ input_incomplete = true;
+ }
+
++ {
+ const ptrdiff_t bytesToCopy = fromLim - *fromP;
+ memcpy((void *)*toP, (const void *)*fromP, (size_t)bytesToCopy);
+ *fromP += bytesToCopy;
+ *toP += bytesToCopy;
++ }
++ }
+
+ if (output_exhausted) // needs to go first
+ return XML_CONVERT_OUTPUT_EXHAUSTED;
diff --git a/python3/python-3.3.7-vcproj.patch.1
b/python3/python-3.3.7-vcproj.patch.1
new file mode 100644
index ..9a9bf06bd90a
--- /dev/null
+++ b/python3/python-3.3.7-vcproj.patch.1
@@ -0,0 +1,20 @@
+--- python3/PCbuild/pyexpat.vcxproj~ 2017-09-19 09:32:02.0 +0200
python3/PCbuild/pyexpat.vcxproj2018-08-16 18:45:44.202252500 +0200
+@@ -222,6 +222,7 @@
+
+
+
++
+
+
+
+--- python3/PCbuild/_elementtree.vcxproj~ 2017-09-19 09:32:02.0
+0200
python3/PCbuild/_elementtree.vcxproj 2018-08-16 19:21:43.515980500
+0200
+@@ -254,6 +254,7 @@
+
+
+
++
+
+
+
___
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/modules/installer/simplepackage.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 070254c2a129d8e35bbdb37d38f90fec03490182
Author: Stephan Bergmann
AuthorDate: Thu Aug 16 23:57:21 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Aug 17 09:41:58 2018 +0200
Print (raw) exit code on system() failure
Change-Id: I5d99319aa336c02dc0c20ab2bc3a1302840d100d
Reviewed-on: https://gerrit.libreoffice.org/59242
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 30f41e43f6ff..f5337e59dc18 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -457,7 +457,7 @@ sub create_package
if ($returnvalue)
{
-$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+$infoline = "ERROR: Could not execute \"$systemcall\":
$returnvalue\n";
push( @installer::globals::logfileinfo, $infoline);
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/export/drawingml.cxx | 34 ++
sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 10 -
3 files changed, 35 insertions(+), 9 deletions(-)
New commits:
commit f5f235051055d24c8aced602078c54261603efea
Author: Adam Kovacs
AuthorDate: Thu Aug 16 09:32:17 2018 -0400
Commit: László Németh
CommitDate: Fri Aug 17 09:37:05 2018 +0200
tdf108064 OOXML export: keep preset dashes in shape outlines
Extending commit d7551e32609d0e0de8ac419576ca42d65c5015be
to all default MSO 2016 preset dashes:
Saving an ooxml file with LibreOffice now preserves the
prstDash tags with the values sysDot, sysDash, dash, dashDot,
lgDash, lgDashDot, lgDashDotDot, instead of converting them
to custDash tags.
Note: the import of the preset dash outlines are still not
relative to the line width, in spite of their original
behaviour in MSO.
Change-Id: I65eaf06952a968019495664067010c874fce1352
Reviewed-on: https://gerrit.libreoffice.org/59203
Tested-by: Jenkins
Reviewed-by: László Németh
Tested-by: László Németh
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index b19042e1c140..6536798be85b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -700,14 +700,34 @@ void DrawingML::WriteOutline( const
Reference& rXPropSet )
if( bDashSet && aStyleLineStyle != drawing::LineStyle_DASH )
{
-// line style is a dash and it was not set by the shape style
-
-if (aLineDash.Dashes == 1 && aLineDash.DashLen == 564 &&
aLineDash.Distance == 423)
+// keep default preset linestyles (instead of custdash)
+if (aLineDash.Dots == 1 && aLineDash.DotLen == 141 && aLineDash.Dashes
== 0 && aLineDash.DashLen == 0 && aLineDash.Distance == 141)
{
-// That's exactly the predefined "dash" value.
-mpFS->singleElementNS(XML_a, XML_prstDash,
- XML_val, "dash",
- FSEND);
+mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, "sysDot",
FSEND);
+}
+else if (aLineDash.Dots == 0 && aLineDash.DotLen == 0 &&
aLineDash.Dashes == 1 && aLineDash.DashLen == 423 && aLineDash.Distance == 141)
+{
+mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, "sysDash",
FSEND);
+}
+else if (aLineDash.Dots == 0 && aLineDash.DotLen == 0 &&
aLineDash.Dashes == 1 && aLineDash.DashLen == 564 && aLineDash.Distance == 423)
+{
+mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, "dash", FSEND);
+}
+else if (aLineDash.Dots == 1 && aLineDash.DotLen == 141 &&
aLineDash.Dashes == 1 && aLineDash.DashLen == 564 && aLineDash.Distance == 423)
+{
+mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, "dashDot",
FSEND);
+}
+else if (aLineDash.Dots == 0 && aLineDash.DotLen == 0 &&
aLineDash.Dashes == 1 && aLineDash.DashLen == 1128 && aLineDash.Distance == 423)
+{
+mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, "lgDash",
FSEND);
+}
+else if (aLineDash.Dots == 1 && aLineDash.DotLen == 141 &&
aLineDash.Dashes == 1 && aLineDash.DashLen == 1128 && aLineDash.Distance == 423)
+{
+mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, "lgDashDot",
FSEND);
+}
+else if (aLineDash.Dots == 2 && aLineDash.DotLen == 141 &&
aLineDash.Dashes == 1 && aLineDash.DashLen == 1128 && aLineDash.Distance == 423)
+{
+mpFS->singleElementNS(XML_a, XML_prstDash, XML_val,
"lgDashDotDot", FSEND);
}
else
{
diff --git a/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx
b/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx
index 9256c3ec7a4e..d7997ddc63c6 100644
Binary files a/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx and
b/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 3a20b765f934..a41dd05501f4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -840,13 +840,19 @@ DECLARE_OOXMLEXPORT_TEST(testAlignForShape,"Shape.docx")
DECLARE_OOXMLEXPORT_TEST(testLineStyle_DashType, "LineStyle_DashType.docx")
{
/* DOCX contatining Shape with LineStyle as Dash Type should get preserved
inside
- * an XMl tag with value "dash".
+ * an XMl tag with value "dash", "sysDot", "lgDot", etc.
*/
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
if (!pXmlDoc)
return;
-assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash",
"val", "dash");
+assertXP
[Libreoffice-commits] core.git: sw/source
sw/source/ui/envelp/envprt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 849cedc47333416d05d93801701c7751e080f2eb
Author: Caolán McNamara
AuthorDate: Thu Aug 16 15:13:59 2018 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 17 09:31:46 2018 +0200
insert->envelope->printer->setup crashes
Change-Id: I06d91941eaab0f622b384e9b3379d033890fd92f
Reviewed-on: https://gerrit.libreoffice.org/59184
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index fee13aabad94..c25a1ff7eb08 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -118,7 +118,7 @@ IMPL_LINK(SwEnvPrtPage, ButtonHdl, weld::Button&, rBtn,
void)
// Call printer setup
if (m_xPrt)
{
-PrinterSetupDialog aDlg(GetTabDialog()->GetFrameWeld());
+PrinterSetupDialog aDlg(GetDialogController()->getDialog());
aDlg.SetPrinter(m_xPrt);
aDlg.execute();
rBtn.grab_focus();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Error on First Run in Windows: Solar Mutex not owned
thanks, should be fixed soon with https://gerrit.libreoffice.org/59245 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
