[Libreoffice-commits] core.git: forms/source
forms/source/component/ListBox.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 4efa9604cf90a581af05c231470bc3fe2e0c49ef
Author: Stephan Bergmann
Date: Wed Jan 14 08:35:33 2015 +0100
Revert "ListBox: refuse to give values before we are loaded"
This reverts commit 1cc29a04adb721205655091854f5ea828bb8eb11, as it caused
JunitTest_forms_unoapi trigger the
assert( m_nConvertedBoundValuesType == getValueType())
at forms/source/component/ListBox.cxx:1189.
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index 72ce587..e7f7e21 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1072,9 +1072,6 @@ namespace frm
ValueList OListBoxModel::impl_getValues() const
{
-if (!isLoaded())
-return ValueList();
-
const sal_Int32 nFieldType = getValueType();
if ( !m_aConvertedBoundValues.empty() && m_nConvertedBoundValuesType
== nFieldType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - include/vcl vcl/inc vcl/source
include/vcl/idle.hxx | 84 ++
include/vcl/timer.hxx| 41
vcl/inc/svdata.hxx |3
vcl/inc/window.h |1
vcl/source/app/idle.cxx | 218 +++
vcl/source/app/svapp.cxx |3
vcl/source/app/timer.cxx | 98 -
7 files changed, 310 insertions(+), 138 deletions(-)
New commits:
commit f23d12b5fc9e1750972b0f67cff8b6ac40538469
Author: Tobias Madl
Date: Wed Jan 14 08:29:37 2015 +0100
Idle: Idle and Timer completely independend
Now the Idle and Timer are divided in two seperate classes. But now all
changed
idles need a new import, before the programm is working again.
Change-Id: I5be7424622b6fcc993c621fa4a11fbee1b6d9bf2
diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx
new file mode 100644
index 000..9da8414
--- /dev/null
+++ b/include/vcl/idle.hxx
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 .
+ */
+
+#ifndef INCLUDED_VCL_IDLE_HXX
+#define INCLUDED_VCL_IDLE_HXX
+
+#include
+#include
+#include
+
+struct ImplIdleData;
+struct ImplSVData;
+
+enum class IdlePriority {
+VCL_IDLE_PRIORITY_HIGHEST = 0, // -> 0ms
+VCL_IDLE_PRIORITY_HIGH = 1,// -> 1ms
+VCL_IDLE_PRIORITY_REPAINT = 2, // -> 30ms
+VCL_IDLE_PRIORITY_RESIZE= 3, // -> 50ms
+VCL_IDLE_PRIORITY_MEDIUM= 4, // -> 50ms
+VCL_IDLE_PRIORITY_LOW = 5, // -> 100ms
+VCL_IDLE_PRIORITY_LOWER = 6, // -> 200ms
+VCL_IDLE_PRIORITY_LOWEST= 7 // -> 400ms
+};
+
+
+// To port from Timer -> Idle switch class name,
+// s/Timeout/DoIdle/ etc. and select priority
+class VCL_DLLPUBLIC Idle
+{
+protected:
+ImplIdleData* mpIdleData;
+IdlePrioritymePriority;
+boolmbActive;
+LinkmaIdleHdl;
+
+friend struct ImplIdleData;
+
+public:
+Idle();
+Idle( const Idle& rIdle );
+virtual ~Idle();
+
+void SetPriority( IdlePriority ePriority ) { mePriority = ePriority; }
+IdlePriority GetPriority() const { return mePriority; }
+
+/// Make it possible to associate a callback with this idle handler
+/// of course, you can also sub-class and override 'DoIdle'
+voidSetIdleHdl( const Link& rLink ) { maIdleHdl = rLink; }
+const Link& GetIdleHdl() const { return maIdleHdl; }
+
+virtual voidDoIdle();
+
+voidStart();
+voidStop();
+
+boolIsActive() const { return mbActive; }
+
+Idle& operator=( const Idle& rIdle );
+static void ImplDeInitIdle();
+static void ImplIdleCallbackProc();
+
+/// Process all pending idle tasks ahead of time in priority order.
+static void ProcessAllIdleHandlers();
+};
+
+#endif // INCLUDED_VCL_IDLE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 11e8f3f..ea65d6f 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -35,7 +35,6 @@ protected:
sal_uLong mnTimeout;
boolmbActive;
boolmbAuto;
-boolmbIdle;
LinkmaTimeoutHdl;
friend struct ImplTimerData;
@@ -63,9 +62,6 @@ public:
static void ImplDeInitTimer();
static void ImplTimerCallbackProc();
-
-/// Process all pending idle tasks ahead of time in priority order.
-static void ProcessAllIdleHandlers();
};
/// An auto-timer is a multi-shot timer re-emitting itself at
@@ -78,43 +74,6 @@ public:
AutoTimer& operator=( const AutoTimer& rTimer );
};
-
-enum IdlePriority {
-VCL_IDLE_PRIORITY_HIGHEST, // -> 0ms
-VCL_IDLE_PRIORITY_HIGH,// -> 1ms
-VCL_IDLE_PRIORITY_REPAINT, // -> 30ms
-VCL_IDLE_PRIORITY_RESIZE, // -> 50ms
-VCL_IDLE_PRIORITY_MEDIUM, // -> 50ms
-VCL_IDLE_PRIORITY_LOW, // -> 100ms
-VCL_IDLE_PRIORITY_LOWER, // -> 200ms
-VCL_IDLE_PRIORITY_LOWEST // -> 400ms
-};
-
-
-// To port from Timer -> Idle switch class name,
-// s/Timeout/DoIdle/ etc. and select priority
-class VCL_DLLPUBLIC Idle : publ
LibreOffice Gerrit News for core on 2015-01-14
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#88339 Fixed Draw/Impress constrained image movement in https://gerrit.libreoffice.org/13900 from Trent MacAlpine about module sd + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/13881 from Ashod Nakashian about module include + --with-macosx-app-name= is unused, so bin it from AC_ARG_WITH list in https://gerrit.libreoffice.org/13658 from Douglas Mencken about module build, solenv, sysui + fdo#88158 Display two "Open..." entries in the file-menu in https://gerrit.libreoffice.org/13795 from juegen funk about module desktop End of freshness + fdo#85818: rename SC_OPCODE_IKV to SC_OPCODE_IRR in https://gerrit.libreoffice.org/13896 from Laurent Charrière about module formula, include, sc + fdo#69552 [part 1] make calc functions CEILING comply with ODF1.2 in https://gerrit.libreoffice.org/7088 from Winfried Donkers about module formula, include, sc + sc: rename ScSTEXY to ScSTEYX in https://gerrit.libreoffice.org/13898 from Laurent Charrière about module sc + fdo#85818: rename SC_OPCODE_KGV to SC_OPCODE_LCM in https://gerrit.libreoffice.org/13894 from Laurent Charrière about module formula, include, sc + fd0#85818: rename SC_OPCODE_NBW to SC_OPCODE_NPV in https://gerrit.libreoffice.org/13897 from Laurent Charrière about module formula, include, sc + fdo#85818: rename RGP to Linest in https://gerrit.libreoffice.org/13893 from Laurent Charrière about module formula, include, sc + fdo#85818: rename SC_OPCODE_GGT to SC_OPCODE_GCD in https://gerrit.libreoffice.org/13895 from Laurent Charrière about module formula, include, sc + fdo#85818: rename RKP to Logest in https://gerrit.libreoffice.org/13892 from Laurent Charrière about module formula, include, sc + fdo#85818: rename KritBinom to CritBinom in https://gerrit.libreoffice.org/13890 from Laurent Charrière about module formula, include, sc + fdo#85818: rename Schiefe to Skew in https://gerrit.libreoffice.org/13891 from Laurent Charrière about module formula, include, sc + sc: rename ocChose et al. to ocChoose et al. in https://gerrit.libreoffice.org/13889 from Laurent Charrière about module formula, include, sc + Translated and fixed function names in comments in scfuncs.src in https://gerrit.libreoffice.org/13887 from Laurent Charrière about module sc + fdo#85818: translate ZZR to Nper in https://gerrit.libreoffice.org/13869 from Laurent Charrière about module formula, include, sc + sc: rename ocPropper et al. to ocProper et al. in https://gerrit.libreoffice.org/13888 from Laurent Charrière about module formula, include, sc + fdo#85818: rename ZW to FV in https://gerrit.libreoffice.org/13868 from Laurent Charrière about module formula, include, sc + convert-to : display error messages in console fdo#88326 in https://gerrit.libreoffice.org/13899 from Laurent Godard about module desktop * Merged changes on master for project core changed in the last 25 hours: + Fix number of sections exceeded object file format limit in https://gerrit.libreoffice.org/13879 from David Ostrovsky + simplify Date/Time/DateTime conversion code in https://gerrit.libreoffice.org/13855 from Noel Grandin + svx, canvas, desktop: gb_OBJCXXFLAGS are not needed at all in https://gerrit.libreoffice.org/13645 from Douglas Mencken + fdo#70185: starmath: unit test writing in https://gerrit.libreoffice.org/13861 from Takeshi Abe + fdo#87551 Category tree is too thin since conversion to .ui in https://gerrit.libreoffice.org/13866 from Adolfo Jayme Barrientos * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + solenv-filelists.pm: fix "can't call method `mode' on an undefined value" in https://gerrit.libreoffice.org/13669 from Douglas Mencken + gbuild-to-ide fixes in https://gerrit.libreoffice.org/11754 from Peter Foley + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + fdo#39625 Make existing CppUnittests work in https://gerrit.libreoffice.org/11605 from Tobias Madl + fdo#86606 removal of direct formatting options from the context menu in https://gerrit.libreoffice.org/13196 from Yousuf Philips + fdo#86784 make soffice commandline in juh Bootstrap.bootstrap() configura in https://gerrit.libreoffice.org/13290 from Christoph Lutz + Replace image-sort.pl with image-sort.py in https://gerrit.libreoffice.org/13124 from Marcos Paulo de Souza + start detection of kf5 stuff in configure.ac in https://gerrit.libreoffice.org/13079 from Jonathan Riddell + fdo#65209 attempt to enable daylight saving time in https://gerrit.libreoffice.org/11441 from Lim Jing + Move more places to boost::signal2 in math in https://gerrit.libreoffice.org/13065 from Marcos Paulo de Souza + more breeze icons in
Late Payment
Hi! Thank you for choosing our services. Attached is the invoice. Invoice Date: Tue, 13 Jan 2015 Thank you for your assistance in this matter, Jacqueline Thompson-Walker Senior Director , Business Solutions Open Door House Of Prayer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Request for LO development design documents
Hi Maarten Hoes, thanks for you replying. Unfortunately, I have read the articles of the link. And more, I have followed this link: https://wiki.openoffice.org/wiki/Writer , these articles have guided me some how. But I still don't understand some designs in the code, could you give me some tips, i.e. why the message loop in module VCL is designed with several level of "while loop" and some invocations are send to the message queue with Link class? Any help will be great! Sand Wen___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/unx/salgdi.h | 441 +++
1 file changed, 239 insertions(+), 202 deletions(-)
New commits:
commit 066103b8a4e4930c72152f9af66022a25938dc1e
Author: Chris Sherlock
Date: Wed Jan 14 11:22:45 2015 +1100
vcl: minor - cleanup inc/unx/salgdi.h
Change-Id: I6835387cab5c093ad6645d75966786330bd0602a
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 44f3a3d..69ec2da 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -69,226 +69,213 @@ class VCLPLUG_GEN_PUBLIC X11SalGraphics : public
SalGraphics
friend class X11OpenGLSalGraphicsImpl;
friend class X11CairoTextRender;
-private:
-boost::scoped_ptr mpImpl;
-boost::scoped_ptr mpTextRenderImpl;
-
-protected:
-SalFrame* m_pFrame; // the SalFrame which created this
Graphics or NULL
-SalVirtualDevice* m_pVDev; // the SalVirtualDevice which created
this Graphics or NULL
-
-const SalColormap* m_pColormap;
-SalColormap*m_pDeleteColormap;
-DrawablehDrawable_; // use
-SalX11Screenm_nXScreen;
-mutable XRenderPictFormat* m_pXRenderFormat;
-XID m_aXRenderPicture;
-
-Region pPaintRegion_;
-Region mpClipRegion;
-
-GC pFontGC_; // Font attributes
-Pixel nTextPixel_;
-
-Pixmap hBrush_;// Dither
-
-boolbWindow_ : 1; // is Window
-boolbPrinter_ : 1; // is Printer
-boolbVirDev_ : 1; // is VirDev
-bool bFontGC_ : 1; // is Font GC valid
-
-using SalGraphics::SetClipRegion;
-voidSetClipRegion( GC pGC,
- Region pXReg = NULL ) const;
-
-boolGetDitherPixmap ( SalColor nSalColor );
-
-
-using SalGraphics::DrawBitmap;
-voidDrawBitmap( const SalTwoRect& rPosAry,
-SalGraphics *pThis,
-const SalBitmap &rSalBitmap,
-const SalBitmap &rTransparentBitmap,
-SalColor nTransparentColor );
-
-GC GetFontGC();
-
-protected:
-voidDrawPrinterString( const SalLayout& );
-
-voidDrawServerFontString( const ServerFontLayout& );
-
-void freeResources();
public:
-X11SalGraphics();
-virtual ~X11SalGraphics();
-
-voidInit( SalFrame *pFrame, Drawable aDrawable,
SalX11Screen nXScreen );
-voidInit( X11SalVirtualDevice *pVirtualDevice,
SalColormap* pColormap = NULL, bool bDeleteColormap = false );
-voidInit( X11OpenGLSalVirtualDevice *pVirtualDevice );
-voidInit( class ImplSalPrinterData *pPrinter );
-voidDeInit();
-
-virtual SalGraphicsImpl* GetImpl() const SAL_OVERRIDE;
-inline const SalDisplay* GetDisplay() const;
-inline Display*GetXDisplay() const;
-inline const SalVisual&GetVisual() const;
-SalGeometryProvider*GetGeometryProvider() const;
-inline DrawableGetDrawable() const { return hDrawable_; }
-voidSetDrawable( Drawable d, SalX11Screen nXScreen );
-XRenderPictFormat* GetXRenderFormat() const;
-inline voidSetXRenderFormat( XRenderPictFormat*
pXRenderFormat ) { m_pXRenderFormat = pXRenderFormat; }
-inline const SalColormap&GetColormap() const { return *m_pColormap; }
+X11SalGraphics();
+virtual ~X11SalGraphics();
+
+voidInit( SalFrame *pFrame, Drawable
aDrawable, SalX11Screen nXScreen );
+voidInit( X11SalVirtualDevice *pVirtualDevice,
SalColormap* pColormap = NULL, bool bDeleteColormap = false );
+voidInit( X11OpenGLSalVirtualDevice
*pVirtualDevice );
+voidInit( class ImplSalPrinterData *pPrinter );
+voidDeInit();
+
+virtual SalGraphicsImpl*GetImpl() const SAL_OVERRIDE;
+inline const SalDisplay* GetDisplay() const;
+inline Display*GetXDisplay() const;
+inline const SalVisual&GetVisual() const;
+SalGeometryProvider*GetGeometryProvider() const;
+inline DrawableGetDrawable() const { return hDrawable_; }
+voidSetDrawable( Drawable d, SalX11Screen
nXScreen );
+XRenderPictFormat* GetXRenderFormat() const;
+inline voidSetXRenderFormat( XRenderPictFormat*
pXRenderFormat ) { m_pXRenderFormat = pXRenderFormat; }
+inline const SalColormap& GetColormap() const { return *m_pColor
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
|6 +-
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
|4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 3ac52a60d570fb8afb3d8ad063e35f0667b385cb
Author: Tomaž Vajngerl
Date: Wed Jan 14 09:09:05 2015 +0900
android: Inflate viewport even more to render more tiles offscreen
Change-Id: I6a1f8bb8fd04e40ecd60eec87043e507ca6350e7
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
index 1a67117..31c7a07 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
@@ -165,7 +165,8 @@ public abstract class ComposedTileLayer extends Layer {
}
}
if (!contains) {
-LOEvent event = LOEventFactory.tileRequest(this, new
TileIdentifier((int) x, (int) y, zoom, tileSize), false);
+TileIdentifier tileId = new TileIdentifier((int) x, (int)
y, zoom, tileSize);
+LOEvent event = LOEventFactory.tileRequest(this, tileId,
true);
event.mPriority = getTilePriority();
LOKitShell.sendEvent(event);
}
@@ -212,6 +213,9 @@ public abstract class ComposedTileLayer extends Layer {
return RectF.intersects(currentViewport, tileId.getRect()) ||
currentViewport.contains(tileId.getRect());
}
+/**
+ * Invalidate tiles which intersect the input rect
+ */
public void invalidateTiles(RectF rect) {
RectF zoomedRect = RectUtils.inverseScale(rect, currentZoom);
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
index 12ff723..38d6d80 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
@@ -19,7 +19,7 @@ public class DynamicTileLayer extends ComposedTileLayer {
return 0;
}
-protected IntSize getInflateFactor() {
-return tileSize;
+private IntSize getInflateFactor() {
+return new IntSize(tileSize.width*2, tileSize.height*4);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doccomp.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 36e31c5b4f39457c1c69c80f4144bfe0399bbe9e
Author: Tor Lillqvist
Date: Wed Jan 14 00:29:12 2015 +0200
WaE: private field 'nSttLineNum' is not used
Change-Id: I2cd795b0b5a266332b167b263f85d2da891e6dee
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 4a46f78..3b828e5 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -78,7 +78,6 @@ private:
sal_uLong NextIdx( const SwNode* pNd );
vector< CompareLine* > aLines;
-sal_uLong nSttLineNum;
bool m_bRecordDiff;
// Truncate beginning and end and add all others to the LinesArray
@@ -89,7 +88,7 @@ private:
public:
CompareData(SwDoc& rD, bool bRecordDiff)
: rDoc( rD ), pIndex( 0 ), pChangedFlag( 0 ), pInsRing(0), pDelRing(0)
-, nSttLineNum( 0 ), m_bRecordDiff(bRecordDiff)
+, m_bRecordDiff(bRecordDiff)
{
}
virtual ~CompareData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: uui/source
uui/source/logindlg.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bbba311d55484389bc8e3677d01b8cb4fa5644d6 Author: Julien Nabet Date: Tue Jan 13 23:02:39 2015 +0100 Typo: cedentials->credentials Change-Id: Ifd0905ed0e68b495d96e429df6193503f53ea908 diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 4fe319e..0cd7eb6 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -35,7 +35,7 @@ #define LF_PATH_READONLY0x0020 // "path" readonly #define LF_USERNAME_READONLY0x0040 // "name" readonly #define LF_NO_ACCOUNT 0x0080 // hide "account" -#define LF_NO_USESYSCREDS 0x0100 // hide "use system cedentials" +#define LF_NO_USESYSCREDS 0x0100 // hide "use system credentials" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.in external_deps.lst LICENSE_category_b more_fonts/fonts more_fonts/prj scp2/source
LICENSE_category_b| 101 -- configure.in | 22 -- external_deps.lst | 10 +- more_fonts/fonts/ttf_croscore/makefile.mk |8 +- more_fonts/prj/d.lst |3 scp2/source/ooo/file_font_ooo.scp |4 - 6 files changed, 13 insertions(+), 135 deletions(-) New commits: commit d8020927231297bc7faa3bab3d20ee2041eb050a Author: Pedro Giffuni Date: Tue Jan 13 16:12:12 2015 + Update ChromeOS fonts to version 1.23.0 As mentioned in their corresponding web pages, the latest versions of the ChromeOS fonts are under an Apache License V2. "Updated in May 2013 with improved hinting and released under the Apache 2.0 license." https://www.google.com/fonts/specimen/Arimo https://www.google.com/fonts/specimen/Tinos https://www.google.com/fonts/specimen/Cousine Thanks to Google for providing this great fonts freely. diff --git a/LICENSE_category_b b/LICENSE_category_b index c203e9a..db11caf 100644 --- a/LICENSE_category_b +++ b/LICENSE_category_b @@ -1482,107 +1482,6 @@ any resulting litigation. -For Google Chrome OS fonts: -- SIL Open Font License, Version 1.1. - -Digitized data copyright (c) 2010 Google Corporation -with Reserved Font Arimo, Tinos and Cousine. - -This Font Software is licensed under the SIL Open Font License, -Version 1.1. - -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 - -PREAMBLE The goals of the Open Font License (OFL) are to stimulate -worldwide development of collaborative font projects, to support the font -creation efforts of academic and linguistic communities, and to provide -a free and open framework in which fonts may be shared and improved in -partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. -The fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply to -any document created using the fonts or their derivatives. - - - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. -This may include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components -as distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting ? in part or in whole ? -any of the components of the Original Version, by changing formats or -by porting the Font Software to a new environment. - -"Author" refers to any designer, engineer, programmer, technical writer -or other person who contributed to the Font Software. - - -PERMISSION & CONDITIONS - -Permission is hereby granted, free of charge, to any person obtaining a -copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components,in - Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, - redistributed and/or sold with any software, provided that each copy - contains the above copyright notice and this license. These can be - included either as stand-alone text files, human-readable headers or - in the appropriate machine-readable metadata fields within text or - binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font - Name(s) unless explicit written permission is granted by the - corresponding Copyright Holder. This restriction only applies to the - primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font - Software shall not be used to promote, endorse or advertise any - Modified Version, except to acknowledge the contribution(s) of the - Copyright Holder(s) and the Author(s) or with their explicit written - permission. - -5) The Font Software, modified or unmodified, in part or in whole, must - be distributed entirely under this license, and must not be distributed - under any other license. The requirement for fonts to remain under - this license does not apply to any document created using the Font - Softwa
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 Beluga changed: What|Removed |Added CC||malc...@whsg.info --- Comment #49 from Beluga --- *** Bug 88363 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sw/source
sw/source/core/doc/doccomp.cxx | 136 +
1 file changed, 110 insertions(+), 26 deletions(-)
New commits:
commit d7bfd7ab1b5554ba7dbc45f8fe8889a68b0bf5ab
Author: Caolán McNamara
Date: Tue Jan 13 16:59:31 2015 +
misunderstood that MergeDoc and CompareDoc used different diff modes
i.e. there was a reason to the inheritence I removed in
commit bdca5a7ec083d24c360c2da86de2415567442605
Date: Tue Jan 13 13:55:58 2015 +
merge CompareData and SwCompareData
the inheritence doesn't help us here at all and we can remove
the virtuals and the casting becomes unnecessary
so restore the different modality
Change-Id: I8f20b8652b7949b04b442b89bed5df3093ad24d8
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 350d190..4a46f78 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -79,6 +79,7 @@ private:
vector< CompareLine* > aLines;
sal_uLong nSttLineNum;
+bool m_bRecordDiff;
// Truncate beginning and end and add all others to the LinesArray
void CheckRanges( CompareData& );
@@ -86,9 +87,9 @@ private:
virtual const SwNode& GetEndOfContent() = 0;
public:
-CompareData( SwDoc& rD )
+CompareData(SwDoc& rD, bool bRecordDiff)
: rDoc( rD ), pIndex( 0 ), pChangedFlag( 0 ), pInsRing(0), pDelRing(0)
-, nSttLineNum( 0 )
+, nSttLineNum( 0 ), m_bRecordDiff(bRecordDiff)
{
}
virtual ~CompareData();
@@ -135,8 +136,8 @@ public:
class CompareMainText : public CompareData
{
public:
-CompareMainText(SwDoc &rD)
-: CompareData(rD)
+CompareMainText(SwDoc &rD, bool bRecordDiff=true)
+: CompareData(rD, bRecordDiff)
{
}
@@ -150,8 +151,8 @@ class CompareFrmFmtText : public CompareData
{
const SwNodeIndex &m_rIndex;
public:
-CompareFrmFmtText(SwDoc &rD, const SwNodeIndex &rIndex)
-: CompareData(rD)
+CompareFrmFmtText(SwDoc &rD, const SwNodeIndex &rIndex, bool
bRecordDiff=true)
+: CompareData(rD, bRecordDiff)
, m_rIndex(rIndex)
{
}
@@ -447,9 +448,12 @@ sal_uLong CompareData::ShowDiffs( const CompareData& rData
)
while( nStt1 < nLen1 && rData.GetChanged( nStt1 )) ++nStt1;
while( nStt2 < nLen2 && GetChanged( nStt2 )) ++nStt2;
-// Check if there are changed lines (only slightly different) and
-// compare them in detail.
-CheckForChangesInLine( rData, nSav1, nStt1, nSav2, nStt2 );
+if (m_bRecordDiff)
+{
+// Check if there are changed lines (only slightly different)
and
+// compare them in detail.
+CheckForChangesInLine( rData, nSav1, nStt1, nSav2, nStt2 );
+}
++nCnt;
}
@@ -2062,8 +2066,8 @@ long SwDoc::MergeDoc( const SwDoc& rDoc )
rSrcDoc.getIDocumentRedlineAccess().SetRedlineMode(
nsRedlineMode_t::REDLINE_SHOW_DELETE );
getIDocumentRedlineAccess().SetRedlineMode(
nsRedlineMode_t::REDLINE_SHOW_DELETE );
-CompareMainText aD0(rSrcDoc);
-CompareMainText aD1(*this);
+CompareMainText aD0(rSrcDoc, false);
+CompareMainText aD1(*this, false);
aD1.CompareLines( aD0 );
if( !aD1.HasDiffs( aD0 ) )
{
commit 16916a14a2ce382aa4ff2a25f8e477108aba5a67
Author: Caolán McNamara
Date: Tue Jan 13 16:52:22 2015 +
allow comparing documents which only differ by frame contents
if two documents have the same number of frames then have an additional
stab at
comparing the contents of those frames
Change-Id: Ie7f1a8906d49d720a74620ad8d69fd97c76304e3
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 526ea1b..350d190 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
@@ -65,10 +66,12 @@ public:
class CompareData
{
+protected:
+SwDoc& rDoc;
+private:
size_t* pIndex;
bool* pChangedFlag;
-SwDoc& rDoc;
SwPaM *pInsRing, *pDelRing;
sal_uLong PrevIdx( const SwNode* pNd );
@@ -80,14 +83,15 @@ class CompareData
// Truncate beginning and end and add all others to the LinesArray
void CheckRanges( CompareData& );
+virtual const SwNode& GetEndOfContent() = 0;
+
public:
CompareData( SwDoc& rD )
-: pIndex( 0 ), pChangedFlag( 0 )
-, rDoc( rD ), pInsRing(0), pDelRing(0)
+: rDoc( rD ), pIndex( 0 ), pChangedFlag( 0 ), pInsRing(0), pDelRing(0)
, nSttLineNum( 0 )
{
}
-~CompareData();
+virtual ~CompareData();
// Are there differences?
bool HasDiffs( const CompareData& rData ) const;
@@ -128,6 +132,36 @@ public:
void SetRedlinesToDoc( bool bUseDocInfo );
};
+class CompareMainText : public CompareData
+{
+public:
+CompareM
Re: libreoffice.org unreachable
On Mon, Jan 12, 2015 at 10:58:51AM +0100, Christian Lohmaier wrote: > @all: > On Mon, Jan 12, 2015 at 10:52 AM, Miklos Vajna > wrote: >> On Sat, Jan 10, 2015 at 06:27:53PM +, Ashod Nakashian >> wrote: > if someone with @yahoo adress writes via the list, it is very likely > that many people won't be able to read it, due to yahoo's DMARC > policy. > (list modifies the message by adding a footer, thus making the > signature that yahoo adds invalid, and yahoo demands that > mailservers don't accept mail from @yahoo users with no or invalid > signatures). I'm fairly sure that the mailing address sends with an envelope sender of "someth...@lists.freedesktop.org"; I thus expect that the DMARC checks happen on the lists.freedesktop.org policy, not on the yahoo.XX policy. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/mmeeks/aafixes44'
New branch 'private/mmeeks/aafixes44' available with the following commits: commit c54196932b744c0b7d2cb236724582c93eff4c77 Author: LuboÅ¡ LuÅák Date: Thu Jan 8 18:09:49 2015 +0100 implement optimized hairline drawing for opengl As a side effect, this prevents the lines from looking too wide, because of generic polygon drawing being a bit too generous with AA. Change-Id: I17314c39fd57e33ecbd10b8a8785c600bdc5b212 Signed-off-by: Michael Meeks commit 1184218611d1b1b28f0b10879e91388e261b1c24 Author: LuboÅ¡ LuÅák Date: Wed Jan 7 17:43:39 2015 +0100 do not set Y line width to 0 I'm somewhat confused by why there needs to be a separate line width for X and Y, but apparently there is, and the latter shouldn't be just plain 0 (otherwise a number of drawPolyLine() implementations either skip using a simpler path for the usual case of them being equal, or even plain to refuse work at all and cause a fall back). And I hope this doesn't lead to finding out that some of those implementation are actually buggy. Change-Id: I2dbbd1539c4a96d41935cce9ae6565872e2a459b Signed-off-by: Michael Meeks commit 24ed906c3654a844f35a2b2022d9df42618a0a23 Author: LuboÅ¡ LuÅák Date: Mon Jan 12 13:24:47 2015 +0100 make AA edges of objects look smoother (opengl) Change-Id: I66a04febdbfa673e0883ab6f574bb7768cad7953 Signed-off-by: Michael Meeks commit ebd15ec32bfe01999a03385a20444b107d48ec81 Author: LuboÅ¡ LuÅák Date: Mon Jan 12 13:20:54 2015 +0100 clean up resetting of solid color when using opengl AA 118529d4644a and 011903894 might have been technically correct, but 'mProgramIsSolidLineColor' is clearly a misnomer at best, and they'd have made it even more likely that this would break yet again. Change-Id: I1f01663e2abc0b1b0e557ae7241637a96e1a402a Signed-off-by: Michael Meeks commit 80ade5e2169175f086cbc3edb7771165f60c0025 Author: LuboÅ¡ LuÅák Date: Wed Jan 7 18:06:25 2015 +0100 fix confusion between transparency and opacity Change-Id: Ifa69f3272ebda2a61ac00d2affb8aebd4524f0fc Signed-off-by: Michael Meeks ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
|3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 20631c2743b7aa54fe0f00d17ee37f7422e3e7ee
Author: Miklos Vajna
Date: Tue Jan 13 17:12:13 2015 +0100
android: avoid setMessageCallback() for now
This has to be only called when the user taps, not before. Don't do it
at all till we figure out how to detect a tap.
Change-Id: I184442d3f06fcbf56f0789bb85693dd7273daf28
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 8f4e56e..0e2db4b 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -69,7 +69,8 @@ public class LOKitTileProvider implements TileProvider,
Document.MessageCallback
public void postLoad() {
mDocument.initializeForRendering();
-mDocument.setMessageCallback(this);
+// FIXME see gtktiledviewer, this has to be registered when we enter
edit mode, not right after loading.
+// mDocument.setMessageCallback(this);
int parts = mDocument.getParts();
Log.i(LOGTAG, "Document parts: " + parts);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/source svtools/source sw/source
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |5 +
svtools/source/contnr/contentenumeration.cxx |5 +
sw/source/core/fields/docufld.cxx |4 +---
3 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit 1e2bf2e0bd0c8078870055d5a4fd0a81ffcc5029
Author: Eike Rathke
Date: Tue Jan 13 17:16:56 2015 +0100
remove superfluous Date and Time temporaries
Change-Id: I7a64027eb58c86ccf9d1b4968c287f0f861f2ec2
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index 4e0355f..f112a44 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -931,9 +931,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub,
sal_uInt32 nFormat,
{
OUString aName( xDocProps->getAuthor() );
util::DateTime uDT( xDocProps->getCreationDate() );
-Date aD(uDT);
-tools::Time aT(uDT);
-DateTime aDate(aD,aT);
+DateTime aDate(uDT);
if( nSub == DI_CREATE )
; // das wars schon!!
else if( nSub == DI_CHANGE )
commit 35fa188305600fa950a07e4b6c4f6a77a42d32d6
Author: Eike Rathke
Date: Tue Jan 13 16:59:30 2015 +0100
eliminate unnecessary macro
Change-Id: I0dceccbe1275298b43f50296da075ae95694d39a
diff --git a/svtools/source/contnr/contentenumeration.cxx
b/svtools/source/contnr/contentenumeration.cxx
index b601bf5..2c8e296 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -50,9 +50,6 @@ namespace svt
#define ROW_IS_FLOPPY 11
#define ROW_IS_COMPACTDISC 12
-#define CONVERT_DATETIME( aUnoDT, aToolsDT ) \
-aToolsDT = ::DateTime( aUnoDT );
-
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Exception;
@@ -260,7 +257,7 @@ namespace svt
if ( bContainsDate )
{
-CONVERT_DATETIME( aDT, pData->maModDate );
+pData->maModDate = ::DateTime( aDT );
}
if ( pData->mbIsFolder )
commit a38e1be92c50ce6feba41402201f09605fedaa5a
Author: Eike Rathke
Date: Tue Jan 13 16:30:44 2015 +0100
use DateTime instead of separate Date and Time
Change-Id: I82cccaabbcf481367e55c52682d0ff765b4a8671
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index a85ec22..3703f62 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -433,10 +433,7 @@ void ScXMLChangeTrackingImportHelper::EndChangeAction()
void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo,
OUString& rUser, DateTime& aDateTime)
{
-Date aDate(aInfo.aDateTime);
-tools::Time aTime(aInfo.aDateTime);
-aDateTime.SetDate( aDate.GetDate() );
-aDateTime.SetTime( aTime.GetTime() );
+aDateTime = DateTime( aInfo.aDateTime);
// old files didn't store nanoseconds, enable again
if ( aInfo.aDateTime.NanoSeconds )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - include/LibreOfficeKit libreofficekit/qa libreofficekit/source
include/LibreOfficeKit/LibreOfficeKitGtk.h |5 +
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 14 +-
libreofficekit/source/gtk/lokdocview.c | 14 +-
3 files changed, 31 insertions(+), 2 deletions(-)
New commits:
commit 66e6ca74cfe461bb2599f2e218b7e2313f16da65
Author: Miklos Vajna
Date: Tue Jan 13 16:47:23 2015 +0100
gtktiledviewer: start in viewer mode, switch to edit mode by mouse click
Change-Id: I0863ec8fb159a2e367951ba9e7d7310d250d8a1e
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 111381d..3fd0c4a 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -41,6 +41,8 @@ struct _LOKDocView
LibreOfficeKit* pOffice;
LibreOfficeKitDocument* pDocument;
+/// View or edit mode.
+gboolean m_bEdit;
};
struct _LOKDocViewClass
@@ -64,6 +66,9 @@ char* lok_docview_get_part_name (LOKDocView*
pDocView,
int nPart);
voidlok_docview_set_partmode(LOKDocView* pDocView,
LibreOfficeKitPartMode ePartMode);
+/// Sets if the viewer is actually an editor or not.
+voidlok_docview_set_edit(LOKDocView* pDocView,
+ gboolean bEdit);
#ifdef __cplusplus
}
#endif
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index e1e9e4f..2be201f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -131,8 +131,11 @@ void changeQuadView( GtkWidget* /*pButton*/, gpointer /*
pItem */ )
static void signalKey(GtkWidget* /*pWidget*/, GdkEventKey* pEvent, gpointer
/*pData*/)
{
LOKDocView* pLOKDocView = LOK_DOCVIEW(pDocView);
-
int nCode = 0;
+
+if (!pLOKDocView->m_bEdit)
+return;
+
switch (pEvent->keyval)
{
case GDK_BackSpace:
@@ -154,6 +157,14 @@ static void signalKey(GtkWidget* /*pWidget*/, GdkEventKey*
pEvent, gpointer /*pD
pLOKDocView->pOffice->pClass->postKeyEvent(pLOKDocView->pOffice,
LOK_KEYEVENT_KEYINPUT, nCode);
}
+/// Receives a button press event.
+static void signalButton(GtkWidget* /*pWidget*/, GdkEvent* /*pEvent*/,
gpointer /*pData*/)
+{
+LOKDocView* pLOKDocView = LOK_DOCVIEW(pDocView);
+
+lok_docview_set_edit(pLOKDocView, TRUE);
+}
+
// GtkComboBox requires gtk 2.24 or later
#if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION
> 2
void populatePartSelector()
@@ -311,6 +322,7 @@ int main( int argc, char* argv[] )
// Input handling.
g_signal_connect(pWindow, "key-press-event", G_CALLBACK(signalKey), NULL);
g_signal_connect(pWindow, "key-release-event", G_CALLBACK(signalKey),
NULL);
+g_signal_connect(pDocView, "button-press-event", G_CALLBACK(signalButton),
NULL);
gtk_container_add( GTK_CONTAINER(pVBox), pDocView );
diff --git a/libreofficekit/source/gtk/lokdocview.c
b/libreofficekit/source/gtk/lokdocview.c
index 2e4226c..d373235 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -71,6 +71,9 @@ static void lok_docview_init( LOKDocView* pDocView )
gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(pDocView),
pDocView->pEventBox );
+// Allow reacting to button press events.
+gtk_widget_set_events(pDocView->pEventBox, GDK_BUTTON_PRESS_MASK);
+
pDocView->pCanvas = gtk_image_new();
gtk_container_add( GTK_CONTAINER( pDocView->pEventBox ), pDocView->pCanvas
);
@@ -84,6 +87,7 @@ static void lok_docview_init( LOKDocView* pDocView )
pDocView->pDocument = 0;
pDocView->fZoom = 1;
+pDocView->m_bEdit = FALSE;
gtk_signal_connect( GTK_OBJECT(pDocView), "destroy",
GTK_SIGNAL_FUNC(lcl_onDestroy), NULL );
@@ -212,7 +216,6 @@ SAL_DLLPUBLIC_EXPORT gboolean lok_docview_open_document(
LOKDocView* pDocView, c
{
pDocView->pDocument->pClass->initializeForRendering(pDocView->pDocument);
renderDocument( pDocView );
-pDocView->pDocument->pClass->registerCallback(pDocView->pDocument,
&lok_docview_callback_worker, pDocView);
}
return TRUE;
@@ -261,4 +264,13 @@ SAL_DLLPUBLIC_EXPORT void lok_docview_set_partmode(
LOKDocView* pDocView,
pDocView->pDocument->pClass->setPartMode( pDocView->pDocument, ePartMode );
renderDocument( pDocView );
}
+
+SAL_DLLPUBLIC_EXPORT void lok_docview_set_edit( LOKDocView* pDocView,
+gboolean bEdit )
+{
+if (!pDocView->m_bEdit && bEdit)
+pDocView->pDocument->pClass->registerCallback(pDocView->pDocument,
&lok_docview_callback_worker, pDocView);
+pDocView->m_bEdit = bEdit;
+}
+
/* vim:set
[Libreoffice-commits] core.git: 3 commits - sc/qa sc/source
sc/qa/extras/macros-test.cxx | 11 ---
sc/qa/unit/data/contentCSV/user-defined-function.csv |1 +
sc/qa/unit/data/ods/user-defined-function.ods|binary
sc/qa/unit/helper/qahelper.cxx |4 +++-
sc/qa/unit/subsequent_filters-test.cxx |7 +++
sc/source/core/opencl/formulagroupcl.cxx |2 --
6 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit ac604d212512e45923df247661f965a910291cc0
Author: Markus Mohrhard
Date: Mon Jan 12 11:29:43 2015 +0100
remove unused variable
Change-Id: If22f2d90644f2c03f1b027c73574a857cea890c1
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index d407a79..581bd24 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3959,8 +3959,6 @@ public:
CLInterpreterResult launchKernel()
{
-CLInterpreterResult aRes; // invalid by default.
-
if (!isValid())
return CLInterpreterResult();
commit 731a9aab0fa42ed42b5470e2c6f7e9fc6b1e3a85
Author: Raal
Date: Mon Jan 12 11:25:00 2015 +0100
add first test for user defined functions
currently disabled as we have a crash on exit in the test related to the
star basic code
Change-Id: If321561a117ea2c55107916c9cb5e99a2c07bdc6
diff --git a/sc/qa/unit/data/contentCSV/user-defined-function.csv
b/sc/qa/unit/data/contentCSV/user-defined-function.csv
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/user-defined-function.csv
@@ -0,0 +1 @@
+8
diff --git a/sc/qa/unit/data/ods/user-defined-function.ods
b/sc/qa/unit/data/ods/user-defined-function.ods
new file mode 100644
index 000..1976c85
Binary files /dev/null and b/sc/qa/unit/data/ods/user-defined-function.ods
differ
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index e0ade4c..c64cac1 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
using namespace ::com::sun::star::uno;
@@ -546,11 +547,12 @@ ScDocShellRef ScBootstrapFixture::load( bool bReadWrite,
SfxMedium* pSrcMed = new SfxMedium(rURL, bReadWrite ? STREAM_STD_READWRITE
: STREAM_STD_READ );
pSrcMed->SetFilter(pFilter);
pSrcMed->UseInteractionHandler(false);
+SfxItemSet* pSet = pSrcMed->GetItemSet();
if (pPassword)
{
-SfxItemSet* pSet = pSrcMed->GetItemSet();
pSet->Put(SfxStringItem(SID_PASSWORD, *pPassword));
}
+
pSet->Put(SfxUInt16Item(SID_MACROEXECMODE,::com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN));
SAL_INFO( "sc.qa", "about to load " << rURL );
if (!xDocShRef->DoLoad(pSrcMed))
{
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 87978d5..13c616d 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -481,6 +481,13 @@ void ScFiltersTest::testFunctionsODS()
testFile(aCSVFileName, rDoc3, 0, PureString);
xDocSh->DoClose();
+
+// crashes at exit while unloading StarBasic code
+// xDocSh = loadDoc("user-defined-function.", ODS);
+// xDocSh->DoHardRecalc(true);
+// ScDocument& rDocUserDef = xDocSh->GetDocument();
+// createCSVPath("user-defined-function.", aCSVFileName);
+// testFile(aCSVFileName, rDocUserDef, 0);
}
void ScFiltersTest::testFunctionsExcel2010()
commit 964ddc1469fb7fb7f1c4b66ad8c1479c6283d56e
Author: Markus Mohrhard
Date: Sat Jan 10 20:35:12 2015 +0100
std::cout to SAL_INFO
Change-Id: I92c48f71baa24cef3b061b9bb6853b99ea1546d4
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index c2948e7..2c6ac2b 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -69,7 +69,6 @@ void ScMacrosTest::testMSP()
const OUString aFileNameBase("MasterScriptProviderProblem.ods");
OUString aFileName;
createFileURL(aFileNameBase, aFileName);
-std::cout << "MasterScriptProviderProblem (fdo#67547) test" << std::endl;
uno::Reference< com::sun::star::lang::XComponent > xComponent =
loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
CPPUNIT_ASSERT_MESSAGE("Failed to load MasterScriptProviderProblem.ods",
xComponent.is());
@@ -92,7 +91,7 @@ void ScMacrosTest::testMSP()
OUString sResult;
aRet >>= sResult;
-std::cout << "Result is " << sResult << std::endl;
+SAL_INFO("sc.qa", "Result is " << sResult );
CPPUNIT_ASSERT_MESSAGE("TestMSP ( for fdo#67547) failed", sResult == "OK"
);
xDocSh->DoClose();
}
@@ -102,7 +101,6 @@ void ScMacrosTest::testStarBasic()
const OUString aFileNameBase("StarBasic.ods");
OUString aFileName;
createFileURL(aFileNameBase, aFileName);
-std::cout << "StarB
[Libreoffice-commits] core.git: basic/source connectivity/source editeng/source extensions/source forms/source include/tools sc/source sd/source sfx2/source svl/source svtools/source svx/source sw/sou
basic/source/runtime/methods.cxx |4 -
connectivity/source/drivers/calc/CTable.cxx|3 -
connectivity/source/drivers/file/FDateFunctions.cxx| 11 +
editeng/source/items/flditem.cxx |2
editeng/source/uno/unofield.cxx|2
extensions/source/propctrlr/standardcontrol.cxx|6 --
forms/source/xforms/datatypes.cxx |9 +---
include/tools/date.hxx |2
include/tools/datetime.hxx |7 +++
include/tools/time.hxx |2
sc/source/filter/oox/revisionfragment.cxx |4 -
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |4 -
sc/source/filter/xml/XMLConverter.cxx | 22 --
sc/source/filter/xml/XMLConverter.hxx |2
sc/source/filter/xml/xmlexprt.cxx |7 ---
sc/source/filter/xml/xmlimprt.cxx |8 ---
sc/source/ui/docshell/docsh8.cxx |3 -
sc/source/ui/miscdlgs/sharedocdlg.cxx |4 -
sc/source/ui/unoobj/fielduno.cxx |2
sd/source/ui/annotations/annotationmanager.cxx |2
sfx2/source/appl/sfxpicklist.cxx |5 --
sfx2/source/dialog/dinfdlg.cxx | 28 +---
sfx2/source/dialog/versdlg.cxx | 10
sfx2/source/doc/SfxDocumentMetaData.cxx|3 -
sfx2/source/doc/objcont.cxx| 10
sfx2/source/view/viewprn.cxx |4 -
svl/source/numbers/numfmuno.cxx|3 -
svtools/source/contnr/contentenumeration.cxx |3 -
svtools/source/svhtml/parhtml.cxx |6 --
svx/source/fmcomp/gridcell.cxx |2
sw/source/core/doc/doccomp.cxx |5 --
sw/source/core/doc/docglbl.cxx |6 --
sw/source/core/fields/docufld.cxx | 37 +++--
sw/source/core/fields/flddat.cxx | 11 -
sw/source/core/unocore/unoredline.cxx | 19 +---
sw/source/filter/ww8/wrtww8.cxx| 12 +
sw/source/filter/ww8/ww8par.cxx|5 --
tools/source/datetime/datetime.cxx |6 ++
tools/source/datetime/tdate.cxx|5 ++
tools/source/datetime/ttime.cxx|5 ++
unotools/source/ucbhelper/ucbhelper.cxx|4 -
xmlsecurity/source/dialogs/resourcemanager.cxx |4 -
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 12 +
43 files changed, 97 insertions(+), 214 deletions(-)
New commits:
commit c32a5a3b8e2e3a49ac9f1fd3f2872b00612676b7
Author: Noel Grandin
Date: Sun Jan 11 13:35:38 2015 +0200
simplify Date/Time/DateTime conversion code
add constructors to Date/DateTime/Time,
that take the css::util counterparts,
to simplify code converting between these type
Change-Id: I4b03da02c63f65b6ec18cb4d6ecc3859bdef1ff7
Reviewed-on: https://gerrit.libreoffice.org/13855
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 113f94d..2817815 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3224,8 +3224,8 @@ RTLFUNC(FileDateTime)
try
{
util::DateTime aUnoDT = xSFI->getDateTimeModified( aPath );
-aTime = tools::Time( aUnoDT.Hours, aUnoDT.Minutes,
aUnoDT.Seconds, aUnoDT.NanoSeconds );
-aDate = Date( aUnoDT.Day, aUnoDT.Month, aUnoDT.Year );
+aTime = tools::Time( aUnoDT );
+aDate = Date( aUnoDT );
}
catch(const Exception & )
{
diff --git a/connectivity/source/drivers/calc/CTable.cxx
b/connectivity/source/drivers/calc/CTable.cxx
index 3e51949..fbf7e94 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -350,8 +350,7 @@ static void lcl_SetValue( ORowSetValue& rValue, const
Reference& x
{
::Date aDate( rNullDate );
aDate += (long)::rtl::math::approxFloor( xCell->getValue()
);
-::com::sun::star::util::Date aDateStruct( aDate.GetDay(),
aDate.GetMonth(), aDate.GetYear() );
-rValue = aDateStruct;
+rValue = aDate.GetUNODate();
}
else
rValue.setNull();
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx
b/connectivity/source/drivers/file/FDateFu
[Libreoffice-commits] core.git: 2 commits - officecfg/registry sc/source sc/uiconfig
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |4 ++-- sc/source/core/tool/calcconfig.cxx |2 +- sc/uiconfig/scalc/ui/formulacalculationoptions.ui|2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 86db1702d72a103ffeafc69dcaa63318539c147a Author: Tor Lillqvist Date: Tue Jan 13 17:07:29 2015 +0200 Decrease the formula group size limit for OpenCL to be considered back to 100 Are we having fun yet? This reverts commit 0694e8313877ca433d226c753301a5a90364b3a5. Change-Id: I378a1695a7b3bd8a1b6bb3d5aa1fff53ab8c7bb5 diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 5d106dc..4e20f9e 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1361,9 +1361,9 @@ -Lower limit on the size of a formula group for OpenCL to be considered. +An approximate lower limit on the number of data cells a spreadsheet formula should use for OpenCL to be considered. - 1 + 100 diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 36db540..f380d13 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -37,7 +37,7 @@ void ScCalcConfig::setOpenCLConfigToDefault() // Crazy. mbOpenCLSubsetOnly = true; mbOpenCLAutoSelect = true; -mnOpenCLMinimumFormulaGroupSize = 1; +mnOpenCLMinimumFormulaGroupSize = 100; // Keep in order of opcode value, is that clearest? (Random order, // at least, would make no sense at all.) diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui index d3aa3d7..20cfab0 100644 --- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui +++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui @@ -5,7 +5,7 @@ 2 -1 +100 1 100 commit f2eaf4dbae3cc8fd0fca51b161be8bfde0a4eead Author: Tor Lillqvist Date: Tue Jan 13 16:27:09 2015 +0200 Allow setting the limit to the minumum possible Also change the default to what it actually is now. Change-Id: Iac5737f9328587c9f0757acecce4f2e77e715d8b diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui index 4e81c04..d3aa3d7 100644 --- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui +++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui @@ -4,8 +4,8 @@ -100 -100 +2 +1 1 100 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/python3
external/python3/ubsan.patch.0 | 22 ++ 1 file changed, 22 insertions(+) New commits: commit e376bc04dc426ff3470647fa1abd4e28d263f00e Author: Stephan Bergmann Date: Tue Jan 13 16:12:55 2015 +0100 external/python3: Work around -fsanitize=alignment Change-Id: I33976bc96fc78dd0210d9aec6d1ec925f514c7f2 diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0 index acfd189..39717d2 100644 --- a/external/python3/ubsan.patch.0 +++ b/external/python3/ubsan.patch.0 @@ -1,3 +1,25 @@ +--- Modules/_ctypes/libffi/src/x86/ffi64.c Modules/_ctypes/libffi/src/x86/ffi64.c +@@ -545,11 +545,15 @@ + tramp = (volatile unsigned short *) &closure->tramp[0]; + + tramp[0] = 0xbb49; /* mov , %r11 */ +- *((unsigned long long * volatile) &tramp[1]) +-= (unsigned long) ffi_closure_unix64; ++ tramp[1] = (unsigned long) ffi_closure_unix64; ++ tramp[2] = ((unsigned long) ffi_closure_unix64) >> 16; ++ tramp[3] = ((unsigned long) ffi_closure_unix64) >> 32; ++ tramp[4] = ((unsigned long) ffi_closure_unix64) >> 48; + tramp[5] = 0xba49; /* mov , %r10 */ +- *((unsigned long long * volatile) &tramp[6]) +-= (unsigned long) codeloc; ++ tramp[6] = (unsigned long) codeloc; ++ tramp[7] = ((unsigned long) codeloc) >> 16; ++ tramp[8] = ((unsigned long) codeloc) >> 32; ++ tramp[9] = ((unsigned long) codeloc) >> 48; + + /* Set the carry bit iff the function uses any sse registers. + This is clc or stc, together with the first byte of the jmp. */ --- Objects/listobject.c +++ Objects/listobject.c @@ -2036,7 +2036,7 @@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-0' - sc/inc sc/source
sc/inc/column.hxx |1 +
sc/source/core/data/cellvalue.cxx |4 ++--
sc/source/core/data/column3.cxx | 13 -
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit cdffabbcb8458b65de9c740216cd0681247739c3
Author: Markus Mohrhard
Date: Sat Jan 10 13:16:20 2015 +0100
only delete cell content for CELLTYPE_NONE, fdo#88200
Change-Id: I43463b56cabfea4c9ee2b98445f7fb51197d
Reviewed-on: https://gerrit.libreoffice.org/13842
Reviewed-by: Muthu Subramanian K
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit 4b6c9a6918238441f63222d4fc9e9db94bed6f0d)
Reviewed-on: https://gerrit.libreoffice.org/13886
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 9e66f8f..2644bf3 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -189,6 +189,7 @@ public:
const sc::CellTextAttr* GetCellTextAttr( sc::ColumnBlockConstPosition&
rBlockPos, SCROW nRow ) const;
voidDelete( SCROW nRow );
+voidDeleteContent( SCROW nRow, bool bBroadcast = true );
voidFreeAll();
voidFreeNotes();
void Swap( ScColumn& rOther, SCROW nRow1, SCROW nRow2, bool bPattern );
diff --git a/sc/source/core/data/cellvalue.cxx
b/sc/source/core/data/cellvalue.cxx
index 8a69d12..8732926 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -123,7 +123,7 @@ static void commitToColumn( const ScCellValue& rCell,
ScColumn& rColumn, SCROW n
}
break;
default:
-rColumn.Delete(nRow);
+rColumn.DeleteContent(nRow);
}
}
@@ -463,7 +463,7 @@ void ScCellValue::release( ScColumn& rColumn, SCROW nRow,
sc::StartListeningType
rColumn.SetFormulaCell(nRow, mpFormula, eListenType);
break;
default:
-rColumn.Delete(nRow);
+rColumn.DeleteContent(nRow);
}
meType = CELLTYPE_NONE;
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 44e3585..8173e67 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -108,7 +108,7 @@ void ScColumn::InterpretDirtyCells( SCROW nRow1, SCROW
nRow2 )
sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
}
-void ScColumn::Delete( SCROW nRow )
+void ScColumn::DeleteContent( SCROW nRow, bool bBroadcast )
{
sc::CellStoreType::position_type aPos = maCells.position(nRow);
sc::CellStoreType::iterator it = aPos.first;
@@ -122,6 +122,17 @@ void ScColumn::Delete( SCROW nRow )
sc::SharedFormulaUtil::unshareFormulaCell(aPos, *p);
}
maCells.set_empty(nRow, nRow);
+
+if (bBroadcast)
+{
+Broadcast(nRow);
+CellStorageModified();
+}
+}
+
+void ScColumn::Delete( SCROW nRow )
+{
+DeleteContent(nRow, false);
maCellTextAttrs.set_empty(nRow, nRow);
maCellNotes.set_empty(nRow, nRow);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-0' - sc/source
sc/source/core/tool/compiler.cxx | 31 ---
1 file changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 6d26deaa4c40f554fb6bc036047564d466b361fd
Author: Markus Mohrhard
Date: Sat Dec 27 06:51:52 2014 +0100
handle index based external refs in formulas in ooxml import, fdo#85617
(cherry picked from commit 18cccd62fb5b730319878df6fac748d5cdf73f1f)
return after finding the reference
(cherry picked from commit cef36587674b6472471478524e87b1add4109507)
that method is the same as in the base class
(cherry picked from commit 02caf8f2eef75d8b5acb6a4ec40277355c3c6c6e)
remove copy&paste code
(cherry picked from commit 757ce63f7346aea132f11c3d9a328b0a1a776403)
a22b97b0a45d8d840095737638c2ccf68373e27a
8cb6f59795d9461c0e02ab70d7edd60af1410c1f
5710856fdb9fb91573de89eeb5a29d3d106ad7a6
Change-Id: Ie4f43f041f5d614b9c2826c74574c854af05c266
Reviewed-on: https://gerrit.libreoffice.org/13837
Tested-by: Eike Rathke
Reviewed-by: Eike Rathke
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 37c234a..40f1de7 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -986,6 +986,10 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1
struct ConventionXL
{
+virtual ~ConventionXL()
+{
+}
+
static void GetTab(
const ScAddress& rPos, const std::vector& rTabNames,
const ScSingleRefData& rRef, OUString& rTabName )
@@ -1100,7 +1104,7 @@ struct ConventionXL
}
}
-static void parseExternalDocName( const OUString& rFormula, sal_Int32&
rSrcPos )
+virtual void parseExternalDocName( const OUString& rFormula, sal_Int32&
rSrcPos ) const
{
sal_Int32 nLen = rFormula.getLength();
const sal_Unicode* p = rFormula.getStr();
@@ -1236,7 +1240,7 @@ struct ConventionXL_A1 : public Convention_A1, public
ConventionXL
sal_Int32 nSrcPos,
const CharClass* pCharClass) const
SAL_OVERRIDE
{
-ConventionXL::parseExternalDocName(rFormula, nSrcPos);
+parseExternalDocName(rFormula, nSrcPos);
ParseResult aRet;
if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) )
@@ -1322,6 +1326,27 @@ struct ConventionXL_OOX : public ConventionXL_A1
* CellStr. */
}
+virtual void parseExternalDocName(const OUString& rFormula, sal_Int32&
rSrcPos) const SAL_OVERRIDE
+{
+sal_Int32 nLen = rFormula.getLength();
+const sal_Unicode* p = rFormula.getStr();
+for (sal_Int32 i = rSrcPos; i < nLen; ++i)
+{
+sal_Unicode c = p[i];
+if (i == rSrcPos)
+{
+// first character must be '['.
+if (c != '[')
+return;
+}
+else if (c == ']')
+{
+rSrcPos = i + 1;
+return;
+}
+}
+}
+
virtual void makeExternalRefStr(
OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId,
const OUString& /*rFileName*/,
const OUString& rTabName, const ScSingleRefData& rRef ) const
SAL_OVERRIDE
@@ -1461,7 +1486,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention,
public ConventionXL
sal_Int32 nSrcPos,
const CharClass* pCharClass) const SAL_OVERRIDE
{
-ConventionXL::parseExternalDocName(rFormula, nSrcPos);
+parseExternalDocName(rFormula, nSrcPos);
ParseResult aRet;
if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-0' - sc/source
sc/source/core/tool/compiler.cxx |3 +--
sc/source/filter/excel/xecontent.cxx | 12
sc/source/filter/excel/xelink.cxx|2 +-
sc/source/filter/inc/xecontent.hxx |5 +++--
sc/source/ui/unoobj/linkuno.cxx |8 +---
5 files changed, 18 insertions(+), 12 deletions(-)
New commits:
commit 0e4df45891035e9f18070173a02c5bdc2eda9a49
Author: Eike Rathke
Date: Fri Jan 9 13:53:27 2015 +0100
Resolves: fdo#85617 always store fully encoded external document name
Also OOXML calls these API functions, this is the central place to handle
it.
(cherry picked from commit 97a8b3ed5e5bd42e213d3230fa764b0f5d10f0f2)
write externalLink Relationship Target IURI encoded, fdo#85617 related
(cherry picked from commit 7eb5e135422f1a5830a44d129300bc3fafb4627d)
do not drop entire external reference, fdo#85617 related
If there are no matching tab names for a FileId, preserve at least the known
reference parts. In case of 2D references the sheet name is in the token if
for example read from .xlsx, only for 3D references the second sheet name
would be needed. The underlying makeExternalRefStr() and its subroutines
handle the missing tabname elements gracefully.
Still this situation is worth an assertion.
(cherry picked from commit b6339617b1cc3136f9e527acd0746d712cd21643)
Change-Id: I3df065af8e4ef44734f468fd455c3b7c93d7fbc6
Reviewed-on: https://gerrit.libreoffice.org/13838
Reviewed-by: Markus Mohrhard
Reviewed-by: Michael Stahl
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 5320d7e..37c234a 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4136,8 +4136,7 @@ void ScCompiler::CreateStringFromExternal(OUStringBuffer&
rBuffer, FormulaToken*
{
vector aTabNames;
pRefMgr->getAllCachedTableNames(nFileId, aTabNames);
-if (aTabNames.empty())
-return;
+assert(!aTabNames.empty()); // something is seriously wrong, but
continue
pConv->makeExternalRefStr(
rBuffer, GetPos(), nFileId, *pFileName, aTabNames,
t->GetString().getString(),
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 521d1a9..47de380 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -353,7 +353,9 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot,
const SvxURLField& rU
{
sal_uInt16 nLevel;
bool bRel;
-OUString aFileName( BuildFileName( nLevel, bRel, rUrl, rRoot ) );
+/* TODO: should we differentiate between BIFF and OOXML and write IURI
+ * encoded for OOXML? */
+OUString aFileName( BuildFileName( nLevel, bRel, rUrl, rRoot, false )
);
if( eProtocol == INET_PROT_SMB )
{
@@ -444,9 +446,10 @@ XclExpHyperlink::~XclExpHyperlink()
}
OUString XclExpHyperlink::BuildFileName(
-sal_uInt16& rnLevel, bool& rbRel, const OUString& rUrl, const
XclExpRoot& rRoot )
+sal_uInt16& rnLevel, bool& rbRel, const OUString& rUrl, const
XclExpRoot& rRoot, bool bEncoded )
{
-OUString aDosName( INetURLObject( rUrl ).getFSysPath(
INetURLObject::FSYS_DOS ) );
+INetURLObject aURLObject( rUrl );
+OUString aDosName( bEncoded ? aURLObject.GetURLPath() :
aURLObject.getFSysPath( INetURLObject::FSYS_DOS ) );
rnLevel = 0;
rbRel = rRoot.IsRelUrl();
@@ -455,7 +458,8 @@ OUString XclExpHyperlink::BuildFileName(
// try to convert to relative file name
OUString aTmpName( aDosName );
aDosName = INetURLObject::GetRelURL( rRoot.GetBasePath(), rUrl,
-INetURLObject::WAS_ENCODED, INetURLObject::DECODE_WITH_CHARSET );
+INetURLObject::WAS_ENCODED,
+(bEncoded ? INetURLObject::DECODE_TO_IURI :
INetURLObject::DECODE_WITH_CHARSET));
if (aDosName.startsWith(INET_FILE_SCHEME))
{
diff --git a/sc/source/filter/excel/xelink.cxx
b/sc/source/filter/excel/xelink.cxx
index fe43ee7..3c8dffc 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1655,7 +1655,7 @@ void XclExpSupbook::SaveXml( XclExpXmlStream& rStrm )
bool bRel = true;
OUString sId = rStrm.addRelation( pExternalLink->getOutputStream(),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLinkPath";,
-XclExpHyperlink::BuildFileName( nLevel, bRel, maUrl, GetRoot()),
+XclExpHyperlink::BuildFileName( nLevel, bRel, maUrl, GetRoot(),
true),
true );
pExternalLink->startElement( XML_externalLink,
diff --git a/sc/source/filter/inc/xecontent.hxx
b/sc/source/filter/inc/xecontent.hxx
index 2142293..f2e8ee9 100644
--- a/sc/source/filter/inc/xecontent.hxx
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c5e31cdf8d81f2d03077ee962e76513c3858aa3d Author: Andras Timar Date: Tue Jan 13 11:19:38 2015 +0100 Updated core Project: dictionaries e1c4530a7e10e0a407a08f166b29b0105fd7f004 Update Portuguese dictionary to version 15.1.2.1 Change-Id: Ia6a17f7afa6ce05cd77ec1b924640e5e6254b4f7 (cherry picked from commit e68d0668772656518c71f49f2968a83b9bbccfcc) Reviewed-on: https://gerrit.libreoffice.org/13883 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/dictionaries b/dictionaries index 79e5674..e1c4530 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 79e5674b3e1b10e659337ec1bad03101bf473608 +Subproject commit e1c4530a7e10e0a407a08f166b29b0105fd7f004 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbb294d186eb3f297fada1cd8cc0c32ba3ce87fa Author: Andras Timar Date: Tue Jan 13 11:19:38 2015 +0100 Updated core Project: dictionaries cf7f3f2a103609a99ce7204713ae327548ab7bdb Update Portuguese dictionary to version 15.1.2.1 Change-Id: Ia6a17f7afa6ce05cd77ec1b924640e5e6254b4f7 (cherry picked from commit e68d0668772656518c71f49f2968a83b9bbccfcc) Reviewed-on: https://gerrit.libreoffice.org/13882 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/dictionaries b/dictionaries index 679e27e..cf7f3f2 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 679e27e61d2d3909c8f532ec9ec6e02651c01d67 +Subproject commit cf7f3f2a103609a99ce7204713ae327548ab7bdb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-3' - pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 - pt_PT/pt_PT.dic | 99 +- 2 files changed, 91 insertions(+), 10 deletions(-) New commits: commit e1c4530a7e10e0a407a08f166b29b0105fd7f004 Author: Andras Timar Date: Tue Jan 13 11:19:38 2015 +0100 Update Portuguese dictionary to version 15.1.2.1 Change-Id: Ia6a17f7afa6ce05cd77ec1b924640e5e6254b4f7 (cherry picked from commit e68d0668772656518c71f49f2968a83b9bbccfcc) Reviewed-on: https://gerrit.libreoffice.org/13883 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/pt_PT/description.xml b/pt_PT/description.xml index 1a3149b..044518a 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + European Portuguese spelling dictionary, hyphenation rules, and thesaurus diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index 097ea87..a424b4e 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 44083 + 44164 , [CAT=punct1a] ; [CAT=punct1b] : [CAT=punct1c] @@ -299,6 +299,7 @@ acerto/pS [CAT=nc,G=m,N=s] acervo/p [CAT=nc,G=m,N=s] aceso/fp [CAT=adj,N=s,G=m] acessão [CAT=nc,G=f,N=s] +acessar/XYPLD [CAT=v,T=inf,TR=t] acessÃvel/pdI [CAT=adj,N=s,G=_] acesso/p [CAT=nc,G=m,N=s] acessório/fpH [CAT=a_nc,G=m,N=s] @@ -2188,6 +2189,7 @@ antisséptico/fp [PREAO90=anti-séptico,CAT=a_nc,G=m,N=s] antiteatro [CAT=nc,G=m,N=s] antiteÃsmo/pq [CAT=nc,G=m,N=s] antitérmico/fp[CAT=adj,N=s,G=m] +antiterrorismo [PREAO90=anti-terrorismo,CAT=nc,G=m,N=s] antÃtese/p[CAT=nc,G=f,N=s] antitetânico [CAT=adj,N=s,G=m] antitético[CAT=adj,N=s,G=m] @@ -4864,6 +4866,7 @@ bilaminado[CAT=adj,N=s,G=m] bilateral/pmi [CAT=adj,N=s,G=_] bilénio [CAT=nc,G=m,N=s] bilha/p[CAT=nc,G=m,N=s] +bilhão/p [CAT=nc,G=m,N=s] bilhardar/XYPL [CAT=v,T=inf,TR=t] bilhardeiro[CAT=nc,G=m,N=s] bilharista [CAT=nc,G=_,N=s] @@ -5964,8 +5967,8 @@ cálice/p [CAT=nc,G=m,N=s] calicida [CAT=nc,G=m,N=s] caliciforme/p [CAT=adj,N=s,G=_] caliço[CAT=nc,G=m,N=s] -calÃculo [CAT=nc,G=m,N=s] -cálido[CAT=adj,N=s,G=m] +calÃculo/p[CAT=nc,G=m,N=s] +cálido/pf [CAT=adj,N=s,G=m] calidoscópio [CAT=nc,G=m,N=s] califado/p [CAT=nc,G=m,N=s] califa/p [CAT=nc,G=m,N=s] @@ -6007,7 +6010,7 @@ calotear/ZYPL [CAT=v,T=inf,TR=_] caloteiro/ifp [CAT=a_nc,G=m,N=s] calote/p [CAT=nc,G=m,N=s] caluda [CAT=in] -caluniador [CAT=a_nc,G=m,N=s] +caluniador/fp [CAT=a_nc,G=m,N=s] calúnia/p [CAT=nc,G=f,N=s] caluniar/XYPLDv[CAT=v,T=inf,TR=t] calunioso/fp [CAT=adj,N=s,G=m] @@ -9113,6 +9116,7 @@ contra-assalto[CAT=nc,G=m,N=s] contra-atacante/p [CAT=a_nc,N=s,G=_] contra-atacar/XYPLn[CAT=v,T=inf,TR=t] contra-ataque/p[CAT=nc,G=m,N=s] +contraterrorismo [PREAO90=contra-terrorismo,CAT=nc,G=m,N=s] contrainformação/p [PREAO90=contra-informação,CAT=nc,G=m,N=s] contrabaixista [CAT=nc,G=_,N=s] contrabaixo/t [CAT=nc,G=m,N=s] @@ -9646,6 +9650,7 @@ corujento [CAT=adj,N=s,G=m] corujo/f [CAT=nc,G=m,N=s] corvense/p [CAT=a_nc,N=s,G=_] corveta/p [CAT=nc,G=f,N=s] +corvÃdeo/p[CAT=nc,G=m,N=s] corvo-marinho [CAT=nc,G=m,N=s] corvo/p[CAT=nc,G=m,N=s] coscuvilhar/XYL[CAT=v,T=inf,TR=i] @@ -11218,7 +11223,7 @@ desincorporar/XYPLc [CAT=v,T=inf,TR=t] desincrustar/XYPLc [CAT=v,T=inf,TR=t] desinencial[CAT=adj,N=s,G=_] desinência/p [CAT=nc,G=f,N=s] -desinfeção [PREAO90=desinfecção,CAT=nc,G=f,N=s] +desinfeção/p [PREAO90=desinfecção,CAT=nc,G=f,N=s] desinfecionar/XYPL [PREAO90=desinfeccionar,CAT=v,T=inf,TR=t] desinfetante/p [PREAO90=desinfectante,CAT=a_nc,G=2,N=s] desinfetar/XYPLDn [PREAO90=desinfectar,CAT=v,T=inf,TR=t] @@ -11455,6 +11460,7 @@ destituir/KPLc [CAT=v,T=inf,TR=t] destoante/p[CAT=adj,N=s,G=_] destoar/XYLn [CAT=v,T=inf,TR=i] destrambelhar/XYLM [CAT=v,T=inf,TR=i] +destratar/XYPLMDnv [CAT=v,T=inf,TR=_] destravar/XYPL [CAT=v,T=inf,TR=_] destreinar/XYPL[CAT=v,T=inf,TR=t] destreza [CAT=nc,G=f,N=s] @@ -13168,7 +13174,7 @@ enjeitar/XYPLM [CAT=v,T=inf,TR=t] enjoadiço [CAT=adj,N=s,G=m] enjoar/XYPLM [CAT=v,T=inf,TR=_] enjoativo [CAT=adj,N=s,G=m] -enjoo [CAT=nc,G=m,N=s] +enjoo/p[CAT=nc,G=m,N=s] enlaçar/XYPLM [CAT=v,T=inf,TR=_] enlace/p [CAT=nc,G=m,N=s] enlambuzar/XYPLM [CAT=v,T=inf,TR=t] @@ -15831,6 +15837,7 @@ folgadamente[CAT=adv] folga [CAT=nc,G=f,N=s] folgante/p [CAT=nc,G=_,N=s] folgar/XYPLDn [CAT=v,T=inf,TR=_] +folgazão/be [CAT=adj,N=s,G=m] folguedo/p [CAT=nc,G=m,N=s] folhada[CAT=nc,G=f,N=s] folhagem/p [CAT=nc,G=f,N=s] @@ -15937,6 +15944,7 @@ formigante
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-4' - pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 - pt_PT/pt_PT.dic | 99 +- 2 files changed, 91 insertions(+), 10 deletions(-) New commits: commit cf7f3f2a103609a99ce7204713ae327548ab7bdb Author: Andras Timar Date: Tue Jan 13 11:19:38 2015 +0100 Update Portuguese dictionary to version 15.1.2.1 Change-Id: Ia6a17f7afa6ce05cd77ec1b924640e5e6254b4f7 (cherry picked from commit e68d0668772656518c71f49f2968a83b9bbccfcc) Reviewed-on: https://gerrit.libreoffice.org/13882 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/pt_PT/description.xml b/pt_PT/description.xml index 1a3149b..044518a 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + European Portuguese spelling dictionary, hyphenation rules, and thesaurus diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index 097ea87..a424b4e 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 44083 + 44164 , [CAT=punct1a] ; [CAT=punct1b] : [CAT=punct1c] @@ -299,6 +299,7 @@ acerto/pS [CAT=nc,G=m,N=s] acervo/p [CAT=nc,G=m,N=s] aceso/fp [CAT=adj,N=s,G=m] acessão [CAT=nc,G=f,N=s] +acessar/XYPLD [CAT=v,T=inf,TR=t] acessÃvel/pdI [CAT=adj,N=s,G=_] acesso/p [CAT=nc,G=m,N=s] acessório/fpH [CAT=a_nc,G=m,N=s] @@ -2188,6 +2189,7 @@ antisséptico/fp [PREAO90=anti-séptico,CAT=a_nc,G=m,N=s] antiteatro [CAT=nc,G=m,N=s] antiteÃsmo/pq [CAT=nc,G=m,N=s] antitérmico/fp[CAT=adj,N=s,G=m] +antiterrorismo [PREAO90=anti-terrorismo,CAT=nc,G=m,N=s] antÃtese/p[CAT=nc,G=f,N=s] antitetânico [CAT=adj,N=s,G=m] antitético[CAT=adj,N=s,G=m] @@ -4864,6 +4866,7 @@ bilaminado[CAT=adj,N=s,G=m] bilateral/pmi [CAT=adj,N=s,G=_] bilénio [CAT=nc,G=m,N=s] bilha/p[CAT=nc,G=m,N=s] +bilhão/p [CAT=nc,G=m,N=s] bilhardar/XYPL [CAT=v,T=inf,TR=t] bilhardeiro[CAT=nc,G=m,N=s] bilharista [CAT=nc,G=_,N=s] @@ -5964,8 +5967,8 @@ cálice/p [CAT=nc,G=m,N=s] calicida [CAT=nc,G=m,N=s] caliciforme/p [CAT=adj,N=s,G=_] caliço[CAT=nc,G=m,N=s] -calÃculo [CAT=nc,G=m,N=s] -cálido[CAT=adj,N=s,G=m] +calÃculo/p[CAT=nc,G=m,N=s] +cálido/pf [CAT=adj,N=s,G=m] calidoscópio [CAT=nc,G=m,N=s] califado/p [CAT=nc,G=m,N=s] califa/p [CAT=nc,G=m,N=s] @@ -6007,7 +6010,7 @@ calotear/ZYPL [CAT=v,T=inf,TR=_] caloteiro/ifp [CAT=a_nc,G=m,N=s] calote/p [CAT=nc,G=m,N=s] caluda [CAT=in] -caluniador [CAT=a_nc,G=m,N=s] +caluniador/fp [CAT=a_nc,G=m,N=s] calúnia/p [CAT=nc,G=f,N=s] caluniar/XYPLDv[CAT=v,T=inf,TR=t] calunioso/fp [CAT=adj,N=s,G=m] @@ -9113,6 +9116,7 @@ contra-assalto[CAT=nc,G=m,N=s] contra-atacante/p [CAT=a_nc,N=s,G=_] contra-atacar/XYPLn[CAT=v,T=inf,TR=t] contra-ataque/p[CAT=nc,G=m,N=s] +contraterrorismo [PREAO90=contra-terrorismo,CAT=nc,G=m,N=s] contrainformação/p [PREAO90=contra-informação,CAT=nc,G=m,N=s] contrabaixista [CAT=nc,G=_,N=s] contrabaixo/t [CAT=nc,G=m,N=s] @@ -9646,6 +9650,7 @@ corujento [CAT=adj,N=s,G=m] corujo/f [CAT=nc,G=m,N=s] corvense/p [CAT=a_nc,N=s,G=_] corveta/p [CAT=nc,G=f,N=s] +corvÃdeo/p[CAT=nc,G=m,N=s] corvo-marinho [CAT=nc,G=m,N=s] corvo/p[CAT=nc,G=m,N=s] coscuvilhar/XYL[CAT=v,T=inf,TR=i] @@ -11218,7 +11223,7 @@ desincorporar/XYPLc [CAT=v,T=inf,TR=t] desincrustar/XYPLc [CAT=v,T=inf,TR=t] desinencial[CAT=adj,N=s,G=_] desinência/p [CAT=nc,G=f,N=s] -desinfeção [PREAO90=desinfecção,CAT=nc,G=f,N=s] +desinfeção/p [PREAO90=desinfecção,CAT=nc,G=f,N=s] desinfecionar/XYPL [PREAO90=desinfeccionar,CAT=v,T=inf,TR=t] desinfetante/p [PREAO90=desinfectante,CAT=a_nc,G=2,N=s] desinfetar/XYPLDn [PREAO90=desinfectar,CAT=v,T=inf,TR=t] @@ -11455,6 +11460,7 @@ destituir/KPLc [CAT=v,T=inf,TR=t] destoante/p[CAT=adj,N=s,G=_] destoar/XYLn [CAT=v,T=inf,TR=i] destrambelhar/XYLM [CAT=v,T=inf,TR=i] +destratar/XYPLMDnv [CAT=v,T=inf,TR=_] destravar/XYPL [CAT=v,T=inf,TR=_] destreinar/XYPL[CAT=v,T=inf,TR=t] destreza [CAT=nc,G=f,N=s] @@ -13168,7 +13174,7 @@ enjeitar/XYPLM [CAT=v,T=inf,TR=t] enjoadiço [CAT=adj,N=s,G=m] enjoar/XYPLM [CAT=v,T=inf,TR=_] enjoativo [CAT=adj,N=s,G=m] -enjoo [CAT=nc,G=m,N=s] +enjoo/p[CAT=nc,G=m,N=s] enlaçar/XYPLM [CAT=v,T=inf,TR=_] enlace/p [CAT=nc,G=m,N=s] enlambuzar/XYPLM [CAT=v,T=inf,TR=t] @@ -15831,6 +15837,7 @@ folgadamente[CAT=adv] folga [CAT=nc,G=f,N=s] folgante/p [CAT=nc,G=_,N=s] folgar/XYPLDn [CAT=v,T=inf,TR=_] +folgazão/be [CAT=adj,N=s,G=m] folguedo/p [CAT=nc,G=m,N=s] folhada[CAT=nc,G=f,N=s] folhagem/p [CAT=nc,G=f,N=s] @@ -15937,6 +15944,7 @@ formigante
[Libreoffice-commits] core.git: forms/source qadevOOo/runner qadevOOo/tests
forms/source/component/refvaluecomponent.cxx | 11 +++
qadevOOo/runner/util/ValueChanger.java | 17 -
qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java | 54 +++
qadevOOo/tests/java/ifc/beans/_XPropertySet.java |2
4 files changed, 58 insertions(+), 26 deletions(-)
New commits:
commit 7ca657e5eeb883d2a90ef80456f48a7df6e27cba
Author: Stephan Bergmann
Date: Tue Jan 13 15:14:07 2015 +0100
css.form.component.{CheckBox,RadioButton} DefaultState property values
...must be in the range 0--2; avoid setting bad values from generic qadevOOo
property set tests, and throw an IllegalArgumentException if bad values do
get set.
Change-Id: Ia4a97d0fac326b3ca2ce254946dc4d418e9dd5a7
diff --git a/forms/source/component/refvaluecomponent.cxx
b/forms/source/component/refvaluecomponent.cxx
index b3f4afe..0be4706 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -103,8 +103,15 @@ namespace frm
case PROPERTY_ID_DEFAULT_STATE:
{
-sal_Int16 nDefaultChecked( (sal_Int16)TRISTATE_FALSE );
-OSL_VERIFY( _rValue >>= nDefaultChecked );
+sal_Int16 nDefaultChecked;
+if (!(_rValue >>= nDefaultChecked) || nDefaultChecked < 0
+|| nDefaultChecked > 2)
+{
+throw css::lang::IllegalArgumentException(
+("DefaultState property value must be a SHORT in the range"
+ " 0--2"),
+css::uno::Reference(), -1);
+}
m_eDefaultChecked = (ToggleState)nDefaultChecked;
resetNoBroadcast();
}
diff --git a/qadevOOo/runner/util/ValueChanger.java
b/qadevOOo/runner/util/ValueChanger.java
index 87cc2e7..197de43 100644
--- a/qadevOOo/runner/util/ValueChanger.java
+++ b/qadevOOo/runner/util/ValueChanger.java
@@ -32,7 +32,7 @@ import com.sun.star.uno.AnyConverter;
public class ValueChanger {
// Method to change a Value, thought for properties
-public static Object changePValue(Object oldValue) {
+public static Object changePValue(Object oldValue, String name) {
Object newValue = null;
@@ -57,8 +57,15 @@ public class ValueChanger {
long oldlong = ((Long) oldValue).longValue();
newValue = Long.valueOf(oldlong + 15);
} else if (oldValue instanceof Short) {
-short oldshort = ((Short) oldValue).shortValue();
-newValue = Short.valueOf((short) (oldshort + 1));
+short n = ((Short) oldValue).shortValue();
+// css.form.component.{CheckBox,RadioButton} DefaultState
properties
+// must have values in the range 0--2:
+if ("DefaultState".equals(name) && n == 2) {
+--n;
+} else {
+++n;
+}
+newValue = Short.valueOf(n);
} else if (oldValue instanceof Byte) {
byte oldbyte = ((Byte) oldValue).byteValue();
newValue = Byte.valueOf((byte) (oldbyte + 1));
@@ -1000,6 +1007,10 @@ public class ValueChanger {
} // end of Change PValue
+public static Object changePValue(Object oldValue) {
+return changePValue(oldValue, null);
+}
+
/**
* Checks if the passed value is the API structure. The value assumed to be
* a structure if there are no public methods, and all public fields are
not
diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
index 925b20e..b0b645a 100644
--- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
@@ -53,10 +53,24 @@ import com.sun.star.uno.UnoRuntime;
* @see com.sun.star.beans.XFastPropertySet
*/
public class _XFastPropertySet extends MultiMethodTest {
+private static final class Prop {
+public final int handle;
+public final String name;
+
+public Prop() {
+handle = -1;
+name = null;
+}
+
+public Prop(int handle, String name) {
+this.handle = handle;
+this.name = name;
+}
+};
public XFastPropertySet oObj = null;
-private final List handles = new ArrayList();
-private int handle = -1;
+private final List props = new ArrayList();
+private Prop prop;
private Set exclude = null ;
/**
@@ -91,26 +105,26 @@ public class _XFastPropertySet extends MultiMethodTest {
Object gValue = null;
Object sValue = null;
-if ( handle == -1) {
+if ( prop.handle == -1) {
log.println("*** No changeable properties found ***");
tRes.tested("setFastPropertyValue()", false) ;
} else {
try {
-gValue = oObj.getFastPropertyValue(handle);
-sValue = ValueChanger.changePValue(gVal
[Libreoffice-commits] core.git: basebmp/Library_basebmp.mk
basebmp/Library_basebmp.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 26a967863c2dba39b6be3bd63c0d625625093eb4 Author: Michael Stahl Date: Tue Jan 13 15:11:53 2015 +0100 basebmap: 5e4a7a95027d979b3bdd729d7ebe950da1129b2b missed COM check Change-Id: I6850d69089c4d0db06a22e14888f089406980c2c diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index cd8a753..12a2dec 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -33,11 +33,13 @@ $(eval $(call gb_Library_add_defs,basebmp,\ # Fatal Error C1128: number of sections exceeded object file # format limit : compile with /bigobj # +ifeq ($(COM),MSC) ifeq ($(CPUNAME),X86_64) $(eval $(call gb_Library_add_cxxflags,basebmp, \ -bigobj \ )) endif +endif $(eval $(call gb_Library_add_exception_objects,basebmp,\ basebmp/source/bitmapdevice \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - forms/source
forms/source/component/FormComponent.cxx |1
forms/source/component/ListBox.cxx | 37 +--
forms/source/component/ListBox.hxx |5 +++-
3 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 0331fa6a904d3f923cb80d7104e74ea6f2958179
Author: Lionel Elie Mamane
Date: Tue Jan 13 14:56:23 2015 +0100
ListBox with value list: consider first empty value as NULL
Change-Id: I15c040b481b7f03720d0227ba5d2fcd2ccc78386
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index d6eb7cf..72ce587 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -79,6 +79,8 @@ namespace frm
using ::connectivity::ORowSetValue;
+const ::connectivity::ORowSetValue OListBoxModel::s_aEmptyValue;
+const ::connectivity::ORowSetValue OListBoxModel::s_aEmptyStringValue =
OUString();
//= helper
@@ -1007,12 +1009,12 @@ namespace frm
void OListBoxModel::onDisconnectedDbColumn()
{
+clearBoundValues();
+m_nNULLPos = -1;
+m_nBoundColumnType = DataType::SQLNULL;
+
if ( m_eListSourceType != ListSourceType_VALUELIST )
{
-clearBoundValues();
-m_nNULLPos = -1;
-m_nBoundColumnType = DataType::SQLNULL;
-
if ( !hasExternalListSource() )
setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny(
StringSequence() ) );
@@ -1037,13 +1039,25 @@ namespace frm
void OListBoxModel::convertBoundValues(const sal_Int32 nFieldType) const
{
+assert(s_aEmptyValue.isNull());
+m_nNULLPos = -1;
m_aConvertedBoundValues.resize(m_aBoundValues.size());
ValueList::const_iterator src = m_aBoundValues.begin();
const ValueList::const_iterator end = m_aBoundValues.end();
ValueList::iterator dst = m_aConvertedBoundValues.begin();
for (; src != end; ++src, ++dst )
{
-*dst = *src;
+if(m_nNULLPos == -1 &&
+ !isRequired()&&
+ (*src == s_aEmptyStringValue || *src == s_aEmptyValue ||
src->isNull()) )
+{
+m_nNULLPos = src - m_aBoundValues.begin();
+dst->setNull();
+}
+else
+{
+*dst = *src;
+}
dst->setTypeKind(nFieldType);
}
m_nConvertedBoundValuesType = nFieldType;
@@ -1090,21 +1104,19 @@ namespace frm
ORowSetValue OListBoxModel::getFirstSelectedValue() const
{
-static const ORowSetValue s_aEmptyVaue;
-
DBG_ASSERT( m_xAggregateFastSet.is(),
"OListBoxModel::getFirstSelectedValue: invalid aggregate!" );
if ( !m_xAggregateFastSet.is() )
-return s_aEmptyVaue;
+return s_aEmptyValue;
Sequence< sal_Int16 > aSelectedIndices;
OSL_VERIFY( m_xAggregateFastSet->getFastPropertyValue(
getValuePropertyAggHandle() ) >>= aSelectedIndices );
if ( !aSelectedIndices.getLength() )
// nothing selected at all
-return s_aEmptyVaue;
+return s_aEmptyValue;
if ( ( m_nNULLPos != -1 ) && ( aSelectedIndices[0] == m_nNULLPos ) )
// the dedicated "NULL" entry is selected
-return s_aEmptyVaue;
+return s_aEmptyValue;
ValueList aValues( impl_getValues() );
@@ -1112,7 +1124,7 @@ namespace frm
if ( selectedValue >= aValues.size() )
{
SAL_WARN( "forms.component",
"OListBoxModel::getFirstSelectedValue: inconsistent selection/valuelist!" );
-return s_aEmptyVaue;
+return s_aEmptyValue;
}
return aValues[ selectedValue ];
diff --git a/forms/source/component/ListBox.hxx
b/forms/source/component/ListBox.hxx
index 85b380c..a1217e8 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -114,7 +114,7 @@ class OListBoxModel :public OBoundControlModel
::com::sun::star::uno::Sequence m_aDefaultSelectSeq;//
DefaultSelected
//
-sal_Int16 m_nNULLPos; //
position of the NULL value in our list
+mutable sal_Int16 m_nNULLPos; //
position of the NULL value in our list
sal_Int32 m_nBoundColumnType;
private:
@@ -145,6 +145,9 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException)
SAL_OVERRIDE;
protected:
+static const ::connectivity::ORowSetValue s_aEmptyValue;
+static const ::connectivity::ORowSetValue s_aEmptyStringValue;
+
// XMultiPropertySet
virtual void SAL_CALL setPropertyValues(const
::com::sun::star::uno::Sequence< OUString >& PropertyNames, const
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values)
throw(::com::sun::star::beans::PropertyVetoExcep
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doccomp.cxx | 122 +++--
1 file changed, 45 insertions(+), 77 deletions(-)
New commits:
commit bdca5a7ec083d24c360c2da86de2415567442605
Author: Caolán McNamara
Date: Tue Jan 13 13:55:58 2015 +
merge CompareData and SwCompareData
the inheritence doesn't help us here at all and we can remove
the virtuals and the casting becomes unnecessary
Change-Id: I1b9f8490876267b587902f5349c804bec907289b
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 65073dd..5e05f7b 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -68,16 +68,27 @@ class CompareData
size_t* pIndex;
bool* pChangedFlag;
+SwDoc& rDoc;
+SwPaM *pInsRing, *pDelRing;
+
+sal_uLong PrevIdx( const SwNode* pNd );
+sal_uLong NextIdx( const SwNode* pNd );
+
protected:
vector< CompareLine* > aLines;
sal_uLong nSttLineNum;
// Truncate beginning and end and add all others to the LinesArray
-virtual void CheckRanges( CompareData& ) = 0;
+void CheckRanges( CompareData& );
public:
-CompareData();
-virtual ~CompareData();
+CompareData( SwDoc& rD )
+: pIndex( 0 ), pChangedFlag( 0 )
+, rDoc( rD ), pInsRing(0), pDelRing(0)
+, nSttLineNum( 0 )
+{
+}
+~CompareData();
// Are there differences?
bool HasDiffs( const CompareData& rData ) const;
@@ -89,10 +100,10 @@ public:
// Displaying the actually content is to be handled by the subclass!
sal_uLong ShowDiffs( const CompareData& rData );
-virtual void ShowInsert( sal_uLong nStt, sal_uLong nEnd );
-virtual void ShowDelete( const CompareData& rData, sal_uLong nStt,
+void ShowInsert( sal_uLong nStt, sal_uLong nEnd );
+void ShowDelete( const CompareData& rData, sal_uLong nStt,
sal_uLong nEnd, sal_uLong nInsPos );
-virtual void CheckForChangesInLine( const CompareData& rData,
+void CheckForChangesInLine( const CompareData& rData,
sal_uLong& nStt, sal_uLong& nEnd,
sal_uLong& nThisStt, sal_uLong& nThisEnd );
@@ -114,6 +125,8 @@ public:
{ return aLines[ nLine ]; }
void InsertLine( CompareLine* pLine )
{ aLines.push_back( pLine ); }
+
+void SetRedlinesToDoc( bool bUseDocInfo );
};
class Hash
@@ -328,13 +341,21 @@ public:
CompareLine::~CompareLine() {}
-CompareData::CompareData()
-: pIndex( 0 ), pChangedFlag( 0 ), nSttLineNum( 0 )
-{
-}
-
CompareData::~CompareData()
{
+if( pDelRing )
+{
+while( pDelRing->GetNext() != pDelRing )
+delete pDelRing->GetNext();
+delete pDelRing;
+}
+if( pInsRing )
+{
+while( pInsRing->GetNext() != pInsRing )
+delete pInsRing->GetNext();
+delete pInsRing;
+}
+
delete[] pIndex;
delete[] pChangedFlag;
}
@@ -422,19 +443,6 @@ bool CompareData::HasDiffs( const CompareData& rData )
const
return bRet;
}
-void CompareData::ShowInsert( sal_uLong, sal_uLong )
-{
-}
-
-void CompareData::ShowDelete( const CompareData&, sal_uLong, sal_uLong,
sal_uLong )
-{
-}
-
-void CompareData::CheckForChangesInLine( const CompareData& ,
-sal_uLong&, sal_uLong&, sal_uLong&,
sal_uLong& )
-{
-}
-
Hash::Hash( sal_uLong nSize )
: nCount(1)
{
@@ -972,30 +980,6 @@ public:
OUString GetText() const;
};
-class SwCompareData : public CompareData
-{
-SwDoc& rDoc;
-SwPaM *pInsRing, *pDelRing;
-
-sal_uLong PrevIdx( const SwNode* pNd );
-sal_uLong NextIdx( const SwNode* pNd );
-
-virtual void CheckRanges( CompareData& ) SAL_OVERRIDE;
-virtual void ShowInsert( sal_uLong nStt, sal_uLong nEnd ) SAL_OVERRIDE;
-virtual void ShowDelete( const CompareData& rData, sal_uLong nStt,
-sal_uLong nEnd, sal_uLong nInsPos )
SAL_OVERRIDE;
-
-virtual void CheckForChangesInLine( const CompareData& rData,
-sal_uLong& nStt, sal_uLong& nEnd,
-sal_uLong& nThisStt, sal_uLong& nThisEnd )
SAL_OVERRIDE;
-
-public:
-SwCompareData( SwDoc& rD ) : rDoc( rD ), pInsRing(0), pDelRing(0) {}
-virtual ~SwCompareData();
-
-void SetRedlinesToDoc( bool bUseDocInfo );
-};
-
SwCompareLine::SwCompareLine( const SwNode& rNd )
: rNode( rNd )
{
@@ -1400,23 +1384,7 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine&
rLine,
return bRet;
}
-SwCompareData::~SwCompareData()
-{
-if( pDelRing )
-{
-while( pDelRing->GetNext() != pDelRing )
-delete pDelRing->GetNext();
-delete pDelRing;
-}
-if( pInsRing )
-{
-while( pInsRing->GetNext() != pInsRing )
-delete pInsRing->GetNext();
-delete pInsRing;
-}
-}
-
-sal_uLong SwCompareData::NextIdx( const SwN
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/filter/ww8/ww8scan.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 26dcacf845093303eda2b889ef3ee2abe91e0d98
Author: Caolán McNamara
Date: Fri Jan 9 16:44:07 2015 +
asan: heap-buffer-overflow on ooo8726-1.doc
Change-Id: I9fd7b873b6e64a6450c1bd946cd9bb08c293290a
(cherry picked from commit b7d07699c8142e33f9d05d4e203b6fb567f36a9b)
Reviewed-on: https://gerrit.libreoffice.org/13841
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6d6d037..cdec81b 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -358,11 +358,12 @@ const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher()
{108, { 0, L_VAR} }, // "sprmCMajority50" chp.fBold, chp.fItalic, ...
{109, { 2, L_FIX} }, // "sprmCHpsMul" chp.hps percentage to grow hps
{110, { 2, L_FIX} }, // "sprmCCondHyhen" chp.ysri ysri
-{111, { 2, L_FIX} }, // rtl bold
-{112, { 2, L_FIX} }, // rtl italic
-{113, { 0, L_VAR} }, // rtl property ?
-{115, { 0, L_VAR} }, // rtl property ?
-{116, { 0, L_VAR} }, // unknown
+{111, { 2, L_FIX} }, // ww7 font
+{112, { 2, L_FIX} }, // ww7 CJK font
+{113, { 2, L_FIX} }, // ww7 rtl font
+{114, { 2, L_FIX} }, // ww7 lid
+{115, { 2, L_FIX} }, // ww7 rtl colour ?
+{116, { 2, L_FIX} }, // ww7 fontsize
{117, { 1, L_FIX} }, // "sprmCFSpec" chp.fSpec 1 or 0 bit
{118, { 1, L_FIX} }, // "sprmCFObj" chp.fObj 1 or 0 bit
{119, { 1, L_FIX} }, // "sprmPicBrcl" pic.brcl brcl (see PIC
definition)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - basegfx/source
basegfx/source/tools/unotools.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 1d372a219a412f2710a1c7e7b794ea58dd1dcba9
Author: Caolán McNamara
Date: Thu Jan 8 20:58:24 2015 +
asan: global-buffer-overflow on fdo55736-1.docx
throws on master, be more conservative here
(cherry picked from commit 6b084f0001fc15112bf3c40d20a0c7096c83b7fe)
Change-Id: If69a57aa9ff011cc670f868cb87b3a1c4d904435
Reviewed-on: https://gerrit.libreoffice.org/13818
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/basegfx/source/tools/unotools.cxx
b/basegfx/source/tools/unotools.cxx
index d4ff311..f6b1ba8 100644
--- a/basegfx/source/tools/unotools.cxx
+++ b/basegfx/source/tools/unotools.cxx
@@ -53,7 +53,10 @@ namespace unotools
{
const sal_Int32 nInnerSequenceCount(pInnerSequence->getLength());
-if(pInnerSequenceFlags->getLength() != nInnerSequenceCount)
+if (!nInnerSequenceCount)
+break;
+
+if (pInnerSequenceFlags->getLength() != nInnerSequenceCount)
throw lang::IllegalArgumentException();
// prepare new polygon
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - basegfx/source
basegfx/source/tools/unotools.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 59cc966c33b4a7929f4c9d738a66187b87a3695e
Author: Caolán McNamara
Date: Thu Jan 8 20:58:24 2015 +
asan: global-buffer-overflow on fdo55736-1.docx
throws on master, be more conservative here
(cherry picked from commit 6b084f0001fc15112bf3c40d20a0c7096c83b7fe)
Change-Id: If69a57aa9ff011cc670f868cb87b3a1c4d904435
Reviewed-on: https://gerrit.libreoffice.org/13817
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/basegfx/source/tools/unotools.cxx
b/basegfx/source/tools/unotools.cxx
index f5b1e273..c3e10b4 100644
--- a/basegfx/source/tools/unotools.cxx
+++ b/basegfx/source/tools/unotools.cxx
@@ -52,7 +52,10 @@ namespace unotools
{
const sal_Int32 nInnerSequenceCount(pInnerSequence->getLength());
-if(pInnerSequenceFlags->getLength() != nInnerSequenceCount)
+if (!nInnerSequenceCount)
+break;
+
+if (pInnerSequenceFlags->getLength() != nInnerSequenceCount)
throw lang::IllegalArgumentException();
// prepare new polygon
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/opengl
vcl/opengl/scale.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 30afccefb7d9ce88cdaea7690825c09c21db7983
Author: LuboÅ¡ LuÅák
Date: Mon Jan 12 14:14:18 2015 +0100
opengl scaling can also handle the generic aliases
Was missing from 82bc764bc9, without this opengl scaling wasn't used for
these.
Change-Id: If853435b12383e799afe2f057c43263b2d2297fa
Reviewed-on: https://gerrit.libreoffice.org/13872
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
Reviewed-by: Michael Stahl
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 01a9963..a81c63b 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -252,7 +252,9 @@ bool OpenGLSalBitmap::Scale( const double& rScaleX, const
double& rScaleY, sal_u
if( nScaleFlag == BMP_SCALE_FAST ||
nScaleFlag == BMP_SCALE_BILINEAR ||
nScaleFlag == BMP_SCALE_SUPER ||
-nScaleFlag == BMP_SCALE_LANCZOS )
+nScaleFlag == BMP_SCALE_LANCZOS ||
+nScaleFlag == BMP_SCALE_DEFAULT ||
+nScaleFlag == BMP_SCALE_BESTQUALITY )
{
makeCurrent();
if( mpContext == NULL )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/Library_cairocanvas.mk desktop/Library_sofficeapp.mk svx/Library_svxcore.mk
canvas/Library_cairocanvas.mk | 12 desktop/Library_sofficeapp.mk | 10 -- svx/Library_svxcore.mk|4 3 files changed, 26 deletions(-) New commits: commit 601d7d38628bf93218fba15249c4654ae24e7396 Author: Douglas Mencken Date: Wed Dec 24 13:51:06 2014 -0500 svx, canvas, desktop: gb_OBJCXXFLAGS are not needed at all Change-Id: Iea164e00262822d571f2c49665165795706a57a4 Reviewed-on: https://gerrit.libreoffice.org/13645 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index b4654c0..da2ec7f 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -25,24 +25,12 @@ $(eval $(call gb_Library_use_sdk_api,cairocanvas)) ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_cxxflags,cairocanvas,\ -$(gb_OBJCXXFLAGS) \ -)) - $(eval $(call gb_Library_use_system_darwin_frameworks,cairocanvas,\ Cocoa \ )) endif -ifeq ($(OS),IOS) - -$(eval $(call gb_Library_add_cxxflags,cairocanvas,\ -$(gb_OBJCXXFLAGS) \ -)) - -endif - $(eval $(call gb_Library_use_libraries,cairocanvas,\ sal \ cppu \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 65c92a3..ee92f7a 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -67,22 +67,12 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_cxxflags,sofficeapp,\ -$(gb_OBJCXXFLAGS) \ -)) - $(eval $(call gb_Library_use_system_darwin_frameworks,sofficeapp,\ Foundation \ )) endif -ifeq ($(OS),IOS) -$(eval $(call gb_Library_add_cflags,sofficeapp,\ -$(gb_OBJCFLAGS) \ -)) -endif - $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/app/app \ desktop/source/app/appinit \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 39d6be5..04b05f5 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -92,10 +92,6 @@ $(eval $(call gb_Library_use_externals,svxcore,\ ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_cxxflags,svxcore,\ -$(gb_OBJCXXFLAGS) \ -)) - $(eval $(call gb_Library_use_system_darwin_frameworks,svxcore,\ Foundation \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/CppunitTest_starmath_import.mk starmath/inc starmath/Library_sm.mk starmath/Module_starmath.mk starmath/qa
starmath/CppunitTest_starmath_import.mk | 88 ++
starmath/Library_sm.mk |4 +
starmath/Module_starmath.mk |1
starmath/inc/document.hxx |3 -
starmath/inc/smdll.hxx |4 +
starmath/inc/smdllapi.hxx | 23
starmath/qa/extras/data/simple.mml | 13
starmath/qa/extras/mmlimport-test.cxx | 92
8 files changed, 226 insertions(+), 2 deletions(-)
New commits:
commit 9b87116fa4c5873fa719468f775589edd6c8613c
Author: Takeshi Abe
Date: Mon Jan 12 00:45:17 2015 +0900
fdo#70185: starmath: unit test writing
This adds a unit test of importing a simple MathML file.
New smdllapi.hxx defines a macro SM_DLLPUBLIC to turn on
visibility of symbols required from a CppunitTest.
Change-Id: I4f72d7d8f2766751580e5bde7dac4870e8dad62a
Reviewed-on: https://gerrit.libreoffice.org/13861
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/starmath/CppunitTest_starmath_import.mk
b/starmath/CppunitTest_starmath_import.mk
new file mode 100644
index 000..17a9f71
--- /dev/null
+++ b/starmath/CppunitTest_starmath_import.mk
@@ -0,0 +1,88 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,starmath_import))
+
+$(eval $(call gb_CppunitTest_set_include,starmath_import,\
+$$(INCLUDE) \
+-I$(SRCDIR)/starmath/inc \
+))
+
+$(eval $(call gb_CppunitTest_use_external,starmath_import,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,starmath_import,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,starmath_import,\
+starmath/qa/extras/mmlimport-test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,starmath_import,\
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sm \
+smd \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+test \
+tk \
+tl \
+unotest \
+unoxml \
+utl \
+vcl \
+xo \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,starmath_import))
+$(eval $(call gb_CppunitTest_use_vcl,starmath_import))
+
+$(eval $(call gb_CppunitTest_use_components,starmath_import,\
+configmgr/source/configmgr \
+framework/util/fwk \
+i18npool/util/i18npool \
+package/source/xstor/xstor \
+package/util/package2 \
+sfx2/util/sfx \
+starmath/util/sm \
+starmath/util/smd \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unotools/util/utl \
+comphelper/util/comphelp \
+filter/source/config/cache/filterconfig1 \
+oox/util/oox \
+sax/source/expatwrap/expwrap \
+svl/source/fsstor/fsstorage \
+svl/util/svl \
+svx/util/svx \
+unoxml/source/service/unoxml \
+xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,starmath_import))
+
+# vim: set noet sw=4 ts=4:
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index fc1d1e1..7208dcb 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -21,6 +21,10 @@ $(eval $(call gb_Library_set_include,sm,\
$$(INCLUDE) \
))
+$(eval $(call gb_Library_add_defs,sm,\
+ -DSM_DLLIMPLEMENTATION \
+))
+
$(eval $(call gb_Library_use_external,sm,boost_headers))
$(eval $(call gb_Library_use_custom_headers,sm,oox/generated))
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index 2830a46..1a6af4c 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Module_add_l10n_targets,starmath,\
))
$(eval $(call gb_Module_add_check_targets,starmath,\
+CppunitTest_starmath_import \
CppunitTest_starmath_qa_cppunit \
))
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index e71a2f9..792bbb6 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -37,6 +37,7 @@
#include "format.hxx"
#include "parse.hxx"
#include "smmod.hxx"
+#include "smdllapi.hxx"
class SmNode;
class SfxMenuBarManager;
@@ -84,7 +85,7 @@ void SetEditEngineDefaultFonts(SfxItemPool
&rEditEngineItemPool);
-class SmDocShell : public SfxObjectShell, public SfxListener
+class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
{
friend class SmPrinterAccess;
friend class SmModel;
diff --git a/starmath/inc/smdll.hxx b/starmath/inc/smdll.hxx
index 034e985..3408f2f 100644
--- a/starmath/inc/smdll.hxx
+++ b/starmath/inc/smdll.hxx
@@ -19,9 +19,11 @@
#ifndef INCLUDED_STARMATH_IN
[Libreoffice-commits] core.git: basebmp/Library_basebmp.mk
basebmp/Library_basebmp.mk | 13 + 1 file changed, 13 insertions(+) New commits: commit 5e4a7a95027d979b3bdd729d7ebe950da1129b2b Author: David Ostrovsky Date: Mon Jan 12 23:19:59 2015 +0100 Fix number of sections exceeded object file format limit Change-Id: If81ebef14696c856374967e984138fbd25218a8c Reviewed-on: https://gerrit.libreoffice.org/13879 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 26d8f2a..cd8a753 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -26,6 +26,19 @@ $(eval $(call gb_Library_add_defs,basebmp,\ -DBASEBMP_DLLIMPLEMENTATION \ )) +# TODO(davido): This is failing only in release mode with: +# +# Compilation of bitmapdevice.cxx is failing in release mode: +# +# Fatal Error C1128: number of sections exceeded object file +# format limit : compile with /bigobj +# +ifeq ($(CPUNAME),X86_64) +$(eval $(call gb_Library_add_cxxflags,basebmp, \ +-bigobj \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,basebmp,\ basebmp/source/bitmapdevice \ basebmp/source/debug \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - xmloff/source
xmloff/source/core/xmlimp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 814e27ea3cae1277319559003380b7068ac82861
Author: Caolán McNamara
Date: Sun Jan 11 16:26:23 2015 +
LeakSanitizer: leak detected in ooo56669-1.odt
Change-Id: Ifdd98068762762316dbfd50fb465ed3c970f53d9
(cherry picked from commit 5e6a4591d31619f9bf32a9891c59a6dcc3af80b5)
Reviewed-on: https://gerrit.libreoffice.org/13862
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index d688e8f..3eaab08 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -443,6 +443,7 @@ SvXMLImport::~SvXMLImport() throw ()
delete mpNamespaceMap;
delete mpUnitConv;
delete mpEventImportHelper;
+delete mpFastContexts;
if( mpContexts )
{
while( !mpContexts->empty() )
@@ -463,8 +464,7 @@ SvXMLImport::~SvXMLImport() throw ()
delete mpNumImport;
delete mpProgressBarHelper;
-if( mpImpl )
-delete mpImpl;
+delete mpImpl;
if (mxEventListener.is() && mxModel.is())
mxModel->removeEventListener(mxEventListener);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
|2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a71e4daad9cde44ac7896ae4488d61d17fedc796
Author: Miklos Vajna
Date: Tue Jan 13 12:48:58 2015 +0100
android: if we don't have a document, then that can't be text
Change-Id: I2b9e37aec2705ab723c11a0d1eb795aa5a63105e
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index fe389ef..8f4e56e 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -254,7 +254,7 @@ public class LOKitTileProvider implements TileProvider,
Document.MessageCallback
@Override
public boolean isTextDocument() {
-return mDocument.getDocumentType() == Document.DOCTYPE_TEXT;
+return mDocument != null && mDocument.getDocumentType() ==
Document.DOCTYPE_TEXT;
}
@Override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/view/viewsh.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 8c7f98d400ce222b5246b04a681526586bd4e5bf Author: Miklos Vajna Date: Tue Jan 13 12:34:22 2015 +0100 sw: invalidate after keypresses when we have a callback Ideally we could always just invalidate and paint when the main loop says so, but currently without priorities that can take some time. So just do the invalidate-then-paint when we have a callback that is listening to invalidations. Change-Id: I6a835a0a149ae01a4ece3a319dffbe81cd5bd3eb diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 27ec8a3..adbaaba 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -393,7 +393,10 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) if ( bPaintsFromSystem ) PaintDesktop( aRect ); -pCurrentLayout->Paint( aRect ); +if (!mpLibreOfficeKitCallback) +pCurrentLayout->Paint( aRect ); +else + pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect()); // #i75172# end DrawingLayer paint DLPostPaint2(true); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/hunspell
external/hunspell/ubsan.patch.0 | 24
1 file changed, 24 insertions(+)
New commits:
commit 4cd1c4cb41316e16996a92695d86ac1d956d7e07
Author: Stephan Bergmann
Date: Tue Jan 13 12:31:53 2015 +0100
external/hunspell: Work around -fsanitize=shift
Change-Id: I66ac6ec25615698382d065db2b782950cbc154e4
diff --git a/external/hunspell/ubsan.patch.0 b/external/hunspell/ubsan.patch.0
index 8749cd9..b52802d 100644
--- a/external/hunspell/ubsan.patch.0
+++ b/external/hunspell/ubsan.patch.0
@@ -9,3 +9,27 @@
for (int i=0; i < 4 && *word != 0; i++)
hv = (hv << 8) | (*word++);
while (*word != 0) {
+--- src/hunspell/csutil.cxx
src/hunspell/csutil.cxx
+@@ -147,7 +147,7 @@
+ case 0xd0: {// 2-byte UTF-8 codes
+ if ((*(u8+1) & 0xc0) == 0x80) {
+ u2->h = (*u8 & 0x1f) >> 2;
+-u2->l = (*u8 << 6) + (*(u8+1) & 0x3f);
++u2->l = (*reinterpret_cast(u8) << 6) +
(*(u8+1) & 0x3f);
+ u8++;
+ } else {
+ HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Missing
continuation byte in %ld. character position:\n%s\n", static_cast(u8 -
(signed char *)src), src);
+@@ -158,10 +158,10 @@
+ }
+ case 0xe0: {// 3-byte UTF-8 codes
+ if ((*(u8+1) & 0xc0) == 0x80) {
+-u2->h = ((*u8 & 0x0f) << 4) + ((*(u8+1) & 0x3f) >> 2);
++u2->h = ((*reinterpret_cast(u8) &
0x0f) << 4) + ((*(u8+1) & 0x3f) >> 2);
+ u8++;
+ if ((*(u8+1) & 0xc0) == 0x80) {
+-u2->l = (*u8 << 6) + (*(u8+1) & 0x3f);
++u2->l = (*reinterpret_cast(u8) <<
6) + (*(u8+1) & 0x3f);
+ u8++;
+ } else {
+ HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Missing
continuation byte in %ld. character position:\n%s\n", static_cast(u8 -
(signed char *)src), src);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editdoc.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 2813632238380e0bfe40c0e6404a07102cde1398
Author: Caolán McNamara
Date: Tue Jan 13 11:27:57 2015 +
debugging assert about unsorted properties on loading ooo59216-14.ods
Change-Id: I30e7dcddcce188edef0d2affb148a3dba6f62c1d
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 85419c6..7ded8e7 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1322,6 +1322,7 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex,
sal_Int32 nNew, SfxItemPool&
// Start <= nIndex, End >= nIndex => Start=End=nIndex!
// if ( pAttrib->GetStart() == nIndex )
pAttrib->Expand( nNew );
+bResort = true;
if ( pAttrib->GetStart() == 0 )
bExpandedEmptyAtIndexNull = true;
}
@@ -1455,7 +1456,10 @@ void ContentNode::CollapsAttribs( sal_Int32 nIndex,
sal_Int32 nDeleted, SfxItemP
// Special case: Attribute covers the area exactly
// => keep as empty Attribute.
if ( !pAttrib->IsFeature() && ( pAttrib->GetStart() == nIndex
) && ( pAttrib->GetEnd() == nEndChanges ) )
+{
pAttrib->GetEnd() = nIndex; // empty
+bResort = true;
+}
else
bDelAttr = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/optionsdialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 43fa2bcfecec0d1b7df3382cd69858bab4ffbca8 Author: Adolfo Jayme Barrientos Date: Sun Jan 11 19:52:40 2015 -0600 fdo#87551 Category tree is too thin since conversion to .ui Change-Id: Ic0b4eaa918114293f1428ba6c1e4bcb8ee721849 Reviewed-on: https://gerrit.libreoffice.org/13866 Tested-by: Jenkins Tested-by: Yousuf Philips Reviewed-by: Yousuf Philips diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui index e40815b..c7f338e 100644 --- a/cui/uiconfig/ui/optionsdialog.ui +++ b/cui/uiconfig/ui/optionsdialog.ui @@ -26,6 +26,7 @@ 6 +240 True True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - libreofficekit/source sw/source
libreofficekit/source/gtk/lokdocview.c |1 +
sw/source/uibase/uno/unotxdoc.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit cf38e076a4daf1b1775511b1603a231e677f6b96
Author: Miklos Vajna
Date: Tue Jan 13 12:02:00 2015 +0100
gtktiledviewer: missing initializeForRendering()
Without that, we can't be sure we'll get pages in a single column.
Change-Id: I18725607251b74bb81254c149fcc7e451de9359e
diff --git a/libreofficekit/source/gtk/lokdocview.c
b/libreofficekit/source/gtk/lokdocview.c
index cf3169c..2e4226c 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -210,6 +210,7 @@ SAL_DLLPUBLIC_EXPORT gboolean lok_docview_open_document(
LOKDocView* pDocView, c
}
else
{
+
pDocView->pDocument->pClass->initializeForRendering(pDocView->pDocument);
renderDocument( pDocView );
pDocView->pDocument->pClass->registerCallback(pDocView->pDocument,
&lok_docview_callback_worker, pDocView);
}
commit 04053a2f8645a5cea6818e4dba882ae88901a8e3
Author: Miklos Vajna
Date: Tue Jan 13 12:00:07 2015 +0100
Missing guard in SwXTextDocument::initializeForTiledRendering()
Change-Id: Ic0b09b13612e92ec069cb72a951431939b979715
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 4bba535..4655298 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3148,6 +3148,7 @@ Size SwXTextDocument::getDocumentSize()
void SwXTextDocument::initializeForTiledRendering()
{
+SolarMutexGuard aGuard;
bool bBookMode = false;
sal_Int16 nColumns = 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libvisio
external/libvisio/UnpackedTarball_libvisio.mk |3 +++
external/libvisio/ubsan.patch | 15 +++
2 files changed, 18 insertions(+)
New commits:
commit 4fc8d14751879c7837e38dd1d626e1bc3870e03d
Author: Stephan Bergmann
Date: Tue Jan 13 11:19:53 2015 +0100
external/libvisio: -fsanitize=float-divide-by-zero
...when running CppunitTest_writerperfect_draw
Change-Id: I074512f56ebb7eb054c79946c576516036bebbea
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk
b/external/libvisio/UnpackedTarball_libvisio.mk
index 3190833..caae903 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -11,8 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0))
+
$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
external/libvisio/vsd-msvc-max.patch.1 \
+ external/libvisio/ubsan.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch
new file mode 100644
index 000..16b0ec4
--- /dev/null
+++ b/external/libvisio/ubsan.patch
@@ -0,0 +1,15 @@
+--- src/lib/VSDParser.cpp
src/lib/VSDParser.cpp
+@@ -1104,7 +1104,11 @@
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+ double scale = readDouble(input);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+- scale /= readDouble(input);
++ double scaleDenom = readDouble(input);
++ if (scaleDenom != 0)
++ {
++scale /= scaleDenom;
++ }
+
+ if (m_isStencilStarted && m_currentStencil)
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c4ff0a78da9a57b445fe13d7c278576d3fa89a0f Author: Andras Timar Date: Tue Jan 13 11:19:38 2015 +0100 Updated core Project: dictionaries e68d0668772656518c71f49f2968a83b9bbccfcc diff --git a/dictionaries b/dictionaries index 09b0646..e68d066 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 09b0646f984780d190ea53976f35ae23c99bd06c +Subproject commit e68d0668772656518c71f49f2968a83b9bbccfcc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 - pt_PT/pt_PT.dic | 99 +- 2 files changed, 91 insertions(+), 10 deletions(-) New commits: commit e68d0668772656518c71f49f2968a83b9bbccfcc Author: Andras Timar Date: Tue Jan 13 11:19:38 2015 +0100 Update Portuguese dictionary to version 15.1.2.1 Change-Id: Ia6a17f7afa6ce05cd77ec1b924640e5e6254b4f7 diff --git a/pt_PT/description.xml b/pt_PT/description.xml index 1a3149b..044518a 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + European Portuguese spelling dictionary, hyphenation rules, and thesaurus diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index 097ea87..a424b4e 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 44083 + 44164 , [CAT=punct1a] ; [CAT=punct1b] : [CAT=punct1c] @@ -299,6 +299,7 @@ acerto/pS [CAT=nc,G=m,N=s] acervo/p [CAT=nc,G=m,N=s] aceso/fp [CAT=adj,N=s,G=m] acessão [CAT=nc,G=f,N=s] +acessar/XYPLD [CAT=v,T=inf,TR=t] acessÃvel/pdI [CAT=adj,N=s,G=_] acesso/p [CAT=nc,G=m,N=s] acessório/fpH [CAT=a_nc,G=m,N=s] @@ -2188,6 +2189,7 @@ antisséptico/fp [PREAO90=anti-séptico,CAT=a_nc,G=m,N=s] antiteatro [CAT=nc,G=m,N=s] antiteÃsmo/pq [CAT=nc,G=m,N=s] antitérmico/fp[CAT=adj,N=s,G=m] +antiterrorismo [PREAO90=anti-terrorismo,CAT=nc,G=m,N=s] antÃtese/p[CAT=nc,G=f,N=s] antitetânico [CAT=adj,N=s,G=m] antitético[CAT=adj,N=s,G=m] @@ -4864,6 +4866,7 @@ bilaminado[CAT=adj,N=s,G=m] bilateral/pmi [CAT=adj,N=s,G=_] bilénio [CAT=nc,G=m,N=s] bilha/p[CAT=nc,G=m,N=s] +bilhão/p [CAT=nc,G=m,N=s] bilhardar/XYPL [CAT=v,T=inf,TR=t] bilhardeiro[CAT=nc,G=m,N=s] bilharista [CAT=nc,G=_,N=s] @@ -5964,8 +5967,8 @@ cálice/p [CAT=nc,G=m,N=s] calicida [CAT=nc,G=m,N=s] caliciforme/p [CAT=adj,N=s,G=_] caliço[CAT=nc,G=m,N=s] -calÃculo [CAT=nc,G=m,N=s] -cálido[CAT=adj,N=s,G=m] +calÃculo/p[CAT=nc,G=m,N=s] +cálido/pf [CAT=adj,N=s,G=m] calidoscópio [CAT=nc,G=m,N=s] califado/p [CAT=nc,G=m,N=s] califa/p [CAT=nc,G=m,N=s] @@ -6007,7 +6010,7 @@ calotear/ZYPL [CAT=v,T=inf,TR=_] caloteiro/ifp [CAT=a_nc,G=m,N=s] calote/p [CAT=nc,G=m,N=s] caluda [CAT=in] -caluniador [CAT=a_nc,G=m,N=s] +caluniador/fp [CAT=a_nc,G=m,N=s] calúnia/p [CAT=nc,G=f,N=s] caluniar/XYPLDv[CAT=v,T=inf,TR=t] calunioso/fp [CAT=adj,N=s,G=m] @@ -9113,6 +9116,7 @@ contra-assalto[CAT=nc,G=m,N=s] contra-atacante/p [CAT=a_nc,N=s,G=_] contra-atacar/XYPLn[CAT=v,T=inf,TR=t] contra-ataque/p[CAT=nc,G=m,N=s] +contraterrorismo [PREAO90=contra-terrorismo,CAT=nc,G=m,N=s] contrainformação/p [PREAO90=contra-informação,CAT=nc,G=m,N=s] contrabaixista [CAT=nc,G=_,N=s] contrabaixo/t [CAT=nc,G=m,N=s] @@ -9646,6 +9650,7 @@ corujento [CAT=adj,N=s,G=m] corujo/f [CAT=nc,G=m,N=s] corvense/p [CAT=a_nc,N=s,G=_] corveta/p [CAT=nc,G=f,N=s] +corvÃdeo/p[CAT=nc,G=m,N=s] corvo-marinho [CAT=nc,G=m,N=s] corvo/p[CAT=nc,G=m,N=s] coscuvilhar/XYL[CAT=v,T=inf,TR=i] @@ -11218,7 +11223,7 @@ desincorporar/XYPLc [CAT=v,T=inf,TR=t] desincrustar/XYPLc [CAT=v,T=inf,TR=t] desinencial[CAT=adj,N=s,G=_] desinência/p [CAT=nc,G=f,N=s] -desinfeção [PREAO90=desinfecção,CAT=nc,G=f,N=s] +desinfeção/p [PREAO90=desinfecção,CAT=nc,G=f,N=s] desinfecionar/XYPL [PREAO90=desinfeccionar,CAT=v,T=inf,TR=t] desinfetante/p [PREAO90=desinfectante,CAT=a_nc,G=2,N=s] desinfetar/XYPLDn [PREAO90=desinfectar,CAT=v,T=inf,TR=t] @@ -11455,6 +11460,7 @@ destituir/KPLc [CAT=v,T=inf,TR=t] destoante/p[CAT=adj,N=s,G=_] destoar/XYLn [CAT=v,T=inf,TR=i] destrambelhar/XYLM [CAT=v,T=inf,TR=i] +destratar/XYPLMDnv [CAT=v,T=inf,TR=_] destravar/XYPL [CAT=v,T=inf,TR=_] destreinar/XYPL[CAT=v,T=inf,TR=t] destreza [CAT=nc,G=f,N=s] @@ -13168,7 +13174,7 @@ enjeitar/XYPLM [CAT=v,T=inf,TR=t] enjoadiço [CAT=adj,N=s,G=m] enjoar/XYPLM [CAT=v,T=inf,TR=_] enjoativo [CAT=adj,N=s,G=m] -enjoo [CAT=nc,G=m,N=s] +enjoo/p[CAT=nc,G=m,N=s] enlaçar/XYPLM [CAT=v,T=inf,TR=_] enlace/p [CAT=nc,G=m,N=s] enlambuzar/XYPLM [CAT=v,T=inf,TR=t] @@ -15831,6 +15837,7 @@ folgadamente[CAT=adv] folga [CAT=nc,G=f,N=s] folgante/p [CAT=nc,G=_,N=s] folgar/XYPLDn [CAT=v,T=inf,TR=_] +folgazão/be [CAT=adj,N=s,G=m] folguedo/p [CAT=nc,G=m,N=s] folhada[CAT=nc,G=f,N=s] folhagem/p [CAT=nc,G=f,N=s] @@ -15937,6 +15944,7 @@ formigante/p[CAT=adj,N=s,G=_] formigão/p[CAT=a_nc,G=m,N=s] formigar/XYPLn [CAT=v,T=inf,TR=_] formigueiro/p [CAT=nc,G=m,N=s] +formol [CAT=nc,G=m,N=s] formoso/fsp[CAT=adj,N=s,G=m] fo
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/fly.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2bd04e21a68d5c845d5b9124f20b58552ac5fea4
Author: Caolán McNamara
Date: Tue Jan 13 10:12:16 2015 +
fix debug stl assert about unsorted range on loading ooo42586-1.sxw
Change-Id: Ib97dc719c438aed96c2e24bd34fc38726b90f097
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 3743a33..b8b942b 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2112,6 +2112,9 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj )
{
_rNewObj.DrawObj()->SetLayer(aControlLayerID);
}
+//The layer is part of the key used to sort the obj, so update
+//its position if the layer changed.
+mpDrawObjs->Update(_rNewObj);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libmspub
external/libmspub/UnpackedTarball_libmspub.mk |6 ++ external/libmspub/ubsan.patch | 12 2 files changed, 18 insertions(+) New commits: commit 7340bec4720340e5d43d495577db7ac19937f84a Author: Stephan Bergmann Date: Tue Jan 13 11:13:40 2015 +0100 external/libmspub: Work around -fsanitize=enum Change-Id: Icf1d45b1cd171e868a15f841258c5368a0b213e1 diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk index 044ce96..cce7b54 100644 --- a/external/libmspub/UnpackedTarball_libmspub.mk +++ b/external/libmspub/UnpackedTarball_libmspub.mk @@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmspub)) $(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libmspub,\ +external/libmspub/ubsan.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libmspub/ubsan.patch b/external/libmspub/ubsan.patch new file mode 100644 index 000..b58249e --- /dev/null +++ b/external/libmspub/ubsan.patch @@ -0,0 +1,12 @@ +--- src/lib/MSPUBContentChunkType.h src/lib/MSPUBContentChunkType.h +@@ -27,7 +27,8 @@ + CELLS = 0x63, + FONT = 0x6C, + IMAGE_2K, //these don't exist in Pub 2k3 so their value in the enum is not used. +- IMAGE_2K_DATA ++ IMAGE_2K_DATA, ++ MSPUBContentChunkType_dummy=0xFF // MSPUBParser.cpp:2359:9: runtime error: load of value 138, which is not a valid value for type 'libmspub::MSPUBContentChunkType' + }; + } // namespace libmspub + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45618] Implement 3d slideshow transition framework also for windows
https://bugs.freedesktop.org/show_bug.cgi?id=45618 Gerry changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #14 from Gerry --- As "OpenGL transitions" is an advertised new feature in LO 4.4, which seems to be not working though, I feel free to REOPEN this bug. See comment 11, comment 12, comment 13. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libmwaw
external/libmwaw/UnpackedTarball_libmwaw.mk |1 +
external/libmwaw/ubsan.patch.0 | 11 +++
2 files changed, 12 insertions(+)
New commits:
commit fcfa399067a7606e0ffc426265428b25c8e9260d
Author: Stephan Bergmann
Date: Tue Jan 13 10:54:36 2015 +0100
external/libmwaw: Work around -fsanitize=shift
Change-Id: Ia44ef02bc19653e2a20b2da52f5b5b377950353d
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index e37d82d..5338ce5 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
\
external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
\
+ external/libmwaw/ubsan.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/ubsan.patch.0 b/external/libmwaw/ubsan.patch.0
new file mode 100644
index 000..4a7f210
--- /dev/null
+++ b/external/libmwaw/ubsan.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/WingzParser.cxx
src/lib/WingzParser.cxx
+@@ -1120,7 +1120,7 @@
+ MWAWColor colors[4];
+ for (int i=0; i<4; ++i) { // font, back, unknown,font color
+ val=(int) input->readULong(4);
+-int col=((val>>16)&0xFF)|(val&0xFF00)|((val<<16)&0xFF);
++int col=((val>>16)&0xFF)|(val&0xFF00)|((val&0xFF)<<16);
+ int high=(val>>24);
+ colors[i]=MWAWColor(uint32_t(col)|0xFF00);
+ switch (i) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/flyfrms.hxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 8dd900b698054b1bd11fbe8ec35bce55cd2b3720
Author: David Tardon
Date: Tue Jan 13 10:27:23 2015 +0100
SwFlyLayFrm is already indirectly derived from noncopyable
Change-Id: Ic64b56a55d43efed8920eb1662fb9b6a5a2b5e14
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 82b1b96..489e475 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -21,8 +21,6 @@
#include
-#include
-
#include "flyfrm.hxx"
// #i28701#
@@ -123,7 +121,7 @@ public:
};
// Flys that are bound to LayoutFrms and not to Cntnt
-class SwFlyLayFrm : public SwFlyFreeFrm, private boost::noncopyable
+class SwFlyLayFrm : public SwFlyFreeFrm
{
public:
// #i28701#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - vcl/source
vcl/source/app/svapp.cxx |4 +++-
vcl/source/app/timer.cxx |3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a373e59936a31a81d013869cf3b6cec2711ddab7
Author: Tobias Madl
Date: Tue Jan 13 09:14:46 2015 +
Idle: Better place for Idle handling
Change-Id: I2e5462544d83572e8206bb1db92a2b9df032281b
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 0ed3219..cba619a 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -354,9 +354,11 @@ inline void ImplYield( bool i_bWait, bool i_bAllEvents )
{
while ( pSVData->mbNotAllTimerCalled )
Timer::ImplTimerCallbackProc();
-Timer::Timer::ProcessAllIdleHandlers();
}
+//Process all idles
+Timer::Timer::ProcessAllIdleHandlers();
+
pSVData->maAppData.mnDispatchLevel++;
// do not wait for events if application was already quit; in that
// case only dispatch events already available
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 0dea56d..0348543 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -234,7 +234,8 @@ void Timer::ImplTimerCallbackProc()
void Timer::ProcessAllIdleHandlers()
{
// process all pending Idle timers
-while (ImplTimerData* pTimerData =
+ImplTimerData* pTimerData;
+while (pTimerData =
ImplTimerData::GetFirstIdle())
{
pTimerData->Invoke();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source vcl/source
sw/source/core/view/viewsh.cxx | 14 --
vcl/source/outdev/map.cxx |8 +++-
2 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 482c57264708f783e70667fb1ac2d641cd25114a
Author: Stephan Bergmann
Date: Tue Jan 13 10:07:34 2015 +0100
Improve ImplLogicToPixel overflow check
Change-Id: Ib0554f6d489e410527d7bf4dc77f76db1bdbf1fc
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 5117471..7a9cc0c 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -17,7 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
+#include
#include
+
#include
#include
@@ -382,7 +386,9 @@ static long ImplLogicToPixel( long n, long nDPI, long
nMapNum, long nMapDenom,
}
else
#else
-assert(n < std::numeric_limits::max() / nMapNum); //detect overflows
+assert(nMapNum > 0);
+assert(nDPI > 0);
+assert(std::abs(n) < std::numeric_limits::max() / nMapNum / nDPI);
//detect overflows
#endif
{
sal_Int64 n64 = n;
commit fd72427850d1f2db4d0b982391975d67b3e784fa
Author: Stephan Bergmann
Date: Tue Jan 13 10:02:57 2015 +0100
Exclude FAR_AWAY objects from bounds computation
...otherwise, running CppunitTest_writerperfect_writer would overflow in
ImplLogicToPixel (vcl/source/outdev/map.cxx) when nMaxRight would be
ridiculously large due to including the ridiculously large right bound of an
SwFlyLayFrm that is marked FAR_AWAY.
Change-Id: Id6f8c895a953e99c5955b0f6ed655f8b79fba6f1
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 580117f..9a5ff25 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1085,12 +1085,14 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
if (pObj->IsFormatPossible())
{
const Rectangle &rBound =
pObj->GetObjRect().SVRect();
-// OD 03.03.2003 #107927# - use correct
datatype
-const SwTwips nL = std::max( 0L, rBound.Left()
- nOfst );
-if ( nL < nMinLeft )
-nMinLeft = nL;
-if( rBound.Right() + nOfst > nMaxRight )
-nMaxRight = rBound.Right() + nOfst;
+if (rBound.Left() != FAR_AWAY) {
+// OD 03.03.2003 #107927# - use correct
datatype
+const SwTwips nL = std::max( 0L,
rBound.Left() - nOfst );
+if ( nL < nMinLeft )
+nMinLeft = nL;
+if( rBound.Right() + nOfst > nMaxRight )
+nMaxRight = rBound.Right() + nOfst;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit 84c69550bcb8139669de9cf98b51c35f21fe853d Author: Noel Grandin Date: Tue Jan 13 10:42:38 2015 +0200 revert accidental change to configure.ac that slipped in with commit 3ab2d3a2c5b802ab88171770d19871e081c3252b "fdo#88256 fix crash when running javascript macro" Change-Id: Idae2148181517e434d133958cf20d4fd6c4b9187 diff --git a/configure.ac b/configure.ac index 18a1e6b..d4029a5 100644 --- a/configure.ac +++ b/configure.ac @@ -4527,6 +4527,10 @@ dnl Check for syslog header dnl === AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H)) +# placeholder for future crash reporter feature +ENABLE_CRASHDUMP="" +AC_SUBST(ENABLE_CRASHDUMP) + dnl Set the ENABLE_WERROR variable. (Activate --enable-werror) dnl === AC_MSG_CHECKING([whether to turn warnings to errors]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libreofficekit/source
libreofficekit/source/gtk/lokdocview.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 47287df1cbb0745596bf0ba81e0371189ac35afd Author: Miklos Vajna Date: Tue Jan 13 09:38:07 2015 +0100 libreofficekit: typo Change-Id: Idab19cc812e40280367e6fbc70351e6e02685811 diff --git a/libreofficekit/source/gtk/lokdocview.c b/libreofficekit/source/gtk/lokdocview.c index e34936b..cf3169c 100644 --- a/libreofficekit/source/gtk/lokdocview.c +++ b/libreofficekit/source/gtk/lokdocview.c @@ -183,7 +183,7 @@ static void lok_docview_callback_worker(int nType, const char* pPayload, void* p #if GTK_CHECK_VERSION(2,12,0) gdk_threads_add_idle(lok_docview_callback, pDocView); #else -g_add_idle(lok_docview_callback, pDocView); +g_idle_add(lok_docview_callback, pDocView); #endif break; default: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac scripting/java
configure.ac
|4 --
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
| 20 +-
scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
|3 +
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
| 11 +
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
| 16 ++--
scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
|5 ++
6 files changed, 49 insertions(+), 10 deletions(-)
New commits:
commit 3ab2d3a2c5b802ab88171770d19871e081c3252b
Author: Noel Grandin
Date: Tue Jan 13 08:34:10 2015 +0200
fdo#88256 fix crash when running javascript macro
caused by my commit 8583da1e934a49791ef8d86668f3d5c3c5dae1d7
"java: remove unused fields"
Change-Id: Ibcd6462e8229a0a6cb98ebfd16ce5d2ea45ca931
diff --git a/configure.ac b/configure.ac
index d4029a5..18a1e6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4527,10 +4527,6 @@ dnl Check for syslog header
dnl ===
AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H))
-# placeholder for future crash reporter feature
-ENABLE_CRASHDUMP=""
-AC_SUBST(ENABLE_CRASHDUMP)
-
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl ===
AC_MSG_CHECKING([whether to turn warnings to errors])
diff --git
a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index c4ae664..71535e1 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -55,6 +55,11 @@ public class ParcelBrowseNode extends PropertySet implements
private Collection browsenodes;
private final ParcelContainer container;
private Parcel parcel;
+// these four are properties, they are accessed via reflection
+public boolean deletable = true;
+public boolean editable = false;
+public boolean creatable = false;
+public boolean renamable = true;
public ParcelBrowseNode(ScriptProvider provider, ParcelContainer container,
String parcelName) {
@@ -75,15 +80,28 @@ public class ParcelBrowseNode extends PropertySet implements
registerProperty("Editable", new Type(boolean.class), (short)0,
"editable");
registerProperty("Creatable", new Type(boolean.class), (short)0,
"creatable");
registerProperty("Renamable", new Type(boolean.class), (short)0,
"renamable");
+if (provider.hasScriptEditor())
+{
+this.creatable = true;
+}
+String parcelDirUrl = parcel.getPathToParcel();
XComponentContext xCtx =
provider.getScriptingContext().getComponentContext();
XMultiComponentFactory xFac = xCtx.getServiceManager();
try {
-UnoRuntime.queryInterface(XSimpleFileAccess.class,
+XSimpleFileAccess xSFA =
UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
+if ( xSFA != null && ( xSFA.isReadOnly( parcelDirUrl ) ||
+ container.isUnoPkg() ) )
+{
+deletable = false;
+editable = false;
+creatable = false;
+renamable = false;
+}
} catch (com.sun.star.uno.Exception e) {
// TODO propagate potential errors
LogUtils.DEBUG("Caught exception creating ParcelBrowseNode " + e);
diff --git
a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
index bc52cb5..6cdfd2a 100644
---
a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
+++
b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
@@ -37,6 +37,9 @@ public class PkgProviderBrowseNode extends ProviderBrowseNode
{
container.getParcelContainerDir());
LogUtils.DEBUG("*** PkgProviderBrowseNode ctor, container has num
parcels = " +
container.getElementNames().length);
+deletable = false;
+editable = false;
+creatable = false;
}
@Override public String getName() {
diff --git
a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 2e9ee68..868af08 100644
---
a/scripting/java/com/sun/star/script/framework/browse
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - libreofficekit/source
libreofficekit/source/gtk/lokdocview.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 16b18bc6587be8661b6b008821dad3acd2abb5cb Author: Miklos Vajna Date: Tue Jan 13 09:38:07 2015 +0100 libreofficekit: typo Change-Id: Idab19cc812e40280367e6fbc70351e6e02685811 diff --git a/libreofficekit/source/gtk/lokdocview.c b/libreofficekit/source/gtk/lokdocview.c index e34936b..cf3169c 100644 --- a/libreofficekit/source/gtk/lokdocview.c +++ b/libreofficekit/source/gtk/lokdocview.c @@ -183,7 +183,7 @@ static void lok_docview_callback_worker(int nType, const char* pPayload, void* p #if GTK_CHECK_VERSION(2,12,0) gdk_threads_add_idle(lok_docview_callback, pDocView); #else -g_add_idle(lok_docview_callback, pDocView); +g_idle_add(lok_docview_callback, pDocView); #endif break; default: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 3 commits - android/experimental desktop/source
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
|2 --
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
| 10 ++
desktop/source/lib/lokandroid.cxx
|4
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit d0bf9ca2fbf33d2ab881c8c65f4f3e59cc17c052
Author: Tomaž Vajngerl
Date: Tue Jan 13 17:28:13 2015 +0900
android: add method to force showing of soft keyboard
Change-Id: Iadf2ed580b75b2b1fcb0067617a2d79ca707d54a
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index b59bba8..0d2b067 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -24,6 +24,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout;
import org.libreoffice.LibreOfficeMainActivity;
@@ -350,6 +351,15 @@ public class LayerView extends FrameLayout {
}
}
+public void showSoftKeyboard() {
+View view = mSurfaceView != null ? mSurfaceView : mTextureView;
+
+if (view.requestFocus()) {
+InputMethodManager inputMethodManager = (InputMethodManager)
getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+inputMethodManager.showSoftInput(view,
InputMethodManager.SHOW_IMPLICIT);
+}
+}
+
private class SurfaceTextureListener implements
TextureView.SurfaceTextureListener {
public void onSurfaceTextureAvailable(SurfaceTexture surface, int
width, int height) {
// We don't do this for surfaceCreated above because it is always
followed by a surfaceChanged,
commit 5eb7a15bef7d32678389a07d58a3bf9b68d514ce
Author: Tomaž Vajngerl
Date: Tue Jan 13 17:27:20 2015 +0900
android: remove unneeded comment & clean whitespace
Change-Id: I55514bf47683bb0e7823892a3afd3dd23dc13e2f
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 4063a84..7459580 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -41,7 +41,6 @@ public class LOKitThread extends Thread implements
TileProvider.TileInvalidation
private void tileRerender(ComposedTileLayer composedTileLayer, SubTile
tile) {
if (composedTileLayer.isStillValid(tile.id) && !tile.markedForRemoval)
{
-Log.i(LOGTAG, "Redrawing tile " + tile.id);
mLayerClient.beginDrawing();
mTileProvider.rerenderTile(tile.getImage(), tile.id.x, tile.id.y,
tile.id.size, tile.id.zoom);
tile.invalidate();
@@ -50,7 +49,6 @@ public class LOKitThread extends Thread implements
TileProvider.TileInvalidation
}
}
-
/** Handle the geometry change + draw. */
private void redraw() {
if (mLayerClient == null || mTileProvider == null) {
commit cf9e6292585410885f67dc8b46445420d67edbad
Author: Tomaž Vajngerl
Date: Tue Jan 13 17:21:06 2015 +0900
jni: if documentLoad returns NULL don't call NewDirectByteBuffer
Change-Id: I847a7b90c0f85bb59869ecaca037145221e16e7f
diff --git a/desktop/source/lib/lokandroid.cxx
b/desktop/source/lib/lokandroid.cxx
index 773cba5..cd3f6b5 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -138,6 +138,10 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL
Java_org_libreoffice_kit_Office_docume
LibreOfficeKit* pLibreOfficeKit = getHandle(pEnv, aObject);
LibreOfficeKitDocument* pDocument =
pLibreOfficeKit->pClass->documentLoad(pLibreOfficeKit, aCloneDocumentPath);
+
+if (pDocument == NULL)
+return NULL;
+
jobject aHandle = pEnv->NewDirectByteBuffer((void*) pDocument,
sizeof(LibreOfficeKitDocument));
return aHandle;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/flyfrms.hxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit b6013382694b7c9784c404a101d6d505919e067d
Author: Stephan Bergmann
Date: Tue Jan 13 09:26:48 2015 +0100
SwFlyLayFrm shall apparently be noncopyable
Change-Id: I78e1f23c3c39cafb6e3c1c085db880bc1cd88196
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index ef01125..82b1b96 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_FLYFRMS_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_FLYFRMS_HXX
+#include
+
+#include
+
#include "flyfrm.hxx"
// #i28701#
@@ -119,14 +123,14 @@ public:
};
// Flys that are bound to LayoutFrms and not to Cntnt
-class SwFlyLayFrm : public SwFlyFreeFrm
+class SwFlyLayFrm : public SwFlyFreeFrm, private boost::noncopyable
{
public:
// #i28701#
TYPEINFO_OVERRIDE();
SwFlyLayFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
-SwFlyLayFrm( SwFlyLayFrm& );
+
protected:
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/sfxbasemodel.hxx | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 840810d41e7f865752d1af09c9d99e955467ce6c
Author: Miklos Vajna
Date: Tue Jan 13 09:09:27 2015 +0100
sfx2: stop using comphelper/implbase_var.hxx
Change-Id: I3dc9e9305883c890e5e3c10ffcd8a9a5dbf09cc7
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 028236f..a074263 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -84,13 +84,7 @@
#include
#include
#include
-
-#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32
-#include
-#endif
-
+#include
#include
class SfxMedium;
@@ -129,7 +123,7 @@ namespace sfx { namespace intern {
SfxListener
*/
-typedef ::comphelper::WeakImplHelper32 < css::container::XChild
+typedef ::cppu::WeakImplHelper < css::container::XChild
,
css::document::XDocumentPropertiesSupplier
, css::document::XCmisDocument
, css::rdf::XDocumentMetadataAccess
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
