[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf106001-2.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 10 ++
sw/source/filter/ww8/docxattributeoutput.cxx |5 -
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit a3a0eac099831de6fd7c53b66f85b964e41a5a13
Author: Aron Budea
Date: Tue Feb 28 07:28:30 2017 +0100
tdf#106001: Clamp CharScaleWidth outliers when exporting to DOCX
Atribute is of type ST_TextScale, which has to be
between 1 and 600.
Change-Id: I9b9cddc47d194f1364d91675c9b825752b2f5e06
Reviewed-on: https://gerrit.libreoffice.org/34713
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tdf106001-2.odt
b/sw/qa/extras/ooxmlexport/data/tdf106001-2.odt
new file mode 100644
index 000..36d2650
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf106001-2.odt
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index a97ee2f..3ab81d2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -231,6 +231,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf106001, "tdf106001.docx")
CPPUNIT_ASSERT_EQUAL( static_cast( 100 ),
getProperty(getRun(getParagraph(1), 1), "CharScaleWidth" ));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf106001_2, "tdf106001-2.odt")
+{
+// In test ODT CharScaleWidth = 900, this was not changed upon OOXML
export to stay in [1..600], now it's clamped to 600
+// Note: we disregard what's set in pPr / rPr and only care about r / rPr
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:rPr/w:w","val","600");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf103931, "tdf103931.docx")
{
uno::Reference
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a66ab0b..e5ce36a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6566,8 +6566,11 @@ void DocxAttributeOutput::CharTwoLines( const
SvxTwoLinesItem& rTwoLines )
void DocxAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem&
rScaleWidth )
{
+// Clamp CharScaleWidth to OOXML limits ([1..600])
+const sal_Int16 nScaleWidth( std::max( 1,
+std::min( rScaleWidth.GetValue(), 600 ) ) );
m_pSerializer->singleElementNS( XML_w, XML_w,
-FSNS( XML_w, XML_val ), OString::number( rScaleWidth.GetValue()
).getStr(), FSEND );
+FSNS( XML_w, XML_val ), OString::number( nScaleWidth ).getStr(), FSEND
);
}
void DocxAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source cui/source editeng/source forms/source i18npool/inc i18npool/qa i18npool/source i18nutil/source include/editeng include/i18nutil include/svl include/svx in
basic/source/classes/global.cxx |3 basic/source/runtime/methods.cxx | 22 - basic/source/runtime/runtime.cxx |6 cui/source/dialogs/cuifmsearch.cxx|3 cui/source/factory/dlgfact.cxx|4 cui/source/factory/dlgfact.hxx|4 cui/source/inc/cuisrchdlg.hxx |6 cui/source/options/cuisrchdlg.cxx |5 cui/source/options/optaboutconfig.cxx |3 cui/source/options/optaboutconfig.hxx |4 cui/source/options/optjsearch.cxx | 88 +++--- cui/source/options/optjsearch.hxx | 13 editeng/source/editeng/editeng.cxx|4 editeng/source/editeng/editundo.cxx |2 editeng/source/editeng/editundo.hxx |6 editeng/source/editeng/editview.cxx |2 editeng/source/editeng/impedit.hxx|2 editeng/source/editeng/impedit4.cxx | 10 editeng/source/misc/svxacorr.cxx |5 editeng/source/outliner/outlvw.cxx|2 forms/source/xforms/computedexpression.cxx|4 i18npool/inc/transliteration_caseignore.hxx |2 i18npool/qa/cppunit/test_textsearch.cxx |5 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |1 i18npool/source/search/textsearch.cxx | 77 ++--- i18npool/source/transliteration/transliteration_caseignore.cxx|5 i18nutil/source/utility/casefolding.cxx |9 include/editeng/editeng.hxx |6 include/editeng/editview.hxx |3 include/editeng/outliner.hxx | 16 - include/i18nutil/casefolding.hxx |5 include/i18nutil/searchopt.hxx| 142 ++ include/i18nutil/transliteration.hxx | 132 + include/svl/ondemand.hxx |8 include/svl/srchitem.hxx | 25 - include/svx/fmsrccfg.hxx |9 include/svx/fmsrcimp.hxx |9 include/svx/srchdlg.hxx |9 include/svx/svxdlg.hxx| 17 - include/unotools/caserotate.hxx |5 include/unotools/searchopt.hxx|3 include/unotools/textsearch.hxx | 18 - include/unotools/transliterationwrapper.hxx |7 include/vcl/textview.hxx |7 include/vcl/xtextedt.hxx |2 reportdesign/source/ui/inspection/GeometryHandler.cxx |6 sc/inc/document.hxx |2 sc/inc/global.hxx |8 sc/inc/viewutil.hxx |6 sc/qa/unit/ucalc.cxx |4 sc/source/core/data/documen8.cxx |6 sc/source/core/data/table6.cxx|8 sc/source/core/tool/cellkeytranslator.cxx |5 sc/source/core/tool/interpr1.cxx |4 sc/source/ui/docshell/docfunc.cxx |2 sc/source/ui/drawfunc/drtxtob.cxx |4 sc/source/ui/inc/docfunc.hxx |7 sc/source/ui/inc/undoblk.hxx |5 sc/source/ui/inc/viewfunc.hxx |2 sc/source/ui/undo/undoblk.cxx |2 sc/source/ui/view/cellsh1.cxx |6 sc/source/ui/view/editsh.cxx |4 sc/source/ui/view/viewfun2.cxx
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/SdtHelper.cxx |2 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 ++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 10 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit d97380c66904328e9d706a0b03a6800dc048aa7d
Author: Miklos Vajna
Date: Tue Feb 28 20:33:17 2017 +0100
writerfilter: avoid repeating the return type from the declaration
Change-Id: I4fb7993482e71c936d820b559aa6b4a212c8175d
Reviewed-on: https://gerrit.libreoffice.org/34729
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx
b/writerfilter/source/dmapper/SdtHelper.cxx
index a27c017..b9c3b9f 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -59,7 +59,7 @@ awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr&
pStyleSheet, OUString& r
sal_Int32 nBorder = nHeight / 2;
// Width: space for the text + the square having the dropdown arrow.
-return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder);
+return {nWidth + nBorder + nHeight, nHeight + nBorder};
}
SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 719d82c..7286a83 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -210,8 +210,8 @@ const char* keywordToString(RTFKeyword nKeyword)
static util::DateTime lcl_getDateTime(RTFParserState& aState)
{
-return util::DateTime(0 /*100sec*/, 0 /*sec*/, aState.nMinute,
aState.nHour,
- aState.nDay, aState.nMonth, aState.nYear, false);
+return {0 /*100sec*/, 0 /*sec*/, aState.nMinute, aState.nHour,
+ aState.nDay, aState.nMonth, aState.nYear, false};
}
static void lcl_DestinationToMath(OUStringBuffer* pDestinationText,
oox::formulaimport::XmlStreamBuilder& rMathBuffer, bool& rMathNor)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 5b09a50..5128264a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -274,11 +274,11 @@ public:
bool isRightToLeft;
// Info group.
-int nYear;
-int nMonth;
-int nDay;
-int nHour;
-int nMinute;
+sal_Int16 nYear;
+sal_uInt16 nMonth;
+sal_uInt16 nDay;
+sal_uInt16 nHour;
+sal_uInt16 nMinute;
/// Text from special destinations.
OUStringBuffer aDestinationText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - 13 commits - common/Common.hpp common/Session.cpp common/Session.hpp net/Socket.hpp net/WebSocketHandler.hpp test/helpers.hpp tes
common/Common.hpp|3
common/Session.cpp |7
common/Session.hpp |2
net/Socket.hpp | 33 ++-
net/WebSocketHandler.hpp | 165 +
test/UnitAdmin.cpp |4
test/UnitMinSocketBufferSize.cpp |2
test/UnitStorage.cpp |2
test/UnitTileCache.cpp |2
test/helpers.hpp |6
test/httpcrashtest.cpp |5
test/httpwserror.cpp |2
test/httpwstest.cpp | 73 ---
wsd/DocumentBroker.cpp |4
wsd/LOOLWSD.cpp | 364 +++
15 files changed, 515 insertions(+), 159 deletions(-)
New commits:
commit 7d0d0fd4af9088c6a875aabe7c530d97ea613dbc
Author: Ashod Nakashian
Date: Wed Mar 1 01:49:10 2017 -0500
nb: support inserting image
Change-Id: I6ef11634bbda7e3ecdc467ce10727c8573caef8d
diff --git a/net/Socket.hpp b/net/Socket.hpp
index a1e1f1f..5ba902e 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -403,6 +403,15 @@ public:
send(str.data(), str.size(), flush);
}
+void send(Poco::Net::HTTPResponse& response)
+{
+response.set("User-Agent", HTTP_AGENT_STRING);
+std::ostringstream oss;
+response.write(oss);
+LOG_INF(oss.str());
+send(oss.str());
+}
+
/// Reads data by invoking readData() and buffering.
/// Return false iff the socket is closed.
virtual bool readIncomingData()
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b26c669..2985b25 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3040,7 +3040,9 @@ private:
File(dirPath).createDirectories();
std::string fileName = dirPath + "/" + form.get("name");
File(tmpPath).moveTo(fileName);
-return; // FIXME send response
+response.setContentLength(0);
+socket->send(response);
+return;
}
}
}
commit a6df778c209d1bcc6fedf8d962d700c8527e813d
Author: Ashod Nakashian
Date: Tue Feb 28 17:45:27 2017 -0500
nb: enable testCloseAfterClose
Change-Id: I4150c547c3859e22c6628cd8d65e470b71d8cad4
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 3150cf9..cd5e156 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -58,7 +58,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testBadRequest);
CPPUNIT_TEST(testHandshake);
-// CPPUNIT_TEST(testCloseAfterClose); //FIXME: loolnb
+CPPUNIT_TEST(testCloseAfterClose);
CPPUNIT_TEST(testConnectNoLoad); // This fails most of the times but
occasionally succeeds
CPPUNIT_TEST(testLoadSimple);
CPPUNIT_TEST(testLoadTortureODT);
@@ -326,7 +326,9 @@ void HTTPWSTest::testCloseAfterClose()
{
bytes = socket->receiveFrame(buffer, sizeof(buffer), flags);
}
-while (bytes && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) !=
Poco::Net::WebSocket::FRAME_OP_CLOSE);
+while (bytes > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK)
!= Poco::Net::WebSocket::FRAME_OP_CLOSE);
+
+std::cerr << "Received " << bytes << " bytes, flags: "<< std::hex <<
flags << std::dec << std::endl;
// no more messages is received.
bytes = socket->receiveFrame(buffer, sizeof(buffer), flags);
commit 8b7aea14b12ce6dee0ae837671c2cddb85e54105
Author: Ashod Nakashian
Date: Wed Mar 1 01:21:49 2017 -0500
nb: shutdown on reaching connection or document limit
Change-Id: I5eedaf780ed00804d93c362e83ac4fcfd5d057b1
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index cb36d3a..b26c669 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -204,58 +204,22 @@ static int careerSpanSeconds = 0;
namespace
{
-inline void shutdownLimitReached(LOOLWebSocket& ws)
+inline void shutdownLimitReached(WebSocketSender& ws)
{
const std::string error = Poco::format(PAYLOAD_UNAVAILABLE_LIMIT_REACHED,
MAX_DOCUMENTS, MAX_CONNECTIONS);
LOG_INF("Sending client limit-reached message: " << error);
-/* loleaflet sends loolclient, load and partrectangles message immediately
- after web socket handshake, so closing web socket fails loading page in
- some sensible browsers. Ignore handshake messages and gracefully
- close in order to send error messages.
-*/
try
{
-int flags = 0;
-int retries = 7;
-std::vector buffer(READ_BUFFER_SIZE * 100);
+// Let the client know we are shutting down.
+ws.sendFrame(error);
-const Poco::Timespan waitTime(POLL_TIMEOUT_MS * 1000 / retries);
-do
-{
-if (ws.poll(Poco::Timespan(0),
Poco::Net::Socket::SelectMode::SELECT_ERROR))
-{
-// Already disconnected, can't send 'close' frame.
-ws.clos
[Libreoffice-commits] core.git: xmloff/inc xmloff/source
xmloff/inc/anim.hxx|6 +++---
xmloff/source/draw/animimp.cxx |6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 121525db245624b96a85824cc6ad3013e05e34b0
Author: Noel Grandin
Date: Tue Feb 28 15:10:25 2017 +0200
these arrays should be const
Change-Id: I808064abce15c4ec240d61e8168f0430ebf4c86c
Reviewed-on: https://gerrit.libreoffice.org/34722
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index 6dafc1f..809273f 100644
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
@@ -45,7 +45,7 @@ enum XMLEffect
EK_stretch
};
-extern SvXMLEnumMapEntry aXML_AnimationEffect_EnumMap[];
+extern const SvXMLEnumMapEntry aXML_AnimationEffect_EnumMap[];
enum XMLEffectDirection
{
@@ -84,9 +84,9 @@ enum XMLEffectDirection
ED_cclockwise
};
-extern SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[];
+extern const SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[];
-extern SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[];
+extern const SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[];
void SdXMLImplSetEffect( css::presentation::AnimationEffect eEffect,
XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool&
bIn );
css::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind,
XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn );
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 9424ec5..3b6ce8d 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::presentation;
using namespace ::xmloff::token;
-SvXMLEnumMapEntry aXML_AnimationEffect_EnumMap[] =
+const SvXMLEnumMapEntry aXML_AnimationEffect_EnumMap[] =
{
{ XML_NONE, EK_none },
{ XML_FADE, EK_fade },
@@ -70,7 +70,7 @@ SvXMLEnumMapEntry aXML_AnimationEffect_EnumMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[] =
+const SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[] =
{
{ XML_NONE, ED_none },
{ XML_FROM_LEFT,ED_from_left },
@@ -103,7 +103,7 @@ SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[] =
+const SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[] =
{
{ XML_SLOW, AnimationSpeed_SLOW },
{ XML_MEDIUM, AnimationSpeed_MEDIUM },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/forms/controlpropertyhdl.cxx | 16 +-
xmloff/source/forms/elementexport.cxx | 92 +++
xmloff/source/forms/elementimport.cxx |6 -
xmloff/source/forms/formenums.cxx | 174 +++--
xmloff/source/forms/formenums.hxx | 52 +++-
xmloff/source/forms/layerimport.cxx| 22 +--
6 files changed, 107 insertions(+), 255 deletions(-)
New commits:
commit dd4ed25aae41788e97500f183521f60543e759ea
Author: Noel Grandin
Date: Tue Feb 28 15:07:59 2017 +0200
expose the SvXMLEnumMapEntry arrays in OEnumMapper
preparatory change to making SvXMLEnumMapEntry a template class for the
"UNO scoped enum" change.
But I think its an improvement by itself, there is no need to initialise
these arrays on-demand, the compiler will do that at link time.
Change-Id: I842c16b3ef44b9f5e1f0325b637d3f55f8bb5ebc
Reviewed-on: https://gerrit.libreoffice.org/34721
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx
b/xmloff/source/forms/controlpropertyhdl.cxx
index e313f98..43e9d87 100644
--- a/xmloff/source/forms/controlpropertyhdl.cxx
+++ b/xmloff/source/forms/controlpropertyhdl.cxx
@@ -60,7 +60,7 @@ namespace xmloff
{
case XML_TYPE_TEXT_ALIGN:
if (!m_pTextAlignHandler)
-m_pTextAlignHandler =
o3tl::make_unique(OEnumMapper::getEnumMap(OEnumMapper::epTextAlign),
XML_TOKEN_INVALID );
+m_pTextAlignHandler =
o3tl::make_unique(aTextAlignMap, XML_TOKEN_INVALID
);
pHandler = m_pTextAlignHandler.get();
break;
@@ -90,13 +90,13 @@ namespace xmloff
case XML_TYPE_CONTROL_TEXT_EMPHASIZE:
if (!m_pFontEmphasisHandler)
-m_pFontEmphasisHandler =
o3tl::make_unique(
OEnumMapper::getEnumMap(OEnumMapper::epFontEmphasis), XML_NONE );
+m_pFontEmphasisHandler =
o3tl::make_unique( aFontEmphasisMap, XML_NONE );
pHandler = m_pFontEmphasisHandler.get();
break;
case XML_TYPE_TEXT_FONT_RELIEF:
if (!m_pFontReliefHandler)
-m_pFontReliefHandler =
o3tl::make_unique(
OEnumMapper::getEnumMap(OEnumMapper::epFontRelief), XML_NONE );
+m_pFontReliefHandler =
o3tl::make_unique( aFontReliefMap, XML_NONE );
pHandler = m_pFontReliefHandler.get();
break;
case XML_TYPE_TEXT_LINE_MODE:
@@ -129,7 +129,7 @@ namespace xmloff
bool bBelow = 0 != (nFontEmphasis & awt::FontEmphasisMark::BELOW);
// convert
-bSuccess = SvXMLUnitConverter::convertEnum(aReturn, nType,
OEnumMapper::getEnumMap(OEnumMapper::epFontEmphasis), XML_NONE);
+bSuccess = SvXMLUnitConverter::convertEnum(aReturn, nType,
aFontEmphasisMap, XML_NONE);
if (bSuccess)
{
aReturn.append( ' ' );
@@ -169,7 +169,7 @@ namespace xmloff
}
if (!bHasType)
{
-if (SvXMLUnitConverter::convertEnum(nEmphasis, sToken,
OEnumMapper::getEnumMap(OEnumMapper::epFontEmphasis)))
+if (SvXMLUnitConverter::convertEnum(nEmphasis, sToken,
aFontEmphasisMap))
{
bHasType = true;
}
@@ -211,7 +211,7 @@ namespace xmloff
if ( m_eFacet == STYLE )
{
// is it a valid enum value?
-if ( SvXMLUnitConverter::convertEnum( nStyle, sToken,
OEnumMapper::getEnumMap( OEnumMapper::epBorderWidth ) ) )
+if ( SvXMLUnitConverter::convertEnum( nStyle, sToken,
aBorderTypeMap ) )
{
_rValue <<= nStyle;
return true;
@@ -244,7 +244,7 @@ namespace xmloff
{
sal_Int16 nBorder = 0;
bSuccess = (_rValue >>= nBorder)
-&& SvXMLUnitConverter::convertEnum( aOut, nBorder,
OEnumMapper::getEnumMap( OEnumMapper::epBorderWidth ) );
+&& SvXMLUnitConverter::convertEnum( aOut, nBorder,
aBorderTypeMap );
}
break;
case COLOR:
@@ -335,7 +335,7 @@ namespace xmloff
//= ImageScaleModeHandler
ImageScaleModeHandler::ImageScaleModeHandler()
-:XMLConstantsPropertyHandler( OEnumMapper::getEnumMap(
OEnumMapper::epImageScaleMode ), XML_STRETCH )
+:XMLConstantsPropertyHandler( aScaleModeMap, XML_STRETCH )
{
}
diff --git a/xmloff/source/forms/elementexport.cxx
b/xmloff/source/forms/elementexport.cxx
index b89dc22..b239cb4 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -649,7 +649,7 @@ namespace xmloff
OAttributeMetaData::getCommonControlAttributeNamespace(CCAFlags::ButtonType),
OAttrib
[Libreoffice-commits] core.git: basic/qa
basic/qa/cppunit/test_vba.cxx |5 +
basic/qa/vba_tests/abs.vb | 73
basic/qa/vba_tests/array.vb | 100 +++
basic/qa/vba_tests/asc.vb | 74 +
basic/qa/vba_tests/atn.vb | 80 +++
basic/qa/vba_tests/cbool.vb | 106 ++
6 files changed, 438 insertions(+)
New commits:
commit 38f13e4dca802793143ebb3ff672c13243879368
Author: ZdenÄk Crhonek
Date: Mon Feb 27 22:37:05 2017 +0100
add VBA functions tests - ABS,ARRAY, ASC, ATN, CBOOL
Change-Id: I8a0b8b833ba32b9d27773748b3bbd8bbc07d1959
Reviewed-on: https://gerrit.libreoffice.org/34696
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index cff9b06..94371ff 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -56,6 +56,11 @@ void VBATest::testMiscVBAFunctions()
"replace.vb",
"stringplusdouble.vb",
"chr.vb",
+"abs.vb",
+"array.vb",
+"asc.vb",
+"atn.vb",
+"cbool.vb",
#ifndef WIN32 // missing 64bit Currency marshalling.
"win32compat.vb", // windows compatibility hooks.
#endif
diff --git a/basic/qa/vba_tests/abs.vb b/basic/qa/vba_tests/abs.vb
new file mode 100644
index 000..e60880c
--- /dev/null
+++ b/basic/qa/vba_tests/abs.vb
@@ -0,0 +1,73 @@
+Rem Attribute VBA_ModuleType=VBAModule
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testABS()
+If failCount <> 0 And passCount > 0 Then
+doUnitTest = result
+Else
+doUnitTest = "OK"
+End If
+End Function
+
+
+
+Function verify_testABS() As String
+
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+
+Dim testName As String
+Dim TestDateTime As Date
+Dim TestStr As String
+Dim date1, date2 As Date 'variables for test
+Dim nr1, nr2 As Double
+
+testName = "Test ABS function"
+On Error GoTo errorHandler
+
+nr2 = 5
+nr1 = Abs(-5)
+TestLog_ASSERT nr1 = nr2, "the return ABS is: " & nr1
+
+nr2 = 5
+nr1 = Abs(5)
+TestLog_ASSERT nr1 = nr2, "the return ABS is: " & nr1
+
+nr2 = 21.7
+nr1 = Abs(-21.7)
+TestLog_ASSERT nr1 = nr2, "the return ABS is: " & nr1
+
+result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) &
"Tests failed: " & failCount & Chr$(10)
+verify_testABS = result
+
+Exit Function
+errorHandler:
+TestLog_ASSERT (False), testName & ": hit error handler"
+End Function
+
+Sub TestLog_ASSERT(assertion As Boolean, Optional testId As String, Optional
testComment As String)
+
+If assertion = True Then
+passCount = passCount + 1
+Else
+Dim testMsg As String
+If Not IsMissing(testId) Then
+testMsg = testMsg + " : " + testId
+End If
+If Not IsMissing(testComment) And Not (testComment = "") Then
+testMsg = testMsg + " (" + testComment + ")"
+End If
+
+result = result & Chr$(10) & " Failed: " & testMsg
+failCount = failCount + 1
+End If
+
+End Sub
+
diff --git a/basic/qa/vba_tests/array.vb b/basic/qa/vba_tests/array.vb
new file mode 100644
index 000..914cf44
--- /dev/null
+++ b/basic/qa/vba_tests/array.vb
@@ -0,0 +1,100 @@
+Rem Attribute VBA_ModuleType=VBAModule
+Option VBASupport 1
+Option Explicit
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+Type MyType
+ax(3) As Integer
+bx As Double
+End Type
+
+Function doUnitTest() As String
+result = verify_testARRAY()
+If failCount <> 0 And passCount > 0 Then
+doUnitTest = result
+Else
+doUnitTest = "OK"
+End If
+End Function
+
+
+
+Function verify_testARRAY() As String
+
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+
+Dim testName As String
+Dim TestDateTime As Date
+Dim TestStr As String
+Dim date1, date2 As Date 'variables for test
+Dim a, b, C As Variant
+a = Array(10, 20, 30)
+testName = "Test ARRAY function"
+On Error GoTo errorHandler
+
+b = 10
+C = a(0)
+TestLog_ASSERT b = C, "the return ARRAY is: " & C
+
+b = 20
+C = a(1)
+TestLog_ASSERT b = C, "the return ARRAY is: " & C
+
+b = 30
+C = a(2)
+TestLog_ASSERT b = C, "the return ARRAY is: " & C
+
+Dim MyWeek, MyDay
+MyWeek = Array("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
+
+b = "Tue"
+MyDay = MyWeek(1) ' MyDay contains "Tue".
+TestLog_ASSERT b = MyDay, "the return ARRAY is: " & MyDay
+
+b = "Thu"
+MyDay = MyWeek(3) ' MyDay contains "Thu".
+TestLog_ASSERT b = MyDay, "the return ARRAY is: " & MyDay
+
+Dim mt As MyType
+mt.ax(0) = 42
+mt
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
2 new defect(s) introduced to LibreOffice found with Coverity Scan.
5 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 2 of 2 defect(s)
** CID 1401593: Memory - illegal accesses (WRAPPER_ESCAPE)
/lotuswordpro/source/filter/lwppagelayout.cxx: 316 in
LwpPageLayout::RegisterStyle()()
*** CID 1401593: Memory - illegal accesses (WRAPPER_ESCAPE)
/lotuswordpro/source/filter/lwppagelayout.cxx: 316 in
LwpPageLayout::RegisterStyle()()
310 * @descr: Register master page and page master style
311 *
312 */
313 void LwpPageLayout::RegisterStyle()
314 {
315 std::unique_ptr xpm1(new XFPageMaster());
>>> CID 1401593: Memory - illegal accesses (WRAPPER_ESCAPE)
>>> The internal representation of local "xpm1" escapes into
>>> "this->m_pXFPageMaster", but is destroyed when it exits scope.
316 m_pXFPageMaster = xpm1.get();
317
318 ParseGeometry(xpm1.get());
319 //Does not process LayoutScale, for watermark is not supported in
SODC.
320 ParseWaterMark(xpm1.get());
321 ParseMargins(xpm1.get());
** CID 1401592: Control flow issues (DEADCODE)
/oox/source/vml/vmlshape.cxx: 803 in
oox::vml::SimpleShape::implConvertAndInsert(const
com::sun::star::uno::Reference &, const
com::sun::star::awt::Rectangle &) const()
*** CID 1401592: Control flow issues (DEADCODE)
/oox/source/vml/vmlshape.cxx: 803 in
oox::vml::SimpleShape::implConvertAndInsert(const
com::sun::star::uno::Reference &, const
com::sun::star::awt::Rectangle &) const()
797
798 // When flip has 'x' or 'y', the associated ShapeRect will be
changed but direction change doesn't occur.
799 // It might occur internally in SdrObject of "sw" module, not
here.
800 // The associated properties "PROP_MirroredX" and
"PROP_MirroredY" have to be set here so that direction change will occur
internally.
801 if (bFlipX || bFlipY)
802 {
>>> CID 1401592: Control flow issues (DEADCODE)
>>> Execution cannot reach the expression "2" inside this statement:
>>> "aPropSequence.Sequence(((bF...".
803 css::uno::Sequence< css::beans::PropertyValue >
aPropSequence (
804 bFlipX && bFlipY ? 2 : 1);
805 int nPropertyIndex = 0;
806 if (bFlipX)
807 {
808 aPropSequence [nPropertyIndex].Name = "MirroredX";
To view the defects in Coverity Scan visit,
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpynhlF8jHypPkXalZKMkK8XwqEAVKwHw6ursvyYDoCr2XFZD9aa88WNPkdGbLLhFq3DFQGLtgH7FKPzM5Eu-2FluyVSdLmBaA1WN9hsJGqptxpQboWgK7srSbF2FRAILseAeD3cHUE4j4asEwkFTsxPlLoxQKRZCR7C3MjXJRxheOG4-3D
To manage Coverity Scan email notifications for
"libreoffice@lists.freedesktop.org", click
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRbVDbis712qZDP-2FA8y06Nq4k1FZJSDV-2FTHi5VQof9xGafB4oBwGYxuHHknceo2QLpCrZ44Ciy7AqBR2QyX6OCB5N5X-2B1MAElavPQhH6nLwozJzqOkt2k8uOkYf2ZoppNa9QVe0T3fEZVQ7Kky1tOkLz_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpynhlF8jHypPkXalZKMkK8X9SX8Uwr7bZkiqzXzLpT0U2gpRvChB-2BI1aA-2FCbDyt-2FW9MjrXmQHkNjwdavF6b9Df38P63A8kNRpKK3p4AR1AZSHs3E-2BEHmyYYh-2BTNi3vLmE3pPNNa9LW-2Fz0bnkR9BHa2ZfP5oq0FZ6BiGC5m5jy3Gvs-3D
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - solenv/gbuild uitest/calc_tests
solenv/gbuild/Module.mk |2 +-
uitest/calc_tests/create_chart.py |2 --
uitest/calc_tests/edit_chart.py |1 -
3 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit e7655fbd2bba02ae22fafaa82cc4b2b163ee91c0
Author: Markus Mohrhard
Date: Wed Mar 1 02:39:47 2017 +0100
let the top level uicheck depend on the build
Change-Id: I3dbbf84af75fd5ec3598302252ee1103bb9d5596
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 6af2b5c..dd159a74 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -471,7 +471,7 @@ screenshot : $$(firstword
$$(gb_Module_SCREENSHOTTARGETSTACK))
subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
stagingcheck : $$(firstword $$(gb_Module_STAGINGCHECKTARGETSTACK))
perfcheck : $$(firstword $$(gb_Module_PERFCHECKTARGETSTACK))
-uicheck : $$(firstword $$(gb_Module_UICHECKTARGETSTACK))
+uicheck : build $$(firstword $$(gb_Module_UICHECKTARGETSTACK))
clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
ifneq ($$(words $$(gb_Module_TARGETSTACK)),1)
commit aa5241dfd6d56ad64703767f48cacb5dc2a9ecd9
Author: Markus Mohrhard
Date: Wed Mar 1 01:13:28 2017 +0100
uitest: enable additional chart tests that seem to be stable now
Change-Id: I9a41c29807cc47f570a9057435386e519a438289
diff --git a/uitest/calc_tests/create_chart.py
b/uitest/calc_tests/create_chart.py
index 427b4ce..5b97199 100644
--- a/uitest/calc_tests/create_chart.py
+++ b/uitest/calc_tests/create_chart.py
@@ -103,7 +103,6 @@ class CalcChartUIDemo(UITestCase):
self.ui_test.close_doc()
-@unittest.skip("linux deadlock")
def test_activate_chart(self):
self.ui_test.create_doc_in_start_center("calc")
@@ -129,7 +128,6 @@ class CalcChartUIDemo(UITestCase):
self.ui_test.close_doc()
-@unittest.skip("linux deadlock")
def select_chart_element(self):
self.ui_test.create_doc_in_start_center("calc")
commit fb090555c93715a05d58ddec7757ebec39a83696
Author: Markus Mohrhard
Date: Wed Mar 1 00:14:39 2017 +0100
uitest: the new code allows to enable the chart test again
Change-Id: I51ff48441d07c12f8019d282ab92f1835cec69cb
diff --git a/uitest/calc_tests/edit_chart.py b/uitest/calc_tests/edit_chart.py
index 4d44d52..d74a8c2 100644
--- a/uitest/calc_tests/edit_chart.py
+++ b/uitest/calc_tests/edit_chart.py
@@ -27,7 +27,6 @@ class CalcChartEditUIDemo(UITestCase):
xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE":
"A1:C2"}))
-@unittest.skip("deadlock in the chart/embbedobj code")
def test_select_secondary_axis(self):
self.ui_test.create_doc_in_start_center("calc")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/complextext.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 62592cf1ebcc8ef381fe53855684342d963e6138
Author: Khaled Hosny
Date: Wed Mar 1 01:38:58 2017 +0200
Add a test for GetTextArray()
Might help showing the source of differences causing random Windows
failures.
Change-Id: I435d1d4f7a016b057af30661b1c7016231426149
Reviewed-on: https://gerrit.libreoffice.org/34731
Tested-by: Jenkins
Reviewed-by: Khaled Hosny
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 4b0d243..fd6a72f 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -54,6 +54,16 @@ void VclComplexTextTest::testArabic()
OutputDevice *pOutDev = pWin.get();
pOutDev->SetFont( aFont );
+// absolute character widths AKA text array.
+std::vector aCharWidths(aOneTwoThree.getLength(), 0);
+long nTextWidth = pOutDev->GetTextArray(aOneTwoThree, aCharWidths.data());
+CPPUNIT_ASSERT_EQUAL(72L, nTextWidth);
+CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back());
+std::vector aRefCharWidths {6, 9, 16, 16, 22, 22, 26, 29, 32, 32,
+ 36, 40, 49, 53, 56, 63, 63, 66, 72, 72};
+for (size_t i = 0; i < aCharWidths.size(); i++)
+CPPUNIT_ASSERT_EQUAL(aRefCharWidths[i], aCharWidths[i]);
+
// text advance width and line height
CPPUNIT_ASSERT_EQUAL(72L, pOutDev->GetTextWidth(aOneTwoThree));
CPPUNIT_ASSERT_EQUAL(13L, pOutDev->GetTextHeight());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/docs
odk/docs/common/ref/idl.css |9 -
odk/docs/cpp/ref/cpp.css |9 -
odk/docs/images/bg_table.png |binary
odk/docs/tools.html |2 +-
4 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 995c892201e3aea41aae920348abfa1fde02a39d
Author: Matthias Seidel
Date: Tue Feb 28 23:05:15 2017 +
Minor changes in HTML and CSS
diff --git a/odk/docs/common/ref/idl.css b/odk/docs/common/ref/idl.css
index d5c4894..a69e416 100644
--- a/odk/docs/common/ref/idl.css
+++ b/odk/docs/common/ref/idl.css
@@ -24,12 +24,11 @@
/*See bottom of file for explanations.*/
-body { background-color:#ff; }
+body { color:#33; background-color:#ff; }
-#adc-idlref a { text-decoration: none; }
-#adc-idlref a:link { color: #0e85cd; }
-#adc-idlref a:visited { color: #638093; }
-#adc-idlref a:active { color: #4dadea; }
+#adc-idlref a:link { color: #107EC0; text-decoration: none; }
+#adc-idlref a:visited { color: #638093; text-decoration: none; }
+#adc-idlref a:hover { color: #107EC0; text-decoration: underline; }
#adc-idlref h3
{ font-size:13pt; font-weight:bold;
diff --git a/odk/docs/cpp/ref/cpp.css b/odk/docs/cpp/ref/cpp.css
index 98aa3d0..a2feb13 100644
--- a/odk/docs/cpp/ref/cpp.css
+++ b/odk/docs/cpp/ref/cpp.css
@@ -22,12 +22,11 @@
/* Autodoc css file for C++ documentation */
-body { background-color:#ff; }
+body { color:#33; background-color:#ff; }
-#adc-cppref a { text-decoration: none; }
-#adc-cppref a:link { color: #0e85cd; }
-#adc-cppref a:visited { color: #638093; }
-#adc-cppref a:active { color: #4dadea; }
+#adc-cppref a:link { color: #107EC0; text-decoration: none; }
+#adc-cppref a:visited { color: #638093; text-decoration: none; }
+#adc-cppref a:hover { color: #107EC0; text-decoration: underline; }
#adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }
#adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt;
margin-bottom:5pt; }
diff --git a/odk/docs/images/bg_table.png b/odk/docs/images/bg_table.png
index eb5d4f2..1cb4c1e 100644
Binary files a/odk/docs/images/bg_table.png and b/odk/docs/images/bg_table.png
differ
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 9698354..92e4baa 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -1016,7 +1016,7 @@
Options:
-
+
-v
== 5 displays the parsed
source
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/a11y/atkaction.cxx | 11 -
vcl/unx/gtk/a11y/atkcomponent.cxx | 11 -
vcl/unx/gtk/a11y/atkeditabletext.cxx | 11 -
vcl/unx/gtk/a11y/atkhypertext.cxx | 11 -
vcl/unx/gtk/a11y/atkimage.cxx | 11 -
vcl/unx/gtk/a11y/atklistener.cxx | 20 --
vcl/unx/gtk/a11y/atklistener.hxx |2
vcl/unx/gtk/a11y/atkselection.cxx | 11 -
vcl/unx/gtk/a11y/atktable.cxx | 11 -
vcl/unx/gtk/a11y/atktext.cxx | 44 +++--
vcl/unx/gtk/a11y/atktextattributes.cxx | 11 -
vcl/unx/gtk/a11y/atkutil.cxx | 25 +--
vcl/unx/gtk/a11y/atkvalue.cxx | 11 -
vcl/unx/gtk/a11y/atkwrapper.cxx| 266 +++--
vcl/unx/gtk/a11y/atkwrapper.hxx| 34 +++-
15 files changed, 258 insertions(+), 232 deletions(-)
New commits:
commit 10077a06d8f6d08f276f99024528ee31a57390a9
Author: Kohei Yoshida
Date: Tue Feb 28 17:52:10 2017 -0500
Revert my fix for tdf#71409, to hopefully fix tdf#104381.
This reverts commit 87e040fd0f04307534920d0765af6d5878794a98.
This reverts commit a0ef7474521413c8967559a635e6fdc0d88f1df6.
Conflicts:
vcl/unx/gtk/a11y/atkutil.cxx
Change-Id: Ib3a799e27b2495ebd1e7723f1cb5babf0dfbc702
Reviewed-on: https://gerrit.libreoffice.org/34730
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index faadc40..98a85e9 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -49,11 +49,14 @@ static
css::uno::Reference
{
AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( action );
-if (pWrap)
+if( pWrap )
{
-uno::Reference xAction(
-pWrap->mpContext.get(), uno::UNO_QUERY);
-return xAction;
+if( !pWrap->mpAction.is() )
+{
+pWrap->mpAction.set(pWrap->mpContext, css::uno::UNO_QUERY);
+}
+
+return pWrap->mpAction;
}
return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx
b/vcl/unx/gtk/a11y/atkcomponent.cxx
index 54e664b..a56aebe 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.cxx
@@ -28,11 +28,14 @@ static
css::uno::Reference
getComponent( AtkComponent *pComponent )
{
AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pComponent );
-if (pWrap)
+if( pWrap )
{
-uno::Reference xComp(
-pWrap->mpContext.get(), uno::UNO_QUERY);
-return xComp;
+if( !pWrap->mpComponent.is() )
+{
+pWrap->mpComponent.set(pWrap->mpContext, css::uno::UNO_QUERY);
+}
+
+return pWrap->mpComponent;
}
return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx
b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index 070ee28..49d3eb9 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx
@@ -32,11 +32,14 @@ static
css::uno::Reference
getEditableText( AtkEditableText *pEditableText )
{
AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pEditableText );
-if (pWrap)
+if( pWrap )
{
-uno::Reference xET(
-pWrap->mpContext.get(), uno::UNO_QUERY);
-return xET;
+if( !pWrap->mpEditableText.is() )
+{
+pWrap->mpEditableText.set(pWrap->mpContext, css::uno::UNO_QUERY);
+}
+
+return pWrap->mpEditableText;
}
return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx
b/vcl/unx/gtk/a11y/atkhypertext.cxx
index 356262f..637842b 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -194,11 +194,14 @@ static
css::uno::Reference
getHypertext( AtkHypertext *pHypertext )
{
AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pHypertext );
-if (pWrap)
+if( pWrap )
{
-uno::Reference xAH(
-pWrap->mpContext.get(), uno::UNO_QUERY);
-return xAH;
+if( !pWrap->mpHypertext.is() )
+{
+pWrap->mpHypertext.set(pWrap->mpContext, css::uno::UNO_QUERY);
+}
+
+return pWrap->mpHypertext;
}
return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index 404871f..1c9bc2c 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.cxx
@@ -40,11 +40,14 @@ static
css::uno::Reference
getImage( AtkImage *pImage )
{
AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pImage );
-if (pWrap)
+if( pWrap )
{
-uno::Reference xAI(
-pWrap->mpContext.get(), uno::UNO_QUERY);
-return xAI;
+if( !pWrap->mpImage.is() )
+{
+pWrap->mpImage.set(pWrap->mpContext, css::uno::UNO_QUERY);
+}
+
+return pWrap->mpImage;
}
return css::uno::Reference();
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
i
[Libreoffice-commits] core.git: Changes to 'feature/cib_contract561'
New branch 'feature/cib_contract561' available with the following commits: commit 6d1046a4640dd736ec6e67584da535fad2e9b65c Author: Katarina Behrens Date: Sun Feb 19 23:58:52 2017 +0100 Run macro:// via LOKit Reviewed-on: https://gerrit.libreoffice.org/34538 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit e7729f458409f7fef2b7dab752205e3b230acb65) Conflicts: desktop/qa/desktop_lib/test_desktop_lib.cxx desktop/source/lib/init.cxx include/LibreOfficeKit/LibreOfficeKit.h include/LibreOfficeKit/LibreOfficeKit.hxx In the end amending 31d435bd576b1877bbf32749fc4bf943fe6a1ea8 Change-Id: I54d3c734d86d4b44e1dfe1ad7728e2f51cd26d53 commit 8209f1437f5e968f560629e7a2b8c96fff8eb5c5 Author: Thorsten Behrens Date: Tue Feb 28 10:55:27 2017 +0100 Fix headless build for LOKit Inspired by 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 Change-Id: I1dfa5d30ba00b3ef4527b1fcfccbe22066ab235b commit 94965a807fc18c292317d12e3068ea6a139317ab Author: Samuel Mehrbrodt Date: Thu Feb 23 12:39:54 2017 +0100 Fix headless build Change-Id: I25c85ca732ad94a42db65a9586b50294c7322414 commit c4950731860058a6a97f080cf581f27c4a34890c Author: Thorsten Behrens Date: Mon Feb 20 04:20:51 2017 +0100 Add list-style-type support to html parser Conflicts: sw/source/filter/html/svxcss1.cxx sw/source/filter/html/svxcss1.hxx Change-Id: Ibd7978b12a3c5024c55571b165b82c6abe7a8925 commit 31d435bd576b1877bbf32749fc4bf943fe6a1ea8 Author: Katarina Behrens Date: Mon Feb 20 00:55:58 2017 +0100 Run macro:// via LOKit, first cut Change-Id: I8a9e6a097a437b45dc0264282ef1bd68479ac63e commit 4ff75747c530452fc671d8584ee1a4e26effd25a Author: Markus Mohrhard Date: Mon Dec 19 12:54:34 2016 +0100 Add logging to file and log config for Windows Patch set comprised of: add an option to pipe log output to file The target file and the option are controlled by SAL_LOG_FILE. The variable should contain the target file in a system dependent notation. Change-Id: Ie1ce9c39740c8b7a989e5af222be21a3e3142084 Reviewed-on: https://gerrit.libreoffice.org/32176 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit fb22a4f0d92d1a7a371fab21c965b26b9c0a5b42) Allow to set log level/path in file Expects a file logging.txt in the program/ directory with the keys LogFilePath and LogLevel, e.g.: LogFilePath=C:\\log.txt LogLevel=info Change-Id: I35c730469e4079139da908aa287b989dc98e0f9d (cherry picked from commit e06a339e37929af1132cd454e2fbd412ad55c3a5) sal: don't reopen logfile on every log line Change-Id: Iac34fc87a99e98ca5e41eb621d55bf356c371e97 (cherry picked from commit 45b33aa06fc9a9d866b086777cee209a23b92e2e) sal: log windows trace output to debugger console Change-Id: Ic8fea70fd3b0b2d4881cd30e3616f5bbf7c0c533 (cherry picked from commit c249b51db18302e02b86b9b13270ca21eecdcf36) Optionally include timestamp in the log Change-Id: Ia9f162b704b6e16c84f259e9548e91b7bcd6a378 (cherry picked from commit 11536e5cde942692e90df33ff74f53df2b7e2548) This code wouldn't otherwise build on 5.0.7@Linux Change-Id: I106c1a286ff5ad710a54cabc873cc5356f0a3123 (cherry picked from commit 7a0a072224ecc46fab96b6074df33cd6a308721f) Fix crash when logging.ini does not exist Change-Id: I1ed82fdcce1eb15548e699ffbf93ae39664612b3 (cherry picked from commit d7ecdc3901cca29d37fe597744dffb66c46e0ee6) sal: flush log-to-file, remove extra linefeeds otherwise syslog and windows debugger console don't need explicit line feeds. For ofstream, use endl which implies a flush. Change-Id: Id94e07aa1ae042557052fab6483e5db75aada89d (cherry picked from commit c7f35d079fd364f236ce1df6ee1f32bb80d1cd22) commit 3e6476c3508aec3058d2b61e8b45a09c9aa8a354 Author: Thorsten Behrens Date: Thu Feb 16 03:32:15 2017 +0100 Fix windows build Change-Id: I17cf2283477516a5c9cd97aa00987db273672480 commit f894ffc2aac0e728101b45f5f0c82b98bf6166d0 Author: Oliver Specht Date: Tue Jan 19 10:47:01 2016 +0100 Build the LibreOfficeKit bits also on Windows Reviewed-on: https://gerrit.libreoffice.org/21598 Tested-by: Jenkins Reviewed-by: Oliver Specht (cherry picked from commit 0d31873dc1f40963b70a3840537e9c25bec7cff0) Conflicts: desktop/Library_sofficeapp.mk Change-Id: Ibbd5e50ffeeb061a30d6f0f09a393a67ba67421e commit 75da7ee670e43530dfa327cc263cf79067b06e43 Author: Thorsten Behrens Date: Sun Jan 15 11:50:27 2017 +0100 gbuild: populate local symstore on Windows Script based on Lubos' tb master script from http://nabble.documentfoundation.org/Daily-Win32-debug-builds-td4067279.html Cha
Re: Chart test failures on mac: text size differences
Hi Khaled, > I don’t think text width or height are that interesting, but they are > probably a good approximation, so I repurposed one of the existing VCL > tests to test this[1]. I tried testing also the text bounding rectangle > but it showed a 1 pixel difference on Mac, this should be fixed in [2]. > > Feel free to add more test cases that you think are worth having. I noticed today that some of the Windows tinderboxes fails on the new vcl test randomly. They fail on the text width check. This can explain why chart test were failing on the same Windows tinderboxes. http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1488318182.31559 http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1488315724.23850 Best Regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: 3 commits - loolwsd.spec.in Makefile.am test/run_unit.sh.in
Makefile.am | 17 ++---
loolwsd.spec.in | 16
test/run_unit.sh.in |4
3 files changed, 14 insertions(+), 23 deletions(-)
New commits:
commit 453819ed15807ef75486c641b9d034b1230ae5d2
Author: Andras Timar
Date: Tue Feb 28 22:58:50 2017 +0100
adapt rpm spec file to new build system, remove obsoleted options and don't
install ssl key/cert
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index d92599e..4ef30e9 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -17,7 +17,6 @@ Vendor: Collabora
Summary:LibreOffice Online WebSocket Daemon
License:MPL
Source0:loolwsd-@package_vers...@.tar.gz
-Source1:loleaflet-@package_vers...@.tar.gz
BuildRequires: libcap-devel libpng-devel poco-devel >= 1.7.5
%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: libpcap
@@ -60,14 +59,10 @@ Obsoletes: loleaflet <= 1.5.8
%endif
%prep
%setup -n loolwsd-@PACKAGE_VERSION@
-%setup -n loolwsd-@PACKAGE_VERSION@ -T -D -a 1
%build
%configure \
--with-lokit-path=bundled/include \
-%if %{ssl_support} == "NO"
- --disable-ssl \
-%endif
%if 0%{?config_options:1}
%{config_options}
%endif
@@ -79,9 +74,6 @@ env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
%install
env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
-%if %{default_admin} == "YES"
-sed -i "s|ExecStart=/usr/bin/loolwsd --version
--o:sys_template_path=/opt/lool/systemplate
--o:lo_template_path=/opt/collaboraoffice5.1
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd|ExecStart=/usr/bin/loolwsd
--version --o:sys_template_path=/opt/lool/systemplate
--o:lo_template_path=/opt/collaboraoffice5.1
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd --o:admin_console.username=admin
--o:admin_console.password=admin|" loolwsd.service
-%endif
%__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -d -m 755 %{buildroot}/var/adm/fillup-templates
%if 0%{?fedora} || 0%{?rhel} >= 7
@@ -94,9 +86,6 @@ install -D -m 644 sysconfig.loolwsd
%{buildroot}/var/adm/fillup-templates
mkdir -p %{buildroot}/etc/cron.d
echo "#Remove old tiles once every 10 days at midnight" >
%{buildroot}/etc/cron.d/loolwsd.cron
echo "0 0 */1 * * root find /var/cache/loolwsd -name \"*.png\" -a -atime +10
-exec rm {} \;" >> %{buildroot}/etc/cron.d/loolwsd.cron
-cd loleaflet-@PACKAGE_VERSION@
-mkdir -p %{buildroot}/usr/share/loolwsd/loleaflet
-tar cf - . | (cd %{buildroot}/usr/share/loolwsd/loleaflet && tar xf -)
%files
/usr/bin/loolwsd
@@ -121,11 +110,6 @@ tar cf - . | (cd %{buildroot}/usr/share/loolwsd/loleaflet
&& tar xf -)
%config(noreplace) /etc/cron.d/loolwsd.cron
%config(noreplace) /etc/loolwsd/loolwsd.xml
-%config(noreplace) %attr(400, lool, lool) /etc/loolwsd/key.pem
-%if %{ssl_support} == "YES"
-%config(noreplace) /etc/loolwsd/cert.pem
-%config(noreplace) /etc/loolwsd/ca-chain.cert.pem
-%endif
%doc README
commit 738792d5fff2700c9721fb68c8db4ee76379f628
Author: Andras Timar
Date: Tue Feb 28 22:54:03 2017 +0100
use key.pem from source directory for unit tests
diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index 43108be..54e4d3f 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -73,6 +73,7 @@ if test "z$tst" == "z"; then
--o:child_root_path="$jails_path" \
--o:storage.filesystem[@allow]=true \
--o:logging.level=trace \
+
--o:ssl.key_file_path="${abs_top_builddir}/etc/key.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
> "$tst_log" 2>&1 &
echo " executing test"
@@ -101,6 +102,7 @@ else # newer unit tests.
--o:child_root_path="$jails_path" \
--o:storage.filesystem[@allow]=true \
--o:logging.level=trace \
+
--o:ssl.key_file_path="${abs_top_builddir}/etc/key.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--unitlib=".libs/$tst.so" > "$tst_log"
2>&1; then
echo "Test $tst passed."
@@ -113,6 +115,8 @@ else # newer unit tests.
echo " --o:lo_template_path=\"$lo_path\" \\"
echo " --o:child_root_path=\"$jails_path\" \\"
echo " --o:storage.filesystem[@allow]=true \\"
+echo " --o:logging.level=trace \\"
+echo "
--o:ssl.key_file_path=\"${abs_top_builddir}/etc/key.pem\" \\"
echo " --o:admin_console.username=admin
--o:admin_console.password=admin \\"
echo " --unitlib=\".libs/$tst.so\""
echo "==
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/sallogareas.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 4f762202f647976ffd80c23bacada8401d633001
Author: Stephan Bergmann
Date: Tue Feb 28 23:12:48 2017 +0100
Adapt loplugin:sallogareas
...to b6a69585b00867005820c1dd94e10e0e6b545e2a "old sal_detail_log_backtrace
into sal_detail_log" and follow-up c697ae306cd4eaa8144ed93fc908e50d5934e249
"Some clean up"
Change-Id: Ie38899e70c5b326724f9442fbf92e453b05eec01
diff --git a/compilerplugins/clang/sallogareas.cxx
b/compilerplugins/clang/sallogareas.cxx
index bde3513..e6c2997 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -51,7 +51,7 @@ bool SalLogAreas::VisitCallExpr( const CallExpr* call )
return true;
if( const FunctionDecl* func = call->getDirectCallee())
{
-if( func->getNumParams() == 4 && func->getIdentifier() != NULL
+if( func->getNumParams() == 5 && func->getIdentifier() != NULL
&& ( func->getName() == "sal_detail_log" || func->getName() ==
"log" ))
{
auto tc = loplugin::DeclCheck(func);
@@ -73,8 +73,9 @@ bool SalLogAreas::VisitCallExpr( const CallExpr* call )
area->getLocStart());
return true;
}
-if(
loplugin::DeclCheck(inFunction).Function("log").Namespace("detail").Namespace("sal").GlobalNamespace()
)
-return true; // This function only forwards to
sal_detail_log, so ok.
+if(
loplugin::DeclCheck(inFunction).Function("log").Namespace("detail").Namespace("sal").GlobalNamespace()
+||
loplugin::DeclCheck(inFunction).Function("sal_detail_logFormat").GlobalNamespace()
)
+return true; // These functions only forward to
sal_detail_log, so ok.
if( call->getArg( 1 )->isNullPointerConstant(
compiler.getASTContext(),
Expr::NPC_ValueDependentIsNotNull ) != Expr::NPCK_NotNull )
{ // If the area argument is a null pointer, that is
allowed only for SAL_DEBUG.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/macosx.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c0c3575f7434712d294ccb0eaa7f49bf845437e0 Author: Stephan Bergmann Date: Tue Feb 28 22:46:50 2017 +0100 Fix gb_Extension_LICENSEFILE_DEFAULT ...post 3c946d688627ba0c31bcb37dfed4e6e180608854 "Put also the LICENSE file in Resources on macOS" Change-Id: I0a3435cc973d09e029ce4133d62544e4e432f6b5 diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 9bf18c3..626f399 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -334,7 +334,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/Resources/LICENSE # UnpackedTarget class ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source
sax/source/tools/fastserializer.cxx | 55 +++-
1 file changed, 54 insertions(+), 1 deletion(-)
New commits:
commit baca2ec8d5a457512e25b499c3cacc7a66ca853f
Author: Eike Rathke
Date: Tue Feb 28 22:14:08 2017 +0100
FastSaxSerializer: SAL_WARN() when writing invalid XML characters
This catches things for OOXML, that could be escaped using _x_
Change-Id: I937f67dc5edd3c0e5727d74bebb736dc82bdc53d
diff --git a/sax/source/tools/fastserializer.cxx
b/sax/source/tools/fastserializer.cxx
index 620fe68..a571829 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -101,6 +101,26 @@ namespace sax_fastparser {
write( sOutput.getStr(), sOutput.getLength(), bEscape );
}
+#if OSL_DEBUG_LEVEL > 0
+/** Characters not allowed in XML 1.0
+XML 1.1 would exclude only U+
+ */
+bool invalidChar( char c )
+{
+if (static_cast(c) >= 0x20)
+return false;
+
+switch (c)
+{
+case 0x09:
+case 0x0a:
+case 0x0d:
+return false;
+}
+return true;
+}
+#endif
+
void FastSaxSerializer::write( const char* pStr, sal_Int32 nLen, bool
bEscape )
{
if (nLen == -1)
@@ -112,6 +132,7 @@ namespace sax_fastparser {
return;
}
+bool bGood = true;
for (sal_Int32 i = 0; i < nLen; ++i)
{
char c = pStr[ i ];
@@ -124,9 +145,26 @@ namespace sax_fastparser {
case '"': writeBytes( """, 6 ); break;
case '\n': writeBytes( "
", 5 );break;
case '\r': writeBytes( "
", 5 );break;
-default:writeBytes( &c, 1 ); break;
+default:
+#if OSL_DEBUG_LEVEL > 0
+/* FIXME: we should escape such invalid characters
+ * in the _x_ form OOXML uses. Note that also a
+ * literal "_x0008_" would have to be escaped then
+ * as _x005F_x0008_ (where only the leading '_' is
+ * escaped as _x005F_). */
+if (invalidChar(pStr[i]))
+{
+bGood = false;
+// The SAL_WARN() for the single character is
+// issued in writeBytes(), just gather for the
+// SAL_WARN_IF() below.
+}
+#endif
+writeBytes( &c, 1 ); break;
}
}
+SAL_WARN_IF( !bGood && nLen > 1, "sax", "in '" <<
OString(pStr,std::min(nLen,42)) << "'");
+(void)bGood;
}
void FastSaxSerializer::endDocument()
@@ -496,6 +534,21 @@ namespace sax_fastparser {
void FastSaxSerializer::writeBytes( const char* pStr, size_t nLen )
{
+#if OSL_DEBUG_LEVEL > 0
+{
+bool bGood = true;
+for (size_t i=0; i < nLen; ++i)
+{
+if (invalidChar(pStr[i]))
+{
+bGood = false;
+SAL_WARN("sax", "FastSaxSerializer::writeBytes - illegal
XML character 0x" <<
+std::hex << int(static_cast(pStr[i])));
+}
+}
+SAL_WARN_IF( !bGood && nLen > 1, "sax", "in '" <<
OString(pStr,std::min(nLen,42)) << "'");
+}
+#endif
maCachedOutputStream.writeBytes( reinterpret_cast(pStr), nLen );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/gimmicks/ReadDir.xba |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6bb6ca1fb30f786385c2357e5435077066a49f82 Author: Katarina Behrens Date: Tue Feb 28 16:31:49 2017 +0100 Related: tdf#80731 missing ')' breaks Gimmicks.Autotext macro Change-Id: Idbfcab663b5f4dbd97b49f2771c62564ca7d7972 Reviewed-on: https://gerrit.libreoffice.org/34725 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/wizards/source/gimmicks/ReadDir.xba b/wizards/source/gimmicks/ReadDir.xba index 0287f43..fdd725b 100644 --- a/wizards/source/gimmicks/ReadDir.xba +++ b/wizards/source/gimmicks/ReadDir.xba @@ -263,7 +263,7 @@ Dim MaxFileIndex as Integer End If Next i End If - Loop Until m > Ubound(DirList() + Loop Until m > Ubound(DirList()) ReDim Preserve FileNameList(n-1,1) as String ReadSourceDirectory() = FileNameList() End Function @@ -319,4 +319,4 @@ Sub ToggleDialogControls(bDoEnable as Boolean) .Label2.Enabled = bDoEnable .TextField1.Enabled = bDoEnable End With -End Sub \ No newline at end of file +End Sub ___ 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/ipict/ipict.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 7f0b3e90ad8cc6c16e2004cc0739150352c8d7e6
Author: Caolán McNamara
Date: Tue Feb 28 21:08:00 2017 +
ofz: timeout, check availablity of point data before reading it
Change-Id: I86b3041bc5123ba10bbb9b64702dfb2060b3cc23
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx
b/filter/source/graphicfilter/ipict/ipict.cxx
index 4003b0f..a85e691 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -461,6 +461,12 @@ sal_uLong PictReader::ReadPolygon(tools::Polygon & rPoly)
pPict->SeekRel(8);
sal_uLong nDataSize = (sal_uLong)nSize;
nSize=(nSize-10)/4;
+const size_t nMaxPossiblePoints = pPict->remainingSize() / 2 *
sizeof(sal_uInt16);
+if (nSize > nMaxPossiblePoints)
+{
+SAL_WARN("filter.pict", "pict record claims to have: " << nSize << "
points, but only " << nMaxPossiblePoints << " possible, clamping");
+nSize = nMaxPossiblePoints;
+}
rPoly.SetSize(nSize);
for (sal_uInt16 i = 0; i < nSize; ++i)
rPoly.SetPoint(ReadPoint(), i);
___
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/ipict/ipict.cxx | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 162cd5d4fee7611e6b9e84cfbfddc81cbb869650
Author: Caolán McNamara
Date: Tue Feb 28 21:01:24 2017 +
tidy this a titch
Change-Id: I71153579a193abc209a08a0f076ee50cf8ec5d06
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx
b/filter/source/graphicfilter/ipict/ipict.cxx
index cf54239..4003b0f 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -454,18 +454,16 @@ void PictReader::ReadRectangle(Rectangle & rRect)
SAL_INFO("filter.pict", "ReadRectangle: " << rRect);
}
-
sal_uLong PictReader::ReadPolygon(tools::Polygon & rPoly)
{
-sal_uInt16 nSize,i;
-sal_uLong nDataSize;
-
-pPict->ReadUInt16( nSize );
+sal_uInt16 nSize(0);
+pPict->ReadUInt16(nSize);
pPict->SeekRel(8);
-nDataSize=(sal_uLong)nSize;
+sal_uLong nDataSize = (sal_uLong)nSize;
nSize=(nSize-10)/4;
rPoly.SetSize(nSize);
-for (i=0; i___
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/lwpfootnote.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 26ea6d50b3f0f82d4035b367811f8edcc49ee23e
Author: Caolán McNamara
Date: Tue Feb 28 20:53:34 2017 +
fix leak
Change-Id: Ia073517977648a21d7adb5ee4d7bda51b1b7db18
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx
b/lotuswordpro/source/filter/lwpfootnote.cxx
index b8ac3fd..dbf35db 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -103,28 +103,28 @@ void LwpFribFootnote::XFConvert(XFContentContainer* pCont)
LwpFootnote* pFootnote = GetFootnote();
if(pFootnote)
{
-XFContentContainer* pContent = nullptr;
+rtl::Reference xContent;
if(pFootnote->GetType() == FN_FOOTNOTE)
{
-pContent = new XFFootNote();
+xContent.set(new XFFootNote);
}
else
{
-pContent = new XFEndNote();
+xContent.set(new XFEndNote);
}
-pFootnote->XFConvert(pContent);
-if(m_ModFlag)
+pFootnote->XFConvert(xContent.get());
+if (m_ModFlag)
{
//set footnote number font style
-XFTextSpan *pSpan = new XFTextSpan();
+XFTextSpan *pSpan = new XFTextSpan;
pSpan->SetStyleName(GetStyleName());
//add the xffootnote into the content container
-pSpan->Add(pContent);
+pSpan->Add(xContent.get());
pCont->Add(pSpan);
}
else
{
-pCont->Add(pContent);
+pCont->Add(xContent.get());
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/qa filter/source
filter/qa/cppunit/data/dxf/pass/bigangle-1.dxf | 143 +
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 12 --
2 files changed, 148 insertions(+), 7 deletions(-)
New commits:
commit b018021d5a5e644f1d8aafd20432562621b33554
Author: Caolán McNamara
Date: Tue Feb 28 20:45:49 2017 +
ofz: timeout on clamping big double to 0..360
Change-Id: Ica2aedc5275e5f523302f5793e3f3816b3ff65b4
diff --git a/filter/qa/cppunit/data/dxf/pass/bigangle-1.dxf
b/filter/qa/cppunit/data/dxf/pass/bigangle-1.dxf
new file mode 100644
index 000..3c47414
--- /dev/null
+++ b/filter/qa/cppunit/data/dxf/pass/bigangle-1.dxf
@@ -0,0 +1,143 @@
+99
+170141183460469231731687303715884105718
+ 2
+BL0C
+ 0
+SECTION
+ 2
+ENTITIES
+ 0111
N9.0
+0
+ARC
+111
N9
+ 1
+I
+
39
+9
+130
+
+ 51
+1758770265ded1a13ecce6855794837535bf766a7fRC
+111
N9.0007
+
39
+9
+130
+10
+ 2
+BL0C
+ 0
+SECTION
+ 2
+ENTITIES
+ 0111
N9.0
+0
+ARC
+111
N9
+ 1
+I
+
39
+9
+130
+
+ 51
+9705
+0
+ARC
+111
39
+9
+130
+
+ 51
+183460469231731687303715884105718
+ 2
+BL0C
+ 0
+SECTION
+ 2
+ENTITIES
+ 0111
N9.0
+0
+ARC
+111
N9
+ 1
+I
+
39
+9
+130
+
+ 51
+1758770265ded1a13ecce6855794837535bf766a7fRC
+111
N9.0007
+
39
+9
+130
+10
+ 2
+BL0C
+ 0
+SECTION
+ 2
+ENTITIES
+ 0111
N9.0
+0
+ARC
+111
N9
+ 1
+I
+
39
+9
+130
+
+ 51
+9705
+0
+ARC
+111
39
+9
+130
+
+ 51
+197
+0
+ARC
+111
N9.00÷dL07
+
39
+9
+130
+
+ 56
+15
+ 8
+
+0
+EOF
+111
N9.0
+ 56*
+15
+ 8
+
+0
+EO?
+111
197
+0
+ARC
+111
N9.00÷dL07
+
39
+9
+130
+
+ 56
+15
+ 8
+
+0
+EOF
+111
N9.0
+ 56*
+15
+ 8
+
+0
+EO?
+111
N9.000
+3
N 2S 79 799
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 9255fb9..64ce94c 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -296,19 +296,18 @@ void DXF2GDIMetaFile::DrawCircleEntity(const
DXFCircleEntity & rE, const DXFTran
}
}
-
void DXF2GDIMetaFile::DrawArcEntity(const DXFArcEntity & rE, const
DXFTransform & rTransform)
{
-double frx,fry,fA1,fdA;
+double frx,fry;
sal_uInt16 nPoints,i;
DXFVector aC;
Point aPS,aPE;
if (!SetLineAttribute(rE)) return;
-fA1=rE.fStart;
-fdA=rE.fEnd-fA1;
-while (fdA>=360.0) fdA-=360.0;
-while (fdA<=0) fdA+=360.0;
+double fA1=rE.fStart;
+double fdA=rE.fEnd-fA1;
+fdA = fmod(fdA, 360.0);
+if (fdA<=0) fdA+=360.0;
rTransform.Transform(rE.aP0,aC);
if (rE.fThickness==0 && fdA>5.0 &&
rTransform.TransCircleToEllipse(rE.fRadius,frx,fry)) {
DXFVector
aVS(cos(fA1/180.0*3.14159265359),sin(fA1/180.0*3.14159265359),0.0);
@@ -359,7 +358,6 @@ void DXF2GDIMetaFile::DrawArcEntity(const DXFArcEntity &
rE, const DXFTransform
}
}
-
void DXF2GDIMetaFile::DrawTraceEntity(const DXFTraceEntity & rE, const
DXFTransform & rTransform)
{
if (SetLineAttribute(rE)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Finding Bugs
Hi we have made a step by step guide to help you get started. https://wiki.documentfoundation.org/Development/GetInvolved We have no chance of helping you, with your statement,you need to select 1 easyhack, and if you encounter problems while solving it then ask specific questions. rgds jan i > On 28 Feb 2017, at 20:55, Jeevan Surya Maddu > wrote: > > Hi, > I have already built libre-office on my desktop. I have found bugs on > Bugzilla ( Easy Hacks ). > I have tried many times to pick up a bug and understand it, but I am unable > to proceed. Can, anyone please help me, how can I move ahead. > > Jeevan. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Finding Bugs
Hi, I have already built libre-office on my desktop. I have found bugs on Bugzilla ( Easy Hacks ). I have tried many times to pick up a bug and understand it, but I am unable to proceed. Can, anyone please help me, how can I move ahead. Jeevan. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/shutdowniconaqua.mm |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 0b849247e11729707d46c214f53da7d4eb22c7e0 Author: Stephan Bergmann Date: Tue Feb 28 20:51:16 2017 +0100 loplugin:unoany Change-Id: Id50b15bbb9f8c62ac5258358431ff6ce0e7584d1 diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index 8a36273..cd69b46 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -252,11 +252,11 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin css::uno::Sequence< css::beans::PropertyValue > aArgsList( NUM_OF_PICKLIST_ARGS ); aArgsList[0].Name = "Referer"; -aArgsList[0].Value = css::uno::makeAny( OUString( "private:user" ) ); +aArgsList[0].Value <<= OUString( "private:user" ); // documents in the picklist will never be opened as templates aArgsList[1].Name = "AsTemplate"; -aArgsList[1].Value = css::uno::makeAny( false ); +aArgsList[1].Value <<= false; ::rtl::OUString aFilter( rRecentFile.aFilter ); sal_Int32 nPos = aFilter.indexOf( '|' ); @@ -268,14 +268,14 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin aFilterOptions = aFilter.copy( nPos+1 ); aArgsList[2].Name = "FilterOptions"; -aArgsList[2].Value = css::uno::makeAny( aFilterOptions ); +aArgsList[2].Value <<= aFilterOptions; aFilter = aFilter.copy( 0, nPos-1 ); aArgsList.realloc( ++NUM_OF_PICKLIST_ARGS ); } aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = "FilterName"; -aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = css::uno::makeAny( aFilter ); +aArgsList[NUM_OF_PICKLIST_ARGS-1].Value <<= aFilter; ShutdownIcon::OpenURL( rRecentFile.aURL, "_default", aArgsList ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx vcl/source
vcl/osx/DataFlavorMapping.cxx | 12 ++--
vcl/source/window/mouse.cxx |4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit bd7dd48189e5ff7f62e16e53f0a02d1068583108
Author: Stephan Bergmann
Date: Tue Feb 28 20:10:52 2017 +0100
loplugin:unoany
Change-Id: I525ba4d7706e6f6a385a0fbf5976d8e9883a40a5
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 31edf56..6db7d41 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -216,9 +216,9 @@ Any UniDataProvider::getOOoData()
if (mSystemData)
{
- oOOData = makeAny(OUString(static_cast([mSystemData
bytes]),
+ oOOData <<= OUString(static_cast([mSystemData bytes]),
[mSystemData length],
- RTL_TEXTENCODING_UTF8));
+ RTL_TEXTENCODING_UTF8);
}
else
{
@@ -268,7 +268,7 @@ Any ByteSequenceDataProvider::getOOoData()
Sequence byteSequence;
byteSequence.realloc(flavorDataLength);
memcpy(byteSequence.getArray(), [mSystemData bytes], flavorDataLength);
- oOOData = makeAny(byteSequence);
+ oOOData <<= byteSequence;
}
else
{
@@ -324,7 +324,7 @@ Any HTMLFormatDataProvider::getOOoData()
pPlainHtml = &plainHtml;
}
- oOOData = makeAny(*pPlainHtml);
+ oOOData <<= *pPlainHtml;
}
else
{
@@ -388,7 +388,7 @@ Any PNGDataProvider::getOOoData()
Sequence pngData;
if( ImageToPNG( imgData, pngData, meImageType))
-oOOData = makeAny( pngData);
+oOOData <<= pngData;
}
else
{
@@ -450,7 +450,7 @@ Any FileListDataProvider::getOOoData()
pBuffer += l + 1;
}
- oOOData = makeAny(oOOFileList);
+ oOOData <<= oOOFileList;
}
else
{
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index d0349d8..d6bf320 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -741,8 +741,8 @@ Reference< css::datatransfer::dnd::XDragSource >
Window::GetDragSource()
* Using Windows based dnd as a temporary solution*/
aDragSourceSN =
"com.sun.star.datatransfer.dnd.OleDragSource";
aDropTargetSN =
"com.sun.star.datatransfer.dnd.OleDropTarget";
-aDragSourceAL[ 1 ] = makeAny( static_cast(
reinterpret_cast(pEnvData->mpNSView) ) );
-aDropTargetAL[ 0 ] = makeAny( static_cast(
reinterpret_cast(pEnvData->mpNSView) ) );
+aDragSourceAL[ 1 ] <<= static_cast(
reinterpret_cast(pEnvData->mpNSView) );
+aDropTargetAL[ 0 ] <<= static_cast(
reinterpret_cast(pEnvData->mpNSView) );
#elif HAVE_FEATURE_X11
aDragSourceSN =
"com.sun.star.datatransfer.dnd.X11DragSource";
aDropTargetSN =
"com.sun.star.datatransfer.dnd.X11DropTarget";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/tree/imagecontainer.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 386e38bd3f6d60ee1e1c24f808aeafd030f6d895
Author: Stephan Bergmann
Date: Tue Feb 28 19:09:45 2017 +0100
loplugin:sallogareas
Change-Id: Ida8a58bd95164cd651934dbf8be0923ac2c08a8e
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx
b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 64d17c6..b44ef77 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -129,14 +129,14 @@ void ImageContainer::writeBase64EncodedStream( ImageId
nId, EmitContext& rContex
if (pValue == pAry + nLen )
{
-SAL_WARN("pdfimport", "InputSequence not found");
+SAL_WARN("sdext.pdfimport", "InputSequence not found");
return;
}
uno::Sequence aData;
if( !(pValue->Value >>= aData) )
{
-SAL_WARN("pdfimport", "Wrong data type");
+SAL_WARN("sdext.pdfimport", "Wrong data type");
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/postit.cxx | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
New commits:
commit d3676ceeec55a41337ce5e6bc596f4f100d0638e
Author: Eike Rathke
Date: Tue Feb 28 18:28:53 2017 +0100
in decRefAndDestroy() the remaining element must be one and only one
So head can be destroyed already there and removeFromList() take a short
cut.
Change-Id: I8f53d252c4e0ad867674ee410ecfaa300ac0c731
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 2e084c6..965d843 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -637,14 +637,11 @@ void ScCaptionPtr::decRefAndDestroy()
* foo and call SdrObject::Free(), likely with mpHead->mpCaption, see
* ScPostIt::RemoveCaption(). Further work needed to be able to do so.
* */
-ScCaptionPtr* pThat = (mpHead ? mpHead->mpFirst : this);
-do
-{
-pThat->mpCaption = nullptr;
-pThat = pThat->mpNext;
-}
-while (pThat);
-assert(!mpCaption); // this ought to be in list and nulled
+assert(mpHead->mpFirst == this);// this must be one and only one
+mpCaption = nullptr;
+assert(!mpNext);// this must be one and only one
+delete mpHead;
+mpHead = nullptr;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - editeng/source
editeng/source/editeng/editdoc.hxx | 10 +-
editeng/source/editeng/impedit3.cxx | 16
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 04f75cd35e5e2657fcb8033fc88dc8abce9cd90e
Author: Marco Cecchetti
Date: Thu Feb 23 21:26:34 2017 +0100
LOK - Calc: Text is not visible in cell when entering numerical input
Problem
The issue occurs when you double click and enter a numerical input in
a cell which belongs to one of the front colums.
Findings
After a bit of investigation I detected that the problem shows up when
the spreedsheet width is increased by invoking
ScViewData::SetMaxTiledCol.
Indeed the problem occurs whenever the spreadsheet width is larger
than 2^16 twips.
Solution
By changing the type of some variables from sal_uInt16 to long in all
involved contexts, the problem disappeared.
Change-Id: Ia6c6c258b0644f03c897e7b4bcaded967f21537c
Reviewed-on: https://gerrit.libreoffice.org/34597
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
(cherry picked from commit 288d694ff695ef83cbe4224db87dd65281c75a8f)
Reviewed-on: https://gerrit.libreoffice.org/34605
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
(cherry picked from commit 4b0faa31f94a8a9034faa2f54f641be1a17c)
Reviewed-on: https://gerrit.libreoffice.org/34675
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index 601e4bf..5ae040b 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -478,7 +478,7 @@ public:
private:
CharPosArrayType aPositions;
longnTxtWidth;
-sal_uInt16 nStartPosX;
+longnStartPosX;
sal_Int32 nStart; // could be replaced by nStartPortion
sal_Int32 nEnd; // could be replaced by nEndPortion
sal_Int32 nStartPortion;
@@ -532,7 +532,7 @@ public:
sal_Int32 GetLen() const { return nEnd - nStart; }
-sal_uInt16 GetStartPosX() const{ return nStartPosX; }
+longGetStartPosX() const{ return nStartPosX; }
voidSetStartPosX( long start );
SizeCalcTextSize( ParaPortion& rParaPortion );
@@ -592,7 +592,7 @@ private:
sal_Int32 nInvalidPosStart;
sal_Int32 nFirstLineOffset; // For
Writer-LineSpacing-Interpretation
-sal_uInt16 nBulletX;
+sal_Int32 nBulletX;
sal_Int32 nInvalidDiff;
boolbInvalid: 1;
@@ -618,8 +618,8 @@ public:
boolMustRepaint() const { return bForceRepaint; }
voidSetMustRepaint( bool bRP ) { bForceRepaint = bRP; }
-sal_uInt16 GetBulletX() const { return nBulletX; }
-voidSetBulletX( sal_uInt16 n ) { nBulletX = n; }
+sal_Int32 GetBulletX() const { return nBulletX; }
+voidSetBulletX( sal_Int32 n ) { nBulletX = n; }
voidMarkInvalid( sal_Int32 nStart, sal_Int32 nDiff);
voidMarkSelectionInvalid( sal_Int32 nStart, sal_Int32 nEnd
);
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 15afde8..ca7f220 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -738,7 +738,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara,
sal_uInt32 nStartPosY )
{
aBulletArea = GetEditEnginePtr()->GetBulletArea(
GetParaPortions().GetPos( pParaPortion ) );
if ( aBulletArea.Right() > 0 )
-pParaPortion->SetBulletX( (sal_uInt16) GetXValue(
aBulletArea.Right() ) );
+pParaPortion->SetBulletX( (sal_Int32) GetXValue(
aBulletArea.Right() ) );
else
pParaPortion->SetBulletX( 0 ); // if Bullet is set incorrectly
}
@@ -1608,23 +1608,23 @@ void ImpEditEngine::CreateAndInsertEmptyLine(
ParaPortion* pParaPortion, sal_uIn
sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth(
pParaPortion->GetNode(), &nSpaceBefore );
const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pParaPortion->GetNode() );
const SvxLineSpacingItem& rLSItem = static_cast(pParaPortion->GetNode()->GetContentAttribs().GetItem(
EE_PARA_SBL ));
-short nStartX = GetXValue( (short)(rLRItem.GetTextLeft() +
rLRItem.GetTextFirstLineOfst() + nSpaceBefore));
+long nStartX = GetXValue( rLRItem.GetTextLeft() +
rLRItem.GetTextFirstLineOfst() + nSpaceBefore );
Rectangle aBulletArea = Rectangle( Point(), Point() );
if ( bLineBreak )
{
-nStartX = (short)GetXValue( rLRItem.GetTextLeft() +
rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
+nStartX = GetXValue( rLRItem.GetTextLeft() +
rLRItem.GetTextFirstLineOfs
[Libreoffice-commits] core.git: include/sal
include/sal/log-areas.dox |1 + 1 file changed, 1 insertion(+) New commits: commit e6a90b3f28d948275188e7504fc9d46f0793e36f Author: Stephan Bergmann Date: Tue Feb 28 18:02:58 2017 +0100 loplugin:sallogareas Change-Id: I9af09bc52775501c8dbf0e883f4ec3b53c397de4 diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 0afd32e..c8036ab 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -273,6 +273,7 @@ certain functionality. @section io +@li @c io.connector @li @c io.streams @section jvmfwk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/commonfuzzer.hxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 1bb18010973540911aea7f1ab89ffe0517c2879e Author: Caolán McNamara Date: Tue Feb 28 17:00:47 2017 + convince ofz lsan this isn't leak Change-Id: Ifac8b0ac03cedb59deec1733b0d38887038992de diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx index ea8c342..b18e033 100644 --- a/vcl/workben/commonfuzzer.hxx +++ b/vcl/workben/commonfuzzer.hxx @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -88,8 +89,11 @@ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) utl::ConfigManager::EnableAvoidConfig(); InitVCL(); -//we don't have a de-init, so get the font info here inside the leak disabled code +//we don't have a de-init, so inside this leak disabled region... +//get the font info psp::PrintFontManager::get(); +//get the printer info +Printer::GetPrinterQueues(); if (__lsan_enable) __lsan_enable(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/update/check/download.cxx |4 ++--
extensions/source/update/check/updatecheckconfig.cxx | 14 +++---
extensions/source/update/check/updatehdl.cxx |4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 9697b14b65e923f5b9fdfcc27cad00387372d202
Author: Stephan Bergmann
Date: Tue Feb 28 17:57:12 2017 +0100
loplugin:unoany
Change-Id: I57f1d614b1dbb945e39b546fec2fdaac40de82b2
diff --git a/extensions/source/update/check/download.cxx
b/extensions/source/update/check/download.cxx
index 43320b5..4b4afea 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -181,10 +181,10 @@ Download::getProxyForURL(const OUString& rURL, OString&
rHost, sal_Int32& rPort)
beans::PropertyValue aProperty;
aProperty.Name = "nodepath";
-aProperty.Value = uno::makeAny( OUString("org.openoffice.Inet/Settings") );
+aProperty.Value <<= OUString("org.openoffice.Inet/Settings");
uno::Sequence< uno::Any > aArgumentList( 1 );
-aArgumentList[0] = uno::makeAny( aProperty );
+aArgumentList[0] <<= aProperty;
uno::Reference< container::XNameAccess > xNameAccess(
xConfigProvider->createInstanceWithArguments(
diff --git a/extensions/source/update/check/updatecheckconfig.cxx
b/extensions/source/update/check/updatecheckconfig.cxx
index d98a905..e61f7ed 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -229,22 +229,22 @@ UpdateCheckConfig::get(
beans::PropertyValue aProperty;
aProperty.Name = "nodepath";
-aProperty.Value = uno::makeAny(
OUString("org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments") );
+aProperty.Value <<=
OUString("org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments");
uno::Sequence< uno::Any > aArgumentList( 1 );
-aArgumentList[0] = uno::makeAny( aProperty );
+aArgumentList[0] <<= aProperty;
uno::Reference< container::XNameContainer > xContainer(
xConfigProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess",
aArgumentList ),
uno::UNO_QUERY_THROW );
-aProperty.Value = uno::makeAny(
OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates")
);
-aArgumentList[0] = uno::makeAny( aProperty );
+aProperty.Value <<=
OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates");
+aArgumentList[0] <<= aProperty;
uno::Reference< container::XNameContainer > xIgnoredExt(
xConfigProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess", aArgumentList ),
uno::UNO_QUERY_THROW );
-aProperty.Value = uno::makeAny(
OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/AvailableUpdates")
);
-aArgumentList[0] = uno::makeAny( aProperty );
+aProperty.Value <<=
OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/AvailableUpdates");
+aArgumentList[0] <<= aProperty;
uno::Reference< container::XNameContainer > xUpdateAvail(
xConfigProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess", aArgumentList ),
uno::UNO_QUERY_THROW );
return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt,
rListener );
@@ -472,7 +472,7 @@ UpdateCheckConfig::getByName( const OUString& aName )
aValue >>= aStr;
if( aStr.isEmpty() )
-aValue = uno::makeAny(getDesktopDirectory());
+aValue <<= getDesktopDirectory();
}
return aValue;
}
diff --git a/extensions/source/update/check/updatehdl.cxx
b/extensions/source/update/check/updatehdl.cxx
index 6a18544..1fb0bae 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -816,10 +816,10 @@ void UpdateHandler::setFullVersion( OUString& rString )
beans::PropertyValue aProperty;
aProperty.Name = "nodepath";
-aProperty.Value = uno::makeAny( OUString("org.openoffice.Setup/Product") );
+aProperty.Value <<= OUString("org.openoffice.Setup/Product");
uno::Sequence< uno::Any > aArgumentList( 1 );
-aArgumentList[0] = uno::makeAny( aProperty );
+aArgumentList[0] <<= aProperty;
uno::Reference< uno::XInterface > xConfigAccess;
xConfigAccess = xConfigurationProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationAccess",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/commonfuzzer.hxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit d4ea5708a83ca5b087ae196e4599aa98e606e9ca
Author: Caolán McNamara
Date: Tue Feb 28 16:56:04 2017 +
don't check for printers during fuzzing
Change-Id: Id52d5dc425b6e3319879c1802f6c1fc51c1dd4f3
diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index bafaaee..ea8c342 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -72,6 +72,7 @@ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
setenv("SAL_USE_VCLPLUGIN", "svp", 1);
setenv("SAL_WMF_COMPLEXCLIP_VIA_REGION", "1", 1);
+setenv("SAL_DISABLE_PRINTERLIST", "1", 1);
osl_setCommandArgs(*argc, *argv);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-1' - svx/source
svx/source/svdraw/svdmark.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1d1582dedfd41cbc28c6b5383deace28a77a6114
Author: Caolán McNamara
Date: Mon Feb 20 14:52:52 2017 +
Resolves: tdf#106105 duplicate marks not merged when they are at the start
i.e. initial mark isn't compared which goes on to crash under some
circumstances
regression from...
commit aa11e7bae89fe691f914abb27d1c4a03d27a7ee5
Date: Tue Aug 14 16:31:53 2012 +0200
Convert maList in SdrMarkList from Container to std::vector
Change-Id: Ib3e9b02aad91c14971656af171d48154507da127
(cherry picked from commit 35bb22c1a834b306c910cb065bc006818c9fa9b3)
Reviewed-on: https://gerrit.libreoffice.org/34478
Reviewed-by: Stephan Bergmann
Reviewed-by: Michael Stahl
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 66e5f6e..6cf64c9 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -179,8 +179,9 @@ void SdrMarkList::ImpForceSort()
if(maList.size() > 1)
{
SdrMark* pAkt = maList.back();
-for (size_t i = maList.size() - 2; i; --i)
+for (size_t count = maList.size() - 1; count; --count)
{
+size_t i = count - 1;
SdrMark* pCmp = maList[i];
if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj() &&
pAkt->GetMarkedSdrObj())
{
___
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/itiff/ccidecom.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 99c361be16eb3a21aa679a103db2d07ecd0f5d3c
Author: Caolán McNamara
Date: Tue Feb 28 16:43:44 2017 +
check nTargetBits size
Change-Id: I5cc7499cfdee58ffa480bb31dfc262d5b781180d
diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx
b/filter/source/graphicfilter/itiff/ccidecom.cxx
index 125d9c8..b5f3ab4 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -627,7 +627,9 @@ void CCIDecompressor::StartDecompression( SvStream &
rIStream )
bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong
nTargetBits, bool bLastLine )
{
-bool b2D;
+//Read[1|2]DScanlineData take a sal_uInt16, so its either limit here or
expand there
+if (nTargetBits > SAL_MAX_UINT16)
+return false;
if ( nEOLCount >= 5 ) // RTC (Return To Controller)
return true;
@@ -682,6 +684,7 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 *
pTarget, sal_uLong nTarget
if ( nOptions & CCI_OPTION_BYTEALIGNROW )
nInputBitsBufSize &= 0xfff8;
+bool b2D;
// is it a 2D row?
if ( nOptions & CCI_OPTION_2D )
{
___
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/kde4/KDE4FilePicker.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2c5db7360d03cb28d232f06212065d3a1d9d4589
Author: Stephan Bergmann
Date: Tue Feb 28 17:26:41 2017 +0100
loplugin:unoany
Change-Id: Id0823ce54c7adb03c824e4095c835356846c69ca
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index d20c716..af57bb2 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -454,7 +454,7 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16
controlId, sal_Int16 nCont
if (_customWidgets.contains( controlId )) {
QCheckBox* cb = dynamic_cast( _customWidgets.value(
controlId ));
if (cb)
-res = uno::Any(cb->isChecked());
+res <<= cb->isChecked();
}
else
SAL_WARN( "vcl", "get value on unknown control " << controlId );
___
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/lwpstory.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c632aa3269aa08457a35e98580fb693a9dacfecd
Author: Caolán McNamara
Date: Tue Feb 28 16:25:37 2017 +
endless loop on corrupt lwp
Change-Id: Ie984d396a6c0055fc5175755fd42161749c572be
diff --git a/lotuswordpro/source/filter/lwpstory.cxx
b/lotuswordpro/source/filter/lwpstory.cxx
index 6a700be..61c91b7 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -132,6 +132,8 @@ void LwpStory::RegisterStyle()
rtl::Reference
xPara(dynamic_cast(GetFirstPara().obj().get()));
while (xPara.is())
{
+if (xPara->GetFoundry())
+throw std::runtime_error("loop in register style");
xPara->SetFoundry(m_pFoundry);
xPara->DoRegisterStyle();
xPara.set(dynamic_cast(xPara->GetNext().obj().get()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source
sc/source/ui/undo/undoblk3.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 0eda0807f9b0ba81035cf4bd630e50a27ba2678b
Author: Eike Rathke
Date: Fri Feb 17 23:54:21 2017 +0100
Resolves: tdf#105667 forget target area's caption pointer in Merge Undo
It's the same that was copied to the Undo document, so don't delete the
caption.
(cherry picked from commit a627c44026fcf883918f84bddd1c3b745e1f898c)
Change-Id: Ib89870ed6e392c4271de2f416c78d42135922609
Reviewed-on: https://gerrit.libreoffice.org/34385
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 3072d0c..ff43c28 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -701,7 +701,13 @@ void ScUndoMerge::DoChange( bool bUndo ) const
// undo -> copy back deleted contents
if (bUndo && mpUndoDoc)
{
-rDoc.DeleteAreaTab( aRange,
InsertDeleteFlags::CONTENTS|InsertDeleteFlags::NOCAPTIONS );
+// If there are note captions to be deleted during Undo they were
+// kept or moved during the merge and copied to the Undo document
+// without cloning the caption. Forget the target area's caption
+// pointer that is identical to the one in the Undo document
+// instead of deleting it.
+rDoc.DeleteAreaTab( aRange,
+InsertDeleteFlags::CONTENTS |
InsertDeleteFlags::NOCAPTIONS | InsertDeleteFlags::FORGETCAPTIONS );
mpUndoDoc->CopyToDocument( aRange,
InsertDeleteFlags::ALL|InsertDeleteFlags::NOCAPTIONS, false, &rDoc );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/postit.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d407791075ce4caff1259aa9a8ae573e4b7bb8bd
Author: Eike Rathke
Date: Tue Feb 28 17:16:33 2017 +0100
dissolve() needs to delete head now that it's not a list element anymore
Change-Id: I9949a1006e6d1b4b50dd5350106ad69b643e833c
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index b0e736b..2e084c6 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -665,15 +665,18 @@ bool ScCaptionPtr::forget()
void ScCaptionPtr::dissolve()
{
+ScCaptionPtr::Head* pHead = mpHead;
ScCaptionPtr* pThat = (mpHead ? mpHead->mpFirst : this);
while (pThat)
{
-assert(!pThat->mpNext || mpHead); // next without head is bad
+assert(!pThat->mpNext || pThat->mpHead);// next without head is bad
+assert(pThat->mpHead == pHead); // same head required
within one list
ScCaptionPtr* p = pThat->mpNext;
pThat->clear();
pThat = p;
}
-clear();
+assert(!mpHead && !mpNext && !mpCaption); // should had been cleared
during list walk
+delete pHead;
}
void ScCaptionPtr::clear()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/view/viewfrm.cxx | 21 +++--
1 file changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 67070d583871ec77400b434b4f976c63768ad5b3
Author: Caolán McNamara
Date: Tue Feb 28 10:35:50 2017 +
don't have to create SfxApplication if none exists
Change-Id: I312f00e8b2956470eaa496abfa2687c296f256ae
Reviewed-on: https://gerrit.libreoffice.org/34717
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5848f6b..12fc132 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1433,10 +1433,13 @@ SfxViewFrame::~SfxViewFrame()
GetFrame().SetCurrentViewFrame_Impl( nullptr );
// Unregister from the Frame List.
-SfxApplication *pSfxApp = SfxGetpApp();
-SfxViewFrameArr_Impl &rFrames = pSfxApp->GetViewFrames_Impl();
-SfxViewFrameArr_Impl::iterator it = std::find( rFrames.begin(),
rFrames.end(), this );
-rFrames.erase( it );
+SfxApplication *pSfxApp = SfxApplication::Get();
+if (pSfxApp)
+{
+SfxViewFrameArr_Impl &rFrames = pSfxApp->GetViewFrames_Impl();
+SfxViewFrameArr_Impl::iterator it = std::find( rFrames.begin(),
rFrames.end(), this );
+rFrames.erase( it );
+}
// Delete Member
KillDispatcher_Impl();
@@ -1472,7 +1475,10 @@ SfxViewFrame* SfxViewFrame::GetFirst
boolbOnlyIfVisible
)
{
-SfxApplication *pSfxApp = SfxGetpApp();
+SfxApplication *pSfxApp = SfxApplication::Get();
+if (!pSfxApp)
+return nullptr;
+
SfxViewFrameArr_Impl &rFrames = pSfxApp->GetViewFrames_Impl();
// search for a SfxDocument of the specified type
@@ -1495,7 +1501,10 @@ SfxViewFrame* SfxViewFrame::GetNext
boolbOnlyIfVisible
)
{
-SfxApplication *pSfxApp = SfxGetpApp();
+SfxApplication *pSfxApp = SfxApplication::Get();
+if (!pSfxApp)
+return nullptr;
+
SfxViewFrameArr_Impl &rFrames = pSfxApp->GetViewFrames_Impl();
// refind the specified predecessor
___
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/itiff/ccidecom.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 3ae57096ae33eeed5b4e658ebdf3563a6dd86474
Author: Caolán McNamara
Date: Tue Feb 28 16:15:46 2017 +
use memset instead of loop
Change-Id: I572f52658914a0814bc3d3990830e247275e110b
diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx
b/filter/source/graphicfilter/itiff/ccidecom.cxx
index 1cb7d7d..125d9c8 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -995,10 +995,14 @@ void CCIDecompressor::Read1DScanlineData(sal_uInt8 *
pTarget, sal_uInt16 nTarget
nDataBits = nDataBits - nTgtFreeByteBits;
pTarget++;
nTgtFreeByteBits=8;
-while (nDataBits>=8) {
-*(pTarget++)=nBlackOrWhite;
-nDataBits-=8;
+if (nDataBits >= 8)
+{
+const sal_uInt16 nDataBytes = nDataBits / 8;
+memset(pTarget, nBlackOrWhite, nDataBytes);
+pTarget += nDataBytes;
+nDataBits -= nDataBytes * 8;
}
+
if (nDataBits>0) {
*pTarget=nBlackOrWhite;
nTgtFreeByteBits = nTgtFreeByteBits - nDataBits;
___
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/lwpfrib.cxx | 48 -
1 file changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 9fadf818e9de0813e8904acb994560d5a18a18ec
Author: Caolán McNamara
Date: Tue Feb 28 15:24:03 2017 +
fix leak
Change-Id: I57d1ae4d8f3fed72f024672a9eefb748df83bb93
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx
b/lotuswordpro/source/filter/lwpfrib.cxx
index a056216..2d6d382 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -119,7 +119,7 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara,
LwpObjectStream* pObjStrm, sal_uInt
}
//Read frib data
-LwpFrib* newFrib = nullptr;
+std::unique_ptr newFrib;
sal_uInt16 friblen = pObjStrm->QuickReaduInt16();
sal_uInt8 fribtype = fribtag&~FRIB_TAG_TYPEMASK;
switch(fribtype)
@@ -127,74 +127,74 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara,
LwpObjectStream* pObjStrm, sal_uInt
case FRIB_TAG_INVALID: //fall through
case FRIB_TAG_EOP: //fall through
default:
-newFrib = new LwpFrib(pPara);
+newFrib.reset(new LwpFrib(pPara));
break;
case FRIB_TAG_TEXT:
{
-newFrib = new LwpFribText (pPara, (fribtag & FRIB_TAG_NOUNICODE)
!= 0);
+newFrib.reset(new LwpFribText(pPara, (fribtag &
FRIB_TAG_NOUNICODE) != 0));
break;
}
case FRIB_TAG_TABLE:
-newFrib = new LwpFribTable(pPara);
+newFrib.reset(new LwpFribTable(pPara));
break;
case FRIB_TAG_TAB:
-newFrib = new LwpFribTab(pPara);
+newFrib.reset(new LwpFribTab(pPara));
break;
case FRIB_TAG_PAGEBREAK:
-newFrib = new LwpFribPageBreak(pPara);
+newFrib.reset(new LwpFribPageBreak(pPara));
break;
case FRIB_TAG_FRAME:
-newFrib = new LwpFribFrame(pPara);
+newFrib.reset(new LwpFribFrame(pPara));
break;
case FRIB_TAG_FOOTNOTE:
-newFrib = new LwpFribFootnote(pPara);
+newFrib.reset(new LwpFribFootnote(pPara));
break;
case FRIB_TAG_COLBREAK:
-newFrib = new LwpFribColumnBreak(pPara);
+newFrib.reset(new LwpFribColumnBreak(pPara));
break;
case FRIB_TAG_LINEBREAK:
-newFrib = new LwpFribLineBreak(pPara);
+newFrib.reset(new LwpFribLineBreak(pPara));
break;
case FRIB_TAG_HARDSPACE:
-newFrib = new LwpFribHardSpace(pPara);
+newFrib.reset(new LwpFribHardSpace(pPara));
break;
case FRIB_TAG_SOFTHYPHEN:
-newFrib = new LwpFribSoftHyphen(pPara);
+newFrib.reset(new LwpFribSoftHyphen(pPara));
break;
case FRIB_TAG_PARANUMBER:
-newFrib = new LwpFribParaNumber(pPara);
+newFrib.reset(new LwpFribParaNumber(pPara));
break;
case FRIB_TAG_UNICODE: //fall through
case FRIB_TAG_UNICODE2: //fall through
case FRIB_TAG_UNICODE3: //fall through
-newFrib = new LwpFribUnicode(pPara);
+newFrib.reset(new LwpFribUnicode(pPara));
break;
case FRIB_TAG_NOTE:
-newFrib = new LwpFribNote(pPara);
+newFrib.reset(new LwpFribNote(pPara));
break;
case FRIB_TAG_SECTION:
-newFrib = new LwpFribSection(pPara);
+newFrib.reset(new LwpFribSection(pPara));
break;
case FRIB_TAG_PAGENUMBER:
-newFrib = new LwpFribPageNumber(pPara);
+newFrib.reset(new LwpFribPageNumber(pPara));
break;
case FRIB_TAG_DOCVAR:
-newFrib = new LwpFribDocVar(pPara);
+newFrib.reset(new LwpFribDocVar(pPara));
break;
case FRIB_TAG_BOOKMARK:
-newFrib = new LwpFribBookMark(pPara);
+newFrib.reset(new LwpFribBookMark(pPara));
break;
case FRIB_TAG_FIELD:
-newFrib = new LwpFribField(pPara);
+newFrib.reset(new LwpFribField(pPara));
break;
case FRIB_TAG_CHBLOCK:
-newFrib = new LwpFribCHBlock(pPara);
+newFrib.reset(new LwpFribCHBlock(pPara));
break;
case FRIB_TAG_RUBYMARKER:
-newFrib = new LwpFribRubyMarker(pPara);
+newFrib.reset(new LwpFribRubyMarker(pPara));
break;
case FRIB_TAG_RUBYFRAME:
-newFrib = new LwpFribRubyFrame(pPara);
+newFrib.reset(new LwpFribRubyFrame(pPara));
break;
}
@@ -207,7 +207,7 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara,
LwpObjectStream* pObjStrm, sal_uInt
newFrib->m_nFribType = fribtype;
newFrib->m_nEditor = editID;
newFrib->Read(pObjStrm, friblen);
-return newFrib;
+return newFri
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.2.6.2'
Tag 'libreoffice-5.2.6.2' created by Christian Lohmaier at 2017-02-28 14:39 + Tag libreoffice-5.2.6.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJYtYuqAAoJEPQ0oe+v7q6jTMsQAJI1u7pQJDaIy6vdw4hPHy9j uGCUEroe67RthGhZxqnCXwGtauMGbRajGMmvoJTu7AhkUNzFmZaPwxxAxWjSTnpM rZorSXkSdgVDJv236a6hnAdH4YWj/7+XEbz2ZDuVMj4wMxXF92vNqM6zZA28L1r3 Px+gplhGhKilcHN6JZZziOF3FrNijnW3YZv06nqQ1eVlzNE++SqNuRvadS8Zf2ta OuYbGqG9UfKBUF1ID7BUqAYYPx1BALL06UpXaznf8ZNP2oM3STWj16ZS6QgL9+4s NHCZ1E/n9e174FuCV08ethjnaH2pV4Xb4OHu1e31Wex2nQJASo/8Ntx8T+A+d1cU Icdvt67LP8NVspC58JUDjPPD3rmCnSw1pAlKHGwIZQM+aHGW+Wp4EGP0mcoMPG+4 UjY9Hxvv8yPSkZ5H1J6KiLjNz3d6tFYswEss2Kr9yLOh+njRJ5x5iJuMmTEQgU6E NB0NXVqkRKpT1vPf4Pl/etBNd5cCU5eD35nKJ6wS48c71uR2rAVfAfJcyfyUApP0 xrKweWtjgV1EfRdq0ohXLiaglXCVhnRrXNpiZ4aH+aIhkWIp+Vfq+N/zHzA0LPJX dPFdA/UI+ho+Sj70lpl3Bpc09mcwpG799DyNIKsTsgQecpKs0EINwWe1asgJ7uNJ c7xHqdF32vUCrzGk6pL/ =DD07 -END PGP SIGNATURE- Changes since libreoffice-5-2-branch-point-1036: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.2.6.2'
Tag 'libreoffice-5.2.6.2' created by Christian Lohmaier at 2017-02-28 14:39 + Tag libreoffice-5.2.6.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJYtYuhAAoJEPQ0oe+v7q6jLiwQAKMc6TB87NlYn0WG29t/3Cif Qp/LAcBaHYB0lUFYSpQRuIFY+PTidbWeBIIwD4Mvq5jFbsUqV1artBK3YQEKRRad PW9lFRd14VciY0iImFeamIt2bAjYzuJlFWfTX/VWEMkbCcUMS0ZsZ/n4M/3JDX5n HNsnrJC+rSos7SdW/C2fCrb/uPovvkoqO63spmYNWhtp6eqg6eTpuIIA/5QW5PkR 2g+pT0Triks60aho38oF3C++c/PiD1J80BCF6PI4rZPGHVUc7dv+yqelNkQ9DrPb N0hilvpSbf2Gb7WoDJkGDN221p4AOwSmhSV201NIJ5nNOD+TLJr8vNkZkbTGDYvD vz1kLnQznG2xoRz4+6xFCibWL3IgALT90BvMZLsrsoPP0GjF0no6PJdChTRiJ9gI GllSv53LrStQnRPOumU2APl7p68V2ImZoNOFjD5+c0TIStLLcO3wdbA1SV9pJ9Lv 2tPURjMgop8YfcalCXGGK3rCMMJ3Tk0t/H5SbG6JA13+QWPob9080X3bhHSwtWVz 4PUP7u6gpiMhG5UnvgoYj9iXcN5hCqrEDdz39FTn8S8V/odKKCPT9LZPSiWEz72X ZBaKE3Nnpp/AsSkB3p6+1JXq2Bk7y03l8zDsE/6108zjECSXt041bIJiUYwuL733 HUDfah4cDHipkUIqt/Sa =B1O8 -END PGP SIGNATURE- Changes since libreoffice-5.2.6.1-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.2.6.2'
Tag 'libreoffice-5.2.6.2' created by Christian Lohmaier at 2017-02-28 14:39 + Tag libreoffice-5.2.6.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJYtYudAAoJEPQ0oe+v7q6jrKkP/1biGxH0c+vs+z6/RkP3AlJ+ JlZgCdONje9YNDaHlAjxBeEBTMK/sVpGqMCAqDZhu7jiAETPF1AFUhH6AUvh5C7o 30Lx6MV5gWJwjQGEcdPn7UVBXrhKf2t0tStBPQboBr5GUilyjb5tNLA955+HOIj/ wZgyMj1HW2VDGl2c7NeqmWUzDgGSmieuZbW4DPJ2VoBRNVJ1cK0lWG0zKtIQophw zs6NLqBn5FfsAL88Nl1Bcpt5SsKjGrmGcUEi3RPRyOTGV5i9ZXhb5yBhWpUEX1UH VJTjvaSmgxY6hM7gG7OeeTsBKrMACQ4g6G4kwROpcflEdg+I7FwYaz547cLmu8Se sRZ5+fqZfbnYH0qzrVEEqbHlxQGpnt9DeKx3JLjZcCn/uH8vCOqV0dRaScqMkOmv 3gAZyYsjNHhJOWs+lHxR1jhfUpH4O+PEXfvRwultzkIGn7+n3dkg5o//8dcs+sCh jbkE+LzucW/DI+hMliTH5omtADhh6Zyscpk0L4PWpCwJsuQIfNbePOtWkLGDi7rM ymZvKtYvwzzTi7x8g1LYDUI+VOnUShkSIB0yDUlsnsoEFZcRb2Qi+JrCNzPEmXMe K2Muxo2DRjUiip4INli/LKIDie76Mn+6Fjq/6g66Dd4EMADCMsRWWxtpEh8VzpHy ugEYZKil+dRY9O28yXi/ =QcKC -END PGP SIGNATURE- Changes since libreoffice-5-2-branch-point-20: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-6' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f191a4feb70253fa3c8421efccd8c1b729c80804 Author: Christian Lohmaier Date: Tue Feb 28 15:40:05 2017 +0100 bump product version to 5.2.6.2.0+ Change-Id: I88b7ac9c355840c96bf65baacf40fb27e49f5b08 diff --git a/configure.ac b/configure.ac index 903f6ea..3fba415 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.2.6.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.2.6.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.2.6.2'
Tag 'libreoffice-5.2.6.2' created by Christian Lohmaier at 2017-02-28 14:39 + Tag libreoffice-5.2.6.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJYtYuaAAoJEPQ0oe+v7q6jQu8QAMUm9IlgLscJQD15MzUEKUTy BsszWEtptjGhTaH0shpICUswwSQvs1nuYIKJZQElztYvvMqBBYypQDj/6TKZUd86 EmV3TmF8qWOLP5TFPf9JRlsyOOsQYzFvuuZlGbSX/HazJl+pHGZYt6dqBzPAomk1 eSJ71sQ7KM3ldqaVG0+Rn0NM9ET9SSLIcbrRJIbIr6/RJWOBEZ/liLaQJX1RNcpy iTD5P0NZXJIzcmP6QQw3bfccFC5phBfR8mbeLdMZlnWP3FjDHVKrkYAuQQ2+wqho hjKSNKjkeIqjP9lgnVaI7SLJ6421L+Ow5ZAzwJLSt9f3oNYgEN4dk+k796ID/1ZY B1A1fwFZjzFFSFVQU0ZeccA63hbOyv9TqyQdeSMkEBjrl2qxk0M39VMzIEIs2AL8 /Y9QR1abKzWulDpDyUHeYbyJs+HeHiHdyFFxtwe3bpWAf9IvcZ5K6xmDdsrYpRAT H14LZtDXWPQCBlQfIg7+M5N/q4evpYgNIJPtCnkXeFO7sS5a8Keub/0vW58snhIp bGoPrL8luoJ1JgdsGeDiFYsFkAEO8ri2I2dAk7+bHCm15zxy0KJ5mpSwtO5wVGQD ChRYmNc45B6BYfNLo3kdO2j+TXPXAACq/2fGpTtmZdX1/CqWsOzZc7Eps6uybqKo 3u0p/PljEHv08E14VELA =cVhZ -END PGP SIGNATURE- Changes since cp-5.1-branch-point-8: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-6' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3025 ++-- 1 file changed, 1556 insertions(+), 1469 deletions(-) New commits: commit cd690dd32ac97daddf07878757669c849e7f9519 Author: Christian Lohmaier Date: Tue Feb 28 15:30:45 2017 +0100 update credits Change-Id: Iea0785f5ec1b55200d25d5cd55a63652ab5a38e1 (cherry picked from commit b694f15c86169fca1109ff0068afdf180c8a7d3b) (cherry picked from commit d3a26d4e7d1fd00bd4e22613ddb5c0502cb9c589) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index af2e061..d6ae0c9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,29 +1,30 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.2.5.1$Linux_X86_64 LibreOffice_project/0312e1a284a7d50ca85a365c316c7abbf20a4d222012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.3.0.3$Linux_X86_64 LibreOffice_project/7074905676c47b82bbcfbea1aeefc84afe1c50e12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 686 + 531 501 41197 - 21645 + 21698 true true view2 - 3676 + 3649 3471 501 - 686 + 531 41697 - 22329 + 7 0 0 false 100 false + false @@ -46,13 +47,13 @@ false false false - false false false true false true true + 1557161 false false false @@ -69,7 +70,7 @@ false false true - 6348325 + 6399058 false false false @@ -94,6 +95,12 @@ false + false + false + false + 1 + true + false true true true @@ -109,11 +116,6 @@ false false - 1557161 - false - 1 - true - false false 0 false @@ -314,40 +316,37 @@ - + - + - + - + - + - - - - + - + - + - + - + @@ -356,19 +355,19 @@ - + - + - + - + - + @@ -377,19 +376,16 @@ - + - + - + - - - - + @@ -398,23 +394,26 @@ - + - + - + - + - + + + + @@ -1042,7 +1041,7 @@ Credits -1246 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-01-26 22:47:12. +1257 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-02-28 15:22:34. * marks developers whose first contributions happened after 2010-09-28. Developers committing
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-6' - sw/source
sw/source/filter/xml/xmlimpit.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b59f4307144ed4a7d0a17533fb11f8fd0f195636 Author: Justin Luth Date: Wed Jan 18 15:52:33 2017 +0300 tdf#77111 odt import: treat PAGEDESC_PAGENUMOFFSET==0 as auto Ever since 2010 commit 7edaf190 zeroes have been saved as XML_AUTO. Ever since 2014 commit c2ccd20c, a numoffset of zero is no longer considered to be auto (for MS compatibility) but is still treated as auto during xml export. Thus, any older documents that had been saved with a zero should still xml import as auto instead of as 0. Change-Id: I1a0df32a8e2f1b30b2bedbf4c9bb07ebec239637 Reviewed-on: https://gerrit.libreoffice.org/33267 Tested-by: Jenkins Reviewed-by: Justin Luth Reviewed-by: Michael Stahl (cherry picked from commit e36f0860f00af139a8fa94d36302f7b0c56383fe) Reviewed-on: https://gerrit.libreoffice.org/34695 (cherry picked from commit 1f87318abb50e164aa4125747493c5ee02e8687c) Reviewed-on: https://gerrit.libreoffice.org/34697 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index ed7fb7c..8125c19 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -787,7 +787,7 @@ bool SvXMLImportItemMapper::PutXMLValue( sal_Int32 nVal; bOk = ::sax::Converter::convertNumber( nVal, rValue, 0, USHRT_MAX); -if( bOk ) +if( bOk && nVal > 0 ) rPageDesc.SetNumOffset( (sal_uInt16)nVal ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3025 ++-- 1 file changed, 1556 insertions(+), 1469 deletions(-) New commits: commit d3a26d4e7d1fd00bd4e22613ddb5c0502cb9c589 Author: Christian Lohmaier Date: Tue Feb 28 15:30:45 2017 +0100 update credits Change-Id: Iea0785f5ec1b55200d25d5cd55a63652ab5a38e1 (cherry picked from commit b694f15c86169fca1109ff0068afdf180c8a7d3b) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index af2e061..d6ae0c9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,29 +1,30 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.2.5.1$Linux_X86_64 LibreOffice_project/0312e1a284a7d50ca85a365c316c7abbf20a4d222012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.3.0.3$Linux_X86_64 LibreOffice_project/7074905676c47b82bbcfbea1aeefc84afe1c50e12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 686 + 531 501 41197 - 21645 + 21698 true true view2 - 3676 + 3649 3471 501 - 686 + 531 41697 - 22329 + 7 0 0 false 100 false + false @@ -46,13 +47,13 @@ false false false - false false false true false true true + 1557161 false false false @@ -69,7 +70,7 @@ false false true - 6348325 + 6399058 false false false @@ -94,6 +95,12 @@ false + false + false + false + 1 + true + false true true true @@ -109,11 +116,6 @@ false false - 1557161 - false - 1 - true - false false 0 false @@ -314,40 +316,37 @@ - + - + - + - + - + - - - - + - + - + - + - + @@ -356,19 +355,19 @@ - + - + - + - + - + @@ -377,19 +376,16 @@ - + - + - + - - - - + @@ -398,23 +394,26 @@ - + - + - + - + - + + + + @@ -1042,7 +1041,7 @@ Credits -1246 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-01-26 22:47:12. +1257 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-02-28 15:22:34. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1069,10 +1068,10 @@ Vladimir Gl
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-1' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3025 ++-- 1 file changed, 1556 insertions(+), 1469 deletions(-) New commits: commit 5351055562f37a35f1f09fec0e32e0a8ab8eb3ce Author: Christian Lohmaier Date: Tue Feb 28 15:30:45 2017 +0100 update credits Change-Id: Iea0785f5ec1b55200d25d5cd55a63652ab5a38e1 (cherry picked from commit b694f15c86169fca1109ff0068afdf180c8a7d3b) (cherry picked from commit e9fd3674fe783df2c905c3d9b29d0a2bec0cfa00) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index af2e061..d6ae0c9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,29 +1,30 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.2.5.1$Linux_X86_64 LibreOffice_project/0312e1a284a7d50ca85a365c316c7abbf20a4d222012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.3.0.3$Linux_X86_64 LibreOffice_project/7074905676c47b82bbcfbea1aeefc84afe1c50e12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 686 + 531 501 41197 - 21645 + 21698 true true view2 - 3676 + 3649 3471 501 - 686 + 531 41697 - 22329 + 7 0 0 false 100 false + false @@ -46,13 +47,13 @@ false false false - false false false true false true true + 1557161 false false false @@ -69,7 +70,7 @@ false false true - 6348325 + 6399058 false false false @@ -94,6 +95,12 @@ false + false + false + false + 1 + true + false true true true @@ -109,11 +116,6 @@ false false - 1557161 - false - 1 - true - false false 0 false @@ -314,40 +316,37 @@ - + - + - + - + - + - - - - + - + - + - + - + @@ -356,19 +355,19 @@ - + - + - + - + - + @@ -377,19 +376,16 @@ - + - + - + - - - - + @@ -398,23 +394,26 @@ - + - + - + - + - + + + + @@ -1042,7 +1041,7 @@ Credits -1246 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-01-26 22:47:12. +1257 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-02-28 15:22:34. * marks developers whose first contributions happened after 2010-09-28. Developers committing
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3025 ++-- 1 file changed, 1556 insertions(+), 1469 deletions(-) New commits: commit e9fd3674fe783df2c905c3d9b29d0a2bec0cfa00 Author: Christian Lohmaier Date: Tue Feb 28 15:30:45 2017 +0100 update credits Change-Id: Iea0785f5ec1b55200d25d5cd55a63652ab5a38e1 (cherry picked from commit b694f15c86169fca1109ff0068afdf180c8a7d3b) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index af2e061..d6ae0c9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,29 +1,30 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.2.5.1$Linux_X86_64 LibreOffice_project/0312e1a284a7d50ca85a365c316c7abbf20a4d222012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.3.0.3$Linux_X86_64 LibreOffice_project/7074905676c47b82bbcfbea1aeefc84afe1c50e12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 686 + 531 501 41197 - 21645 + 21698 true true view2 - 3676 + 3649 3471 501 - 686 + 531 41697 - 22329 + 7 0 0 false 100 false + false @@ -46,13 +47,13 @@ false false false - false false false true false true true + 1557161 false false false @@ -69,7 +70,7 @@ false false true - 6348325 + 6399058 false false false @@ -94,6 +95,12 @@ false + false + false + false + 1 + true + false true true true @@ -109,11 +116,6 @@ false false - 1557161 - false - 1 - true - false false 0 false @@ -314,40 +316,37 @@ - + - + - + - + - + - - - - + - + - + - + - + @@ -356,19 +355,19 @@ - + - + - + - + - + @@ -377,19 +376,16 @@ - + - + - + - - - - + @@ -398,23 +394,26 @@ - + - + - + - + - + + + + @@ -1042,7 +1041,7 @@ Credits -1246 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-01-26 22:47:12. +1257 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-02-28 15:22:34. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1069,10 +1068,10 @@ Vladimir Gl
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3025 ++-- 1 file changed, 1556 insertions(+), 1469 deletions(-) New commits: commit b694f15c86169fca1109ff0068afdf180c8a7d3b Author: Christian Lohmaier Date: Tue Feb 28 15:30:45 2017 +0100 update credits Change-Id: Iea0785f5ec1b55200d25d5cd55a63652ab5a38e1 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index af2e061..d6ae0c9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,29 +1,30 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.2.5.1$Linux_X86_64 LibreOffice_project/0312e1a284a7d50ca85a365c316c7abbf20a4d222012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.3.0.3$Linux_X86_64 LibreOffice_project/7074905676c47b82bbcfbea1aeefc84afe1c50e12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 686 + 531 501 41197 - 21645 + 21698 true true view2 - 3676 + 3649 3471 501 - 686 + 531 41697 - 22329 + 7 0 0 false 100 false + false @@ -46,13 +47,13 @@ false false false - false false false true false true true + 1557161 false false false @@ -69,7 +70,7 @@ false false true - 6348325 + 6399058 false false false @@ -94,6 +95,12 @@ false + false + false + false + 1 + true + false true true true @@ -109,11 +116,6 @@ false false - 1557161 - false - 1 - true - false false 0 false @@ -314,40 +316,37 @@ - + - + - + - + - + - - - - + - + - + - + - + @@ -356,19 +355,19 @@ - + - + - + - + - + @@ -377,19 +376,16 @@ - + - + - + - - - - + @@ -398,23 +394,26 @@ - + - + - + - + - + + + + @@ -1042,7 +1041,7 @@ Credits -1246 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-01-26 22:47:12. +1257 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-02-28 15:22:34. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1069,10 +1068,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-1' - extras/source
extras/source/autocorr/lang/ca/DocumentList.xml | 70 +--- 1 file changed, 63 insertions(+), 7 deletions(-) New commits: commit eb8c0519d2c56ecbf77ffb41a408eee982023adc Author: Christian Lohmaier Date: Tue Feb 28 15:22:34 2017 +0100 update emoji autocorrect files from po-files Change-Id: Ib837a679e359ac7f7c1e22f57cdfc0fddbdee931 (cherry picked from commit e5b616bc22bf66c78939258e8b7e4fa457ebff9b) (cherry picked from commit da671e946dd938a249d0e428f4e017d7d32460d5) diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index 6225ff6..38a1bf7 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -358,7 +358,6 @@ - @@ -443,11 +442,13 @@ + + @@ -460,6 +461,7 @@ + @@ -511,7 +513,7 @@ - + @@ -594,10 +596,12 @@ + + @@ -646,18 +650,17 @@ - - - + + @@ -665,17 +668,25 @@ + + + + + + + + @@ -696,6 +707,7 @@ + @@ -705,6 +717,7 @@ + @@ -712,11 +725,13 @@ + + @@ -734,6 +749,7 @@ + @@ -757,6 +773,8 @@ + + @@ -820,6 +838,7 @@ + @@ -844,6 +863,7 @@ + @@ -861,6 +881,7 @@ + @@ -873,6 +894,7 @@ + @@ -898,6 +920,7 @@ + @@ -942,6 +965,7 @@ + @@ -962,11 +986,14 @@ + - + + + @@ -986,7 +1013,7 @@ - + @@ -1023,7 +1050,10 @@ + + + @@ -1042,6 +1072,7 @@ + @@ -1053,6 +1084,7 @@ + @@ -1064,17 +1096,20 @@ + + + @@ -1084,10 +1119,12 @@ + + @@ -1149,6 +1186,8 @@ + + @@ -1172,10 +1211,12 @@ + + @@ -1193,6 +1234,7 @@ + @@ -1226,6 +1268,8 @@ + + @@ -1251,11 +1295,14 @@ + + + @@ -1282,6 +1329,7 @@ + @@ -1313,8 +1361,13 @@ + + + + + @@ -1325,6 +1378,7 @@ + @@ -1391,6 +1445,7 @@ + @@ -1400,6 +1455,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - extras/source
extras/source/autocorr/lang/ca/DocumentList.xml | 70 +--- 1 file changed, 63 insertions(+), 7 deletions(-) New commits: commit da671e946dd938a249d0e428f4e017d7d32460d5 Author: Christian Lohmaier Date: Tue Feb 28 15:22:34 2017 +0100 update emoji autocorrect files from po-files Change-Id: Ib837a679e359ac7f7c1e22f57cdfc0fddbdee931 (cherry picked from commit e5b616bc22bf66c78939258e8b7e4fa457ebff9b) diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index 6225ff6..38a1bf7 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -358,7 +358,6 @@ - @@ -443,11 +442,13 @@ + + @@ -460,6 +461,7 @@ + @@ -511,7 +513,7 @@ - + @@ -594,10 +596,12 @@ + + @@ -646,18 +650,17 @@ - - - + + @@ -665,17 +668,25 @@ + + + + + + + + @@ -696,6 +707,7 @@ + @@ -705,6 +717,7 @@ + @@ -712,11 +725,13 @@ + + @@ -734,6 +749,7 @@ + @@ -757,6 +773,8 @@ + + @@ -820,6 +838,7 @@ + @@ -844,6 +863,7 @@ + @@ -861,6 +881,7 @@ + @@ -873,6 +894,7 @@ + @@ -898,6 +920,7 @@ + @@ -942,6 +965,7 @@ + @@ -962,11 +986,14 @@ + - + + + @@ -986,7 +1013,7 @@ - + @@ -1023,7 +1050,10 @@ + + + @@ -1042,6 +1072,7 @@ + @@ -1053,6 +1084,7 @@ + @@ -1064,17 +1096,20 @@ + + + @@ -1084,10 +1119,12 @@ + + @@ -1149,6 +1186,8 @@ + + @@ -1172,10 +1211,12 @@ + + @@ -1193,6 +1234,7 @@ + @@ -1226,6 +1268,8 @@ + + @@ -1251,11 +1295,14 @@ + + + @@ -1282,6 +1329,7 @@ + @@ -1313,8 +1361,13 @@ + + + + + @@ -1325,6 +1378,7 @@ + @@ -1391,6 +1445,7 @@ + @@ -1400,6 +1455,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/ca/DocumentList.xml | 70 +--- 1 file changed, 63 insertions(+), 7 deletions(-) New commits: commit e5b616bc22bf66c78939258e8b7e4fa457ebff9b Author: Christian Lohmaier Date: Tue Feb 28 15:22:34 2017 +0100 update emoji autocorrect files from po-files Change-Id: Ib837a679e359ac7f7c1e22f57cdfc0fddbdee931 diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index 6225ff6..38a1bf7 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -358,7 +358,6 @@ - @@ -443,11 +442,13 @@ + + @@ -460,6 +461,7 @@ + @@ -511,7 +513,7 @@ - + @@ -594,10 +596,12 @@ + + @@ -646,18 +650,17 @@ - - - + + @@ -665,17 +668,25 @@ + + + + + + + + @@ -696,6 +707,7 @@ + @@ -705,6 +717,7 @@ + @@ -712,11 +725,13 @@ + + @@ -734,6 +749,7 @@ + @@ -757,6 +773,8 @@ + + @@ -820,6 +838,7 @@ + @@ -844,6 +863,7 @@ + @@ -861,6 +881,7 @@ + @@ -873,6 +894,7 @@ + @@ -898,6 +920,7 @@ + @@ -942,6 +965,7 @@ + @@ -962,11 +986,14 @@ + - + + + @@ -986,7 +1013,7 @@ - + @@ -1023,7 +1050,10 @@ + + + @@ -1042,6 +1072,7 @@ + @@ -1053,6 +1084,7 @@ + @@ -1064,17 +1096,20 @@ + + + @@ -1084,10 +1119,12 @@ + + @@ -1149,6 +1186,8 @@ + + @@ -1172,10 +1211,12 @@ + + @@ -1193,6 +1234,7 @@ + @@ -1226,6 +1268,8 @@ + + @@ -1251,11 +1295,14 @@ + + + @@ -1282,6 +1329,7 @@ + @@ -1313,8 +1361,13 @@ + + + + + @@ -1325,6 +1378,7 @@ + @@ -1391,6 +1445,7 @@ + @@ -1400,6 +1455,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-6' - extras/source
extras/source/autocorr/lang/ca/DocumentList.xml |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 67da3e28c75086146e6401fbe28c31a4520c4a43 Author: Christian Lohmaier Date: Tue Feb 28 15:14:49 2017 +0100 update emoji autocorrect files from po-files Change-Id: Id1e9b9a3be789d9478ba617a1785a3510c5e0c24 (cherry picked from commit cb1234d8e72f0f1e688e1cb2565ab8f62abfe10c) diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index 885bc70..e6dc5cd 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -646,9 +646,6 @@ - - - @@ -674,6 +671,9 @@ + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - extras/source
extras/source/autocorr/lang/ca/DocumentList.xml |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit cb1234d8e72f0f1e688e1cb2565ab8f62abfe10c Author: Christian Lohmaier Date: Tue Feb 28 15:14:49 2017 +0100 update emoji autocorrect files from po-files Change-Id: Id1e9b9a3be789d9478ba617a1785a3510c5e0c24 diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index 885bc70..e6dc5cd 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -646,9 +646,6 @@ - - - @@ -674,6 +671,9 @@ + + + ___ 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/lwpdocdata.cxx | 95 ++-- lotuswordpro/source/filter/lwpdocdata.hxx |1 lotuswordpro/source/filter/lwpglobalmgr.cxx | 15 lotuswordpro/source/filter/lwpglobalmgr.hxx |2 4 files changed, 52 insertions(+), 61 deletions(-) New commits: commit 7edc6b9a749953b23ad439671405adf65834d83c Author: Caolán McNamara Date: Tue Feb 28 14:03:54 2017 + fix leak Change-Id: Id6171fbaffda1f0a20d33e9137d68e14c59e6aac diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx index 3155590..67abc7f 100644 --- a/lotuswordpro/source/filter/lwpdocdata.cxx +++ b/lotuswordpro/source/filter/lwpdocdata.cxx @@ -169,126 +169,127 @@ void LwpDocData::Read() for (i = 0;i xEditorAttr(new LwpEditorAttr); //cName -pEditorAttr->cName.Read(m_pObjStrm.get()); +xEditorAttr->cName.Read(m_pObjStrm.get()); //cInitials -pEditorAttr->cInitials.Read(m_pObjStrm.get()); +xEditorAttr->cInitials.Read(m_pObjStrm.get()); //cHiLite -pEditorAttr->cHiLiteColor.Read(m_pObjStrm.get()); +xEditorAttr->cHiLiteColor.Read(m_pObjStrm.get()); //cID -pEditorAttr->nID = m_pObjStrm->QuickReaduInt16(); +xEditorAttr->nID = m_pObjStrm->QuickReaduInt16(); //cInsFontOver //CFontAttributeOverride --cAttrBits -pEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrBits = m_pObjStrm->QuickReaduInt16(); +xEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrBits = m_pObjStrm->QuickReaduInt16(); //CFontAttributeOverride --cAttrOverrideBits -pEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrOverrideBits = m_pObjStrm->QuickReaduInt16(); +xEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrOverrideBits = m_pObjStrm->QuickReaduInt16(); //CFontAttributeOverride --cAttrApplyBits -pEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrApplyBits = m_pObjStrm->QuickReaduInt16(); +xEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrApplyBits = m_pObjStrm->QuickReaduInt16(); //CFontAttributeOverride --cAttrOverrideBits2 -pEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrOverrideBits2 = m_pObjStrm->QuickReaduInt8(); +xEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrOverrideBits2 = m_pObjStrm->QuickReaduInt8(); //CFontAttributeOverride --cAttrApplyBits2 -pEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrApplyBits2 = m_pObjStrm->QuickReaduInt8(); +xEditorAttr->cInsFontOver.cFontAttributeOverride.cAttrApplyBits2 = m_pObjStrm->QuickReaduInt8(); //CFontAttributeOverride --cCase -pEditorAttr->cInsFontOver.cFontAttributeOverride.cCase = m_pObjStrm->QuickReaduInt8(); +xEditorAttr->cInsFontOver.cFontAttributeOverride.cCase = m_pObjStrm->QuickReaduInt8(); //CFontAttributeOverride --cUnder -pEditorAttr->cInsFontOver.cFontAttributeOverride.cUnder = m_pObjStrm->QuickReaduInt8(); +xEditorAttr->cInsFontOver.cFontAttributeOverride.cUnder = m_pObjStrm->QuickReaduInt8(); m_pObjStrm->SkipExtra(); //CFontDescriptionOverrideBase--cOverrideBits -pEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cOverrideBits = m_pObjStrm->QuickReaduInt8(); +xEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cOverrideBits = m_pObjStrm->QuickReaduInt8(); //CFontDescriptionOverrideBase--cApplyBits -pEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cApplyBits = m_pObjStrm->QuickReaduInt8(); +xEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cApplyBits = m_pObjStrm->QuickReaduInt8(); //CFontDescriptionOverrideBase--cPointSize -pEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cPointSize = m_pObjStrm->QuickReadInt32(); +xEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cPointSize = m_pObjStrm->QuickReadInt32(); //CFontDescriptionOverrideBase--cOverstrike -pEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cOverstrike = m_pObjStrm->QuickReaduInt8(); +xEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cOverstrike = m_pObjStrm->QuickReaduInt8(); //CFontDescriptionOverrideBase--cTightness -pEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cTightness = m_pObjStrm->QuickReaduInt16(); +xEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cTightness = m_pObjStrm->QuickReaduInt16(); //CFontDescriptionOverrideBase--cColor - pEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cColor.Read(m_pObjStrm.get()); + xEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cColor.Read(m_pObjStrm.get()); //CFontDescriptionOverrideBase--cBackgroundColor - pEditorAttr->cInsFontOver.cFontDescriptionOverrideBase.cBackgroundColor.Read(m_pObjStrm.get()); + xEditorAttr-
[Libreoffice-commits] translations.git: source/am source/ar source/bg source/br source/ca source/cs source/de source/en-GB source/es source/fi source/fr source/gd source/gl source/he source/hr source/
source/am/helpcontent2/source/text/sbasic/shared.po |8 source/am/helpcontent2/source/text/scalc/01.po | 69 source/am/helpcontent2/source/text/scalc/05.po |8 source/am/helpcontent2/source/text/shared/01.po | 10 source/am/helpcontent2/source/text/shared/autopi.po |8 source/am/helpcontent2/source/text/shared/guide.po |6 source/am/helpcontent2/source/text/shared/optionen.po | 16 source/am/helpcontent2/source/text/smath/01.po | 20 source/am/helpcontent2/source/text/swriter/01.po| 14 source/am/helpcontent2/source/text/swriter/guide.po |6 source/am/officecfg/registry/data/org/openoffice/Office/UI.po |7 source/am/sc/source/ui/src.po | 10 source/am/sc/uiconfig/scalc/ui.po |9 source/am/scaddins/source/pricing.po|6 source/am/svx/uiconfig/ui.po|6 source/ar/cui/source/options.po |8 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po | 157 - source/ar/sw/uiconfig/swriter/ui.po |8 source/bg/sc/uiconfig/scalc/ui.po | 12 source/br/avmedia/source/framework.po | 12 source/br/basctl/source/basicide.po | 16 source/br/chart2/uiconfig/ui.po | 28 source/br/cui/source/dialogs.po | 12 source/br/dbaccess/source/ui/app.po | 10 source/br/dbaccess/source/ui/querydesign.po | 14 source/br/dbaccess/source/ui/tabledesign.po |9 source/br/desktop/uiconfig/ui.po| 18 source/br/extras/source/autocorr/emoji.po | 32 source/br/filter/source/config/fragments/filters.po | 16 source/br/filter/source/config/fragments/internalgraphicfilters.po | 12 source/br/filter/uiconfig/ui.po | 10 source/br/forms/source/resource.po | 10 source/br/formula/source/core/resource.po |8 source/br/formula/uiconfig/ui.po| 12 source/br/fpicker/uiconfig/ui.po| 12 source/br/framework/source/classes.po | 10 source/br/instsetoo_native/inc_openoffice/windows/msi_languages.po | 22 source/br/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po | 10 source/br/reportdesign/source/ui/inspection.po | 38 source/br/sc/uiconfig/scalc/ui.po | 13 source/br/scp2/source/ooo.po| 16 source/br/sd/uiconfig/simpress/ui.po| 10 source/br/starmath/source.po| 28 source/br/uui/uiconfig/ui.po| 10 source/br/vcl/source/src.po | 16 source/br/xmlsecurity/uiconfig/ui.po| 12 source/ca/extras/source/autocorr/emoji.po | 130 - source/ca/helpcontent2/source/text/shared/01.po |8 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po | 232 +- source/ca/sc/source/ui/dbgui.po |8 source/ca/sc/source/ui/navipi.po|8 source/ca/sc/source/ui/src.po | 16 source/ca/sc/uiconfig/scalc/ui.po | 130 - source/ca/sd/source/ui/animations.po| 38 source/ca/sd/uiconfig/sdraw/ui.po | 14 source/ca/sd/uiconfig/simpress/ui.po| 48 source/ca/svx/source/dialog.po | 10 source/ca/svx/source/src.po |8 source/ca/svx/source/stbctrls.po|8 source/ca/svx/source/tbxctrls.po|6 source/ca/svx/uiconfig/ui.po| 55 source/ca/sw/source/uibase/utlui.po
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 696f5cfed55fa7ed6e453da7f35d9ada718a1fde Author: Christian Lohmaier Date: Tue Feb 28 13:56:50 2017 +0100 Updated core Project: translations 2883419ce5b0406a375cea7774ab6918e27efd8f update translations for 5.3.1 rc2 and force-fix errors using pocheck Change-Id: I37d9df9e5daf10adc8baf905bb43c621c37d960e (cherry picked from commit 05788c2f5a2a282905055c813b3b3504a25938c3) diff --git a/translations b/translations index 9f55d56..2883419 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 9f55d56ddd0b479429a4d75b596387ace58c2c3b +Subproject commit 2883419ce5b0406a375cea7774ab6918e27efd8f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-3-1' - 2 commits - source/am source/ar source/bg source/br source/ca source/cs source/de source/en-GB source/es source/fi source/fr source
source/am/helpcontent2/source/text/sbasic/shared.po |8 source/am/helpcontent2/source/text/scalc/01.po | 69 source/am/helpcontent2/source/text/scalc/05.po |8 source/am/helpcontent2/source/text/shared/01.po | 10 source/am/helpcontent2/source/text/shared/autopi.po |8 source/am/helpcontent2/source/text/shared/guide.po |6 source/am/helpcontent2/source/text/shared/optionen.po | 16 source/am/helpcontent2/source/text/smath/01.po | 20 source/am/helpcontent2/source/text/swriter/01.po| 14 source/am/helpcontent2/source/text/swriter/guide.po |6 source/am/officecfg/registry/data/org/openoffice/Office/UI.po |7 source/am/sc/source/ui/src.po | 10 source/am/sc/uiconfig/scalc/ui.po |9 source/am/scaddins/source/pricing.po|6 source/am/svx/uiconfig/ui.po|6 source/ar/cui/source/options.po |8 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po | 157 - source/ar/sw/uiconfig/swriter/ui.po |8 source/bg/sc/uiconfig/scalc/ui.po | 12 source/br/avmedia/source/framework.po | 12 source/br/basctl/source/basicide.po | 16 source/br/chart2/uiconfig/ui.po | 28 source/br/cui/source/dialogs.po | 12 source/br/dbaccess/source/ui/app.po | 10 source/br/dbaccess/source/ui/querydesign.po | 14 source/br/dbaccess/source/ui/tabledesign.po |9 source/br/desktop/uiconfig/ui.po| 18 source/br/extras/source/autocorr/emoji.po | 32 source/br/filter/source/config/fragments/filters.po | 16 source/br/filter/source/config/fragments/internalgraphicfilters.po | 12 source/br/filter/uiconfig/ui.po | 10 source/br/forms/source/resource.po | 10 source/br/formula/source/core/resource.po |8 source/br/formula/uiconfig/ui.po| 12 source/br/fpicker/uiconfig/ui.po| 12 source/br/framework/source/classes.po | 10 source/br/instsetoo_native/inc_openoffice/windows/msi_languages.po | 22 source/br/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po | 10 source/br/reportdesign/source/ui/inspection.po | 38 source/br/sc/uiconfig/scalc/ui.po | 13 source/br/scp2/source/ooo.po| 16 source/br/sd/uiconfig/simpress/ui.po| 10 source/br/starmath/source.po| 28 source/br/uui/uiconfig/ui.po| 10 source/br/vcl/source/src.po | 16 source/br/xmlsecurity/uiconfig/ui.po| 12 source/ca/extras/source/autocorr/emoji.po | 130 - source/ca/helpcontent2/source/text/shared/01.po |8 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po | 232 +- source/ca/sc/source/ui/dbgui.po |8 source/ca/sc/source/ui/navipi.po|8 source/ca/sc/source/ui/src.po | 16 source/ca/sc/uiconfig/scalc/ui.po | 130 - source/ca/sd/source/ui/animations.po| 38 source/ca/sd/uiconfig/sdraw/ui.po | 14 source/ca/sd/uiconfig/simpress/ui.po| 48 source/ca/svx/source/dialog.po | 10 source/ca/svx/source/src.po |8 source/ca/svx/source/stbctrls.po|8 source/ca/svx/source/tbxctrls.po|6 source/ca/svx/uiconfig/ui.po| 55 source/ca/sw/source/uibase/utlui.po
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3ed87e151388468ed531d1a80b4f35729f569164 Author: Christian Lohmaier Date: Tue Feb 28 13:56:50 2017 +0100 Updated core Project: translations 48f61d5f411544af0e6797bdf5552216a8b69d0e update translations for 5.3.1 rc2 and force-fix errors using pocheck Change-Id: I37d9df9e5daf10adc8baf905bb43c621c37d960e (cherry picked from commit 05788c2f5a2a282905055c813b3b3504a25938c3) diff --git a/translations b/translations index ac04c9b..48f61d5 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ac04c9ba6cc35f75ab246739b6ee3fbb640ec78d +Subproject commit 48f61d5f411544af0e6797bdf5552216a8b69d0e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3936e1d021867e666ab8f75218fa3a02b52c8c2e Author: Christian Lohmaier Date: Tue Feb 28 13:56:50 2017 +0100 Updated core Project: translations 05788c2f5a2a282905055c813b3b3504a25938c3 update translations for 5.3.1 rc2 and force-fix errors using pocheck Change-Id: I37d9df9e5daf10adc8baf905bb43c621c37d960e diff --git a/translations b/translations index 6374c7e..05788c2 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 6374c7e5df4654df346aea70692605c372d030cb +Subproject commit 05788c2f5a2a282905055c813b3b3504a25938c3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-3' - source/am source/ar source/bg source/br source/ca source/cs source/de source/en-GB source/es source/fi source/fr source/gd source/gl
source/am/helpcontent2/source/text/sbasic/shared.po |8 source/am/helpcontent2/source/text/scalc/01.po | 69 source/am/helpcontent2/source/text/scalc/05.po |8 source/am/helpcontent2/source/text/shared/01.po | 10 source/am/helpcontent2/source/text/shared/autopi.po |8 source/am/helpcontent2/source/text/shared/guide.po |6 source/am/helpcontent2/source/text/shared/optionen.po | 16 source/am/helpcontent2/source/text/smath/01.po | 20 source/am/helpcontent2/source/text/swriter/01.po| 14 source/am/helpcontent2/source/text/swriter/guide.po |6 source/am/officecfg/registry/data/org/openoffice/Office/UI.po |7 source/am/sc/source/ui/src.po | 10 source/am/sc/uiconfig/scalc/ui.po |9 source/am/scaddins/source/pricing.po|6 source/am/svx/uiconfig/ui.po|6 source/ar/cui/source/options.po |8 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po | 157 - source/ar/sw/uiconfig/swriter/ui.po |8 source/bg/sc/uiconfig/scalc/ui.po | 12 source/br/avmedia/source/framework.po | 12 source/br/basctl/source/basicide.po | 16 source/br/chart2/uiconfig/ui.po | 28 source/br/cui/source/dialogs.po | 12 source/br/dbaccess/source/ui/app.po | 10 source/br/dbaccess/source/ui/querydesign.po | 14 source/br/dbaccess/source/ui/tabledesign.po |9 source/br/desktop/uiconfig/ui.po| 18 source/br/extras/source/autocorr/emoji.po | 32 source/br/filter/source/config/fragments/filters.po | 16 source/br/filter/source/config/fragments/internalgraphicfilters.po | 12 source/br/filter/uiconfig/ui.po | 10 source/br/forms/source/resource.po | 10 source/br/formula/source/core/resource.po |8 source/br/formula/uiconfig/ui.po| 12 source/br/fpicker/uiconfig/ui.po| 12 source/br/framework/source/classes.po | 10 source/br/instsetoo_native/inc_openoffice/windows/msi_languages.po | 22 source/br/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po | 10 source/br/reportdesign/source/ui/inspection.po | 38 source/br/sc/uiconfig/scalc/ui.po | 13 source/br/scp2/source/ooo.po| 16 source/br/sd/uiconfig/simpress/ui.po| 10 source/br/starmath/source.po| 28 source/br/uui/uiconfig/ui.po| 10 source/br/vcl/source/src.po | 16 source/br/xmlsecurity/uiconfig/ui.po| 12 source/ca/extras/source/autocorr/emoji.po | 130 - source/ca/helpcontent2/source/text/shared/01.po |8 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po | 232 +- source/ca/sc/source/ui/dbgui.po |8 source/ca/sc/source/ui/navipi.po|8 source/ca/sc/source/ui/src.po | 16 source/ca/sc/uiconfig/scalc/ui.po | 130 - source/ca/sd/source/ui/animations.po| 38 source/ca/sd/uiconfig/sdraw/ui.po | 14 source/ca/sd/uiconfig/simpress/ui.po| 48 source/ca/svx/source/dialog.po | 10 source/ca/svx/source/src.po |8 source/ca/svx/source/stbctrls.po|8 source/ca/svx/source/tbxctrls.po|6 source/ca/svx/uiconfig/ui.po| 55 source/ca/sw/source/uibase/utlui.po
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwptablelayout.cxx | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit def48d5027bc51504acbfc3f190cb93e3870e83c
Author: Caolán McNamara
Date: Tue Feb 28 13:14:51 2017 +
fix leak
Change-Id: Icce163a695ce5467d943019919de1bb604dd130b
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index c9acba7..f690daf 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -712,7 +712,7 @@ void LwpTableLayout::RegisterStyle()
RegisterColumns();
// register style of whole table
-XFTableStyle * pTableStyle = new XFTableStyle();
+std::unique_ptr xTableStyle(new XFTableStyle);
sal_uInt8 nType = pSuper->GetRelativeType();
// If the table is not "with paragraph above" placement, create an frame
style
@@ -721,21 +721,20 @@ void LwpTableLayout::RegisterStyle()
&& (!pSuper->GetContainerLayout().is() ||
!pSuper->GetContainerLayout()->IsCell()) )
{
//with para above
-// pSuper->ApplyBackColor(pTableStyle);
-pSuper->ApplyBackGround(pTableStyle);
-pSuper->ApplyWatermark(pTableStyle);
-pSuper->ApplyShadow(pTableStyle);
-pSuper->ApplyAlignment(pTableStyle);
-pTableStyle->SetWidth(pSuper->GetTableWidth());
+pSuper->ApplyBackGround(xTableStyle.get());
+pSuper->ApplyWatermark(xTableStyle.get());
+pSuper->ApplyShadow(xTableStyle.get());
+pSuper->ApplyAlignment(xTableStyle.get());
+xTableStyle->SetWidth(pSuper->GetTableWidth());
}
else
{
pSuper->RegisterFrameStyle();
-pTableStyle->SetAlign(enumXFAlignCenter);
-pTableStyle->SetWidth(pSuper->GetTableWidth());
+xTableStyle->SetAlign(enumXFAlignCenter);
+xTableStyle->SetWidth(pSuper->GetTableWidth());
}
XFStyleManager* pXFStyleManager =
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
-m_StyleName =
pXFStyleManager->AddStyle(pTableStyle).m_pStyle->GetStyleName();
+m_StyleName =
pXFStyleManager->AddStyle(xTableStyle.release()).m_pStyle->GetStyleName();
//convert to OO table now and register row style
// traverse
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Makefile.am
Makefile.am |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 71b8ebb72d86154e60bd89fca7835e526684f2d7 Author: Andras Timar Date: Tue Feb 28 14:11:41 2017 +0100 do not package loolwsd_fuzzer diff --git a/Makefile.am b/Makefile.am index 23c1055..a7b3251 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = . test loleaflet export ENABLE_DEBUG -bin_PROGRAMS = loolwsd loolforkit loolwsd_fuzzer loolmap loolmount looltool loolstress +bin_PROGRAMS = loolwsd loolforkit loolmap loolmount looltool loolstress dist_bin_SCRIPTS = loolwsd-systemplate-setup @@ -65,7 +65,8 @@ loolwsd_SOURCES = $(loolwsd_sources) \ noinst_PROGRAMS = connect \ lokitclient \ - loolforkit-nocaps + loolforkit-nocaps \ + loolwsd_fuzzer connect_SOURCES = tools/Connect.cpp \ common/Log.cpp \ ___ 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/ipsd/ipsd.cxx | 50 ++
1 file changed, 30 insertions(+), 20 deletions(-)
New commits:
commit 73051d46a62d588db75a73cd392f7e39b3f5bf5b
Author: Caolán McNamara
Date: Tue Feb 28 13:09:07 2017 +
ofz: detect failure earlier
Change-Id: I28be740fb15b3b9ed88d2575c94073c24d53579c
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx
b/filter/source/graphicfilter/ipsd/ipsd.cxx
index a1cd3ab..ccfabf4 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -344,7 +344,7 @@ bool PSDReader::ImplReadBody()
case 1 :
{
signed char nBitCount = -1;
-while ( nY < mpFileHeader->nRows )
+while (nY < mpFileHeader->nRows && m_rPSD.good())
{
if ( nBitCount == -1 )
{
@@ -357,7 +357,8 @@ bool PSDReader::ImplReadBody()
}
if ( nRunCount & 0x80 ) // a run length packet
{
-for ( sal_uInt16 i = 0; i < ( -nRunCount + 1 ); i++ )
+const sal_uInt16 nCount = -nRunCount + 1;
+for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
{
if ( nBitCount == -1 ) // bits left in nDat?
{
@@ -378,7 +379,8 @@ bool PSDReader::ImplReadBody()
}
else// a raw packet
{
-for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 );
i++ )
+const sal_uInt16 nCount = (nRunCount & 0x7f) + 1;
+for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
{
if ( nBitCount == -1 ) // bits left in nDat ?
{
@@ -403,7 +405,7 @@ bool PSDReader::ImplReadBody()
case 8 :
{
-while ( nY < mpFileHeader->nRows )
+while (nY < mpFileHeader->nRows && m_rPSD.good())
{
if ( mbCompression )// else nRunCount = 0 -> so we use
only single raw packets
{
@@ -417,7 +419,8 @@ bool PSDReader::ImplReadBody()
m_rPSD.ReadUChar( nDat );
if ( mpFileHeader->nDepth == 16 ) // 16 bit depth is to
be skipped
m_rPSD.ReadUChar( nDummy );
-for ( sal_uInt16 i = 0; i < ( -nRunCount + 1 ); i++ )
+const sal_uInt16 nCount = -nRunCount + 1;
+for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
{
mpWriteAcc->SetPixelIndex( nY, nX, nDat );
if ( ++nX == mpFileHeader->nColumns )
@@ -431,7 +434,8 @@ bool PSDReader::ImplReadBody()
}
else// a raw packet
{
-for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 );
i++ )
+const sal_uInt16 nCount = (nRunCount & 0x7f) + 1;
+for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
{
m_rPSD.ReadUChar( nDat );
if ( mpFileHeader->nDepth == 16 ) // 16 bit depth is
to be skipped
@@ -456,7 +460,7 @@ bool PSDReader::ImplReadBody()
// the psd format is in plain order ( ) so we have to
set each pixel three times
// maybe the format is
-while ( nY < mpFileHeader->nRows )
+while (nY < mpFileHeader->nRows && m_rPSD.good())
{
if ( mbCompression )// else nRunCount = 0 -> so we use
only single raw packets
{
@@ -465,13 +469,13 @@ bool PSDReader::ImplReadBody()
nRunCount = nTmp;
}
-
if ( nRunCount & 0x80 ) // a run length packet
{
m_rPSD.ReadUChar( nRed );
if ( mpFileHeader->nDepth == 16 ) // 16 bit depth is to
be skipped
m_rPSD.ReadUChar( nDummy );
-for ( sal_uInt16 i = 0; i < ( -nRunCount + 1 ); i++ )
+const sal_uInt16 nCount = -nRunCount + 1;
+for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i)
{
mpWriteAcc->SetPixel( nY, nX, BitmapColor( nRed,
(sal_uInt8)0, (sal_uInt8)0 ) );
if ( ++nX == mpFileHeader->nColumns )
@@ -485,7 +489,8 @@ bool PSDReader::ImplReadBody()
}
else// a raw packet
{
-for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 );
i++ )
+const sal_uInt16 nCount = (nRunCount & 0x7f) + 1;
+for (sal_uInt16
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/shape.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c5b956b9ab70a6e8917abcc4b8ce4d2b9bd8571b
Author: Tor Lillqvist
Date: Tue Feb 28 14:59:17 2017 +0200
Fix incorrect function name in SAL_INFO
Change-Id: I75ee5f1a20fadef7c20103278bc03abd41b815cf
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 9533f4e..e60d487 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -246,7 +246,7 @@ void Shape::addShape(
const awt::Rectangle* pShapeRect,
ShapeIdMap* pShapeMap )
{
-SAL_INFO("oox.drawingml", "Shape::getShapeStyleRef: id='" << msId << "'");
+SAL_INFO("oox.drawingml", "Shape::addShape: id='" << msId << "'");
try
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/postit.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 041a9b641bac500b7b4bbff1280b9d311ae2dbcb
Author: Eike Rathke
Date: Tue Feb 28 13:47:54 2017 +0100
assert that nullptr captions are not in a list
Change-Id: I0c286891454d290ec4373dbc37e31d65c22c746d
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index e7004e7..b0e736b 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -494,6 +494,8 @@ ScCaptionPtr& ScCaptionPtr::operator=( const ScCaptionPtr&
r )
// Let's find some weird usage.
// Assigning without head doesn't make sense unless it is a nullptr
caption.
assert(r.mpHead || !r.mpCaption);
+// A nullptr caption must not be in a list and thus not have a head.
+assert(!r.mpHead || r.mpCaption);
// Same captions were caught above, so here different heads must be
present.
assert(r.mpHead != mpHead);
@@ -533,7 +535,7 @@ void ScCaptionPtr::removeFromList()
// Use the walk to check consistency on the fly.
assert(pThat->mpHead == mpHead);// all belong to the same
assert(pThat->mpHead || !pThat->mpNext);// next without head is bad
-assert(pThat->mpCaption == nullptr || pThat->mpCaption == mpCaption);
+assert(pThat->mpCaption == mpCaption);
pThat = pThat->mpNext;
#if OSL_DEBUG_LEVEL > 0
++nCount;
@@ -556,7 +558,7 @@ void ScCaptionPtr::removeFromList()
{
assert(pThat->mpHead == mpHead);// all belong to the
same
assert(pThat->mpHead || !pThat->mpNext);// next without head
is bad
-assert(pThat->mpCaption == nullptr || pThat->mpCaption ==
mpCaption);
+assert(pThat->mpCaption == mpCaption);
++nCount;
}
while ((pThat = pThat->mpNext) != nullptr);
___
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/lwpfoundry.cxx | 23 +++
lotuswordpro/source/filter/lwpfoundry.hxx | 14 +++---
2 files changed, 14 insertions(+), 23 deletions(-)
New commits:
commit 214ef61b37c7e05414fa975bd21643220f2d4140
Author: Caolán McNamara
Date: Tue Feb 28 12:42:41 2017 +
fix leak
Change-Id: Id501339e1576277655c53e0cf0d172947640d64e
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx
b/lotuswordpro/source/filter/lwpfoundry.cxx
index 6591db0..6c22b93 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -72,28 +72,20 @@
#include "xfilter/xfstylemanager.hxx"
#include "lwplayout.hxx"
-
#include
-
LwpFoundry::LwpFoundry(LwpObjectStream *pStrm, LwpDocument* pDoc)
: m_pDoc(pDoc)
, m_bRegisteredAll(false)
-, m_pPieceMgr(nullptr)
-, m_pStyleMgr(nullptr)
{
Read(pStrm);
-m_pDropcapMgr = new LwpDropcapMgr;
-m_pBulletStyleMgr = new LwpBulletStyleMgr();
-m_pBulletStyleMgr->SetFoundry(this);
+m_xDropcapMgr.reset(new LwpDropcapMgr);
+m_xBulletStyleMgr.reset(new LwpBulletStyleMgr);
+m_xBulletStyleMgr->SetFoundry(this);
}
LwpFoundry::~LwpFoundry()
{
-delete m_pPieceMgr;
-delete m_pStyleMgr;
-delete m_pDropcapMgr;
-delete m_pBulletStyleMgr;
}
void LwpFoundry::Read(LwpObjectStream *pStrm)
@@ -132,9 +124,8 @@ void LwpFoundry::Read(LwpObjectStream *pStrm)
if (!m_pDoc->IsChildDoc() && LwpFileHeader::m_nFileRevision >= 0x000B)
{
-m_pPieceMgr = new LwpPieceManager();
-
-m_pPieceMgr->Read(pStrm);
+m_xPieceMgr.reset(new LwpPieceManager);
+m_xPieceMgr->Read(pStrm);
}
if( LwpFileHeader::m_nFileRevision >= 0x000B)
@@ -148,8 +139,8 @@ void LwpFoundry::Read(LwpObjectStream *pStrm)
}
pStrm->SkipExtra();
-m_pStyleMgr = new LwpStyleManager();
-m_pStyleMgr->SetFoundry(this);
+m_xStyleMgr.reset(new LwpStyleManager);
+m_xStyleMgr->SetFoundry(this);
}
void LwpFoundry::ReadStyles(LwpObjectStream *pStrm)
diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx
b/lotuswordpro/source/filter/lwpfoundry.hxx
index 72be999..2f2ac1d 100644
--- a/lotuswordpro/source/filter/lwpfoundry.hxx
+++ b/lotuswordpro/source/filter/lwpfoundry.hxx
@@ -240,7 +240,7 @@ private: //file members
LwpContentManager m_ContentMgr;
LwpFontManager m_FontMgr;
-LwpPieceManager* m_pPieceMgr;
+std::unique_ptr m_xPieceMgr;
LwpObjectID m_DftDropCapStyle;
LwpObjectID m_DftHeaderStyle;
@@ -259,16 +259,16 @@ public:
inline LwpNumberManager& GetNumberManager() { return m_NumMgr;}
LwpObjectID * GetDefaultTextStyle() ;
private:
-LwpStyleManager* m_pStyleMgr;
-LwpDropcapMgr* m_pDropcapMgr;
-LwpBulletStyleMgr* m_pBulletStyleMgr;
+std::unique_ptr m_xStyleMgr;
+std::unique_ptr m_xDropcapMgr;
+std::unique_ptr m_xBulletStyleMgr;
public:
-inline LwpStyleManager* GetStyleManager() { return m_pStyleMgr;}
+LwpStyleManager* GetStyleManager() { return m_xStyleMgr.get(); }
LwpBookMark* GetBookMark(LwpObjectID objMarker);
-LwpDropcapMgr* GetDropcapMgr(){return m_pDropcapMgr;}
+LwpDropcapMgr* GetDropcapMgr() { return m_xDropcapMgr.get(); }
LwpContent* EnumContents(LwpContent* pContent);
LwpSection* EnumSections(LwpSection* pSection);
-LwpBulletStyleMgr* GetBulletStyleMgr(){return m_pBulletStyleMgr;}
+LwpBulletStyleMgr* GetBulletStyleMgr() { return m_xBulletStyleMgr.get(); }
LwpObjectID* FindParaStyleByName(const OUString& name);
OUString FindActuralStyleName(const OUString& name);
___
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/lwppagelayout.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 11c92df5e61aba0e37a4b3d6e5aaace084812d71
Author: Caolán McNamara
Date: Tue Feb 28 12:35:50 2017 +
loplugin:subtlezeroinit
Change-Id: I29197c9a4093d904d1f7b990de08fbf8254c168e
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx
b/lotuswordpro/source/filter/lwppagelayout.cxx
index 35d6119..45e1047 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -339,7 +339,7 @@ void LwpPageLayout::RegisterStyle()
OUString pmname = pm1->GetStyleName();
//Add master page
-XFMasterPage* p1 = new XFMasterPage();
+XFMasterPage* p1 = new XFMasterPage;
p1->SetStyleName(GetName().str());
p1->SetPageMaster(pmname);
p1 = static_cast(pXFStyleManager->AddStyle(p1).m_pStyle);
@@ -398,7 +398,7 @@ OUString LwpPageLayout::RegisterEndnoteStyle()
OUString pmname = pm1->GetStyleName();
//Add master page
-XFMasterPage* p1 = new XFMasterPage();
+XFMasterPage* p1 = new XFMasterPage;
p1->SetStyleName("Endnote");
p1->SetPageMaster(pmname);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - hwpfilter/source sfx2/source
hwpfilter/source/hwpfile.cxx |6 ++
sfx2/source/control/unoctitm.cxx |9 +
2 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit b9483aacadf443e57f7708f8db64aeeba4666f2a
Author: Caolán McNamara
Date: Tue Feb 28 12:32:07 2017 +
hwp: avoid low hanging invalid input
Change-Id: I06133d6db14edb9d915c38e4c120a9d0905495dd
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 5f6fe55..0ce3902 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -350,6 +350,12 @@ void HWPFile::TagsRead()
if (!Read4b(_hwpInfo.back_info.size))
return;
+ if (_hwpInfo.back_info.size < 0)
+ {
+_hwpInfo.back_info.size = 0;
+return;
+ }
+
_hwpInfo.back_info.data = new char[(unsigned
int)_hwpInfo.back_info.size];
ReadBlock(_hwpInfo.back_info.data,
_hwpInfo.back_info.size);
commit 727a25090dbb1d3a3a2c33153a12d9c25b4206de
Author: Caolán McNamara
Date: Tue Feb 28 12:04:40 2017 +
might as well move append 'usage' into the msConfigPath from the start
Change-Id: Ie8a15f1a20621ebdd00ab4ed195495e0acd111a5
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 6e99463..2191cd8 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -496,7 +496,10 @@ public:
{
mbIsCollecting = bIsCollecting;
if (mbIsCollecting)
+{
msConfigPath = SvtPathOptions().GetConfigPath();
+msConfigPath += "usage/";
+}
}
};
@@ -515,9 +518,7 @@ void UsageInfo::save()
if (!mbIsCollecting)
return;
-OUString path(msConfigPath);
-path += "usage/";
-osl::Directory::createPath(path);
+osl::Directory::createPath(msConfigPath);
//get system time information.
TimeValue systemTime;
@@ -532,7 +533,7 @@ void UsageInfo::save()
//filename type: usage--MM-DDTHH_MM_SS.csv
OUString filename = "usage-" + OUString::createFromAscii(time) + ".csv";
-path += filename;
+OUString path = msConfigPath + filename;
osl::File file(path);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/mtfrenderer/textaction.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit e4f6db9ec254ece82c55f98767e361ad30b25182
Author: Noel Grandin
Date: Tue Feb 28 13:30:44 2017 +0200
FontDescription.IsVertical is a tristate
found by still in progress "UNO scoped enum" change
Change-Id: I0a21b89e77be165bc96e914017a402cf8724d218
Reviewed-on: https://gerrit.libreoffice.org/34719
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx
b/cppcanvas/source/mtfrenderer/textaction.cxx
index eb95d39..51554a2 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -39,7 +39,6 @@
#include
#include
-
#include
#include "textaction.hxx"
@@ -331,7 +330,7 @@ namespace cppcanvas
if( rSubset.mnSubsetBegin > 0 )
{
::basegfx::B2DHomMatrix aTranslation;
-if(
rOrigTextLayout->getFont()->getFontRequest().FontDescription.IsVertical )
+if(
rOrigTextLayout->getFont()->getFontRequest().FontDescription.IsVertical ==
css::util::TriState_YES )
{
// vertical text -> offset in y direction
aTranslation.translate( 0.0, nMinPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/update/ui/updatecheckui.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 563e56653b725e8f968df60eb25132fd7084461c Author: Stephan Bergmann Date: Tue Feb 28 13:14:03 2017 +0100 loplugin:unoany Change-Id: I57375d39aa2e84e40f2c2eb13e3e942497a78a3e diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 8fc5989..1f40751 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -436,17 +436,17 @@ uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName) uno::Any aRet; if( rPropertyName == PROPERTY_TITLE ) -aRet = uno::makeAny( maBubbleTitle ); +aRet <<= maBubbleTitle; else if( rPropertyName == PROPERTY_TEXT ) -aRet = uno::makeAny( maBubbleText ); +aRet <<= maBubbleText; else if( rPropertyName == PROPERTY_SHOW_BUBBLE ) -aRet = uno::makeAny( mbShowBubble ); +aRet <<= mbShowBubble; else if( rPropertyName == PROPERTY_IMAGE ) -aRet = uno::makeAny( maBubbleImageURL ); +aRet <<= maBubbleImageURL; else if( rPropertyName == PROPERTY_CLICK_HDL ) -aRet = uno::makeAny( mrJob ); +aRet <<= mrJob; else if( rPropertyName == PROPERTY_SHOW_MENUICON ) -aRet = uno::makeAny( mbShowMenuIcon ); +aRet <<= mbShowMenuIcon; else throw beans::UnknownPropertyException(); ___ 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/lwpstory.cxx | 19 +++
lotuswordpro/source/filter/lwpstory.hxx |2 +-
2 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit 06206252f43c388e781f7bf1665604da108f14c8
Author: Caolán McNamara
Date: Tue Feb 28 12:01:29 2017 +
fix leak
Change-Id: I724c6e50392d70acd847c733e09a959c08c8c790
diff --git a/lotuswordpro/source/filter/lwpstory.cxx
b/lotuswordpro/source/filter/lwpstory.cxx
index 3038348..6a700be 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -75,7 +75,6 @@ LwpStory::LwpStory(LwpObjectHeader &objHdr, LwpSvStream*
pStrm)
, m_pTabLayout(nullptr)
, m_bDropcap(false)
, m_pHyperlinkMgr(new LwpHyperlinkMgr)
-, m_pXFContainer(nullptr)
{
}
@@ -141,11 +140,10 @@ void LwpStory::RegisterStyle()
void LwpStory::Parse(IXFStream* pOutputStream)
{
-m_pXFContainer = new XFContentContainer;
-XFConvert(m_pXFContainer);
-m_pXFContainer->ToXml(pOutputStream);
-delete m_pXFContainer;
-m_pXFContainer = nullptr;
+m_xXFContainer.set(new XFContentContainer);
+XFConvert(m_xXFContainer.get());
+m_xXFContainer->ToXml(pOutputStream);
+m_xXFContainer.clear();
}
/**
@@ -392,16 +390,13 @@ void
LwpStory::XFConvertFrameInHeaderFooter(XFContentContainer* pCont)
void LwpStory::AddXFContent(XFContent* pContent)
{
-if(m_pXFContainer)
-m_pXFContainer->Add(pContent);
+if (m_xXFContainer)
+m_xXFContainer->Add(pContent);
}
XFContentContainer* LwpStory::GetXFContent()
{
-if(m_pXFContainer)
-return m_pXFContainer;
-else
-return nullptr;
+return m_xXFContainer.get();
}
LwpPara* LwpStory::GetLastParaOfPreviousStory()
diff --git a/lotuswordpro/source/filter/lwpstory.hxx
b/lotuswordpro/source/filter/lwpstory.hxx
index 39a5b22..f4c421b 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -90,7 +90,7 @@ private:
std::unique_ptr m_pHyperlinkMgr;
OUString m_CurrSectionName;
-XFContentContainer* m_pXFContainer;
+rtl::Reference m_xXFContainer;
protected:
void Read() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-1' - sc/source
sc/source/ui/drawfunc/fuins2.cxx | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 0c6d6106a9914b9de16634ee4f55f14a44344bbc
Author: Eike Rathke
Date: Mon Feb 20 22:26:40 2017 +0100
Resolves: tdf#106089 generate range string with current address convention
This is a combination of 2 commits.
Resolves: tdf#106089 catch legal IllegalArgumentException on bad range
string
... that for example doesn't match the document's current address
convention.
Further work is need to make that actually fly, but at least don't terminate
the application but come up with a default Chart instead where the range
can be
edited.
(cherry picked from commit 0200677891c6d592a12343f0d6f82c569cd7a9e0)
Related: tdf#106089 generate range string with current address convention
... so subsequent parsing actually works.
(cherry picked from commit 3ec3d7ead0f2e47a4e24ba0d6953fea0f49815ed)
47d661d24552104b56827248b4c5e6a6617c5d63
Change-Id: I6cb6400c56c896dac7ab949b8a986c784690dfd3
Reviewed-on: https://gerrit.libreoffice.org/34516
Reviewed-by: Kohei Yoshida
Reviewed-by: Markus Mohrhard
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 41610a0..9a9e132 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -114,7 +114,7 @@ void lcl_ChartInit( const uno::Reference <
embed::XEmbeddedObject >& xObj, ScVie
pDoc->LimitChartArea( nTab1, nCol1,nRow1, nCol2,nRow2 );
ScRange aRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
-aRangeString = aRange.Format(ScRefFlags::RANGE_ABS_3D,
&rScDoc);
+aRangeString = aRange.Format(ScRefFlags::RANGE_ABS_3D,
&rScDoc, rScDoc.GetAddressConvention());
}
}
}
@@ -186,7 +186,20 @@ void lcl_ChartInit( const uno::Reference <
embed::XEmbeddedObject >& xObj, ScVie
aArgs[3] = beans::PropertyValue(
OUString("DataRowSource"), -1,
uno::makeAny( eDataRowSource ),
beans::PropertyState_DIRECT_VALUE );
-xReceiver->setArguments( aArgs );
+
+try
+{
+xReceiver->setArguments( aArgs );
+}
+catch (const lang::IllegalArgumentException& e)
+{
+// Can happen for invalid aRangeString, in which case a Chart
+// will be created nevertheless and the range string can be
+// edited.
+SAL_WARN("sc.ui",
+"lcl_ChartInit - caught IllegalArgumentException with
message \"" << e.Message << "\","
+" might be due to aRangeString: " << aRangeString);
+}
// don't create chart listener here (range may be modified in
chart dialog)
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-1' - sd/source
sd/source/ui/sidebar/SlideBackground.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9e587239f5fb2089549e72d2c99cbc493459d984
Author: Markus Mohrhard
Date: Thu Feb 23 00:32:12 2017 +0100
fix crash in the sidebar code
The check should be for xPanel and not xPanels.
See
http://crashreport.libreoffice.org/stats/signature/sfx2::sidebar::Panel::GetTitleBar()
Change-Id: I745d6d8abbfc68e86ed812460faa551867ddec43
Reviewed-on: https://gerrit.libreoffice.org/34560
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
(cherry picked from commit 0407200401358d3d565438800f55b61fc1a61794)
Reviewed-on: https://gerrit.libreoffice.org/34563
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit ed8b8f59e1a85b455a2f8daebd2c1f6fb59faeaa)
Reviewed-on: https://gerrit.libreoffice.org/34624
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index 71d2541..309185f 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -295,7 +295,7 @@ void SlideBackground::SetPanelTitle( const OUString& rTitle
)
return;
Reference xPanel ( xPanels->getByName("SlideBackgroundPanel"),
uno::UNO_QUERY);
-if ( !xPanels.is() )
+if ( !xPanel.is() )
return;
xPanel->setTitle( rTitle );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - starmath/qa starmath/source
starmath/qa/cppunit/test_starmath.cxx |8 +++
starmath/source/edit.cxx | 36 +-
2 files changed, 18 insertions(+), 26 deletions(-)
New commits:
commit 9168ae9b0463c27a6d5e4b53a9afbc29ba7e07e9
Author: Takeshi Abe
Date: Tue Feb 21 12:48:33 2017 +0900
tdf#106116 "Previous Marker" changes selection only when needed
This fixes a hang caused by repeated Shift+F4. Although it seems
a regression from 2af1f5691e8d64afd5246d245d7876b5a2cd5cd8,
the original code of SmEditWindow::SelPrevMark() had been doomed
due to conditional loop depending on obscure signed/unsigned
conversion.
Change-Id: I61f630eec44b285dc1f1c27097acde4b48ed2991
Reviewed-on: https://gerrit.libreoffice.org/34503
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
(cherry picked from commit 3efdd925e0ae1c080fbef3f1f79865eb6e172c68)
Reviewed-on: https://gerrit.libreoffice.org/34529
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/qa/cppunit/test_starmath.cxx
b/starmath/qa/cppunit/test_starmath.cxx
index 91a14bd..3b7fd55 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -133,6 +133,14 @@ void Test::editMarker()
m_pEditWindow->Delete();
m_pEditWindow->InsertText("b");
+// tdf#106116: should be safe i.e. do nothing
+m_pEditWindow->SelPrevMark();
+auto aSelection = m_pEditWindow->GetSelection();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.nStartPara);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aSelection.nStartPos);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aSelection.nEndPara);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aSelection.nEndPos);
+
m_pEditWindow->Flush();
OUString sFinalText = m_pEditWindow->GetText();
CPPUNIT_ASSERT_MESSAGE("Should be a under b under c", sFinalText ==
sTargetText);
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 2186e99..aae451d 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -867,36 +867,20 @@ void SmEditWindow::SelPrevMark()
if (pEditEngine && pEditView)
{
ESelection eSelection = pEditView->GetSelection();
-sal_Int32 nPos = -1;
+sal_Int32 nPara = eSelection.nStartPara;
sal_Int32 nMax = eSelection.nStartPos;
-OUString aText(pEditEngine->GetText(eSelection.nStartPara));
-OUString aMark("");
-sal_Int32 nCounts = pEditEngine->GetParagraphCount();
-
-do
-{
-sal_Int32 nMarkIndex = aText.indexOf(aMark);
-while ((nMarkIndex < nMax) && (nMarkIndex != -1))
-{
-nPos = nMarkIndex;
-nMarkIndex = aText.indexOf(aMark, nMarkIndex + 1);
-}
-
-if (nPos == -1)
-{
-eSelection.nStartPara--;
-aText = pEditEngine->GetText(eSelection.nStartPara);
-nMax = aText.getLength();
-}
-}
-while ((eSelection.nStartPara < nCounts) &&
-(nPos == -1));
+OUString aText(pEditEngine->GetText(nPara));
+const OUString aMark("");
+sal_Int32 nPos;
-if (nPos != -1)
+while ( (nPos = aText.lastIndexOf(aMark, nMax)) < 0 )
{
-pEditView->SetSelection(ESelection(
-eSelection.nStartPara, nPos, eSelection.nStartPara, nPos + 3));
+if (--nPara < 0)
+return;
+aText = pEditEngine->GetText(nPara);
+nMax = aText.getLength();
}
+pEditView->SetSelection(ESelection(nPara, nPos, nPara, nPos + 3));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - svx/source
svx/source/tbxctrls/PaletteManager.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 5b76c743488b1e206cfe40a5ed087b3a0ceaa1d8
Author: Markus Mohrhard
Date: Fri Feb 24 18:08:39 2017 +0100
prevent crash in PaletteManager
Found by the crashreporter:
http://crashreport.libreoffice.org/stats/signature/PaletteManager::ReloadColorSet(SvxColorValueSet%20&)
Change-Id: I82c5e3f7588615700ec3b5540ac94e331df783bb
Reviewed-on: https://gerrit.libreoffice.org/34627
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
(cherry picked from commit ece3c97ca6c9aaffbf9dd51785ae2f1d4d3e2c9b)
Reviewed-on: https://gerrit.libreoffice.org/34634
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/tbxctrls/PaletteManager.cxx
b/svx/source/tbxctrls/PaletteManager.cxx
index 1dc3a46..bdd9701 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -120,8 +120,6 @@ void PaletteManager::LoadPalettes()
void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet)
{
-SfxObjectShell* pDocSh = SfxObjectShell::Current();
-
if( mnCurrentPalette == 0)
{
rColorSet.Clear();
@@ -138,10 +136,14 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet
&rColorSet)
else if( mnCurrentPalette == mnNumOfPalettes - 1 )
{
// Add doc colors to palette
-std::set aColors = pDocSh->GetDocColors();
-mnColorCount = aColors.size();
-rColorSet.Clear();
-rColorSet.addEntriesForColorSet(aColors, SVX_RESSTR(
RID_SVXSTR_DOC_COLOR_PREFIX ) + " " );
+SfxObjectShell* pDocSh = SfxObjectShell::Current();
+if (pDocSh)
+{
+std::set aColors = pDocSh->GetDocColors();
+mnColorCount = aColors.size();
+rColorSet.Clear();
+rColorSet.addEntriesForColorSet(aColors, SVX_RESSTR(
RID_SVXSTR_DOC_COLOR_PREFIX ) + " " );
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-1' - svx/source
svx/source/sidebar/media/MediaPlaybackPanel.cxx | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit e1001e48385f3af359ec6ee49e77d4e7fda0245a
Author: Markus Mohrhard
Date: Tue Feb 28 02:25:30 2017 +0100
mpMediaItem might be nullptr
This fixes at least two crashes reported through the crashreporter:
http://crashreport.libreoffice.org/stats/signature/avmedia::MediaItem::getTime()
http://crashreport.libreoffice.org/stats/signature/avmedia::MediaItem::getDuration()
Change-Id: I92eeca229fa46921317586d0317e9f00309e793b
Reviewed-on: https://gerrit.libreoffice.org/34710
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
(cherry picked from commit b5987a4148a10e27fe44ecf5d03e697692e07ca9)
Reviewed-on: https://gerrit.libreoffice.org/34712
Reviewed-by: Katarina Behrens
(cherry picked from commit 52b89c4764b68cd56cec68678c8234a8a3d5)
Reviewed-on: https://gerrit.libreoffice.org/34716
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
index 46f7645..f1e744d 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
@@ -118,10 +118,13 @@ void MediaPlaybackPanel::UpdateToolBoxes(MediaItem
aMediaItem)
void MediaPlaybackPanel::Update()
{
-UpdateToolBoxes( *mpMediaItem );
-UpdateTimeSlider( *mpMediaItem );
-UpdateVolumeSlider( *mpMediaItem );
-UpdateTimeField( *mpMediaItem, mpMediaItem->getTime() );
+if (mpMediaItem)
+{
+UpdateToolBoxes( *mpMediaItem );
+UpdateTimeSlider( *mpMediaItem );
+UpdateVolumeSlider( *mpMediaItem );
+UpdateTimeField( *mpMediaItem, mpMediaItem->getTime() );
+}
}
IMPL_LINK_NOARG( MediaPlaybackPanel, VolumeSlideHdl, Slider*, void)
@@ -135,7 +138,10 @@ IMPL_LINK_NOARG( MediaPlaybackPanel, SeekHdl, Slider*,
void)
{
MediaItem aItem(SID_AVMEDIA_TOOLBOX);
aItem.setState( MediaState::Pause );
-aItem.setTime( mpTimeSlider->GetThumbPos() * mpMediaItem->getDuration() /
AVMEDIA_TIME_RANGE);
+double nTime = 0;
+if (mpMediaItem)
+nTime = mpTimeSlider->GetThumbPos() * mpMediaItem->getDuration() /
AVMEDIA_TIME_RANGE;
+aItem.setTime(nTime);
mpBindings->GetDispatcher()->ExecuteList(SID_AVMEDIA_TOOLBOX,
SfxCallMode::RECORD, { &aItem });
mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX);
}
@@ -154,7 +160,7 @@ IMPL_LINK( MediaPlaybackPanel, PlayToolBoxSelectHdl,
ToolBox*, pControl, void)
{
aItem.setState( MediaState::Play );
-if( mpMediaItem->getTime() == mpMediaItem->getDuration() )
+if( !mpMediaItem || (mpMediaItem->getTime() ==
mpMediaItem->getDuration() ))
aItem.setTime( 0.0 );
else
aItem.setTime( mpMediaItem->getTime());
___
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/lwppagelayout.cxx|8 ++---
lotuswordpro/source/filter/xfilter/xfmasterpage.cxx | 29 +---
lotuswordpro/source/filter/xfilter/xfmasterpage.hxx | 13 ++--
3 files changed, 16 insertions(+), 34 deletions(-)
New commits:
commit 36398bb8ba85dea1d16fe86cd78b0da8380fe7ad
Author: Caolán McNamara
Date: Tue Feb 28 11:44:17 2017 +
std::unique_ptr -> rtl::Reference for loplugin:refcounting
Change-Id: I83cccff1f4fb172e1b6aa5c1cfda93de2e4be525
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx
b/lotuswordpro/source/filter/lwppagelayout.cxx
index 4b67421..35d6119 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -872,7 +872,7 @@ void LwpHeaderLayout::ParseWaterMark(XFHeaderStyle *
pHeaderStyle)
void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
{
-std::unique_ptr xHeader(new XFHeader());
+rtl::Reference xHeader(new XFHeader());
rtl::Reference pStory = m_Content.obj();
if(pStory.is())
{
@@ -892,7 +892,7 @@ void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
pChangeMgr->SetHeadFootFribMap(false);
}
-mp1->SetHeader(xHeader.release());
+mp1->SetHeader(xHeader);
}
LwpFooterLayout::LwpFooterLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm )
@@ -1023,7 +1023,7 @@ void LwpFooterLayout::ParseBackColor(XFFooterStyle*
pFooterStyle)
void LwpFooterLayout::RegisterStyle(XFMasterPage* mp1)
{
-std::unique_ptr xFooter(new XFFooter());
+rtl::Reference xFooter(new XFFooter());
rtl::Reference pStory = m_Content.obj(VO_STORY);
//Call the RegisterStyle first to register the styles in footer paras, and
then XFConvert()
if(pStory.is())
@@ -1043,7 +1043,7 @@ void LwpFooterLayout::RegisterStyle(XFMasterPage* mp1)
pChangeMgr->SetHeadFootFribMap(false);
}
-mp1->SetFooter(xFooter.release());
+mp1->SetFooter(xFooter);
}
void LwpFooterLayout::ParseWaterMark(XFFooterStyle * pFooterStyle)
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
index 5fe16aa..96b4b60 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
@@ -63,28 +63,15 @@
#include "xffooter.hxx"
#include "xfheader.hxx"
#include "../lwpglobalmgr.hxx"
-XFMasterPage::XFMasterPage()
-{
-m_pHeader = nullptr;
-m_pFooter = nullptr;
-}
-
-XFMasterPage::~XFMasterPage()
-{
-delete m_pHeader;
-delete m_pFooter;
-}
-voidXFMasterPage::SetHeader(XFHeader *pHeader)
+void XFMasterPage::SetHeader(rtl::Reference& rHeader)
{
-delete m_pHeader;
-m_pHeader = pHeader;
+m_xHeader = rHeader;
}
-voidXFMasterPage::SetFooter(XFFooter *pFooter)
+void XFMasterPage::SetFooter(rtl::Reference& rFooter)
{
-delete m_pFooter;
-m_pFooter = pFooter;
+m_xFooter = rFooter;
}
enumXFStyle XFMasterPage::GetStyleFamily()
@@ -105,10 +92,10 @@ voidXFMasterPage::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( "style:name", m_strStyleName );
pAttrList->AddAttribute( "style:page-master-name", m_strPageMaster );
pStrm->StartElement( "style:master-page" );
-if( m_pHeader )
-m_pHeader->ToXml(pStrm);
-if( m_pFooter )
-m_pFooter->ToXml(pStrm);
+if (m_xHeader)
+m_xHeader->ToXml(pStrm);
+if (m_xFooter)
+m_xFooter->ToXml(pStrm);
pStrm->EndElement( "style:master-page" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
index acd3c00..367e37c 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
@@ -68,16 +68,11 @@ class XFHeader;
class XFMasterPage : public XFStyle
{
public:
-XFMasterPage();
-
-virtual ~XFMasterPage() override;
-
-public:
voidSetPageMaster(const OUString& pm);
-voidSetHeader(XFHeader *pHeader);
+voidSetHeader(rtl::Reference& rHeader);
-voidSetFooter(XFFooter *pFooter);
+voidSetFooter(rtl::Reference& rFooter);
virtual enumXFStyle GetStyleFamily() override;
@@ -85,8 +80,8 @@ public:
private:
OUString m_strPageMaster;
-XFHeader*m_pHeader;
-XFFooter*m_pFooter;
+rtl::Reference m_xHeader;
+rtl::Reference m_xFooter;
};
#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/9058b7075de432c6b135928878b9c93acda660b0/ 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
[Libreoffice-commits] online.git: Changes to 'refs/tags/2.0.4'
Tag '2.0.4' created by Andras Timar at 2017-02-28 10:59 + 2.0.4 Changes since 2.0.3-9: --- 0 files changed --- ___ 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/lwpcelllayout.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit e7c960e233e4a7742a8359f6f4b3ae4a62e069ea
Author: Caolán McNamara
Date: Tue Feb 28 11:33:48 2017 +
fix leak
Change-Id: Ic84035f68075733a6777a7447cb2be092f17a189
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 6d87c39..1858788 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -510,13 +510,13 @@ void LwpCellLayout::RegisterDefaultCell()
for (sal_uInt16 eLoop = enumWholeBorder; eLoop < enumCellBorderTopLimit;
eLoop++)
{
// register cell style
-XFCellStyle *pCellStyle = new XFCellStyle();
+std::unique_ptr xCellStyle(new XFCellStyle());
-ApplyPadding(pCellStyle);
-ApplyBackColor(pCellStyle);
-ApplyWatermark(pCellStyle);
-ApplyFmtStyle(pCellStyle);
-pCellStyle->SetAlignType(enumXFAlignNone, GetVerticalAlignmentType());
+ApplyPadding(xCellStyle.get());
+ApplyBackColor(xCellStyle.get());
+ApplyWatermark(xCellStyle.get());
+ApplyFmtStyle(xCellStyle.get());
+xCellStyle->SetAlignType(enumXFAlignNone, GetVerticalAlignmentType());
XFBorders * pBorders = GetXFBorders();
if (pBorders)
@@ -554,9 +554,9 @@ void LwpCellLayout::RegisterDefaultCell()
default:
assert(false);
}
-pCellStyle->SetBorders(pBorders);
+xCellStyle->SetBorders(pBorders);
}
-m_CellStyleNames[eLoop] =
(pXFStyleManager->AddStyle(pCellStyle)).m_pStyle->GetStyleName();
+m_CellStyleNames[eLoop] =
(pXFStyleManager->AddStyle(xCellStyle.release())).m_pStyle->GetStyleName();
}
}
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - editeng/source
editeng/source/editeng/editview.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 48ad98b36403a04d05f6ed08e541ffbd65995af9
Author: Caolán McNamara
Date: Fri Feb 24 13:57:53 2017 +
Resolves: tdf#106123 store and restore the PaM around the menu Execute
because the loss of focus in the current editeng causes writer annotations
to
save their contents, making the pContent of the current EditMaps invalid
(cherry picked from commit 71a84b69ae30458a941f38869aa994118051a063)
Change-Id: Ic01379291fa66dd58246d33287b18801f5da49c0
Reviewed-on: https://gerrit.libreoffice.org/34613
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 3245004..a246587 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -976,7 +976,18 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel,
LinkGetWindow()->OutputToScreenPixel(
aScreenPos );
aTempRect = pImpEditView->GetWindow()->LogicToPixel(
Rectangle(aScreenPos, aTempRect.GetSize() ));
+//tdf#106123 store and restore the EditPaM around the menu Execute
+//because the loss of focus in the current editeng causes writer
+//annotations to save their contents, making the pContent of the
+//current EditPams invalid
+EPaM aP = pImpEditView->pEditEngine->pImpEditEngine->CreateEPaM(aPaM);
+EPaM aP2 =
pImpEditView->pEditEngine->pImpEditEngine->CreateEPaM(aPaM2);
+
sal_uInt16 nId = aPopupMenu->Execute( pImpEditView->GetWindow(),
aTempRect, PopupMenuFlags::NoMouseUpClose );
+
+aPaM2 = pImpEditView->pEditEngine->pImpEditEngine->CreateEditPaM(aP2);
+aPaM = pImpEditView->pEditEngine->pImpEditEngine->CreateEditPaM(aP);
+
if ( nId == MN_IGNORE )
{
OUString aWord = pImpEditView->SpellIgnoreWord();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source
sw/source/uibase/utlui/content.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4024318a1d656388f3417a0f74794ccf05b3509a
Author: Caolán McNamara
Date: Thu Feb 23 17:15:04 2017 +
Resolves: tdf#106159 right click + left click with comments in navigator
results in a disposed submenu in the menu, we need to flag with bSubPop4
that we have inserted the submenu into the parent menu to not dispose
it
Change-Id: I5b9711c0bba750c11d64dc175efd452f4bc8f4e5
(cherry picked from commit 58659cbaa8c955b135737bf9d77e4e57813310e5)
Reviewed-on: https://gerrit.libreoffice.org/34590
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index dd8a2bf..ed5cb81 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1240,6 +1240,7 @@ VclPtr SwContentTree::CreateContextMenu()
SwContentType* pType =
static_cast(pEntry->GetUserData());
if ( (pType->GetType() == ContentTypeId::POSTIT) &&
(!m_pActiveShell->GetView().GetDocShell()->IsReadOnly()) && (
pType->GetMemberCount() > 0) )
{
+bSubPop4 = true;
pSubPop4->InsertItem(600, m_sPostItShow );
pSubPop4->InsertItem(601, m_sPostItHide );
pSubPop4->InsertItem(602, m_sPostItDelete );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/unoctitm.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 390b7ffbc9c0fd2a846bb0a60883b450d6124fd8
Author: Caolán McNamara
Date: Tue Feb 28 10:58:25 2017 +
Revert "move append 'usage' into the msConfigPath from the start"
oops
This reverts commit dc1c69a4efe9368a1f4fae4bc11325485bcc0772.
Change-Id: I5fb9016040636fb44d4337567a6b894bfe16f503
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b343c77..6e99463 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -496,10 +496,7 @@ public:
{
mbIsCollecting = bIsCollecting;
if (mbIsCollecting)
-{
msConfigPath = SvtPathOptions().GetConfigPath();
-msConfigPath += "usage/";
-}
}
};
@@ -518,7 +515,9 @@ void UsageInfo::save()
if (!mbIsCollecting)
return;
-osl::Directory::createPath(msConfigPath);
+OUString path(msConfigPath);
+path += "usage/";
+osl::Directory::createPath(path);
//get system time information.
TimeValue systemTime;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - filter/source
filter/source/graphicfilter/itiff/itiff.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 4d31e570f69fd8ec5294ea2aea019b57637bccb9
Author: Caolán McNamara
Date: Thu Feb 23 11:01:00 2017 +
ofz: don't read data that isn't there
Change-Id: I7fdcb78bde8f650c1a57d34177d8993a6d8a0a2f
(cherry picked from commit ee619fb344c7e8f491e09bd256df7f8567af9bef)
improve scoping
Change-Id: Ic79d46da4e322a0f52981c3a3df65f7f0294fdd8
(cherry picked from commit 840ad0a88045021c58644404a099a3678a371020)
make this a little clearer
no logic change intended
Change-Id: Ibfc46d0aba9e220be54270734e0cdfbc123be9a5
(cherry picked from commit 46b1b5dd2a5368663fd56434160fa126f1a54d84)
Reviewed-on: https://gerrit.libreoffice.org/34572
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 96c7f0c..48f985e 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -786,7 +786,7 @@ sal_uLong TIFFReader::GetBits( const sal_uInt8 * pSrc,
sal_uLong nBitsPos, sal_u
bool TIFFReader::ConvertScanline(sal_Int32 nY)
{
-sal_uInt32 nRed, nGreen, nBlue, ns, nVal, nByteCount;
+sal_uInt32 nRed, nGreen, nBlue, ns, nVal;
sal_uInt8 nByteVal;
if ( nDstBitsPerPixel == 24 )
@@ -997,11 +997,18 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
case 1 :
{
+sal_uInt32 nByteCount = nImageWidth >> 3;
+
+sal_uInt32 nBytesNeeded = nByteCount;
+if (nImageWidth & 7)
+++nBytesNeeded;
+if (pt + nBytesNeeded > ptend)
+return false;
+
if ( bByteSwap )
{
sal_Int32 nx = 0;
-nByteCount = ( nImageWidth >> 3 ) + 1;
-while ( --nByteCount )
+while (nByteCount--)
{
nByteVal = *pt++;
pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 );
@@ -1033,8 +1040,7 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
else
{
sal_Int32 nx = 7;
-nByteCount = ( nImageWidth >> 3 ) + 1;
-while ( --nByteCount )
+while (nByteCount--)
{
nByteVal = *pt++;
pAcc->SetPixelIndex( nY, nx, nByteVal & 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source
vcl/source/window/status.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit b192cf7791aa7a218b0657715f4c4ad2adf5bb4d
Author: Jan-Marek Glogowski
Date: Wed Feb 22 17:08:25 2017 +0100
tdf#104482 Force updating progress bar on safe
I don't know why the progress bar on load is handled differently
then on safe. As a workaround, this converts all Flush() calls
to Update() calls, but we should update the UI on safe correctly.
Change-Id: I97d6fc5797d08e9556f7fa7f9f8110aef30b3772
(cherry picked from commit 0b08eacd79a2133a07410dfb99bcc04bb9dd2199)
Reviewed-on: https://gerrit.libreoffice.org/34551
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 5a48fbd..d2adcacf 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1163,7 +1163,7 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const
OUString& rText )
{
Rectangle aRect = ImplGetItemRectPos(nPos);
Invalidate(aRect);
-Flush();
+Update();
}
}
}
@@ -1216,7 +1216,7 @@ void StatusBar::SetItemData( sal_uInt16 nItemId, void*
pNewData )
{
Rectangle aRect = ImplGetItemRectPos(nPos);
Invalidate(aRect, InvalidateFlags::NoErase);
-Flush();
+Update();
}
}
}
@@ -1246,7 +1246,7 @@ void StatusBar::RedrawItem(sal_uInt16 nItemId)
{
Rectangle aRect = ImplGetItemRectPos(nPos);
Invalidate(aRect);
-Flush();
+Update();
}
}
@@ -1338,7 +1338,7 @@ void StatusBar::StartProgressMode( const OUString& rText )
if ( IsReallyVisible() )
{
Invalidate();
-Flush();
+Update();
}
}
@@ -1353,7 +1353,7 @@ void StatusBar::SetProgressValue( sal_uInt16 nNewPercent )
{
bool bNeedErase = ImplGetSVData()->maNWFData.mbProgressNeedsErase;
Invalidate(maPrgsFrameRect, bNeedErase ? InvalidateFlags::NONE :
InvalidateFlags::NoErase);
-Flush();
+Update();
}
mnPercent = nNewPercent;
}
@@ -1368,7 +1368,7 @@ void StatusBar::EndProgressMode()
if ( IsReallyVisible() )
{
Invalidate();
-Flush();
+Update();
}
}
@@ -1385,7 +1385,7 @@ void StatusBar::SetText(const OUString& rText)
{
Invalidate();
Window::SetText(rText);
-Flush();
+Update();
}
}
else if (mbProgressMode)
@@ -1394,7 +1394,7 @@ void StatusBar::SetText(const OUString& rText)
if (IsReallyVisible())
{
Invalidate();
-Flush();
+Update();
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - svx/source
svx/source/tbxctrls/tbcontrl.cxx | 61 +++
1 file changed, 36 insertions(+), 25 deletions(-)
New commits:
commit 14ac9a27ff8ab198d002bafde7923bf2b833254a
Author: Caolán McNamara
Date: Mon Feb 20 21:24:25 2017 +
Resolves: tdf#106099 tweak to restore old behaviour
wrt initial default color if none gets set.
This doesn't fix the various bizarre things in font and replace by formats,
just
restore to its historical initial behaviour
(cherry picked from commit 0fa4efec2e58ecd8d749972f1e8c2a20d1c3a6bc)
Change-Id: I82cc3f05d2f205947a140483537baae882e91530
Reviewed-on: https://gerrit.libreoffice.org/34510
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6e7b8e0..4c93b9b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1477,35 +1477,44 @@ NamedColor SvxColorWindow::GetNoneColor() const
return std::make_pair(aColor, sColorName);
}
-NamedColor SvxColorWindow::GetAutoColor() const
+namespace
{
-Color aColor;
-OUString sColorName;
-switch (theSlotId)
+NamedColor GetAutoColor(sal_uInt16 nSlotId)
{
-case SID_ATTR_CHAR_COLOR_BACKGROUND:
-case SID_BACKGROUND_COLOR:
-case SID_ATTR_CHAR_BACK_COLOR:
-aColor = COL_TRANSPARENT;
-sColorName = SVX_RESSTR(RID_SVXSTR_NOFILL);
-break;
-case SID_AUTHOR_COLOR:
-aColor = COL_TRANSPARENT;
-sColorName = SVX_RESSTR(RID_SVXSTR_BY_AUTHOR);
-break;
-case SID_BMPMASK_COLOR:
-aColor = COL_TRANSPARENT;
-sColorName = SVX_RESSTR(RID_SVXSTR_TRANSPARENT);
-break;
-case SID_ATTR_CHAR_COLOR:
-case SID_ATTR_CHAR_COLOR2:
-case SID_EXTRUSION_3D_COLOR:
-aColor = COL_AUTO;
-sColorName = SVX_RESSTR(RID_SVXSTR_AUTOMATIC);
-break;
+Color aColor;
+OUString sColorName;
+switch (nSlotId)
+{
+case SID_ATTR_CHAR_COLOR_BACKGROUND:
+case SID_BACKGROUND_COLOR:
+case SID_ATTR_CHAR_BACK_COLOR:
+aColor = COL_TRANSPARENT;
+sColorName = SVX_RESSTR(RID_SVXSTR_NOFILL);
+break;
+case SID_AUTHOR_COLOR:
+aColor = COL_TRANSPARENT;
+sColorName = SVX_RESSTR(RID_SVXSTR_BY_AUTHOR);
+break;
+case SID_BMPMASK_COLOR:
+aColor = COL_TRANSPARENT;
+sColorName = SVX_RESSTR(RID_SVXSTR_TRANSPARENT);
+break;
+case SID_ATTR_CHAR_COLOR:
+case SID_ATTR_CHAR_COLOR2:
+case SID_EXTRUSION_3D_COLOR:
+default:
+aColor = COL_AUTO;
+sColorName = SVX_RESSTR(RID_SVXSTR_AUTOMATIC);
+break;
+}
+
+return std::make_pair(aColor, sColorName);
}
+}
-return std::make_pair(aColor, sColorName);
+NamedColor SvxColorWindow::GetAutoColor() const
+{
+return ::GetAutoColor(theSlotId);
}
IMPL_LINK(SvxColorWindow, AutoColorClickHdl, Button*, pButton, void)
@@ -3213,7 +3222,9 @@ SvxColorListBox::SvxColorListBox(vcl::Window* pParent,
WinBits nStyle)
, m_nSlotId(0)
, m_bShowNoneButton(false)
{
+m_aSelectedColor = GetAutoColor(m_nSlotId);
LockWidthRequest();
+ShowPreview(m_aSelectedColor);
m_aPaletteManager.SetColorSelectFunction(m_aColorWrapper);
SetActivateHdl(LINK(this, SvxColorListBox, MenuActivateHdl));
SetNoSelection();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - lotuswordpro/source sfx2/source
lotuswordpro/source/filter/lwppagelayout.cxx |8
sfx2/source/control/unoctitm.cxx |7 ---
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 9fe0c6636f38163936ff65aee2da863a503a4fc7
Author: Caolán McNamara
Date: Tue Feb 28 10:52:22 2017 +
fix leak
Change-Id: I20e665a2b0bfadd44976b1659d85b1828e10311f
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx
b/lotuswordpro/source/filter/lwppagelayout.cxx
index bdb99af..4b67421 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -872,7 +872,7 @@ void LwpHeaderLayout::ParseWaterMark(XFHeaderStyle *
pHeaderStyle)
void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
{
-XFHeader* pHeader = new XFHeader();
+std::unique_ptr xHeader(new XFHeader());
rtl::Reference pStory = m_Content.obj();
if(pStory.is())
{
@@ -887,12 +887,12 @@ void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
//register child layout style for framelayout,
RegisterChildStyle();
//End
-pChangeMgr->SetHeadFootChange(pHeader);
-pStory->DoXFConvert(pHeader);
+pChangeMgr->SetHeadFootChange(xHeader.get());
+pStory->DoXFConvert(xHeader.get());
pChangeMgr->SetHeadFootFribMap(false);
}
-mp1->SetHeader(pHeader);
+mp1->SetHeader(xHeader.release());
}
LwpFooterLayout::LwpFooterLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm )
commit dc1c69a4efe9368a1f4fae4bc11325485bcc0772
Author: Caolán McNamara
Date: Tue Feb 28 10:42:17 2017 +
might as well move append 'usage' into the msConfigPath from the start
Change-Id: Ic3e141d91607f8e34ff4a74cd1ae3276e42934e7
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 6e99463..b343c77 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -496,7 +496,10 @@ public:
{
mbIsCollecting = bIsCollecting;
if (mbIsCollecting)
+{
msConfigPath = SvtPathOptions().GetConfigPath();
+msConfigPath += "usage/";
+}
}
};
@@ -515,9 +518,7 @@ void UsageInfo::save()
if (!mbIsCollecting)
return;
-OUString path(msConfigPath);
-path += "usage/";
-osl::Directory::createPath(path);
+osl::Directory::createPath(msConfigPath);
//get system time information.
TimeValue systemTime;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 42 commits - configmgr/source configure.ac desktop/qa desktop/source distro-configs/CPLinux.conf download.lst external/Module_externa
Makefile.fetch|4 configmgr/source/components.cxx |4 configure.ac | 20 desktop/qa/data/blank_presentation.odp|binary desktop/qa/data/sheets.ods|binary desktop/qa/desktop_lib/test_desktop_lib.cxx | 144 desktop/source/lib/init.cxx | 89 distro-configs/CPLinux.conf |1 download.lst |3 external/Module_external.mk |1 external/more_fonts/ExternalPackage_karla.mk | 19 external/more_fonts/Module_more_fonts.mk |2 external/more_fonts/UnpackedTarball_karla.mk | 14 external/noto_font/ExternalPackage_noto.mk| 230 external/noto_font/Makefile |7 external/noto_font/Module_noto_font.mk| 17 external/noto_font/README |1 external/noto_font/UnpackedTarball_noto.mk| 14 include/LibreOfficeKit/LibreOfficeKit.h |2 include/LibreOfficeKit/LibreOfficeKit.hxx | 13 libreofficekit/README |7 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 52 oox/source/export/drawingml.cxx | 13 readlicense_oo/license/LICENSE| 26 readlicense_oo/license/LICENSE.fodt | 810 - readlicense_oo/license/LICENSE.html |10032 +- sc/qa/unit/tiledrendering/tiledrendering.cxx | 100 sc/source/ui/unoobj/docuno.cxx|2 sc/source/ui/view/gridwin4.cxx| 10 scp2/source/ooo/file_font_ooo.scp |8 scp2/source/ooo/module_hidden_ooo.scp | 14 sd/CppunitTest_sd_tiledrendering.mk |1 sd/inc/Annotation.hxx |4 sd/qa/unit/tiledrendering/data/tdf105502.odp |binary sd/qa/unit/tiledrendering/data/tdf81754.pptx |binary sd/qa/unit/tiledrendering/tiledrendering.cxx | 251 sd/sdi/drviewsh.sdi |5 sd/source/core/annotations/Annotation.cxx | 24 sd/source/filter/html/htmlex.cxx | 16 sd/source/ui/annotations/annotationmanager.cxx| 234 sd/source/ui/annotations/annotationmanagerimpl.hxx|5 sd/source/ui/inc/View.hxx |3 sd/source/ui/inc/unomodel.hxx |2 sd/source/ui/remotecontrol/BluetoothServer.cxx|2 sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx |2 sd/source/ui/unoidl/unomodel.cxx | 50 setup_native/source/packinfo/package_names.txt|1 setup_native/source/packinfo/packinfo_office.txt | 15 sfx2/source/appl/macroloader.cxx | 18 sfx2/source/control/dispatch.cxx |5 sfx2/source/control/unoctitm.cxx |1 svx/sdi/svx.sdi |4 sw/inc/format.hxx |2 sw/inc/ftninfo.hxx|2 sw/inc/lineinfo.hxx |2 sw/inc/ndindex.hxx|2 sw/inc/pagedesc.hxx |2 sw/inc/section.hxx|2 sw/inc/tox.hxx|2 sw/inc/txtatr.hxx |2 sw/inc/unosett.hxx|4 sw/inc/unostyle.hxx |2 sw/inc/usrfld.hxx |2 sw/source/core/inc/frmtool.hxx|8 sw/source/core/layout/frmtool.cxx |6 sw/source/core/text/frmform.cxx |4 sw/source/uibase/uno/unotxdoc.cxx |2 67 files changed, 11700 insertions(+), 646 deletions(-) New commits: commit cf1b71694fc921195b572dd906d71d70b0608044 Author: Katarina Behrens Date: Sun Feb 19 23:58:52 2017 +0100 Run macro:// via LOKit Change-Id: I54d3c734d86d4b44e1dfe1ad7728e2f51cd26d53 Reviewed-on: https://gerrit.libreoffice.org/34538 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit e7729f458409f7fef2b7dab752205e3b230acb65) diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index eb8017e..0f2d41c 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -112,6 +112,7 @@ public: void testCommentsCalc(); void
[Libreoffice-commits] core.git: solenv/CompilerTest_compilerplugins_clang.mk
solenv/CompilerTest_compilerplugins_clang.mk | 12 1 file changed, 12 insertions(+) New commits: commit 061b541e779c44e0345ad88138cf3a72e96e2e86 Author: Stephan Bergmann Date: Tue Feb 28 11:33:10 2017 +0100 Add back tests that got lost ...with 198c41c4fe8be4ce8a6ddab43ae0c5f17a4889ac "new loplugin unoany" Change-Id: Ia4e59356ad8ef3af899209a287ac5326e1389c5e diff --git a/solenv/CompilerTest_compilerplugins_clang.mk b/solenv/CompilerTest_compilerplugins_clang.mk index 212405b..c0d3dcf 100644 --- a/solenv/CompilerTest_compilerplugins_clang.mk +++ b/solenv/CompilerTest_compilerplugins_clang.mk @@ -10,7 +10,19 @@ $(eval $(call gb_CompilerTest_CompilerTest,compilerplugins_clang)) $(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \ +compilerplugins/clang/test/datamembershadow \ +compilerplugins/clang/test/externvar \ +compilerplugins/clang/test/finalprotected \ +compilerplugins/clang/test/passstuffbyref \ +compilerplugins/clang/test/oslendian-1 \ +compilerplugins/clang/test/oslendian-2 \ +compilerplugins/clang/test/oslendian-3 \ +compilerplugins/clang/test/redundantcast \ +compilerplugins/clang/test/salbool \ +compilerplugins/clang/test/stringconstant \ +compilerplugins/clang/test/unnecessaryoverride-dtor \ compilerplugins/clang/test/unoany \ +compilerplugins/clang/test/vclwidgets \ )) $(eval $(call gb_CompilerTest_use_udk_api,compilerplugins_clang)) ___ 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/lwppagelayout.cxx | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 328d26a17b9ea3243ed0ae96384acc08d7fea0c0
Author: Caolán McNamara
Date: Tue Feb 28 10:19:11 2017 +
fix leak
Change-Id: I88e652fa2eab8738d0e1a235cf1a3f9066bfc230
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx
b/lotuswordpro/source/filter/lwppagelayout.cxx
index 4fa01d2..bdb99af 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -754,23 +754,22 @@ void LwpHeaderLayout::Read()
void LwpHeaderLayout::RegisterStyle(XFPageMaster* pm1)
{
-XFHeaderStyle* pHeaderStyle = new XFHeaderStyle();
+std::unique_ptr xHeaderStyle(new XFHeaderStyle());
//Modify page top margin
//page top marging: from top of header to the top edge
double top = GetMarginsValue(MARGIN_TOP);
pm1->SetMargins(-1, -1, top, -1);
-ParseMargins(pHeaderStyle);
-ParseBorder(pHeaderStyle);
-ParseShadow(pHeaderStyle);
-// ParseBackColor(pHeaderStyle);
-ParseBackGround(pHeaderStyle);
+ParseMargins(xHeaderStyle.get());
+ParseBorder(xHeaderStyle.get());
+ParseShadow(xHeaderStyle.get());
+ParseBackGround(xHeaderStyle.get());
-ParseWaterMark(pHeaderStyle);
+ParseWaterMark(xHeaderStyle.get());
//End by
-pm1->SetHeaderStyle(pHeaderStyle);
+pm1->SetHeaderStyle(xHeaderStyle.release());
}
void LwpHeaderLayout::ParseMargins(XFHeaderStyle* ph1)
___
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 |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d3981b3e8c021ee03a2ca7103a73e56cca18df81 Author: Jan Holesovsky Date: Tue Feb 28 11:14:53 2017 +0100 Keep the order that is in the header. Change-Id: I6171668b91e13cbcddf223645333e435cf08cb2a diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 56d70b2..50c51ee 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1056,7 +1056,6 @@ static void doc_destroy(LibreOfficeKitDocument *pThis) static voidlo_destroy (LibreOfficeKit* pThis); static int lo_initialize(LibreOfficeKit* pThis, const char* pInstallPath, const char* pUserProfilePath); static LibreOfficeKitDocument* lo_documentLoad (LibreOfficeKit* pThis, const char* pURL); -static boollo_runMacro (LibreOfficeKit* pThis, const char* pURL); static char * lo_getError (LibreOfficeKit* pThis); static voidlo_freeError (char* pFree); static LibreOfficeKitDocument* lo_documentLoadWithOptions (LibreOfficeKit* pThis, @@ -1071,6 +1070,7 @@ static void lo_setDocumentPassword(LibreOfficeKit* pThis, const char* pURL, const char* pPassword); static char* lo_getVersionInfo(LibreOfficeKit* pThis); +static boollo_runMacro (LibreOfficeKit* pThis, const char* pURL); LibLibreOffice_Impl::LibLibreOffice_Impl() : m_pOfficeClass( gOfficeClass.lock() ) @@ -1085,7 +1085,6 @@ LibLibreOffice_Impl::LibLibreOffice_Impl() m_pOfficeClass->destroy = lo_destroy; m_pOfficeClass->documentLoad = lo_documentLoad; -m_pOfficeClass->runMacro = lo_runMacro; m_pOfficeClass->getError = lo_getError; m_pOfficeClass->freeError = lo_freeError; m_pOfficeClass->documentLoadWithOptions = lo_documentLoadWithOptions; @@ -1094,6 +1093,7 @@ LibLibreOffice_Impl::LibLibreOffice_Impl() m_pOfficeClass->setOptionalFeatures = lo_setOptionalFeatures; m_pOfficeClass->setDocumentPassword = lo_setDocumentPassword; m_pOfficeClass->getVersionInfo = lo_getVersionInfo; +m_pOfficeClass->runMacro = lo_runMacro; gOfficeClass = m_pOfficeClass; } ___ 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/extras/odfexport/data/ooo321_stylepagenumber.odt |binary
sw/qa/extras/odfexport/odfexport.cxx | 31 +
sw/source/core/unocore/unoparagraph.cxx|6 ++-
sw/source/core/unocore/unostyle.cxx|6 ++-
sw/source/filter/xml/xmlimpit.cxx |3 +
5 files changed, 42 insertions(+), 4 deletions(-)
New commits:
commit e7f463cea58fc87e114008a726b4ea7489f36aa9
Author: Michael Stahl
Date: Mon Feb 27 22:13:32 2017 +0100
tdf#77111 sw: add unit test, fix getting PageNumberOffset property
There are 2 places where the style:page-number attribute is handled, in
XMLNumberWithAutoInsteadZeroPropHdl (for paragraphs) and
SvXMLExportItemMapper/SvXMLImportItemMapper (for tables)
Apparently for the paragraph case, 0 was never written to mean "auto",
this happened only for tables (see
7edaf190e2b18fe5dd9b7dd8d8e7e24b2ff26520).
The test reveals that SwXParagraph::Impl::GetSinglePropertyValue_Impl()
was kinda broken by 7d9bb549d498d6beed2c4050c402d09643febdfa, which
converts void values of "short" properties to short(0), wrongly assuming
that the Any contains a long. (Fortunately this is then mapped to
"auto" in XMLNumberWithAutoInsteadZeroPropHdl.)
Change-Id: I3dc6d5533ac96955440b1589f1999d06750101af
diff --git a/sw/qa/extras/odfexport/data/ooo321_stylepagenumber.odt
b/sw/qa/extras/odfexport/data/ooo321_stylepagenumber.odt
new file mode 100644
index 000..aae70e1
Binary files /dev/null and
b/sw/qa/extras/odfexport/data/ooo321_stylepagenumber.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 43aee57..3354ce2 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -548,6 +548,37 @@ DECLARE_ODFEXPORT_TEST(testFdo58949, "fdo58949.docx")
CPPUNIT_ASSERT_EQUAL(true, bool(xNameAccess->hasByName("Obj102")));
}
+DECLARE_ODFEXPORT_TEST(testStylePageNumber, "ooo321_stylepagenumber.odt")
+{
+uno::Reference xTable1(getParagraphOrTable(1));
+// actually no break attribute is written in this case
+//CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE,
getProperty(xTable1, "BreakType"));
+CPPUNIT_ASSERT_EQUAL(OUString("Left Page"), getProperty(xTable1,
"PageDescName"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1), getProperty(xTable1,
"PageNumberOffset"));
+
+uno::Reference xPara1(getParagraphOrTable(2));
+CPPUNIT_ASSERT_EQUAL(OUString("Right Page"), getProperty(xPara1,
"PageDescName"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1), getProperty(xPara1,
"PageNumberOffset"));
+
+// i#114163 tdf#77111: OOo < 3.3 bug, it wrote "auto" as "0" for tables
+uno::Reference xTable0(getParagraphOrTable(3),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Left Page"), getProperty(xTable0,
"PageDescName"));
+CPPUNIT_ASSERT_EQUAL(uno::Any(),
xTable0->getPropertyValue("PageNumberOffset"));
+
+uno::Reference xPara0(getParagraphOrTable(4),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Right Page"), getProperty(xPara0,
"PageDescName"));
+CPPUNIT_ASSERT_EQUAL(uno::Any(),
xPara0->getPropertyValue("PageNumberOffset"));
+
+uno::Reference
xParaStyles(getStyles("ParagraphStyles"), uno::UNO_QUERY);
+uno::Reference
xStyle1(xParaStyles->getByName("stylewithbreak1"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Right Page"),
getProperty(xStyle1, "PageDescName"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1), getProperty(xStyle1,
"PageNumberOffset"));
+
+uno::Reference
xStyle0(xParaStyles->getByName("stylewithbreak0"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("First Page"),
getProperty(xStyle0, "PageDescName"));
+CPPUNIT_ASSERT_EQUAL(uno::Any(),
xStyle0->getPropertyValue("PageNumberOffset"));
+}
+
DECLARE_ODFEXPORT_TEST(testCharacterBorder, "charborder.odt")
{
// Make sure paragraph and character attributes don't interfere
diff --git a/sw/source/core/unocore/unoparagraph.cxx
b/sw/source/core/unocore/unoparagraph.cxx
index c0dc4ae..de10429 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -495,8 +495,10 @@ void SwXParagraph::Impl::GetSinglePropertyValue_Impl(
// since the sfx uInt16 item now exports a sal_Int32, we may have
to fix this here
sal_Int32 nValue(0);
-rAny >>= nValue;
-rAny <<= static_cast< sal_Int16 >(nValue);
+if (rAny >>= nValue)
+{
+rAny <<= static_cast(nValue);
+}
}
// check for needed metric translation
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 6e2c9e0..54eca80 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3989,8 +3989,10 @@ uno::Sequence< uno::Any >
SwXAutoStyle::GetPropertyValues_Impl(
{
[Libreoffice-commits] core.git: desktop/qa desktop/source include/LibreOfficeKit sfx2/source
desktop/qa/desktop_lib/test_desktop_lib.cxx | 15
desktop/source/lib/init.cxx | 88
include/LibreOfficeKit/LibreOfficeKit.h |2
include/LibreOfficeKit/LibreOfficeKit.hxx | 13
sfx2/source/appl/macroloader.cxx| 18 +
5 files changed, 135 insertions(+), 1 deletion(-)
New commits:
commit e7729f458409f7fef2b7dab752205e3b230acb65
Author: Katarina Behrens
Date: Sun Feb 19 23:58:52 2017 +0100
Run macro:// via LOKit
Change-Id: I54d3c734d86d4b44e1dfe1ad7728e2f51cd26d53
Reviewed-on: https://gerrit.libreoffice.org/34538
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 62ec69d..81cbece 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -107,6 +107,7 @@ public:
void testCommentsCalc();
void testCommentsImpress();
void testCommentsCallbacksWriter();
+void testRunMacro();
CPPUNIT_TEST_SUITE(DesktopLOKTest);
CPPUNIT_TEST(testGetStyles);
@@ -145,6 +146,7 @@ public:
CPPUNIT_TEST(testCommentsCalc);
CPPUNIT_TEST(testCommentsImpress);
CPPUNIT_TEST(testCommentsCallbacksWriter);
+CPPUNIT_TEST(testRunMacro);
CPPUNIT_TEST_SUITE_END();
uno::Reference mxComponent;
@@ -2096,6 +2098,19 @@ void DesktopLOKTest::testCommentsCallbacksWriter()
comphelper::LibreOfficeKit::setActive(false);
}
+void DesktopLOKTest::testRunMacro()
+{
+LibLibreOffice_Impl aOffice;
+bool bGoodMacro, bNonExistentMacro;
+
+// Tools macros come pre-installed in system share/basic folder,
+bGoodMacro = aOffice.m_pOfficeClass->runMacro(&aOffice,
OString("macro:///Tools.Debug.ActivateReadOnlyFlag()").getStr());
+CPPUNIT_ASSERT(bGoodMacro);
+
+bNonExistentMacro = aOffice.m_pOfficeClass->runMacro(&aOffice,
OString("macro:///I.Am.Not(There)").getStr());
+CPPUNIT_ASSERT(!bNonExistentMacro);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 61fbc61..56d70b2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -40,6 +40,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -1054,6 +1056,7 @@ static void doc_destroy(LibreOfficeKitDocument *pThis)
static voidlo_destroy (LibreOfficeKit* pThis);
static int lo_initialize(LibreOfficeKit* pThis, const
char* pInstallPath, const char* pUserProfilePath);
static LibreOfficeKitDocument* lo_documentLoad (LibreOfficeKit* pThis, const
char* pURL);
+static boollo_runMacro (LibreOfficeKit* pThis, const
char* pURL);
static char * lo_getError (LibreOfficeKit* pThis);
static voidlo_freeError (char* pFree);
static LibreOfficeKitDocument* lo_documentLoadWithOptions (LibreOfficeKit*
pThis,
@@ -1082,6 +1085,7 @@ LibLibreOffice_Impl::LibLibreOffice_Impl()
m_pOfficeClass->destroy = lo_destroy;
m_pOfficeClass->documentLoad = lo_documentLoad;
+m_pOfficeClass->runMacro = lo_runMacro;
m_pOfficeClass->getError = lo_getError;
m_pOfficeClass->freeError = lo_freeError;
m_pOfficeClass->documentLoadWithOptions = lo_documentLoadWithOptions;
@@ -1211,6 +1215,90 @@ static LibreOfficeKitDocument*
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
return nullptr;
}
+static bool lo_runMacro( LibreOfficeKit* pThis, const char *pURL)
+{
+SolarMutexGuard aGuard;
+
+LibLibreOffice_Impl* pLib = static_cast(pThis);
+
+OUString sURL( pURL, strlen(pURL), RTL_TEXTENCODING_UTF8 );
+if (sURL.isEmpty())
+{
+pLib->maLastExceptionMsg = "Macro to run was not provided.";
+SAL_INFO("lok", "Macro URL is empty");
+return false;
+}
+
+if (!sURL.startsWith("macro://"))
+{
+pLib->maLastExceptionMsg = "This doesn't look like macro URL";
+SAL_INFO("lok", "Macro URL is invalid");
+return false;
+}
+
+pLib->maLastExceptionMsg.clear();
+
+if (!xContext.is())
+{
+pLib->maLastExceptionMsg = "ComponentContext is not available";
+SAL_INFO("lok", "ComponentContext is not available");
+return false;
+}
+
+util::URL aURL;
+aURL.Complete = sURL;
+
+uno::Reference < util::XURLTransformer > xParser(
util::URLTransformer::create( xContext ) );
+
+if( xParser.is() )
+xParser->parseStrict( aURL );
+
+uno::Reference xComponentLoader =
frame::Desktop::create(xContext);
+
+if (!xComponentLoader.is())
+{
+pLib->maLastExceptionMsg = "ComponentLoader is not available";
+SAL_INFO("lok", "ComponentLoader is not available");
+return false;
+}
+
+xFactory = xContext->getSer
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf103931.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|8
writerfilter/source/ooxml/model.xml |1 +
3 files changed, 9 insertions(+)
New commits:
commit 6603947329a7b372a173a3c60e013e532d0bc5cf
Author: Miklos Vajna
Date: Tue Feb 28 09:16:48 2017 +0100
tdf#103931 DOCX import: fix lost section break
When there are multiple sections in a document, every element
triggers a handleLastParagraphInSection() call, and that's how the
previous section is ended and the next one is started if necessary. In
case the section contains no paragraphs at all, the section was lost on
import. Fix this by also calling handleLastParagraphInSection() on
as well.
It's not a problem if there are both and in a section
(which is the usual situation) as only the first call closes the
previous section / starts the next one.
Change-Id: I64f2c403dcb2ceca76d444ab06df3052235d2795
Reviewed-on: https://gerrit.libreoffice.org/34715
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/data/tdf103931.docx
b/sw/qa/extras/ooxmlexport/data/tdf103931.docx
new file mode 100644
index 000..094fe1b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf103931.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 0ffd692..a97ee2f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -231,6 +231,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf106001, "tdf106001.docx")
CPPUNIT_ASSERT_EQUAL( static_cast( 100 ),
getProperty(getRun(getParagraph(1), 1), "CharScaleWidth" ));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf103931, "tdf103931.docx")
+{
+uno::Reference
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference
xTextSections(xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY);
+// This was 2, the last (empty) section of the document was lost on import.
+CPPUNIT_ASSERT_EQUAL(static_cast(3), xTextSections->getCount());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 5312510..771d211 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17822,6 +17822,7 @@
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
