LibreOffice Gerrit News 2013-10-08
Moin! * Open changes on master for project core changed in the last 25 hours: + Fix fdo#70143 by normalising replacement position in https://gerrit.libreoffice.org/6156 from Arnaud Versini + fdo#61950 De-externalize Presentation Minimizer in https://gerrit.libreoffice.org/6143 from David Ostrovsky + Hanlde TopDown - BottomUp conversion in basebmp DirectCopy logic in https://gerrit.libreoffice.org/6155 from Tsahi Glik @ CloudOn + Check for minimum version of flex (2.5.35) in https://gerrit.libreoffice.org/6134 from Christian Lohmaier + fdo#7 add support for COVARIANCE.P and COVARIANCE.S functions in https://gerrit.libreoffice.org/6135 from Winfried Donkers * Merged changes on master for project core changed in the last 25 hours: + only build openGL canvas when libGL supports shader in https://gerrit.libreoffice.org/6160 from Christian Lohmaier + fdo#54938: Adapt supportsService implementations to cppu::supportsService in https://gerrit.libreoffice.org/6035 from Marcos Souza + startcenter: Hide template toggle button if no templates in https://gerrit.libreoffice.org/5913 from Krisztian Pinter + EPS import: convert to BMP instead of PNG in https://gerrit.libreoffice.org/6124 from Björgvin Ragnarsson + fdo#70196: Python 2 compatibility for UNO import error handling in https://gerrit.libreoffice.org/6148 from David Bolen * Abandoned changes on master for project core changed in the last 25 hours: + DOCX:fdo#43093 fix wrong directionality for RTL files in https://gerrit.libreoffice.org/5944 from Faisal al-otaibi * Open changes needing tweaks, but being untouched for more than a week: + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + fdo#69407 Putting no fill frame color instead of transparent by default in https://gerrit.libreoffice.org/5996 from matthieu gay + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Fix for IOS scroll by pixels, and pinch to zoom Change-Id: Ied6087a264f1c in https://gerrit.libreoffice.org/5742 from Ptyl + fix polygon rendering with clip area of one line only in https://gerrit.libreoffice.org/5709 from Tsahi Glik @ CloudOn + fix for text watermark in https://gerrit.libreoffice.org/5568 from Adam CloudOn + fdo#44689: fix for specific case restart value 0 in https://gerrit.libreoffice.org/5681 from Adam CloudOn + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/source
sc/source/ui/undo/undoblk.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 7ed8dd9d5dc577c85464db289e540e548672653b
Author: Laurent Godard lgodard.li...@laposte.net
Date: Tue Oct 8 09:19:18 2013 +0200
at least copy notes on Redo
Change-Id: I440b770d51fd827f4eb8c8a153648a17f1c97f95
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index ce78a8f..ddf9f09 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -909,6 +909,7 @@ void ScUndoPaste::DoChange(bool bUndo)
// do not undo/redo objects and note captions, they are handled via
drawing undo
(nUndoFlags = ~IDF_OBJECTS) |= IDF_NOCAPTIONS;
+
bool bPaintAll = false;
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -1284,8 +1285,9 @@ void ScUndoDragDrop::Redo()
aSourceMark.SelectTable( nTab, sal_True );
// do not clone objects and note captions into clipdoc (see above)
+// but at least copy notes
ScClipParam aClipParam(aSrcRange, bCut);
-pDoc-CopyToClip(aClipParam, pClipDoc, aSourceMark, false,
bKeepScenarioFlags, false, false);
+pDoc-CopyToClip(aClipParam, pClipDoc, aSourceMark, false,
bKeepScenarioFlags, false, true);
if (bCut)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice Help
Hi Markus, Rob, Le 08/10/2013 01:52, Markus Mohrhard a écrit : Hey Rob, 2013/10/7 Rob Snelders libreoff...@ertai.nl Hi Markus, We have spoken about exporting the help-system from the help-wiki. We will need a html/javascript framework for that. I don't think a basic framework will need more time then a month or 2 for me. But I think we will also need to look at how we export the pages from the wiki because how the pages are exported is important. Can you tell me what plugin for mediawiki you had in mind to do the export? I found DumpHTML at the mediawiki page. I wanted to try this first before looking for other scripts. Is there a test-wiki to try it on to see what it does, maybe we'll need to change the plugin to fit our needs. We will get a VM from the infrastructure team soon. We will test all the steps there. I'll tell you more as soon as we get the VM and have it correctly set up with a wikihelp instance. If the l10n team is impacted by your project, please tell me, as this is their (huge) work, I would like to keep them in the loop. Thanks in advance Kind regards Sophie ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: canvas/source
canvas/source/opengl/ogl_spritedevicehelper.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 2f5f2c7d3c9a855682b95b428c35cbe3ca2b3fac
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 8 09:25:52 2013 +0200
-Werror,-Wunused-private-field
Change-Id: Ie8aaab5fb6042c4845cb5355db2ee1a1c66d9d92
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index cb96f2e..f83f8a8 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -1162,7 +1162,9 @@ namespace oglcanvas
::basegfx::B2IVector maSize;
const SpriteDeviceHelper mrDeviceHelper;
unx::GLXPbuffermpPBuffer;
+#if 0
unx::Display* mpDisplay;
+#endif
unsigned int mnTexture;
virtual bool startBufferRendering()
@@ -1184,12 +1186,18 @@ namespace oglcanvas
public:
BufferContextImpl(const SpriteDeviceHelper rDeviceHelper,
unx::GLXPbuffer pBuffer,
- unx::Display* pDisplay,
+ unx::Display*
+#if 0
+ pDisplay
+#endif
+ ,
const ::basegfx::B2IVector rSize) :
maSize(rSize),
mrDeviceHelper(rDeviceHelper),
mpPBuffer(pBuffer),
+#if 0
mpDisplay(pDisplay),
+#endif
mnTexture(0)
{
glGenTextures( 1, mnTexture );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Help
Hi All how to create LibreOffice install package for windows i have successful build on developing environment : - win7 x64 - cygwin - visual studio 2012 thank you -- Best Regards, *CSEC* Computer Science Egyptian Center Soliman ElDebaky Software Developer * * Mob: (+2) 01007294366 Website : www.csec1.com Email : soliman.mou...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH - SDRemote LO
On Mon, Oct 07, 2013 at 07:05:06PM +0100, Andrzej Hunt andr...@ahunt.org wrote: If you include the bug number in the form fdo#12345678 in the commit subject then bugzilla will automatically be updated to Resolved-Fixed along with a message detailing when it'll be available in daily builds Indeed a comment will be added, and target will be added to whiteboard, but resolution won't be set automatically, as only the developer knows if that single commit fixed the issue or more work is needed. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Having trouble with writing libreoffice extension
Hi, On Thu, Oct 03, 2013 at 09:54:37AM +, Hu, Xiaoran hu@buckeyemail.osu.edu wrote: I am a senior CSE student of the ohio state university. Right now I want to write a libreoffice extension, but I'm confused what to do. I have already finished a Java program which I hope to make it an extension in libreoffice. Can you help me a little bit? I have installed NetBean and its plug-in for Openoffice. See here: https://wiki.documentfoundation.org/Development/Extension_Development The general documentation is the most useful link on that page. Also, you may want to try out the SDK examples first, that require no IDE at all. Most developers use vi or emacs to write LibreOffice-related code. In case of Java, you may have some luck with Eclipse an OOEclipse: http://people.freedesktop.org/~cbosdo/ooeclipse/ Though last time I tried it with Eclipse 3.5 and LO 3.4. (Again, usually we just use the commandline build system and an editor.) HTH, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] Advice on adding Smart-Art related settings
El 03/10/13 14:45, Jan Holesovsky escribió: Jacobo Aragunde Pérez píše v Čt 03. 10. 2013 v 10:24 +0200: ... 2. Immutable shapes can be saved to docx with no data loss, but they are transformed to a shape group when saved to odt and this process introduces some errors. ... Regarding 2., couldn't we roundtrip the metadata as some blob in the ODT too? Otherwise sounds great to me :-) That's a good idea. I'll start working on point 2 trying to preserve SmartArt metadata when saving to .odt. ... Finally, would you agree on temporarily adding an entry to the options dialog as described at [2] for the short term? If you commit to further improving as you have described above, I won't push back on this - I prefer code included early; gets more testing feedback that way, and won't bitrot. Andrés has pushed to gerrit a set of patches to implement the issue as it was previously described (with a new entry in the options dialog). Thank you a lot, Thanks to you all for your time :) [2] http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-October/002399.html -- Jacobo Aragunde Software Engineer at Igalia ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
How are installation sets being built?
Hi all, I was always thinking that --enable-epm (despite its name) was the magic autogen.input switch to instruct a top-level make (or make check) to also build installation sets (deb, rpm, dmg, msi, ...), on all platforms. (And that the phenomenon that Windows continued to build an archive installation set regardless of --dis-/enable-epm was an inadvertent leftover from the old OOo times where such an archive installation set was needed to run the subsequentcheck tests agaist.) However, git grep -Flw -e --enable-epm makes me doubtful about my assumption, as only distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/OxygenOfficeLinux.conf mention it, while distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeMinGW.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf distro-configs/LibreOfficeiOS.conf distro-configs/OxygenOfficeWin32.conf do not. So, I am wondering how exactly the official TDF-released installation sets are being built for the various platforms. What are the autogen.sh (autogen.input) switches, and what are the exact make command lines? Where is that stored in git or similar (if it is stored anywhere at all)? Similarly, how exactly are any of those nightly installation sets (uploaded from select tinderboxes, IIUC) being built? How can you trace that? (I'm asking because I noticed that after instdir-ification we still always build a now-useless archive installation set on Windows during make and make check, regardless of --dis-/enable-epm, and I wanted to clean that up. Which is especially important now that that installation set is built in parallel with running the make check subsequenttests, which appears to have destabilizing effects at least for some.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] translations.git: source/de
source/de/svx/uiconfig/ui.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 70db96bbb2c8cbd22c1ce9c421cc1988658af09e Author: David Tardon dtar...@redhat.com Date: Tue Oct 8 10:49:54 2013 +0200 rbhz#1015004 fix case Change-Id: I0ac0f74895ca2097439b83e68ba6d2f95e08eef3 diff --git a/source/de/svx/uiconfig/ui.po b/source/de/svx/uiconfig/ui.po index b49346c..29eee82 100644 --- a/source/de/svx/uiconfig/ui.po +++ b/source/de/svx/uiconfig/ui.po @@ -806,7 +806,7 @@ msgctxt label\n string.text msgid R_ight margin: -msgstr R_echter rand: +msgstr R_echter Rand: #: headfootformatpage.ui msgctxt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 038114ff93e02294a7b79980b02cc93d570487f7 Author: David Tardon dtar...@redhat.com Date: Tue Oct 8 10:49:54 2013 +0200 Updated core Project: translations 70db96bbb2c8cbd22c1ce9c421cc1988658af09e diff --git a/translations b/translations index c4768e4..70db96b 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit c4768e4b398b6090f524ae801d74ad55879239ca +Subproject commit 70db96bbb2c8cbd22c1ce9c421cc1988658af09e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - qadevOOo/tests
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java | 55
++
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java |2
2 files changed, 33 insertions(+), 24 deletions(-)
New commits:
commit dcee4cfcdc0adab82eec1bd68b68dea7549c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 8 10:52:56 2013 +0200
Try make this more robust in slow environments
...where the previous .uno:PrintPreview request has not yet been processed,
the
same way it had been made more robust for ScAccessiblePageHeader.java in
5b5c52a3a4d048bba8c18dfb06ffca25c670d099 Try make this more robust in slow
environments plus b5dd2b4218f966e177d880bcc29fa5fba3bfe1c1 Also cope with
intermittend DisposedExceptions.
Change-Id: I4d429a96b7b595776aaf3fa20e3e03b00ca886bc
diff --git
a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
index 535e92d..26e9ff1 100644
--- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
@@ -38,6 +38,7 @@ import com.sun.star.frame.XController;
import com.sun.star.frame.XDispatch;
import com.sun.star.frame.XDispatchProvider;
import com.sun.star.frame.XModel;
+import com.sun.star.lang.DisposedException;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sheet.XSpreadsheet;
@@ -86,7 +87,6 @@ public class AccessibleEditableTextPara_PreviewCell extends
TestCase {
*/
protected synchronized TestEnvironment
createTestEnvironment(TestParameters Param, PrintWriter log) {
-XAccessibleContext oObj = null;
XCell xCell = null;
try {
@@ -136,19 +136,38 @@ public class AccessibleEditableTextPara_PreviewCell
extends TestCase {
throw new StatusException(Status.failed(Couldn't change mode));
}
-shortWait();
-
-
-XWindow xWindow = AccessibilityTools.getCurrentWindow(
(XMultiServiceFactory) Param.getMSF(), xModel);
-XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
-//AccessibilityTools.printAccessibleTree(log,xRoot);
-AccessibilityTools.getAccessibleObjectForRole(xRoot,
AccessibleRole.TABLE_CELL,true);
-
-xRoot = AccessibilityTools.SearchedAccessible;
-
-//AccessibilityTools.printAccessibleTree(log,xRoot);
-
-oObj =
AccessibilityTools.getAccessibleObjectForRole(xRoot,AccessibleRole.PARAGRAPH);
+XAccessibleContext oObj = null;
+for (int i = 0;; ++i) {
+try {
+Thread.sleep(500);
+} catch (InterruptedException e) {
+throw new RuntimeException(e);
+}
+try {
+XAccessible xRoot = AccessibilityTools.getAccessibleObject(
+AccessibilityTools.getCurrentWindow(
+(XMultiServiceFactory) Param.getMSF(), xModel));
+if (xRoot != null) {
+AccessibilityTools.getAccessibleObjectForRole(
+xRoot, AccessibleRole.TABLE_CELL, true);
+xRoot = AccessibilityTools.SearchedAccessible;
+if (xRoot != null) {
+oObj = AccessibilityTools.getAccessibleObjectForRole(
+xRoot, AccessibleRole.PARAGRAPH);
+if (oObj != null) {
+break;
+}
+}
+}
+} catch (DisposedException e) {
+log.println(Ignoring DisposedException);
+}
+if (i == 20) { // give up after 10 sec
+throw new RuntimeException(
+Couldn't get AccessibleRoot.HEADER object);
+}
+log.println(No TABLE_CELL/PARAGRAPH found yet, retrying);
+}
log.println(ImplementationName + utils.getImplName(oObj));
log.println(AccessibleName + oObj.getAccessibleName());
@@ -169,12 +188,4 @@ public class AccessibleEditableTextPara_PreviewCell
extends TestCase {
return tEnv;
}
-
-protected void shortWait() {
-try {
-Thread.sleep(1000) ;
-} catch (InterruptedException e) {
-System.out.println(While waiting : + e);
-}
-}
}
commit f52d78bf7cc0ae5fcaf1b693e5bfa98bb015c569
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 8 10:52:07 2013 +0200
Unused variable (AccessibilityTools is all static members)
Change-Id: I5f3be57dea77cec1cfa3f48833758b0c2328350e
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index f1f7b07..484ccf4 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++
[Libreoffice-commits] core.git: extras/source
extras/source/misc_config/wizard/web/layouts/layout.xsl |2 +- extras/source/misc_config/wizard/web/layouts/layoutX.xsl |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 849c890ebc1782aea2c98e1212920e943f128040 Author: Andrea Pescetti pesce...@apache.org Date: Mon Oct 7 18:00:24 2013 + #i95765# Fix CSS classes in Web Page Wizard. Patch-By: motohoss hcm...@hosscomm.com. Reviewed-By: jza (cherry picked from commit f0577f5efa9609e14aa44f741a1faa3b8bec412f) diff --git a/extras/source/misc_config/wizard/web/layouts/layout.xsl b/extras/source/misc_config/wizard/web/layouts/layout.xsl index e539edf..a7a4058 100644 --- a/extras/source/misc_config/wizard/web/layouts/layout.xsl +++ b/extras/source/misc_config/wizard/web/layouts/layout.xsl @@ -121,7 +121,7 @@ places... xsl:template match=document/@update-date - span class=doclastchangedate + span class=doclastchangeddate xsl:value-of select=./ /span br/ diff --git a/extras/source/misc_config/wizard/web/layouts/layoutX.xsl b/extras/source/misc_config/wizard/web/layouts/layoutX.xsl index ed683f8..3f9aec0 100644 --- a/extras/source/misc_config/wizard/web/layouts/layoutX.xsl +++ b/extras/source/misc_config/wizard/web/layouts/layoutX.xsl @@ -207,7 +207,7 @@ xsl:template match=document/@update-date - span class=doclastchangedate + span class=doclastchangeddate xsl:value-of select=./ /span br/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f0/577f5efa9609e14aa44f741a1faa3b8bec412f
f0/577f5efa9609e14aa44f741a1faa3b8bec412f |1 + 1 file changed, 1 insertion(+) New commits: commit c23745172de8e60404f4cd4674c8c942fec9027b Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 8 10:02:03 2013 +0100 Notes added by 'git notes add' diff --git a/f0/577f5efa9609e14aa44f741a1faa3b8bec412f b/f0/577f5efa9609e14aa44f741a1faa3b8bec412f new file mode 100644 index 000..22faabb --- /dev/null +++ b/f0/577f5efa9609e14aa44f741a1faa3b8bec412f @@ -0,0 +1 @@ +merged as: 849c890ebc1782aea2c98e1212920e943f128040 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 9 commits - sd/source sfx2/source svtools/source sw/source tools/source
sd/source/ui/animations/CustomAnimationList.cxx |8 ---
sfx2/source/appl/lnkbase2.cxx | 19 +++--
sfx2/source/bastyp/progress.cxx | 12 ++-
sfx2/source/dialog/filedlghelper.cxx|4 +++
svtools/source/filter/exportdialog.cxx |9 +---
sw/source/filter/html/htmlfldw.cxx | 26 ++--
sw/source/ui/app/applab.cxx |3 +-
tools/source/rc/rc.cxx |1
8 files changed, 57 insertions(+), 25 deletions(-)
New commits:
commit 1c316e0b060b9c58ef726631d4b4b86cb4ef149e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 09:43:31 2013 +0100
CID#1079304 uninitialized members
and CID#1079303
Change-Id: I52e70424ca83ae7c9c73dd28d93912a1228ce2bd
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 49d175f..58d871b 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2250,6 +2250,7 @@ FileDialogHelper::FileDialogHelper(
const OUString rFact,
SfxFilterFlags nMust,
SfxFilterFlags nDont )
+: m_nError(0)
{
mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags );
mxImp = mpImp;
@@ -2268,6 +2269,7 @@ FileDialogHelper::FileDialogHelper(
SfxFilterFlags nDont,
const OUString rStandardDir,
const ::com::sun::star::uno::Sequence OUString rBlackList)
+: m_nError(0)
{
mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, nDialog,
NULL, rStandardDir, rBlackList );
mxImp = mpImp;
@@ -2281,6 +2283,7 @@ FileDialogHelper::FileDialogHelper(
sal_Int16 nDialogType,
sal_Int64 nFlags,
Window* _pPreferredParent )
+: m_nError(0)
{
mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags,
SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent );
mxImp = mpImp;
@@ -2294,6 +2297,7 @@ FileDialogHelper::FileDialogHelper(
const OUString rStandardDir,
const ::com::sun::star::uno::Sequence OUString rBlackList,
Window* _pPreferredParent )
+: m_nError(0)
{
mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags,
SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent,rStandardDir, rBlackList );
mxImp = mpImp;
commit 4d19209880729327829451241c68c9508bc00c51
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 09:41:58 2013 +0100
CID#1079305 uninitialized members
Change-Id: I00d716a0f05d50fd7a7a1c43772af51224a6b15a
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 06661d9..ef4e335 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -103,7 +103,17 @@ void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable )
// ---
SfxProgress_Impl::SfxProgress_Impl( const OUString /*rTitle*/ )
-: pActiveProgress(0), pWorkWin(0), pView(0)
+: nMax(0)
+, nCreate(0)
+, nNextReschedule(0)
+, bLocked(false)
+, bAllDocs(false)
+, bWaitMode(false)
+, bAllowRescheduling(false)
+, bRunning(false)
+, pActiveProgress(0)
+, pWorkWin(0)
+, pView(0)
{
}
commit 009ddaf73b0458b3c08634e71042096d97e0a71d
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 09:39:30 2013 +0100
CID#1079306 uninitialized members
Change-Id: I40838e5816439b95a33da6e6896f5ae0b89dbbef
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 4614e65..23f016a 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -124,6 +124,7 @@ public:
//--
SvBaseLink::SvBaseLink()
+: m_bIsReadOnly(false)
{
pImpl = new BaseLink_Impl();
nObjType = OBJECT_CLIENT_SO;
@@ -135,6 +136,7 @@ SvBaseLink::SvBaseLink()
//--
SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
+: m_bIsReadOnly(false)
{
pImpl = new BaseLink_Impl();
nObjType = OBJECT_CLIENT_SO;
@@ -152,6 +154,7 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr
nContentType )
SvBaseLink::SvBaseLink( const OUString rLinkName, sal_uInt16 nObjectType,
SvLinkSource* pObj )
: pImpl(0)
+, m_bIsReadOnly(false)
{
bVisible = bSynchron = bUseCache = sal_True;
bWasLastEditOK = sal_False;
commit 7cf32bbf4e13258f6572c2ac37949c7761b7061e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 09:39:11 2013 +0100
CID#1079314 uninitialized members
Change-Id: I3f10b7ae435f466752914ef6d98ce5f6e923b785
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx
b/sd/source/ui/animations/CustomAnimationList.cxx
index 23ae228..7876abd 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/dapiuno.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 829752d3159c77f39bdd99bc070cfd543296808c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 8 11:04:08 2013 +0200
-Werror,-Wunused-variable
Change-Id: I50b99a129f6a102be7120da318533cbbdd0af105
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 2794d9e..180c061 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1232,7 +1232,6 @@ void SAL_CALL ScDataPilotTableObj::setTag( const
OUString aNewTag )
ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName);
if (pDPObj)
{
-OUString aString(aNewTag);
pDPObj-SetTag( aNewTag ); //! Undo - DBDocFunc ???
// DataPilotUpdate would do too much (output table is not changed)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 4f/897669a97515bf1f4247324e6c04136b593f0c e6/cdcb46f2cec5c9b7607d8df160a01fcbdf68e0
4f/897669a97515bf1f4247324e6c04136b593f0c |1 + e6/cdcb46f2cec5c9b7607d8df160a01fcbdf68e0 |1 + 2 files changed, 2 insertions(+) New commits: commit 110c0ca97eafe2ff37297407d347ed5cbb13e6e5 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 8 10:05:00 2013 +0100 Notes added by 'git notes add' diff --git a/4f/897669a97515bf1f4247324e6c04136b593f0c b/4f/897669a97515bf1f4247324e6c04136b593f0c new file mode 100644 index 000..b341b7d --- /dev/null +++ b/4f/897669a97515bf1f4247324e6c04136b593f0c @@ -0,0 +1 @@ +ignore: worthy, but WDK is colossal commit 5650e01bdb9a36d38530aea3cecfc97535f5fd70 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 8 10:04:53 2013 +0100 Notes added by 'git notes add' diff --git a/e6/cdcb46f2cec5c9b7607d8df160a01fcbdf68e0 b/e6/cdcb46f2cec5c9b7607d8df160a01fcbdf68e0 new file mode 100644 index 000..b341b7d --- /dev/null +++ b/e6/cdcb46f2cec5c9b7607d8df160a01fcbdf68e0 @@ -0,0 +1 @@ +ignore: worthy, but WDK is colossal ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4f/8bd30b7634e143514d1c0d52d8ca2ffb07a7b9
4f/8bd30b7634e143514d1c0d52d8ca2ffb07a7b9 |1 + 1 file changed, 1 insertion(+) New commits: commit 437fc9eb5c2161598ed01eeda646404ebf47e71f Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 8 10:04:34 2013 +0100 Notes added by 'git notes add' diff --git a/4f/8bd30b7634e143514d1c0d52d8ca2ffb07a7b9 b/4f/8bd30b7634e143514d1c0d52d8ca2ffb07a7b9 new file mode 100644 index 000..b341b7d --- /dev/null +++ b/4f/8bd30b7634e143514d1c0d52d8ca2ffb07a7b9 @@ -0,0 +1 @@ +ignore: worthy, but WDK is colossal ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
How are installation sets being built?
Hi all, I was always thinking that --enable-epm (despite its name) was the magic autogen.input switch to instruct a top-level make (or make check) to also build installation sets (deb, rpm, dmg, msi, ...), on all platforms. (And that the phenomenon that Windows continued to build an archive installation set regardless of --dis-/enable-epm was an inadvertent leftover from the old OOo times where such an archive installation set was needed to run the subsequentcheck tests agaist.) However, git grep -Flw -e --enable-epm makes me doubtful about my assumption, as only distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/OxygenOfficeLinux.conf mention it, while distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeMinGW.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf distro-configs/LibreOfficeiOS.conf distro-configs/OxygenOfficeWin32.conf do not. So, I am wondering how exactly the official TDF-released installation sets are being built for the various platforms. What are the autogen.sh (autogen.input) switches, and what are the exact make command lines? Where is that stored in git or similar (if it is stored anywhere at all)? Similarly, how exactly are any of those nightly installation sets (uploaded from select tinderboxes, IIUC) being built? How can you trace that? (I'm asking because I noticed that after instdir-ification we still always build a now-useless archive installation set on Windows during make and make check, regardless of --dis-/enable-epm, and I wanted to clean that up. Which is especially important now that that installation set is built in parallel with running the make check subsequenttests, which appears to have destabilizing effects at least for some.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About Clang headers on Debian
On 10/07/2013 11:46 PM, julien2412 wrote:
I'm trying to build clang from svn trunk to give a try to MemorySanitizer.
So I followed, http://clang.llvm.org/get_started.html
but I don't know what to put in my autogen.input
Either I get this:
* WARNING : Cannot find Clang headers to build compiler plugins, plugins
disabled
or I get this:
make: *** No rule to make target `/home/julien/llvm-svn/build/bin/clang',
needed by
`/home/julien/compile-libreoffice/libo_clang/compilerplugins/obj/clang-timestamp'.
Stop
Here's the end of my autogen.input when I get last message:
CLANGBUILD=/home/julien/llvm-svn/build
CLANGDIR=/home/julien/llvm-svn/llvm
CC=/home/julien/llvm-svn/build/Debug+Asserts/bin/clang
CXX=/home/julien/llvm-svn/build/Debug+Asserts/bin/clang++
The script with which I build Clang trunk is
#!/bin/bash
set -ex
mkdir ${HOME?}/clang/trunk
svn co http://llvm.org/svn/llvm-project/llvm/trunk ${HOME?}/clang/trunk/src
svn co http://llvm.org/svn/llvm-project/cfe/trunk \
${HOME?}/clang/trunk/src/tools/clang
svn co http://llvm.org/svn/llvm-project/clang-tools-extra/trunk \
${HOME?}/clang/trunk/src/tools/clang/tools/extra
svn co http://llvm.org/svn/llvm-project/compiler-rt/trunk \
${HOME?}/clang/trunk/src/projects/compiler-rt
mkdir ${HOME?}/clang/trunk/build
cd ${HOME?}/clang/trunk/build
${HOME?}/clang/trunk/src/configure --prefix=${HOME?}/clang/trunk/inst \
--enable-optimized CC=gcc CXX=g++
make -j12
make install -j12
and then have
CC=/home/sbergman/clang/trunk/inst/bin/clang
CXX=/home/sbergman/clang/trunk/inst/bin/clang++
CLANGBUILD=/home/sbergman/clang/trunk/inst
CLANGDIR=/home/sbergman/clang/trunk/inst
in autogen.input, with CLANGBUILD = CLANGDIR (though IIRC Lubos used a
somewhat different setup that did involve setting CLANGBUILD != CLANGDIR).
Then if it had worked, I wanted to try this:
CFLAGS=-fsanitize=memory -fsanitize-memory-track-origins
-fno-omit-frame-pointer -g -O2' CXXFLAGS='-fsanitize=memory
-fsanitize-memory-track-origins -fno-omit-frame-pointer -g -O2' make
as I read here:
https://wiki.documentfoundation.org/Development/BuildingOnLinux#Compiler_flags
I once toyed around a little with -fsanitize=undefined, but it took some
tweaking of solenv/gbuild/ to get the relevant flags properly into the
build IIRC. (I have those changes still lying around locally, but never
came around to look into it again and clean up. Also,
-fsanitize=undefined started to fail rather quickly due to problems
discussed in the thread starting at
http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130812/086127.html
ubsan: check type_info equality via strcmp, which would need fixing in
our cppumaker-generated headers.)
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice Help
On 08/10/13 09:34, Soliman Eldebaky wrote: Hi All how to create LibreOffice install package for windows i have successful build on developing environment : - win7 x64 - cygwin - visual studio 2012 hi Soliman, good to hear you had a successful build! on Windows an MSI installer should be created by default at the end of the build, you can find it in: workdir/*/installation/LibreOffice*/msi/install/en-US/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
gerrit git update? (was: Can't access logerrit buildbot logs)
Something somewhat related and likely relevant for the same audience: Gerrit still sends out ill-phrased I have submitted a patch for review mails despite https://gerrit.libreoffice.org/gitweb?p=gerrit-etc.git;a=commit;h=49e88663db8b4dee58811af25ab6ec77d64839b9 Avoid confusing wording in mails requesting a review. Could it be that the Gerrit installation needs a git update there? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - canvas/source officecfg/registry postprocess/Rdb_services.mk slideshow/source
canvas/source/opengl/ogl_spritedevicehelper.cxx |2 officecfg/registry/data/org/openoffice/Office/Canvas.xcu | 23 +--- postprocess/Rdb_services.mk |3 slideshow/source/engine/pointersymbol.cxx| 73 +-- slideshow/source/engine/pointersymbol.hxx| 20 ++-- slideshow/source/engine/slideshowimpl.cxx| 17 --- slideshow/source/engine/waitsymbol.hxx |1 7 files changed, 53 insertions(+), 86 deletions(-) New commits: commit f448d677bcaa9ad68876ea292d93978f729335a0 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Oct 8 12:25:11 2013 +0200 oglcanvas: cleanup canvas services, demote oglcanvas a bit. Remove long-dead service instances, demote oglcanvas to be below cairocanvas (we're not quite mature yet). Change-Id: Ie6051895fd93a1a518eaa4fb4f71b62bff330a83 diff --git a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu index 266e4d2..8851827 100644 --- a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu @@ -31,50 +31,37 @@ value oor:separator=,com.sun.star.comp.rendering.BitmapCanvas.GDI+, com.sun.star.comp.rendering.Canvas.GDI+, com.sun.star.comp.rendering.Canvas.Cairo, - com.sun.star.comp.rendering.Canvas.GL, - com.sun.star.comp.rendering.Canvas.Java, com.sun.star.comp.rendering.Canvas.VCL /value /prop prop oor:name=AcceleratedImplementations oor:type=oor:string-list -value oor:separator=,com.sun.star.comp.rendering.Canvas.GL, - com.sun.star.comp.rendering.Canvas.Java -/value +value oor:separator=,/ /prop prop oor:name=AntialiasingImplementations oor:type=oor:string-list value oor:separator=,com.sun.star.comp.rendering.BitmapCanvas.GDI+, com.sun.star.comp.rendering.Canvas.GDI+, - com.sun.star.comp.rendering.Canvas.Cairo, - com.sun.star.comp.rendering.Canvas.GL, - com.sun.star.comp.rendering.Canvas.Java + com.sun.star.comp.rendering.Canvas.Cairo /value /prop /node node oor:name=com.sun.star.rendering.SpriteCanvas oor:op=replace prop oor:name=PreferredImplementations oor:type=oor:string-list value oor:separator=,com.sun.star.comp.rendering.SpriteCanvas.DX9, - com.sun.star.comp.rendering.SpriteCanvas.DX5, - com.sun.star.comp.rendering.SpriteCanvas.OGL, com.sun.star.comp.rendering.SpriteCanvas.Cairo, - com.sun.star.comp.rendering.SpriteCanvas.GL, - com.sun.star.comp.rendering.SpriteCanvas.Java, + com.sun.star.comp.rendering.SpriteCanvas.OGL, com.sun.star.comp.rendering.SpriteCanvas.VCL /value /prop prop oor:name=AcceleratedImplementations oor:type=oor:string-list value oor:separator=,com.sun.star.comp.rendering.SpriteCanvas.DX9, - com.sun.star.comp.rendering.SpriteCanvas.DX5, com.sun.star.comp.rendering.SpriteCanvas.Cairo, - com.sun.star.comp.rendering.SpriteCanvas.GL, - com.sun.star.comp.rendering.SpriteCanvas.Java + com.sun.star.comp.rendering.SpriteCanvas.OGL /value /prop prop oor:name=AntialiasingImplementations oor:type=oor:string-list value oor:separator=,com.sun.star.comp.rendering.SpriteCanvas.DX9, - com.sun.star.comp.rendering.SpriteCanvas.DX5, com.sun.star.comp.rendering.SpriteCanvas.Cairo, - com.sun.star.comp.rendering.SpriteCanvas.GL, - com.sun.star.comp.rendering.SpriteCanvas.Java + com.sun.star.comp.rendering.SpriteCanvas.OGL /value /prop /node commit d9b2328c5447a505f11fd0a47d375174abcbd2c1 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Oct 8 12:23:59 2013 +0200 slideshow: remove cruft, align formatting. Change-Id: I119cf2461f4a77057cdbc19349561cd24991e2dd diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 43c5aaa..4c59b25 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - setup_native/source
setup_native/source/mac/ooo/osxdndinstall.png |binary 1 file changed New commits: commit a90039fb78af4f797545d58a2b325cb24e56fd2c Author: Andras Timar andras.ti...@collabora.com Date: Tue Oct 8 12:41:12 2013 +0200 set resolution of DMG folder background image to 72DPI Change-Id: Iacfedb43e5333d98baf4d30ab69b0c85f47dbbf3 diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png index 28f9c9c..6552d44 100644 Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |1
writerfilter/source/dmapper/LatentStyleHandler.cxx | 82 +
writerfilter/source/dmapper/LatentStyleHandler.hxx | 42 ++
writerfilter/source/dmapper/StyleSheetTable.cxx| 81
writerfilter/source/dmapper/StyleSheetTable.hxx|2
5 files changed, 208 insertions(+)
New commits:
commit f484f9b482dd74616ab542d74f9ec547aab71285
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 8 10:52:33 2013 +0200
writerfilter: handle CT_LatentStyles and CT_LsdException in dmapper
Just store them in the document InteropGrabBag for now.
Change-Id: Ia413930746ed087bcb0f6e338198c7baa5bcbdf0
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 24b92a8..ff23bad 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -102,6 +102,7 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/FormControlHelper \
writerfilter/source/dmapper/GraphicHelpers \
writerfilter/source/dmapper/GraphicImport \
+writerfilter/source/dmapper/LatentStyleHandler \
writerfilter/source/dmapper/MeasureHandler \
writerfilter/source/dmapper/ModelEventListener \
writerfilter/source/dmapper/NumberingManager \
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx
b/writerfilter/source/dmapper/LatentStyleHandler.cxx
new file mode 100644
index 000..013e3c0
--- /dev/null
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -0,0 +1,82 @@
+/* -*- 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/.
+ */
+#include LatentStyleHandler.hxx
+#include ooxml/resourceids.hxx
+#include dmapperLoggers.hxx
+
+namespace writerfilter {
+namespace dmapper {
+
+using namespace ::com::sun::star;
+
+LatentStyleHandler::LatentStyleHandler() :
+LoggedProperties(dmapper_logger, LatentStyleHandler)
+{
+}
+
+LatentStyleHandler::~LatentStyleHandler()
+{
+}
+
+void LatentStyleHandler::lcl_attribute(Id rName, Value rVal)
+{
+beans::PropertyValue aValue;
+bool bFound = true;
+switch (rName)
+{
+case NS_ooxml::LN_CT_LsdException_name:
+aValue.Name = name;
+break;
+case NS_ooxml::LN_CT_LsdException_locked:
+aValue.Name = locked;
+break;
+case NS_ooxml::LN_CT_LsdException_uiPriority:
+aValue.Name = uiPriority;
+break;
+case NS_ooxml::LN_CT_LsdException_semiHidden:
+aValue.Name = semiHidden;
+break;
+case NS_ooxml::LN_CT_LsdException_unhideWhenUsed:
+aValue.Name = unhideWhenUsed;
+break;
+case NS_ooxml::LN_CT_LsdException_qFormat:
+aValue.Name = qFormat;
+break;
+default:
+bFound = false;
+#ifdef DEBUG_DOMAINMAPPER
+dmapper_logger-element(unhandled);
+#endif
+break;
+}
+if (bFound)
+{
+aValue.Value = uno::makeAny(rVal.getString());
+m_aAttributes.push_back(aValue);
+}
+}
+
+
+void LatentStyleHandler::lcl_sprm(Sprm /*rSprm*/)
+{
+}
+
+uno::Sequencebeans::PropertyValue LatentStyleHandler::getAttributes() const
+{
+uno::Sequencebeans::PropertyValue aAttributes(m_aAttributes.size());
+beans::PropertyValue* pAttributes = aAttributes.getArray();
+for (std::vectorbeans::PropertyValue::const_iterator i =
m_aAttributes.begin(); i != m_aAttributes.end(); ++i)
+*pAttributes++ = *i;
+return aAttributes;
+}
+
+} // namespace dmapper
+} // namespace writerfilter
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx
b/writerfilter/source/dmapper/LatentStyleHandler.hxx
new file mode 100644
index 000..081ddc2
--- /dev/null
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -0,0 +1,42 @@
+/* -*- 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/.
+ */
+#ifndef INCLUDED_LATENTSTYLEHANDLER_HXX
+#define INCLUDED_LATENTSTYLEHANDLER_HXX
+
+#include resourcemodel/LoggedResources.hxx
+#include boost/shared_ptr.hpp
+#include com/sun/star/beans/PropertyValue.hpp
+
+namespace writerfilter {
+namespace dmapper {
+
+/// Handler for a latent style (w:lsdException element)
+class LatentStyleHandler
+: public LoggedProperties
+{
+
Re: gerrit git update?
Hi, Stephan Bergmann wrote on 2013-10-08 11:55: Something somewhat related and likely relevant for the same audience: Gerrit still sends out ill-phrased I have submitted a patch for review mails despite https://gerrit.libreoffice.org/gitweb?p=gerrit-etc.git;a=commit;h=49e88663db8b4dee58811af25ab6ec77d64839b9 Avoid confusing wording in mails requesting a review. Could it be that the Gerrit installation needs a git update there? David and Norbert probably know best - if they can't have a look directly, if anyone tells me what to do without breaking Gerrit (I have a high level of respect for it ;-), I can follow the instructions. Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: setup_native/source
setup_native/source/mac/ooo/osxdndinstall.png |binary 1 file changed New commits: commit 0d57ddfabf76521590a709e0169b0ee63539cdfe Author: Andras Timar andras.ti...@collabora.com Date: Tue Oct 8 13:27:48 2013 +0200 fdo#52004 set resolution of .dmg background image to 72DPI Apparently Mac OS X looks at the DPI value, not to the actual pixel size of the image. Change-Id: I9fd43228e4d2e05397f798ed4902d7d80ef2145f diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png index 18eaaea..1872f40 100644 Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: PATCH - SDRemote LO
Hi guys, Yep, I know tricks about commit messages, thank you for the advise anyway ;-) I still think it’s better to mark bugs as resolved when the app will be released, let’s hope it will be done in near future. I also CC Michael, maybe he has other points. Regards, Artur. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/drawinglayer
include/drawinglayer/geometry/viewinformation2d.hxx |3 --- include/drawinglayer/geometry/viewinformation3d.hxx |3 --- 2 files changed, 6 deletions(-) New commits: commit 193ff323f94ca37832154dcedcf396783b57880e Author: Tor Lillqvist t...@collabora.com Date: Tue Oct 8 14:44:59 2013 +0300 Bin pointless comment We include com/*sun*/star/... all over the place without mentioning anything about sun being defined as 1 in some compiler at some time, so why mention it here. Change-Id: Idaf18813a583897020f33ba9ed9905b9d11cc902 diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx index f8e0d66..4268e26 100644 --- a/include/drawinglayer/geometry/viewinformation2d.hxx +++ b/include/drawinglayer/geometry/viewinformation2d.hxx @@ -22,9 +22,6 @@ #include drawinglayer/drawinglayerdllapi.h -// the solaris compiler defines 'sun' as '1'. To avoid that (and to allow -// pre-declarations of com/sun/star namespace), include sal/config.h here -// where sun is redefined as 'sun' (so i guess the problem is known). #include sal/config.h #include com/sun/star/uno/Sequence.h #include com/sun/star/beans/PropertyValue.hpp diff --git a/include/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx index 86c9a2c..8ad8c3e 100644 --- a/include/drawinglayer/geometry/viewinformation3d.hxx +++ b/include/drawinglayer/geometry/viewinformation3d.hxx @@ -22,9 +22,6 @@ #include drawinglayer/drawinglayerdllapi.h -// the solaris compiler defines 'sun' as '1'. To avoid that (and to allow -// pre-declarations of com/sun/star namespace), include sal/config.h here -// where sun is redefined as 'sun' (so i guess the problem is known). #include sal/config.h #include com/sun/star/uno/Sequence.h #include com/sun/star/beans/PropertyValue.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/sidebarparagraph.ui | 210 ++-- svx/uiconfig/ui/sidebartextpanel.ui | 38 -- 2 files changed, 130 insertions(+), 118 deletions(-) New commits: commit a5aa1b29d5fb9a8a3045ba36fa0de4a0718bed54 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Tue Oct 8 14:51:40 2013 +0300 Move WriteDirection buttons to paragraph sidebar fdo#67746 Change-Id: I7a49e1ba9eb08c2fa79b80d572ef86ac5f76b9ca diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index 691ee14..d702d15 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -16,86 +16,6 @@ property name=column_spacing6/property property name=column_homogeneousTrue/property child - object class=GtkToolbar id=horizontalalignment -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesHorizontal Alignment/property -property name=tooltip_text translatable=yesHorizontal Alignment/property -property name=halignstart/property -property name=show_arrowFalse/property -child - object class=GtkToolButton id=leftpara -property name=width_request25/property -property name=height_request25/property -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesAlign Left/property -property name=tooltip_text translatable=yesAlign Left/property -property name=valignstart/property -property name=action_name.uno:LeftPara/property -property name=use_underlineTrue/property - /object - packing -property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child -child - object class=GtkToolButton id=centerpara -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesAlign Center/property -property name=tooltip_text translatable=yesAlign Center/property -property name=action_name.uno:CenterPara/property -property name=use_underlineTrue/property - /object - packing -property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child -child - object class=GtkToolButton id=rightpara -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesAlign Right/property -property name=tooltip_text translatable=yesAlign Right/property -property name=action_name.uno:RightPara/property -property name=use_underlineTrue/property - /object - packing -property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child -child - object class=GtkToolButton id=substjustify -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesAlign Justified/property -property name=tooltip_text translatable=yesAlign Justified/property -property name=action_name.uno:JustifyPara/property -property name=use_underlineTrue/property - /object - packing -property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child - /object - packing -property name=left_attach0/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child object class=GtkToolbar id=verticalalignment property name=visibleTrue/property property name=can_focusFalse/property @@ -688,6 +608,136 @@ property name=height1/property /packing /child +child + object class=GtkBox id=box1 +property
[Bug 36104] [FILESAVE] National symbols corrupted when saved in the MS Excel 5.0 format
https://bugs.freedesktop.org/show_bug.cgi?id=36104 Eike Rathke er...@redhat.com changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |WONTFIX --- Comment #8 from Eike Rathke er...@redhat.com --- With 4-0 being the earliest supported branch now and that already has saving to Excel 5.0 format removed we can indeed close this. Sorry for fuzz. -- 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: Branch 'libreoffice-4-1' - setup_native/source
setup_native/source/mac/ooo/osxdndinstall.png |binary 1 file changed New commits: commit 26fcde48b6b403c896b18552343de084bc2184c3 Author: Andras Timar andras.ti...@collabora.com Date: Tue Oct 8 13:27:48 2013 +0200 fdo#52004 set resolution of .dmg background image to 72DPI Apparently Mac OS X looks at the DPI value, not to the actual pixel size of the image. Change-Id: I9fd43228e4d2e05397f798ed4902d7d80ef2145f Reviewed-on: https://gerrit.libreoffice.org/6162 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png index 18eaaea..1872f40 100644 Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst |8
solenv/inc/minor.mk |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a327e95238e441a24223b5f9e988f15c95b1ff14
Author: Andras Timar andras.ti...@collabora.com
Date: Tue Oct 8 05:40:18 2013 -0700
Bump for 4.0-18
Change-Id: I9d76a7031a28b8dd82f26877dfef2c30e07941ca
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index b4b9723..be5c25a 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -33,7 +33,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 17
+WINDOWSPATCHLEVEL 18
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -56,7 +56,7 @@ LibreOffice
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-317
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-318
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -107,7 +107,7 @@ LibreOffice_Dev
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-317
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-318
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -365,7 +365,7 @@ OxygenOffice
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-317
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-318
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index d7bd97a..46df670 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=400
-RSCREVISION=400m1(Build:317)
-BUILD=317
+RSCREVISION=400m1(Build:318)
+BUILD=318
LAST_MINOR=m0
SOURCEVERSION=OOO400
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sw/source
sw/source/filter/ww8/attributeoutputbase.hxx |5
sw/source/filter/ww8/docxattributeoutput.cxx | 220 +--
sw/source/filter/ww8/docxattributeoutput.hxx | 12 +
sw/source/filter/ww8/rtfattributeoutput.cxx |7
sw/source/filter/ww8/rtfattributeoutput.hxx |5
sw/source/filter/ww8/wrtw8nds.cxx|4
sw/source/filter/ww8/ww8attributeoutput.hxx |5
7 files changed, 236 insertions(+), 22 deletions(-)
New commits:
commit 62ceeb1d1a0ff32e1be615f78da796aa13aaa06c
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Oct 8 13:50:42 2013 +0200
DOCX export: Export run properties defaults in docDefaults.
The paragraph properties still need some work, so that part is disabled in
order not to break the unit tests.
Change-Id: I06e55a5345d4fe08b14b8a260ab774b38770bf7b
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b63d78c..1940fa2 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -37,6 +37,7 @@
#include i18nlangtag/languagetag.hxx
+#include editeng/autokernitem.hxx
#include editeng/unoprnms.hxx
#include editeng/fontitem.hxx
#include editeng/tstpitem.hxx
@@ -2359,6 +2360,180 @@ void DocxAttributeOutput::StartStyles()
DocDefaults();
}
+void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem rHt)
+{
+bool bMustWrite = true;
+switch (rHt.Which())
+{
+case RES_CHRATR_CASEMAP:
+bMustWrite = static_cast const SvxCaseMapItem
(rHt).GetCaseMap() != SVX_CASEMAP_NOT_MAPPED;
+break;
+case RES_CHRATR_COLOR:
+bMustWrite = static_cast const SvxColorItem
(rHt).GetValue().GetColor() != COL_AUTO;
+break;
+case RES_CHRATR_CONTOUR:
+bMustWrite = static_cast const SvxContourItem (rHt).GetValue();
+break;
+case RES_CHRATR_CROSSEDOUT:
+bMustWrite = static_cast const SvxCrossedOutItem
(rHt).GetStrikeout() != STRIKEOUT_NONE;
+break;
+case RES_CHRATR_ESCAPEMENT:
+bMustWrite = static_cast const SvxEscapementItem
(rHt).GetEscapement() != SVX_ESCAPEMENT_OFF;
+break;
+case RES_CHRATR_FONT:
+bMustWrite = true;
+break;
+case RES_CHRATR_FONTSIZE:
+bMustWrite = static_cast const SvxFontHeightItem
(rHt).GetHeight() != 200; // see StyleSheetTable_Impl::StyleSheetTable_Impl()
where we set this default
+break;
+case RES_CHRATR_KERNING:
+bMustWrite = static_cast const SvxKerningItem (rHt).GetValue()
!= 0;
+break;
+case RES_CHRATR_LANGUAGE:
+bMustWrite = true;
+break;
+case RES_CHRATR_POSTURE:
+bMustWrite = static_cast const SvxPostureItem
(rHt).GetPosture() != ITALIC_NONE;
+break;
+case RES_CHRATR_SHADOWED:
+bMustWrite = static_cast const SvxShadowedItem (rHt).GetValue();
+break;
+case RES_CHRATR_UNDERLINE:
+bMustWrite = static_cast const SvxUnderlineItem
(rHt).GetLineStyle() != UNDERLINE_NONE;
+break;
+case RES_CHRATR_WEIGHT:
+bMustWrite = static_cast const SvxWeightItem (rHt).GetWeight()
!= WEIGHT_NORMAL;
+break;
+case RES_CHRATR_AUTOKERN:
+bMustWrite = static_cast const SvxAutoKernItem (rHt).GetValue();
+break;
+case RES_CHRATR_BLINK:
+bMustWrite = static_cast const SvxBlinkItem (rHt).GetValue();
+break;
+case RES_CHRATR_BACKGROUND:
+{
+const SvxBrushItem rBrushItem = static_cast const
SvxBrushItem (rHt);
+bMustWrite = (rBrushItem.GetColor() != COL_AUTO ||
+ rBrushItem.GetShadingValue() !=
sal_uInt32(ShadingPattern::CLEAR) ||
+ rBrushItem.GetGraphic() != NULL ||
+ rBrushItem.GetGraphicObject() != NULL);
+}
+break;
+
+case RES_CHRATR_CJK_FONT:
+bMustWrite = true;
+break;
+case RES_CHRATR_CJK_FONTSIZE:
+bMustWrite = false; // we have written it already as
RES_CHRATR_FONTSIZE
+break;
+case RES_CHRATR_CJK_LANGUAGE:
+bMustWrite = true;
+break;
+case RES_CHRATR_CJK_POSTURE:
+bMustWrite = false; // we have written it already as
RES_CHRATR_POSTURE
+break;
+case RES_CHRATR_CJK_WEIGHT:
+bMustWrite = false; // we have written it already as
RES_CHRATR_WEIGHT
+break;
+
+case RES_CHRATR_CTL_FONT:
+bMustWrite = true;
+break;
+case RES_CHRATR_CTL_FONTSIZE:
+bMustWrite = static_cast const SvxFontHeightItem
(rHt).GetHeight() != 200; // see
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/dbnamdlg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f4e2e662d1635390359c6e9bd8335517daf1cc20
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 8 14:55:24 2013 +0200
Fix leftover typo from String conversion
Change-Id: Ib50e3c827ef99b4f534e39f55cfd8c450c5ddd9c
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index b732f65..6e029f1 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -416,7 +416,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
OUString aNewName = comphelper::string::strip(m_pEdName-GetText(), ' ');
OUString aNewArea = m_pEdAssign-GetText();
-if ( !aNewName.isEmpty() 0 !aNewArea.isEmpty() )
+if ( !aNewName.isEmpty() !aNewArea.isEmpty() )
{
if ( ScRangeData::IsNameValid( aNewName, pDoc )
!aNewName.equalsAscii(STR_DB_LOCAL_NONAME) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/bin
solenv/bin/modules/installer.pm | 30 +++-
solenv/bin/modules/installer/windows/msp.pm | 30
2 files changed, 34 insertions(+), 26 deletions(-)
New commits:
commit 4854217ab86c3b5f47412ecdb9dd609192c4fe13
Author: Andras Timar andras.ti...@collabora.com
Date: Sun Sep 29 09:39:22 2013 -0700
I forgot to add -d swith to signtool
The UAC prompt shows a temporary random Program Name for msi, if the
-d switch is not given.
One more change: probably it is not wise to print the password of
code signing key in clear text to log and to screen.
Change-Id: I1f555754eee19708bbd7a3c70280fe662c77fc3a
Reviewed-on: https://gerrit.libreoffice.org/6081
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index a5a6a01..ead0f3c 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1648,31 +1648,6 @@ sub run {
# Path of new installation set: $finalinstalldir
# Path of old installation set:
$installer::globals::updatedatabasepath
my $mspdir =
installer::windows::msp::create_msp_patch($finalinstalldir,
$includepatharrayref, $allvariableshashref, $languagestringref,
$languagesarrayref, $filesinproductlanguageresolvedarrayref);
-if ( defined($ENV{'WINDOWS_BUILD_SIGNING'})
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') )
-{
-my $systemcall = signtool.exe sign ;
-if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= -f
$ENV{'PFXFILE'} ; }
-if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= -p
$ENV{'PFXPASSWORD'} ; }
-if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= -t
$ENV{'TIMESTAMPURL'} ; } else { $systemcall .= -t
http://timestamp.globalsign.com/scripts/timestamp.dll ; }
-$systemcall .= $mspdir . /*.msp;
-installer::logger::print_message( ... $systemcall ...\n
);
-
-my $returnvalue = system($systemcall);
-
-my $infoline = Systemcall: $systemcall\n;
-push( @installer::globals::logfileinfo, $infoline);
-
-if ($returnvalue)
-{
-$infoline = ERROR: Could not execute
\$systemcall\!\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-else
-{
-$infoline = Success: Executed \$systemcall\
successfully!\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-}
($is_success, $finalinstalldir) =
installer::worker::analyze_and_save_logfile($loggingdir, $mspdir,
$installlogdir, $allsettingsarrayref, $languagestringref,
$current_install_number);
installer::worker::clean_output_tree(); # removing directories
created in the output tree
}
@@ -1699,11 +1674,14 @@ sub run {
if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= -f
$ENV{'PFXFILE'} ; }
if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= -p
$ENV{'PFXPASSWORD'} ; }
if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= -t
$ENV{'TIMESTAMPURL'} ; } else { $systemcall .= -t
http://timestamp.globalsign.com/scripts/timestamp.dll ; }
+$systemcall .= -d \ .
installer::download::get_downloadname_productname($allvariableshashref) . .
installer::download::get_download_version($allvariableshashref) . .
installer::download::get_downloadname_language($languagestringref) . .
installer::download::get_download_functionality($allvariableshashref) . \ ;
$systemcall .= $finalinstalldir .
$installer::globals::separator . $$downloadname . .msi;
-installer::logger::print_message( ... $systemcall ...\n
);
+installer::logger::print_message( ... code signing and
timestamping with signtool.exe ...\n );
my $returnvalue = system($systemcall);
+# do not print password to log
+if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall =~
s/$ENV{'PFXPASSWORD'}//; }
my $infoline = Systemcall: $systemcall\n;
push( @installer::globals::logfileinfo, $infoline);
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index 9892c7d..7c7fcb9 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1205,6 +1205,36 @@ sub create_msp_patch
[Libreoffice-commits] core.git: 5 commits - include/tools reportdesign/source sc/source sw/source tools/source
include/tools/string.hxx |2 -
reportdesign/source/ui/inspection/GeometryHandler.cxx | 12 +-
sc/source/core/tool/rangeutl.cxx | 10 -
sc/source/ui/app/inputwin.cxx |6 -
sc/source/ui/drawfunc/drtxtob.cxx |3 +-
sw/source/core/doc/docfld.cxx |4 +--
sw/source/core/doc/doctxm.cxx | 20 +-
sw/source/filter/ascii/ascatr.cxx |6 ++---
sw/source/filter/html/wrthtml.cxx | 13 ---
sw/source/filter/ww8/docxattributeoutput.cxx | 17 +++
sw/source/filter/ww8/docxattributeoutput.hxx |2 -
sw/source/filter/ww8/wrtw8nds.cxx | 12 +-
sw/source/filter/ww8/wrtw8sty.cxx |5 +---
sw/source/filter/ww8/ww8atr.cxx | 10 +++--
sw/source/ui/dbui/dbui.cxx|6 ++---
sw/source/ui/dbui/mmlayoutpage.cxx|4 +--
sw/source/ui/misc/redlndlg.cxx| 15 +
sw/source/ui/uiview/viewport.cxx | 10 +
tools/source/string/strimp.cxx| 19 -
tools/source/string/tustring.cxx | 15 -
20 files changed, 72 insertions(+), 119 deletions(-)
New commits:
commit 9914e44400524a2ffafd1efbd7f717281af27a74
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 14:03:03 2013 +0100
can drop casts now
Change-Id: If54ee50dd3d3d856257882c40e4424bbbe3eac45
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 1d32cb2..e5a8acb 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -503,17 +503,17 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
// This isn't parsed by ScRange, so try to parse the two Addresses
then.
if (!bResult)
{
-bResult = ((rRange.aStart.Parse( aUIString.copy(0,
(xub_StrLen)nIndex), const_castScDocument*(pDocument),
+bResult = ((rRange.aStart.Parse( aUIString.copy(0, nIndex),
const_castScDocument*(pDocument),
eConv) SCA_VALID) == SCA_VALID)
- ((rRange.aEnd.Parse(
aUIString.copy((xub_StrLen)nIndex+1), const_castScDocument*(pDocument),
+ ((rRange.aEnd.Parse( aUIString.copy(nIndex+1),
const_castScDocument*(pDocument),
eConv) SCA_VALID) == SCA_VALID);
::formula::FormulaGrammar::AddressConvention eConvUI =
pDocument-GetAddressConvention();
if (!bResult eConv != eConvUI)
{
-bResult = ((rRange.aStart.Parse( aUIString.copy(0,
(xub_StrLen)nIndex), const_castScDocument*(pDocument),
+bResult = ((rRange.aStart.Parse( aUIString.copy(0,
nIndex), const_castScDocument*(pDocument),
eConvUI) SCA_VALID) == SCA_VALID)
- ((rRange.aEnd.Parse(
aUIString.copy((xub_StrLen)nIndex+1), const_castScDocument*(pDocument),
+ ((rRange.aEnd.Parse( aUIString.copy(nIndex+1),
const_castScDocument*(pDocument),
eConvUI) SCA_VALID) == SCA_VALID);
}
}
commit 97527649bc03e9db1f74f74c3f5211427a4e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 14:01:11 2013 +0100
just copy everything remaining
Change-Id: I32a7b82eae664a60bf4bc73cb2645d3132ddaa81
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 1395a63..1d32cb2 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -126,7 +126,7 @@ sal_Bool ScRangeUtil::IsAbsTabArea( const OUString
rAreaStr,
ScRefAddressaEndPos;
aStartPosStr = aTempAreaStr.copy( 0, nColonPos );
-aEndPosStr = aTempAreaStr.copy( nColonPos+1, STRING_LEN );
+aEndPosStr = aTempAreaStr.copy( nColonPos+1 );
if ( ConvertSingleRef( pDoc, aStartPosStr, 0, aStartPos, rDetails ) )
{
commit 387c88a1e6d743ae7c0cc131fc74281e2be42092
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 13:31:42 2013 +0100
drop intermediate strings
Change-Id: I603031739aef12393084b14a51aa2a61311e5709
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index fc0bd81..ca2f9ae 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -618,11 +618,7 @@ void ScInputWindow::SetTextString( const OUString rString
)
if (rString.getLength() = 32767)
aTextWindow.SetTextString(rString);
else
-{
-OUString aNew = rString;
-aNew
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #70 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=832e5aadbff006ec24959162c29756fe2b1982be Related: fdo#38838 remove UniString::SearchAndReplaceAll The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: unotools/source
unotools/source/misc/datetime.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit bb05ff5599667fefa86741779dfecb405929975f Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 8 15:22:02 2013 +0200 No longer used header include Change-Id: I74034503b4d2d1eb438b4213bf135d831a08e9fc diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index ac42bfe..cb6b6e1 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -21,7 +21,6 @@ #include tools/date.hxx #include tools/time.hxx #include tools/datetime.hxx -#include stdexcept #include rtl/ustrbuf.hxx #include rtl/math.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Efficient UNO component linkage GC ...
Hi guys,
I just had a chat with Roi about the efforts to reduce the
amount of code being compiled / linked into LibreOffice, and I've
jotted a few notes down here on a sketch design with some code pointers:
* The background
We want to be able to configure which pieces (particularly
components) of LibreOffice are linked into our binaries. By compiling
our binaries with --ffunction-sections - and then defining the few
entry points - we can get the linker to link to all LibreOffice code,
and then to garbage-collect any unused methods - which results in
significant size savings. This is the approach used on Android / iOS.
Currently it is done thus:
http://cgit.freedesktop.org/libreoffice/core/tree/ios/experimental/LibreOffice/LibreOffice/lo.mm#n82
By listing every shared library's entry point that we will
require.
For mobile LibreOffice and various other use cases, it seems
extremely likely that UI's will not require great chunks of UI that
LibreOffice currently implements. Another interesting factor is that
(typically) the whole app will be linked into a single shared object
(much like the mergedlibs under Linux) - a Merged Library Domain.
* The problem
To shrink the size of our builds, a current prototype uses a
lot of #ifdefs everywhere, however - this is fragile, opaque and hard
to maintain. Ideally we could select which components we want to link
into our output in a more pleasant way.
Currently selecting per shlib is not granular enough eg. we
have a single factory for svx (eg.) that creates many components:
svx/source/unodraw/unoctabl.cxx
From the missable 'FindTextToolbarController' to the
indispensable 'SvxShapeCollection'. In order to eliminate unused code
in a clean way, we have to split these methods.
* Proposed solution
Part one - while there are some factories that (simply due to
the sheer volume of contents) presuambly need to stay as string
lookups - most factories should be split up, and a new factory naming
system introduced.
Part two - we should also cleanup the generation of lists of
components / library mappings that are currently duplicated across
iOS, Android etc.
Part three - we should use that list to avoid using string
lookups for component instantiation inside the Merged Library Domain,
** Part one - splitting factories
Clearly we need a new naming scheme for these; this should be
based on a mangled version of the implementation name; so:
implementation name=com.sun.star.comp.Draw.GraphicExporter
-
com_sun_star_comp_Draw_GraphicExporter_getFactory();
Despite everyone's loathing of the css. namespace this makes
part three much easier.
There are various ways to annotate that a .component file
eg. svx/util/svx.component refers to a shlib with a split factory. I
suggest we reduce the problem space by asserting that each shlib with
this property has it's components entirely split up - yielding a
single attribute change.
For these we alter the prefix=svx to prefix=name or
some equivalent magic, and tweak:
stoc/source/loader/dllcomponentloader.cxx:
ReferenceXInterface SAL_CALL DllComponentLoader::activate(
const OUString rImplName, const OUString , const OUString rLibName,
const Reference XRegistryKey xKey )
To special case this prefix, and build a symbol name (in
aPrefix) and use a new variant of:
cppuhelper/source/shlib.cxx:Reference XInterface SAL_CALL
loadSharedLibComponentFactory(
To load and hook out the correctly named symbol there.
We also define these factory functions to always be passed a
valid pServiceManager, and only ever to be asked to construct the
exact service name mangled into the symbol, hence:
SAL_DLLPUBLIC_EXPORT void * SAL_CALL
com_sun_star_drawing_SvxUnoColorTable_getFactory ( void * pServiceManager )
{
// Ideally this reference, and the branch below would be subsumed
// by a helper, such that this method call was a single line, and
// ideally could be macro-ized elegantly.
uno::Reference lang::XSingleServiceFactory xFactory;
xFactory = cppu::createSingleFactory(
reinterpret_cast lang::XMultiServiceFactory * (
pServiceManager ),
SvxUnoColorTable::getImplementationName_Static(),
SvxUnoColorTable_createInstance,
SvxUnoColorTable::getSupportedServiceNames_Static() );
if( xFactory.is())
{
xFactory-acquire();
return xFactory.get();
}
return NULL;
}
** Part two - list generation cleanup
For this, we define during configure time a list of services
which we want to be internal, and unconditionally resolved into our
binaries. This would be in the form of a flat list of implementations:
com.sun.star.comp.Svx.GraphicExportHelper
com.sun.star.comp.Svx.GraphicImportHelper
com.sun.star.comp.graphic.PrimitiveFactory2D
...
Instead
[Bug 70280] New: add UNO IDL support to ctags
https://bugs.freedesktop.org/show_bug.cgi?id=70280 Priority: medium Bug ID: 70280 CC: libreoffice@lists.freedesktop.org Assignee: libreoffice-b...@lists.freedesktop.org Summary: add UNO IDL support to ctags Severity: enhancement Classification: Unclassified OS: All Reporter: mst...@redhat.com Hardware: Other Status: NEW Version: 4.2.0.0.alpha0+ Master Component: contrib Product: LibreOffice ctags is very useful for developers to quickly look up definitions of identifiers in the huge LO code base. unfortunately ctags does not support the UNO IDL language, so identifiers from the UNO API cannot be looked up yet. likely it is not hard at all to add the required support to extract UNO IDL definitions to ctags. ctags website: http://ctags.sourceforge.net UNO IDL syntax description: http://www.openoffice.org/udk/common/man/idl.html#object_observes_def perhaps looking at the UNO IDL compiler may be helpful: idlc/source/scanner.l / parser.y or the new unoidl tool: unoidl/source/sourceprovider-* -- 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
Re: How are installation sets being built?
FWIW, this was the configuration I used for the 4.1 Linux builds while I was the one building them. --with-distro=LibreOfficeLinux --with-package-format=rpm deb --with-lang=ALL --enable-release-build --with-branding=/home/baseline/core/src/tdf-branding-4-1 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70280] add UNO IDL support to ctags
https://bugs.freedesktop.org/show_bug.cgi?id=70280 Michael Stahl mst...@redhat.com changed: What|Removed |Added Whiteboard||EasyHack, ||DifficultyBeginner, ||SkillCpp, SkillScript, ||TopicDebug -- 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: Branch 'private/kohei/calc-shared-string' - 3 commits - sc/inc sc/qa sc/source
sc/inc/document.hxx |4 +--
sc/inc/formulagroup.hxx |1
sc/qa/unit/ucalc.cxx |4 +--
sc/source/core/data/column.cxx|6 ++---
sc/source/core/data/column2.cxx | 26 +++---
sc/source/core/data/column3.cxx | 16 ++---
sc/source/core/data/documen2.cxx |4 +--
sc/source/core/data/documentimport.cxx|4 +--
sc/source/core/data/validat.cxx |2 -
sc/source/core/tool/interpr1.cxx |6 ++---
sc/source/filter/xcl97/XclImpChangeTrack.cxx |2 -
sc/source/filter/xml/XMLDDELinksContext.cxx |2 -
sc/source/filter/xml/XMLTrackedChangesContext.cxx |2 -
sc/source/ui/undo/undocell.cxx|2 -
14 files changed, 40 insertions(+), 41 deletions(-)
New commits:
commit 04071a018b1484838334c018f4c3d75596492a50
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 8 09:33:23 2013 -0400
Get the string ID's for case insensitive comparisons.
If we ever need to use this for case sensitive comparisons, we'll have to
find a way to conditionalize it.
Change-Id: Ibb862c4700d2fb660570fc80a80a03eed1d556c3
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 21ef99f..392a851 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2183,7 +2183,7 @@ bool appendStrings(
getBlockIteratorssc::string_block(it, nLenRemain, itData,
itDataEnd);
for (; itData != itDataEnd; ++itData)
-rArray.push_back(itData-getData());
+rArray.push_back(itData-getDataIgnoreCase());
}
break;
case sc::element_type_edittext:
@@ -2194,7 +2194,7 @@ bool appendStrings(
for (; itData != itDataEnd; ++itData)
{
OUString aStr = ScEditUtil::GetString(**itData, pDoc);
-rArray.push_back(rPool.intern(aStr).getData());
+rArray.push_back(rPool.intern(aStr).getDataIgnoreCase());
}
}
break;
@@ -2219,7 +2219,7 @@ bool appendStrings(
return false;
}
-rArray.push_back(rPool.intern(aStr).getData());
+rArray.push_back(rPool.intern(aStr).getDataIgnoreCase());
}
}
break;
@@ -2250,7 +2250,7 @@ bool appendStrings(
return false;
}
-void copyFirstBlock( sc::FormulaGroupContext rCxt, size_t nLen, const
sc::CellStoreType::position_type rPos )
+void copyFirstStringBlock( sc::FormulaGroupContext rCxt, size_t nLen, const
sc::CellStoreType::position_type rPos )
{
rCxt.maStrArrays.push_back(new sc::FormulaGroupContext::StrArrayType);
sc::FormulaGroupContext::StrArrayType rArray = rCxt.maStrArrays.back();
@@ -2259,7 +2259,7 @@ void copyFirstBlock( sc::FormulaGroupContext rCxt,
size_t nLen, const sc::CellS
svl::SharedString* p = sc::string_block::at(*rPos.first-data,
rPos.second);
svl::SharedString* pEnd = p + nLen;
for (; p != pEnd; ++p)
-rArray.push_back(p-getData());
+rArray.push_back(p-getDataIgnoreCase());
}
}
@@ -2370,12 +2370,12 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray(
sc::FormulaGroupContext
if (nLenRequested = nLen)
{
// Requested length fits a single block.
-copyFirstBlock(rCxt, nLenRequested, aPos);
+copyFirstStringBlock(rCxt, nLenRequested, aPos);
sc::FormulaGroupContext::StrArrayType rArray =
rCxt.maStrArrays.back();
return formula::VectorRefArray(rArray[0]);
}
-copyFirstBlock(rCxt, nLen, aPos);
+copyFirstStringBlock(rCxt, nLen, aPos);
sc::FormulaGroupContext::StrArrayType rArray =
rCxt.maStrArrays.back();
// Fill the remaining array with values from the following blocks.
commit f05eaa705a1b77c3975929709637b52b8961fb31
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 8 09:27:27 2013 -0400
Rename GetCellStringPool() to GetSharedStringPool().
Change-Id: I99d373f7887424bb103cff60d53f5cd8ce337ef7
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fc0058d..54fd457 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -853,8 +853,8 @@ public:
*/
double* GetValueCell( const ScAddress rPos );
-SC_DLLPUBLIC svl::SharedStringPool GetCellStringPool();
-const svl::SharedStringPool GetCellStringPool() const;
+SC_DLLPUBLIC svl::SharedStringPool GetSharedStringPool();
+const svl::SharedStringPool GetSharedStringPool() const;
sal_uIntPtr GetCellStringID( const ScAddress rPos ) const;
[Libreoffice-commits] core.git: 2 commits - sc/source xmloff/source
sc/source/core/tool/interpr6.cxx |4 ++--
xmloff/source/chart/SchXMLSeries2Context.cxx |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6854a42af0b6f6a7160be21b4f6add49bef7fcdd
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 14:23:55 2013 +0100
CID#1079199 uninitialized member
and CID#1079200
Change-Id: Icf00324c0a1fa669c17d41be83abcd5bacd398ca
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index efde90f..35bb95e 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -271,7 +271,7 @@ class FuncCount : public sc::ColumnSpanSet::ColumnAction
sal_uInt32 mnNumFmt;
public:
-FuncCount() : mnCount(0), mnNumFmt(0) {}
+FuncCount() : mpCol(0), mnCount(0), mnNumFmt(0) {}
virtual void startColumn(ScColumn* pCol)
{
@@ -302,7 +302,7 @@ class FuncSum : public sc::ColumnSpanSet::ColumnAction
sal_uInt32 mnNumFmt;
public:
-FuncSum() : mfSum(0.0), mnNumFmt(0) {}
+FuncSum() : mpCol(0), mfSum(0.0), mnNumFmt(0) {}
virtual void startColumn(ScColumn* pCol)
{
commit a9984d7744f1164d32381fea7fb2904199a3d956
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 14:11:36 2013 +0100
CID#1079188 uninitialized member
Change-Id: I55c9f2d0d7a7c03dd9960a32a415398a194f8265
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx
b/xmloff/source/chart/SchXMLSeries2Context.cxx
index e881298..bfc3932 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -277,6 +277,7 @@ SchXMLSeries2Context::SchXMLSeries2Context(
m_bStockHasVolume( bStockHasVolume ),
m_rGlobalSeriesImportInfo(rGlobalSeriesImportInfo),
mpAttachedAxis( NULL ),
+mnAttachedAxis( 0 ),
maGlobalChartTypeName( aGlobalChartTypeName ),
maSeriesChartTypeName( aGlobalChartTypeName ),
m_bHasDomainContext(false),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 32f9f70019ad31ca79e34c671c8e8b53786f9135
Author: Ahmad H. Al Harthi aalhar...@kacst.edu.sa
Date: Tue Oct 8 09:40:30 2013 +0300
Smiley face now smiles!
Change-Id: I5f74c866327bfc51c31694db93a9f7f2dad79858
Reviewed-on: https://gerrit.libreoffice.org/6161
Reviewed-by: Faisal al-otaibi fmalota...@kacst.edu.sa
Tested-by: Faisal al-otaibi fmalota...@kacst.edu.sa
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 7b79dc3..35572b1 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -3086,8 +3086,8 @@ static const mso_CustomShape msoActionButtonMovie =
static const SvxMSDffVertPair mso_sptSmileyFaceVert[] = // adj value 15510 -
17520
{
{ 10800, 10800 }, { 10800, 10800 }, { 0, 360 },
-{ 7305, 7515 }, { 1165, 1165 }, { 0, 360 },
-{ 14295, 7515 }, { 1165, 1165 }, { 0, 360 },
+{ 7305, 7515 }, { 1000, 1865 }, { 0, 360 },
+{ 14295, 7515 }, { 1000, 1865 }, { 0, 360 },
{ 4870, 1 MSO_I }, { 8680, 2 MSO_I }, { 12920, 2 MSO_I }, { 16730, 1 MSO_I
}
};
static const sal_uInt16 mso_sptSmileyFaceSegm[] =
@@ -3099,19 +3099,19 @@ static const sal_uInt16 mso_sptSmileyFaceSegm[] =
};
static const SvxMSDffCalculationData mso_sptSmileyFaceCalc[] =
{
-{ 0x2000, { DFF_Prop_adjustValue, 0, 15510 } },
-{ 0x8000, { 17520, 0, 0x400 } },
-{ 0x4000, { 15510, 0x400, 0 } }
+{ 0x2000, { DFF_Prop_adjustValue, 0, 14510 } },
+{ 0x8000, { 18520, 0, 0x400 } },
+{ 0x4000, { 14510, 0x400, 0 } }
};
static const sal_Int32 mso_sptSmileyFaceDefault[] =
{
-1, 17520
+1, 18520
};
static const SvxMSDffHandle mso_sptSmileyHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
-10800, 0x100, 10800, 10800, MIN_INT32, 0x7fff, 15510, 17520 }
+10800, 0x100, 10800, 10800, MIN_INT32, 0x7fff, 14510, 18520 }
};
static const mso_CustomShape msoSmileyFace =
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - sc/source
sc/source/core/data/column2.cxx | 38 +++---
1 file changed, 31 insertions(+), 7 deletions(-)
New commits:
commit 1cd94a3c84f20458d57a0d8b97a714b943d33275
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 8 10:08:59 2013 -0400
Handle edit text cells here as well as the string cells.
Change-Id: I46934341dbde93d963764152f663c4d2d310bea0
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 392a851..bb8cf5f 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2250,16 +2250,39 @@ bool appendStrings(
return false;
}
-void copyFirstStringBlock( sc::FormulaGroupContext rCxt, size_t nLen, const
sc::CellStoreType::position_type rPos )
+void copyFirstStringBlock(
+ScDocument rDoc, sc::FormulaGroupContext rCxt, size_t nLen, const
sc::CellStoreType::position_type rPos )
{
rCxt.maStrArrays.push_back(new sc::FormulaGroupContext::StrArrayType);
sc::FormulaGroupContext::StrArrayType rArray = rCxt.maStrArrays.back();
rArray.reserve(nLen);
-svl::SharedString* p = sc::string_block::at(*rPos.first-data,
rPos.second);
-svl::SharedString* pEnd = p + nLen;
-for (; p != pEnd; ++p)
-rArray.push_back(p-getDataIgnoreCase());
+switch (rPos.first-type)
+{
+case sc::element_type_string:
+{
+svl::SharedString* p = sc::string_block::at(*rPos.first-data,
rPos.second);
+svl::SharedString* pEnd = p + nLen;
+for (; p != pEnd; ++p)
+rArray.push_back(p-getDataIgnoreCase());
+}
+break;
+case sc::element_type_edittext:
+{
+EditTextObject** p = sc::edittext_block::at(*rPos.first-data,
rPos.second);
+EditTextObject** pEnd = p + nLen;
+svl::SharedStringPool rPool = rDoc.GetSharedStringPool();
+for (; p != pEnd; ++p)
+{
+EditTextObject* pText = *p;
+OUString aStr = ScEditUtil::GetString(*pText, rDoc);
+rArray.push_back(rPool.intern(aStr).getDataIgnoreCase());
+}
+}
+break;
+default:
+;
+}
}
}
@@ -2366,16 +2389,17 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray(
sc::FormulaGroupContext
}
break;
case sc::element_type_string:
+case sc::element_type_edittext:
{
if (nLenRequested = nLen)
{
// Requested length fits a single block.
-copyFirstStringBlock(rCxt, nLenRequested, aPos);
+copyFirstStringBlock(*pDocument, rCxt, nLenRequested, aPos);
sc::FormulaGroupContext::StrArrayType rArray =
rCxt.maStrArrays.back();
return formula::VectorRefArray(rArray[0]);
}
-copyFirstStringBlock(rCxt, nLen, aPos);
+copyFirstStringBlock(*pDocument, rCxt, nLen, aPos);
sc::FormulaGroupContext::StrArrayType rArray =
rCxt.maStrArrays.back();
// Fill the remaining array with values from the following blocks.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/inc svx/source
svx/inc/svx/sdrundomanager.hxx |3 +++
svx/source/svdraw/sdrundomanager.cxx | 19 +++
2 files changed, 22 insertions(+)
New commits:
commit 81e916525fa63b188b2a3b9bb7030e4d451a4808
Author: Armin Le Grand a...@apache.org
Date: Tue Oct 8 12:38:03 2013 +
i123350 Added Clear() implementation to SdrUndoManager to only delete text
edit part of the undo stack
diff --git a/svx/inc/svx/sdrundomanager.hxx b/svx/inc/svx/sdrundomanager.hxx
index 70f46d7..5b4b9f6 100755
--- a/svx/inc/svx/sdrundomanager.hxx
+++ b/svx/inc/svx/sdrundomanager.hxx
@@ -51,6 +51,9 @@ public:
virtual sal_Bool Undo();
virtual sal_Bool Redo();
+// ##
+virtual void Clear();
+
// Call for the view which starts the interactive text edit. Use link to
// activate (start text edit) and empty link to reset (end text edit). On
// reset all text edit actions will be removed from this undo manager to
diff --git a/svx/source/svdraw/sdrundomanager.cxx
b/svx/source/svdraw/sdrundomanager.cxx
index 3211ee2..49df4f2 100755
--- a/svx/source/svdraw/sdrundomanager.cxx
+++ b/svx/source/svdraw/sdrundomanager.cxx
@@ -85,6 +85,25 @@ sal_Bool SdrUndoManager::Redo()
return bRetval;
}
+void SdrUndoManager::Clear()
+{
+if(isTextEditActive())
+{
+while(GetUndoActionCount() mpLastUndoActionBeforeTextEdit !=
GetUndoAction(0))
+{
+RemoveLastUndoAction();
+}
+
+// urgently needed: RemoveLastUndoAction does NOT correct the Redo
stack by itself (!)
+ClearRedo();
+}
+else
+{
+// call parent
+EditUndoManager::Clear();
+}
+}
+
void SdrUndoManager::SetEndTextEditHdl(const Link rLink)
{
maEndTextEditHdl = rLink;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a6691cf244e0c59bbf213e672630a83910eb4bd7 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Oct 8 15:53:32 2013 +0200 Updated core Project: translations e80c5f716acc72479afcb558d920a72925d1ff47 diff --git a/translations b/translations index ff3cff1..e80c5f7 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ff3cff1f9e31f89c0648340f952dcb52a0403aaa +Subproject commit e80c5f716acc72479afcb558d920a72925d1ff47 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70285] New: cleanup generated C++ code ...
https://bugs.freedesktop.org/show_bug.cgi?id=70285 Priority: medium Bug ID: 70285 CC: libreoffice@lists.freedesktop.org Assignee: libreoffice-b...@lists.freedesktop.org Summary: cleanup generated C++ code ... Severity: normal Classification: Unclassified OS: All Reporter: michael.me...@collabora.com Hardware: Other Status: NEW Version: 4.2.0.0.alpha0+ Master Component: Libreoffice Product: LibreOffice The existing codemaker/source/cppumaker/cpputype.cxx generates lots of ugly / old-world: com::sun::star:: namespace blurb. These should all be replaced with css:: prefixes which should make the generated code much easier to read. Checkout eg. workdir/unxlngi6.pro/UnoApiHeadersTarget/offapi/comprehensive/com/sun/star/frame/FrameLoaderFactory.hpp: to see the before / after - and re-run 'make' in the top-level to re-generate. Thanks ! -- 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
[Bug 70285] cleanup generated C++ code ...
https://bugs.freedesktop.org/show_bug.cgi?id=70285 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Whiteboard||EasyHack,DifficultyBeginner ||,SkillCpp,TopicCleanup -- 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] help.git: Changes to 'libreoffice-4-1-3'
New branch 'libreoffice-4-1-3' available with the following commits: commit c6adf5b556afb67bad79bb05d6389c7c38a3aa45 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Oct 8 16:44:06 2013 +0200 Branch libreoffice-4-1-3 This is 'libreoffice-4-1-3' - the stable branch for the 4.1.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I4e05b04642def9c996414cc1bfcf2bc31f103278 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0d/eed3a5731ca8eb50acbe36adfaa50d498bc278
0d/eed3a5731ca8eb50acbe36adfaa50d498bc278 |1 + 1 file changed, 1 insertion(+) New commits: commit 9581eca3eeeabb50964d343a239eda249cb91aeb Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 8 15:47:21 2013 +0100 Notes added by 'git notes add' diff --git a/0d/eed3a5731ca8eb50acbe36adfaa50d498bc278 b/0d/eed3a5731ca8eb50acbe36adfaa50d498bc278 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/0d/eed3a5731ca8eb50acbe36adfaa50d498bc278 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-1-3'
New branch 'libreoffice-4-1-3' available with the following commits: commit 6e9c9338c74a57ff1b5c63562e4596a33fbd627f Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Oct 8 16:44:07 2013 +0200 Branch libreoffice-4-1-3 This is 'libreoffice-4-1-3' - the stable branch for the 4.1.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I8391ac556a4d065a27c5695eadfdf310bd705101 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-1-3'
New branch 'libreoffice-4-1-3' available with the following commits: commit bfb57df4dcb7ccc879069914652f3252ece06b02 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Oct 8 16:44:06 2013 +0200 Branch libreoffice-4-1-3 This is 'libreoffice-4-1-3' - the stable branch for the 4.1.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I86de3c80a6804ee7158b586dccbbfc94838ae536 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-4-1-3'
New branch 'libreoffice-4-1-3' available with the following commits: commit a4bcb901cd824dcdb5d6f1549198acfae696c906 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Oct 8 16:45:54 2013 +0200 Branch libreoffice-4-1-3 This is 'libreoffice-4-1-3' - the stable branch for the 4.1.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ice389840b41d182cc27a8dd5d15b86c19a1e64f8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3ec0cbd7f176b14353fcf8e1eb8d5e453b7fcc05 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Oct 8 16:50:01 2013 +0200 bump product version to 4.1.4.0.0+ Change-Id: I7416968f44df48b25416bafe9d5357988cc55fef diff --git a/configure.ac b/configure.ac index 57350a5..4084f3a 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.3.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.4.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Bug 70285] cleanup generated C++ code ...
Hi Michael, On Tue, Oct 08, 2013 at 02:43:16PM +, bugzilla-dae...@freedesktop.org wrote: https://bugs.freedesktop.org/show_bug.cgi?id=70285 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Whiteboard||EasyHack,DifficultyBeginner ||,SkillCpp,TopicCleanup you seem to stick to that habit of doing comma separated Whiteboard status -- which is unfortunate, as this by now makes your EasyHack invisible on the Wiki as that matches _whitespace_ separated words. Thus EasyHack,foo does not match EasyHack. And that is mostly a Good Thing as we need this to match EasyHack not ProposedEasyHack. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svtools/source
svtools/source/contnr/imivctl1.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e2ed0bc526db564114a4daf58d32b8bbcdbb84c9 Author: Eike Rathke er...@redhat.com Date: Mon Oct 7 21:51:26 2013 +0200 WaE [-Wstrict-overflow] assuming signed overflow does not occur ... when assuming that (X - c) = X is always true ... or that (X + c) X is always false Change-Id: Ib2313827cd6358ced0141b41cba753896b676e28 (cherry picked from commit ca576e0804324bbb36b697543cbe992e34d4b951) Reviewed-on: https://gerrit.libreoffice.org/6158 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 805ce6f..01f733d 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2709,9 +2709,9 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcFocusRect( SvxIconChoiceCtrlEntry* pEntry Rectangle aFocusRect( aBoundRect.Left(), aBmpRect.Top() - 1, aBoundRect.Right() - 4, aTextRect.Bottom() + 1 ); // the focus rectangle should not touch the text -if( aFocusRect.Left() - 1 = pEntry-aRect.Left() ) +if( aFocusRect.Left() ::std::numeric_limitslong::min() aFocusRect.Left() - 1 = pEntry-aRect.Left() ) aFocusRect.Left()--; -if( aFocusRect.Right() + 1 = pEntry-aRect.Right() ) +if( aFocusRect.Right() ::std::numeric_limitslong::max() aFocusRect.Right() + 1 = pEntry-aRect.Right() ) aFocusRect.Right()++; return aFocusRect; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svtools/source
svtools/source/contnr/imivctl1.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5e259fb8bb36d287e8986cf0c9695bcb75b9e70c Author: Eike Rathke er...@redhat.com Date: Mon Oct 7 21:51:26 2013 +0200 WaE [-Wstrict-overflow] assuming signed overflow does not occur ... when assuming that (X - c) = X is always true ... or that (X + c) X is always false Change-Id: Ib2313827cd6358ced0141b41cba753896b676e28 (cherry picked from commit ca576e0804324bbb36b697543cbe992e34d4b951) Reviewed-on: https://gerrit.libreoffice.org/6159 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index f363a0f..9d5478d 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2710,9 +2710,9 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcFocusRect( SvxIconChoiceCtrlEntry* pEntry Rectangle aFocusRect( aBoundRect.Left(), aBmpRect.Top() - 1, aBoundRect.Right() - 4, aTextRect.Bottom() + 1 ); // the focus rectangle should not touch the text -if( aFocusRect.Left() - 1 = pEntry-aRect.Left() ) +if( aFocusRect.Left() ::std::numeric_limitslong::min() aFocusRect.Left() - 1 = pEntry-aRect.Left() ) aFocusRect.Left()--; -if( aFocusRect.Right() + 1 = pEntry-aRect.Right() ) +if( aFocusRect.Right() ::std::numeric_limitslong::max() aFocusRect.Right() + 1 = pEntry-aRect.Right() ) aFocusRect.Right()++; return aFocusRect; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.3.1'
Tag 'libreoffice-4.1.3.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-10-08 15:56 -0700 Tag libreoffice-4.1.3.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSVB0rAAoJEPQ0oe+v7q6jq6cQAL4gAfm9+fqF9YWP6yg7Neu1 0+nzt8WzwPNq7paOp0orNSRhQ/LWonQVOtVCtz9o+CCbU4jNwHWJXhE97PnLSmQ0 95gNWCpl6QyzprLheyHQdNazzB7E5d+AqnqadXoXG3zYJ4pUzYvs29pUk8M3644M E9dUkbYGhQntGERR5SoV8AJj8qfIEt7HBAoYDv1wodIhPQElg01gKkRoV2La059o GCZ6z430KD4ZWFAV50kTgohK4i9GdeMRtfxfCIDzeDdtQ0Oz0xTnjpSxbDItqzG0 DPtVp5FTr2jGnEjaxGJev7f+20SzgMHv6SiON0VYwaPxzpns8yCM+YXAZekIQMOd 7CJUPn02CHIz9eKU44aI3KHU9pIX2CAFKGvNfg6+SI+ogX8wINJDOjBYHW6VEV/m pv8xUDhnEMqxJAoeJq0IkXoV2M6g0NFFlCej8uaWnxHFq3V3LfiK83alALpuC01R jYLRjGv0AkBR+8BE/nJN4SxR73sKhSCq0PDUTCMYc3QUrUT8Yjr9z0zcQqPW23kH yJFiKhrw+fjcUpQ98C8X1fYK8JFcIje/VvgJpiIzU4m2kyU06nBZs9V9L+mch8TQ HsZAw0ZCele2VZ1mYhI3p4Ky0OMsPfPKgGvN09M1OH790mlsSpmYVpdeDbacNF0j zLbmcl0XhRpvwGd9MNaM =sn0V -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-18: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.3.1'
Tag 'libreoffice-4.1.3.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-10-08 15:56 -0700 Tag libreoffice-4.1.3.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSVB0wAAoJEPQ0oe+v7q6jJUIQAL8wV7hPoj+ZagMzaJc04npP GqWgG4aObmsob9gmnXZ5VdG+6d/O4QqBMoqKpJoRXXFQRA1o0IiLMHbem1E3nolZ m8jZUlFxiZqVmYFiVbyRclcIRXB8C7nuXydZEnIwDsJyUGAVuCH580rUxmVzizN4 ej60JWn+4MFPbUrAzhbSEEJYsHDjHJrxWTHCFiflCikaKlneGEOX1Cro10WA1nJt 7wSBUDK5SFXbaMuGgr9X6GNi26bsgN4TAlaOjcFfIRHAueWMfQ8odGhuPrsKjCDm wuS2NTWXW7WFlVdYf/De1BtKsqcUbsm1hQxvabi3pCqbu6md0G2snzlA4Ito/KIq dAB5G1cij+3UpgNNWWqpnQ/ZTmCAy3ZSsIxKWz54DEutcH6UOQVg/fSH7bN36xxD 1AS/ni9qKo8awNqqW1t44bdHbN7JcwRN2Q5wSdJ37i1qY7EWYVe8BKb46BHq9FNR 4VRuiGfqXbQw4xkiNV8YnEZDLyRmVmfbpt+potRCR/SUltqmayg2WukyebmzxdiZ ybssNO+SGgFLgk5GmVBActBec3JGuvl/f1WstNwF9tsy19QG7eZibXdcgToNXeSE auGc4XfF06jAgXdZUerU9a5cyAEvoPo54suL/VXG6dCbujUn+mILkF4XgM9iWSBT rwtRZHI+9KOhA9tPahfr =q4a1 -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-18: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.3.1'
Tag 'libreoffice-4.1.3.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-10-08 15:56 -0700 Tag libreoffice-4.1.3.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSVB00AAoJEPQ0oe+v7q6jejoP/07FroMjYlGZfBSXRPDBr8nN Oomv9vfqHXfieS0yBfHx/iuUZamOcie/egW6bCf5FV3d+1sKbqEbg61wBDny6L04 ufH8wPHwbf/PFUXOKDYbwQcrNfpeNftrWcmtNa/ndpIpWbupUX0iQs/VcmBK3W1d YiYBWhGaamAyybwEGLnuaE9Zi4LsClNc312EqdNpMqOSgE1n005gnlxV8IsCVI61 tWlLpcGC0thp8bqUJo553nPXUh+tHjn37WAfOdzgzITeWTE87QlA4c83cJYauS05 qVpIFghNNSMfgkKnsNb+J6NK+dAlqqQJUy0bI4S5f8Umbnq7kbxbYM0Hb+5Ssp5/ cUmwNihbDSF6YbWPzpm9MGL4k3R9/Qk9ad05PNS1f3ifFk1+js5fTCR7NsvWLY3Z Gsqc6IZ1GdEG19A62EpXUZAqR6c4RwhEn7LhEb94YsobG0v67tRngwvvvWzFlPWm Z7Ye2JUQeSB+zavvyInmwo5YmzJAfVidLTsHmyrT6HMKY49l9SYNr2JsPRtTXN6Q fZ7Qc0TsckEvVLQawyzSDtot5ja4E3MORoQMU/uBK85t+ccaAC44v/CCS9Dtj7t9 iHbCwo1wZyO1vxl46GsAGWHKEHRCSTDKq+qNj8FcGekMbMoD9ByhLx3M3vA2PEsG l//Ni56BqZ3YJoFgMN9Y =6Lka -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-40: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.3.1'
Tag 'libreoffice-4.1.3.1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-10-08 15:56 -0700 Tag libreoffice-4.1.3.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSVB04AAoJEPQ0oe+v7q6jTFAQAMeTEcx/tG2OsDDHEmcoMroY LJR5CZ+kPtxbIdzxgWsgX2SrxEU6kTE4egap7QWGIi+R1gy2UWTLLc5VrJWMO2IR UAuwn4ymx6HKJuaLx/qeI5s4wtGXFu4+dv2UTkBDLLICg12mu2Mx8XTSzQErr6JK 6fssTrcSyEMVV06QEEYyyj99ral/eSMTXgKFtSXw5w/DPF+rgC8ohZpMTQZ1HQgz e0tdkzEU0+gDF0MylfZYAfir6z/iuLozAjk5MUBMIX6N/DAaSoosHGDLF6/lj3mB qlu6BXWZRxRlTbF9yeq0KY+ybHX/U3NeGONksBwTTJHohn1s3Fn+SgL06nYEGA1g PvXoJ7EUGJReBCW+vuhtabxV/fJPtTU+czmq5T/BFa/I9FxpV7A6XqWn81XvYaxa lPgMjj0RggnBG6RsDNQS5gH7S71m5qNWlJVHUqzKem1PdKREIGVs9w9hFg7nvD2O qQ85pmj9AY4xxcW+7qWpwpXEZPwmDEGxCNp2x5MMWKv9AD40SoqyNfZ0+/HR34w2 fttfXXevcnVqH2QCJ+s+mDeDm48wkjEG3mQbTtctFbUzc9458ul44g+03Ye4z6R8 5jztCh36mWuwA4NJnIz9URuQuucCVES1bFPpAKaO/TWPh0X19uc6xXyvU9dfBTHD 1cLrfaL4AQfabWphYuys =3ArU -END PGP SIGNATURE- Changes since libreoffice-4.1.0.1-608: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 81/e916525fa63b188b2a3b9bb7030e4d451a4808
81/e916525fa63b188b2a3b9bb7030e4d451a4808 |1 + 1 file changed, 1 insertion(+) New commits: commit 99481cf4d43e4eded34df0db7dd59e28ceffa847 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 8 15:59:35 2013 +0100 Notes added by 'git notes add' diff --git a/81/e916525fa63b188b2a3b9bb7030e4d451a4808 b/81/e916525fa63b188b2a3b9bb7030e4d451a4808 new file mode 100644 index 000..08838ff --- /dev/null +++ b/81/e916525fa63b188b2a3b9bb7030e4d451a4808 @@ -0,0 +1 @@ +merged as: bfeabd965c4ed4cc78975dbedafb586e2fac8c48 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - include/svx svx/source sw/source vcl/source
include/svx/sdrundomanager.hxx |3 +
svx/source/svdraw/sdrundomanager.cxx | 19
sw/source/core/swg/swblocks.cxx |3 +
sw/source/core/text/porfld.cxx |5 ++-
sw/source/filter/html/swhtml.cxx |5 +++
vcl/source/window/menu.cxx | 55 ---
6 files changed, 72 insertions(+), 18 deletions(-)
New commits:
commit bfeabd965c4ed4cc78975dbedafb586e2fac8c48
Author: Armin Le Grand a...@apache.org
Date: Tue Oct 8 12:38:03 2013 +
Resolves: #i123350# Added Clear() implementation to SdrUndoManager...
to only delete text edit part of the undo stack
(cherry picked from commit 81e916525fa63b188b2a3b9bb7030e4d451a4808)
Conflicts:
svx/inc/svx/sdrundomanager.hxx
Change-Id: I19594e4cfa52a24dbcb95639ac3c6b9f39908cc7
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx
old mode 100644
new mode 100755
index f71f115..9c88f06
--- a/include/svx/sdrundomanager.hxx
+++ b/include/svx/sdrundomanager.hxx
@@ -48,6 +48,9 @@ public:
virtual bool Undo();
virtual bool Redo();
+// #i123350#
+virtual void Clear();
+
// Call for the view which starts the interactive text edit. Use link to
// activate (start text edit) and empty link to reset (end text edit). On
// reset all text edit actions will be removed from this undo manager to
diff --git a/svx/source/svdraw/sdrundomanager.cxx
b/svx/source/svdraw/sdrundomanager.cxx
index 4f97225..f2a00c5 100644
--- a/svx/source/svdraw/sdrundomanager.cxx
+++ b/svx/source/svdraw/sdrundomanager.cxx
@@ -80,6 +80,25 @@ bool SdrUndoManager::Redo()
return bRetval;
}
+void SdrUndoManager::Clear()
+{
+if(isTextEditActive())
+{
+while(GetUndoActionCount() mpLastUndoActionBeforeTextEdit !=
GetUndoAction(0))
+{
+RemoveLastUndoAction();
+}
+
+// urgently needed: RemoveLastUndoAction does NOT correct the Redo
stack by itself (!)
+ClearRedo();
+}
+else
+{
+// call parent
+EditUndoManager::Clear();
+}
+}
+
void SdrUndoManager::SetEndTextEditHdl(const Link rLink)
{
maEndTextEditHdl = rLink;
commit 8d1a172121ab29c70de89c59945b60f462a89fa4
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 15:42:03 2013 +0100
CID#1079272 uninitialized member variable
Change-Id: Iff12fd9f9fbd1dac3f56dd733d967d8ba251d6b4
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 2193ea0..aaf0aea 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -94,7 +94,8 @@ SwImpBlocks::SwImpBlocks( const OUString rFile, sal_Bool )
aDateModified( Date::EMPTY ),
aTimeModified( Time::EMPTY ),
pDoc( 0 ), nCur( (sal_uInt16)-1 ),
-bReadOnly( sal_True ), bInPutMuchBlocks( sal_False )
+bReadOnly( sal_True ), bInPutMuchBlocks( sal_False ),
+bInfoChanged(false)
{
FStatHelper::GetModifiedDateTimeOfFile( rFile,
aDateModified, aTimeModified );
commit 609c35d943b001cb1d598709289cfa0b2bb48f01
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 15:40:43 2013 +0100
CID#1079271 uninitialized member variables
Change-Id: I4bf9e0c7a548c0f22ce670803bc8334277f80c9e
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c51d7e5..ab693ea 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -135,22 +135,45 @@ struct MenuItemData
SalMenuItem*pSalMenuItem; // access to native menu
-MenuItemData() :
-pSubMenu(NULL), pAutoSubMenu(NULL),
nItemImageAngle(0), pSalMenuItem ( NULL )
-{}
-MenuItemData( const OUString rStr, const Image rImage ) :
-pSubMenu(NULL),
-pAutoSubMenu(NULL),
-aText( rStr ),
-aImage( rImage ),
-nItemImageAngle(0),
-pSalMenuItem ( NULL )
-{}
-~MenuItemData();
-bool HasCheck() const
-{
-return bChecked || ( nBits ( MIB_RADIOCHECK | MIB_CHECKABLE |
MIB_AUTOCHECK ) );
-}
+MenuItemData()
+: nId(0)
+, eType(MENUITEM_DONTKNOW)
+, nBits(0)
+, pSubMenu(NULL)
+, pAutoSubMenu(NULL)
+, nUserValue(0)
+, bChecked(false)
+, bEnabled(false)
+, bVisible(false)
+, bIsTemporary(false)
+, bMirrorMode(false)
+, nItemImageAngle(0)
+, pSalMenuItem(NULL)
+{
+}
+MenuItemData( const OUString rStr, const Image rImage )
+: nId(0)
+, eType(MENUITEM_DONTKNOW)
+, nBits(0)
+, pSubMenu(NULL)
+, pAutoSubMenu(NULL)
+, aText(rStr)
+, nUserValue(0)
+,
[Libreoffice-commits] core.git: sw/source
sw/source/core/swg/swblocks.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit cd910534d884921b9ca179eff00248c6b16f9a4f
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 16:07:02 2013 +0100
CID#1079273 uninitialized member variables
and CID#1079274
Change-Id: Ia263d06e40093a58e5a37f4ad3848d2c2fd61fa4
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index aaf0aea..a339db7 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -60,14 +60,15 @@ sal_uInt16 SwImpBlocks::Hash( const OUString r )
SwBlockName::SwBlockName( const OUString rShort, const OUString rLong )
: aShort( rShort ), aLong( rLong ), aPackageName (rShort),
-bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False )
+bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False ),
bInPutMuchBlocks(false)
{
nHashS = SwImpBlocks::Hash( rShort );
nHashL = SwImpBlocks::Hash( rLong );
}
+
SwBlockName::SwBlockName( const OUString rShort, const OUString rLong, const
OUString rPackageName)
: aShort( rShort ), aLong( rLong ), aPackageName (rPackageName),
-bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False )
+bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False ),
bInPutMuchBlocks(false)
{
nHashS = SwImpBlocks::Hash( rShort );
nHashL = SwImpBlocks::Hash( rLong );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 30fb57dc0cf74339fef902e1f704f2e3b8089bab Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Oct 8 17:10:24 2013 +0200 bump product version to 4.1.3.1+, release number to Change-Id: I6403af2224bfcfd9db7f93de051363fea7c2df58 diff --git a/configure.ac b/configure.ac index 57350a5..6f062c5 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.3.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.3.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - 2 commits - sc/inc sc/source
sc/inc/queryentry.hxx |3 --
sc/source/core/tool/interpr1.cxx | 55 ++---
sc/source/core/tool/queryentry.cxx |2 -
3 files changed, 5 insertions(+), 55 deletions(-)
New commits:
commit b56b566eb41d2261d9b021623ab84cd8da292463
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 8 11:11:48 2013 -0400
Turns out we are not using OpenCL here in the existing interpreter.
Change-Id: I4d511ef8099b5d7fcff07adf401901c9ee089ad3
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 19eee49..8bfe666 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6449,43 +6449,6 @@ void ScInterpreter::ScHLookup()
CalculateLookup(true);
}
-namespace {
-
-#if 1
-bool isFilterByEqualString( const ScQueryParam )
-{
-return false;
-}
-#else
-bool isFilterByEqualString( const ScQueryParam rParam )
-{
-if (rParam.bRegExp)
-// filter by regular expression.
-return false;
-
-if (!rParam.GetEntryCount())
-// No entries.
-return false;
-
-const ScQueryEntry rEntry = rParam.GetEntry(0);
-if (rEntry.eOp != SC_EQUAL)
-return false;
-
-const ScQueryEntry::QueryItemsType rItems = rEntry.GetQueryItems();
-if (rItems.size() != 1)
-// Multi-item query is not supported.
-return false;
-
-if (rItems[0].meType != ScQueryEntry::ByString)
-// Not by string equality.
-return false;
-
-return true;
-}
-#endif
-
-}
-
void ScInterpreter::CalculateLookup(bool bHLookup)
{
sal_uInt8 nParamCount = GetByte();
@@ -6722,18 +6685,9 @@ void ScInterpreter::CalculateLookup(bool bHLookup)
}
else
{
-if (isFilterByEqualString(aParam))
-{
-nRow = nRow1;
-bFound = true;
-}
-else
-{
-ScAddress aResultPos( nCol1, nRow1, nTab1);
-bFound = LookupQueryWithCache( aResultPos, aParam);
-nRow = aResultPos.Row();
-}
-
+ScAddress aResultPos( nCol1, nRow1, nTab1);
+bFound = LookupQueryWithCache( aResultPos, aParam);
+nRow = aResultPos.Row();
nCol = nSpIndex;
}
commit ae1e055326ce8fdc7294260f5261a040ee8e5a1b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 8 10:30:15 2013 -0400
Let's not do this.
Change-Id: I93fe9f8c5edbfb08b78b6694771db2dd18d8868c
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index 636372e..a3baea6 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -42,9 +42,8 @@ struct SC_DLLPUBLIC ScQueryEntry
QueryType meType;
doublemfVal;
OUString maString;
-sal_uIntPtr mnStrId;
-Item() : meType(ByValue), mfVal(0.0), mnStrId(0) {}
+Item() : meType(ByValue), mfVal(0.0) {}
bool operator== (const Item r) const;
};
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c621de3..19eee49 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6763,7 +6763,6 @@ bool ScInterpreter::FillEntry(ScQueryEntry rEntry)
const OUString sStr = GetString();
rItem.meType = ScQueryEntry::ByString;
rItem.maString = sStr;
-rItem.mnStrId =
pDok-GetSharedStringPool().getIdentifierIgnoreCase(rItem.maString);
}
break;
case svDoubleRef :
@@ -6788,7 +6787,6 @@ bool ScInterpreter::FillEntry(ScQueryEntry rEntry)
GetCellString(aStr, aCell);
rItem.meType = ScQueryEntry::ByString;
rItem.maString = aStr;
-rItem.mnStrId =
pDok-GetSharedStringPool().getIdentifierIgnoreCase(rItem.maString);
}
}
break;
@@ -6797,7 +6795,6 @@ bool ScInterpreter::FillEntry(ScQueryEntry rEntry)
OUString aStr;
const ScMatValType nType =
GetDoubleOrStringFromMatrix(rItem.mfVal, aStr);
rItem.maString = aStr;
-rItem.mnStrId =
pDok-GetSharedStringPool().getIdentifierIgnoreCase(rItem.maString);
rItem.meType = ScMatrix::IsNonValueType(nType) ?
ScQueryEntry::ByString : ScQueryEntry::ByValue;
}
diff --git a/sc/source/core/tool/queryentry.cxx
b/sc/source/core/tool/queryentry.cxx
index e061d0f..1ac1a89 100644
--- a/sc/source/core/tool/queryentry.cxx
+++ b/sc/source/core/tool/queryentry.cxx
@@ -32,7 +32,7 @@
bool ScQueryEntry::Item::operator== (const Item r) const
{
-return meType == r.meType mfVal == r.mfVal
maString.equals(r.maString) mnStrId == r.mnStrId;
+return meType == r.meType mfVal == r.mfVal
maString.equals(r.maString);
}
ScQueryEntry::ScQueryEntry() :
___
Libreoffice-commits mailing list
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - sc/source
sc/source/core/tool/token.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0a73352b57dd02da1ca2259ce0f7d37cb78587a5 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Oct 8 11:24:16 2013 -0400 Add VLOOKUP to the list of functions we support for group calculation. Change-Id: I2a440b881af14076928e97918bdc5508804ff0ee diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 69ba49e..e519455 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1336,6 +1336,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocMatInv: case ocCount: case ocCount2: +case ocVLookup: // Don't change the state. break; default: ___ 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/unx
sw/source/core/swg/SwXMLTextBlocks.cxx | 14 ++
vcl/unx/generic/dtrans/X11_selection.cxx |2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 766ec29ce6557a83368fa1efdea009fd8f6f85dc
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 16:26:35 2013 +0100
CID#1078847 we're writing a byte, so use a byte
Change-Id: I45fbcaae87b8ecff5fc25eca646e19849beda293
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 2cdf21d..e14baa4 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3836,7 +3836,7 @@ void SelectionManager::shutdown() throw()
Application::Reschedule();
}
// trigger poll()'s wait end by writing a dummy value
-int dummy=0;
+char dummy=0;
dummy = write(m_EndThreadPipe[1], dummy, 1);
}
osl_joinWithThread( m_aThread );
commit 731174ae31f854ddfd6ba0f8746e74b4e9da
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 16:11:11 2013 +0100
CID#1079275 uninitialized member variables
also CID#1079276
Change-Id: Ib8e5f56f6f970a4eaae334eff2f670b20b13ad2d
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx
b/sw/source/core/swg/SwXMLTextBlocks.cxx
index ad9645c..9366504 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -57,7 +57,11 @@ void SwXMLTextBlocks::ResetBlockMode ( )
}
SwXMLTextBlocks::SwXMLTextBlocks( const OUString rFile )
-: SwImpBlocks( rFile ), bAutocorrBlock( sal_False ), nFlags ( 0 )
+: SwImpBlocks(rFile)
+, bAutocorrBlock(false)
+, bBlock(false)
+, nFlags(0)
+, nCurBlk(0)
{
SwDocShell* pDocSh = new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
if( !pDocSh-DoInitNew( 0 ) )
@@ -98,9 +102,11 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString rFile )
}
SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference embed::XStorage
rStg, const OUString rName )
-: SwImpBlocks( rName )
-, bAutocorrBlock( sal_True )
-, nFlags ( 0 )
+: SwImpBlocks( rName )
+, bAutocorrBlock(false)
+, bBlock(false)
+, nFlags(0)
+, nCurBlk(0)
{
SwDocShell* pDocSh = new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
if( !pDocSh-DoInitNew( 0 ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70285] cleanup generated C++ code ...
https://bugs.freedesktop.org/show_bug.cgi?id=70285 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Whiteboard|EasyHack,DifficultyBeginner |EasyHack DifficultyBeginner |,SkillCpp,TopicCleanup |SkillCpp TopicCleanup -- 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: svtools/source
svtools/source/contnr/fileview.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ccd2240332f2e70e08f62e349176fab03297c39f
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 8 16:38:04 2013 +0100
CID#1079290 uninitialized member
Change-Id: Ibc75fed4b5282d3caeccac54a884ff5dde3d1910
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index bf52146..a03c882 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -2557,7 +2557,9 @@ QueryDeleteDlg_Impl::QueryDeleteDlg_Impl
_aYesButton ( this, SvtResId( BTN_YES ) ),
_aAllButton ( this, SvtResId( BTN_ALL ) ),
_aNoButton( this, SvtResId( BTN_NO ) ),
-_aCancelButton( this, SvtResId( BTN_CANCEL ) )
+_aCancelButton( this, SvtResId( BTN_CANCEL ) ),
+
+_eResult( QUERYDELETE_YES )
{
FreeResource();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Bug 70285] cleanup generated C++ code ...
On Tue, 2013-10-08 at 16:57 +0200, bjoern wrote: you seem to stick to that habit of doing comma separated Whiteboard status First time I've heard that is wrong - my cheat sheet has the ~4 lines I can use to add easy-hacks and I just paste it over and over :-) which is unfortunate, as this by now makes your EasyHack invisible on the Wiki as that matches _whitespace_ separated words. Fixed; and documented it in the wiki page :-) ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38840] add coverage analysis to unit tests
https://bugs.freedesktop.org/show_bug.cgi?id=38840 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #8 from Björn Michaelsen bjoern.michael...@canonical.com --- 17:25 Sweetshark_ sberg, erAck_away: can fdo#38840 be closed? 17:33 @sberg Sweetshark_, how do I know? /you/ filed that issue ;) and yes, we have the machinery now, even though we do not make any use of it (yet?), so the bug can probably be closed indeed = thus closing, best file a new EasyHack with the exciting new things to build on top of this when needed. -- 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: drawinglayer/source
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 57d9c96d96d818f19d34d4930cc8ffc8c24e43e2 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 8 17:41:36 2013 +0200 fdo#70090: Avoid race in copy vs. modification of aRetval Sequence If, in the original code, aRetval[0] was computed before calling new MaskPrmitive2D (as apparently happens with Clang), no COW-copy of aRetval's internals was created (as the refcount was still 1), so MaskPrimitive2D's maChildren would share the Sequence internals with aRetval, so would end up having itself as its children after the assignment. Change-Id: I145ca429fdfae2ea555b8c754b407a81b989d45b diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index 42da753..91c5cae 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -304,9 +304,10 @@ namespace drawinglayer basegfx::B2DPolygon aMaskPolygon(basegfx::tools::createUnitPolygon()); aMaskPolygon.transform(rTransform); -aRetval[0] = new MaskPrimitive2D( +Primitive2DReference mask = new MaskPrimitive2D( basegfx::B2DPolyPolygon(aMaskPolygon), aRetval); +aRetval[0] = mask; } break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Bug 70285] cleanup generated C++ code ...
Hi, On Tue, Oct 08, 2013 at 04:39:02PM +0100, Michael Meeks wrote: First time I've heard that is wrong - my cheat sheet has the ~4 lines I can use to add easy-hacks and I just paste it over and over :-) Well, up until this week it worked by accident, as we were matching for substrings before and not for words (but that did not allow us to match EasyHack without also hitting ProposedEasyHack or using even more Rube-Goldbergesque queries). ;) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source desktop/win32 sd/source setup_native/source
connectivity/source/resource/conn_shared_res.src
| 14 +-
desktop/win32/source/setup/setup.ulf
|2
sd/source/core/sdpage.cxx
| 47 ++
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
| 12 +-
setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
|6 -
5 files changed, 64 insertions(+), 17 deletions(-)
New commits:
commit b94437b6dfe60904f9c89608c15ed55dc3ce277d
Author: Armin Le Grand a...@apache.org
Date: Tue Oct 8 15:40:15 2013 +
i119056 Added direct refreshes for objects dependent of HeaderFooterSettings
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 48cddd1..2945e84 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2810,9 +2810,56 @@ void SdPage::setHeaderFooterSettings( const
sd::HeaderFooterSettings rNewSettin
}
SetChanged();
+
if(TRG_HasMasterPage())
{
TRG_GetMasterPageDescriptorViewContact().ActionChanged();
+
+// #119056# For HeaderFooterSettings SdrObjects are used, but the
properties
+// used are not part of their model data, but kept in SD. This data is
applied
+// using a 'backdoor' on primitive creation. Thus, the normal
mechanism to detect
+// object changes does not work here. It is neccessary to trigger
updates here
+// directly. BroadcastObjectChange used for PagePreview invalidations,
+// flushViewObjectContacts used to invalidate and flush all
visualizations in
+// edit views.
+SdPage* pMasterPage = dynamic_cast SdPage* (TRG_GetMasterPage());
+
+if(pMasterPage)
+{
+SdrObject* pCandidate = 0;
+
+pCandidate = pMasterPage-GetPresObj( PRESOBJ_HEADER );
+
+if(pCandidate)
+{
+pCandidate-BroadcastObjectChange();
+pCandidate-GetViewContact().flushViewObjectContacts();
+}
+
+pCandidate = pMasterPage-GetPresObj( PRESOBJ_DATETIME );
+
+if(pCandidate)
+{
+pCandidate-BroadcastObjectChange();
+pCandidate-GetViewContact().flushViewObjectContacts();
+}
+
+pCandidate = pMasterPage-GetPresObj( PRESOBJ_FOOTER );
+
+if(pCandidate)
+{
+pCandidate-BroadcastObjectChange();
+pCandidate-GetViewContact().flushViewObjectContacts();
+}
+
+pCandidate = pMasterPage-GetPresObj( PRESOBJ_SLIDENUMBER );
+
+if(pCandidate)
+{
+pCandidate-BroadcastObjectChange();
+pCandidate-GetViewContact().flushViewObjectContacts();
+}
+}
}
}
commit 32c62655723779327cca683bfc9c7096b445580c
Author: Jürgen Schmidt j...@apache.org
Date: Tue Oct 8 15:16:53 2013 +
#123428# correct spelling, occured - occurred
diff --git a/connectivity/source/resource/conn_shared_res.src
b/connectivity/source/resource/conn_shared_res.src
index dd2b0ec..8009f62 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -123,7 +123,7 @@ String STR_STMT_TYPE_NOT_SUPPORTED
String STR_UNSPECIFIED_ERROR
{
-Text [ en-US ] = An unknown error occured.;
+Text [ en-US ] = An unknown error occurred.;
};
String STR_COULD_NOT_CREATE_ADDRESSBOOK
@@ -138,12 +138,12 @@ String STR_COULD_NOT_LOAD_LIB
String STR_ERROR_REFRESH_ROW
{
-Text [ en-US ] = An error occured while refreshing the current row.;
+Text [ en-US ] = An error occurred while refreshing the current row.;
};
String STR_ERROR_GET_ROW
{
-Text [ en-US ] = An error occured while getting the current row.;
+Text [ en-US ] = An error occurred while getting the current row.;
};
String STR_CAN_NOT_CANCEL_ROW_UPDATE
@@ -163,7 +163,7 @@ String STR_QUERY_INVALID_IS_NULL_COLUMN
String STR_ILLEGAL_MOVEMENT
{
-Text [ en-US ] = Illegal cursor movement occured.;
+Text [ en-US ] = Illegal cursor movement occurred.;
};
String STR_COMMIT_ROW
@@ -375,7 +375,7 @@ String STR_NO_CONNECTION
// dbase
String STR_COULD_NOT_DELETE_INDEX
{
-Text [ en-US ] = The index could not be deleted. An unknown error while
accessing the file system occured.;
+Text [ en-US ] = The index could not be deleted. An unknown error while
accessing the file system occurred.;
};
String STR_ONL_ONE_COLUMN_PER_INDEX
{
@@ -620,11 +620,11 @@ String STR_INVALID_FILE_URL
};
String STR_NO_TABLE_CONTAINER
{
-Text [ en-US ] = An error occured while obtaining the connection's table
container.;
+Text [ en-US ] = An error occurred while obtaining the connection's table
container.;
};
String STR_NO_TABLE_EDITOR_DIALOG
{
-Text [ en-US ] = An error occured while creating the table editor
[Bug 70280] add UNO IDL support to ctags
https://bugs.freedesktop.org/show_bug.cgi?id=70280 Michael Stahl mst...@redhat.com changed: What|Removed |Added Whiteboard|EasyHack, |EasyHack DifficultyBeginner |DifficultyBeginner, |SkillCpp SkillScript |SkillCpp, SkillScript, |TopicDebug |TopicDebug | -- 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
[Bug 70285] cleanup generated C++ code ...
https://bugs.freedesktop.org/show_bug.cgi?id=70285 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #1 from Stephan Bergmann sberg...@redhat.com --- * Use ::css, not just css in the generated code, to avoid name clashes. * Ensure sal/types.h (where css is defined) is included in generated files using css. -- 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
Re: PATCH - SDRemote LO
On Tue, Oct 8, 2013 at 7:34 AM, Artur Dryomov artur.dryo...@gmail.com wrote: Hi guys, Yep, I know tricks about commit messages, thank you for the advise anyway ;-) I still think it’s better to mark bugs as resolved when the app will be released, let’s hope it will be done in near future. I haven't had a chance to try out one of the daily builds* myself, but assuming that they are running smoothly, I'd encourage the same workflow we use with bugs in LibreOffice itself (Test fix with daily build and mark as RESOLVED FIXED when bug is no longer present). From a QA standpoint, standardizing our treatment of LO and SDRemote bugs is important to keeping the QA process as simple and straightforward as possible :-) As Miklos mentioned above, there is some automation that adds a comment and target to a LibreOffice bug when a patch has been pushed for it. This information is slightly less useful for SDRemote bugs, as our release schedule for the remote is not in lockstep with our LibreOffice releases, but the links to daily builds may indeed be followed to find an SDRemote daily build*. Cheers, --R * http://dev-builds.libreoffice.org/daily/master/Android-ARM@24-Bytemark-Hosting/current/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/attributeoutputbase.hxx |4 +-
sw/source/filter/ww8/docxattributeoutput.cxx | 34 ++--
sw/source/filter/ww8/docxattributeoutput.hxx |6
sw/source/filter/ww8/rtfattributeoutput.cxx | 19 -
sw/source/filter/ww8/rtfattributeoutput.hxx |6
sw/source/filter/ww8/ww8atr.cxx | 37 +++
sw/source/filter/ww8/ww8attributeoutput.hxx |6
7 files changed, 67 insertions(+), 45 deletions(-)
New commits:
commit 26303d1f95d2b12b9e0df68a953ab19f5378d944
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Oct 8 17:47:30 2013 +0200
DOCX export: ParaScriptSpace() should not contain handling of more items.
They are not really related, so no reason to have one method for them.
Change-Id: Id633c2a9e8d46c3a64dc9d5abe508a4da5ab2410
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 414e52b..60ab1b1 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -502,10 +502,10 @@ protected:
virtual void ParaScriptSpace( const SfxBoolItem ) = 0;
/// Sfx item RES_PARATR_HANGINGPUNCTUATION
-void ParaHangingPunctuation( const SfxBoolItem rHt ) { ParaScriptSpace(
rHt ); };
+virtual void ParaHangingPunctuation( const SfxBoolItem ) = 0;
/// Sfx item RES_PARATR_FORBIDDEN_RULES
-void ParaForbiddenRules( const SfxBoolItem rHt ) { ParaScriptSpace( rHt
); };
+virtual void ParaForbiddenRules( const SfxBoolItem ) = 0;
/// Sfx item RES_PARATR_VERTALIGN
virtual void ParaVerticalAlign( const SvxParaVertAlignItem ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1bcedd3..48af82b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5196,27 +5196,23 @@ void DocxAttributeOutput::ParaNumRule_Impl( const
SwTxtNode* /*pTxtNd*/, sal_Int
void DocxAttributeOutput::ParaScriptSpace( const SfxBoolItem rScriptSpace )
{
-sal_uInt16 nXmlElement = 0;
+m_pSerializer-singleElementNS( XML_w, XML_autoSpaceDE,
+ FSNS( XML_w, XML_val ), rScriptSpace.GetValue( ) ? true: false,
+ FSEND );
+}
-switch ( rScriptSpace.Which( ) )
-{
-case RES_PARATR_SCRIPTSPACE:
-nXmlElement = XML_autoSpaceDE;
-break;
-case RES_PARATR_HANGINGPUNCTUATION:
-nXmlElement = XML_overflowPunct;
-break;
-case RES_PARATR_FORBIDDEN_RULES:
-nXmlElement = XML_kinsoku;
-break;
-}
+void DocxAttributeOutput::ParaHangingPunctuation( const SfxBoolItem rItem )
+{
+m_pSerializer-singleElementNS( XML_w, XML_overflowPunct,
+ FSNS( XML_w, XML_val ), rItem.GetValue( ) ? true: false,
+ FSEND );
+}
-if ( nXmlElement )
-{
-m_pSerializer-singleElementNS( XML_w, nXmlElement,
- FSNS( XML_w, XML_val ), rScriptSpace.GetValue( ) ? true:
false,
- FSEND );
-}
+void DocxAttributeOutput::ParaForbiddenRules( const SfxBoolItem rItem )
+{
+m_pSerializer-singleElementNS( XML_w, XML_kinsoku,
+ FSNS( XML_w, XML_val ), rItem.GetValue( ) ? true: false,
+ FSEND );
}
void DocxAttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem
rAlign )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 16f17b7..8a17e9c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -537,6 +537,12 @@ protected:
/// Sfx item RES_PARATR_SCRIPTSPACE
virtual void ParaScriptSpace( const SfxBoolItem );
+/// Sfx item RES_PARATR_HANGINGPUNCTUATION
+virtual void ParaHangingPunctuation( const SfxBoolItem );
+
+/// Sfx item RES_PARATR_FORBIDDEN_RULES
+virtual void ParaForbiddenRules( const SfxBoolItem );
+
/// Sfx item RES_PARATR_VERTALIGN
virtual void ParaVerticalAlign( const SvxParaVertAlignItem rAlign );
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index c47abef..1e15d24 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2659,15 +2659,18 @@ void RtfAttributeOutput::ParaScriptSpace( const
SfxBoolItem rScriptSpace )
if (!rScriptSpace.GetValue( ))
return;
-switch ( rScriptSpace.Which( ) )
-{
-case RES_PARATR_SCRIPTSPACE:
-m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ASPALPHA);
-break;
-default:
-break;
-}
+m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ASPALPHA);
+}
+
+void RtfAttributeOutput::ParaHangingPunctuation( const SfxBoolItem )
+{
+SAL_INFO(sw.rtf, TODO: OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::ParaForbiddenRules( const
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-18'
Tag 'suse-4.0-18' created by Andras Timar andras.ti...@collabora.com at 2013-10-08 18:10 -0700 suse-4.0-18 Changes since libreoffice-4.0.2.2-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-18'
Tag 'suse-4.0-18' created by Andras Timar andras.ti...@collabora.com at 2013-10-08 18:10 -0700 suse-4.0-18 Changes since suse-4.0-17-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-18'
Tag 'suse-4.0-18' created by Andras Timar andras.ti...@collabora.com at 2013-10-08 18:10 -0700 suse-4.0-18 Changes since libreoffice-4.0.2.2-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-18'
Tag 'suse-4.0-18' created by Andras Timar andras.ti...@collabora.com at 2013-10-08 18:10 -0700 suse-4.0-18 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - distro-configs/CPOSX.conf
distro-configs/CPOSX.conf |3 +++ 1 file changed, 3 insertions(+) New commits: commit 90acc48ec81f075039b98abd7dc3c14874f351f1 Author: Andras Timar andras.ti...@collabora.com Date: Mon Oct 7 21:28:29 2013 +0200 tweaks to Mac OS X config Change-Id: I95ae32fa9fb811ee0a081a8e64a8fafa19b94461 diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf index 2c708ff..fda38ac 100644 --- a/distro-configs/CPOSX.conf +++ b/distro-configs/CPOSX.conf @@ -13,6 +13,9 @@ --enable-extension-integration --disable-online-update --disable-odk +--enable-epm +--with-macosx-sdk=10.8 +--with-macosx-version-min-required=10.6 --enable-ext-wiki-publisher --enable-ext-report-builder --enable-ext-presenter-minimizer ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - ios/CustomTarget_LibreOffice_app.mk ios/experimental sal/rtl
ios/CustomTarget_LibreOffice_app.mk| 10 +-
ios/experimental/LibreOffice/LibreOffice/lo.mm |2 +-
sal/rtl/bootstrap.cxx | 11 ++-
3 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 261f1439e5516f6d60317a675d261af330a9a74c
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 8 20:34:58 2013 +0300
Don't ignore -env: command line parameters in some cases
Happened at least in the experimental iOS app.
Change-Id: I725dde2f40ae9e64406e7a1b1dd5dc0da0a9ebd4
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index a4169b3..5ee61b0 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -199,9 +199,18 @@ static sal_Bool getFromCommandLineArgs(
}
rtl_uString_release( pArg );
}
-pNameValueList = nameValueList;
+// If osl_setCommandArgs() has not been called yet (for
+// instance, if this gets called from a static initialiser),
+// don't initialise pNameValueList, as that would cause the
+// code to ignore any -env:FOO=BAR on the command line once
+// osl is told about it.
+if( nArgCount 0 )
+pNameValueList = nameValueList;
}
+if( ! pNameValueList )
+return sal_False;
+
sal_Bool found = sal_False;
for( NameValueList::iterator ii = pNameValueList-begin() ;
commit 0ef3218911ee843c0b2eb639669050d2dc056def
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 8 19:49:53 2013 +0300
This app is called LibreOffice, not Viewer
Change-Id: I19663a22cedc0ed4355fc63d28821d80520ee292
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 167948c..f65c532 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -156,7 +156,7 @@ lo_initialize(void)
const int argc = sizeof(argv)/sizeof(*argv);
-argv[0] = NSBundle mainBundle] bundlePath]
stringByAppendingPathComponent: @Viewer] UTF8String];
+argv[0] = NSBundle mainBundle] bundlePath]
stringByAppendingPathComponent: @LibreOffice] UTF8String];
NSString *app_root_escaped = [[[NSBundle mainBundle] bundlePath]
stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
commit d7094ab8b3ef199573b4a846cf4eff880b4870aa
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 8 17:19:41 2013 +0300
Adapt to instdir and solver changes lately
Change-Id: Idc6c20f6645f2e39b98a11f741aaa482f31c6ea1
diff --git a/ios/CustomTarget_LibreOffice_app.mk
b/ios/CustomTarget_LibreOffice_app.mk
index 6fedb74..9ba7dec 100644
--- a/ios/CustomTarget_LibreOffice_app.mk
+++ b/ios/CustomTarget_LibreOffice_app.mk
@@ -59,14 +59,6 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call
gb_Executable_get_target,LibreOffice)
cp $(INSTDIR)/program/services/services.rdb $(appdir)
cp $(INSTDIR)/ure/share/misc/services.rdb $(appdir)/ure
#
-# Copy registry files
-#
-# FIXME This can be removed ? registry is copied below
- mkdir -p $(appdir)/registry/modules $(appdir)/registry/res
- cp $(OUTDIR)/xml/*.xcd $(appdir)/registry
- mv $(appdir)/registry/fcfg_langpack_en-US.xcd $(appdir)/registry/res
- cp -R $(OUTDIR)/xml/registry/* $(appdir)/registry
-#
# Copy .res files
#
# program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure,
@@ -103,7 +95,7 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call
gb_Executable_get_target,LibreOffice)
( \
echo '[Bootstrap]' \
echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR' \
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry
module:$${BRAND_BASE_DIR}/registry/modules res:$${BRAND_BASE_DIR}/registry' \
+ echo
'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
res:$${BRAND_BASE_DIR}/share/registry' \
: ) $(appdir)/fundamentalrc
#
( \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.0-17-1'
Tag 'cp-4.0-17-1' created by Andras Timar andras.ti...@collabora.com at 2013-10-08 18:37 -0700 cp-4.0-17-1 Changes since cp-4.0-15-2-20: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.0-17-1'
Tag 'cp-4.0-17-1' created by Andras Timar andras.ti...@collabora.com at 2013-10-08 18:37 -0700 cp-4.0-17-1 Changes since libreoffice-4.0.2.2-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.0-17-1'
Tag 'cp-4.0-17-1' created by Andras Timar andras.ti...@collabora.com at 2013-10-08 18:37 -0700 cp-4.0-17-1 Changes since libreoffice-4.0.2.2-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.0-17-1'
Tag 'cp-4.0-17-1' created by Andras Timar andras.ti...@collabora.com at 2013-10-08 18:37 -0700 cp-4.0-17-1 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - sc/inc sc/source
sc/inc/column.hxx|1 +
sc/inc/document.hxx |2 ++
sc/inc/table.hxx |1 +
sc/source/core/data/column2.cxx | 26 ++
sc/source/core/data/documen8.cxx |9 -
sc/source/core/data/table1.cxx |9 +
sc/source/core/tool/formulagroup.cxx |4 ++--
7 files changed, 49 insertions(+), 3 deletions(-)
New commits:
commit 229904a43c7406c4193e5e8c165e20f6a6a5bc44
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 8 13:47:49 2013 -0400
Support for passing non-double formula results from group interpreter.
Change-Id: I1cbe6b32d8a9b86a575e9806802f7a2a45eee873
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f81ad71..25d2a83 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -477,6 +477,7 @@ public:
void FillMatrix( ScMatrix rMat, size_t nMatCol, SCROW nRow1, SCROW nRow2
) const;
formula::VectorRefArray FetchVectorRefArray( sc::FormulaGroupContext
rCxt, SCROW nRow1, SCROW nRow2 );
void SetFormulaResults( SCROW nRow, const double* pResults, size_t nLen );
+void SetFormulaResults( SCROW nRow, const formula::FormulaTokenRef*
pResults, size_t nLen );
void SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 54fd457..c0de4b5f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1749,6 +1749,8 @@ public:
*/
void SC_DLLPUBLIC SetFormulaResults( const ScAddress rTopPos, const
double* pResults, size_t nLen );
+void SC_DLLPUBLIC SetFormulaResults( const ScAddress rTopPos, const
formula::FormulaTokenRef* pResults, size_t nLen );
+
private:
ScDocument(const ScDocument r); // disabled with no definition
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 6e095e2..5a216ae 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -871,6 +871,7 @@ public:
void InterpretDirtyCells( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2 );
void SetFormulaResults( SCCOL nCol, SCROW nRow, const double* pResults,
size_t nLen );
+void SetFormulaResults( SCCOL nCol, SCROW nRow, const
formula::FormulaTokenRef* pResults, size_t nLen );
/**
* Have formula cells with NeedsListening() == true start listening to the
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index bb8cf5f..ec3d475 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2466,6 +2466,32 @@ void ScColumn::SetFormulaResults( SCROW nRow, const
double* pResults, size_t nLe
}
}
+void ScColumn::SetFormulaResults( SCROW nRow, const formula::FormulaTokenRef*
pResults, size_t nLen )
+{
+sc::CellStoreType::position_type aPos = maCells.position(nRow);
+sc::CellStoreType::iterator it = aPos.first;
+if (it-type != sc::element_type_formula)
+// This is not a formula block.
+return;
+
+size_t nBlockLen = it-size - aPos.second;
+if (nBlockLen nLen)
+// Result array is longer than the length of formula cells. Not good.
+return;
+
+sc::formula_block::iterator itCell = sc::formula_block::begin(*it-data);
+std::advance(itCell, aPos.second);
+
+const formula::FormulaTokenRef* pResEnd = pResults + nLen;
+for (; pResults != pResEnd; ++pResults, ++itCell)
+{
+ScFormulaCell rCell = **itCell;
+rCell.SetResultToken(pResults-get());
+rCell.ResetDirty();
+rCell.SetChanged(true);
+}
+}
+
void ScColumn::SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat )
{
short eOldType = pDocument-GetFormatTable()-GetType(
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index d69e25b..c7e6a99 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -454,8 +454,15 @@ void ScDocument::SetFormulaResults( const ScAddress
rTopPos, const double* pRes
pTab-SetFormulaResults(rTopPos.Col(), rTopPos.Row(), pResults, nLen);
}
+void ScDocument::SetFormulaResults(
+const ScAddress rTopPos, const formula::FormulaTokenRef* pResults, size_t
nLen )
+{
+ScTable* pTab = FetchTable(rTopPos.Tab());
+if (!pTab)
+return;
-//
+pTab-SetFormulaResults(rTopPos.Col(), rTopPos.Row(), pResults, nLen);
+}
void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const
ScAddress* pAdrTo,
bool bNumFormatChanged )
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 0c985fd..851cf6c 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -2231,6 +2231,15 @@ void ScTable::SetFormulaResults( SCCOL nCol, SCROW nRow,
const double* pResults,
aCol[nCol].SetFormulaResults(nRow, pResults, nLen);
}
+void ScTable::SetFormulaResults(
+SCCOL nCol, SCROW nRow,
Re: Test failure
Hello all, I've been investigating on this issue and I've tried the patch from Julien and it still doesn't seem to fix the problem. There unit test always fails on the equality assertion even if we reverse that as well. Here is what I've got: When we check against sal_Int32(0xD99594) (i.e. 14259604 in decimal) for start color aGradient.StartColor equality assertion failed - Expected: 14259604 - Actual : 12603469 and When we check against sal_Int32(0xC0504D) (i.e. 12603469 in decimal) for start color aGradient.StartColor equality assertion failed - Expected: 12603469 - Actual : 14259604 That is, whenever we reverse the hex value (the expected value) for the unit test, the actual value coming out of the test is surprisingly reversed as well!! Which I failed to explain... I have to assume that there are other filters that are tested against this unit test (which in this case needs to reverse the startColor/endColor as I have done in the ooxmlexport filter) or there are some hidden mechanism in this unit test that changes the actual value when we change the expected value... My previous patch was tested (on OSX so without unit tests) during the Milano hackathon and it has solved an interoperability bug so presumbly we should keep this patch. Now I guess we need some qa experts to shed some light on the mechanism of this unit test ... Cheers, Siqi 2013/10/7 Siqi Liu m...@siqi.fr Hello all, Sorry for the late response! This was a patch that I've submitted during the hackathon in Milan and it fixes the #fdo65295 on bugzilla. Actually we've analyzed the content of the .docx exported by writer and it seems that the startColor and the endColor were accidentally reversed so that each time we import and export a docx with gradient background, we reverse the start and end color in the exported .docx file. I would test the patch above to see if that solves the problem when I'm back home. Sorry for the broken build :P ATB, Siqi 2013/10/6 julien2412 serval2...@yahoo.fr Hi, If StartColor and EndColor have been reversed, perhaps it was the same for qa part? So what about this patch? diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index f771ef9..8fdb7fb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -733,8 +733,8 @@ void Test::testTextframeGradient() uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_GRADIENT, getPropertydrawing::FillStyle(xFrame, FillStyle)); awt::Gradient aGradient = getPropertyawt::Gradient(xFrame, FillGradient); -CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aGradient.StartColor); -CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), aGradient.EndColor); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), aGradient.StartColor); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aGradient.EndColor); CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style); Julien -- View this message in context: http://nabble.documentfoundation.org/Test-failure-tp4076788p4076897.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) -- Cordialement, Siqi LIU Étudiant Ingénieur, 1ère année École Supérieur d'Électricité (Supélec) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: reportbuilder/java
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
|2 ++
1 file changed, 2 insertions(+)
New commits:
commit 0089d3ae9442f26695ae742f5fbdeeaf698861f2
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Oct 8 16:37:32 2013 +0200
fdo#62994 reportbuilder survive empty formula
Change-Id: I1da053871d107730ad9a135deb48313d8a877d89
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index 5bda08b..1841122 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -84,6 +84,8 @@ public class FormattedTextLayoutController
{
final FormattedTextElement element = (FormattedTextElement)
getNode();
final FormulaExpression formulaExpression =
element.getValueExpression();
+if (formulaExpression.getFormulaExpression() == null)
+return false;
final Formula formula = formulaExpression.getCompiledFormula();
final LValue lValue = formula.getRootReference();
return FormatValueUtility.isReferenceChanged(this, lValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
atk_focus_tracker_notify deprecated
Hello, On pc Debian x86-64 with master sources updated today, I got this: /home/julien/compile-libreoffice/libo/vcl/unx/gtk/a11y/atklistener.cxx: In function ‘gint idle_defunc_state_change(AtkObject*)’: /home/julien/compile-libreoffice/libo/vcl/unx/gtk/a11y/atklistener.cxx:81:13: error: ‘void atk_focus_tracker_notify(AtkObject*)’ is deprecated (declared at /usr/include/atk-1.0/atk/atkutil.h:176) [-Werror=deprecated-declarations] atk_focus_tracker_notify( NULL ); ^ /home/julien/compile-libreoffice/libo/vcl/unx/gtk/a11y/atklistener.cxx:81:44: error: ‘void atk_focus_tracker_notify(AtkObject*)’ is deprecated (declared at /usr/include/atk-1.0/atk/atkutil.h:176) [-Werror=deprecated-declarations] atk_focus_tracker_notify( NULL ); ^ (I runned a make clean make) See https://developer.gnome.org/atk/unstable/AtkUtil.html#atk-focus-tracker-notify Any idea? Julien -- View this message in context: http://nabble.documentfoundation.org/atk-focus-tracker-notify-deprecated-tp4077259.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - editeng/source include/editeng include/svl sc/inc sc/qa sc/source svl/source
editeng/source/editeng/editobj.cxx | 55 +++---
editeng/source/editeng/editobj2.hxx |6 --
include/editeng/editobj.hxx |4 -
include/svl/sharedstring.hxx |3 +
include/svl/sharedstringpool.hxx | 22 -
sc/inc/column.hxx|3 -
sc/inc/document.hxx |4 -
sc/inc/table.hxx |3 -
sc/qa/unit/ucalc.cxx | 84 +--
sc/qa/unit/ucalc.hxx |4 -
sc/source/core/data/column3.cxx | 48 ++--
sc/source/core/data/document.cxx | 14 +
sc/source/core/data/table2.cxx | 14 +
svl/source/misc/sharedstring.cxx | 10
svl/source/misc/sharedstringpool.cxx | 22 -
15 files changed, 87 insertions(+), 209 deletions(-)
New commits:
commit 3f8c8b25a6158034f38e4076cb72239741098ba9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 8 15:18:16 2013 -0400
No more getIdentifier*() calls because they are not efficient.
They shall never be used.
Change-Id: I019c88b1511a67175d782777cd41e0ec0434f497
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 0ad6d28..06cbbe2 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -154,16 +154,9 @@ void ContentInfo::NormalizeString( svl::SharedStringPool
rPool )
maText = rPool.intern(OUString(maText.getData()));
}
-sal_uIntPtr ContentInfo::GetStringID( const svl::SharedStringPool rPool )
const
+const svl::SharedString ContentInfo::GetSharedString() const
{
-rtl_uString* p = const_castrtl_uString*(maText.getData());
-return rPool.getIdentifier(OUString(p));
-}
-
-sal_uIntPtr ContentInfo::GetStringIDIgnoreCase( const svl::SharedStringPool
rPool ) const
-{
-rtl_uString* p = const_castrtl_uString*(maText.getData());
-return rPool.getIdentifierIgnoreCase(OUString(p));
+return maText;
}
OUString ContentInfo::GetText() const
@@ -350,14 +343,9 @@ void EditTextObject::NormalizeString(
svl::SharedStringPool rPool )
mpImpl-NormalizeString(rPool);
}
-bool EditTextObject::GetStringIDs( const svl::SharedStringPool rPool,
std::vectorsal_uIntPtr rIDs ) const
-{
-return mpImpl-GetStringIDs(rPool, rIDs);
-}
-
-bool EditTextObject::GetStringIDsIgnoreCase( const svl::SharedStringPool
rPool, std::vectorsal_uIntPtr rIDs ) const
+std::vectorsvl::SharedString EditTextObject::GetSharedStrings() const
{
-return mpImpl-GetStringIDsIgnoreCase(rPool, rIDs);
+return mpImpl-GetSharedStrings();
}
const SfxItemPool* EditTextObject::GetPool() const
@@ -656,42 +644,17 @@ void EditTextObjectImpl::NormalizeString(
svl::SharedStringPool rPool )
}
}
-bool EditTextObjectImpl::GetStringIDs( const svl::SharedStringPool rPool,
std::vectorsal_uIntPtr rIDs ) const
-{
-std::vectorsal_uIntPtr aIDs;
-aIDs.reserve(aContents.size());
-ContentInfosType::const_iterator it = aContents.begin(), itEnd =
aContents.end();
-for (; it != itEnd; ++it)
-{
-const ContentInfo rInfo = *it;
-sal_uIntPtr nID = rInfo.GetStringID(rPool);
-if (!nID)
-return false;
-
-aIDs.push_back(nID);
-}
-
-rIDs.swap(aIDs);
-return true;
-}
-
-bool EditTextObjectImpl::GetStringIDsIgnoreCase( const svl::SharedStringPool
rPool, std::vectorsal_uIntPtr rIDs ) const
+std::vectorsvl::SharedString EditTextObjectImpl::GetSharedStrings() const
{
-std::vectorsal_uIntPtr aIDs;
-aIDs.reserve(aContents.size());
+std::vectorsvl::SharedString aSSs;
+aSSs.reserve(aContents.size());
ContentInfosType::const_iterator it = aContents.begin(), itEnd =
aContents.end();
for (; it != itEnd; ++it)
{
const ContentInfo rInfo = *it;
-sal_uIntPtr nID = rInfo.GetStringIDIgnoreCase(rPool);
-if (!nID)
-return false;
-
-aIDs.push_back(nID);
+aSSs.push_back(rInfo.GetSharedString());
}
-
-rIDs.swap(aIDs);
-return true;
+return aSSs;
}
bool EditTextObjectImpl::IsVertical() const
diff --git a/editeng/source/editeng/editobj2.hxx
b/editeng/source/editeng/editobj2.hxx
index d2ac045..5c1c2a2 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -144,8 +144,7 @@ public:
~ContentInfo();
void NormalizeString( svl::SharedStringPool rPool );
-sal_uIntPtr GetStringID( const svl::SharedStringPool rPool ) const;
-sal_uIntPtr GetStringIDIgnoreCase( const svl::SharedStringPool rPool )
const;
+const svl::SharedString GetSharedString() const;
OUString GetText() const;
void SetText( const OUString rStr );
@@ -210,8 +209,7 @@ public:
void SetUserType( sal_uInt16 n );
void NormalizeString( svl::SharedStringPool rPool );
-bool GetStringIDs( const svl::SharedStringPool rPool,
std::vectorsal_uIntPtr rIDs
[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk|1
writerfilter/source/doctok/WW8Clx.hxx |2
writerfilter/source/doctok/WW8OutputWithDepth.cxx | 43 --
writerfilter/source/doctok/WW8OutputWithDepth.hxx | 47
writerfilter/source/doctok/WW8Picture.cxx | 11
writerfilter/source/doctok/WW8PropertySetImpl.hxx |1
writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 35 +-
writerfilter/source/doctok/resourcesimpl.xsl|6 --
8 files changed, 5 insertions(+), 141 deletions(-)
New commits:
commit 2541f60615ebbdebeab870625817a1f4d8ad1682
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 8 21:06:30 2013 +0200
writerfilter: drop unused WW8OutputWithDepth
Change-Id: I7526953ba1f4d95cb550be13df6616cb6046e518
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index ff23bad..797c193 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -130,7 +130,6 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/doctok/WW8FontTable \
writerfilter/source/doctok/WW8LFOTable \
writerfilter/source/doctok/WW8ListTable \
-writerfilter/source/doctok/WW8OutputWithDepth \
writerfilter/source/doctok/WW8Picture \
writerfilter/source/doctok/WW8PropertySetImpl \
writerfilter/source/doctok/WW8ResourceModelImpl \
diff --git a/writerfilter/source/doctok/WW8Clx.hxx
b/writerfilter/source/doctok/WW8Clx.hxx
index e985d21..b15c5e2 100644
--- a/writerfilter/source/doctok/WW8Clx.hxx
+++ b/writerfilter/source/doctok/WW8Clx.hxx
@@ -22,8 +22,6 @@
#include doctok/resources.hxx
-#include WW8OutputWithDepth.hxx
-
namespace writerfilter {
namespace doctok
{
diff --git a/writerfilter/source/doctok/WW8OutputWithDepth.cxx
b/writerfilter/source/doctok/WW8OutputWithDepth.cxx
deleted file mode 100644
index fcde204..000
--- a/writerfilter/source/doctok/WW8OutputWithDepth.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- 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 .
- */
-
-#include iostream
-#include WW8OutputWithDepth.hxx
-
-namespace writerfilter {
-namespace doctok
-{
-
-using namespace ::std;
-
-WW8OutputWithDepth::WW8OutputWithDepth()
-: OutputWithDepthstring(tablegroup, /tablegroup)
-{
-}
-
-void WW8OutputWithDepth::output(const string str) const
-{
-cout str endl;
-}
-
-WW8OutputWithDepth output;
-
-}}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/WW8OutputWithDepth.hxx
b/writerfilter/source/doctok/WW8OutputWithDepth.hxx
deleted file mode 100644
index 8b168a3..000
--- a/writerfilter/source/doctok/WW8OutputWithDepth.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- 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_WW8_OUTPUT_WITH_DEPTH
-#define INCLUDED_WW8_OUTPUT_WITH_DEPTH
-
-#include resourcemodel/OutputWithDepth.hxx
-
-#include string
-
-using namespace ::std;
-
-namespace writerfilter {
-namespace doctok
-{
-class WW8OutputWithDepth : public OutputWithDepthstring
-{
-protected:
-void output(const string output) const;
-public:
-WW8OutputWithDepth();
-virtual ~WW8OutputWithDepth() { finalize(); }
LibreOffice Help
Hi Markus, We have spoken about exporting the help-system from the help-wiki. We will need a html/javascript framework for that. I don't think a basic framework will need more time then a month or 2 for me. But I think we will also need to look at how we export the pages from the wiki because how the pages are exported is important. Can you tell me what plugin for mediawiki you had in mind to do the export? Is there a test-wiki to try it on to see what it does, maybe we'll need to change the plugin to fit our needs. -- Greetings, Rob Snelders ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/thints.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 91159b1c31a7fd474ba0b97828f593604790ce3c
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 8 18:37:35 2013 +0200
fdo#70201: sw: eliminate no-extent RSID-only AUTOFMT hints
These are already filtered out in SwpHints::TryInsertHint(), but they
can be produced by a SwTxtNode::Update() following some deletion like in
SwTxtNode::ReplaceText() (or maybe CutImpl() and RstAttr() too?).
So in order to prevent SwHistorySetTxt being created for these,
filter them out in SwpHints::MergePortions(), which has the advantage
that it's one location to change; probably filtering in Update() and
RstAttr() both would work too.
(regression from 6db39dbd7378351f6476f6db25eb7110c9cfb291)
Change-Id: I597a9ab290dcc3fb1b624dd2dca241c462acf256
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index 82ccc73..8038311 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -2527,6 +2527,15 @@ bool SwpHints::MergePortions( SwTxtNode rNode )
pHt-GetAutoFmt().GetStyleHandle());
if ((pSet-Count() == 1) pSet-GetItem(RES_CHRATR_RSID, false))
{
+// fdo#70201: eliminate no-extent RSID-only AUTOFMT
+// could be produced by ReplaceText or (maybe?) RstAttr
+if (*pHt-GetStart() == *pHt-GetEnd())
+{
+SwpHintsArray::DeleteAtPos(i); // kill it without History!
+SwTxtAttr::Destroy(pHt, rNode.GetDoc()-GetAttrPool());
+--i;
+continue;
+}
// fdo#52028: this one has _only_ RSID = ignore it completely
if (!pHt-IsFormatIgnoreStart() || !pHt-IsFormatIgnoreEnd())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
