[Libreoffice-commits] .: README.cross
README.cross |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a54e92737e3e2b642c1f8564d51d985c7433bd29 Author: Miklos Vajna vmik...@suse.cz Date: Tue Nov 20 09:20:40 2012 +0100 README.cross: typo Change-Id: I92a82a29fe217faaefe7e67228d59a9fb43526d5 diff --git a/README.cross b/README.cross index e706f1d..d117c97 100644 --- a/README.cross +++ b/README.cross @@ -373,7 +373,7 @@ And here is an autogen.lastrun for Android when cross-compiling to x86 from Linu There are a couple of (more or less) interactive apps that you can run on the emulator or on a device that use LibreOffice code. Look in android/experimental. DocumentLoader is just a testbench, really for -code to load a document (just Weiter ones so far) and display one page +code to load a document (just Writer ones so far) and display one page at a time. LibreOffice4Android is what resulted from a Google Summer of Code project in 2012, a document viewer. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
cppCheck: invalidPrintfArgType + minor formatting when appro...
Christophe JAILLET has abandoned this change. Change subject: cppCheck: invalidPrintfArgType + minor formatting when appropriate .. Patch Set 1: Abandoned Will provide separate patches in the future. -- To view, visit https://gerrit.libreoffice.org/1032 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ibe8b8dd2682fad2cb7bc5cd986a1fe0eeb19db5f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: shell/source
shell/source/tools/lngconvex/lngconvex.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit b0126a2ea297c692214ec11302d2a7b3cf70edde
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Nov 20 10:11:24 2012 +0100
do not use exitcode 0 on failure
Change-Id: I47ce1502e8ffd58709a64a3ca520d59cb765bfaa
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx
b/shell/source/tools/lngconvex/lngconvex.cxx
index 942ae75..1e4f1c2 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -590,15 +590,18 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
catch(const std::ios::failure ex)
{
std::cout ex.what() std::endl;
+return 1;
}
catch(const std::exception ex)
{
std::cout ex.what() std::endl;
ShowUsage();
+return 1;
}
catch(...)
{
std::cout Unexpected error... std::endl;
+return 1;
}
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/source
shell/source/win32/shlxthandler/res/shlxthdl.ulf | 18 -- 1 file changed, 18 deletions(-) New commits: commit 3d55b14aa23ac49c499ee654f793e722f517d858 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Nov 20 10:20:43 2012 +0100 remove license header that confuses lngconvex This is not C++ source. Change-Id: I05fe98ef019df23fd4be0d7e281ebb877b545484 diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.ulf b/shell/source/win32/shlxthandler/res/shlxthdl.ulf index 75c5416..eed3dd3 100644 --- a/shell/source/win32/shlxthandler/res/shlxthdl.ulf +++ b/shell/source/win32/shlxthandler/res/shlxthdl.ulf @@ -1,21 +1,3 @@ -/* - * 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 . - */ - [%TITLE%] en-US = Title ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 57059, which changed state. Bug 57059 Summary: CRASH when scroll down on (Writer) HELP contents - Common Help Topics - General Information - General Glossary https://bugs.freedesktop.org/show_bug.cgi?id=57059 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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] .: sw/source vcl/source
sw/source/core/layout/paintfrm.cxx | 28
vcl/source/gdi/bitmap3.cxx |4
2 files changed, 24 insertions(+), 8 deletions(-)
New commits:
commit 9b3d96fddd214b808f241197c42af0434c6bba82
Author: Michael Meeks michael.me...@suse.com
Date: Tue Nov 20 09:32:54 2012 +
fdo#57059 - fix crasher rendering borders for very small windows.
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index fc50baf..717a253 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5791,9 +5791,15 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut,
Point aPoint, BitmapEx
aPageBottomRightShadow );
pOut-DrawBitmapEx( pOut-PixelToLogic( Point( aPaintRect.Right() + 1,
aPagePxRect.Top() - mnShadowPxWidth ) ),
aPageTopRightShadow );
-BitmapEx aPageRightShadow = aPageRightShadowBase;
-aPageRightShadow.Scale( 1, aPagePxRect.Height() - 2 * (mnShadowPxWidth
- 1) );
-lcl_paintBitmapExToRect(pOut, Point( aPaintRect.Right() +
mnShadowPxWidth, aPagePxRect.Top() + mnShadowPxWidth - 1), aPageRightShadow,
RIGHT );
+
+if ( aPagePxRect.Height() 2 * mnShadowPxWidth)
+{
+BitmapEx aPageRightShadow = aPageRightShadowBase;
+aPageRightShadow.Scale( 1, aPagePxRect.Height() - 2 *
(mnShadowPxWidth - 1) );
+lcl_paintBitmapExToRect( pOut, Point( aPaintRect.Right() +
mnShadowPxWidth,
+ aPagePxRect.Top() +
mnShadowPxWidth - 1),
+ aPageRightShadow, RIGHT );
+}
}
// Left shadows and corners
@@ -5803,17 +5809,23 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut,
Point aPoint, BitmapEx
pOut-DrawBitmapEx( pOut-PixelToLogic( Point( lLeft,
aPagePxRect.Bottom() + 1 + mnShadowPxWidth -
aPageBottomLeftShadow.GetSizePixel().Height() ) ), aPageBottomLeftShadow );
pOut-DrawBitmapEx( pOut-PixelToLogic( Point( lLeft,
aPagePxRect.Top() - mnShadowPxWidth ) ), aPageTopLeftShadow );
-BitmapEx aPageLeftShadow = aPageLeftShadowBase;
-aPageLeftShadow.Scale( 1, aPagePxRect.Height() - 2 * (mnShadowPxWidth
- 1) );
-lcl_paintBitmapExToRect(pOut, Point( lLeft, aPagePxRect.Top() +
mnShadowPxWidth - 1), aPageLeftShadow, LEFT);
+if ( aPagePxRect.Height() 2 * mnShadowPxWidth)
+{
+BitmapEx aPageLeftShadow = aPageLeftShadowBase;
+aPageLeftShadow.Scale( 1, aPagePxRect.Height() - 2 *
(mnShadowPxWidth - 1) );
+lcl_paintBitmapExToRect( pOut, Point( lLeft, aPagePxRect.Top() +
mnShadowPxWidth - 1),
+ aPageLeftShadow, LEFT );
+}
}
BitmapEx aPageBottomShadow = aPageBottomShadowBase;
aPageBottomShadow.Scale( aPaintRect.Width(), 1 );
-lcl_paintBitmapExToRect(pOut, Point( aPaintRect.Left(),
aPagePxRect.Bottom() + 1 ), aPageBottomShadow, BOTTOM);
+lcl_paintBitmapExToRect( pOut, Point( aPaintRect.Left(),
aPagePxRect.Bottom() + 1 ),
+ aPageBottomShadow, BOTTOM );
BitmapEx aPageTopShadow = aPageTopShadowBase;
aPageTopShadow.Scale( aPaintRect.Width(), 1 );
-lcl_paintBitmapExToRect(pOut, Point( aPaintRect.Left(), aPagePxRect.Top()
- mnShadowPxWidth ), aPageTopShadow, TOP);
+lcl_paintBitmapExToRect( pOut, Point( aPaintRect.Left(), aPagePxRect.Top()
- mnShadowPxWidth ),
+ aPageTopShadow, TOP );
}
//mod #i6193# paint sidebar for notes
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 0031fa0..fab9d90 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -2175,6 +2175,10 @@ bool Bitmap::ImplScaleConvolution( const double
rScaleX, const double rScaleY,
int* pPixels;
int* pCount;
+// Handle negative scales safely cf. other ImplScale methods
+if( ( nNewWidth 1L ) || ( nNewHeight 1L ) )
+return false;
+
// Do horizontal filtering
ImplCalculateContributions( nWidth, nNewWidth, aNumberOfContributions,
pWeights, pPixels, pCount, aKernel );
pReadAcc = AcquireReadAccess();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added Depends on||57311 --- Comment #167 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- I nominate bug 57311 : LO 3.6.4.1 is named LOdev instead of LibreOffice on Linux / Deb x86 -- 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] .: android/experimental
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 100 ++
1 file changed, 66 insertions(+), 34 deletions(-)
New commits:
commit 4c359c22e12a8cd6b6b40af60e1a39261737ad2a
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Nov 20 09:42:41 2012 +0100
android: don't bootstrap after every rotation in DocumentLoader
It seems that previously onCreate served 3 different purposes:
1) bootstrap UNO machinery
2) load the document
3) create the view
Ideally it should do the first two only if not done already -- as a
first step, this commit extracts 1) and does only once.
Change-Id: I087a6b934c05295263080f571c95ef152e4602cb
diff --git
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 806fcab..3837a04 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -126,10 +126,7 @@ public class DocumentLoader
private static final int PAGECACHE_PLUSMINUS = 2;
private static final int PAGECACHE_SIZE = PAGECACHE_PLUSMINUS*2 + 1;
-long timingOverhead;
-XComponentContext context;
-XMultiComponentFactory mcf;
-XComponentLoader componentLoader;
+BootstrapContext bootstrapContext;
XToolkitExperimental toolkit;
XDevice dummySmallDevice;
Object doc;
@@ -619,7 +616,7 @@ public class DocumentLoader
long t0 = System.currentTimeMillis();
PropertyValue rendererProps[] = renderable.getRenderer(number,
doc, renderProps);
long t1 = System.currentTimeMillis();
-Log.i(TAG, getRenderer took + ((t1-t0)-timingOverhead) + ms);
+Log.i(TAG, getRenderer took +
((t1-t0)-bootstrapContext.timingOverhead) + ms);
int pageWidth = 0, pageHeight = 0;
for (int i = 0; i rendererProps.length; i++) {
@@ -699,7 +696,7 @@ public class DocumentLoader
t0 = System.currentTimeMillis();
renderable.render(number, doc, renderProps);
t1 = System.currentTimeMillis();
-Log.i(TAG, Rendering page + number + took +
((t1-t0)-timingOverhead) + ms);
+Log.i(TAG, Rendering page + number + took +
((t1-t0)-bootstrapContext.timingOverhead) + ms);
Bootstrap.force_full_alpha_bb(bb, 0, flipper.getWidth() *
flipper.getHeight() * 4);
@@ -816,12 +813,12 @@ public class DocumentLoader
loadProps[2].Value = new Boolean(true);
long t0 = System.currentTimeMillis();
-doc = componentLoader.loadComponentFromURL(url, _blank, 0,
loadProps);
+doc =
bootstrapContext.componentLoader.loadComponentFromURL(url, _blank, 0,
loadProps);
long t1 = System.currentTimeMillis();
-Log.i(TAG, Loading took + ((t1-t0)-timingOverhead) + ms);
+Log.i(TAG, Loading took +
((t1-t0)-bootstrapContext.timingOverhead) + ms);
-Object toolkitService = mcf.createInstanceWithContext
-(com.sun.star.awt.Toolkit, context);
+Object toolkitService =
bootstrapContext.mcf.createInstanceWithContext
+(com.sun.star.awt.Toolkit,
bootstrapContext.componentContext);
toolkit = (XToolkitExperimental)
UnoRuntime.queryInterface(XToolkitExperimental.class, toolkitService);
renderable = (XRenderable)
UnoRuntime.queryInterface(XRenderable.class, doc);
@@ -846,7 +843,7 @@ public class DocumentLoader
t0 = System.currentTimeMillis();
pageCount = renderable.getRendererCount(doc, renderProps);
t1 = System.currentTimeMillis();
-Log.i(TAG, getRendererCount: + pageCount + , took +
((t1-t0)-timingOverhead) + ms);
+Log.i(TAG, getRendererCount: + pageCount + , took +
((t1-t0)-bootstrapContext.timingOverhead) + ms);
}
catch (Exception e) {
e.printStackTrace(System.err);
@@ -856,6 +853,18 @@ public class DocumentLoader
}
}
+/**
+ * This class contains the state that is initialized once and never changes
+ * (not specific to a document or a view).
+ */
+class BootstrapContext
+{
+public long timingOverhead;
+public XComponentContext componentContext;
+public XMultiComponentFactory mcf;
+public XComponentLoader componentLoader;
+}
+
static void dumpUNOObject(String objectName, Object object)
{
Log.i(TAG, objectName + is + (object != null ? object.toString() :
null));
@@ -924,19 +933,19 @@ public class DocumentLoader
}
@Override
-public void onCreate(Bundle
Re: Funding Wishlist
Hi everyone, Just to clarify. We are really looking for your team's wishlist and it must be of budgetary consideration. This is not a wishlist for new UX-designs, new logos etc. The wishlist should really be discussed with your other team members so that we can get a better view of the needs of the different LibreOffice teams. For example: website team is looking at infrastructure (big and small); the marketing team is discussing the possibility of Booth kits to be deployed/shipped to areas/regions where conference materials are in desperate need. Leave me a message on this thread is you have any questions. Please do not send me your personal wishlists; I will go around and collect the wishlists from your list/thread later or as I see your discussions and decisions are made. Cheers, Marc Le 2012-11-18 09:32, Marc Paré a écrit : Hi everyone, Just a reminder to your teams about this. We are seriously looking at different teams' wishlists. Please do take a little time out of your busy schedule and speak to your teams about any funding for items that you think may be of importance to your team or the enhance the functioning of your team's work on the project. So far there are only the website and marketing teams who are working on some items. Feel free to ask if you have any questions regarding this. At this point, anything goes, as long as the requests are reasonable. We need these items for planning more effective funding drives as well as for budgeting. It would really help if your suggestions come along with approximate costs where possible. Cheers, Marc Le 2012-10-13 16:45, marc.p...@libreoffice.org a écrit : Hi everyone, In trying to better assess the TDF/LibreOffice funding requirements, we are compiling a wishlist of funding request particular to your team's needs. While there is no guarantee that this will get you funding for any particular item, it will help to better assess and prioritize the project's needs. I have volunteered to take care of setting up, as well as, document (facilitate) the proposal from Florian (below)[1] snip == What we effectively need now is a (senseful) wishlist from the various teams. Think of it as a Christmas wishlist: You write a dozen things on it, eventually you get two or three, which is fantastic! Besides the infrastructure and cost for ongoing operations, I can also imagine some developer machines are required, more travel funding, a marketing campaign, funds to produce collaterals and swags for giving them away, and many more. My proposal is to create a wiki page, asking the various groups to write down their wishes, and eventually distill a wishlist out of that. Does that sound senseful? Are there any volunteers for mailing the various lists and compiling an initial wiki page? (Florian Effenberger) == I think the key words in Florian's proposal are senseful-whishlist. If there are multiple items, you may want to prioritize them in the right order. I have set up a wiki page to collect your team's list[2]. Feel free to add these to the wiki page after discussing it with your team, or, I can also help out with collecting your suggestions by re-visiting this thread and then add them to the wiki page. Cheers, Marc [1] http://permalink.gmane.org/gmane.comp.documentation.libreoffice.marketing/6143 [2] http://wiki.documentfoundation.org/Marketing/Funding_Priorities -- Marc Paré m...@marcpare.com http://www.parEntreprise.com parEntreprise.com Supports OpenDocument Formats (ODF) parEntreprise.com Supports http://www.LibreOffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GTK theming: oxygen-gtk support broken
On Mon, 2012-11-19 at 23:45 +0100, Enrico Weigelt wrote: IIRC, this provides KDE look+feel using Gtk, right ? That, IMHO, could count as argument for dropping Qt/KDE vcl. (see my other postings about vcl's/widget toolkits) Please stop trolling on this topic. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: config_host.mk.in configure.ac extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk postprocess/packcomponents Repository.mk scp2/InstallModule_ooo.mk scp2/source
Repository.mk |9 - config_host.mk.in |3 + configure.ac | 51 ++--- extensions/Module_extensions.mk| 19 np_sdk/Module_np_sdk.mk|9 - postprocess/packcomponents/makefile.mk |2 - scp2/InstallModule_ooo.mk |3 + scp2/source/ooo/common_brand.scp |2 - scp2/source/ooo/file_library_ooo.scp |2 - scp2/source/ooo/file_ooo.scp | 24 +++ 10 files changed, 75 insertions(+), 49 deletions(-) New commits: commit a6139f6fe6d4615c993a9b52b63b7d93c0c8ad4f Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 20 11:15:56 2012 +0100 Key different browser plugin features to specific flags This is a rework of f9059d4eee8e53c0a6b531fff16e1fade58cb8b0 Key all browser plugin features to --enable-nsplugin. The problem with that was that Mac OS X supports pluging browser plugins into LO documents (which was originally controlled by --enable-mozilla) but not plugging LO into browser windows (which was originally controlled by --enable-nsplugin), so controlling the former with the same switch as the latter did not actually work. Thus I replaced the single ENABLE_NSPLUGIN feature flag with two dedicated ones, ENABLE_NPAPI_FROM_BROWSER (for plugging browser plugins into LO documents) and ENABLE_NPAPI_INTO_BROWSER (for plugging LO into browser windows). The --enable-nsplugin configure switch is gone completely, setting the feature flags is always done fully automatically now. Change-Id: Iecf706637465e865c987563b5de489fa90b4c904 diff --git a/Repository.mk b/Repository.mk index 82aac94..8dd9e27 100755 --- a/Repository.mk +++ b/Repository.mk @@ -187,14 +187,19 @@ $(eval $(call gb_Helper_register_executables,UREBIN,\ endif -ifeq ($(ENABLE_NSPLUGIN),YES) +ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES) $(eval $(call gb_Helper_register_executables,OOO,\ -nsplugin \ pluginapp.bin \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ pl \ )) +endif + +ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES) +$(eval $(call gb_Helper_register_executables,OOO,\ +nsplugin \ +)) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ npsoplugin \ )) diff --git a/config_host.mk.in b/config_host.mk.in index a5f8f40..727bdc7 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -161,7 +161,8 @@ export ENABLE_LTO=@ENABLE_LTO@ export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@ export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@ export ENABLE_MYSQLC=@ENABLE_MYSQLC@ -export ENABLE_NSPLUGIN=@ENABLE_NSPLUGIN@ +export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@ +export ENABLE_NPAPI_INTO_BROWSER=@ENABLE_NPAPI_INTO_BROWSER@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@ export ENABLE_OPENGL=@ENABLE_OPENGL@ export ENABLE_OXYGENOFFICE=@ENABLE_OXYGENOFFICE@ diff --git a/configure.ac b/configure.ac index 18d4277..5adc27e 100644 --- a/configure.ac +++ b/configure.ac @@ -1014,13 +1014,6 @@ AC_ARG_ENABLE(zenity, [Do not display a build icon in the notification area (on unix) during build.]), ,enable_zenity=yes) -AC_ARG_ENABLE(nsplugin, -AS_HELP_STRING([--disable-nsplugin], -[Do not build NPAPI-based plugin features (allowing to plug LibreOffice - into browser windows, and to plug browser plugins into LibreOffice - documents.]) -) - AC_ARG_ENABLE(cups, AS_HELP_STRING([--disable-cups], [Do not build cups support.]) @@ -1682,7 +1675,8 @@ WITH_SYSTEM_MOZILLA=no) AC_ARG_WITH(system-npapi-headers, AS_HELP_STRING([--with-system-npapi-headers], [Use NPAPI headers provided by system instead of bundled ones. Used in - extensions/source/nsplugin and extensions/source/plugin]),, + extensions/source/nsplugin (ENABLE_NPAPI_INTO_BROWSER=YES) and + extensions/source/plugin (ENABLE_NPAPI_FROM_BROWSER=YES)]),, [with_system_npapi_headers=$with_system_headers] ) @@ -8390,7 +8384,8 @@ if test $with_system_npapi_headers = yes; then AC_LANG_POP([C]) else AC_MSG_RESULT([internal]) -dnl ...but will not be built/used unless ENABLE_NSPLUGIN is YES +dnl ...but will not be built/used unless ENABLE_NPAPI_FROM_BROWSER or +dnl ENABLE_NPAPI_INTO_BROWSER is YES SYSTEM_NPAPI_HEADERS=NO fi AC_SUBST(NPAPI_HEADERS_CFLAGS) @@ -8556,24 +8551,33 @@ AC_SUBST(GRAPHITE_TARBALL) AC_SUBST([MINGW_GRAPHITE2_DLL]) dnl === -dnl Check for nsplugin +dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents dnl === -AC_MSG_CHECKING([whether to build nsplugin extension]) -ENABLE_NSPLUGIN=NO -if test $_os = Darwin -o $_os = iOS -o $_os = Android -o $enable_headless = yes; then -
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||34555 --- Comment #393 from Michael Meeks michael.me...@novell.com --- add image cropping annoyance mis-added to 4.0 -- 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] .: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7407673dee25cd76ff4196179c5a0062b081659f Author: Jan Holesovsky ke...@suse.cz Date: Tue Nov 20 11:23:05 2012 +0100 Revert Hide the rulers in Writer by default for a cleaner look Terribly sorry to revert this - but the UX-advise consensus is to show the rulers by default. This reverts commit ae991a10701caac3db2483a8aef05e4e8385765c. diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index c25d9e4..6fec206 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1353,7 +1353,7 @@ descSpecifies whether rulers are displayed. Filters the values of HorizontalRuler and VerticalRuler./desc labelShow rulers/label /info - valuefalse/value + valuetrue/value /prop prop oor:name=HorizontalRuler oor:type=xs:boolean oor:nillable=false !-- OldPath: Writer/Layout/Window -- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on|34555 | --- Comment #33 from Michael Meeks michael.me...@novell.com --- Removed bug#34555 - please add MAB's to the open tracker of the lowest version they are found in: in this case 3.5 (at bug#37361). This helps us have a good view of bugs specific to each version -- 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
Reverted Hide the rulers in Writer by default for a cleaner look
Hi Samuel, Terribly sorry for that - but the Design team consensus (as discussed on the ESC meeting) was not to hide the rulers by default, so I have reverted the change: http://cgit.freedesktop.org/libreoffice/core/commit/?id=7407673dee25cd76ff4196179c5a0062b081659f I am sorry, but I have no creative solution here - either it is on, or it is off... ;-) But would be great to see you working with the Design/UX guys closely, I am sure there are many other areas that need improvements and are not controversial? Thank you for all your patches you've sent so far! - I loved your Wordcount dialog improvements, eg. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Fwd] LibreOffice 3.6.3.2 build on Linux fail on dictionaries and help (localize.sdf not found)
Hey, Since I posted my message on the wrong ML, I'm forwarding it (with the nabble interface, sorry…) as suggested here. So here is my problem : Hey, I don't know if it's the right place to ask, but I'm experiencing some problems building LibreOffice 3.6.3.2 on GNU/Linux 32-bit. I'm using this Pkgfile (build file for NuTyX's pkgmk (originally Crux's one)) : http://pastebin.com/jUK3GjRC additional_source (list of packages to download from LibreOffice's server because they're not present on the system) : http://pastebin.com/JgDtQgp0 build_error.log : http://pastebin.com/BV3ePhsn list of installed packages : http://pastebin.com/PAMcwHFF My system is a chroot of an highly modified NuTyX pakxe.4, so you can't find any information on it. (but that may help : http://piernov.org/git/nutyx-pakxe/ http://piernov.org/git/nutyx-extra/ → My outdated repositories of packages). Thank you in advance. -- View this message in context: http://nabble.documentfoundation.org/Fwd-LibreOffice-3-6-3-2-build-on-Linux-fail-on-dictionaries-and-help-localize-sdf-not-found-tp4019742.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] .: sw/source
sw/source/ui/utlui/poolfmt.src | 38 +++---
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 783d13a9276931e274a90b9b53de2c92dc8c055e
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Nov 20 12:03:18 2012 +0100
Rename style called Default to Default Style + First Cap Some Others
too.
Change-Id: I71b74ceabfdaced541529143d15d020ac17d2e26
diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src
index e3afdd9..f20c110 100644
--- a/sw/source/ui/utlui/poolfmt.src
+++ b/sw/source/ui/utlui/poolfmt.src
@@ -70,19 +70,19 @@ String STR_POOLPAGE_LANDSCAPE
};
String STR_POOLCHR_LINENUM
{
-Text [ en-US ] = Line numbering ;
+Text [ en-US ] = Line Numbering ;
};
String STR_POOLCHR_IDX_MAIN_ENTRY
{
-Text [ en-US ] = Main index entry;
+Text [ en-US ] = Main Index Entry;
};
String STR_POOLCHR_FOOTNOTE_ANCHOR
{
-Text [ en-US ] = Footnote anchor;
+Text [ en-US ] = Footnote Anchor;
};
String STR_POOLCHR_ENDNOTE_ANCHOR
{
-Text [ en-US ] = Endnote anchor;
+Text [ en-US ] = Endnote Anchor;
};
// Zeichenvorlagen fuer HTML
@@ -157,27 +157,27 @@ String STR_POOLFRM_LABEL
// -
String STR_POOLCOLL_STANDARD
{
-Text [ en-US ] = Default ;
+Text [ en-US ] = Default Style ;
};
String STR_POOLCOLL_TEXT
{
-Text [ en-US ] = Text body ;
+Text [ en-US ] = Text Body ;
};
String STR_POOLCOLL_TEXT_IDENT
{
-Text [ en-US ] = First line indent ;
+Text [ en-US ] = First Line Indent ;
};
String STR_POOLCOLL_TEXT_NEGIDENT
{
-Text [ en-US ] = Hanging indent ;
+Text [ en-US ] = Hanging Indent ;
};
String STR_POOLCOLL_TEXT_MOVE
{
-Text [ en-US ] = Text body indent ;
+Text [ en-US ] = Text Body Indent ;
};
String STR_POOLCOLL_GREETING
{
-Text [ en-US ] = Complimentary close ;
+Text [ en-US ] = Complimentary Close ;
};
String STR_POOLCOLL_SIGNATURE
{
@@ -409,11 +409,11 @@ String STR_POOLCOLL_HEADER
};
String STR_POOLCOLL_HEADERL
{
-Text [ en-US ] = Header left ;
+Text [ en-US ] = Header Left ;
};
String STR_POOLCOLL_HEADERR
{
-Text [ en-US ] = Header right ;
+Text [ en-US ] = Header Right ;
};
String STR_POOLCOLL_FOOTER
{
@@ -421,11 +421,11 @@ String STR_POOLCOLL_FOOTER
};
String STR_POOLCOLL_FOOTERL
{
-Text [ en-US ] = Footer left ;
+Text [ en-US ] = Footer Left ;
};
String STR_POOLCOLL_FOOTERR
{
-Text [ en-US ] = Footer right ;
+Text [ en-US ] = Footer Right ;
};
String STR_POOLCOLL_TABLE
{
@@ -437,7 +437,7 @@ String STR_POOLCOLL_TABLE_HDLN
};
String STR_POOLCOLL_FRAME
{
-Text [ en-US ] = Frame contents ;
+Text [ en-US ] = Frame Contents ;
};
String STR_POOLCOLL_FOOTNOTE
{
@@ -593,19 +593,19 @@ String STR_POOLCOLL_TOX_ILLUS1
};
String STR_POOLCOLL_TOX_OBJECTH
{
-Text [ en-US ] = Object index heading;
+Text [ en-US ] = Object Index Heading;
};
String STR_POOLCOLL_TOX_OBJECT1
{
-Text [ en-US ] = Object index 1;
+Text [ en-US ] = Object Index 1;
};
String STR_POOLCOLL_TOX_TABLESH
{
-Text [ en-US ] = Table index heading;
+Text [ en-US ] = Table Index Heading;
};
String STR_POOLCOLL_TOX_TABLES1
{
-Text [ en-US ] = Table index 1;
+Text [ en-US ] = Table Index 1;
};
String STR_POOLCOLL_TOX_AUTHORITIESH
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/experimental
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 33 +-
1 file changed, 17 insertions(+), 16 deletions(-)
New commits:
commit a1d9caffa38b8acdf241feb94a2f8b66dfd5ea9a
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Nov 20 11:48:47 2012 +0100
android: move toolkit and dummySmallDevice to bootstrapContext as well
Change-Id: I4b6ce49aa5e6d391e832dc1023e47d694a480948
diff --git
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 3837a04..9dc7540 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -127,8 +127,6 @@ public class DocumentLoader
private static final int PAGECACHE_SIZE = PAGECACHE_PLUSMINUS*2 + 1;
BootstrapContext bootstrapContext;
-XToolkitExperimental toolkit;
-XDevice dummySmallDevice;
Object doc;
int pageCount;
XRenderable renderable;
@@ -607,7 +605,7 @@ public class DocumentLoader
renderProps[0].Value = new Boolean(true);
renderProps[1] = new PropertyValue();
renderProps[1].Name = RenderDevice;
-renderProps[1].Value = dummySmallDevice;
+renderProps[1].Value = bootstrapContext.dummySmallDevice;
renderProps[2] = new PropertyValue();
renderProps[2].Name = View;
renderProps[2].Value = new MyXController();
@@ -634,7 +632,7 @@ public class DocumentLoader
XDevice device;
if (pageWidth == 0) {
// Huh?
-device =
toolkit.createScreenCompatibleDeviceUsingBuffer(flipper.getWidth(),
flipper.getHeight(), 1, 1, 0, 0, wrapped_bb);
+device =
bootstrapContext.toolkit.createScreenCompatibleDeviceUsingBuffer(flipper.getWidth(),
flipper.getHeight(), 1, 1, 0, 0, wrapped_bb);
} else {
// Scale so that it fits our device which has a resolution of
@@ -684,7 +682,7 @@ public class DocumentLoader
Log.i(TAG, Rendering page + number + level= + level +
scale= + scaleNumerator + / + scaleDenominator + , offset=( + xOffset + ,
+ yOffset + ));
-device =
toolkit.createScreenCompatibleDeviceUsingBuffer(flipper.getWidth(),
flipper.getHeight(),
+device =
bootstrapContext.toolkit.createScreenCompatibleDeviceUsingBuffer(flipper.getWidth(),
flipper.getHeight(),
scaleNumerator, scaleDenominator,
-xOffset, -yOffset,
wrapped_bb);
@@ -817,25 +815,15 @@ public class DocumentLoader
long t1 = System.currentTimeMillis();
Log.i(TAG, Loading took +
((t1-t0)-bootstrapContext.timingOverhead) + ms);
-Object toolkitService =
bootstrapContext.mcf.createInstanceWithContext
-(com.sun.star.awt.Toolkit,
bootstrapContext.componentContext);
-toolkit = (XToolkitExperimental)
UnoRuntime.queryInterface(XToolkitExperimental.class, toolkitService);
-
renderable = (XRenderable)
UnoRuntime.queryInterface(XRenderable.class, doc);
-// Set up dummySmallDevice and use it to find out the number
-// of pages (renderers).
-ByteBuffer smallbb =
ByteBuffer.allocateDirect(SMALLSIZE*SMALLSIZE*4);
-long wrapped_smallbb =
Bootstrap.new_byte_buffer_wrapper(smallbb);
-dummySmallDevice =
toolkit.createScreenCompatibleDeviceUsingBuffer(SMALLSIZE, SMALLSIZE, 1, 1, 0,
0, wrapped_smallbb);
-
PropertyValue renderProps[] = new PropertyValue[3];
renderProps[0] = new PropertyValue();
renderProps[0].Name = IsPrinter;
renderProps[0].Value = new Boolean(true);
renderProps[1] = new PropertyValue();
renderProps[1].Name = RenderDevice;
-renderProps[1].Value = dummySmallDevice;
+renderProps[1].Value = bootstrapContext.dummySmallDevice;
renderProps[2] = new PropertyValue();
renderProps[2].Name = View;
renderProps[2].Value = new MyXController();
@@ -863,6 +851,8 @@ public class DocumentLoader
public XComponentContext componentContext;
public XMultiComponentFactory mcf;
public XComponentLoader componentLoader;
+public XToolkitExperimental toolkit;
+public XDevice dummySmallDevice;
}
static void dumpUNOObject(String objectName, Object object)
@@ -973,6 +963,17 @@
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fd91019804398c0643951eb291a45d3931968ae3 Author: Andras Timar ati...@suse.com Date: Mon Oct 1 15:19:11 2012 +0200 Updated core Project: help 66abeb18556b468ea3d97cea78dcd8e9f0c94380 translations is a source-only module diff --git a/helpcontent2 b/helpcontent2 index c3cfcf7..66abeb1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c3cfcf7098787f11ca987ef8db65fbb670d8da6e +Subproject commit 66abeb18556b468ea3d97cea78dcd8e9f0c94380 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - prj/build.lst source/auxiliary source/text
prj/build.lst| 21 ++- source/auxiliary/makefile.mk | 43 +--- source/text/makefile.mk | 76 +++ 3 files changed, 89 insertions(+), 51 deletions(-) New commits: commit 66abeb18556b468ea3d97cea78dcd8e9f0c94380 Author: Andras Timar ati...@suse.com Date: Mon Oct 1 15:19:11 2012 +0200 translations is a source-only module Change-Id: I85a8d170b83d1b0cf872a1fe7a216dd11884b1a2 diff --git a/prj/build.lst b/prj/build.lst index ee7424a..767425f 100644 --- a/prj/build.lst +++ b/prj/build.lst @@ -1,4 +1,4 @@ -h2 helpcontent2 :TRANSLATIONS:translations xmlhelp NULL +h2 helpcontent2 :xmlhelp NULL h2 helpcontent2 usr1 - all helpcontent2_mkout helpcontent2_aux NULL h2 helpcontent2\prj get - all helpcontent2_prj helpcontent2_aux NULL h2 helpcontent2\source\text\sbasic\guide nmake - all helpcontent2_sbas_guid helpcontent2_aux NULL commit b468ed513b22bed0ad3bc70a51baf41903b705d1 Author: Zolnai zolnaitamas20...@gmail.com Date: Tue Nov 20 00:38:47 2012 +0100 Fix dependacies in help Change-Id: I37bfd70884864b43e1bf71c4971cfb85e85baa66 diff --git a/prj/build.lst b/prj/build.lst index 9b73fc0..ee7424a 100644 --- a/prj/build.lst +++ b/prj/build.lst @@ -52,14 +52,14 @@ h2 helpcontent2\source\text\swriter\01 nmake - all helpconten h2 helpcontent2\source\text\swriter\02nmake - all helpcontent2_swri_02 helpcontent2_aux NULL h2 helpcontent2\source\text\swriter\04nmake - all helpcontent2_swri_04 helpcontent2_aux NULL h2 helpcontent2\source\text\swriter\guide nmake - all helpcontent2_swri_guid helpcontent2_aux NULL -h2 helpcontent2\util\sbasic nmake - all helpcontent2_ut_sbas helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL -h2 helpcontent2\util\schart nmake - all helpcontent2_ut_scha helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL -h2 helpcontent2\util\scalcnmake - all helpcontent2_ut_scal helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04
[Libreoffice-commits] .: android/experimental
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 57 +++---
1 file changed, 42 insertions(+), 15 deletions(-)
New commits:
commit 4460f406a4c33be48f31f296c6ca9d85ef2bd4c1
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Nov 20 12:38:21 2012 +0100
android: don't load the document after every rotation
Change-Id: I0af154bc5bc6cc79ab45a85a5a06e4539442ec81
diff --git
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 9dc7540..64d4248 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -108,6 +108,7 @@ import com.sun.star.view.XRenderable;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import java.util.ArrayList;
import org.libreoffice.android.Bootstrap;
@@ -127,9 +128,7 @@ public class DocumentLoader
private static final int PAGECACHE_SIZE = PAGECACHE_PLUSMINUS*2 + 1;
BootstrapContext bootstrapContext;
-Object doc;
-int pageCount;
-XRenderable renderable;
+DocumentContext documentContext;
GestureDetector.OnGestureListener gestureListener;
GestureDetector gestureDetector;
@@ -151,7 +150,7 @@ public class DocumentLoader
{
Log.i(TAG, onFling: + event1 + + event2);
if (event1.getX() - event2.getX() 120) {
-if (((PageViewer)flipper.getCurrentView()).currentPageNumber
== pageCount-1)
+if (((PageViewer)flipper.getCurrentView()).currentPageNumber
== documentContext.pageCount-1)
return false;
Animation inFromRight = new
TranslateAnimation(Animation.RELATIVE_TO_SELF, 1, Animation.RELATIVE_TO_SELF, 0,
@@ -612,7 +611,7 @@ public class DocumentLoader
// getRenderer returns a set of properties that include the
PageSize
long t0 = System.currentTimeMillis();
-PropertyValue rendererProps[] = renderable.getRenderer(number,
doc, renderProps);
+PropertyValue rendererProps[] =
documentContext.renderable.getRenderer(number, documentContext.doc,
renderProps);
long t1 = System.currentTimeMillis();
Log.i(TAG, getRenderer took +
((t1-t0)-bootstrapContext.timingOverhead) + ms);
@@ -692,7 +691,7 @@ public class DocumentLoader
renderProps[1].Value = device;
t0 = System.currentTimeMillis();
-renderable.render(number, doc, renderProps);
+documentContext.renderable.render(number, documentContext.doc,
renderProps);
t1 = System.currentTimeMillis();
Log.i(TAG, Rendering page + number + took +
((t1-t0)-bootstrapContext.timingOverhead) + ms);
@@ -727,7 +726,7 @@ public class DocumentLoader
Log.i(TAG, doInBackground( + number + ));
-if (number = pageCount)
+if (number = documentContext.pageCount)
return -1;
state = PageState.LOADING;
@@ -811,11 +810,11 @@ public class DocumentLoader
loadProps[2].Value = new Boolean(true);
long t0 = System.currentTimeMillis();
-doc =
bootstrapContext.componentLoader.loadComponentFromURL(url, _blank, 0,
loadProps);
+documentContext.doc =
bootstrapContext.componentLoader.loadComponentFromURL(url, _blank, 0,
loadProps);
long t1 = System.currentTimeMillis();
Log.i(TAG, Loading took +
((t1-t0)-bootstrapContext.timingOverhead) + ms);
-renderable = (XRenderable)
UnoRuntime.queryInterface(XRenderable.class, doc);
+documentContext.renderable = (XRenderable)
UnoRuntime.queryInterface(XRenderable.class, documentContext.doc);
PropertyValue renderProps[] = new PropertyValue[3];
renderProps[0] = new PropertyValue();
@@ -829,9 +828,9 @@ public class DocumentLoader
renderProps[2].Value = new MyXController();
t0 = System.currentTimeMillis();
-pageCount = renderable.getRendererCount(doc, renderProps);
+documentContext.pageCount =
documentContext.renderable.getRendererCount(documentContext.doc, renderProps);
t1 = System.currentTimeMillis();
-Log.i(TAG, getRendererCount: + pageCount + , took +
((t1-t0)-bootstrapContext.timingOverhead) + ms);
+Log.i(TAG, getRendererCount: + documentContext.pageCount +
, took + ((t1-t0)-bootstrapContext.timingOverhead) + ms);
}
catch (Exception e) {
e.printStackTrace(System.err);
@@ -855,6 +854,18 @@ public class DocumentLoader
public XDevice
Re: GTK theming: oxygen-gtk support broken
On 19.11.2012 23:55, Ruslan Kabatsayev wrote: Hi Ivan, OK, it appears that these commits have made LibO work more correctly in GTK handling, and now oxygen-gtk's old hacks to work around previous LibO incorrectness overcompensate the margins and need to be removed. To get this all work more or less as expected (i.e. to fix oxygen-gtk at correct time), I'd need to know, which LibO releases will contain these commits. Any pointers to this? Hi Ruslan, The commits are included to the (upcoming) 4.0 release, and the release plan says the 4.0.0 will be out Week 6, Feb 4 - Feb 10, 2013, see http://wiki.documentfoundation.org/ReleasePlan/4.0 Thanks! Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
OUStringBuffer indexOf familly of function do not actually t...
Norbert Thiebaud has abandoned this change. Change subject: OUStringBuffer indexOf familly of function do not actually throw. .. Patch Set 1: Abandoned misunderstanding -- To view, visit https://gerrit.libreoffice.org/1138 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ia5ebc99bf9a2b1e29694f8093036ff2745287175 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] bnc#681110: Fix squashed glyphs with Cairo canvas.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1142 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/1142/1 bnc#681110: Fix squashed glyphs with Cairo canvas. I suppose it is the same misconception as in fdo#55931 - I am convinced that the font metrics should not be used here. Looks to me as if in the past, the font width computation was broken somewhere deep inside OOo, and everyone instead of fixing the root cause was just working that around by using the FontMetric; and then one day the root cause was fixed, and all the workarounds broke ;-) - but that is just a theory. Change-Id: I741bf8f4eaea4f7d8bc698dc9a8124109dfb8c20 --- M starmath/inc/node.hxx M starmath/source/node.cxx 2 files changed, 23 insertions(+), 4 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1142 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I741bf8f4eaea4f7d8bc698dc9a8124109dfb8c20 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Véghelyi András veaqaai2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [PATCH] fdo#50950 modify calc functions WEEKNUM(_ADD) to comply with ODFF1.2
Hi Eike, I'm currently putting your review into a better patch: -renaming the functions: I reverted some lines as you proposed. The link to the help files has been broken, i.e. WEEKNUM now points to the (partially out of date) help text for WEEKNUM_ADD, but ISOWEEKNUM does not point to a help text. That link wasn't broken, the xhp files were not included in the patch. I guess it is beyond the scope for git and that I should use ./g instead to include it. Am I correct here? There are three cases to be considered: 1. reading ODF 1.2 (ODFF) 2. writing ODF 1.0/1.1 (PODF) 3. reading ODF 1.0/1.1 (PODF) This will need some study from me, poking is not my strongest capabilty. I will put the latest diff file as an attachment in bug 50950, as I'm afraid the 'poking' will take some time. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - l10ntools/source svtools/source unusedcode.exclude
l10ntools/source/localize.cxx |1 +
svtools/source/contnr/templwin.cxx | 13 ++---
unusedcode.exclude |3 +++
3 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit c0ae8f9a03ab292de8bfdce29c3ccbb9965a3068
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 20 13:32:05 2012 +0100
Improve error reporting
Change-Id: Icdafde88e3984cf3689f591216a890392892dfce
diff --git a/svtools/source/contnr/templwin.cxx
b/svtools/source/contnr/templwin.cxx
index 714667f..011dff1 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -1455,8 +1455,11 @@ void SvtDocumentTemplateDialog::InitImpl( )
aPackageBtn.SetClickHdl( LINK( this, SvtDocumentTemplateDialog,
PackageHdl_Impl ) );
aPackageBtn.Enable(xSyncDbusSessionHelper.is());
}
-catch(...)
+catch (Exception e)
{
+SAL_INFO(
+svtools.contnr,
+disable Install Template Pack, caught e.Message);
aPackageBtn.Enable(false);
}
Link aLink = LINK( this, SvtDocumentTemplateDialog, OKHdl_Impl );
@@ -1656,8 +1659,12 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog,
PackageHdl_Impl)
::rtl::OUString sInteraction();
xSyncDbusSessionHelper-InstallPackageNames(0, vPackages,
sInteraction);
}
-catch(...)
-{ }
+catch (Exception e)
+{
+SAL_INFO(
+svtools.contnr,
+trying Install Template Pack, caught e.Message);
+}
return 0;
}
commit 50b4b0db8bcf33e26dc332d558f0e03c65ad742b
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 20 13:31:00 2012 +0100
Add comphelper/configuration.hxx functions to unusedcode.exclude
The functionality in comphelper/configuration.hxx is used by C++ headers to
simplify configuration access that are generated via
officecfg/Package_cppheader.mk.
Change-Id: I85d26309ec8c4f8ac5cde773fd3298a699bad030
diff --git a/unusedcode.exclude b/unusedcode.exclude
index f6dc906..dc8ec70 100644
--- a/unusedcode.exclude
+++ b/unusedcode.exclude
@@ -24,3 +24,6 @@ apitest::XPropertySet::testAddVetoableChangeListener()
apitest::XPropertySet::testRemovePropertyChangeListener()
apitest::XPropertySet::testRemoveVetoableChangeListener()
apitest::XSpreadsheetDocument::testGetSheets()
+comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptrcomphelper::ConfigurationChanges
const, rtl::OUString const) const
+comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString
const) const
+comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptrcomphelper::ConfigurationChanges
const, rtl::OUString const, com::sun::star::uno::Any const) const
commit 954f991ba8b109a5e642fb6520ba076c3d1715ed
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 20 13:30:16 2012 +0100
tubes missing from l10n project list
Change-Id: Ieb04a22f83e698521aa90fe16fce4f66c4635034
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 8dfb8ec..e4eb955 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -322,6 +322,7 @@ bool includeProject(rtl::OUString const project) {
sw,
swext,
sysui,
+tubes,
uui,
vcl,
wizards,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/Bootstrap
android/Bootstrap/no-resource-compress.xml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a0adefdc4991baa8a3c402f3b01270b73fd28362
Author: Tor Lillqvist t...@iki.fi
Date: Tue Nov 20 13:44:00 2012 +0200
Update to match SDK r21
Change-Id: I7bc54a295c7155a1a173c28f45118a6d2983d0d2
diff --git a/android/Bootstrap/no-resource-compress.xml
b/android/Bootstrap/no-resource-compress.xml
index 5363c4c..314f6d5 100644
--- a/android/Bootstrap/no-resource-compress.xml
+++ b/android/Bootstrap/no-resource-compress.xml
@@ -26,6 +26,7 @@
resourcefilter=${aapt.resource.filter}
libraryResFolderPathRefid=project.library.res.folder.path
libraryPackagesRefid=project.library.packages
+libraryRFileRefid=project.library.bin.r.file.path
previousBuildType=${build.last.target}
buildType=${build.target}
ignoreAssets=${aapt.ignore.assets}
@@ -36,4 +37,4 @@
/aapt
/do-only-if-not-library
/target
-/project
\ No newline at end of file
+/project
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] VclContainer: use transparent background
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1143 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/1143/1 VclContainer: use transparent background see http://lists.freedesktop.org/archives/libreoffice/2012-November/040587.html, screenshot at [3]. Change-Id: Iaf72b3734564301244365773f05c6df01a6dea62 --- M vcl/source/window/layout.cxx 1 file changed, 1 insertion(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1143 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf72b3734564301244365773f05c6df01a6dea62 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ivan Timofeev timofeev@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.0.alpha1'
Tag 'libreoffice-4.0.0.0.alpha1' created by Petr Mladek pmla...@suse.cz at 2012-11-20 12:57 -0800 Tag libreoffice-4.0.0.0.alpha1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQq34nAAoJEPQ0oe+v7q6jb7sP/jnmmhqyx0ACxh0ATYuRtyRd XLdJPezc3LezD2XIBlO1If9jNTiiyNXeS3tUQK8tsNRClOx7weAikBeW/s1GSW0N F6PR7AMkKHcf2cmWdiAxbzW2Ggpodo2Zil6szK/4dP8zbSwf6tgUmfN+hcbqrZSe XACHKjgUPvOFWAjMqQ3+yYRtq3ilKcIaZrY2SvanerZkrrFGv8Ep2vhNKtJXFpPV npaSI4mDBZRS9fnxcfcGJPxlUdpPUAGOwf5z5vTGUL4as5o33bPXo9mW6R+iJNIK /syhzUIyGHYXvM40PRKWrsMj6IDOBxtDEUh9qMcDxefVLpMVDlImmAJRd/vrpubP PnBUNRNwWcQE7R2lFy/OkHiNiaPEtpjgx+L6zLKKohE+HUUv6aiCaboCy0RgEEJ3 MEcrDxfCpWnLtlHE45O6q607bJ5kzoNbhsfVPtJeUAyUgSI12n9D/Bgn+7ViSejh +8yHZF4AdO8nEpaI25vJAV2WtqoYpitfgUlytbg6cewHmZsYeMp7+PF1YZgptk1R sFlFJwsJW5ihzLBlYMas5otfi7OK1SC65ZqVAsxvFtCt/eo1Byxbo20vmmBc9UnP CEEvXPdLx+tsNSHHBdPCkDeNtGjW2qkA5meJfIId5nYIfaONfCfbeZEuSWxXfhqQ xG2gQ5+h4UWX+sojoSrC =H7hV -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-34: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.0.alpha1'
Tag 'libreoffice-4.0.0.0.alpha1' created by Petr Mladek pmla...@suse.cz at 2012-11-20 12:57 -0800 Tag libreoffice-4.0.0.0.alpha1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQq340AAoJEPQ0oe+v7q6jccYP/1f8jaPpvP6q4YglLJ+V7lg5 L+sqBPGCzuI8lV3zt1mzybifBRIDV5bPs5voKwQK0vaeIosI1Ft7Oh0tg6Qgs+6l iGGmiyjgc72RuD3kLTzvOm67WGU69bPkxIwAJmLEIEmCjgYVPQAclDpS53wvDn/p rKujCP3pHyGj8lxQJiGIfqYXRIJTZv0Hdcl2CneyUR7Cq2sEnxYRRXbpnvaxiBfb FRohqat86QLXpOQk4VMQKTcPqPtF3+1jEBRHoY0e2QYvafrdo+goDaTm08NmSrXG UocXVfLM4PxsQSWLkaROZ1A6ZgWfvA4Z2QNJLJQ7PLCIP4FOUFSzRgXN9jzbafXl 8mosqJo1QRltyXunpx96ktzXAbC7Puz8MozUfnNr/HcK/ZtICxOtagBQv8QxEtzj Gco/M/gb4pwDTRRpvXiO6pFOonPwYluFblMuLrWFj+oI9EegUGhJaqHd6KCbos4d YarPKufuxaUHR/9wBFi00piZrihiRQXTLNWADfWoJnm3T8Pdib7Jf0LrjSfFtXF7 hdXCeZzIcIY1zLCpfnnTfJFzg3kAaoMQHkuzx20T9aL/RuYIFYoZuRHqXU2jkEXM 7i3L1tTeKwqXp9Xs2qTqGkr51VB90ZmVNiHU2DEJ7noCC2+I2iPR122En0clBNtb Zo7fae8O/whzZOSgYucy =RyjQ -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-111: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.0.alpha1'
Tag 'libreoffice-4.0.0.0.alpha1' created by Petr Mladek pmla...@suse.cz at 2012-11-20 12:57 -0800 Tag libreoffice-4.0.0.0.alpha1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQq348AAoJEPQ0oe+v7q6jz5oP/As/7Y91+ysK+XFAboekA953 9VWMItZlfWP5eARjqmGLj8sy5ichg2aW3VudANm2S/4y3v6GlAE3uK/GUqyU/8F8 VbV9H93LAO/K9Fvq2RYQzet8ERP6nWp/Gx8bL1P2X/zPC9htX7PyOdEkFnu6AhMc xmL7AuLTaZEWxBIdNNAThgyCdCjs/p7CBFKD9jsQZFM+SGQovTrY31dlkmWGLzkJ //njQed7EGUB4/0fwaD4IpLOW67aYKNrFbPJVG+I/ATnbQFq/Gc8IQs9+TXNW9q5 zFqR95+dQzhlSzn0Aok6BFpT+JWeim0itafDLoevdY3hsOASqDzoj6CY2MR4vCcc d+9IdgSaVmlYxsPa5XYDCwt3WOmYZp/AX8sfo6Ojjp869MpuMSnVeMDe5ujBlIqH 8SrlDBgSFlSISGFldTb689g1obqVv9pwCUH7NR4s5aquROIt69x5b/sC9KkhAF3t 0MfkZILlNH5l4GztamcokN5nYW5ggpJBZe0OI0hJFLliJR6LXePwfQIBEcSHlGNy xuA+EBphqwrpQVyFI+otpXqat8/ndDo7X2RRk/21os1EMbkq0un/3lynDoiVBqUv ri776iNuwLkx2Hwzrw5WHTWO0GgciJa9rVyO+TsrKt6cEVcRLFak3DUxKXiQK3Vg px1xXmyUH+pyaQ7hzSLO =AivA -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-28: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.0.alpha1'
Tag 'libreoffice-4.0.0.0.alpha1' created by Petr Mladek pmla...@suse.cz at 2012-11-20 12:55 -0800 Tag libreoffice-4.0.0.0.alpha1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQq33BAAoJEPQ0oe+v7q6jdgoP/1K28woiaK9roSBIKPqHp0Bm VzIQpWuu8aW1zf5ReT3wGqccKgDnycJwJBQfnJEhTEbKUwlBG1Vsy07O4T9NALG3 5C4FVfp1zlgyz+U0a3bw7uHQ31Btw4zSK0HEozkY0PjOcTWDgfYECZv6j5PHTHMY ghsQKrQDGa9w0R1Oi+6jXxlKX9i4zAQ5zzLfGU6MUILcumhny/f991MwsGb3blzO k8uj7FEm8TFI2yWe7qS1XXfK4lo20vaNH0/Kty18nroMc8HKlEOt1T92ZGit755u Xvz04MQqXiLTRA5mV4kgAqbG+LE8N3Rf34ATnzI5gFIe3/yK7T+Z3r1X7tHSsAOH ken9mtGZ/A6Bo1/QSDWwS9oszlJhhx1GlCZEwp4Dyu/6dfBdSpsXSvvOYNhGDZfu Ddl16ac0cB/8BMvQbm20j1E504Qu/mhXSwMH79HJGWomhvkK2aIGlIQrrQwQA7ro LKtqeqjggXtkLDu01zm+xWEXUQeo95NLVhBMFO+PmJXl2NO+UIDTAiqwkKHJ9FqK QumZJmRoQBPAe1MW/wcwHOZESJ+fZwhVQ/yBT7VsqZ6xvIG2sGRLUf5+bzWHme9G In1g5AJgHTo1MrO0iRqqRt14wnS5II8MGmPDXyWzh8LNzW8SxkS+I9DLXIYs3WBP /3Hd4IOVT5u1TvPFikDN =wW7k -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-8808: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source cui/source sfx2/inc svx/inc svx/source sw/source tools/inc unotools/inc vcl/inc
basctl/source/basicide/basides1.cxx|2 --
basctl/source/basicide/basides3.cxx|2 --
basctl/source/basicide/basidesh.cxx|1 -
basctl/source/inc/basidesh.hxx |2 --
cui/source/inc/dlgname.hxx | 10 --
cui/source/inc/linkdlg.hxx |2 --
cui/source/inc/macropg.hxx |4
cui/source/inc/transfrm.hxx|4
sfx2/inc/inettbc.hxx |5 +
sfx2/inc/sfx2/docfile.hxx |4
sfx2/inc/sfx2/macropg.hxx |4 ++--
sfx2/inc/sfx2/viewsh.hxx |2 --
svx/inc/svdibrow.hxx |4 ++--
svx/source/tbxctrls/colorwindow.hxx|2 --
svx/source/tbxctrls/tbcontrl.cxx |4
sw/source/ui/inc/docfnote.hxx |2 --
tools/inc/tools/solar.h|5 -
unotools/inc/unotools/ucblockbytes.hxx |2 --
vcl/inc/impbmp.hxx |4
vcl/inc/vcl/syswin.hxx |2 --
vcl/inc/vcl/timer.hxx |2 --
21 files changed, 9 insertions(+), 60 deletions(-)
New commits:
commit 56d3de7360434e4f15d7bd92d50888e8bc092ad6
Author: Tor Lillqvist t...@iki.fi
Date: Tue Nov 20 13:55:16 2012 +0200
Bin pointless _SOLAR__PRIVATE which was always 1 anyway
Change-Id: I98f35920f02d4ee71787a9968158b220af69bde6
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 42644e5..85da8ae 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _SOLAR__PRIVATE 1
-
#include basidesh.hrc
#include helpid.hrc
diff --git a/basctl/source/basicide/basides3.cxx
b/basctl/source/basicide/basides3.cxx
index 5d043ea..8d0b70d 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -19,8 +19,6 @@
#include basidesh.hrc
-#define _SOLAR__PRIVATE 1
-
#include basidesh.hxx
#include baside2.hxx
#include baside3.hxx
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index ed86cca..812ca41 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -22,7 +22,6 @@
#include basidesh.hxx
-#define _SOLAR__PRIVATE 1
#include tools/diagnose_ex.h
#include basic/basmgr.hxx
#include basidesh.hrc
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index be34a78..e093680 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -95,7 +95,6 @@ private:
friend class ContainerListenerImpl;
::com::sun::star::uno::Reference
::com::sun::star::container::XContainerListener m_xLibListener;
-#if _SOLAR__PRIVATE
voidInit();
voidInitTabBar();
voidInitScrollBars();
@@ -113,7 +112,6 @@ private:
DECL_LINK( TabBarHdl, TabBar* );
DECL_LINK( TabBarSplitHdl, TabBar * );
-#endif
static unsigned nShellCount;
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 35c065d..de64052 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -39,9 +39,8 @@ private:
HelpButton aBtnHelp;
LinkaCheckNameHdl;
-#if _SOLAR__PRIVATE
+
DECL_LINK(ModifyHdl, void *);
-#endif
public:
SvxNameDialog( Window* pWindow, const String rName, const String rDesc );
@@ -93,9 +92,8 @@ private:
// callback link for name uniqueness
LinkaCheckNameHdl;
-#if _SOLAR__PRIVATE
+
DECL_LINK(ModifyHdl, void *);
-#endif
public:
// constructor
@@ -156,10 +154,10 @@ private:
CancelButtonaBtnCancel;
FixedImage aFtImage;
Image* pImage;
-#if _SOLAR__PRIVATE
+
DECL_LINK(Button1Hdl, void *);
DECL_LINK(Button2Hdl, void *);
-#endif
+
public:
SvxMessDialog( Window* pWindow, const String rText, const String rDesc,
Image* pImg = NULL );
~SvxMessDialog();
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 1c75302..e5d928d 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -73,7 +73,6 @@ class SvBaseLinksDlg : public ModalDialog
sal_BoolbHtmlMode;
Timer aUpdateTimer;
-#if _SOLAR__PRIVATE
DECL_LINK( LinksSelectHdl, SvTabListBox * );
DECL_LINK( LinksDoubleClickHdl, SvTabListBox * );
DECL_LINK( AutomaticClickHdl, RadioButton * );
@@ -88,7 +87,6 @@ class SvBaseLinksDlg : public ModalDialog
String ImplGetStateStr( const sfx2::SvBaseLink );
void SetType( sfx2::SvBaseLink rLink, sal_uInt16 nPos, sal_uInt16 nType );
void InsertEntry( const sfx2::SvBaseLink rLink, sal_uInt16 nPos =
LISTBOX_APPEND, sal_Bool bSelect = sal_False);
-#endif
void StartUpdateTimer() { aUpdateTimer.Start(); }
diff --git a/cui/source/inc/macropg.hxx
Re: [Fwd] LibreOffice 3.6.3.2 build on Linux fail on dictionaries and help (localize.sdf not found)
Hi there, On Tue, 2012-11-20 at 03:01 -0800, piernov wrote: Since I posted my message on the wrong ML, I'm forwarding it (with the nabble interface, sorry…) as suggested here. So here is my problem : :-) Hey, I don't know if it's the right place to ask, but I'm experiencing some problems building LibreOffice 3.6.3.2 on GNU/Linux 32-bit. So this is the right place to ask; it helps to paste the error fragment of your log, in this case: log for /tmp/work-23513/src/libreoffice-core-3.6.3.2/dictionaries/hu_HU Warning : Can't open ../unxlngi6.pro/misc/dictionaries/dummy/localize.sdf Warning : Can't open /tmp/work-23513/src/libreoffice-core-3.6.3.2/workdir/unxlngi6.pro/CustomTarget/translations/translate/sdf/dictionaries/hu_HU/dialog/localize.sdf propmerge: cannot open sdf file: /tmp/work-23513/src/libreoffice-core-3.6.3.2/workdir/unxlngi6.pro/CustomTarget/translations/translate/sdf/dictionaries/hu_HU/dialog/localize.sdf at /tmp/work-23513/src/libreoffice-core-3.6.3.2/solver/unxlngi6.pro/bin/propmerge line 46. Which looks unusual :-) Of course, if you need to get a quick build to develop with you can configure with: --without-help. Beyond that I'm not sure :-) HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 54cd57e03e115d6b009409e6df374603452b1378 Author: Andras Timar ati...@suse.com Date: Tue Nov 20 11:00:15 2012 +0100 Updated core Project: translations b2cf0bf6fb5d098ed7997099349b74de8fb5e1f1 initial import of LibreOffice 4.0 translations diff --git a/translations b/translations index de54a2f..b2cf0bf 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit de54a2fcdee6bd2d8005a819d4a3a822b2a8043f +Subproject commit b2cf0bf6fb5d098ed7997099349b74de8fb5e1f1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Mihkel Tõnnov mihh...@gmail.com changed: What|Removed |Added Depends on||42134 -- 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 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #394 from Mihkel Tõnnov mihh...@gmail.com --- Added bug 42134 - FORMATTING: Autofit doesn't work properly on long texts This is terribly annoying for me: with longer lines, part of or all of the text in a text frame regularly gets squeezed together so the text becomes illegible. Workaround is to disable Autofit completely. -- 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 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Roman Eisele b...@eikota.de changed: What|Removed |Added Depends on||54933 Blocks|54933 | --- Comment #395 from Roman Eisele b...@eikota.de --- I would guess that bug 54933 is meant to be in the “Depends on” field, not in the “Blocks” list, isn’t it?! -- 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-qa] Minutes - QA Call 11/16/2012
*Time Start: 1405 UTC +Slight mix up with call in number, Joel fixed on wiki and sent out correction email shortly before meeting * Present +Bjoern, Florian, Joel, Peter +Mas joined near end of meeting, time mix up *Completed Action Items +Flos server installation program +The minimal build LibO SI GUI is downloading matches 99% compared to release configuration only missing MediaWiki and NLPSolver +https://github.com/reisi007/LibreOffice_Server_Installation_GUI *Pending Action Items +None *Bugzilla +bugzilla Openid alternatives +OpenID broken +Facebook/Twitter – possibly Gmail +Punting for next time, Bjoern will investigate + localized bsa stuff +French Brazillian communities have shown interest +BSA would go to mailing list instead where someone could translate to English and then put on FDO +Benefit would be that non-English speakers could get good quality bug reports on FDO and that this would make duplicates less likely +Setup is basically there already, shouldn't be hard to implement +Goal to try with one language first (most likely French as the community is very large) +Bjoern will discuss this with Rob in Munich +Number of Old Untouched Bugs Climbing (well over 700) +Is there a need to do a mass FDO status change for old bugs that have not been touched for a long period of time? +Punted for next time, we will all think of possible solutions *Triaging +Stats +Joel showed Wiki page, everyone will think about useful stats for marketing +http://wiki.documentfoundation.org/QA_Stats +Volunteers +Ideas to grow community, triaging is really easy step for users to become contributors +BSA – invite to join/participate after submitting bug +Joel Bjoern will look into this +http://bugs.freedesktop.org/show_bug.cgi?id=57199 +Twitter Feed +Look into expanding twitter stuff that Bjoern has already done +Needs admin involved as we'll need another email +Discuss in Munich +Wiki +Really really simple wiki page (3-4 points) with the simplified “how to triage” +Joel will do this +Realistic Goals +Get ESC involved in some kind of “what's currently being worked on” +Goal would be to have triagers/users experiment with these features before release +Punt until after 4.0 release *Release 4.0 To Do +QA/Todo rename 3.7 to 4.0 http://wiki.documentfoundation.org/QA/Todo_rename_3.7_to_4.0 +Everyone will look at this and see if there is anything they can help with or other things that need to be done +We will merge 3.7 4.0 master in FDO *Agenda Minutes +Automate agenda and minutes through IRC bot +Going to try in the next meeting, Joel and Bjoern will play around with options before meeting +Florian – Good for democratic process of LibreOffice, anyone can add to agenda,etc... +Possibility to automatically add to wiki through bot – Joel likes this *Hard Hacks +Everyone will get 1 additional proposed hard hack on the wiki by next meeting *Next Meeting Date/Time +November 30^th ^, 2012, 1400 UTC *End Time: 1510 UTC ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: what's the problem with system cairo ?
On 17 November 2012 23:04, Matúš Kukan matus.ku...@gmail.com wrote: I've been gbuildizing cairo but then realized it's used only for linux [1], as also cairo/README says. Though there are many platform conditionals in various cairo related makefiles. Maybe it was used more in the past ? So can't we just use system cairo and/or pixman? Anyone could shed some light on this ? Anyway, this is what I've done so far: https://gerrit.libreoffice.org/1144 HTH, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] libreoffice-4.0.0.0.alpha1 tag created + modified packaging of source tarballs
Hi, there have been created the libreoffice-4.0.0.0.alpha1 tag. The corresponding official builds will be available within next few days. PURPOSE: This release in intended only for internal testing. The main purpose is to test that we are able to create release builds from master and that they are usable for testing. We will not push it on mirros. Please, do not announce the bugs widely. IMPORTANT: We switched to submodules in git, so there are not longer symlinks from the optional modules. I used this opportunity to slightly modify packaging of the sources: 1. Use the same top-level directory for all tarballs: + libreoffice-version 2. removed -core from the main tarball name, so we have: + libreoffice-version.tar.xz + libreoffice-dictionaries-version.tar.xz + libreoffice-help-version.tar.xz + libreoffice-translations-version.tar.xz The result is that they can be easily unpacked using: for tarball in *.xz ; do tar -xf $tarball ; done Please, let me know if you do not like this change. NOTE: If time permits, I will try to produce list of commits and fixed bugs against 3.6.3. It is a bit tricky and might take some time. I think that the list of new features is more interesting in this case, see http://wiki.documentfoundation.org/ReleaseNotes/4.0 Now, you might switch your current 3-6 source tree to it using: ./g fetch --tags ./g checkout -b tag-libreoffice-4.0.0.0.alpha1 libreoffice-4.0.0.0.alpha1 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will be available from the official page together with the builds. See also the schedule at http://wiki.documentfoundation.org/ReleasePlan#4.0_release and release criteria at http://wiki.documentfoundation.org/Release_Criteria Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] cairo: convert to gbuild
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1144 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/1144/1 cairo: convert to gbuild Change-Id: I1f3dd368a0d0b78b73df3baad214a1079bbbd1d3 --- M Makefile.top M Module_tail_build.mk M RepositoryExternal.mk M RepositoryFixes.mk M RepositoryModule_ooo.mk A cairo/ExternalPackage_cairo.mk A cairo/ExternalPackage_pixman.mk A cairo/ExternalProject_cairo.mk A cairo/ExternalProject_pixman.mk A cairo/Makefile A cairo/Module_cairo.mk A cairo/UnpackedTarball_cairo.mk A cairo/UnpackedTarball_pixman.mk D cairo/cairo-1.10.2.configure_ac.patch R cairo/cairo/cairo-1.10.2-oldfontconfig.patch R cairo/cairo/cairo-1.10.2.android.patch R cairo/cairo/cairo-1.10.2.ios.patch R cairo/cairo/cairo-1.10.2.no-atsui.patch R cairo/cairo/cairo-1.10.2.patch R cairo/cairo/cairo-1.10.2.wntmsc.patch R cairo/cairo/cairo.dlsym.lcdfilter.patch A cairo/pixman/Makefile.win32.common R cairo/pixman/pixman-0.24.4.android.patch R cairo/pixman/pixman-0.24.4.patch M cairo/prj/build.lst M cairo/prj/d.lst D cairo/prj/dmake M configure.ac M scp2/source/ooo/file_library_ooo.scp M tail_build/prj/build.lst M vcl/Library_vclplug_gtk.mk M vcl/inc/unx/gtk/gtkframe.hxx 32 files changed, 318 insertions(+), 205 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1144 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f3dd368a0d0b78b73df3baad214a1079bbbd1d3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO as an NPAPI browser plugin host?
On Fri, 2012-11-16 at 16:08 +0100, Stephan Bergmann wrote: ** Trying the same with LO Writer's Insert - Object - Plug-in... fails (just specifying the .ogg/.flv file pathname, leaving Options blank). The SAL_INFO output indicates that libtotem-clone-plugin.so is loaded, but calling its NP_Initialize returns 3 (NPERR_INVALID_FUNCTABLE_ERROR) because the NPNetscapeFuncs struct created in extensions/source/plugin/unx/npnapi.cxx (based on an outdated definition of NPNetscapeFuncs in np_sdk/mozsrc/npupp.h) is too short (i.e., misses functions added by later NPAPI revisions and expected by the given libtotem-clone-plugin.so). The last time I fixed these I hacked totem to use the old api. i.e. https://bugzilla.redhat.com/show_bug.cgi?id=475187 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docrecord.py src/docstream.py
src/docrecord.py | 21 + src/docstream.py | 11 +-- 2 files changed, 30 insertions(+), 2 deletions(-) New commits: commit 68dadb716e6ee7f12f1ad804458896291ac67611 Author: Miklos Vajna vmik...@suse.cz Date: Tue Nov 20 16:07:04 2012 +0100 dump PlcfandTxt (comment text) diff --git a/src/docrecord.py b/src/docrecord.py index 46369d3..6c51a48 100755 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -359,6 +359,27 @@ class PlcBteChpx(DOCDirStream, PLC): print '/aFC' print '/plcBteChpx' +class PlcfandTxt(DOCDirStream, PLC): +The PlcfandTxt structure is a PLC that contains only CPs and no additional data. +def __init__(self, mainStream, offset, size): +DOCDirStream.__init__(self, mainStream.doc.getDirectoryStreamByName(1Table).bytes, mainStream=mainStream) +PLC.__init__(self, size, 0) +self.pos = offset +self.size = size + +def dump(self): +print 'plcfandTxt type=PlcfandTxt offset=%d size=%d bytes' % (self.pos, self.size) +offset = self.mainStream.fcMin + self.mainStream.ccpText + self.mainStream.ccpFtn + self.mainStream.ccpHdd # TODO do this in a better way when headers are handled +pos = self.pos +for i in range(self.getElements() - 1): +start = self.getuInt32(pos = pos) +end = self.getuInt32(pos = pos + 4) +print 'aCP index=%d start=%d end=%d' % (i, start, end) +print 'transformed value=%s/' % FcCompressed.getFCTransformedValue(self.mainStream.bytes, offset+start, offset+end) +pos += 4 +print '/aCP' +print '/plcfandTxt' + class PlcBtePapx(DOCDirStream, PLC): The PlcBtePapx structure is a PLC that specifies paragraph, table row, or table cell properties. def __init__(self, bytes, mainStream, offset, size): diff --git a/src/docstream.py b/src/docstream.py index 559bd0a..b98a0fc 100755 --- a/src/docstream.py +++ b/src/docstream.py @@ -125,7 +125,8 @@ class WordDocumentStream(DOCDirStream): self.pos += 2 self.printAndSet(reserved4, self.getuInt16()) self.pos += 2 -self.printAndSet(reserved5, self.getuInt32()) +# reserved5 in the spec, offset of first character of text according to LO ww8 import filter +self.printAndSet(fcMin, self.getuInt32()) self.pos += 4 self.printAndSet(reserved6, self.getuInt32()) self.pos += 4 @@ -198,7 +199,7 @@ class WordDocumentStream(DOCDirStream): [fcPlcfandRef], [lcbPlcfandRef], [fcPlcfandTxt], -[lcbPlcfandTxt], +[lcbPlcfandTxt, self.handleLcbPlcfandTxt], [fcPlcfSed], [lcbPlcfSed], [fcPlcPad], @@ -411,6 +412,12 @@ class WordDocumentStream(DOCDirStream): stsh = docrecord.STSH(self.doc.getDirectoryStreamByName(1Table).bytes, self, offset, size) stsh.dump() +def handleLcbPlcfandTxt(self): +offset = self.fcPlcfandTxt +size = self.lcbPlcfandTxt +plcfandTxt = docrecord.PlcfandTxt(self, offset, size) +plcfandTxt.dump() + def dumpFibRgFcLcb97(self, name): print '%s type=FibRgFcLcb97 size=744 bytes' % name self.__dumpFibRgFcLcb97() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO as an NPAPI browser plugin host?
On 20/11/12 16:03, Caolán McNamara wrote: On Fri, 2012-11-16 at 16:08 +0100, Stephan Bergmann wrote: ** Trying the same with LO Writer's Insert - Object - Plug-in... fails (just specifying the .ogg/.flv file pathname, leaving Options blank). The SAL_INFO output indicates that libtotem-clone-plugin.so is loaded, but calling its NP_Initialize returns 3 (NPERR_INVALID_FUNCTABLE_ERROR) because the NPNetscapeFuncs struct created in extensions/source/plugin/unx/npnapi.cxx (based on an outdated definition of NPNetscapeFuncs in np_sdk/mozsrc/npupp.h) is too short (i.e., misses functions added by later NPAPI revisions and expected by the given libtotem-clone-plugin.so). The last time I fixed these I hacked totem to use the old api. i.e. https://bugzilla.redhat.com/show_bug.cgi?id=475187 but who would want a totem plugin anyway when you can just use GStreamer etc. avmedia backends? imho the only NPAPI plugin that's still of any use today is SWF/Flash. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: l10ntools/Executable_transex3.mk l10ntools/inc l10ntools/prj
l10ntools/Executable_transex3.mk |1 + l10ntools/inc/xmlparse.hxx |3 +++ l10ntools/prj/build.lst |2 +- 3 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 7753bbb8b160251525ac2f661ccb60f9fc98da50 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 20 16:19:12 2012 +0100 Fix libxml2 usage in l10ntools Change-Id: I746af9162d5cd01e0ce0a9f469f0771d7934ba2d diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk index d2b7952..5568f93 100644 --- a/l10ntools/Executable_transex3.mk +++ b/l10ntools/Executable_transex3.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Executable_add_exception_objects,transex3,\ $(eval $(call gb_Executable_use_externals,transex3,\ icuuc \ $(if $(filter MSC,$(COM)),icuin,icui18n) \ +libxml2 \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 0fedb2b..7a75872 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -26,7 +26,10 @@ #include vector #include signal.h + +#include libxml/xmlexports.h // define XMLCALL so expat.h does not redefine it #include expat.h + #include rtl/ustring.hxx #include rtl/ustrbuf.hxx #include boost/unordered_map.hpp diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst index af0fdfe..ebe9ce1 100644 --- a/l10ntools/prj/build.lst +++ b/l10ntools/prj/build.lst @@ -1,3 +1,3 @@ -tr l10ntools : EXPAT:expat LIBXSLT:libxslt ICU:icu sal NULL +tr l10ntools : EXPAT:expat LIBXML2:libxml2 LIBXSLT:libxslt ICU:icu sal NULL tr l10ntools usr1- all tr_mkout NULL tr l10ntools\prj nmake - all tr_prj NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - compilerplugins/clang rsc/source
compilerplugins/clang/bodynotinblock.cxx | 17 +--
compilerplugins/clang/bodynotinblock.hxx |3
rsc/source/parser/rscyacc.y | 26 ++---
rsc/source/res/rsccont.cxx | 148 +++
rsc/source/rsc/rsc.cxx |2
rsc/source/rscpp/cpp5.c | 102 ++---
rsc/source/rscpp/cpp6.c |2
7 files changed, 151 insertions(+), 149 deletions(-)
New commits:
commit 1ed9af9a4419b50a76eea56eb2e4c684e616673b
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Nov 20 16:26:53 2012 +0100
skip 'else' from a macro expansion too
Change-Id: I1a6d70d1554dc5bf8f46940ed62b47ab34983aa7
diff --git a/compilerplugins/clang/bodynotinblock.cxx
b/compilerplugins/clang/bodynotinblock.cxx
index b6572bf..90f7933 100644
--- a/compilerplugins/clang/bodynotinblock.cxx
+++ b/compilerplugins/clang/bodynotinblock.cxx
@@ -56,15 +56,15 @@ void BodyNotInBlock::traverseStatement( const Stmt* stmt,
StmtParents parents )
parents.push_back( *it );
if( const IfStmt* ifstmt = dyn_cast IfStmt ( *it ))
{
-checkBody( ifstmt-getThen(), parents, 0, ifstmt-getElse() !=
NULL );
-checkBody( ifstmt-getElse(), parents, 0 );
+checkBody( ifstmt-getThen(), ifstmt-getIfLoc(), parents, 0,
ifstmt-getElse() != NULL );
+checkBody( ifstmt-getElse(), ifstmt-getElseLoc(), parents, 0
);
}
else if( const WhileStmt* whilestmt = dyn_cast WhileStmt ( *it ))
-checkBody( whilestmt-getBody(), parents, 1 );
+checkBody( whilestmt-getBody(), whilestmt-getWhileLoc(),
parents, 1 );
else if( const ForStmt* forstmt = dyn_cast ForStmt ( *it ))
-checkBody( forstmt-getBody(), parents, 2 );
+checkBody( forstmt-getBody(), forstmt-getForLoc(), parents,
2 );
else if( const CXXForRangeStmt* forstmt = dyn_cast
CXXForRangeStmt ( *it ))
-checkBody( forstmt-getBody(), parents, 2 );
+checkBody( forstmt-getBody(), forstmt-getForLoc(), parents,
2 );
parents.pop_back();
}
}
@@ -72,16 +72,17 @@ void BodyNotInBlock::traverseStatement( const Stmt* stmt,
StmtParents parents )
parents.pop_back();
}
-void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents parents,
int stmtType, bool dontGoUp )
+void BodyNotInBlock::checkBody( const Stmt* body, SourceLocation stmtLocation,
const StmtParents parents,
+int stmtType, bool dontGoUp )
{
if( body == NULL || parents.size() 2 )
return;
-// TODO: If the if/while/for comes from a macro expansion, ignore it
completely for
+// TODO: If the if/else/while/for comes from a macro expansion, ignore it
completely for
// now. The code below could assume everything is in the same place (and
thus also column)
// and give a false warning. Moreover some macros are rather lousily
written and would
// result in poor formatting. To be evaluated later, maybe this could be
handled
// including macro expansion.
-if( parents.back()-getLocStart().isMacroID())
+if( stmtLocation.isMacroID())
return;
if( dyn_cast CompoundStmt ( body ))
return; // if body is a compound statement, then it is in {}
diff --git a/compilerplugins/clang/bodynotinblock.hxx
b/compilerplugins/clang/bodynotinblock.hxx
index 304bbf0..3cfc9ba 100644
--- a/compilerplugins/clang/bodynotinblock.hxx
+++ b/compilerplugins/clang/bodynotinblock.hxx
@@ -27,7 +27,8 @@ class BodyNotInBlock
private:
typedef vector const Stmt* StmtParents;
void traverseStatement( const Stmt* stmt, StmtParents parents );
-void checkBody( const Stmt* body, const StmtParents parents, int
stmtType, bool dontGoUp = false );
+void checkBody( const Stmt* body, SourceLocation stmtLocation, const
StmtParents parents,
+int stmtType, bool dontGoUp = false );
};
} // namespace
commit 13cca3de54265b884fc80a10450096c7e1061b36
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Nov 20 16:12:57 2012 +0100
incorrect body alignment
Change-Id: Ie62113f0018e71c984845f1684a4876809b901c4
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index 2efc6ff..4fbf0fd 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -160,7 +160,7 @@ sal_Bool DoClassHeader( RSCHEADER * pHeader, sal_Bool
bMember )
RSCINST aTmpI( S.Top() );
aTmpI.pClass-Destroy( aTmpI );
aTmpI.pClass-Create( aTmpI, aCopyInst );
-};
+}
}
else
pTC-pEH-Error( ERR_FALSETYPE, S.Top().pClass, aName1,
@@ -213,8 +213,8 @@ sal_Bool DoClassHeader( RSCHEADER * pHeader, sal_Bool
bMember )
return( sal_False );
}
Re: Help to build LibreOffice4Android
Hi, On Tue, Nov 20, 2012 at 11:31:05PM +0800, Island enzi.w...@gmail.com wrote: I recently compiled LibreOffice4Android *followed this doc：* * http://cgit.freedesktop.org/libreoffice/core/commit/README.Android * But I fount it need some.so libs before run the comand make clean all install in the doc. I followed the doc README.cross and it still failed. Can you tell me how to build these .so libs it depends before we compiled LibreOffice4Android ? Honestly I have little idea, never tried to build LibreOffice4Android. Can you share exactly what went wrong in the build? Also, please ask such questions on this list, that's where in general we try to help developers. Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: starmath/source
starmath/source/mathmlexport.cxx |4 ++--
starmath/source/mathmlimport.cxx |2 +-
starmath/source/node.cxx |4
starmath/source/view.cxx |1 -
4 files changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 2aa31da545efa130e6e0a3d0aeb32ae0514d16e9
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Nov 20 16:50:46 2012 +0100
clang plugin warnings
Change-Id: Id58c593577c432537b3ca07087aeb17ed10772b6
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 6e34b32..53445fc 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -384,7 +384,7 @@ throw(uno::RuntimeException)
if ( rId.getLength() == 16
0 == memcmp( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
-return sal::static_int_cast sal_Int64 (reinterpret_cast sal_uIntPtr
(this));
+return sal::static_int_cast sal_Int64 (reinterpret_cast sal_uIntPtr
(this));
return SvXMLExport::getSomething( rId );
}
@@ -759,7 +759,7 @@ void SmXMLExport::ExportExpression(const SmNode *pNode, int
nLevel)
if (nSize 1 || (pNode pNode-GetType() == NEXPRESSION))
pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MROW,
sal_True, sal_True);
-for (sal_uInt16 i = 0; i nSize; i++)
+for (sal_uInt16 i = 0; i nSize; i++)
if (const SmNode *pTemp = pNode-GetSubNode(i))
ExportNodes(pTemp, nLevel+1);
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 2273c10..b63eab5 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -539,7 +539,7 @@ throw(uno::RuntimeException)
if ( rId.getLength() == 16
0 == memcmp( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
-return sal::static_int_cast sal_Int64 (reinterpret_cast sal_uIntPtr
(this));
+return sal::static_int_cast sal_Int64 (reinterpret_cast sal_uIntPtr
(this));
return SvXMLImport::getSomething( rId );
}
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 4760d92..47adc29 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -825,8 +825,6 @@ void SmExpressionNode::CreateTextFromNode(String rText)
void SmTableNode::Arrange(const OutputDevice rDev, const SmFormat rFormat)
// arranges all subnodes in one column
{
-Point rPosition;
-
SmNode *pNode;
sal_uInt16 nSize = GetNumSubNodes();
@@ -2533,8 +2531,6 @@ void SmMatrixNode::CreateTextFromNode(String rText)
void SmMatrixNode::Arrange(const OutputDevice rDev, const SmFormat rFormat)
{
-Point aPosition,
-aOffset;
SmNode *pNode;
sal_uInt16 i, j;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 1450ed5..58e031a 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -326,7 +326,6 @@ void SmGraphicWindow::SetCursor(const SmNode *pNode)
aTLPos (GetFormulaDrawPos() + aOffset);
aTLPos.X() -= pNode-GetItalicLeftSpace();
Size aSize (pNode-GetItalicSize());
-Point aBRPos (aTLPos.X() + aSize.Width(), aTLPos.Y() + aSize.Height());
SetCursor(Rectangle(aTLPos, aSize));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - src/docrecord.py src/docstream.py
src/docrecord.py | 34 ++ src/docstream.py |8 +++- 2 files changed, 41 insertions(+), 1 deletion(-) New commits: commit 2436df923e2329ee633d6f084d369ff8a89735b4 Author: Miklos Vajna vmik...@suse.cz Date: Tue Nov 20 17:02:15 2012 +0100 start dumping ATRDPre10 diff --git a/src/docrecord.py b/src/docrecord.py index e79a5c9..a3c6fe6 100755 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -318,6 +318,16 @@ class PnFkpChpx(DOCDirStream): chpxFkp.dump() print '/%s' % self.name +class ATRDPre10(DOCDirStream): +The ATRDPre10 structure contains information about a comment in the document. +def __init__(self, aPlcfandRef, offset): +DOCDirStream.__init__(self, aPlcfandRef.bytes) +self.pos = offset + +def dump(self): +print 'aATRDPre10 type=ATRDPre10 offset=%d size=30 bytes' % self.pos +print '/aATRDPre10' + class PnFkpPapx(DOCDirStream): The PnFkpPapx structure specifies the offset of a PapxFkp in the WordDocument Stream. def __init__(self, bytes, mainStream, offset, size, name): @@ -398,6 +408,9 @@ class PlcfandRef(DOCDirStream, PLC): print 'transformed value=%s/' % FcCompressed.getFCTransformedValue(self.mainStream.bytes, start, start + 1) pos += 4 +# aATRDPre10 +aATRDPre10 = ATRDPre10(self, self.getOffset(self.pos, i)) +aATRDPre10.dump() print '/aCP' print '/plcfandRef' commit af141a7dbfd2e312ff208b65b219e9ac86f081db Author: Miklos Vajna vmik...@suse.cz Date: Tue Nov 20 16:43:02 2012 +0100 dump PlcfandRef diff --git a/src/docrecord.py b/src/docrecord.py index 6c51a48..e79a5c9 100755 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -380,6 +380,27 @@ class PlcfandTxt(DOCDirStream, PLC): print '/aCP' print '/plcfandTxt' +class PlcfandRef(DOCDirStream, PLC): +The PlcfandRef structure is a PLC whose data elements are ATRDPre10 structures. +def __init__(self, mainStream, offset, size): +DOCDirStream.__init__(self, mainStream.doc.getDirectoryStreamByName(1Table).bytes, mainStream=mainStream) +PLC.__init__(self, size, 30) +self.pos = offset +self.size = size + +def dump(self): +print 'plcfandRef type=PlcfandRef offset=%d size=%d bytes' % (self.pos, self.size) +offset = self.mainStream.fcMin +pos = self.pos +for i in range(self.getElements()): +start = offset + self.getuInt32(pos = pos) +print 'aCP index=%d commentEndOffset=%d' % (i, start) +print 'transformed value=%s/' % FcCompressed.getFCTransformedValue(self.mainStream.bytes, start, start + 1) +pos += 4 + +print '/aCP' +print '/plcfandRef' + class PlcBtePapx(DOCDirStream, PLC): The PlcBtePapx structure is a PLC that specifies paragraph, table row, or table cell properties. def __init__(self, bytes, mainStream, offset, size): diff --git a/src/docstream.py b/src/docstream.py index b98a0fc..928bb29 100755 --- a/src/docstream.py +++ b/src/docstream.py @@ -197,7 +197,7 @@ class WordDocumentStream(DOCDirStream): [fcPlcffndTxt], [lcbPlcffndTxt], [fcPlcfandRef], -[lcbPlcfandRef], +[lcbPlcfandRef, self.handleLcbPlcfandRef], [fcPlcfandTxt], [lcbPlcfandTxt, self.handleLcbPlcfandTxt], [fcPlcfSed], @@ -418,6 +418,12 @@ class WordDocumentStream(DOCDirStream): plcfandTxt = docrecord.PlcfandTxt(self, offset, size) plcfandTxt.dump() +def handleLcbPlcfandRef(self): +offset = self.fcPlcfandRef +size = self.lcbPlcfandRef +plcfandRef = docrecord.PlcfandRef(self, offset, size) +plcfandRef.dump() + def dumpFibRgFcLcb97(self, name): print '%s type=FibRgFcLcb97 size=744 bytes' % name self.__dumpFibRgFcLcb97() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - sc/source svl/source
sc/source/core/data/column3.cxx | 67
svl/source/numbers/zforfind.cxx | 22 +
2 files changed, 51 insertions(+), 38 deletions(-)
New commits:
commit ece86458f09e91b57729b82c8897339c37949960
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 14 21:48:33 2012 +0100
resolved fdo#56278 broadcast deletion to dependent formula cells
Consolidated changes for fdo#56278 fdo#54074 fdo#53364 fdo#55059 (and
earlier i#99844 and i#101869). The replacement cell for the broadcaster
to inform listeners, if any, is transferred the broadcaster and owns it,
the remembered formula cell never does. When broadcasting the change use
the replacement cell instead of the remembered formula cell. Don't
fiddle around with ReleaseBroadcaster() at the remembered cell, we don't
delete twice and now also don't leak.
(cherry picked from commit 8165bfa2afbe828caf37df57b83cb31bef2559cb)
Change-Id: Ia11b6d3d751c784af64aaed05f8508887f869a80
Reviewed-on: https://gerrit.libreoffice.org/1069
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 475299d..a31 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -399,11 +399,13 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
// try to create a replacement note cell, if note or
broadcaster exists
ScNoteCell* pNoteCell = NULL;
SvtBroadcaster* pBC = pOldCell-GetBroadcaster();
-bool bKeepBC = pBC pBC-HasListeners();
-// #i99844# do not release broadcaster from old cell, it still
has to notify deleted content
-if (bKeepBC)
+if (pBC pBC-HasListeners())
{
pNoteCell = new ScNoteCell( pBC );
+// NOTE: the broadcaster here is transferred and released
+// only if it has listeners! If it does not, it will simply
+// be deleted when the cell is deleted and no replacement
+// cell is created.
pOldCell-ReleaseBroadcaster();
}
@@ -427,15 +429,10 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
else
{
aHint.GetAddress().SetRow( nOldRow );
-if(bKeepBC)
-aHint.SetCell( pNoteCell );
-else
-aHint.SetCell( pOldCell );
+aHint.SetCell( pNoteCell ? pNoteCell : pOldCell );
pDocument-Broadcast( aHint );
if (pNoteCell != pOldCell)
{
-// #i99844# after broadcasting, old cell has to forget
the broadcaster (owned by pNoteCell)
-pOldCell-ReleaseBroadcaster();
pOldCell-Delete();
}
}
@@ -456,7 +453,9 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
if (nFirst = nEndIndex)
aRemovedSegments.insert_back(nFirst, nEndIndex + 1, true);
-{
+// Remove segments from the column array, containing pDummyCell and formula
+// cell pointers to be deleted.
+{ // own scope for variables
RemovedSegments_t::const_iterator aIt(aRemovedSegments.begin());
RemovedSegments_t::const_iterator aEnd(aRemovedSegments.end());
// The indexes in aRemovedSegments denote cell positions in the
@@ -499,29 +498,33 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
}
// *** delete all formula cells ***
-
-// first, all cells stop listening, may save unneeded recalcualtions
-for ( FormulaCellVector::iterator aIt = aDelCells.begin(), aEnd =
aDelCells.end(); aIt != aEnd; ++aIt )
-(*aIt)-EndListeningTo( pDocument );
-
-// #i101869# if the note cell with the broadcaster was deleted in
EndListening,
-// forget the pointer to the broadcaster
-for ( FormulaCellVector::iterator aIt = aDelCells.begin(), aEnd =
aDelCells.end(); aIt != aEnd; ++aIt )
-{
-SCSIZE nIndex;
-if ( !Search( (*aIt)-aPos.Row(), nIndex ) )
-(*aIt)-ReleaseBroadcaster();
-}
-
-// broadcast SC_HINT_DYING for all cells and delete them
-for ( FormulaCellVector::iterator aIt = aDelCells.begin(), aEnd =
aDelCells.end(); aIt != aEnd; ++aIt )
+if (!aDelCells.empty())
{
-aHint.SetAddress( (*aIt)-aPos );
-aHint.SetCell( *aIt );
-pDocument-Broadcast( aHint );
-// #i99844# after broadcasting, old cell has to forget the broadcaster
(owned by replacement note cell)
-(*aIt)-ReleaseBroadcaster();
-
[Libreoffice-commits] .: i18npool/source
i18npool/source/isolang/inunx.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 9de9c430ca36751b63744ccb2f31e5b075e599b0 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 20 17:09:39 2012 +0100 Blind fix for MACOSX-only MsLangId::convertIsoNamesToLanguage leftover Change-Id: Iec2845cb3717520e1126ac4e9743413d5f3a5119 diff --git a/i18npool/source/isolang/inunx.cxx b/i18npool/source/isolang/inunx.cxx index eb61f0b..778446a 100644 --- a/i18npool/source/isolang/inunx.cxx +++ b/i18npool/source/isolang/inunx.cxx @@ -30,6 +30,7 @@ #endif // MACOSX #include rtl/instance.hxx +#include i18npool/languagetag.hxx #include i18npool/mslangid.hxx // === @@ -101,7 +102,7 @@ static void getPlatformSystemLanguageImpl( LanguageType rSystemLanguage, rtl::OUString rLang( procLocale-Language ); rtl::OUString rCountry( procLocale-Country ); -nLang = MsLangId::convertIsoNamesToLanguage( rLang, rCountry ); +nLang = LanguageTag( rLang, rCountry ).getLanguageType(); OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); rSystemLanguage = nLang; #ifdef DEBUG ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source
sc/source/ui/app/scmod.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit daeb7de41e8bf4a289e311c2a08c5f3e008ba53d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Nov 13 14:14:30 2012 -0500
fdo#56776: Change in formula options should cause repaint.
Else Calc would fail to update the column headers due to A1 to R1C1
change (and vise versa).
Change-Id: I2c403212f5bc539aea92370e60da96f480549d6d
Reviewed-on: https://gerrit.libreoffice.org/1049
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 2635cb8..46e9140 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1076,6 +1076,11 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
if (rOptSet.HasItem(SID_SCFORMULAOPTIONS, pItem))
{
const ScFormulaOptions rOpt = ((const
ScTpFormulaItem*)pItem)-GetFormulaOptions();
+
+if (!pFormulaCfg || (*pFormulaCfg != rOpt))
+// Formula options have changed. Repaint the column headers.
+bRepaint = true;
+
SetFormulaOptions( rOpt );
if ( pDocSh )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/directx/dx_textlayout_drawhelper.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ee6bfe1910b6b3a255f3e393689397fc2c94cdda Author: Eike Rathke er...@redhat.com Date: Tue Nov 20 17:26:09 2012 +0100 use LanguageTag Change-Id: Ic81a3f3ffd00431ddc8082a210dacaa77ce862f4 diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index b4f2104..2fe6091 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -39,7 +39,7 @@ #include canvas/debug.hxx #include dx_impltools.hxx #include vcl/sysdata.hxx -#include i18npool/mslangid.hxx +#include i18npool/lanuagetag.hxx #include dx_textlayout_drawhelper.hxx #include dx_bitmap.hxx #include dx_canvasfont.hxx @@ -125,7 +125,7 @@ namespace dxcanvas rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED ? PITCH_FIXED : PITCH_VARIABLE); - aFont.SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale)); + aFont.SetLanguage(LanguageTag(rFontRequest.Locale).getLanguageType()); // setup font color aFont.SetColor( aColor ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/file_resource_ooo.scp |4 1 file changed, 4 deletions(-) New commits: commit 71ee467a12a4fbc9914e0d421431f32c953c26d0 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 20 17:19:59 2012 +0100 No more tubes res file ...apparently gone with e74fc93e4aba7887e6a278cc44c4bc0962471065 tubes: use new .ui format for contacts dialog. Change-Id: I7f492e252b58d641a5cb8c722011df99a5a7d966 diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index a065312..9a04b2f 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -123,7 +123,3 @@ STD_RES_FILE( gid_File_Res_T602Filter, t602filter ) STD_RES_FILE( gid_File_Res_Forui, forui ) STD_RES_FILE( gid_File_Res_For, for ) - -#ifdef ENABLE_TELEPATHY -STD_RES_FILE( gid_File_Res_Tubes, tubes ) -#endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - svl/source
svl/source/numbers/zforscan.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 78b1bf986b5e518968ad70aed6dab1aa0a621cbe Author: Noel Power noel.po...@suse.com Date: Tue Nov 13 16:30:07 2012 + don't always show integer part for fraction formats with hard denom fdo#56205 fixes bug when you have a fraction format with a forced denominator e.g. '?/5' which showed the integer part of the fraction ( as if the format was '# ?/5' ) but even without the space e.g. before fix pi 3.14159265358979 with format '?/8' would be shown as 31/8 after the fix 3.14159265358979 with format '?/8' would be shown as 25/8 Change-Id: I1feb8b78af94b90db1bcc30da248077243dd8dfc Reviewed-on: https://gerrit.libreoffice.org/1047 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com Reviewed-on: https://gerrit.libreoffice.org/1064 diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 069d2d3..1124fc5 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -1605,7 +1605,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String rString ) nCounter = nCntPost; else if (nCntPre) nCounter = nCntPre; -if (!nCntPre) +// don't artificially increment nCntPre +// for forced denominator +if ( ( eScannedType != NUMBERFORMAT_FRACTION ) (!nCntPre) ) nCntPre++; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - extensions/Library_npsoplugin.mk extensions/source np_sdk/mozsrc np_sdk/Package_inc.mk
extensions/Library_npsoplugin.mk |6 ++-
extensions/source/nsplugin/source/npshell.cxx |8 ++--
np_sdk/Package_inc.mk |1
np_sdk/mozsrc/npunix.c|4 +-
np_sdk/mozsrc/npwin.cxx |4 +-
np_sdk/mozsrc/plugin.h| 44 ++
6 files changed, 60 insertions(+), 7 deletions(-)
New commits:
commit 4066e4a4f04000414a7716d9b153cdbe0d2f5189
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 12 16:59:50 2012 +0100
Enable NPP_Initialize/Shutdown again
...calling which had erroneously been dropped in
bdead69dd3c947743907681c8a2f16ca1f50cd9c Add switch for system/internal
npapi.h. This makes the npsoplugin browser plugin work again.
(Also, init write_fd to -1 instead of 0, so that a missing do_init_pipe
does not
accidentally cause writing to write_fd succeed in writing to stdin.)
(cherry picked from commit 9081e07c9c92267d86a90752b28bd42b592782a8 plus
follow-
up 6ce21d57d9a627a95bfb2f10519ae3cd032f521b Typo)
Conflicts:
extensions/Library_npsoplugin.mk
Change-Id: Iced734512a43c8dfea46088f7ac16f159e7dd807
Reviewed-on: https://gerrit.libreoffice.org/1042
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 7e8b400..2f1d8f6 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -30,6 +30,10 @@
$(eval $(call gb_Library_Library,npsoplugin))
+$(eval $(call gb_Library_use_packages,npsoplugin,\
+ np_sdk_inc \
+))
+
$(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers))
$(eval $(call gb_Library_use_static_libraries,npsoplugin,\
@@ -90,8 +94,6 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\
ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,npsoplugin,\
/EXPORT:NPP_GetMIMEDescription \
- /EXPORT:NPP_Initialize \
- /EXPORT:NPP_Shutdown \
/EXPORT:NPP_New \
/EXPORT:NPP_Destroy \
/EXPORT:NPP_SetWindow \
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index e9aae65..52e85b6 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -82,6 +82,8 @@
#include nsp_func.hxx
+#include npsdk/plugin.h
+
#include comphelper/documentconstants.hxx
#ifdef _MSC_VER
@@ -97,7 +99,7 @@
***/
static NSP_Mute_Obj send_lock = NSP_New_Mute_Obj();
-static NSP_PIPE_FD write_fd = 0;
+static NSP_PIPE_FD write_fd = -1;
long int NSP_WriteToPipe(NSP_PIPE_FD fp, void* buf, unsigned long int len)
@@ -416,7 +418,7 @@ dupMimeType(NPMIMEType type)
}
#endif // end of UNIX
-NP_DLLPUBLIC NPError
+NPError
NPP_Initialize(void)
{
debug_fprintf(NSP_LOG_NEW, NS Plugin begin initialize.\n);
@@ -431,7 +433,7 @@ NPP_GetJavaClass()
}
#endif
-NP_DLLPUBLIC void
+void
NPP_Shutdown(void)
{
PLUGIN_MSG msg;
diff --git a/np_sdk/Package_inc.mk b/np_sdk/Package_inc.mk
index 841b1bd..2a656b9 100644
--- a/np_sdk/Package_inc.mk
+++ b/np_sdk/Package_inc.mk
@@ -31,5 +31,6 @@ $(eval $(call
gb_Package_add_file,np_sdk_inc,inc/npsdk/jri.h,mozsrc/jri.h))
$(eval $(call
gb_Package_add_file,np_sdk_inc,inc/npsdk/jri_md.h,mozsrc/jri_md.h))
$(eval $(call
gb_Package_add_file,np_sdk_inc,inc/npsdk/jritypes.h,mozsrc/jritypes.h))
$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/npupp.h,mozsrc/npupp.h))
+$(eval $(call
gb_Package_add_file,np_sdk_inc,inc/npsdk/plugin.h,mozsrc/plugin.h))
# vim: set noet sw=4 ts=4:
diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c
index 0b5ff38..24ef766 100644
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/mozsrc/npunix.c
@@ -58,6 +58,7 @@
#include stdio.h
#include npapi.h
#include npupp.h
+#include plugin.h
/*
* Define PLUGIN_TRACE to have the wrapper functions print
@@ -485,7 +486,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs*
pluginFuncs)
pluginFuncs-javaClass = Private_GetJavaClass();
#endif
-err = NPERR_NO_ERROR;
+err = NPP_Initialize();
}
return err;
@@ -502,4 +503,5 @@ SAL_DLLPUBLIC_EXPORT void
NP_Shutdown(void)
{
PLUGINDEBUGSTR(NP_Shutdown);
+NPP_Shutdown();
}
diff --git a/np_sdk/mozsrc/npwin.cxx b/np_sdk/mozsrc/npwin.cxx
index 204f5d1..9021c63 100644
--- a/np_sdk/mozsrc/npwin.cxx
+++ b/np_sdk/mozsrc/npwin.cxx
@@ -37,6 +37,7 @@
#include npapi.h
#include npupp.h
+#include plugin.h
//\\// DEFINE
#define NP_EXPORT
@@ -149,7 +150,7 @@ NP_Initialize(NPNetscapeFuncs* pFuncs)
}
#endif
-return NPERR_NO_ERROR;
+return NPP_Initialize();
}
//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
@@ -163,6 +164,7 @@ NP_Initialize(NPNetscapeFuncs* pFuncs)
void
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 7752d65999fd64454deb259ef134456e0bb4709f Author: Eike Rathke er...@redhat.com Date: Tue Nov 20 17:33:33 2012 +0100 use LanguageTag Change-Id: Ia5d328b995460f11602f3a1e4d49946d10dfad73 diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 7becdba..134c1a3 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -28,6 +28,7 @@ #include rtl/bootstrap.hxx #include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include osl/module.h #include osl/file.hxx @@ -548,7 +549,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern rFon eLang = MapCharToLanguage( uChar ); if( eLang == LANGUAGE_DONTKNOW ) continue; -MsLangId::convertLanguageToLocale( eLang, aLocale ); +aLocale = LanguageTag( eLang ).getLocale(); break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/winlayout.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 9a320f283f32f421e7fd14c030dbba2ad981d05f Author: Eike Rathke er...@redhat.com Date: Tue Nov 20 17:38:31 2012 +0100 use LanguageTag Change-Id: I5fe231f26d29dbab214d414790936b2b484c2fe6 diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index b7929c9..03e59a0 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -51,7 +51,7 @@ typedef boost::unordered_mapint,int IntMap; // Graphite headers #ifdef ENABLE_GRAPHITE -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include graphite_layout.hxx #include graphite_features.hxx #endif @@ -2737,7 +2737,8 @@ GraphiteWinLayout::GraphiteWinLayout(HDC hDC, const ImplWinFontData rWFD, ImplW mpFont = gr_make_font_with_advance_fn(static_castfloat(-aLogFont.lfHeight), hDC, gr_fontAdvance, rWFD.GraphiteFace()); maImpl.SetFont(mpFont); -const rtl::OString aLang = MsLangId::convertLanguageToIsoByteString( rWFE.maFontSelData.meLanguage ); +const rtl::OString aLang = OUStringToOString( LanguageTag( rWFE.maFontSelData.meLanguage ).getBcp47(), +RTL_TEXTENCODING_ASCII_US); rtl::OString name = rtl::OUStringToOString( rWFE.maFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - i18npool/source
i18npool/source/ordinalsuffix/ordinalsuffix.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 0c12d92abcc4c61b64decf3063f6067f78a8d60f Author: Petr Mladek pmla...@suse.cz Date: Tue Nov 6 15:57:07 2012 +0100 fix build with icu-4.0 use functions already provided by icu-4.0 Change-Id: I238a499ae1bc2a7efeb4d61fbe780e24d7d36a7a (cherry picked from commit 524461f1721d0fb7c5bd115d72ca82711e0ff950) Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index a0760a0..3d7f560 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -97,7 +97,9 @@ uno::Sequence OUString SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN return retValue; icu::UnicodeString sFormatWithNoOrdinal; -xNumberFormat-format((int32_t)nNumber, sFormatWithNoOrdinal, NULL, nCode); +icu::Formattable ftmNumber((int32_t)nNumber); +icu::FieldPosition icuPos; +xNumberFormat-format(ftmNumber, sFormatWithNoOrdinal, icuPos, nCode); if (!U_SUCCESS(nCode)) return retValue; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: rsc/source
rsc/source/parser/rscibas.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6a9f0cdc021bdc591cb140bb3c2d609723430b0c Author: Eike Rathke er...@redhat.com Date: Tue Nov 20 17:42:07 2012 +0100 use LanguageTag Change-Id: I9aa7ff4a1aedee6fa029e3d94301788be1a3761a diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 0f54ff7..d162f1e 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -25,6 +25,7 @@ #include string.h #include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include comphelper/string.hxx #include tools/rc.h #include tools/color.hxx @@ -94,7 +95,7 @@ void RscLangEnum::Init( RscNameTable rNames ) fprintf( stderr, ISO Language in : %d\n, (int)nIndex, pLangEntry-mnLang, - MsLangId::convertLanguageToIsoByteString( pLangEntry-mnLang ).getStr() ); + OUStringToOString( LanguageTag( pLangEntry-mnLang ).getBcp47(), RTL_TEXTENCODING_ASCII_US).getStr() ); #endif rtl::OString aLang(pLangEntry-maLangStr, strlen(pLangEntry-maLangStr)); rtl::OString aCountry(pLangEntry-maCountry, strlen(pLangEntry-maCountry)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 56882, which changed state. Bug 56882 Summary: Font list is unsorted in 'insert special character' dialog https://bugs.freedesktop.org/show_bug.cgi?id=56882 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- 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] .: Branch 'distro/suse/suse-3.6' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 43 +++
sw/source/filter/ww8/docxattributeoutput.hxx | 11 +-
2 files changed, 33 insertions(+), 21 deletions(-)
New commits:
commit cd134b0e7a6d1ac29dd3543d30cdcec34f5dfe92
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Nov 9 10:42:47 2012 +0100
fdo#51550 fix DOCX export dataloss on non-math/chart OLE export
This is still not complete, but having the replacement graphic only is
far better than having nothing.
(cherry picked from commit bd6ae389008e110be62a335dfcd82c655d512e63)
Conflicts:
sw/source/filter/ww8/docxattributeoutput.cxx
Change-Id: I141a3de1a449f4261c7086e10f2c141b3f6cdb10
Reviewed-on: https://gerrit.libreoffice.org/1017
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e6d4bc8..071900c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1017,7 +1017,7 @@ void DocxAttributeOutput::WritePostponedGraphic()
for( std::list PostponedGraphic ::const_iterator it =
m_postponedGraphic-begin();
it != m_postponedGraphic-end();
++it )
-FlyFrameGraphic( *( it-grfNode ), it-size );
+FlyFrameGraphic( it-grfNode, it-size );
delete m_postponedGraphic;
m_postponedGraphic = NULL;
}
@@ -2073,17 +2073,18 @@ void DocxAttributeOutput::DefaultStyle( sal_uInt16
nStyle )
#endif
}
-void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode rGrfNode, const
Size rSize )
+void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const
Size rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode )
{
-OSL_TRACE( TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode
rGrfNode, const Size rSize ) - some stuff still missing );
+OSL_TRACE( TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode*
pGrfNode, const Size rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode
) - some stuff still missing );
+const SwFrmFmt* pFrmFmt = pGrfNode ? pGrfNode-GetFlyFmt() : pOLEFrmFmt;
// create the relation ID
OString aRelId;
sal_Int32 nImageType;
-if ( rGrfNode.IsLinkedFile() )
+if ( pGrfNode pGrfNode-IsLinkedFile() )
{
// linked image, just create the relation
String aFileName;
-rGrfNode.GetFileFilterNms( aFileName, 0 );
+pGrfNode-GetFileFilterNms( aFileName, 0 );
// TODO Convert the file name to relative for better interoperability
@@ -2096,10 +2097,14 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode rGrfNode, const Size
else
{
// inline, we also have to write the image itself
-Graphic rGraphic = const_cast Graphic ( rGrfNode.GetGrf() );
+Graphic* pGraphic = 0;
+if (pGrfNode)
+pGraphic = const_cast Graphic ( pGrfNode-GetGrf() );
+else
+pGraphic = pOLENode-GetGraphic();
m_rDrawingML.SetFS( m_pSerializer ); // to be sure that we write to
the right stream
-OUString aImageId = m_rDrawingML.WriteImage( rGraphic );
+OUString aImageId = m_rDrawingML.WriteImage( *pGraphic );
aRelId = OUStringToOString( aImageId, RTL_TEXTENCODING_UTF8 );
@@ -2111,11 +2116,11 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode rGrfNode, const Size
m_pSerializer-startElementNS( XML_w, XML_drawing,
FSEND );
-bool isAnchor = rGrfNode.GetFlyFmt()-GetAnchor().GetAnchorId() !=
FLY_AS_CHAR;
+bool isAnchor = pFrmFmt-GetAnchor().GetAnchorId() != FLY_AS_CHAR;
if( isAnchor )
{
::sax_fastparser::FastAttributeList* attrList =
m_pSerializer-createAttrList();
-attrList-add( XML_behindDoc,
rGrfNode.GetFlyFmt()-GetOpaque().GetValue() ? 0 : 1 );
+attrList-add( XML_behindDoc, pFrmFmt-GetOpaque().GetValue() ? 0 :
1 );
attrList-add( XML_distT, 0 );
attrList-add( XML_distB, 0 );
attrList-add( XML_distL, 0 );
@@ -2124,13 +2129,13 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode rGrfNode, const Size
attrList-add( XML_locked, 0 );
attrList-add( XML_layoutInCell, 1 );
attrList-add( XML_allowOverlap, 1 ); // TODO
-if( const SdrObject* pObj = rGrfNode.GetFlyFmt()-FindRealSdrObject())
+if( const SdrObject* pObj = pFrmFmt-FindRealSdrObject())
attrList-add( XML_relativeHeight, OString::valueOf( sal_Int32(
pObj-GetOrdNum(;
m_pSerializer-startElementNS( XML_wp, XML_anchor,
XFastAttributeListRef( attrList ));
m_pSerializer-singleElementNS( XML_wp, XML_simplePos, XML_x, 0,
XML_y, 0, FSEND ); // required, unused
const char* relativeFromH;
const char* relativeFromV;
-switch(
Line height depending on characters in that line
Hello, I'd need a little help from somebody who knows how exactly line height is computed. Specifically, create a new document, create a bullet list (2-3 items), and change it from bullets to 1. style (RMB-Bullets and numbering...-Numbering type - any of those). Doing this (visible when repeatedly hitting Ctrl+Z and Ctrl+Y) noticeably changes the height of all the lines. With MSWord there isn't such a big difference, leading to different formatting on .docx import in a specific bugreport I have. I have checked that this change is triggered by the bullet character being or not being present in the actual string representation of the line, so I assume that the bullet character from the OpenSymbol font is somehow higher than the rest, or that the font itself specifies this height. But I have no idea how this stuff works. What would be the proper way of fixing this? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4012983def85bd75e7b611bd8e4fa636817dbb01 Author: Andras Timar ati...@suse.com Date: Tue Nov 20 18:16:09 2012 +0100 Updated core Project: translations ae82c7e8c304794a9a534c6dd202b5d94c32e82a add missing po file for filter/uiconfig diff --git a/translations b/translations index 2333133..ae82c7e 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 2333133e2c4422089ab79519effc359578bebddf +Subproject commit ae82c7e8c304794a9a534c6dd202b5d94c32e82a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source
sc/source/filter/oox/worksheethelper.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 47bb01d4a46fe1dac33b98f3cc427cc7093921bf
Author: Noel Power noel.po...@suse.com
Date: Fri Nov 9 16:58:00 2012 +
fix for fdo#55875 numbers as text converted strangely
old code used to use XCell-setString, new code uses rDoc.SetString which
by default tries to detect number formats. The ScColumn::SetString that
eventually
gets called seems to do lots of additional checks ( and apparently even if
an ScSetStringParam instance with mbDetectNumberFormat ( false ) was passed
it seems that it will still try to detect decimal number formats. With that
in mind I restore and un-unoified version of what XCell-setString used do
Change-Id: Ifaef74c78b198f492a390a3d5dc1721622a01ea4
Reviewed-on: https://gerrit.libreoffice.org/1020
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index 96c84f9..771f32f 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1564,7 +1564,14 @@ void WorksheetHelper::putString( const CellAddress
rAddress, const OUString rT
{
ScAddress aAddress;
ScUnoConversion::FillScAddress( aAddress, rAddress );
-getScDocument().SetString( aAddress.Col(), aAddress.Row(), aAddress.Tab(),
rText );
+ScBaseCell* pNewCell = NULL;
+ScDocument rDoc = getScDocument();
+if ( !rText.isEmpty() )
+pNewCell = ScBaseCell::CreateTextCell( rText, rDoc );
+if ( pNewCell )
+rDoc.PutCell( aAddress, pNewCell );
+else
+rDoc.SetString( aAddress.Col(), aAddress.Row(), aAddress.Tab(), rText
);
}
void WorksheetHelper::putRichString( const CellAddress rAddress, const
RichString rString, const Font* pFirstPortionFont ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - sal/Library_sal.mk sfx2/source
sal/Library_sal.mk |3 +++ sfx2/source/appl/shutdowniconw32.cxx |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit b382f0cb7c392b434a632f3de32ade9870e5ed6c Author: Jan Holesovsky ke...@suse.cz Date: Tue Jul 17 10:34:30 2012 +0200 Fix MinGW build. Change-Id: I48bad55cc982fba6fb48a921746801de9993bff1 Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 28f783b..2f85ae5 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -289,7 +289,7 @@ static void addTaskbarIcon( HWND hWnd ) IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), LR_DEFAULTCOLOR | LR_SHARED ); -wcsncpy( nid.szTip, strTip.getStr(), 64 ); +wcsncpy( nid.szTip, reinterpret_castLPCWSTR(strTip.getStr()), 64 ); nid.cbSize = sizeof(nid); nid.hWnd= hWnd; commit 13946e644171701af7f619319ab28283f4c46154 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Nov 15 12:17:00 2012 +0100 fix mingw build diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index de22417..e1360f8 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -81,6 +81,9 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ + $(if $(filter-out $(GUI),UNX), \ + uwinapi \ + ) \ $(gb_STDLIBS) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: what's the problem with system cairo ?
Matus I am not sure if the work you have been doign has resulted in the issue I am seeing on mac, but i am using the disable autogen.sh switch for cairo yet for me my build is still failing and suggesting that cairo coudl be the cause along with some other modules in cppunit module. Is this related or not at all? On Tue, Nov 20, 2012 at 3:58 PM, Matúš Kukan matus.ku...@gmail.com wrote: On 17 November 2012 23:04, Matúš Kukan matus.ku...@gmail.com wrote: I've been gbuildizing cairo but then realized it's used only for linux [1], as also cairo/README says. Though there are many platform conditionals in various cairo related makefiles. Maybe it was used more in the past ? So can't we just use system cairo and/or pixman? Anyone could shed some light on this ? Anyway, this is what I've done so far: https://gerrit.libreoffice.org/1144 HTH, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source
sc/source/ui/dbgui/tpsort.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 3fa4875745008c502abea5b8a11d33192885ebbd
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Nov 12 03:08:54 2012 +0100
make sure that the sort vector is large enough, fdo#56958
Change-Id: I7099e984a8b05ccd3324f3b9231c193e716eaf83
(cherry picked from commit cd545dcf511daedd548c11159b8c244f272e9cb6)
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 7ebbb47..c9c7707 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -236,6 +236,9 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet
rArgSet )
if ( nSortPos[i] == LISTBOX_ENTRY_NOTFOUND ) nSortPos[i] = 0;
}
+if( nSortKeyCount = aNewSortData.maKeyState.size() )
+aNewSortData.maKeyState.resize(nSortKeyCount);
+
if ( nSortPos[0] 0 )
{
for ( sal_uInt16 i=0; inSortKeyCount; i++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[TRIAGE UPDATE] 11/20/2012
Hi All, We're falling way behind again after going a couple months doing well. We're back up to almost 1,100 bugs that haven't been triaged and were reported more than 30 days ago. This is 250 more than 3 months ago. I am going to update the Google doc but feel free to tackle some in the mean time: https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDchfieldto=-31Dproduct=LibreOfficequery_format=advancedorder=changeddate%2Cpriority%2Cbug_severitylimit=0list_id=168313 Google Doc can be found here: https://docs.google.com/spreadsheet/ccc?key=0ApS-XtOUGGH5dDIwaXN1YnNsM0h4RXFKdVhvb2RRb0E Stats: http://wiki.documentfoundation.org/QA_Stats#Unconfirmed_Bugs_Reported_More_Than_30_Days_Ago Regards, Joel -- *Joel Madero* LibO QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source
sc/source/ui/dbgui/tpsort.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4246bc9e5e51e24818f3a159123b5f10f4a5a660
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Nov 12 03:07:38 2012 +0100
only set entries for existing sort entries, related fdo#56958
Change-Id: Ib48606402fb90b259f705badeac294d7c336cb9c
(cherry picked from commit c45b6496e87fe74570a41821bc5f4fbdb3d3cf8e)
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index c9c7707..38724dd 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -164,7 +164,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet /*
rArgSet */ )
{
for ( sal_uInt16 i=0; inSortKeyCount; i++ )
{
-if ( aSortData.maKeyState[i].bDoSort )
+if ( i aSortData.maKeyState.size()
aSortData.maKeyState[i].bDoSort )
{
maSortKeyItems[i].aLbSort.SelectEntryPos( GetFieldSelPos(
aSortData.maKeyState[i].nField ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: what's the problem with system cairo ?
2012/11/20 Jonathan Aquilina eagles051...@gmail.com: Matus I am not sure if the work you have been doign has resulted in the issue I am seeing on mac, but i am using the disable autogen.sh switch for cairo yet for me my build is still failing and suggesting that cairo coudl be the cause along with some other modules in cppunit module. Is this related or not at all? Cppunit has no dependencies to cairo. Cppunit is independent of all our internal modules. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build errors on mac (WAS: what's the problem with system cairo ?)
Is there a way to disable the cppunit stuff? as my searching is yielding no way to disable them. On Tue, Nov 20, 2012 at 7:17 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: 2012/11/20 Jonathan Aquilina eagles051...@gmail.com: Matus I am not sure if the work you have been doign has resulted in the issue I am seeing on mac, but i am using the disable autogen.sh switch for cairo yet for me my build is still failing and suggesting that cairo coudl be the cause along with some other modules in cppunit module. Is this related or not at all? Cppunit has no dependencies to cairo. Cppunit is independent of all our internal modules. -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build errors on mac (WAS: what's the problem with system cairo ?)
2012/11/20 Jonathan Aquilina eagles051...@gmail.com: Is there a way to disable the cppunit stuff? as my searching is yielding no way to disable them. No officialy supported way. But cppunit should be stable and easy to build so can you please attach your build error message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] API CHANGE: com.sun.star.lang.IllegalArgumentException
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1145 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/1145/1 API CHANGE: com.sun.star.lang.IllegalArgumentException ... derives from com.sun.star.uno.RuntimeException instead of com.sun.star.uno.Exception. Only test that breaks with this change is jurt_uno/AnyConverter_Test, which for mysterious reasons effectively tests that IllegalArgumentException is a subclass of Exception and not RuntimeException. Presumably this is just a generic exception test that happens to use IllegalArgumentException. Some further testing indicates there are no problems expected at runtime: Running make subsequentcheck with all Java test code compiled against a ridl.jar that does not contain the change, running against a soffice that uses ridl.jar and rdbs with the change + ridl.jar with the change on the test side yields exactly the same AnyConverter_Test failure, with no other failures. Change-Id: Iad183de76ec7e0d56648084e97cdcc160b5b033d --- M dbaccess/source/ui/uno/copytablewizard.cxx M desktop/source/deployment/manager/dp_manager.cxx M desktop/source/deployment/registry/dp_backend.cxx M forms/source/runtime/formoperations.cxx M framework/qa/complex/path_settings/PathSettingsTest.java M jurt/test/com/sun/star/uno/AnyConverter_Test.java M offapi/type_reference/types.rdb M package/source/xstor/xstorage.cxx M pyuno/source/module/pyuno_adapter.cxx M qadevOOo/runner/util/BasicMacroTools.java M qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java M qadevOOo/tests/java/mod/_remotebridge/uno/various.java M qadevOOo/tests/java/mod/_remotebridge/various.java M qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java M qadevOOo/tests/java/mod/_sw/SwXCellRange.java M qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java M qadevOOo/tests/java/mod/_sw/SwXTextTable.java M scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java M sfx2/source/doc/sfxbasemodel.cxx M swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java M ucb/source/ucp/hierarchy/hierarchydata.cxx M ucb/source/ucp/package/pkgcontent.cxx M udkapi/com/sun/star/lang/IllegalArgumentException.idl M wizards/com/sun/star/wizards/common/NumericalHelper.java M wizards/com/sun/star/wizards/common/PlaceholderTextElement.java M wizards/com/sun/star/wizards/common/PropertySetHelper.java M wizards/com/sun/star/wizards/common/SystemDialog.java M wizards/com/sun/star/wizards/query/Finalizer.java M wizards/com/sun/star/wizards/report/DBColumn.java M wizards/com/sun/star/wizards/report/ReportTextDocument.java M wizards/com/sun/star/wizards/ui/FilterComponent.java M wizards/com/sun/star/wizards/ui/UnoDialog.java M wizards/com/sun/star/wizards/ui/WizardDialog.java 33 files changed, 58 insertions(+), 100 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1145 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad183de76ec7e0d56648084e97cdcc160b5b033d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build environment for official win32 builds
On 19/11/12 19:32, Tor Lillqvist wrote: evidently local file system (NTFS) is rather slow, and process creation is very slow (which is important for any make-based build system). This when seen through the Cygwin POSIX emulation layer, presumably? yes ... but i don't remember the 4NT/native tools based build system OOo had back in 2008 or so to be fast by any stretch of the imagination... And when using a build mechanism that has been developed on Unix systems in general and lately Linux in particular. trollwell... NT is basically UNIX... modulo performance./troll ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build errors on mac (WAS: what's the problem with system cairo ?)
Turns out the issue with the hacked up moz that LO uses, disabling it seems to have fixed the issue that I was experiencing. On Tue, Nov 20, 2012 at 7:30 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: 2012/11/20 Jonathan Aquilina eagles051...@gmail.com: Is there a way to disable the cppunit stuff? as my searching is yielding no way to disable them. No officialy supported way. But cppunit should be stable and easy to build so can you please attach your build error message. -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sdext/Library_presenter.mk sdext/source
sdext/Library_presenter.mk|1
sdext/source/presenter/PresenterButton.cxx| 34 +
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 206 ++---
sdext/source/presenter/PresenterSlideShowView.cxx | 44 +-
sdext/source/presenter/PresenterSlideSorter.cxx | 26 +
sdext/source/presenter/PresenterToolBar.cxx | 377 +-
sdext/source/presenter/PresenterWindowManager.cxx | 100
7 files changed, 592 insertions(+), 196 deletions(-)
New commits:
commit 5e5c11c664f67ff9fd1120905b09a32bea3b2f6c
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Wed Nov 14 10:28:17 2012 +0300
fdo#42070-Fix RTL support in presenter console
Problems that still exist:
1-Help layout.
2-Slide sorter view (slides alignment).
3-Note view buttons.
4-Scroll bars.
Change-Id: Ie78519358d2f6d847692ee870ecdc1790c5244e6
Reviewed-on: https://gerrit.libreoffice.org/1053
Tested-by: Lior Kaplan kaplanl...@gmail.com
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index 7dcb3fd..8153e0d 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,PresenterScreen,\
cppu \
cppuhelper \
sal \
+vcl \
))
$(eval $(call gb_Library_add_exception_objects,PresenterScreen,\
diff --git a/sdext/source/presenter/PresenterButton.cxx
b/sdext/source/presenter/PresenterButton.cxx
index 00e1842..ac8e813 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include vcl/svapp.hxx
#include PresenterButton.hxx
#include PresenterCanvasHelper.hxx
#include PresenterController.hxx
@@ -301,7 +302,6 @@ void SAL_CALL PresenterButton::mousePressed (const
css::awt::MouseEvent rEvent)
{
(void)rEvent;
ThrowIfDisposed();
-
meState = PresenterBitmapDescriptor::ButtonDown;
}
@@ -413,15 +413,29 @@ void PresenterButton::RenderButton (
rendering::RenderState aRenderState (geometry::AffineMatrix2D(1,0,0,
0,1,0), NULL,
Sequencedouble(4), rendering::CompositeOperation::SOURCE);
PresenterCanvasHelper::SetDeviceColor(aRenderState, rpFont-mnColor);
-aRenderState.AffineTransform.m02 = (rSize.Width - aTextBBox.X2 +
aTextBBox.X1)/2;
-aRenderState.AffineTransform.m12 = (rSize.Height - aTextBBox.Y2 +
aTextBBox.Y1)/2 - aTextBBox.Y1;
-
-rxCanvas-drawText(
-aContext,
-rpFont-mxFont,
-rendering::ViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL),
-aRenderState,
-rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
+/// this is responsible of the close button
+/// check whether RTL interface or not
+if(!Application::GetSettings().GetLayoutRTL()){
+aRenderState.AffineTransform.m02 = (rSize.Width - aTextBBox.X2 +
aTextBBox.X1)/2;
+aRenderState.AffineTransform.m12 = (rSize.Height - aTextBBox.Y2 +
aTextBBox.Y1)/2 - aTextBBox.Y1;
+
+rxCanvas-drawText(
+aContext,
+rpFont-mxFont,
+rendering::ViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL),
+aRenderState,
+rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
+}else{
+aRenderState.AffineTransform.m02 = (rSize.Width + aTextBBox.X2 -
aTextBBox.X1)/2;
+aRenderState.AffineTransform.m12 = (rSize.Height - aTextBBox.Y2 +
aTextBBox.Y1)/2 - aTextBBox.Y1;
+
+rxCanvas-drawText(
+aContext,
+rpFont-mxFont,
+rendering::ViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL),
+aRenderState,
+rendering::TextDirection::WEAK_RIGHT_TO_LEFT);
+}
}
void PresenterButton::Invalidate (void)
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index ea1c80c..6eccd95 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include vcl/svapp.hxx
#include PresenterPaneBorderPainter.hxx
#include PresenterCanvasHelper.hxx
#include PresenterConfigurationAccess.hxx
@@ -536,74 +537,149 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
if ( ! xLayout.is())
return;
-geometry::RealRectangle2D aBox (xLayout-queryTextBounds());
-const double nTextHeight = aBox.Y2 - aBox.Y1;
-const double nTextWidth = aBox.X2 - aBox.X1;
-double nX = rInnerBox.X + (rInnerBox.Width - nTextWidth)/2;
-const sal_Int32 nTitleBarHeight = rInnerBox.Y - rOuterBox.Y - 1;
-double nY = rOuterBox.Y + (nTitleBarHeight - nTextHeight) / 2 - aBox.Y1;
-if (nY =
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - oox/inc oox/source
oox/inc/oox/export/drawingml.hxx |5 -
oox/inc/oox/export/shapes.hxx|3
oox/source/export/drawingml.cxx | 55 +++--
oox/source/export/shapes.cxx | 162 +--
4 files changed, 177 insertions(+), 48 deletions(-)
New commits:
commit 88bd07f118f6a5fd0143ea2a82c71ff14010187e
Author: Radek Doulik r...@novell.com
Date: Mon Nov 19 18:20:24 2012 +0100
export embedded spreadsheet(s), fixes n#780830
Change-Id: Iee8328a695b554d97f6805b64b98706b9e3d7ab9
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index 93b0358..6ecf96b 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -63,6 +63,9 @@ protected:
rtl::OUString WriteImage( const rtl::OUString rURL );
+const char* GetComponentDir();
+const char* GetRelationCompPrefix();
+
public:
DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase*
pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX ) : meDocumentType(
eDocumentType ), mpFS( pFS ), mpFB( pFB ) {}
void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; }
@@ -86,7 +89,7 @@ public:
void WriteStretch();
void WriteLinespacing( ::com::sun::star::style::LineSpacing rLineSpacing
);
-::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet, ::rtl::OUString rURL );
+::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet, ::rtl::OUString rURL,
Graphic *pGraphic=NULL );
void WriteBlipMode( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet );
void WriteShapeTransformation( ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape rXShape,
diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx
index b043c3f..8e89220 100644
--- a/oox/inc/oox/export/shapes.hxx
+++ b/oox/inc/oox/export/shapes.hxx
@@ -51,6 +51,7 @@ namespace oox { namespace drawingml {
class OOX_DLLPUBLIC ShapeExport : public DrawingML {
private:
+static int mnSpreadsheetCounter;
struct ShapeCheck
{
bool operator()( const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape s1, const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape s2 ) const
@@ -70,6 +71,8 @@ public:
protected:
sal_Int32 mnShapeIdMax, mnPictureIdMax;
+void WriteGraphicObjectShapePart( ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape xShape, Graphic *pGraphic=NULL );
+
private:
sal_Int32 mnXmlNamespace;
FractionmaFraction;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c4adc33..58decbd 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -430,6 +430,30 @@ OUString DrawingML::WriteImage( const OUString rURL )
return OUString();
}
+const char* DrawingML::GetComponentDir()
+{
+switch ( meDocumentType )
+{
+case DOCUMENT_DOCX: return word;
+case DOCUMENT_PPTX: return ppt;
+case DOCUMENT_XLSX: return xl;
+}
+
+return unknown;
+}
+
+const char* DrawingML::GetRelationCompPrefix()
+{
+switch ( meDocumentType )
+{
+case DOCUMENT_DOCX: return ;
+case DOCUMENT_PPTX:
+case DOCUMENT_XLSX: return ../;
+}
+
+return unknown;
+}
+
OUString DrawingML::WriteImage( const Graphic rGraphic )
{
GfxLink aLink = rGraphic.GetLink ();
@@ -491,16 +515,8 @@ OUString DrawingML::WriteImage( const Graphic rGraphic )
}
}
-const char *pComponent = ;
-switch ( meDocumentType )
-{
-case DOCUMENT_DOCX: pComponent = word; break;
-case DOCUMENT_PPTX: pComponent = ppt; break;
-case DOCUMENT_XLSX: pComponent = xl; break;
-}
-
Reference XOutputStream xOutStream = mpFB-openFragmentStream(
OUStringBuffer()
-
.appendAscii( pComponent )
+
.appendAscii( GetComponentDir() )
.appendAscii( /media/image )
.append(
(sal_Int32) mnImageCounter )
.appendAscii( pExtension )
@@ -509,22 +525,11 @@ OUString DrawingML::WriteImage( const Graphic rGraphic )
xOutStream-writeBytes( Sequence sal_Int8 ( (const sal_Int8*) aData,
nDataSize ) );
xOutStream-closeOutput();
-const char *pImagePrefix = ;
-switch ( meDocumentType )
-{
-case DOCUMENT_DOCX:
-pImagePrefix = media/image;
-break;
-case DOCUMENT_PPTX:
-case DOCUMENT_XLSX:
-pImagePrefix = ../media/image;
-
[PUSHED] fdo#42070-Fix RTL support in presenter console
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1053 Approvals: Lior Kaplan: Verified Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1053 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie78519358d2f6d847692ee870ecdc1790c5244e6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Issa Alkurtass ialkurt...@kacst.edu.sa Gerrit-Reviewer: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Line height depending on characters in that line
Hello, Moreover, with register-true page layout, the result is terrible (empty lines between the lines). Maybe modification of the font file is not possible, because the formula editor depends from OpenSymbol. A proper solution would be to add relative size support (like in the Heading styles) to the character size of the default character style Bullets, and set it to 87,5%. By the way, there are other problems with these no-name list styles, eg. their missing localizations. It would be fine to change or add an option to use named numbering/list styles with Numbering/List icons and automatic list replacement instead of these awful no-name styles. Best regards, László 2012/11/20 Lubos Lunak l.lu...@suse.cz Hello, I'd need a little help from somebody who knows how exactly line height is computed. Specifically, create a new document, create a bullet list (2-3 items), and change it from bullets to 1. style (RMB-Bullets and numbering...-Numbering type - any of those). Doing this (visible when repeatedly hitting Ctrl+Z and Ctrl+Y) noticeably changes the height of all the lines. With MSWord there isn't such a big difference, leading to different formatting on .docx import in a specific bugreport I have. I have checked that this change is triggered by the bullet character being or not being present in the actual string representation of the line, so I assume that the bullet character from the OpenSymbol font is somehow higher than the rest, or that the font itself specifies this height. But I have no idea how this stuff works. What would be the proper way of fixing this? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/source sc/qa sd/source svx/source sw/source tools/inc vcl/aqua vcl/ios vcl/source vcl/win vcl/workben
filter/source/flash/swfwriter1.cxx |2
filter/source/flash/swfwriter2.cxx | 18 ---
filter/source/graphicfilter/epict/epict.cxx |8 +--
sc/qa/unit/ucalc.cxx |4 -
sd/source/filter/eppt/pptx-text.cxx |4 -
sd/source/filter/html/htmlattr.cxx |4 -
sd/source/ui/animations/CustomAnimationList.cxx |8 +--
sd/source/ui/annotations/annotationmanager.cxx |8 +--
sd/source/ui/dlg/headerfooterdlg.cxx |8 +--
sd/source/ui/slideshow/slideshowimpl.cxx |4 -
sd/source/ui/unoidl/unomodel.cxx |2
sd/source/ui/view/frmview.cxx| 12 ++---
svx/source/accessibility/ChildrenManagerImpl.cxx |8 +--
svx/source/dialog/dlgctrl.cxx| 18 +++
svx/source/svdraw/svddrgmt.cxx | 10 ++--
svx/source/table/cell.cxx|8 +--
svx/source/table/svdotable.cxx |4 -
svx/source/table/tablelayouter.cxx | 12 ++---
svx/source/table/tablertfimporter.cxx|2
sw/source/core/access/accmap.cxx | 16 +++
sw/source/core/bastyp/swrect.cxx |4 -
sw/source/core/layout/paintfrm.cxx | 52 +++
sw/source/ui/uiview/viewport.cxx | 18 ---
tools/inc/tools/gen.hxx | 18 ---
tools/inc/tools/vector2d.hxx | 14 +++---
vcl/aqua/source/window/salframe.cxx |8 +--
vcl/aqua/source/window/salmenu.cxx |2
vcl/ios/source/window/salframe.cxx |8 +--
vcl/source/control/button.cxx|2
vcl/source/control/imgctrl.cxx |8 +--
vcl/source/control/tabctrl.cxx | 12 ++---
vcl/source/gdi/outdev.cxx|6 +-
vcl/source/gdi/outdev3.cxx |8 +--
vcl/source/gdi/pdfwriter_impl.cxx|8 +--
vcl/source/window/brdwin.cxx | 14 +++---
vcl/source/window/dockmgr.cxx| 36 ---
vcl/source/window/splitwin.cxx |8 +--
vcl/source/window/syswin.cxx |8 +--
vcl/source/window/window.cxx | 10 ++--
vcl/win/source/window/salframe.cxx |8 +--
vcl/workben/vcldemo.cxx |4 -
41 files changed, 214 insertions(+), 202 deletions(-)
New commits:
commit 53ad646f54f8aa33b86c696c04500fd08ea6f3b6
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Sun Oct 28 23:23:53 2012 +0100
Enforce use of accessors on gen.hxx structures
Change-Id: Icd1b2937fdeaba6de1877258731f53ddf996002e
Reviewed-on: https://gerrit.libreoffice.org/936
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/filter/source/flash/swfwriter1.cxx
b/filter/source/flash/swfwriter1.cxx
index cce56ee..3efc36c 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1162,7 +1162,7 @@ void Writer::Impl_writeLine( const Point rPt1, const
Point rPt2, const Color*
void Writer::Impl_writeRect( const Rectangle rRect, long nRadX, long nRadY )
{
-if( (rRect.nTop == rRect.nBottom) || (rRect.nLeft == rRect.nRight) )
+if( (rRect.Top() == rRect.Bottom()) || (rRect.Left() == rRect.Right()) )
{
Color aColor( mpVDev-GetFillColor() );
Impl_writeLine( rRect.TopLeft(), rRect.BottomRight(), aColor );
diff --git a/filter/source/flash/swfwriter2.cxx
b/filter/source/flash/swfwriter2.cxx
index 4b4c7a5..b951064 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -252,23 +252,27 @@ void Tag::writeRect( SvStream rOut, const Rectangle
rRect )
sal_Int32 minX, minY, maxX, maxY;
-if( rRect.nLeft rRect.nRight )
+if( rRect.Left() rRect.Right() )
{
-minX = rRect.nLeft; maxX = rRect.nRight;
+minX = rRect.Left();
+maxX = rRect.Right();
}
else
{
-maxX = rRect.nLeft; minX = rRect.nRight;
+maxX = rRect.Left();
+minX = rRect.Right();
}
-if( rRect.nTop rRect.nBottom )
+if( rRect.Top() rRect.Bottom() )
{
-minY = rRect.nTop; maxY = rRect.nBottom;
+minY = rRect.Top();
+maxY = rRect.Bottom();
}
else
{
-maxY = rRect.nTop; minY = rRect.nBottom;
+maxY = rRect.Top();
+minY = rRect.Bottom();
}
// AS: Figure out the maximum nubmer of bits required to represent any of
the
@@ -665,7 +669,7 @@ void FillStyle::Impl_addGradient( Tag* pTag ) const
case GradientStyle_FORCE_EQUAL_SIZE: break;
}
-m.translate( maBoundRect.nLeft, maBoundRect.nTop );
+m.translate( maBoundRect.Left(), maBoundRect.Top() );
[PUSHED] Enforce use of accessors on gen.hxx structures
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/936 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/936 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd1b2937fdeaba6de1877258731f53ddf996002e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/renewpo.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit b420358033faf43ceabb38418902cecffd1c643c
Author: David Ostrovsky da...@ostrovsky.org
Date: Tue Nov 20 21:06:25 2012 +0100
WaE ignoring return value
Change-Id: I3a8fa34eb739e4595f8a9d279e33b9191adc2443
diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx
index a9f3321..4c236ef 100644
--- a/l10ntools/source/renewpo.cxx
+++ b/l10ntools/source/renewpo.cxx
@@ -84,11 +84,16 @@ void HandleLanguage(struct dirent* pLangEntry, const
OString rOldPath,
}
const OString SDFFileName =
OUStringToOString(aTempPath, RTL_TEXTENCODING_UTF8);
-system( (rpo2loPath +
+const char* cmd = (rpo2loPath +
-i + rOldPath + / + LangEntryName +
-o + SDFFileName +
-l + LangEntryName +
- -t + rSDFPath).getStr());
+-t + rSDFPath).getStr();
+if (system(cmd) != 0)
+{
+std::cerr Error: Failed to execute cmd '\n';
+throw false;
+}
cout Language sdf is ready! endl;
//Store info for po entries
@@ -136,7 +141,13 @@ void HandleLanguage(struct dirent* pLangEntry, const
OString rOldPath,
const OString sNewPoFileName =
GetPath(rNewPath + / +LangEntryName,pActInfo-second.first) +
.po;
-system((mkdir -p +
sNewPoFileName.copy(0,sNewPoFileName.lastIndexOf(/))).getStr());
+const char* cmd2 = (mkdir -p +
sNewPoFileName.copy(0,sNewPoFileName.lastIndexOf(/))).getStr();
+if (system(cmd2) != 0)
+{
+std::cerr Error: Failed to execute cmd2 '\n';
+throw false;
+}
+
aNewPo.open(sNewPoFileName);
if (!aNewPo.isOpen())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Reverted Hide the rulers in Writer by default for a cleaner look
Hi Kendy, thanks for considering my patch and discussing it. Terribly sorry for that - but the Design team consensus (as discussed on the ESC meeting) was not to hide the rulers by default, so I have reverted the change: It's totally ok for me that it has been reverted, I know that it's a controversial change and it seems to be better to stick with the rulers enabled by default. Thank you for all your patches you've sent so far! - I loved your Wordcount dialog improvements, eg. Thanks :) I got some inspiration from Google Docs ;) Maybe I'll continue working on other Dialogs. Regards, Samuel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [TRIAGE UPDATE] 11/20/2012
The Google Document is now updated, if you have some free time (haha?) and can do even 1 bug a week, please assign yourself a sheet. Some of them have a very small amount of bugs (10), it'd be nice to get those components done https://docs.google.com/spreadsheet/ccc?key=0ApS-XtOUGGH5dDIwaXN1YnNsM0h4RXFKdVhvb2RRb0E For any in the US, happy Thanksgiving week :) Regards, Joel On Tue, Nov 20, 2012 at 10:01 AM, Joel Madero jmadero@gmail.com wrote: Hi All, We're falling way behind again after going a couple months doing well. We're back up to almost 1,100 bugs that haven't been triaged and were reported more than 30 days ago. This is 250 more than 3 months ago. I am going to update the Google doc but feel free to tackle some in the mean time: https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDchfieldto=-31Dproduct=LibreOfficequery_format=advancedorder=changeddate%2Cpriority%2Cbug_severitylimit=0list_id=168313 Google Doc can be found here: https://docs.google.com/spreadsheet/ccc?key=0ApS-XtOUGGH5dDIwaXN1YnNsM0h4RXFKdVhvb2RRb0E Stats: http://wiki.documentfoundation.org/QA_Stats#Unconfirmed_Bugs_Reported_More_Than_30_Days_Ago Regards, Joel -- *Joel Madero* LibO QA Volunteer jmadero@gmail.com -- *Joel Madero* LibO QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build environment for official win32 builds
yes ... but i don't remember the 4NT/native tools based build system OOo had back in 2008 or so to be fast by any stretch of the imagination... Well, I have never used those, so I don't know. Surely those tools, too, tried to if not emulate, at least simulate, POSIX in some ways? Anyway, my point with this: And when using a build mechanism that has been developed on Unix systems in general and lately Linux in particular. was that the build mechanism (including how a make program works in general) is designed with UNIX concepts/ideas/principles in mind. But those concepts are intuitive, obviously the correct way to design an OS and its applications, etc etc. Yeah, sure, *we* who have been using UNIX for a long time think so. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/renewpo.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 835d0fb70097b41eef057493bb1fb67c12ce5306
Author: David Ostrovsky da...@ostrovsky.org
Date: Tue Nov 20 21:31:23 2012 +0100
WaE ignoring return value, this time really
Change-Id: I5647f318000d83f1f363153c1bc7f4ae4effc88c
diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx
index 4c236ef..87a871a 100644
--- a/l10ntools/source/renewpo.cxx
+++ b/l10ntools/source/renewpo.cxx
@@ -84,14 +84,14 @@ void HandleLanguage(struct dirent* pLangEntry, const
OString rOldPath,
}
const OString SDFFileName =
OUStringToOString(aTempPath, RTL_TEXTENCODING_UTF8);
-const char* cmd = (rpo2loPath +
+const OString cmd = OString(rpo2loPath +
-i + rOldPath + / + LangEntryName +
-o + SDFFileName +
-l + LangEntryName +
--t + rSDFPath).getStr();
-if (system(cmd) != 0)
+ -t + rSDFPath);
+if (system(cmd.getStr()) != 0)
{
-std::cerr Error: Failed to execute cmd '\n';
+std::cerr Error: Failed to execute cmd.getStr() '\n';
throw false;
}
cout Language sdf is ready! endl;
@@ -141,10 +141,10 @@ void HandleLanguage(struct dirent* pLangEntry, const
OString rOldPath,
const OString sNewPoFileName =
GetPath(rNewPath + / +LangEntryName,pActInfo-second.first) +
.po;
-const char* cmd2 = (mkdir -p +
sNewPoFileName.copy(0,sNewPoFileName.lastIndexOf(/))).getStr();
-if (system(cmd2) != 0)
+const OString cmd2 = OString(mkdir -p +
sNewPoFileName.copy(0,sNewPoFileName.lastIndexOf(/)));
+if (system(cmd2.getStr()) != 0)
{
-std::cerr Error: Failed to execute cmd2 '\n';
+std::cerr Error: Failed to execute cmd2.getStr()
'\n';
throw false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] cairo: convert to gbuild
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1144 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1144 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f3dd368a0d0b78b73df3baad214a1079bbbd1d3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Fwd] LibreOffice 3.6.3.2 build on Linux fail on dictionaries and help (localize.sdf not found)
Hey, Yeah, I could also disable all translations-related stuff, but I would wanted to have a full build of LO, containing translations, dictionaries and help content (but the last is optional). Especially in french, because I'm building it for a french distribution. So for the second error, maybe the --disable-help can help, but for the first one, it'll not change anything, and I need at least French and English dictionaries. But actually we can't choose which one to build, so it tries to build the hu_HU one too, and fails. Thanks. -- View this message in context: http://nabble.documentfoundation.org/Fwd-LibreOffice-3-6-3-2-build-on-Linux-fail-on-dictionaries-and-help-localize-sdf-not-found-tp4019742p4019888.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] .: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec8dcf58e95bda4c394fc15b5eae72c408f19aca Author: Andras Timar ati...@suse.com Date: Tue Nov 20 21:45:17 2012 +0100 Updated core Project: dictionaries e295c6f831f0435fc5a68ea0fd1a50bcba76ea16 translations is a source-only module diff --git a/dictionaries b/dictionaries index 028f440..e295c6f 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 028f44069fd346ba07b3a0263ee340022eb44d6c +Subproject commit e295c6f831f0435fc5a68ea0fd1a50bcba76ea16 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: prj/build.lst
prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e295c6f831f0435fc5a68ea0fd1a50bcba76ea16 Author: Andras Timar ati...@suse.com Date: Tue Nov 20 21:45:17 2012 +0100 translations is a source-only module Change-Id: I93b248918bcd9e25221874c61ac88cf1b91e1523 diff --git a/prj/build.lst b/prj/build.lst index f9f34c6..cbf6fb5 100644 --- a/prj/build.lst +++ b/prj/build.lst @@ -1,3 +1,3 @@ -di dictionaries : sal soltools DESKTOP:l10ntools mythes TRANSLATIONS:translations NULL +di dictionaries : sal soltools DESKTOP:l10ntools mythes NULL di dictionariesusr1 - all di_mkout NULL di dictionaries\prj nmake - all di_prj NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppuhelper/inc offapi/com offapi/org sal/inc shell/source udkapi/com vcl/inc
cppuhelper/inc/cppuhelper/supportsservice.hxx |2 -
offapi/com/sun/star/awt/XToolkit2.idl |2 -
offapi/com/sun/star/configuration/ReadOnlyAccess.idl |2 -
offapi/com/sun/star/configuration/ReadWriteAccess.idl |2 -
offapi/com/sun/star/document/Settings.idl |4 +-
offapi/com/sun/star/frame/AutoRecovery.idl|2 -
offapi/com/sun/star/frame/XGlobalEventBroadcaster.idl |2 -
offapi/com/sun/star/frame/XModuleManager2.idl |2 -
offapi/com/sun/star/linguistic2/XLinguServiceManager2.idl |2 -
offapi/com/sun/star/sdb/XDatabaseContext.idl |2 -
offapi/com/sun/star/style/PageProperties.idl |2 -
offapi/com/sun/star/task/XPasswordContainer2.idl |2 -
offapi/com/sun/star/text/TextPageStyle.idl|4 +-
offapi/com/sun/star/text/textfield/Annotation.idl |4 +-
offapi/com/sun/star/ucb/XUniversalContentBroker.idl |2 -
offapi/com/sun/star/ui/dialogs/XFolderPicker2.idl |2 -
offapi/com/sun/star/util/XNumberFormatter2.idl|2 -
offapi/com/sun/star/xml/crypto/NSSInitializer.idl |2 -
offapi/com/sun/star/xml/crypto/XNSSInitializer.idl|2 -
offapi/com/sun/star/xml/dom/XSAXDocumentBuilder2.idl |2 -
offapi/com/sun/star/xml/sax/Writer.idl|2 -
offapi/com/sun/star/xml/sax/XWriter.idl |2 -
offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl |2 -
offapi/com/sun/star/xml/xslt/XSLTTransformer.idl |2 -
offapi/com/sun/star/xml/xslt/XXSLTTransformer.idl |2 -
offapi/org/freedesktop/PackageKit/XModify.idl | 22 +++---
offapi/org/freedesktop/PackageKit/XQuery.idl |4 +-
sal/inc/osl/interlck.h|4 +-
sal/inc/rtl/string.h |2 -
sal/inc/rtl/string.hxx|6 +--
sal/inc/rtl/ustring.h |4 +-
sal/inc/rtl/ustring.hxx | 10 +++---
sal/inc/sal/types.h |2 -
shell/source/sessioninstall/SyncDbusSessionHelper.hxx |2 -
udkapi/com/sun/star/bridge/XBridgeFactory2.idl|2 -
udkapi/com/sun/star/io/XPipe.idl |2 -
udkapi/com/sun/star/reflection/theCoreReflection.idl |2 -
vcl/inc/vcl/temporaryfonts.hxx|2 -
38 files changed, 60 insertions(+), 60 deletions(-)
New commits:
commit ca00713a613f3f5babf83707838fdbecfffd88a7
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 20 21:40:36 2012 +0100
offapi: rename XModify.InstalliGStreamerResources
...since GStreamer is not an Apple product it should not be
called iGStreamer.
Change-Id: Ia2b73ecb56dd7aee88b23b560430ffe94b455665
diff --git a/offapi/org/freedesktop/PackageKit/XModify.idl
b/offapi/org/freedesktop/PackageKit/XModify.idl
index 33a8fa0..b79542f 100644
--- a/offapi/org/freedesktop/PackageKit/XModify.idl
+++ b/offapi/org/freedesktop/PackageKit/XModify.idl
@@ -70,7 +70,7 @@ interface XModify : com::sun::star::uno::XInterface
* @since LibreOffice 4.0
*/
-void InstalliGStreamerResources( [in] unsigned long xid, [in] sequence
string resources, [in] string interaction);
+void InstallGStreamerResources( [in] unsigned long xid, [in] sequence
string resources, [in] string interaction);
/**
* Installs resources of a given type from a configured software source.
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index 32c1ac1..78bbc8e 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -35,7 +35,7 @@ namespace shell { namespace sessioninstall
{ throw ::com::sun::star::uno::RuntimeException(); } // not
implemented
virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 /*
xid */, const ::com::sun::star::uno::Sequence ::rtl::OUString /* resources
*/, const ::rtl::OUString /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
{ throw ::com::sun::star::uno::RuntimeException(); } // not
implemented
-virtual void SAL_CALL InstalliGStreamerResources( ::sal_uInt32 /*
xid */, const ::com::sun::star::uno::Sequence ::rtl::OUString /* resources
*/, const ::rtl::OUString /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL InstallGStreamerResources( ::sal_uInt32 /*
xid */, const ::com::sun::star::uno::Sequence ::rtl::OUString /* resources
*/, const ::rtl::OUString /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException)
{ throw
Re: Line height depending on characters in that line
On Tue, Nov 20, 2012 at 05:57:12PM +0100, Lubos Lunak wrote: Hello, I'd need a little help from somebody who knows how exactly line height is computed. Specifically, create a new document, create a bullet list (2-3 items), and change it from bullets to 1. style (RMB-Bullets and numbering...-Numbering type - any of those). Doing this (visible when repeatedly hitting Ctrl+Z and Ctrl+Y) noticeably changes the height of all the lines. With MSWord there isn't such a big difference, leading to different formatting on .docx import in a specific bugreport I have. I have checked that this change is triggered by the bullet character being or not being present in the actual string representation of the line, so I assume that the bullet character from the OpenSymbol font is somehow higher than the rest, or that the font itself specifies this height. But I have no idea how this stuff works. What would be the proper way of fixing this? If you are on Linux, try setting env variable SAL_USE_NEW_LINEHEIGHT and see if it makes any difference (probably not, either case pullets shouldn't affect line height, but this is done in VCL which might be too late to distinguish content from non-content text). Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/po.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7ad55015326edc0c9d21c446cdb9cff9ea12cc4c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Nov 20 22:01:05 2012 +0100
work around ambiguity with msvc and old gcc
C:/cygwin/home/tinderbox/master-build/l10ntools/source/po.cxx(188) : error
C2666: 'std::fpos_Statetype::operator !=' : 2 overloads have similar
conversions
with
[
_Statetype=_Mbstatet
]
C:/PROGRA~2/MICROS~1.0/VC/include\iosfwd(116): could be 'bool
std::fpos_Statetype::operator !=(const std::fpos_Statetype ) const'
with
[
_Statetype=_Mbstatet
]
or 'built-in C++ operator!=(std::streamoff, long)'
while trying to match the argument list '(std::fpos_Statetype,
long)'
with
[
_Statetype=_Mbstatet
]
Change-Id: Id1375d68996414c5ccf75d5d3ebc0afad061e3d2
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 6ce5018..8ee7dc9 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -185,7 +185,7 @@ void GenPoEntry::setFuzzy(const bool bFuzzy)
//Write to file
void GenPoEntry::writeToFile(std::ofstream rOFStream) const
{
-if ( rOFStream.tellp() != 0 )
+if ( rOFStream.tellp() != std::ofstream::pos_type( 0 ))
rOFStream std::endl;
if ( !m_sExtractCom.isEmpty() )
rOFStream
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Fwd] LibreOffice 3.6.3.2 build on Linux fail on dictionaries and help (localize.sdf not found)
Hello, On Tue, Nov 20, 2012 at 9:40 PM, piernov pier...@piernov.org wrote: Hey, Yeah, I could also disable all translations-related stuff, but I would wanted to have a full build of LO, containing translations, dictionaries and help content (but the last is optional). Especially in french, because I'm building it for a french distribution. So for the second error, maybe the --disable-help can help, but for the first one, it'll not change anything, and I need at least French and English dictionaries. But actually we can't choose which one to build, so it tries to build the hu_HU one too, and fails. Thanks. It seems that sdf files have not been generated for you from the translations module. Some tools might ignore it, and use en-US everywhere, while propex seems to be picky about it. Did you try to make translations module manually? Probably the real error is there. make translations.clean make translations Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac editeng/prj instsetoo_native/prj librelogo/prj Module_cross_tail_build.mk Module_tail_build.mk RepositoryModule_ooo.mk sdext/prj setup_native/prj svl/prj sysui/pr
Module_cross_tail_build.mk |1 - Module_tail_build.mk |1 - RepositoryModule_ooo.mk|1 - configure.ac |1 - editeng/prj/build.lst |2 +- instsetoo_native/prj/build.lst |2 +- librelogo/prj/build.lst|2 +- sdext/prj/build.lst|2 +- setup_native/prj/build.lst |2 +- svl/prj/build.lst |2 +- sysui/prj/build.lst|2 +- vcl/prj/build.lst |2 +- 12 files changed, 8 insertions(+), 12 deletions(-) New commits: commit c75ed68f056342477586ebd4214786f5a440005e Author: Andras Timar ati...@suse.com Date: Tue Nov 20 22:10:21 2012 +0100 translations is a source-only module Change-Id: Ib89ccdfe3646f68df6b483c54eb330c0b223c32a diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index de8bc75..2e15516 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -68,7 +68,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ stoc \ store \ tools \ - $(call gb_Helper_optional,TRANSLATIONS,translations) \ ucbhelper \ $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index c237d26..f499dcb 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -171,7 +171,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ toolkit \ tools \ touch \ - $(call gb_Helper_optional,TRANSLATIONS,translations) \ tubes \ twain \ ucb \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index cc37259..6b942c3 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -182,7 +182,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ toolkit \ tools \ touch \ - $(call gb_Helper_optional,TRANSLATIONS,translations) \ tubes \ twain \ ucb \ diff --git a/configure.ac b/configure.ac index 7e36a36..1545ca8 100644 --- a/configure.ac +++ b/configure.ac @@ -11863,7 +11863,6 @@ WITH_LANG_LIST=`echo $WITH_LANG | sed s/ALL/$ALL_LANGS/` # they need a real list of languages test -z $WITH_LANG_LIST WITH_LANG_LIST=en-US test $WITH_LANG = en-US WITH_LANG= -test -z $WITH_LANG || BUILD_TYPE=$BUILD_TYPE TRANSLATIONS AC_SUBST(ALL_LANGS) AC_SUBST(WITH_LANG) AC_SUBST(WITH_LANG_LIST) diff --git a/editeng/prj/build.lst b/editeng/prj/build.lst index 72b4636..37c850a 100644 --- a/editeng/prj/build.lst +++ b/editeng/prj/build.lst @@ -1,2 +1,2 @@ -ed editeng : TRANSLATIONS:translations svtools xmloff linguistic unotest NULL +ed editeng : svtools xmloff linguistic unotest NULL ed editeng\prj nmake - all ed_prj NULL diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst index 1347e36..46b09be 100644 --- a/instsetoo_native/prj/build.lst +++ b/instsetoo_native/prj/build.lst @@ -1,4 +1,4 @@ -ooninstsetoo_native:: TRANSLATIONS:translations postprocess packimages NULL +ooninstsetoo_native:: postprocess packimages NULL ooninstsetoo_nativeusr1 - all oon_mkout NULL ooninstsetoo_native\inc_openoffice\unixnmake - u oon_unix NULL ooninstsetoo_native\inc_openoffice\windows\msi_languages nmake - all oon_msilang NULL diff --git a/librelogo/prj/build.lst b/librelogo/prj/build.lst index d280a4a..6274580 100644 --- a/librelogo/prj/build.lst +++ b/librelogo/prj/build.lst @@ -1,2 +1,2 @@ -librelogo librelogo : TRANSLATIONS:translations offapi officecfg comphelper unotools l10ntools cppu tools cppuhelper sal javaunohelper officecfg DESKTOP:xmlhelp DESKTOP:helpcompiler NULL +librelogo librelogo : offapi officecfg comphelper unotools DESKTOP:l10ntools cppu tools cppuhelper sal javaunohelper officecfg DESKTOP:xmlhelp DESKTOP:helpcompiler NULL librelogo librelogo\prjnmake -alllibrelogo_prj NULL diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst index 3e540fe..27a7306 100644 --- a/sdext/prj/build.lst +++ b/sdext/prj/build.lst @@ -1,3 +1,3 @@ -dx sdext : TRANSLATIONS:translations offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt DESKTOP:xmlhelp DESKTOP:helpcompiler NULL +dx sdext : offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt DESKTOP:xmlhelp DESKTOP:helpcompiler NULL dx sdext usr1- all sdext_mkout NULL dx sdext\prj nmake - all sdext_prj NULL diff --git a/setup_native/prj/build.lst
[Libreoffice-commits] .: canvas/source
canvas/source/directx/dx_textlayout_drawhelper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c1282c1fa0d1724f88538f75229f1f5a8d177ab Author: Andras Timar ati...@suse.com Date: Tue Nov 20 22:19:24 2012 +0100 fix typo Change-Id: Ic5c3c2d9cb2ad4186aad7bd16693c972d4a257f3 diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 2fe6091..a73cda2 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -39,7 +39,7 @@ #include canvas/debug.hxx #include dx_impltools.hxx #include vcl/sysdata.hxx -#include i18npool/lanuagetag.hxx +#include i18npool/languagetag.hxx #include dx_textlayout_drawhelper.hxx #include dx_bitmap.hxx #include dx_canvasfont.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - .gitignore tail_build/prj
.gitignore |1 - tail_build/prj/build.lst |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 827c3806ada71b1e6701608621fd729cf54b1fc8 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Nov 18 12:53:01 2012 +0100 repo-list is gone since 664012b313f3c3cd5666fc6f943fc8152e503e23 Change-Id: I2178f60a75a0436c66f825fe001e23f6aefb0e97 diff --git a/.gitignore b/.gitignore index e1799e2..f7978e0 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,6 @@ /configure /desktop/scripts/soffice.sh /makefile.mk -/bin/repo-list /src.downloaded /ooo.lst /intltool-extract.in commit 81fc9abeb87e9322f354fc9743cac12d95820d04 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Nov 20 22:17:58 2012 +0100 tail_build: forgot to merge build.lst after cairo is in Change-Id: If745adf8541c980fa5cb1aa1b9f1ce9fa716504a diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 4f94749..7eec9e9 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BERKELEYDB:berkeleydb CPPUNIT:cppunit EXPAT:expat ICU:icu LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cairo/ExternalProject_cairo.mk RepositoryExternal.mk
RepositoryExternal.mk |3 +++ cairo/ExternalProject_cairo.mk |4 2 files changed, 7 insertions(+) New commits: commit adbe531ef00b8149f9c09c27928746a6ed595043 Author: Michael Stahl mst...@redhat.com Date: Tue Nov 20 22:24:09 2012 +0100 cairo: to actually use the right cairo-version.h... ...it is necessary to overwrite dummy src/cairo-version.h because that is included with from src/cairo.h which means that at least GCC 4.7 looks in the current directory src/ first... Change-Id: I4a254021ad318ffb428242443f7e1e29c876915c diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index cb51d62..54a220b 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -26,6 +26,9 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : else +# overwrite src/cairo-version.h because that is just a dummy file and included +# from cairo.h in non-overridable way + $(call gb_ExternalProject_get_state_target,cairo,build) : cd $(EXTERNAL_WORKDIR) \ ./configure \ @@ -46,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ +cp cairo-version.h src/cairo-version.h \ cd src $(MAKE) \ touch $@ commit de14220ae5b5e512007df004acec16812992f5f4 Author: Michael Stahl mst...@redhat.com Date: Tue Nov 20 22:05:36 2012 +0100 cairo: add missing dependencies, and add include dir... ...to find the right cairo-version.h Change-Id: Ia609f7498aae97a68e908101bdeae274d940d2e8 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5b66ac1..bc717b1 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -754,7 +754,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_cairo +$(call gb_LinkTarget_use_package,$(1),cairo) +$(call gb_LinkTarget_use_package,$(1),pixman) $(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,cairo) \ -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ $(FREETYPE_CFLAGS) \ $$(INCLUDE) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
