Re: [Libreoffice] map files: how to update? [was: cppu::OPropertySetHelper ABI backwards compatibility]
2) for MSVC, I'm rather more disarmed; made some incomplete guesses.
?queryInterface@OPropertySetHelper@cppu@@W3AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
?queryInterface@OPropertySetHelper@cppu@@W7AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
The undname command that comes with MSVC can be used to demangle MSVC++
identifiers; these two are:
[thunk]:public: virtual class com::sun::star::uno::Any __cdecl
cppu::OPropertySetHelper::queryInterface`adjustor{4}' (class
com::sun::star::uno::Type const )
[thunk]:public: virtual class com::sun::star::uno::Any __cdecl
cppu::OPropertySetHelper::queryInterface`adjustor{8}' (class
com::sun::star::uno::Type const )
but what that means I have no idea;)
It also seems to me that the msvc_win32_x86_64.map is out of sync: it
has no UDK_3.7, nor UDK_3.8 section; this looks highly suspicious. If
someone is willing to take a look at it and fix it?
Whenever somebody (I, or somebody else) starts looking at the 64-bit MSVC port
again... In principle solenv/bin/remangle32to64.pl can be used to produce a
.map file for x64 MSVC from that for x86 MSVC.
--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Packaging of custom built extensions.
I have no deeper knowledge how to build deb packages. But you may want to have a look how we package extensions for ArchLinux: http://projects.archlinux.org/svntogit/packages.git/tree/libreoffice/trunk/PKGBUILD It's just extracting the .oxt stuff into the proper directory depending on your LibO installation path. -Andy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] EXAUSTOR INDUSTRIAL (11) 2887 4378
Title: Ventilador,Ventiladores,Exaustor,Exaustores,Ventilador de Teto,Ventilação,Ventilador de Parede,Ventilador de Coluna,Purificador,Purificador de Água Europa,Filtros,Refrigerador,Geladeira,Bebedouro,Bebedouro de Pressão,Bebedouro de Garrafão,Refresqueira,Suqueira,Ventilador Ventisilva,Bebedouros,Exaustores,Exaustor Industrial,Exaustor Axial,Exaustor Centrífugo,Ventilador Parede 65 cm,Tufão,Ventisol,Ventidelta,Loren Sid,Arno, ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] WinDbg ?
Are the free Windows debugging tools: http://msdn.microsoft.com/en-us/windows/hardware/gg463009 any good ? Sure they are. Useful for lower-level debugging where the Visual Studio debugger isn't powerful enough. Much closer to gdb-style debugging (even if these, too have a kind of GUI). Can be used to debug the kernel even. But they have a steep learning curve. (And a correspondingly speedy forgetting curve... [points at himself]) (or are they even free) ? ;-) Free as in beer, sure. And/or should we have steps on: http://wiki.documentfoundation.org/Development/How_to_debug As to how to go about debugging with them ? Well, assuming somebody has time to learn how to do that, why not... But I wouldn't expect normal users to be able to do it, no matter how good the instructions. There is code inside LO to produce more useful stack traces in crashes on Windows, isn't there? Do we (accidentally?) diable that? Do we strip symbols from binaries (or don't ship .pdb files) without thinking? How much larger would the installer / an installation be on Windows if we shipped symbols and made sure backtraces are displayed? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] map files: how to update? [was: cppu::OPropertySetHelper ABI backwards compatibility]
On Aug 25, 2011, at 11:00 PM, Lionel Elie Mamane wrote: On Thu, Aug 25, 2011 at 10:10:16PM +0200, Stephan Bergmann wrote: On Aug 25, 2011, at 6:09 PM, Lionel Elie Mamane wrote: On Tue, Aug 23, 2011 at 07:37:06PM +0200, Stephan Bergmann wrote: On Aug 23, 2011, at 5:00 PM, Lionel Elie Mamane wrote: - There is no reason for OPropertySetHelper2 to have a non-virtual dtor. (And thus no reason to disable warnings.) Why does OPropertySetHelper have a non-virtual dtor, actually? A historic mistake (that could not be corrected without breaking compatibility). - The OPropertySetHelper::queryInterface symbol must not be removed from gcc3.map. It was there in duplicate, I remove it only once. It is right there, three lines up from the one removed. Ah, missed that. - For the question of which symbols for OPropertySetHelper2 to list in the various map files, see http://udk.openoffice.org/common/man/apicppclasses.html (you probably need access to builds on the various platforms to find out the correct mangled names). OK, thanks will read. As to access to builds on the various platforms, that's rather optimistic… Yes, sure. As Michael already wrote, modus operandi is that somebody with access to any given platform helps out. -Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] map files: how to update? [was: cppu::OPropertySetHelper ABI backwards compatibility]
On Aug 26, 2011, at 8:02 AM, Tor Lillqvist wrote:
2) for MSVC, I'm rather more disarmed; made some incomplete guesses.
?queryInterface@OPropertySetHelper@cppu@@W3AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
?queryInterface@OPropertySetHelper@cppu@@W7AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
The undname command that comes with MSVC can be used to demangle MSVC++
identifiers; these two are:
[thunk]:public: virtual class com::sun::star::uno::Any __cdecl
cppu::OPropertySetHelper::queryInterface`adjustor{4}' (class
com::sun::star::uno::Type const )
[thunk]:public: virtual class com::sun::star::uno::Any __cdecl
cppu::OPropertySetHelper::queryInterface`adjustor{8}' (class
com::sun::star::uno::Type const )
but what that means I have no idea;)
For a class with multiple base classes, there is generally demand to adjust the
this-pointer when calling a virtual function of the derived class from within a
function of one of the base classes. Thats what these thunks are for.
-Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] WinDbg ?
There is code inside LO to produce more useful stack traces in crashes on Windows, isn't there? Do we (accidentally?) diable that? Do we strip symbols from binaries (or don't ship .pdb files) without thinking? How much larger would the installer / an installation be on Windows if we shipped symbols and made sure backtraces are displayed? We don't really need to ship symbols. For every released version of LibO you can just place the pdb files in a public http server and then tell WinDbg or Visual Studio (probably a much better tool for not very experienced users) to get them for there. If we do it this way, we don't have to add new files to the installation. Although a much better option (in my opinion) would be to use an automatic crash report system, so the normal user doesn't have to mess with such complicated and scary tools :) -- Jesús Corrius je...@softcatala.org Document Foundation founding member Mobile: +34 661 11 38 26 Skype: jcorrius | Twitter: @jcorrius ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Daily Builds from Master Mac OSX - does not receive foreground focus on launch ?
Hi all, While testing the daily builds from master on Mac OSX, I have noticed that when the app is started the main app window no longer gets foreground focus and is displayed behind other windows already open on the desktop. Testbuilds : 22/08 and 25/08 Can anyone else here confirm/deny ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Daily Builds from Master Mac OSX - does not receive foreground focus on launch ?
On Fri, 2011-08-26 at 09:34 +0200, Alexander Thurgood wrote: Hi all, While testing the daily builds from master on Mac OSX, I have noticed that when the app is started the main app window no longer gets foreground focus and is displayed behind other windows already open on the desktop. Testbuilds : 22/08 and 25/08 Is there a daily build where that doesn't happen, and then a daily build where it does happen ? That's, hopefully, the real point of the dailies. Bisect it down to the first build when it happens if possible, take note of the build-ids in help-about of the last version where its ok and the first version where its broken. Those are the git ids of the repositories at build time. The first chunk is for the main repo, and the others for the various other repos. So if the working/broken bounds are known it becomes easy to find the commit that causes the change. Even a manual inspection of git log workingid...brokenid is likely to highlight the baddy C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Daily Builds from Master Mac OSX - does not receive foreground focus on launch ?
Hi Caolán, Le 26/08/11 11:08, Caolán McNamara a écrit : Is there a daily build where that doesn't happen, and then a daily build where it does happen ? That's, hopefully, the real point of the dailies. Bisect it down to the first build when it happens if possible, take note of the build-ids in help-about of the last version where its ok and the first version where its broken. Those are the git ids of the repositories at build time. The first chunk is for the main repo, and the others for the various other repos. Am in the process of working back through daily builds now to see where this changed, but just wanted to check whether anyone else had noticed this as well. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] WinDbg ?
On Fri, 2011-08-26 at 08:42 +0200, Jesús Corrius wrote: Although a much better option (in my opinion) would be to use an automatic crash report system That's basically there, in theory at least, just disabled with no place to send them to currently. --enable-crashdump, ENABLE_CRASHDUMP CRASHREP etc. Though, without the original server-side of that, fuzzy stack matching (if there was any) and so forth, might be a better approach to glue it to google-breakpad instead or something that's a more generic solution rather than a home-rolled one ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Daily Builds from Master Mac OSX - does not receive foreground focus on launch ?
Le 26/08/11 11:08, Caolán McNamara a écrit : Hi all, Is there a daily build where that doesn't happen, and then a daily build where it does happen ? That's, hopefully, the real point of the dailies. Bisect it down to the first build when it happens if possible, take note of the build-ids in help-about of the last version where its ok and the first version where its broken. Those are the git ids of the repositories at build time. The first chunk is for the main repo, and the others for the various other repos. The problem is apparent all the way back to at least the build of 27/06 in the builds from : Index of /daily/Mac_OSX_10.6.0_gcc-4.0.1_x86/master but unfortunately I don't have anything older than that to test when it first appeared and the daily build server holds less than a month's worth of disk images. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech steering call ...
On Thu, 2011-08-25 at 18:05 +0100, Michael Meeks wrote: + intermittent(?) dictionary loss in 3.4.3 + https://bugs.freedesktop.org/show_bug.cgi?id=37195 + most annoying for testers: + who do a lots of upgrades etc. I read through it, I despaired. Lots of heat and noise, but ideally what's needed is a concise how to reproduce from scratch, and clarification if it actually affects Linux. I had much better luck with http://bugs.freedesktop.org/show_bug.cgi?id=36678 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [review] fdo#36678 Missing user-defined dictionaries with a specified language attribute via Spelling and Grammar
potential cherry-pick candidate for 3-4 Missing user-defined dictionaries with a specified language attribute via Spelling and Grammar F7 https://bugs.freedesktop.org/show_bug.cgi?id=36678 http://cgit.freedesktop.org/libreoffice/core/commit/?id=c9e6df76fffe84da7529d92cba7bb79e36d9cd15 To avoid calling a virtual method on an object (rParent) where rParent hasn't finished its construction yet so virtual methods don't work yet, the spell-check dialog has a hack to use postuserevent and finish the initialization later. Part of the initialization is run first though, and the list of languages to populate the add menu is generated before the second part of initialization is run which determines the languages available. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech steering call ...
2011/8/26 Caolán McNamara caol...@redhat.com: On Thu, 2011-08-25 at 18:05 +0100, Michael Meeks wrote: + intermittent(?) dictionary loss in 3.4.3 + https://bugs.freedesktop.org/show_bug.cgi?id=37195 + most annoying for testers: + who do a lots of upgrades etc. I read through it, I despaired. Lots of heat and noise, but ideally what's needed is a concise how to reproduce from scratch, and clarification if it actually affects Linux. wope reproduced it under openSUSE 11.4, see https://bugs.freedesktop.org/show_bug.cgi?id=37195#c32 I think the key is the configmgr.ini, see https://bugs.freedesktop.org/show_bug.cgi?id=37195#c24 So the bug seems to be that 'configmgr.ini' in the user profile isn't updated. (when someone upgrades from one version to another of the 3.4 series.) Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Daily Builds from Master Mac OSX - does not receive foreground focus on launch ?
Le 26/08/11 11:08, Caolán McNamara a écrit : Hi all, So if the working/broken bounds are known it becomes easy to find the commit that causes the change. Even a manual inspection of git log workingid...brokenid is likely to highlight the baddy Just to compare with 3.3.4 and 3.4.2, both launch with foreground focus even if other windows had focus on the desktop, so it would be a regression to current production behaviour. Will open bug report. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech steering call ...
On Fri, 2011-08-26 at 11:59 +0200, Andras Timar wrote: wope reproduced it under openSUSE 11.4, see https://bugs.freedesktop.org/show_bug.cgi?id=37195#c32 I don't ask why patients lie, I just assume they all do. :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Build breaks in instsetoo_native because of missing file xsec_xmlsec.dll
Hi, still no build :( Now it breaks in instsetoo_native because the file xsec_xmlsec.dll is missing. The file xsec-fw.dll, xmlsecurity.dll, and xmlsecen_US.res are in solver, but xsec_xmlsec.dll is missing. My configure options are: ./autogen.sh \ --with-directx-home=/cygdrive/c/Programme/Microsoft DirectX SDK (March 2009) \ --with-cl-home=/cygdrive/c/Programme/Microsoft Visual Studio 9.0/VC \ --disable-activex \ --disable-build-mozilla \ --disable-nss-module \ --disable-atl \ --disable-binfilter \ --with-midl-path=/cygdrive/c/Programme/Microsoft SDKs/Windows /v6.0A/bin \ --with-asm-home=/cygdrive/c/Programme/Microsoft Visual Studio 9.0/VC/bin \ --with-jdk-home=/cygdrive/c/Programme/Java/jdk1.6.0_20 \ --with-csc-path=/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5 \ --with-ant-home=/ant \ --with-mspdb-path=/cygdrive/c/Programme/Microsoft Visual Studio 9.0/Common7/IDE \ --without-junit \ --with-vendor=Regina \ --with-build-version=25Aug11 I use Cygwin on WinXp with MSVC 2008 Express. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Build break in module basic
Hi Tor, I follow your link, but I don't know how to use it. Kind regards Regina Tor Lillqvist schrieb: Maybe getting make 3.82 from http://ftpmirror.gnu.org/make/ helps, Or even our own make 3.82 with some useful debugging and warning options added from http://anongit.freedesktop.org/git/libreoffice/contrib/dev-tools.git/ (munge into the git URL of your choice depending on if you use the anongit server or the authenticated one). though I have no idea whether that builds in cygwin or not, Sure. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Build breaks in instsetoo_native because of missing file xsec_xmlsec.dll
On Fri, 2011-08-26 at 12:56 +0200, Regina Henschel wrote: Hi, still no build :( Now it breaks in instsetoo_native because the file xsec_xmlsec.dll is missing. The file xsec-fw.dll, xmlsecurity.dll, and xmlsecen_US.res are in solver, but xsec_xmlsec.dll is missing. --disable-build-mozilla \ --disable-nss-module \ I suspect there may be a mismatch between the ifdefs of scp2/source/ooo/file_library_ooo.scp and the xsec_xmlsec.dll line there and the other one in xmlsecurity/Module_xmlsecurity.mk Probably scp2 needs an extra ifdef for NSS_MODULE_FOO to not include xsec_xmlsec.dll or xsec_xmlsec.dll can actually be built under windows without nss and the .mk there needs tweaking. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] smoke test fail
On Fri, Aug 26, 2011 at 12:36:36AM +0200, Jenei Gábor jen...@elte.hu wrote: Yes,the problem is there, actually I found out that in type*.cxx there is a reference counting variable,which seems to be not 0 in the end, so it looks like a memory leak. But I don't know yet where, and what's the reason. Can you help me? I would suggest building without setting dbglevel, then if you are interested, you can try trebuilding 'cppu' (or other modules) with dbglevel=1 or 2 and see if smoketest fails. If that happens, you can know at least which module causes the problem. pgp0I0rDFI9j3.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] minutes of tech steering call ...
On Fri, 2011-08-26 at 11:14 +0100, Caolán McNamara wrote: On Fri, 2011-08-26 at 11:59 +0200, Andras Timar wrote: wope reproduced it under openSUSE 11.4, see https://bugs.freedesktop.org/show_bug.cgi?id=37195#c32 I don't ask why patients lie, I just assume they all do. :-) My working theory at the moment is that while we are packaging the migrationoo2 and migrationoo3 components we are only registering the migrationoo2 component in packcomponents, which suggests that migrations might not be happening correctly. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [review] missing migrationoo3 component, fdo#37195
proposing cherry-picking of http://cgit.freedesktop.org/libreoffice/core/commit/?id=5e4c9fb9bbf12b40afbefb30e8d71d6e046b5bd0 back to 3-4. We bundle migrationoo3 into our install sets, but it's not registered. I strongly suspect it's the trigger for fdo#37195 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] build error
On Wed, 2011-08-24 at 15:56 +0200, Jenei Gábor wrote: Hello, While building a totally new build on Debian 6 32bit I got the following error message: Since you've disabled or enabled at least one algorithm, you need to do the following before building: make depend Configured for linux-elf. mkdir: cannot create directory `./unxlngi6/misc/build/openssl-0.9.8o/.': File exists making all in crypto... make[2]: *** No rule to make target `x86cpuid-elf.o', needed by `../libcrypto.a'. Stop. make[1]: *** [build_crypto] Error 1 dmake: Error code 2, while making './unxlngi6/misc/build/so_built_openssl' should I do only make depend? I imagine that the above do make depend is an error/warning message from openssl itself inside its own little embedded build, so doing make depend won't help probably. Your configure/build options might matter here ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Hackfest information
Hello everyone, with this e-mail, I would like to send out some more details for the upcoming LibreOffice Hackfest, which takes place from September 2nd to 4th in Munich. 1. Wiki page and emergency contact For up-to-date information, please keep an eye on the official wiki page at http://wiki.documentfoundation.org/Hackfest2011 - best is to print that page out shortly before you travel to Munich. In case of an emergency, my mobile number is in the signature of this e-mail and on the wiki page, so you can reach me. 2. Venues and sleeping I just added information on the two venues at the wiki page, and information for car drivers. It is possible to sleep at Café Netzwerk, although we try to organize couchsurfing instead. If you want to sleep at Café Netzwerk, please ping me in advance, and do *not* just add your name to the list. I just managed to get everyone to couchsurfing, then a few new names with sleeping at Café Netzwerk popped up without pinging me, which makes the whole process a bit complicated. ;-) For those who plan to sleep at Café Netzwerk: You need a sleeping bag and a mattress, because we have to sleep on the plain floor, there are no beds. Be aware that Café Netzwerk has no showers, just normal restrooms. The LiMux office has showers we could use, however. 3. Couchsurfing A call especially to our friends from Munich: If you want to give some friendly hackers a sleeping place, please let me know directly, so we can coordinate. Be assured that all participants are quite nice and behave friendly. ;-) 4. Add your e-mail address On the participants list in the wiki, some mail addresses are missing. I would like to ask everyone to add your address, so we can reach you directly. 5. Food and beverages The LiMux project team will try to organize breakfast for Saturday and Sunday. In case you do not want to participate, please let me know in advance, so we can buy accordingly. Otherwise, feel free to skip breakfast at the hotel, and eat together with us. ;-) Italo Vignoli will cook pasta for lunch on Saturday, more details are in the wiki. In case you do not want to join, please let me know as well, so we know the amount of pasta to make. On Friday evening, we will go out for dinner. Saturday's dinner and Sunday's lunch will be determined on the fly, based on what we are hungry for. ;-) Please note that participants have to pay for food on their own, it is *not* paid for by the organizers. 6. Agenda and timetable As the Hackfest is some sort of unconference, there is no fixed agenda with items to be worked on. In the wiki, we have compiled a list of topics and issues to work on, the rest will be decided on the fly and ad hoc at the venue. This sounds rather chaotic, but usually works out quite well. ;-) We have, however, compiled a little timetable in the wiki. So, now I hope this e-mail didn't cause more confusion than it helped, and I look forward to meeting all of you in Munich! Have a look at your inbox the next days and on the wiki page, in case we some details change. Happy hacking! Florian -- Florian Effenberger flo...@documentfoundation.org Steering Committee and Founding Member of The Document Foundation Tel: +49 8341 99660880 | Mobile: +49 151 14424108 Skype: floeff | Twitter/Identi.ca: @floeff ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [review] missing migrationoo3 component, fdo#37195
Hi there, On Fri, 2011-08-26 at 13:17 +0100, Caolán McNamara wrote: proposing cherry-picking of http://cgit.freedesktop.org/libreoffice/core/commit/?id=5e4c9fb9bbf12b40afbefb30e8d71d6e046b5bd0 back to 3-4. We bundle migrationoo3 into our install sets, but it's not registered. Heh :-) it may indeed be related. I recall digging into some nasty grief in this area last time I looked, and (I thought) enabling the migrationoo3 thing - AFAIR it has not been enabled in the past; are we happy that it does the right thing ? If so - I'm happy to ack the patch for 3.4 - but I'd prefer to enabling that chunk of (untested?) code in master for a while first (?) ATB, Michael. -- michael.me...@novell.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [review] missing migrationoo3 component, fdo#37195
On Fri, 2011-08-26 at 15:12 +0100, Michael Meeks wrote: Hi there, On Fri, 2011-08-26 at 13:17 +0100, Caolán McNamara wrote: proposing cherry-picking of http://cgit.freedesktop.org/libreoffice/core/commit/?id=5e4c9fb9bbf12b40afbefb30e8d71d6e046b5bd0 back to 3-4. We bundle migrationoo3 into our install sets, but it's not registered. Heh :-) it may indeed be related. I recall digging into some nasty grief in this area last time I looked, and (I thought) enabling the migrationoo3 thing - AFAIR it has not been enabled in the past; are we happy that it does the right thing ? If it was possible to get a windows 3-4 build with that change in place we could test the theory. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [review] missing migrationoo3 component, fdo#37195
2011/8/26 Caolán McNamara caol...@redhat.com: On Fri, 2011-08-26 at 15:12 +0100, Michael Meeks wrote: Hi there, On Fri, 2011-08-26 at 13:17 +0100, Caolán McNamara wrote: proposing cherry-picking of http://cgit.freedesktop.org/libreoffice/core/commit/?id=5e4c9fb9bbf12b40afbefb30e8d71d6e046b5bd0 back to 3-4. We bundle migrationoo3 into our install sets, but it's not registered. Heh :-) it may indeed be related. I recall digging into some nasty grief in this area last time I looked, and (I thought) enabling the migrationoo3 thing - AFAIR it has not been enabled in the past; are we happy that it does the right thing ? If it was possible to get a windows 3-4 build with that change in place we could test the theory. I'll test it. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Build breaks in instsetoo_native because of missing file xsec_xmlsec.dll
On Fri, 2011-08-26 at 12:09 +0100, Caolán McNamara wrote: I suspect there may be a mismatch between the ifdefs Try http://cgit.freedesktop.org/libreoffice/core/commit/?id=771def6aec5bbb1966f65e81cdf68afd94aa4b70 I *think* it might have been the case that in 3-4 with those config options it was basically an empty/stub xsec_xmlsec.dll while now there would be no xsec_xmlsec.dll C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] HTML export cleanup
On 2011-08-20 at 13:00, hatap...@iki.fi wrote: A few cleanups and removal of HTML 3.2 from HTML export options. Thanks. Committed and pushed. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Download and install git plugin for jenkins
--Henrik Jensen (HenrikJ on #libreoffice-dev) 0001-Download-and-install-git-plugin-for-jenkins.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED] Download and install git plugin for jenkins
On Fri, 26 Aug 2011 16:42:31 +0100 (BST) Henrik Jensen hrikj...@yahoo.dk wrote: --Henrik Jensen (HenrikJ on #libreoffice-dev) PUSHED as dev-tools:487e084c291fd9d1827a2190671a386f0303c5aa. Please confirm this patch (and hopefully all following to the list) to be MPL 1.1 / GPLv3+ / LGPLv3+ licensed. Best, Bjoern -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] gdb pretty printers landed in master
Hi David, On Thursday, 2011-08-25 10:41:02 +0200, David Tardon wrote: as the subject says, I pushed my gdb pretty printers into master. That's just GREAT! Works like a charme (gdb 7.2 :-) Eike -- PGP/OpenPGP/GnuPG encrypted mail preferred in all private communication. Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] inelegancy in XStorage / path handling ...
So,
One of the things I was rather missing with our UNO storage interfaces
was the ability to resolve paths: [ would be quite a nice feature -
right ? ]. Unfortunately, since we have a mess of different UNO
interfaces to use for file-system (and storage) access, and few of them
overlap, from:
* URLs - to XSimpleFileAccess
* ucb's monstrous interfaces
* XStorage / XStream / ...
It seemed there was no way to do this - is that so ? anyhow, I wrote
some vaguely clean path resolution code that could be shared, in some
nice shared place. Of course, since interfaces are so beautifully
abstract - there is no way to associate these to with the underlying
interfaces usefully - they can't be added to the interface without
crippling each implementor: what we really need is some magic way to
associate implementations with interfaces (what an idea!) but anyhow -
perhaps someone else might just find comphelper's storagehelper if they
want this, urgh.
Anyhow - package/'s ZipPackage.cxx does some hierarchical naming
lookups to validate the manifest - but does that via XTunnel and is
specific to its own implementation. Anyway, I got this written and
then ...
Amazing - package/store/xstor/ocompinstream.cxx stream -magically-
invalidates itself if we don't keep a reference around to the parent
storage: a compelling feature if ever I saw one.
At which point - I had to add this grotesque LifecycleProxy hack
(appended). If I was -really- 'clever' I could have - you know - done an
adaptive proxy object that would pretend to be whatever it is pointing
at, and hold the list of parents in there. [ Unfortunately, for all its
meta-power, UNO doesn't provide such an ability AFAICS - though it is
conceptually quite possible to have a 'TransparentProxy' object that
would do this ].
Anyhow - distressed at having to do this; thoughts / indulgences
appreciated; since this is one of the cleaner hackarounds the Any(UNO)
de-coupling madness I'll push it.
HTH,
Michael.
diff --git a/comphelper/inc/comphelper/storagehelper.hxx
b/comphelper/inc/comphelper/storagehelper.hxx
index 078bfb8..f4f0f81 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -167,6 +167,26 @@ public:
static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar,
sal_Int32 nLength, sal_Bool bSlashAllowed );
static sal_Bool PathHasSegment( const ::rtl::OUString aPath, const
::rtl::OUString aSegment );
+
+// Methods to allow easy use of hierachical names inside storages
+
+// Unfortunately - the impl.s of XStorage like to invalidate all
+// their sub streams and storages when you release references, so
+// it is necessary to keep references to all storages down the
+// path - this is 'beautiful' (TM). So we need this ugly hack:
+class LifecycleProxyImpl;
+class LifecycleProxy {
+public:
+LifecycleProxyImpl *pBadness;
+LifecycleProxy();
+~LifecycleProxy();
+};
+static ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage
GetStorageAtPath(
+const ::com::sun::star::uno::Reference
::com::sun::star::embed::XStorage xStorage,
+const ::rtl::OUString aPath, sal_uInt32 nOpenMode, LifecycleProxy
rNastiness );
+static ::com::sun::star::uno::Reference ::com::sun::star::io::XStream
GetStreamAtPath(
+const ::com::sun::star::uno::Reference
::com::sun::star::embed::XStorage xStorage,
+const ::rtl::OUString aPath, sal_uInt32 nOpenMode, LifecycleProxy
rNastiness );
};
}
diff --git a/comphelper/source/misc/storagehelper.cxx
b/comphelper/source/misc/storagehelper.cxx
index 70b7852..52b8e67 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -39,6 +39,7 @@
#include com/sun/star/xml/crypto/XDigestContextSupplier.hpp
#include com/sun/star/xml/crypto/DigestID.hpp
+#include vector
#include rtl/digest.h
#include ucbhelper/content.hxx
@@ -536,6 +537,58 @@ sal_Bool OStorageHelper::PathHasSegment( const
::rtl::OUString aPath, const ::r
return bResult;
}
+class OStorageHelper::LifecycleProxyImpl : public std::vector uno::Reference
embed::XStorage {};
+OStorageHelper::LifecycleProxy::LifecycleProxy() :
+pBadness( new OStorageHelper::LifecycleProxyImpl() ) { }
+OStorageHelper::LifecycleProxy::~LifecycleProxy() { delete pBadness; }
+
+static void splitPath( std::vectorrtl::OUString rElems,
+ const ::rtl::OUString rPath )
+{
+for (sal_Int32 i = 0; i = 0;)
+rElems.push_back( rPath.getToken( 0, '/', i ) );
+}
+
+static uno::Reference embed::XStorage LookupStorageAtPath(
+const uno::Reference embed::XStorage xParentStorage,
+std::vectorrtl::OUString rElems, sal_uInt32 nOpenMode,
+OStorageHelper::LifecycleProxy rNastiness )
+{
+uno::Reference embed::XStorage
Re: [Libreoffice] License confirmation
- Original Message - From: Bjoern Michaelsen bjoern.michael...@canonical.com To: Henrik Jensen hrikj...@yahoo.dk Cc: Henrik Jensen hrikjsenvagt...@yahoo.dk; libreoffice@lists.freedesktop.org libreoffice@lists.freedesktop.org Sent: Friday, 26 August 2011, 18:07 Subject: [Libreoffice] [PUSHED] Download and install git plugin for jenkins On Fri, 26 Aug 2011 16:42:31 +0100 (BST) Henrik Jensen hrikj...@yahoo.dk wrote: --Henrik Jensen (HenrikJ on #libreoffice-dev) PUSHED as dev-tools:487e084c291fd9d1827a2190671a386f0303c5aa. Please confirm this patch (and hopefully all following to the list) to be MPL 1.1 / GPLv3+ / LGPLv3+ licensed. Best, Bjoern I hereby confirm that this patch, all my previous patches and following patches to this list are licensed under MPL 1.1 / GPLv3+ / LGPLv3+. --Henrik ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [EasyHack][#34697][MHST] How to get the current page number in Calc, Impress, Draw
On 08/18/2011 01:19 AM, Markus Mohrhard wrote: Hello, 2011/8/17 Ta Duc Tung tatung2...@gmail.com mailto:tatung2...@gmail.com Hi, I'm trying to fix the bug number #34697 in https://bugs.freedesktop.org/show_bug.cgi?id=34697 (No option for printing current page). The bug was fixed in Writer. Now I'm trying to make it in Calc. The problem is that I don't know how to get the current page number. If in Writer, I can get the current cursor then get the page number from that cursor, but in Calc, where should I start? I think we have someting in this direction already in calc. You should have a closer look at ScPrintFunc, especially at ScPrintfunc::PrintPage. Regards, Markus Hi, I've tried to look into ScPrintFunc. In PrintPage, I see a param named nPageNo but when I print it out, the value is always 0. This is probably not the current page :D. But I cannot find any other hint closed to finding current page rather than the nPageNo one :|. I think I can somehow get it from ScDocShell or ScDocument but still no hope. I'm still losing my way here. Anyone please help! Thank and Best Regards, Ta Tung ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Build break in module basic
Hi Regina, On Friday, 2011-08-26 13:02:23 +0200, Regina Henschel wrote: I follow your link, but I don't know how to use it. Should be quite similar to building upstream make I mentioned earlier cd dev-tools/make-3.82-gbuild ./configure --prefix=$HOME/usr make make check make install and then prepend $HOME/usr/bin to your user's PATH environment and start a fresh shell. Verify that make -v gives 3.82 Eike -- PGP/OpenPGP/GnuPG encrypted mail preferred in all private communication. Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [EasyHack][#34697][MHST] How to get the current page number in Calc, Impress, Draw
Hi, ScPrintFunc is the correct place but not nPageNo. So http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/printfun.cxx#2670is responsible for printing and you should have a closer look at it. I think that with the context of lines 2719 to 2778 the main idea should be clear: -Get the range we need to print to one page -call ScPrintFunc::Print with this range Maybe the best idea is to set a breakpoint in ScPrintFunc::Print and look where it is called and what are the parameters. I'll translate the german comments in this section for you. If you still have any questions feel free to write a mail or ask on #libreoffice-dev. Regards, Markus 2011/8/26 Ta Duc Tung tatung2...@gmail.com On 08/18/2011 01:19 AM, Markus Mohrhard wrote: Hello, 2011/8/17 Ta Duc Tung tatung2...@gmail.com Hi, I'm trying to fix the bug number #34697 in https://bugs.freedesktop.org/show_bug.cgi?id=34697 (No option for printing current page). The bug was fixed in Writer. Now I'm trying to make it in Calc. The problem is that I don't know how to get the current page number. If in Writer, I can get the current cursor then get the page number from that cursor, but in Calc, where should I start? I think we have someting in this direction already in calc. You should have a closer look at ScPrintFunc, especially at ScPrintfunc::PrintPage. Regards, Markus Hi, I've tried to look into ScPrintFunc. In PrintPage, I see a param named nPageNo but when I print it out, the value is always 0. This is probably not the current page :D. But I cannot find any other hint closed to finding current page rather than the nPageNo one :|. I think I can somehow get it from ScDocShell or ScDocument but still no hope. I'm still losing my way here. Anyone please help! Thank and Best Regards, Ta Tung ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] code simplification: please logic review, to be sure
Hello,
I am trying to wipe some unneeded calls and I see the following:
while( )
{
-
SwFrm* pFrm;
if( 0 != ( pONd = aIdx.GetNode().GetOLENode() )
aName.Equals( pONd-GetChartTblName() )
0 != ( pFrm = pONd-getLayoutFrm( rVSh.GetLayout() ) ) )
{
}
...
}
knowing that pFrm is never used execpt in the comparision, I wanted to
simplify to :
0 != ( pONd-getLayoutFrm( rVSh.GetLayout() )
since the return value of the operator= should be the same as the right
operand.
But this basically, this just ensure that the return value is not NULL
(comparing the pointer SwFrm* with 0 )
So I though the final version to be:
if( 0 != ( pONd = aIdx.GetNode().GetOLENode() )
aName.Equals( pONd-GetChartTblName() )
pONd-getLayoutFrm( rVSh.GetLayout() )
{
}
Did I missed something with my logic ?
The code is from line 145 of sw/source/core/doc/docchart.cxx
Thanks a lot for your feed-back
best regards
Pierre-André
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] background in LTR interface shows BrOffice instead of LibreOffice
Hi Guys. While editing the Hebrew article of LibreOffice in Wikipedia, noticed something weird about the logo in the screen shot - it has of the BrOffice logo instead of the LibreOffice logo. http://en.wikipedia.org/wiki/File:Hebrew_LibreOffice_3.3.2_startup_screen.png I'm a bit ashamed to say I didn't previously notice it myself on my local system. While trying to figure if it this issue still happens in 3.4.2 (it does), I found out that it's going to be fixed in 3.4.3 with a patch by Andras (thanks (: ). http://cgit.freedesktop.org/libreoffice/artwork/commit/default_images/brand/shell/backing_rtl_left.pngid=af0bea8aa6174fb421cf02f3f3f490a6f624276b Could we also have this done for the next 3.3.x release ? Thanks. Kaplan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] how to handle this bug (if this is one?)
hello,
in vcl/win/source/gdi/winlayout.cxx, around line 695 there is:
long SimpleWinLayout::FillDXArray( long* pDXArray ) const
{
+if( !mnWidth )
+{
+long mnWidth = mnBaseAdv;
+for( int i = 0; i mnGlyphCount; ++i )
+mnWidth += mpGlyphAdvances[ i ];
+}
+if( pDXArray != NULL )
{
+for( int i = 0; i mnCharCount; ++i )
+ pDXArray[ i ] = mpCharWidths[ i ];
}
+return mnWidth;
}
the statement within th IF does not make any sense for my poor
understanding. As I read the code, the first IF could also be totally
removed, since as soon as exiting the first IF, all value are lost.
It seems to me that this is more or less what happened with the early
code before the change of commit 2f382d6c2579a2 in 2003. But I do not
sucess to match both logic.
Has someone more / better hints?
Thanks
Pierre-André
long SimpleWinLayout::FillDXArray( long* pDXArray ) const
{
-if( mnWidth !pDXArray )
-return mnWidth;
-
-long nWidth = 0;
-for( int i = 0; i mnGlyphCount; ++i )
{
-int j = !mpChars2Glyphs ? i : mpChars2Glyphs[i];
-nWidth += mpGlyphAdvances[j];
-if( pDXArray )
-pDXArray[i] = nWidth;
}
-return nWidth;
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] core.git only repo-mirror. Using git instead of ./g
Hi Bjôrn Could not totally remove './g checkout `git name-rev --name-only HEAD`' as I got an error but replaced it with 'git checkout master' './g -f stash pop' had to be replaced with 'git stash pop || :' as it generated an error caught by jenkins if no stash was found. Out commented subsequenttests as it still does not build. Btw. with only the core.git a make all make dev-install' only takes around 28 mins, on my i7-860 :-) --Henrik (HenrikJ on #libreoffice-dev) 0001-core.git-only-repo-mirror.-Using-git-instead-of-.-g.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [ANN] LibreOffice 3.4.3 RC2 available
Dear Community, The Document Foundation is happy to announce the second release candidate of LibreOffice 3.4.3 The upcoming 3.4.3 will be the third in a series of frequent bugfix releases for our 3.4 code line. Please be aware that LibreOffice 3.4.3 RC2 is not yet ready for production use, you should continue to use LibreOffice 3.3.4 or 3.4.2 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org For other ways to get involved with this exciting project - you can e.g. contribute code: https://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.4 or help with funding our foundation: http://challenge.documentfoundation.org/ A list of known issues with 3.4.3 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.4.3/RC2 Please find the list of changes against LibreOffice 3.4.3 RC1 here: http://download.documentfoundation.org/libreoffice/src/bugfixes-libreoffice-3-4-3-release-3.4.3.2.log Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Steering Committee of The Document Foundation pgpsyN0Q5tpAX.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] EXAUSTOR COMERCIAL (11) 2371 4964
Title: Ventilador,Ventiladores,Exaustor,Exaustores,Ventilador de Teto,Ventilação,Ventilador de Parede,Ventilador de Coluna,Purificador,Purificador de Água Europa,Filtros,Refrigerador,Geladeira,Bebedouro,Bebedouro de Pressão,Bebedouro de Garrafão,Refresqueira,Suqueira,Ventilador Ventisilva,Bebedouros,Exaustores,Exaustor Industrial,Exaustor Axial,Exaustor Centrífugo,Ventilador Parede 65 cm,Tufão,Ventisol,Ventidelta,Loren Sid,Arno, ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Make numbering more flexible by custom separator
Make numbering more flexible by using custom separators. So that
numbers like 3-2(a) can be used instead of boring 3.2.a.
Everything for the goal was available so a simple hack in code makes
it ready to use.
By this patch suffix and prefix in number styles are used
only for specified level number not on the whole number. So the
hardcoded . separator was removed.
From 48cd31d528d3b9264df83d1c3a09dcdbed40964f Mon Sep 17 00:00:00 2001
From: Mohammad Elahi elahimoham...@gmail.com
Date: Sat, 27 Aug 2011 03:04:38 +0430
Subject: [PATCH] Make numbering more flexible by custom separator
Make numbering more flexible by using custom separators. So that
numbers like 3-2(a) can be used instead of boring 3.2.a.
Everything for the goal was available so a simple hack in code make
it ready to use.
By this patch suffix and prefix in number styles are used for the
only for specified level number not on the whole number. So the
hardcoded . separator was removed.
---
sw/source/core/doc/number.cxx | 14 ++
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index a977649..55b6335 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -715,6 +715,7 @@ String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector rNumVector,
continue;
}
+aStr+=rNFmt.GetPrefix();
if( rNumVector[ i ] )
{
if( bOnlyArabic )
@@ -724,18 +725,7 @@ String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector rNumVector,
}
else
aStr += '0'; // alle 0-Level sind eine 0
-if( i != nLevel aStr.Len() )
-aStr += aDotStr;
-}
-
-//JP 14.12.99: the type dont have any number, so dont append
-//the Post-/Prefix String
-if( bInclStrings !bOnlyArabic
-SVX_NUM_CHAR_SPECIAL != rMyNFmt.GetNumberingType()
-SVX_NUM_BITMAP != rMyNFmt.GetNumberingType() )
-{
-aStr.Insert( rMyNFmt.GetPrefix(), 0 );
-aStr += rMyNFmt.GetSuffix();
+aStr+=rNFmt.GetSuffix();
}
}
}
--
1.7.4.1
From bcbadacf35f6f533a788af8e91400407919f38b2 Mon Sep 17 00:00:00 2001
From: Mohammad Elahi elahimoham...@gmail.com
Date: Sat, 27 Aug 2011 02:56:58 +0430
Subject: [PATCH] Make numbering more flexible by custom separator
Make numbering more flexible by using custom separators. So that
numbers like 3-2(a) can be used instead of boring 3.2.a.
Everything for the goal was available so a simple hack in code make
it ready to use.
By this patch suffix and prefix in number styles are used for the
only for specified level number not on the whole number. So the
hardcoded . separator was removed.
---
editeng/source/items/numitem.cxx | 11 +++
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 9f4d838..b01dd7a 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -810,6 +810,7 @@ String SvxNumRule::MakeNumString( const SvxNodeNum rNum, sal_Bool bInclStrings
}
sal_Bool bDot = sal_True;
+aStr += rNFmt.GetPrefix();
if( rNum.GetLevelVal()[ i ] )
{
if(SVX_NUM_BITMAP != rNFmt.GetNumberingType())
@@ -819,15 +820,9 @@ String SvxNumRule::MakeNumString( const SvxNodeNum rNum, sal_Bool bInclStrings
}
else
aStr += sal_Unicode('0'); // all 0-levels are a 0
-if( i != rNum.GetLevel() bDot)
-aStr += sal_Unicode('.');
-}
-}
-if( bInclStrings )
-{
-aStr.Insert( rMyNFmt.GetPrefix(), 0 );
-aStr += rMyNFmt.GetSuffix();
+aStr += rNFmt.GetSuffix();
+}
}
}
return aStr;
--
1.7.4.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Add numbering type in persian word.
Numbering in localized persian word is useful in some areas, at least
for me it is necessary. Since it is not trivial a function and table
is needed.
From d04ad728a0e4c7376eac28d742046dae9b10d3c3 Mon Sep 17 00:00:00 2001
From: Mohammad Elahi elahimoham...@gmail.com
Date: Sat, 27 Aug 2011 03:37:21 +0430
Subject: [PATCH] Add numbering type in persian word.
Numbering in localized persian word is useful in some areas, at least
for me it is necessary. Since it is not trivial a function and table
is needed.
---
.../defaultnumberingprovider.cxx | 110
1 files changed, 110 insertions(+), 0 deletions(-)
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index e315dad..6ce448a 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -208,6 +208,56 @@ static sal_Unicode lowerLetter[] = {
0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
};
+// Tables used for numbering in persian words
+static sal_Unicode *table_PersianWord_decade1[]={
+(sal_Unicode[]){0}, // 0
+(sal_Unicode[]){0x06cc, 0x06a9, 0}, // 1
+(sal_Unicode[]){0x062f,0x0648, 0}, // 2
+(sal_Unicode[]){0x0633,0x0647, 0}, // 3
+(sal_Unicode[]){0x0686,0x0647,0x0627,0x0631, 0}, // 4
+(sal_Unicode[]){0x067e,0x0646,0x062c, 0}, // 5
+(sal_Unicode[]){0x0634,0x0634, 0}, // 6
+(sal_Unicode[]){0x0647,0x0641,0x062a, 0}, // 7
+(sal_Unicode[]){0x0647,0x0634,0x062a, 0}, // 8
+(sal_Unicode[]){0x0646,0x0647, 0}, // 9
+(sal_Unicode[]){0x062f, 0x0647, 0}, // 10
+(sal_Unicode[]){0x06cc, 0x0627, 0x0632, 0x062f, 0x0647, 0}, // 11
+(sal_Unicode[]){0x062f, 0x0648, 0x0627, 0x0632, 0x062f, 0x0647, 0}, // 12
+(sal_Unicode[]){0x0633, 0x06cc, 0x0632, 0x062f, 0x0647, 0}, // 13
+(sal_Unicode[]){0x0686, 0x0647, 0x0627, 0x0631, 0x062f, 0x0647, 0}, // 14
+(sal_Unicode[]){0x067e, 0x0627, 0x0646, 0x0632, 0x062f, 0x0647, 0}, // 15
+(sal_Unicode[]){0x0634, 0x0627, 0x0646, 0x0632, 0x062f, 0x0647, 0}, // 16
+(sal_Unicode[]){0x0647, 0x0641, 0x062f, 0x0647, 0}, // 17
+(sal_Unicode[]){0x0647, 0x062c, 0x062f, 0x0647, 0}, // 18
+(sal_Unicode[]){0x0646, 0x0648, 0x0632, 0x062f, 0x0647, 0}}; // 19
+
+static sal_Unicode *table_PersianWord_decade2[]={
+(sal_Unicode[]){0x0628, 0x06cc, 0x0633, 0x062a, 0}, // 20
+(sal_Unicode[]){0x0633, 0x06cc, 0}, // 30
+(sal_Unicode[]){0x0686, 0x0647, 0x0644, 0}, // 40
+(sal_Unicode[]){0x067e, 0x0646, 0x062c, 0x0627, 0x0647, 0}, // 50
+(sal_Unicode[]){0x0634, 0x0635, 0x062a, 0}, // 60
+(sal_Unicode[]){0x0647, 0x0641, 0x062a, 0x0627, 0x062f, 0}, // 70
+(sal_Unicode[]){0x0647, 0x0634, 0x062a, 0x0627, 0x062f, 0}, // 80
+(sal_Unicode[]){0x0646, 0x0648, 0x062f, 0}}; // 90
+
+static sal_Unicode *table_PersianWord_decade3[]={
+(sal_Unicode[]){0x0635, 0x062f, 0}, // 100
+(sal_Unicode[]){0x062f, 0x0648, 0x06cc, 0x0633, 0x062a, 0}, // 200
+(sal_Unicode[]){0x0633, 0x06cc, 0x0635, 0x062f, 0}, // 300
+(sal_Unicode[]){0x0686, 0x0647, 0x0627, 0x0631, 0x0635, 0x062f, 0}, // 400
+(sal_Unicode[]){0x067e, 0x0627, 0x0646, 0x0635, 0x062f, 0}, // 500
+(sal_Unicode[]){0x0634, 0x0635, 0x062f, 0}, // 600
+(sal_Unicode[]){0x0647, 0x0641, 0x062a, 0x0635, 0x062f, 0}, // 700
+(sal_Unicode[]){0x0647, 0x0634, 0x062a, 0x0635, 0x062f, 0}, // 800
+(sal_Unicode[]){0x0646, 0x0647, 0x0635, 0x062f, 0}}; // 900
+
+static sal_Unicode *table_PersianWord_decadeX[]={
+(sal_Unicode[]){0x0647, 0x0632, 0x0627, 0x0631, 0}, // 1000
+(sal_Unicode[]){0x0645, 0x06cc, 0x0644, 0x06cc, 0x0648, 0x0646, 0}, // 100
+(sal_Unicode[]){0x0645, 0x06cc, 0x0644, 0x06cc, 0x0627, 0x0631, 0x062f, 0}}; // 10
+
+
DefaultNumberingProvider::DefaultNumberingProvider( const Reference XMultiServiceFactory xMSF ) : xSMgr(xMSF),translit(NULL)
{
@@ -333,6 +383,61 @@ void lcl_formatChars3( sal_Unicode table_capital[], sal_Unicode table_small[], i
s += OUString::valueOf( table_small[ n%tableSize ] );
}
+/* Returns number's representation in persian words upto 9 */
+static
+void lcl_formatPersianWord(unsigned int aNumber, OUString rsResult)
+{
+// Formats numbers in persian word up to which is high enough for showing int
+OUString asTemp;
+unsigned char anDigit;
+OUString asPersianWord_conjunction=OUString((sal_Unicode[]){0x20,0x0648,0x20,0});
+unsigned char anSection=0;
+
+//if(n)
+//return;
+
+while(int anPart=aNumber%1000)
+{
+if(anSection)
+asTemp=OUString(table_PersianWord_decadeX[anSection-1])+asPersianWord_conjunction+asTemp;
+
+if((anDigit=anPart%100)20)
+{
+if(!asTemp.isEmpty())
+asTemp=OUString(0x0020)+asTemp;
+
+
[Libreoffice] [PATCH] Add numbering type of arabic abjad sequence
A localized numbering type base on arabic abjad sequence is
added base on a table.
From 41d106c1303a53edae8551dfde7f1b35e7d67685 Mon Sep 17 00:00:00 2001
From: Mohammad Elahi elahimoham...@gmail.com
Date: Sat, 27 Aug 2011 03:45:19 +0430
Subject: [PATCH] Add numbering type of arabic abjad sequence
A localized numbering type base on arabic abjad sequence is
added base on a table.
---
.../defaultnumberingprovider.cxx | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index e315dad..66aac8b 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -76,6 +76,13 @@ static sal_Unicode table_Alphabet_ar[] = {
0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649
};
+static sal_Unicode table_Alphabet_ar_abjad[] = {
+0x0627, 0x0628, 0x062c, 0x062f, 0x0647, 0x0648, 0x0632, 0x062d,
+0x0637, 0x064a, 0x0643, 0x0644, 0x0645, 0x0646, 0x0633, 0x0639,
+0x0641, 0x0635, 0x0642, 0x0631, 0x0634, 0x062a, 0x062b, 0x062e,
+0x0630, 0x0636, 0x0638, 0x063a
+};
+
static sal_Unicode table_Alphabet_th[] = {
0x0E01, 0x0E02, 0x0E04, 0x0E07,
0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
@@ -630,6 +637,9 @@ DefaultNumberingProvider::makeNumberingString( const Sequencebeans::PropertyVal
case CHARS_ARABIC:
lcl_formatChars(table_Alphabet_ar, sizeof(table_Alphabet_ar) / sizeof(sal_Unicode), number - 1, result);
break;
+ case CHARS_ARABIC_ABJAD:
+ lcl_formatChars(table_Alphabet_ar_abjad, sizeof(table_Alphabet_ar_abjad) / sizeof(sal_Unicode), number - 1, result);
+ break;
case CHARS_THAI:
lcl_formatChars(table_Alphabet_th, sizeof(table_Alphabet_th) / sizeof(sal_Unicode), number - 1, result);
break;
@@ -794,6 +804,7 @@ static const Supported_NumberingType aSupportedTypes[] =
{style::NumberingType::HANGUL_CIRCLED_JAMO_KO, NULL, LANG_CJK},
{style::NumberingType::HANGUL_CIRCLED_SYLLABLE_KO, NULL, LANG_CJK},
{style::NumberingType::CHARS_ARABIC,NULL, LANG_CTL},
+{style::NumberingType::CHARS_ARABIC_ABJAD, NULL, LANG_CTL},
{style::NumberingType::CHARS_THAI, NULL, LANG_CTL},
{style::NumberingType::CHARS_HEBREW,NULL, LANG_CTL},
{style::NumberingType::CHARS_NEPALI,NULL, LANG_CTL},
--
1.7.4.1
From 8a232d3f375dc2b8b51b24d4b42cbbe1897e8d93 Mon Sep 17 00:00:00 2001
From: Mohammad Elahi elahimoham...@gmail.com
Date: Sat, 27 Aug 2011 03:48:13 +0430
Subject: [PATCH] Add numbering type of arabic abjad sequence
A localized numbering type base on arabic abjad sequence is
added base on a table.
---
offapi/com/sun/star/style/NumberingType.idl |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/offapi/com/sun/star/style/NumberingType.idl b/offapi/com/sun/star/style/NumberingType.idl
index 0b4c7ca..82370ac 100644
--- a/offapi/com/sun/star/style/NumberingType.idl
+++ b/offapi/com/sun/star/style/NumberingType.idl
@@ -485,6 +485,14 @@ published constants NumberingType
*/
const short CHARS_GREEK_LOWER_LETTER = 53;
+
+//-
+/** Numbering in Arabic alphabet using abjad sequence
+
+@since OOo 3.5
+ */
+const short CHARS_ARABIC_ABJAD = 54;
+
};
//=
--
1.7.4.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] unusedcode.easy and debug build
Hello Caolan, all, I just had some problems with my debug build in ucb and discovered that at least one method only needed in a debug build has been removed. It seems it was mentionend on unusedcode.easy, so my question is how we should deal with these cases. In this special case I removed the call for now, but I'm not quite sure if this is really what we want to do. Just adding it again won't help because it will be removed next time again. http://cgit.freedesktop.org/libreoffice/core/commit/?id=888a4519c30bed7ca9896f367d5d48fae96bae2d Can someone who understands ucb better than me decide if we should add this call again? Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
