[Libreoffice-commits] core.git: svtools/source
svtools/source/contnr/svimpbox.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 44e9bbc29cc37d2bac089b8f051478f62f7d5d31 Author: Jim Raykowski Date: Fri Jan 19 15:31:18 2018 -0900 tdf#115105 Fix Styles and Macros nodes don't expand in Customize dialog by initializing bSubLstOpDblClick true. Change-Id: I1e3419014cd0c0bf9d4363d0fc365124413d5508 Reviewed-on: https://gerrit.libreoffice.org/48227 Reviewed-by: Muhammet Kara Tested-by: Muhammet Kara diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 61cb5e274436..8f4e6b0fe443 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -111,6 +111,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinS nFlags |= LBoxFlags::Filling; bSubLstOpRet = bSubLstOpLR = bContextMenuHandling = bIsCellFocusEnabled = false; +bSubLstOpDblClick = true; } SvImpLBox::~SvImpLBox() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark
dev/null |binary icon-themes/sifr/cmd/32/exportto.png |binary icon-themes/sifr/cmd/32/numberformatthousands.png |binary icon-themes/sifr/cmd/32/splitcells.png |binary icon-themes/sifr/cmd/lc_exportto.png |binary icon-themes/sifr/cmd/lc_numberformatthousands.png |binary icon-themes/sifr/cmd/lc_splitcells.png |binary icon-themes/sifr/cmd/sc_exportto.png |binary icon-themes/sifr/cmd/sc_numberformatthousands.png |binary icon-themes/sifr/cmd/sc_splitcells.png |binary icon-themes/sifr_dark/cmd/32/exportto.png |binary icon-themes/sifr_dark/cmd/32/numberformatthousands.png |binary icon-themes/sifr_dark/cmd/32/splitcells.png|binary icon-themes/sifr_dark/cmd/lc_exportdirecttopdf.png |binary icon-themes/sifr_dark/cmd/lc_exportto.png |binary icon-themes/sifr_dark/cmd/lc_numberformatthousands.png |binary icon-themes/sifr_dark/cmd/lc_splitcells.png|binary icon-themes/sifr_dark/cmd/sc_exportdirecttopdf.png |binary icon-themes/sifr_dark/cmd/sc_exportto.png |binary icon-themes/sifr_dark/cmd/sc_numberformatthousands.png |binary icon-themes/sifr_dark/cmd/sc_splitcells.png|binary 21 files changed New commits: commit 342a56deda984a1a21b7a49b56acfaed4ebdfd9a Author: Matthias Freund Date: Sun Jan 21 23:58:45 2018 +0100 tdf#75256 Sifr update exportto numberformatthousands splitcells Change-Id: Idb2b8e1234528cffcc54fd5a2e354ce3cb30a030 Reviewed-on: https://gerrit.libreoffice.org/48283 Tested-by: Jenkins Reviewed-by: Matthias Freund diff --git a/icon-themes/sifr/cmd/32/exportto.png b/icon-themes/sifr/cmd/32/exportto.png new file mode 100644 index ..4d2fa21d2cdd Binary files /dev/null and b/icon-themes/sifr/cmd/32/exportto.png differ diff --git a/icon-themes/sifr/cmd/32/numberformatthousands.png b/icon-themes/sifr/cmd/32/numberformatthousands.png index cf91bf722449..0da5b6ea6346 100644 Binary files a/icon-themes/sifr/cmd/32/numberformatthousands.png and b/icon-themes/sifr/cmd/32/numberformatthousands.png differ diff --git a/icon-themes/sifr/cmd/32/splitcells.png b/icon-themes/sifr/cmd/32/splitcells.png new file mode 100644 index ..9eeb4656f610 Binary files /dev/null and b/icon-themes/sifr/cmd/32/splitcells.png differ diff --git a/icon-themes/sifr/cmd/lc_exportto.png b/icon-themes/sifr/cmd/lc_exportto.png index a3a42355dc3b..40dcf8056f19 100644 Binary files a/icon-themes/sifr/cmd/lc_exportto.png and b/icon-themes/sifr/cmd/lc_exportto.png differ diff --git a/icon-themes/sifr/cmd/lc_numberformatthousands.png b/icon-themes/sifr/cmd/lc_numberformatthousands.png index 31fe85468611..a2e744374766 100644 Binary files a/icon-themes/sifr/cmd/lc_numberformatthousands.png and b/icon-themes/sifr/cmd/lc_numberformatthousands.png differ diff --git a/icon-themes/sifr/cmd/lc_splitcells.png b/icon-themes/sifr/cmd/lc_splitcells.png new file mode 100644 index ..7772fd09ddf7 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_splitcells.png differ diff --git a/icon-themes/sifr/cmd/sc_exportto.png b/icon-themes/sifr/cmd/sc_exportto.png index c0450d78c75b..5513420d8183 100644 Binary files a/icon-themes/sifr/cmd/sc_exportto.png and b/icon-themes/sifr/cmd/sc_exportto.png differ diff --git a/icon-themes/sifr/cmd/sc_numberformatthousands.png b/icon-themes/sifr/cmd/sc_numberformatthousands.png index 913403a2e71d..ee5e1dd65630 100644 Binary files a/icon-themes/sifr/cmd/sc_numberformatthousands.png and b/icon-themes/sifr/cmd/sc_numberformatthousands.png differ diff --git a/icon-themes/sifr/cmd/sc_splitcells.png b/icon-themes/sifr/cmd/sc_splitcells.png new file mode 100644 index ..a73db5d51d17 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_splitcells.png differ diff --git a/icon-themes/sifr_dark/cmd/32/exportto.png b/icon-themes/sifr_dark/cmd/32/exportto.png new file mode 100644 index ..b7eb55332f87 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/exportto.png differ diff --git a/icon-themes/sifr_dark/cmd/32/numberformatthousands.png b/icon-themes/sifr_dark/cmd/32/numberformatthousands.png index 1231788dc700..890ea63f2306 100644 Binary files a/icon-themes/sifr_dark/cmd/32/numberformatthousands.png and b/icon-themes/sifr_dark/cmd/32/numberformatthousands.png differ diff --git a/icon-themes/sifr_dark/cmd/32/splitcells.png b/icon-themes/sifr_dark/cmd/32/splitcells.png new file mode 100644 index ..f698fb1fb975 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/splitcells.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_exportdirecttopdf.png b/icon-themes/sifr_dark/cmd/lc_exportdirecttopdf.png index 394aae9c62ff..af8178efad4e 100644 Binary files a/icon-themes/sifr_dark/cmd/lc_exportdirecttopdf.png and b/icon-themes/sifr_dark/cmd/lc_exportdirecttopdf.png dif
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/texteng.hxx |3 +--
vcl/source/edit/textdat2.hxx |6 +++---
vcl/source/edit/texteng.cxx | 11 ++-
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit df9a20fc3fce72ab19e71f3b17c43b5cb97dc871
Author: Noel Grandin
Date: Sun Jan 21 13:22:51 2018 +0200
improve RTL detection in TextEngine
the ubidi_getLogicalRun call returns a direction bool in bit 0,
so the old code would only have been correct for embedding level 0.
found by an up and coming loplugin.
Change-Id: I56658981fbd32caf0d961d47d76b668f1dd1b680
Reviewed-on: https://gerrit.libreoffice.org/48261
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index dcab1dd337b2..7d642ee7e116 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -62,7 +62,6 @@ namespace svl
class TextLine;
class TETextPortion;
-
struct TEIMEInfos;
class SvtCTLOptions;
@@ -195,7 +194,7 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster
longImpGetPortionXOffset( sal_uInt32 nPara, TextLine const
* pLine, std::size_t nTextPortion );
longImpGetXPos( sal_uInt32 nPara, TextLine* pLine,
sal_Int32 nIndex, bool bPreferPortionStart = false );
longImpGetOutputOffset( sal_uInt32 nPara, TextLine* pLine,
sal_Int32 nIndex, sal_Int32 nIndex2 );
-sal_uInt8 ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos );
+boolImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos );
static void ImpInitLayoutMode( OutputDevice* pOutDev );
TxtAlignImpGetAlign() const;
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index a69c718fd140..3c60509594d7 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -99,11 +99,11 @@ public:
struct TEWritingDirectionInfo
{
-sal_uInt8nType;
+bool bLeftToRight;
sal_Int32nStartPos;
sal_Int32nEndPos;
-TEWritingDirectionInfo( sal_uInt8 Type, sal_Int32 Start, sal_Int32 End )
-: nType {Type}
+TEWritingDirectionInfo( bool LeftToRight, sal_Int32 Start, sal_Int32 End )
+: bLeftToRight {LeftToRight}
, nStartPos {Start}
, nEndPos {End}
{}
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index ec57a36041a2..f8faf331ccf2 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -2778,7 +2778,8 @@ void TextEngine::ImpInitWritingDirections( sal_uInt32
nPara )
for ( long nIdx = 0; nIdx < nCount; ++nIdx )
{
ubidi_getLogicalRun( pBidi, nStart, &nEnd, &nCurrDir );
-rInfos.emplace_back( nCurrDir, nStart, nEnd );
+// bit 0 of nCurrDir indicates direction
+rInfos.emplace_back( /*bLeftToRight*/ nCurrDir % 2 == 0, nStart,
nEnd );
nStart = nEnd;
}
@@ -2791,9 +2792,9 @@ void TextEngine::ImpInitWritingDirections( sal_uInt32
nPara )
}
-sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos )
+bool TextEngine::ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos )
{
-sal_uInt8 nRightToLeft = 0;
+bool bRightToLeft = false;
TextNode* pNode = mpDoc->GetNodes()[ nPara ];
if ( pNode && !pNode->GetText().isEmpty() )
@@ -2807,12 +2808,12 @@ sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uInt32
nPara, sal_Int32 nPos )
{
if ( rWritingDirectionInfo.nStartPos <= nPos &&
rWritingDirectionInfo.nEndPos >= nPos )
{
-nRightToLeft = rWritingDirectionInfo.nType;
+bRightToLeft = !rWritingDirectionInfo.bLeftToRight;
break;
}
}
}
-return nRightToLeft;
+return bRightToLeft;
}
long TextEngine::ImpGetPortionXOffset( sal_uInt32 nPara, TextLine const *
pLine, std::size_t nTextPortion )
___
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/xls/fail/ofz5527-1.xls |binary
sc/source/filter/excel/xicontent.cxx |4 +++-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f6eefd96cb16a9b5607fe59bdbf9b1121c9b56e8
Author: Caolán McNamara
Date: Sun Jan 21 16:15:30 2018 +
copy ScAddress before possibly joining it
Change-Id: Ib1148584b9771da67d3f4b3141184228e1bbe3a2
Reviewed-on: https://gerrit.libreoffice.org/48271
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/qa/unit/data/xls/fail/ofz5527-1.xls
b/sc/qa/unit/data/xls/fail/ofz5527-1.xls
new file mode 100644
index ..334cafe42445
Binary files /dev/null and b/sc/qa/unit/data/xls/fail/ofz5527-1.xls differ
diff --git a/sc/source/filter/excel/xicontent.cxx
b/sc/source/filter/excel/xicontent.cxx
index b0d5b7284feb..626963c3a2a2 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -678,6 +678,8 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
// *** create the Calc conditional formatting ***
+const ScAddress aPos(rPos); //in case maRanges.Join invalidates it
+
if( !mxScCondFmt.get() )
{
mxScCondFmt.reset( new ScConditionalFormat( 0/*nKey*/, &GetDocRef() )
);
@@ -686,7 +688,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
mxScCondFmt->SetRange(maRanges);
}
-ScCondFormatEntry* pEntry = new ScCondFormatEntry( eMode, xTokArr1.get(),
pTokArr2.get(), &GetDocRef(), rPos, aStyleName );
+ScCondFormatEntry* pEntry = new ScCondFormatEntry(eMode, xTokArr1.get(),
pTokArr2.get(), &GetDocRef(), aPos, aStyleName);
mxScCondFmt->AddEntry( pEntry );
++mnCondIndex;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/bencont.cxx | 18 +++---
lotuswordpro/source/filter/bento.hxx |2 +-
lotuswordpro/source/filter/lwpgrfobj.cxx | 25 +++--
3 files changed, 15 insertions(+), 30 deletions(-)
New commits:
commit 6d6421d3e66aa012cd0ca0d903c3825e4212c643
Author: Caolán McNamara
Date: Sat Jan 20 21:09:29 2018 +
rework to remove intermediate stream
Change-Id: I6ff66cf6ea6ac38f7c36da7668b612b2062e4852
Reviewed-on: https://gerrit.libreoffice.org/48257
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/bencont.cxx
b/lotuswordpro/source/filter/bencont.cxx
index 71eda29213bd..c4125971d089 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -267,11 +267,12 @@ sal_uInt64 GetSvStreamSize(SvStream * pStream)
* Find hazily according to object ID
* @param pObjectname - format as "GrXX," wherein XX is high part of
object ID, and is low part
*/
-SvMemoryStream* LtcBenContainer::CreateGraphicStream(const char *pObjectName)
+std::vector LtcBenContainer::GetGraphicData(const char *pObjectName)
{
+std::vector aData;
if (!pObjectName)
{
-return nullptr;
+return aData;
}
// construct the string of property name
char sSName[64]="";
@@ -300,12 +301,11 @@ SvMemoryStream*
LtcBenContainer::CreateGraphicStream(const char *pObjectName)
// the 'D' stream is NULL or it has invalid length
if (nLen <= 0)
{
-return nullptr;
+return aData;
}
-char * pBuf = new char[nLen];
-assert(pBuf != nullptr);
-char * pPointer = pBuf;
+aData.resize(nLen);
+sal_uInt8* pPointer = aData.data();
if (xD)
{
xD->ReadBytes(pPointer, nDLen);
@@ -318,11 +318,7 @@ SvMemoryStream* LtcBenContainer::CreateGraphicStream(const
char *pObjectName)
xS.reset();
}
-SvMemoryStream* pMemStream = new SvMemoryStream(pBuf, nLen,
StreamMode::READ);
-assert(pMemStream != nullptr);
-pMemStream->ObjectOwnsMemory(true);
-
-return pMemStream;
+return aData;
}
sal_uLong LtcBenContainer::remainingSize() const
diff --git a/lotuswordpro/source/filter/bento.hxx
b/lotuswordpro/source/filter/bento.hxx
index f1cd48b4abae..4608b9b21996 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -221,7 +221,7 @@ public: // Internal methods
LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char *
sPropertyName);
LtcUtBenValueStream * FindValueStreamWithPropertyName(const char *
sPropertyName);
-SvMemoryStream* CreateGraphicStream(const char *pObjectName);
+std::vector GetGraphicData(const char *pObjectName);
sal_uLong GetSize() const { return m_ulLength; }
private: // Data
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx
b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 30431b7a1bb3..f0e355125249 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -302,14 +302,13 @@ void LwpGraphicObject::CreateDrawObjects()
GetBentoNamebyID(rMyID, aGrfObjName);
// get bento stream by the name
-SvStream* pDrawObjStream =
pBentoContainer->CreateGraphicStream(aGrfObjName.c_str());
-if (pDrawObjStream)
+std::vector aData =
pBentoContainer->GetGraphicData(aGrfObjName.c_str());
+if (!aData.empty())
{
-LwpSdwFileLoader fileLoader(pDrawObjStream, this);
-fileLoader.CreateDrawObjects(&m_vXFDrawObjects);
+SvMemoryStream aDrawObjStream(aData.data(), aData.size(),
StreamMode::READ);
-delete pDrawObjStream;
-pDrawObjStream = nullptr;
+LwpSdwFileLoader fileLoader(&aDrawObjStream, this);
+fileLoader.CreateDrawObjects(&m_vXFDrawObjects);
}
}
@@ -352,18 +351,8 @@ std::vector LwpGraphicObject::GetRawGrafData()
std::string aGrfObjName;
GetBentoNamebyID(rMyID, aGrfObjName);
-// get bento stream by the name
-SvMemoryStream* pMemGrafStream =
pBentoContainer->CreateGraphicStream(aGrfObjName.c_str());
-if (pMemGrafStream)
-{
-// read image data
-aGrafData.resize(pMemGrafStream->GetEndOfData());
-pMemGrafStream->ReadBytes(aGrafData.data(), aGrafData.size());
-
-delete pMemGrafStream;
-}
-
-return aGrafData;
+// get bento stream by the name and read image data
+return pBentoContainer->GetGraphicData(aGrfObjName.c_str());
}
/**
___
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' - sysui/desktop
sysui/desktop/apparmor/program.soffice.bin | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
New commits:
commit c7d88cb4c2981fcfab709755c9dac03ee09a6195
Author: Rene Engelhard
Date: Thu Jan 18 23:11:54 2018 +0100
deb#887593 apparmor: updates for gpg
This squashes
commit 24702687433842a6e9e8a1070ead46c035192bf3
Author: Rene Engelhard
Date: Sat Jan 20 15:54:43 2018 +0100
deb#887593 use child profile for gpg
add gpg and gpgsm to soffice.bin apparmor profile
parts of
commit c6a19889e91f2585453636667e3d5779b153ab86
Author: Rene Engelhard
Date: Thu Jan 18 23:12:03 2018 +0100
deb#887593 apparmor: allow soffice.bin reading .mozilla/firefox and
.gnupg
and
commit e64e7da9b222cebfdff270059f5182e71b667796
Author: Rene Engelhard
Date: Thu Jan 18 23:11:54 2018 +0100
deb#887593 add gpg and gpgsm to soffice.bin apparmor profile
and parts of
and parts of
commit d4440ce6b5964d08be1e5841ed301112b260823d
Author: Rene Engelhard
Date: Thu Jan 18 23:19:46 2018 +0100
update copyright years
Change-Id: I634c1132265295f90f624a53b93dddb2b18eabd5
and
Author: Rene Engelhard
Date: Sat Jan 20 23:25:07 2018 +0100
deb#887593 make gpg child profile really work
now I can see my testkey and sign. Thanks Christian Bolz
and
commit cae52b77d48916d819e788675f40da5fe4f7c99c
Author: Rene Engelhard
Date: Sat Jan 20 23:28:51 2018 +0100
readd lost comment
Change-Id: I15dfc46acec9487bf3550d208d79257527cd6791
Reviewed-on: https://gerrit.libreoffice.org/48241
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index a365f6297781..cf967ba89a77 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -1,7 +1,7 @@
# --
#
#Copyright (C) 2016 Canonical Ltd.
-#Copyright (C) 2017 Software in the Public Interest, Inc.
+#Copyright (C) 2018 Software in the Public Interest, Inc.
#
#This Source Code Form is subject to the terms of the Mozilla Public
#License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -74,6 +74,8 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
#include
#include
#include
+# GnuPG1 only...
+# #include
#include
#include
@@ -114,6 +116,8 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
/usr/bin/lpr rmPUx,
/usr/bin/paperconfrmix,
/usr/bin/gpgconf rmix,
+ /usr/bin/gpg rmCx -> gpg,
+ /usr/bin/gpgsmrmCx -> gpg,
/dev/tty rw,
@@ -154,4 +158,15 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
owner @{HOME}/.icons/*/cursors/* r,
/usr/share/*-fonts/conf.avail/*.conf r,
/usr/share/fonts-config/conf.avail/*.conf r,
+
+ # there is abstractions/gnupg but that's just for gpg1...
+ profile gpg {
+#include
+
+ /usr/bin/gpgconf rm,
+ /usr/bin/gpg rm,
+ /usr/bin/gpgsm rm,
+
+owner @{HOME}/.gnupg/* r,
+ }
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/tblrwcl.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 8aa37ca1b94a340c0ca3dc4edebdc501edc25cf5
Author: Caolán McNamara
Date: Sun Jan 21 21:23:11 2018 +
ubsan SwTableBoxFormat is really SwTableLineFormat
/sw/source/core/doc/tblrwcl.cxx:1937:29: runtime error: downcast of
address 0x2b328cff7da8 which does not point to an object of type
´SwTableBoxFormat´
0x2b328cff7da8: note: object is of type ´SwTableLineFormat´
00 00 00 00 f0 ea dd 46 32 2b 00 00 b8 80 ff 8c 32 2b 00 00 e8 43 f5
00 90 61 00 00 58 79 65 80
^~~
vptr for ´SwTableLineFormat´
#0 0x2b323c386daf in lcl_CopyLineToDoc(FndLine_ const&, CpyPara*)
/sw/source/core/doc/tblrwcl.cxx:1937:29
Change-Id: I16f7b61a3561de3e599818aba538c72c631511ca
Reviewed-on: https://gerrit.libreoffice.org/48282
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 505ecc7c92eb..dd1856646ed4 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -79,12 +79,12 @@ using namespace com::sun::star::uno;
struct CpyTabFrame
{
union {
-SwTableBoxFormat *pFrameFormat; // for CopyCol
-SwTwips nSize; // for DelCol
+SwFrameFormat* pFrameFormat; // for CopyCol
+SwTwips nSize; // for DelCol
} Value;
SwTableBoxFormat *pNewFrameFormat;
-explicit CpyTabFrame( SwTableBoxFormat* pAktFrameFormat ) :
pNewFrameFormat( nullptr )
+explicit CpyTabFrame(SwFrameFormat* pAktFrameFormat) : pNewFrameFormat(
nullptr )
{ Value.pFrameFormat = pAktFrameFormat; }
bool operator==( const CpyTabFrame& rCpyTabFrame ) const
@@ -279,7 +279,7 @@ static void lcl_CopyCol( FndBox_ & rFndBox, CpyPara *const
pCpyPara)
{
// Look up the Frame Format in the Frame Format Array
SwTableBox* pBox = rFndBox.GetBox();
-CpyTabFrame aFindFrame(
static_cast(pBox->GetFrameFormat()) );
+CpyTabFrame aFindFrame(pBox->GetFrameFormat());
sal_uInt16 nFndPos;
if( pCpyPara->nCpyCnt )
@@ -379,7 +379,7 @@ static void lcl_CopyCol( FndBox_ & rFndBox, CpyPara *const
pCpyPara)
? rBoxItem.GetTop()
: rBoxItem.GetRight() )
{
-aFindFrame.Value.pFrameFormat =
static_cast(pBox->GetFrameFormat());
+aFindFrame.Value.pFrameFormat = pBox->GetFrameFormat();
SvxBoxItem aNew( rBoxItem );
if( 8 > pCpyPara->nDelBorderFlag )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/strings.hrc|1 +
svtools/source/java/javainteractionhandler.cxx | 10 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 506e1396c34bb90c8d2c3679e3e84c3833b18869
Author: tagezi
Date: Sun Jan 21 19:08:30 2018 +0300
tdf#115002 Including of bitness information into Java message on Windows
Change-Id: Id5235360110cf9838a38f8063448b06a5de1f82c
Reviewed-on: https://gerrit.libreoffice.org/48272
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index e9e05f2f8109..5413f7794daa 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -282,6 +282,7 @@
#define STR_SVT_DEFAULT_SERVICE_LABEL
NC_("STR_SVT_DEFAULT_SERVICE_LABEL", "$user$'s $service$")
#define STR_WARNING_JAVANOTFOUND
NC_("STR_WARNING_JAVANOTFOUND", "%PRODUCTNAME requires a Java runtime
environment (JRE) to perform this task. Please install a JRE and restart
%PRODUCTNAME.")
+#define STR_WARNING_JAVANOTFOUND_WIN
NC_("STR_WARNING_JAVANOTFOUND_WIN", "%PRODUCTNAME requires a %BITNESS-bit Java
runtime environment (JRE) to perform this task. Please install a JRE and
restart %PRODUCTNAME.")
#define STR_WARNING_JAVANOTFOUND_MAC
NC_("STR_WARNING_JAVANOTFOUND_MAC", "%PRODUCTNAME requires Oracle's Java
Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please
install them and restart %PRODUCTNAME.")
#define STR_WARNING_INVALIDJAVASETTINGS_MAC
NC_("STR_WARNING_INVALIDJAVASETTINGS_MAC", "The %PRODUCTNAME configuration has
been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced,
select the Java runtime environment you want to have used by %PRODUCTNAME.")
#define STR_WARNING_INVALIDJAVASETTINGS
NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been
changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java
runtime environment you want to have used by %PRODUCTNAME.")
diff --git a/svtools/source/java/javainteractionhandler.cxx
b/svtools/source/java/javainteractionhandler.cxx
index ba9625065663..6eb906a23005 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -118,8 +118,16 @@ void SAL_CALL JavaInteractionHandler::handle( const
Reference< XInteractionReque
// No suitable JRE found
SolarMutexGuard aSolarGuard;
m_bJavaNotFound_Handled = true;
-#ifdef MACOSX
+#if defined( MACOSX )
ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr,
SvtResId(STR_WARNING_JAVANOTFOUND_MAC), VclMessageType::Warning);
+#elif defined( _WIN32 )
+ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr,
SvtResId(STR_WARNING_JAVANOTFOUND_WIN), VclMessageType::Warning);
+OUString sPrimTex = aWarningBox->get_primary_text();
+#if defined( _WIN64 )
+aWarningBox->set_primary_text(sPrimTex.replaceAll( "%BITNESS",
"64" ));
+#else
+aWarningBox->set_primary_text(sPrimTex.replaceAll( "%BITNESS",
"32" ));
+#endif
#else
ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr,
SvtResId(STR_WARNING_JAVANOTFOUND), VclMessageType::Warning);
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/2a055c05381824644cc9c71615578dbb9c6976e3/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
CppunitTest_xmlsecurity_signing Unit Test Failure on 32-bit Linux
With both gcc and clang on Fedora 25, the build is failing with an assertion failure. This issue started with commit: https://cgit.freedesktop.org/libreoffice/core/commit/?id=8242c22f84cef1bbc8c385875b2da4713b542329 [CUT] xmlsecurity_signing SigningTest::testODFBrokenStreamGPG finished in: 639ms SigningTest::testODFBrokenDsigGPG finished in: 5475ms /core/unotest/source/cpp/macros_test.cxx:52:SigningTest::testODFEncryptedGPG assertion failed - Expression: xComponent.is() - loading failed: file:///core//xmlsecurity/qa/unit/signing/data/encryptedGPG.odt SigningTest::testODFEncryptedGPG finished in: 10168ms macros_test.cxx:52:Assertion Test name: SigningTest::testODFEncryptedGPG assertion failed - Expression: xComponent.is() - loading failed: file:///core//xmlsecurity/qa/unit/signing/data/encryptedGPG.odt Failures !!! Run: 24 Failure total: 1 Failures: 1 Errors: 0 Error: a unit test failed, please do one of: make CppunitTest_xmlsecurity_signing CPPUNITTRACE="gdb --args" # for interactive debugging on Linux ... /core/solenv/gbuild/CppunitTest.mk:114: recipe for target '/core/workdir/CppunitTest/xmlsecurity_signing.test' failed make[1]: *** [/core/workdir/CppunitTest/xmlsecurity_signing.test] Error 1 make[1]: *** Waiting for unfinished jobs Makefile:280: recipe for target 'build' failed make: *** [build] Error 2 $clang --version clang version 7.0.0 (trunk 322869) Target: i686-pc-linux-gnu $ gcc --version gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: CppunitTest_xmlsecurity_signing Unit Test Failure on 32-bit Linux
Luke Benes wrote: > /core/unotest/source/cpp/macros_test.cxx:52:SigningTest::testODFEncryptedGPG > assertion failed > - Expression: xComponent.is() > - loading failed: > file:///core//xmlsecurity/qa/unit/signing/data/encryptedGPG.odt > Hi Luke, this is weird - path is constructed exactly the same as for the other tests - can you perhaps run the tests with SAL_LOG="+WARN.+INFO.xmlsecurity+INFO.comphelper.crypto" for some extra diagnosis output? Likely something deeper inside gpgme and/or gpg is failing here, would be great if you could narrow that down to a backtrace perhaps? All the best, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/bencont.cxx | 33 ++---
1 file changed, 26 insertions(+), 7 deletions(-)
New commits:
commit fba9512f4f5fc424985528b28ab038194c931a1a
Author: Caolán McNamara
Date: Sun Jan 21 14:33:53 2018 +
ofz#5508 Out of memory
Change-Id: If46b4f98849d75164956e68c181b1c501a72fae0
Reviewed-on: https://gerrit.libreoffice.org/48266
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/bencont.cxx
b/lotuswordpro/source/filter/bencont.cxx
index c4125971d089..a39650c6de01 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -263,6 +263,27 @@ sal_uInt64 GetSvStreamSize(SvStream * pStream)
return ulLength;
}
+namespace
+{
+void readDataInBlocks(SvStream& rSt, sal_uInt64 nDLen,
std::vector& rData)
+{
+//read data in blocks as its more likely large values are simply broken
+//and we'll run out of data before we need to realloc
+for (sal_uInt64 i = 0; i < nDLen; i+= SAL_MAX_UINT16)
+{
+ size_t nOldSize = rData.size();
+ size_t nBlock = std::min(SAL_MAX_UINT16, nDLen - nOldSize);
+ rData.resize(nOldSize + nBlock);
+ size_t nReadBlock = rSt.ReadBytes(rData.data() + nOldSize, nBlock);
+ if (nBlock != nReadBlock)
+ {
+ rData.resize(nOldSize + nReadBlock);
+ break;
+ }
+}
+}
+}
+
/**
* Find hazily according to object ID
* @param pObjectname - format as "GrXX," wherein XX is high part of
object ID, and is low part
@@ -291,12 +312,13 @@ std::vector
LtcBenContainer::GetGraphicData(const char *pObjectName)
{
nDLen = GetSvStreamSize(xD.get());
}
-sal_uInt64 nLen = nDLen;
+sal_uInt64 nSLen = 0;
if (xS)
{
-nLen += GetSvStreamSize(xS.get()) ;
+nSLen = GetSvStreamSize(xS.get()) ;
}
+sal_uInt64 nLen = nDLen + nSLen;
OSL_ENSURE(nLen > 0, "expected a non-0 length");
// the 'D' stream is NULL or it has invalid length
if (nLen <= 0)
@@ -304,17 +326,14 @@ std::vector
LtcBenContainer::GetGraphicData(const char *pObjectName)
return aData;
}
-aData.resize(nLen);
-sal_uInt8* pPointer = aData.data();
if (xD)
{
-xD->ReadBytes(pPointer, nDLen);
+readDataInBlocks(*xD, nDLen, aData);
xD.reset();
}
-pPointer += nDLen;
if (xS)
{
-xS->ReadBytes(pPointer, nLen - nDLen);
+readDataInBlocks(*xS, nSLen, aData);
xS.reset();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx | 14 --
1 file changed, 14 deletions(-)
New commits:
commit 57fd33408a5a3ae4d2a9ff68ee5513ff1192b6ad
Author: jan Iversen
Date: Sun Jan 21 12:57:59 2018 +0100
iOS, removed iOS special handling in init()
Removed the need for the (limited) init() used earlier by iOS.
Due to problems solved below init() it is now posible to use
the standard init !!
init.cxx still have some special handling of paintTile, which we should try
to eliminate
Change-Id: I42234aea8ac6b8dfcf8c3c88b386b4d4a97bba74
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 468a145f31c6..b3631ba3ade7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3504,7 +3504,6 @@ static bool initialize_uno(const OUString& aAppProgramURL)
return true;
}
-#ifndef IOS
static void lo_startmain(void*)
{
osl_setThreadName("lo_startmain");
@@ -3516,7 +3515,6 @@ static void lo_startmain(void*)
Application::ReleaseSolarMutex();
}
-#endif
static bool bInitialized = false;
@@ -3651,14 +3649,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
// CommandLineArgs):
desktop::Desktop::GetCommandLineArgs().setHeadless();
-#ifdef IOS
-// mpDefInst need to be initialized, which only happens in
InitVCL(),
-// there might be more elegant ways to get InitVCL() called, but
-// this one works :-)
-InitVCL();
-SfxApplication::GetOrCreate();
-#endif
-
if (eStage == PRE_INIT)
{
std::cerr << "Init vcl\n";
@@ -3714,16 +3704,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
if (eStage != PRE_INIT)
{
SAL_INFO("lok", "Enabling RequestHandler");
-#ifdef IOS
-RequestHandler::Enable(true);
-#else
RequestHandler::Enable(false);
SAL_INFO("lok", "Starting soffice_main");
RequestHandler::SetReady(false);
pLib->maThread = osl_createThread(lo_startmain, nullptr);
SAL_INFO("lok", "Waiting for RequestHandler");
RequestHandler::WaitForReady();
-#endif
SAL_INFO("lok", "RequestHandler ready -- continuing");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/bencont.cxx | 14 ++
lotuswordpro/source/filter/bento.hxx |2 +-
lotuswordpro/source/filter/lwpgrfobj.cxx | 11 ++-
3 files changed, 9 insertions(+), 18 deletions(-)
New commits:
commit 430a56228ad50dde9399af30d638411380f93258
Author: Caolán McNamara
Date: Sat Jan 20 20:56:47 2018 +
just return SvMemoryStream*
Change-Id: I5c577984055e01f49c4e04685dc4df6672c8fc87
Reviewed-on: https://gerrit.libreoffice.org/48255
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/bencont.cxx
b/lotuswordpro/source/filter/bencont.cxx
index d3c046882e0f..71eda29213bd 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -267,12 +267,11 @@ sal_uInt64 GetSvStreamSize(SvStream * pStream)
* Find hazily according to object ID
* @param pObjectname - format as "GrXX," wherein XX is high part of
object ID, and is low part
*/
-void LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char
*pObjectName)
+SvMemoryStream* LtcBenContainer::CreateGraphicStream(const char *pObjectName)
{
if (!pObjectName)
{
-pStream = nullptr;
-return;
+return nullptr;
}
// construct the string of property name
char sSName[64]="";
@@ -301,8 +300,7 @@ void LtcBenContainer::CreateGraphicStream(SvStream *
&pStream, const char *pObje
// the 'D' stream is NULL or it has invalid length
if (nLen <= 0)
{
-pStream = nullptr;
-return;
+return nullptr;
}
char * pBuf = new char[nLen];
@@ -310,13 +308,13 @@ void LtcBenContainer::CreateGraphicStream(SvStream *
&pStream, const char *pObje
char * pPointer = pBuf;
if (xD)
{
-auto nRead = xD->ReadBytes(pPointer, nDLen);
+xD->ReadBytes(pPointer, nDLen);
xD.reset();
}
pPointer += nDLen;
if (xS)
{
-auto nRead = xS->ReadBytes(pPointer, nLen - nDLen);
+xS->ReadBytes(pPointer, nLen - nDLen);
xS.reset();
}
@@ -324,7 +322,7 @@ void LtcBenContainer::CreateGraphicStream(SvStream *
&pStream, const char *pObje
assert(pMemStream != nullptr);
pMemStream->ObjectOwnsMemory(true);
-pStream = pMemStream;
+return pMemStream;
}
sal_uLong LtcBenContainer::remainingSize() const
diff --git a/lotuswordpro/source/filter/bento.hxx
b/lotuswordpro/source/filter/bento.hxx
index 322653aee938..f1cd48b4abae 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -221,7 +221,7 @@ public: // Internal methods
LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char *
sPropertyName);
LtcUtBenValueStream * FindValueStreamWithPropertyName(const char *
sPropertyName);
-void CreateGraphicStream(SvStream * &pStream, const char *pObjectName);
+SvMemoryStream* CreateGraphicStream(const char *pObjectName);
sal_uLong GetSize() const { return m_ulLength; }
private: // Data
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx
b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 5bcc918187d2..5731b34acdff 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -305,15 +305,13 @@ void LwpGraphicObject::CreateDrawObjects()
if (ulRet != OpenStormBento::BenErr_OK)
return;
-SvStream* pDrawObjStream = nullptr;
-
// get graphic object's bento object name
LwpObjectID& rMyID = GetObjectID();
std::string aGrfObjName;
GetBentoNamebyID(rMyID, aGrfObjName);
// get bento stream by the name
-pBentoContainer->CreateGraphicStream(pDrawObjStream, aGrfObjName.c_str());
+SvStream* pDrawObjStream =
pBentoContainer->CreateGraphicStream(aGrfObjName.c_str());
if (pDrawObjStream)
{
LwpSdwFileLoader fileLoader(pDrawObjStream, this);
@@ -357,17 +355,13 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*&
pGrafData)
return 0;
}
-SvStream* pGrafStream = nullptr;
-
// get graphic object's bento object name
LwpObjectID& rMyID = GetObjectID();
std::string aGrfObjName;
GetBentoNamebyID(rMyID, aGrfObjName);
// get bento stream by the name
-pBentoContainer->CreateGraphicStream(pGrafStream, aGrfObjName.c_str());
-SvMemoryStream* pMemGrafStream = static_cast(pGrafStream);
-
+SvMemoryStream* pMemGrafStream =
pBentoContainer->CreateGraphicStream(aGrfObjName.c_str());
if (pMemGrafStream)
{
// read image data
@@ -376,7 +370,6 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*&
pGrafData)
pMemGrafStream->ReadBytes(pGrafData, nDataLen);
delete pMemGrafStream;
-pMemGrafStream = nullptr;
return nDataLen;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/pormulti.hxx | 10 +-
sw/source/filter/html/htmlctxt.cxx |2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e455baf19c3096f46cdcf6279590d7a59775f1fa
Author: Andrea Gelmini
Date: Sun Jan 21 21:17:48 2018 +0100
Fix typos
Change-Id: Id3e707e89bd0fda4d86e02a185a16336c89e7c82
Reviewed-on: https://gerrit.libreoffice.org/48281
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 62cb236f5bb8..5fdbb7f9ea66 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -62,15 +62,15 @@ struct SwMultiCreator
// in this case the structure SwBracket will be used.
struct SwBracket
{
-sal_Int32 nStart; // Start of text attribute determins the font
+sal_Int32 nStart; // Start of text attribute determines the font
sal_uInt16 nAscent; // Ascent of the brackets
sal_uInt16 nHeight; // Height of them
sal_uInt16 nPreWidth; // Width of the opening bracket
sal_uInt16 nPostWidth; // Width of the closing bracket
-sal_Unicode cPre; // Initial character, e.g. '('
-sal_Unicode cPost; // Final character, e.g. ')'
-SwFontScript nPreScript; // Script of the initial character
-SwFontScript nPostScript; // Script of the final character
+sal_Unicode cPre; // Initial character, e.g. '('
+sal_Unicode cPost; // Final character, e.g. ')'
+SwFontScript nPreScript;// Script of the initial character
+SwFontScript nPostScript; // Script of the final character
};
// The SwMultiPortion is line portion inside a line portion,
diff --git a/sw/source/filter/html/htmlctxt.cxx
b/sw/source/filter/html/htmlctxt.cxx
index 95750dfae142..f166177fcabb 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -384,7 +384,7 @@ void SwHTMLParser::ClearContext( HTMLAttrContext *pContext )
OSL_ENSURE( !pContext->HasSaveDocContext(),
"Frame can no longer be exited" );
-// like RestoreDocContext reset enough of this to not catastropically
+// like RestoreDocContext reset enough of this to not catastrophically
// fail if we still have a SaveDocContext here
if (HTMLAttrContext_SaveDoc *pSave = pContext->GetSaveDocContext())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/bencont.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 28580d90305fcb159395b957b65275f94591bc38
Author: Caolán McNamara
Date: Sat Jan 20 20:54:14 2018 +
use correct types
Change-Id: I350f826f88bda85d3ea861ce7b05680900b850cf
Reviewed-on: https://gerrit.libreoffice.org/48254
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/bencont.cxx
b/lotuswordpro/source/filter/bencont.cxx
index 6a03ba73a8f3..d3c046882e0f 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -253,11 +253,11 @@ LtcUtBenValueStream *
LtcBenContainer::FindValueStreamWithPropertyName(const cha
return FindNextValueStreamWithPropertyName(sPropertyName);
}
-sal_uInt32 GetSvStreamSize(SvStream * pStream)
+sal_uInt64 GetSvStreamSize(SvStream * pStream)
{
-sal_uInt32 nCurPos = pStream->Tell();
+sal_uInt64 nCurPos = pStream->Tell();
pStream->Seek(STREAM_SEEK_TO_END);
-sal_uInt32 ulLength = pStream->Tell();
+sal_uInt64 ulLength = pStream->Tell();
pStream->Seek(nCurPos);
return ulLength;
@@ -286,12 +286,12 @@ void LtcBenContainer::CreateGraphicStream(SvStream *
&pStream, const char *pObje
std::unique_ptr xS(FindValueStreamWithPropertyName(sSName));
std::unique_ptr xD(FindValueStreamWithPropertyName(sDName));
-sal_uInt32 nDLen = 0;
+sal_uInt64 nDLen = 0;
if (xD)
{
nDLen = GetSvStreamSize(xD.get());
}
-sal_uInt32 nLen = nDLen;
+sal_uInt64 nLen = nDLen;
if (xS)
{
nLen += GetSvStreamSize(xS.get()) ;
@@ -310,13 +310,13 @@ void LtcBenContainer::CreateGraphicStream(SvStream *
&pStream, const char *pObje
char * pPointer = pBuf;
if (xD)
{
-xD->ReadBytes(pPointer, nDLen);
+auto nRead = xD->ReadBytes(pPointer, nDLen);
xD.reset();
}
pPointer += nDLen;
if (xS)
{
-xS->ReadBytes(pPointer, nLen - nDLen);
+auto nRead = xS->ReadBytes(pPointer, nLen - nDLen);
xS.reset();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/uitest/uiobject.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit b29c5cd859fbc26184b3ef0abac297736ef0714c
Author: Markus Mohrhard
Date: Sun Jan 21 18:03:35 2018 +0100
uitest: add checked to radio button properties
Change-Id: I7e5a3f4b743029fc1a8ee01d9a4ab6ea49f9b73c
Reviewed-on: https://gerrit.libreoffice.org/48274
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 7b8d0b287b18..d05a664acd7f 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -801,6 +801,7 @@ void RadioButtonUIObject::execute(const OUString& rAction,
StringMap RadioButtonUIObject::get_state()
{
StringMap aMap = WindowUIObject::get_state();
+aMap["Checked"] = OUString::boolean(mxRadioButton->IsChecked());
return aMap;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Vincas Dargis 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: sysui/desktop
sysui/desktop/apparmor/program.oosplash|1 +
sysui/desktop/apparmor/program.soffice.bin |1 +
2 files changed, 2 insertions(+)
New commits:
commit 19181fd45735005aad7cb910ca1bf3dd7fb687fb
Author: Vincas Dargis
Date: Sun Jan 21 16:16:43 2018 +0200
deb#887593 apparmor: allow reading device information
* Add file read rule for paths like
/sys/devices/virtual/block/dm-0/queue/rotational
used by isRotational() in desktop/unx/source/pagenin.c.
* Add file read rule for paths like
/sys/dev/char/226:128/device/uevent
used by libdrm.
Change-Id: Ic41365b478c817b6766e25adadd6761fa03ff055
Reviewed-on: https://gerrit.libreoffice.org/48265
Tested-by: Rene Engelhard
Reviewed-by: Rene Engelhard
Tested-by: Jenkins
diff --git a/sysui/desktop/apparmor/program.oosplash
b/sysui/desktop/apparmor/program.oosplash
index e044c1afce26..bcc06914d112 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -23,6 +23,7 @@ profile libreoffice-oopslash INSTDIR-program/oosplash {
/etc/passwd r,
/etc/nsswitch.confr,
/run/nscd/passwd r,
+ /sys/devices/{virtual,pci[0-9]*}/**/queue/rotational r, # for
isRotational() in desktop/unx/source/pagein.c
/usr/lib{,32,64}/ure/bin/javaldx rmpux,
/usr/share/libreoffice/program/* r,
INSTDIR-program/** r,
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index ecc249883d28..113562c3e7b3 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -170,6 +170,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
#Likely moving to abstractions in the future
owner @{HOME}/.icons/*/cursors/* r,
+
/sys/devices/pci[0-9]*/**/{device,subsystem_device,subsystem_vendor,uevent,vendor}
r, # for libdrm
/usr/share/*-fonts/conf.avail/*.conf r,
/usr/share/fonts-config/conf.avail/*.conf r,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark
dev/null |binary icon-themes/sifr/cmd/32/copy.png |binary icon-themes/sifr/cmd/32/cut.png |binary icon-themes/sifr/cmd/32/formatpaintbrush.png |binary icon-themes/sifr/cmd/32/paste.png |binary icon-themes/sifr/cmd/lc_copy.png |binary icon-themes/sifr/cmd/lc_cut.png |binary icon-themes/sifr/cmd/lc_exportdirecttopdf.png |binary icon-themes/sifr/cmd/lc_formatpaintbrush.png |binary icon-themes/sifr/cmd/lc_paste.png |binary icon-themes/sifr/cmd/sc_copy.png |binary icon-themes/sifr/cmd/sc_cut.png |binary icon-themes/sifr/cmd/sc_formatpaintbrush.png |binary icon-themes/sifr/cmd/sc_paste.png |binary icon-themes/sifr_dark/cmd/32/copy.png |binary icon-themes/sifr_dark/cmd/32/cut.png |binary icon-themes/sifr_dark/cmd/32/formatpaintbrush.png |binary icon-themes/sifr_dark/cmd/32/paste.png|binary icon-themes/sifr_dark/cmd/lc_copy.png |binary icon-themes/sifr_dark/cmd/lc_cut.png |binary icon-themes/sifr_dark/cmd/lc_formatpaintbrush.png |binary icon-themes/sifr_dark/cmd/lc_paste.png|binary icon-themes/sifr_dark/cmd/sc_copy.png |binary icon-themes/sifr_dark/cmd/sc_cut.png |binary icon-themes/sifr_dark/cmd/sc_formatpaintbrush.png |binary icon-themes/sifr_dark/cmd/sc_paste.png|binary 26 files changed New commits: commit 8e7f5733fcd90cc302829f6c780856624c850aff Author: Matthias Freund Date: Sun Jan 21 01:59:28 2018 +0100 tdf#75256 Sifr some new 32px icons Change-Id: I6b0ea66424f36982b6c8eae8b9e405aaf30ca5d6 Reviewed-on: https://gerrit.libreoffice.org/48259 Tested-by: Jenkins Reviewed-by: Matthias Freund diff --git a/icon-themes/sifr/cmd/32/copy.png b/icon-themes/sifr/cmd/32/copy.png new file mode 100644 index ..19747908b128 Binary files /dev/null and b/icon-themes/sifr/cmd/32/copy.png differ diff --git a/icon-themes/sifr/cmd/32/cut.png b/icon-themes/sifr/cmd/32/cut.png new file mode 100644 index ..36dab3f99815 Binary files /dev/null and b/icon-themes/sifr/cmd/32/cut.png differ diff --git a/icon-themes/sifr/cmd/32/xportdirecttopdf.png b/icon-themes/sifr/cmd/32/exportdirecttopdf.png similarity index 100% rename from icon-themes/sifr/cmd/32/xportdirecttopdf.png rename to icon-themes/sifr/cmd/32/exportdirecttopdf.png diff --git a/icon-themes/sifr/cmd/32/formatpaintbrush.png b/icon-themes/sifr/cmd/32/formatpaintbrush.png new file mode 100644 index ..158e2084999c Binary files /dev/null and b/icon-themes/sifr/cmd/32/formatpaintbrush.png differ diff --git a/icon-themes/sifr/cmd/32/paste.png b/icon-themes/sifr/cmd/32/paste.png new file mode 100644 index ..87d92cff98f7 Binary files /dev/null and b/icon-themes/sifr/cmd/32/paste.png differ diff --git a/icon-themes/sifr/cmd/lc_copy.png b/icon-themes/sifr/cmd/lc_copy.png index 36c7de0dc674..802be1b0aad8 100644 Binary files a/icon-themes/sifr/cmd/lc_copy.png and b/icon-themes/sifr/cmd/lc_copy.png differ diff --git a/icon-themes/sifr/cmd/lc_cut.png b/icon-themes/sifr/cmd/lc_cut.png index 4e02400c3ab3..d54215ca44bf 100644 Binary files a/icon-themes/sifr/cmd/lc_cut.png and b/icon-themes/sifr/cmd/lc_cut.png differ diff --git a/icon-themes/sifr/cmd/lc_exportdirecttopdf.png b/icon-themes/sifr/cmd/lc_exportdirecttopdf.png index 16ad6b11363d..127bf940d26b 100644 Binary files a/icon-themes/sifr/cmd/lc_exportdirecttopdf.png and b/icon-themes/sifr/cmd/lc_exportdirecttopdf.png differ diff --git a/icon-themes/sifr/cmd/lc_formatpaintbrush.png b/icon-themes/sifr/cmd/lc_formatpaintbrush.png index 8e77c855898f..484cc96238ca 100644 Binary files a/icon-themes/sifr/cmd/lc_formatpaintbrush.png and b/icon-themes/sifr/cmd/lc_formatpaintbrush.png differ diff --git a/icon-themes/sifr/cmd/lc_paste.png b/icon-themes/sifr/cmd/lc_paste.png index d7aa5b047d0e..3ee4240536d7 100644 Binary files a/icon-themes/sifr/cmd/lc_paste.png and b/icon-themes/sifr/cmd/lc_paste.png differ diff --git a/icon-themes/sifr/cmd/lc_xportdirecttopdf.png b/icon-themes/sifr/cmd/lc_xportdirecttopdf.png deleted file mode 100644 index 127bf940d26b.. Binary files a/icon-themes/sifr/cmd/lc_xportdirecttopdf.png and /dev/null differ diff --git a/icon-themes/sifr/cmd/sc_copy.png b/icon-themes/sifr/cmd/sc_copy.png index dcfe8a05a445..3a0887985609 100644 Binary files a/icon-themes/sifr/cmd/sc_copy.png and b/icon-themes/sifr/cmd/sc_copy.png differ diff --git a/icon-themes/sifr/cmd/sc_cut.png b/icon-themes/sifr/cmd/sc_cut.png index f7f634ddce0f..46c0454c7010 100644 Binary files a/icon-themes/sifr/cmd/sc_cut.png and b/icon-themes/sifr/cmd/sc_cut.png differ diff --git a/icon-themes/sifr/cmd/sc_formatpaintbrush.png b/icon-themes/sifr/cmd/sc_formatpaintbrush.png index 234b926a2c9a..bc9607ffe69d 100644 Binary f
[Libreoffice-commits] core.git: connectivity/source cui/source dbaccess/source forms/source l10ntools/inc svx/source unotools/source
connectivity/source/drivers/file/FResultSet.cxx |2
cui/source/options/optsave.cxx | 52 +++-
dbaccess/source/ui/inc/sbagrid.hxx |2
dbaccess/source/ui/misc/DExport.cxx |2
dbaccess/source/ui/misc/UITools.cxx |2
forms/source/component/EventThread.hxx |2
l10ntools/inc/xmlparse.hxx |2
svx/source/form/fmshimp.cxx |2
unotools/source/config/optionsdlg.cxx |2
9 files changed, 33 insertions(+), 35 deletions(-)
New commits:
commit 3b666f6819bb0230520bc724d5e33a7a349aa15c
Author: Noel Grandin
Date: Sun Jan 21 18:28:03 2018 +0200
remove some sal_Bool remnants
Change-Id: I0a9637aca523a73fbdbbd22f9ad735d6d1ba6898
Reviewed-on: https://gerrit.libreoffice.org/48273
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index dc6bb60a07da..50bb8f9f1c5f 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1432,7 +1432,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow&
_rRow,
const OUString sRealName =
OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
const OUString sType =
OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
-std::map aSelectIters;
+std::map aSelectIters;
OValueRefVector::Vector::const_iterator aRowIter = _rRow->get().begin()+1;
for (sal_Int32 i=0; // the first column is the bookmark column
aRowIter != _rRow->get().end();
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index ff3456eee4d8..8167af33add4 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -54,10 +54,9 @@ using namespace comphelper;
struct SvxSaveTabPage_Impl
{
Reference< XNameContainer > xFact;
-Sequence< OUString >aFilterArr[APP_COUNT];
-Sequence< sal_Bool >aAlienArr[APP_COUNT];
-Sequence< sal_Bool >aODFArr[APP_COUNT];
-Sequence< OUString >aUIFilterArr[APP_COUNT];
+std::vector< OUString > aFilterArr[APP_COUNT];
+std::vector< bool > aODFArr[APP_COUNT];
+std::vector< OUString > aUIFilterArr[APP_COUNT];
OUStringaDefaultArr[APP_COUNT];
boolaDefaultReadonlyArr[APP_COUNT];
boolbInitialized;
@@ -429,8 +428,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
sCommand = sCommand.replaceFirst("%1", sReplace);
Reference< XEnumeration > xList =
xQuery->createSubSetEnumerationByQuery(sCommand);
std::vector< OUString > lList;
-std::vector< sal_Bool > lAlienList;
-std::vector< sal_Bool > lODFList;
+std::vector lAlienList;
+std::vector lODFList;
while(xList->hasMoreElements())
{
SequenceAsHashMap aFilter(xList->nextElement());
@@ -443,9 +442,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
lODFList.push_back( isODFFormat( sFilter ) );
}
}
-pImpl->aFilterArr[nData] =
comphelper::containerToSequence(lList);
-pImpl->aAlienArr[nData] =
comphelper::containerToSequence(lAlienList);
-pImpl->aODFArr[nData] =
comphelper::containerToSequence(lODFList);
+pImpl->aFilterArr[nData] = lList;
+pImpl->aODFArr[nData] = lODFList;
}
}
aDocTypeLB->SelectEntryPos(0);
@@ -571,36 +569,36 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&,
rBox, void )
if(aDocTypeLB == &rBox)
{
aSaveAsLB->Clear();
-const OUString* pFilters =
pImpl->aFilterArr[nData].getConstArray();
-if(!pImpl->aUIFilterArr[nData].getLength())
+auto & rFilters = pImpl->aFilterArr[nData];
+if(!pImpl->aUIFilterArr[nData].size())
{
-
pImpl->aUIFilterArr[nData].realloc(pImpl->aFilterArr[nData].getLength());
-OUString* pUIFilters = pImpl->aUIFilterArr[nData].getArray();
-for(int nFilter = 0; nFilter <
pImpl->aFilterArr[nData].getLength(); nFilter++)
+
pImpl->aUIFilterArr[nData].resize(pImpl->aFilterArr[nData].size());
+auto & rUIFilters = pImpl->aUIFilterArr[nData];
+for(size_t nFilter = 0; nFilter <
pImpl->aFilterArr[nData].size(); nFilter++)
{
-Any aProps = pImpl->xFact->getByName(pFilters[nFilter]);
+Any aProps = pImpl->xFact->getByName(rFilters[nFilter]);
[Libreoffice-commits] core.git: starmath/inc starmath/qa starmath/source
starmath/inc/document.hxx |6 ++---
starmath/inc/parse.hxx |4 +--
starmath/qa/cppunit/test_cursor.cxx |8 +++
starmath/qa/cppunit/test_node.cxx |8 +++
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 26 +++-
starmath/qa/cppunit/test_parse.cxx |4 +--
starmath/source/document.cxx| 19 +++--
starmath/source/mathmlexport.cxx|4 +--
starmath/source/mathmlimport.cxx|4 +--
starmath/source/node.cxx|2 -
starmath/source/parse.cxx |6 ++---
11 files changed, 39 insertions(+), 52 deletions(-)
New commits:
commit f3d1b2e58c39618d99bf017702ef19f373464b34
Author: Takeshi Abe
Date: Thu Jan 18 18:20:12 2018 +0900
starmath: Make SmParser::Parse() return std::unique_ptr
Change-Id: I6c8811f71ab40398043cdcfa3334eee4381b4c7e
Reviewed-on: https://gerrit.libreoffice.org/48098
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 2d6e63da5f2f..af2ce9475fc3 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -89,7 +89,7 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public
SfxListener
SmParsermaParser;
OUStringmaAccText;
SvtLinguOptions maLinguOptions;
-SmTableNode*mpTree;
+std::unique_ptr mpTree;
SfxItemPool*mpEditEngineItemPool;
EditEngine *mpEditEngine;
VclPtr mpPrinter; //q.v. comment to SmPrinter Access!
@@ -177,8 +177,8 @@ public:
voidParse();
SmParser & GetParser() { return maParser; }
-const SmTableNode *GetFormulaTree() const { return mpTree; }
-voidSetFormulaTree(SmTableNode *pTree) { mpTree = pTree; }
+const SmTableNode *GetFormulaTree() const { return mpTree.get(); }
+voidSetFormulaTree(SmTableNode *pTree) { mpTree.reset(pTree); }
const std::set< OUString > &GetUsedSymbols() const { return
maUsedSymbols; }
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 5c4646e28eb8..a2faa73a3b40 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -78,7 +78,7 @@ class SmParser
inline bool TokenInGroup( TG nGroup );
// grammar
-SmTableNode *DoTable();
+std::unique_ptr DoTable();
SmLineNode *DoLine();
std::unique_ptr DoExpression(bool bUseExtraSpaces = true);
SmNode *DoRelation();
@@ -114,7 +114,7 @@ public:
SmParser();
/** Parse rBuffer to formula tree */
-SmTableNode *Parse(const OUString &rBuffer);
+std::unique_ptr Parse(const OUString &rBuffer);
/** Parse rBuffer to formula subtree that constitutes an expression */
std::unique_ptr ParseExpression(const OUString &rBuffer);
diff --git a/starmath/qa/cppunit/test_cursor.cxx
b/starmath/qa/cppunit/test_cursor.cxx
index 702777a614f8..403994707d27 100644
--- a/starmath/qa/cppunit/test_cursor.cxx
+++ b/starmath/qa/cppunit/test_cursor.cxx
@@ -68,7 +68,7 @@ void Test::tearDown()
void Test::testCopyPaste()
{
OUString const sInput("a * b + c");
-std::unique_ptr xTree(SmParser().Parse(sInput));
+auto xTree = SmParser().Parse(sInput);
xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef, 0);
SmCursor aCursor(xTree.get(), xDocShRef.get());
@@ -91,7 +91,7 @@ void Test::testCopyPaste()
void Test::testCopySelectPaste()
{
OUString const sInput("a * b + c");
-std::unique_ptr xTree(SmParser().Parse(sInput));
+auto xTree = SmParser().Parse(sInput);
xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef, 0);
SmCursor aCursor(xTree.get(), xDocShRef.get());
@@ -118,7 +118,7 @@ void Test::testCopySelectPaste()
void Test::testCutPaste()
{
OUString const sInput("a * b + c");
-std::unique_ptr xTree(SmParser().Parse(sInput));
+auto xTree = SmParser().Parse(sInput);
xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef, 0);
SmCursor aCursor(xTree.get(), xDocShRef.get());
@@ -141,7 +141,7 @@ void Test::testCutPaste()
void Test::testCutSelectPaste()
{
OUString const sInput("a * b + c");
-std::unique_ptr xTree(SmParser().Parse(sInput));
+auto xTree = SmParser().Parse(sInput);
xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef, 0);
SmCursor aCursor(xTree.get(), xDocShRef.get());
diff --git a/starmath/qa/cppunit/test_node.cxx
b/starmath/qa/cppunit/test_node.cxx
index 2a35bdffbe4c..ebf0682f531e 100644
--- a/starmath/qa/cppunit/test_node.cxx
+++ b/starmath/qa/cppunit/test_node.cxx
@@ -64,10 +64,10 @@ void NodeTest::testTdf47813()
{
SmParser aParser;
#define MATRIX "matrix {-2#33##4#-5##6,0#7}"
-std::unique_ptr pNodeA(aParser.Parse(MATRIX));
-std::unique_ptr pNodeC(aParser.Parse("alignc " MATRIX));
-std::unique_ptr pNod
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2018-21-01_02:24:51 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sysui/desktop
sysui/desktop/apparmor/program.soffice.bin |4
1 file changed, 4 insertions(+)
New commits:
commit 8930dc75e2d5c1e2d2165db6d55617930816fbe4
Author: Rene Engelhard
Date: Sun Jan 21 13:10:46 2018 +0100
apparmor: allow running the "certificate manager" applications for gpg
Change-Id: Ic71e05d7561e1dcb532795dbf0b6e9309c1032d2
Reviewed-on: https://gerrit.libreoffice.org/48262
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index cf967ba89a77..93fc7ee537e6 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -118,6 +118,10 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
/usr/bin/gpgconf rmix,
/usr/bin/gpg rmCx -> gpg,
/usr/bin/gpgsmrmCx -> gpg,
+ /usr/bin/gpa rix,
+ /usr/bin/seahorse rix,
+ /usr/bin/kgpg rix,
+ /usr/bin/kleopatrarix,
/dev/tty rw,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf113946.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |7 ++
writerfilter/source/dmapper/GraphicHelpers.cxx | 86 -
3 files changed, 51 insertions(+), 42 deletions(-)
New commits:
commit ff8826d438a9fd080e8e61f8e66b3d3b2c8d752b
Author: Patrick Jaap
Date: Mon Jan 15 16:43:07 2018 +0100
tdf#113946 add 'topMargin' to GraphicHelpers import
The case '...topMargin' was not caught for setting a relative
vertical position in GraphicHelpers. The test file demands a '7' here,
which stands for 'PAGE_FRAME'. The '7' was overwritten in GraphicImport in
case
'LN_CT_Anchor_positionV' by a call of 'resolve'.
For a better overview a switch is inserted here.
Change-Id: Ie98209fe445ecbba15c3dafe5980ca52421126f8
Reviewed-on: https://gerrit.libreoffice.org/47905
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/ooxmlimport/data/tdf113946.docx
b/sw/qa/extras/ooxmlimport/data/tdf113946.docx
new file mode 100644
index ..060df76ecc2a
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf113946.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4d65beeb90c4..449dae04ac59 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1567,6 +1567,13 @@ DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop );
}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
+{
+OUString aTop =
parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top");
+CPPUNIT_ASSERT_EQUAL( OUString("1696"), aTop );
+}
+
// tests should only be added to ooxmlIMPORT *if* they fail round-tripping in
ooxmlEXPORT
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 8108445d24fb..a7ce01868714 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -63,57 +63,59 @@ void PositionHandler::lcl_attribute( Id aName, Value& rVal )
{
case NS_ooxml::LN_CT_PosV_relativeFrom:
{
-// TODO There are some other unhandled values
-static const Id pVertRelValues[] =
+switch ( nIntValue )
{
-
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_margin,
-NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_page,
-
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_paragraph,
-NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_line
-};
+case
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_margin:
+m_nRelation = text::RelOrientation::PAGE_PRINT_AREA;
+break;
-static const sal_Int16 pVertRelations[] =
-{
-text::RelOrientation::PAGE_PRINT_AREA,
-text::RelOrientation::PAGE_FRAME,
-text::RelOrientation::FRAME,
-text::RelOrientation::TEXT_LINE
-};
+case
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_page:
+case
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_topMargin: // fallthrough
intended
+m_nRelation = text::RelOrientation::PAGE_FRAME;
+break;
-for ( int i = 0; i < 4; i++ )
-{
-if ( pVertRelValues[i] == sal_uInt32( nIntValue ) )
-m_nRelation = pVertRelations[i];
+case
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_paragraph:
+m_nRelation = text::RelOrientation::FRAME;
+break;
+
+case
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromV_line:
+m_nRelation = text::RelOrientation::TEXT_LINE;
+break;
+
+// TODO There are some other unhandled values
}
}
break;
+
case NS_ooxml::LN_CT_PosH_relativeFrom:
{
-// TODO There are some other unhandled values
-static const Id pHoriRelValues[] =
+switch ( nIntValue )
{
-
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromH_margin,
-NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromH_page,
-
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromH_column,
-
NS_ooxml::LN_Value_wordprocessingDrawing_ST_RelFromH_character,
-
NS_ooxml::LN_Value_wordprocessingDrawing_ST_Rel
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpgrfobj.cxx | 31 ++-
lotuswordpro/source/filter/lwpgrfobj.hxx |2 +-
lotuswordpro/source/filter/lwplayout.cxx | 10 ++
3 files changed, 13 insertions(+), 30 deletions(-)
New commits:
commit 398b0195b7833ca8fab29a600954c84527b25cf9
Author: Caolán McNamara
Date: Sat Jan 20 21:03:31 2018 +
just return a vector
Change-Id: Id6a75dee04c836ca28299dc6b3ab0b93361684c4
Reviewed-on: https://gerrit.libreoffice.org/48256
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx
b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 5731b34acdff..30431b7a1bb3 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -225,17 +225,8 @@ void LwpGraphicObject::XFConvert (XFContentContainer*
pCont)
}
else
{
-sal_uInt8* pGrafData = nullptr;
-sal_uInt32 nDataLen = GetRawGrafData(pGrafData);
-
-if (pGrafData)
-{
-pImage->SetImageData(pGrafData, nDataLen);
-
-// delete used image data
-delete [] pGrafData;
-pGrafData = nullptr;
-}
+std::vector aGrafData = GetRawGrafData();
+pImage->SetImageData(aGrafData.data(), aGrafData.size());
}
pCont->Add(pImage);
@@ -337,11 +328,12 @@ void LwpGraphicObject::GetBentoNamebyID(LwpObjectID const
& rMyID, std::string&
/**
* @descr get the image data read from bento stream according to the
VO_GRAPHIC ID.
- * @param pGrafData the array to store the image data. the pointer need to
be deleted outside.
- * @return the length of the image data.
+ * @return the image data.
*/
-sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData)
+std::vector LwpGraphicObject::GetRawGrafData()
{
+std::vector aGrafData;
+
// create graphic object
// if small file, use the compressed stream for BENTO
LwpSvStream* pStream = m_pStrm->GetCompressedStream() ?
m_pStrm->GetCompressedStream(): m_pStrm;
@@ -352,7 +344,7 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*&
pGrafData)
sal_uLong ulRet = OpenStormBento::BenOpenContainer(pStream, &pTmp);
pBentoContainer.reset(pTmp);
if (ulRet != OpenStormBento::BenErr_OK)
-return 0;
+return aGrafData;
}
// get graphic object's bento object name
@@ -365,16 +357,13 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*&
pGrafData)
if (pMemGrafStream)
{
// read image data
-sal_uInt32 nDataLen = pMemGrafStream->GetEndOfData();
-pGrafData = new sal_uInt8 [nDataLen];
-pMemGrafStream->ReadBytes(pGrafData, nDataLen);
+aGrafData.resize(pMemGrafStream->GetEndOfData());
+pMemGrafStream->ReadBytes(aGrafData.data(), aGrafData.size());
delete pMemGrafStream;
-
-return nDataLen;
}
-return 0;
+return aGrafData;
}
/**
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx
b/lotuswordpro/source/filter/lwpgrfobj.hxx
index 03d017a74a4d..726d8ec049cc 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -118,7 +118,7 @@ public:
void CreateDrawObjects();
void CreateGrafObject();
static void GetBentoNamebyID(LwpObjectID const & rMyID, std::string&
rName);
-sal_uInt32 GetRawGrafData(sal_uInt8*& pGrafData);
+std::vector GetRawGrafData();
sal_uInt32 GetGrafData(sal_uInt8*& pGrafData);
void GetGrafOrgSize(long& rWidth, long& rHeight) { rWidth = m_Cache.Width;
rHeight = m_Cache.Height; }
void GetGrafOrgSize(double& rWidth, double& rHeight) override;
diff --git a/lotuswordpro/source/filter/lwplayout.cxx
b/lotuswordpro/source/filter/lwplayout.cxx
index 00ab92c6a4b3..73f0c3114640 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1364,14 +1364,8 @@ XFBGImage* LwpMiddleLayout::GetXFBGImage()
}
else
{
-sal_uInt8* pGrafData = nullptr;
-sal_uInt32 nDataLen = pGrfObj->GetRawGrafData(pGrafData);
-pXFBGImage->SetImageData(pGrafData, nDataLen);
-if(pGrafData)
-{
-delete[] pGrafData;
-pGrafData = nullptr;
-}
+std::vector aGrafData = pGrfObj->GetRawGrafData();
+pXFBGImage->SetImageData(aGrafData.data(), aGrafData.size());
}
//automatic, top left
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/inc lotuswordpro/source
lotuswordpro/inc/lwpsvstream.hxx |4 +--
lotuswordpro/source/filter/bencont.cxx | 11 --
lotuswordpro/source/filter/bento.hxx | 31 ++---
lotuswordpro/source/filter/benval.cxx | 16 +++---
lotuswordpro/source/filter/lwpsvstream.cxx |2 -
lotuswordpro/source/filter/tocread.cxx |4 +--
lotuswordpro/source/filter/utbenvs.cxx |5
7 files changed, 34 insertions(+), 39 deletions(-)
New commits:
commit 6a0fb0debf67e63e0b52f3a8255773679c254c4e
Author: Caolán McNamara
Date: Sat Jan 20 20:42:37 2018 +
align types
Change-Id: I6080d92ec26f9ee9bf3eb4319a36c10ae38caca2
Reviewed-on: https://gerrit.libreoffice.org/48253
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/lotuswordpro/inc/lwpsvstream.hxx b/lotuswordpro/inc/lwpsvstream.hxx
index d39aee929e7b..7b119403d761 100644
--- a/lotuswordpro/inc/lwpsvstream.hxx
+++ b/lotuswordpro/inc/lwpsvstream.hxx
@@ -67,8 +67,8 @@ class LwpSvStream
{
public:
LwpSvStream(SvStream* pStream, LwpSvStream * pCompressed = nullptr);
-sal_Int32 Read( void* bytes, sal_Int32 nBytesToRead );
-void SeekRel( sal_Int64 pos );
+size_t Read(void* bytes, size_t nBytesToRead);
+void SeekRel(sal_Int64 pos);
sal_Int64 Tell();
sal_Int64 Seek(sal_Int64 pos);
bool CheckSeek(sal_Int64 pos);
diff --git a/lotuswordpro/source/filter/bencont.cxx
b/lotuswordpro/source/filter/bencont.cxx
index 7340f046fa53..6a03ba73a8f3 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -170,8 +170,8 @@ LtcBenContainer::LtcBenContainer(LwpSvStream * pStream)
* @param number of bytes read
* @return BenError
*/
-BenError LtcBenContainer::Read(void * pBuffer, unsigned long MaxSize,
- unsigned long * pAmtRead)
+BenError LtcBenContainer::Read(void * pBuffer, size_t MaxSize,
+ size_t* pAmtRead)
{
*pAmtRead = cpStream->Read(pBuffer, MaxSize);
return BenErr_OK;
@@ -182,11 +182,10 @@ BenError LtcBenContainer::Read(void * pBuffer, unsigned
long MaxSize,
* @param number of bytes to be read
* @return BenError
*/
-BenError LtcBenContainer::ReadKnownSize(void * pBuffer, unsigned long Amt)
+BenError LtcBenContainer::ReadKnownSize(void * pBuffer, size_t Amt)
{
-sal_uLong ulLength;
-ulLength = cpStream->Read(pBuffer, Amt);
-if(ulLength == Amt)
+size_t ulLength = cpStream->Read(pBuffer, Amt);
+if (ulLength == Amt)
{
return BenErr_OK;
}
diff --git a/lotuswordpro/source/filter/bento.hxx
b/lotuswordpro/source/filter/bento.hxx
index 069a408cbc5d..322653aee938 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -128,13 +128,13 @@ class CBenValueSegment;
class CBenNamedObject;
class CBenPropertyName;
-typedef unsigned char BenByte;
-typedef unsigned short BenWord;
-typedef unsigned long BenDWord;
+typedef sal_uInt8 BenByte;
+typedef sal_uInt16 BenWord;
+typedef sal_uInt32 BenDWord;
-typedef unsigned long BenContainerPos;
-typedef unsigned long BenObjectID;
-typedef unsigned long BenGeneration;
+typedef sal_uInt32 BenContainerPos;
+typedef sal_uInt32 BenObjectID;
+typedef sal_uInt32 BenGeneration;
sal_uLong BenOpenContainer(LwpSvStream * pStream, LtcBenContainer **
ppContainer);
@@ -187,10 +187,9 @@ protected: // Overridden methods
private: // Data
CBenValue * cpValue;
-unsigned long cCurrentPosition;
+size_t cCurrentPosition;
sal_uLong m_ulValueLength; // Added by , sum of length of all
sub-valuesegments
-// voidGetAmountLeft(sal_uLong * pAmtLeft);useless in SODC
};
class LtcBenContainer
@@ -210,9 +209,9 @@ public: // Internal methods
~LtcBenContainer();
sal_uLong remainingSize() const;
-BenError Read(void * pBuffer, unsigned long MaxSize,
- unsigned long * pAmtRead);
-BenError ReadKnownSize(void * pBuffer, unsigned long Amt);
+BenError Read(void * pBuffer, size_t MaxSize,
+ size_t* pAmtRead);
+BenError ReadKnownSize(void * pBuffer, size_t Amt);
BenError SeekToPosition(BenContainerPos Pos);
BenError SeekFromEnd(long Offset);
@@ -253,9 +252,9 @@ private: // Data
class CBenValue : public CBenIDListElmt
{
public:
-unsigned long GetValueSize();
+size_t GetValueSize();
void ReadValueData(void * pBuffer,
- unsigned long Offset, unsigned long MaxSize, unsigned long * pAmtRead);
+ size_t Offset, size_t MaxSize, size_t* pAmtRead);
CBenProperty * BEN_EXPORT GetProperty() { return cpProperty; }
@@ -309,7 +308,7 @@ class CBenValueSegment : public CUtListElmt
{
public: // Internal methods
CBenValueSegment(CBenValue * pValue, BenContainerPos Pos,
- unsigned long Size) : CUtListElmt(&pValue->GetValueSegments())
+ size_t Size) : CUtListElmt(&pValue->GetValueSegments())
{ cpValue = pValue; cImmediate = false; cPos = Pos;
cSize
[Libreoffice-commits] core.git: svl/source sw/qa
svl/source/numbers/zforscan.cxx |6 --
sw/qa/core/data/html/pass/ofz5535-1.html |1 +
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6763c0ce90825b23a839fac2cd7aede5772c8993
Author: Caolán McNamara
Date: Sun Jan 21 15:24:13 2018 +
ofz#5535 max decimal places for rtl_math_round is 20
Change-Id: I636e086c51ceb70bdac72acfbabe99ad29003cdb
Reviewed-on: https://gerrit.libreoffice.org/48268
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index e2b121059496..2c70900be729 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -39,6 +39,8 @@ using namespace svt;
const sal_Unicode cNoBreakSpace = 0xA0;
const sal_Unicode cNarrowNoBreakSpace = 0x202F;
+const int MaxCntPost = 20; //max dec places allow by rtl_math_round
+
const NfKeywordTable ImpSvNumberformatScan::sEnglishKeyword =
{ // Syntax keywords in English (USA)
//! All keywords MUST be UPPERCASE! In same order as NfKeywordIndex
@@ -2722,7 +2724,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString&
rString )
switch( sStrArray[i][0] )
{
case '0':
-if ( bTimePart && Is100SecZero( i, bDecSep ) )
+if (bTimePart && Is100SecZero(i, bDecSep) && nCounter
< MaxCntPost)
{
bDecSep = true;
nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
@@ -2730,7 +2732,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString&
rString )
nCounter++;
i++;
while (i < nStringsCnt &&
- sStrArray[i][0] == '0')
+ sStrArray[i][0] == '0' && nCounter <
MaxCntPost)
{
rStr += sStrArray[i];
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
diff --git a/sw/qa/core/data/html/pass/ofz5535-1.html
b/sw/qa/core/data/html/pass/ofz5535-1.html
new file mode 100644
index ..5439e009b392
--- /dev/null
+++ b/sw/qa/core/data/html/pass/ofz5535-1.html
@@ -0,0 +1 @@
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source sc/source
chart2/source/controller/main/ChartController.cxx | 19
chart2/source/controller/main/ControllerCommandDispatch.cxx |4 +-
sc/source/ui/unoobj/docuno.cxx |3 -
3 files changed, 11 insertions(+), 15 deletions(-)
New commits:
commit c18d183c9fdadea3d3d28a14b417f5c9620eb439
Author: Vasily Melenchuk
Date: Tue Jan 16 11:34:51 2018 +0300
tdf#113572: removed redundant calc service
calc service introduced previously in commit
0074951704022d173a5fdb9df933f47be1dcbb91 is not required, interface
is enough for feature implementation.
Change-Id: I9cf30f2201619465da9061c7ef1e574209062cf9
Reviewed-on: https://gerrit.libreoffice.org/47960
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 1348c7aedb1b..c992e03070fe 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1333,8 +1333,9 @@ void ChartController::executeDispatch_SourceData()
if ( rModel.hasInternalDataProvider() )
{
// Check if we will able to create data provider later
-Reference< lang::XServiceInfo > xParentServiceInfo(
rModel.getParent(), uno::UNO_QUERY );
-if ( !xParentServiceInfo.is() ||
!xParentServiceInfo->supportsService("com.sun.star.chart2.XDataProviderAccess")
)
+css::uno::Reference< com::sun::star::chart2::XDataProviderAccess >
xCreatorDoc(
+rModel.getParent(), uno::UNO_QUERY);
+if (!xCreatorDoc.is())
return;
SolarMutexGuard aSolarGuard;
@@ -1349,18 +1350,12 @@ void ChartController::executeDispatch_SourceData()
rModel.removeDataProviders();
// Ask parent document to create new data provider
-css::uno::Reference< com::sun::star::chart2::XDataProviderAccess >
xCreatorDoc(
-rModel.getParent(), uno::UNO_QUERY );
-SAL_WARN_IF( !xCreatorDoc.is(), "chart2.main", "Invalid
XDataProviderAccess" );
-if ( xCreatorDoc.is() )
+uno::Reference< data::XDataProvider > xDataProvider =
xCreatorDoc->createDataProvider();
+SAL_WARN_IF( !xDataProvider.is(), "chart2.main", "Data provider was
not created" );
+if (xDataProvider.is())
{
-uno::Reference< data::XDataProvider > xDataProvider =
xCreatorDoc->createDataProvider();
-SAL_WARN_IF( !xDataProvider.is(), "chart2.main", "Data provider
was not created" );
-if ( xDataProvider.is() )
-{
-rModel.attachDataProvider(xDataProvider);
-}
+rModel.attachDataProvider(xDataProvider);
}
}
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 81c31baa2c0a..537c54c77b58 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
// only needed until #i68864# is fixed
#include
@@ -555,7 +556,8 @@ void ControllerCommandDispatch::updateCommandAvailability()
OSL_ENSURE(xParentServiceInfo.is(), "Invalid XServiceInfo");
if ( xParentServiceInfo.is() )
{
-bCanCreateDataProvider =
xParentServiceInfo->supportsService("com.sun.star.chart2.XDataProviderAccess");
+css::uno::Reference<
com::sun::star::chart2::XDataProviderAccess > xCreatorDoc(rModel.getParent(),
uno::UNO_QUERY);
+bCanCreateDataProvider = xCreatorDoc.is();
}
}
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index a54f054bd664..70c8123711af 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -228,7 +228,6 @@ using sc::TwipsToHMM;
#define SCMODELOBJ_SERVICE "com.sun.star.sheet.SpreadsheetDocument"
#define SCDOCSETTINGS_SERVICE
"com.sun.star.sheet.SpreadsheetDocumentSettings"
#define SCDOC_SERVICE "com.sun.star.document.OfficeDocument"
-#define SCDATAPROVIDERACCESS_SERVICE "com.sun.star.chart2.XDataProviderAccess"
SC_SIMPLE_SERVICE_INFO( ScAnnotationsObj, "ScAnnotationsObj",
"com.sun.star.sheet.CellAnnotations" )
SC_SIMPLE_SERVICE_INFO( ScDrawPagesObj, "ScDrawPagesObj",
"com.sun.star.drawing.DrawPages" )
@@ -2855,7 +2854,7 @@ sal_Bool SAL_CALL ScModelObj::supportsService( const
OUString& rServiceName )
uno::Sequence SAL_CALL ScModelObj::getSupportedServiceNames()
{
-return {SCMODELOBJ_SERVICE, SCDOCSETTINGS_SERVICE, SCDOC_SERVICE,
SCDATAPROVIDERACCESS_SERVICE};
+return {SCMODELOBJ_SERVICE, SCDOCSETTINGS_SERVICE, SCDOC_SERVICE};
}
// XUnoTunnel
___
Libreoffice-commits mailing list
libreoffice-comm...@l
[Libreoffice-commits] core.git: desktop/source svx/source
desktop/source/app/app.cxx | 34 ++---
desktop/source/app/officeipcthread.cxx | 19 +---
svx/source/inc/docrecovery.hxx |1
svx/source/unodraw/recoveryui.cxx | 38 +
4 files changed, 85 insertions(+), 7 deletions(-)
New commits:
commit cf333a878ceed18d0343520a2c65be69fc433b1f
Author: Mike Kaganski
Date: Sun Jan 21 22:10:09 2018 +0300
tdf#38915: set cProcessed condition on any process outcome
When application is initializing, initially request handler is not
processing requests (its state is Starting). Requests processing is
enabled in Desktop::OpenClients() after recovery had been processed.
If another soffice process is started, it communicates over already
established pipe, and sends a request to the first process. In
IpcThread::process(), it is decided if the request needs to be checked
for completion (e.g., if a file or specific module was requested to be
open). After that, the prepared request is posted for processing. In
case when the completion should be checked, PipeIpcThread::execute()
then waits for Processed condition indefinitely.
Request is processed in RequestHandler::ExecuteCmdLineRequests, which
first checks that handler's state is RequestsEnabled, and if it isn't,
then returns. Otherwise, after processing, Processed condition is set.
The problem is, thus, in case when the request comes before requests
processing is enabled (e.g., when recovery dialog is open): request
handler thread waits indefinitely, but the processed condition will
not be set. This will not allow to close the pipe to second process,
and it will hang indefinitely. The IPC thread will be hung even after
user closes recovery dialog, and continues working with program. So,
subsequent attempts to open files from file manager (launching new
process) will fail, and new zombie soffice processes will wait the
first indefinitely. Also, when first process will be closed by user,
the deinit sequence will attempt to wait for the IPC thread to finish
(in RequestHandler::Disable(), after all visible windows had been
closed), which will leave the first process hung, preventing all
subsequent attempts to open LibreOffice.
This patch ensures that the Processed condition is set at any outcome
in RequestHandler::ExecuteCmdLineRequests. Also, it brings (possibly
hidden) recovery dialog to front, making the reason why following
attempts to open files fail apparent to user.
Change-Id: Ibddf7483e5b1d6167ac7f307ea2442119f446129
Reviewed-on: https://gerrit.libreoffice.org/48280
Tested-by: Jenkins
Reviewed-by: Aron Budea
Reviewed-by: Mike Kaganski
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index f75fcac00ab8..c95674d50211 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -982,6 +982,15 @@ void impl_checkRecoveryState(bool& bCrashed ,
bSessionDataExists = elements && session;
}
+Reference< css::frame::XSynchronousDispatch > g_xRecoveryUI;
+
+template
+struct RefClearGuard
+{
+Ref& m_Ref;
+RefClearGuard(Ref& ref) : m_Ref(ref) {}
+~RefClearGuard() { m_Ref.clear(); }
+};
/* @short start the recovery wizard.
@@ -996,12 +1005,13 @@ bool impl_callRecoveryUI(bool bEmergencySave ,
css::uno::Reference< css::uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
-Reference< css::frame::XSynchronousDispatch > xRecoveryUI(
+g_xRecoveryUI.set(
xContext->getServiceManager()->createInstanceWithContext("com.sun.star.comp.svx.RecoveryUI",
xContext),
css::uno::UNO_QUERY_THROW);
+RefClearGuard>
refClearGuard(g_xRecoveryUI);
Reference< css::util::XURLTransformer > xURLParser =
-
css::util::URLTransformer::create(::comphelper::getProcessComponentContext());
+css::util::URLTransformer::create(xContext);
css::util::URL aURL;
if (bEmergencySave)
@@ -1013,6 +1023,24 @@ bool impl_callRecoveryUI(bool bEmergencySave ,
xURLParser->parseStrict(aURL);
+css::uno::Any aRet = g_xRecoveryUI->dispatchWithReturnValue(aURL,
css::uno::Sequence< css::beans::PropertyValue >());
+bool bRet = false;
+aRet >>= bRet;
+return bRet;
+}
+
+bool impl_bringToFrontRecoveryUI()
+{
+Reference< css::frame::XSynchronousDispatch > xRecoveryUI(g_xRecoveryUI);
+if (!xRecoveryUI.is())
+return false;
+
+css::util::URL aURL;
+aURL.Complete = "vnd.sun.star.autorecovery:/doBringToFront";
+Reference< css::util::XURLTransformer > xURLParser =
+
css::util::URLTransformer::create(::comphelper::getProcessComponentContext());
+xURLParser->parseStrict(aURL);
+
css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL,
css::uno::Sequence< css::beans::PropertyVal
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/apparmor/program.soffice.bin |1 +
1 file changed, 1 insertion(+)
New commits:
commit cae52b77d48916d819e788675f40da5fe4f7c99c
Author: Rene Engelhard
Date: Sat Jan 20 23:28:51 2018 +0100
readd lost comment
Change-Id: I99e3b3941f0478213ec9efe6b5152f2d780a8d00
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index fd074e878d9b..bde433fe6e4f 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -170,6 +170,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin
flags=(complain) {
/usr/share/fonts-config/conf.avail/*.conf r,
owner @{HOME}/.mozilla/firefox/** r,
+ # there is abstractions/gnupg but that's just for gpg1...
profile gpg {
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/Kit.cpp
kit/Kit.cpp | 21 -
1 file changed, 21 deletions(-)
New commits:
commit 90cd7791fa9088d0f7e2e09fceac13db20274e59
Author: Henry Castro
Date: Sat Jan 20 16:30:33 2018 -0400
kit: remove unused debug code
Change-Id: Ibd69a2b451be0a075759524acff5f0e9fc820d05
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index d3ac6bc9..4d054427 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2246,27 +2246,6 @@ void lokit_main(const std::string& childRoot,
return TerminationFlag.load();
});
-#if 0
-std::string uri = "file://$HOME/docs/basic-presentation.pptx";
-std::shared_ptr loKitDoc;
-
-const auto flags = LOK_FEATURE_DOCUMENT_PASSWORD
- | LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY
- | LOK_FEATURE_PART_IN_INVALIDATION_CALLBACK
- | LOK_FEATURE_NO_TILED_ANNOTATIONS
- | LOK_FEATURE_RANGE_HEADERS;
-loKit->setOptionalFeatures(flags);
-loKitDoc.reset(loKit->documentLoad(uri.c_str()));
-if (!loKitDoc || !loKitDoc->get())
-{
-LOG_ERR("Failed to load: " << uri << ", error: " <<
loKit->getError());
-std::_Exit(Application::EXIT_OK);
-}
-
-// specific case to debug
-// ...
-#endif
-
// Let forkit handle the jail cleanup.
}
catch (const Exception& exc)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sysui/desktop
sysui/desktop/apparmor/program.oosplash|2 +-
sysui/desktop/apparmor/program.soffice.bin |6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3ac287a705fdf801fd1f191fcbc2d74fc9ff2ffe
Author: Rene Engelhard
Date: Sun Jan 21 13:12:20 2018 +0100
remove accidentially committed flags=(complain)
Change-Id: Ia7116f77298b87d87221c80896b11a293d33f726
diff --git a/sysui/desktop/apparmor/program.oosplash
b/sysui/desktop/apparmor/program.oosplash
index 333c0617aa86..e044c1afce26 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -14,7 +14,7 @@
#include
-profile libreoffice-oopslash INSTDIR-program/oosplash flags=(complain) {
+profile libreoffice-oopslash INSTDIR-program/oosplash {
#include
#include
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index d7a639b7d53b..ecc249883d28 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -72,7 +72,7 @@
#include
-profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
+profile libreoffice-soffice INSTDIR-program/soffice.bin {
#include
#include
commit cd577ab89faefe6b7ef1a2bec14ed4d69b832f8e
Author: Rene Engelhard
Date: Sun Jan 21 13:10:46 2018 +0100
apparmor: allow running the "certificate manager" applications for gpg
Change-Id: Ic71e05d7561e1dcb532795dbf0b6e9309c1032d2
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index bde433fe6e4f..d7a639b7d53b 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -128,6 +128,10 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin
flags=(complain) {
/usr/bin/gpgconf rmix,
/usr/bin/gpg rmCx -> gpg,
/usr/bin/gpgsmrmCx -> gpg,
+ /usr/bin/gpa rix,
+ /usr/bin/seahorse rix,
+ /usr/bin/kgpg rix,
+ /usr/bin/kleopatrarix,
/dev/tty rw,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/ui/notebookbar.ui | 73 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui| 36 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 38 sc/uiconfig/scalc/ui/notebookbar_groups.ui| 39 sd/uiconfig/simpress/ui/notebookbar.ui| 57 +++ sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 37 sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui| 45 + sd/uiconfig/simpress/ui/notebookbar_groups.ui | 36 sw/uiconfig/swriter/ui/notebookbar.ui | 114 ++ sw/uiconfig/swriter/ui/notebookbar_compact.ui | 18 ++ sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 42 + sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 47 + sw/uiconfig/swriter/ui/notebookbar_groups.ui | 40 13 files changed, 616 insertions(+), 6 deletions(-) New commits: commit 5f650f72861d94c7c173bc16de9331c3c1c305d5 Author: Maxim Monastirsky Date: Fri Jan 19 03:39:44 2018 +0200 Addition of focus_on_click to notebookbar ui files (automatic rewrite) Change-Id: I959b58b3b0b69de9344b0f7188594a19e8b9d4ea Reviewed-on: https://gerrit.libreoffice.org/48176 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 283b9fc6d3d8..7012ed6c1ee9 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -216,6 +216,7 @@ True True +False True .uno:OpenFromCalc OpenImg @@ -232,6 +233,7 @@ True True +False True .uno:Save SaveImg @@ -248,6 +250,7 @@ True True +False True .uno:SaveAs SaveAsImg @@ -264,6 +267,7 @@ True True +False True .uno:OpenRemote OpenRemoteImg @@ -284,6 +288,7 @@ True True +False True .uno:ExportTo ExportToImg @@ -314,6 +319,7 @@ True True +False True .uno:ExportToPDF ExportToPDFImg @@ -340,6 +346,7 @@ True True +False True .uno:Print PrintImg @@ -360,6 +367,7 @@ True True +False True .uno:Signature SignatureImg @@ -404,6 +412,7 @@ True True +False True .uno:Paste PasteImg @@ -426,6 +435,7 @@ True True +False True .uno:Cut none @@ -441,6 +451,7 @@ True True +False True .uno:Copy none @@ -468,6 +479,7 @@ Clone True True +False True .uno:FormatPaintbrush FormatPaintbrushImg1 @@ -1397,6 +1409,7 @@ True True +False True .uno:ConditionalFormatMenu none @@ -1412,6 +1425,7 @@ True True +False True .uno:ToggleMergeCells none @@ -1615,6 +1629,7 @@
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathmlimport.cxx | 24
starmath/source/mathmlimport.hxx |5 +
2 files changed, 25 insertions(+), 4 deletions(-)
New commits:
commit f1d1eb2c647af7b751b024faef09e01d849aacbb
Author: Caolán McNamara
Date: Sun Jan 21 17:51:14 2018 +
ofz#5526 restrict mml parsing depth
Change-Id: Ib74787137112fb8402a2f6400ab4313d43c103dc
Reviewed-on: https://gerrit.libreoffice.org/48277
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 032feb61a260..62a705cae930 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -410,7 +410,8 @@ SmXMLImport::SmXMLImport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLImportFlags nImportFlags)
: SvXMLImport(rContext, implementationName, nImportFlags),
-bSuccess(false)
+bSuccess(false),
+nParseDepth(0)
{
}
@@ -536,7 +537,15 @@ class SmXMLImportContext: public SvXMLImportContext
public:
SmXMLImportContext( SmXMLImport &rImport, sal_uInt16 nPrfx,
const OUString& rLName)
-: SvXMLImportContext(rImport, nPrfx, rLName) {}
+: SvXMLImportContext(rImport, nPrfx, rLName)
+{
+GetSmImport().IncParseDepth();
+}
+
+virtual ~SmXMLImportContext() override
+{
+GetSmImport().DecParseDepth();
+}
SmXMLImport& GetSmImport()
{
@@ -546,6 +555,12 @@ public:
virtual void TCharacters(const OUString & /*rChars*/);
virtual void Characters(const OUString &rChars) override;
virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 /*nPrefix*/,
const OUString& /*rLocalName*/, const uno::Reference< xml::sax::XAttributeList
> & /*xAttrList*/) override;
+virtual void StartElement(const
css::uno::Reference& rAttrList) override
+{
+if (GetSmImport().TooDeep())
+throw std::range_error("too deep");
+SvXMLImportContext::StartElement(rAttrList);
+}
};
void SmXMLImportContext::TCharacters(const OUString & /*rChars*/)
@@ -906,7 +921,9 @@ public:
SmXMLRowContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
const OUString& rLName)
: SmXMLDocContext_Impl(rImport,nPrefix,rLName)
-{ nElementCount = GetSmImport().GetNodeStack().size(); }
+, nElementCount(GetSmImport().GetNodeStack().size())
+{
+}
virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix, const
OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >
&xAttrList) override;
@@ -916,7 +933,6 @@ public:
void EndElement() override;
};
-
class SmXMLEncloseContext_Impl : public SmXMLRowContext_Impl
{
public:
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 3d017c1a25a7..a0d2c6254f0c 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -80,6 +80,7 @@ class SmXMLImport : public SvXMLImport
SmNodeStack aNodeStack;
bool bSuccess;
+int nParseDepth;
OUString aText;
public:
@@ -181,6 +182,10 @@ public:
virtual void SetViewSettings(const
css::uno::Sequence& aViewProps) override;
virtual void SetConfigurationSettings(const
css::uno::Sequence& aViewProps) override;
+
+void IncParseDepth() { ++nParseDepth; }
+bool TooDeep() const { return nParseDepth >= 2048; }
+void DecParseDepth() { --nParseDepth; }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/ctrl.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2a2b37202a735b34da914c03b2f6e1495f833b51
Author: Maxim Monastirsky
Date: Sat Jan 20 19:51:34 2018 +0200
tdf#115023 Check mpControlData for nullptr
Control::ImplClearLayoutData happens to be called post
dispose, but Control::dispose already destroyed
mpControlData. So put back the nullptr check that was
removed in e8b49f09074fe184374bee5062715357427ae044
("new loplugin: useuniqueptr: vcl").
(But IMHO it's odd that we even try to send lose focus
events to disposing windows. So maybe it would make sense
to replace the "! pOldFocusWindow->IsDisposed()" check
inside Window::ImplGrabFocus with "isDisposed()" which
comes from VclReferenceBase, and set much earlier?)
Change-Id: Iddaf7e05d6cb56c28a34884876770753fcf7179e
Reviewed-on: https://gerrit.libreoffice.org/48246
Reviewed-by: Noel Grandin
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 6a512eb4171f..4ece999ab75b 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -328,7 +328,8 @@ void Control::SetLayoutDataParent( const Control* pParent )
const
void Control::ImplClearLayoutData() const
{
-mpControlData->mpLayoutData.reset();
+if (mpControlData)
+mpControlData->mpLayoutData.reset();
}
void Control::ImplDrawFrame( OutputDevice* pDev, tools::Rectangle& rRect )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/idxf/dxfreprd.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit cc04bc76c49dc6881cc7752a8e34fb84bddf7262
Author: Caolán McNamara
Date: Sun Jan 21 14:46:31 2018 +
ofz#5539 stricter on strings in dxf
Change-Id: I06823d9d767ffe11061531ec905f62ed3a5d302e
Reviewed-on: https://gerrit.libreoffice.org/48267
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx
b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 5920eaddab83..636d9197153c 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -454,7 +454,10 @@ namespace {
OUString DXFRepresentation::ToOUString(const OString& s) const
{
-OUString result = OStringToOUString(s, getTextEncoding());
+OUString result = OStringToOUString(s, getTextEncoding(),
+
RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
+ |
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
+ |
RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR);
result = result.replaceAll("%%o", "") // Overscore -
simply remove
.replaceAll("%%u", "") // Underscore -
simply remove
.replaceAll("%%d", OUStringLiteral1(0x00B0)) // Degrees
symbol (°)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source sw/source
cui/source/dialogs/SpellDialog.cxx |5 +++--
sw/source/ui/dbui/addresslistdialog.cxx |4 ++--
sw/source/ui/dbui/mmaddressblockpage.cxx | 10 ++
3 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 5776d219db28b795acb952e9728cc9502403bcb8
Author: Noel Grandin
Date: Fri Jan 19 15:44:12 2018 +0200
more ScopedVclPtr for dialogs
Change-Id: I0f19a0c1e312843bee0ee5c9939831918ddc2da7
Reviewed-on: https://gerrit.libreoffice.org/48198
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index db126849cb4c..95e611a313cb 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -489,8 +489,9 @@ IMPL_LINK( SpellDialog, CheckGrammarHdl, Button*, pBox,
void )
void SpellDialog::StartSpellOptDlg_Impl()
{
SfxItemSet aSet( SfxGetpApp()->GetPool(),
svl::Items{});
-VclPtr pDlg(
-VclPtr::Create(this, aSet, "SpellOptionsDialog",
"cui/ui/spelloptionsdialog.ui"));
+ScopedVclPtr pDlg(
+VclPtr::Create(
+this, aSet, "SpellOptionsDialog", "cui/ui/spelloptionsdialog.ui"));
VclPtr pPage = SvxLinguTabPage::Create(
pDlg->get_content_area(), &aSet );
static_cast(pPage.get())->HideGroups( GROUP_MODULES );
pDlg->SetTabPage( pPage );
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx
b/sw/source/ui/dbui/addresslistdialog.cxx
index 77890e3b27fc..ef79ead501c6 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -357,8 +357,8 @@ IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl, Button*,
void)
IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void)
{
OUString sInputURL;
-VclPtr pDlg(
-VclPtr::Create(
+ScopedVclPtr pDlg(
+VclPtr::Create(
pButton,
sInputURL,
m_pAddressPage->GetWizard()->GetConfigItem()));
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 68b6adde88f7..945e72c93382 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -218,8 +218,9 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl,
Button*, pButton, void)
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
const sal_uInt16 nSel = m_pSettingsWIN->GetSelectedAddress();
const uno::Sequence< OUString> aBlocks = rConfigItem.GetAddressBlocks();
-VclPtr pDlg(
-VclPtr::Create(pButton,
m_pWizard->GetConfigItem(), aBlocks[nSel], true));
+ScopedVclPtr pDlg(
+VclPtr::Create(
+pButton, m_pWizard->GetConfigItem(), aBlocks[nSel], true));
if(RET_OK == pDlg->Execute())
{
//preview update
@@ -447,8 +448,9 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl,
Button*, pButton, vo
SwCustomizeAddressBlockDialog::DialogType nType = bCustomize ?
SwCustomizeAddressBlockDialog::ADDRESSBLOCK_EDIT :
SwCustomizeAddressBlockDialog::ADDRESSBLOCK_NEW;
-VclPtr pDlg(
-
VclPtr::Create(pButton,m_rConfig,nType));
+ScopedVclPtr pDlg(
+VclPtr::Create(
+pButton,m_rConfig,nType));
if(bCustomize)
{
pDlg->SetAddress(m_aAddressBlocks[m_pPreview->GetSelectedAddress()]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/itrform2.cxx | 17
sw/source/core/text/pormulti.cxx | 79 +++
sw/source/core/text/pormulti.hxx | 19 ++---
3 files changed, 70 insertions(+), 45 deletions(-)
New commits:
commit d1bc14b318c9a412a761d243085da0895a1aed4a
Author: Mark Hung
Date: Sat Jan 20 23:35:44 2018 +0800
tdf#35301 Formatting ruby text on right side.
* BuildMultiPortion(): preserve room for the ruby text by
increasing the width of the last portion of the base text.
This allows the ruby portion to be selected with the base
text so that they seemd like attached to each other.
* CalcSize(): we need to be careful because the width and
height of the base text line is swapped.
* PaintMultiPortion(): render the base text on top of the
preserved room mentioned above, by shifting the position
back.
* SwRubyPortion(): RubyPortion::RIGHT is designed for
horizontal writing mode only. In vertical writing
mode it fallback to RubyPortion::ABOVE.
Change-Id: I5291e32221b6b2fc1c3e152b3a5defe857428163
Reviewed-on: https://gerrit.libreoffice.org/48244
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 1346390589cc..fbaa66dedc7b 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1252,24 +1252,9 @@ SwLinePortion *SwTextFormatter::NewPortion(
SwTextFormatInfo &rInf )
pTmp = new SwBidiPortion( nEnd, pCreate->nLevel );
else if ( SwMultiCreatorId::Ruby == pCreate->nId )
{
-Seek( rInf.GetIdx() );
-bool bRubyTop = false;
-bool* pRubyPos = nullptr;
-
-if ( rInf.SnapToGrid() )
-{
-SwTextGridItem const*const pGrid(
-GetGridItem(GetTextFrame()->FindPageFrame()));
-if ( pGrid )
-{
-bRubyTop = ! pGrid->GetRubyTextBelow();
-pRubyPos = &bRubyTop;
-}
-}
-
pTmp = new SwRubyPortion( *pCreate, *rInf.GetFont(),
*GetTextFrame()->GetTextNode()->getIDocumentSettingAccess(),
- nEnd, 0, pRubyPos );
+ nEnd, 0, rInf );
}
else if( SwMultiCreatorId::Rotate == pCreate->nId )
pTmp = new SwRotatedPortion( *pCreate, nEnd,
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index b35760f763ba..03f7e8592625 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -92,7 +92,17 @@ void SwMultiPortion::CalcSize( SwTextFormatter& rLine,
SwTextFormatInfo &rInf )
}
else
SetAscent( GetAscent() + pLay->GetAscent() );
-Height( Height() + pLay->Height() );
+
+// Increase the line height, except for ruby text on the right.
+if ( !IsRuby() || !OnRight() || pLay == &GetRoot() )
+Height( Height() + pLay->Height() );
+else
+{
+// We already added the width after building the portion,
+// so no need to add it twice.
+break;
+}
+
if( Width() < pLay->Width() )
Width( pLay->Width() );
pLay = pLay->GetNext();
@@ -538,7 +548,7 @@ SwRubyPortion::SwRubyPortion( const SwRubyPortion& rRuby,
sal_Int32 nEnd ) :
nAdjustment( rRuby.GetAdjustment() )
{
SetDirection( rRuby.GetDirection() );
-SetTop( rRuby.OnTop() );
+SetRubyPosition( rRuby.GetRubyPosition() );
SetRuby();
}
@@ -547,7 +557,7 @@ SwRubyPortion::SwRubyPortion( const SwRubyPortion& rRuby,
sal_Int32 nEnd ) :
SwRubyPortion::SwRubyPortion( const SwMultiCreator& rCreate, const SwFont&
rFnt,
const IDocumentSettingAccess&
rIDocumentSettingAccess,
sal_Int32 nEnd, sal_Int32 nOffs,
- const bool* pForceRubyPos )
+ const SwTextSizeInfo &rInf )
: SwMultiPortion( nEnd )
{
SetRuby();
@@ -557,11 +567,22 @@ SwRubyPortion::SwRubyPortion( const SwMultiCreator&
rCreate, const SwFont& rFnt,
nAdjustment = rRuby.GetAdjustment();
nRubyOffset = nOffs;
-// in grid mode we force the ruby text to the upper or lower line
-if ( pForceRubyPos )
-SetTop( *pForceRubyPos );
-else
-SetTop( ! rRuby.GetPosition() );
+const SwTextFrame *pFrame = rInf.GetTextFrame();
+RubyPosition ePos = static_cast( rRuby.GetPosition() );
+
+// RIGHT is designed for horizontal writing mode only.
+if ( ePos == RubyPosit
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/apparmor/program.soffice.bin |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit b16d91cff78fa8c60131c76853c5d8fe279210a9
Author: Rene Engelhard
Date: Sat Jan 20 23:25:07 2018 +0100
deb#887593 make gpg child profile really work
now I can see my testkey and sign. Thanks Christian Bolz
Change-Id: Idd46e7f7d2e16cf24bbdee10ecad772b7f4a
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index ba1e248917be..fd074e878d9b 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -170,8 +170,13 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin
flags=(complain) {
/usr/share/fonts-config/conf.avail/*.conf r,
owner @{HOME}/.mozilla/firefox/** r,
- # there is abstractions/gnupg but that's just for gpg1...
profile gpg {
+#include
+
+ /usr/bin/gpgconf rm,
+ /usr/bin/gpg rm,
+ /usr/bin/gpgsm rm,
+
owner @{HOME}/.gnupg/* r,
}
}
___
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/gtksalframe.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 02514633c8b9299ffefbb18884995af5eef9a7f6
Author: Caolán McNamara
Date: Fri Jan 19 15:40:50 2018 +
Resolves: tdf#115106 don't assume fullscreen is impress
writer can too, so revert this part of
commit 277395b6266c57a7709c3c47986f135f6789c8e7
Author: Caolán McNamara
Date: Tue Jun 13 18:09:08 2017 +0100
make opengl transitions under X flicker free on enter/leave
which should restore matters to its former glory, at this point gtk3 opengl
transition support now works so it all moot to me now.
Change-Id: I78a8a774aead6482d0541575dbf10ad977ceccc0
Reviewed-on: https://gerrit.libreoffice.org/48207
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index de2101f96e90..d297d7ad7cfd 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2789,9 +2789,7 @@ gboolean GtkSalFrame::signalExpose( GtkWidget*,
GdkEventExpose* pEvent, gpointer
{
GtkSalFrame* pThis = static_cast(frame);
-const bool bImmediate = OpenGLHelper::isVCLOpenGLEnabled() ||
pThis->m_bFullscreen;
-
-struct SalPaintEvent aEvent( pEvent->area.x, pEvent->area.y,
pEvent->area.width, pEvent->area.height, bImmediate );
+struct SalPaintEvent aEvent( pEvent->area.x, pEvent->area.y,
pEvent->area.width, pEvent->area.height, OpenGLHelper::isVCLOpenGLEnabled() );
pThis->CallCallback( SalEvent::Paint, &aEvent );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 19
+++---
1 file changed, 14 insertions(+), 5 deletions(-)
New commits:
commit 0b835ff2d872f3597d5166c25c355ea8e1389f3d
Author: heiko tietze
Date: Fri Jan 19 15:21:40 2018 +0100
Fix Clone Formatting command labels in Writer
Regression of effc05eecb1359239ca7a86103a6fd9fc8424015
("tdf#103705 Tooltip improvement for clone formatting")
Change-Id: I3e7bfd95cb0de07d5ca4cd85166f679f7673655c
Reviewed-on: https://gerrit.libreoffice.org/48201
Reviewed-by: Maxim Monastirsky
Tested-by: Maxim Monastirsky
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 95c89edde3f8..1f4fe350ce11 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2633,6 +2633,20 @@
Smart ~Tag Options...
+
+
+ Clone
+
+
+ Clone Formatting
+
+
+ Clone Formatting (double click and Ctrl or
Cmd to alter behavior)
+
+
+ 9
+
+
@@ -3269,11 +3283,6 @@
More Fields
-
-
- Clone Formatting (double click and Ctrl or
Cmd to alter behavior)
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/brdwin.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 121f6f3c79ea2dceb7cc3d61a56f5a56a1cb0d0d
Author: Maxim Monastirsky
Date: Sun Jan 21 01:14:13 2018 +0200
Make the condition more obvious
No need to look at possible enum values each time.
Change-Id: I3191ab08d91c8f954ecfb027f1ab26b25a021f14
Reviewed-on: https://gerrit.libreoffice.org/48258
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 5cf138c4f2e7..980e77da3043 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1418,7 +1418,7 @@ void
ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, con
vcl::Region oldClipRgn(rRenderContext.GetClipRegion());
// for popups, don't draw part of the frame
-if (pData->mnTitleType >= BorderWindowTitleType::Tearoff)
+if (!(pData->mnTitleType & (BorderWindowTitleType::Normal |
BorderWindowTitleType::Small)))
{
FloatingWindow* pWin =
dynamic_cast(pData->mpBorderWindow->GetWindow(GetWindowType::Client));
if (pWin)
@@ -1444,7 +1444,7 @@ void
ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, con
--aInRect.Bottom();
// restore
-if (pData->mnTitleType >= BorderWindowTitleType::Tearoff)
+if (!(pData->mnTitleType & (BorderWindowTitleType::Normal |
BorderWindowTitleType::Small)))
rRenderContext.SetClipRegion(oldClipRgn);
// Draw Border
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/ImpressTileLayer.js | 17 -
loleaflet/src/map/Map.js |2 +-
2 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit dc0001e92f5930babf6a32bfe9a6033f474e6298
Author: Henry Castro
Date: Sat Jan 20 17:39:55 2018 -0400
loleaflet: impress: ensure to remove the layer annotation items
Change-Id: I660686c193f367ba22278fb2d1c8b2525572c3e0
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 0917f9ab..abad6a79 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -183,6 +183,21 @@ L.ImpressTileLayer = L.TileLayer.extend({
}
},
+ clearAnnotations: function () {
+ var annotation;
+ var annotations;
+ for (var key in this._annotations) {
+ annotations = this._annotations[key];
+ while (annotations.length > 0) {
+ annotation = annotations.pop();
+ if (annotation) {
+ this._map.removeLayer(annotation);
+ }
+ }
+ }
+ this._annotations = {};
+ },
+
removeAnnotation: function (id) {
var annotations =
this._annotations[this._partHashes[this._selectedPart]];
for (var index in annotations) {
@@ -279,7 +294,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
}
if (values.comments) {
- this._annotations = {};
+ this.clearAnnotations();
for (var index in values.comments) {
var comment = values.comments[index];
if (!this._annotations[comment.parthash]) {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 9020f160..6c761b98 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -850,7 +850,7 @@ L.Map = L.Evented.extend({
console.debug('sending useractive');
this._socket.sendMessage('useractive');
this._active = true;
- if (this._doclayer) {
+ if (this._docLayer) {
this._docLayer._onMessage('invalidatetiles: EMPTY', null);
}
if (vex.dialogID > 0) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpfribptr.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit c68d08a63ed95d96914981fa320afd215a046e72
Author: Caolán McNamara
Date: Sat Jan 20 20:15:10 2018 +
ofz#5514 Direct-leak
Change-Id: I9d77f102ed74ac901fffeac3054a57d172fd9dc0
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx
b/lotuswordpro/source/filter/lwpfribptr.cxx
index 406a42189075..a899458bca4e 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -204,14 +204,14 @@ void LwpFribPtr::XFConvert()
XFTabStop *pTab = new XFTabStop;
m_pXFPara->Add(pTab);
}
-}
break;
+}
case FRIB_TAG_SECTION:
{
LwpFribSection* pSectionFrib = static_cast(pFrib);
pSectionFrib->ParseSection();
+break;
}
-break;
case FRIB_TAG_PAGEBREAK:
{
@@ -230,28 +230,28 @@ void LwpFribPtr::XFConvert()
else
{
//parse pagebreak
-XFParagraph *pPara = new XFParagraph();
-pPara->SetStyleName(pFrib->GetStyleName());
-SetXFPara(pPara);
-m_pPara->AddXFContent(pPara);
+rtl::Reference xPara(new XFParagraph);
+xPara->SetStyleName(pFrib->GetStyleName());
+SetXFPara(xPara.get());
+m_pPara->AddXFContent(xPara.get());
}
}
-}
break;
+}
case FRIB_TAG_COLBREAK:
{
rtl::Reference xPara(new XFParagraph);
xPara->SetStyleName(pFrib->GetStyleName());
SetXFPara(xPara.get());
m_pPara->AddXFContent(xPara.get());
-}
break;
+}
case FRIB_TAG_LINEBREAK:
{
XFLineBreak *pLineBreak = new XFLineBreak;
m_pXFPara->Add(pLineBreak);
-}
break;
+}
case FRIB_TAG_UNICODE: //fall through
case FRIB_TAG_UNICODE2: //fall through
case FRIB_TAG_UNICODE3: //fall through
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/data/html/pass/ofz5353-1.html |1 +
sw/source/filter/html/htmlctxt.cxx | 14 ++
2 files changed, 15 insertions(+)
New commits:
commit fc38cb55cc6bc2af12ed4f12d2e7fb1494c3376b
Author: Caolán McNamara
Date: Fri Jan 19 17:37:18 2018 +
ofz#5253 restore some sort of valid state on missing Restore
Change-Id: Ic12e1567f5a3370d1580d8c471ee38d3069568ce
Reviewed-on: https://gerrit.libreoffice.org/48217
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/core/data/html/pass/ofz5353-1.html
b/sw/qa/core/data/html/pass/ofz5353-1.html
new file mode 100644
index ..25cff17de584
--- /dev/null
+++ b/sw/qa/core/data/html/pass/ofz5353-1.html
@@ -0,0 +1 @@
+ �
\ No newline at end of file
diff --git a/sw/source/filter/html/htmlctxt.cxx
b/sw/source/filter/html/htmlctxt.cxx
index 93e8c5f57f0c..95750dfae142 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -384,6 +384,20 @@ void SwHTMLParser::ClearContext( HTMLAttrContext *pContext
)
OSL_ENSURE( !pContext->HasSaveDocContext(),
"Frame can no longer be exited" );
+// like RestoreDocContext reset enough of this to not catastropically
+// fail if we still have a SaveDocContext here
+if (HTMLAttrContext_SaveDoc *pSave = pContext->GetSaveDocContext())
+{
+if (SIZE_MAX != pSave->GetContextStMin())
+{
+m_nContextStMin = pSave->GetContextStMin();
+if (SIZE_MAX != pSave->GetContextStAttrMin())
+m_nContextStAttrMin = pSave->GetContextStAttrMin();
+}
+
+pContext->ClearSaveDocContext();
+}
+
// Restart PRE/LISTING/XMP environments
if( pContext->IsFinishPREListingXMP() )
FinishPREListingXMP();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config.guess config.sub
config.guess | 679 +++
config.sub | 316 +--
2 files changed, 525 insertions(+), 470 deletions(-)
New commits:
commit c5f88f0dce63c4fb2d208c493c1b06e25318aa61
Author: Caolán McNamara
Date: Fri Jan 19 10:03:13 2018 +
Update config.{guess,sub}
...to latest versions from
and
but retain...
commit 25a09c8776cc6088a5b2bf13dc84eb386c26bb7e
Date: Wed Jun 7 12:23:17 2017 +0200
iOS, add support for arm64
Added general support for arm64
Removed experimental/prototype from normal build
Change-Id: I82f9a549bb5004ff25266c50985569af53ba5f0e
Reviewed-on: https://gerrit.libreoffice.org/48180
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/config.guess b/config.guess
index 553731934eb7..ae5ffc72f4be 100644
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2014-03-23'
+timestamp='2018-01-16'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2014-03-23'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see
