Re: gbuild deps: removed header
Hi, On Sun, Jul 22, 2012 at 09:01:45PM +0200, Matúš Kukan wrote: Hi all, Should gbuild dependencies survive removed header ? Yes, ideally :-) Something like: touch solver/*/inc/foo.h +#include foo.h e.g. in salhelper/source/condition.cxx make gb_FULLDEPS=T salhelper Now workdir/*/Dep/LinkTarget/Library/*salhelper*.d should contain foo.h So: rm solver/*/inc/foo.h -#include foo.h in salhelper/source/condition.cxx and make gb_FULLDEPS=T salhelper fails for me. Is it expected ? I thought it could work. But what works is if we use /home/matus/git/libo/solver/unxlngx6.pro/inc/foo.h: @true instead of just /home/matus/git/libo/solver/unxlngx6.pro/inc/foo.h: Do we want to hack contac-deps and add @true there ? Is there another option or is this just wrong ? IMHO this will cause problems for headers in solver, because a specific rule for a file overrides a pattern rule, which means that delivery of changed headers will stop working. Also, I am wondering, has this ever been working before ? I do not think it has. (Note that this is a problem with idl and hrc files too.) D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make check with DEBUGCCPUNIT=TRUE is waiting for console output
Hi Noel, On Fri, Jul 20, 2012 at 10:54:04AM +0200, Noel Grandin n...@peralex.com wrote: Ping? Anybody have any ideas? This is driving me nuts during my testing. So - I think this has been already mentioned in this thread, to just avoid the pain, the best is to run make check without DEBUGCCPUNIT=TRUE, and if there is one failing test, then run just that test with this option. This way it won't hang, and not running all tests in gdb will make make check faster as well. Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: mdds/makefile.mk mdds/mdds_0.6.0-unused-parameter.patch
mdds/makefile.mk |2 +-
mdds/mdds_0.6.0-unused-parameter.patch | 11 +++
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit f86d51e1bc15e46090a59cfa10b71055ceccd381
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jul 23 09:36:11 2012 +0200
-Werror,-Wunused-parameter (Clang 3.1)
Change-Id: Id384aeda51bcbba9aefdb242db386a30ae991c30
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index 53a0419..5adc83d 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -32,7 +32,7 @@ TARFILE_MD5=3e89a35f253a4f1c7de68c57d851ef38
PATCH_FILES=\
mdds_0.6.0.patch \
0001-help-compiler-select-the-right-overload-of-vector-in.patch \
-
+mdds_0.6.0-unused-parameter.patch
CONFIGURE_DIR=
CONFIGURE_ACTION=
diff --git a/mdds/mdds_0.6.0-unused-parameter.patch
b/mdds/mdds_0.6.0-unused-parameter.patch
new file mode 100644
index 000..6abc69e
--- /dev/null
+++ b/mdds/mdds_0.6.0-unused-parameter.patch
@@ -0,0 +1,11 @@
+--- misc/mdds_0.6.0/include/mdds/multi_type_vector_types.hpp 2012-07-19
05:09:49.0 +0200
misc/build/mdds_0.6.0/include/mdds/multi_type_vector_types.hpp
2012-07-23 09:31:51.636388620 +0200
+@@ -302,7 +302,7 @@
+ noncopyable_element_block(size_t n, const _Data val) : base_type(n, val)
{}
+
+ public:
+-static _Self* clone_block(const base_element_block blk)
++static _Self* clone_block(const base_element_block)
+ {
+ throw element_block_error(attempted to clone a noncopyable element
block.);
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: make check with DEBUGCCPUNIT=TRUE is waiting for console output
On 2012-07-23 09:27, Miklos Vajna wrote: So - I think this has been already mentioned in this thread, to just avoid the pain, the best is to run make check without DEBUGCCPUNIT=TRUE My point is that this used to work, and I'm pretty sure it's a bug in the make scripts, since it doesn't seem to be functioning as intended. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/source
oox/source/dump/dumperbase.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6aff9717426db96f41ab04cd96da2b5d074625e1
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jul 23 10:28:03 2012 +0200
Bogus warning C4701: potentially uninitialized local variable
Change-Id: I51caaca911f71788940260bd63d3854526d7473f
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 20ecbc5..0e48615 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -332,7 +332,7 @@ void StringHelper::appendHex( OUStringBuffer rStr,
sal_Int64 nData, bool bPrefi
static sal_uInt64
lcl_ConvertDouble(double const f)
{
-sal_uInt64 i;
+sal_uInt64 i = sal_uInt64();
for (size_t j = 0; j sizeof(double); ++j)
{ // hopefully both endian independent and strict aliasing safe
reinterpret_castchar *(i)[j] = reinterpret_castchar const
*(f)[j];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - filter/inc filter/source svx/inc
filter/inc/filter/msfilter/msdffimp.hxx | 14 +++---
filter/inc/filter/msfilter/svdfppt.hxx | 12 ++--
filter/source/msfilter/svdfppt.cxx |8
svx/inc/svx/svditer.hxx |6 +++---
4 files changed, 24 insertions(+), 16 deletions(-)
New commits:
commit 4d05a50182587ee2c63b6911206cbd6c3287c180
Author: David Tardon dtar...@redhat.com
Date: Mon Jul 23 10:33:36 2012 +0200
mark more one-param ctors as explicit
Change-Id: Idf923e4a1e81a2e2e9c7107e4b6725bd9eb33e38
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx
b/filter/inc/filter/msfilter/msdffimp.hxx
index 22a8d72..e127aa8 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -121,7 +121,7 @@ protected:
DffPropFlagsmpFlags[ 1024 ];
public:
-DffPropSet( sal_Bool bInitialize = sal_False )
+explicit DffPropSet( sal_Bool bInitialize = sal_False )
{
if ( bInitialize )
memset( mpFlags, 0, 0x400 * sizeof( DffPropFlags ) );
@@ -160,7 +160,7 @@ class MSFILTER_DLLPUBLIC DffPropertyReader : public
DffPropSet
public:
sal_Int32 mnFix16Angle;
-DffPropertyReader( const SvxMSDffManager rManager );
+explicit DffPropertyReader( const SvxMSDffManager rManager );
~DffPropertyReader();
sal_Int32 Fix16ToAngle( sal_Int32 nAngle ) const;
@@ -344,7 +344,7 @@ struct SvxMSDffImportData
SvxMSDffImportData()
{}
-SvxMSDffImportData( const Rectangle rParentRect ) : aParentRect(
rParentRect ) {}
+explicit SvxMSDffImportData( const Rectangle rParentRect ) : aParentRect(
rParentRect ) {}
void SetNewRect(sal_Int32 left, sal_Int32 top, sal_Int32 right, sal_Int32
bottom )
{ aNewRect = Rectangle(left, top, right, bottom); }
sal_Bool HasParRect() const { return aParentRect.IsEmpty(); }
@@ -403,7 +403,7 @@ struct DffRecordList
DffRecordHeader mHd[ DFF_RECORD_MANAGER_BUF_SIZE ];
-DffRecordList( DffRecordList* pList );
+explicit DffRecordList( DffRecordList* pList );
~DffRecordList();
};
@@ -431,7 +431,7 @@ public :
DffSeekToContentMode eMode =
SEEK_FROM_BEGINNING );
DffRecordManager();
-DffRecordManager( SvStream rIn );
+explicit DffRecordManager( SvStream rIn );
~DffRecordManager();
DffRecordHeader* Current();
@@ -815,7 +815,7 @@ struct SvxMSDffShapeInfo
sal_Bool bSortByShapeId :1;
sal_Bool bLastBoxInChain:1;
-SvxMSDffShapeInfo(sal_uLong nFPos, sal_uInt32 nId=0, // sal_uLong nBIdx=0,
+explicit SvxMSDffShapeInfo(sal_uLong nFPos, sal_uInt32 nId=0, // sal_uLong
nBIdx=0,
sal_uInt16 nSeqId=0, sal_uInt16 nBoxId=0):
nShapeId( nId ),
nFilePos( nFPos ),
@@ -860,7 +860,7 @@ struct SvxMSDffShapeOrder
// Approach: In the Ctor of SvxMSDffManager only the shape ids are stored
in
// the shape order array. The Text-Box number and the object
// pointer are only stored if the shape is really imported.
-SvxMSDffShapeOrder( sal_uLong nId ):
+explicit SvxMSDffShapeOrder( sal_uLong nId ):
nShapeId( nId ), nTxBxComp( 0 ), pFly( 0 ), nHdFtSection( 0 ), pObj( 0
){}
bool operator==( const SvxMSDffShapeOrder rEntry ) const
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx
b/filter/inc/filter/msfilter/svdfppt.hxx
index d2fb3b1..baf955e 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -500,7 +500,7 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry
const PptSlidePersistEntry rSlidePersist
);
-HeaderFooterEntry( const PptSlidePersistEntry* pMaster
= NULL );
+explicit HeaderFooterEntry( const
PptSlidePersistEntry* pMaster = NULL );
~HeaderFooterEntry();
};
@@ -672,7 +672,7 @@ struct PPTTextSpecInfo
sal_uInt16 nLanguage[ 3 ];
sal_uInt16 nDontKnow;
-PPTTextSpecInfo( sal_uInt32 nCharIdx );
+explicit PPTTextSpecInfo( sal_uInt32 nCharIdx );
~PPTTextSpecInfo();
};
@@ -762,7 +762,7 @@ struct PPTCharSheet
{
PPTCharLevelmaCharLevel[ 5 ];
-PPTCharSheet( sal_uInt32 nInstance );
+explicit PPTCharSheet( sal_uInt32 nInstance );
PPTCharSheet( const PPTCharSheet rCharSheet );
voidRead( SvStream rIn, sal_Bool bMasterStyle, sal_uInt32
nLevel, sal_Bool bFirst );
@@ -795,7 +795,7 @@ public:
PPTParaLevelmaParaLevel[ 5 ];
-PPTParaSheet( sal_uInt32 nInstance );
+explicit PPTParaSheet( sal_uInt32 nInstance );
PPTParaSheet( const PPTParaSheet rParaSheet );
voidRead(
@@ -945,7 +945,7 @@ struct PPTCharPropSet
voidSetFont( sal_uInt16 nFont );
void
Re: C++11 in LibreOffice
On Saturday 21 of July 2012, Kohei Yoshida wrote: On 07/19/2012 11:26 AM, Michael Meeks wrote: On Thu, 2012-07-19 at 16:04 +0200, Michael Stahl wrote: i'm saying it doesn't benefit from the sophisticated optimizations that vendor compilers like SunStudio or Intel do that speed up your BLAS stuff with gigabytes of floating point arrays by X times because office suites don't contain gigabytes of floating point arrays. So - Kohei has been working for years to turn Calc spreadsheets into gigabyte arrays of floating point numbers - precisely to take advantage of this sort of optimisation :-) Just wrote a blog post explaining some of that. http://kohei.us/2012/07/20/mdds-multi_type_vector-explained/ Almost 2 years in the making (well, that also includes one year of just thinking about it idly with no code), I'm glad I've finally got this one off my shoulder. :-) But no doubt more work is ahead to further optimize this structure. Where's the benchmark for that? I'd like to see what difference it makes, but I cannot find anything in the blog post. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: No Win builds?
Norbert Thiebaud schrieb: humm, indeed. apparently push_nightly.sh is not finding stuff to push Hi, today I see some progress, /daily/Win-x86@6/master/2012-07-22_22.08.18 contains a build. Others still empty! Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 in LibreOffice
On Thursday 19 of July 2012, Michael Meeks wrote: Having said that, I totally agree, our problems are 95% algorithmic, and fiddling with compiler optimiser settings is the last refuge of the desperate man ;-) The thing that concerns me about gcc vs. MSVC++ is not the speed of the generated code, but it's size (which impacts startup performance, I/O load, memory use etc.). If you checkout the tables you linked the binary size column is quite stark: http://www.willus.com/ccomp_benchmark2.shtml?p18+s12 http://www.willus.com/ccomp_benchmark2.shtml?p14+s12 in several cases a 2x growth. So - clearly this would need benchmarking various ways to see what the story is there with -Os etc. The other interesting thing in the table is that interprocedural optimization makes quite a difference with MSVC. It would be quite worth trying that one out with LO. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Tinderbox failure, W2008R2@16-minimal_build, MASTER, last success: 2012-07-22 13:36:59
On Monday 23 of July 2012, nthieb...@gmail.com wrote: Hi folks, One of you broke the build of LibreOffice with your commit :-( Please commit and push a fix ASAP! Full log available at http://tinderbox.libreoffice.org/MASTER/status.html Tinderbox info: Box name: W2008R2@16-minimal_build ... 1bdb080 'make build' again generates .msi on windows The error is: build failed - error is:: : WARNING: Source for Microsoft_VC100_CRT_x86.msm not found! ... : : *** : ERROR: msm file not found: Microsoft_VC100_CRT_x86.msm ! : in function: merge_mergemodules_into_msi_database : *** I've just noticed that since my commit this tinderbox has started failing again, but I think it's just a side effect. Looks like scp2 needs to be modified too to make this file really only optional. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gbuild deps: removed header
On Sunday 22 of July 2012, Matúš Kukan wrote: Hi all, Should gbuild dependencies survive removed header ? Something like: touch solver/*/inc/foo.h +#include foo.h e.g. in salhelper/source/condition.cxx make gb_FULLDEPS=T salhelper Now workdir/*/Dep/LinkTarget/Library/*salhelper*.d should contain foo.h So: rm solver/*/inc/foo.h -#include foo.h in salhelper/source/condition.cxx and make gb_FULLDEPS=T salhelper fails for me. Is it expected ? I thought it could work. And it does, at least here. I did not use gb_FULLDEPS=T though, if you had to use that because of --disable-dependency-tracking, maybe that is broken. But what works is if we use /home/matus/git/libo/solver/unxlngx6.pro/inc/foo.h: @true instead of just /home/matus/git/libo/solver/unxlngx6.pro/inc/foo.h: Do we want to hack contac-deps and add @true there ? No. That should not make any difference AFAIK. Your problem should be elsewhere. See also the -MP option in gcc manpage. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Tinderbox nightlies broken (was Re: No Win builds?)
On Sunday 22 of July 2012, Norbert Thiebaud wrote: ... but I used a simple grep + sed to extract INPATH= simpler and most importantly avoid using 'make' on platform for which that may not resolve to a gnumake. You forgot to tell grep what to grep for, so if anybody has updated after this, please pull again. I added the push of LibO*.zip files in push_nightlies.sh. Is there any point in uploading a .zip file with a Windows build? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gbuild deps: removed header
On 23/07/12 08:14, David Tardon wrote: On Sun, Jul 22, 2012 at 09:01:45PM +0200, Matúš Kukan wrote: But what works is if we use /home/matus/git/libo/solver/unxlngx6.pro/inc/foo.h: @true instead of just /home/matus/git/libo/solver/unxlngx6.pro/inc/foo.h: Do we want to hack contac-deps and add @true there ? Is there another option or is this just wrong ? IMHO this will cause problems for headers in solver, because a specific rule for a file overrides a pattern rule, which means that delivery of changed headers will stop working. indeed. and before you propose to add the deliver rule instead of true, note that Bjoern found out years ago that GNU make will slow down horribly with 1 explicit rules, which is why gbuild mostly uses pattern rules. the _real_ fix for this is to get rid of the silly practice of delivering header files; that way the only headers that can cause such breakage are generated (IDL) and external library headers, neither of which tend to be removed often. so we'll have to wait for the AOO rebase and then perhaps convert a few more modules, then we can move all headers around etc. Also, I am wondering, has this ever been working before ? I do not think it has. (Note that this is a problem with idl and hrc files too.) it does work for the headers that are not delivered or generated (i.e. module internal headers). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] updated tango artwork ...
On Fri, 2012-07-20 at 21:57 +0200, Bjoern Michaelsen wrote: On Thursday, 2012-07-19 17:57:49 +0100, Michael Meeks wrote: all looks good to me, though the sendmail icon is a tad cute :-) Anyhow, no cows, no dogs, no middle fingers.. have my sign-off. IANAL and trust Michael on that. Other than that looking good, pushed. Great that it made it to -3-6-0 :-) Thanks guys Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6][REVIEW 3-6-0] fdo#52232 Hidden MediaWiki options page
On 07/18/2012 02:38 PM, Stephan Bergmann wrote: This is a little embarrassing, but I just noticed that the simplified C++ configuration access, introduced into master towards LO 3.6, breaks down on localized configuration properties. The result is https://bugs.freedesktop.org/show_bug.cgi?id=52232 Hidden MediaWiki options page and the only easy fix I came up with is http://cgit.freedesktop.org/libreoffice/core/commit/?id=aebf5bf22304c73e121b16dc0b51f909c5f34c28 fdo#52232 ConfigurationSet wrapper unusable for localized properties. It bluntly reverts the adaption of the affected code to the simplified C++ configuration access. That should be enough for libreoffice-3-6 and libreoffice-3-6-0 (please review and cherry-pick accordingly, folks). For current master, I'll go back to the drawing board... Can I make some noisy advertising to get this considered for backporting? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 in LibreOffice
Hi Lubos, On Mon, 2012-07-23 at 11:04 +0200, Lubos Lunak wrote: But no doubt more work is ahead to further optimize this structure. Where's the benchmark for that? I'd like to see what difference it makes, but I cannot find anything in the blog post. Benchmark ? as in a huge sheet that performs poorly ? that's pretty easy, banal examples abound - and better data structures are at the root of fixing all of them. So - for example fill column A with 1 and copy-down =A1 from B1 to fill column B. With the planned new data structures we can slowly move this to being as instant and tiny as it deserves to be (based on the ~absence of information in the sheet) ;-) We have some huge scope for really exciting optimisations, memory improvements, efficiency wins more with this new structures, although much of the fun will come from sharing formulae, re-working the dependency logic to be based on blocks of similar formulae and other fun things :-) calc is a really fertile place to hack there, though naturally there is a -lot- of work to do yet before ScCell is dead ;-) [ assuming I managed to persuade everyone that is a good idea ;-]. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [GSoC 2012][svg export filter] Weekly Report #9
Hi everybody, unfortunately this week I have not been able to commit any new piece of code. The reason is that the analysis of the state of svg text support required more time and tests than I could believe. Rather than presenting the week activity on a daily basis, I decided to subdivide it per arguments. That lead me to write down the following document as a summary of all my tests and investigations: A survey on the state of svg text support link: https://docs.google.com/document/d/1hc-0Jh78PiVgn7vT9VRlhv9wlwkBCBqE2bN7v4Ogmhk/edit?pli=1# Before starting implementing a solution, I would like to know your thoughts on the subject. Cheers, -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gbuild deps: removed header
On 23 July 2012 11:23, Lubos Lunak l.lu...@suse.cz wrote: On Sunday 22 of July 2012, Matúš Kukan wrote: Hi all, Should gbuild dependencies survive removed header ? Something like: touch solver/*/inc/foo.h +#include foo.h e.g. in salhelper/source/condition.cxx make gb_FULLDEPS=T salhelper Now workdir/*/Dep/LinkTarget/Library/*salhelper*.d should contain foo.h So: rm solver/*/inc/foo.h -#include foo.h in salhelper/source/condition.cxx and make gb_FULLDEPS=T salhelper fails for me. Is it expected ? I thought it could work. And it does, at least here. You are lucky :-) IMHO it should not. I did not use gb_FULLDEPS=T though, if you had to use that because of --disable-dependency-tracking, maybe that is broken. I don't use --disable-dependency-tracking, so I don't need to use gb_FULLDEPS=T, I just wanted to be sure, that anybody who tries this, has deps enabled. Do we want to hack contac-deps and add @true there ? No. That should not make any difference AFAIK. Your problem should be elsewhere. See also the -MP option in gcc manpage. Well, it works but not for headers from solver/ because we use $(OUTDIR)/inc/% : $$(call gb_Deliver_deliver,$$,$$@) Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH (partial)] fdo#48549 System::Beep() removal
It'd be great to have a blanket MPL/LGPLv3+ license statement from you Mek Otar is my nickname, I will send you a license statement with my real name: Mathieu Vonlanthen. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gbuild deps: removed header
On 23 July 2012 11:37, Michael Stahl mst...@redhat.com wrote: the _real_ fix for this is to get rid of the silly practice of delivering header files; that way the only headers that can cause such breakage are generated (IDL) and external library headers, neither of which tend to be removed often. so we'll have to wait for the AOO rebase and then perhaps convert a few more modules, then we can move all headers around etc. All right, sounds like best idea to just wait. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/inc
sal/inc/rtl/string.hxx |7 ++-
sal/inc/rtl/ustring.hxx |7 ++-
2 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 8ee7c47404cdf408bcd3b6ea0267fbe54193c93f
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jul 23 12:09:12 2012 +0200
Make rtl::O[U]String::isEmpty return true bool
...instead of sal_Bool, to work around MSVC warning C4805: unsafe mix of
type
'sal_Bool' and type 'bool'.
Change-Id: Ia3477539ccc23aa9daec49d633f023d414f2b4bf
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 8c3757f..497e4e3 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -320,12 +320,9 @@ public:
@since LibreOffice 3.4
*/
-sal_Bool isEmpty() const SAL_THROW(())
+bool isEmpty() const SAL_THROW(())
{
-if ( pData-length )
-return sal_False;
-else
-return sal_True;
+return pData-length == 0;
}
/**
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index d70a43c..448f620 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -405,12 +405,9 @@ public:
@since LibreOffice 3.4
*/
-sal_Bool isEmpty() const SAL_THROW(())
+bool isEmpty() const SAL_THROW(())
{
-if ( pData-length )
-return sal_False;
-else
-return sal_True;
+return pData-length == 0;
}
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/core/data/table2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8ac1d7cc1d825e53d42aac699b077ffddb9c8769
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Jul 22 21:15:37 2012 +0200
use correct source table for cond format paste, fdo#52340
Change-Id: I7c4cb1a5f31ba9e37a280af2243a13c57914cb2f
(cherry picked from commit 669784c6653732fd2ad43024332957d5df5652bb)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 18dfda4..9dd2afb 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -658,7 +658,7 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW
nRow1, SCCOL nCol2, SCRO
ScConditionalFormatList* pOldCondFormatList =
pTable-mpCondFormatList.get();
for(SCCOL i = nCol1; i = nCol2; ++i)
{
-ScAttrIterator* pIter = aCol[i-nDx].CreateAttrIterator( nRow1-nDy,
nRow2-nDy );
+ScAttrIterator* pIter = pTable-aCol[i-nDx].CreateAttrIterator(
nRow1-nDy, nRow2-nDy );
SCROW nStartRow = 0, nEndRow = 0;
const ScPatternAttr* pPattern = pIter-Next( nStartRow, nEndRow );
sal_uInt32 nId =
((SfxUInt32Item)pPattern-GetItem(ATTR_CONDITIONAL)).GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6][REVIEW 3-6-0] fix for fdo#52340, use correct table for conditional format paste
Hi Markus, On Monday, 2012-07-23 11:22:20 +0200, Markus Mohrhard wrote: [1] fixes several problems around conditional format paste. Perfect ;-) Pushed to 3-6 with http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=8ac1d7cc1d825e53d42aac699b077ffddb9c8769 Two more reviews needed for 3-6-0 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpDYPGpZjQoV.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Tinderbox nightlies broken (was Re: No Win builds?)
On 22/07/12 16:36, Lubos Lunak wrote: There was one more thing broken. The recent changes to get dev-install working changed the package format built in the 'build' target to .zip, so there was no .msi package to upload. I've reverted that change and moved the FORCE2ARCHIVE part to dev-install, oh i didn't notice that FORCE2ARCHIVE would prevent MSI from being built, but looking at the actual instsetoo_native/util/makefile.mk it overrides PKGFORMAT, so it's not a surprise :) if we want to build a MSI anyway, then building the archive in dev-install makes a lot of sense. but this whole 'build' target looks broken to me. What's the point of building a .msi archive there? Especially now with dev-install that looks completely pointless and it should have its own target. build should build the install set(s) that the user has told configure to build with the --with-package-format option. apparently that defaults to nothing for Linux and to MSI for WNT. for building everything except instset there is already a build-packimages target. Does somebody understand this perl install cruft? i, for one, certainly don't. which is why i've implemented dev-install with FORCE2ARCHIVE, after finding that modifying ooinstall to call the installer with --format=installed didn't yield success. On 23/07/12 11:30, Lubos Lunak wrote: On Sunday 22 of July 2012, Norbert Thiebaud wrote: I added the push of LibO*.zip files in push_nightlies.sh. Is there any point in uploading a .zip file with a Windows build? that's a good question, it depends on what you want to test; for testing office functionality it's probably easier to use zips because they're trivial to install (just unzip) and use a private profile directory automatically, but they don't have bundled MSVC runtimes or system integration so you can't test that ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Memory options defaults
On Fri, 2012-07-20 at 22:35 -0300, Olivier Hallot wrote: Someone from the Brazilian users list raised an issue about the current memory defaults we carry in our age-old options. He argues that the current values were set when computers were short on GBytes, which is not the case anymore actually. Heh ;-) He also claims that there are better figures to put that improves LO performance, and those figures should be a function of the amount of RAM available. There is an urban myth that those figures improve startup performance based on horribly inaccurate profiling of cold vs. warm start. Of course, it is possible that increasing these numbers may help in some cases. Having said that - the graphics caching is itself -utterly -utterly- broken and the image lifecycle is busted beyond belief as is visible in numerous comments through the code and a tracker bug here: https://bugs.freedesktop.org/show_bug.cgi?id=47148 Tracks that I guess; we need to fix it - images should be immutable and managed with a hard lifecycle mechanism such as a reference count that cannot be screwed up; the current attempt at a unique / hashed string / path and manual lifecycle management is broken. Images' source should not be documents that go away and/or are over-written, autosave should not impact your likelihood of loosing images etc. etc. ;-) As it is, when we save / load (IIRC) writer forces images out of the cache anyway and then brings them back in; so basically the whole thing is busted - and these tweak-ables are pretty horrific too ;-) Does it worth to review our memory figures? Come up with a patch get it reviewed I guess. I imagine you have a good feel for how much is useful. Be aware that if we wander into using swap for our 'cache' we will quite possibly make everything way slower than having no cache ;-) Ideally - we'd find time to fix the whole image story - sadly that means passing some new XFoo through innumerable UNO interfaces instead of string image names which is one factor making it harder to re-factor. ATB, 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 (partial)] Writer autocompletion feature
Hi Nico, So - firstly, thanks for your work - it's great to have an improved structure for the autocompletion data; as you say there are a number of nasty performance problems self-inflicted wounds there. On Sat, 2012-07-21 at 00:39 +, Nico Weyand wrote: Well, in that case, I'm officially stating that the code I've committed (and all future code I am going to commit) may be used under LGPLv3+ (If I've understood it correctly, only one of both the licenses you named is required and I do prefer LGPL over MPL). We require a dual license: MPL/LGPLv3+ statement. We understand if you don't want to make that, but then including this one change has a big impact on the licensing of our code base. The ideal is to get a clean blanket statement (as above) and link you into: http://wiki.documentfoundation.org/Development/Developers Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
gbuild: fix dep target dependencies
From Matúš Kukan matus.ku...@gmail.com: Matúš Kukan has abandoned this change. Change subject: gbuild: fix dep target dependencies .. Patch Set 1: Abandoned Does not fix anything wrong and causes regression. -- To view, visit https://gerrit.libreoffice.org/340 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ia302715b1187f281675d063ae9bdb80b316bfdb0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: config_host.mk.in configure.in
config_host.mk.in |1 + configure.in |7 +++ 2 files changed, 8 insertions(+) New commits: commit ed8cb1ae0ff1537d2885c2d3cde50a2b6dd4a29d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jul 23 12:50:21 2012 +0200 Check for uuidgen and for winegcc Change-Id: I38c92dad50fd13dcd32a07feed860eb60349c080 diff --git a/config_host.mk.in b/config_host.mk.in index 5e24730..f28c03b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -565,6 +565,7 @@ export VISIO_LIBS=@VISIO_LIBS@ export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@ export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@ export WINDRES=@WINDRES@ +export WINEGCC=@WINEGCC@ export WITHOUT_AFMS=@WITHOUT_AFMS@ export WITHOUT_PPDS=@WITHOUT_PPDS@ export WITH_AGFA_MONOTYPE_FONTS=@WITH_AGFA_MONOTYPE_FONTS@ diff --git a/configure.in b/configure.in index 980a2fb..27c63c1 100644 --- a/configure.in +++ b/configure.in @@ -74,6 +74,8 @@ else fi AC_SUBST(CROSS_COMPILING) +AC_PATH_PROG(WINEGCC, winegcc) + AC_PROG_EGREP # AC_PROG_EGREP doesn't set GREP on all systems as well AC_PATH_PROG(GREP, grep) @@ -8571,6 +8573,11 @@ if test $_os = WINNT; then UUIDGEN=uuidgen.exe AC_SUBST(UUIDGEN) fi +else +AC_PATH_PROG([UUIDGEN], [uuidgen]) +if test -z $UUIDGEN; then +AC_MSG_WARN([uuid is needed for dev-install]) +fi fi dnl = ___ 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 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on||51659 --- Comment #49 from Petr Mladek pmla...@suse.cz 2012-07-23 10:54:58 PDT --- Add 51659: Letter Wizard leaves LO in a strange semi-crashed state. -- 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
[REVIEW 3-6-0] fix for fdo#52340, use correct table for conditional format paste
On Mon, 2012-07-23 at 12:17 +0200, Eike Rathke wrote: [1] fixes several problems around conditional format paste. Perfect ;-) Pushed to 3-6 with http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=8ac1d7cc1d825e53d42aac699b077ffddb9c8769 You have a +1 from me also; only one more required. Thanks ! :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: git branch audit ...
On Fri, 2012-07-20 at 17:03 +0100, Michael Meeks wrote: On Thu, 2012-07-19 at 11:36 +0100, Caolán McNamara wrote: On Wed, 2012-07-18 at 17:51 +0100, Michael Meeks wrote: origin/feature/cmclayouttrans A work in progress, to munge translating .ui files into our localization mechanism. Extraction of translatables done, re-insertion still a to-do :-) Gosh - does that mean that cmclayout got merged to master ? or is it just renamed somehow ? I didn't see that, and the branch appears not to be there anymore. What's up there ? merged into cmclayouttrans C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - i18npool/source
i18npool/source/localedata/data/de_AT.xml |1 +
i18npool/source/localedata/data/de_CH.xml |1 +
i18npool/source/localedata/data/de_LI.xml |1 +
i18npool/source/localedata/data/de_LU.xml |1 +
4 files changed, 4 insertions(+)
New commits:
commit 04f857bc7596ba13cb2dc4a74f77aa1822575f04
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 20 17:51:39 2012 +0200
fdo#52240 added abbreviated date acceptance patterns for [de-{AT,CH,LI,LU}]
Change-Id: I589cedcd2db0208b03d1e28babbb493912f20c78
(cherry picked from commit 41306f222d7f3aa3fedcd2a9a91fd7558449a24e)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/i18npool/source/localedata/data/de_AT.xml
b/i18npool/source/localedata/data/de_AT.xml
index dde647e..69e93fc 100644
--- a/i18npool/source/localedata/data/de_AT.xml
+++ b/i18npool/source/localedata/data/de_AT.xml
@@ -35,6 +35,7 @@
MeasurementSystemmetric/MeasurementSystem
/LC_CTYPE
LC_FORMAT
+DateAcceptancePatternD.M./DateAcceptancePattern
FormatElement msgid=FixedFormatskey1 default=true type=medium
usage=FIXED_NUMBER formatindex=0
FormatCodeStandard/FormatCode
/FormatElement
diff --git a/i18npool/source/localedata/data/de_CH.xml
b/i18npool/source/localedata/data/de_CH.xml
index 7349e04..772e004 100644
--- a/i18npool/source/localedata/data/de_CH.xml
+++ b/i18npool/source/localedata/data/de_CH.xml
@@ -38,6 +38,7 @@
MeasurementSystemmetric/MeasurementSystem
/LC_CTYPE
LC_FORMAT
+DateAcceptancePatternD.M./DateAcceptancePattern
FormatElement msgid=FixedFormatskey1 default=true type=medium
usage=FIXED_NUMBER formatindex=0
FormatCodeStandard/FormatCode
/FormatElement
diff --git a/i18npool/source/localedata/data/de_LI.xml
b/i18npool/source/localedata/data/de_LI.xml
index 6e320b1..4abcc9e 100644
--- a/i18npool/source/localedata/data/de_LI.xml
+++ b/i18npool/source/localedata/data/de_LI.xml
@@ -35,6 +35,7 @@
MeasurementSystemmetric/MeasurementSystem
/LC_CTYPE
LC_FORMAT
+DateAcceptancePatternD.M./DateAcceptancePattern
FormatElement msgid=FixedFormatskey1 default=true type=medium
usage=FIXED_NUMBER formatindex=0
FormatCodeStandard/FormatCode
/FormatElement
diff --git a/i18npool/source/localedata/data/de_LU.xml
b/i18npool/source/localedata/data/de_LU.xml
index dc733c2..69a50bd 100644
--- a/i18npool/source/localedata/data/de_LU.xml
+++ b/i18npool/source/localedata/data/de_LU.xml
@@ -35,6 +35,7 @@
MeasurementSystemmetric/MeasurementSystem
/LC_CTYPE
LC_FORMAT
+DateAcceptancePatternD.M./DateAcceptancePattern
FormatElement msgid=FixedFormatskey1 default=true type=medium
usage=FIXED_NUMBER formatindex=0
FormatCodeStandard/FormatCode
/FormatElement
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6][PUSHED 3-6-0] fdo#52240 added abbreviated date acceptance patterns for [de-{AT,CH,LI,LU}]
On Fri, 2012-07-20 at 18:27 +0200, Markus Mohrhard wrote: Hey, 2012/7/20 Eike Rathke er...@redhat.com: Hi, Please review and cherry-pick to 3-6 and 3-6-0 the no-brainer http://cgit.freedesktop.org/libreoffice/core/commit/?id=d0d840c27943f976fd59a673f2de84a10ea475c9 Looks good. Pushed into 3-6. Two more reviews needed for 3-6-0. in 3-6 and 3-6-0 now. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/inc/treeopt.hxx |9 -
cui/source/options/treeopt.cxx | 318 +
2 files changed, 175 insertions(+), 152 deletions(-)
New commits:
commit 10ae81acb68ba6e03cfe8907d8a0a1ea33067376
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 18 14:00:57 2012 +0200
fdo#52232 ConfigurationSet wrapper unusable for localized properties
The comphelper::ConfigurationSet wrapper, used by the automatically
generated
headers to access the configuration data from C++, is based on
com.sun.star.configuration.ReadOnlyAccess/ReadWriteAcess that provide an
all-
locales view of the configuration data, i.e., a localized property is
represented as a UNO object implementing various container interfaces (to
access the per-locale values) instead of a plain value.
Hence,
xLeaveAccess-getByName(C2U(Label)) = sLeafLabel;
silently changed its meaning, now silently failing to extract a string and
leaving sLeafLabel empty, which in turn causes the labels of extension
option
pages to disappear from the Tools - Options... dialog.
This partially reverts commit 161c3f179f71eda2a32dabaf68ff6fb3ba487062 Some
more comphelper/configurationhelper clean up.
Change-Id: I584c682ea6a7c8b9444b34f1867cc553ad160802
(cherry picked from commit aebf5bf22304c73e121b16dc0b51f909c5f34c28)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 38700e6..64d2b9b 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -138,6 +138,7 @@ struct LastPageSaver
// class OfaTreeOptionsDialog
namespace com { namespace sun { namespace star { namespace frame { class
XFrame; } } } }
+namespace com { namespace sun { namespace star { namespace container { class
XNameAccess; } } } }
namespace com { namespace sun { namespace star { namespace lang { class
XMultiServiceFactory; } } } }
namespace com { namespace sun { namespace star { namespace awt { class
XContainerWindowProvider; } } } }
@@ -191,8 +192,12 @@ private:
com::sun::star::lang::XMultiServiceFactory xMFac,
const com::sun::star::uno::Reference
com::sun::star::frame::XFrame
xFrame );
-Module* LoadModule( const rtl::OUString rModuleIdentifier );
-voidLoadNodes( Module* pModule,
+Module* LoadModule( const rtl::OUString rModuleIdentifier,
+const com::sun::star::uno::Reference
+com::sun::star::container::XNameAccess
xRoot );
+voidLoadNodes( const com::sun::star::uno::Reference
+com::sun::star::container::XNameAccess
xRoot,
+ Module* pModule,
const rtl::OUString rExtensionId,
VectorOfNodes rOutNodeList );
voidInsertNodes( const VectorOfNodes rNodeList );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 95a52c6..66c7b47 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -67,11 +67,11 @@
#include com/sun/star/frame/XModuleManager.hpp
#include com/sun/star/loader/CannotActivateFactoryException.hpp
#include com/sun/star/util/XMacroExpander.hpp
+#include comphelper/configurationhelper.hxx
#include comphelper/processfactory.hxx
#include editeng/optitems.hxx
#include editeng/unolingu.hxx
#include linguistic/misc.hxx
-#include officecfg/Office/OptionsDialog.hxx
#include osl/module.hxx
#include osl/process.h
#include rtl/bootstrap.hxx
@@ -1995,12 +1995,18 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const
rtl::OUString rExtension
{
Module* pModule = NULL;
Reference XMultiServiceFactory xMSFac =
comphelper::getProcessServiceFactory();
+// open optionsdialog.xcu
+Reference XNameAccess xRoot(
+::comphelper::ConfigurationHelper::openConfig(
+xMSFac, C2U(org.openoffice.Office.OptionsDialog),
+::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
+DBG_ASSERT( xRoot.is(), OfaTreeOptionsDialog::LoadExtensionOptions(): no
config );
// when called by Tools - Options then load nodes of active module
if ( rExtensionId.isEmpty() )
-pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference XFrame
() ) );
+pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference XFrame
() ), xRoot );
VectorOfNodes aNodeList;
-LoadNodes( pModule, rExtensionId, aNodeList );
+LoadNodes( xRoot, pModule, rExtensionId, aNodeList );
InsertNodes( aNodeList );
}
@@ -2039,58 +2045,64 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier(
}
Module*
Re: [PUSHED 3-6][REVIEW 3-6-0 1/3] fdo#52232 Hidden MediaWiki options page
On Mon, 2012-07-23 at 11:47 +0200, Stephan Bergmann wrote: On 07/18/2012 02:38 PM, Stephan Bergmann wrote: This is a little embarrassing, but I just noticed that the simplified C++ configuration access, introduced into master towards LO 3.6, breaks down on localized configuration properties. The result is https://bugs.freedesktop.org/show_bug.cgi?id=52232 Hidden MediaWiki options page and the only easy fix I came up with is http://cgit.freedesktop.org/libreoffice/core/commit/?id=aebf5bf22304c73e121b16dc0b51f909c5f34c28 fdo#52232 ConfigurationSet wrapper unusable for localized properties. It bluntly reverts the adaption of the affected code to the simplified C++ configuration access. That should be enough for libreoffice-3-6 and libreoffice-3-6-0 (please review and cherry-pick accordingly, folks). For current master, I'll go back to the drawing board... Can I make some noisy advertising to get this considered for backporting? Pushed to 3-6. Need +2 for 3-6-0 IIRC C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - svx/inc svx/source sw/source unusedcode.easy
svx/inc/svx/gallery1.hxx |3 -
svx/source/gallery2/gallery1.cxx | 26 --
sw/source/filter/ww8/ww8par.hxx | 16
sw/source/filter/ww8/ww8par5.cxx | 26 +++---
unusedcode.easy | 72 ---
5 files changed, 22 insertions(+), 121 deletions(-)
New commits:
commit 84546683fd91ca211063f7ee39df96958ede9041
Author: Kristian Rietveld k...@lanedo.com
Date: Sun Jul 22 11:19:28 2012 +0200
Rename FieldEntry to WW8FieldEntry
When compiled with Clang on OS X, the OS X dynamic linker appears to be
confused about which FieldEntry destructor to call at runtime. In some
cases, the FieldEntry destructor in register/source/reflwrit.cxx is
called instead (both destructors have the same symbol name). This patch
avoids this problem.
Change-Id: I7d69894318cb8fda0a7c5a9b1c2ff3ca0d47a37c
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index dde6d15..9215369 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -456,7 +456,7 @@ namespace sw
}
}
-class FieldEntry
+class WW8FieldEntry
{
private:
::rtl::OUString msBookmarkName;
@@ -468,10 +468,10 @@ class FieldEntry
sw::hack::Position maStartPos;
sal_uInt16 mnFieldId;
sal_uLong mnObjLocFc;
-FieldEntry(SwPosition rPos, sal_uInt16 nFieldId) throw();
-FieldEntry(const FieldEntry rOther) throw();
-FieldEntry operator=(const FieldEntry rOther) throw();
-void Swap(FieldEntry rOther) throw();
+WW8FieldEntry(SwPosition rPos, sal_uInt16 nFieldId) throw();
+WW8FieldEntry(const WW8FieldEntry rOther) throw();
+WW8FieldEntry operator=(const WW8FieldEntry rOther) throw();
+void Swap(WW8FieldEntry rOther) throw();
SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); };
xub_StrLen GetPtCntnt() { return maStartPos.GetPtCntnt(); };
@@ -494,7 +494,7 @@ private:
WW8PLCFxSaveAll maPLCFxSave;
SwPosition maTmpPos;
std::dequebool maOldApos;
-std::dequeFieldEntry maOldFieldStack;
+std::dequeWW8FieldEntry maOldFieldStack;
SwWW8FltControlStack* mpOldStck;
SwWW8FltAnchorStack* mpOldAnchorStck;
sw::util::RedlineStack *mpOldRedlines;
@@ -985,8 +985,8 @@ private:
where the end point will fall, to do so fully correctly duplicates the
main logic of the filter itself.
*/
-std::dequeFieldEntry maFieldStack;
-typedef std::dequeFieldEntry::const_iterator mycFieldIter;
+std::dequeWW8FieldEntry maFieldStack;
+typedef std::dequeWW8FieldEntry::const_iterator mycFieldIter;
/*
A stack of open footnotes. Should only be one in it at any time.
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index bffc240..412fb14 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -413,7 +413,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
SwPosition aStart(*pPaM-GetPoint());
if (!maFieldStack.empty())
{
-const FieldEntry rTest = maFieldStack.back();
+const WW8FieldEntry rTest = maFieldStack.back();
aStart = rTest.maStartPos;
}
@@ -826,56 +826,56 @@ bool AcceptableNestedField(sal_uInt16 nFieldCode)
}
}
-FieldEntry::FieldEntry(SwPosition rPos, sal_uInt16 nFieldId) throw()
+WW8FieldEntry::WW8FieldEntry(SwPosition rPos, sal_uInt16 nFieldId) throw()
: maStartPos(rPos), mnFieldId(nFieldId), mnObjLocFc(0)
{
}
-FieldEntry::FieldEntry(const FieldEntry rOther) throw()
+WW8FieldEntry::WW8FieldEntry(const WW8FieldEntry rOther) throw()
: maStartPos(rOther.maStartPos), mnFieldId(rOther.mnFieldId),
mnObjLocFc(rOther.mnObjLocFc)
{
}
-void FieldEntry::Swap(FieldEntry rOther) throw()
+void WW8FieldEntry::Swap(WW8FieldEntry rOther) throw()
{
std::swap(maStartPos, rOther.maStartPos);
std::swap(mnFieldId, rOther.mnFieldId);
}
-FieldEntry FieldEntry::operator=(const FieldEntry rOther) throw()
+WW8FieldEntry WW8FieldEntry::operator=(const WW8FieldEntry rOther) throw()
{
-FieldEntry aTemp(rOther);
+WW8FieldEntry aTemp(rOther);
Swap(aTemp);
return *this;
}
-::rtl::OUString FieldEntry::GetBookmarkName()
+::rtl::OUString WW8FieldEntry::GetBookmarkName()
{
return msBookmarkName;
}
-::rtl::OUString FieldEntry::GetBookmarkCode()
+::rtl::OUString WW8FieldEntry::GetBookmarkCode()
{
return msMarkCode;
}
-void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName)
+void WW8FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName)
{
msBookmarkName=bookmarkName;
}
-void FieldEntry::SetBookmarkType(::rtl::OUString bookmarkType)
+void WW8FieldEntry::SetBookmarkType(::rtl::OUString bookmarkType)
{
msMarkType=bookmarkType;
}
-void FieldEntry::SetBookmarkCode(::rtl::OUString bookmarkCode)
+void WW8FieldEntry::SetBookmarkCode(::rtl::OUString
[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx | 18 --
binfilter/inc/bf_svx/svdmrkv.hxx |2 --
2 files changed, 20 deletions(-)
New commits:
commit 90eb42254e0300bad08d8a5d1d205f2ef777dbaf
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 23 08:22:13 2012 +0100
callcatcher: SdrMarkView::GetMarkedObjRect freshly unused
since 24f44a91db4db8b67045c5cd98a6537ae7c7c5f5
Change-Id: I737acb7866f8fb424bf7968451ff8e986ed3acee
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
index fbf5d3c..a3f0c43 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
@@ -381,24 +381,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ const Rectangle SdrMarkView::GetMarkedObjRect() const
-/*N*/ {
-/*N*/ if (bMarkedObjRectDirty) {
-/*N*/ ((SdrMarkView*)this)-bMarkedObjRectDirty=FALSE;
-/*N*/ Rectangle aRect;
-/*N*/ for (ULONG nm=0; nmaMark.GetMarkCount(); nm++) {
-/*?*/ SdrMark* pM=aMark.GetMark(nm);
-/*?*/ SdrObject* pO=pM-GetObj();
-/*?*/ Rectangle aR1(pO-GetSnapRect());
-/*?*/ aR1+=pM-GetPageView()-GetOffset();
-/*?*/ if (aRect.IsEmpty()) aRect=aR1;
-/*?*/ else aRect.Union(aR1);
-/*N*/ }
-/*N*/ ((SdrMarkView*)this)-aMarkedObjRect=aRect;
-/*N*/ }
-/*N*/ return aMarkedObjRect;
-/*N*/ }
-
/*N*/ void SdrMarkView::MarkListHasChanged()
diff --git a/binfilter/inc/bf_svx/svdmrkv.hxx b/binfilter/inc/bf_svx/svdmrkv.hxx
index e31363f..91bf900 100644
--- a/binfilter/inc/bf_svx/svdmrkv.hxx
+++ b/binfilter/inc/bf_svx/svdmrkv.hxx
@@ -241,8 +241,6 @@ public:
// Der Zweck ist, unnoetiges Flackern zu vermeiden. - Funkt noch nich,
deshalb TRUE!
void AdjustMarkHdl(BOOL bRestraintPaint=TRUE);
-const Rectangle GetMarkedObjRect() const; // SnapRects der Objekte, ohne
Strichstaerke
-
// Wird immer dann gerufen, wenn sich die Liste der markierten Objekte
// moeglicherweise geaendert hat. Wer ueberlaed muss unbedingt auch die
// Methode der Basisklasse rufen!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6-0] fdo#52232 Hidden MediaWiki options page
On Mon, 2012-07-23 at 12:42 +0100, Caolán McNamara wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=aebf5bf22304c73e121b16dc0b51f909c5f34c28 fdo#52232 ConfigurationSet wrapper unusable for localized properties. It bluntly reverts the adaption of the affected code to the simplified C++ configuration access. Pushed to 3-6. Need +2 for 3-6-0 IIRC And now I read it properly - it's affects just the cui code, not configmgr itself ;-) so - it seems reasonable for 3.6.0, you have my +1 - one more needed. 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] .: configure.in cross_toolset/prj setup_native/prj setup_native/source
configure.in |2 - cross_toolset/prj/build.lst|2 - setup_native/prj/build.lst |5 ++ setup_native/source/win32/wintools/makecab/makefile.mk | 32 + setup_native/source/win32/wintools/msidb/makefile.mk | 32 + setup_native/source/win32/wintools/msiinfo/makefile.mk | 32 + setup_native/source/win32/wintools/msimsp/makefile.mk | 32 + setup_native/source/win32/wintools/msitran/makefile.mk | 32 + 8 files changed, 167 insertions(+), 2 deletions(-) New commits: commit 4e7cfbfaedc747a9c7bfabf891897d36b741a765 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jul 23 14:06:02 2012 +0200 Eventually build the lanedo msi* tools soon Change-Id: Ie8174ae4b7d2c02503f40fe1263076d924f2c9e2 diff --git a/configure.in b/configure.in index 27c63c1..7a0ec39 100644 --- a/configure.in +++ b/configure.in @@ -8562,7 +8562,7 @@ AC_SUBST(WINDOWS_SDK_HOME) dnl = dnl Check for uuidgen dnl = -if test $_os = WINNT; then +if test $_os = WINNT -a $cross_compiling != yes; then if test $WITH_MINGW = yes; then AC_PATH_PROG([UUIDGEN], [uuid]) if test -z $UUIDGEN; then diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst index 4346a83..2883e64 100644 --- a/cross_toolset/prj/build.lst +++ b/cross_toolset/prj/build.lst @@ -1 +1 @@ -crscross_toolset :: autodoc cross_tail_build NULL +crscross_toolset :: autodoc setup_native cross_tail_build NULL diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index d8ebf59..fbdbb4f 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -16,3 +16,8 @@ pk setup_native\source\win32\customactions\shellextensions nmake - w sn_sh pk setup_native\source\win32\customactions\indexingfilter nmake - w sn_indexingfilter NULL pk setup_native\source\win32\customactions\languagepacks nmake - w sn_languagepacks sn_shellextensions.w sn_tools.w NULL pk setup_native\source\win32\customactions\patch nmake - w sn_patch sn_languagepacks.w sn_shellextensions.w sn_quickstarter.w sn_tools.w NULL +pk setup_native\source\win32\wintools\makecabnmake - u sn_makecab NULL +pk setup_native\source\win32\wintools\msidb nmake - u sn_msidb NULL +pk setup_native\source\win32\wintools\msiinfonmake - u sn_msiinfo NULL +pk setup_native\source\win32\wintools\msimsp nmake - u sn_msimsp NULL +pk setup_native\source\win32\wintools\msitrannmake - u sn_msitrans NULL diff --git a/setup_native/source/win32/wintools/makecab/makefile.mk b/setup_native/source/win32/wintools/makecab/makefile.mk new file mode 100644 index 000..c8fee10 --- /dev/null +++ b/setup_native/source/win32/wintools/makecab/makefile.mk @@ -0,0 +1,32 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRJ=..$/..$/..$/.. +PRJNAME=setup_native +TARGET=sn_makecab + + +# --- Settings - + +.INCLUDE : settings.mk + +# --- Files + +.IF $(WINEGCC)== +@all: +@echo No winegcc present, not building makecab... +.ELSE +@all: +@echo Not building makecab yet, stay tuned... +.ENDIF + +# --- Targets -- + +.INCLUDE : target.mk + +# - diff --git a/setup_native/source/win32/wintools/msidb/makefile.mk b/setup_native/source/win32/wintools/msidb/makefile.mk new file mode 100644 index 000..2bb31bc --- /dev/null +++ b/setup_native/source/win32/wintools/msidb/makefile.mk @@ -0,0 +1,32 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRJ=..$/..$/..$/.. +PRJNAME=setup_native +TARGET=sn_msidb + + +# --- Settings - + +.INCLUDE : settings.mk + +# --- Files + +.IF $(WINEGCC)== +@all: +@echo No winegcc present, not building msidb... +.ELSE +@all: +@echo Not building msidb yet, stay tuned... +.ENDIF + +# --- Targets -- + +.INCLUDE : target.mk + +# - diff --git
[Libreoffice-commits] .: 2 commits - configure.in cppu/source stoc/source
configure.in| 10 ++
cppu/source/uno/lbenv.cxx |4
stoc/source/invocation_adapterfactory/iafactory.cxx |2 ++
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 4b5f1d7b2d095e4b41434658b376b6de422bf573
Author: Tor Lillqvist t...@iki.fi
Date: Mon Jul 23 14:51:53 2012 +0300
WaE: unused variable
Change-Id: Ie355701716c7106ef2afd76ae8b6544a00ac474c
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 377b20b..ef37aee 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -190,6 +190,10 @@ inline void ObjectEntry::append(
::std::pair Ptr2ObjectMap::iterator, bool insertion(
pEnv-aPtr2ObjectMap.insert( Ptr2ObjectMap::value_type(
pInterface, this ) ) );
+// No idea if the code above has side-effects and can't be just
+// bypassed in the no-OSL_ASSERT case, so avoid unused variable like
this instead.
+(void) insertion;
+
OSL_ASSERT( insertion.second ||
(find( pInterface, 0 ) = 0
// points to the same object entry:
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 02f715b..72a880a 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -863,6 +863,8 @@ Reference XInterface FactoryImpl::createAdapter(
{
pair t_ptr_set::iterator, bool insertion(
adapter_set-insert( pNew ) );
+// Avoid unused variable warning
+(void) insertion;
OSL_ASSERT( insertion.second );
that = pNew;
}
commit 9d1263d108244c172e682624557ca4d23ddfcd10
Author: Tor Lillqvist t...@iki.fi
Date: Mon Jul 16 21:40:11 2012 +0300
Use xcode-select -print-path for 10.6 and 10.7 SDKs
Change-Id: I79d71c682c07f49b70c6791953c000868bf65cd9
diff --git a/configure.in b/configure.in
index 7a0ec39..783520f 100644
--- a/configure.in
+++ b/configure.in
@@ -2443,19 +2443,13 @@ if test $_os = Darwin; then
echo Building with a SDK 10.4 is experimental warn
;;
10.6)
-MACOSX_SDK_PATH=/Developer/SDKs/MacOSX10.6.sdk
-if test ! -d $MACOSX_SDK_PATH; then
-
MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
-fi
+MACOSX_SDK_PATH=`xcode-select
-print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
macosx_sdk_value=1060
AC_MSG_WARN([Building with a SDK 10.4 is experimental])
echo Building with a SDK 10.4 is experimental warn
;;
10.7)
-MACOSX_SDK_PATH=/Developer/SDKs/MacOSX10.7.sdk
-if test ! -d $MACOSX_SDK_PATH; then
-
MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
-fi
+MACOSX_SDK_PATH=`xcode-select
-print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
macosx_sdk_value=1070
AC_MSG_WARN([Building with SDK 10.7 is known to fail in vcl])
echo Building with SDK 10.7 is known to fail in vcl warn
___
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 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on||52340 --- Comment #50 from Petr Mladek pmla...@suse.cz 2012-07-23 12:34:10 PDT --- (In reply to comment #48) Add Bug 52340 - EDITING: CRASH when Copy+Paste row with conditional formatting to other sheet and back to inserted row; Crash with often used operation. Really added :-) -- 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 - cairo/cairo config_host.mk.in configure.in
cairo/cairo/makefile.mk |2 +- config_host.mk.in |1 + configure.in| 11 ++- 3 files changed, 8 insertions(+), 6 deletions(-) New commits: commit 8f8edfe737427880dfcee7296186d449f243c5d8 Author: Tor Lillqvist t...@iki.fi Date: Mon Jul 23 15:27:04 2012 +0300 ATSUI is not present in the 10.7 SDK even if one builds for 10.6 or earlier So use the avoid-ATSUI patch dependingh on (the newly added) MAXOSX_SDK_VERSION, not MAC_OS_X_VERSION_MAX_ALLOWED. It is not clear (to me at least) whether for instance building against SDK version 10.7 but with MAC_OS_X_VERSION_MAX_ALLOWED=1060 ensures the resulting binaries actually work on 10.6. Somebody should check. If it doesn't work, we should add a check to configure.in that the min-required and max-allowed values are not less than the SDK version. (If it would work even for MAC_OS_X_VERSION_MAX_ALLOWED=1040, we would not need to require the increasingly obsolete Xcode 3 and 10.4 SDK for official builds.) Change-Id: Ia7088a26024ed288db55fa734465138d44d2ae12 diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 43f7b8f..2b079d0 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -119,7 +119,7 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) .ENDIF # $(SYSBASE)!= CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . .$/configure -.IF $(MAC_OS_X_VERSION_MIN_REQUIRED) = 1070 +.IF $(MACOSX_SDK_VERSION) = 1070 PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch .ENDIF CONFIGURE_FLAGS=--enable-static=no --disable-valgrind --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) commit a34126985b7b9fdb86f1bd134332b203b2d1a256 Author: Tor Lillqvist t...@iki.fi Date: Mon Jul 23 15:21:52 2012 +0300 Propagate also the OS X SDK version we are building against to the environment Change-Id: I3c1137bdb1186df773a92c34267b2324ad43ae7e diff --git a/config_host.mk.in b/config_host.mk.in index f28c03b..b335325 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -293,6 +293,7 @@ export MANDIR=@MANDIR@ export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@ export MACOSX_DEPLOYMENT_TARGET_FOR_BUILD=@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@ export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@ +export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@ export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@ export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@ export MDDS_CPPFLAGS=@MDDS_CPPFLAGS@ diff --git a/configure.in b/configure.in index 783520f..1006d37 100644 --- a/configure.in +++ b/configure.in @@ -2428,7 +2428,7 @@ if test $_os = Darwin; then if test ! -d $MACOSX_SDK_PATH; then MACOSX_SDK_PATH=/Xcode3/SDKs/MacOSX10.4u.sdk fi -macosx_sdk_value=1040 +MACOSX_SDK_VERSION=1040 ;; 10.5) MACOSX_SDK_PATH=/Developer/SDKs/MacOSX10.5.sdk @@ -2438,19 +2438,19 @@ if test $_os = Darwin; then if test ! -d $MACOSX_SDK_PATH; then MACOSX_SDK_PATH=/Xcode3/SDKs/MacOSX10.5.sdk fi -macosx_sdk_value=1050 +MACOSX_SDK_VERSION=1050 AC_MSG_WARN([Building with a SDK 10.4 is experimental]) echo Building with a SDK 10.4 is experimental warn ;; 10.6) MACOSX_SDK_PATH=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk -macosx_sdk_value=1060 +MACOSX_SDK_VERSION=1060 AC_MSG_WARN([Building with a SDK 10.4 is experimental]) echo Building with a SDK 10.4 is experimental warn ;; 10.7) MACOSX_SDK_PATH=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -macosx_sdk_value=1070 +MACOSX_SDK_VERSION=1070 AC_MSG_WARN([Building with SDK 10.7 is known to fail in vcl]) echo Building with SDK 10.7 is known to fail in vcl warn ;; @@ -2531,7 +2531,7 @@ if test $_os = Darwin; then fi AC_MSG_CHECKING([that macosx-version-max-allowed is coherent macos-with-sdk]) -if test $MAC_OS_X_VERSION_MAX_ALLOWED -gt $macosx_sdk_value; then +if test $MAC_OS_X_VERSION_MAX_ALLOWED -gt $MACOSX_SDK_VERSION; then AC_MSG_ERROR([the version maximum allowed cannot be greater thatn the sdk level]) else AC_MSG_RESULT([ok]) @@ -2541,6 +2541,7 @@ if test $_os = Darwin; then fi AC_SUBST(FRAMEWORKSHOME) AC_SUBST(MACOSX_SDK_PATH) +AC_SUBST(MACOSX_SDK_VERSION) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED) AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] .: sw/source
sw/source/core/layout/paintfrm.cxx | 39 -
1 file changed, 26 insertions(+), 13 deletions(-)
New commits:
commit 02e80d2e431a57ad775a674eb3cfcd6cec53e09f
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 23 14:24:31 2012 +0200
fdo#39812: Writer: fix collapsing merged table border painting:
Create a table with a merged cell like in the screenshot in the
bug, with a SAL_DEBUG in SwTabFrmPainter::PaintLines the following
lines are painted:
debug: paint start
1 debug: start: 2749,1488 end: 12387,1488
2 debug: start: 2749,1945 end: 7567,1945
3 debug: start: 7567,1945 end: 12387,1945
4 debug: start: 2749,2015 end: 12387,2015
5 debug: start: 2749,2542 end: 7567,2542
6 debug: start: 7567,2542 end: 12387,2542
7 debug: start: 2749,1488 end: 2749,1945
8 debug: start: 2749,1945 end: 2749,2015
9 debug: start: 2749,2015 end: 2749,2542
A debug: start: 7567,1945 end: 7567,2542
B debug: start: 12387,1488 end: 12387,1945
C debug: start: 12387,1945 end: 12387,2015
D debug: start: 12387,2015 end: 12387,2542
debug: paint end
*1*1*
7 B
7 B
*2*3*
8 A C
*4*4*
9 A D
9 A D
*5*6*
The problem is obviously that the Y coordinates of the lines 2, 3
and 4 differ; they should be on the same Y position.
The problem here is that logically horizontal lines must be painted
not centered but below the line, and It turns out that
SwTabFrmPainter::Insert cannot correct the positions properly to
do that, because it only looks at borders in a single cell.
When using the UI to set the borders, we get (for innner table borders)
only a bottom border in the cells, but no top borders, so the
top position of the logically vertical borders needs to be corrected
with the width of the bottom border of the cell _above_; a symmetric
correction of the bottom position to the top border of the cell below
is also necessary.
Fortunately if we just leave the positons alone in Insert then
TabFrmPainter will eliminate duplicate lines with equal positions
and so it's only necessary to correct the positions when actually
painting the line in wTabFrmPainter::PaintLines,
where we have the neighboring lines available.
Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 4718fc0..ba91302 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2533,6 +2533,28 @@ void SwTabFrmPainter::PaintLines( OutputDevice rDev,
const SwRect rRect ) cons
aPaintEnd.Y() = aUpperAligned._Bottom();
}
+// logically vertical lines are painted centered on the line,
+// logically horizontal lines are painted below the line
+bool const isBelow((mrTabFrm.IsVertical()) ? !bHori : bHori);
+double const offsetStart = (isBelow)
+? aStyles[0].GetWidth() / 2.0
+: std::maxdouble(aStyles[1].GetWidth(),
+aStyles[3].GetWidth()) / 2.0;
+double const offsetEnd = (isBelow)
+? aStyles[0].GetWidth() / 2.0
+: std::maxdouble(aStyles[4].GetWidth(),
+aStyles[6].GetWidth()) / 2.0;
+if (mrTabFrm.IsVertical())
+{
+aPaintStart.X() -= static_castlong(offsetStart + 0.5);
+aPaintEnd.X() -= static_castlong(offsetEnd + 0.5);
+}
+else
+{
+aPaintStart.Y() += static_castlong(offsetStart + 0.5);
+aPaintEnd.Y() += static_castlong(offsetEnd + 0.5);
+}
+
aPaintStart.X() -= nTwipXCorr; // nHalfPixelSzW - 2 to assure
that we do not leave the pixel
aPaintEnd.X() -= nTwipXCorr;
aPaintStart.Y() -= nTwipYCorr;
@@ -2726,19 +2748,10 @@ void SwTabFrmPainter::Insert( const SwFrm rFrm, const
SvxBoxItem rBoxItem )
aR.MirrorSelf();
aB.MirrorSelf();
-const SwTwips nHalfBottomWidth = aB.GetWidth() / 2;
-const SwTwips nHalfTopWidth = (bBottomAsTop)
-? nHalfBottomWidth : aT.GetWidth() / 2;
-
-// these are positions of the lines
-const SwTwips nLeft =
-aBorderRect._Left() - ((bVert) ? nHalfBottomWidth : 0);
-const SwTwips nRight =
-aBorderRect._Right() - ((bVert) ? nHalfTopWidth : 0);
-const SwTwips nTop=
-aBorderRect._Top() + ((bVert) ? 0 : nHalfTopWidth);
-const SwTwips nBottom =
-aBorderRect._Bottom()+ ((bVert) ? 0 : nHalfBottomWidth);
+const SwTwips nLeft = aBorderRect._Left();
+
Re: [PATCH (partial)] fdo#48549 System::Beep() removal
Hi,
Here is my license statement:
-
All of my past future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.
--
I send a new version of the patch taking into account the last commits.
I didn't add error reporting because I don't know the official way to do
this.
Best regards
Mathieu Vonlanthen
--
http://www.fastmail.fm - IMAP accessible web-mail
From 499921f466ae4db5aeb3ccdc9c8c59e98b290cfe Mon Sep 17 00:00:00 2001
From: Mathieu Vonlanthen mat_...@fastmail.fm
Date: Thu, 19 Jul 2012 11:02:45 +0200
Subject: [PATCH] fdo#48549 System::Beep() removal
Change-Id: I8fe133dd8d1f759fbe21d47ae358c0b5451812b5
---
basctl/source/basicide/baside2.cxx | 17 +
basctl/source/basicide/baside2b.cxx | 22 +---
basctl/source/basicide/brkdlg.cxx |1 -
basic/source/runtime/methods.cxx|1 -
formula/source/ui/dlg/funcutl.cxx |4 ---
sc/source/core/data/documen4.cxx|2 --
sc/source/ui/app/inputhdl.cxx |6 -
sc/source/ui/docshell/docfunc.cxx |6 -
sc/source/ui/docshell/olinefun.cxx |8 --
sc/source/ui/navipi/content.cxx |2 --
sc/source/ui/navipi/navipi.cxx |2 --
sc/source/ui/view/editsh.cxx| 12 -
sc/source/ui/view/gridwin.cxx | 10
sc/source/ui/view/gridwin2.cxx |2 --
sc/source/ui/view/select.cxx|1 -
sc/source/ui/view/tabcont.cxx |3 ---
sc/source/ui/view/tabvwshe.cxx |1 -
sc/source/ui/view/viewfun2.cxx |4 ---
sc/source/ui/view/viewfun6.cxx | 47 ++-
sc/source/ui/view/viewfunc.cxx |2 --
svtools/source/contnr/fileview.cxx |3 ---
svtools/source/contnr/svlbitm.cxx |2 --
svtools/source/contnr/svtreebx.cxx |1 -
svtools/source/edit/textview.cxx|5
svx/source/fmcomp/gridctrl.cxx |1 -
svx/source/form/tbxform.cxx |1 -
svx/workben/edittest.cxx|2 --
sw/source/ui/utlui/content.cxx |6 +
vcl/source/control/field2.cxx |7 +-
vcl/source/window/menu.cxx | 13 --
30 files changed, 12 insertions(+), 182 deletions(-)
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index d427a30..0c91e85 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -546,7 +546,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
CheckCompileBasic();
if ( aStatus.bError )
{
-Sound::Beep();
return sal_False;
}
@@ -572,9 +571,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
}
}
}
-
-if ( !bNewBreakPoint )
-Sound::Beep();
}
}
@@ -753,7 +749,6 @@ void ModulWindow::BasicAddWatch()
{
DBG_CHKTHIS( ModulWindow, 0 );
String aWatchStr;
-sal_Bool bInserted = sal_False;
AssertValidEditEngine();
sal_Bool bAdd = sal_True;
if ( !GetEditView()-HasSelection() )
@@ -780,9 +775,6 @@ void ModulWindow::BasicAddWatch()
bInserted = sal_True;
}
}
-
-if ( !bInserted )
-Sound::Beep();
}
@@ -790,10 +782,7 @@ void ModulWindow::BasicAddWatch()
void ModulWindow::BasicRemoveWatch()
{
DBG_CHKTHIS( ModulWindow, 0 );
-bool bRemoved = pLayout-GetWatchWindow().RemoveSelectedWatch();
-
-if ( !bRemoved )
-Sound::Beep();
+pLayout-GetWatchWindow().RemoveSelectedWatch();
}
@@ -1022,10 +1011,6 @@ void ModulWindow::ExecuteCommand( SfxRequest rReq )
}
break;
case SID_BASICIDE_MATCHGROUP:
-{
-if ( !GetEditView()-MatchGroup() )
-Sound::Beep();
-}
break;
case SID_BASICIDE_TOGGLEBRKPNT:
{
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 0e63635..d10859c 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1496,8 +1496,6 @@ IMPL_LINK( WatchWindow, EditAccHdl, Accelerator *, pAcc )
aXEdit.SetSelection( Selection( 0, 0x ) );
UpdateWatches();
}
-else
-Sound::Beep();
}
break;
case KEY_ESCAPE:
@@ -1942,9 +1940,6 @@ sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection )
}
}
-if ( !bEdit )
-Sound::Beep();
-
return bEdit;
}
@@ -1962,22 +1957,10 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString
aResult = aResult.Copy( 1, nResultLen - 2 );
sal_Bool bResModified = ( aResult != aEditingRes ) ? sal_True : sal_False;
-sal_Bool bError = sal_False;
-if ( !aVName.Len() )
-{
-bError = sal_True;
-}
-
sal_Bool bRet = sal_False;
-if ( bError )
-{
-
Re: [PATCH][PUSHED] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor
On Sun, 2012-07-22 at 11:25 +0200, Kristian Rietveld wrote: (Please keep me on CC as I am not subscribed to the list) Hi all, I have been building LibreOffice using Clang on Mac OS X Lion again, now that it is possible to get a working build using Clang on Linux. During the build, however, the sw_filters_test unit test crashes. The crash happens in rtl_string_release from the FieldEntry (the one in sw/source/file/ww8/ww8par.hxx) destructor. The FieldEntry destructor is called through a dyld stub. After reading assembly code I figured that the FieldEntry destructor being executed does not match the FieldEntry's fields. What was already suspicious above is that rtl_string_release is being called even though this FieldEntry uses OUStrings. From the assembly code I guess the FieldEntry destructor being executed is actually the one in registry/source/reflwrit.cxx. So my impression is that the dynamic linker on OS X is simply calling the wrong destructor (the symbols have the same name). To fix this, I can think of either putting the WW8 FieldEntry in a namespace, or renaming it to WW8FieldEntry. Since no namespaces were used in the current code, I decided to rename the class. A patch is attached and I verified that it fixes the crashing unit test for me. If people have a better or preferred way to fix this, please let me know and I will update the patch accordingly. Sounds like a similar problem to fdo#37044, fixed by http://cgit.freedesktop.org/libreoffice/core/commit/?id=7080d629c82422a419d38051536c7711f8abe53e I thought that got tracked down to disabled visibility or something of that nature. Anyway, doesn't hurt to disambiguate. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 93 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 12 ++-
writerfilter/source/rtftok/rtfvalue.cxx| 25 ++
writerfilter/source/rtftok/rtfvalue.hxx|5 +
4 files changed, 131 insertions(+), 4 deletions(-)
New commits:
commit 4ad9e3f5be10bde030338f744d56ffa6c7736bd0
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jul 23 14:45:45 2012 +0200
implement import of RTF_{MOMATH,MR,MF,MFPR,MCTRLPR,MNUM,MDEN}
Change-Id: I4d0d9df26de1ef52a808c82d89a8404c98ef7bc4
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 37da9c0..187ae91 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -48,11 +48,17 @@
#include filter/msfilter/util.hxx
#include filter/msfilter/escherex.hxx
#include comphelper/string.hxx
+#include tools/globname.hxx
+#include comphelper/classids.hxx
+#include comphelper/embeddedobjectcontainer.hxx
+#include oox/mathml/import.hxx
#include doctok/sprmids.hxx // NS_sprm namespace
#include doctok/resourceids.hxx // NS_rtf namespace
#include ooxml/resourceids.hxx // NS_ooxml namespace
#include ooxml/OOXMLFastTokens.hxx // ooxml namespace
+#include oox/token/namespaces.hxx // oox namespace
+#include oox/token/tokens.hxx
#include rtfsdrimport.hxx
#include rtftokenizer.hxx
@@ -943,6 +949,7 @@ void RTFDocumentImpl::text(OUString rString)
case DESTINATION_SUBJECT:
case DESTINATION_DOCCOMM:
case DESTINATION_ATNID:
+case DESTINATION_MR:
m_aStates.top().aDestinationText.append(rString);
break;
case DESTINATION_EQINSTRUCTION:
@@ -1390,6 +1397,54 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
case RTF_ATNID:
m_aStates.top().nDestinationState = DESTINATION_ATNID;
break;
+case RTF_MMATH:
+// Nothing to do here (just enter the destination) till
RTF_MMATHPR is implemented.
+break;
+case RTF_MOMATH:
+{
+uno::Referencexml::sax::XFastAttributeList aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_oMath, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MOMATH;
+}
+break;
+case RTF_MR:
+m_aStates.top().nDestinationState = DESTINATION_MR;
+break;
+case RTF_MF:
+{
+uno::Referencexml::sax::XFastAttributeList aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_f, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MF;
+}
+break;
+case RTF_MFPR:
+{
+uno::Referencexml::sax::XFastAttributeList aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_fPr, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MFPR;
+}
+break;
+case RTF_MCTRLPR:
+{
+uno::Referencexml::sax::XFastAttributeList aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_ctrlPr, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MCTRLPR;
+}
+break;
+case RTF_MNUM:
+{
+uno::Referencexml::sax::XFastAttributeList aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_num, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MNUM;
+}
+break;
+case RTF_MDEN:
+{
+uno::Referencexml::sax::XFastAttributeList aAttribs;
+m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_den, aAttribs);
+m_aStates.top().nDestinationState = DESTINATION_MDEN;
+}
+break;
default:
SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle
destination ' lcl_RtfToString(nKeyword) ');
// Make sure we skip destinations (even without \*) till we don't
handle them
@@ -3443,6 +3498,44 @@ int RTFDocumentImpl::popState()
parBreak();
m_bNeedPap = true;
}
+else if (m_aStates.top().nDestinationState == DESTINATION_MOMATH)
+{
+uno::Referencexml::sax::XFastAttributeList aAttribs;
+m_aMathBuffer.appendClosingTag(oox::NMSP_officeMath | oox::XML_oMath);
+
+SvGlobalName aGlobalName(SO3_SM_CLASSID);
+comphelper::EmbeddedObjectContainer aContainer;
+OUString aName;
+uno::Referenceembed::XEmbeddedObject xObject =
aContainer.CreateEmbeddedObject(aGlobalName.GetByteSequence(), aName);
+uno::Referenceutil::XCloseable xComponent(xObject-getComponent(),
[PATCH] Change in core[libreoffice-3-6]: fdo#39812: Writer: fix collapsing merged table border painti...
From Michael Stahl mst...@redhat.com: Michael Stahl has uploaded a new change for review. Change subject: fdo#39812: Writer: fix collapsing merged table border painting: .. fdo#39812: Writer: fix collapsing merged table border painting: Create a table with a merged cell like in the screenshot in the bug, with a SAL_DEBUG in SwTabFrmPainter::PaintLines the following lines are painted: debug: paint start 1 debug: start: 2749,1488 end: 12387,1488 2 debug: start: 2749,1945 end: 7567,1945 3 debug: start: 7567,1945 end: 12387,1945 4 debug: start: 2749,2015 end: 12387,2015 5 debug: start: 2749,2542 end: 7567,2542 6 debug: start: 7567,2542 end: 12387,2542 7 debug: start: 2749,1488 end: 2749,1945 8 debug: start: 2749,1945 end: 2749,2015 9 debug: start: 2749,2015 end: 2749,2542 A debug: start: 7567,1945 end: 7567,2542 B debug: start: 12387,1488 end: 12387,1945 C debug: start: 12387,1945 end: 12387,2015 D debug: start: 12387,2015 end: 12387,2542 debug: paint end *1*1* 7 B 7 B *2*3* 8 A C *4*4* 9 A D 9 A D *5*6* The problem is obviously that the Y coordinates of the lines 2, 3 and 4 differ; they should be on the same Y position. The problem here is that logically horizontal lines must be painted not centered but below the line, and It turns out that SwTabFrmPainter::Insert cannot correct the positions properly to do that, because it only looks at borders in a single cell. When using the UI to set the borders, we get (for innner table borders) only a bottom border in the cells, but no top borders, so the top position of the logically vertical borders needs to be corrected with the width of the bottom border of the cell _above_; a symmetric correction of the bottom position to the top border of the cell below is also necessary. Fortunately if we just leave the positons alone in Insert then TabFrmPainter will eliminate duplicate lines with equal positions and so it's only necessary to correct the positions when actually painting the line in wTabFrmPainter::PaintLines, where we have the neighboring lines available. Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129 (cherry picked from commit 02e80d2e431a57ad775a674eb3cfcd6cec53e09f) --- M sw/source/core/layout/paintfrm.cxx 1 file changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/341/1 -- To view, visit https://gerrit.libreoffice.org/341 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-5]: fdo#39812: Writer: fix collapsing merged table border painti...
From Michael Stahl mst...@redhat.com: Michael Stahl has uploaded a new change for review. Change subject: fdo#39812: Writer: fix collapsing merged table border painting: .. fdo#39812: Writer: fix collapsing merged table border painting: Create a table with a merged cell like in the screenshot in the bug, with a SAL_DEBUG in SwTabFrmPainter::PaintLines the following lines are painted: debug: paint start 1 debug: start: 2749,1488 end: 12387,1488 2 debug: start: 2749,1945 end: 7567,1945 3 debug: start: 7567,1945 end: 12387,1945 4 debug: start: 2749,2015 end: 12387,2015 5 debug: start: 2749,2542 end: 7567,2542 6 debug: start: 7567,2542 end: 12387,2542 7 debug: start: 2749,1488 end: 2749,1945 8 debug: start: 2749,1945 end: 2749,2015 9 debug: start: 2749,2015 end: 2749,2542 A debug: start: 7567,1945 end: 7567,2542 B debug: start: 12387,1488 end: 12387,1945 C debug: start: 12387,1945 end: 12387,2015 D debug: start: 12387,2015 end: 12387,2542 debug: paint end *1*1* 7 B 7 B *2*3* 8 A C *4*4* 9 A D 9 A D *5*6* The problem is obviously that the Y coordinates of the lines 2, 3 and 4 differ; they should be on the same Y position. The problem here is that logically horizontal lines must be painted not centered but below the line, and It turns out that SwTabFrmPainter::Insert cannot correct the positions properly to do that, because it only looks at borders in a single cell. When using the UI to set the borders, we get (for innner table borders) only a bottom border in the cells, but no top borders, so the top position of the logically vertical borders needs to be corrected with the width of the bottom border of the cell _above_; a symmetric correction of the bottom position to the top border of the cell below is also necessary. Fortunately if we just leave the positons alone in Insert then TabFrmPainter will eliminate duplicate lines with equal positions and so it's only necessary to correct the positions when actually painting the line in wTabFrmPainter::PaintLines, where we have the neighboring lines available. Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129 (cherry picked from commit 02e80d2e431a57ad775a674eb3cfcd6cec53e09f) --- M sw/source/core/layout/paintfrm.cxx 1 file changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/342/1 -- To view, visit https://gerrit.libreoffice.org/342 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/source
vcl/source/components/rasterizer_rsvg.cxx | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 682cb83ed59233decbeeaff68c4d871442b58bb1
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 23 13:59:12 2012 +0100
Resolves: fdo#50975 rsvg_handle_new_from_data calls rsvg_handle_close
rsvg_handle_new_from_data calls rsvg_handle_fill_with_data which itself
calls
rsvg_handle_close on success, so we don't have to.
And older versions of librsvg (e.g. 2.16.1) don't protect against
rsvg_handle_close getting called twice, although new versions do,
so we crash on e.g. RHEL-5
Change-Id: I451075e50c9c2c7b07289356d7a92eb55db82f9f
diff --git a/vcl/source/components/rasterizer_rsvg.cxx
b/vcl/source/components/rasterizer_rsvg.cxx
index 00940c2..f5a7f57 100644
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ b/vcl/source/components/rasterizer_rsvg.cxx
@@ -117,7 +117,6 @@ public:
// LibRSVG
void rsvg_init() { (*mp_rsvg_init)(); }
RsvgHandle* rsvg_handle_new_from_data( const guint8* data, gsize size,
GError** error) { return( (*mp_rsvg_handle_new_from_data)( data, size, error )
); }
-gboolean rsvg_handle_close( RsvgHandle* handle, GError** error ) { return(
(*mp_rsvg_handle_close)( handle, error ) ); }
void rsvg_handle_set_dpi_x_y( RsvgHandle* handle, double dpix, double dpiy
) { (*mp_rsvg_handle_set_dpi_x_y)( handle, dpix, dpiy ); }
void rsvg_handle_get_dimensions( RsvgHandle* handle, RsvgDimensionData*
dimensions ) { (*mp_rsvg_handle_get_dimensions)( handle, dimensions ); }
gboolean rsvg_handle_render_cairo( RsvgHandle* handle, cairo_t* cairo ) {
return( (*mp_rsvg_handle_render_cairo)( handle, cairo ) ); }
@@ -137,7 +136,6 @@ private:
// LibRSVG
void (*mp_rsvg_init)( void );
RsvgHandle* (*mp_rsvg_handle_new_from_data)( const guint8*, gsize,
GError** );
-gboolean (*mp_rsvg_handle_close)( RsvgHandle*, GError** );
void (*mp_rsvg_handle_set_dpi_x_y)( RsvgHandle*, double, double );
void (*mp_rsvg_handle_get_dimensions)( RsvgHandle*, RsvgDimensionData* );
gboolean (*mp_rsvg_handle_render_cairo)( RsvgHandle*, cairo_t* );
@@ -189,14 +187,12 @@ LibraryWrapper::LibraryWrapper() :
{
mp_rsvg_init = ( void (*)( void ) ) osl_getAsciiFunctionSymbol(
mpRSVGLib, rsvg_init );
mp_rsvg_handle_new_from_data = ( RsvgHandle* (*)( const guint8*,
gsize, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib,
rsvg_handle_new_from_data );
-mp_rsvg_handle_close = ( gboolean (*)( RsvgHandle*, GError** ) )
osl_getAsciiFunctionSymbol( mpRSVGLib, rsvg_handle_close );
mp_rsvg_handle_set_dpi_x_y = ( void (*)( RsvgHandle*, double, double )
) osl_getAsciiFunctionSymbol( mpRSVGLib, rsvg_handle_set_dpi_x_y );
mp_rsvg_handle_get_dimensions = ( void (*)( RsvgHandle*,
RsvgDimensionData* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib,
rsvg_handle_get_dimensions );
mp_rsvg_handle_render_cairo = ( gboolean (*)( RsvgHandle*, cairo_t* )
) osl_getAsciiFunctionSymbol( mpRSVGLib, rsvg_handle_render_cairo );
if( !( mp_rsvg_init
mp_rsvg_handle_new_from_data
- mp_rsvg_handle_close
mp_rsvg_handle_set_dpi_x_y
mp_rsvg_handle_get_dimensions
mp_rsvg_handle_render_cairo ) )
@@ -415,12 +411,15 @@ uno::Reference graphic::XGraphic
Rasterizer::implGetXGraphicFromSurface( cair
}
while( nReadSize == nBlockSize );
-if( aDataBuffer.size()
-( NULL != ( mpRsvgHandle = rLib.rsvg_handle_new_from_data(
reinterpret_cast sal_uInt8* ( aDataBuffer[ 0 ] ),
-
aDataBuffer.size(), NULL ) ) )
-!rLib.rsvg_handle_close( mpRsvgHandle, NULL ) )
+if (aDataBuffer.size())
{
-implFreeRsvgHandle();
+//See: fdo#50975 rsvg_handle_new_from_data calls
+//rsvg_handle_fill_with_data which itself calls rsvg_handle_close
+//on success. Older versions of librsvg (e.g. 2.16.1) don't
+//protect against rsvg_handle_close getting called twice, so we
+//shouldn't additionally call svg_handle_close here.
+mpRsvgHandle = rLib.rsvg_handle_new_from_data( reinterpret_cast
sal_uInt8* ( aDataBuffer[ 0 ] ),
+
aDataBuffer.size(), NULL );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuildfixes' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: git branch audit - results ...
Hi Bjoern, On 2012-07-20 at 23:45 +0200, Bjoern Michaelsen wrote: origin/feature/gbuildfixes mostly mine. Whatever is in there is either merged or obsolete - can be deleted. I've done that; but please, everybody, is it as simple as: git push origin :feature/gbuildfixes If you own a feature branch that is merged (or obsolete), just go ahead and delete it, don't send can be deleted messages to the list. Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Tinderbox nightlies broken (was Re: No Win builds?)
Hi Michael, On 2012-07-23 at 12:38 +0200, Michael Stahl wrote: I added the push of LibO*.zip files in push_nightlies.sh. Is there any point in uploading a .zip file with a Windows build? that's a good question, it depends on what you want to test; for testing office functionality it's probably easier to use zips because they're trivial to install (just unzip) and use a private profile directory automatically, but they don't have bundled MSVC runtimes or system integration so you can't test that Adding the QA guys - from my point of view, the nightly should be as close to our 'normal' installation as possible (ie. .msi), so that the QA guys can see installation problems early too. But up to them do decide, I guess. Rainer, all - what do you prefer? Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
REMINDER: Release 3.6.0-rc3 from libreoffice-3-6-0 branch
Hi, please note that the commit deadline for 3.6.0-rc3 is today, July 23, 2012. It will be used as LO-3.6.0 final if no blocker is reported. See also http://wiki.documentfoundation.org/ReleasePlan#3.6_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cppu/source stoc/source
cppu/source/uno/lbenv.cxx | 15 ++-
stoc/source/invocation_adapterfactory/iafactory.cxx |9 -
2 files changed, 10 insertions(+), 14 deletions(-)
New commits:
commit a4967e4a7563e1d1bd43d1560ed95b9f6bbf58cd
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jul 23 15:18:02 2012 +0200
Assertion clean-up
Change-Id: I234c615d9d3386da2b244709add5c029b76d346c
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index ef37aee..3358fe9 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -187,17 +187,14 @@ inline void ObjectEntry::append(
typelib_typedescription_acquire( (typelib_TypeDescription *) pTypeDescr );
aNewEntry.pTypeDescr = pTypeDescr;
-::std::pair Ptr2ObjectMap::iterator, bool insertion(
+::std::pair Ptr2ObjectMap::iterator, bool i(
pEnv-aPtr2ObjectMap.insert( Ptr2ObjectMap::value_type(
pInterface, this ) ) );
-// No idea if the code above has side-effects and can't be just
-// bypassed in the no-OSL_ASSERT case, so avoid unused variable like
this instead.
-(void) insertion;
-
-OSL_ASSERT( insertion.second ||
-(find( pInterface, 0 ) = 0
- // points to the same object entry:
- insertion.first-second == this) );
+SAL_WARN_IF(
+!i.second (find(pInterface, 0) == -1 || i.first-second != this),
+cppu,
+map already contains i.first-second != this for
+ pInterface);
aInterfaces.push_back( aNewEntry );
}
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 72a880a..1a1ab13 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -861,11 +861,10 @@ Reference XInterface FactoryImpl::createAdapter(
adapter_set, m_receiver2adapters, xKey.get(), rTypes );
if (0 == that) // again no entry
{
-pair t_ptr_set::iterator, bool insertion(
-adapter_set-insert( pNew ) );
-// Avoid unused variable warning
-(void) insertion;
-OSL_ASSERT( insertion.second );
+pair t_ptr_set::iterator, bool i(adapter_set-insert(pNew));
+SAL_WARN_IF(
+!i.second, stoc,
+set already contains *(i.first) != pNew);
that = pNew;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ffe20407f6dc599a309183dcb68b83616f1dcc6
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jul 23 15:21:05 2012 +0200
warning C4101: unreferenced local variable
Change-Id: I8dcd71b73204d37d3125e38b6983af430fa4570c
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8156512..2d8c584 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -659,7 +659,7 @@ void
lcl_MoveBorderPropertiesToFrame(uno::Sequencebeans::PropertyValue rFrame
}
rFrameProperties.realloc(nStart);
}
-catch( const uno::Exception rEx )
+catch( const uno::Exception )
{
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Tinderbox nightlies broken (was Re: No Win builds?)
On Mon, Jul 23, 2012 at 4:30 AM, Lubos Lunak l.lu...@suse.cz wrote: On Sunday 22 of July 2012, Norbert Thiebaud wrote: ... but I used a simple grep + sed to extract INPATH= simpler and most importantly avoid using 'make' on platform for which that may not resolve to a gnumake. You forgot to tell grep what to grep for, so if anybody has updated after this, please pull again. I added the push of LibO*.zip files in push_nightlies.sh. Is there any point in uploading a .zip file with a Windows build? I suspect that the 2 are exclusive right... so either there is a zip or a msi so push_nightlies.sh should not care and do a best effort Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - pango/pango-1.28.3.patch solenv/gbuild solenv/inc
pango/pango-1.28.3.patch | 14 -- solenv/gbuild/platform/macosx.mk |1 + solenv/inc/unxmacx.mk|2 +- 3 files changed, 14 insertions(+), 3 deletions(-) New commits: commit abf0ff683bc87fe6b2d88df0ae101d89740d6238 Author: Tor Lillqvist t...@iki.fi Date: Mon Jul 23 16:27:57 2012 +0300 Avoid confusion in 10.7 SDK headers in at least Xcode45-DP3 When building with MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_7, CoreData/NSFetchRequest.h does #define NSPersistentStoreRequest NSObject (i.e. as a dummy) and does not import CoreData/NSPersistentStoreRequest.h. But CoreData/NSIncrementalStore.h doesn't do anything similar, it imports CoreData/NSPersistentStoreRequest.h unconditionally. So if CoreData/NSFetchRequest.h has already been included by then, it will end up quite confusing. Change-Id: I9de6885ea444a73bf5fd50aa6a3d132b9fcc2f31 diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch index 539bef7..ba6edcb 100644 --- a/pango/pango-1.28.3.patch +++ b/pango/pango-1.28.3.patch @@ -65,7 +65,7 @@ # Checks for LibThai --- misc/pango-1.28.3/pango/pangoatsui-fontmap.c +++ misc/build/pango-1.28.3/pango/pangoatsui-fontmap.c -@@ -27,6 +27,12 @@ +@@ -27,6 +27,17 @@ #include pango-impl-utils.h #include modules.h @@ -75,12 +75,17 @@ +typedef int NSColorRenderingIntent; +#endif + ++#if MAC_OS_X_VERSION_MAX_ALLOWED 1070 MACOSX_SDK_VERSION = 1070 ++// Avoid a problem in at least the XCode 4.5DP3 SDK 10.7 headers ++#import CoreData/NSPersistentStoreRequest.h ++#endif ++ #import Cocoa/Cocoa.h typedef struct _FontHashKey FontHashKey; --- misc/pango-1.28.3/pango/pangocairo-atsuifont.c +++ misc/build/pango-1.28.3/pango/pangocairo-atsuifont.c -@@ -22,6 +22,12 @@ +@@ -22,6 +22,17 @@ #include config.h @@ -90,6 +95,11 @@ +typedef int NSColorRenderingIntent; +#endif + ++#if MAC_OS_X_VERSION_MAX_ALLOWED 1070 MACOSX_SDK_VERSION = 1070 ++// Avoid a problem in at least the XCode 4.5DP3 SDK 10.7 headers ++#import CoreData/NSPersistentStoreRequest.h ++#endif ++ #import Cocoa/Cocoa.h #include pango-impl-utils.h commit 59fa9d92972e60ef5d7278454d584dae582401c0 Author: Tor Lillqvist t...@iki.fi Date: Mon Jul 23 16:26:38 2012 +0300 Define also MACOSX_SDK_VERSION in compilations Change-Id: I1f9810b1230c4e3e5ca0571e5392297c1daf6a47 diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 425c7d6..084c4c0 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -44,6 +44,7 @@ gb_OSDEFS := \ -DQUARTZ \ -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \ -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \ + -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \ $(EXTRA_CDEFS) \ diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 1a7c891..a5ea287 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -49,7 +49,7 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI #.EXPORT: MACOSX_DEPLOYMENT_TARGET CDEFS+:=-DQUARTZ -EXTRA_CDEFS+:=-isysroot $(MACOSX_SDK_PATH) -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) +EXTRA_CDEFS+:=-isysroot $(MACOSX_SDK_PATH) -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) # Name of library where static data members are initialized # STATICLIBNAME=static$(DLLPOSTFIX) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS
Hi Thorsten, On 2012-07-22 at 16:42 +0200, Thorsten Behrens wrote: would some two people please review then cherry-pick http://cgit.freedesktop.org/libreoffice/core/commit/?id=5bfba6ee21b5576c9da475b13d7db0f735f078d2 into libreoffice-3-6-0? Thanks so much for that! - looks great to me; we should probably remove the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse others too, right? :-) 1 more review + cherry-pick still needed. All the best, Kendy ___ 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 52205, which changed state. Bug 52205 Summary: EDITING: Regression: reference to CSV becomes a string, not an integer https://bugs.freedesktop.org/show_bug.cgi?id=52205 What|Old Value |New Value Resolution||FIXED Status|ASSIGNED|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
[PUSHED] fdo#47957: refactoring and simplifying the color config settings
On Mon, 2012-07-23 at 14:33 +0200, János Uray wrote: Instead of the data members and the 7 arrays, there are now two classes in ColorConfigWindow_Impl: Entry and Chapter, and they contain the widgets as private data members. They have several member functions to handle the widgets. Lovely :-) I like this sort of numstat: 943 1209cui/source/options/optcolor.cxx Always good to remove cleanup more code than is added. Nice work :-) 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] .: setup_native/prj setup_native/source
setup_native/prj/d.lst |6 ++
setup_native/source/win32/wintools/makecab/makefile.mk | 10 +++---
setup_native/source/win32/wintools/msidb/makefile.mk | 10 +++---
setup_native/source/win32/wintools/msiinfo/makefile.mk | 10 +++---
setup_native/source/win32/wintools/msiinfo/msiinfo.c | 14 +++---
setup_native/source/win32/wintools/msimsp/makefile.mk | 10 +++---
setup_native/source/win32/wintools/msitran/makefile.mk | 10 +++---
7 files changed, 48 insertions(+), 22 deletions(-)
New commits:
commit 65e2c77e762a667b965ab3dc2bcaf8b8d1a0bc91
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jul 23 15:59:44 2012 +0200
Build the cross-msi-tools if winegcc is found
Change-Id: Idc58b314a0721507e80e7b0e6216f29090f1d347
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 19669cd..581bd85 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -1,7 +1,13 @@
mkdir: %_DEST%\bin\osl
..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe
+..\%__SRC%\bin\*.exe.so %_DEST%\bin\*.exe.so
..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
+symlink: %_DEST%\bin\makecab.exe %_DEST%\bin\makecab
+symlink: %_DEST%\bin\msidb.exe %_DEST%\bin\msidb
+symlink: %_DEST%\bin\msiinfo.exe %_DEST%\bin\msiinfo
+symlink: %_DEST%\bin\msimsp.exe %_DEST%\bin\msimsp
+symlink: %_DEST%\bin\msitran.exe %_DEST%\bin\msitran
mkdir: %_DEST%\bin\userscripts
..\%__SRC%\bin\install %_DEST%\bin\userscripts\install
diff --git a/setup_native/source/win32/wintools/makecab/makefile.mk
b/setup_native/source/win32/wintools/makecab/makefile.mk
index c8fee10..b30a520 100644
--- a/setup_native/source/win32/wintools/makecab/makefile.mk
+++ b/setup_native/source/win32/wintools/makecab/makefile.mk
@@ -20,11 +20,15 @@ TARGET=sn_makecab
.IF $(WINEGCC)==
@all:
@echo No winegcc present, not building makecab...
-.ELSE
-@all:
-@echo Not building makecab yet, stay tuned...
.ENDIF
+@all: $(BIN)/makecab.exe $(BIN)/makecab.exe.so
+
+$(BIN)/makecab.exe.so: $(BIN)/makecab.exe
+
+$(BIN)/makecab.exe:
+ $(WINEGCC) -o $(BIN)/makecab.exe makecab.c parseddf.c -mconsole -lmsi
+
# --- Targets --
.INCLUDE : target.mk
diff --git a/setup_native/source/win32/wintools/msidb/makefile.mk
b/setup_native/source/win32/wintools/msidb/makefile.mk
index 2bb31bc..6c1f0f3 100644
--- a/setup_native/source/win32/wintools/msidb/makefile.mk
+++ b/setup_native/source/win32/wintools/msidb/makefile.mk
@@ -20,11 +20,15 @@ TARGET=sn_msidb
.IF $(WINEGCC)==
@all:
@echo No winegcc present, not building msidb...
-.ELSE
-@all:
-@echo Not building msidb yet, stay tuned...
.ENDIF
+@all: $(BIN)/msidb.exe $(BIN)/msidb.exe.so
+
+$(BIN)/msidb.exe.so: $(BIN)/msidb.exe
+
+$(BIN)/msidb.exe:
+ $(WINEGCC) -o $(BIN)/msidb.exe msidb.c -municode -lmsi
+
# --- Targets --
.INCLUDE : target.mk
diff --git a/setup_native/source/win32/wintools/msiinfo/makefile.mk
b/setup_native/source/win32/wintools/msiinfo/makefile.mk
index 62e09b5..d7aab3b 100644
--- a/setup_native/source/win32/wintools/msiinfo/makefile.mk
+++ b/setup_native/source/win32/wintools/msiinfo/makefile.mk
@@ -20,11 +20,15 @@ TARGET=sn_msiinfo
.IF $(WINEGCC)==
@all:
@echo No winegcc present, not building msiinfo...
-.ELSE
-@all:
-@echo Not building msiinfo yet, stay tuned...
.ENDIF
+@all: $(BIN)/msiinfo.exe $(BIN)/msiinfo.exe.so
+
+$(BIN)/msiinfo.exe.so: $(BIN)/msiinfo.exe
+
+$(BIN)/msiinfo.exe:
+ $(WINEGCC) -o $(BIN)/msiinfo.exe msiinfo.c -mconsole -municode -lmsi
+
# --- Targets --
.INCLUDE : target.mk
diff --git a/setup_native/source/win32/wintools/msiinfo/msiinfo.c
b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
index 2a33684..37bbe09 100644
--- a/setup_native/source/win32/wintools/msiinfo/msiinfo.c
+++ b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
@@ -33,7 +33,7 @@
#define MAX_STORAGE_NAME 31
#define COMMANDS 17
-static const uint commandMap[COMMANDS][4] =
+static const unsigned commandMap[COMMANDS][4] =
{{'c', PID_CODEPAGE, VT_I2},
{'t', PID_TITLE, VT_LPSTR},
{'j', PID_SUBJECT, VT_LPSTR},
@@ -61,7 +61,7 @@ static const char * commandNames[COMMANDS] =
static void parseDate(LPCWSTR value, SYSTEMTIME *time)
{
LPWSTR field;
-uint len = 4*sizeof(WCHAR);
+unsigned len = 4*sizeof(WCHAR);
if (lstrlenW(value) != 19) return;
field = malloc(len + sizeof(WCHAR));
@@ -93,7 +93,7 @@ static void parseDate(LPCWSTR value, SYSTEMTIME *time)
static BOOL msiinfoDisplayProperties(LPWSTR dbfile)
{
MSIHANDLE dbhandle, infohandle;
-uint i, r, dataType;
+unsigned i, r, dataType;
INT iVal;
FILETIME ftVal;
SYSTEMTIME sysTime;
@@ -137,9 +137,9 @@ static BOOL msiinfoDisplayProperties(LPWSTR dbfile)
Re: [PATCH (partial)] fdo#48549 System::Beep() removal
Hey, 2012/7/23 Mathieu Vonlanthen mat_...@fastmail.fm: Hi, Here is my license statement: - All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. -- I send a new version of the patch taking into account the last commits. I didn't add error reporting because I don't know the official way to do this. Best regards Mathieu Vonlanthen Thank you very much for your work! Having reviewed your patch, I still think that a warning/logging might be helpful for latter debugging in the following files: * basctl/source/basicide/baside2.cxx - @@ -572,9 +571,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine ) - @@ -790,10 +782,7 @@ void ModulWindow::BasicAddWatch() - @@ -1022,10 +1011,6 @@ void ModulWindow::ExecuteCommand( SfxRequest rReq ) * basic/source/runtime/methods.cxx * formula/source/ui/dlg/funcutl.cxx * sc/source/ui/app/inputhdl.cxx * sc/source/ui/docshell/olinefun.cxx * sc/source/ui/navipi/content.cxx * sc/source/ui/navipi/navipi.cxx * sc/source/ui/view/viewfun2.cxx * sc/source/ui/view/viewfun6.cxx * svtools/source/edit/textview.cxx * svx/source/form/tbxform.cxx * svx/workben/edittest.cxx * sw/source/ui/utlui/content.cxx But I do not know what the general opinion of the LO developers for that cases is... Maybe they are happy without any logging in there... Whould love to hear from the others what they think. Nevertheless, removing that annoying beeps is a good thing! Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/template-dialog' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - wizards/com
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 33 +-
1 file changed, 24 insertions(+), 9 deletions(-)
New commits:
commit c5b6a945e898ded83613afefbedef71372665b13
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Jul 12 23:23:03 2012 +0200
fdo#50800 populate composedCommandNames ASAP, not at call of getFromClause
In particular com/sun/star/wizards/ui/FilterComponent calls getSelectClause
before calling getFromClause, and then all hell breaks loose:
composedCommandNames is empty, thus cannot find the proper Alias column name,
thus the column names in the select list were not properly escaped, ...
We have just made getFromClause quadratic instead of linear, but:
1) I do not think this would be a problem (small datastructures)
2) If it is, rather use a hashmap or something like that, wich will also
make getSelectClause faster
Also make the fallback case of unknown table more robust: escape the
table name (if any) and column name!
Change-Id: I474adc51fc6378d836bd5865d9eb9505983dcbc5
Sgined-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 8469a2b..3a2d0b6 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -68,7 +68,7 @@ public class SQLQueryComposer
{
try
{
-this.CurDBMetaData = _CurDBMetaData;
+setDBMetaData(_CurDBMetaData);
xMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class,
CurDBMetaData.DBConnection);
final Object oQueryComposer =
xMSF.createInstance(com.sun.star.sdb.SingleSelectQueryComposer);
m_xQueryAnalyzer =
UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class, oQueryComposer);
@@ -231,6 +231,7 @@ public class SQLQueryComposer
public void setDBMetaData(QueryMetaData _oDBMetaData)
{
this.CurDBMetaData = _oDBMetaData;
+updateComposedCommandNames();
}
private PropertyValue[][] replaceConditionsByAlias(PropertyValue
_filterconditions[][])
@@ -255,22 +256,30 @@ public class SQLQueryComposer
return m_xQueryAnalyzer.getQuery();
}
-public StringBuilder getFromClause()
+private void updateComposedCommandNames()
{
-StringBuilder sFromClause = new StringBuilder(FROM);
composedCommandNames.clear();
String[] sCommandNames = CurDBMetaData.getIncludedCommandNames();
for (int i = 0; i sCommandNames.length; i++)
{
-CommandName curCommandName = new CommandName(CurDBMetaData,
sCommandNames[i]); //(setComposedCommandName)
+CommandName curCommandName = new CommandName(CurDBMetaData,
sCommandNames[i]);
curCommandName.setAliasName(getuniqueAliasName(curCommandName.getTableName()));
+composedCommandNames.add(curCommandName);
+}
+}
+
+public StringBuilder getFromClause()
+{
+StringBuilder sFromClause = new StringBuilder(FROM);
+String[] sCommandNames = CurDBMetaData.getIncludedCommandNames();
+for (int i = 0; i sCommandNames.length; i++)
+{
+CommandName curCommandName =
getComposedCommandByDisplayName(sCommandNames[i]);
sFromClause.append(
).append(curCommandName.getComposedName()).append(
).append(quoteName(curCommandName.getAliasName()));
if (i sCommandNames.length - 1)
{
sFromClause.append(, );
}
-// fill composedCommandNames
-composedCommandNames.add(curCommandName);
}
return sFromClause;
}
@@ -320,13 +329,19 @@ public class SQLQueryComposer
private String getComposedAliasFieldName(String _fieldname)
{
FieldColumn CurFieldColumn =
CurDBMetaData.getFieldColumnByDisplayName(_fieldname);
-CommandName curComposedCommandName =
getComposedCommandByDisplayName(CurFieldColumn.getCommandName());
+final String curCommandName = CurFieldColumn.getCommandName();
+final String curFieldName = CurFieldColumn.getFieldName();
+CommandName curComposedCommandName =
getComposedCommandByDisplayName(curCommandName);
if (curComposedCommandName == null)
{
-return _fieldname;
+//return _fieldname;
+if ( curCommandName.length() 0 )
+return quoteName(curCommandName) + . +
quoteName(curFieldName);
+else
+return quoteName(CurFieldColumn.getFieldName());
}
String curAliasName = curComposedCommandName.getAliasName();
-return quoteName(curAliasName) + . +
quoteName(CurFieldColumn.getFieldName());
+return quoteName(curAliasName) + . + quoteName(curFieldName);
}
private CommandName getComposedCommandByAliasName(String _AliasName)
[Libreoffice-commits] .: 2 commits - basctl/source basic/source cui/source formula/source sc/source svtools/source svx/source svx/workben sw/source vcl/source
basctl/source/basicide/baside2.cxx | 18 -
basctl/source/basicide/baside2b.cxx | 23 +
basctl/source/basicide/brkdlg.cxx |1
basic/source/runtime/methods.cxx|1
cui/source/options/optcolor.cxx |2 -
formula/source/ui/dlg/funcutl.cxx |4 ---
sc/source/core/data/documen4.cxx|2 -
sc/source/ui/app/inputhdl.cxx |6
sc/source/ui/docshell/docfunc.cxx |6
sc/source/ui/docshell/olinefun.cxx |9 --
sc/source/ui/navipi/content.cxx |2 -
sc/source/ui/navipi/navipi.cxx |2 -
sc/source/ui/view/editsh.cxx| 12 -
sc/source/ui/view/gridwin.cxx | 10 ---
sc/source/ui/view/gridwin2.cxx |2 -
sc/source/ui/view/select.cxx|1
sc/source/ui/view/tabcont.cxx |3 --
sc/source/ui/view/tabvwshe.cxx |1
sc/source/ui/view/viewfun2.cxx |4 ---
sc/source/ui/view/viewfun6.cxx | 47 ++--
sc/source/ui/view/viewfunc.cxx |2 -
svtools/source/contnr/fileview.cxx |3 --
svtools/source/contnr/svlbitm.cxx |2 -
svtools/source/contnr/svtreebx.cxx |1
svtools/source/edit/textview.cxx|5 ---
svx/source/fmcomp/gridctrl.cxx |1
svx/source/form/tbxform.cxx |1
svx/workben/edittest.cxx|2 -
sw/source/ui/utlui/content.cxx |6
vcl/source/control/field2.cxx |7 -
vcl/source/window/menu.cxx | 13 -
31 files changed, 15 insertions(+), 184 deletions(-)
New commits:
commit 20ac67f06bc1a21a52e0843de3139d3d6133e4de
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jul 23 15:12:15 2012 +0100
WaE: misc. fixes.
Change-Id: I6cab01b0b82f7b82fff617715c5af45d23c536fe
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 0c91e85..696d603 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -772,7 +772,6 @@ void ModulWindow::BasicAddWatch()
aWatchStr = GetEditView()-GetSelected();
pLayout-GetWatchWindow().AddWatch( aWatchStr );
pLayout-GetWatchWindow().UpdateWatches();
-bInserted = sal_True;
}
}
}
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index d10859c..3682d72 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2006,6 +2006,7 @@ sal_Bool WatchTreeListBox::ImplBasicEntryEdited(
SvLBoxEntry* pEntry, const Stri
bError = sal_True;
SbxBase::ResetError();
}
+(void)bError; // used to Beep.
UpdateWatches();
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index ee68e3b..7bbc437 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -779,7 +779,7 @@ void ColorConfigWindow_Impl::SetAppearance ()
ColorListBox aSampleColorList(this);
{
XColorListRef const xColorTable = XColorList::CreateStdColorList();
-for (unsigned i = 0; i != xColorTable-Count(); ++i)
+for (sal_Int32 i = 0; i != xColorTable-Count(); ++i)
{
XColorEntry rEntry = *xColorTable-GetColor(i);
aSampleColorList.InsertEntry(rEntry.GetColor(), rEntry.GetName());
diff --git a/sc/source/ui/docshell/olinefun.cxx
b/sc/source/ui/docshell/olinefun.cxx
index 3c177eb..223eb2d 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -444,6 +444,7 @@ sal_Bool ScOutlineDocFunc::SelectLevel( SCTAB nTab,
sal_Bool bColumns, sal_uInt1
sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange rRange, sal_Bool
bRecord, sal_Bool bApi )
{
+(void)bApi;
sal_Bool bDone = false;
SCCOL nStartCol = rRange.aStart.Col();
commit 0f6101cfef4c2e45d9f1f1b3a61ef94799e4526b
Author: Mathieu Vonlanthen mat_...@fastmail.fm
Date: Thu Jul 19 11:02:45 2012 +0200
fdo#48549 System::Beep() removal
Change-Id: I8fe133dd8d1f759fbe21d47ae358c0b5451812b5
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index d427a30..0c91e85 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -546,7 +546,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
CheckCompileBasic();
if ( aStatus.bError )
{
-Sound::Beep();
return sal_False;
}
@@ -572,9 +571,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
}
}
}
-
-if ( !bNewBreakPoint )
-Sound::Beep();
}
}
@@ -753,7 +749,6 @@ void ModulWindow::BasicAddWatch()
{
DBG_CHKTHIS( ModulWindow, 0 );
String aWatchStr;
-sal_Bool bInserted = sal_False;
AssertValidEditEngine();
sal_Bool bAdd = sal_True;
if (
[PUSHED]] fdo#48549 System::Beep() removal
On Mon, 2012-07-23 at 03:10 -0700, Mathieu Vonlanthen wrote: I send a new version of the patch taking into account the last commits. I didn't add error reporting because I don't know the official way to do this. Thanks :-) One thing that is worth doing is compiling your code before submitting it, anyhow - I did a little cleanup and it works nicely; in addition - people get upset about warnings breaking their build - so a warning-free compilation is rather a bonus. Nevertheless - nice work :-) can you close the bug ? What else would you like to work on ? there is certainly a lot that needs cleaning up improving :-) 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] .: cui/source
cui/source/options/optcolor.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6a90d4ec8afd1e58c9b69f4de1364d5b5624300b
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jul 23 16:28:22 2012 +0200
-Werror=sign-compare
Change-Id: I6be5df685575c6909d4adfcee0ccc4fb0bd4b600
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 7bbc437..5c90b65 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1033,7 +1033,7 @@ unsigned ColorConfigWindow_Impl::GetPosBehindLastChapter
() const
long ColorConfigWindow_Impl::GetDeltaAbove (Group eGroup) const
{
long nDelta = 0;
-for (unsigned i = 0; i != eGroup; ++i)
+for (int i = 0; i != eGroup; ++i)
if (!IsGroupVisible(static_castGroup(i)))
nDelta += vChapters[i]-GetHeight();
return nDelta;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS
On Mon, 2012-07-23 at 15:53 +0200, Jan Holesovsky wrote: would some two people please review then cherry-pick http://cgit.freedesktop.org/libreoffice/core/commit/?id=5bfba6ee21b5576c9da475b13d7db0f735f078d2 Thanks so much for that! - looks great to me; we should probably remove the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse others too, right? :-) 1 more review + cherry-pick still needed. +1 from me - it simply duplicates the equivalent code [cough] from DrawText - right ? ;-) Regards, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: config_host.mk.source configure.in
config_host.mk.source |3 ++-
configure.in |4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 17ddd27bf543eadebe3d950b5184ffce48bd5014
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Jul 23 16:35:01 2012 +0200
Use config_host.mk.source when configuring 'build' for cross-compilation.
Change-Id: I2e6e2a98bbaf515ececa75948d6b20bf9a093fe5
diff --git a/config_host.mk.source b/config_host.mk.source
index 10dd617..89f5f4b 100644
--- a/config_host.mk.source
+++ b/config_host.mk.source
@@ -5,6 +5,7 @@
# source ./config_host.mk.source
temp_conf=`mktemp config_host.mk.XX`
-sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_host.mk $temp_conf
+sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' \
+-e 's/^\s*export\s\+\([A-Z0-9_]*\)?=\(.*\)$/export \1=${\1:-\2}/'
config_host.mk $temp_conf
source ./$temp_conf
rm $temp_conf
diff --git a/configure.in b/configure.in
index 1006d37..264c6c6 100644
--- a/configure.in
+++ b/configure.in
@@ -3527,6 +3527,7 @@ if test $cross_compiling = yes; then
bin/repo-list.in \
config.guess \
config_host.mk.in \
+config_host.mk.source \
configure \
ooo.lst.in \
oowintool \
@@ -3571,8 +3572,7 @@ if test $cross_compiling = yes; then
test -f ./config_host.mk 2/dev/null || exit
cp config_host.mk ../config_build.mk
cp config.log ../config.Build.log
-sed -e 's,=\(.*\),=\1,' config_host.mk config_host.sh
-. ./config_host.sh
+. ./config_host.mk.source
for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON
GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
PYTHON SYSTEM_LIBXSLT; do
VV='$'$V
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/unx/system.c | 25 -
1 file changed, 20 insertions(+), 5 deletions(-)
New commits:
commit ba47dd6f03cfea17ae1117598bed8fe4e7d18a51
Author: Arnaud Versini arnaud.vers...@gmail.com
Date: Sun Jul 22 16:04:06 2012 +0200
Don't use a mutex for gethostbyname_r on Mac OS X
Change-Id: I5b8c7901266ae73d95626e98116b9a3b43710642
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 720d1cd..1eaeb18 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -30,11 +30,26 @@
#ifdef NO_PTHREAD_RTL
-static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
-
/* struct passwd differs on some platforms */
+
#if defined(MACOSX) || defined(IOS) || defined(OPENBSD) || defined(NETBSD)
+//No mutex needed on Mac OS X, gethostbyname is thread safe
+
+#if defined(MACOSX)
+
+#define RTL_MUTEX_LOCK
+#define RTL_MUTEX_UNLOCK
+
+#else //defined(MACOSX)
+
+static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+#define RTL_MUTEX_LOCK pthread_mutex_lock(getrtl_mutex);
+#define RTL_MUTEX_UNLOCK pthread_mutex_unlock(getrtl_mutex);
+
+#endif //defined(MACOSX)
+
extern int h_errno;
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
@@ -50,7 +65,7 @@ struct hostent *gethostbyname_r(const char *name, struct
hostent *result,
*/
struct hostent* res;
- pthread_mutex_lock(getrtl_mutex);
+ RTL_MUTEX_LOCK
if ( (res = gethostbyname(name)) )
{
@@ -120,9 +135,9 @@ struct hostent *gethostbyname_r(const char *name, struct
hostent *result,
*h_errnop = h_errno;
}
-pthread_mutex_unlock(getrtl_mutex);
+RTL_MUTEX_UNLOCK
- return res;
+return res;
}
#endif // OSX || IOS || OPENBSD || NETBSD
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Tinderbox nightlies broken (was Re: No Win builds?)
Jan Holesovsky schrieb: Adding the QA guys - from my point of view, the nightly should be as close to our 'normal' installation as possible (ie. .msi), so that the QA guys can see installation problems early too. But up to them do decide, I guess. Hi, that all is a little true for particular tester's preferences. I usually do server installations (msiexec /a) and modify bootstrap.ini to an existing LibOdev profile, what has been copied from my normal installation profile. So I have a realistic test environment. I think that would also be possible with zip, and I already did so with MinGW builds sometimes. I saw few installer problems, so I believe .ZIPs as daily builds would not have bigger disadvantages. For occasional testers the simple installation of zips (using their individual own profile) even might be favorable, so someone has the possibility to test a fix for a particular problem with a master build without need to learn anything about parallel installation or similar. Most times that worked well for me with MinGW builds, what came very reliable every day, but currently source has run dry? We will discuss those needs additionally during German QA-Weekend. An Additional advantage of master.zip builds might be that we could invite interested WIN users to see and test new features very early. For me that quick and easy is less important because I have to do some administration overhead to keep overview for the lots of versions. Very interesting for me (and may be 5 ... 10 other power testers would be some kind of feed / newsletter or whatever with New build from Tinderbx @xx available Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor
On 22/07/12 11:25, Kristian Rietveld wrote: (Please keep me on CC as I am not subscribed to the list) During the build, however, the sw_filters_test unit test crashes. The crash happens in rtl_string_release from the FieldEntry (the one in sw/source/file/ww8/ww8par.hxx) destructor. The FieldEntry destructor is called through a dyld stub. After reading assembly code I figured that the FieldEntry destructor being executed does not match the FieldEntry's fields. What was already suspicious above is that rtl_string_release is being called even though this FieldEntry uses OUStrings. From the assembly code I guess the FieldEntry destructor being executed is actually the one in registry/source/reflwrit.cxx. So my impression is that the dynamic linker on OS X is simply calling the wrong destructor (the symbols have the same name). that is really not supposed to happen, we really should build everything with -fvisibility=hidden on all platforms where unnecessarily exported symbols cause such problems (guess that means everything but Windows). on master and libreoffice-3-6, in solenv/gbuild/platform/macosx.mk the -fvisibility=hidden is inside: ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE) can you check that that is actually detected properly for your compiler? and if so, that it's actually on the command line in a make registry VERBOSE=t? perhaps the check for it is broken somehow. ah, there is another one, i wonder what that does: ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE) possibly in this day and age we should strongly consider hard-requiring visibility support in configure, i.e. reject compilers that can't do it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS
Jan Holesovsky wrote: Thanks so much for that! - looks great to me; we should probably remove the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse others too, right? :-) No idea - Norbert, you were refactoring that recently, any opinion? -- Thorsten pgpZi7zv0NYgd.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS
Michael Meeks wrote: +1 from me - it simply duplicates the equivalent code [cough] from DrawText - right ? ;-) Yes. ;) -- Thorsten pgpglEapxrvtB.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
mdds::multi_type_vector (was: Re: C++11 in LibreOffice)
On 07/23/2012 05:04 AM, Lubos Lunak wrote: Where's the benchmark for that? I'd like to see what difference it makes, but I cannot find anything in the blog post. Good question. I didn't put benchmark data in because I wanted to first get the background story out first, which I knew was going to be somewhat long. I'll do another blog post just for benchmarks, and for other performance considerations. Having said that, I have _some_ numbers to share. While I can't really test the real spreadsheet storage benchmark since doing that would require we actually put this structure into ScColumn for real), we can simulate it by using the former matrix backend container mixed_type_matrix, and compare it to multi_type_matrix which uses multi_type_vector as its backend storage. mixed_type_matrix also had its elements allocated on the heap and their memory locations stored in its primary array, so it had the same weakness as the current cell storage model in ScColumn. Here are the numbers. The test scenario is to 1) create a 100,000 by 1,000 matrix instance and fill it with numeric values, and 2) iterate through all its elements and calculate their total. The results are: mixed_type_matrix: 1) 0.887776 sec 2) 1.96097 sec multi_type_matrix: 1) 0.819243 sec 2) 0.364899 sec The instantiation and insertion performance is only slightly faster, but element iteration performance is noticeably faster with multi_type_matrix. The test code was compiled with g++ with only -Os flag. I haven't tested it with any other optimization flags that gcc provides. Best, Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #9
Marco Cecchetti wrote: A survey on the state of svg text support link: https://docs.google.com/document/d/1hc-0Jh78PiVgn7vT9VRlhv9wlwkBCBqE2bN7v4Ogmhk/edit?pli=1# Hi Marco, nice research writeup - I wonder if some distilled version of that would be possible as a README in filter/source/svg - always good to preserve rationale for later hackers looking at the code. ;) Given the contraints, I agree with your conclusion, but would like to ask you to make the choice between absolute glyph positions (and native font runs) configurable (can be a hidden config item or somesuch). Since it's a rather nasty tradeoff, for high-fidelity presentations, given my past experience, people would probably prefer exactly-rendered text ... Cheers, -- Thorsten pgpjfzwCHB460.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC 2012][Collaboration] status, ideas
Hi Matúš, On Friday, 2012-07-20 22:35:53 +0200, Matúš Kukan wrote: https://gerrit.libreoffice.org/#/c/336/ See my nitpicking there.. Right; there is a need to associated XFrames - or SfxSomething's with collaboration sessions I suppose that bit needs doing; It's associated to ScDocFuncSend. But It does not work if we - open another document | receive another channel - between receiving channel and setting session for document belonging to that channel. Is that '|' as in one or the other? Or the sequence of opening another document and receiving another channel? Anyhow, I think that could be solved by queuing the requested channels while an association of channel with document is in progress. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpwg1hHFx2d3.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source
vcl/source/app/vclevent.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 222b7032153cfd3a6f5e12e2fc855ccabc2ea769
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jul 23 14:53:27 2012 +0100
fdo#47368 - fix one potential re-enterancy hazard around even emission
Change-Id: I8be50fb82d1333731dae825b1785e981fe69adbd
Signed-off-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 613a659..2656c15 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -69,7 +69,10 @@ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
ImplDelData aDel( pWinEvent-GetWindow() );
while ( aIter != aCopy.end() ! aDel.IsDead() )
{
-(*aIter).Call( pEvent );
+Link rLink = *aIter;
+// check this hasn't been removed in some re-enterancy scenario
fdo#47368
+if( std::find(m_aListeners.begin(), m_aListeners.end(), rLink) !=
m_aListeners.end() )
+rLink.Call( pEvent );
aIter++;
}
}
@@ -77,7 +80,9 @@ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
{
while ( aIter != aCopy.end() )
{
-(*aIter).Call( pEvent );
+Link rLink = *aIter;
+if( std::find(m_aListeners.begin(), m_aListeners.end(), rLink) !=
m_aListeners.end() )
+rLink.Call( pEvent );
aIter++;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS
On Mon, Jul 23, 2012 at 10:06 AM, Norbert Thiebaud nthieb...@gmail.com wrote: On Mon, Jul 23, 2012 at 9:48 AM, Thorsten Behrens t...@documentfoundation.org wrote: Jan Holesovsky wrote: Thanks so much for that! - looks great to me; we should probably remove the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse others too, right? :-) No idea - Norbert, you were refactoring that recently, any opinion? no I (should) not have touched that... I will run a test after the next builbot iteration to verify the fix... but reading I would concur to +1 ok so vertical rulers looks fine on master... so +1 Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - boost/boost.4127.warnings.patch boost/makefile.mk i18npool/qa i18npool/source
boost/boost.4127.warnings.patch| 19
boost/makefile.mk |2
i18npool/qa/cppunit/test_breakiterator.cxx | 80 +++
i18npool/source/breakiterator/data/README | 722 +
4 files changed, 823 insertions(+)
New commits:
commit b8b792babfa63ce2f59104117c961e96d8e265a7
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 23 16:07:11 2012 +0100
Related: boost#4127 strict-aliasing rules warning
Change-Id: I9b4f9009c29276054ff94a427adf51c2094377b5
diff --git a/boost/boost.4127.warnings.patch b/boost/boost.4127.warnings.patch
new file mode 100644
index 000..11a955f
--- /dev/null
+++ b/boost/boost.4127.warnings.patch
@@ -0,0 +1,19 @@
+--- misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp (revision 69250)
misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp(revision 69251)
+@@ -50,5 +50,16 @@
+ if( initialized_ )
+ {
++#if defined( __GNUC__ )
++
++// fixes incorrect aliasing warning
++T * p = reinterpret_cast T* ( storage_.data_ );
++p-~T();
++
++#else
++
+ reinterpret_cast T* ( storage_.data_ )-~T();
++
++#endif
++
+ initialized_ = false;
+ }
diff --git a/boost/makefile.mk b/boost/makefile.mk
index e223ddf..5ce795f 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -53,6 +53,8 @@ TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a
PATCH_FILES=$(TARFILE_NAME).patch
#https://svn.boost.org/trac/boost/ticket/3780
PATCH_FILES+=boost.3780.aliasing.patch
+#https://svn.boost.org/trac/boost/ticket/4127
+PATCH_FILES+=boost.4127.warnings.patch
#https://svn.boost.org/trac/boost/ticket/4713
PATCH_FILES+=boost.4713.warnings.patch
#https://svn.boost.org/trac/boost/ticket/5119
commit a1cb33edbbb03bbb5f856d8c180b8ad97bd708b0
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 23 15:20:04 2012 +0100
Related: #i13494# regression tests for word iterator
Change-Id: Ifad0a8ae01386db80a5eca9dfba8ee6841980139
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index b72deda..f983686 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -281,6 +281,86 @@ void TestBreakIterator::testWordBoundaries()
CPPUNIT_ASSERT(m_xBreak-isEndWord(aTest, aBounds.endPos, aLocale,
mode));
}
}
+
+//See https://issues.apache.org/ooo/show_bug.cgi?id=13494
+{
+const rtl::OUString aBase(xxAAxxBBxxCCxx);
+const sal_Unicode aTests[] =
+{
+'\'', ';', ',', '.', '!', '@', '#', '%', '', '*',
+'(', ')', '_', '-', '{', '}', '[', ']', '\', '/',
+'\\', '?', '~', '$', '+', '^', '=', '', '', '|'
+};
+
+const sal_Int32 aDoublePositions[] = {0, 2, 4, 6, 8, 10, 12, 14};
+for (size_t j = 0; j SAL_N_ELEMENTS(aTests); ++j)
+{
+rtl::OUString aTest = aBase.replace('x', aTests[j]);
+sal_Int32 nPos = -1;
+size_t i = 0;
+do
+{
+CPPUNIT_ASSERT(i SAL_N_ELEMENTS(aDoublePositions));
+nPos = m_xBreak-nextWord(aTest, nPos, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
+CPPUNIT_ASSERT(nPos == aDoublePositions[i++]);
+}
+while (nPos aTest.getLength());
+nPos = aTest.getLength();
+i = SAL_N_ELEMENTS(aDoublePositions)-1;
+do
+{
+nPos = m_xBreak-previousWord(aTest, nPos, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
+CPPUNIT_ASSERT(nPos == aDoublePositions[--i]);
+}
+while (nPos 0);
+}
+
+const sal_Int32 aSinglePositions[] = {0, 1, 3, 4, 6, 7, 9, 10};
+for (size_t j = 1; j SAL_N_ELEMENTS(aTests); ++j)
+{
+rtl::OUString aTest = aBase.replaceAll(rtl::OUString(xx),
rtl::OUString(aTests[j]));
+sal_Int32 nPos = -1;
+size_t i = 0;
+do
+{
+CPPUNIT_ASSERT(i SAL_N_ELEMENTS(aSinglePositions));
+nPos = m_xBreak-nextWord(aTest, nPos, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
+CPPUNIT_ASSERT(nPos == aSinglePositions[i++]);
+}
+while (nPos aTest.getLength());
+nPos = aTest.getLength();
+i = SAL_N_ELEMENTS(aSinglePositions)-1;
+do
+{
+nPos = m_xBreak-previousWord(aTest, nPos, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES).startPos;
+CPPUNIT_ASSERT(nPos == aSinglePositions[--i]);
+}
+while (nPos 0);
+}
+
+const sal_Int32 aSingleQuotePositions[] = {0, 1, 9, 10};
+CPPUNIT_ASSERT(aTests[0] == '\'');
+{
+rtl::OUString aTest = aBase.replaceAll(rtl::OUString(xx),
[PATCH-3-6-0] fdo#47368 - many crashes with a11y on OS/X ...
Hi guys, Norbert's trace with bugs suggested a great site for the source of this; an unfortunately outdated copy of listeners that can be emitted after they are removed. This simple patch uses the list copy for safe iteration, while checking the parent listener is still registered. At least, I hope it does ;-) kudos to Norbert for managing to reproduce it on a build with symbols. 2x extra reviews much appreciated to take it to -3-6-0: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=222b7032153cfd3a6f5e12e2fc855ccabc2ea769 Of course, it is -possible- that continuing to emit listener that have been already removed is required by some dark corner of the code (if so it is prolly best to find it sooner rather than later). 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] .: 3 commits - oox/inc oox/source writerfilter/source
oox/inc/oox/mathml/importutils.hxx |7 +
oox/source/mathml/importutils.cxx | 16
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 99 ++---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |6 +
4 files changed, 83 insertions(+), 45 deletions(-)
New commits:
commit fd11c723d0bbaa50421baf9806295ec079ab
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jul 23 17:15:21 2012 +0200
rtftok: cleanup - use M_TOKEN() macro
Change-Id: If51def3c7c798104fd6dec9cf38473e5d70420fc
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1338542..3581f30 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -68,6 +68,7 @@
#include rtffly.hxx
#define TWIP_TO_MM100(TWIP) ((TWIP) = 0 ? (((TWIP)*127L+36L)/72L) :
(((TWIP)*127L-36L)/72L))
+#define M_TOKEN(token) OOX_TOKEN(officeMath, token)
using std::make_pair;
using rtl::OString;
@@ -1402,73 +1403,46 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
// Nothing to do here (just enter the destination) till
RTF_MMATHPR is implemented.
break;
case RTF_MOMATH:
-{
-uno::Referencexml::sax::XFastAttributeList aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_oMath, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MOMATH;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(oMath));
+m_aStates.top().nDestinationState = DESTINATION_MOMATH;
break;
case RTF_MR:
m_aStates.top().nDestinationState = DESTINATION_MR;
break;
case RTF_MF:
-{
-uno::Referencexml::sax::XFastAttributeList aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_f, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MF;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(f));
+m_aStates.top().nDestinationState = DESTINATION_MF;
break;
case RTF_MFPR:
-{
-uno::Referencexml::sax::XFastAttributeList aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_fPr, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MFPR;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(fPr));
+m_aStates.top().nDestinationState = DESTINATION_MFPR;
break;
case RTF_MCTRLPR:
-{
-uno::Referencexml::sax::XFastAttributeList aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_ctrlPr, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MCTRLPR;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(ctrlPr));
+m_aStates.top().nDestinationState = DESTINATION_MCTRLPR;
break;
case RTF_MNUM:
-{
-uno::Referencexml::sax::XFastAttributeList aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_num, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MNUM;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(num));
+m_aStates.top().nDestinationState = DESTINATION_MNUM;
break;
case RTF_MDEN:
-{
-uno::Referencexml::sax::XFastAttributeList aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_den, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MDEN;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(den));
+m_aStates.top().nDestinationState = DESTINATION_MDEN;
break;
case RTF_MACC:
-{
-uno::Referencexml::sax::XFastAttributeList aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_acc, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MACC;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(acc));
+m_aStates.top().nDestinationState = DESTINATION_MACC;
break;
case RTF_MACCPR:
-{
-uno::Referencexml::sax::XFastAttributeList aAttribs;
-m_aMathBuffer.appendOpeningTag(oox::NMSP_officeMath |
oox::XML_accPr, aAttribs);
-m_aStates.top().nDestinationState = DESTINATION_MACCPR;
-}
+m_aMathBuffer.appendOpeningTag(M_TOKEN(accPr));
+m_aStates.top().nDestinationState = DESTINATION_MACCPR;
break;
case RTF_MCHR:
m_aStates.top().nDestinationState = DESTINATION_MCHR;
break;
[PUSHED] Re: [REVIEW 3-6-0] fdo#52232 Hidden MediaWiki options page
On 23/07/12 14:02, Michael Meeks wrote: On Mon, 2012-07-23 at 12:42 +0100, Caolán McNamara wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=aebf5bf22304c73e121b16dc0b51f909c5f34c28 fdo#52232 ConfigurationSet wrapper unusable for localized properties. It bluntly reverts the adaption of the affected code to the simplified C++ configuration access. Pushed to 3-6. Need +2 for 3-6-0 IIRC And now I read it properly - it's affects just the cui code, not configmgr itself ;-) so - it seems reasonable for 3.6.0, you have my +1 - one more needed. pushed to libreoffice-3-6-0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6-0] Fix vertical rulers on MacOS
On Mon, Jul 23, 2012 at 9:48 AM, Thorsten Behrens t...@documentfoundation.org wrote: Jan Holesovsky wrote: Thanks so much for that! - looks great to me; we should probably remove the AquaSalGraphics::GetGlyphBoundRect() so that it does not confuse others too, right? :-) No idea - Norbert, you were refactoring that recently, any opinion? no I (should) not have touched that... I will run a test after the next builbot iteration to verify the fix... but reading I would concur to +1 Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - cui/source
cui/source/inc/treeopt.hxx |9 -
cui/source/options/treeopt.cxx | 318 +
2 files changed, 175 insertions(+), 152 deletions(-)
New commits:
commit 734b653a95a88478ca53d7010aefc82ad78f6740
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 18 14:00:57 2012 +0200
fdo#52232 ConfigurationSet wrapper unusable for localized properties
The comphelper::ConfigurationSet wrapper, used by the automatically
generated
headers to access the configuration data from C++, is based on
com.sun.star.configuration.ReadOnlyAccess/ReadWriteAcess that provide an
all-
locales view of the configuration data, i.e., a localized property is
represented as a UNO object implementing various container interfaces (to
access the per-locale values) instead of a plain value.
Hence,
xLeaveAccess-getByName(C2U(Label)) = sLeafLabel;
silently changed its meaning, now silently failing to extract a string and
leaving sLeafLabel empty, which in turn causes the labels of extension
option
pages to disappear from the Tools - Options... dialog.
This partially reverts commit 161c3f179f71eda2a32dabaf68ff6fb3ba487062 Some
more comphelper/configurationhelper clean up.
Change-Id: I584c682ea6a7c8b9444b34f1867cc553ad160802
(cherry picked from commit aebf5bf22304c73e121b16dc0b51f909c5f34c28)
Signed-off-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 10ae81acb68ba6e03cfe8907d8a0a1ea33067376)
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 38700e6..64d2b9b 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -138,6 +138,7 @@ struct LastPageSaver
// class OfaTreeOptionsDialog
namespace com { namespace sun { namespace star { namespace frame { class
XFrame; } } } }
+namespace com { namespace sun { namespace star { namespace container { class
XNameAccess; } } } }
namespace com { namespace sun { namespace star { namespace lang { class
XMultiServiceFactory; } } } }
namespace com { namespace sun { namespace star { namespace awt { class
XContainerWindowProvider; } } } }
@@ -191,8 +192,12 @@ private:
com::sun::star::lang::XMultiServiceFactory xMFac,
const com::sun::star::uno::Reference
com::sun::star::frame::XFrame
xFrame );
-Module* LoadModule( const rtl::OUString rModuleIdentifier );
-voidLoadNodes( Module* pModule,
+Module* LoadModule( const rtl::OUString rModuleIdentifier,
+const com::sun::star::uno::Reference
+com::sun::star::container::XNameAccess
xRoot );
+voidLoadNodes( const com::sun::star::uno::Reference
+com::sun::star::container::XNameAccess
xRoot,
+ Module* pModule,
const rtl::OUString rExtensionId,
VectorOfNodes rOutNodeList );
voidInsertNodes( const VectorOfNodes rNodeList );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 95a52c6..66c7b47 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -67,11 +67,11 @@
#include com/sun/star/frame/XModuleManager.hpp
#include com/sun/star/loader/CannotActivateFactoryException.hpp
#include com/sun/star/util/XMacroExpander.hpp
+#include comphelper/configurationhelper.hxx
#include comphelper/processfactory.hxx
#include editeng/optitems.hxx
#include editeng/unolingu.hxx
#include linguistic/misc.hxx
-#include officecfg/Office/OptionsDialog.hxx
#include osl/module.hxx
#include osl/process.h
#include rtl/bootstrap.hxx
@@ -1995,12 +1995,18 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const
rtl::OUString rExtension
{
Module* pModule = NULL;
Reference XMultiServiceFactory xMSFac =
comphelper::getProcessServiceFactory();
+// open optionsdialog.xcu
+Reference XNameAccess xRoot(
+::comphelper::ConfigurationHelper::openConfig(
+xMSFac, C2U(org.openoffice.Office.OptionsDialog),
+::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
+DBG_ASSERT( xRoot.is(), OfaTreeOptionsDialog::LoadExtensionOptions(): no
config );
// when called by Tools - Options then load nodes of active module
if ( rExtensionId.isEmpty() )
-pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference XFrame
() ) );
+pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference XFrame
() ), xRoot );
VectorOfNodes aNodeList;
-LoadNodes( pModule, rExtensionId, aNodeList );
+
[Libreoffice-commits] .: boost/boost.4127.warnings.patch
boost/boost.4127.warnings.patch |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e7ffa3e2d36a800bf2f2d91ca6d08887a21caa31
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 23 16:25:19 2012 +0100
my patch applied it, other's don't, so regenerating
Change-Id: I7ffd382b6aa3954bc346d1ecc45607a417ad2509
diff --git a/boost/boost.4127.warnings.patch b/boost/boost.4127.warnings.patch
index 11a955f..b3e355d 100644
--- a/boost/boost.4127.warnings.patch
+++ b/boost/boost.4127.warnings.patch
@@ -1,6 +1,7 @@
--- misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp (revision 69250)
+++ misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp(revision 69251)
-@@ -50,5 +50,16 @@
+@@ -49,7 +49,18 @@
+ {
if( initialized_ )
{
+#if defined( __GNUC__ )
@@ -17,3 +18,4 @@
+
initialized_ = false;
}
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument
Hi Kohei, On Friday, 2012-07-20 10:10:48 -0400, Kohei Yoshida wrote: I'll add this configuration option during 3.7 cycle if this can wait until 3.7. If you guys need it earlier than that I could work on it and push it as a late feature if it's desperately needed for 3.6. I'd appreciate if you could do it for 3.6 as well, but it would need also translation, do we add that in stable branches? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpCMSzHOMTtQ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED:3-6] [URGENT] horrible performance regression
Stephan Bergmann píše v Út 17. 07. 2012 v 13:48 +0200: On 07/17/2012 12:10 AM, Lionel Elie Mamane wrote: Please cherry-pick 0cda6605844ef68e45db7a7c05cc4d09ef2bc49a (http://cgit.freedesktop.org/libreoffice/core/commit/?id=0cda6605844ef68e45db7a7c05cc4d09ef2bc49a and patch also attached) to libreoffice-3-6 in time for rc2. This would allow me to get some Base testers in 3.6 before release (as it is, embedded HSQLDB is so slow as to be unusable). Just for the record: My understanding is that cherry picking shall generally happen from master to branches like libreoffice-3-6. The above link unfortunately does not make it clear that 0cda6605844ef68e45db7a7c05cc4d09ef2bc49a is not on master, but rather on features/base-preview. (It meanwhile got cherry-picked to master too as http://cgit.freedesktop.org/libreoffice/core/commit/?id=1e89c6f3d1edee7d112fc2549d2f6ad16e65659e.) It is in both 3-6 and 3-6-0 branches. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-6] fdo#50975 crash in about dialog on RHEL-5
So rsvg_handle_new_from_data calls rsvg_handle_close already it turns out. In new versions of librsvg you can call rsvg_handle_close on a handle safely as many times as you want, but in older versions like that of RHEL-5 you can only call it once. http://cgit.freedesktop.org/libreoffice/core/commit/?id=682cb83ed59233decbeeaff68c4d871442b58bb1 i.e. just drop rsvg_handle_close because rsvg_handle_new_from_data already did it C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH (partial)] fdo#48549 System::Beep() removal
Hi Philipp, On Monday, 2012-07-23 16:01:56 +0200, Philipp Riemer wrote: But I do not know what the general opinion of the LO developers for that cases is... Maybe they are happy without any logging in there... Whould love to hear from the others what they think. In general such cases deserve a SAL_WARN, so that at least in a debug build some output is logged to the console. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpyPcVfJc0oL.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument
On 07/23/2012 11:36 AM, Eike Rathke wrote: Hi Kohei, On Friday, 2012-07-20 10:10:48 -0400, Kohei Yoshida wrote: I'll add this configuration option during 3.7 cycle if this can wait until 3.7. If you guys need it earlier than that I could work on it and push it as a late feature if it's desperately needed for 3.6. I'd appreciate if you could do it for 3.6 as well, but it would need also translation, do we add that in stable branches? Normally we don't, but we *may* have to somehow make an exception for this. Let me CC Andras and Petr on this. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: boost/boost.4127.warnings.patch
boost/boost.4127.warnings.patch | 42
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 31c4ac62dba8f8312ae094def9dfae4cd3fdc05a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 23 16:46:34 2012 +0100
ah, dos format breaks some patches
Change-Id: Id99429366485924ff35da63ebde1b5df11419d58
diff --git a/boost/boost.4127.warnings.patch b/boost/boost.4127.warnings.patch
index b3e355d..fe3c2bf 100644
--- a/boost/boost.4127.warnings.patch
+++ b/boost/boost.4127.warnings.patch
@@ -1,21 +1,21 @@
misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp (revision 69250)
-+++ misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp(revision 69251)
-@@ -49,7 +49,18 @@
- {
- if( initialized_ )
- {
-+#if defined( __GNUC__ )
-+
-+// fixes incorrect aliasing warning
-+T * p = reinterpret_cast T* ( storage_.data_ );
-+p-~T();
-+
-+#else
-+
- reinterpret_cast T* ( storage_.data_ )-~T();
-+
-+#endif
-+
- initialized_ = false;
- }
- }
+--- misc/boost_1_44_0/boost/smart_ptr/make_shared.hpp
misc/build/boost_1_44_0/boost/smart_ptr/make_shared.hpp
+@@ -49,7 +49,18 @@
+ {
+ if( initialized_ )
+ {
++#if defined( __GNUC__ )
++
++// fixes incorrect aliasing warning
++T * p = reinterpret_cast T* ( storage_.data_ );
++p-~T();
++
++#else
++
+ reinterpret_cast T* ( storage_.data_ )-~T();
++
++#endif
++
+ initialized_ = false;
+ }
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument
Eike Rathke píše v Po 23. 07. 2012 v 17:36 +0200: Hi Kohei, On Friday, 2012-07-20 10:10:48 -0400, Kohei Yoshida wrote: I'll add this configuration option during 3.7 cycle if this can wait until 3.7. If you guys need it earlier than that I could work on it and push it as a late feature if it's desperately needed for 3.6. I'd appreciate if you could do it for 3.6 as well, but it would need also translation, do we add that in stable branches? If the bug was already in LO-3.3, I would not break the UI/string freeze because of it. I think that such an old bug could wait few more months for LO-3.7. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source
vcl/source/components/rasterizer_rsvg.cxx | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit cd878743c11d977ec1c336918d795180983972e5
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 23 13:59:12 2012 +0100
Resolves: fdo#50975 rsvg_handle_new_from_data calls rsvg_handle_close
rsvg_handle_new_from_data calls rsvg_handle_fill_with_data which itself
calls
rsvg_handle_close on success, so we don't have to.
And older versions of librsvg (e.g. 2.16.1) don't protect against
rsvg_handle_close getting called twice, although new versions do,
so we crash on e.g. RHEL-5
Change-Id: I451075e50c9c2c7b07289356d7a92eb55db82f9f
(cherry picked from commit 682cb83ed59233decbeeaff68c4d871442b58bb1)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/source/components/rasterizer_rsvg.cxx
b/vcl/source/components/rasterizer_rsvg.cxx
index 00940c2..f5a7f57 100644
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ b/vcl/source/components/rasterizer_rsvg.cxx
@@ -117,7 +117,6 @@ public:
// LibRSVG
void rsvg_init() { (*mp_rsvg_init)(); }
RsvgHandle* rsvg_handle_new_from_data( const guint8* data, gsize size,
GError** error) { return( (*mp_rsvg_handle_new_from_data)( data, size, error )
); }
-gboolean rsvg_handle_close( RsvgHandle* handle, GError** error ) { return(
(*mp_rsvg_handle_close)( handle, error ) ); }
void rsvg_handle_set_dpi_x_y( RsvgHandle* handle, double dpix, double dpiy
) { (*mp_rsvg_handle_set_dpi_x_y)( handle, dpix, dpiy ); }
void rsvg_handle_get_dimensions( RsvgHandle* handle, RsvgDimensionData*
dimensions ) { (*mp_rsvg_handle_get_dimensions)( handle, dimensions ); }
gboolean rsvg_handle_render_cairo( RsvgHandle* handle, cairo_t* cairo ) {
return( (*mp_rsvg_handle_render_cairo)( handle, cairo ) ); }
@@ -137,7 +136,6 @@ private:
// LibRSVG
void (*mp_rsvg_init)( void );
RsvgHandle* (*mp_rsvg_handle_new_from_data)( const guint8*, gsize,
GError** );
-gboolean (*mp_rsvg_handle_close)( RsvgHandle*, GError** );
void (*mp_rsvg_handle_set_dpi_x_y)( RsvgHandle*, double, double );
void (*mp_rsvg_handle_get_dimensions)( RsvgHandle*, RsvgDimensionData* );
gboolean (*mp_rsvg_handle_render_cairo)( RsvgHandle*, cairo_t* );
@@ -189,14 +187,12 @@ LibraryWrapper::LibraryWrapper() :
{
mp_rsvg_init = ( void (*)( void ) ) osl_getAsciiFunctionSymbol(
mpRSVGLib, rsvg_init );
mp_rsvg_handle_new_from_data = ( RsvgHandle* (*)( const guint8*,
gsize, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib,
rsvg_handle_new_from_data );
-mp_rsvg_handle_close = ( gboolean (*)( RsvgHandle*, GError** ) )
osl_getAsciiFunctionSymbol( mpRSVGLib, rsvg_handle_close );
mp_rsvg_handle_set_dpi_x_y = ( void (*)( RsvgHandle*, double, double )
) osl_getAsciiFunctionSymbol( mpRSVGLib, rsvg_handle_set_dpi_x_y );
mp_rsvg_handle_get_dimensions = ( void (*)( RsvgHandle*,
RsvgDimensionData* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib,
rsvg_handle_get_dimensions );
mp_rsvg_handle_render_cairo = ( gboolean (*)( RsvgHandle*, cairo_t* )
) osl_getAsciiFunctionSymbol( mpRSVGLib, rsvg_handle_render_cairo );
if( !( mp_rsvg_init
mp_rsvg_handle_new_from_data
- mp_rsvg_handle_close
mp_rsvg_handle_set_dpi_x_y
mp_rsvg_handle_get_dimensions
mp_rsvg_handle_render_cairo ) )
@@ -415,12 +411,15 @@ uno::Reference graphic::XGraphic
Rasterizer::implGetXGraphicFromSurface( cair
}
while( nReadSize == nBlockSize );
-if( aDataBuffer.size()
-( NULL != ( mpRsvgHandle = rLib.rsvg_handle_new_from_data(
reinterpret_cast sal_uInt8* ( aDataBuffer[ 0 ] ),
-
aDataBuffer.size(), NULL ) ) )
-!rLib.rsvg_handle_close( mpRsvgHandle, NULL ) )
+if (aDataBuffer.size())
{
-implFreeRsvgHandle();
+//See: fdo#50975 rsvg_handle_new_from_data calls
+//rsvg_handle_fill_with_data which itself calls rsvg_handle_close
+//on success. Older versions of librsvg (e.g. 2.16.1) don't
+//protect against rsvg_handle_close getting called twice, so we
+//shouldn't additionally call svg_handle_close here.
+mpRsvgHandle = rLib.rsvg_handle_new_from_data( reinterpret_cast
sal_uInt8* ( aDataBuffer[ 0 ] ),
+
aDataBuffer.size(), NULL );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - sc/source
sc/source/core/data/table2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aeebb0d20c6163ecbea47bb84fc83dd34b1438fa
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Jul 22 21:15:37 2012 +0200
use correct source table for cond format paste, fdo#52340
(cherry picked from commit 669784c6653732fd2ad43024332957d5df5652bb)
Change-Id: I7c4cb1a5f31ba9e37a280af2243a13c57914cb2f
Signed-off-by: Eike Rathke er...@redhat.com
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 18dfda4..9dd2afb 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -658,7 +658,7 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW
nRow1, SCCOL nCol2, SCRO
ScConditionalFormatList* pOldCondFormatList =
pTable-mpCondFormatList.get();
for(SCCOL i = nCol1; i = nCol2; ++i)
{
-ScAttrIterator* pIter = aCol[i-nDx].CreateAttrIterator( nRow1-nDy,
nRow2-nDy );
+ScAttrIterator* pIter = pTable-aCol[i-nDx].CreateAttrIterator(
nRow1-nDy, nRow2-nDy );
SCROW nStartRow = 0, nEndRow = 0;
const ScPatternAttr* pPattern = pIter-Next( nStartRow, nEndRow );
sal_uInt32 nId =
((SfxUInt32Item)pPattern-GetItem(ATTR_CONDITIONAL)).GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/matrix-new-backend' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Tinderbox nightlies broken (was Re: No Win builds?)
On 07/23/2012 12:38 PM, Michael Stahl wrote: On 22/07/12 16:36, Lubos Lunak wrote: There was one more thing broken. The recent changes to get dev-install working changed the package format built in the 'build' target to .zip, so there was no .msi package to upload. I've reverted that change and moved the FORCE2ARCHIVE part to dev-install, oh i didn't notice that FORCE2ARCHIVE would prevent MSI from being built, but looking at the actual instsetoo_native/util/makefile.mk it overrides PKGFORMAT, so it's not a surprise :) if we want to build a MSI anyway, then building the archive in dev-install makes a lot of sense. See http://cgit.freedesktop.org/libreoffice/core/commit/?id=05250e05b00f363c2c65e6099714070beea89ca0 sb118: independent of PKGFORMAT, always build a default-language openoffice product also in archive format, so that tests that require an OOo installation (like smoketestoo_native) have one available and http://cgit.freedesktop.org/libreoffice/core/commit/?id=292efdc53861499dbef66122a5299b01019e265b sb118: always set PKGFORMAT (so that always building openoffice_en-US.archive in instsetoo_native/util also works on Windows) for how this was achieved in OOo times. On all platforms, it always built an additional archive installation set in module insetsetoo_native, so that during the later build of module smoketestoo_native that archive installation set could be unpacked and used for the smoke test (as well as any subsequenttests; only on Windows the installation set was not unpacked once to solver/*/installation, but for each test anew to a temp folder, to work around problems with long file paths). No idea how much of that got broken in the meantime though. (As for non-Windows, the solver/*/installation set used by the various tests is now produced by another means via make dev-install.) Stephan ___ 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 52340, which changed state. Bug 52340 Summary: EDITING: CRASH when Copy+Paste row with conditional formatting to other sheet and back to inserted row https://bugs.freedesktop.org/show_bug.cgi?id=52340 What|Old Value |New Value Resolution||FIXED Status|ASSIGNED|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
[PUSHED][3-5][3-6] Re: [REVIEW 3-6] fdo#50975 crash in about dialog on RHEL-5
On 23/07/12 17:41, Caolán McNamara wrote: So rsvg_handle_new_from_data calls rsvg_handle_close already it turns out. In new versions of librsvg you can call rsvg_handle_close on a handle safely as many times as you want, but in older versions like that of RHEL-5 you can only call it once. http://cgit.freedesktop.org/libreoffice/core/commit/?id=682cb83ed59233decbeeaff68c4d871442b58bb1 i.e. just drop rsvg_handle_close because rsvg_handle_new_from_data already did it i was wondering why you'd removed the content of the then branch until i realized that that is actually error handling code for a failed close call... it's really painful to read code with 2 side effects in the if clause pushed to libreoffice-3-5. libreoffice-3-6 2 more necessary for -3-6-0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'feature/calc-empty-string-config'
New branch 'feature/calc-empty-string-config' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
