Crash when trying to change Line spacing in Writer (master sources only)
Hello, I noticed a crash when using Line Spacing, see https://bugs.freedesktop.org/show_bug.cgi?id=50438. I attached a backtrace. I don't have this problem with 3.5 branch. Could anyone confirm this ? Julien. -- View this message in context: http://nabble.documentfoundation.org/Crash-when-trying-to-change-Line-spacing-in-Writer-master-sources-only-tp3986477.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
Re: GSoC Week 1
I suppose it does not make much sense to build them in _any_ cross-compilation... Well, that depends. When debugging Android and iOS programs with gdb, the *gdb* program runs on the build platform, and just the gdbserver part (or something equivalent) runs on the host platform, no? If it is the gdb program itself that uses Python extensions, in theory our stuff could be used. But is it? I don't know. And in any case, for iOS, I think that Apple's gdb might not support Python extensions? And in any case Apple is moving in the direction of lldb (the debugger from the LLVM project). Still, yeah, until somebody actually investigates the complexities involved, would be best to just skip the gdb extension stuff for all cross-compilations. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit 85d89558a425c04917b396344f89c0f6fb41561e Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Mon May 28 22:00:51 2012 +0200 Check for libXext headers if we will need them Change-Id: I35dd689ccb4bd01bb47f15b4db00d01a715ad2a6 diff --git a/configure.in b/configure.in index 2ecac9b..5015915 100644 --- a/configure.in +++ b/configure.in @@ -8068,6 +8068,8 @@ if test $with_system_xextensions_headers != no; then AC_MSG_RESULT([no]) else AC_MSG_RESULT([yes]) +AC_CHECK_HEADERS(X11/extensions/shape.h,[],[AC_MSG_ERROR([libXext headers not found])], + [#include X11/extensions/shape.h]) BUILD_TYPE=$BUILD_TYPE X11_EXTENSIONS fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] [PUSHED] check for libXext
Thanks, pushified. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: shell/source
shell/source/backends/gconfbe/gconfaccess.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b6ce391171e417199d33ae085d2f0768a3e952b3
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 29 09:01:32 2012 +0200
-Werror=deprecated-declarations
g_strcasecmp - g_ascii_strcasecmp, hopefully the latter is already
available in oldest relevant glib.
Change-Id: Iac47ebd511672d4ca08d4dc998a536939d4a98c3
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx
b/shell/source/backends/gconfbe/gconfaccess.cxx
index 9771b5d..8b17824 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -401,7 +401,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient*
pClient, const Configurati
if ( pGconfValue != NULL )
{
-bool bOk = g_strcasecmp( manual, gconf_value_get_string(
pGconfValue ) ) == 0;
+bool bOk = g_ascii_strcasecmp( manual,
gconf_value_get_string( pGconfValue ) ) == 0;
gconf_value_free( pGconfValue );
if (bOk) return sal_True;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - oox/source writerfilter/source
oox/source/shape/ShapeContextHandler.cxx | 26 +
oox/source/shape/ShapeContextHandler.hxx |2 +
writerfilter/source/dmapper/GraphicImport.cxx |1
writerfilter/source/ooxml/model.xml | 31 ++
4 files changed, 60 insertions(+)
New commits:
commit 8c6fb76c2cc24c336a28702b5f7f31cb5964129a
Author: Miklos Vajna vmik...@suse.cz
Date: Tue May 29 08:37:07 2012 +0200
oox: initial smartart text is imported into Writer
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index 3234238..5ceb101 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -30,6 +30,7 @@
#include oox/vml/vmldrawingfragment.hxx
#include oox/vml/vmlshape.hxx
#include oox/vml/vmlshapecontainer.hxx
+#include oox/drawingml/diagram/diagram.hxx
namespace oox { namespace shape {
@@ -120,6 +121,19 @@ ShapeContextHandler::getDrawingShapeContext()
}
uno::Referencexml::sax::XFastContextHandler
+ShapeContextHandler::getDiagramShapeContext()
+{
+if (!mxDiagramShapeContext.is())
+{
+FragmentHandlerRef rFragmentHandler(new
ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
+mpShape.reset(new Shape());
+mxDiagramShapeContext.set(new
DiagramGraphicDataContext(*rFragmentHandler, mpShape));
+}
+
+return mxDiagramShapeContext;
+}
+
+uno::Referencexml::sax::XFastContextHandler
ShapeContextHandler::getContextHandler()
{
uno::Referencexml::sax::XFastContextHandler xResult;
@@ -130,6 +144,9 @@ ShapeContextHandler::getContextHandler()
case NMSP_vml:
xResult.set(getDrawingShapeContext());
break;
+case NMSP_dmlDiagram:
+xResult.set(getDiagramShapeContext());
+break;
default:
xResult.set(getGraphicShapeContext(mnStartToken));
break;
@@ -154,6 +171,9 @@ void SAL_CALL ShapeContextHandler::startFastElement
mpThemePtr.reset(new Theme());
+if (Element == DGM_TOKEN(relIds))
+createFastChildContext(Element, Attribs);
+
uno::ReferenceXFastContextHandler xContextHandler(getContextHandler());
if (xContextHandler.is())
@@ -247,6 +267,12 @@ ShapeContextHandler::getShape() throw
(uno::RuntimeException)
if( const ::oox::vml::ShapeBase* pShape =
mpDrawing-getShapes().takeLastShape() )
xResult = pShape-convertAndInsert( xShapes );
}
+else if (getContextHandler() == getDiagramShapeContext())
+{
+basegfx::B2DHomMatrix aMatrix;
+mpShape-addShape( *mxFilterBase, mpThemePtr.get(), xShapes,
aMatrix );
+xResult = mpShape-getXShape();
+}
else if (mpShape.get() != NULL)
{
basegfx::B2DHomMatrix aTransformation;
diff --git a/oox/source/shape/ShapeContextHandler.hxx
b/oox/source/shape/ShapeContextHandler.hxx
index df9c398..95aee66 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -159,6 +159,7 @@ private:
GraphicShapeContextPtr;
css::uno::ReferenceXFastContextHandler mxDrawingFragmentHandler;
css::uno::ReferenceXFastContextHandler mxGraphicShapeContext;
+css::uno::ReferenceXFastContextHandler mxDiagramShapeContext;
core::XmlFilterRef mxFilterBase;
drawingml::ThemePtr mpThemePtr;
@@ -168,6 +169,7 @@ private:
css::uno::ReferenceXFastContextHandler
getGraphicShapeContext(::sal_Int32 Element);
css::uno::ReferenceXFastContextHandler getDrawingShapeContext();
+css::uno::ReferenceXFastContextHandler getDiagramShapeContext();
css::uno::ReferenceXFastContextHandler getContextHandler();
};
commit 028d56943cac2a6f5eeec5f9f675e20814cb7447
Author: Miklos Vajna vmik...@suse.cz
Date: Tue May 29 08:36:29 2012 +0200
writerfilter: read dgm:relIds element and its attributes
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 4a71e1c..5429bbc 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1165,6 +1165,7 @@ void GraphicImport::lcl_sprm(Sprm rSprm)
case NS_ooxml::LN_CT_WrapPath_lineTo: // 90925;
case NS_ooxml::LN_graphic_graphic:
case NS_ooxml::LN_pic_pic:
+case NS_ooxml::LN_dgm_relIds:
{
writerfilter::ReferenceProperties::Pointer_t pProperties =
rSprm.getProps();
if( pProperties.get())
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index c5fea31..dbaa151 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -8,6 +8,7 @@
namespace-alias
name=http://schemas.openxmlformats.org/drawingml/2006/main; alias=drawingml
id=dml/
namespace-alias name=urn:schemas-microsoft-com:vml alias=vml id=vml/
namespace-alias
Re: [PATCH] disable unit tests wich depend on xmlsec was: sc filter test failures
Hello, Il 28/05/2012 23:08, David Ostrovsky ha scritto: On 28.05.2012 22:30, Markus Mohrhard wrote: Hey, The problem is --disable-xmlsec. You should not specify this flag as long as you plan to build on a normal platform. Behind xmlsec are also all our password related libraries so you can't open password protected documents. This option makes only sense for platforms where we don't yet support them. I was getting the same error on feature/gbuild_merge branch and reported it here: [1]. I think we should handle this properly: if some feature is disabled, unit tests have to be disabled too. Attached patch does it. [1] http://lists.freedesktop.org/archives/libreoffice/2012-May/032345.html Or at least say it straight in the help that you are going to waste time if you don't know what you are doing :) See attached patch. thanks, riccardo From 216f4e4d6064d0f996ec1978717bd615afd89086 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Tue, 29 May 2012 09:16:25 +0200 Subject: [PATCH] configure: warn about disabling XML security Some tests will fail and bad things will happen. Change-Id: Ic4b36a030e527b0869d8f8875e6a7c3dfe0a4ff9 --- configure.in |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 2382c83..52c937d 100644 --- a/configure.in +++ b/configure.in @@ -778,7 +778,8 @@ AC_ARG_ENABLE(build-mozilla, AC_ARG_ENABLE(xmlsec, AS_HELP_STRING([--disable-xmlsec], -[Whether to enable XMLsec for open document signing.]), +[Whether to enable XMLsec for open document signing. Be warned, + building without XML Security will likely give you test failures.]), ) AC_ARG_ENABLE(tde, -- 1.7.5.4 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 955ef015ece01e8b4ccc8dff53e1e2b4de93ebd0 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Tue May 29 09:16:25 2012 +0200 Warn about disabling XML security Some tests will fail and bad things will happen. Change-Id: Ic4b36a030e527b0869d8f8875e6a7c3dfe0a4ff9 diff --git a/configure.in b/configure.in index 5015915..94f545e 100644 --- a/configure.in +++ b/configure.in @@ -778,7 +778,8 @@ AC_ARG_ENABLE(build-mozilla, AC_ARG_ENABLE(xmlsec, AS_HELP_STRING([--disable-xmlsec], -[Whether to enable XMLsec for open document signing.]), +[Whether to enable XMLsec for open document signing. Be warned, + building without XML Security will likely give you test failures.]), ) AC_ARG_ENABLE(tde, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] [PUSHED] disable unit tests wich depend on xmlsec was: sc filter test failures
Or at least say it straight in the help that you are going to waste time if you don't know what you are doing :) See attached patch. Thanks, applied and pushed. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/Library_kabdrv1.mk
connectivity/Library_kabdrv1.mk |4 1 file changed, 4 insertions(+) New commits: commit f77a09b236a825c2ca358e7faa1402cce0f25a03 Author: David Tardon dtar...@redhat.com Date: Tue May 29 09:38:33 2012 +0200 fix build with KDE Change-Id: I409054f4d24cfd1e768d1bb346ad38342d1b2c92 diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 1120536..9bc575c 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -32,6 +32,10 @@ $(eval $(call gb_Library_use_api,kabdrv1,\ udkapi \ )) +$(eval $(call gb_Library_use_externals,kabdrv1,\ + kde \ +)) + $(eval $(call gb_Library_add_libs,kabdrv1,\ -lkabc \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)
On 22/05/12 15:56, Lubos Lunak wrote: On Friday 18 of May 2012, Michael Stahl wrote: On 16/05/12 15:09, Lubos Lunak wrote: (i wonder if -ggdb1 exists and would be sufficient for symbols but don't care enough to try). It does, from gcc manpage: Level 1 produces minimal information, enough for making backtraces in parts of the program that you don't plan to debug. This includes descriptions of functions and external variables, but no information about local variables and no line numbers. hmm.. line numbers are useful though, especially in sw when a method needs the first 100 lines just to declare all the variables used in the ugly Pascal-style... Now --enable-debug=-sc/ means that sc/ is built without -g and with -O2. In other words, the compiler spends extra time working on code I don't care about at all. There was a reason why OPT flags was empty in --enable-debug build - as soon as I do a developer build, I don't want the compiler to optimize any code, anywhere, unless explicitly told so. that is surprising; i had thought that developers either want code that runs fast, or code that is debuggable (i.e. the point of disabling optimizations is not to confuse the debugger), but you apparently want slow code that is not debuggable? I want code that builds fast. Or rather, code that doesn't take ages to build. LO needs a lot of time for building even without the compiler spending time on optimizing it. But I'm not actually thinking of me, I know I can manually override CXXFLAGS, I'm thinking of people who don't have as powerful build systems and have to wait a long time for builds. I think people are more likely to see big delays rather than many small ones. i don't think disabling optimization makes the build fast enough, i would guess most people figure out that anybody can change a header in sal any day, and that will take too long to rebuild in any case, and the only sane way to actually work and not just wait for builds is to keep a checkout and not rebase it for at least a week. but i don't care that much about it, and wonder what other developers think about optimization in --enable-dbgutil. it has occasionally annoyed me how horribly slow loading certain large documents becomes if optimization is disabled. Moreover, such code actually is built also with -g. I'm not sure why, but something now seems to turn on -g for everything, regardless of the selective symbols. sounds like you also have --enable-symbols on, which works globally, as the intended target audience doesn't know for which parts stack traces need to be generated, so it doesn't make sense to sub-divide this. I don't, it's something else introducing it. But that's just a bug somewhere. weird, just tried out with --enable-debug=sal/ and i get -O0 -ggdb2 in sal but -O2 and no -g in xml2cmp (as dbgutil and symbols default to off). So move the selective symbol feature back to --enable-debug. That does not make much sense. Even this very sentence says that symbols and debug are again tangled together. makes sense, because it is in fact not a selective symbol but a selective debug feature (and iirc Bjoern had originally implemented it as such); But --enable-debug enables assertions, logging and other stuff, so --enable-debug=sc/ seems to suggest that they will be only enabled in sc/ , while in fact they will be enabled everywhere, and only -g will be enabled in sc/ . hmm... looks like there's still a bug there, the debuglevel is still a global variable while it should be tied into the LinkTarget_get_cflags stuff. So it is selective symbol and not selective debug, because it only controls -g and has since Bjoern's first version. Bjoern's first version disabled compiler optimization but not OSL_DEBUG_LEVEL, just like the current situation. Having this selectivity controlled by --enable-debug only adds to the confusion about what option actually does what. no, it makes things clearer: if you want to debug Writer ODF import, then use --enable-debug=xmloff/ sw/ and you get a build where you can easily step through with gdb and get more-or-less helpful assertions as well when things go wrong (or equivalently make xmloff.clean sw.clean make xmloff sw debug=t). no need to remember how to set up each of these things individually. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW:3-5] fdo#44174 export RTF_TITLEPG when title page has no header
Hi,
See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b22749f
Reportedly regression from 3.4, though hard to see how this ever worked.
;)
Backported patch attached.
Thanks,
Miklos
From dba3e01960cfa5c4aec4588d3c2625e35922cfaa Mon Sep 17 00:00:00 2001
From: Miklos Vajna vmik...@suse.cz
Date: Fri, 11 May 2012 09:38:03 +0200
Subject: [PATCH] fdo#44174 RTF_TITLEPG when title page has no header
Change-Id: Ida6566b38ceaca30441a029c73bd1f52d93bbb3b
---
sw/source/filter/ww8/rtfexport.cxx |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 0904ac8..cf13e5f 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1193,6 +1193,7 @@ void RtfExport::OutPageDescription( const SwPageDesc rPgDsc, sal_Bool bWriteRes
// title page
if( pAktPageDesc != rPgDsc )
{
+Strm() OOO_STRING_SVTOOLS_RTF_TITLEPG;
pAktPageDesc = rPgDsc;
if( pAktPageDesc-GetMaster().GetAttrSet().GetItemState( RES_HEADER,
sal_False, pItem ) == SFX_ITEM_SET )
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
sw filter test failures
On Mon, 2012-05-28 at 22:15 +0200, Riccardo Magliocchetti wrote: i have this test failures while building libo, i'm getting these while building headless so today tried to build libo without --enable-headless and got them too: FWIW, from a clean[1] build on my linux machine of master from commit a26efd71ed18738edb6b4fe272418831e797dac6 I get: [ build CUT ] sw_filters_test File tested,Test Result,Execution Time (ms) file:///data/opt/libreoffice/master/sw/qa/core/data/xml/fail/CVE-2006-3117-1.sxw,Fail,153 File tested,Test Result,Execution Time (ms) file:///data/opt/libreoffice/master/sw/qa/core/data/ww8/pass/CVE-2010-3454-1.doc.dc,Fail,27 filters-test.cxx:129:Assertion Test name: SwFiltersTest::testCVEs assertion failed - Expression: bRes == (nExpected == test::pass) - file:///data/opt/libreoffice/master/sw/qa/core/data/ww8/pass/CVE-2010-3454-1. doc.dc I suspect this is something to do with this different block of configure options I'm using vs. another identical system where it works fine: --disable-build-mozilla --disable-mozilla --with-system-nss --enable-telepathy --with-system-dicts --without-myspell-dicts IMHO - it makes most sense for the unit tests to cut out those bits that are known not to work for a given configuration - so the most people can build straight through. Then again, it's rather unclear to me why any of the above should break things (so perhaps it is something else). HTH, Michael. [1] - make clean ; rm -Rf workdir solver -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ 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 Bug 37361 depends on bug 47769, which changed state. Bug 47769 Summary: FILEOPEN particular DOCX 2007 - pictures shown wrongly on page 1 https://bugs.freedesktop.org/show_bug.cgi?id=47769 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||46114 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: 2 commits - connectivity/Library_kab1.mk connectivity/Library_kabdrv1.mk
connectivity/Library_kab1.mk|5 + connectivity/Library_kabdrv1.mk |9 + 2 files changed, 14 insertions(+) New commits: commit b40f7d051b859130ab28150f8608e25e90aafd99 Author: David Tardon dtar...@redhat.com Date: Tue May 29 10:35:34 2012 +0200 more missing includes for KDE Change-Id: I74d8b0cd79a21c856ed638465ca73815f324ba48 diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 9bc575c..e5a1673 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Library_Library,kabdrv1)) +$(eval $(call gb_Library_use_packages,kabdrv1,\ + shell_inc \ +)) + $(eval $(call gb_Library_use_api,kabdrv1,\ offapi \ udkapi \ @@ -36,6 +40,11 @@ $(eval $(call gb_Library_use_externals,kabdrv1,\ kde \ )) +$(eval $(call gb_Library_set_include,kabdrv1,\ + -I$(SRCDIR)/connectivity/source/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_add_libs,kabdrv1,\ -lkabc \ )) commit e962c1b2d5798b6bca7ae7566e178d06deadf509 Author: David Tardon dtar...@redhat.com Date: Tue May 29 10:18:08 2012 +0200 set include path for kab1 Change-Id: Ifbbf4de9c1ff94b89d23e2d5952d7e16d9fb2de4 diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index d7705d8..7480d29 100644 --- a/connectivity/Library_kab1.mk +++ b/connectivity/Library_kab1.mk @@ -36,6 +36,11 @@ $(eval $(call gb_Library_use_api,kab1,\ udkapi \ )) +$(eval $(call gb_Library_set_include,kab1,\ + -I$(SRCDIR)/connectivity/source/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_use_libraries,kab1,\ comphelper \ cppu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 46114 - Java Access Bridge no longer works
On Mon, 2012-05-28 at 12:38 -0700, V Stuart Foote wrote: So understand the effort to reduce the Java UNO dependencies and desire to move to more robust solutions. But it would appear that current releases of Oracle's Java Access Bridge is no longer functioning, so the Accessibility Support assistive technology tools... check box causes LibreOffice 3.5.x Windows builds to crash. That is not good; marked it a most annoying bug. It'd be wonderful to have a stack-trace from a windows build, but of course - these are not so easy to create. Either need to press on with the IBM contributed IAcessible2 integration ( https://bugs.freedesktop.org/show_bug.cgi?id=39956 ) to fully eliminate JAB, Sure; unfortunately (as yet) the Symphony code-dump is not in a state where that can be easily extracted for 3.6. or roll back and revisit what we've done to ourselves and what Oracle has done with the package that is making it incompatible. Sure; that's certainly worth doing. It sounds like it started to fail in the 3.4 to 3.5 transition - a shame that we only discovered it now. Eitherway there is a large class of disabled LO users on Windows that have been left hanging--and not just users dependent on screen readers like NVDA. Yep; it needs fixing. Of course - getting a good stack-trace from a real live system with NVDA installed, where we can reproduce this is the first step. I'm struggling with VirtualBox's persistent mangling of it's own configuration personally so ... Hmm, 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] .: connectivity/AllLangResTarget_hsqldb.mk
connectivity/AllLangResTarget_hsqldb.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e689eb6401e69c39c2e52a4659b49b7b98422914 Author: Stephan Bergmann sberg...@redhat.com Date: Tue May 29 10:41:31 2012 +0200 Typo Change-Id: I59cdfb17a384d124cc7857b73adf53a10795fd27 diff --git a/connectivity/AllLangResTarget_hsqldb.mk b/connectivity/AllLangResTarget_hsqldb.mk index 923833d..4bccc5e 100644 --- a/connectivity/AllLangResTarget_hsqldb.mk +++ b/connectivity/AllLangResTarget_hsqldb.mk @@ -30,7 +30,7 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,hsqldb)) $(eval $(call gb_AllLangResTarget_set_reslocation,hsqldb,database)) $(eval $(call gb_AllLangResTarget_add_srs,hsqldb,\ - database \ + hsqldb/res \ )) $(eval $(call gb_SrsTarget_SrsTarget,hsqldb/res)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/Library_recentfile.mk shell/StaticLibrary_xmlparser.mk
shell/Library_recentfile.mk |8 shell/StaticLibrary_xmlparser.mk |8 +++- 2 files changed, 15 insertions(+), 1 deletion(-) New commits: commit 7ccef10f9c7c5af5258a29733783f9164894e3f7 Author: Caolán McNamara caol...@redhat.com Date: Tue May 29 09:44:00 2012 +0100 get shell to build for me again Change-Id: Idf2dc8025085e417e7368d77420131ad459544b8 diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index 134847d..7588299 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -32,10 +32,18 @@ $(eval $(call gb_Library_set_include,recentfile,\ $$(INCLUDE) \ )) +ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_externals,recentfile,\ expat_utf16 \ )) +else +$(eval $(call gb_Library_use_externals,recentfile,\ + expat_utf8 \ +)) + +endif + $(eval $(call gb_Library_use_libraries,recentfile,\ sal \ $(gb_STDLIBS) \ diff --git a/shell/StaticLibrary_xmlparser.mk b/shell/StaticLibrary_xmlparser.mk index 13638bf..eeefe1d 100644 --- a/shell/StaticLibrary_xmlparser.mk +++ b/shell/StaticLibrary_xmlparser.mk @@ -36,12 +36,18 @@ ifeq ($(GUI),WNT) $(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser,\ -DXML_UNICODE \ )) -endif $(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\ expat_utf16 \ )) +else +$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\ + expat_utf8 \ +)) + +endif + $(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser,\ shell/source/all/xml_parser \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/kab/KPreparedStatement.hxx |3 +++ connectivity/source/drivers/kab/KResultSet.hxx |1 + connectivity/source/drivers/kab/KStatement.hxx |1 + 3 files changed, 5 insertions(+) New commits: commit f3d74f9df0548afe74bfe655c1268fa5f32c5cc4 Author: Stephan Bergmann sberg...@redhat.com Date: Tue May 29 10:53:49 2012 +0200 -Werror=overloaded-virtual Change-Id: Ic70ccbb9b9a3aeb226af116ce009937510cd8153 diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx index dfaf040..44ccffd 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.hxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx @@ -82,6 +82,9 @@ namespace connectivity virtual sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference ::com::sun::star::sdbc::XConnection SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); +using KabCommonStatement::executeQuery; +using KabCommonStatement::executeUpdate; +using KabCommonStatement::execute; // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index fc7e5f4..2792934 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -92,6 +92,7 @@ namespace connectivity virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any rValue, sal_Int32 nHandle) const; +using OPropertySetHelper::getFastPropertyValue; // you can't delete objects of this type virtual ~KabResultSet(); diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index dcc141f..3e1e3cd 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -93,6 +93,7 @@ namespace connectivity virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any rValue, sal_Int32 nHandle) const; +using OPropertySetHelper::getFastPropertyValue; virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); virtual void getNextParameter(::rtl::OUString rParameter) const throw(::com::sun::star::sdbc::SQLException); ___ 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 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||50438 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: connectivity/source
connectivity/source/drivers/mozab/MColumnAlias.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 149c6985788d32ca813d80be96e6cbb1f5236d83
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 29 09:59:18 2012 +0100
WaE: signed/unsigned
Change-Id: I46daa1c716b980a503225f40f64eeb70594e70cd
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx
b/connectivity/source/drivers/mozab/MColumnAlias.hxx
index 1508ae5..817d03e 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx
@@ -46,14 +46,14 @@ namespace connectivity
struct AliasEntry
{
::rtl::OString programmaticAsciiName;
-sal_Int32 columnPosition;
+size_t columnPosition;
AliasEntry()
:programmaticAsciiName()
,columnPosition( 0 )
{
}
-AliasEntry( const sal_Char* _programmaticAsciiName, sal_Int32
_columnPosition )
+AliasEntry( const sal_Char* _programmaticAsciiName, size_t
_columnPosition )
:programmaticAsciiName( _programmaticAsciiName )
,columnPosition( _columnPosition )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/Library_postgresql-sdbc-impl.mk
connectivity/Library_postgresql-sdbc-impl.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a4849e9d2b409b399191efaa446d42b797cc3d1e Author: Stephan Bergmann sberg...@redhat.com Date: Tue May 29 11:01:35 2012 +0200 Unquoted $(COMMA) Change-Id: I6d15cd77896da73422ab8c92f62d6341f7e2561f diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 62c4f2f..c31d225 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -62,10 +62,10 @@ ifneq ($(GUI)$(COM),WNTMSC) include $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\ - $(if $(filter-out MACOSX,$(OS)),-Wl,--as-needed) \ + $(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--as-needed) \ $(LIBPQ_DEP_LIBS) \ $(if $(filter-out MACOSX,$(OS)),-ldl) \ - $(if $(filter-out MACOSX,$(OS)),-Wl,--no-as-needed) \ + $(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--no-as-needed) \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/inc connectivity/source
connectivity/inc/connectivity/sqlnode.hxx|2 +-
connectivity/source/drivers/mozab/MPreparedStatement.cxx |4 ++--
connectivity/source/drivers/mozab/MPreparedStatement.hxx |2 +-
connectivity/source/drivers/mozab/MResultSet.cxx | 14 +++---
connectivity/source/drivers/mozab/MResultSetMetaData.cxx |2 +-
connectivity/source/drivers/mozab/MStatement.cxx |2 +-
connectivity/source/inc/TSortIndex.hxx |2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit d567a320b20bbbe5abe8c8cdc25476076f7fbcff
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 29 10:15:06 2012 +0100
WaE: signed/unsigned etc.
Change-Id: I3e2e43f5854b8bc33a442ecd25e089d20a122018
diff --git a/connectivity/inc/connectivity/sqlnode.hxx
b/connectivity/inc/connectivity/sqlnode.hxx
index 8874ed0..8d7a3fb 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -272,7 +272,7 @@ namespace connectivity
void setParent(OSQLParseNode* pParseNode) {m_pParent = pParseNode;};
-sal_uInt32 count() const {return m_aChildren.size();};
+size_t count() const {return m_aChildren.size();};
inline OSQLParseNode* getChild(sal_uInt32 nPos) const;
void append(OSQLParseNode* pNewSubTree);
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index c9b27e3..cb1fd13 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -408,11 +408,11 @@ ORowSetValue x)
}
//--
-sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const
ReferenceXPropertySet _xCol)
+size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const
ReferenceXPropertySet _xCol)
{
OSL_UNUSED( pParameter );
// Count of the newly added Parameters
-sal_uInt32 nParameter = m_xParamColumns-get().size()+1;
+size_t nParameter = m_xParamColumns-get().size()+1;
OSL_ENSURE(SQL_ISRULE(pParameter,parameter),OResultSet::AddParameter:
Argument is not a Parameter);
OSL_ENSURE(pParameter-count() 0,OResultSet: error in parse tree);
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index eca24fd..90f2cc7 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -97,7 +97,7 @@ namespace connectivity
void checkAndResizeParameters(sal_Int32 parameterIndex);
void setParameter(sal_Int32 parameterIndex, const ORowSetValue x);
-sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter,
+size_t AddParameter(connectivity::OSQLParseNode * pParameter,
const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet _xCol);
void scanParameter(OSQLParseNode* pParseNode,::std::vector
OSQLParseNode* _rParaNodes);
void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode*
_pNode,const OSQLTable _xTable);
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx
b/connectivity/source/drivers/mozab/MResultSet.cxx
index c64b5b8..5bb0af5 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -886,8 +886,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*
parseT
OSQLParseNode *pOptEscape;
const OSQLParseNode* pPart2 = parseTree-getChild(1);
pColumn = parseTree-getChild(0);// Match
Item
-pAtom = pPart2-getChild(pPart2-count()-2); // Match String
-pOptEscape = pPart2-getChild(pPart2-count()-1); // Opt Escape
Rule
+pAtom =
pPart2-getChild(static_castsal_uInt32(pPart2-count()-2)); // Match
String
+pOptEscape =
pPart2-getChild(static_castsal_uInt32(pPart2-count()-1)); // Opt Escape
Rule
(void)pOptEscape;
const bool bNot = SQL_ISTOKEN(pPart2-getChild(0), NOT);
@@ -1297,7 +1297,7 @@ void SAL_CALL OResultSet::executeQuery() throw(
::com::sun::star::sdbc::SQLExcep
}
m_pKeySet = m_pSortIndex-CreateKeySet();
-m_CurrentRowCount = m_pKeySet-get().size();
+m_CurrentRowCount =
static_castsal_Int32(m_pKeySet-get().size());
#if OSL_DEBUG_LEVEL 0
for( OKeySet::Vector::size_type i = 0; i
m_pKeySet-get().size(); i++ )
OSL_TRACE(Sorted: %d - %d, i, (m_pKeySet-get())[i]
);
@@ -1405,7 +1405,7 @@ void OResultSet::setBoundedColumns(const OValueRow _rRow,
{
[Libreoffice-commits] .: connectivity/inc
connectivity/inc/connectivity/dbcharset.hxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 553455ae8a9b8adc477323043073068b8c7ecfc3
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 29 11:20:40 2012 +0200
-Werror=conversion
Change-Id: I3d4055722e8f7c22c50f892e62b5b3246904ce50
diff --git a/connectivity/inc/connectivity/dbcharset.hxx
b/connectivity/inc/connectivity/dbcharset.hxx
index cb13fcd..cbaceb0 100644
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/connectivity/inc/connectivity/dbcharset.hxx
@@ -29,6 +29,10 @@
#ifndef _DBHELPER_DBCHARSET_HXX_
#define _DBHELPER_DBCHARSET_HXX_
+#include sal/config.h
+
+#include cstddef
+
#include comphelper/stl_types.hxx
#include rtl/textenc.h
#include rtl/tencinfo.h
@@ -84,7 +88,7 @@ namespace dbtools
*/
CharsetIterator find(const ::rtl::OUString _rIanaName, const IANA)
const;
-sal_Int32 size() const { ensureConstructed( ); return
m_aEncodings.size(); }
+std::size_t size() const { ensureConstructed( ); return
m_aEncodings.size(); }
/// get access to the first element of the charset collection
CharsetIterator begin() const;
___
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 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||43030 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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 'libreoffice-3-5' - sw/source
sw/source/filter/ww8/rtfexport.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit f1bb52a221448877571e727b0d1d71577ef6900b
Author: Miklos Vajna vmik...@suse.cz
Date: Fri May 11 09:38:03 2012 +0200
fdo#44174 RTF_TITLEPG when title page has no header
Change-Id: Ida6566b38ceaca30441a029c73bd1f52d93bbb3b
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 0904ac8..cf13e5f 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1193,6 +1193,7 @@ void RtfExport::OutPageDescription( const SwPageDesc
rPgDsc, sal_Bool bWriteRes
// title page
if( pAktPageDesc != rPgDsc )
{
+Strm() OOO_STRING_SVTOOLS_RTF_TITLEPG;
pAktPageDesc = rPgDsc;
if( pAktPageDesc-GetMaster().GetAttrSet().GetItemState( RES_HEADER,
sal_False, pItem ) == SFX_ITEM_SET )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/masterpages'
New branch 'feature/masterpages' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED 3-5] fdo#44174 export RTF_TITLEPG when title page has no header
On Tue, 2012-05-29 at 10:03 +0200, Miklos Vajna wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b22749f Reportedly regression from 3.4, though hard to see how this ever worked. :-) I love your unit tests for everything approach. Pushed, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED] disable unit tests wich depend on xmlsec was: sc filter test failures
On Tuesday 29 of May 2012, Tor Lillqvist wrote: Or at least say it straight in the help that you are going to waste time if you don't know what you are doing :) See attached patch. Thanks, applied and pushed. Sorry, but that does not make any sense. An (non-experimental) option that leads to breakage is still broken even if it's documented. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ciruclar dependencies
On 25/05/12 17:49, Tor Lillqvist wrote: i believe cyclical dependencies indicate bad architecture. if 2 modules depend on each other, then either they should be changed not to depend on each other, or merged into one module. Hear, hear. Do you include run-time dependency in that? Like the couple of places where dynamic linking is used, to enable code in library A that depends on library B at compile-time to be used from library B at run-time. (I.e. B loads A and looks up one or a few functions from it dynamically.) that kind of thing isn't particularly elegant, but in specific cases there may be good reasons to do it in order to improve performance. if the stuff in library B is used rarely, then splitting it out and loading it on demand can improve startup performance, see e.g. the msword library in sw, which is completely unnecessary if you create a new document, or only use ODF; the fastest way to start is still to load only the code that is necessary to start. of course, if the stuff in library B is always loaded on every use of something in library A it doesn't make sense to split them. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sc filter test failures
On Mon, 2012-05-28 at 22:49 +0200, Riccardo Magliocchetti wrote:
==27901==at 0x13B030C8: FcConfigFileExists (fccfg.c:1671)
This is sadly one of the bogus errors with some fast strlen impl knowing
the malloc chunk is really in hunks of 4 bytes or sommat. I patch my
local fontconfig with this backport from head/latest fontconfig so I
don't have to write suppression files or keep seeing it
==27901== Conditional jump or move depends on uninitialised value(s)
==27901==at 0x13380510: inflateReset2 (inflate.c:157)
ditto I think. I used to see this, but I don't think I do anymore. Might
be silenced by default in my system valgrind supression files, or maybe
silenced in latest zlib.
C.
diff -ru fontconfig-2.8.0.orig/src/fccfg.c fontconfig-2.8.0/src/fccfg.c
--- fontconfig-2.8.0.orig/src/fccfg.c 2011-03-23 09:08:06.277208441 +
+++ fontconfig-2.8.0/src/fccfg.c 2011-03-23 09:47:40.313889413 +
@@ -1646,10 +1646,19 @@
FcConfigFileExists (const FcChar8 *dir, const FcChar8 *file)
{
FcChar8*path;
+int size;
if (!dir)
dir = (FcChar8 *) ;
-path = malloc (strlen ((char *) dir) + 1 + strlen ((char *) file) + 1);
+
+size = strlen ((char *) dir) + 1 + strlen ((char *) file) + 1;
+/*
+ * workaround valgrind warning because glibc takes advantage of how it knows memory is
+ * allocated to implement strlen by reading in groups of 4
+ */
+size = (size + 3) ~3;
+
+path = malloc (size);
if (!path)
return 0;
@@ -1668,7 +1677,7 @@
#endif
strcat ((char *) path, (char *) file);
-FcMemAlloc (FC_MEM_STRING, strlen ((char *) path) + 1);
+FcMemAlloc (FC_MEM_STRING, size);
if (access ((char *) path, R_OK) == 0)
return path;
diff -ru fontconfig-2.8.0.orig/src/fcpat.c fontconfig-2.8.0/src/fcpat.c
--- fontconfig-2.8.0.orig/src/fcpat.c 2011-03-23 09:08:06.321208957 +
+++ fontconfig-2.8.0/src/fcpat.c 2011-03-23 09:45:08.184116274 +
@@ -1057,9 +1057,13 @@
if (b-hash == hash !strcmp ((char *)name, (char *) (b + 1)))
return (FcChar8 *) (b + 1);
size = sizeof (struct objectBucket) + strlen ((char *)name) + 1;
-b = malloc (size + sizeof (int));
-/* workaround glibc bug which reads strlen in groups of 4 */
-FcMemAlloc (FC_MEM_STATICSTR, size + sizeof (int));
+/*
+ * workaround valgrind warning because glibc takes advantage of how it knows memory is
+ * allocated to implement strlen by reading in groups of 4
+ */
+size = (size + 3) ~3;
+b = malloc (size);
+FcMemAlloc (FC_MEM_STATICSTR, size);
if (!b)
return NULL;
b-next = 0;
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dictionaries/fr_FR
dictionaries/fr_FR/package-description.txt |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1bdd340e5edd92bcade41b7ceed7a7dc0fedff25
Author: Olivier R olivier.nore...@gmail.com
Date: Sat May 26 16:18:35 2012 +0200
fix name in the package description (fr)
diff --git a/dictionaries/fr_FR/package-description.txt
b/dictionaries/fr_FR/package-description.txt
index 6c8d70f..ac877e1 100644
--- a/dictionaries/fr_FR/package-description.txt
+++ b/dictionaries/fr_FR/package-description.txt
@@ -1,4 +1,4 @@
-Dictionnaire ${shortname} 4.5 ⢠Synonymes 2.3 ⢠Césures 3.0
+Dictionnaire «Moderne» 4.5 ⢠Synonymes 2.3 ⢠Césures 3.0
Pour signaler une erreur, ajouter ou supprimer des mots, cliquez sur le lien.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] fix name in the package description (fr)
2012.05.26. 16:30 keltezéssel, Olivier R. írta: Hi *, A tiny fix in a description file: http://nabble.documentfoundation.org/file/n3986158/0001-fix-name-in-the-package-description-fr.patch 0001-fix-name-in-the-package-description-fr.patch Pushed, thanks. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ciruclar dependencies
which is completely unnecessary if you create a new document, or only use ODF On the other hand, if you never use ODF, you still have to load the code for it? the fastest way to start is still to load only the code that is necessary to start. Isn't there something called demand paging that takes care of that? Why stop at the arbitrary division of libraries as they happen to exist now; I am sure one could as well come up with dozens of other classes of functionality that some group of users don't need when starting up? But, whatever. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED] disable unit tests wich depend on xmlsec was: sc filter test failures
Sorry, but that does not make any sense. An (non-experimental) option that leads to breakage is still broken even if it's documented. Sure, sure, but on the other hand I pushed one more patch! --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: chart2/source
chart2/source/model/template/PieChartType.cxx |2 +-
chart2/source/model/template/PieChartTypeTemplate.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c1a595aa0b4b721ae1e465ce08f6e4fdf78171b8
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 29 12:21:17 2012 +0100
hide local functions harder
Change-Id: I874a7cda6b2948866a56f0559ab737fed5f42385
diff --git a/chart2/source/model/template/PieChartType.cxx
b/chart2/source/model/template/PieChartType.cxx
index 6fdb8e2..9635ecd 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -54,7 +54,7 @@ enum
PROP_PIECHARTTYPE_USE_RINGS
};
-void lcl_AddPropertiesToVector(
+static void lcl_AddPropertiesToVector(
::std::vector Property rOutProperties )
{
rOutProperties.push_back(
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx
b/chart2/source/model/template/PieChartTypeTemplate.cxx
index ece6b3e..9a4f1d9 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -70,7 +70,7 @@ enum
PROP_PIE_TEMPLATE_USE_RINGS
};
-void lcl_AddPropertiesToVector(
+static void lcl_AddPropertiesToVector(
::std::vector Property rOutProperties )
{
rOutProperties.push_back(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ciruclar dependencies
On 29/05/12 13:17, Tor Lillqvist wrote: which is completely unnecessary if you create a new document, or only use ODF On the other hand, if you never use ODF, you still have to load the code for it? that's an unfortunate side effect of how the ODF filter is implemented in Writer: mostly it accesses the document via UNO API, but some parts (tables especially) are intimately tied up with the Writer core, and so there are Writer specific sub-classes of stuff from xmloff in sw/source/filter/xml, and so sw is linked against xmloff. no, wait, that is actually a side issue, of course the ODF filter could be split out into a separate library, but i guess since ODF is the default file format it makes less sense to do that than other formats; i don't have a strong opinion either way in this case. i guess it could make sense to split out some of the other filters that are still linked into libsw, but i wonder if that in practice means only HTML nowadays (the ASCII one has surprising users in core). the fastest way to start is still to load only the code that is necessary to start. Isn't there something called demand paging that takes care of that? it is supposed to do this, but falls short when it comes to startup performance on rotating storage, which is why we have various platform specific hacks to do linear reads of all libraries required at startup in order to hide the seek latencies incurred by demand paging. Why stop at the arbitrary division of libraries as they happen to exist now; I am sure one could as well come up with dozens of other classes of functionality that some group of users don't need when starting up? certainly, the distribution of code across libraries is to a large extent an accumulation of historical accidents, so i guess many improvements are possible there. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/source
filter/source/svg/svgwriter.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 8c55f7542b1be9dc11992e0942eaabc6688bfa3c
Author: Michael Meeks michael.me...@suse.com
Date: Tue May 29 12:57:59 2012 +0100
targetted re-work
Change-Id: I64a38e22f776914605fe3903312524d8827e29a2
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 5bcbb5a..1106eaf 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -484,7 +484,7 @@ PolyPolygon SVGActionWriter::ImplMap( const PolyPolygon
rPolyPoly, PolyPolygon
for( long i = 0, nCount = rPolyPoly.Count(); i nCount; i++ )
{
const Polygon rPoly = rPolyPoly[ (sal_uInt16) i ];
-sal_uInt16 nSize = rPoly.GetSize();
+sal_uInt16 n = 1, nSize = rPoly.GetSize();
if( nSize 1 )
{
@@ -494,8 +494,6 @@ PolyPolygon SVGActionWriter::ImplMap( const PolyPolygon
rPolyPoly, PolyPolygon
aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() );
sal_Char nCurrentMode = 0;
-sal_uInt16 n = 1;
-
while( n nSize )
{
aPathData += aBlank;
@@ -1201,9 +1199,10 @@ void SVGActionWriter::ImplWriteText( const Point rPos,
const String rText,
if( nWidth aNormSize.Width() ( nWidth != aNormSize.Width() )
)
{
+long i;
const double fFactor = (double) nWidth / aNormSize.Width();
-for( long i = 0; i ( nLen - 1 ); i++ )
+for( i = 0; i ( nLen - 1 ); i++ )
pDX[ i ] = FRound( pDX[ i ] * fFactor );
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/en_GB.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit 495943c872a6ba529505c22924b95f0c7a994e3e Author: Eike Rathke er...@redhat.com Date: Tue May 29 14:10:10 2012 +0200 added same date acceptance patterns as in gd-GB Change-Id: I2e36fce85882566d19cb3e3c9fa3e037d322ce6c diff --git a/i18npool/source/localedata/data/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml index 0771e36..e2f0a51 100644 --- a/i18npool/source/localedata/data/en_GB.xml +++ b/i18npool/source/localedata/data/en_GB.xml @@ -35,6 +35,8 @@ MeasurementSystemMetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$£-809] +DateAcceptancePatternD/M/DateAcceptancePattern +DateAcceptancePatternD-M/DateAcceptancePattern FormatElement msgid=DateFormatskey1 default=true type=short usage=DATE formatindex=18 FormatCodeDD/MM/YY/FormatCode /FormatElement ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build time optimization
Hi, Then next step would be not to build external libs during LO build. There is a magic option: --with-system-libs. If you try this option on debian based systems (x86_64) you would probably end up with clucene dependency not met error. ACK. While hacking on dropping all bundled 3rdparty libs, I faced similar problems. My workaround for now is to install all the deps locally (in the user who's running the build) and pass proper pkg-config env variables to ./configure. Just a matter of installing those two available clucene packages? Unfortunately not: as it turns out those packages are hopelessly outdated (2008). Yes, it seems there had been a major rewrite of clucene, and the two versions actually seem to be separate packages (from deployment side) now. I was also considering providing an recent clucene package for ubuntu (just didnt have the time to properly set up the ubuntu build machinery on my side). I'm thinking about another magic configure option, like --with-external-lib-directory=/opt/libo this would install all dependend libs to this directory during first build and this would *survive* the make clean call, so the next time all external lib artifacts would be reused from there. I wouldn't recommend this, as it makes the build machinery even more complex. Better write a small shell script that builds the missing deps (those not already in your distro) to some proper prefix and then calls the LO build machinery with proper parameters (eg. pkg-config search pathes). I've already hacked up a little bit, but not really useful yet. My plan is to package all the yet missing deps for the major distros (in my case: ubuntu) and throw them out of the LO tree entirely. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Äußere Bayreuther Str. 55, D - 90409 Nürnberg Tel: +49 911 72303-30 Fax: +49 911 72303-50 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: build time optimization
Hi, It is not that certain that ramdisk on linux really helps. ramdisk eat-up memory that cannot be used for fs-cache... so ramdisk will increase the cache-miss at the kernel level... I've used ramdisks for automatic mass builds on some other projects, and it really helped (IIRC factor 10). But the scenario there was a bit different: much smaller codebases and the machines had a lot of ram (16GB), and i didn't want to keep the actual build output, just know whether it builds at all and certain post-tests succeed. I guess, we only find out if we try ;-o I have not tested ramdisk on Windows, so I do not know how effective it is. On what I remember from certain large enterprise hosting projects, Windows (at least pre Win7) was pretty bad in IO (the OS itself keeps the stores quite busy for certain housekeeping tasks, so at least on short load peaks that was quite unpleasent - no idea if that really matters much in this scenario). cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Äußere Bayreuther Str. 55, D - 90409 Nürnberg Tel: +49 911 72303-30 Fax: +49 911 72303-50 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED] Cleanup related to always enabled HTMLMODE_SOME_ABS_POS
On Friday 25 May 2012, Tor Lillqvist wrote: Looks fine, pushed, thanks. I do see more (presumably equally unnecessary) tests of HTMLMODE_SOME_ABS_POS in the code, at least in opengrok, though? Yes. I didn't have time to check and fix them all at once but I will write another patch to completely remove HTMLMODE_SOME_ABS_POS later. Harri ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help about Calc Functions
Hi all, Italo Vignoli schrieb: I have tried to figure out the thinking behind the Calc Functions Help, but after a couple of days I have given up because it looks impossible to understand. Basically, the problems are the following: 1. Functions are not listed alphabetically. Does it make sense? Does it make sense to swap them inside the file to create al alphabetical order (which is the usual order for human beings)? The help syntax has an element sort.../sort. A help viewer could be able to interpret this element. I don't know whether it had worked sometime. It seems it had been disabled with https://issues.apache.org/ooo/show_bug.cgi?id=70462 The correct solution for getting functions alphabetic would be to make the Help viewer able to interpret this element. But unfortunately I don't know how to do that. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/Library_svxcore.mk
svx/Library_svxcore.mk |4 1 file changed, 4 insertions(+) New commits: commit 4cfeba11e7bef43a174818ab73198299c2ebb945 Author: David Tardon dtar...@redhat.com Date: Tue May 29 14:41:08 2012 +0200 svxcore needs headers from connectivity Change-Id: I929dc661bde5eb7ff49831d5c041c62d808a6219 diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 50ef4b2..7c021f7 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -382,6 +382,10 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ )) ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))$(filter IOS,$(OS))) +$(eval $(call gb_Library_use_packages,svxcore,\ + connectivity_inc \ +)) + $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/fmcomp/dbaexchange \ svx/source/fmcomp/fmgridcl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/Library_kdebe.mk
shell/Library_kdebe.mk |4 1 file changed, 4 insertions(+) New commits: commit 9d766d5112062f22c8a3abcf1acba0ad9cb9aadf Author: Petr Mladek pmla...@suse.cz Date: Tue May 29 14:31:37 2012 +0200 gbuild: libkdebe1 has to be linked with libkio was removed during gbuildisation Change-Id: I0ff6159114bf7f82897bbb88c76fbfe8732098d9 diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index 8d1c169..3761a8b 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -31,6 +31,10 @@ $(eval $(call gb_Library_use_packages,kdebe1,\ shell_inc \ )) +$(eval $(call gb_Library_add_libs,kdebe1,\ + -lkio \ +)) + $(eval $(call gb_Library_use_api,kdebe1,\ offapi \ udkapi \ ___ 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_library_ooo.scp | 17 +++-- 1 file changed, 3 insertions(+), 14 deletions(-) New commits: commit 79179df3d97e6f838fa07cfffbbeb2987ce66c17 Author: Stephan Bergmann sberg...@redhat.com Date: Tue May 29 14:49:57 2012 +0200 Adapted to changed lib names after gbuild'ification Change-Id: Ia1c75076254c0300b19d6e12879143f7966b8294 diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b2a6cbb..f92ed29 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -449,19 +449,8 @@ End #endif #ifdef ENABLE_KAB -File gid_File_Lib_Kab_1 -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(libkab1,UNXSUFFIX)); -End - -File gid_File_Lib_Kab_Drv_1 -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(libkabdrv1,UNXSUFFIX)); -End +STD_LIB_FILE(gid_File_Lib_Kab_1, kab1); +STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1); #endif #ifdef MACOSX @@ -895,7 +884,7 @@ End #if !defined(SYSTEM_MOZILLA) !defined(WITHOUT_MOZILLA) !defined(MACOSX) // #i91209# -STD_LIB_FILE(gid_File_Lib_Mozab,mozab) +STD_LIB_FILE(gid_File_Lib_Mozab,mozab2) STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) #else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc solenv/Module_solenv.mk solenv/Package_minor.mk
solenv/Module_solenv.mk |1 + solenv/Package_minor.mk | 33 + solenv/inc/settings.mk |6 -- 3 files changed, 34 insertions(+), 6 deletions(-) New commits: commit 41cf973f84f42c0605fdd9e8c5f307be888c2f89 Author: David Tardon dtar...@redhat.com Date: Tue May 29 15:06:11 2012 +0200 $(OUTDIR)/inc/*minor.mk is created my gbuild now Actually I think it should be removed entirely, because dmake already includes minor.mk directly from solenv, but I do not want to pry into it right now... Change-Id: I51520642f4796d722cb2131e91e9e92a82920531 diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index 3fa34ff..d107f9a 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,solenv)) $(eval $(call gb_Module_add_targets,solenv,\ CustomTarget_versionlist \ Package_inc \ + Package_minor \ )) ifeq ($(GUI),UNX) diff --git a/solenv/Package_minor.mk b/solenv/Package_minor.mk new file mode 100644 index 000..7ea056a --- /dev/null +++ b/solenv/Package_minor.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,solenv_minor_mk,$(SRCDIR)/solenv/inc)) + +$(eval $(call gb_Package_add_file,solenv_minor_mk,inc/$(UPD)minor.mk,minor.mk)) +$(eval $(call gb_Package_add_file,solenv_minor_mk,inc/minormkchanged.flg,minor.mk)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 1eeba4f..9d01c5e 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -50,12 +50,6 @@ EXTNAME*=$(EXTENSIONNAME)_in WRONG_SOURCEVERSION .ENDIF -# Create $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk if needed -%minor.mk : $(SOLARENV)/inc/minor.mk -@@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc -@@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk -@@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg - # Force creation of $(SOLARVERSION)/$(INPATH)/inc/ # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk .INCLUDE : $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/Module_shell.mk
shell/Module_shell.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e7ee6ed3e83673ec747c8b93880a82059eee1657 Author: Andras Timar ati...@suse.com Date: Tue May 29 15:21:01 2012 +0200 BUILD_X64 is TRUE not YES, when defined Change-Id: Ib49f623e3423ce1d7caf64bc97d7ffd72dd50ed7 diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 124ed70..de1cec2 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -89,7 +89,7 @@ $(eval $(call gb_Module_add_targets,shell,\ )) endif -ifeq ($(BUILD_X64),YES) +ifeq ($(BUILD_X64),TRUE) $(eval $(call gb_Module_add_targets,shell,\ CustomTarget_x64 \ Library_ooofilt_x64 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Licensed statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Best regards, TaTung ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Advice needed about some cppcheck reports
On Tuesday 29 of May 2012, Michael Stahl wrote:
On 28/05/12 18:03, julien2412 wrote:
Same thing here :
[sal/osl/w32/file.cxx:880] - [sal/osl/w32/file.cxx:880]: (style) Same
expression on both sides of '-'.
876 if (nSize 0)
877 {
878 c ^= pData[0];
879 pData += nSize;
880 nSize -= nSize;
881 }
And here :
[filter/source/graphicfilter/icgm/cgm.cxx:269] -
[filter/source/graphicfilter/icgm/cgm.cxx:269]: (style) Same expression
on both sides of '-'.
267 if ( pLong[ nSwitch ] 0 )
268 {
269 nRetValue -= nRetValue;
270 }
271 nRetValue /= 65536;
also makes sense
This is not the same, it looks more to me like it should be 'nRetValue
= -nRetValue;' to negate the value, especially given the abs() above.
--
Lubos Lunak
l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[pseudo-PATCH] Enhanced vertical scaling for chart2
Hi list :) commit 635b51d9ca8184cb791101b86a2e7f1ac280acf6 Author: Vladimir Glazounov Date: Tue May 22 18:08:41 2007 + INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2005/04/29 12:21:55 dr 1.1.2.3: #i30426# enhanced linear scaling +/* If minimum equals maximum, or if minimum is less than 5/6 of +maximum, set minimum to 0. */ +if( (fTempMinimum == fTempMaximum) || (fTempMinimum / fTempMaximum 5.0 / 6.0) ) The commit I quoted above was done to maintain compatibility with MS Office. MS apparently got complaints that auto-scaling for column charts is inappropriate for the typical use case, where most people expect the bottom of the column to be zero. But IMO it really doesn't/shouldn't apply to stock charts, where most people (including me) absolutely do *not* expect the bottom of the chart to be zero, not ever. So, my proposed patch (to be submitted soon) would simply exempt stock charts from that test added by Vladimir in 2007. I don't know the LO code very well, so I'd like someone to point me to some examples of how to test for the chart type, and I'll try to work up a real patch for you. Thanks for any hints! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
MPL/LGPLv3+ re-licensing
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
licensing statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/source
i18npool/source/isolang/mslangid.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 8979193090f085d5d171a6daa6f8fa4a188b3130
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue May 29 16:24:14 2012 +0200
Revert fdo#45830: Indicate correct default locale setting
This causes a failure in sc_subsequent_filters_test , the test
fails in non-English locales.
This reverts commit 1a5aae96bdb20e36a17d77ec60da874037544628.
diff --git a/i18npool/source/isolang/mslangid.cxx
b/i18npool/source/isolang/mslangid.cxx
index 8fe16c0..3cd877e 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -94,7 +94,10 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang )
switch (simplifySystemLanguages( nLang))
{
case LANGUAGE_SYSTEM :
-nLang = getSystemLanguage();
+if (nConfiguredSystemLanguage == LANGUAGE_SYSTEM)
+nLang = getSystemLanguage();
+else
+nLang = nConfiguredSystemLanguage;
break;
case LANGUAGE_NONE :
if (nConfiguredSystemUILanguage == LANGUAGE_SYSTEM)
___
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_library_ooo.scp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e62b67648afe11b941257d1d6156dcf1e45610e3 Author: Stephan Bergmann sberg...@redhat.com Date: Tue May 29 16:34:57 2012 +0200 Removed spurious trailing semicolons Change-Id: I49680c13989c9031150bae110e498a02af2476c4 diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f92ed29..3b09ee2 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -449,8 +449,8 @@ End #endif #ifdef ENABLE_KAB -STD_LIB_FILE(gid_File_Lib_Kab_1, kab1); -STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1); +STD_LIB_FILE(gid_File_Lib_Kab_1, kab1) +STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1) #endif #ifdef MACOSX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: REMINDER: Release 3.6.0-alpha1 from master
Petr Mladek píše v Po 28. 05. 2012 v 11:00 +0200: Hi, we are one week from the feature freeze for 3.6 release. We are going to provide 3.6.0-alpha1 build from master this week. I would like to do the tag tomorrow. I'll wait with the tag one more day. master build is quite broken after merging the many changes over night. It would be great to have them included in alpha1. We do not push on mirrors, so we are slightly less pressed. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Build Error (65280 in moz)
Hi All, Got this error about 85-90% into build last night: ERROR: error 65280 occurred while making ../libreoffice-core-3.5.3.2/moz it seems that the error is inside 'moz', please re-run build inside this module to isolate the error and/or test your fix: Furthermore, when I try to do as it says and run build inside of the module I get: build: command not found I'm running this on Ubuntu 12.04. Appreciate any help ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - sw/source
sw/source/ui/uiview/pview.cxx| 77 +--
sw/source/ui/uiview/viewport.cxx | 24
2 files changed, 42 insertions(+), 59 deletions(-)
New commits:
commit bdca5df2644d4653665f7360c24f7757f46dcef0
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue May 29 18:35:36 2012 +0400
SwPagePreView: fix some scrollbar bugs (still not perfect, just a quick fix)
Change-Id: I4ff31f31bf579ece69e62633b99986d96ca7d857
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 52814df..ecdc27d 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1183,10 +1183,6 @@ void SwPagePreView::Init(const SwViewOption * pPrefs)
if( !bIsModified )
pESh-ResetModified();
-
-pVScrollbar-ExtendedShow(pPrefs-IsViewVScrollBar());
-pHScrollbar-ExtendedShow(pPrefs-IsViewHScrollBar());
-pScrollFill-Show(pPrefs-IsViewVScrollBar()
pPrefs-IsViewHScrollBar());
}
SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
@@ -1392,9 +1388,6 @@ void SwPagePreView::OuterResizePixel( const Point rOfst,
const Size rSize )
{
SvBorder aBorder;
CalcAndSetBorderPixel( aBorder, sal_False );
-ViewResizePixel( aViewWin, rOfst, rSize, aViewWin.GetOutputSizePixel(),
-sal_False, *pVScrollbar,
-*pHScrollbar, pPageUpBtn, pPageDownBtn, 0,
*pScrollFill );
//EditWin niemals einstellen!
@@ -1411,6 +1404,9 @@ void SwPagePreView::OuterResizePixel( const Point rOfst,
const Size rSize )
SvBorder aBorderNew;
CalcAndSetBorderPixel( aBorderNew, sal_False );
+ViewResizePixel( aViewWin, rOfst, rSize, aViewWin.GetOutputSizePixel(),
+sal_False, *pVScrollbar,
+*pHScrollbar, pPageUpBtn, pPageDownBtn, 0,
*pScrollFill );
}
void SwPagePreView::SetVisArea( const Rectangle rRect, sal_Bool
bUpdateScrollbar )
@@ -1615,6 +1611,9 @@ void SwPagePreView::ScrollViewSzChg()
{
if(!GetViewShell())
return ;
+
+bool bShowVScrollbar = false, bShowHScrollbar = false;
+
if(pVScrollbar)
{
if(GetViewShell()-PagePreviewLayout()-DoesPreviewLayoutRowsFitIntoWindow())
@@ -1645,25 +1644,10 @@ void SwPagePreView::ScrollViewSzChg()
aScrollbarRange.Max() += ( nVisPages - 1 );
pVScrollbar-SetRange( aScrollbarRange );
-if( nVisPages mnPageCount )
-{
-ShowVScrollbar( sal_True );
-pPageUpBtn-Show( sal_True );
-pPageDownBtn-Show( sal_True );
-}
-else
-{
-ShowVScrollbar( sal_False );
-pPageUpBtn-Show( sal_False );
-pPageDownBtn-Show( sal_False );
-}
+bShowVScrollbar = nVisPages mnPageCount;
}
else //vertical scrolling by pixel
{
-ShowVScrollbar( sal_True );
-pPageUpBtn-Show( sal_True );
-pPageDownBtn-Show( sal_True );
-
const Rectangle rDocRect = aViewWin.GetPaintedPreviewDocRect();
const Size rPreviewSize =
GetViewShell()-PagePreviewLayout()-GetPrevwDocSize();
@@ -1673,7 +1657,13 @@ void SwPagePreView::ScrollViewSzChg()
pVScrollbar-SetThumbPos( rDocRect.Top() );
pVScrollbar-SetLineSize( nVisHeight / 10 );
pVScrollbar-SetPageSize( nVisHeight / 2 );
+
+bShowVScrollbar = true;
}
+
+ShowVScrollbar(bShowVScrollbar);
+pPageUpBtn-Show(bShowVScrollbar);
+pPageDownBtn-Show(bShowVScrollbar);
}
if(pHScrollbar)
{
@@ -1686,7 +1676,7 @@ void SwPagePreView::ScrollViewSzChg()
if(rDocRect.GetWidth() rPreviewSize.Width())
{
-ShowHScrollbar( sal_True );
+bShowHScrollbar = true;
nVisWidth = rDocRect.GetWidth();
nThumb = rDocRect.Left();
@@ -1698,9 +1688,10 @@ void SwPagePreView::ScrollViewSzChg()
pHScrollbar-SetLineSize( nVisWidth / 10 );
pHScrollbar-SetPageSize( nVisWidth / 2 );
}
-else
-ShowHScrollbar( sal_False );
+
+ShowHScrollbar(bShowHScrollbar);
}
+pScrollFill-Show(bShowVScrollbar bShowHScrollbar);
}
void SwPagePreView::ScrollDocSzChg()
commit e7f7f4092a337cc98076ff500fb209a7f4dbb6b1
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon May 28 21:41:51 2012 +0400
these SwScrollbar::IsVisible(false) calls does not make sense to me...
Change-Id: Ic58be239044f75f1ad7f70df45813b59a4610737
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 44bd8c4..7acaa98 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -870,13 +870,10 @@ void ViewResizePixel( const Window rRef,
const sal_Bool bVLineal = pVLineal pVLineal-IsVisible();
[Libreoffice-commits] .: accessibility/source pyuno/source sw/source vcl/aqua vcl/source vcl/win
accessibility/source/extended/AccessibleToolPanelDeck.cxx |3 ---
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx |2 --
pyuno/source/module/pyuno_module.cxx|1 -
sw/source/ui/dbui/dbinsdlg.cxx |1 -
sw/source/ui/dbui/maildispatcher.cxx|1 -
sw/source/ui/vba/vbastyles.cxx |1 -
vcl/aqua/source/dtrans/DataFlavorMapping.cxx|3 ---
vcl/source/window/window.cxx|4
vcl/win/source/gdi/winlayout.cxx|2 --
9 files changed, 18 deletions(-)
New commits:
commit 6b915b210aeebeed104ab3e266c4ebc67c1c9d46
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue May 29 23:39:23 2012 +0900
nuke unused typedef
Change-Id: I12a55e08a83b88221d992790c97c830761755582
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index a57c7d6..b0a7ff8 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -44,7 +44,6 @@
#include tools/diagnose_ex.h
#include boost/noncopyable.hpp
-#include vector
//..
namespace accessibility
@@ -77,7 +76,6 @@ namespace accessibility
namespace AccessibleEventId =
::com::sun::star::accessibility::AccessibleEventId;
namespace AccessibleStateType =
::com::sun::star::accessibility::AccessibleStateType;
-typedef ::com::sun::star::awt::RectangleUnoRectangle;
typedef ::com::sun::star::awt::PointUnoPoint;
//==
@@ -115,7 +113,6 @@ namespace accessibility
Reference XAccessible m_xAccessibleParent;
::svt::ToolPanelDeck* m_pPanelDeck;
-typedef ::std::vector Reference XAccessible AccessibleChildren;
Reference XAccessible m_xActivePanelAccessible;
};
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index bcfa82e..8ede78c 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -78,8 +78,6 @@ namespace accessibility
namespace AccessibleStateType =
::com::sun::star::accessibility::AccessibleStateType;
typedef ::com::sun::star::awt::PointUnoPoint;
-typedef ::com::sun::star::awt::Size UnoSize;
-typedef ::com::sun::star::awt::RectangleUnoRectangle;
//==
//= AccessibleWrapper
diff --git a/pyuno/source/module/pyuno_module.cxx
b/pyuno/source/module/pyuno_module.cxx
index 31c330e..432a61e 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -91,7 +91,6 @@ namespace {
class fillStructState
{
-typedef boost::unordered_map const OUString, bool, OUStringHash
initialised_t;
// Keyword arguments used
PyObject *used;
// Which structure members are initialised
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 6a64058..d4e547b 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -172,7 +172,6 @@ struct _DB_Column
}
};
-typedef _DB_Column* _DB_ColumnPtr;
SV_IMPL_OP_PTRARR_SORT( SwInsDBColumns, SwInsDBColumnPtr )
diff --git a/sw/source/ui/dbui/maildispatcher.cxx
b/sw/source/ui/dbui/maildispatcher.cxx
index 3eb6632..33ea0ac 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -34,7 +34,6 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
-typedef std::list uno::Referencemail::XMailMessage MailMessageContainer_t;
typedef std::list ::rtl::ReferenceIMailDispatcherListener
MailDispatcherListenerContainer_t;
namespace /* private */
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 595f5a3..af34899 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -166,7 +166,6 @@ static const MSOStyleNameTable aMSOStyleNameTable[] =
{ 0, 0, 0 }
};
-typedef ::cppu::WeakImplHelper1 container::XEnumeration
StyleEnumeration_BASE;
typedef ::cppu::WeakImplHelper3 container::XNameAccess,
container::XIndexAccess, container::XEnumerationAccess
StyleCollectionHelper_BASE;
class StyleCollectionHelper : public StyleCollectionHelper_BASE
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index e0db688..4bc25e9
[Libreoffice-commits] .: shell/CustomTarget_x64.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl_x64.mk shell/StaticLibrary_shlxthandler_common_x64.mk shell/Stat
shell/CustomTarget_x64.mk |2 +- shell/Library_ooofilt_x64.mk |2 +- shell/Library_propertyhdl_x64.mk |4 ++-- shell/Library_shlxthdl_x64.mk |2 +- shell/StaticLibrary_shlxthandler_common_x64.mk |2 +- shell/StaticLibrary_xmlparser_x64.mk |2 +- 6 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 759d11c6c7c5174d04803f5710db62cba35dfde8 Author: Andras Timar ati...@suse.com Date: Tue May 29 16:47:03 2012 +0200 trying to fix shell x64 build on Windows Change-Id: Ibf5dffec5f5617d225f6f529566b524ebafc20c2 diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk index 75d1f60..e1e5f68 100644 --- a/shell/CustomTarget_x64.mk +++ b/shell/CustomTarget_x64.mk @@ -57,7 +57,7 @@ SHELL_OOOFILT_FILES := \ win32/shlxthandler/ooofilt/propspec SHELL_PROPERTYHDL_FILES := \ -win32/shell/source/win32/shlxthandler/prophdl/propertyhdl +win32/shlxthandler/prophdl/propertyhdl SHELL_XMLPARSER_FILES := \ all/xml_parser diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 7620d52..47f058c 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -84,7 +84,7 @@ $(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ /EXPORT:DllUnregisterServer \ )) -$(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\ +$(eval $(call gb_Library_add_generated_exception_objects,ooofilt_x64,\ CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index f613bd3..e774a50 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -83,8 +83,8 @@ $(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ /EXPORT:DllGetClassObject \ )) -$(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\ -shell/source/win32/shlxthandler/prophdl/propertyhdl \ +$(eval $(call gb_Library_add_generated_exception_objects,propertyhdl_x64,\ +CustomTarget/shell/source/win32/shlxthandler/prophdl/propertyhdl \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index f13d9dc..0732762 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -61,7 +61,7 @@ $(eval $(call gb_Library_use_libraries,shlxthdl_x64,\ gdi32 \ gdiplus \ kernel32 \ - mvvcprt \ + msvcprt \ msvcrt \ ole32 \ oleaut32 \ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index b0d0124..98b5831 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -54,7 +54,7 @@ $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ zlib \ )) -$(eval $(call gb_StaticLibrary_add_exception_objects,shlxthandler_common_x64,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,shlxthandler_common_x64,\ CustomTarget/shell/source/win32/ooofilereader/autostyletag \ CustomTarget/shell/source/win32/ooofilereader/basereader \ CustomTarget/shell/source/win32/ooofilereader/contentreader \ diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk index 67c71c8..126ef81 100644 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,shell_xmlparser_x64)) $(eval $(call gb_StaticLibrary_set_x64,shell_xmlparser_x64,YES)) -$(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser_x64,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,shell_xmlparser_x64,\ CustomTarget/shell/source/all/xml_parser \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 46114 - Java Access Bridge no longer works
Happy to cobble together a couple of clean Win7sp1 systems (32bit, 64bit) with JRE 1.7.4, Java Access Bridge 2.0.2, NVDA 2012.1 and LibreOffice 3.5.4rc2 to capture the faults. But for posting stack- trace what would folks prefer (be able to use) to efficiently pin down the issue under Windows, JRE or the JAB? A Windows Sysinternals Process Monitor log during crash would be my starting point. But I could load MinGW for gcc/gdb, or Visual Studio 2008 (or 2005) and appropriate debug symbols if someone points me to them and lets me know what they need captured and of any configuration weirdness. Also, could load Dr. Memory and work with one of the /win32-debug/libreoffice-3-5 installer packages if that is preferred, although the 3.5.4rc1 dev version is not yet posted. Stuart -- View this message in context: http://nabble.documentfoundation.org/Bug-46114-Java-Access-Bridge-no-longer-works-tp3986431p3986543.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
[REVIEW] Reenable sorting in the Helpfiles
Hello Regina, all, 2012/5/28 Regina Henschel rb.hensc...@t-online.de The help syntax has an element sort.../sort. A help viewer could be able to interpret this element. I don't know whether it had worked sometime. It seems it had been disabled with https://issues.apache.org/ooo/show_bug.cgi?id=70462 The correct solution for getting functions alphabetic would be to make the Help viewer able to interpret this element. But unfortunately I don't know how to do that. I took a stab at this with the attached patch. It works nicely in my Ubuntu-setup and even sorts non ascii characters such as åäö in the correct order. I did not get any error messages in the terminal so thats nice. The messages may or may not show up on other platforms though. I can not test it on any other platform at the moment but if I understand the bug report correctly the only negative effect was error messages in the terminal. Unrelated question: Is the review-tag correct for this type of message? -- Regards Niklas Johansson ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 3.5.3rc1 win32 / debug package ...
bfo píše v Po 28. 05. 2012 v 08:37 -0700: bfo wrote As I wrote earlier I have pdb symbols and source links in the WinDbg outputs, but I am concerned about missing FAULTING_SOURCE_LINE and FAULTING_SOURCE_CODE sections. I managed to receive outputs with FAULTING_SOURCE_CODE section just as in Jesus screencast. FAULTING_SOURCE_LINE is still missing, but it is not a big problem, as there is marker in the source code section. Sounds great. I'll put it into wiki page soon. I am looking forward to have anything there :-) Thanks for diffing into it. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - connectivity/Library_dbtools.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl_x64.mk
connectivity/Library_dbtools.mk |1 + shell/Library_ooofilt_x64.mk |4 shell/Library_propertyhdl_x64.mk |4 shell/Library_shlxthdl_x64.mk|4 4 files changed, 13 insertions(+) New commits: commit de1297a1ffd01c1829f6c82d1c9d53b5a7c3c3b5 Author: David Tardon dtar...@redhat.com Date: Tue May 29 17:30:19 2012 +0200 copy the source files before trying to use them Change-Id: I3252511cd845e6f91d31f5b5858c9122fcab4838 diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 47f058c..f3c9946 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -29,6 +29,10 @@ $(eval $(call gb_Library_Library,ooofilt_x64)) $(eval $(call gb_Library_set_x64,ooofilt_x64,YES)) +$(eval $(call gb_Library_use_custom_headers,ooofilt_x64,\ + shell/source \ +)) + $(eval $(call gb_Library_set_include,ooofilt_x64,\ -I$(SRCDIR)/shell/inc \ $$(INCLUDE) \ diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index e774a50..1a36e2b 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -29,6 +29,10 @@ $(eval $(call gb_Library_Library,propertyhdl_x64)) $(eval $(call gb_Library_set_x64,propertyhdl_x64,YES)) +$(eval $(call gb_Library_use_custom_headers,propertyhdl_x64,\ + shell/source \ +)) + $(eval $(call gb_Library_set_include,propertyhdl_x64,\ -I$(SRCDIR)/shell/inc \ $$(INCLUDE) \ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index 0732762..a7e149c 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -29,6 +29,10 @@ $(eval $(call gb_Library_Library,shlxthdl_x64)) $(eval $(call gb_Library_set_x64,shlxthdl_x64,YES)) +$(eval $(call gb_Library_use_custom_headers,shlxthdl_x64,\ + shell/source \ +)) + $(eval $(call gb_Library_set_include,shlxthdl_x64,\ -I$(SRCDIR)/shell/inc \ $$(INCLUDE) \ commit f39f100959e4cff8787d6d92f5407c469d936a21 Author: David Tardon dtar...@redhat.com Date: Tue May 29 17:24:01 2012 +0200 make sure all headers are in place Change-Id: I9b0b2eb426e44883e0e81ab693c907e6ed70f39e diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 3336815..f3faca7 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_Library,dbtools)) $(eval $(call gb_Library_use_packages,dbtools,\ + connectivity_generated \ connectivity_inc \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/CustomTarget_x64.mk
shell/CustomTarget_x64.mk | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) New commits: commit 76804ffd5546261ac895ff32ab02e36383304d37 Author: David Tardon dtar...@redhat.com Date: Tue May 29 17:38:54 2012 +0200 copy header files too Change-Id: I5b3e1cd3a44d8f5ea11b3456516258564899c3f6 diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk index e1e5f68..5139482 100644 --- a/shell/CustomTarget_x64.mk +++ b/shell/CustomTarget_x64.mk @@ -62,9 +62,24 @@ SHELL_PROPERTYHDL_FILES := \ SHELL_XMLPARSER_FILES := \ all/xml_parser +SHELL_HEADERS := \ + win32/ooofilereader/autostyletag \ + win32/ooofilereader/dummytag \ + win32/ooofilereader/itag \ + win32/ooofilereader/keywordstag \ + win32/ooofilereader/simpletag \ + win32/shlxthandler/classfactory \ + win32/shlxthandler/ooofilt/ooofilt \ + win32/shlxthandler/ooofilt/propspec \ + win32/shlxthandler/propsheets/document_statistic \ + win32/shlxthandler/propsheets/listviewbuilder \ + win32/zipfile/zipexcptn + $(call gb_CustomTarget_get_target,shell/source) : \ $(foreach source,$(SHELL_SHLXTHANDLER_COMMON_FILES) $(SHELL_SHLXTHDL_FILES) $(SHELL_OOOFILT_FILES) $(SHELL_PROPERTYHDL_FILES) $(SHELL_XMLPARSER_FILES),\ - $(call gb_CustomTarget_get_workdir,shell/source)/$(source).cxx) + $(call gb_CustomTarget_get_workdir,shell/source)/$(source).cxx) \ + $(foreach header,$(SHELL_HEADERS),\ + $(call gb_CustomTarget_get_workdir,shell/source)/$(header).hxx) $(call gb_CustomTarget_get_workdir,shell/source)/% : $(SRCDIR)/shell/source/% mkdir -p $(dir $@) $(call gb_Deliver_deliver,$,$@) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash when trying to change Line spacing in Writer (master sources only)
On Mon, 2012-05-28 at 23:27 -0700, julien2412 wrote: Hello, I noticed a crash when using Line Spacing, see https://bugs.freedesktop.org/show_bug.cgi?id=50438. I attached a backtrace. I don't have this problem with 3.5 branch. Could anyone confirm this ? no crash for me (or warnings under valgrind) with x86_64 Linux 76804ffd5546261ac895ff32ab02e36383304d37 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/Module_connectivity.mk
connectivity/Module_connectivity.mk |4 1 file changed, 4 insertions(+) New commits: commit 2f378a6a611030ca64ce918a1f7fcd584deefea6 Author: Tor Lillqvist t...@iki.fi Date: Tue May 29 18:46:51 2012 +0300 Bypass unless BUILD_TYPE includes DBCONNECTIVITY Change-Id: I4450b0bae9223c96f2e5e26e7ffad72b4fc1ff07 diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 76e822a..a57b42d 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Module_Module,connectivity)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,connectivity,\ AllLangResTarget_cnr \ AllLangResTarget_sdbcl \ @@ -146,4 +148,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\ endif +endif + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/shape/ShapeContextHandler.cxx | 26 --
oox/source/shape/ShapeContextHandler.hxx |2 --
2 files changed, 28 deletions(-)
New commits:
commit 099198a4224778fe6e43f5dc13b5b9b1b4dc828c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue May 29 17:49:17 2012 +0200
Revert oox: initial smartart text is imported into Writer
This causes a test failure with sw's n747461.docx , since one
shape is apparently not loaded. In this patch, it seems the
if (Element == DGM_TOKEN(relIds)) part is the problem.
Reverting the whole change until this is fixed.
This reverts commit 8c6fb76c2cc24c336a28702b5f7f31cb5964129a.
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index 5ceb101..3234238 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -30,7 +30,6 @@
#include oox/vml/vmldrawingfragment.hxx
#include oox/vml/vmlshape.hxx
#include oox/vml/vmlshapecontainer.hxx
-#include oox/drawingml/diagram/diagram.hxx
namespace oox { namespace shape {
@@ -121,19 +120,6 @@ ShapeContextHandler::getDrawingShapeContext()
}
uno::Referencexml::sax::XFastContextHandler
-ShapeContextHandler::getDiagramShapeContext()
-{
-if (!mxDiagramShapeContext.is())
-{
-FragmentHandlerRef rFragmentHandler(new
ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
-mpShape.reset(new Shape());
-mxDiagramShapeContext.set(new
DiagramGraphicDataContext(*rFragmentHandler, mpShape));
-}
-
-return mxDiagramShapeContext;
-}
-
-uno::Referencexml::sax::XFastContextHandler
ShapeContextHandler::getContextHandler()
{
uno::Referencexml::sax::XFastContextHandler xResult;
@@ -144,9 +130,6 @@ ShapeContextHandler::getContextHandler()
case NMSP_vml:
xResult.set(getDrawingShapeContext());
break;
-case NMSP_dmlDiagram:
-xResult.set(getDiagramShapeContext());
-break;
default:
xResult.set(getGraphicShapeContext(mnStartToken));
break;
@@ -171,9 +154,6 @@ void SAL_CALL ShapeContextHandler::startFastElement
mpThemePtr.reset(new Theme());
-if (Element == DGM_TOKEN(relIds))
-createFastChildContext(Element, Attribs);
-
uno::ReferenceXFastContextHandler xContextHandler(getContextHandler());
if (xContextHandler.is())
@@ -267,12 +247,6 @@ ShapeContextHandler::getShape() throw
(uno::RuntimeException)
if( const ::oox::vml::ShapeBase* pShape =
mpDrawing-getShapes().takeLastShape() )
xResult = pShape-convertAndInsert( xShapes );
}
-else if (getContextHandler() == getDiagramShapeContext())
-{
-basegfx::B2DHomMatrix aMatrix;
-mpShape-addShape( *mxFilterBase, mpThemePtr.get(), xShapes,
aMatrix );
-xResult = mpShape-getXShape();
-}
else if (mpShape.get() != NULL)
{
basegfx::B2DHomMatrix aTransformation;
diff --git a/oox/source/shape/ShapeContextHandler.hxx
b/oox/source/shape/ShapeContextHandler.hxx
index 95aee66..df9c398 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -159,7 +159,6 @@ private:
GraphicShapeContextPtr;
css::uno::ReferenceXFastContextHandler mxDrawingFragmentHandler;
css::uno::ReferenceXFastContextHandler mxGraphicShapeContext;
-css::uno::ReferenceXFastContextHandler mxDiagramShapeContext;
core::XmlFilterRef mxFilterBase;
drawingml::ThemePtr mpThemePtr;
@@ -169,7 +168,6 @@ private:
css::uno::ReferenceXFastContextHandler
getGraphicShapeContext(::sal_Int32 Element);
css::uno::ReferenceXFastContextHandler getDrawingShapeContext();
-css::uno::ReferenceXFastContextHandler getDiagramShapeContext();
css::uno::ReferenceXFastContextHandler getContextHandler();
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 46114 - Java Access Bridge no longer works
On Tue, 2012-05-29 at 07:53 -0700, V Stuart Foote wrote: Happy to cobble together a couple of clean Win7sp1 systems (32bit, 64bit) with JRE 1.7.4, Java Access Bridge 2.0.2, NVDA 2012.1 and LibreOffice 3.5.4rc2 to capture the faults. But for posting stack- trace what would folks prefer (be able to use) to efficiently pin down the issue under Windows, JRE or the JAB? I suspect you'd do best with a windows master snapshot built with debug symbols .pdb files; unfortunately I've not had much luck here, either with Jesus' builds or the new tinderbox debug builds - the .pdb files mismatch the binaries or are not there. Also, could load Dr. Memory and work with one of the /win32-debug/libreoffice-3-5 installer packages if that is preferred, although the 3.5.4rc1 dev version is not yet posted. Yep - problem is, we barely startup under DrMemory :-) there are some rather odd things going on there I think - then again, perhaps some of those have been fixed in the most recent versions, so you might have more luck. My DrMemory crashed pretty fast running LibreOffice though - we do some unusual things for an application ;-) The best trace would prolly come from windbg for a build with symbols I guess. Thanks, 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] .: 2 commits - officecfg/registry qadevOOo/runner sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 -
qadevOOo/runner/lib/MultiMethodTest.java |1
qadevOOo/runner/lib/StatusException.java | 18 ---
sc/source/core/tool/defaultsoptions.cxx |2 -
4 files changed, 4 insertions(+), 19 deletions(-)
New commits:
commit 3e07bdfce6ef700a94868ccc03268aa005c295b8
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 29 18:23:12 2012 +0200
Revert fdo#50183 Use one sheet as default in Calc
This reverts commit 9a7d3d47d9b4d57b0c7380eadb294add4245ba3a.
It caused various tests in sc/JunitTest_sc_complex and
sc/JunitTest_sc_unoapi
to fail, which apparently implicitly depend on three instead of one sheets
per default in Calc.
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 62f0ff0..0cd2ff3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1620,7 +1620,7 @@
authorAlbert Thuswaldner/author
descOption to set initial number of sheet
tabs/desc
/info
- value1/value
+ value3/value
/prop
prop oor:name=SheetPrefix oor:type=xs:string
!-- UIHints: Tools - Options - Spreadsheet -
Defaults --
diff --git a/sc/source/core/tool/defaultsoptions.cxx
b/sc/source/core/tool/defaultsoptions.cxx
index 9683a7a..034b585 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -61,7 +61,7 @@ ScDefaultsOptions::~ScDefaultsOptions()
void ScDefaultsOptions::SetDefaults()
{
-nInitTabCount = 1;
+nInitTabCount = 3;
aInitTabPrefix = ScGlobal::GetRscString(STR_TABLE_DEF); // Default Prefix
Sheet
}
commit 1b330990733bcffbbf485df7aaed8130c899e2b8
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 29 18:22:25 2012 +0200
Improved error reporting
Change-Id: Ib852987c2040d47cd3de08c6aebc649a068378d6
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java
b/qadevOOo/runner/lib/MultiMethodTest.java
index 901f499..a68461e 100644
--- a/qadevOOo/runner/lib/MultiMethodTest.java
+++ b/qadevOOo/runner/lib/MultiMethodTest.java
@@ -222,6 +222,7 @@ public class MultiMethodTest
}
catch (Exception e)
{
+e.printStackTrace();
setSubStates(e.toString());
return tRes;
}
diff --git a/qadevOOo/runner/lib/StatusException.java
b/qadevOOo/runner/lib/StatusException.java
index 4768a92..a413257 100644
--- a/qadevOOo/runner/lib/StatusException.java
+++ b/qadevOOo/runner/lib/StatusException.java
@@ -34,12 +34,6 @@ package lib;
*/
public class StatusException extends RuntimeException {
/**
- * Contains an exception if the StatusException was created with
- * StatusException(String, Throwable) constructor.
- */
-protected Throwable exceptionThrown;
-
-/**
* The Status contained in the StatusException.
*/
protected Status status;
@@ -51,8 +45,7 @@ public class StatusException extends RuntimeException {
* @param t the exception of the exception Status
*/
public StatusException( String message, Throwable t ) {
-super( message );
-exceptionThrown = t;
+super( message, t );
status = Status.exception( t );
}
@@ -65,17 +58,9 @@ public class StatusException extends RuntimeException {
}
/**
- * @return an exception, if this represents an exception Status,
- * ttfalse/tt otherwise.
- */
-public Throwable getThrownException() {
-return exceptionThrown;
-}
-
-/**
* @return a status contained in the StatusException.
*/
public Status getStatus() {
return status;
}
-}
\ No newline at end of file
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - shell/CustomTarget_x64.mk shell/StaticLibrary_shlxthandler_common_x64.mk shell/StaticLibrary_xmlparser_x64.mk
shell/CustomTarget_x64.mk |2 +- shell/StaticLibrary_shlxthandler_common_x64.mk |4 shell/StaticLibrary_xmlparser_x64.mk |5 + 3 files changed, 10 insertions(+), 1 deletion(-) New commits: commit b7c6716b4bc0742af4206035495d161e7eb49424 Author: David Tardon dtar...@redhat.com Date: Tue May 29 18:53:03 2012 +0200 remove useless argument Change-Id: I8d5cd9a3ee8a469d4b0154f4423a6c811e3ad369 diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk index 5139482..332a8e2 100644 --- a/shell/CustomTarget_x64.mk +++ b/shell/CustomTarget_x64.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_CustomTarget_CustomTarget,shell/source,new_style)) +$(eval $(call gb_CustomTarget_CustomTarget,shell/source)) SHELL_SHLXTHANDLER_COMMON_FILES := \ win32/ooofilereader/autostyletag \ commit 9548c17e7446fca1c14a1044ad76d5149021756f Author: David Tardon dtar...@redhat.com Date: Tue May 29 18:52:39 2012 +0200 ensure source files are present before trying to use them Change-Id: I8c7608121872976e275d00236539940d797b64c4 diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 98b5831..95e9911 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -29,6 +29,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,shlxthandler_common_x64)) $(eval $(call gb_StaticLibrary_set_x64,shlxthandler_common_x64,YES)) +$(eval $(call gb_StaticLibrary_use_custom_headers,shlxthandler_common_x64,\ + shell/source \ +)) + $(eval $(call gb_StaticLibrary_set_include,shlxthandler_common_x64,\ -I$(SRCDIR)/shell/inc \ $$(INCLUDE) \ commit 061b196922b2ccb050755e72a915dc5fa3d96cf2 Author: David Tardon dtar...@redhat.com Date: Tue May 29 18:49:59 2012 +0200 fix include path Change-Id: I2857d5831e04227b9ebe12e4689f7d7a25221685 diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk index 126ef81..f833c94 100644 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -29,6 +29,11 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,shell_xmlparser_x64)) $(eval $(call gb_StaticLibrary_set_x64,shell_xmlparser_x64,YES)) +$(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_StaticLibrary_add_generated_exception_objects,shell_xmlparser_x64,\ CustomTarget/shell/source/all/xml_parser \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: blanket license statement ...
Hi, Here goes my blanket statement regarding my contributions to LibreOffice: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Regards -- Santiago Alessandri Forensic Analyst, Co-Founder. Nasel (http://www.nasel.com.ar) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 11 ++-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 +
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 9486851baea59d16c449d79bd61a38f6e686cfe0
Author: Miklos Vajna vmik...@suse.cz
Date: Tue May 29 15:31:11 2012 +0200
n#760764 dmapper: don't ignore character properties of text fields
Change-Id: If1497d78b8c31a4b2e5677bb57f40a0343a819a9
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c73b1cc..01d4b46 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -196,6 +196,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsColumnBreakDeferred( false ),
m_bIsPageBreakDeferred( false ),
m_pLastSectionContext( ),
+m_pLastCharacterContext(),
m_nCurrentTabStopIndex( 0 ),
m_sCurrentParaStyleId(),
m_bInStyleSheetImport( false ),
@@ -361,6 +362,8 @@ voidDomainMapper_Impl::PopProperties(ContextType eId)
{
m_pLastSectionContext = m_aPropertyStacks[eId].top( );
}
+else if (eId == CONTEXT_CHARACTER)
+m_pLastCharacterContext = m_aPropertyStacks[eId].top();
m_aPropertyStacks[eId].pop();
m_aContextStack.pop();
@@ -3173,7 +3176,13 @@ void DomainMapper_Impl::PopFieldContext()
if( xToInsert.is() )
{
uno::Reference text::XTextAppendAndConvert
xTextAppendAndConvert( xTextAppend, uno::UNO_QUERY_THROW );
-xTextAppendAndConvert-appendTextContent( xToInsert,
uno::Sequence beans::PropertyValue () );
+uno::Sequencebeans::PropertyValue aValues;
+// Character properties of the field show up here the
+// last (always empty) run. Inherit character
+// properties from there.
+if (m_pLastCharacterContext.get())
+aValues =
m_pLastCharacterContext-GetPropertyValues();
+xTextAppendAndConvert-appendTextContent(xToInsert,
aValues);
}
else
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 8fa3f4a..1dc1ebc 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -326,6 +326,7 @@ private:
PropertyMapPtr m_pTopContext;
PropertyMapPtr m_pLastSectionContext;
+PropertyMapPtr m_pLastCharacterContext;
::std::vectorDeletableTabStop m_aCurrentTabStops;
sal_uInt32 m_nCurrentTabStopIndex;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild starmath/CppunitTest_starmath_qa_cppunit.mk
solenv/gbuild/StaticLibrary.mk |1 + starmath/CppunitTest_starmath_qa_cppunit.mk | 11 --- 2 files changed, 5 insertions(+), 7 deletions(-) New commits: commit ddf8a35d9572f4fe9ab6d86b79aba74ad077fe33 Author: David Tardon dtar...@redhat.com Date: Tue May 29 19:34:40 2012 +0200 add gb_StaticLibrary_set_x64 Change-Id: Id54050f483aabf3514e4dd122ef295c6f1135fe4 diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 672478e..8458319 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -106,6 +106,7 @@ $(eval $(foreach method,\ set_include \ add_ldflags \ set_ldflags \ + set_x64 \ add_libs \ set_library_path_flags \ add_api \ commit 96a32c111538f8387934fa7e556f98bbd9f10620 Author: David Tardon dtar...@redhat.com Date: Tue May 29 19:09:36 2012 +0200 fix .component paths Change-Id: I953cdd6f425245aff0d18858d201520938e0e3aa diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index d8ecc78..356a916 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -79,6 +79,7 @@ $(eval $(call gb_CppunitTest_use_ure,starmath_qa_cppunit)) $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ configmgr/source/configmgr \ +dtrans/util/mcnttype \ framework/util/fwk \ i18npool/util/i18npool \ toolkit/util/tk \ @@ -86,14 +87,10 @@ $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ vcl/vcl \ )) -$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\ -mcnttype \ -)) - ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\ -ftransl \ -sysdtrans \ +$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ +dtrans/util/ftransl \ +dtrans/util/sysdtrans \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Unify OUTPATH values
Hi Francois, On Saturday, 2012-05-26 12:59:32 +0200, Francois Tigeot wrote: The attached patch reduces OUTPATH to two possible values: unx and wnt. In addition to what others already said regarding cross-platform builds and such, there are source directories named 'unx' within some modules, i.e. ls -d */unx desktop/unx extras/unx svl/unx tools/unx vcl/unx Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp1uoUFB9anT.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 50438, which changed state. Bug 50438 Summary: FORMATTING: Crash when trying to change Line spacing https://bugs.freedesktop.org/show_bug.cgi?id=50438 What|Old Value |New Value Resolution||INVALID Status|UNCONFIRMED |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
[INVALID] Re: Crash when trying to change Line spacing in Writer (master sources only)
Thank you Caolán for your feedback. I updated the fdo#50438. To sum up, after a recompilation from scratch, no crash. Much ado about nothing, sorry guys :-( -- View this message in context: http://nabble.documentfoundation.org/Crash-when-trying-to-change-Line-spacing-in-Writer-master-sources-only-tp3986477p3986576.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
Re: [PATCH] Unify OUTPATH values
Hi Michael, On Saturday, 2012-05-26 12:15:51 +0100, Michael Meeks wrote: [ admittedly the names are highly non-intuitive, and hard to write when explaining to others, and I don't believe the parallel .pro / non-pro distinctions is necessary ;-) ] When I worked on performance I usually liked to have .pro and non-pro (dbgutil) in parallel, .pro to do the profiling and dbgutil for development to have DBG_*/OSL_*/SAL_* bells and whistles until the next profiling step. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp1EmpazFn76.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Unify OUTPATH values
Hi, On Tue, May 29, 2012 at 09:07:06PM +0200, Eike Rathke wrote: On Saturday, 2012-05-26 12:59:32 +0200, Francois Tigeot wrote: The attached patch reduces OUTPATH to two possible values: unx and wnt. In addition to what others already said regarding cross-platform builds and such, there are source directories named 'unx' within some modules, i.e. ls -d */unx desktop/unx extras/unx svl/unx tools/unx vcl/unx OK, OK, that was a bad idea; I'm actively trying to forget it ;) -- Francois Tigeot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Unify OUTPATH values
Hi Francois, On Saturday, 2012-05-26 13:47:45 +0200, Francois Tigeot wrote: I didn't think cross-compiling could be done this way; in my mind, separate git clones were used for each destination platform. One could even have only one checkout and natively compile all platforms from it, which was how it was done in Sun Hamburg labs. Except that one platform that always gives troubles ;-) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgplEO2vufUgj.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: blanket license statement ...
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license -- Ionut ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: scp2/InstallModule_ooo.mk
scp2/InstallModule_ooo.mk |1 + 1 file changed, 1 insertion(+) New commits: commit e1af55f19df1bceaf24c601cd157e54f56217543 Author: Caolán McNamara caol...@redhat.com Date: Tue May 29 20:21:51 2012 +0100 apparently missing SYSTEM_HSQLDB define Change-Id: Ia4fd68af25725770cc620254dedba805102301a8 diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 928edad..d56a666 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -57,6 +57,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_GETTEXT \ SYSTEM_GLIB \ SYSTEM_GRAPHITE \ + SYSTEM_HSQLDB \ SYSTEM_HUNSPELL \ SYSTEM_HYPH \ SYSTEM_ICU \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Advice needed about some cppcheck reports
On 29/05/12 16:04, Lubos Lunak wrote:
On Tuesday 29 of May 2012, Michael Stahl wrote:
On 28/05/12 18:03, julien2412 wrote:
Same thing here :
[sal/osl/w32/file.cxx:880] - [sal/osl/w32/file.cxx:880]: (style) Same
expression on both sides of '-'.
876 if (nSize 0)
877 {
878 c ^= pData[0];
879 pData += nSize;
880 nSize -= nSize;
881 }
And here :
[filter/source/graphicfilter/icgm/cgm.cxx:269] -
[filter/source/graphicfilter/icgm/cgm.cxx:269]: (style) Same expression
on both sides of '-'.
267 if ( pLong[ nSwitch ] 0 )
268 {
269 nRetValue -= nRetValue;
270 }
271 nRetValue /= 65536;
also makes sense
This is not the same, it looks more to me like it should be 'nRetValue
= -nRetValue;' to negate the value, especially given the abs() above.
d'oh, thanks for the correction, stupid me had overlooked that there
were 3 of these, i've only seen the first 2 but then added this comment
below the third one which i hadn't actually looked at :-/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Unify OUTPATH values
On 29/05/12 21:21, Eike Rathke wrote: Hi Francois, On Saturday, 2012-05-26 13:47:45 +0200, Francois Tigeot wrote: I didn't think cross-compiling could be done this way; in my mind, separate git clones were used for each destination platform. One could even have only one checkout and natively compile all platforms from it, which was how it was done in Sun Hamburg labs. unfortunately that only worked with setsolar, not with configure based builds, because the names of the set_soenv shell output files collided. then i actually fixed that in CWS gnumake4, but now we have a single config_host.mk again :) well i don't currently build different platforms over NFS so who cares... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/osl sw/source
sal/osl/unx/file.cxx |2 +-
sw/source/core/unocore/unomap.cxx |6 +++---
sw/source/ui/docvw/SidebarWin.cxx |5 +
sw/source/ui/shells/langhelper.cxx |5 +
4 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 40106014f7b5c414faf087472a5ae350e683db53
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue May 29 21:31:44 2012 +0200
Some cppcheck cleaning
see
http://nabble.documentfoundation.org/Advice-needed-about-some-cppcheck-reports-td3986408.html
Change-Id: I4b3b2c87031ab48641e78fce56bd7f86c606b48b
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index dbf256d..1d8ab6c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1258,7 +1258,7 @@ SAL_CALL osl_mapFile (
{
c^= pData[0];
pData += nSize;
-nSize -= nSize;
+nSize = 0;
}
}
}
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index b21defd..9eba818 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -962,11 +962,11 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{
COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01
TABSTOPS_MAP_ENTRY
-{ SW_PROP_NMID(UNO_NAME_BACK_COLOR),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32),
PropertyAttribute::MAYBEVOID|PropertyAttribute::MAYBEVOID ,MID_BACK_COLOR
},
+{ SW_PROP_NMID(UNO_NAME_BACK_COLOR),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32),
PropertyAttribute::MAYBEVOID, MID_BACK_COLOR },
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,
CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_URL
},
{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_FILTER),
RES_BACKGROUND, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID
,MID_GRAPHIC_FILTER},
-{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC),
PropertyAttribute::MAYBEVOID|PropertyAttribute::MAYBEVOID
,MID_GRAPHIC_POSITION},
-{ SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT),
FN_UNO_TABLE_CELL_BACKGROUND,CPPU_E2T(CPPUTYPE_BOOLEAN),
PropertyAttribute::MAYBEVOID|PropertyAttribute::MAYBEVOID
,MID_GRAPHIC_TRANSPARENT },
+{ SW_PROP_NMID(UNO_NAME_BACK_GRAPHIC_LOCATION),
FN_UNO_TABLE_CELL_BACKGROUND, CPPU_E2T(CPPUTYPE_GRAPHICLOC),
PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION},
+{ SW_PROP_NMID(UNO_NAME_BACK_TRANSPARENT),
FN_UNO_TABLE_CELL_BACKGROUND,CPPU_E2T(CPPUTYPE_BOOLEAN),
PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT },
{ SW_PROP_NMID(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT,
CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID ,0
},
{ SW_PROP_NMID(UNO_NAME_VERT_ORIENT), RES_VERT_ORIENT,
CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE ,MID_VERTORIENT_ORIENT},
{ SW_PROP_NMID(UNO_NAME_CHART_ROW_AS_LABEL),
FN_UNO_RANGE_ROW_LABEL,CPPU_E2T(CPPUTYPE_BOOLEAN),
PropertyAttribute::MAYBEVOID, 0},
diff --git a/sw/source/ui/docvw/SidebarWin.cxx
b/sw/source/ui/docvw/SidebarWin.cxx
index 606ee29..e7c73d5 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -791,10 +791,7 @@ void SwSidebarWin::SetLanguage(const SvxLanguageItem
aNewItem)
const SwViewOption* pVOpt = mrView.GetWrtShellPtr()-GetViewOptions();
sal_uLong nCntrl = Engine()-GetControlWord();
// turn off
-if (!pVOpt-IsOnlineSpell())
-nCntrl = ~EE_CNTRL_ONLINESPELLING;
-else
-nCntrl = ~EE_CNTRL_ONLINESPELLING;
+nCntrl = ~EE_CNTRL_ONLINESPELLING;
Engine()-SetControlWord(nCntrl);
//turn back on
diff --git a/sw/source/ui/shells/langhelper.cxx
b/sw/source/ui/shells/langhelper.cxx
index 830f345..0a3ab12 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -209,10 +209,7 @@ namespace SwLangHelper
const SwViewOption* pVOpt =
rView.GetWrtShellPtr()-GetViewOptions();
sal_uLong nCntrl = pEditEngine-GetControlWord();
// turn off
-if (!pVOpt-IsOnlineSpell())
-nCntrl = ~EE_CNTRL_ONLINESPELLING;
-else
-nCntrl = ~EE_CNTRL_ONLINESPELLING;
+nCntrl = ~EE_CNTRL_ONLINESPELLING;
pEditEngine-SetControlWord(nCntrl);
//turn back on
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[PARTLY PUSHED] Re: Advice needed about some cppcheck reports
Thank you Michael and Lubos for your feedback. I commited and pushed on master some elements (see http://cgit.freedesktop.org/libreoffice/core/commit/?id=40106014f7b5c414faf087472a5ae350e683db53) I put aside for the moment : connectivity/source/drivers/mozab/MDriver.cxx:240 (we don't know yet what to do) sal/osl/w32/file.cxx:880 (since I'm not sure having well understood the abs and nRet thing :-() filter/source/graphicfilter/icgm/cgm.cxx:269 (no response about this for the moment) Julien. -- View this message in context: http://nabble.documentfoundation.org/Advice-needed-about-some-cppcheck-reports-tp3986408p3986586.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
Meaning of _SOLAR__PRIVATE
What is the meaning of _SOLAR__PRIVATE? See http://opengrok.libreoffice.org/search?q=project=coredefs=refs=_SOLAR__PRIVATEpath=hist= (Just one of zillion mysterious things in the codebase that one comes across by accident... I guess it's best to just ask here; asking on IRC is not always successful, and this way any answer gets archived.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/ui/docvw/PostItMgr.cxx |2 +-
sw/source/ui/shells/mediash.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4c21b80c8e57c101afb8d1578f3ae810419e0d5f
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue May 29 22:04:32 2012 +0200
Reduce scope
Change-Id: I12a743f9ef98377482472c6b31c2ea8b2c18b538
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 6d42563..7052fcc 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -936,7 +936,6 @@ bool SwPostItMgr::LayoutByPage(std::listSwSidebarWin*
aVisiblePostItList,cons
longlBottomBorder = rBorder.Bottom() - 5;
const long lVisibleHeight = lBottomBorder - lTopBorder;
//rBorder.GetHeight() ;
longlTranslatePos = 0;
-boolbDone = false;
boolbScrollbars = false;
// do all neccessary resizings
@@ -965,6 +964,7 @@ bool SwPostItMgr::LayoutByPage(std::listSwSidebarWin*
aVisiblePostItList,cons
//start the real layout so nothing overlaps anymore
if (aVisiblePostItList.size()1)
{
+bool bDone = false;
long lSpaceUsed = 0;
int loop = 0;
// if no window is moved anymore we are finished
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index 9321c5d..f43c624 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -166,10 +166,10 @@ void SwMediaShell::GetMediaState(SfxItemSet rSet)
{
SwWrtShell rSh = GetShell();
SdrView*pView = rSh.GetDrawView();
-boolbDisable = true;
if( pView )
{
+bool bDisable = true;
SdrMarkList* pMarkList = new SdrMarkList(
pView-GetMarkedObjectList() );
if( 1 == pMarkList-GetMarkCount() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Unify OUTPATH values
On Tue, 2012-05-29 at 21:37 +0200, Michael Stahl wrote: On 29/05/12 21:21, Eike Rathke wrote: One could even have only one checkout and natively compile all platforms from it, which was how it was done in Sun Hamburg labs. unfortunately that only worked with setsolar, not with configure based builds, because the names of the set_soenv shell output files collided. then i actually fixed that in CWS gnumake4, but now we have a single config_host.mk again :) well i don't currently build different platforms over NFS so who cares... I used to build all the weird-ass ports locally over nfs on a shared source tree but gave up with the various changes that broke that. Anyway disk space is so relatively insanely cheap now that the space saving side of things doesn't matter much. There even used to be a common[.pro] output dir at one stage for arch independent output so slower arches could skip building those (?) but that went away years ago I think. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Unify OUTPATH values
On 29/05/12 22:26, Caolán McNamara wrote: On Tue, 2012-05-29 at 21:37 +0200, Michael Stahl wrote: On 29/05/12 21:21, Eike Rathke wrote: One could even have only one checkout and natively compile all platforms from it, which was how it was done in Sun Hamburg labs. unfortunately that only worked with setsolar, not with configure based builds, because the names of the set_soenv shell output files collided. then i actually fixed that in CWS gnumake4, but now we have a single config_host.mk again :) well i don't currently build different platforms over NFS so who cares... I used to build all the weird-ass ports locally over nfs on a shared source tree but gave up with the various changes that broke that. Anyway disk space is so relatively insanely cheap now that the space saving side of things doesn't matter much. it was not at all about the space savings (during my time anyway), but only about the convenience of managing only 1 repo/working copy. There even used to be a common[.pro] output dir at one stage for arch independent output so slower arches could skip building those (?) but that went away years ago I think. actually while it wasn't used in configure for many years, iirc it only went away in setsolar with the gbuild migration, because we refused to support common trees, with the inherent race conditions and over-writes when building concurrently on different platforms they never worked properly anyway. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 6 commits - android/Bootstrap android/experimental android/qa framework/source sal/android vcl/source
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
| 16 +
android/experimental/DocumentLoader/Makefile
|1
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 82 +++---
android/qa/desktop/Makefile
|6
framework/source/dispatch/interceptionhelper.cxx
| 24 --
framework/source/dispatch/loaddispatcher.cxx
| 38
framework/source/loadenv/targethelper.cxx
|6
framework/source/services/modulemanager.cxx
| 57 --
sal/android/lo-bootstrap.c
| 19 ++
vcl/source/window/wrkwin.cxx
| 10 +
10 files changed, 107 insertions(+), 152 deletions(-)
New commits:
commit 0453a1244a3966cef1497b4a0931d1e8279e2822
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed May 30 00:01:21 2012 +0300
Better comment for how to use lo-strace
Change-Id: I29afe81866229bd29fcd997624264fb337c74d95
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index d38b413..2f7cbd0 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -254,7 +254,7 @@ uninstall:
run:
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP)
-# add -e lo-strace yes # if you want that
+# add -e lo-strace -f -o /somewhere/the/app/can/write.log if you want
# If you reinstall an app several times, even if you uninstall it
# between, disk space seems to leak that won't get recycled until you
commit 9faf21d484c8d9b5d30ca65d1aefdbaf101f6b22
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed May 30 00:00:33 2012 +0300
No cmdline file is created so don't use lo-main-indirect-cmdline then
Change-Id: Ifac7e34b34fcf32fb2a0f117e8b8ad5ab1003fc9
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 2253ed6..d38b413 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -253,9 +253,7 @@ uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
run:
-# echo file:///assets/demo/writer.odt cmdline
-# $(ANDROID_SDK_HOME)/platform-tools/adb push cmdline
$(APP_DATA_PATH)/cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-indirect-cmdline
$(APP_DATA_PATH)/cmdline
+ $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP)
# add -e lo-strace yes # if you want that
# If you reinstall an app several times, even if you uninstall it
commit e28ad1b5d8258df9d4014692867d6c6ee0612047
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue May 29 23:59:03 2012 +0300
More experimentation
Change-Id: I8ad45f173c4f2b37aca6506d9021e8346c17db16
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 3774680..1e9cebc 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -53,6 +53,7 @@ copy-stuff:
basegfxlo \
bootstrap.uno \
comphelpgcc3 \
+ ctllo \
datelo \
dbaxmllo \
dbtoolslo \
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 975cd05..5a45406 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -41,6 +41,29 @@ public class DocumentLoader
private static String TAG = DocumentLoader;
+static void dump(String objectName, Object object)
+{
+Log.i(TAG, objectName + is + (object != null ? object.toString() :
null));
+
+if (object == null)
+return;
+
+com.sun.star.lang.XTypeProvider typeProvider =
(com.sun.star.lang.XTypeProvider)
+UnoRuntime.queryInterface(com.sun.star.lang.XTypeProvider.class,
object);
+
+Log.i(TAG, typeProvider is + (typeProvider != null ?
typeProvider.toString() : null));
+
+if (typeProvider == null)
+return;
+
+com.sun.star.uno.Type[] types = typeProvider.getTypes();
+if (types == null)
+return;
+
+for (com.sun.star.uno.Type t : types)
+Log.i(TAG,+ t.getTypeName());
+}
+
@Override
public void
[PATCH] Re: [PATCH] [PUSHED] Re: fdo#45830 - Language/User Interface: current choice indicated as default
Hi,
The patch was reverted because it gave errors. I have changed the patch.
Can anybody look if it is ok now?
I changed the patch so that it is solved in
SvxLanguageBox::ImplInsertLanguage. The only function that calls it with
the LANGUAGE_SYSTEM-option is the optgdlg (OptionsDialog-Language). Is
it correct this way or is a new function needed as not to disturb the
current function?
--
Greetings,
Rob Snelders
Op 28-05-12 16:59, Tor Lillqvist schreef:
Thanks, pushed.
--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
From 67fd871f3549b977406da10a2062f6b229cbd519 Mon Sep 17 00:00:00 2001
From: Rob Snelders programm...@ertai.nl
Date: Tue, 29 May 2012 23:25:10 +0200
Subject: [PATCH] fdo#45830: Indicate correct default locale setting
Change-Id: Iac77758e4cdd48629ae276566bec2d7a4b873e38
---
svx/source/dialog/langbox.cxx |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 0ec2329..a2ec7fd 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -349,7 +349,10 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
LanguageType nRealLang = nLang;
if (nRealLang == LANGUAGE_SYSTEM)
{
-nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType);
+if (nType == ::com::sun::star::i18n::ScriptType::WEAK)
+nRealLang = MsLangId::getSystemLanguage();
+else
+nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType);
aStrEntry.AppendAscii( - );
aStrEntry.Append(m_pLangTable-GetString( nRealLang ));
}
--
1.7.5.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - cui/source shell/inc
cui/source/dialogs/SpellDialog.cxx | 51 +--
shell/inc/internal/stream_helper.hxx |2 -
2 files changed, 33 insertions(+), 20 deletions(-)
New commits:
commit a3c47760e122baaf55f39107597aff2f5957aecd
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 29 22:27:11 2012 +0100
Resolves: fdo#50476 Dots inside quoted sentences get removed on Correct
All
refactor the dodgy dot replacement code so that all the replacement paths go
through the same logic so that Change All does the same thing as repeated
Changes
Change-Id: Id63968e03409f676200a9ac546f7baa398f2eff8
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 602289e..eec15d5 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -632,22 +632,39 @@ void SpellDialog::StartSpellOptDlg_Impl()
OfaTreeOptionsDialog::ApplyLanguageOptions(*pOutSet);
}
delete pDlg;
+}
+
+namespace
+{
+String getDotReplacementString(const String rErrorText, const String
rSuggestedReplacement)
+{
+String aString = rErrorText;
+
+//dots are sometimes part of the spelled word but they are not
necessarily part of the replacement
+bool bDot = aString.Len() aString.GetChar(aString.Len() - 1 ) ==
'.';
+aString = rSuggestedReplacement;
+
+if(bDot (!aString.Len() || aString.GetChar(aString.Len() - 1 ) !=
'.'))
+aString += '.';
+
+return aString;
+}
}
+
String SpellDialog::getReplacementString() const
{
-String aString = aSentenceED.GetErrorText();
-//dots are sometimes part of the spelled word but they are not necessarily
part of the replacement
-bool bDot = aString.Len() aString.GetChar(aString.Len() - 1 ) == '.';
+String sOrigString = aSentenceED.GetErrorText();
+
+String sReplacement(sOrigString);
+
if(aSuggestionLB.IsEnabled()
aSuggestionLB.GetSelectEntryCount()0
aNoSuggestionsST != aSuggestionLB.GetSelectEntry())
-aString = aSuggestionLB.GetSelectEntry();
-if(bDot (!aString.Len() || aString.GetChar(aString.Len() - 1 ) != '.'))
-aString += '.';
+sReplacement = aSuggestionLB.GetSelectEntry();
-return aString;
+return getDotReplacementString(sOrigString, sReplacement);
}
// ---
@@ -1304,20 +1321,13 @@ bool
SpellDialog::ApplyChangeAllList_Impl(SpellPortions rSentence, bool bHasRe
{
if(aStart-xAlternatives.is())
{
-rtl::OUString rString = aStart-sText;
+const rtl::OUString rString = aStart-sText;
-//dots are sometimes part of the spelled word but they are not
necessarily part of the replacement
-bool bDot = !rString.isEmpty() rString[rString.getLength() - 1]
== '.';
-
-ReferenceXDictionaryEntry xEntry = xChangeAll-getEntry( rString
);
+ReferenceXDictionaryEntry xEntry = xChangeAll-getEntry(rString);
if(xEntry.is())
{
-rString = xEntry-getReplacementText();
-
-if(bDot (rString.isEmpty() || rString[rString.getLength() -
1] != '.'))
-rString = rString +
rtl::OUString(static_castsal_Unicode('.'));
-
+aStart-sText = getDotReplacementString(rString,
xEntry-getReplacementText());
aStart-xAlternatives = 0;
bHasReplaced = true;
}
@@ -1731,8 +1741,11 @@ bool SentenceEditWindow_Impl::MarkNextError( bool
bIgnoreCurrentError )
{
m_nErrorStart = pNextError-GetStart();
m_nErrorEnd = pNextError-GetEnd();
-ChangeMarkedWord(xEntry-getReplacementText(),
-SvxLocaleToLanguage( pSpellErrorDescription-aLocale ));
+
+String sReplacement(getDotReplacementString(GetErrorText(),
xEntry-getReplacementText()));
+
+ChangeMarkedWord(sReplacement, SvxLocaleToLanguage(
pSpellErrorDescription-aLocale ));
+
aCursor.GetIndex() = aCursor.GetIndex() +
(sal_uInt16)(xEntry-getReplacementText().getLength());
}
else
commit 5713c054c569593e21d2d9db8680d5304f3063f9
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 29 21:14:13 2012 +0100
WaE: C4099: type name first seen using struct now using class
Change-Id: I31772243349f1e3fcbea6b0d0aea9786b19d0fcc
diff --git a/shell/inc/internal/stream_helper.hxx
b/shell/inc/internal/stream_helper.hxx
index b1949fd..f0d41bb 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
@@ -31,7 +31,7 @@
#include internal/types.hxx
-class IStream;
+struct IStream;
class BufferStream : public StreamInterface
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
Re: [PATCH] Unify OUTPATH values
On Tue, May 29, 2012 at 2:37 PM, Michael Stahl mst...@redhat.com wrote: unfortunately that only worked with setsolar, not with configure based builds, because the names of the set_soenv shell output files collided. then i actually fixed that in CWS gnumake4, but now we have a single config_host.mk again :) well i don't currently build different platforms over NFS so who cares... the long term solution would be to completely separate the build from the source mkdir mybuild cd mybuild $SRCDIR/autogen.sh make Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: shell/Library_ooofilt_x64.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl_x64.mk shell/StaticLibrary_shlxthandler_common_x64.mk shell/StaticLibrary_xmlparser_x64.mk
shell/Library_ooofilt_x64.mk |2 +- shell/Library_propertyhdl_x64.mk |2 +- shell/Library_shlxthdl_x64.mk |2 +- shell/StaticLibrary_shlxthandler_common_x64.mk |2 +- shell/StaticLibrary_xmlparser_x64.mk |2 +- solenv/gbuild/StaticLibrary.mk |2 ++ 6 files changed, 7 insertions(+), 5 deletions(-) New commits: commit d131867357e85307f229d2920492c9ae2be3abeb Author: Andras Timar ati...@suse.com Date: Tue May 29 23:58:25 2012 +0200 use 64-bit compiler and linker for 64-bit Windows shell extensions Change-Id: I4ad94eca4ebbf7d8e989dba5a19296d727111850 diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index f3c9946..265672a 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -88,7 +88,7 @@ $(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ /EXPORT:DllUnregisterServer \ )) -$(eval $(call gb_Library_add_generated_exception_objects,ooofilt_x64,\ +$(eval $(call gb_Library_add_x64_generated_exception_objects,ooofilt_x64,\ CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 1a36e2b..46d24ff 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -87,7 +87,7 @@ $(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ /EXPORT:DllGetClassObject \ )) -$(eval $(call gb_Library_add_generated_exception_objects,propertyhdl_x64,\ +$(eval $(call gb_Library_add_x64_generated_exception_objects,propertyhdl_x64,\ CustomTarget/shell/source/win32/shlxthandler/prophdl/propertyhdl \ )) diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index a7e149c..f5c8c7c 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -90,7 +90,7 @@ $(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\ /EXPORT:DllUnregisterServer \ )) -$(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\ +$(eval $(call gb_Library_add_x64_generated_exception_objects,shlxthdl_x64,\ CustomTarget/shell/source/win32/shlxthandler/classfactory \ CustomTarget/shell/source/win32/shlxthandler/columninfo/columninfo \ CustomTarget/shell/source/win32/shlxthandler/infotips/infotips \ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 95e9911..5665e4b 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -58,7 +58,7 @@ $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ zlib \ )) -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,shlxthandler_common_x64,\ +$(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shlxthandler_common_x64,\ CustomTarget/shell/source/win32/ooofilereader/autostyletag \ CustomTarget/shell/source/win32/ooofilereader/basereader \ CustomTarget/shell/source/win32/ooofilereader/contentreader \ diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk index f833c94..1944380 100644 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -34,7 +34,7 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ $$(INCLUDE) \ )) -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,shell_xmlparser_x64,\ +$(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shell_xmlparser_x64,\ CustomTarget/shell/source/all/xml_parser \ )) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 8458319..e8ef3e6 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -90,6 +90,7 @@ $(eval $(foreach method,\ add_asmobject \ add_asmobjects \ add_exception_objects \ + add_x64_generated_exception_objects \ add_noexception_objects \ add_generated_cobjects \ add_generated_cxxobjects \ @@ -101,6 +102,7 @@ $(eval $(foreach method,\ add_objcflags \ add_objcxxflags \ set_objcxxflags \ + set_x64 \ add_defs \ set_defs \ set_include \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/Library_gconfbe.mk
shell/Library_gconfbe.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 835802d60d3b629182d73c0d1d49d790cb0ac57f Author: Caolán McNamara caol...@redhat.com Date: Tue May 29 23:01:26 2012 +0100 ensure linking to gobject Change-Id: Idfe17f54b2f8a2d53bc340f03253270a1b222811 diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index 0616898..9fb520d 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_api,gconfbe1,\ $(eval $(call gb_Library_use_externals,gconfbe1,\ gconf \ + gobject \ )) $(eval $(call gb_Library_use_libraries,gconfbe1,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/StaticLibrary.mk |1 - 1 file changed, 1 deletion(-) New commits: commit e8551287cf2161ba7a55eb19df23069e693d6b3e Author: Andras Timar ati...@suse.com Date: Wed May 30 00:11:07 2012 +0200 remove already added set_x64 Change-Id: I62c72e499119eb43ed0c75fe1f5cb1c9fc06c113 diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index e8ef3e6..2d4a9d5 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -102,7 +102,6 @@ $(eval $(foreach method,\ add_objcflags \ add_objcxxflags \ set_objcxxflags \ - set_x64 \ add_defs \ set_defs \ set_include \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: feature/gbuild_merge needs testing
2012/5/28 David Tardon dtar...@redhat.com: After 3 days of fixing, it reportedly builds on MacOS X and Windows now (big thanks to Norbert, Matus, David and Noel for testing!) Therefore I am going to merge it tomorrow morning (around 6.00 UTC). There is still an issue with building 64-bit shell extensions on Windows with MSVC. We had some progress today, both you and me committed patches. Now I'm stuck at the linking phase. We have to link to 64-bit expat and zlib (in solver\wntmsci12.pro\lib\x64), but I don't know how to modify gbuild makefiles to do that. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in reportbuilder/Module_reportbuilder.mk
configure.in |3 --- reportbuilder/Module_reportbuilder.mk |2 +- 2 files changed, 1 insertion(+), 4 deletions(-) New commits: commit c88234357f97020885010d50aa3e2c3e1c53d605 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed May 30 00:22:11 2012 +0200 reportbuilder: build only when enabled Change-Id: Iee65c6bd8ddc51b3ae703e6d38c825f3801389fe diff --git a/configure.in b/configure.in index 94f545e..f5088f9 100644 --- a/configure.in +++ b/configure.in @@ -9119,7 +9119,6 @@ AC_MSG_CHECKING([whether to build the Report Builder extension]) if test $enable_ext_report_builder != no -a x$enable_extension_integration != xno -a $with_java != no; then AC_MSG_RESULT([yes]) ENABLE_REPORTBUILDER=YES -AC_MSG_CHECKING([for reportbuilder module]) AC_MSG_CHECKING([which jfreereport libs to use]) if test $with_system_jfreereport = yes; then SYSTEM_JFREEREPORT=YES @@ -9282,11 +9281,9 @@ if test $enable_ext_report_builder != no -a x$enable_extension_integration else AC_MSG_RESULT([internal]) -AC_MSG_CHECKING([for jfreereport module]) SYSTEM_JFREEREPORT=NO BUILD_TYPE=$BUILD_TYPE JFREEREPORT fi -BUILD_TYPE=$BUILD_TYPE REPORTBUILDER else AC_MSG_RESULT([no]) ENABLE_REPORTBUILDER=NO diff --git a/reportbuilder/Module_reportbuilder.mk b/reportbuilder/Module_reportbuilder.mk index 9d3bea5..1829743 100644 --- a/reportbuilder/Module_reportbuilder.mk +++ b/reportbuilder/Module_reportbuilder.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Module_Module,reportbuilder)) -ifneq ($(SOLAR_JAVA),) +ifeq ($(ENABLE_REPORTBUILDER),YES) $(eval $(call gb_Module_add_targets,reportbuilder,\ Configuration_reportbuilder \ Extension_reportbuilder \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
