[Libreoffice-commits] core.git: comphelper/source include/comphelper include/oox oox/source
comphelper/source/xml/xmltools.cxx | 14 ++
include/comphelper/xmltools.hxx|2 ++
include/oox/export/drawingml.hxx |2 --
oox/source/export/drawingml.cxx| 19 ++-
oox/source/ole/vbaexport.cxx | 28 +++-
5 files changed, 21 insertions(+), 44 deletions(-)
New commits:
commit c85d8064cb67552e3ddcc73099769af09d7d0edd
Author: Samuel Mehrbrodt
Date: Mon Dec 11 14:38:54 2017 +0100
Move generateGUIDString to comphelper
and remove duplicate method
Change-Id: Ic513a780f3b9b526c3abd0f273ad9c230ffbb373
Reviewed-on: https://gerrit.libreoffice.org/46233
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/comphelper/source/xml/xmltools.cxx
b/comphelper/source/xml/xmltools.cxx
index b1fcc6a5b59a..ace7d2661e3b 100644
--- a/comphelper/source/xml/xmltools.cxx
+++ b/comphelper/source/xml/xmltools.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
using namespace com::sun::star;
@@ -91,6 +92,19 @@ namespace comphelper
return OString(reinterpret_cast(&aChaff[0]),
nLength);
}
+
+OString generateGUIDString()
+{
+sal_uInt8 aSeq[16];
+rtl_createUuid(aSeq, nullptr, true);
+
+char str[39];
+sprintf(str,
"{%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+aSeq[0], aSeq[1], aSeq[2], aSeq[3], aSeq[4], aSeq[5],
aSeq[6], aSeq[7], aSeq[8],
+aSeq[9], aSeq[10], aSeq[11], aSeq[12], aSeq[13], aSeq[14],
aSeq[15]);
+
+return OString(str, SAL_N_ELEMENTS(str));
+}
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/xmltools.hxx b/include/comphelper/xmltools.hxx
index 5f5bec9b94ad..85915ec47f9a 100644
--- a/include/comphelper/xmltools.hxx
+++ b/include/comphelper/xmltools.hxx
@@ -20,6 +20,8 @@ namespace comphelper
namespace xml
{
COMPHELPER_DLLPUBLIC OString makeXMLChaff();
+COMPHELPER_DLLPUBLIC OString generateGUIDString();
+
}
}
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 276e18d0bcc2..69d1d6657fad 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -230,8 +230,6 @@ public:
static void ResetCounters();
-static OString GetUUID();
-
static sal_Unicode SubstituteBullet( sal_Unicode cBulletId,
css::awt::FontDescriptor& rFontDesc );
static sal_uInt32 ColorWithIntensity( sal_uInt32 nColor, sal_uInt32
nIntensity );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index eb19a286e587..f500036e1282 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -76,6 +76,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1757,22 +1758,6 @@ OUString DrawingML::GetFieldValue( const
css::uno::Reference< css::text::XTextRa
return aFieldValue;
}
-OString DrawingML::GetUUID()
-{
-sal_uInt8 aSeq[16];
-rtl_createUuid(aSeq, nullptr, true);
-
-char str[39];
-sprintf(str,
"{%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-aSeq[0], aSeq[1], aSeq[2], aSeq[3],
-aSeq[4], aSeq[5],
-aSeq[6], aSeq[7],
-aSeq[8], aSeq[9],
-aSeq[10], aSeq[11], aSeq[12], aSeq[13], aSeq[14], aSeq[15]);
-
-return OString(str, SAL_N_ELEMENTS(str));
-}
-
void DrawingML::WriteRun( const Reference< XTextRange >& rRun,
bool& rbOverridingCharHeight, sal_Int32&
rnCharHeight)
{
@@ -1822,7 +1807,7 @@ void DrawingML::WriteRun( const Reference< XTextRange >&
rRun,
{
if( bWriteField )
{
-OString sUUID(GetUUID());
+OString sUUID(comphelper::xml::generateGUIDString());
mpFS->startElementNS( XML_a, XML_fld,
XML_id, sUUID.getStr(),
XML_type, OUStringToOString( sFieldValue,
RTL_TEXTENCODING_UTF8 ).getStr(),
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index cd26bf486615..4aeff993b926 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -31,9 +31,8 @@
#include
-#include
-
#include
+#include
#define USE_UTF8_CODEPAGE 0
#if USE_UTF8_CODEPAGE
@@ -88,28 +87,6 @@ OUString createHexStringFromDigit(sal_uInt8 nDigit)
return aString.toAsciiUpperCase();
}
-OUString createGuidStringFromInt(sal_uInt8 const nGuid[16])
-{
-OUStringBuffer aBuffer;
-aBuffer.append('{');
-for(size_t i = 0; i < 16; ++i)
-{
-aBuffer.append(createHexStringFromDigit(nGuid[i]));
-if(i == 3|| i == 5 || i == 7 || i == 9 )
-aBuffer.append('-');
-}
-aBuffer.append('}');
-OUString aString = aBuffer.makeStringAndClear();
-return aString.toAsciiUpperCase();
-}
-
-OUString generateGUIDString()
-
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-4' - scp2/source
scp2/source/ooo/file_font_ooo.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7bb8173c0b1ac0aa1777d23ca4994e9b86486ecd Author: Caolán McNamara Date: Fri Dec 8 10:53:28 2017 + fix mac build wrt fontconfig conf file Change-Id: Ic13ea258773ad68ba295d29078eaf69365f951c9 Reviewed-on: https://gerrit.libreoffice.org/46086 Tested-by: Jenkins Reviewed-by: Christian Lohmaier (cherry picked from commit 9bfe3a3386e643ad90e984ae35b43cd3a9a38c69) Reviewed-on: https://gerrit.libreoffice.org/46227 Reviewed-by: Michael Stahl Reviewed-by: Eike Rathke Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 08ba609ff397..e9207797fbc8 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -69,7 +69,7 @@ STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist") // fontconfig updates to allow proper use of local fonts -#ifdef UNX +#ifdef USING_X11 #ifndef WITHOUT_FONTS File gid_File_FcLocal_Conf Dir = FILELIST_DIR; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ac3d194db5bf32de9b92a0accf7492145e5d6cdd Author: Christian Lohmaier Date: Tue Dec 12 08:24:58 2017 +0100 Updated core Project: translations 28cfef34df86f518e0d03f4d2fd18bfe2916d982 resurrect some translated strings via compendium Change-Id: Id82cede546542d3baba7fba0a89cd5932eeb00b4 diff --git a/translations b/translations index 24c9679f7197..28cfef34df86 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 24c9679f71975ebeb9c8b0922de4ec001883199a +Subproject commit 28cfef34df86f518e0d03f4d2fd18bfe2916d982 ___ 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' - comphelper/source desktop/source include/comphelper include/LibreOfficeKit sc/source
comphelper/source/misc/lok.cxx | 12
desktop/source/lib/init.cxx |2 ++
include/LibreOfficeKit/LibreOfficeKitEnums.h |7 ++-
include/comphelper/lok.hxx |4
sc/source/ui/view/tabview.cxx| 18 +++---
5 files changed, 35 insertions(+), 8 deletions(-)
New commits:
commit 069cf9321be51e7203e336e0e87d8ba7dc9b729e
Author: Marco Cecchetti
Date: Fri Dec 8 16:44:09 2017 +0100
lok: calc: LOK_FEATURE_RANGE_HEADERS
For allowing the client to enable/disable the new range based header
data
Change-Id: I95da8ec3e48137fb75b9b22af3bb1296001ba9ca
Reviewed-on: https://gerrit.libreoffice.org/46095
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index a4f60ac6c565..b8324a4defcd 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -25,6 +25,8 @@ static bool g_bDialogPainting(false);
static bool g_bTiledAnnotations(true);
+static bool g_bRangeHeaders(false);
+
void setActive(bool bActive)
{
g_bActive = bActive;
@@ -75,6 +77,16 @@ bool isTiledAnnotations()
return g_bTiledAnnotations;
}
+void setRangeHeaders(bool bRangeHeaders)
+{
+g_bRangeHeaders = bRangeHeaders;
+}
+
+bool isRangeHeaders()
+{
+return g_bRangeHeaders;
+}
+
static bool g_bLocalRendering(false);
void setLocalRendering(bool bLocalRendering)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 76748a87a317..e339d3a40467 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3379,6 +3379,8 @@ static void lo_setOptionalFeatures(LibreOfficeKit* pThis,
unsigned long long con
comphelper::LibreOfficeKit::setPartInInvalidation(true);
if (features & LOK_FEATURE_NO_TILED_ANNOTATIONS)
comphelper::LibreOfficeKit::setTiledAnnotations(false);
+if (features & LOK_FEATURE_RANGE_HEADERS)
+comphelper::LibreOfficeKit::setRangeHeaders(true);
}
static void lo_setDocumentPassword(LibreOfficeKit* pThis,
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index cf85d7c6b592..f14ce4d36a7a 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -79,7 +79,12 @@ typedef enum
/**
* Turn off tile rendering for annotations
*/
-LOK_FEATURE_NO_TILED_ANNOTATIONS = (1ULL << 3)
+LOK_FEATURE_NO_TILED_ANNOTATIONS = (1ULL << 3),
+
+/**
+ * Enable range based header data
+ */
+LOK_FEATURE_RANGE_HEADERS = (1ULL << 4)
}
LibreOfficeKitOptionalFeatures;
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index 7a293ca70352..c42a740822e0 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -60,6 +60,10 @@ COMPHELPER_DLLPUBLIC void setDialogPainting(bool
bDialogPainting);
COMPHELPER_DLLPUBLIC void setTiledAnnotations(bool bTiledAnnotations);
/// Check if annotations rendering is turned off
COMPHELPER_DLLPUBLIC bool isTiledAnnotations();
+/// Set if we want range based header data
+COMPHELPER_DLLPUBLIC void setRangeHeaders(bool bTiledAnnotations);
+/// Check if range based header data is enabled
+COMPHELPER_DLLPUBLIC bool isRangeHeaders();
// Status indicator handling. Even if in theory there could be several status
indicators active at
// the same time, in practice there is only one at a time, so we don't handle
any identification of
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 8676d1cad5c6..73d8e485196d 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2712,6 +2712,8 @@ OUString ScTabView::getRowColumnHeaders(const Rectangle&
rRectangle)
if (rRectangle.IsEmpty())
return OUString();
+bool bRangeHeaderSupport = comphelper::LibreOfficeKit::isRangeHeaders();
+
rtl::OUStringBuffer aBuffer(256);
aBuffer.append("{ \"commandName\": \".uno:ViewRowColumnHeaders\",\n");
@@ -2769,7 +2771,7 @@ OUString ScTabView::getRowColumnHeaders(const Rectangle&
rRectangle)
const ScOutlineArray* pRowArray = pTable ? &(pTable->GetRowArray()) :
nullptr;
size_t nRowGroupDepth = 0;
std::vector aRowGroupIndexes;
-if (pTable)
+if (bRangeHeaderSupport && pTable)
{
nRowGroupDepth = pRowArray->GetDepth();
lcl_getGroupIndexes(*pRowArray, nStartRow, nEndRow, aRowGroupIndexes);
@@ -2843,13 +2845,13 @@ OUString ScTabView::getRowColumnHeaders(const
Rectangle& rRectangle)
nTotalPixels += nSizePx;
const long nTotalTwips = nTotalPixels * TWIPS_PER_PIXEL;
-if (nRowGroupDepth > 0)
+if (bRangeHeaderSupport && nRowGroupDepth > 0)
{
lcl_createGroupsData(nRow, nEndRow, nSizePx, nTotalTwips,
*pRowArray, aRowGroupIndexes, aRowGroupStartPositions,
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/crashreportui.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 135c160d41e68c8ba4178684cce6fb88b1f57d78 Author: Stephan Bergmann Date: Tue Dec 12 08:20:46 2017 +0100 loplugin:salcall Change-Id: I38be4ffc8e93cdc567fbaaf826ce791fa79bbfaf diff --git a/svx/source/dialog/crashreportui.cxx b/svx/source/dialog/crashreportui.cxx index 1b2acdd308e4..b91aee8dafe9 100644 --- a/svx/source/dialog/crashreportui.cxx +++ b/svx/source/dialog/crashreportui.cxx @@ -75,7 +75,7 @@ css::uno::Any SAL_CALL CrashReportUI::dispatchWithReturnValue(const css::util::U } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_CrashReportUI_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence const &) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/gpgmepp solenv/gbuild xmlsecurity/CppunitTest_xmlsecurity_signing.mk
external/gpgmepp/UnpackedTarball_gpgmepp.mk|1 + external/gpgmepp/asan.patch| 14 ++ solenv/gbuild/CppunitTest.mk |2 +- xmlsecurity/CppunitTest_xmlsecurity_signing.mk |8 4 files changed, 24 insertions(+), 1 deletion(-) New commits: commit d15f042abd5a1093984a0c8380837145f38c4efc Author: Stephan Bergmann Date: Mon Dec 11 17:07:50 2017 +0100 CppunitTest_xmlsecurity_signing failed in sanitizer builds ...because external/gpgmepp spawns /usr/bin/gpgconf (and later on /usr/bin/ggp2, /usr/bin/gpgsm) which all depend on libgpg-error.so.0, so due to CppunitTest's LD_LIBRARY_PATH will pick up instdir/program/libgpg-error.so.0, which fails due to > /usr/bin/gpgconf: symbol lookup error: /data/sbergman/lo-san/core/instdir/program/libgpg-error.so.0: undefined symbol: __asan_option_detect_stack_use_after_return The easiest fix appears to be, when running sanitizers on Linux, to hack gpgmepp's _gpgme_io_spawn to set LD_LIBRARY_PATH back to its original state. (When it was originally unset, it will now be set but null, but that should not make a difference.) This requires EXTRA_ENV_VARS to be set earlier in CppunitTest.mk, so setting LIBO_LD_PATH doesn't use the LD_LIBRARY_PATH value set in gb_CppunitTest_CPPTESTPRECOMMAND. The backtrace of the first, originally failing call to _gpgme_io_spawn during CppunitTest_xmlsecurity_signing: > #0 0x7fffe1f354dc in _gpgme_io_spawn (path=0x1 , argv=0x72fbd4e0, flags=0, fd_list=0x9, atfork=0x4e, atforkvalue=0x72fbd4e0, r_pid=0x72fbd4e0) at posix-io.c:433 > #1 0x7fffe1f41971 in read_gpgconf_dirs (pgmname=0x6110002f8e00 "/usr/bin/gpgconf", components=0) at dirinfo.c:206 > #2 0x7fffe1f3fa29 in get_gpgconf_item (what=12) at dirinfo.c:284 > #3 0x7fffe1f4073e in _gpgme_get_default_gpg_name () at dirinfo.c:370 > #4 0x7fffe1e87093 in engine_get_file_name (proto=GPGME_PROTOCOL_OpenPGP) at engine.c:79 > #5 0x7fffe1e84e89 in gpgme_get_engine_info (info=0x72a06160) at engine.c:230 > #6 0x7fffe1e845ef in gpgme_engine_check_version (proto=GPGME_PROTOCOL_OpenPGP) at engine.c:144 > #7 0x7fffe634e7d9 in GpgME::checkEngine(GpgME::Protocol) (proto=GpgME::OpenPGP) at context.cpp:1610 > #8 0x7fff8df3fd49 in SecurityEnvironmentGpg::SecurityEnvironmentGpg() (this=0x6060005825c0) at xmlsecurity/source/gpg/SecurityEnvironment.cxx:30 > #9 0x7fff8df5755e in SEInitializerGpg::createSecurityContext(rtl::OUString const&) (this=0x606000582560) at xmlsecurity/source/gpg/SEInitializer.cxx:45 > #10 0x7fff8df57bb3 in non-virtual thunk to SEInitializerGpg::createSecurityContext(rtl::OUString const&) () at include/rtl/stringutils.hxx:170 > #11 0x7fffab66de90 in DocumentSignatureManager::init() (this=0x72fbb020) at xmlsecurity/source/helper/documentsignaturemanager.cxx:78 > #12 0x7fffab498504 in DocumentDigitalSignatures::ImplVerifySignatures(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, DocumentSignatureMode) (this=0x6080001aaf20, rxStorage=uno::Reference to (OStorage *) 0x60d0003a4c48, xSignStream=empty uno::Reference, eMode=DocumentSignatureMode::Content) at xmlsecurity/source/component/documentdigitalsignatures.cxx:264 > #13 0x7fffab497f8b in DocumentDigitalSignatures::verifyDocumentContentSignatures(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&) (this=0x6080001aaf20, rxStorage=uno::Reference to (OStorage *) 0x60d0003a4c48, xSignInStream=empty uno::Reference) at xmlsecurity/source/component/documentdigitalsignatures.cxx:127 > #14 0x7fffab49c35b in non-virtual thunk to DocumentDigitalSignatures::verifyDocumentContentSignatures(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&) () at include/cppu/unotype.hxx:136 > #15 0x7fffafc062a3 in SfxObjectShell::ImplAnalyzeSignature(bool, com::sun::star::uno::Reference const&) (this=0x61100021c7c0, bScriptingContent=false, xSigner=empty uno::Reference) at sfx2/source/doc/objserv.cxx:1293 > #16 0x7fffafc074b1 in SfxObjectShell::ImplGetSignatureState(bool) (this=0x61100021c7c0, bScriptingContent=false) at sfx2/source/doc/objserv.cxx:1322 > #17 0x7fffafc0383d in SfxObjectShell::GetDocumentSignatureState() (this=0x61100021c7c0) at sfx2/source/doc/objserv.cxx:1485 > #18 0x7fffafbb323c in SfxObjectShell::CheckForBrokenDocSignatures_Impl() (this=0x61100021c7c0) at sfx2/source/doc/objmisc.cxx:981 > #19 0x7fffafbb2da4 in SfxObjectShell::CheckSecurityOnLoading_Impl() (this=0x61100021c7c0) at sfx2/source/doc/objmisc.cxx:931 > #20 0x7fffafbb95cf in SfxObjectShell::FinishedLoading(SfxLoadedFlags) (this=0x61100021c7c0, nFlags=SfxLoadedFlags::ALL) at sfx2/source/doc/objmisc.cxx:1079 > #21 0x7ff
[Libreoffice-commits] core.git: svtools/source
svtools/source/brwbox/brwbox2.cxx | 15 +++
svtools/source/brwbox/datwin.cxx | 18 ++
svtools/source/brwbox/datwin.hxx |5 ++---
3 files changed, 15 insertions(+), 23 deletions(-)
New commits:
commit de37c379847afcef8ddf3f03f84cca1b61104851
Author: Takeshi Abe
Date: Mon Dec 11 22:28:32 2017 +0900
svtools: Simplify BrowserDataWin with std::unique_ptr
Change-Id: Ib63b60c1f5326cfc1b163164ae5a783ea8ba1919
Reviewed-on: https://gerrit.libreoffice.org/46256
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svtools/source/brwbox/brwbox2.cxx
b/svtools/source/brwbox/brwbox2.cxx
index f1030cd9ec31..8ff0f3e860e5 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star::datatransfer;
@@ -234,7 +235,7 @@ void BrowseBox::ToggleSelection()
bNotToggleSel = true;
// accumulate areas of rows to highlight
-RectangleList aHighlightList;
+std::vector aHighlightList;
long nLastRowInRect = 0; // for the CFront
// don't highlight handle column
@@ -257,20 +258,18 @@ void BrowseBox::ToggleSelection()
Point( nOfsX, (nRow-nTopRow)*GetDataRowHeight() ),
Size( pDataWin->GetSizePixel().Width(), GetDataRowHeight() ) );
if ( aHighlightList.size() && nLastRowInRect == ( nRow - 1 ) )
-aHighlightList[ 0 ]->Union( aAddRect );
+aHighlightList[ 0 ].Union( aAddRect );
else
-aHighlightList.insert( aHighlightList.begin(), new
tools::Rectangle( aAddRect ) );
+aHighlightList.emplace( aHighlightList.begin(), aAddRect );
nLastRowInRect = nRow;
}
// unhighlight the old selection (if any)
-for ( size_t i = aHighlightList.size(); i > 0; )
+while ( !aHighlightList.empty() )
{
-tools::Rectangle *pRect = aHighlightList[ --i ];
-pDataWin->Invalidate( *pRect );
-delete pRect;
+pDataWin->Invalidate( aHighlightList.back() );
+aHighlightList.pop_back();
}
-aHighlightList.clear();
// unhighlight old column selection (if any)
for ( long nColId = pColSel ? pColSel->FirstSelected() :
BROWSER_ENDOFSELECTION;
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 2378e91ed4f5..69d6501a24da 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -214,8 +214,6 @@ void BrowserDataWin::dispose()
{
bInDtor = true;
-for (tools::Rectangle* i : aInvalidRegion)
-delete i;
aInvalidRegion.clear();
pHeaderBar.clear();
pEventWin.clear();
@@ -283,7 +281,7 @@ void BrowserDataWin::Paint(vcl::RenderContext&
rRenderContext, const tools::Rect
{
if (bInPaint)
{
-aInvalidRegion.push_back(new tools::Rectangle(rRect));
+aInvalidRegion.emplace_back(rRect);
return;
}
bInPaint = true;
@@ -293,7 +291,7 @@ void BrowserDataWin::Paint(vcl::RenderContext&
rRenderContext, const tools::Rect
}
else
{
-aInvalidRegion.push_back(new tools::Rectangle(rRect));
+aInvalidRegion.emplace_back(rRect);
}
}
@@ -637,10 +635,8 @@ void BrowserDataWin::SetUpdateMode( bool bMode )
void BrowserDataWin::DoOutstandingInvalidations()
{
-for (tools::Rectangle* i : aInvalidRegion) {
-Control::Invalidate( *i );
-delete i;
-}
+for (auto& rRect : aInvalidRegion)
+Control::Invalidate( rRect );
aInvalidRegion.clear();
}
@@ -649,10 +645,8 @@ void BrowserDataWin::Invalidate( InvalidateFlags nFlags )
{
if ( !GetUpdateMode() )
{
-for (tools::Rectangle* i : aInvalidRegion)
-delete i;
aInvalidRegion.clear();
-aInvalidRegion.push_back( new tools::Rectangle( Point( 0, 0 ),
GetOutputSizePixel() ) );
+aInvalidRegion.emplace_back( Point( 0, 0 ), GetOutputSizePixel() );
}
else
Window::Invalidate( nFlags );
@@ -662,7 +656,7 @@ void BrowserDataWin::Invalidate( InvalidateFlags nFlags )
void BrowserDataWin::Invalidate( const tools::Rectangle& rRect,
InvalidateFlags nFlags )
{
if ( !GetUpdateMode() )
-aInvalidRegion.push_back( new tools::Rectangle( rRect ) );
+aInvalidRegion.emplace_back( rRect );
else
Window::Invalidate( rRect, nFlags );
}
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 81366e31548e..ab8ba930d193 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -25,13 +25,12 @@
#include
#include
#include
+#include
#include
#define MIN_COLUMNWIDTH 2
-typedef ::std::vector< tools::Rectangle* > RectangleList;
-
class ButtonFrame
{
@@ -101,7 +100,7 @@ public:
OUStringaRealRowCount; // to show in VScrollBar
-RectangleList aInvalidRe
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source sw/inc sw/source
include/sfx2/linksrc.hxx |4
sfx2/source/appl/linksrc.cxx |8 -
sw/inc/cellatr.hxx |6 -
sw/inc/grfatr.hxx| 24 ++---
sw/inc/hintids.hxx | 161 +++
sw/source/core/docnode/swbaslnk.cxx |4
sw/source/core/draw/dflyobj.cxx |2
sw/source/core/table/swtable.cxx |4
sw/source/core/undo/rolbck.cxx |3
sw/source/core/unocore/unoframe.cxx |2
sw/source/core/unocore/unomap.cxx|1
sw/source/filter/basflt/fltshell.cxx |2
sw/source/filter/xml/xmlitemm.cxx|1
sw/source/uibase/ribbar/inputwin.cxx |2
sw/source/uibase/shells/frmsh.cxx|2
sw/source/uibase/shells/grfsh.cxx| 54 +--
sw/source/uibase/shells/tabsh.cxx|8 -
17 files changed, 137 insertions(+), 151 deletions(-)
New commits:
commit d905c783e7f20ea1f18600252cd92c02ea7f91f7
Author: Noel Grandin
Date: Mon Dec 11 14:52:04 2017 +0200
TypeWhichId in sw
Change-Id: Ia5654aaf88f13c37f52e3c17d61dd3475641070a
Reviewed-on: https://gerrit.libreoffice.org/46230
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 30027fc64c77..795e03952aeb 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -100,11 +100,11 @@ public:
};
inline const SwTableBoxNumFormat &SwAttrSet::GetTableBoxNumFormat(bool
bInP) const
-{ return static_cast(Get(
RES_BOXATR_FORMAT,bInP)); }
+{ return Get( RES_BOXATR_FORMAT,bInP); }
inline const SwTableBoxFormula&SwAttrSet::GetTableBoxFormula(bool
bInP) const
-{ return static_cast(Get(
RES_BOXATR_FORMULA,bInP)); }
+{ return Get( RES_BOXATR_FORMULA,bInP); }
inline const SwTableBoxValue &SwAttrSet::GetTableBoxValue(bool bInP)
const
-{ return static_cast(Get( RES_BOXATR_VALUE,
bInP)); }
+{ return Get( RES_BOXATR_VALUE, bInP); }
inline const SwTableBoxNumFormat &SwFormat::GetTableBoxNumFormat(bool
bInP) const
{ return m_aSet.GetTableBoxNumFormat(bInP); }
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 306f9a9757fe..175bdcd480e3 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -288,29 +288,29 @@ public:
// Implementation of graphics attributes methods of SwAttr
inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(bool bInP) const
-{ return static_cast(Get( RES_GRFATR_MIRRORGRF,bInP));
}
+{ return Get( RES_GRFATR_MIRRORGRF,bInP); }
inline const SwCropGrf &SwAttrSet::GetCropGrf(bool bInP) const
-{ return static_cast(Get( RES_GRFATR_CROPGRF,bInP)); }
+{ return Get( RES_GRFATR_CROPGRF,bInP); }
inline const SwRotationGrf &SwAttrSet::GetRotationGrf(bool bInP) const
-{ return static_cast(Get(
RES_GRFATR_ROTATION,bInP)); }
+{ return Get( RES_GRFATR_ROTATION,bInP); }
inline const SwLuminanceGrf &SwAttrSet::GetLuminanceGrf(bool bInP) const
-{ return static_cast(Get(
RES_GRFATR_LUMINANCE,bInP)); }
+{ return Get( RES_GRFATR_LUMINANCE,bInP); }
inline const SwContrastGrf &SwAttrSet::GetContrastGrf(bool bInP) const
-{ return static_cast(Get(
RES_GRFATR_CONTRAST,bInP)); }
+{ return Get( RES_GRFATR_CONTRAST,bInP); }
inline const SwChannelRGrf &SwAttrSet::GetChannelRGrf(bool bInP) const
-{ return static_cast(Get(
RES_GRFATR_CHANNELR,bInP)); }
+{ return Get( RES_GRFATR_CHANNELR,bInP); }
inline const SwChannelGGrf &SwAttrSet::GetChannelGGrf(bool bInP) const
-{ return static_cast(Get(
RES_GRFATR_CHANNELG,bInP)); }
+{ return Get( RES_GRFATR_CHANNELG,bInP); }
inline const SwChannelBGrf &SwAttrSet::GetChannelBGrf(bool bInP) const
-{ return static_cast(Get(
RES_GRFATR_CHANNELB,bInP)); }
+{ return Get( RES_GRFATR_CHANNELB,bInP); }
inline const SwGammaGrf &SwAttrSet::GetGammaGrf(bool bInP) const
-{ return static_cast(Get( RES_GRFATR_GAMMA,bInP)); }
+{ return Get( RES_GRFATR_GAMMA,bInP); }
inline const SwInvertGrf &SwAttrSet::GetInvertGrf(bool bInP) const
-{ return static_cast(Get( RES_GRFATR_INVERT,bInP)); }
+{ return Get( RES_GRFATR_INVERT,bInP); }
inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(bool bInP) const
-{ return static_cast(Get(
RES_GRFATR_TRANSPARENCY,bInP)); }
+{ return Get( RES_GRFATR_TRANSPARENCY,bInP); }
inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(bool bInP) const
-{ return static_cast(Get(
RES_GRFATR_DRAWMODE,bInP)); }
+{ return Get( RES_GRFATR_DRAWMODE,bInP); }
#endif // INCLUDED_SW_INC_GRFATR_HXX
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 344478a078ef..c4017211a045 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -229,46 +229,37 @@ RES_FRMATR_BEGIN = RES_PARATR_LIST_END,
RES_FRMATR_END
};
-enum RES_GRFATR
-{
-RES_GRFATR_BEGIN = RES_FRMATR_END,
-RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN,// 130
-RES_GRFATR_CROPGRF, // 131
-
-RES_GRFATR_R
[Libreoffice-commits] core.git: 2 commits - include/tools tools/source
include/tools/inetmsg.hxx | 14 +++---
include/tools/inetstrm.hxx | 10 +-
tools/source/inet/inetmsg.cxx |4 ++--
tools/source/inet/inetstrm.cxx | 18 +-
4 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 5de99031fa31eaf78d92cf5aa8de6cac8f2f8782
Author: Noel Grandin
Date: Mon Dec 11 12:02:35 2017 +0200
sal_IntPtr->sal_uInt32 in INetMIMEMessageStream
Change-Id: I5c57b0bf28a395a0617d1c16ccaeff759915974e
Reviewed-on: https://gerrit.libreoffice.org/46225
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index ba6f6aa14744..f3e7ae325c90 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -43,21 +43,21 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream
bool done;
-sal_uIntPtr nChildIndex;
+sal_uInt32 nChildIndex;
INetMIMEMessageStream *pChildStrm;
INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) = delete;
INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) =
delete;
-int GetHeaderLine(sal_Char *pData, sal_uIntPtr nSize);
-int GetBodyLine(sal_Char *pData, sal_uIntPtr nSize);
-int GetMsgLine(sal_Char *pData, sal_uIntPtr nSize);
+int GetHeaderLine(sal_Char *pData, sal_uInt32 nSize);
+int GetBodyLine(sal_Char *pData, sal_uInt32 nSize);
+int GetMsgLine(sal_Char *pData, sal_uInt32 nSize);
public:
explicit INetMIMEMessageStream(INetMIMEMessage *pMsg, bool
headerGenerated);
~INetMIMEMessageStream();
-int Read (sal_Char *pData, sal_uIntPtr nSize);
+int Read (sal_Char *pData, sal_uInt32 nSize);
};
#endif
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index 73b3afc1e5ac..7949b5f94108 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -28,11 +28,11 @@
#include
#include
-int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uIntPtr nSize)
+int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uInt32 nSize)
{
sal_Char* pWBuf = pData;
-sal_uIntPtr i, n;
+sal_uInt32 i, n;
if (maMsgBuffer.Tell() == 0)
{
@@ -71,7 +71,7 @@ int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData,
sal_uIntPtr nSize)
return (pWBuf - pData);
}
-int INetMIMEMessageStream::GetBodyLine(sal_Char* pData, sal_uIntPtr nSize)
+int INetMIMEMessageStream::GetBodyLine(sal_Char* pData, sal_uInt32 nSize)
{
sal_Char* pWBuf = pData;
sal_Char* pWEnd = pData + nSize;
@@ -81,14 +81,14 @@ int INetMIMEMessageStream::GetBodyLine(sal_Char* pData,
sal_uIntPtr nSize)
if (pMsgStrm == nullptr)
pMsgStrm = new SvStream (pSourceMsg->GetDocumentLB());
-sal_uIntPtr nRead = pMsgStrm->ReadBytes(pWBuf, (pWEnd - pWBuf));
+sal_uInt32 nRead = pMsgStrm->ReadBytes(pWBuf, (pWEnd - pWBuf));
pWBuf += nRead;
}
return (pWBuf - pData);
}
-int INetMIMEMessageStream::GetMsgLine(sal_Char* pData, sal_uIntPtr nSize)
+int INetMIMEMessageStream::GetMsgLine(sal_Char* pData, sal_uInt32 nSize)
{
// Check for header or body.
if (!bHeaderGenerated)
@@ -252,7 +252,7 @@ INetMIMEMessageStream::~INetMIMEMessageStream()
delete pMsgStrm;
}
-int INetMIMEMessageStream::Read(sal_Char* pData, sal_uIntPtr nSize)
+int INetMIMEMessageStream::Read(sal_Char* pData, sal_uInt32 nSize)
{
sal_Char* pWBuf = pData;
sal_Char* pWEnd = pData + nSize;
@@ -260,13 +260,13 @@ int INetMIMEMessageStream::Read(sal_Char* pData,
sal_uIntPtr nSize)
while (pWBuf < pWEnd)
{
// Caller's buffer not yet filled.
-sal_uIntPtr n = pRead - pWrite;
+sal_uInt32 n = pRead - pWrite;
if (n > 0)
{
// Bytes still in buffer.
-sal_uIntPtr m = pWEnd - pWBuf;
+sal_uInt32 m = pWEnd - pWBuf;
if (m < n) n = m;
-for (sal_uIntPtr i = 0; i < n; i++) *pWBuf++ = *pWrite++;
+for (sal_uInt32 i = 0; i < n; i++) *pWBuf++ = *pWrite++;
}
else
{
commit ef5471959f21ebc4599146d672165513d92d344a
Author: Noel Grandin
Date: Mon Dec 11 11:59:04 2017 +0200
sal_uIntPtr->sal_uInt32 in m_nMIMEIndex
Change-Id: I1373f11f07679569ef338178e56ffd269baf3c30
Reviewed-on: https://gerrit.libreoffice.org/46224
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index e1b26dbe43b7..445c3a60922c 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -78,14 +78,14 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC INetMIMEMessage
SvLockBytesRef m_xDocLB;
-::std::map m_nMIMEIndex;
+::std::map m_nMIMEIndex;
INetMIMEMessage* pParent;
::std::vector< std::unique_ptr >
aChildren;
OString
[Libreoffice-commits] core.git: include/tools
include/tools/config.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8772a64f430ab097af7daf8377a6a55a1ecca7d9 Author: Noel Grandin Date: Mon Dec 11 11:46:12 2017 +0200 mnDataUpdateId can be sal_uInt32 Change-Id: Ied469752391afeca365838f83b35e75143b7cf65 Reviewed-on: https://gerrit.libreoffice.org/46223 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/tools/config.hxx b/include/tools/config.hxx index 776799d3f7df..8d1e853d1f07 100644 --- a/include/tools/config.hxx +++ b/include/tools/config.hxx @@ -32,7 +32,7 @@ private: OString maGroupName; ImplConfigData* mpData; ImplGroupData* mpActGroup; -sal_uIntPtr mnDataUpdateId; +sal_uInt32 mnDataUpdateId; sal_uInt16 mnLockCount; TOOLS_DLLPRIVATE bool ImplUpdateConfig() const; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/excel-2003-xml-orcus-filter' - sc/source
sc/source/filter/inc/orcusinterface.hxx | 13 +
sc/source/filter/orcus/interface.cxx| 26 ++
2 files changed, 39 insertions(+)
New commits:
commit cd710d7645d3dfc7b796c961cf3067aed8cc3f99
Author: Kohei Yoshida
Date: Mon Dec 11 21:53:55 2017 -0500
Pick up global named expressions.
Formulas with named expressions don't work yet since they get
imported before the named expressions do. We need to insert formula
cells after the named expressions.
Change-Id: Id2d7c59194ce7c07a3580cc8d9afd9fdda660b24
diff --git a/sc/source/filter/inc/orcusinterface.hxx
b/sc/source/filter/inc/orcusinterface.hxx
index b869e0bc43a4..64c3383708f2 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -76,6 +76,17 @@ public:
orcus::spreadsheet::range_t resolve_range(const char* p, size_t n);
};
+class ScOrcusNamedExpression : public
orcus::spreadsheet::iface::import_named_expression
+{
+ScDocumentImport& mrDoc;
+const ScOrcusGlobalSettings& mrGlobalSettings;
+
+public:
+ScOrcusNamedExpression( ScDocumentImport& rDoc, const
ScOrcusGlobalSettings& rGS );
+
+virtual void define_name(const char* p_name, size_t n_name, const char*
p_exp, size_t n_exp) override;
+};
+
class ScOrcusSharedStrings : public
orcus::spreadsheet::iface::import_shared_strings
{
ScOrcusFactory& mrFactory;
@@ -518,6 +529,7 @@ class ScOrcusFactory : public
orcus::spreadsheet::iface::import_factory
ScOrcusGlobalSettings maGlobalSettings;
ScOrcusRefResolver maRefResolver;
ScOrcusSharedStrings maSharedStrings;
+ScOrcusNamedExpression maNamedExpressions;
std::vector< std::unique_ptr > maSheets;
ScOrcusStyles maStyles;
@@ -534,6 +546,7 @@ public:
virtual orcus::spreadsheet::iface::import_sheet*
get_sheet(orcus::spreadsheet::sheet_t sheet_index) override;
virtual orcus::spreadsheet::iface::import_global_settings*
get_global_settings() override;
virtual orcus::spreadsheet::iface::import_shared_strings*
get_shared_strings() override;
+virtual orcus::spreadsheet::iface::import_named_expression*
get_named_expression() override;
virtual orcus::spreadsheet::iface::import_styles* get_styles() override;
virtual void finalize() override;
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index 87ac4f89d0e8..f57ca97eae65 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -151,6 +151,26 @@ os::range_t ScOrcusRefResolver::resolve_range(const char*
p, size_t n)
return ret;
}
+ScOrcusNamedExpression::ScOrcusNamedExpression(
+ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS ) :
+mrDoc(rDoc), mrGlobalSettings(rGS) {}
+
+void ScOrcusNamedExpression::define_name(const char* p_name, size_t n_name,
const char* p_exp, size_t n_exp)
+{
+OUString aName(p_name, n_name, RTL_TEXTENCODING_UTF8);
+OUString aExpr(p_exp, n_exp, RTL_TEXTENCODING_UTF8);
+
+ScRangeName* pNames = mrDoc.getDoc().GetRangeName();
+if (!pNames)
+return;
+
+ScRangeData* pRange = new ScRangeData(
+&mrDoc.getDoc(), aName, aExpr, ScAddress(), ScRangeData::Type::Name,
+mrGlobalSettings.getCalcGrammar());
+
+pNames->insert(pRange, false);
+}
+
ScOrcusFactory::StringCellCache::StringCellCache(const ScAddress& rPos, size_t
nIndex) :
maPos(rPos), mnIndex(nIndex) {}
@@ -159,6 +179,7 @@ ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) :
maGlobalSettings(maDoc),
maRefResolver(maDoc, maGlobalSettings),
maSharedStrings(*this),
+maNamedExpressions(maDoc, maGlobalSettings),
maStyles(rDoc),
mnProgress(0) {}
@@ -242,6 +263,11 @@ orcus::spreadsheet::iface::import_shared_strings*
ScOrcusFactory::get_shared_str
return &maSharedStrings;
}
+orcus::spreadsheet::iface::import_named_expression*
ScOrcusFactory::get_named_expression()
+{
+return &maNamedExpressions;
+}
+
orcus::spreadsheet::iface::import_styles* ScOrcusFactory::get_styles()
{
return &maStyles;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_consolidationdescriptorobj.mk sc/Module_sc.mk sc/qa test/Library_subsequenttest.
include/test/sheet/xconsolidationdescriptor.hxx |
45 +
qadevOOo/Jar_OOoRunner.mk |
2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScConsolidationDescriptor.csv |
12
qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor.java |
253 --
qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java|
99 ---
sc/CppunitTest_sc_consolidationdescriptorobj.mk |
105
sc/Module_sc.mk |
1
sc/qa/extras/scconsolidationdescriptorobj.cxx |
105
sc/qa/unoapi/sc_3.sce |
1
test/Library_subsequenttest.mk|
1
test/source/sheet/xconsolidationdescriptor.cxx|
144 +
11 files changed, 401 insertions(+), 367 deletions(-)
New commits:
commit 68f7d89cecc74e1df649e0691676178db544f913
Author: Jens Carl
Date: Mon Dec 11 20:26:42 2017 +
tdf#45904 Move _XConsolidationDescriptor Java tests to C++
Change-Id: Ib3e3722c1a4799ebb0cbb78f458abd6b967d6ba1
Reviewed-on: https://gerrit.libreoffice.org/46263
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/sheet/xconsolidationdescriptor.hxx
b/include/test/sheet/xconsolidationdescriptor.hxx
new file mode 100644
index ..ff5fb5b8254c
--- /dev/null
+++ b/include/test/sheet/xconsolidationdescriptor.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XCONSOLIDATIONDESCRIPTOR_HXX
+#define INCLUDED_TEST_SHEET_XCONSOLIDATIONDESCRIPTOR_HXX
+
+#include
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XConsolidationDescriptor
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetFunction();
+void testSetFunction();
+void testGetSources();
+void testSetSources();
+void testGetStartOutputPosition();
+void testSetStartOutputPosition();
+void testGetUseColumnHeaders();
+void testSetUseColumnHeaders();
+void testGetUseRowHeaders();
+void testSetUseRowHeaders();
+void testGetInsertLinks();
+void testSetInsertLinks();
+
+protected:
+~XConsolidationDescriptor() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XCONSOLIDATIONDESCRIPTOR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index abd1b2efdf3e..4e378ebc4b0e 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -594,7 +594,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer \
qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery \
qadevOOo/tests/java/ifc/sheet/_XConsolidatable \
-qadevOOo/tests/java/ifc/sheet/_XConsolidationDescriptor \
qadevOOo/tests/java/ifc/sheet/_XDDELink \
qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing \
qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster \
@@ -1013,7 +1012,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScCellTextCursor \
qadevOOo/tests/java/mod/_sc/ScChartObj \
qadevOOo/tests/java/mod/_sc/ScChartsObj \
-qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor \
qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \
qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj \
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj \
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScConsolidationDescriptor.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScConsolidationDescriptor.csv
deleted file mode 100644
index b63ae7188675..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScConsolidationDescriptor.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getFunction()"
-"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"setFunction()"
-"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getSources()"
-"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"setSources()"
-"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getStartOutputPosition()"
-"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"setStartOutputPosition()"
-"ScConsolidationDescriptor";"com::sun::star::sheet::XConsolidationDescriptor";"getUseColumnHeaders()"
-
Re: Association between ToC index object and its paragraph content
Hi Mikos,
Thank you for your emails and suggestions thus far. I've played around
with this some more and one question remains.
If I get the actual index object:
indeces = document.getDocumentIndexes()
toc = indeces.getByName('Table of Content1') # Assume it exists!
and then I create a text range of the paragraphs that make up the ToC:
index_pars = toc.Anchor
index_cursor = document.Text.createTextCursorByRange(index_pars)
index_parenum = index_cursor.createEnumeration()
while index_parenum.hasMoreElements():
index_par = index_parenum.nextElement()
# index_par is a paragraph (XTextContext) that's a single in in the ToC
How can I correlate these index_par objects with the paragraphs that I
visit using the document's paragraph enumeration:
parenum = document.Text.createEnumeration()
while parenum.hasMoreElements():
par = parenum.nextElement()
# par is a paragraph (XTextContext) in the document
At some point a given `par` and `index_par` represent the same
paragraph in the document, but how do I know? Or does such an
association not or very loosely exist?
Cheers,
Jens
On Thu, Dec 07, 2017 at 09:58:24AM +0100, Miklos Vajna wrote:
> Hi Jens,
>
> On Thu, Dec 07, 2017 at 06:04:08AM +0100, Jens Tröger
> wrote:
> > While walking all paragraphs of a Writer document and visiting their text
> > content, I come across text portions (the Heading N) which have Bookmarks
> > whose name is something like “_Toc263250771”. However, when I walk the
> > paragraphs and text portions that actually make up the ToC of the document
> > itself, I see no indication or reference to these bookmarks.
>
> Let's say you have a ToC, then a Heading 1 paragraphs, Foo.
>
> Then the ToC refers to hidden RefHeading bookmark for Foo. You can see
> this reference at an UNO API level. Basic code for this:
>
> oParas = ThisComponent.Text.createEnumeration
> oPara = oParas.nextElement ' Table of Contents
> oPara = oParas.nextElement ' Foo
> oPortions = oPara.createEnumeration
> oPortion = oPortions.nextElement
> xray oPortion.HyperlinkURL ' gives #__RefHeading___Toc...
>
> If you want to see the bookmarks the ToC refers to, it's similar:
>
> ...
> oPara = oParas.nextElement ' Foo
> oPortions = oPara.createEnumeration
> oPortion = oPortions.nextElement
> xray oPortion.TextPortionType ' gives Bookmark
> xray oPortion.Bookmark.Name ' gives #__RefHeading___Toc...
>
> In most cases if you see some information serialized into ODT, then you
> can assume the same information is available via the UNO API. You can
> always read (most of) the ODT filter in xmloff/ to see what exact UNO
> API is used to write a given ODT markup.
>
> Regards,
> Miklos
--
Jens Tröger
http://savage.light-speed.de/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/conditio.hxx| 11 +---
sc/qa/unit/ucalc.hxx |2
sc/qa/unit/ucalc_condformat.cxx| 76 ++--
sc/source/core/data/conditio.cxx | 78 +
sc/source/core/data/table2.cxx | 24 ++
sc/source/filter/xml/xmlcondformat.cxx |2
6 files changed, 126 insertions(+), 67 deletions(-)
New commits:
commit 3f614f431475e1bf3bb3bbeac59b0681309628b7
Author: Mike Kaganski
Date: Fri Dec 1 15:25:56 2017 +0300
tdf#95295: don't add duplicate conditional formats
This tries to make sure that on copy, any conditional formatting
that has same entries (conditions and formats) as another condition
in the table, is not appended to the conditions list, but updates
existing condition's range. This should prevent multiplication of
entries with duplicating conditions and formats, and fragmenting
ranges.
Existing unit tests had to be adjusted, because they had ensured
exactly that behaviour that is changed in this commit: that new
items are added to the list, and e.g. multiple elements are created
when a single cell is copied to a range.
Change-Id: I46adb883bab7249571b912d56fea0c7918b3516d
Reviewed-on: https://gerrit.libreoffice.org/45656
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 93481f202236..327b8367dce9 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -244,6 +244,7 @@ public:
virtual void SetParent( ScConditionalFormat* pNew ) = 0;
bool operator==( const ScFormatEntry& ) const;
+virtual bool IsEqual( const ScFormatEntry&, bool bIgnoreSrcPos ) const;
virtual void startRendering();
virtual void endRendering();
@@ -350,9 +351,7 @@ public:
ScConditionEntry( ScDocument* pDocument, const ScConditionEntry& r
);
virtual ~ScConditionEntry() override;
-booloperator== ( const ScConditionEntry& r ) const;
-
-boolEqualIgnoringSrcPos( const ScConditionEntry& r ) const;
+boolIsEqual( const ScFormatEntry& r, bool bIgnoreSrcPos )
const override;
virtual void SetParent( ScConditionalFormat* pNew ) override;
@@ -440,8 +439,6 @@ class SC_DLLPUBLIC ScCondFormatEntry : public
ScConditionEntry
{
OUString aStyleName;
-using ScConditionEntry::operator==;
-
public:
ScCondFormatEntry( ScConditionMode eOper,
const OUString& rExpr1, const OUString& rExpr2,
@@ -459,7 +456,7 @@ public:
ScCondFormatEntry( ScDocument* pDocument, const ScCondFormatEntry&
r );
virtual ~ScCondFormatEntry() override;
-booloperator== ( const ScCondFormatEntry& r ) const;
+boolIsEqual( const ScFormatEntry& r, bool bIgnoreSrcPos )
const override;
const OUString& GetStyle() const{ return aStyleName; }
voidUpdateStyleName(const OUString& rNew) { aStyleName=rNew; }
@@ -572,7 +569,7 @@ public:
ScCondFormatData GetData( ScRefCellValue& rCell, const ScAddress& rPos )
const;
-boolEqualEntries( const ScConditionalFormat& r ) const;
+boolEqualEntries( const ScConditionalFormat& r, bool
bIgnoreSrcPos = false ) const;
voidDoRepaint();
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index ed8bf0c09e0e..74729debe9ea 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -482,6 +482,7 @@ public:
void testCondCopyPaste();
void testCondCopyPasteSingleCell(); //e.g. fdo#82503
void testCondCopyPasteSingleCellToRange(); //e.g. fdo#82503
+void testCondCopyPasteSingleCellIntoSameFormatRange(); // e.g., tdf#95295
void testCondCopyPasteSingleRowToRange(); //e.g. tdf#106242
void testCondCopyPasteSingleRowToRange2();
void testCondCopyPasteSheetBetweenDoc();
@@ -780,6 +781,7 @@ public:
CPPUNIT_TEST(testCondCopyPaste);
CPPUNIT_TEST(testCondCopyPasteSingleCell);
CPPUNIT_TEST(testCondCopyPasteSingleCellToRange);
+CPPUNIT_TEST(testCondCopyPasteSingleCellIntoSameFormatRange);
CPPUNIT_TEST(testCondCopyPasteSingleRowToRange);
CPPUNIT_TEST(testCondCopyPasteSingleRowToRange2);
CPPUNIT_TEST(testCondCopyPasteSheetBetweenDoc);
diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
index f98d2e94b8eb..e0f18ca1fd5b 100644
--- a/sc/qa/unit/ucalc_condformat.cxx
+++ b/sc/qa/unit/ucalc_condformat.cxx
@@ -288,14 +288,19 @@ void Test::testCondCopyPaste()
ScConditionalFormat* pPastedFormat = m_pDoc->GetCondFormat(7,7,0);
CPPUNIT_ASSERT(pPastedFormat);
-CPPUNIT_ASSERT_EQUAL(ScRangeList(aTargetRange), pPastedFormat->GetRange());
-CPPUNIT_ASSERT( nIndex != pPastedFormat->GetKey());
+// Pasting the same conditional format must modify existing format, making
its range
+// combi
Re: pre-init / strings ...
Hi Stephan On 08/12/17 16:20, Stephan Bergmann wrote: >>> So, it would be interesting to know whether the issue indeed is mostly >>> with such rtl_uString instances, so that the mechanism I outlined above >>> would be going to sufficiently solve your issue. > > That's why I mentioned that it is "potentially being available in Clang > or GCC even before; it already is, in a form almost usable for our > needs". My assumption would be that we could get this at least into > dedicated Linux builds rather "soon-ish", with other builds gracefully > falling back to the status quo. Fair enough; so - the problem is working out where a string came from after the fact is rather problematic ;-) I spent a while to create some code that scans for and dumps strings and add it to loolmap: SStrings : 50, 77 chars UStrings : 65021, 1053049 chars You can see a dump of all the things that look like ASCII strings in memory here: http://users.freedesktop.org/~michael/strings.txt.gz Some clearly come from the code - but a lot look like they come from the services.rdb and filter configuration, and a rather large number of them look like they are from the officecfg. It gives some good hints for where an additional 'intern()' or two might save quite some memory I think; we have approaching 200kB of repetitions of 'com.sun.star' too, 6k lots of "en-US" etc. etc. Looking at that lot, I suspect that the pre-init allocator does indeed make quite some sense, but have a poke & see what you think. ATB, Michael. -- michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/core/tool/compiler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b030bf19e29f031b0a640dd92c38d654785f1a99 Author: Eike Rathke Date: Mon Dec 11 18:21:32 2017 +0100 Resolves: tdf#114406 treat % as the operator that it is Regression from commit 73c7e0921d752df53004ed55735f3ecc592f Date: Tue Sep 20 21:39:10 2016 +0200 sc-perf: tdf#79023 for ODFF do not call SvNumberFormatter to determine numeric for ODFF, and for OOXML commit a8a8ff59c5749bbe1f2f58ea8fd42d66e6ae2a81 Date: Tue Sep 20 22:37:59 2016 +0200 sc-perf: tdf#79023 do not call SvNumberFormatter also for numbers in OOXML Numbers followed by a percent operator like 100% were always (wrongly) treated as one entity (by '%' having ScCharFlags::Value) and incidentally handled by the number formatter's parser, which so far "worked" in the sense that the correct constant number was produced (i.e. 1 here), but the expression detail was lost. The commits above for performance reasons when reading ODF or OOXML files don't let a symbol pass through the number formatter's parser anymore and the "100%" does not represent a strict number, so lead to #NAME? error at the end. Set the proper flags in the compiler's character table to treat '%' as operator in all circumstances. Change-Id: I266beb74a313c779370e5fac42f45d0fb5cdba0c (cherry picked from commit f6b2349e880afa82f9267087fb48b6e4f8a9aa05) Reviewed-on: https://gerrit.libreoffice.org/46254 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 8f74f42276a4..3c6365a5e7c6 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -323,7 +323,7 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv ) /* $ */ t[36] = ScCharFlags::CharWord | ScCharFlags::Word | ScCharFlags::CharIdent | ScCharFlags::Ident; if (FormulaGrammar::CONV_ODF == meConv) /* $ */ t[36] |= ScCharFlags::OdfNameMarker; -/* % */ t[37] = ScCharFlags::Value; +/* % */ t[37] = ScCharFlags::Char | ScCharFlags::WordSep | ScCharFlags::ValueSep; /* & */ t[38] = ScCharFlags::Char | ScCharFlags::WordSep | ScCharFlags::ValueSep; /* ' */ t[39] = ScCharFlags::NameSep; /* ( */ t[40] = ScCharFlags::Char | ScCharFlags::WordSep | ScCharFlags::ValueSep; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 3 commits - tools/map.cpp
tools/map.cpp | 221 +++---
1 file changed, 181 insertions(+), 40 deletions(-)
New commits:
commit 44600de7c7dbe11da0545cf73ccae9dfa653d141
Author: Michael Meeks
Date: Sat Dec 9 17:33:15 2017 +
loolmap: implement a simple string scan and dump function.
Change-Id: I056f764c99f977a0178105511dfd5406ea6dbfa5
diff --git a/tools/map.cpp b/tools/map.cpp
index 88c1aa07..c69db7d2 100644
--- a/tools/map.cpp
+++ b/tools/map.cpp
@@ -31,6 +31,7 @@ typedef unsigned long long addr_t;
bool DumpHex = false;
bool DumpAll = false;
+bool DumpStrings = false;
#define MAP_SIZE 20
#define PATH_SIZE 1000 // No harm in having it much larger than strictly
necessary. Avoids compiler warning.
@@ -138,20 +139,44 @@ static void dumpDiff(const std::string &pageStr, const
std::string &parentStr)
}
}
+struct AddrSpace;
+
struct Map {
addr_t _start;
addr_t _end;
std::string _name;
+size_t size() { return _end - _start; }
+};
+
+struct StringData {
+size_t _count;
+size_t _chars;
+StringData() :
+_count(0),
+_chars(0)
+{}
};
struct AddrSpace {
unsigned _proc_id;
std::vector _maps;
+StringData _strings[3];
AddrSpace(unsigned proc_id) :
_proc_id(proc_id)
{
}
+void printStats()
+{
+char prefixes[] = { 'S', 'U', 'c' };
+for (int i = 0; i < 2; ++i)
+{
+printf("%cStrings :%20lld, %lld chars\n",
+ prefixes[i], (addr_t)_strings[i]._count,
+ (addr_t)_strings[i]._chars);
+ }
+}
+
std::string findName(addr_t page) const
{
for (const Map &i : _maps)
@@ -162,6 +187,81 @@ struct AddrSpace {
return std::string("");
}
+void insert(addr_t start, addr_t end, const char *name)
+{
+Map map;
+map._start = start;
+map._end = end;
+map._name = std::string(name);
+_maps.push_back(map);
+}
+
+// Normal OUString:
+// 20 00 00 00 00 00 00 00 02 00 00 00 05 00 00 00 4b 00 45 00 59 00 5f
00 55 00 00 00 00 00 00 00 | ...K.E.Y._.U..
+// 20 00 00 00 00 00 00 00 02 00 00 00 05 00 00 00 4b 45 59 5f 55 00 00
00 00 00 00 00 00 00 00 00 | ...KEY_U..
+
+bool isStringAtOffset(const std::vector &data, size_t i,
+ uint32_t len, bool isUnicode, std::string &str)
+{
+str = isUnicode ? "U_" : "S_";
+int step = isUnicode ? 2 : 1;
+for (size_t j = i; j < i + len*step && j < data.size(); j += step)
+{
+if (isascii(data[j]) && !iscntrl(data[j]))
+str += static_cast(data[j]);
+else
+return false;
+}
+return true;
+}
+
+void scanForSalStrings(Map &map, const std::vector &data)
+{
+for (size_t i = 0; i < data.size() - 24; i += 4)
+{
+const uint32_t *p = reinterpret_cast(&data[i]);
+uint32_t len;
+if ((p[0] & 0xff) < 0x1000 && // plausible max ref-count
+(len = p[1]) < 0x100 && // plausible max string length
+len <= (data.size() - i) &&
+len > 0)
+{
+std::string str;
+bool isUnicode = data[i+1] == 0 && data[i+3] == 0;
+if (isStringAtOffset(data, i + 8, len, isUnicode, str))
+{
+StringData &sdata = _strings[isUnicode ? 1 : 0];
+sdata._count ++;
+sdata._chars += len;
+if (DumpStrings)
+printf("string address 0x%.8llx %s\n",
+ map._start + i, str.c_str());
+}
+i += 8;
+}
+}
+}
+
+void scanMapsForStrings()
+{
+int mem_fd = openPid(_proc_id, "mem");
+if (DumpStrings)
+printf("String dump:\n");
+for (auto &map : _maps)
+{
+std::vector data;
+data.resize (map.size());
+if (lseek(mem_fd, map._start, SEEK_SET) < 0 ||
+read(mem_fd, &data[0], map.size()) != (int)map.size())
+error(EXIT_FAILURE, errno, "Failed to seek in /proc/%d/mem to
%lld",
+ _proc_id, map._start);
+
+scanForSalStrings(map, data);
+}
+if (DumpStrings)
+printf("String dump ends.\n");
+close (mem_fd);
+}
};
static void dumpPages(unsigned proc_id, unsigned parent_id, const char *type,
const std::vector &pages, const AddrSpace &space)
@@ -191,12 +291,6 @@ static void dumpPages(unsigned proc_id, unsigned
parent_id, const char *type, co
else if (read(parent_fd, &parentData[0], 0x1000) != 0x1000)
parentData.resize(0); // missing equivalent page.
-// Diff as ASCII
-std
[Libreoffice-commits] core.git: filter/qa filter/source framework/source package/source qadevOOo/runner qadevOOo/tests sc/source sd/source sw/source
filter/qa/complex/filter/detection/typeDetection/TypeDetection.java | 26 +- filter/source/msfilter/msdffimp.cxx |2 filter/source/xslt/import/wordml/wordml2ooo_draw.xsl|2 framework/source/services/frame.cxx |2 package/source/zippackage/ZipPackage.cxx|2 qadevOOo/runner/lib/MultiMethodTest.java|2 qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java |2 qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java|8 +-- sc/source/filter/excel/xiescher.cxx | 16 +++--- sd/source/ui/func/fudraw.cxx|2 sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx|2 sw/source/core/docnode/nodes.cxx|2 sw/source/core/docnode/swbaslnk.cxx |2 sw/source/core/layout/wsfrm.cxx |2 14 files changed, 36 insertions(+), 36 deletions(-) New commits: commit 7d202623b007979d9d0f93f6cd62c3c031d6d1d4 Author: Ilmari Lauhakangas Date: Mon Dec 11 19:14:07 2017 +0200 Fix typos and grammar Change-Id: I4143da3c5a809118d57849664f6ab1d2e775837f Reviewed-on: https://gerrit.libreoffice.org/46253 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java index c7def3cd16e8..44a5d2de9ad0 100644 --- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java +++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java @@ -60,8 +60,8 @@ import util.utils; * of the TypeDetection must match with an expected type. * * - * To get information which test file should support which type, filter and - * document service, this information was collect from configuration files: + * To get information on which test file should support which type, filter and + * document service, this information was collected from configuration files: * * TypeDetection.props * files.csv @@ -72,7 +72,7 @@ import util.utils; * * * typeDetection.props - * At fist there will be the typeDetection.props. Here the following + * At first there will be the typeDetection.props. Here the following * properties should be set (with example values): * * TestDocumentPath=file:///path/to/my/testdocuments @@ -100,7 +100,7 @@ import util.utils; * this file * * The second example displays two document types for - * XInputStream (generic_Text). This + * XInputStream (generic_Text). These * two document types are listed by a colon ':' as separator. * This is needed because XInputStream can detect a text file as * generic_Text. @@ -112,9 +112,9 @@ import util.utils; * filter to detect the document. This make sense ie. for csv-files: You can * open csv files as Writer or as Calc. To check this case you have to specify * in csv.files a fileAlias like ?csv_writer? and ?csv_calc? with - * the same fileURL and it's specific defaultFileType. - * The returned file type by TypeDetection must equal to - * correspond defaultFileType from csv.files + * the same fileURL and its specific defaultFileType. + * The returned file type by TypeDetection must be equal to the + * corresponding defaultFileType from csv.files * * Syntax: fileAlias;FilterName;FilterOptions;FilterData * Example: Writer6_1;%SO6productname %SO6formatversion Textdocument; @@ -125,18 +125,18 @@ import util.utils; * name which should be used. Here we have a special: %SO6productname * %SO6formatversion will be replaced by the equals of * typeDetection.props. The filter names depends on the Office - * name and version. So a future Office could called ?StarSuite 8?. + * name and version. So a future Office could be called ?StarSuite 8?. * FilterOptions is not relevant for this filter. But ie. for csv * filter this entry could be used to specify the separator of the csv file. * FilterData if filter needs some FilterData arguments you can - * specify it here + * specify them here * * * * preselectedType.csv * In this file you can preselect the type * TypeDetection should use. - * The returned file type by TypeDetection must equal to the + * The file type returned by TypeDetection must be equal to the * preselected file type. * Note: If you try to use invalid types you will get a failed test because * TypeDetection tries to find out the type itself. @@ -153,8 +153,8 @@ import util.utils; * * * serviceName.csv In this file you can preselect a service name - * to detect the file type. The returned file type by - * TypeDetection must equal to correspond + * to detect the file type. The file type returned by + * TypeDetection must be equal to th
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/inc/tvread.hxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4094f9baf62a426b24f497c86d6a96ccfcb22ad1
Author: Eike Rathke
Date: Mon Dec 11 22:34:21 2017 +0100
Attempt to blind fix build breaker
Change-Id: Ic20cc65b7fa78729d432fbf5e15fabe0e25cf627
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx
b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index f4bb0631d30d..bee206db49c6 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
namespace treeview {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathmlattr.cxx | 83 ++-
starmath/source/mathmlattr.hxx |4 -
starmath/source/mathmlimport.cxx |4 -
3 files changed, 27 insertions(+), 64 deletions(-)
New commits:
commit 44e47c2c32799e7833cc6cfd249c4d15306fd7e6
Author: Caolán McNamara
Date: Mon Dec 11 15:41:50 2017 +
ofz#4594 Integer-overflow
Change-Id: I6d73f514536e5b3e69573e24fd8b9f4b84e315c5
Reviewed-on: https://gerrit.libreoffice.org/46248
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/source/mathmlattr.cxx b/starmath/source/mathmlattr.cxx
index 2b0c70335430..74e32d42944b 100644
--- a/starmath/source/mathmlattr.cxx
+++ b/starmath/source/mathmlattr.cxx
@@ -12,22 +12,8 @@
#include
#include
-namespace {
-
-sal_Int32 lcl_GetPowerOf10(sal_Int32 nPower)
+sal_Int32 ParseMathMLUnsignedNumber(const OUString &rStr, Fraction& rUN)
{
-assert(nPower > 0);
-sal_Int32 nResult = 1;
-while (nPower--)
-nResult *= 10;
-return nResult;
-}
-
-}
-
-sal_Int32 ParseMathMLUnsignedNumber(const OUString &rStr, Fraction *pUN)
-{
-assert(pUN);
auto nLen = rStr.getLength();
sal_Int32 nDecimalPoint = -1;
sal_Int32 nIdx;
@@ -44,113 +30,91 @@ sal_Int32 ParseMathMLUnsignedNumber(const OUString &rStr,
Fraction *pUN)
if (cD < u'0' || u'9' < cD)
break;
}
-if (nIdx == 0 || ((nIdx == 1 || nIdx == 11) && nDecimalPoint == 0))
+if (nIdx == 0 || (nIdx == 1 && nDecimalPoint == 0))
return -1;
-if (nDecimalPoint == -1)
-{
-assert(nIdx > 0);
-*pUN = Fraction(rStr.copy(0, nIdx).toInt32(), 1);
-return nIdx;
-}
-if (nDecimalPoint == 0)
-{
-assert(nIdx > 1);
-*pUN = Fraction(rStr.copy(1, nIdx-1).toInt32(),
lcl_GetPowerOf10(nIdx-1));
-return nIdx;
-}
-assert(0 < nDecimalPoint);
-assert(nDecimalPoint < nIdx);
-*pUN = Fraction(rStr.copy(0, nDecimalPoint).toInt32(), 1);
-if (++nDecimalPoint < nIdx)
-{
-const sal_Int32 nDigits = nIdx - nDecimalPoint;
-if (nDigits > 9)
-return -1;
-*pUN += Fraction(rStr.copy(nDecimalPoint, nDigits).toInt32(),
lcl_GetPowerOf10(nDigits));
-}
+
+rUN = Fraction(rStr.copy(0, nIdx).toDouble());
+
return nIdx;
}
-sal_Int32 ParseMathMLNumber(const OUString &rStr, Fraction *pN)
+sal_Int32 ParseMathMLNumber(const OUString &rStr, Fraction& rN)
{
-assert(pN);
if (rStr.isEmpty())
return -1;
bool bNegative = (rStr[0] == '-');
sal_Int32 nOffset = bNegative ? 1 : 0;
Fraction aF;
-auto nIdx = ParseMathMLUnsignedNumber(rStr.copy(nOffset), &aF);
+auto nIdx = ParseMathMLUnsignedNumber(rStr.copy(nOffset), aF);
if (nIdx <= 0)
return -1;
if (bNegative)
-*pN = Fraction(aF.GetNumerator(), aF.GetDenominator());
+rN = Fraction(aF.GetNumerator(), aF.GetDenominator());
else
-*pN = aF;
+rN = aF;
return nOffset + nIdx;
}
-sal_Int32 ParseMathMLAttributeLengthValue(const OUString &rStr,
MathMLAttributeLengthValue *pV)
+sal_Int32 ParseMathMLAttributeLengthValue(const OUString &rStr,
MathMLAttributeLengthValue& rV)
{
-assert(pV);
-auto nIdx = ParseMathMLNumber(rStr, &pV->aNumber);
+auto nIdx = ParseMathMLNumber(rStr, rV.aNumber);
if (nIdx <= 0)
return -1;
OUString sRest = rStr.copy(nIdx);
if (sRest.isEmpty())
{
-pV->eUnit = MathMLLengthUnit::None;
+rV.eUnit = MathMLLengthUnit::None;
return nIdx;
}
if (sRest.startsWith("em"))
{
-pV->eUnit = MathMLLengthUnit::Em;
+rV.eUnit = MathMLLengthUnit::Em;
return nIdx + 2;
}
if (sRest.startsWith("ex"))
{
-pV->eUnit = MathMLLengthUnit::Ex;
+rV.eUnit = MathMLLengthUnit::Ex;
return nIdx + 2;
}
if (sRest.startsWith("px"))
{
-pV->eUnit = MathMLLengthUnit::Px;
+rV.eUnit = MathMLLengthUnit::Px;
return nIdx + 2;
}
if (sRest.startsWith("in"))
{
-pV->eUnit = MathMLLengthUnit::In;
+rV.eUnit = MathMLLengthUnit::In;
return nIdx + 2;
}
if (sRest.startsWith("cm"))
{
-pV->eUnit = MathMLLengthUnit::Cm;
+rV.eUnit = MathMLLengthUnit::Cm;
return nIdx + 2;
}
if (sRest.startsWith("mm"))
{
-pV->eUnit = MathMLLengthUnit::Mm;
+rV.eUnit = MathMLLengthUnit::Mm;
return nIdx + 2;
}
if (sRest.startsWith("pt"))
{
-pV->eUnit = MathMLLengthUnit::Pt;
+rV.eUnit = MathMLLengthUnit::Pt;
return nIdx + 2;
}
if (sRest.startsWith("pc"))
{
-pV->eUnit = MathMLLengthUnit::Pc;
+rV.eUnit = MathMLLengthUnit::Pc;
return nIdx + 2;
}
if (sRest[0] == u'%')
{
-pV->eUnit = MathMLLengthUnit::Percent;
+rV.eUnit
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/swtypes.hxx |2 -
sw/inc/view.hxx |4 +--
sw/qa/extras/ww8export/ww8export.cxx|2 -
sw/source/core/fields/flddat.cxx|2 -
sw/source/core/inc/swfont.hxx |8 +++---
sw/source/core/layout/fly.cxx | 12 -
sw/source/core/layout/ftnfrm.cxx|4 +--
sw/source/core/layout/objectformatter.cxx |4 +--
sw/source/core/layout/sectfrm.cxx |6 ++--
sw/source/core/layout/tabfrm.cxx|2 -
sw/source/core/layout/wsfrm.cxx |8 +++---
sw/source/core/objectpositioning/anchoredobjectposition.cxx |2 -
sw/source/core/text/blink.cxx |4 +--
sw/source/core/txtnode/swfont.cxx |6 ++--
sw/source/filter/ww8/rtfattributeoutput.cxx |4 +--
sw/source/filter/ww8/wrtww8gr.cxx | 10 +++
sw/source/filter/ww8/ww8par.cxx | 16 ++--
sw/source/filter/ww8/ww8par6.cxx|6 ++--
sw/source/filter/ww8/ww8scan.cxx|6 ++--
sw/source/ui/frmdlg/frmpage.cxx |8 +++---
sw/source/uibase/app/appenv.cxx |4 +--
sw/source/uibase/shells/annotsh.cxx |2 -
sw/source/uibase/shells/drwtxtsh.cxx|2 -
sw/source/uibase/uiview/view2.cxx |2 -
sw/source/uibase/uiview/viewmdi.cxx |2 -
sw/source/uibase/uiview/viewport.cxx|2 -
26 files changed, 64 insertions(+), 66 deletions(-)
New commits:
commit baadb184e84568acd1c6efda95c3715b05818da3
Author: tagezi
Date: Thu Dec 7 22:27:21 2017 +0200
tdf#96505 Deleted suffix long (L) where it is possible
Change-Id: Iafe5ea3822f7f0170d2fb041fea604e95dbfa015
Reviewed-on: https://gerrit.libreoffice.org/46041
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 226609ab668e..f4a8138d1ed8 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -85,7 +85,7 @@ const SwTwips lMinBorder = 1134;
// Margin left and above document.
// Half of it is gap between the pages.
//TODO: Replace with SwViewOption::defDocumentBorder
-#define DOCUMENTBORDER 284L
+#define DOCUMENTBORDER 284
// Constant strings.
SW_DLLPUBLIC extern OUString aEmptyOUStr; // remove once aEmptyOUStr can be
changed to OUString
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index a865b4184ee5..6e8f4b7d9511 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -643,12 +643,12 @@ public:
inline long SwView::GetXScroll() const
{
-return m_aVisArea.GetWidth() * nScrollX / 100L;
+return (m_aVisArea.GetWidth() * nScrollX) / 100;
}
inline long SwView::GetYScroll() const
{
-return m_aVisArea.GetHeight() * nScrollY / 100L;
+return (m_aVisArea.GetHeight() * nScrollY) / 100;
}
inline const SwDocShell *SwView::GetDocShell() const
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 825ba6be7cf0..fa143dad4e4b 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -50,8 +50,6 @@
#include
-#define convertTwipToMm100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36)/72L) :
(((TWIP)*127L-36)/72L))
-
class Test : public SwModelTestBase
{
public:
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index a8c0b6457594..ef12474832f2 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -73,7 +73,7 @@ OUString SwDateTimeField::Expand() const
fVal = GetValue();
if (nOffset)
-fVal += (double)(nOffset * 60L) / 86400.0;
+fVal += nOffset * ( 60 / 86400.0 );
return ExpandValue(fVal, GetFormat(), GetLanguage());
}
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index b44ab3494cd1..ee377c50c6fd 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -720,8 +720,8 @@ inline void SwSubFont::SetSize( const Size& rSize )
else
{
Font::SetFontSize( Size(
-m_aSize.Width() * GetPropr() / 100L,
-m_aSize.Height() * GetPropr() / 100L ) );
+m_aSize.Width() * GetPropr() / 100,
+m_aSize.Height() * GetPropr() / 100 ) );
}
m_pMagic = nullptr;
}
@@ -749,8 +749,8 @@ inline void SwFont::SetActual( SwFontScript nNew )
inline void SwSubFont::SetProportion( const sal_uInt8 nNewPropr )
{
m_pMagic = nullptr;
-Font::SetFontSize( Size( m_aSize.Width() * nNewPropr / 100L,
-
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 897fb601b7bc2c378bcfc9696f90137c73a2609a Author: Olivier Hallot Date: Mon Dec 11 16:30:39 2017 -0200 Updated core Project: help f6cefa1f7fc30eca7257c3cd9ab831db29e806ac Clean extra XML tag Change-Id: Ifaf97010abd0f590fae3a154173c9c6dc3513644 Reviewed-on: https://gerrit.libreoffice.org/46261 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot (cherry picked from commit 08d29364d8178eb559fec149e03d751565f2bd55) Reviewed-on: https://gerrit.libreoffice.org/46262 diff --git a/helpcontent2 b/helpcontent2 index e741601dd052..f6cefa1f7fc3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e741601dd05236be0f9412d8ba5df5314256d3c4 +Subproject commit f6cefa1f7fc30eca7257c3cd9ab831db29e806ac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/01010400.xhp |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 08d29364d8178eb559fec149e03d751565f2bd55 Author: Olivier Hallot Date: Mon Dec 11 16:30:39 2017 -0200 Clean extra XML tag Change-Id: Ifaf97010abd0f590fae3a154173c9c6dc3513644 Reviewed-on: https://gerrit.libreoffice.org/46261 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index febd5bfcc..ae5463c47 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -53,8 +53,7 @@ The configuration allows for two different directories: one folder where the user has write permissions, and one without write permissions. The user can only edit and delete the user dictionaries that are located in the writable path. Other dictionaries can be read only. Edit -To edit a language module, select it and click Edit. The Edit -Modules dialog appears. +To edit a language module, select it and click Edit. The Edit Modules dialog appears. User-defined dictionaries ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text
source/text/shared/optionen/01010400.xhp |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit f6cefa1f7fc30eca7257c3cd9ab831db29e806ac Author: Olivier Hallot Date: Mon Dec 11 16:30:39 2017 -0200 Clean extra XML tag Change-Id: Ifaf97010abd0f590fae3a154173c9c6dc3513644 Reviewed-on: https://gerrit.libreoffice.org/46261 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot (cherry picked from commit 08d29364d8178eb559fec149e03d751565f2bd55) Reviewed-on: https://gerrit.libreoffice.org/46262 diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index febd5bfcc..ae5463c47 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -53,8 +53,7 @@ The configuration allows for two different directories: one folder where the user has write permissions, and one without write permissions. The user can only edit and delete the user dictionaries that are located in the writable path. Other dictionaries can be read only. Edit -To edit a language module, select it and click Edit. The Edit -Modules dialog appears. +To edit a language module, select it and click Edit. The Edit Modules dialog appears. User-defined dictionaries ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09815cf40fad561991bec4bea15b3f677c937b02 Author: Olivier Hallot Date: Mon Dec 11 16:30:39 2017 -0200 Updated core Project: help 08d29364d8178eb559fec149e03d751565f2bd55 Clean extra XML tag Change-Id: Ifaf97010abd0f590fae3a154173c9c6dc3513644 Reviewed-on: https://gerrit.libreoffice.org/46261 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 9e89f7947685..08d29364d817 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9e89f79476859a19c376f0fdf029cc0600a39179 +Subproject commit 08d29364d8178eb559fec149e03d751565f2bd55 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/inc/tvread.hxx |2 -
xmlhelp/source/treeview/tvread.cxx| 36 --
2 files changed, 23 insertions(+), 15 deletions(-)
New commits:
commit 8a3bb9356219754af7e651a879b5fc8925a18468
Author: Michael Stahl
Date: Mon Dec 11 20:00:15 2017 +0100
tdf#114242 xmlhelp: fix crash in TVChildTarget::Check()
The ... idiomatic C++ code in TVChildTarget::Check() and
SearchAndInsert() handles ownership in non-obvious ways,
so it's not surprising that it took offense at the recent
conversion to std::unique_ptr. Let's at least try to
prevent it from crashing so quickly.
(regression from 4b69497e36b941d4db62ae8d5bad863d032fdc50)
Change-Id: I0981707a61aee1733e727b1c00346d8ec524362e
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx
b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index bef027c06399..f4bb0631d30d 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -227,7 +227,7 @@ namespace treeview {
static void subst( OUString& instpath );
-bool SearchAndInsert(TVDom* p, TVDom* tvDom);
+std::unique_ptr SearchAndInsert(std::unique_ptr p,
TVDom* tvDom);
void Check(TVDom* tvDom);
diff --git a/xmlhelp/source/treeview/tvread.cxx
b/xmlhelp/source/treeview/tvread.cxx
index d8b95c84bfad..f3fe31b44d46 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -61,11 +61,10 @@ namespace treeview {
return children.back().get();
}
-TVDom* newChild(TVDom* p)
+void newChild(std::unique_ptr p)
{
-children.emplace_back( p );
-p->parent = this;
-return children.back().get();
+children.emplace_back(std::move(p));
+children.back()->parent = this;
}
TVDom* getParent() const
@@ -448,8 +447,13 @@ void TVChildTarget::Check(TVDom* tvDom)
TVDom* p = tvDom->children.back().get();
for(auto & k : p->children)
-if (!SearchAndInsert(k.get(), tvDom->children[i].get()))
-tvDom->children[i]->newChild(k.get());
+{
+std::unique_ptr tmp(SearchAndInsert(std::move(k),
tvDom->children[i].get()));
+if (tmp)
+{
+tvDom->children[i]->newChild(std::move(tmp));
+}
+}
tvDom->children.pop_back();
h = true;
@@ -458,9 +462,10 @@ void TVChildTarget::Check(TVDom* tvDom)
}
}
-bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
+std::unique_ptr
+TVChildTarget::SearchAndInsert(std::unique_ptr p, TVDom* tvDom)
{
-if (p->isLeaf()) return false;
+if (p->isLeaf()) return p;
bool h = false;
sal_Int32 max = 0;
@@ -481,8 +486,8 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
if (p_int==c_int)
{
-(*(tvDom->children.insert(i+1,
std::unique_ptr(p->parent = tvDom;
-return true;
+(*(tvDom->children.insert(i+1, std::move(p->parent = tvDom;
+return nullptr;
}
else if(c_int>max && c_int < p_int)
{
@@ -491,17 +496,20 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom*
tvDom)
}
}
if (h)
-(*(tvDom->children.insert(max_It, std::unique_ptr(p->parent
= tvDom;
+{
+(*(tvDom->children.insert(max_It, std::move(p->parent = tvDom;
+return nullptr;
+}
else
{
i = tvDom->children.begin();
-while ((i!=tvDom->children.end()) && (!h))
+while ((i!=tvDom->children.end()) && (p != nullptr))
{
-h = SearchAndInsert(p, i->get());
+p = SearchAndInsert(std::move(p), i->get());
++i;
}
+return p;
}
-return h;
}
Any SAL_CALL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/drawingml.cxx | 21 +++--
1 file changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 54dfb9ff07a41d9249302ac2ed0a005d0a8114d4
Author: geri1245
Date: Wed Dec 6 19:40:59 2017 +0100
tdf#111785 Save hatch background color in pptx format.
When exporting to pptx from LO, the background color of
the hatching is preserved. The default background, when no
hatch background is set is transparent.
Change-Id: Ie44c89a9ce54eef49100b3e7b376c27c1a952fcf
Reviewed-on: https://gerrit.libreoffice.org/46098
Reviewed-by: Tamás Zolnai
Tested-by: Tamás Zolnai
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 1ec05fa2a2e9..eb19a286e587 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1189,9 +1189,26 @@ void DrawingML::WritePattFill( const Reference<
XPropertySet >& rXPropSet )
WriteColor(aHatch.Color);
mpFS->endElementNS( XML_a , XML_fgClr );
-// In Writer hatching has no background so use white as a default
value.
+sal_uInt32 nColor = COL_WHITE;
+sal_Int32 nAlpha = 0;
+bool isBackgroundFilled = false;
+
+if ( GetProperty( rXPropSet, "FillBackground" ) )
+{
+mAny >>= isBackgroundFilled;
+if( isBackgroundFilled )
+{
+nAlpha = MAX_PERCENT;
+
+if( GetProperty( rXPropSet, "FillColor" ) )
+{
+mAny >>= nColor;
+}
+}
+}
+
mpFS->startElementNS( XML_a , XML_bgClr, FSEND );
-WriteColor(COL_WHITE);
+WriteColor(nColor, nAlpha);
mpFS->endElementNS( XML_a , XML_bgClr );
mpFS->endElementNS( XML_a , XML_pattFill );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sysui/desktop
sysui/desktop/apparmor/program.soffice.bin |3 +++
1 file changed, 3 insertions(+)
New commits:
commit c945ad8d93b4617a8810972710cb85df1882ba86
Author: Rene Engelhard
Date: Mon Dec 11 17:54:44 2017 +
sysui/desktop/apparmor/program.soffice.bin: allow /usr/bin/gpgconf
Change-Id: I762ed3961d929204fdb97a3272fc9ca73f7d0234
Reviewed-on: https://gerrit.libreoffice.org/46257
Reviewed-by: Thorsten Behrens
Tested-by: Jenkins
Tested-by: Rene Engelhard
Reviewed-by: Rene Engelhard
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index b4baeab8f5ee..a365f6297781 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -1,6 +1,7 @@
# --
#
#Copyright (C) 2016 Canonical Ltd.
+#Copyright (C) 2017 Software in the Public Interest, Inc.
#
#This Source Code Form is subject to the terms of the Mozilla Public
#License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,6 +9,7 @@
#
#Authors: Jonathan Davies
# Bryan Quigley
+# Rene Engelhard
#
# --
@@ -111,6 +113,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
/usr/bin/bluetooth-sendto rmPUx,
/usr/bin/lpr rmPUx,
/usr/bin/paperconfrmix,
+ /usr/bin/gpgconf rmix,
/dev/tty rw,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/apparmor/program.xpdfimport |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 9db88abe3f91bb4f7b1cbf533a40af4eb8266c21 Author: Rene Engelhard Date: Mon Dec 11 20:01:22 2017 +0100 copyright Change-Id: I102d9ca1be63c2ef8fef4957fb5589d98583881f diff --git a/sysui/desktop/apparmor/program.xpdfimport b/sysui/desktop/apparmor/program.xpdfimport index aa76e85505fe..efe10dce020d 100644 --- a/sysui/desktop/apparmor/program.xpdfimport +++ b/sysui/desktop/apparmor/program.xpdfimport @@ -1,12 +1,14 @@ # -- # #Copyright (C) 2016 Canonical Ltd. +#Copyright (C) 2017 Software in the Public Interest, Inc. # #This Source Code Form is subject to the terms of the Mozilla Public #License, v. 2.0. If a copy of the MPL was not distributed with this #file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#Author: Bryan Quigley +#Authors: Bryan Quigley +# Rene Engelhard # # -- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/apparmor/program.xpdfimport |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 48ff651c521a07e50870f39a9ab5f4cc2ad76d03
Author: Rene Engelhard
Date: Mon Dec 11 19:41:12 2017 +0100
apparmor: copy xpdfimport definition into xpdfimport and allow "m"
Dec 11 18:46:11 sid kernel: [ 176.085106] audit: type=1400
audit(1513014371.237:22): apparmor="DENIED" operation="file_mmap"
profile="libreoffice-xpdfimport" name="/usr/lib/libreoffice/program/xpdfimport"
pid=1511 comm="xpdfimport" requested_mask="m" denied_mask="m" fsuid=1000 ouid=0
Change-Id: I31ddb412d1dd95506a00d22739a33d2e6770ba23
diff --git a/sysui/desktop/apparmor/program.xpdfimport
b/sysui/desktop/apparmor/program.xpdfimport
index 3934c0a04006..aa76e85505fe 100644
--- a/sysui/desktop/apparmor/program.xpdfimport
+++ b/sysui/desktop/apparmor/program.xpdfimport
@@ -22,6 +22,8 @@ profile libreoffice-xpdfimport INSTDIR-program/xpdfimport {
/usr/share/libreoffice/share/config/* r,
owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw,
+ INSTDIR-program/xpdfimportpxm,
+
#Uncomment for build testing (should be one directory <- of instdir)
#/mnt/store/git/libo/**r,
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/backends/kde4be/kde4backend.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 72e5a125c973758e8a5dc489d6a861c92cfaa7a9
Author: Stephan Bergmann
Date: Mon Dec 11 19:40:05 2017 +0100
loplugin:salcall
Change-Id: I735b8ae96ed06dd5914d4e868d11ecbd21ffb1ad
diff --git a/shell/source/backends/kde4be/kde4backend.cxx
b/shell/source/backends/kde4be/kde4backend.cxx
index ab54e4a204ec..800465002c28 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -52,12 +52,12 @@
namespace {
-OUString SAL_CALL getServiceImplementationName() {
+OUString getServiceImplementationName() {
return OUString(
"com.sun.star.comp.configuration.backend.KDE4Backend");
}
-css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() {
+css::uno::Sequence< OUString > getServiceSupportedServiceNames() {
OUString name(
"com.sun.star.configuration.backend.KDE4Backend");
return css::uno::Sequence< OUString >(&name, 1);
@@ -155,7 +155,7 @@ css::uno::Any Service::getPropertyValue(OUString const &
PropertyName)
PropertyName, static_cast< cppu::OWeakObject * >(this));
}
-css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
+css::uno::Reference< css::uno::XInterface > createInstance(
css::uno::Reference< css::uno::XComponentContext > const &)
{
return static_cast< cppu::OWeakObject * >(new Service);
@@ -170,7 +170,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL kde4be1_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * kde4be1_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/apparmor/program.soffice.bin |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2d9170ab14427e88893da353c3f154e242c05953
Author: Rene Engelhard
Date: Mon Dec 11 19:23:34 2017 +0100
revert accidentially committed local change
Change-Id: I2dcac6b8faf1e89ff0c9483bef74ae7c22fc26fb
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index b0e8737bd707..ff2c4b08cd4b 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -62,7 +62,7 @@
#include
-profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
+profile libreoffice-soffice INSTDIR-program/soffice.bin {
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sysui/desktop
sysui/desktop/apparmor/program.senddoc | 16 +---
sysui/desktop/apparmor/program.soffice.bin | 11 +++
2 files changed, 16 insertions(+), 11 deletions(-)
New commits:
commit 2a74249d058e8642b057d22c7480b29c88e6ac96
Author: Rene Engelhard
Date: Mon Dec 11 17:54:44 2017 +
sysui/desktop/apparmor/program.soffice.bin: allow /usr/bin/gpgconf
Change-Id: I762ed3961d929204fdb97a3272fc9ca73f7d0234
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index 7340272b1432..b0e8737bd707 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -113,6 +113,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin
flags=(complain) {
/usr/bin/bluetooth-sendto rmPUx,
/usr/bin/lpr rmPUx,
/usr/bin/paperconfrmix,
+ /usr/bin/gpgconf rmix,
/dev/tty rw,
commit 0ea1e508041511233d40b8a2f56517fc2a28b221
Author: Rene Engelhard
Date: Mon Dec 11 17:51:20 2017 +
also allow /usr/bin/dash (etc.) for merged-/usr-scenario
Change-Id: Ic139e67b0931a4648bac147398970aa80a331c34
diff --git a/sysui/desktop/apparmor/program.senddoc
b/sysui/desktop/apparmor/program.senddoc
index 42c2740f7012..0aa284de3684 100644
--- a/sysui/desktop/apparmor/program.senddoc
+++ b/sysui/desktop/apparmor/program.senddoc
@@ -1,12 +1,14 @@
# --
#
#Copyright (C) 2016 Canonical Ltd.
+#Copyright (C) 2017 Software in the Public Interest, Inc.
#
#This Source Code Form is subject to the terms of the Mozilla Public
#License, v. 2.0. If a copy of the MPL was not distributed with this
#file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-#Author: Bryan Quigley
+#Authors: Bryan Quigley
+# Rene Engelhard
#
# --
@@ -17,14 +19,14 @@ profile libreoffice-senddoc
INSTDIR-/usr/lib{,32,64}/libreoffice/program/senddoc
owner /tmp/lu** rw,#makes files like luR.tmp/lub.tmp where
R is random
#Note, usually it's lub or luc, don't know why.
- /bin/sh rmix,
- /bin/dash rmix,
- /bin/bash rmix,
- /bin/sed rmix,
+ /{usr/,}bin/shrmix,
+ /{usr/,}bin/bash rmix,
+ /{usr/,}bin/dash rmix,
+ /{usr/,}bin/sed rmix,
/usr/bin/dirname rmix,
/usr/bin/basename rmix,
- /bin/grep rmix,
- /bin/unamermix,
+ /{usr/,}bin/grep rmix,
+ /{usr/,}bin/uname rmix,
/usr/bin/xdg-open Cxr -> sanitized_helper,
/dev/null rw,
INSTDIR-program/uri-encode rmpux,
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index b4baeab8f5ee..7340272b1432 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -1,6 +1,7 @@
# --
#
#Copyright (C) 2016 Canonical Ltd.
+#Copyright (C) 2017 Software in the Public Interest, Inc.
#
#This Source Code Form is subject to the terms of the Mozilla Public
#License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,6 +9,7 @@
#
#Authors: Jonathan Davies
# Bryan Quigley
+# Rene Engelhard
#
# --
@@ -60,7 +62,7 @@
#include
-profile libreoffice-soffice INSTDIR-program/soffice.bin {
+profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
#include
#include
@@ -105,9 +107,9 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
# bluetooth send to
network bluetooth,
- /bin/sh rmix,
- /bin/bash rmix,
- /bin/dash rmix,
+ /{usr/,}bin/shrmix,
+ /{usr/,}bin/bash rmix,
+ /{usr/,}bin/dash rmix,
/usr/bin/bluetooth-sendto rmPUx,
/usr/bin/lpr rmPUx,
/usr/bin/paperconfrmix,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/compiler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f6b2349e880afa82f9267087fb48b6e4f8a9aa05 Author: Eike Rathke Date: Mon Dec 11 18:21:32 2017 +0100 Resolves: tdf#114406 treat % as the operator that it is Regression from commit 73c7e0921d752df53004ed55735f3ecc592f Date: Tue Sep 20 21:39:10 2016 +0200 sc-perf: tdf#79023 for ODFF do not call SvNumberFormatter to determine numeric for ODFF, and for OOXML commit a8a8ff59c5749bbe1f2f58ea8fd42d66e6ae2a81 Date: Tue Sep 20 22:37:59 2016 +0200 sc-perf: tdf#79023 do not call SvNumberFormatter also for numbers in OOXML Numbers followed by a percent operator like 100% were always (wrongly) treated as one entity (by '%' having ScCharFlags::Value) and incidentally handled by the number formatter's parser, which so far "worked" in the sense that the correct constant number was produced (i.e. 1 here), but the expression detail was lost. The commits above for performance reasons when reading ODF or OOXML files don't let a symbol pass through the number formatter's parser anymore and the "100%" does not represent a strict number, so lead to #NAME? error at the end. Set the proper flags in the compiler's character table to treat '%' as operator in all circumstances. Change-Id: I266beb74a313c779370e5fac42f45d0fb5cdba0c diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 909bf0afe1c7..2fd59cbec44e 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -323,7 +323,7 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv ) /* $ */ t[36] = ScCharFlags::CharWord | ScCharFlags::Word | ScCharFlags::CharIdent | ScCharFlags::Ident; if (FormulaGrammar::CONV_ODF == meConv) /* $ */ t[36] |= ScCharFlags::OdfNameMarker; -/* % */ t[37] = ScCharFlags::Value; +/* % */ t[37] = ScCharFlags::Char | ScCharFlags::WordSep | ScCharFlags::ValueSep; /* & */ t[38] = ScCharFlags::Char | ScCharFlags::WordSep | ScCharFlags::ValueSep; /* ' */ t[39] = ScCharFlags::NameSep; /* ( */ t[40] = ScCharFlags::Char | ScCharFlags::WordSep | ScCharFlags::ValueSep; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/libassuan
download.lst|4 ++-- external/libassuan/ExternalPackage_libassuan.mk |2 +- external/libassuan/ExternalProject_libassuan.mk |2 ++ external/libassuan/w32-build-fixes.patch.1 | 10 +- 4 files changed, 10 insertions(+), 8 deletions(-) New commits: commit 814ff5301d4db1119aeec63a41cdaaa49d71348b Author: Thorsten Behrens Date: Sun Dec 10 23:56:16 2017 +0100 libassuan: upgrade to release 2.5.1 Change-Id: Ic6ec245b0011676b1346ea75c016b3af02a0361c Reviewed-on: https://gerrit.libreoffice.org/46205 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/download.lst b/download.lst index 342c245320ba..0faaa5312987 100644 --- a/download.lst +++ b/download.lst @@ -126,8 +126,8 @@ export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fa export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_SHA256SUM := 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22 export LCMS2_TARBALL := lcms2-2.8.tar.gz -export LIBASSUAN_SHA256SUM := 22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71 -export LIBASSUAN_TARBALL := libassuan-2.4.3.tar.bz2 +export LIBASSUAN_SHA256SUM := 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449 +export LIBASSUAN_TARBALL := libassuan-2.5.1.tar.bz2 export LIBATOMIC_OPS_SHA256SUM := cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7ef59c68d9ad export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_SHA256SUM := cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk index 41af53b2c373..9553c7ae 100644 --- a/external/libassuan/ExternalPackage_libassuan.mk +++ b/external/libassuan/ExternalPackage_libassuan.mk @@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),LINUX) -$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.7.3)) +$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.1)) else ifeq ($(OS),MACOSX) diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 03570ff9e9ef..83d79a520988 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -28,6 +28,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl && ./configure \ --enable-static \ --disable-shared \ + --disable-doc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(CXXFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ @@ -42,6 +43,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_ExternalProject_run,build,\ autoreconf \ && ./configure \ + --disable-doc \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ $(if $(filter LINUX,$(OS)), \ diff --git a/external/libassuan/w32-build-fixes.patch.1 b/external/libassuan/w32-build-fixes.patch.1 index 9b5c78f1c10f..b0dbbf841a24 100755 --- a/external/libassuan/w32-build-fixes.patch.1 +++ b/external/libassuan/w32-build-fixes.patch.1 @@ -53,12 +53,12 @@ diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c diff -ru libassuan.orig/Makefile.am libassuan/Makefile.am --- libassuan.orig/Makefile.am 2016-07-14 10:09:22.0 +0200 +++ libassuan/Makefile.am 2017-09-25 21:20:19.928317500 +0200 -@@ -28,7 +28,7 @@ - tests/ChangeLog-2011 contrib/ChangeLog-2011 \ - build-aux/git-log-footer build-aux/git-log-fix +@@ -35,7 +35,7 @@ + doc = + endif --SUBDIRS = m4 src doc tests -+SUBDIRS = m4 src doc +-SUBDIRS = m4 src $(doc) tests ++SUBDIRS = m4 src $(doc) dist-hook: gen-ChangeLog ___ 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 a4408a523af1f80ab7755cd9dbd0abc9fa0ed5da
Author: Stephan Bergmann
Date: Mon Dec 11 17:50:02 2017 +0100
loplugin:salcall
Change-Id: I7521b2adb9572efbb1d28f9f44f9d29c62d6e1e9
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 4488d04489b5..6e2c90d87953 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -87,7 +87,7 @@ using namespace ::com::sun::star::uno;
namespace
{
-uno::Sequence SAL_CALL FilePicker_getSupportedServiceNames()
+uno::Sequence FilePicker_getSupportedServiceNames()
{
uno::Sequence aRet(3);
aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/o3tl odk/settings
include/o3tl/safeint.hxx |3 ++-
odk/settings/settings.mk | 14 ++
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 71d7532f59b6e87729617d6c91bf65f7364ac78a
Author: Michael Stahl
Date: Mon Dec 11 17:26:59 2017 +0100
odk: fix 32-bit Linux build on 64-bit OS
In this situation gcc/g++ will default to x86_64, so pass the "-m32"
flag to produce x86 binaries.
Change-Id: Ie31cd4240e353db606621cb03107ce03a74cfbef
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index e21d33829ba9..25b31cd68fac 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -358,6 +358,10 @@ ifeq "$(PROCTYPE)" "powerpc"
CC_FLAGS+=-fPIC
endif
+ifeq "$(PROCTYPE)" "x86"
+CC_FLAGS+=-m32
+endif
+
SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include"
-I"$(OO_SDK_JAVA_HOME)/include/linux"
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV)
@@ -372,9 +376,19 @@ LIBRARY_LINK_FLAGS=-shared -Wl,-z,origin
'-Wl,-rpath,$$ORIGIN'
ifeq "$(PROCTYPE)" "powerpc"
LIBRARY_LINK_FLAGS+=-fPIC
endif
+
+ifeq "$(PROCTYPE)" "x86"
+LIBRARY_LINK_FLAGS+=-m32
+endif
+
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs
-Wl,--no-whole-archive
+
+ifeq "$(PROCTYPE)" "x86"
+EXE_LINK_FLAGS+=-m32
+endif
+
LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-L"$(OO_SDK_JAVA_HOME)/lib"
commit 3331aecdf89c0b275fb8234414c6a8281114ae33
Author: Michael Stahl
Date: Mon Dec 11 16:51:07 2017 +0100
o3tl: 32-bit clang 4.0.1 fails with undefined reference to `__mulodi4'
... so prevent it from using __builtin_mul_overflow().
Change-Id: Id716f88abb0385701b6df42353b663479abfd496
diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index 56175edb3bbe..67af99cf810c 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -82,7 +82,8 @@ template inline bool checked_sub(T a, T b, T&
result)
return !msl::utilities::SafeSubtract(a, b, result);
}
-#elif (defined __GNUC__ && __GNUC__ >= 5) ||
(__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined
__clang__))
+#elif (defined __GNUC__ && __GNUC__ >= 5) ||
(__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined
__clang__) && !(defined(__clang__) && defined(__i386__) && __clang_major__ ==
4))
+// 32-bit clang 4.0.1 fails with undefined reference to `__mulodi4'
template inline bool checked_multiply(T a, T b, T& result)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/gpgmepp external/libassuan
external/gpgmepp/ExternalProject_gpgmepp.mk |4 ++-- external/libassuan/ExternalProject_libassuan.mk |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit bade2dff0fc7c4d33af1fda8b3e79ff525c36565 Author: Thorsten Behrens Date: Mon Dec 11 12:44:19 2017 +0100 external: fix host setup for gpgme and libassuan Change-Id: I9315a2158dce7d06a875787428e17eb75826de37 Reviewed-on: https://gerrit.libreoffice.org/46222 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index d144b78dcce7..3d6f0ac6e92b 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -39,8 +39,8 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \ $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \ - --host=$(gb_ExternalProject_libgpg-error_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + --host=$(gb_ExternalProject_gpgmepp_host) \ + RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 988bd10c00e7..03570ff9e9ef 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -32,8 +32,8 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl CXXFLAGS="$(CXXFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ - --host=$(gb_ExternalProject_libgpg-error_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ +--host=$(gb_ExternalProject_libassuan_host) \ + RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ MAKE=$(MAKE) \ && $(MAKE) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/cursor.hxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 2c51ebd6bf8d9819e1d4fc3d54bd14b2f20c8b0e
Author: Stephan Bergmann
Date: Mon Dec 11 10:12:50 2017 +0100
Remove unnecessary forward declaration
...introduced with 7330776504ca2e62790f3e3e6d8f575fbad2ec54 "Build fix:
forward-
decl rtl::OUString" in parallel with
df802d0c1b0d255bc88eac279cb8a72d7570ec3a
"Build fix". The latter (introducing an #include) is necessary to also
include
the necessary using declaration.
Change-Id: If5617505d909b97d866f0434df7305f34eef8b0e
Reviewed-on: https://gerrit.libreoffice.org/46213
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx
index 0b55ff18449b..725724ee8024 100644
--- a/include/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
@@ -29,7 +29,6 @@
class Timer;
struct ImplCursorData;
namespace vcl { class Window; }
-namespace rtl { class OUString; }
// Cursor styles
#define CURSOR_SHADOW ((sal_uInt16)0x0001)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/source
tools/source/generic/poly.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 20b349052099aa1ecc00276e484cb84525c4931d
Author: Caolán McNamara
Date: Mon Dec 11 12:42:59 2017 +
ofz#4592 Direct-leak
regression from
commit 225115af05cba9a603130914b49c5b28ed451108
Date: Fri Sep 15 09:17:17 2017 +0200
tdf#62525 tools: use cow_wrapper class for Polygon
Change-Id: Ibd9173bfb005f8a30317d95adea4e5fb25f1df1d
Reviewed-on: https://gerrit.libreoffice.org/46229
Reviewed-by: Andreas Brandner
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 664428426352..d735be9f91eb 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -709,11 +709,11 @@ protected:
class ImplPolygonPointFilter : public ImplPointFilter
{
-std::unique_ptr mxPoly;
-sal_uInt16 mnSize;
+ImplPolygon maPoly;
+sal_uInt16 mnSize;
public:
explicit ImplPolygonPointFilter(sal_uInt16 nDestSize)
-: mxPoly(new ImplPolygon(nDestSize))
+: maPoly(nDestSize)
, mnSize(0)
{
}
@@ -725,24 +725,24 @@ public:
virtual voidLastPoint() override;
virtual voidInput( const Point& rPoint ) override;
-ImplPolygon*release() { return mxPoly.release(); }
+ImplPolygon&get() { return maPoly; }
};
void ImplPolygonPointFilter::Input( const Point& rPoint )
{
-if ( !mnSize || (rPoint != mxPoly->mpPointAry[mnSize-1]) )
+if ( !mnSize || (rPoint != maPoly.mpPointAry[mnSize-1]) )
{
mnSize++;
-if ( mnSize > mxPoly->mnPoints )
-mxPoly->ImplSetSize( mnSize );
-mxPoly->mpPointAry[mnSize-1] = rPoint;
+if ( mnSize > maPoly.mnPoints )
+maPoly.ImplSetSize( mnSize );
+maPoly.mpPointAry[mnSize-1] = rPoint;
}
}
void ImplPolygonPointFilter::LastPoint()
{
-if ( mnSize < mxPoly->mnPoints )
-mxPoly->ImplSetSize( mnSize );
+if ( mnSize < maPoly.mnPoints )
+maPoly.ImplSetSize( mnSize );
};
class ImplEdgePointFilter : public ImplPointFilter
@@ -1494,7 +1494,7 @@ void Polygon::Clip( const tools::Rectangle& rRect )
else
aPolygon.LastPoint();
-mpImplPolygon = ImplType(*aPolygon.release());
+mpImplPolygon = ImplType(aPolygon.get());
}
tools::Rectangle Polygon::GetBoundRect() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/source
tools/source/generic/poly.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 42c59d7c8fd1373e62fd0131852e9a631efd387a
Author: Caolán McNamara
Date: Mon Dec 11 15:46:44 2017 +
Revert "just delete, don't check for null and then delete"
no time for this
This reverts commit 4b941b7b7fd79415935c8f2d3ce900eb64a40f66.
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index c00627965c64..664428426352 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -516,8 +516,11 @@ bool ImplPolygon::operator==( const ImplPolygon&
rCandidate) const
ImplPolygon::~ImplPolygon()
{
-delete[] mpPointAry;
-delete[] mpFlagAry;
+if ( mpPointAry )
+delete[] mpPointAry;
+
+if( mpFlagAry )
+delete[] mpFlagAry;
}
void ImplPolygon::ImplInitDefault()
@@ -583,7 +586,8 @@ void ImplPolygon::ImplSetSize( sal_uInt16 nNewSize, bool
bResize )
else
pNewAry = nullptr;
-delete[] mpPointAry;
+if ( mpPointAry )
+delete[] mpPointAry;
// take FlagArray into account, if applicable
if( mpFlagAry )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f501d151f85261f8c826089b936f2a1b5e81ff3 Author: Olivier Hallot Date: Sun Dec 10 10:15:45 2017 -0200 Updated core Project: help 9e89f79476859a19c376f0fdf029cc0600a39179 tdf#107601 rename t-test to Paired t-test in Help Note: The change in the interface is related to Data - Statistics - t-Test. Reference to Calc function =TTEST() are left unchanged. Change-Id: Ic83d177cbea14aa2fe49534cdf6bd363b0701d63 Reviewed-on: https://gerrit.libreoffice.org/46185 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 49abf8b92077..9e89f7947685 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 49abf8b9207718aab9d4ea943730314f71589d27 +Subproject commit 9e89f79476859a19c376f0fdf029cc0600a39179 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text
source/text/scalc/01/statistics.xhp| 20 +++- source/text/scalc/01/statistics_regression.xhp |2 +- 2 files changed, 12 insertions(+), 10 deletions(-) New commits: commit e741601dd05236be0f9412d8ba5df5314256d3c4 Author: Olivier Hallot Date: Sun Dec 10 10:15:45 2017 -0200 tdf#107601 rename t-test to Paired t-test in Help Note: The change in the interface is related to Data - Statistics - t-Test. Reference to Calc function =TTEST() are left unchanged. Change-Id: Ic83d177cbea14aa2fe49534cdf6bd363b0701d63 Reviewed-on: https://gerrit.libreoffice.org/46247 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/scalc/01/statistics.xhp b/source/text/scalc/01/statistics.xhp index 72b67c3d9..6a36c7904 100644 --- a/source/text/scalc/01/statistics.xhp +++ b/source/text/scalc/01/statistics.xhp @@ -1126,27 +1126,29 @@ Analysis toolpack;t-test +Analysis toolpack;paired t-test t-test;Analysis toolpack -Data statistics;t-test +paired t-test;Analysis toolpack +Data statistics;paired t-test -t-test -Calculates the t-Test of two data samples. +Paired t-test +Calculates the paired t-Test of two data samples. -Choose Data - Statistics - t-test +Choose Data - Statistics - Paired t-test -A t-test is any statistical hypothesis test that follows a Student's t distribution. -For more information on t-tests, refer to the http://en.wikipedia.org/wiki/T-test";>corresponding Wikipedia article. +A paired t-test is any statistical hypothesis test that follows a Student's t distribution. +For more information on paired t-tests, refer to the http://en.wikipedia.org/wiki/T-test";>corresponding Wikipedia article. Data Variable 1 range: The reference of the range of the first data series to analyze. Variable 2 range: The reference of the range of the second data series to analyze. Results to: The reference of the top left cell of the range where the test will be displayed. -Results for t-Test: -The following table shows the t-Test for the data series above: +Results for paired t-test: +The following table shows the paired t-test for the data series above: -t-test +paired t-test diff --git a/source/text/scalc/01/statistics_regression.xhp b/source/text/scalc/01/statistics_regression.xhp index 39ddea70b..d1f05b17e 100644 --- a/source/text/scalc/01/statistics_regression.xhp +++ b/source/text/scalc/01/statistics_regression.xhp @@ -319,7 +319,7 @@ - Sampling, Descriptive Statistics, Analysis of Variance (ANOVA), Correlation, Covariance, Exponential Smoothing, Moving Average, t-test, F-test, Z-test, Chi-square test. + Sampling, Descriptive Statistics, Analysis of Variance (ANOVA), Correlation, Covariance, Exponential Smoothing, Moving Average, Paired t-test, F-test, Z-test, Chi-square test. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/statistics.xhp| 20 +++- source/text/scalc/01/statistics_regression.xhp |2 +- 2 files changed, 12 insertions(+), 10 deletions(-) New commits: commit 9e89f79476859a19c376f0fdf029cc0600a39179 Author: Olivier Hallot Date: Sun Dec 10 10:15:45 2017 -0200 tdf#107601 rename t-test to Paired t-test in Help Note: The change in the interface is related to Data - Statistics - t-Test. Reference to Calc function =TTEST() are left unchanged. Change-Id: Ic83d177cbea14aa2fe49534cdf6bd363b0701d63 Reviewed-on: https://gerrit.libreoffice.org/46185 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/scalc/01/statistics.xhp b/source/text/scalc/01/statistics.xhp index 72b67c3d9..6a36c7904 100644 --- a/source/text/scalc/01/statistics.xhp +++ b/source/text/scalc/01/statistics.xhp @@ -1126,27 +1126,29 @@ Analysis toolpack;t-test +Analysis toolpack;paired t-test t-test;Analysis toolpack -Data statistics;t-test +paired t-test;Analysis toolpack +Data statistics;paired t-test -t-test -Calculates the t-Test of two data samples. +Paired t-test +Calculates the paired t-Test of two data samples. -Choose Data - Statistics - t-test +Choose Data - Statistics - Paired t-test -A t-test is any statistical hypothesis test that follows a Student's t distribution. -For more information on t-tests, refer to the http://en.wikipedia.org/wiki/T-test";>corresponding Wikipedia article. +A paired t-test is any statistical hypothesis test that follows a Student's t distribution. +For more information on paired t-tests, refer to the http://en.wikipedia.org/wiki/T-test";>corresponding Wikipedia article. Data Variable 1 range: The reference of the range of the first data series to analyze. Variable 2 range: The reference of the range of the second data series to analyze. Results to: The reference of the top left cell of the range where the test will be displayed. -Results for t-Test: -The following table shows the t-Test for the data series above: +Results for paired t-test: +The following table shows the paired t-test for the data series above: -t-test +paired t-test diff --git a/source/text/scalc/01/statistics_regression.xhp b/source/text/scalc/01/statistics_regression.xhp index 39ddea70b..d1f05b17e 100644 --- a/source/text/scalc/01/statistics_regression.xhp +++ b/source/text/scalc/01/statistics_regression.xhp @@ -319,7 +319,7 @@ - Sampling, Descriptive Statistics, Analysis of Variance (ANOVA), Correlation, Covariance, Exponential Smoothing, Moving Average, t-test, F-test, Z-test, Chi-square test. + Sampling, Descriptive Statistics, Analysis of Variance (ANOVA), Correlation, Covariance, Exponential Smoothing, Moving Average, Paired t-test, F-test, Z-test, Chi-square test. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a9d33ac7bfb177bddf250a6a88ca656662a5faa Author: Olivier Hallot Date: Sun Dec 10 10:15:45 2017 -0200 Updated core Project: help e741601dd05236be0f9412d8ba5df5314256d3c4 tdf#107601 rename t-test to Paired t-test in Help Note: The change in the interface is related to Data - Statistics - t-Test. Reference to Calc function =TTEST() are left unchanged. Change-Id: Ic83d177cbea14aa2fe49534cdf6bd363b0701d63 Reviewed-on: https://gerrit.libreoffice.org/46247 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 74ea25020163..e741601dd052 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 74ea250201630f2f0ad5b15bc11bf9f235268945 +Subproject commit e741601dd05236be0f9412d8ba5df5314256d3c4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdoashp.cxx | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit af77dff1c08313fd355d173eacff9267595f7087
Author: Caolán McNamara
Date: Mon Dec 11 09:16:37 2017 +
ofz#4583 Abrt
Change-Id: Id6e782cb09a76901cdd8c43b25eff3d53700ece7
Reviewed-on: https://gerrit.libreoffice.org/46216
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index bfc41acfd63c..11ba1cbbdf76 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -424,9 +425,15 @@ Reference< XCustomShapeEngine > const &
SdrObjCustomShape::GetCustomShapeEngine(
aPropValues[ 0 ].Name = "CustomShape";
aPropValues[ 0 ].Value <<= aXShape;
aArgument[ 0 ] <<= aPropValues;
-Reference< XInterface > xInterface(
xContext->getServiceManager()->createInstanceWithArgumentsAndContext( aEngine,
aArgument, xContext ) );
-if ( xInterface.is() )
-mxCustomShapeEngine.set( xInterface, UNO_QUERY );
+try
+{
+Reference
xInterface(xContext->getServiceManager()->createInstanceWithArgumentsAndContext(aEngine,
aArgument, xContext));
+if (xInterface.is())
+mxCustomShapeEngine.set( xInterface, UNO_QUERY );
+}
+catch (const css::loader::CannotActivateFactoryException&)
+{
+}
}
return mxCustomShapeEngine;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox
include/oox/drawingml/drawingmltypes.hxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3e38f8c507d9924fac00b6b7dffc6dafb98bb368
Author: Caolán McNamara
Date: Mon Dec 11 09:49:21 2017 +
ofz#4591 Integer-overflow
Change-Id: I97d527272f198a46485b98a8f26acd8daa42cab7
Reviewed-on: https://gerrit.libreoffice.org/46217
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/oox/drawingml/drawingmltypes.hxx
b/include/oox/drawingml/drawingmltypes.hxx
index 751f7865c374..689317505249 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -180,7 +181,7 @@ inline sal_Int64 convertHmmToEmu( sal_Int32 nValue )
inline sal_Int32 convertEmuToHmm( sal_Int64 nValue )
{
sal_Int32 nCorrection = (nValue > 0 ? 1 : -1) * EMU_PER_HMM / 2; // So
that the implicit floor will round.
-return getLimitedValue< sal_Int32, sal_Int64 >( (nValue + nCorrection) /
EMU_PER_HMM, SAL_MIN_INT32, SAL_MAX_INT32 );
+return getLimitedValue(o3tl::saturating_add(nValue, nCorrection) / EMU_PER_HMM,
SAL_MIN_INT32, SAL_MAX_INT32);
}
/** Converts the passed 64-bit integer value from EMUs to Points. */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |2 +
sw/qa/extras/ooxmlimport/data/tdf112443.docx|binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 10 ++
sw/source/core/doc/DocumentSettingManager.cxx |7
sw/source/core/inc/DocumentSettingManager.hxx |1
sw/source/core/layout/flylay.cxx|6
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 18
sw/source/filter/xml/xmlimp.cxx |7
sw/source/uibase/uno/SwXDocumentSettings.cxx| 17 +++
writerfilter/source/filter/WriterFilter.cxx |2 -
10 files changed, 67 insertions(+), 3 deletions(-)
New commits:
commit 8d62b79f168180c6992eb483ec864d473050635f
Author: Patrick Jaap
Date: Wed Nov 29 12:41:33 2017 +0100
tdf#112443 disable off-page content positioning
Disable the positioning for objects that are completely off-page.
During import, LO writer forces content always back to the page
and causes unwanted content on the page in constrast to MSO.
To achive this the top/left position of the content is compared to the
bottom/right border of the clipping region.
A new compatibility flag OFF_PAGE_POSITIONING is introduced for
legacy rendering of legacy documents.
A unit test demonstrates the issue.
It resolves tdf#112443.
Change-Id: I263c129f9f09ed909ad777a34f8b9ffc84d871e4
Reviewed-on: https://gerrit.libreoffice.org/43313
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index 6e9942bce66c..41b2c4ff79c3 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -81,6 +81,8 @@ enum class DocumentSettingId
SURROUND_TEXT_WRAP_SMALL,
PROP_LINE_SPACING_SHRINKS_FIRST_LINE,
SUBTRACT_FLYS,
+// tdf#112443 disable off-page content positioning
+DISABLE_OFF_PAGE_POSITIONING,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
HTML_MODE,
diff --git a/sw/qa/extras/ooxmlimport/data/tdf112443.docx
b/sw/qa/extras/ooxmlimport/data/tdf112443.docx
new file mode 100644
index ..385ce514c1c9
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf112443.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index cafef1d2ee53..4d65beeb90c4 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -118,7 +118,6 @@ public:
}
};
-
DECLARE_OOXMLIMPORT_TEST(testImageHyperlink, "image-hyperlink.docx")
{
OUString URL = getProperty(getShape(1), "HyperLinkURL");
@@ -1559,6 +1558,15 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
sal_Int32(-1), getProperty(xText, "CharColor"));
}
+
+DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
+{
+// the position of the flying text frame should be off page
+// 30624 below its anchor
+OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
+CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop );
+
+}
// tests should only be added to ooxmlIMPORT *if* they fail round-tripping in
ooxmlEXPORT
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx
b/sw/source/core/doc/DocumentSettingManager.cxx
index 47c513e1486e..77de92017537 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -87,7 +87,8 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc
&rDoc)
mbPropLineSpacingShrinksFirstLine(true),
mbSubtractFlys(false),
mApplyParagraphMarkFormatToNumbering(false),
-mbLastBrowseMode( false )
+mbLastBrowseMode( false ),
+mbDisableOffPagePositioning ( false )
// COMPATIBILITY FLAGS END
{
@@ -202,6 +203,7 @@ bool sw::DocumentSettingManager::get(/*[in]*/
DocumentSettingId id) const
case DocumentSettingId::EMBED_FONTS: return mEmbedFonts;
case DocumentSettingId::EMBED_SYSTEM_FONTS: return mEmbedSystemFonts;
case DocumentSettingId::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING:
return mApplyParagraphMarkFormatToNumbering;
+case DocumentSettingId::DISABLE_OFF_PAGE_POSITIONING: return
mbDisableOffPagePositioning;
default:
OSL_FAIL("Invalid setting id");
}
@@ -416,6 +418,9 @@ void sw::DocumentSettingManager::set(/*[in]*/
DocumentSettingId id, /*[in]*/ boo
case DocumentSettingId::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING:
mApplyParagraphMarkFormatToNumbering = value;
break;
+case DocumentSettingId::DISABLE_OFF_PAGE_POSITIONING:
+mbDisableOffPagePositioning = value;
+break;
default:
OSL_FAIL("Invalid setting id");
}
diff --git a/sw/source/core/inc/DocumentSetting
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - xmloff/source
xmloff/source/text/XMLIndexIllustrationSourceContext.cxx |2 +-
xmloff/source/text/XMLIndexTemplateContext.cxx | 12
xmloff/source/text/XMLIndexTemplateContext.hxx |1 +
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 267ef9428dd3713746f405a8a650defede3a4005
Author: Caolán McNamara
Date: Wed Dec 6 16:08:11 2017 +
tdf#71737: save allows links in illustration index, but load doesn't
since illustration index links were initially implemented by
commit 2c10d784deb86501b5488044a61d9fc2efc6321a
Date: Tue Jul 16 15:49:44 2013 +0200
fdo#39904, n#825976: implement hyperlinks for Illustrations index
(cherry picked from commit 8bb2c7f1556c10508c8ac451c579539ccf5dacfb)
Change-Id: I679fb9c40cd5dc55a5d546ef7c533faf9de2e483
Reviewed-on: https://gerrit.libreoffice.org/45967
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 523da0bfba2546552b4181e0268f41bc38a1903f)
Reviewed-on: https://gerrit.libreoffice.org/46108
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit f987cc2910ae90229ae7f76ed1dc9325b57b5cb6)
Reviewed-on: https://gerrit.libreoffice.org/46218
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index b8e6a2f5dcd1..7da521bbc8a8 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
@@ -63,7 +63,7 @@ SvXMLImportContext*
XMLIndexIllustrationSourceContext::CreateChildContext(
aLevelNameTableMap,
XML_TOKEN_INVALID, // no
outline-level attr
aLevelStylePropNameTableMap,
- aAllowedTokenTypesTable);
+
aIllustrationAllowedTokenTypesTable);
}
else
{
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx
b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 1498c5be39ba..9487cd539571 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -432,6 +432,18 @@ const SvXMLEnumMapEntry* aLevelNameTableMap =
nullptr;
const sal_Char* aLevelStylePropNameTableMap[] =
{ nullptr, "ParaStyleLevel1", nullptr };
+const bool aIllustrationAllowedTokenTypesTable[] =
+{
+true, // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
+true, // XML_TOK_INDEX_TYPE_TAB_STOP,
+true, // XML_TOK_INDEX_TYPE_TEXT,
+true, // XML_TOK_INDEX_TYPE_PAGE_NUMBER,
+true, // XML_TOK_INDEX_TYPE_CHAPTER,
+true, // XML_TOK_INDEX_TYPE_LINK_START,
+true, // XML_TOK_INDEX_TYPE_LINK_END,
+false // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY
+};
+
const bool aAllowedTokenTypesTable[] =
{
true, // XML_TOK_INDEX_TYPE_ENTRY_TEXT =
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx
b/xmloff/source/text/XMLIndexTemplateContext.hxx
index 09e141105b41..00bdd6509331 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -56,6 +56,7 @@ extern const bool aAllowedTokenTypesBibliography[];
// table, illustration and object tables:
extern const SvXMLEnumMapEntry* aLevelNameTableMap; // NULL: no
outline-level
extern const sal_Char* aLevelStylePropNameTableMap[];
+extern const bool aIllustrationAllowedTokenTypesTable[];
extern const bool aAllowedTokenTypesTable[];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - net/WebSocketHandler.hpp
net/WebSocketHandler.hpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e0b59b0da80db2e8c4f695b777d1710927241780
Author: Jan Holesovsky
Date: Mon Dec 11 15:27:29 2017 +0100
Fix an assert.
Change-Id: I5825a19740c0fa46c6cd14f067d0c1d3927c0c0b
Reviewed-on: https://gerrit.libreoffice.org/46234
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 149fd808..a534fdac 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -307,7 +307,7 @@ public:
int sendMessage(const char* data, const size_t len, const WSOpCode code,
const bool flush = true) const
{
int unitReturn = -1;
-if (UnitWSD::get().filterSendMessage(data, len, code, flush,
unitReturn))
+if (UnitBase::get().filterSendMessage(data, len, code, flush,
unitReturn))
return unitReturn;
//TODO: Support fragmented messages.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - net/WebSocketHandler.hpp
net/WebSocketHandler.hpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d55e313b9ec2e6325f916faf9f3a17a5eb0992ee
Author: Jan Holesovsky
Date: Mon Dec 11 15:27:29 2017 +0100
Fix an assert.
Change-Id: I5825a19740c0fa46c6cd14f067d0c1d3927c0c0b
Reviewed-on: https://gerrit.libreoffice.org/46235
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index cae461bc..1b37389d 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -316,7 +316,7 @@ public:
int sendMessage(const char* data, const size_t len, const WSOpCode code,
const bool flush = true) const
{
int unitReturn = -1;
-if (UnitWSD::get().filterSendMessage(data, len, code, flush,
unitReturn))
+if (UnitBase::get().filterSendMessage(data, len, code, flush,
unitReturn))
return unitReturn;
//TODO: Support fragmented messages.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/WebSocketHandler.hpp
net/WebSocketHandler.hpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 73d7aee2acbf63789169e10a4f3405afa71ece7a
Author: Jan Holesovsky
Date: Mon Dec 11 15:27:29 2017 +0100
Fix an assert.
Change-Id: I5825a19740c0fa46c6cd14f067d0c1d3927c0c0b
Reviewed-on: https://gerrit.libreoffice.org/46236
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index cae461bc..1b37389d 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -316,7 +316,7 @@ public:
int sendMessage(const char* data, const size_t len, const WSOpCode code,
const bool flush = true) const
{
int unitReturn = -1;
-if (UnitWSD::get().filterSendMessage(data, len, code, flush,
unitReturn))
+if (UnitBase::get().filterSendMessage(data, len, code, flush,
unitReturn))
return unitReturn;
//TODO: Support fragmented messages.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/source
tools/source/generic/poly.cxx | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 4b941b7b7fd79415935c8f2d3ce900eb64a40f66
Author: Caolán McNamara
Date: Mon Dec 11 12:36:24 2017 +
just delete, don't check for null and then delete
Change-Id: I4b3ebaadfe72c2c369ae6ad49abfb0d6626e9d71
Reviewed-on: https://gerrit.libreoffice.org/46228
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 664428426352..c00627965c64 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -516,11 +516,8 @@ bool ImplPolygon::operator==( const ImplPolygon&
rCandidate) const
ImplPolygon::~ImplPolygon()
{
-if ( mpPointAry )
-delete[] mpPointAry;
-
-if( mpFlagAry )
-delete[] mpFlagAry;
+delete[] mpPointAry;
+delete[] mpFlagAry;
}
void ImplPolygon::ImplInitDefault()
@@ -586,8 +583,7 @@ void ImplPolygon::ImplSetSize( sal_uInt16 nNewSize, bool
bResize )
else
pNewAry = nullptr;
-if ( mpPointAry )
-delete[] mpPointAry;
+delete[] mpPointAry;
// take FlagArray into account, if applicable
if( mpFlagAry )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/accfrmobjmap.cxx |8
sw/source/core/access/accfrmobjmap.hxx |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 48053ba5a110360b6d5eb19b6fb8a88e904b85c2
Author: Miklos Vajna
Date: Mon Dec 11 08:10:20 2017 +0100
sw: prefix members of SwAccessibleChildMap
Change-Id: Icf886da2ab2ed2b2b26efbaf6c889eef65f4
Reviewed-on: https://gerrit.libreoffice.org/46209
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/access/accfrmobjmap.cxx
b/sw/source/core/access/accfrmobjmap.cxx
index 9b43951c868a..03c46fd080f7 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -39,8 +39,8 @@ using namespace sw::access;
SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
const SwFrame& rFrame,
SwAccessibleMap& rAccMap )
-: nHellId(
rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetHellId() )
-, nControlsId(
rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetControlsId() )
+: mnHellId(
rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetHellId() )
+, mnControlsId(
rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetControlsId() )
{
const bool bVisibleChildrenOnly = SwAccessibleChild( &rFrame
).IsVisibleChildrenOnly();
@@ -135,9 +135,9 @@ std::pair< SwAccessibleChildMap::iterator, bool >
SwAccessibleChildMap::insert(
{
const SdrLayerID nLayer = pObj->GetLayer();
SwAccessibleChildMapKey::LayerId eLayerId =
-(nHellId == nLayer)
+(mnHellId == nLayer)
? SwAccessibleChildMapKey::HELL
-: ( (nControlsId == nLayer)
+: ( (mnControlsId == nLayer)
? SwAccessibleChildMapKey::CONTROLS
: SwAccessibleChildMapKey::HEAVEN );
SwAccessibleChildMapKey aKey( eLayerId, pObj->GetOrdNum() );
diff --git a/sw/source/core/access/accfrmobjmap.hxx
b/sw/source/core/access/accfrmobjmap.hxx
index 154554f52f6a..ed0b520e8c41 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -95,8 +95,8 @@ public:
typedef std::map::const_reverse_iterator
const_reverse_iterator;
private:
-const SdrLayerID nHellId;
-const SdrLayerID nControlsId;
+const SdrLayerID mnHellId;
+const SdrLayerID mnControlsId;
std::map maMap;
std::pair< iterator, bool > insert( const sal_uInt32 nPos,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmltab.cxx |2 ++
sw/source/filter/html/swhtml.cxx |9 -
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit b06ef4699e486368840bf0f7457debbe7f985ab0
Author: Caolán McNamara
Date: Sat Dec 9 19:37:36 2017 +
ofz: crash on null pTableNd
Change-Id: I9396afb40d75ee2463005a4501233dde1683f556
Reviewed-on: https://gerrit.libreoffice.org/46165
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index b8518a497f17..8f7dccdeb8ee 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2715,6 +2715,8 @@ const SwStartNode *SwHTMLParser::InsertTableSection(
sal_uInt16 nPoolId )
else
{
SwTableNode *pTableNd = pNd->FindTableNode();
+if (!pTableNd)
+throw std::runtime_error("missing table");
if( pTableNd->GetTable().GetHTMLTableLayout() )
{ // if there is already a HTMTableLayout, this table is already
finished
// and we have to look for the right table in the environment
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index bd4b8edb7878..1ddf9f741270 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -5533,7 +5533,14 @@ bool TestImportHTML(SvStream &rStream)
SwPaM aPaM( aIdx );
aPaM.GetPoint()->nContent.Assign(aIdx.GetNode().GetContentNode(), 0);
pD->SetInReading(true);
-bool bRet = xReader->Read(*pD, OUString(), aPaM, OUString()) ==
ERRCODE_NONE;
+bool bRet = false;
+try
+{
+bRet = xReader->Read(*pD, OUString(), aPaM, OUString()) ==
ERRCODE_NONE;
+}
+catch (const std::runtime_error&)
+{
+}
pD->SetInReading(false);
return bRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/JunitTest_sw_complex.mk sw/PythonTest_sw_python.mk sw/qa
sw/JunitTest_sw_complex.mk |6 --
sw/PythonTest_sw_python.mk |2 +-
sw/qa/complex/writer/TestDocument.java | 31 ---
3 files changed, 1 insertion(+), 38 deletions(-)
New commits:
commit c4d0cd148128ceec55b95407d637d42e27426966
Author: jmzambon
Date: Sun Dec 10 14:20:59 2017 +0100
tdf#97362: convert sw java complex tests to Python (#final)
Move test documents to python folder.
Delete remaining java helper class "TestDocument" and parent folder.
Change-Id: I76ba4e82e96b39df207c337fc1f17052b750774d
Reviewed-on: https://gerrit.libreoffice.org/46188
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 79b87a5094cb..d39f39f22515 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -19,15 +19,9 @@
$(eval $(call gb_JunitTest_JunitTest,sw_complex))
-$(eval $(call gb_JunitTest_set_defs,sw_complex,\
-$$(DEFS) \
-
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/complex/writer/testdocuments \
-))
-
$(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
sw/qa/complex/accessibility/AccessibleRelationSet \
sw/qa/complex/indeterminateState/CheckIndeterminateState \
-sw/qa/complex/writer/TestDocument \
))
$(eval $(call gb_JunitTest_use_jars,sw_complex,\
diff --git a/sw/PythonTest_sw_python.mk b/sw/PythonTest_sw_python.mk
index 2d1d8bb44eca..c47c5cbcbbd3 100644
--- a/sw/PythonTest_sw_python.mk
+++ b/sw/PythonTest_sw_python.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_PythonTest_PythonTest,sw_python))
$(eval $(call gb_PythonTest_set_defs,sw_python,\
-TDOC="$(SRCDIR)/sw/qa/complex/writer/testdocuments" \
+TDOC="$(SRCDIR)/sw/qa/python/testdocuments" \
))
$(eval $(call gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\
diff --git a/sw/qa/complex/writer/TestDocument.java
b/sw/qa/complex/writer/TestDocument.java
deleted file mode 100644
index da6c6d4573ae..
--- a/sw/qa/complex/writer/TestDocument.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package complex.writer;
-
-import java.io.File;
-import org.openoffice.test.OfficeFileUrl;
-import org.openoffice.test.Argument;
-
-final class TestDocument {
-public static String getUrl(String name) {
-return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name));
-}
-
-private TestDocument() {}
-}
diff --git a/sw/qa/complex/writer/testdocuments/CheckCrossReferences.odt
b/sw/qa/python/testdocuments/CheckCrossReferences.odt
similarity index 100%
rename from sw/qa/complex/writer/testdocuments/CheckCrossReferences.odt
rename to sw/qa/python/testdocuments/CheckCrossReferences.odt
diff --git a/sw/qa/complex/writer/testdocuments/CheckFlies.odt
b/sw/qa/python/testdocuments/CheckFlies.odt
similarity index 100%
rename from sw/qa/complex/writer/testdocuments/CheckFlies.odt
rename to sw/qa/python/testdocuments/CheckFlies.odt
diff --git a/sw/qa/complex/writer/testdocuments/TESTMETA.odt
b/sw/qa/python/testdocuments/TESTMETA.odt
similarity index 100%
rename from sw/qa/complex/writer/testdocuments/TESTMETA.odt
rename to sw/qa/python/testdocuments/TESTMETA.odt
diff --git a/sw/qa/complex/writer/testdocuments/TESTXMLID.odt
b/sw/qa/python/testdocuments/TESTXMLID.odt
similarity index 100%
rename from sw/qa/complex/writer/testdocuments/TESTXMLID.odt
rename to sw/qa/python/testdocuments/TESTXMLID.odt
diff --git a/sw/qa/complex/writer/testdocuments/fdo39694.ott
b/sw/qa/python/testdocuments/fdo39694.ott
similarity index 100%
rename from sw/qa/complex/writer/testdocuments/fdo39694.ott
rename to sw/qa/python/testdocuments/fdo39694.ott
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - config_host/config_gpgme.h.in configure.ac xmlsecurity/qa
config_host/config_gpgme.h.in |3 +++
configure.ac| 17 -
xmlsecurity/qa/unit/signing/signing.cxx | 20 +++-
3 files changed, 26 insertions(+), 14 deletions(-)
New commits:
commit e52e0403d42f7a0c29700cda3d5791915ae95297
Author: Thorsten Behrens
Date: Fri Dec 8 00:10:42 2017 +0100
gpg4libre: check if we can really verify OpenPGP signatures
And disable unit tests otherwise
Change-Id: I32e1d8d2f8b0013d9cb43b78a55d23a1a29a8e8d
Reviewed-on: https://gerrit.libreoffice.org/46057
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 7886de305809e265cd2126d39912147131d3a004)
Reviewed-on: https://gerrit.libreoffice.org/46191
Reviewed-by: Rene Engelhard
diff --git a/config_host/config_gpgme.h.in b/config_host/config_gpgme.h.in
index a8435bd0aa43..7e46f3703ec3 100644
--- a/config_host/config_gpgme.h.in
+++ b/config_host/config_gpgme.h.in
@@ -16,6 +16,9 @@
// Defined if gpgme support is available
#define HAVE_FEATURE_GPGME 0
+// Defined if gpg and gpgme signature verification is available
+#define HAVE_FEATURE_GPGVERIFY 0
+
#if HAVE_FEATURE_GPGME
# include "config_lgpl.h"
#endif
diff --git a/configure.ac b/configure.ac
index d65ade3281fd..6a6aac317628 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,9 +133,16 @@ dnl path location is git, so make sure we have it
if test -n "$mac_git_path" -a -x "$mac_git_path" -a "$mac_git_path" !=
"/usr/bin/git" ; then
mac_path="$mac_path:`dirname $mac_git_path`"
fi
+dnl a not so common but nevertheless quite helpful thing that may be in a fancy
+dnl path location is gpg, so make sure we find it
+mac_gpg_path=`which gpg 2>/dev/null`
+if test -n "$mac_gpg_path" -a -x "$mac_gpg_path" -a "$mac_gpg_path" !=
"/usr/bin/gpg" ; then
+mac_path="$mac_path:`dirname $mac_gpg_path`"
+fi
PATH="$mac_path"
unset mac_path
-unset git_mac_path
+unset mac_git_path
+unset mac_gpg_path
}
echo ""
@@ -10172,6 +10179,14 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin" \
fi
ENABLE_GPGMEPP=TRUE
AC_DEFINE([HAVE_FEATURE_GPGME])
+AC_PATH_PROG(GPG, gpg)
+# TODO: Windows's cygwin gpg does not seem to work with our gpgme,
+# so let's exclude that manually for the moment
+if test -n "$GPG" -a "$_os" != "WINNT"; then
+# make sure we not only have a working gpgme, but a full working
+# gpg installation to run OpenPGP signature verification
+AC_DEFINE([HAVE_FEATURE_GPGVERIFY])
+fi
fi
AC_SUBST(ENABLE_GPGMEPP)
AC_SUBST(SYSTEM_GPGMEPP)
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx
b/xmlsecurity/qa/unit/signing/signing.cxx
index 9ea266907bcb..7e737f8f3bd4 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
@@ -103,8 +104,7 @@ public:
void testXAdESGood();
/// Test importing of signature line images
void testSignatureLineImages();
-#ifdef LINUX
-# if HAVE_FEATURE_GPGME
+#if HAVE_FEATURE_GPGVERIFY
/// Test a typical ODF where all streams are GPG-signed.
void testODFGoodGPG();
/// Test a typical ODF where all streams are GPG-signed, but we don't
trust the signature.
@@ -113,7 +113,6 @@ public:
void testODFBrokenStreamGPG();
/// Test a typical broken ODF signature where the XML dsig hash is
corrupted.
void testODFBrokenDsigGPG();
-# endif
#endif
CPPUNIT_TEST_SUITE(SigningTest);
CPPUNIT_TEST(testDescription);
@@ -137,13 +136,11 @@ public:
CPPUNIT_TEST(testXAdES);
CPPUNIT_TEST(testXAdESGood);
CPPUNIT_TEST(testSignatureLineImages);
-#ifdef LINUX
-# if HAVE_FEATURE_GPGME
+#if HAVE_FEATURE_GPGVERIFY
CPPUNIT_TEST(testODFGoodGPG);
CPPUNIT_TEST(testODFUntrustedGoodGPG);
CPPUNIT_TEST(testODFBrokenStreamGPG);
CPPUNIT_TEST(testODFBrokenDsigGPG);
-# endif
#endif
CPPUNIT_TEST_SUITE_END();
@@ -177,15 +174,14 @@ void SigningTest::setUp()
osl::FileBase::getSystemPathFromFileURL(aTargetDir, aTargetPath);
setenv("MOZILLA_CERTIFICATE_FOLDER", aTargetPath.toUtf8().getStr(), 1);
#endif
-#ifdef LINUX
-# if HAVE_FEATURE_GPGME
+#if HAVE_FEATURE_GPGVERIFY
// Make gpg use our own defined setup below data dir
OUString aHomePath;
osl::FileBase::getSystemPathFromFileURL(
m_directories.getURLFromSrc(DATA_DIRECTORY),
aHomePath);
-setenv("GNUPGHOME", aHomePath.toUtf8().getStr(), 1);
-# endif
+OUString envVar("GNUPGHOME");
+osl_setEnvironment(envVar.pData, aHomePath.pData);
#endif
}
@@ -687,8 +683,7 @@ void SigningTest::testSignatureLineImages()
CPPUNIT_ASSERT(xSignatureInfo[0].InvalidSignatureLineImage.is());
}
-#ifdef LINUX
-# if HAVE_FEATURE_GPGME
+#if HAVE_FEATURE_GPGVERIFY
void SigningTest::tes
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - scp2/source
scp2/source/ooo/file_font_ooo.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9bfe3a3386e643ad90e984ae35b43cd3a9a38c69 Author: Caolán McNamara Date: Fri Dec 8 10:53:28 2017 + fix mac build wrt fontconfig conf file Change-Id: Ic13ea258773ad68ba295d29078eaf69365f951c9 Reviewed-on: https://gerrit.libreoffice.org/46086 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 08ba609ff397..e9207797fbc8 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -69,7 +69,7 @@ STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist") // fontconfig updates to allow proper use of local fonts -#ifdef UNX +#ifdef USING_X11 #ifndef WITHOUT_FONTS File gid_File_FcLocal_Conf Dir = FILELIST_DIR; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/frmdlg/column.cxx |4 sw/source/uibase/inc/column.hxx |3 ++- sw/uiconfig/swriter/ui/columnpage.ui | 30 +++--- 3 files changed, 9 insertions(+), 28 deletions(-) New commits: commit 18aaca86fc0733244f36b761479c8dd476752a30 Author: Gabor Kelemen Date: Sat Dec 9 23:30:48 2017 +0100 tdf#113959 Use svxlo-FrameDirectionListBox instead of ListBox Reduce number of translatable strings in columnpage.ui Change-Id: Id3d8744bed8ac8366b10f93fa8e38803316eeb82 Reviewed-on: https://gerrit.libreoffice.org/46171 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index db28e793044a..af6561a7a594 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -435,6 +435,10 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) connectPercentField(m_aDistEd1, "spacing1mf"); connectPercentField(m_aDistEd2, "spacing2mf"); +m_pTextDirectionLB->InsertEntryValue( SvxResId( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB ); +m_pTextDirectionLB->InsertEntryValue( SvxResId( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB ); +m_pTextDirectionLB->InsertEntryValue( SvxResId( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment ); + SetExchangeSupport(); m_pDefaultVS->SetColCount( 5 ); diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 531a914c3445..f64843fecd03 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include "colex.hxx" #include "prcntfld.hxx" @@ -114,7 +115,7 @@ class SwColumnPage : public SfxTabPage VclPtrm_pLinePosDLB; VclPtr m_pTextDirectionFT; -VclPtrm_pTextDirectionLB; +VclPtrm_pTextDirectionLB; // Example VclPtr m_pPgeExampleWN; diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui index fe1880b9caf1..1ce5640810cf 100644 --- a/sw/uiconfig/swriter/ui/columnpage.ui +++ b/sw/uiconfig/swriter/ui/columnpage.ui @@ -1,8 +1,8 @@ + - 1 20 @@ -47,28 +47,6 @@ gtk-go-forward 1 - - - - - - - - - -Left-to-right -0 - - -Right-to-left -1 - - -Use superordinate object settings -4 - - - @@ -733,11 +711,9 @@ - + +True False -True -True -liststore1 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfimport/rtfimport.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit d2ddc267e2015cd1cbe607eb7680d00a8cfa1965
Author: Mike Kaganski
Date: Mon Dec 11 09:52:34 2017 +0200
Enable RTF import tests on Windows
Change-Id: I4c14679d5cb91dc3cf35c3f47cb9120d3ee0f9cf
Reviewed-on: https://gerrit.libreoffice.org/46212
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8f6d767f96a6..6dfb347cc6db 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -87,8 +87,6 @@ protected:
AllSettings m_aSavedSettings;
};
-#if !defined(_WIN32)
-
DECLARE_RTFIMPORT_TEST(testN695479, "n695479.rtf")
{
uno::Reference xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -750,7 +748,6 @@ public:
};
CPPUNIT_TEST_SUITE_REGISTRATION(testTdf105511);
-#endif
DECLARE_RTFIMPORT_TEST(testContSectionPageBreak, "cont-section-pagebreak.rtf")
{
uno::Reference xParaSecond = getParagraph(2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/frame.hxx|6 ++
include/sfx2/viewfrm.hxx |4 ++--
sfx2/source/view/frame.cxx|8
sfx2/source/view/impframe.hxx |4 ++--
sfx2/source/view/viewfrm.cxx |4 ++--
5 files changed, 12 insertions(+), 14 deletions(-)
New commits:
commit 7c98099c2577084cc807a4928756e3e7e8600061
Author: Noel Grandin
Date: Mon Dec 11 11:16:56 2017 +0200
convert SFXFRAME_HASTITLE to bool field
this is the only flag we are setting in the "type" field, so simplify
Change-Id: I6079750b915f55486bf815a27d48f673af59bdb0
Reviewed-on: https://gerrit.libreoffice.org/46214
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 94c46d6ad05d..0c616483 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -76,8 +76,6 @@ class SystemWindow;
typedef ::std::vector TargetList;
-#define SFXFRAME_HASTITLE 0x0001
-
// SfxFrame is a management class for windows and their content.
// A SfxApplication represent a hierarchy of SfxFrames, with which the actual
@@ -124,7 +122,7 @@ public:
SfxObjectShell* GetCurrentDocument() const;
SfxViewFrame* GetCurrentViewFrame() const;
-sal_uInt32 GetFrameType() const;
+boolGetHasTitle() const;
static void GetDefaultTargetList( TargetList& );
voidUpdateDescriptor( SfxObjectShell const *pDoc );
voidResize();
@@ -141,7 +139,7 @@ public:
SAL_DLLPRIVATE void SetFrameInterface_Impl( const css::uno::Reference<
css::frame::XFrame >& rFrame );
SAL_DLLPRIVATE void ReleasingComponent_Impl();
SAL_DLLPRIVATE void GetViewData_Impl();
-SAL_DLLPRIVATE void SetFrameType_Impl( sal_uInt32 );
+SAL_DLLPRIVATE void SetHasTitle( bool );
SAL_DLLPRIVATE bool PrepareClose_Impl( bool bUI );
SAL_DLLPRIVATE bool DocIsModified_Impl();
SAL_DLLPRIVATE void SetCurrentViewFrame_Impl( SfxViewFrame* );
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 333e055c6996..3c66418fa6fb 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -146,8 +146,8 @@ public:
SfxViewFrame* GetTopViewFrame() const;
boolDoClose();
-sal_uIntPtr GetFrameType() const
-{ return GetFrame().GetFrameType(); }
+boolGetHasTitle() const
+{ return GetFrame().GetHasTitle(); }
static void GetTargetList( TargetList& rList )
{ SfxFrame::GetDefaultTargetList( rList ); }
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 8d940ba05bac..b772c62534dc 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -277,14 +277,14 @@ void SfxFrame::SetCurrentViewFrame_Impl( SfxViewFrame
*pFrame )
pImpl->pCurrentViewFrame = pFrame;
}
-sal_uInt32 SfxFrame::GetFrameType() const
+bool SfxFrame::GetHasTitle() const
{
-return pImpl->nType;
+return pImpl->mbHasTitle;
}
-void SfxFrame::SetFrameType_Impl( sal_uInt32 n )
+void SfxFrame::SetHasTitle( bool n )
{
-pImpl->nType = n;
+pImpl->mbHasTitle = n;
}
void SfxFrame::GetViewData_Impl()
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 25b4a392d4fd..b5f3413d2894 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -36,7 +36,7 @@ class SfxFrame_Impl : public SfxBroadcaster
{
public:
css::uno::Reference< css::frame::XFrame > xFrame;
-sal_uInt32nType;
+bool mbHasTitle;
SfxViewFrame* pCurrentViewFrame;
SfxFrameDescriptor* pDescr;
bool bClosing : 1;
@@ -54,7 +54,7 @@ public:
bool bMenuBarOn;
explicit SfxFrame_Impl()
-:nType( 0 )
+:mbHasTitle( false )
,pCurrentViewFrame( nullptr )
,pDescr( nullptr )
,bClosing(false)
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index e6db9e2d4fee..e168ac8068bf 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1012,7 +1012,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
m_xObjSh->DoClose();
SfxObjectShellRef xDyingObjSh = m_xObjSh;
m_xObjSh.clear();
-if( ( GetFrameType() & SFXFRAME_HASTITLE ) && m_pImpl->nDocViewNo )
+if( GetHasTitle() && m_pImpl->nDocViewNo )
xDyingObjSh->GetNoSet_Impl().ReleaseIndex(m_pImpl->nDocViewNo-1);
if ( m_pImpl->bObjLocked )
{
@@ -1350,7 +1350,7 @@ SfxViewFrame::SfxViewFrame
{
rFrame.SetCurrentViewFrame_Impl( this );
-rFrame.SetFrameType_Impl( GetFrameType() | SFXFRAME_HASTITLE );
+rFrame.SetHasTitle( true );
Construct_Impl( pObjShell );
m_pImpl->pWindow = VclPtr::Create( this,
r
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/rtfexport/data/tdf114333.rtf|5 +
sw/qa/extras/rtfexport/data/tdf97035.rtf |2 +-
sw/qa/extras/rtfexport/rtfexport2.cxx|4 ++--
sw/qa/extras/rtfexport/rtfexport3.cxx| 12
sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
sw/source/filter/ww8/rtfattributeoutput.cxx | 21 +
writerfilter/source/rtftok/rtfdispatchsymbol.cxx |5 +++--
writerfilter/source/rtftok/rtfdispatchvalue.cxx |8
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8
writerfilter/source/rtftok/rtfdocumentimpl.hxx |4
10 files changed, 45 insertions(+), 26 deletions(-)
New commits:
commit 0f9a596aa853b4f2beeff25c131246a7b31492a4
Author: Mike Kaganski
Date: Fri Dec 8 17:52:56 2017 +0300
tdf#114333: consider trleft for 1st cell width on import; don't...
... recalculate cell widths by factor pagewidth/tablewidth on export
This makes the import and export symmetrical.
Unit test included.
Some existing unit tests were updated:
- testTdf97035: the previous width of B1 cell (3571 twips) was not
stable enough on round-trip. Old code saved table with wrong width,
and incidentally that made it to output correct width of the cell.
New code outputs table width correctly, and drops unneeded cell width
adjustment on export, so the rounding error on initial import makes
output cell width wrong.
We have a cumbersome arithmetics to import cell widths from RTF:
1. In DomainMapperTableManager::sprm (case
NS_ooxml::LN_CT_TblGridBase_gridCol)
we do convertTwipToMM100 on initial sizes in twips;
2. Then, in DomainMapperTableManager::endOfRowAction, we do
rtl::math::round((fGridWidth * 1) / nFullWidthRelative) on the
mm100 sizes (the 1 is UNO_TABLE_COLUMN_SUM from unotbl.cxx, which
allows to measure cell widths in 100ths of percent of table's width
instead of absolute sizes)
3. Last, in SwTable::NewSetTabCols, we do
lcl_MulDiv64(nNewPos, rParm.nNewWish, nNewWidth)
where rParm.nNewWish is table's width in twips (again), and nNewWidth
is 1. So, the three permutations give us twips back, but rounding
errors may make result differ from initial value (as in case of cell
width 1927 twips and table width 15527 twips, which results in 1926).
The unstable width that resulted in roundtrip error was changed by 1.
The changed unit test file is checked to still correctly test tdf#97035
- testFdo55525: previously, the testdoc was imported with wrong width
(too narrow); that caused rounding error on cell width calculation.
Current tested value is more correct.
Change-Id: I69112521c35b316ed6df11d5e4ff7336534164bd
Reviewed-on: https://gerrit.libreoffice.org/46094
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/extras/rtfexport/data/tdf114333.rtf
b/sw/qa/extras/rtfexport/data/tdf114333.rtf
new file mode 100644
index ..3c2097575aed
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf114333.rtf
@@ -0,0 +1,5 @@
+{\rtf1
+\trowd\trleft4820\cellx9638
+aaa\cell
+\row
+\par }
\ No newline at end of file
diff --git a/sw/qa/extras/rtfexport/data/tdf97035.rtf
b/sw/qa/extras/rtfexport/data/tdf97035.rtf
index a8f1d8a43e81..da0112436112 100644
--- a/sw/qa/extras/rtfexport/data/tdf97035.rtf
+++ b/sw/qa/extras/rtfexport/data/tdf97035.rtf
@@ -125,7 +125,7 @@
}
}\f3 \li0 \strike0 \ul0 \b0 \ql \fs16 \ri0 \cf1 \i0 \intbl \cell \row }}{
{\trowd \itap0 \trleft0
-\clpadt60 \clpadft3 \clpadr60 \clpadfr3 \clbrdrl \trql \clvertalc \cellx3571
+\clpadt60 \clpadft3 \clpadr60 \clpadfr3 \clbrdrl \trql \clvertalc \cellx3572
\clpadt60 \clpadft3 \clpadr60 \clpadfr3 \trql \clvertalc \cellx15418
\intbl
{\li0 \f3 \b0 \ql \ri0 \fs20 \cf1 \i0
diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx
b/sw/qa/extras/rtfexport/rtfexport2.cxx
index 99a8ed9abd4a..60032e92a145 100644
--- a/sw/qa/extras/rtfexport/rtfexport2.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport2.cxx
@@ -1838,9 +1838,9 @@ DECLARE_RTFEXPORT_TEST(testTdf97035, "tdf97035.rtf")
uno::UNO_QUERY);
uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
-// First cell width of the second row should be 2299
+// First cell width of the second row should be 2300
uno::Reference xTableRows(xTable->getRows(),
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int16(2299),
getProperty>(
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2300),
getProperty>(
xTableRows->getByIndex(1),
"TableColumnSeparators")[0]
.Position);
}
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 0c63f23972e0..c8941ed26633 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexpor
[Libreoffice-commits] dev-tools.git: 2 commits - esc-reporting/qa-tools.py
esc-reporting/qa-tools.py | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 6439e1187183696077adee99c654655f1c30f88b
Author: Xisco Fauli
Date: Mon Dec 11 11:41:06 2017 +0100
QA tools: Fix incorrect statement
diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index 9900029..01e0068 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -631,7 +631,7 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
newSystem = change['added']
util_increase_user_actions(statList, rowId,
actionMail, bugTargets, 'system_changed', actionDate)
-if actionDate >= cfg['reportPeriod'] and newSystem not
in row['op_sys']:
+if actionDate >= cfg['reportPeriod'] and newSystem in
row['op_sys']:
statList['weeklyReport']['system_changed'][newSystem]['id'].append(rowId)
statList['weeklyReport']['system_changed'][newSystem]['author'].append(actionMail)
commit 27213efcd379ac2dcb28d68e93544ff80f8ed2e6
Author: Xisco Fauli
Date: Mon Dec 11 11:35:41 2017 +0100
QA tools: Sort metabug lists by aliases
Requested by Thomas Lendo
diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index 9d49f22..9900029 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -872,7 +872,15 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
def util_print_QA_line_weekly(fp, statList, dValue, action, isMetabug=False):
-for key, value in dValue.items():
+#Replace metabugs keys by aliases
+if isMetabug:
+dValueAux = {}
+for key, value in dValue.items():
+if int(key) in statList['bugs']['metabugAlias']:
+dValueAux[statList['bugs']['metabugAlias'][int(key)][0]] =
dValue[key]
+dValue = dValueAux
+
+for key, value in sorted(dValue.items()):
if value['id']:
nBugs = len(value['id'])
if nBugs == 1:
@@ -883,8 +891,6 @@ def util_print_QA_line_weekly(fp, statList, dValue, action,
isMetabug=False):
aux2 = 'bugs'
if action == 'added' or action == 'removed':
-if isMetabug and int(key) in statList['bugs']['metabugAlias']:
-key = statList['bugs']['metabugAlias'][int(key)][0]
aux3 = 'to'
if action == 'removed':
aux3 = 'from'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Weekly QA Report (W49-2017)
Hello, What have happened in QA in the last 7 days? * 146 bugs have been created, of which, 70 are still unconfirmed ( Total Unconfirmed bugs: 407 ) Link: http://tinyurl.com/yadueerr * 1243 comments have been written. == STATUSES CHANGED == * 19 bugs have been changed to 'ASSIGNED'. Link: http://tinyurl.com/y6ujtjjd Done by: Xisco Faulí ( 6 ), Yousuf Philips (jay) ( 2 ), frk.grd ( 2 ), Miklos Vajna ( 1 ), Heiko Tietze ( 1 ), robert.ban102 ( 1 ), Muhammet Kara ( 1 ), Gabor Kelemen ( 1 ), Tamas Bunth ( 1 ), Aron Budea ( 1 ), Martin Bakos ( 1 ), Ahmed GHANMI ( 1 ) * 6 bugs have been changed to 'CLOSED'. Link: http://tinyurl.com/yb9l9eta Done by: Eike Rathke ( 4 ), Harald Koester ( 2 ) * 15 bugs have been changed to 'NEEDINFO'. Link: http://tinyurl.com/y89662dr Done by: Xisco Faulí ( 3 ), V Stuart Foote ( 2 ), Julien Nabet ( 2 ), raal ( 2 ), Jacques Guilleron ( 2 ), Buovjaga ( 1 ), Yousuf Philips (jay) ( 1 ), m.a.riosv ( 1 ), tommy27 ( 1 ) * 45 bugs have been changed to 'NEW'. Link: http://tinyurl.com/y8gyhmkj Done by: Xisco Faulí ( 10 ), Yousuf Philips (jay) ( 10 ), Heiko Tietze ( 4 ), XTR ( 2 ), Kevin Suo ( 2 ), Sophia Schroeder ( 2 ), Aron Budea ( 2 ), Tamás Zolnai ( 1 ), Miklos Vajna ( 1 ), Buovjaga ( 1 ), Julien Nabet ( 1 ), raal ( 1 ), MM ( 1 ), Olivier Hallot ( 1 ), nigeldias2012 ( 1 ), Jacques Guilleron ( 1 ), frk.grd ( 1 ), Adolfo Jayme ( 1 ), Tamas Bunth ( 1 ), tommy27 ( 1 ) * 3 bugs have been changed to 'REOPENED'. Link: http://tinyurl.com/yalputos Done by: Uwe Brauer ( 1 ), Horst ( 1 ), Dieter Praas ( 1 ) * 32 bugs have been changed to 'RESOLVED DUPLICATE'. Link: http://tinyurl.com/y8okfn49 Done by: Xisco Faulí ( 5 ), Regina Henschel ( 4 ), Maxim Monastirsky ( 4 ), Gabor Kelemen ( 3 ), Telesto ( 2 ), Volga ( 2 ), Yousuf Philips (jay) ( 2 ), Mark Hung ( 2 ), V Stuart Foote ( 1 ), Buovjaga ( 1 ), robert ( 1 ), m.a.riosv ( 1 ), Kamil Landa ( 1 ), Timur ( 1 ), Caolán McNamara ( 1 ), Aron Budea ( 1 ) * 38 bugs have been changed to 'RESOLVED FIXED'. Link: http://tinyurl.com/ydhczprn Done by: Eike Rathke ( 4 ), Xisco Faulí ( 3 ), Thorsten Behrens (CIB) ( 3 ), Szymon Kłos ( 3 ), Yousuf Philips (jay) ( 3 ), Maxim Monastirsky ( 3 ), Miklos Vajna ( 2 ), Olivier Hallot ( 2 ), Muhammet Kara ( 2 ), Michael Stahl ( 2 ), Tamas Bunth ( 2 ), Tamás Zolnai ( 1 ), Buovjaga ( 1 ), Heiko Tietze ( 1 ), Kevin Suo ( 1 ), Sophia Schroeder ( 1 ), Mark Hung ( 1 ), tagezi ( 1 ), G Karunakar ( 1 ), Caolán McNamara ( 1 ) * 38 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'. Link: http://tinyurl.com/yc4uwjsa Done by: qa-admin ( 37 ), V Stuart Foote ( 1 ) * 6 bugs have been changed to 'RESOLVED INVALID'. Link: http://tinyurl.com/yd9luffw Done by: Buovjaga ( 2 ), PaulJayD ( 1 ), Clemens Prill ( 1 ), charmeesri ( 1 ), Joerg ( 1 ) * 8 bugs have been changed to 'RESOLVED NOTABUG'. Link: http://tinyurl.com/ybrlf6ym Done by: Sahil Yadav ( 2 ), Buovjaga ( 2 ), Xisco Faulí ( 1 ), Telesto ( 1 ), raal ( 1 ), Bob ( 1 ) * 2 bugs have been changed to 'RESOLVED NOTOURBUG'. Link: http://tinyurl.com/ycswc6zr Done by: Alex Thurgood ( 1 ), Fabien ( 1 ) * 8 bugs have been changed to 'RESOLVED WONTFIX'. Link: http://tinyurl.com/y966fkmp Done by: Heiko Tietze ( 5 ), Xisco Faulí ( 1 ), V Stuart Foote ( 1 ), Olivier Hallot ( 1 ) * 34 bugs have been changed to 'RESOLVED WORKSFORME'. Link: http://tinyurl.com/ybvd846u Done by: Xisco Faulí ( 5 ), Buovjaga ( 5 ), Heiko Tietze ( 4 ), Telesto ( 2 ), Mike ( 2 ), Aron Budea ( 2 ), V Stuart Foote ( 1 ), Thomas Lendo ( 1 ), fossterer ( 1 ), Marcin Segit ( 1 ), Samuel Mehrbrodt (CIB) ( 1 ), ralf.fehlau ( 1 ), l2683566 ( 1 ), John F. Ervin ( 1 ), Peter Roelofsen ( 1 ), Adolfo Jayme ( 1 ), Christian Lohmaier ( 1 ), bernie ( 1 ), tommy27 ( 1 ), Afief Halumi ( 1 ) * 11 bugs have been changed to 'UNCONFIRMED'. Link: http://tinyurl.com/y8dq8noy Done by: Buovjaga ( 1 ), Telesto ( 1 ), sindarus ( 1 ), Pedro ( 1 ), Matthew Kogan ( 1 ), Ganton ( 1 ), John Thomas Lenaghan ( 1 ), jeanmarcranger ( 1 ), Harald Koester ( 1 ), Dilshod ( 1 ), Cor Nouws ( 1 ) * 7 bugs have been changed to 'VERIFIED FIXED'. Link: http://tinyurl.com/ycsdhmfs Done by: Xisco Faulí ( 3 ), Kevin Suo ( 1 ), Julien Nabet ( 1 ), steve -_- ( 1 ), Justin L ( 1 ) == KEYWORDS ADDED == * 'bibisectRequest' has been added to 4 bugs. Link: http://tinyurl.com/y8lguy2p Done by: Miklos Vajna ( 1 ), Buovjaga ( 1 ), Yousuf Philips (jay) ( 1 ), Aron Budea ( 1 ) * 'bibisected' has been added to 14 bugs. Link: http://tinyurl.com/ycjrjlw5 Done by: Xisco Faulí ( 12 ), Kevin Suo ( 1 ), raal ( 1 ) * 'bisected' has been added to 12 bugs. Link: http://tinyurl.com/y9q7rtne Done by: Xisco Faulí ( 11 ), raal ( 1 ) * 'dataLoss' has been added to 1 bug. Link: http://tinyurl.com/y9yvkzvp Done by: Aron Budea ( 1 ) * 'easyHack' has been added to 3 bugs. Link:
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/core/data/formulacell.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit a63e8a7fa3b0f98501e8bc20a1adf6ca235a7dd1 Author: Caolán McNamara Date: Sun Dec 10 20:15:31 2017 + tdf#114342 move recursion guard to encompass threaded path too Change-Id: If815d3faeb72fd8a176225fb80f87ee584ece3ba Reviewed-on: https://gerrit.libreoffice.org/46215 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 2f541d8514c7..06c3bb70eb76 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -4342,6 +4342,12 @@ bool ScFormulaCell::InterpretFormulaGroup() return false; } +// Guard against endless recursion of Interpret() calls, for this to work +// ScFormulaCell::InterpretFormulaGroup() must never be called through +// anything else than ScFormulaCell::Interpret(), same as +// ScFormulaCell::InterpretTail() +RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this); + if (!bThreadingProhibited && !ScCalcConfig::isOpenCLEnabled() && pCode->GetVectorState() == FormulaVectorEnabledForThreading && officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get()) @@ -4478,12 +4484,6 @@ bool ScFormulaCell::InterpretFormulaGroup() return false; } -// Guard against endless recursion of Interpret() calls, for this to work -// ScFormulaCell::InterpretFormulaGroup() must never be called through -// anything else than ScFormulaCell::Interpret(), same as -// ScFormulaCell::InterpretTail() -RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this); - // TODO : Disable invariant formula group interpretation for now in order // to get implicit intersection to work. if (mxGroup->mbInvariant && false) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/salcall.cxx |7 +++
compilerplugins/clang/test/salcall.cxx | 12 ++--
2 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 492afb35b4fbec18be5e2695ea747e8fac50b890
Author: Stephan Bergmann
Date: Sun Dec 10 23:18:17 2017 +0100
Improve loplugin:salcall error reporting
Change-Id: I214052491e90eb4147bf79d6fd3927266638c686
Reviewed-on: https://gerrit.libreoffice.org/46203
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/salcall.cxx
b/compilerplugins/clang/salcall.cxx
index 3b291cb79f56..250994c07f5e 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -191,11 +191,10 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
else if (bDeclIsSalCall)
{
// not fine
-report(DiagnosticsEngine::Warning, "SAL_CALL inconsistency",
- canonicalDecl->getLocation())
-<< canonicalDecl->getSourceRange();
-report(DiagnosticsEngine::Note, "SAL_CALL inconsistency",
decl->getLocation())
+report(DiagnosticsEngine::Warning, "SAL_CALL inconsistency",
decl->getLocation())
<< decl->getSourceRange();
+report(DiagnosticsEngine::Note, "SAL_CALL inconsistency",
canonicalDecl->getLocation())
+<< canonicalDecl->getSourceRange();
return true;
}
}
diff --git a/compilerplugins/clang/test/salcall.cxx
b/compilerplugins/clang/test/salcall.cxx
index 736bb27a3b6a..5a30fb0f 100644
--- a/compilerplugins/clang/test/salcall.cxx
+++ b/compilerplugins/clang/test/salcall.cxx
@@ -31,9 +31,9 @@ void SAL_CALL Class1::method1()
class Class2
{
-void method1(); // expected-error {{SAL_CALL inconsistency
[loplugin:salcall]}}
+void method1(); // expected-note {{SAL_CALL inconsistency
[loplugin:salcall]}}
};
-void SAL_CALL Class2::method1() {} // expected-note {{SAL_CALL inconsistency
[loplugin:salcall]}}
+void SAL_CALL Class2::method1() {} // expected-error {{SAL_CALL inconsistency
[loplugin:salcall]}}
// comment this out because it seems to generate a warning in some internal
buffer of clang that I can't annotate
#if 0
@@ -120,12 +120,12 @@ class Class8_3 : public Class8_1, public Class8_2
#define M1(m) void m
class Class9
{
-M1(method1)(); // expected-error {{SAL_CALL inconsistency
[loplugin:salcall]}}
-void method2(); // expected-error {{SAL_CALL inconsistency
[loplugin:salcall]}}
+M1(method1)(); // expected-note {{SAL_CALL inconsistency
[loplugin:salcall]}}
+void method2(); // expected-note {{SAL_CALL inconsistency
[loplugin:salcall]}}
};
-void SAL_CALL Class9::method1() {} // expected-note {{SAL_CALL inconsistency
[loplugin:salcall]}}
+void SAL_CALL Class9::method1() {} // expected-error {{SAL_CALL inconsistency
[loplugin:salcall]}}
#define M2(T) T SAL_CALL
-M2(void) Class9::method2() {} // expected-note {{SAL_CALL inconsistency
[loplugin:salcall]}}
+M2(void) Class9::method2() {} // expected-error {{SAL_CALL inconsistency
[loplugin:salcall]}}
#if 0 // see TODO in SalCall::isSalCallFunction
class Class10
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfimport/rtfimport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12efb01e38f94992ce746d20d40410229c431225 Author: Mike Kaganski Date: Mon Dec 11 09:38:42 2017 +0200 Use platform-specific newline in unit test Change-Id: I7ff67ff952ecb2682a163866b91a9f2621dde935 Reviewed-on: https://gerrit.libreoffice.org/46210 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index ce96812b138e..2b1127a135d5 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -218,7 +218,7 @@ DECLARE_RTFIMPORT_TEST(testFdo45182, "fdo45182.rtf") uno::UNO_QUERY); uno::Reference xTextRange(xFootnotes->getByIndex(0), uno::UNO_QUERY); // Encoding in the footnote was wrong. -OUString aExpected(u"\u017Eivnost\u00ED\n"); +OUString aExpected(u"\u017Eivnost\u00ED" SAL_NEWLINE_STRING); CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString()); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 50b0f93f3e15962125fdf6e8944b4140a208c727 Author: Stephan Bergmann Date: Sun Dec 10 23:11:45 2017 +0100 loplugin:unnecessaryparen (clang-cl) Change-Id: I0c5f11f305fff61ccf849ec5bcc3a9218797f7f5 Reviewed-on: https://gerrit.libreoffice.org/46199 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx index 56560660eb99..b6c8a00dec98 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx @@ -138,7 +138,7 @@ xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore( "xmlSecKeysMngrGetDataStore", XMLSEC_ERRORS_R_XMLSEC_FAILED, XMLSEC_ERRORS_NO_MESSAGE) ; -return (-1) ; +return -1 ; } if (xmlSecMSCryptoX509StoreAdoptKeyStore(x509Store, keyStore) < 0) @@ -148,7 +148,7 @@ xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore( "xmlSecMSCryptoX509StoreAdoptKeyStore", XMLSEC_ERRORS_R_XMLSEC_FAILED, XMLSEC_ERRORS_NO_MESSAGE) ; -return (-1) ; +return -1 ; } return 0 ; @@ -173,7 +173,7 @@ xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore( "xmlSecKeysMngrGetDataStore", XMLSEC_ERRORS_R_XMLSEC_FAILED, XMLSEC_ERRORS_NO_MESSAGE) ; -return (-1) ; +return -1 ; } if (xmlSecMSCryptoX509StoreAdoptTrustedStore(x509Store, trustedStore) < 0) @@ -183,7 +183,7 @@ xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore( "xmlSecMSCryptoX509StoreAdoptKeyStore", XMLSEC_ERRORS_R_XMLSEC_FAILED, XMLSEC_ERRORS_NO_MESSAGE) ; -return (-1) ; +return -1 ; } return 0 ; @@ -208,7 +208,7 @@ xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( "xmlSecKeysMngrGetDataStore", XMLSEC_ERRORS_R_XMLSEC_FAILED, XMLSEC_ERRORS_NO_MESSAGE) ; -return (-1) ; +return -1 ; } if (xmlSecMSCryptoX509StoreAdoptUntrustedStore(x509Store, untrustedStore) < 0) @@ -218,7 +218,7 @@ xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( "xmlSecMSCryptoX509StoreAdoptKeyStore", XMLSEC_ERRORS_R_XMLSEC_FAILED, XMLSEC_ERRORS_NO_MESSAGE) ; -return (-1) ; +return -1 ; } return 0 ; ___ 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/formulacell.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit e1bd0dd9966c0d525477443bc54c1d2bd6f7d30f Author: Caolán McNamara Date: Sun Dec 10 20:15:31 2017 + tdf#114342 move recursion guard to encompass threaded path too Change-Id: If815d3faeb72fd8a176225fb80f87ee584ece3ba Reviewed-on: https://gerrit.libreoffice.org/46195 Tested-by: Jenkins Reviewed-by: Dennis Francis Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 955be80b4c59..2db3e9cda669 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -4342,6 +4342,12 @@ bool ScFormulaCell::InterpretFormulaGroup() return false; } +// Guard against endless recursion of Interpret() calls, for this to work +// ScFormulaCell::InterpretFormulaGroup() must never be called through +// anything else than ScFormulaCell::Interpret(), same as +// ScFormulaCell::InterpretTail() +RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this); + if (!bThreadingProhibited && !ScCalcConfig::isOpenCLEnabled() && pCode->GetVectorState() == FormulaVectorEnabledForThreading && officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get()) @@ -4478,12 +4484,6 @@ bool ScFormulaCell::InterpretFormulaGroup() return false; } -// Guard against endless recursion of Interpret() calls, for this to work -// ScFormulaCell::InterpretFormulaGroup() must never be called through -// anything else than ScFormulaCell::Interpret(), same as -// ScFormulaCell::InterpretTail() -RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this); - // TODO : Disable invariant formula group interpretation for now in order // to get implicit intersection to work. if (mxGroup->mbInvariant && false) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc basctl/inc
accessibility/inc/pch/precompiled_acc.hxx |1 - basctl/inc/pch/precompiled_basctl.hxx |1 - 2 files changed, 2 deletions(-) New commits: commit adad3724e6c3e85b1b286ccddaf810f3c782424b Author: ekuiitr Date: Thu Dec 7 22:02:27 2017 +0800 tdf#63154 removed some solar.h references Change-Id: Ib3672f84acc54d5838ab7ccf02d368968aa8b5af Reviewed-on: https://gerrit.libreoffice.org/46029 Tested-by: Jenkins Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 5e8055059bad..fde5a69bd67b 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -367,7 +367,6 @@ #include #include #include -#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 0d7d626cd34f..97cc996fb631 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -562,7 +562,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: tools/map.cpp
tools/map.cpp |1 -
1 file changed, 1 deletion(-)
New commits:
commit a597fa9a47bc14571006d210001490bc93f1d6b1
Author: Miklos Vajna
Date: Mon Dec 11 08:41:05 2017 +0100
loolmap: clean up dead assignment
style gets re-assigned on all paths below.
Change-Id: I4164f745c00e39b82410820cffe4682c079fd741
Reviewed-on: https://gerrit.libreoffice.org/46211
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/tools/map.cpp b/tools/map.cpp
index 413576d7..41025c9e 100644
--- a/tools/map.cpp
+++ b/tools/map.cpp
@@ -184,7 +184,6 @@ static void dumpPages(unsigned proc_id, unsigned parent_id,
const char *type, co
}
if (bZeroParent)
{
-style = "was shared with parent zeros";
parentData.resize(0); // diff un-interesting.
}
if (touched == 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source dtrans/source embedserv/source fpicker/source include/svx include/vbahelper svx/source sw/inc sw/source xmlsecurity/source
canvas/source/directx/dx_canvashelper.hxx |2 dtrans/source/win32/clipb/WinClipbImpl.cxx| 18 ++-- dtrans/source/win32/clipb/WinClipbImpl.hxx| 18 ++-- dtrans/source/win32/clipb/WinClipboard.cxx|2 dtrans/source/win32/clipb/WinClipboard.hxx|2 dtrans/source/win32/dnd/sourcecontext.cxx |4 dtrans/source/win32/dnd/sourcecontext.hxx |4 dtrans/source/win32/dtobj/DOTransferable.cxx | 16 +-- dtrans/source/win32/dtobj/DOTransferable.hxx | 14 +-- dtrans/source/win32/dtobj/DTransHelper.cxx| 16 +-- dtrans/source/win32/dtobj/DTransHelper.hxx| 16 +-- dtrans/source/win32/dtobj/DataFmtTransl.cxx | 16 +-- dtrans/source/win32/dtobj/DataFmtTransl.hxx | 18 ++-- dtrans/source/win32/dtobj/DtObjFactory.cxx|2 dtrans/source/win32/dtobj/FetcList.cxx| 34 dtrans/source/win32/dtobj/FetcList.hxx| 42 +- dtrans/source/win32/dtobj/XNotifyingDataObject.cxx|2 dtrans/source/win32/dtobj/XNotifyingDataObject.hxx|2 dtrans/source/win32/dtobj/XTDataObject.cxx| 18 ++-- dtrans/source/win32/dtobj/XTDataObject.hxx| 18 ++-- embedserv/source/embed/intercept.cxx |6 - embedserv/source/embed/servprov.cxx |4 embedserv/source/inc/intercept.hxx|6 - fpicker/source/win32/filepicker/FilterContainer.cxx | 24 ++--- fpicker/source/win32/filepicker/FilterContainer.hxx | 24 ++--- fpicker/source/win32/filepicker/VistaFilePicker.cxx |2 fpicker/source/win32/filepicker/VistaFilePicker.hxx |2 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx |4 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx |4 fpicker/source/win32/folderpicker/FolderPicker.cxx|2 fpicker/source/win32/folderpicker/FolderPicker.hxx|2 fpicker/source/win32/folderpicker/FopEvtDisp.hxx |2 fpicker/source/win32/folderpicker/MtaFop.cxx | 36 fpicker/source/win32/folderpicker/MtaFop.hxx | 40 - fpicker/source/win32/folderpicker/WinFOPImpl.cxx |6 - fpicker/source/win32/folderpicker/WinFOPImpl.hxx | 10 +- include/svx/fmgridif.hxx |4 include/vbahelper/vbashape.hxx|4 include/vbahelper/vbashaperange.hxx |4 svx/source/inc/gridcell.hxx | 12 +- sw/inc/unocoll.hxx|4 sw/inc/unostyle.hxx |8 - sw/source/core/unocore/unostyle.cxx |4 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |2 44 files changed, 240 insertions(+), 240 deletions(-) New commits: commit aad6e593f7e856f716de57304e007fec789e37eb Author: Stephan Bergmann Date: Sun Dec 10 23:21:52 2017 +0100 loplugin:salcall (clang-cl) Change-Id: I31018af8d992c9496f01a72925e24d9b362e340d Reviewed-on: https://gerrit.libreoffice.org/46204 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx index bf06e29bb474..483033fd7c49 100644 --- a/canvas/source/directx/dx_canvashelper.hxx +++ b/canvas/source/directx/dx_canvashelper.hxx @@ -170,7 +170,7 @@ namespace dxcanvas const css::uno::Reference< css::geometry::XMapping2D >& xMapping ); -css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL +css::uno::Reference< css::rendering::XCanvasFont > createFont( const css::rendering::XCanvas* pCanvas, const css::rendering::FontRequest& fontRequest, const css::uno::Sequence< diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx index c5030883900c..a3267942a050 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.cxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx @@
[Libreoffice-commits] core.git: 3 commits - connectivity/source fpicker/source xmlsecurity/source
connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx |2 +-
fpicker/source/win32/folderpicker/MtaFop.cxx |2 +-
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e28ed8c0fb2ffcf5d3a282563ee3a1bf5687b875
Author: Stephan Bergmann
Date: Sun Dec 10 23:16:33 2017 +0100
loplugin:conststringvar (clang-cl)
Change-Id: Icb0e32716ae58886912a1a1c7c50e66f30256227
Reviewed-on: https://gerrit.libreoffice.org/46202
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 195c74ec5c3e..e2dff90c55fa 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -474,7 +474,7 @@ IMPL_STATIC_LINK_NOARG(DigitalSignaturesDialog,
CertMgrButtonHdl, Button*, void)
// FIXME: perhaps poke GpgME for uiserver, and hope it returns something
useful?
const OUString aGUIServers[] = { OUString("kleopatra.exe"),
OUString("launch-gpa.exe"), OUString("gpa.exe"),
OUString("bin\\kleopatra.exe"),
OUString("bin\\launch-gpa.exe"), OUString("bin\\gpa.exe") };
-const char* cPath = "C:\\Program Files (x86)\\GNU\\GnuPG";
+const char* const cPath = "C:\\Program Files (x86)\\GNU\\GnuPG";
#else
const OUString aGUIServers[] = { OUString("kleopatra"),
OUString("seahorse"), OUString("gpa"), OUString("kgpg") };
const char* cPath = getenv("PATH");
commit c8d46b68aec94528c3c787484df3b2ad5479d46b
Author: Stephan Bergmann
Date: Sun Dec 10 23:15:33 2017 +0100
loplugin:redundantcast (clang-cl)
Change-Id: Ie36853231d58fdf985c32497732abe34f7828d7b
Reviewed-on: https://gerrit.libreoffice.org/46201
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx
b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 4958699a7e5d..497d1ebba835 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -704,7 +704,7 @@ ATOM SAL_CALL
CMtaFolderPicker::RegisterStaRequestWindowClass( )
wcex.cbSize = sizeof(wcex);
wcex.style = 0;
-wcex.lpfnWndProc= static_cast< WNDPROC >(
CMtaFolderPicker::StaWndProc );
+wcex.lpfnWndProc= CMtaFolderPicker::StaWndProc;
wcex.cbClsExtra = 0;
wcex.cbWndExtra = 0;
wcex.hInstance = m_hInstance;
commit 74254cd81542e308d905782da0500ba9ab9dba62
Author: Stephan Bergmann
Date: Sun Dec 10 23:13:05 2017 +0100
loplugin:unnecessaryparen (clang-cl)
Change-Id: I2c5aa4c5c3a100de87d3f873b371dded994e4a7c
Reviewed-on: https://gerrit.libreoffice.org/46200
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 6a066f680348..cbb9c9ff116b 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -87,7 +87,7 @@ sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId)
sal_Int32 nSize = 0;
std::map::const_iterator aIter =
m_aLiteralInfo.find(_nId);
if(aIter != m_aLiteralInfo.end() && (*aIter).second.fSupported)
-nSize = (static_cast((*aIter).second.cchMaxLen) == (-1)) ?
0 : (*aIter).second.cchMaxLen;
+nSize = (static_cast((*aIter).second.cchMaxLen) == -1) ? 0
: (*aIter).second.cchMaxLen;
return nSize;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
