Re: Improve doc about gerrit/setup
Le 10/07/2012 00:22, David Ostrovsky a écrit :
On 09.07.2012 23:23, Lionel Elie Mamane wrote:
It is a wiki, you can correct it directly yourself. Also for the rest
of your remarks.
actually we have more then one gerrit command wrapper tool (and
documentation)
that you may want give a try:
http://wiki.documentfoundation.org/Development/GitReview
and of course it is also wiki ... ,-)
Regards
David
3 more points to have it well configured in my box :
1) Also I came across a remote: ERROR: missing Change-Id in commit
message after my first proposal on gerrit.
Googling, to had this Change-Id, I found that I had to run
scp -p -P 29418 username on gerrit.libreoffice.or
https://gerrit.libreoffice.org/g@gerrit.libreoffice.org:hooks/commit-msg
.git/hooks
I've not found anything on it on the wiki, and as I don't anderstand
this command line, I'll let anyone who does, update the wiki.
2) With that, i'm able to connect and transfer the patch BUT I still
have the remote: ERROR: missing Change-Id in commit message
Attached is what I get from a git format-patch HEAD~1 (I'll submit it
via gerrit, as soon as I can have it work)
Here is the output I get with ./logerrit submit:
$ ./logerrit submit
no branch specified, guessing current branch master
Counting objects: 70420, done.
Compressing objects: 100% (9656/9656), done.
Writing objects: 100% (48845/48845), 15.70 MiB | 95 KiB/s, done.
Total 48845 (delta 40284), reused 44589 (delta 37492)
remote: Resolving deltas: 100% (40284/40284)
remote: Processing changes: refs: 1, done
remote: ERROR: missing Change-Id in commit message
remote: Suggestion for commit message:
remote: Remove a useless include
remote:
remote: Change-Id: Ifa3bb68bfa88ba2bbe12611eb67936038780f2d0
To ssh://logerrit/core
! [remote rejected] HEAD - refs/for/master (missing Change-Id in
commit message)
error: failed to push some refs to 'ssh://logerrit/core'
The generated patch has a 'Change-Id', so I would expect that
./logerrit submit would do the same. Where I'm wrong ?
3) Is it normal to send 15.70 MiB of data for a 5.3 Ko patch ???
Thanks in advance for your help.
Best regards,
Christophe JAILLET
From c203061eb60794cfdba03dc0faa6d8b5afc5879f Mon Sep 17 00:00:00 2001
From: Christophe JAILLET christophe.jail...@wanadoo.fr
Date: Mon, 9 Jul 2012 23:40:03 +0200
Subject: [PATCH] Use rtl_zeroMemory in place of rtl_fillMemory(..., 0)
Change-Id: I237ef0d7496a62d76c0263877a66b53d4f8709e1
---
canvas/source/directx/dx_surfacebitmap.cxx | 14 +++---
sal/inc/osl/file.hxx |4 ++--
sc/source/filter/qpro/qprostyle.cxx|8
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx
b/canvas/source/directx/dx_surfacebitmap.cxx
index d0ca06d..413c17e 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -83,7 +83,7 @@ namespace dxcanvas
sal_uInt8* DXColorBuffer::lock() const
{
#if DIRECTX_VERSION 0x0900
-rtl_fillMemory((void *)aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory((void *)aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
if(SUCCEEDED(mpSurface-Lock(NULL,aSurfaceDesc,dwFlags,NULL)))
@@ -344,7 +344,7 @@ namespace dxcanvas
#if DIRECTX_VERSION 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory(aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory(aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
@@ -468,7 +468,7 @@ namespace dxcanvas
{
#if DIRECTX_VERSION 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory( aSurfaceDesc,sizeof(DDSURFACEDESC),0 );
+rtl_zeroMemory( aSurfaceDesc,sizeof(DDSURFACEDESC) );
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
if( FAILED(mpSurface-Lock( NULL,
@@ -541,7 +541,7 @@ namespace dxcanvas
#if DIRECTX_VERSION 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory(aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory(aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
@@ -623,7 +623,7 @@ namespace dxcanvas
#if DIRECTX_VERSION 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory(aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory(aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_WRITEONLY;
Re: [Libreoffice-commits] .: Branch 'feature/remote' - sd/Library_sd.mk sd/source
Hi, On Mon, Jul 09, 2012 at 07:57:21AM -0700, Andrzej J.R. Hunt wrote: New commits: commit 0c81bae4481dfe02dcf58482a95d213a2f934293 Author: Andrzej J. R. Hunt andr...@ahunt.org Date: Mon Jul 9 15:53:03 2012 +0100 Replaced Unix with osl sockets. Added slideshow controller. Change-Id: Ic2d34d666bb748b12e51266e04706d105ab7a3be diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 9a31f20..98c083d 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -63,6 +63,7 @@ $(eval $(call gb_Library_set_include,sd,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/source/ui/slidesorter/inc \ -I$(WORKDIR)/SdiTarget/sd/sdi \ +$(shell pkg-config --cflags json-glib-1.0) \ Please do not call pkg-config from makefiles. That is what configure is for. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
gerrit: polishing web UI
Hi, may be you've already heard about our new code review system site: https://gerrit.libreoffice.org. As you can see we have installed already LO logo in header. Unfortunately there is only 200px and the next small one is 100px too small (and it doesn't really play good enouph with Code Review default font). Would it be possibe to create a 150 px Logo? Or may be create a new one with combination of Logo Code Review Slogan with the same font (Vegur?) -- may be Code bold (as in Libre and Review not as in Office, just my soughts). What about background, favicon, ...? As a inspiration i place here some links how other projects customized it: https://android-review.googlesource.com/#/q/status:open,n,z https://git.eclipse.org/r/#/q/status:open,n,z https://review.openstack.org/ http://codereview.scilab.org/ https://review.typo3.org Thank you in advance for your help! David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Patch] Removed repeated calls in for loops in swnewtable.cxx
Hi, I've submitted a new patch with Matteo's suggestion to Gerrit directly. So discard this patch. - Jesso Clarence ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Improved loop to remove repeated calls in swnewtable.cxx
From Jesso Clarence Murugan developer.je...@gmail.com: Jesso Clarence Murugan has uploaded a new change for review. Change subject: Improved loop to remove repeated calls in swnewtable.cxx .. Improved loop to remove repeated calls in swnewtable.cxx Rewrote the function to combine two mostly similar for loops to avoid unnecessary repeated calls in ExpandColumnSelection function Change-Id: I5dff446e39b7502ad1a4784da4fca987d5a26bdc --- M sw/source/core/table/swnewtable.cxx 1 file changed, 8 insertions(+), 19 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/282/1 -- To view, visit https://gerrit.libreoffice.org/282 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5dff446e39b7502ad1a4784da4fca987d5a26bdc Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jesso Clarence Murugan developer.je...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: xmloff/source
xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx |2
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx |4 -
xmloff/source/script/XMLScriptContextFactory.cxx|6 -
xmloff/source/script/XMLScriptExportHandler.cxx |2
xmloff/source/script/XMLStarBasicContextFactory.cxx | 10 +-
xmloff/source/style/shdwdhdl.cxx|2
xmloff/source/text/XMLAutoMarkFileContext.cxx |3
xmloff/source/text/XMLAutoTextEventImport.cxx |3
xmloff/source/text/XMLIndexTemplateContext.cxx | 44 ++--
xmloff/source/text/XMLIndexTitleTemplateContext.cxx |8 --
xmloff/source/text/XMLTextMasterPageExport.cxx | 16 ++--
xmloff/source/text/XMLTextShapeStyleContext.cxx |2
12 files changed, 48 insertions(+), 54 deletions(-)
New commits:
commit a8fb1a123f6c46eed611dbaea699624ea0b7962b
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jul 10 11:01:00 2012 +0200
xmloff: kill RTL_CONSTASCII_USTRINGPARAM in rebased code
Change-Id: I3d5227c299d78d4492c47e29385c2c5ca25cfe49
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index fc330d2..4e9a715 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -44,7 +44,7 @@ const OUString
UnoInterfaceToUniqueIdentifierMapper::registerReference( const R
}
else
{
-OUString aId( RTL_CONSTASCII_USTRINGPARAM( id ) );
+OUString aId( id );
aId += OUString::valueOf( mnNextId++ );
return (*maEntries.insert( IdMap_t::value_type( aId, rInterface )
).first).first;
}
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index 8c157a5..c6216a4 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -88,7 +88,7 @@ void XMLGraphicsDefaultStyle::SetDefaults()
if( !xFact.is() )
return;
-Reference XPropertySet xDefaults( xFact-createInstance(
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.Defaults) ) ),
UNO_QUERY );
+Reference XPropertySet xDefaults( xFact-createInstance(
com.sun.star.drawing.Defaults ), UNO_QUERY );
if( !xDefaults.is() )
return;
// SJ: #i114750#
@@ -105,7 +105,7 @@ void XMLGraphicsDefaultStyle::SetDefaults()
) )
bWordWrapDefault = sal_False;
-const OUString sTextWordWrap( RTL_CONSTASCII_USTRINGPARAM( TextWordWrap
) );
+const OUString sTextWordWrap( TextWordWrap );
Reference XPropertySetInfo xInfo( xDefaults-getPropertySetInfo() );
if ( xInfo-hasPropertyByName( sTextWordWrap ) )
xDefaults-setPropertyValue( sTextWordWrap, Any( bWordWrapDefault ) );
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx
b/xmloff/source/script/XMLScriptContextFactory.cxx
index 5f671ea..1990d67 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -35,9 +35,9 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
XMLScriptContextFactory::XMLScriptContextFactory() :
-sEventType(RTL_CONSTASCII_USTRINGPARAM(EventType)),
-sScript(RTL_CONSTASCII_USTRINGPARAM(Script)),
-sURL(RTL_CONSTASCII_USTRINGPARAM(Script))
+sEventType(EventType),
+sScript(Script),
+sURL(Script)
{
}
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx
b/xmloff/source/script/XMLScriptExportHandler.cxx
index 9e0c096..51057b7 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -34,7 +34,7 @@ using ::com::sun::star::beans::PropertyValue;
XMLScriptExportHandler::XMLScriptExportHandler() :
-sURL(RTL_CONSTASCII_USTRINGPARAM(Script))
+sURL(Script)
{
}
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx
b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index 3b3faa3..b9825be 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -36,10 +36,10 @@ using ::com::sun::star::uno::Any;
XMLStarBasicContextFactory::XMLStarBasicContextFactory() :
-sEventType(RTL_CONSTASCII_USTRINGPARAM(EventType)),
-sLibrary(RTL_CONSTASCII_USTRINGPARAM(Library)),
-sMacroName(RTL_CONSTASCII_USTRINGPARAM(MacroName)),
-sStarBasic(RTL_CONSTASCII_USTRINGPARAM(StarBasic))
+sEventType(EventType),
+sLibrary(Library),
+sMacroName(MacroName),
+sStarBasic(StarBasic)
{
}
@@ -83,7 +83,7 @@ SvXMLImportContext* XMLStarBasicContextFactory::CreateContext(
sMacroNameVal.copy(0,rApp.getLength()).equalsIgnoreAsciiCase( rApp )
':' == sMacroNameVal[rApp.getLength()]
Re: ODF proposal for number:fill-character element
Hi Thorsten, On Tuesday, 2012-07-10 01:14:04 +0200, Thorsten Behrens wrote: Done at last: https://tools.oasis-open.org/issues/browse/OFFICE-3765 Hey, great, thanks. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpxoLY33WyZz.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: extensions/source
extensions/source/config/ldap/ldapaccess.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 0e732d6f09db22b131752d37550b3f35fcae7706
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Jul 10 11:24:26 2012 +0200
Load the right wldap32.dll
Change-Id: I73c0a5b8265fa92d7aeeadc803d337ef85651781
diff --git a/extensions/source/config/ldap/ldapaccess.cxx
b/extensions/source/config/ldap/ldapaccess.cxx
index 00e62d9..c3948a1 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -282,8 +282,7 @@ void LdapConnection::loadModule()
if ( !s_Ldap_Module )
{
#if defined WNT
-s_Ldap_Module = osl_loadModuleRelativeAscii(
-thisModule, wldap32.dll, 0);
+s_Ldap_Module = osl_loadModuleAscii(wldap32.dll, 0);
#elif defined WITH_OPENLDAP
s_Ldap_Module = osl_loadModuleAscii(
(libldap- SAL_STRINGIFY(LDAP_VENDOR_VERSION_MAJOR) .
@@ -295,7 +294,7 @@ void LdapConnection::loadModule()
thisModule, libldap50.so, 0);
#endif
-if ( s_Ldap_Module != NULL )
+if ( s_Ldap_Module )
{
s_p_unbind_s =
(t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ldap_unbind_s)).pData));
s_p_simple_bind_s =
(t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ldap_simple_bind_s)).pData));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: issue with HelpLinker (Bus Error, core dumped)
On Tuesday 10 of July 2012, Waitman Gobble wrote: Hi, git libo on FreeBSD 10.0-CURRENT using gcc48 I am running into trouble with HelpLinker (and HelpIndexer). the other components of l10ntools appear to run without error. # cd solver/unxfbsd.pro/bin/ # ./HelpLinker no index dir given Bus error (core dumped) ... this produces no errors, CLucene lots of warnings however one thing looks suspect in sal: LinkTarget Library/libpthread.so not defined: Assuming headers to be there! AFAIK harmless, it just means the library is not built using gbuild. # ls -l workdir/unxfbsd.pro/Headers/Library x x 0 Jul 9 21:46 libclucene.so x x 0 Jul 9 21:48 libhelplinkerlo.so x x 0 Jul 9 19:32 libpthread.so x x 0 Jul 9 21:47 libsal_textenc.so x x 0 Jul 9 21:47 libuno_sal.so (hmmm why are these zero byte files?) They are timestamp files for the libraries. -g3, -ggdb, debug=t , can't seem to get info from gdb . maybe i am missing something on the libo debugging page. # gdb741 -core HelpIndexer.core GNU gdb (GDB) 7.4.1 [GDB v7.4.1 for FreeBSD] [New process 125368] Core was generated by `HelpIndexer'. Program terminated with signal 10, Bus error. #0 0x000802d08e8b in ?? () (gdb) bt #0 0x000802d08e8b in ?? () #1 0x000802a9ff50 in ?? () #2 0x000801e6547d in ?? () #3 0x7fffd580 in ?? () #4 0x000802247878 in ?? () #5 0x02a0 in ?? () #6 0x000802a79903 in ?? () #7 0x7fffd4d0 in ?? () #8 0x000102a798d7 in ?? () #9 0x000801d44000 in ?? () #10 0x000800620508 in ?? () #11 0x000801d44040 in ?? () #12 0x7fff0005 in ?? () #13 0x000f in ?? () #14 0x in ?? () Try running it in valgrind in gdb manually. Other than that, you use a development snapshot of gcc, so this is not very likely a LibreOffice problem actually. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Improve doc about gerrit/setup
Hi Christophe, On Tue, Jul 10, 2012 at 07:42:02AM +0200, Christophe JAILLET wrote: 3 more points to have it well configured in my box : It seems to me you are not pushing the right patch: ./logerrit pushes the current HEAD. You can see what ./logerrit would try to submit with: git show HEAD also check if: git log -1 HEAD^ is really a commit that is already on master. All the other points seem to be related. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Review-3-6?] New artwork for 3.6
Stefan Knorr wrote: Currently, about.svg is unused. I was asked, however, to re-enable it, as a matter of treating new contributors contributions better. I will not come to doing this today (i. e. before RC1 is tagged). If about.svg were used, it would be the same across all version of LibreOffice (at least the official TDF one and the community version). Ok, cool - so we can remove it from the tdf-branding configure magic. BTW, I've attached attached a patch for a new Finder background for the Mac installer. It'd be great if you could see if it fits or if there is weird alignment etc. Looks good here, will push to master -3-6 in a minute. Cheers, -- Thorsten pgpyGdmBLw6xV.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: setup_native/source
setup_native/source/mac/ooo/osxdndinstall.png |binary 1 file changed New commits: commit f2a653134e0cf858cb16d85f01934725d126e002 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 10 09:29:02 2012 +0200 New Finder background image for Mac OS installation Change-Id: I7f2d124f8a1d0330c4ab7bc58217e4368ee72cc2 diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png index 2ce08fe..25b0336 100644 Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - setup_native/source
setup_native/source/mac/ooo/osxdndinstall.png |binary 1 file changed New commits: commit 42939b23b6f4a046f0c1d7edc0927b18e906af02 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 10 09:29:02 2012 +0200 New Finder background image for Mac OS installation Change-Id: I7f2d124f8a1d0330c4ab7bc58217e4368ee72cc2 Signed-off-by: Thorsten Behrens tbehr...@suse.com diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png index 2ce08fe..25b0336 100644 Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: gerrit lame / non-reviews spammage
Hi Bjoern, Thanks for fixing the Subjects - that is extremely helpful :-) On Tue, 2012-07-10 at 11:59 +0200, Bjoern Michaelsen wrote: The tricky question is: what is a 'substantive review'? Some Ideas: Hard to see of course; then again - if we could substantially shrink the content of the mail; perhaps it'd be easier to skim through. It seems (like most of the gerrit tools) that verbosity is thought to be an advantage ;-) [snip] Subject:Change in core[master]: add/remove blank lines and braces (in sw/source/core/crsr/) Date: Mon, 9 Jul 2012 12:42:45 + (07/09/2012 01:42:45 PM) From David Ostrovsky david.ostrov...@gmx.de: David Ostrovsky has posted comments on this change. Change subject: add/remove blank lines and braces (in sw/source/core/crsr/) .. [/snip] So - to this point we've duplicated David's name, added a lot of text to scan, duplicated the subject line and added a ... :-) [snip] Patch Set 1: I described here: http://lists.freedesktop.org/archives/libreoffice/2012-July/034664.html how to submit the next patchset. [/snip] and then an ignoreable footer I guess. [snip] -- To view, visit https://gerrit.libreoffice.org/272 To unsubscribe, visit https://gerrit.libreoffice.org/settings [/snip] With only web links in it :-) I'd love to see instead changes '*'d: (can we spoof the sender ?): [snip] From: David Ostrovsky david.ostrov...@gmx.de: Subject: *Comment* **: add/remove blank lines and braces (in sw/source/core/crsr/) Date: Mon, 9 Jul 2012 12:42:45 + (07/09/2012 01:42:45 PM) I described here: http://lists.freedesktop.org/archives/libreoffice/2012-July/034664.html how to submit the next patchset. -- To view this patch use: logerrit foo baa show afdb273a2843.. To visit the web-site see: https://gerrit.libreoffice.org/272 [/snip] Which is much more skim-able; of course, people may reply to such mails ;-) and discuss on the mailing list - presumably that causes some level of complexity but ... Should be done now. I removed the Change in core[master] boilerplate and added '[PATCH]' and '[PUSHED]' as appropriate. If we want to have it more fancy we could do virtually everything with That's lovely :-) but the hard part is coming up with a sensible definition what we (as a community of devs) want. The last time we discussed that it ended in 'send everything to the list', which proved suboptimal in the end. So some more frontup work needed there. Yep - on the other hand, it's nice to see it iterating towards something much better - clearly glueing together the mail web work-flows was never going to be perfectly easy :-) 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: Some strange lines by taking a look at the bt of fdo#51916
Hi, On Mon, Jul 09, 2012 at 02:13:06PM -0700, julien2412 wrote: Hello, I retrieved the bt of fdo#51916 (see https://bugs.freedesktop.org/attachment.cgi?id=64049action=edit) By taking a looking at it, I noticed these : http://opengrok.libreoffice.org/xref/core/sw/source/core/docnode/ndtbl.cxx#1360 new SwEndNode( aCellEndIdx, *pSttNd ); No idea about this :-( This is typical Writer obscurity :) SwNode's constructor adds itself to the same SwNodes array as the other node (pSttNd). So this statement is only executed for the side-effect. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] check for uncommited work before executing a nextchange
From Björn Michaelsen bjoern.michael...@canonical.com: Björn Michaelsen has uploaded a new change for review. Change subject: check for uncommited work before executing a nextchange .. check for uncommited work before executing a nextchange Change-Id: I12b03bb778da712cfe48543949d9634be5221419 --- M logerrit 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/283/1 -- To view, visit https://gerrit.libreoffice.org/283 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12b03bb778da712cfe48543949d9634be5221419 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] make ./g robust against missing bin/repo-list file
From Björn Michaelsen bjoern.michael...@canonical.com: Björn Michaelsen has uploaded a new change for review. Change subject: make ./g robust against missing bin/repo-list file .. make ./g robust against missing bin/repo-list file Change-Id: Ib61a679221d0eddea61358024d31c90464dccefb --- M g 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/284/1 -- To view, visit https://gerrit.libreoffice.org/284 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib61a679221d0eddea61358024d31c90464dccefb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
git hooks (was: Improve doc about gerrit/setup)
Hi, On Tue, Jul 10, 2012 at 07:42:02AM +0200, Christophe JAILLET wrote: Googling, to had this Change-Id, I found that I had to run scp -p -P 29418 username on gerrit.libreoffice.or https://gerrit.libreoffice.org/g@gerrit.libreoffice.org:hooks/commit-msg .git/hooks You shouldnt need do that manually. All the libreoffice git hooks are in the core-repo in the ./git-hooks directory and should be automatically setup already, if they are not a: ./g -z should set them up. Here is the catch: this fails here currently. I never confidently understood how the ./g hook setup is supposed to work, but I tried to fix this with: https://gerrit.libreoffice.org/#/c/284/ @Michael or Norbert: Does that make sense? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - apache-commons/java beanshell/makefile.mk hsqldb/makefile.mk jfreereport/java languagetool/makefile.mk moz/zipped rhino/makefile.mk saxon/makefile.mk tomcat/makefi
apache-commons/java/codec/makefile.mk |4 ++-- apache-commons/java/httpclient/makefile.mk |4 ++-- apache-commons/java/lang/makefile.mk |4 ++-- apache-commons/java/logging/makefile.mk|4 ++-- beanshell/makefile.mk |2 +- hsqldb/makefile.mk |4 ++-- jfreereport/java/flute/makefile.mk |4 ++-- jfreereport/java/jfreereport/makefile.mk |4 ++-- jfreereport/java/libbase/makefile.mk |4 ++-- jfreereport/java/libfonts/makefile.mk |4 ++-- jfreereport/java/libformula/makefile.mk|4 ++-- jfreereport/java/liblayout/makefile.mk |4 ++-- jfreereport/java/libloader/makefile.mk |4 ++-- jfreereport/java/librepository/makefile.mk |4 ++-- jfreereport/java/libserializer/makefile.mk |4 ++-- jfreereport/java/libxml/makefile.mk|4 ++-- jfreereport/java/sac/makefile.mk |4 ++-- languagetool/makefile.mk |4 ++-- moz/zipped/makefile.mk |8 rhino/makefile.mk |4 ++-- saxon/makefile.mk |2 +- tomcat/makefile.mk |4 ++-- 22 files changed, 44 insertions(+), 44 deletions(-) New commits: commit 4fb8a68b0b70243b9c272764cd4762ad5ebf4054 Author: Michael Stahl mst...@redhat.com Date: Tue Jul 10 13:06:47 2012 +0200 quote $ANT in makefiles so path with spaces works diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk index 8464353..fc59a3a 100644 --- a/apache-commons/java/codec/makefile.mk +++ b/apache-commons/java/codec/makefile.mk @@ -57,9 +57,9 @@ ANT_OPTS+=-Dfile.encoding=ISO-8859-1 .IF $(JAVACISGCJ)==yes JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk index 55302e8..c578621 100644 --- a/apache-commons/java/httpclient/makefile.mk +++ b/apache-commons/java/httpclient/makefile.mk @@ -60,9 +60,9 @@ ANT_OPTS+=-Dfile.encoding=ISO-8859-1 .IF $(JAVACISGCJ)==yes JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist +BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist +BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist .ENDIF .ENDIF # $(SOLAR_JAVA)!= diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk index 88a7e1f..099bcd4 100644 --- a/apache-commons/java/lang/makefile.mk +++ b/apache-commons/java/lang/makefile.mk @@ -57,9 +57,9 @@ ANT_OPTS+=-Dfile.encoding=ISO-8859-1 .IF $(JAVACISGCJ)==yes JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk index cc1f1a6..670ccbb 100644 --- a/apache-commons/java/logging/makefile.mk +++ b/apache-commons/java/logging/makefile.mk @@ -63,9 +63,9 @@ SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar .IF $(JAVACISGCJ)==yes JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION) -Dbuild.compiler=gcj -Dservletapi.jar=$(SERVLETAPI_JAR) -f $(ANT_BUILDFILE) compile build-jar +BUILD_ACTION=$(ANT) -Dbuild.label=build-$(RSCREVISION)
make check with DEBUGCCPUNIT=TRUE is waiting for console output
Hi My make check is pausing for console input when I use export DEBUGCPPUNIT=TRUE Not exactly conducive to easy testing :-) This is on an Ubuntu 12.04 linux system. Any ideas on how to debug this? Thanks, Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Added ctrl+w for closing XML FILTER SETTING tool in DRAW
From gokul s gokul.c...@gmail.com: gokul s has uploaded a new change for review. Change subject: Added ctrl+w for closing XML FILTER SETTING tool in DRAW .. Added ctrl+w for closing XML FILTER SETTING tool in DRAW Change-Id: I37cee7027f674003ad4a600a4a36fc1a9eec2dc3 --- M filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/285/1 -- To view, visit https://gerrit.libreoffice.org/285 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37cee7027f674003ad4a600a4a36fc1a9eec2dc3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gokul.c...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gerrit lame / non-reviews spammage
Hi, On Tue, Jul 10, 2012 at 11:28:01AM +0100, Michael Meeks wrote: Hard to see of course; then again - if we could substantially shrink the content of the mail; perhaps it'd be easier to skim through. It seems (like most of the gerrit tools) that verbosity is thought to be an advantage ;-) [...] Which is much more skim-able; of course, people may reply to such mails ;-) and discuss on the mailing list - presumably that causes some level of complexity but ... Yep - on the other hand, it's nice to see it iterating towards something much better - clearly glueing together the mail web work-flows was never going to be perfectly easy :-) Well, I dont think the 'iterating' approach from what we currently have is helpful here. The data source currently is these project-watch emails, which are a not really well suited for machine parsing. So if you want to have something completely different, instead of dissecting and reassembling these mails, we should use gerrit stream events, which are: - instantanteous (no delay by email polling) - JSON objects which can be made to whatever mail we what without fragile email parsing and guesswork. So I would object mangling the mails beyond recognition (at least I wont waste time on that), but keep them as 'good enough' without further mangling until somebody hacks up a gerrit stream event solution. If you have a good template email how that should look like in the end, we can make that a wonderful EasyHack. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: logerrit
logerrit |6 ++ 1 file changed, 6 insertions(+) New commits: commit 689defb4ad5582fbcfc2d3d57e321e31b10a16b9 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Jul 10 12:40:01 2012 +0200 check for uncommited work before executing a nextchange Change-Id: I12b03bb778da712cfe48543949d9634be5221419 diff --git a/logerrit b/logerrit index e5b2ba5..05346d9 100755 --- a/logerrit +++ b/logerrit @@ -73,6 +73,12 @@ case $1 in git push $GERRITURL HEAD:refs/for/$BRANCH ;; nextchange) + if test -n `git status -s -uno` + then + echo You have uncommited changes. Please commit or stash these: + git status + exit 1 + fi CHANGEID=`git log --format=format:%b -1 HEAD|grep Change-Id|cut -d: -f2|tr -d \ ` if test -z $CHANGEID then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 - 1 file changed, 1 deletion(-) New commits: commit a6e3c2b4800144df40e5f78f6f912cdc6a575a32 Author: Michael Stahl mst...@redhat.com Date: Tue Jul 10 13:37:34 2012 +0200 gbuild: Microsoft Resource Compiler does not do -nologo At least the version 6.1.6723.1 that is in the Windows SDK 6.0A only complains about invalid option: -ologo. diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 41a231e..857b91a 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -672,7 +672,6 @@ $(call gb_Output_announce,$(2),$(true),RES,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) \ $(gb_RC) \ - -nologo \ $(DEFS) $(FLAGS) \ $(INCLUDE) \ -Fo$(1) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#51793: FormatNumber can handle sal_uInt32 values after a...
From Bosdonnat Cedric cedric.bosdon...@free.fr: Bosdonnat Cedric has uploaded a new change for review. Change subject: fdo#51793: FormatNumber can handle sal_uInt32 values after all... .. fdo#51793: FormatNumber can handle sal_uInt32 values after all... Change-Id: I9d50bce0278a4aa65873aa816eb991473f556cee --- M sw/inc/fldbas.hxx M sw/source/core/fields/expfld.cxx M sw/source/core/fields/fldbas.cxx 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/286/1 -- To view, visit https://gerrit.libreoffice.org/286 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d50bce0278a4aa65873aa816eb991473f556cee Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: Branch 'feature/remote' - sd/Library_sd.mk sd/source
Hi David, On Tue, 2012-07-10 at 08:16 +0200, David Tardon wrote: -I$(WORKDIR)/SdiTarget/sd/sdi \ +$(shell pkg-config --cflags json-glib-1.0) \ Please do not call pkg-config from makefiles. That is what configure is for. This is on a branch; we're trying to get something working quickly - and it's unclear to me whether we'll continue to use json-glib in future. Also: grep pkg-config */*.mk 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: Help: SW field calculation
Hi Olivier, On Mon, 2012-07-09 at 22:57 -0300, Olivier Hallot wrote: Can someone let me know where are fields computed in swriter? Especially fields of Number range category? While looking for the exact place where this all happens in sw, I found and fixed the bug. You can see the patch here: https://gerrit.libreoffice.org/#/c/286/ For the next time (and for the list archives to remember it for me as well), the update of fields happens in that method: SwDoc::UpdateExpFlds. Regards, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/fldbas.hxx|2 +-
sw/source/core/fields/expfld.cxx |2 +-
sw/source/core/fields/fldbas.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 32c7ba61a9ce620c1c9544ac469ccfd143e60bb9
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Jul 10 13:44:33 2012 +0200
fdo#51793: FormatNumber can handle sal_uInt32 values after all...
Change-Id: I9d50bce0278a4aa65873aa816eb991473f556cee
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 404dcfc..93c7495 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -230,7 +230,7 @@ extern sal_uInt16 aTypeTab[];
// General tools.
String GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang =
LANGUAGE_SYSTEM);
voidSetErrorStr(const String rStr);
-String FormatNumber(sal_uInt16 nNum, sal_uInt32 nFormat);
+String FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat);
// Instances of SwFields and those derived from it occur 0 to n times.
// For each class there is one instance of the associated type class.
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index ba2754c..fee0e9c 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -880,7 +880,7 @@ void SwSetExpField::SetValue( const double rAny )
SwValueField::SetValue(rAny);
if( IsSequenceFld() )
-sExpand = FormatNumber( (sal_uInt16)GetValue(), GetFormat() );
+sExpand = FormatNumber( (sal_uInt32)GetValue(), GetFormat() );
else
sExpand = ((SwValueFieldType*)GetTyp())-ExpandValue( rAny,
GetFormat(), GetLanguage());
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 3ca892e..2a693ea 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -434,7 +434,7 @@ SwField * SwField::CopyField() const
Beschreibung: Numerierung expandieren
*/
-String FormatNumber(sal_uInt16 nNum, sal_uInt32 nFormat)
+String FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat)
{
if(SVX_NUM_PAGEDESC == nFormat)
return String::CreateFromInt32( nNum );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 -- 1 file changed, 2 deletions(-) New commits: commit 87577cac4b7f54552296c090651787afac65669b Author: Thorsten Behrens tbehr...@suse.com Date: Tue Jul 10 14:36:56 2012 +0200 about.svg no longer bears brand differences. Change-Id: I28ce335b4fafc8c628a0ec71dd097a09d683b2be diff --git a/configure.in b/configure.in index 541ab7e..eb2ee8d 100644 --- a/configure.in +++ b/configure.in @@ -11436,7 +11436,6 @@ if test -z $with_branding -o $with_branding = no; then AC_MSG_RESULT([none]) else INTRO_BITMAP=$with_branding/intro.png -ABOUT_BACKGROUND_SVG=$with_branding/about.svg FLAT_LOGO_SVG=$with_branding/flat_logo.svg STARTCENTER_LEFT_BITMAP=$with_branding/backing_left.png STARTCENTER_RIGHT_BITMAP=$with_branding/backing_right.png @@ -11444,7 +11443,6 @@ else STARTCENTER_RTL_RIGHT_BITMAP=$with_branding/backing_rtl_right.png STARTCENTER_SPACE_BITMAP=$with_branding/backing_space.png for i in $INTRO_BITMAP \ - $ABOUT_BACKGROUND_SVG \ $FLAT_LOGO_SVG \ $STARTCENTER_LEFT_BITMAP \ $STARTCENTER_RIGHT_BITMAP \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - configure.in
configure.in |2 -- 1 file changed, 2 deletions(-) New commits: commit 8c8f5b683d611d18ab8400c9fef67f50b1cf288f Author: Thorsten Behrens tbehr...@suse.com Date: Tue Jul 10 14:36:56 2012 +0200 about.svg no longer bears brand differences. Change-Id: I28ce335b4fafc8c628a0ec71dd097a09d683b2be diff --git a/configure.in b/configure.in index 164c079..46bffe4 100644 --- a/configure.in +++ b/configure.in @@ -11322,7 +11322,6 @@ if test -z $with_branding -o $with_branding = no; then AC_MSG_RESULT([none]) else INTRO_BITMAP=$with_branding/intro.png -ABOUT_BACKGROUND_SVG=$with_branding/about.svg FLAT_LOGO_SVG=$with_branding/flat_logo.svg STARTCENTER_LEFT_BITMAP=$with_branding/backing_left.png STARTCENTER_RIGHT_BITMAP=$with_branding/backing_right.png @@ -11330,7 +11329,6 @@ else STARTCENTER_RTL_RIGHT_BITMAP=$with_branding/backing_rtl_right.png STARTCENTER_SPACE_BITMAP=$with_branding/backing_space.png for i in $INTRO_BITMAP \ - $ABOUT_BACKGROUND_SVG \ $FLAT_LOGO_SVG \ $STARTCENTER_LEFT_BITMAP \ $STARTCENTER_RIGHT_BITMAP \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/docshell/docshel4.cxx | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 8089502118d3fe53007e95ff2ca87077c1fb3eab
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Sun Jul 8 17:16:27 2012 +0700
fdo#51179: SearchAscii() is equal to indexOf(), not match()
regression from 8adec08d56a9ad46d3550e43b115e916c4cf783f
Change-Id: Ic1c3160be1c61162f6a62a7e14c4efb7bedccdcc
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index 5b0d4c5..df97c37 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -469,7 +469,8 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium rMedium )
mpDoc-StopWorkStartupDelay();
bRet = SdPPTFilter( rMedium, *this, sal_True ).Import();
}
-else if (aFilterName.match(impress8 ) || aFilterName.match(draw8))
+else if (aFilterName.indexOf(impress8) = 0 ||
+ aFilterName.indexOf(draw8) = 0)
{
// TODO/LATER: nobody is interested in the error code?!
mpDoc-CreateFirstPages();
@@ -478,7 +479,8 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium rMedium )
bRet = SdXMLFilter( rMedium, *this, sal_True ).Import( nError );
}
-else if (aFilterName.match(StarOffice XML (Draw)) ||
aFilterName.match(StarOffice XML (Impress)))
+else if (aFilterName.indexOf(StarOffice XML (Draw)) = 0 ||
+ aFilterName.indexOf(StarOffice XML (Impress)) = 0)
{
// TODO/LATER: nobody is interested in the error code?!
mpDoc-CreateFirstPages();
@@ -595,25 +597,27 @@ sal_Bool DrawDocShell::ConvertTo( SfxMedium rMedium )
const rtl::OUString aTypeName( pMediumFilter-GetTypeName() );
SdFilter* pFilter = NULL;
-if( aTypeName.match( graphic_HTML ) )
+if( aTypeName.indexOf( graphic_HTML ) = 0 )
{
pFilter = new SdHTMLFilter( rMedium, *this, sal_True );
}
-else if( aTypeName.match( MS_PowerPoint_97 ) )
+else if( aTypeName.indexOf( MS_PowerPoint_97 ) = 0 )
{
pFilter = new SdPPTFilter( rMedium, *this, sal_True );
((SdPPTFilter*)pFilter)-PreSaveBasic();
}
-else if ( aTypeName.match( CGM_Computer_Graphics_Metafile ) )
+else if ( aTypeName.indexOf( CGM_Computer_Graphics_Metafile ) = 0 )
{
pFilter = new SdCGMFilter( rMedium, *this, sal_True );
}
-else if( aTypeName.match( draw8 ) || aTypeName.match( impress8 ) )
+else if( aTypeName.indexOf( draw8 ) = 0 ||
+ aTypeName.indexOf( impress8 ) = 0 )
{
pFilter = new SdXMLFilter( rMedium, *this, sal_True );
UpdateDocInfoForSave();
}
-else if( aTypeName.match( StarOffice_XML_Impress ) ||
aTypeName.match( StarOffice_XML_Draw ) )
+else if( aTypeName.indexOf( StarOffice_XML_Impress ) = 0 ||
+ aTypeName.indexOf( StarOffice_XML_Draw ) = 0 )
{
pFilter = new SdXMLFilter( rMedium, *this, sal_True,
SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 );
UpdateDocInfoForSave();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] removed deserted Lotus 1-2-3 export filter
From Michael Meeks michael.me...@suse.com: Michael Meeks has submitted this change and it was merged. Change subject: removed deserted Lotus 1-2-3 export filter .. removed deserted Lotus 1-2-3 export filter which has never enabled so far since its birth at 2008 Change-Id: Ifd2e2f1108f44d5816783bf67f11e500eea0c170 --- M sc/Library_scfilt.mk M sc/inc/filter.hxx M sc/source/filter/inc/exp_op.hxx M sc/source/filter/inc/ftools.hxx D sc/source/filter/lotus/expop.cxx D sc/source/filter/lotus/export.cxx M sc/source/ui/docshell/impex.cxx 7 files changed, 0 insertions(+), 506 deletions(-) Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/280 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd2e2f1108f44d5816783bf67f11e500eea0c170 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Takeshi Abe t...@fixedpoint.jp Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: Branch 'feature/remote' - sd/Library_sd.mk sd/source
Hi, On Tue, Jul 10, 2012 at 12:59:49PM +0100, Michael Meeks wrote: Hi David, On Tue, 2012-07-10 at 08:16 +0200, David Tardon wrote: -I$(WORKDIR)/SdiTarget/sd/sdi \ +$(shell pkg-config --cflags json-glib-1.0) \ Please do not call pkg-config from makefiles. That is what configure is for. This is on a branch; we're trying to get something working quickly - and it's unclear to me whether we'll continue to use json-glib in future. Okay, then. Also: grep pkg-config */*.mk So avmedia/Library_avmediagst.mk and vcl/Library_vclplug_gen.mk _must_ be fixed. I was hoping that kind of stuff would not pass through gbuild conversion. But that is no excuse for using it in new makefiles :-) D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RFC: where to put sorted vector template/class?
Hi In my removals of SV_DECL_PTRARR, I have across a dozen or so places in the codebase, where I cannot use anything other than a sorted vector, normally with a custom comparison function. This is because the code(s) in question wants to take the index of the items in the array and passes the index around. Rather than re-implement such a class/template repeatedly, is there a common place I could stash such a template, and then include it in the places it is necessary? Regards, Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/inc sc/Library_scfilt.mk sc/source
sc/Library_scfilt.mk |2
sc/inc/filter.hxx |5
sc/source/filter/inc/exp_op.hxx | 43
sc/source/filter/inc/ftools.hxx |3
sc/source/filter/lotus/expop.cxx | 405 --
sc/source/filter/lotus/export.cxx | 45
sc/source/ui/docshell/impex.cxx |3
7 files changed, 506 deletions(-)
New commits:
commit 8f42220c6dfc49268f7e1b460a48d9f3d340c40b
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Jul 9 23:11:56 2012 +0900
removed deserted Lotus 1-2-3 export filter
which has never enabled so far since its birth at 2008
Change-Id: Ifd2e2f1108f44d5816783bf67f11e500eea0c170
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 76066b6..2c83049 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -128,8 +128,6 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/html/htmlexp2 \
sc/source/filter/html/htmlimp \
sc/source/filter/html/htmlpars \
- sc/source/filter/lotus/expop \
- sc/source/filter/lotus/export \
sc/source/filter/lotus/filter \
sc/source/filter/lotus/lotattr \
sc/source/filter/lotus/lotform \
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 9b470b5..ac943f5 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -32,8 +32,6 @@
#include tools/string.hxx
#include rtl/textenc.h
-#define ENABLE_LOTUS123_EXPORT 0
-
class SfxMedium;
class SvStream;
@@ -112,9 +110,6 @@ class ScFormatFilterPlugin {
virtual String GetHTMLRangeNameList( ScDocument* pDoc, const
String rOrigName ) = 0;
// various export filters
-#if ENABLE_LOTUS123_EXPORT
-virtual FltError ScExportLotus123( SvStream, ScDocument*,
ExportFormatLotus, CharSet eDest ) = 0;
-#endif
virtual FltError ScExportExcel5( SfxMedium, ScDocument*,
ExportFormatExcel eFormat, CharSet eDest ) = 0;
virtual FltError ScExportDif( SvStream, ScDocument*, const ScAddress
rOutPos, const CharSet eDest,
sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx
index 5781224..aad9325 100644
--- a/sc/source/filter/inc/exp_op.hxx
+++ b/sc/source/filter/inc/exp_op.hxx
@@ -61,49 +61,6 @@ public:
-#if ENABLE_LOTUS123_EXPORT
-class ExportWK1 : public ExportTyp
-{
-private:
-sal_uInt8 GenFormByte( const ScPatternAttr );
-voidBof();
-voidEof();
-voidCalcmode();
-voidCalcorder();
-voidSplit();
-voidSync();
-voidDimensions();
-voidWindow1();
-voidColw();
-voidBlank( const sal_uInt16 nC, const sal_uInt16 nR, const
ScPatternAttr );
-voidNumber( const sal_uInt16 nC, const sal_uInt16 nR,
const double f, const ScPatternAttr );
-voidLabel( const sal_uInt16 nC, const sal_uInt16 nR, const
String, const ScPatternAttr );
-voidFormula( const sal_uInt16 nC, const sal_uInt16 nR,
const ScFormulaCell*, const ScPatternAttr );
-voidProtect();
-voidFooter();
-voidHeader();
-voidMargins();
-voidLabelfmt();
-voidCalccount();
-voidCursorw12();
-voidWKString( const sal_uInt16 nC, const sal_uInt16 nR,
const ScFormulaCell*, const ScPatternAttr );
-voidSnrange();
-voidHidcol();
-voidCpi();
-public:
-
-static const sal_uInt16WK1MAXCOL;
-static const sal_uInt16WK1MAXROW;
-
-inline ExportWK1( SvStream r, ScDocument* p, CharSet e ) :
-ExportTyp( r, p, e ) {};
-
-FltErrorWrite();
-};
-#endif
-
-
-
class ExportBiff5 : public ExportTyp, protected XclExpRoot
{
private:
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index c1c0464..1ffd57f 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -314,9 +314,6 @@ class ScFormatFilterPluginImpl : public
ScFormatFilterPlugin {
virtual String GetHTMLRangeNameList( ScDocument* pDoc, const
String rOrigName );
// various export filters
-#if ENABLE_LOTUS123_EXPORT
-virtual FltError ScExportLotus123( SvStream, ScDocument*,
ExportFormatLotus, CharSet eDest );
-#endif
virtual FltError ScExportExcel5( SfxMedium, ScDocument*,
ExportFormatExcel eFormat, CharSet eDest );
virtual FltError ScExportDif( SvStream, ScDocument*, const ScAddress
rOutPos, const CharSet eDest,
sal_uInt32 nDifOption = SC_DIFOPT_EXCEL );
diff --git a/sc/source/filter/lotus/expop.cxx b/sc/source/filter/lotus/expop.cxx
deleted
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 18e48959de7774f0e2bf194594809b74ee26ab93
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jul 10 15:15:45 2012 +0200
correctly paint toolbar separators with gtk-2.8 (bnc#770013)
wide_separators = 0 would be enough because the value was not modified if
the
property did not exist.
Anyway, I added also #if GTK_CHECK_VERSION(2,10,0) because it helps to avoid
the GTK warning about non-existing property 'wide-separators'.
Change-Id: If93928821d951dc15da967519cb207efdaa30cf7
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 7735a74..96b702b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2865,7 +2865,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
}
else if( nPart == PART_SEPARATOR_HORZ || nPart ==
PART_SEPARATOR_VERT )
{
-gint separator_height, separator_width, wide_separators;
+const double shim = 0.2;
+
+#if GTK_CHECK_VERSION(2,10,0)
+gint separator_height, separator_width, wide_separators = 0;
gtk_widget_style_get (gWidgetData[m_nXScreen].gSeparator,
wide-separators, wide_separators,
@@ -2873,8 +2876,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
separator-height, separator_height,
NULL);
-const double shim = 0.2;
-
if (wide_separators)
{
if (nPart == PART_SEPARATOR_VERT)
@@ -2891,6 +2892,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
w * (1 - 2*shim), separator_width);
}
else
+#endif
{
if (nPart == PART_SEPARATOR_VERT)
gtk_paint_vline
(gWidgetData[m_nXScreen].gSeparator-style, gdkDrawable,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c854d36984789c1ffac8c83c929406c10ba99462
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 10 15:29:02 2012 +0200
gbuild: remove trailing \ that is apparently...
... causing LO patched make 3.82 to fail with Malformed target-specific
variable definition on the next line.
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 857b91a..05d7628 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -638,7 +638,7 @@ $(call
gb_JunitTest_JunitTest_platform_longpathname_hack,$(1))
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:`cat
$(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org
3/program/soffice.exe} \
-Dorg.openoffice.test.arg.env=PATH \
- -Dorg.openoffice.test.arg.user=file:///$(call
gb_JunitTest_get_userdir,$(1)) \
+ -Dorg.openoffice.test.arg.user=file:///$(call
gb_JunitTest_get_userdir,$(1))
endef
___
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 Tue, 2012-07-10 at 13:08 +0200, Noel Grandin wrote: My make check is pausing for console input when I use export DEBUGCPPUNIT=TRUE Not exactly conducive to easy testing :-) Oh - perhaps you have to type 'run' to run the unit tests ? :-) I assume you'd not want to do a 'make check' in the toplevel with that - but isolate it to the single failing test. Hopefully that's not the sfx2 / Undo test that I disabled last night ;-) 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] .: Branch 'libreoffice-3-6' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 1d1a6411d69f300a864012e6b07ccf27551ff561
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jul 10 15:15:45 2012 +0200
correctly paint toolbar separators with gtk-2.8 (bnc#770013)
wide_separators = 0 would be enough because the value was not modified if
the
property did not exist.
Anyway, I added also #if GTK_CHECK_VERSION(2,10,0) because it helps to avoid
the GTK warning about non-existing property 'wide-separators'.
Change-Id: If93928821d951dc15da967519cb207efdaa30cf7
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 2b5d3c8..e1c8e2d 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2871,7 +2871,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
}
else if( nPart == PART_SEPARATOR_HORZ || nPart ==
PART_SEPARATOR_VERT )
{
-gint separator_height, separator_width, wide_separators;
+const double shim = 0.2;
+
+#if GTK_CHECK_VERSION(2,10,0)
+gint separator_height, separator_width, wide_separators = 0;
gtk_widget_style_get (gWidgetData[m_nXScreen].gSeparator,
wide-separators, wide_separators,
@@ -2879,8 +2882,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
separator-height, separator_height,
NULL);
-const double shim = 0.2;
-
if (wide_separators)
{
if (nPart == PART_SEPARATOR_VERT)
@@ -2897,6 +2898,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
w * (1 - 2*shim), separator_width);
}
else
+#endif
{
if (nPart == PART_SEPARATOR_VERT)
gtk_paint_vline
(gWidgetData[m_nXScreen].gSeparator-style, gdkDrawable,
___
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-10 15:29, Michael Meeks wrote: On Tue, 2012-07-10 at 13:08 +0200, Noel Grandin wrote: My make check is pausing for console input when I use export DEBUGCPPUNIT=TRUE Not exactly conducive to easy testing :-) Oh - perhaps you have to type 'run' to run the unit tests ? :-) I Hopefully that's not the sfx2 / Undo test that I disabled last night ;-) It seems to be a general thing. Not specific to one test, they all pause, so I have to enter lots of r and q Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help: SW field calculation
Thanks Cédric for the fix! Also, can this fix go into 3.5 and 3.6 branch? It looks soo simple... Regards 2012/7/10 Cedric Bosdonnat cbosdon...@suse.com Hi Olivier, On Mon, 2012-07-09 at 22:57 -0300, Olivier Hallot wrote: Can someone let me know where are fields computed in swriter? Especially fields of Number range category? While looking for the exact place where this all happens in sw, I found and fixed the bug. You can see the patch here: https://gerrit.libreoffice.org/#/c/286/ For the next time (and for the list archives to remember it for me as well), the update of fields happens in that method: SwDoc::UpdateExpFlds. Regards, -- Cedric -- Olivier Hallot Founder and Steering Commitee Member The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: RFC: where to put sorted vector template/class?
On Tue, 2012-07-10 at 14:53 +0200, Noel Grandin wrote: Rather than re-implement such a class/template repeatedly, is there a common place I could stash such a template, and then include it in the places it is necessary? o3tl maybe ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/source
oox/source/ppt/slidefragmenthandler.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 752c83258899be8b3541e25933905393b9c38698
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Jul 10 19:39:36 2012 +0530
Crash fix.
Though getTheme() is not supposed to be returning NULL.
It seems like doing that sometimes.
diff --git a/oox/source/ppt/slidefragmenthandler.cxx
b/oox/source/ppt/slidefragmenthandler.cxx
index 29954f6..1b34a1a 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -174,7 +174,9 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
case PPT_TOKEN( bgRef ):// a:CT_StyleMatrixReference
{
-const FillProperties *pFillProperties =
mpSlidePersistPtr-getTheme()-getFillStyle( rAttribs.getInteger( XML_idx, -1 )
);
+const FillProperties *pFillProperties = NULL;
+if( mpSlidePersistPtr-getTheme() )
+pFillProperties = mpSlidePersistPtr-getTheme()-getFillStyle(
rAttribs.getInteger( XML_idx, -1 ) );
FillPropertiesPtr pFillPropertiesPtr( pFillProperties ? new
FillProperties( *pFillProperties ) : new FillProperties() );
ContextHandlerRef ret = new ColorContext( *this,
mpSlidePersistPtr-getBackgroundColor() );
mpSlidePersistPtr-setBackgroundProperties( pFillPropertiesPtr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6, 3-5] n#759210: Certain smartart drawings weren't imported
Hello all, First, sorry for not using gerrit. I've tried it but got invalid author error as I tried to push Muthu's patch. The commit 11c5699dad06fb0d7fc0e458550a1dac82f8ee5f also fix fdo#50907 on master, so I propose this review for the inclusion in both -3-6 and -3-5 branches. Branch -3-5 didn't apply cleanly, because conflict by getLength() to isEmpty() change, so patch attached, for both branches. I also deleted code-indent change, which is already in master, in oox/source/ppt/pptshapegroupcontext.cxx. Last, sorry to say this, but I didn't have time to test if it could be build or even fix the problem. (I didn't test in both branches, but tested in master that this really fixes the problem, please see comment 11 in fdo bugzilla). Thanks :-) Best Regards, -- Korrawit Pruegsanusak 0001-n-759210-Certain-smartart-drawings-weren-t-imported-3-5.patch Description: Binary data 0001-n-759210-Certain-smartart-drawings-weren-t-imported-3-6.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: issue with HelpLinker (Bus Error, core dumped)
Lubos Lunak l.lu...@suse.cz wrote .. Try running it in valgrind in gdb manually. Other than that, you use a development snapshot of gcc, so this is not very likely a LibreOffice problem actually. Thanks Lubos, i appreciate the reply and helpful suggestions. The build works without error, (except for the helpcontents2, which can be avoided using --without-help). 'Help' is probably a good idea so I'll need to track down the problem. -- Waitman Gobble San Jose California USA ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RFC - Solaris/intel/gcc patches
Hello,
Here are several patches needed to build and run LO on Solaris/intel/gcc.
These are not enough to get LO running properly because it still crashes
after some time (see http://pastebin.com/JKQHnt3Z)
Any comments welcomed.
Some notes:
* the 8th patch is just a temporary workaround: it simply disable
some failing unit tests.
* you'll need to compile with : 'LDFLAGS=-mimpure-text gmake' to
avoid relocation errors (I didn't manage to properly add this LD_FLAGS
to mk files or to figure how to prevent the issue).
* some .so files don't have the .3 suffix, but the generated install
script : ./solver/unxsogi.pro/bin/setup_osl.ins is looking for .so.3
files. So manually editing this file is needed.
* to start LO, you'll also need to specify a LD_LIBRARY_PATH like this:
LD_LIBRARY_PATH=./solver/unxsogi.pro/installation/opt/ure/lib/
./install/program/soffice
Otherwise, 'ld' will find 'libuno_cppuhelpergcc3.so' in the wrong dir
(./solver/unxsogi.pro/lib/ instead of
./solver/unxsogi.pro/installation/opt/ure/lib/) and then LO will fail to
use the correct unorc like this:
warn:desktop:24534:1:/home/pepp/core/desktop/source/app/app.cxx:703: UNO
Exception: Cannot obtain UNO_SERVICES from uno ini
Regards,
Pierre-Eric Pelloux-Prayer
Lanedo
From d0ec5cc95016ee02a6c1e9a29b8ab050e70c830b Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Mon, 9 Jul 2012 11:22:19 +0200
Subject: [PATCH 1/8] Mark ecx register as clobbered (solaris/intel)
This is a followup of :
commit e748b096633c5ef747f0630d13708d8dd7308a86
Author: Kristian Rietveld k...@lanedo.com
Date: Sat Oct 15 01:15:21 2011 +0200
Mark ecx register as clobbered
The inline assembly code executes a function call and functions are
free to use eax, ecx and edx without preservation. We must thus mark
ecx as a clobber register.
Change-Id: I4e9ed38189b23c2bb6d4fbdedc34c318026acfe7
---
.../source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
index a97a736..8099a25 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
@@ -97,7 +97,7 @@ static void callVirtualMethod(
:
: m(nStackLongs), m(pStackLongs), m(pAdjustedThisPtr),
m(nVtableIndex), m(eax), m(edx), m(stackptr)
-: eax, edx );
+: eax, ecx, edx );
switch( eReturnType )
{
case typelib_TypeClass_HYPER:
--
1.7.3.2
From a8be3a6c889ad5471d8bc677c71ff71098e91de7 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Mon, 9 Jul 2012 11:25:06 +0200
Subject: [PATCH 2/8] Remove conflicting typedef
Barely used typedef produced compilation error on Solaris, due to
already defined type 'SS'.
Change-Id: I2d1d563d8c4818a4afe9656cc4a62ba1bbaaafd2
---
connectivity/source/drivers/odbcbase/ODriver.cxx |9 -
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx
index e937363..e5c2cf1 100644
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
@@ -63,11 +63,10 @@ rtl::OUString ODBCDriver::getImplementationName_Static( ) throw(RuntimeExceptio
// Please take care when changing it.
}
-typedef Sequence ::rtl::OUString SS;
//--
-SS ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
+Sequence ::rtl::OUString ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
{
-SS aSNS( 1 );
+Sequence ::rtl::OUString aSNS( 1 );
aSNS[0] = ::rtl::OUString(com.sun.star.sdbc.Driver);
return aSNS;
}
@@ -81,7 +80,7 @@ SS ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
//--
sal_Bool SAL_CALL ODBCDriver::supportsService( const ::rtl::OUString _rServiceName ) throw(RuntimeException)
{
-SS aSupported(getSupportedServiceNames());
+Sequence ::rtl::OUString aSupported(getSupportedServiceNames());
const ::rtl::OUString* pSupported = aSupported.getConstArray();
const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
for (;pSupported != pEnd !pSupported-equals(_rServiceName); ++pSupported)
@@ -91,7 +90,7 @@ sal_Bool SAL_CALL ODBCDriver::supportsService( const ::rtl::OUString _rServiceN
}
//--
-SS SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException)
+Sequence ::rtl::OUString SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException)
{
return getSupportedServiceNames_Static();
}
--
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sd/source
sd/source/ui/docshell/docshel4.cxx | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 7119c94f78f8160ee502fc4277bdaaf0b5ddf138
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Sun Jul 8 17:16:27 2012 +0700
fdo#51179: SearchAscii() is equal to indexOf(), not match()
regression from 8adec08d56a9ad46d3550e43b115e916c4cf783f
Change-Id: Ic1c3160be1c61162f6a62a7e14c4efb7bedccdcc
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index 5b0d4c5..df97c37 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -469,7 +469,8 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium rMedium )
mpDoc-StopWorkStartupDelay();
bRet = SdPPTFilter( rMedium, *this, sal_True ).Import();
}
-else if (aFilterName.match(impress8 ) || aFilterName.match(draw8))
+else if (aFilterName.indexOf(impress8) = 0 ||
+ aFilterName.indexOf(draw8) = 0)
{
// TODO/LATER: nobody is interested in the error code?!
mpDoc-CreateFirstPages();
@@ -478,7 +479,8 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium rMedium )
bRet = SdXMLFilter( rMedium, *this, sal_True ).Import( nError );
}
-else if (aFilterName.match(StarOffice XML (Draw)) ||
aFilterName.match(StarOffice XML (Impress)))
+else if (aFilterName.indexOf(StarOffice XML (Draw)) = 0 ||
+ aFilterName.indexOf(StarOffice XML (Impress)) = 0)
{
// TODO/LATER: nobody is interested in the error code?!
mpDoc-CreateFirstPages();
@@ -595,25 +597,27 @@ sal_Bool DrawDocShell::ConvertTo( SfxMedium rMedium )
const rtl::OUString aTypeName( pMediumFilter-GetTypeName() );
SdFilter* pFilter = NULL;
-if( aTypeName.match( graphic_HTML ) )
+if( aTypeName.indexOf( graphic_HTML ) = 0 )
{
pFilter = new SdHTMLFilter( rMedium, *this, sal_True );
}
-else if( aTypeName.match( MS_PowerPoint_97 ) )
+else if( aTypeName.indexOf( MS_PowerPoint_97 ) = 0 )
{
pFilter = new SdPPTFilter( rMedium, *this, sal_True );
((SdPPTFilter*)pFilter)-PreSaveBasic();
}
-else if ( aTypeName.match( CGM_Computer_Graphics_Metafile ) )
+else if ( aTypeName.indexOf( CGM_Computer_Graphics_Metafile ) = 0 )
{
pFilter = new SdCGMFilter( rMedium, *this, sal_True );
}
-else if( aTypeName.match( draw8 ) || aTypeName.match( impress8 ) )
+else if( aTypeName.indexOf( draw8 ) = 0 ||
+ aTypeName.indexOf( impress8 ) = 0 )
{
pFilter = new SdXMLFilter( rMedium, *this, sal_True );
UpdateDocInfoForSave();
}
-else if( aTypeName.match( StarOffice_XML_Impress ) ||
aTypeName.match( StarOffice_XML_Draw ) )
+else if( aTypeName.indexOf( StarOffice_XML_Impress ) = 0 ||
+ aTypeName.indexOf( StarOffice_XML_Draw ) = 0 )
{
pFilter = new SdXMLFilter( rMedium, *this, sal_True,
SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 );
UpdateDocInfoForSave();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: RFC: where to put sorted vector template/class?
On 2012-07-10 15:35, Caolán McNamara wrote:
On Tue, 2012-07-10 at 14:53 +0200, Noel Grandin wrote:
Rather than re-implement such a class/template repeatedly, is there a
common place I could stash such a template, and then include it in the
places it is necessary?
o3tl maybe ?
Since I have your attention, and I know very little about modern
template programming :-)
How does this look? It's the bare minimum I need in a sorted_vector class.
namespace o3tl
{
/** Represents a sorted vector of values.
@tpl Value
@tpl Compare comparison method
*/
template class Value, class Compare = lessValue
class sorted_vector : vectorValue
{
public:
// MODIFIERS
pairiterator,bool insert( const Value x );
size_type erase( const Value x );
// OPERATIONS
/* Searches the container for an element with a value of x
* and returns an iterator to it if found, otherwise it returns an
* iterator to sorted_vector::end (the element past the end of the
container).
*/
iteratorfind( const Value x ) const;
};
// IMPLEMENTATION
template class Value, class Compare
pairiterator,bool sorted_vectorValue,Compare::insert( const Value x )
{
iterator it = std::lower_bound(begin(), end(), p, Compare);
if( !Compare(*it, x) )
{
return make_pair( it, false );
}
it = insert( it, p );
return make_pair( it, true );
}
template class Value, class Compare
size_type sorted_vectorValue,Compare::erase( const Value x )
{
iterator it = std::lower_bound(begin(), end(), p, Compare);
if( !Compare(*it, x) )
{
erase( it );
return 1;
}
return 0;
}
template class Value, class Compare
iterator sorted_vectorValue,Compare::find( const Value x )
{
iterator it = std::lower_bound(begin(), end(), p, Compare);
if( !Compare(*it, x) )
{
return it;
}
return end();
}
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Re: [PATCH] cleanup java code and update to Java5, including generics (36)
On 06/29/2012 10:07 PM, Michael Stahl wrote: [PATCH 22/36] Java5 update - convert code to use generics [PATCH 36/36] Java5 updates - update code to use generics the above 2 patches seem to change interfaces of classes in ridljar and javaunohelper that are likely part of the stable URE ABI, and shouldn't be changed; i think adding type parameters is OK (after all the Java standard libraries had these retrofitted as well, and they don't exist at runtime anyway thanks to type erasure) but things like replacing Hashtable with Map is not OK, so i've reverted those parts. Things like changing from com.sun.star.comp.helper.Bootstrap.createInitialComponentContext( Hashtable context_entries); to com.sun.star.comp.helper.Bootstrap.createInitialComponentContext( HashtableString, Object context_entries); (javaunohelper/com/sun/star/comp/helper/Bootstrap.java) are technically incompatible: Old client code could legitimately have called createInitialComponentContext(new HashtableObject, Object()) which now fails to compile. However, chances of such client code are pretty low, so I'd say the changes are OK. 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 51179, which changed state. Bug 51179 Summary: FILESAVE cannot save file as .ppt https://bugs.freedesktop.org/show_bug.cgi?id=51179 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
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Roman Eisele b...@eikota.de changed: What|Removed |Added Depends on||51943 --- Comment #39 from Roman Eisele b...@eikota.de 2012-07-10 14:15:12 PDT --- Add Bug 51943 - text color setting is broken. A wonderful regression which would make all users (and especially our friends at Microsoft and AOO) laugh about LibreOffice -- so this needs to be fixed before 3.6 goes final. At the moment only documented for MacOS X; could someone else please test on Linux and Windows? But even if this bug occurs only on MacOS X, it is very important to fix it, just because it is so simple and ridiculous. -- 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] .: solenv/gbuild
solenv/gbuild/JunitTest.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9991c0f552bfc9c6ea3e6e6d65fe67cc32f243fd Author: Michael Stahl mst...@redhat.com Date: Tue Jul 10 16:22:29 2012 +0200 gbuild: sigh... that didn't help... let's try an eval here Change-Id: Ief6367a5fb8e2e1000bb94c7a4e6cf2095b24543 diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index c74a7ce..31cf96e 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -70,7 +70,7 @@ $(call gb_JunitTest_get_target,%) : define gb_JunitTest_JunitTest $(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value XCLASSPATH),$(value XCLASSPATH)$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib $(call gb_JunitTest_get_target,$(1)) : CLASSES := -$(call gb_JunitTest_JunitTest_platform,$(1)) +$(eval $(call gb_JunitTest_JunitTest_platform,$(1))) $(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1))) $(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(OOO_JUNIT_JAR)) ___ 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 Tue, Jul 10, 2012 at 03:33:24PM +0200, Noel Grandin n...@peralex.com wrote: It seems to be a general thing. Not specific to one test, they all pause, so I have to enter lots of r and q What usually do is: I run toplevel 'make check', then once I know what is the test I want to debug, I run something like: cd sw GDBCPPUNITTRACE=gdb --args make -sr dbglevel=2 /home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CppunitTest/sw_subsequent_ooxmltok.test In this case, I have to enter r only once. ___ 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
On Tue, 2012-07-10 at 15:33 +0200, Noel Grandin wrote: It seems to be a general thing. Not specific to one test, they all pause, so I have to enter lots of r and q Sure - that is to let you do interactive debugging of the test :-) if you don't want that behaviour don't set that variable ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'features/base-preview' - connectivity/source
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 13
++
1 file changed, 13 insertions(+)
New commits:
commit 409131875d7852a57cd5f52a5354f262d1eff525
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jul 10 17:18:56 2012 +0200
fdo#50849 work around psqlodbc segfault
Change-Id: Ib7e484f778d97b3f18845cef12718618324c859f
diff --git
a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index a364915..ec3ab25 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -1125,6 +1125,19 @@ void
ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any
const ::rtl::OUString table,sal_Int32
scope, sal_Bool nullable )
throw(SQLException, RuntimeException)
{
+// Some ODBC drivers really don't like getting an empty string as tableName
+// E.g. psqlodbc up to at least version 09.01.0100 segfaults
+if (table.isEmpty())
+{
+const char errMsg[] = ODBC: Trying to get special columns of empty
table name;
+const char SQLState[] = HY009;
+throw SQLException( ::rtl::OUString(errMsg, sizeof(errMsg) -
sizeof(errMsg[0]), RTL_TEXTENCODING_ASCII_US),
+*this,
+::rtl::OUString(SQLState, sizeof(SQLState) -
sizeof(SQLState[0]), RTL_TEXTENCODING_ASCII_US),
+-1,
+Any() );
+}
+
const ::rtl::OUString *pSchemaPat = NULL;
if(schema.toChar() != '%')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 13
++
1 file changed, 13 insertions(+)
New commits:
commit 1c67fc8015d88a383f2138c4d03d692314d6f579
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jul 10 17:18:56 2012 +0200
fdo#50849 work around psqlodbc segfault
Change-Id: Ib7e484f778d97b3f18845cef12718618324c859f
diff --git
a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index ac81567..953ccc5 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -1117,6 +1117,19 @@ void
ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any
const ::rtl::OUString table,sal_Int32
scope, sal_Bool nullable )
throw(SQLException, RuntimeException)
{
+// Some ODBC drivers really don't like getting an empty string as tableName
+// E.g. psqlodbc up to at least version 09.01.0100 segfaults
+if (table.isEmpty())
+{
+const char errMsg[] = ODBC: Trying to get special columns of empty
table name;
+const char SQLState[] = HY009;
+throw SQLException( ::rtl::OUString(errMsg, sizeof(errMsg) -
sizeof(errMsg[0]), RTL_TEXTENCODING_ASCII_US),
+*this,
+::rtl::OUString(SQLState, sizeof(SQLState) -
sizeof(SQLState[0]), RTL_TEXTENCODING_ASCII_US),
+-1,
+Any() );
+}
+
const ::rtl::OUString *pSchemaPat = NULL;
if(schema.toChar() != '%')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - bridges/source connectivity/source odk/settings sal/osl svtools/source vcl/inc vcl/unx
bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx |2
connectivity/source/drivers/odbcbase/ODriver.cxx |9 --
odk/settings/settings.mk | 28 --
sal/osl/unx/util.c|2
svtools/source/control/headbar.cxx| 76 --
vcl/inc/unx/gtk/gtkgdi.hxx|5 +
vcl/inc/vcl/salnativewidgets.hxx |2
vcl/unx/generic/app/wmadaptor.cxx |3
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 64 ++-
9 files changed, 152 insertions(+), 39 deletions(-)
New commits:
commit f2c09d47407ec8bdd55f789fdba7ff02e14783e8
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Mon Jul 9 12:15:53 2012 +0200
solaris: fix compilation error by adding temp var holding const_cast result
Change-Id: I3e42bb8dae6ad628f5414d8e46616432a704679f
diff --git a/vcl/unx/generic/app/wmadaptor.cxx
b/vcl/unx/generic/app/wmadaptor.cxx
index a0791e0..784cf10 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -1038,8 +1038,9 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const
String rWMName ) const
bOnce = false;
XTextProperty aTestProp = { NULL, None, 0, 0 };
const char *pText = trustme;
+char* pT = const_castchar*(pText);
XmbTextListToTextProperty( m_pDisplay,
- const_castchar*(pText),
+ pT,
1,
XStdICCTextStyle,
aTestProp );
commit 34f8b2b78ec7f7397e6ca9c69b6a77a9c6aa58a3
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Mon Jul 9 12:12:14 2012 +0200
single cpu detection: remove 'defined(__SUNPRO_C)' requirement
Change-Id: Iab3d103688d07ceea05b257ac012a0292c837a85
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index d402575..fd69c0d 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -317,7 +317,7 @@ void osl_InitSparcV9(void)
#endif
#if( defined(__GNUC__) (defined(X86) || defined(X86_64)) )\
-|| ( defined(SOLARIS) defined (__SUNPRO_C) defined(__i386) )
+|| ( defined(SOLARIS) defined(__i386) )
/* Safe default */
int osl_isSingleCPU = 0;
commit eb1192ec1fea481548b5a40f980f59b670232150
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Mon Jul 9 12:09:54 2012 +0200
solaris: update settings.mk to use gcc
Change-Id: Ife7a4806776f55babfab11ceac25a3d2d66fe5af
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 797d123..f2eeb14 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -173,21 +173,32 @@ DELRECURSIVE=rm -rf
COPY=cp
URLPREFIX=file://
+COMID=gcc3
+CPPU_ENV=gcc3
+
# Include UDK version numbers
include $(PRJ)/include/udkversion.mk
+#SALLIB=-luno_sal
+#CPPULIB=-luno_cppu
+#CPPUHELPERLIB=-luno_cppuhelperC52
+#SALHELPERLIB=-luno_salhelperC52
+#REGLIB=-lreg
+#STORELIB=-lstore
SALLIB=-luno_sal
CPPULIB=-luno_cppu
-CPPUHELPERLIB=-luno_cppuhelperC52
-SALHELPERLIB=-luno_salhelperC52
+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
+SALHELPERLIB=-luno_salhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
EMPTYSTRING=
PATH_SEPARATOR=:
-CC_FLAGS_JNI=-c -KPIC
-CC_FLAGS=-c -KPIC -xldscope=hidden
+#CC_FLAGS_JNI=-c -KPIC
+#CC_FLAGS=-c -KPIC -xldscope=hidden
+CC_FLAGS_JNI=-c -fpic
+CC_FLAGS=-c -fpic -fvisibility=hidden
ifeq $(DEBUG) yes
CC_FLAGS_JNI+=-g
CC_FLAGS+=-g
@@ -198,11 +209,14 @@ SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include
-I$(OO_SDK_JAVA_HOME)/inclu
# define for used compiler necessary for UNO
# -DCPPU_ENV=sunpro5 -- sunpro cc 5.x solaris sparc/intel
-CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=sunpro5
-CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=sunpro5
-DHAVE_GCC_VISIBILITY_FEATURE
+#CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=sunpro5
+CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=$(CPPU_ENV) -DGCC
-DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
+#CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=sunpro5
-DHAVE_GCC_VISIBILITY_FEATURE
+CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=$(CPPU_ENV)
-DHAVE_GCC_VISIBILITY_FEATURE -DGCC -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
CC_OUTPUT_SWITCH=-o
-LIBRARY_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp '-R$$ORIGIN' -z text
-norunpath -G -Bdirect -Bdynamic -lpthread -lCrun -lc -lm
+#LIBRARY_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp '-R$$ORIGIN' -z text
-norunpath -G -Bdirect -Bdynamic -lpthread -lCrun -lc -lm
+LIBRARY_LINK_FLAGS=-w -mt -z combreloc -fPIC -PIC -temp=/tmp '-R$$ORIGIN' -z
text -norunpath -G -Bdirect -Bdynamic -lpthread -lCrun -lc -lm
# means if used CC is lower then version 5.5 use option -instance=static
ifeq ($(OO_SDK_CC_55_OR_HIGHER),)
LIBRARY_LINK_FLAGS+=-instances=static
commit 81c5a10a8db5530eb028c85887f0cc73d16c04d3
Author: Pierre-Eric
[PATCH] Change in core[libreoffice-3-5]: fdo#50849 work around psqlodbc segfault
From Lionel Elie Mamane lio...@mamane.lu: Lionel Elie Mamane has uploaded a new change for review. Change subject: fdo#50849 work around psqlodbc segfault .. fdo#50849 work around psqlodbc segfault Change-Id: Ib7e484f778d97b3f18845cef12718618324c859f --- M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/287/1 -- To view, visit https://gerrit.libreoffice.org/287 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7e484f778d97b3f18845cef12718618324c859f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/source
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 13
++
1 file changed, 13 insertions(+)
New commits:
commit 00d453b9332d0f5f3ab64d40186b68b4b3bb6d5e
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jul 10 17:18:56 2012 +0200
fdo#50849 work around psqlodbc segfault
Change-Id: Ib7e484f778d97b3f18845cef12718618324c859f
diff --git
a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 2dfb960..2e115ca 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -1126,6 +1126,19 @@ void
ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any
const ::rtl::OUString table,sal_Int32
scope, sal_Bool nullable )
throw(SQLException, RuntimeException)
{
+// Some ODBC drivers really don't like getting an empty string as tableName
+// E.g. psqlodbc up to at least version 09.01.0100 segfaults
+if (table.isEmpty())
+{
+const char errMsg[] = ODBC: Trying to get special columns of empty
table name;
+const char SQLState[] = HY009;
+throw SQLException( ::rtl::OUString(errMsg, sizeof(errMsg) -
sizeof(errMsg[0]), RTL_TEXTENCODING_ASCII_US),
+*this,
+::rtl::OUString(SQLState, sizeof(SQLState) -
sizeof(SQLState[0]), RTL_TEXTENCODING_ASCII_US),
+-1,
+Any() );
+}
+
const ::rtl::OUString *pSchemaPat = NULL;
if(schema.toChar() != '%')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED (mostly) - RFC - Solaris/intel/gcc patches
Hi Pierre-Eric, On Tue, 2012-07-10 at 15:46 +0200, Pierre-Eric Pelloux-Prayer wrote: Here are several patches needed to build and run LO on Solaris/intel/gcc. Lovely :-) thank you ! I committed all except 0003 and 0006 which need some gnumake expert I think, as you say 0008 is not really what we want - instead we want the unit tests to run everywhere unless there is a good reason why not :-) if they can run on Windows, Solaris should be easy - right ? ;-) So - overall, it's great to bring the Solaris port back from the dead, and without all those horror #ifdef for compiler oddities using gcc. Bits like the -pipe removal in com_GCC_defs in 0003 looked like we ought to make that a platform conditional, turned off on solaris. +$(eval $(call gb_Library_add_ldflags,PresenterScreen,\ +-L$(gb_Library_OUTDIRLOCATION) \ looked odd in 0006 too - but overall this is a great set of fixes :-) * some .so files don't have the .3 suffix, but the generated install script : ./solver/unxsogi.pro/bin/setup_osl.ins is looking for .so.3 files. So manually editing this file is needed. That is odd. On linux at least the ure/lib libraries that we would link to are .so versioned with a .3 in every case - I wonder why it fails to work for solaris. * to start LO, you'll also need to specify a LD_LIBRARY_PATH like this: LD_LIBRARY_PATH=./solver/unxsogi.pro/installation/opt/ure/lib/ ./install/program/soffice and that's odd too; soffice is itself a shell-script (much as I'd love to kill it), possibly you just want to add Solaris to: case `uname -s` in NetBSD|OpenBSD|FreeBSD|DragonFly) # this is a temporary hack until we can live with the default search paths one of those rather long-term temporary hacks ;-) These are not enough to get LO running properly because it still crashes after some time (see http://pastebin.com/JKQHnt3Z) terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' This is a -particularly- annoying something went wrong message - and -worse- it is reasonably trivial to have it print out more useful debugging information: we usually know much more precisely what is wrong. If you hack desktop/source/app/sofficemain.cxx - and un-protect the try/catch guarded by ANDROID there (except for the random /assets ini setup) then life will prolly be better for you wrt. a nice warning message printed. Thanks again ! 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] .: Branch 'features/base-preview' - 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] Changes to 'features/base-preview'
New branch 'features/base-preview' available with the following commits: commit d4b1048b87430a6f8cdfe944e0f02328f1d41327 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 10 17:18:56 2012 +0200 fdo#50849 work around psqlodbc segfault Change-Id: Ib7e484f778d97b3f18845cef12718618324c859f commit 7dede4ccdab4228df5bfd9b6fe359ee8d09b073c Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 3 20:17:01 2012 +0200 embedded HSQLDB: reclaim space occupied by deleted rows Disadvantage is that saving/closing the file may take a significantly longer time Change-Id: I1cc35c34b49e60d73e8d341549c5a3c5ef314b6d commit 7df4c891b33c14cdd7aaae8bc7949b5723d48763 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Jul 2 19:33:38 2012 +0200 LEM notes Change-Id: I16939e5d6e1f7c0a83f7f2b2dbc9a5b397b45c36 commit 0db2ff66a67ed012ae5c3a7aba4e0520ce95159e Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Jul 2 14:48:03 2012 +0200 janitorial: remove unused xParamsAsNames variable Change-Id: Ic4fe24faf75d38a8123a8f0e8304c054760bad85 commit 519d6d8df6e05798ee781a83d03ce9a648a8eeca Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:28:50 2012 +0200 legacy reports: unify treatment of query and table In *both* cases, the value of hidden control Sorting (if non-empty) decides the columns being sorted on. Change-Id: I7f4b50c3af8c12e48e5dedd36b5877ad7a9e1b66 commit e484237a92bb3f291dc8507cb268ddbd0b88dc3c Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:26:58 2012 +0200 legacy report wizard: when source is table, save name in QueryName Change-Id: Ie0bdbed9578b95f7fccc3d9ff6d9c8b5b91ac0ab commit ba76d450b45aa3d3526de6ee984d65de66b48629 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:25:51 2012 +0200 SQLQueryComposer allow setQueryCommand with prependSorting instead of append Change-Id: Ia06794537ea4d0f6f069c83709792ebbcc084804 commit f488bf5c397c85d98018622f485da654256d2259 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:24:54 2012 +0200 db.SQLQueryComposer allow prependSortingCriteria call with addAliasFieldNames Change-Id: I05889ccac213743a55c302bd7249b30f817c0428 commit 298f64dca956c66126cc3774ac81a759bd143a59 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:23:50 2012 +0200 cleanup Change-Id: I1ce4279d434ffa58328e17863b2e68af1e813a99 commit 0f20b5eb5245ac5f938b62f2007dfad6efcc5068 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:23:30 2012 +0200 untabify Change-Id: I984c84534cb4c6cda8bd73a43d79ec8e49afcdeb commit 80ca13f619f62ff6a34c06272aacad8bc0ab3acf Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Jun 4 17:54:30 2012 +0200 i#102625 avoid fetching same row twice in different queries We do a SELECT * FROM table just to fetch the primary key columns; so reuse the same XResultSet to fetch all columns. Else, we immediately issue a SELECT * FROM table WHERE primary_key=current_value to read the other columns, which is wasteful and particularly silly. Commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b already tried to do that, but was essentially reverted piecewise because it caused fdo#47520, fdo#48345, fdo#50372. Commit c08067d6da94743d53217cbc26cffae00a22dc3a thought it did that, but actually reverted commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b. This implementation fetches the whole current row and caches it in memory; only one row is cached: when the current row changes, the cache contains the new current row. This could be problematic (wrt to memory consumption) if the current row is big (e.g. with BLOBs) and nobody is interested in the data anyway (as would often be the case with BLOBs). Note that because of our SELECT *, the driver most probably has it in memory already anyway, so we don't make the situation that much worse. This could be incrementally improved with a heuristic of not preemptively caching binary data (and also not LONGVARCHAR / TEXT / MEMO / ...); a getFOO on these columns would issue a specific SELECT column FROM table WHERE primary_key=current_value each time. The *real* complete fix to all these issues would be to not do SELECT * at all. Use SELECT pkey_col1, pkey_col2, ... when we are only interested in the key columns. As to data, somehow figure out which columns were ar interested in and SELECT only these (and maybe only those with small datatype?). Interesting columns could be determined by our caller (creator) as an argument to our constructor, or some heuristic (no binary data, no big unbound data). Also be extra smart and use *(m_aKeyIter) when getFOO is called on a column included in it (and don't include it in any subsequent SELECT).
[Libreoffice-commits] .: solenv/gdb
solenv/gdb/libreoffice/tl.py | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 53f9b54f73f313814b7f1217a4e37f5dc6bd5a45
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jul 10 17:47:02 2012 +0200
gdb: add pretty-printer for tools Point
nA is X, nB is Y, but finally it's now pointless to remember that
Change-Id: I9fb1f6518e33862663a5bd5e28876979f0f1e05f
diff --git a/solenv/gdb/libreoffice/tl.py b/solenv/gdb/libreoffice/tl.py
index 9571573..b800710 100644
--- a/solenv/gdb/libreoffice/tl.py
+++ b/solenv/gdb/libreoffice/tl.py
@@ -338,6 +338,22 @@ class TablePrinter(ContainerHelper):
def display_hint(self):
return 'map'
+class PointPrinter(object):
+'''Prints a Point.'''
+
+def __init__(self, typename, value):
+self.typename = typename
+self.value = value
+
+def to_string(self):
+return %s % (self.typename)
+
+def children(self):
+x = self.value['nA']
+y = self.value['nB']
+children = [('x', x), ('y', y)]
+return children.__iter__()
+
printer = None
def build_pretty_printers():
@@ -362,6 +378,7 @@ def build_pretty_printers():
printer.add('DateTime', DateTimePrinter)
printer.add('Date', DatePrinter)
printer.add('Time', TimePrinter)
+printer.add('Point', PointPrinter)
def register_pretty_printers(obj):
printing.register_pretty_printer(printer, obj)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/remote' - desktop/source sd/source
desktop/source/app/sofficemain.cxx | 11 +---
sd/source/ui/remotecontrol/Receiver.cxx | 82 +++-
sd/source/ui/remotecontrol/Receiver.hxx |4 -
sd/source/ui/remotecontrol/Server.cxx | 36 +++---
sd/source/ui/remotecontrol/Server.hxx |1
5 files changed, 84 insertions(+), 50 deletions(-)
New commits:
commit 41685dad9bd5a66d5f63d4731a6a98c4f3ea98e9
Author: Andrzej J. R. Hunt andr...@ahunt.org
Date: Tue Jul 10 16:36:04 2012 +0100
Fixed remote control code to work correctly.
Change-Id: I Ia600ed456fba135056f7a00398030b7c9e873329
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
index ed22834..43cd87f 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -43,13 +43,10 @@ int SVMain();
extern C int DESKTOP_DLLPUBLIC soffice_main()
{
-#if defined(ANDROID) || defined(LIBO_HEADLESS)
-#if defined(ANDROID)
+
+
try {
-#endif
-rtl::Bootstrap::setIniFilename(
-
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///assets/program/lofficerc)));
-#endif
+
tools::extendApplicationEnvironment();
RTL_LOGFILE_PRODUCT_TRACE( PERFORMANCE - enter Main() );
@@ -77,13 +74,11 @@ extern C int DESKTOP_DLLPUBLIC soffice_main()
}
#endif
return SVMain();
-#ifdef ANDROID
} catch (const ::com::sun::star::uno::Exception e) {
fprintf (stderr, Not handled UNO exception at main: '%s'\n,
rtl::OUStringToOString(e.Message,
RTL_TEXTENCODING_UTF8).getStr());
throw; // to get exception type printed
}
-#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index 7c6187f..a2120b1 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -27,6 +27,7 @@
#include Receiver.hxx
#include cstring
#include com/sun/star/frame/XFramesSupplier.hpp
+#include com/sun/star/uno/RuntimeException.hpp
#include comphelper/processfactory.hxx
using namespace sd;
using namespace ::com::sun::star::presentation;
@@ -41,48 +42,83 @@ Receiver::~Receiver()
{
}
-void Receiver::parseCommand( char* aCommand, sal_Int32 size,
XSlideShowController *aController )
+void Receiver::executeCommand( JsonObject *aObject,
ReferenceXSlideShowController xSlideShowController )
{
-uno::Reference lang::XMultiServiceFactory xServiceManager(
-::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+const char* aInstruction = json_node_get_string( json_object_get_member(
aObject, command ) );
-uno::Reference XFramesSupplier xFramesSupplier(
xServiceManager-createInstance(
-com.sun.star.frame.Desktop ) , UNO_QUERY_THROW );
-uno::Reference frame::XFrame xFrame = xFramesSupplier-getActiveFrame();
+fprintf( stderr, instruction:%s\n, aInstruction );
-ReferenceXPresentationSupplier xPS (
xFrame-getController()-getModel(), UNO_QUERY_THROW);
+if ( strcmp( aInstruction, transition_next ) == 0 )
+{
-ReferenceXPresentation2 xPresentation(xPS-getPresentation(),
UNO_QUERY_THROW);
+xSlideShowController-gotoNextEffect();
+ // Next slide;
+}
+else if ( strcmp( aInstruction, transition_previous ) == 0 )
+{
+xSlideShowController-gotoPreviousEffect();
+}
+else if ( strcmp( aInstruction, goto_slide ) == 0 )
+{
+//
+}
+
+}
-ReferenceXSlideShowController
xSlideShowController(xPresentation-getController(), UNO_QUERY_THROW);
+void Receiver::parseCommand( const char* aCommand, sal_Int32 size,
XSlideShowController *aController )
+{
+ReferenceXSlideShowController xSlideShowController;
+try {
+uno::Reference lang::XMultiServiceFactory xServiceManager(
+::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+uno::Reference XFramesSupplier xFramesSupplier(
xServiceManager-createInstance(
+com.sun.star.frame.Desktop ) , UNO_QUERY_THROW );
+uno::Reference frame::XFrame xFrame (
xFramesSupplier-getActiveFrame(), UNO_QUERY_THROW );
+ReferenceXPresentationSupplier xPS (
xFrame-getController()-getModel(), UNO_QUERY_THROW);
+ReferenceXPresentation2 xPresentation(xPS-getPresentation(),
UNO_QUERY_THROW);
+// Throws an exception if now slideshow running
+ xSlideShowController = ReferenceXSlideShowController(
xPresentation-getController(), UNO_QUERY_THROW );
+}
+catch ( com::sun::star::uno::RuntimeException e )
+{
+return;
+}
+// Parsing
JsonParser *parser;
JsonNode *root;
GError *error;
-parser = json_parser_new ();
+parser = json_parser_new();
error = NULL;
json_parser_load_from_data( parser, aCommand, size, error );
if (error) {
+g_error_free( error );
+g_object_unref( parser );
}
root =
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 13
++
1 file changed, 13 insertions(+)
New commits:
commit 56ef010aef4db3515f713ad9a2b587fb8402cf2b
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jul 10 17:18:56 2012 +0200
fdo#50849 work around psqlodbc segfault
Change-Id: Ib7e484f778d97b3f18845cef12718618324c859f
diff --git
a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index e795693..f4e56ab 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -1152,6 +1152,19 @@ void
ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any
const ::rtl::OUString table,sal_Int32
scope, sal_Bool nullable )
throw(SQLException, RuntimeException)
{
+// Some ODBC drivers really don't like getting an empty string as tableName
+// E.g. psqlodbc up to at least version 09.01.0100 segfaults
+if (table.isEmpty())
+{
+const char errMsg[] = ODBC: Trying to get special columns of empty
table name;
+const char SQLState[] = HY009;
+throw SQLException( ::rtl::OUString(errMsg, sizeof(errMsg) -
sizeof(errMsg[0]), RTL_TEXTENCODING_ASCII_US),
+*this,
+::rtl::OUString(SQLState, sizeof(SQLState) -
sizeof(SQLState[0]), RTL_TEXTENCODING_ASCII_US),
+-1,
+Any() );
+}
+
const ::rtl::OUString *pSchemaPat = NULL;
if(schema.toChar() != '%')
___
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 Tuesday, 10 July 2012, Michael Meeks wrote: On Tue, 2012-07-10 at 15:33 +0200, Noel Grandin wrote: It seems to be a general thing. Not specific to one test, they all pause, so I have to enter lots of r and q Sure - that is to let you do interactive debugging of the test :-) if you don't want that behaviour don't set that variable ;-) Yeah, that's my point. I set the stack trace flag, (DEBUGCPPUNIT) but not the interactive flag ( GDBCPPUNITTRACE) Or have I got that the wrong way around ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH: Use hyphen for copyright range in About box
On 06/21/2012 07:30 PM, Robinson Tryon wrote: Per https://bugs.freedesktop.org/show_bug.cgi?id=43180 Hyphens more clearly describe a date range, rather than just a discrete list of years (e.g. Widget Foo was produced in years 1950, 1961-1963, 1969). Incidentally, just came across http://gcc.gnu.org/ml/gcc/2012-07/msg00013.html Re: Allow use of ranges in copyright notices. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gerrit: polishing web UI
On Tue, Jul 10, 2012 at 9:10 AM, David Ostrovsky david.ostrov...@gmx.de wrote: Hi, may be you've already heard about our new code review system site: https://gerrit.libreoffice.org. As you can see we have installed already LO logo in header. Unfortunately there is only 200px and the next small one is 100px too small (and it doesn't really play good enouph with Code Review default font). While we are at it: I'd prefer LO and logo and 'code review' below it and the whole thing in the middle rather than on the left. whith a height that is in sync with the rest of the header section. (the interesting part to click should be on the top left or right... it is harder to hit something in the middle) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - svtools/source vcl/inc vcl/unx
svtools/source/control/headbar.cxx | 81 +--
svtools/source/control/tabbar.cxx| 42 +---
vcl/inc/unx/gtk/gtkgdi.hxx |5 +
vcl/inc/vcl/salnativewidgets.hxx |6 ++
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 42 ++--
5 files changed, 133 insertions(+), 43 deletions(-)
New commits:
commit 17ea32a1a36d81a0a12df12adbe15e8eaf1c7c62
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date: Mon Jul 9 03:31:54 2012 +0400
Make bottom tabbar items follow native theme
Change-Id: Ia1c4b4ece81655a91c6e489ee51291684e06c157
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index a922241..0c43549 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1098,14 +1098,20 @@ public:
void drawOutputAreaBorder()
{
+Size aOutputSize = mrParent.GetOutputSizePixel();
+Rectangle aOutRect = mrParent.GetPageArea();
+
+Rectangle
borderRect(Point(aOutRect.Left(),-10),Size(aOutputSize.Width(),12));
+if( mrParent.IsNativeControlSupported(CTRL_FRAME,PART_ENTIRE_CONTROL)
+
mrParent.DrawNativeControl(CTRL_FRAME,PART_ENTIRE_CONTROL,borderRect,
+
CTRL_STATE_ENABLED,ImplControlValue(FRAME_DRAW_IN),rtl::OUString()) )
+return;
+
WinBits nWinStyle = mrParent.GetStyle();
// Bei Border oben und unten einen Strich extra malen
if ( (nWinStyle WB_BORDER) || (nWinStyle WB_TOPBORDER) )
{
-Size aOutputSize = mrParent.GetOutputSizePixel();
-Rectangle aOutRect = mrParent.GetPageArea();
-
// Bei 3D-Tabs wird auch der Border in 3D gemalt
if ( nWinStyle WB_3DTAB )
{
@@ -1198,6 +1204,27 @@ public:
void drawTab()
{
+ControlState nState(CTRL_STATE_ENABLED);
+if( mbSelected )
+nState|=CTRL_STATE_SELECTED;
+TabitemValue tiValue;
+tiValue.mnPosition|=TABITEM_IS_AT_BOTTOM;
+Rectangle tabRect(maRect);
+tabRect.Left()+=5;
+tabRect.Right()-=4;
+tabRect.Bottom()+=1;
+if( !mbSelected )
+{
+tabRect.Bottom()-=2;
+tabRect.Top()+=2;
+}
+if(
mrParent.IsNativeControlSupported(CTRL_TAB_ITEM,PART_ENTIRE_CONTROL)
+
mrParent.DrawNativeControl(CTRL_TAB_ITEM,PART_ENTIRE_CONTROL,tabRect,
+ nState,tiValue,rtl::OUString()) )
+{
+return;
+}
+
mrParent.SetLineColor(mpStyleSettings-GetDarkShadowColor());
// Je nach Status die richtige FillInBrush setzen
@@ -1422,9 +1449,12 @@ void TabBar::Paint( const Rectangle )
if ( bCurrent )
{
-SetLineColor();
-SetFillColor(aSelectColor);
-aDrawer.drawOverTopBorder(mnWinStyle WB_3DTAB);
+
if(!IsNativeControlSupported(CTRL_TAB_ITEM,PART_ENTIRE_CONTROL))
+{
+SetLineColor();
+SetFillColor(aSelectColor);
+aDrawer.drawOverTopBorder(mnWinStyle WB_3DTAB);
+}
return;
}
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx
index 40d4fbd..2ae9473 100644
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/vcl/inc/vcl/salnativewidgets.hxx
@@ -366,16 +366,20 @@ class VCL_DLLPUBLIC SliderValue : public ImplControlValue
#define TABITEM_RIGHTALIGNED 0x002 // the tabitem is aligned with the
right border of the TabControl
#define TABITEM_FIRST_IN_GROUP 0x004 // the tabitem is the first in group of
tabitems
#define TABITEM_LAST_IN_GROUP 0x008 // the tabitem is the last in group of
tabitems
+/* This constant is independent from the ones above */
+#define TABITEM_IS_AT_BOTTOM 0x001 // the tabitem at the bottom of the
TabControl
class VCL_DLLPUBLIC TabitemValue : public ImplControlValue
{
public:
unsigned intmnAlignment;
+unsigned intmnPosition;
inline TabitemValue()
: ImplControlValue( CTRL_TAB_ITEM, BUTTONVALUE_DONTKNOW, 0 )
{
mnAlignment = 0;
+mnPosition = 0;
};
virtual ~TabitemValue();
virtual TabitemValue* clone() const;
@@ -386,6 +390,7 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue
sal_Bool isNotAligned() const { return (mnAlignment
(TABITEM_LEFTALIGNED | TABITEM_RIGHTALIGNED)) == 0; }
sal_Bool isFirst() const{ return (mnAlignment
TABITEM_FIRST_IN_GROUP) != 0; }
sal_Bool isLast() const { return (mnAlignment
TABITEM_LAST_IN_GROUP) != 0; }
+sal_Bool isAtBottom() const { return (mnPosition
TABITEM_IS_AT_BOTTOM) != 0; }
};
/* SpinbuttonValue:
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
Re: RFC: where to put sorted vector template/class?
2012/7/10 Noel Grandin n...@peralex.com:
On 2012-07-10 15:35, Caolán McNamara wrote:
How does this look? It's the bare minimum I need in a sorted_vector class.
namespace o3tl
{
/** Represents a sorted vector of values.
@tpl Value
@tpl Compare comparison method
*/
template class Value, class Compare = lessValue
class sorted_vector : vectorValue
{
public:
// MODIFIERS
pairiterator,bool insert( const Value x );
size_type erase( const Value x );
// OPERATIONS
/* Searches the container for an element with a value of x
* and returns an iterator to it if found, otherwise it returns an
* iterator to sorted_vector::end (the element past the end of the
container).
*/
iteratorfind( const Value x ) const;
};
// IMPLEMENTATION
template class Value, class Compare
pairiterator,bool sorted_vectorValue,Compare::insert( const Value x )
{
iterator it = std::lower_bound(begin(), end(), p, Compare);
if( !Compare(*it, x) )
{
return make_pair( it, false );
}
it = insert( it, p );
return make_pair( it, true );
}
template class Value, class Compare
size_type sorted_vectorValue,Compare::erase( const Value x )
{
iterator it = std::lower_bound(begin(), end(), p, Compare);
if( !Compare(*it, x) )
{
erase( it );
return 1;
}
return 0;
}
template class Value, class Compare
iterator sorted_vectorValue,Compare::find( const Value x )
{
iterator it = std::lower_bound(begin(), end(), p, Compare);
if( !Compare(*it, x) )
{
return it;
}
return end();
}
Maybe a stupid question and more (clean) code related: Why do you
duplicate the search if already included instead of using the ::find
method in ::insert? I mean, sure, at the moment it is just two
lines... but most of the stuff in this code base started that small
and are now big evil monsters ;-) But maybe I am too pessimistic in
this point...
Cheers,
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - desktop/Executable_oosplash.mk sfx2/Module_sfx2.mk solenv/gbuild solenv/inc
desktop/Executable_oosplash.mk|4 ++-- sfx2/Module_sfx2.mk |2 +- solenv/gbuild/platform/solaris.mk | 10 +- solenv/inc/unxsogi.mk |2 +- solenv/inc/unxsogs.mk |2 +- 5 files changed, 10 insertions(+), 10 deletions(-) New commits: commit b84e197e696e2d29616abde0f5e84484eef2ddc8 Author: Michael Stahl mst...@redhat.com Date: Tue Jul 10 18:42:42 2012 +0200 gbuild: Solaris: fix gb_LinkTarget_LDFLAGS: This was accidentally commented out, and thus SOLARLIB was not in effect; fixing this should obviate the need for any -L$(gb_Library_OUTDIRLOCATION). diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 523be83..054398c 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -147,6 +147,7 @@ gb_LinkTarget_LDFLAGS += \ endif #JAD# -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ + gb_LinkTarget_LDFLAGS += \ -L$(SYSBASE)/lib \ -L$(SYSBASE)/usr/lib \ @@ -301,9 +302,9 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ -define gb_Library__get_rpath -$(if $(1),$(strip '-Wl,-rpath,$(1)' -L$(gb_Library_OUTDIRLOCATION))) #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)' +define gb_Library__get_rpath +$(if $(1),$(strip '-Wl,-rpath,$(1)')) endef define gb_Library_get_rpath @@ -363,7 +364,7 @@ gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) define gb_CppunitTest_CppunitTest_platform -$(call gb_LinkTarget_get_target,$(2)) : RPATH := -L$(gb_Library_OUTDIRLOCATION) +$(call gb_LinkTarget_get_target,$(2)) : RPATH := endef commit 7d7b41cf12a7026ea583e34dbb31196a884db65b Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Mon Jul 9 11:52:50 2012 +0200 solaris/intel: update .mk files to fix build errors Change-Id: Iba306cde71eb5efeed29a4a44cefa19a47bac84b diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index a75f11a..a4451f3 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -80,8 +80,8 @@ endif ifeq ($(OS),SOLARIS) -$(eval $(call gb_Executable_use_libraries,oosplash,\ -socket \ +$(eval $(call gb_Executable_add_libs,oosplash,\ +-lsocket \ )) endif diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 81b501a..1e316eb 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ )) endif -ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) +ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD SOLARIS, $(OS))) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) $(eval $(call gb_Module_add_targets,sfx2,\ Library_qstart \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 8639793..523be83 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -302,7 +302,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ define gb_Library__get_rpath -$(if $(1),$(strip '-Wl,-rpath,$(1)' '-L$(gb_Library_OUTDIRLOCATION)')) +$(if $(1),$(strip '-Wl,-rpath,$(1)' -L$(gb_Library_OUTDIRLOCATION))) #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)' endef @@ -312,7 +312,6 @@ endef define gb_Library_Library_platform $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1)) - endef @@ -364,7 +363,7 @@ gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) define gb_CppunitTest_CppunitTest_platform -$(call gb_LinkTarget_get_target,$(2)) : RPATH := +$(call gb_LinkTarget_get_target,$(2)) : RPATH := -L$(gb_Library_OUTDIRLOCATION) endef @@ -408,8 +407,8 @@ define gb_InstallModuleTarget_InstallModuleTarget_platform $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ - -DCOMID=C52 \ - -DCOMNAME=sunpro5 \ + -DCOMID=gcc3 \ + -DCOMNAME=gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) commit 88da060b47b46da506a6760f7b24cd95cfc6a8f6 Author: Michael Stahl mst...@redhat.com Date: Tue Jul 10 18:14:02 2012 +0200 solenv/inc: SOLAR_JAVA should not be overwritten here. SOLAR_JAVA should really be set by configure. Thanks to Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com for the hint. diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk index 49ca1f3..7187556 100644 --- a/solenv/inc/unxsogi.mk +++ b/solenv/inc/unxsogi.mk @@ -29,7 +29,7 @@ ASM=/usr/ccs/bin/as AFLAGS=-P -SOLAR_JAVA=TRUE +SOLAR_JAVA*=TRUE JAVAFLAGSDEBUG=-g # _PTHREADS is needed for the stl diff --git a/solenv/inc/unxsogs.mk
[Libreoffice-commits] .: g
g | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 79e9a64299d7fb5abafdde5502093b899f36193a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Jul 10 12:57:01 2012 +0200
make ./g robust against missing bin/repo-list file
Change-Id: Ib61a679221d0eddea61358024d31c90464dccefb
diff --git a/g b/g
index 11ecaa6..7ec3bda 100755
--- a/g
+++ b/g
@@ -31,6 +31,13 @@ pushd $(dirname $0) /dev/null
COREDIR=$(pwd)
popd /dev/null
+if test -f $COREDIR/bin/repo-list
+then
+ ALLREPOS=core `cat $COREDIR/bin/repo-list`
+else
+ ALLREPOS=core
+fi
+
refresh_hooks()
{
repo=$1
@@ -88,7 +95,7 @@ refresh_hooks()
refresh_all_hooks()
{
-repos=core $(cat $COREDIR/bin/repo-list)
+repos=$ALLREPOS
for repo in $repos ; do
refresh_hooks $repo
done
@@ -239,7 +246,7 @@ done
# do it!
DIRS=core $(cd $CLONEDIR ; ls)
if [ $COMMAND = clone ] ; then
-DIRS=$(cat $COREDIR/bin/repo-list)
+DIRS=$ALLREPOS
fi
for REPO in $DIRS ; do
DIR=$CLONEDIR/$REPO
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/tagtest.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 62342abac0e3a38e39a50b7560f09cbdeb62905a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 10 19:10:49 2012 +0200
fdo#51954: -1 is small while STRING_NOTFOUND was great
...after String - rtl::OUString conversion in
a4cbcf2fc567393cd954d0fcc8ea0ce7d859b59f.
Change-Id: Ieb6dfce8c0cf7d8b5971d187b3b58b754c1cb02f
diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx
index e31faa4..2a29c3f 100644
--- a/l10ntools/source/tagtest.cxx
+++ b/l10ntools/source/tagtest.cxx
@@ -772,13 +772,13 @@ rtl::OUString SimpleParser::GetNextTokenString(
ParserMessageList rErrorList, s
if (nStyle2StartPos == -1 nStyle3StartPos == -1)
return rtl::OUString(); // no more tokens
-if ( nStyle4StartPos nStyle2StartPos nStyle4StartPos =
nStyle3StartPos ) // = to make sure \\ is always handled first
+if ( nStyle4StartPos != -1 nStyle4StartPos nStyle2StartPos
nStyle4StartPos = nStyle3StartPos ) // = to make sure \\ is always handled
first
{ // Skip quoted Backslash
nPos = nStyle4StartPos +2;
return GetNextTokenString( rErrorList, rTagStartPos );
}
-if ( nStyle2StartPos nStyle3StartPos )
+if ( nStyle2StartPos != -1 ( nStyle3StartPos == -1 || nStyle2StartPos
nStyle3StartPos ) )
{ // test for $[ ... ] style tokens
sal_Int32 nEndPos = aSource.indexOf(']', nStyle2StartPos);
if (nEndPos == -1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] make ./g robust against missing bin/repo-list file
From Björn Michaelsen bjoern.michael...@canonical.com: Björn Michaelsen has submitted this change and it was merged. Change subject: make ./g robust against missing bin/repo-list file .. make ./g robust against missing bin/repo-list file Change-Id: Ib61a679221d0eddea61358024d31c90464dccefb --- M g 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Björn Michaelsen: Verified; Looks good to me, approved Norbert Thiebaud: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/284 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib61a679221d0eddea61358024d31c90464dccefb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - solenv/gbuild svtools/source
solenv/gbuild/platform/solaris.mk |2 ++
svtools/source/control/headbar.cxx |2 ++
2 files changed, 4 insertions(+)
New commits:
commit 3f4b4a4d158feba1eb730bb546b28e45c6d9197a
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 10 19:13:25 2012 +0200
HeaderBar::ImplDrawItem: -Werror=parentheses
diff --git a/svtools/source/control/headbar.cxx
b/svtools/source/control/headbar.cxx
index 7ff53f8..733e5e1 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -604,6 +604,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
bDraw = sal_False;
if ( bDraw )
+{
if( pWin pWin-IsNativeControlSupported(CTRL_LISTHEADER,
PART_ARROW) )
{
aCtrlRegion=Rectangle(Point(nArrowX,aRect.Top()),Size(nArrowWidth,aRect.GetHeight()));
@@ -656,6 +657,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
Point( nArrowX+HEAD_ARROWSIZE1, nArrowY )
);
}
}
+}
}
// Gegebenenfalls auch UserDraw aufrufen
commit 5e11e00fcdbd0f7c6735e76d48b3b7f63dda4c2b
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 10 19:11:50 2012 +0200
gbuild: solaris.mk: activate the soversion scripts
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 054398c..2532c19 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -315,6 +315,8 @@ define gb_Library_Library_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call
gb_Library_get_rpath,$(1))
endef
+gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
+
# StaticLibrary class
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Re: RFC - Solaris/intel/gcc patches
On 10/07/12 15:46, Pierre-Eric Pelloux-Prayer wrote: Hello, Here are several patches needed to build and run LO on Solaris/intel/gcc. These are not enough to get LO running properly because it still crashes after some time (see http://pastebin.com/JKQHnt3Z) hmmm... perhaps the unit failing unit tests in i18npool are related... Any comments welcomed. Some notes: * the 8th patch is just a temporary workaround: it simply disable some failing unit tests. haven't pushed that one yet, let's hope you can debug a few of these :) * you'll need to compile with : 'LDFLAGS=-mimpure-text gmake' to avoid relocation errors (I didn't manage to properly add this LD_FLAGS to mk files or to figure how to prevent the issue). that is odd; man gcc seems to imply that the problem is that something that's linked into a SO is not properly built with -fPIC. as a workaround you could try adding the impure option to gb_LinkTarget_LDFLAGS in solaris.mk, which is now no longer commented out. * some .so files don't have the .3 suffix, but the generated install script : ./solver/unxsogi.pro/bin/setup_osl.ins is looking for .so.3 files. So manually editing this file is needed. ah that would be because the soversion stuff is not enabled in solaris.mk, i've pushed a fix for that. you'll probably have to re-link everything now i.e. do rm -rf workdir/*/LinkTarget thanks a lot for your work, pushed the parts of patch #3 that make sense; patch #6 is obsolete as discussed on IRC: this adding of -L$(gb_Library_OUTDIRLOCATION) should be completely unnecessary; the similar -rpath-link in unxgcc.mk is only necessary because GNU ld does not look up libraries found indirecly via RPATH via the -L parameters; the problem is really that the use of $SOLARLIB is commented out in solaris.mk (and i'm amazed that you got anything at all built like that) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/JunitTest.mk |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit a3a0b819bbc597db7c536180c86986b91dd9b063 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jul 10 19:38:11 2012 +0200 Avoid unhelpful 'Binary file ... matches' output instead of error information ...when grep happens to consider the log file to be binary (for whatever reason) as can be obvserved to happen on Linux-RHEL6-x86_64@14-with-check tinderbox. Change-Id: I5da0a792b45b83939c9c26897d30ddf8b0a0c0b0 diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 31cf96e..5eb7d3a 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -51,10 +51,7 @@ $(call gb_JunitTest_get_target,%) : $(DEFS) \ org.junit.runner.JUnitCore \ $(CLASSES) $@.log 21 || \ - (grep -v -e 'at org.junit.' \ - -e 'at java.lang.reflect.' \ - -e 'at sun.reflect.' $@.log \ -echo see full error log at $@.log \ + (cat $@.log \ echo to rerun just this failed test without all others, run: \ echo echo make $@ echo \ echo cd into the module dir to run the tests faster \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/inc toolkit/source
toolkit/inc/toolkit/awt/vclxdevice.hxx |5 -
toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx |1
toolkit/inc/toolkit/controls/dialogcontrol.hxx |1
toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx |6 -
toolkit/inc/toolkit/controls/tabpagecontainer.hxx |3
toolkit/inc/toolkit/controls/tabpagemodel.hxx | 46 -
toolkit/inc/toolkit/controls/unocontrols.hxx |4 -
toolkit/source/controls/grid/defaultgridcolumnmodel.hxx|2
8 files changed, 68 deletions(-)
New commits:
commit 41a6d5e435bd1c9f775260ef90ee3d82fd72a4b5
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Jul 11 02:53:13 2012 +0900
removed commented-out code
Change-Id: I5aa44682d4ebb926b95b64b2d265e6e9f3196a8d
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx
b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index b800b2c..eb9451b 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx
@@ -51,7 +51,6 @@ class VirtualDevice;
class TOOLKIT_DLLPUBLIC VCLXDevice :public ::com::sun::star::awt::XDevice,
public ::com::sun::star::lang::XTypeProvider,
public ::com::sun::star::lang::XUnoTunnel,
-/* public ::com::sun::star::awt::XTextConstraints,*/
public ::com::sun::star::awt::XUnitConversion,
public ::cppu::OWeakObject
{
@@ -99,10 +98,6 @@ public:
::com::sun::star::uno::Reference ::com::sun::star::awt::XBitmap
SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32
nHeight ) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference ::com::sun::star::awt::XDisplayBitmap
SAL_CALL createDisplayBitmap( const ::com::sun::star::uno::Reference
::com::sun::star::awt::XBitmap Bitmap )
throw(::com::sun::star::uno::RuntimeException);
-// ::com::sun::star::awt::XTextConstraints
-// ::sal_Int32 SAL_CALL getTextWidth( const ::rtl::OUString Text ) throw
(::com::sun::star::uno::RuntimeException);
-// ::sal_Int32 SAL_CALL getTextHeight( ) throw
(::com::sun::star::uno::RuntimeException);
-
// ::com::sun::star::awt::XUnitConversion
::com::sun::star::awt::Point SAL_CALL convertPointToLogic( const
::com::sun::star::awt::Point aPoint, ::sal_Int16 TargetUnit ) throw
(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
::com::sun::star::awt::Point SAL_CALL convertPointToPixel( const
::com::sun::star::awt::Point aPoint, ::sal_Int16 SourceUnit ) throw
(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx
b/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx
index 9f0ab63..0c0cee1 100644
--- a/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx
+++ b/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx
@@ -58,7 +58,6 @@ public:
// ::com::sun::star::awt::XDevice,
::com::sun::star::awt::DeviceInfo SAL_CALL getInfo()
throw(::com::sun::star::uno::RuntimeException);
-// virtual voidGetPropertyIds( std::list sal_uInt16 aIds ) {
return ImplGetPropertyIds( aIds ); }
UnoControlModel*Clone() const { return new VCLXTabPageModel( *this ); }
// ::com::sun::star::beans::XMultiPropertySet
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 7c9a674..169fd5d 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -126,7 +126,6 @@ public:
DECLIMPL_SERVICEINFO( UnoDialogControl, szServiceName2_UnoControlDialog )
protected:
- // virtual void ImplModelPropertiesChanged( const
::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyChangeEvent
rEvents ) throw(::com::sun::star::uno::RuntimeException);
virtual void PrepareWindowDescriptor(
::com::sun::star::awt::WindowDescriptor rDesc );
virtual void ImplModelPropertiesChanged( const
::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyChangeEvent
rEvents ) throw(::com::sun::star::uno::RuntimeException);
protected:
diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
index d2dd5ea..285aa73 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
+++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
@@ -29,12 +29,6 @@ OGeometryControlModelCONTROLMODEL::OGeometryControlModel(
const ::com::sun::st
{
}
-//template class CONTROLMODEL
-//OGeometryControlModelCONTROLMODEL::OGeometryControlModel(::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext const i_xCompContext)
-// :OGeometryControlModel_Base(new CONTROLMODEL(i_xCompContext))
-//{
-//}
-//
//
template
[Libreoffice-commits] .: 3 commits - cosv/inc sc/source
cosv/inc/cosv/tpl/processor.hxx| 48 -
cosv/inc/cosv/tpl/range.hxx| 185 -
cosv/inc/cosv/tpl/tpltools.hxx | 68 -
sc/source/ui/app/scdll.cxx |1
sc/source/ui/docshell/arealink.cxx |1
sc/source/ui/docshell/docfunc.cxx |7 -
sc/source/ui/docshell/docsh.cxx| 21
sc/source/ui/docshell/docsh2.cxx | 19 ---
sc/source/ui/docshell/docsh3.cxx |4
sc/source/ui/docshell/docsh4.cxx | 15 ---
sc/source/ui/docshell/docsh5.cxx |7 -
sc/source/ui/docshell/docsh6.cxx |7 -
sc/source/ui/docshell/docsh8.cxx |2
sc/source/ui/docshell/impex.cxx| 18 ---
14 files changed, 2 insertions(+), 401 deletions(-)
New commits:
commit b8d065e94aba1dd94ae1bbe33e8ac32c74944e70
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Jul 7 02:44:15 2012 +0200
Remove unused SOT_FORMATSTR_ID_STARCALC_30
Change-Id: I6efa95c07d524379ce1b14c85d897494509039a5
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index fc3d820..651b46a 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -48,7 +48,6 @@
#include svtools/parhtml.hxx
#include sot/formats.hxx
-#define SOT_FORMATSTR_ID_STARCALC_30 SOT_FORMATSTR_ID_STARCALC
#include scitems.hxx // fuer tbxctrls etc.
#include scmod.hxx
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 7f82e53..f0f7ff4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -56,7 +56,6 @@
#include scabstdlg.hxx
#include sot/formats.hxx
-#define SOT_FORMATSTR_ID_STARCALC_30 SOT_FORMATSTR_ID_STARCALC
#include cell.hxx
#include column.hxx
commit 1c8a30d4f9578057d256b18bfb8477839349e9d9
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Jul 8 00:34:50 2012 +0200
Remove unused code
Change-Id: I00c8f078b50d913c02407653ce23415d31975f2f
diff --git a/cosv/inc/cosv/tpl/processor.hxx b/cosv/inc/cosv/tpl/processor.hxx
index 833c4e0..a685acd 100644
--- a/cosv/inc/cosv/tpl/processor.hxx
+++ b/cosv/inc/cosv/tpl/processor.hxx
@@ -56,25 +56,6 @@ class ConstProcessorClient
ProcessorIfc io_processor ) const = 0;
};
-/** Implements an acyclic visitor pattern. This is the abstract
-base for the classes to be processed (the visitables).
-*/
-class ProcessorClient
-{
- public:
-virtual ~ProcessorClient() {}
-
-voidAccept(
-ProcessorIfc io_processor )
-{ do_Accept(io_processor); }
- private:
-virtual voiddo_Accept(
-ProcessorIfc io_processor ) = 0;
-};
-
-
-
-
/** Typed base for visitor classes, leaving the visited
object const.
@@ -142,35 +123,6 @@ CheckedCall( ProcessorIfc io_processor,
pProcessor-Process(io_client);
}
-template class C
-inline void
-AssertedCall( ProcessorIfc io_processor,
- const Ci_client )
-{
-ConstProcessorC *
-pProcessor = dynamic_cast csv::ConstProcessorC *
-(io_processor);
-csv_assert( pProcessor != 0
- csv::AssertedCall() failed. Processed object did not match
processor. );
-pProcessor-Process(i_client);
-}
-
-template class C
-inline void
-AssertedCall( ProcessorIfc io_processor,
- C io_client )
-{
-ProcessorC *
-pProcessor = dynamic_cast csv::ProcessorC *
-(io_processor);
-csv_assert( pProcessor != 0
- csv::AssertedCall() failed. Processed object did not match
processor. );
-pProcessor-Process(io_client);
-}
-
-
-
-
} // namespace csv
#endif
diff --git a/cosv/inc/cosv/tpl/range.hxx b/cosv/inc/cosv/tpl/range.hxx
deleted file mode 100644
index bb748b3..000
--- a/cosv/inc/cosv/tpl/range.hxx
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef CSV_RANGE_HXX
-#define CSV_RANGE_HXX
-
-#include cstring // for std::size_t
-
-
-
-
-namespace csv
-{
-
-
-/**
[Libreoffice-commits] .: Branch 'feature/remote' - android/sdremote
android/sdremote/AndroidManifest.xml
|1
android/sdremote/res/layout/testlayout.xml
|5
android/sdremote/src/org/libreoffice/impressremote/TestClient.java
| 61 +++-
android/sdremote/src/org/libreoffice/impressremote/communication/Client.java
| 16 +-
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
| 15 +-
android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
| 25 ++-
android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
| 73 ++
android/sdremote/src/org/libreoffice/impressremote/communication/Transmitter.java
|1
8 files changed, 175 insertions(+), 22 deletions(-)
New commits:
commit 135f1e6a9c75412bab66d0071fe59aa07efd7e31
Author: Andrzej J. R. Hunt andr...@ahunt.org
Date: Tue Jul 10 19:16:02 2012 +0100
Preview image and slide number receiving code added to Android client.
Change-Id: I40617d0523eaf7b9431694a0a4cd6d31ad92765e
diff --git a/android/sdremote/AndroidManifest.xml
b/android/sdremote/AndroidManifest.xml
index e1c76d7..82cb1be 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -5,6 +5,7 @@
android:versionName=1.0
uses-permission android:name=android.permission.INTERNET /
+uses-sdk android:minSdkVersion=14 android:targetSdkVersion=14/
application
android:icon=@drawable/ic_launcher
diff --git a/android/sdremote/res/layout/testlayout.xml
b/android/sdremote/res/layout/testlayout.xml
index 2e32325..8e7a4f1 100644
--- a/android/sdremote/res/layout/testlayout.xml
+++ b/android/sdremote/res/layout/testlayout.xml
@@ -25,4 +25,9 @@
android:layout_gravity=center_horizontal
android:text=Previous /
+ImageView
+android:id=@+id/image_preview
+android:layout_width=wrap_content
+android:layout_height=wrap_content /
+
/LinearLayout
\ No newline at end of file
diff --git a/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
b/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
index b3bd3b5..e275efb 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
@@ -1,18 +1,23 @@
package org.libreoffice.impressremote;
import org.libreoffice.impressremote.communication.CommunicationService;
-import org.libreoffice.impressremote.communication.Transmitter;
-
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.os.Bundle;
+import android.os.Handler;
import android.os.IBinder;
+import android.os.Message;
+import android.os.Messenger;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
public class TestClient extends Activity {
@@ -20,27 +25,45 @@ public class TestClient extends Activity {
private CommunicationService mCommunicationService;
+ final Messenger mMessenger = new Messenger(new MessageHandler());
+
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.testlayout);
setupUI();
+
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
doBindService();
+ }
+ // FIXME: move all necessary code to CommunicationService.onUnbind
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ doUnbindService();
+ stopService(new Intent(this, CommunicationService.class));
}
private ServiceConnection mConnection = new ServiceConnection() {
+ @Override
public void onServiceConnected(ComponentName aClassName,
IBinder aService) {
mCommunicationService = ((CommunicationService.CBinder)
aService)
.getService();
mCommunicationService.connectTo(
- CommunicationService.Protocol.NETWORK,
128.232.128.144);
-
+ CommunicationService.Protocol.NETWORK,
10.0.2.2);
+ mCommunicationService.setActivityMessenger(mMessenger);
enableButtons(true);
}
+ @Override
public void
Upvote important questions on ask.libreoffice.org ([Bug 51894] https://www.libreoffice.org/get-help/ misses a ask.libreoffice.org link)
Hi QA guys and gals, https://bugs.freedesktop.org/show_bug.cgi?id=51894 --- Comment #4 from Jean Spiteri beimaginativeegr...@gmail.com 2012-07-10 21:54:35 CEST --- Can you help me, please? Give me the most important questions from ask.libreoffice.org. I hope this list is a good audience for this task as we have a wide rage of advanced users and good knowledge about the project here. Can we help Jean to get the most important questions out of ask.libreoffice.org by upvoting? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Decrease header files dependencies
From Matteo Casalin matteo.casa...@gmx.com: Matteo Casalin has uploaded a new change for review. Change subject: Decrease header files dependencies .. Decrease header files dependencies Change-Id: I654e71e56d60bf629625df09eb93b21c9ef670e8 --- M cui/source/dialogs/cuigrfflt.cxx M cui/source/inc/cuigrfflt.hxx M extensions/source/scanner/scanwin.cxx M filter/source/graphicfilter/icgm/bundles.cxx M filter/source/pdf/pdfexport.cxx M filter/source/svg/svgwriter.cxx M filter/source/svg/svgwriter.hxx M sc/source/ui/view/overlayobject.cxx M sd/source/ui/annotations/annotationwindow.cxx M sd/source/ui/app/optsitem.cxx M sd/source/ui/func/fuoaprms.cxx M sd/source/ui/view/drviews8.cxx M sd/source/ui/view/grviewsh.cxx M sfx2/source/doc/graphhelp.cxx M sfx2/source/view/ipclient.cxx M slideshow/source/engine/shapes/drawinglayeranimation.cxx M slideshow/source/engine/shapes/viewmediashape.cxx M svtools/source/filter/wmf/emfwr.cxx M svtools/source/filter/wmf/wmfwr.cxx M svtools/source/graphic/grfmgr.cxx M svtools/source/graphic/provider.cxx M svx/source/dialog/_contdlg.cxx M svx/source/gallery2/galobj.cxx M svx/source/sdr/overlay/overlayanimatedbitmapex.cxx M svx/source/sdr/overlay/overlaybitmapex.cxx M svx/source/sdr/overlay/overlaycrosshair.cxx M svx/source/sdr/overlay/overlayhelpline.cxx M svx/source/sdr/overlay/overlayline.cxx M svx/source/sdr/overlay/overlaymanager.cxx M svx/source/sdr/overlay/overlaymanagerbuffered.cxx M svx/source/sdr/overlay/overlayobject.cxx M svx/source/sdr/overlay/overlaypolypolygon.cxx M svx/source/sdr/overlay/overlayrollingrectangle.cxx M svx/source/sdr/overlay/overlaytriangle.cxx M svx/source/svdraw/gradtrns.cxx M svx/source/svdraw/sdrpagewindow.cxx M svx/source/svdraw/svdfmtf.cxx M svx/source/svdraw/svdoashp.cxx M svx/source/svdraw/svdobj.cxx M svx/source/svdraw/svdocapt.cxx M svx/source/svdraw/svdograf.cxx M svx/source/svdraw/svdopath.cxx M svx/source/svdraw/svdotext.cxx M svx/source/svdraw/svdotextdecomposition.cxx M svx/source/svdraw/svdotextpathdecomposition.cxx M svx/source/svdraw/svdpage.cxx M svx/source/svdraw/svdpoev.cxx M svx/source/table/tablehandles.cxx M svx/source/xoutdev/_xpoly.cxx M sw/source/core/graphic/ndgrf.cxx M sw/source/core/layout/fly.cxx M sw/source/filter/rtf/swparrtf.cxx M tools/Package_inc.mk M tools/inc/tools/gen.hxx M tools/source/generic/line.cxx M tools/source/generic/poly.cxx M vcl/generic/glyphs/glyphcache.cxx M vcl/inc/vcl/salbtype.hxx M vcl/source/app/sound.cxx M vcl/source/gdi/cvtsvm.cxx M vcl/source/gdi/impanmvw.cxx M vcl/source/gdi/impgraph.cxx M vcl/source/gdi/metaact.cxx M vcl/source/gdi/print2.cxx M vcl/source/gdi/regband.cxx M vcl/source/gdi/region.cxx M vcl/unx/generic/app/saldisp.cxx M vcl/unx/generic/app/soicon.cxx M xmloff/source/draw/shapeexport2.cxx M xmloff/source/draw/shapeexport3.cxx M xmloff/source/draw/xexptran.cxx 71 files changed, 46 insertions(+), 98 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/288/1 -- To view, visit https://gerrit.libreoffice.org/288 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I654e71e56d60bf629625df09eb93b21c9ef670e8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/addincol.hxx | 57 +++---
sc/source/core/tool/addincol.cxx | 138 +--
sc/source/core/tool/compiler.cxx |9 +-
sc/source/filter/excel/xeformula.cxx |2
sc/source/filter/excel/xiroot.cxx|2
5 files changed, 104 insertions(+), 104 deletions(-)
New commits:
commit f5798e947e5d96e59678825c06cadf35ff9229fa
Author: Eike Rathke er...@redhat.com
Date: Tue Jul 10 20:46:54 2012 +0200
changes to Replaced deprecated tools/String with OUString in ScAddInCol
Some further nitpicking changes to avoid a few more temporary conversion
objects.
Change-Id: I5faaa1f525aeafdc5004340a6cd05e0610c22182
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 435fa4c..ba2c9cb 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -889,9 +889,11 @@ void ScUnoAddInCollection::ReadFromAddIn( const
uno::Referenceuno::XInterface
rtl::OUString aFuncU = xFunc-getName();
// stored function name: (service
name).(function)
-::rtl::OUString aFuncName = aServiceName;
-aFuncName += ::rtl::OUString( '.' );
-aFuncName += ::rtl::OUString( aFuncU );
+rtl::OUStringBuffer aFuncNameBuffer(
aServiceName.getLength()+1+aFuncU.getLength());
+aFuncNameBuffer.append(aServiceName);
+aFuncNameBuffer.append('.');
+aFuncNameBuffer.append(aFuncU);
+rtl::OUString aFuncName =
aFuncNameBuffer.makeStringAndClear();
sal_Bool bValid = sal_True;
long nVisibleCount = 0;
@@ -919,35 +921,31 @@ void ScUnoAddInCollection::ReadFromAddIn( const
uno::Referenceuno::XInterface
if (bValid)
{
sal_uInt16 nCategory = lcl_GetCategory(
-::rtl::OUString(
-
xAddIn-getProgrammaticCategoryName(
-aFuncU ) ) );
+
xAddIn-getProgrammaticCategoryName( aFuncU ) );
rtl::OString sHelpId =
aHelpIdGenerator.GetHelpId( aFuncU );
-rtl::OUString aLocalU;
+::rtl::OUString aLocalName;
try
{
-aLocalU = xAddIn-
+aLocalName = xAddIn-
getDisplayFunctionName( aFuncU
);
}
catch(uno::Exception)
{
-aLocalU = ###;
+aLocalName = ###;
}
-::rtl::OUString aLocalName =
::rtl::OUString( aLocalU );
-rtl::OUString aDescU;
+::rtl::OUString aDescription;
try
{
-aDescU = xAddIn-
+aDescription = xAddIn-
getFunctionDescription( aFuncU
);
}
catch(uno::Exception)
{
-aDescU = ###;
+aDescription = ###;
}
-::rtl::OUString aDescription( aDescU );
ScAddInArgDesc* pVisibleArgs = NULL;
if ( nVisibleCount 0 )
@@ -1105,9 +1103,11 @@ void ScUnoAddInCollection::UpdateFromAddIn( const
uno::Referenceuno::XInterface
rtl::OUString aFuncU = xFunc-getName();
// stored function name: (service name).(function)
-::rtl::OUString aFuncName = rServiceName;
-aFuncName += ::rtl::OUString( '.' );
-aFuncName += ::rtl::OUString( aFuncU );
+rtl::OUStringBuffer aFuncNameBuffer(
[GSOC-STATUS-UPDATE] Impress Remote Control
Hi all, A brief status update of the last 2 days: - Switched from Unix sockets to sal code. - Debugged fixed a threading bug. - Fixed some bugs in the command parsing. - Basic remote control now works (back/forward)! - Added Service to Activity messaging in Android app (for server to app communication). - Code to show slide number and preview images in app. (Untested until I've written the server portion, see below.) - Initial work on image export from LO. Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #7
On Tue, 10 Jul 2012 01:58:29 +0200, Thorsten Behrens t...@documentfoundation.org wrote: Marco Cecchetti wrote: This week I provided full support for skipping both a single effect (Right/Down key) and all left effects (Page Down key). Symmetrically, I provided full support for rewinding both a single effect, including going to the previous slide (Left/Up key), and all already played effects (Page Up key). Tests on several browsers have been performed. Moreover I have fixed some bug this week Hi Marco, impressive work again - would you consider some fixes on the c++ part safe for 3.6 incidentally? Hi Thorsten, I suppose that above all you think of repeated animations. Well, the best thing would be having them tested more extensively, anyway surely this feature doesn't work worst than before. The fix in effects.xml is especially nice, though comes with a catch: it may well need swapping direction in at least the binary powerpoint import (maybe also in oox) - poke me for some test files or bounce this back to me. Ah, I wasn't aware of that. Indeed if you agree, I prefer to file a bug/make an easy hack rather than fixing it by myself. Wrt. to the bug in the c++ engine you've found on day 31 - can you file those as fdo bugs right away, with a minimal sample doc? Some of those may even be easy hacks. ;) Well, I guess you are talking about the fact that when we try to skip an effect with the hide after animation option, the C++ presentation engine doesn't apply the final hiding action. I'll create a fdo bug pointing out this problem. And again, would love to see working functionality end up in master, so people pulling nightly builds can enjoy your improvements! At present I'm working on adding some kind of support for skipping / rewinding interactive animation sequences. I hope to achieve a stable implementation. However as soon as possible I'll merge last changes to master branch. 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
Trigger Filter Dialog
Hi All, What's the easiest way to trigger the filter dialog seen here: https://bugs.freedesktop.org/attachment.cgi?id=55136action=edit I'm working on the bug but can't really test anything because I can't figure out how to force the dialog to appear. Appreciate any guidance (or a file that will trigger it). Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Use rtl_zeroMemory in place of rtl_fillMemory(..., 0)
From Christophe JAILLET christophe.jail...@wanadoo.fr: Christophe JAILLET has uploaded a new change for review. Change subject: Use rtl_zeroMemory in place of rtl_fillMemory(..., 0) .. Use rtl_zeroMemory in place of rtl_fillMemory(..., 0) Change-Id: Idd83f6340d13a1d7111d0d5a7268f1aa8bf5c09e --- M canvas/source/directx/dx_surfacebitmap.cxx M sal/inc/osl/file.hxx M sc/source/filter/qpro/qprostyle.cxx 3 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/289/1 -- To view, visit https://gerrit.libreoffice.org/289 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd83f6340d13a1d7111d0d5a7268f1aa8bf5c09e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trigger Filter Dialog
On 07/10/2012 03:59 PM, Joel Madero wrote: Hi All, What's the easiest way to trigger the filter dialog seen here: https://bugs.freedesktop.org/attachment.cgi?id=55136action=edit I'm working on the bug but can't really test anything because I can't figure out how to force the dialog to appear. Appreciate any guidance (or a file that will trigger it). Seeing that dialog means the type detection has failed. There is no easy way to trigger it intentionally unless you are hitting a bug or limitation in the type detection code. I'm curious as to why you would have to trigger it. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trigger Filter Dialog
On 07/10/2012 04:08 PM, Kohei Yoshida wrote: On 07/10/2012 03:59 PM, Joel Madero wrote: I'm working on the bug but can't really test anything because I can't figure out how to force the dialog to appear. Appreciate any guidance (or a file that will trigger it). Seeing that dialog means the type detection has failed. There is no easy way to trigger it intentionally unless you are hitting a bug or limitation in the type detection code. Actually there is. Try opening a file whose format we don't support. Any obscure format that you have that libreoffice couldn't possibly open? Or you can just make something up. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trigger Filter Dialog
Because someone has requested an enhancement that I thought I'd take a stab at and see if it's accepted. Basically there are two complaints: 1. Random order isn't appreciated 2. Possibly two columns - first will have name of file, second extension Also, tried making some random garbage extension (.abc) with emacs, leafpad, and writerall opened fine Joel On Tue, Jul 10, 2012 at 1:08 PM, Kohei Yoshida kohei.yosh...@gmail.comwrote: On 07/10/2012 03:59 PM, Joel Madero wrote: Hi All, What's the easiest way to trigger the filter dialog seen here: https://bugs.freedesktop.org/**attachment.cgi?id=55136**action=edithttps://bugs.freedesktop.org/attachment.cgi?id=55136action=edit I'm working on the bug but can't really test anything because I can't figure out how to force the dialog to appear. Appreciate any guidance (or a file that will trigger it). Seeing that dialog means the type detection has failed. There is no easy way to trigger it intentionally unless you are hitting a bug or limitation in the type detection code. I'm curious as to why you would have to trigger it. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Upvote important questions on ask.libreoffice.org ([Bug 51894] https://www.libreoffice.org/get-help/ misses a ask.libreoffice.org link)
2012/7/10 Bjoern Michaelsen bjoern.michael...@canonical.com: Hi QA guys and gals, https://bugs.freedesktop.org/show_bug.cgi?id=51894 --- Comment #4 from Jean Spiteri beimaginativeegr...@gmail.com 2012-07-10 21:54:35 CEST --- Can you help me, please? Give me the most important questions from ask.libreoffice.org. I hope this list is a good audience for this task as we have a wide rage of advanced users and good knowledge about the project here. Can we help Jean to get the most important questions out of ask.libreoffice.org by upvoting? Best, Bjoern Thank you for your pointer to this website. I personally wasn't aware of it.So I think it is a good idea to increase visibility! There are so many pages for information... Website, wiki, bugzilla, ask,... Unfortunately, it seems as if I am not the only one in this situation... There are currently quite a lot of questions (n=953) un-answered. Some of them might be pretty easy for people more deeply involved/ using LO more often, e.g. the following (from 2012-04-20) where it seems as if the guy here has a script and everything in place but needs just a single parameter change: from http://ask.libreoffice.org/question/2063/wrong-xls-filetype/: Hi I've been converting .ods files to .xls binary format in headless mode using the convert-to option. Every time I use the command, it converts the file to the 95/5.0 version of xls, not the 97-2003 version. Is there any way to specify which type of .xls to convert to using the convert-to option? What I don't get at the moment is the sense of this platform/ why I should vote and for what... I see that it tries to be something similar to the system at stackoverflow but as far as I understand in contrast to e.g. bugzilla there is no option to close a question if it was answered. So by upvoting some entry do I push a feature request? Or what effect does my vote cause in the end? Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
OUString::indexOf with 1 char string parameter
Hi,
before submitting patches on gerrit, I would like to have your feed back
to make sure I'm right.
'OUString' have 'indexOf' that can find a substring (literal or
OUString) or a char.
IMO, looking for a 1 char long string is the same as looking for this
char itself. However, the later is faster. In some cases, we even
allocate memory before doing the search !
Example #1: we allocate memory to build a 1 char long string and search
for it
diff --git a/sc/source/ui/vba/vbafilesearch.cxx
b/sc/source/ui/vba/vbafilesearch.cxx
index ddb5c04..220b2e2 100644
--- a/sc/source/ui/vba/vbafilesearch.cxx
+++ b/sc/source/ui/vba/vbafilesearch.cxx
@@ -180,7 +180,7 @@ sal_Int32 SAL_CALL ScVbaFileSearch::Execute( ) throw
(css::uno::RuntimeExceptio
if ( IsWildCard( aTempFileName ) )
{
bool bEndWithAsterisk = aTempFileName.endsWithAsciiL(*, 1);
-bool bStartWithAsterisk =
(aTempFileName.indexOf(::rtl::OUString(*)) == 0);
+bool bStartWithAsterisk = (aTempFileName.indexOf('*')) == 0);
if ( !bEndWithAsterisk !bStartWithAsterisk )
{
aTempFileName = ::rtl::OUString(*) + aTempFileName +
::rtl::OUString(*);
Example #2: we search for a 1 char string
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx
b/shell/source/tools/lngconvex/lngconvex.cxx
index 5b2ecb2..dce42ab 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -200,7 +200,7 @@ public:
private:
void init()
{
-sal_Int32 idx = lang_.indexOf(-);
+sal_Int32 idx = lang_.indexOf('-');
if (idx -1)
{
In both cases, I think it is safe to search only for the char irself.
There are a few of these that can be cleanup.
If you agree with this, I will provide a patch via gerrit.
Best regards
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Upvote important questions on ask.libreoffice.org ([Bug 51894] https://www.libreoffice.org/get-help/ misses a ask.libreoffice.org link)
On Tue, Jul 10, 2012 at 4:43 PM, Philipp Riemer ruderphil...@gmail.com wrote: Unfortunately, it seems as if I am not the only one in this situation... There are currently quite a lot of questions (n=953) un-answered. It's not currently possible to mark a Best Answer for a question in LO's deployment of Askbot: https://bugs.freedesktop.org/show_bug.cgi?id=51569 Questions from the last few weeks have been accumulating with nobody empowered to close them out and mark them as Answered. Some of the questions don't have (complete) answers yet, but it's hard to find the signal in all of the noise. but as far as I understand in contrast to e.g. bugzilla there is no option to close a question if it was answered. The Askbot software offers at least three user options to 'close 'questions: 1) The asking party (original user who posed the question) can accept an answer 2) The asking party can delete the question 3) (I believe) A user can close someone else's question if they have enough karma AFAIK, the only currently working option on LO's ask site is #2. This is rather suboptimal. --R ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/docnode/ndtbl.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit dd0e782d1176f6f52d121fdc920f015ea7647d45 Author: Julien Nabet serval2...@yahoo.fr Date: Tue Jul 10 23:31:37 2012 +0200 Add some explanation (thank you David!) (see http://nabble.documentfoundation.org/Some-strange-lines-by-taking-a-look-at-the-bt-of-fdo-51916-tp3994561p3994639.html) Change-Id: I93830306c70155532f461957991df8dde29540da diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 118eeb2..ab96959 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1357,7 +1357,12 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t rTableNodes, ++aCellEndIdx; SwStartNode* pSttNd = new SwStartNode( aTmpIdx, ND_STARTNODE, SwTableBoxStartNode ); + +// Quotation of http://nabble.documentfoundation.org/Some-strange-lines-by-taking-a-look-at-the-bt-of-fdo-51916-tp3994561p3994639.html +// SwNode's constructor adds itself to the same SwNodes array as the other node (pSttNd). +// So this statement is only executed for the side-effect. new SwEndNode( aCellEndIdx, *pSttNd ); + //set the start node on all node of the current cell SwNodeIndex aCellNodeIdx = aCellIter-aStart; for(;aCellNodeIdx = aCellIter-aEnd; ++aCellNodeIdx ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Some strange lines by taking a look at the bt of fdo#51916
Thank you David for your explanation, I put it in comment just before the line. (see http://cgit.freedesktop.org/libreoffice/core/commit/?id=dd0e782d1176f6f52d121fdc920f015ea7647d45) Julien -- View this message in context: http://nabble.documentfoundation.org/Some-strange-lines-by-taking-a-look-at-the-bt-of-fdo-51916-tp3994561p3994763.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#34697 - Print Current Page in Print dialog - Draw, Impre...
From Rob Snelders libreoff...@ertai.nl: Rob Snelders has uploaded a new change for review. Change subject: fdo#34697 - Print Current Page in Print dialog - Draw, Impress .. fdo#34697 - Print Current Page in Print dialog - Draw, Impress Change-Id: Ia6d50083eda5e511f8ff47437244cfe598f34948 --- M sd/source/ui/view/DocumentRenderer.cxx 1 file changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/290/1 -- To view, visit https://gerrit.libreoffice.org/290 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6d50083eda5e511f8ff47437244cfe598f34948 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders libreoff...@ertai.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 11 commits - connectivity/Library_dbtools.mk connectivity/Library_file.mk connectivity/source desktop/source extensions/source pyuno/source sfx2/source svtools/inc svtools/sou
connectivity/Library_dbtools.mk | 90
connectivity/Library_file.mk|5
connectivity/source/drivers/postgresql/pq_allocator.hxx |3
desktop/source/deployment/dp_persmap.cxx|6 +
extensions/source/activex/so_activex.cxx| 29 +++--
pyuno/source/module/pyuno_runtime.cxx |3
sfx2/source/appl/linkmgr2.cxx |2
svtools/inc/svtools/grfmgr.hxx |2
svtools/source/graphic/grfmgr.cxx |4
svtools/source/graphic/grfmgr2.cxx |2
vcl/inc/vcl/sysdata.hxx |7 +
11 files changed, 88 insertions(+), 65 deletions(-)
New commits:
commit 185b8bfc6796ec0a8cc701bf2de5df9cc6abd10d
Author: Michael Stahl mst...@redhat.com
Date: Wed Jul 11 00:01:59 2012 +0200
warning C4018: singed/unsigned mismatch
Change-Id: I2f0899086f656f117849521c933cce4c23b8751c
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 55f030c..591d96a 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -139,7 +139,7 @@ void LinkManager::Remove( sal_uInt16 nPos, sal_uInt16 nCnt )
{
if( nCnt nPos aLinkTbl.size() )
{
-if( nPos + nCnt aLinkTbl.size() )
+if (sal::static_int_castsize_t(nPos + nCnt) aLinkTbl.size())
nCnt = aLinkTbl.size() - nPos;
for( sal_uInt16 n = nPos; n nPos + nCnt; ++n)
commit 8ab07f99d6bd302ff38b292a3ec7c3695f19fd27
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 10 23:56:47 2012 +0200
warning C4267: conversion from 'size_t' to 'DWORD'
Change-Id: I343a819a11d3121030d294d78808a2ec1da2adeb
diff --git a/extensions/source/activex/so_activex.cxx
b/extensions/source/activex/so_activex.cxx
index 0b4eacb..3ae9145 100644
--- a/extensions/source/activex/so_activex.cxx
+++ b/extensions/source/activex/so_activex.cxx
@@ -173,14 +173,14 @@ BOOL createKey( HKEY hkey,
,
0,
REG_SZ,
- (const BYTE*)aValue,
- strlen( aValue ) ) )
+ reinterpret_castconst BYTE*(aValue),
+ sal::static_int_castDWORD(strlen(aValue
( !aChildName || ERROR_SUCCESS == RegSetValueExA( hkey1,
aChildName,
0,
REG_SZ,
- (const
BYTE*)aChildValue,
- strlen(
aChildValue ) ) )
+ reinterpret_castconst BYTE*(aChildValue),
+ sal::static_int_castDWORD(strlen(aChildValue
ERROR_SUCCESS == RegCloseKey( hkey1 ) );
}
@@ -286,8 +286,11 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL
bForAllUsers, REGSAM nKeyAc
wsprintfA( aSubKey, %sMIME\\DataBase\\Content Type\\%s, aPrefix,
aMimeType[ind] );
if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ?
HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL,
REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, hkey, NULL )
|| ERROR_SUCCESS != RegSetValueExA(hkey, CLSID, 0, REG_SZ,
- (const BYTE *)aClassID, strlen(aClassID)) )
+reinterpret_castconst BYTE *(aClassID),
+sal::static_int_castDWORD(strlen(aClassID))) )
+{
aResult = FALSE;
+}
if( hkey )
RegCloseKey(hkey),hkey= NULL;
@@ -487,10 +490,14 @@ STDAPI DllRegisterServerDoc_Impl( int nMode, BOOL
bForAllUsers, REGSAM nKeyAcces
wsprintfA( aSubKey, %sMIME\\DataBase\\Content Type\\%s,
aPrefix, aMSMimeType[ind] );
if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ?
HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL,
REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, hkey, NULL )
|| ERROR_SUCCESS != RegSetValueExA(hkey, Extension, 0, REG_SZ,
- (const BYTE *)aMSFileExt[ind], strlen( aMSFileExt[ind] ) )
+reinterpret_castconst BYTE *(aMSFileExt[ind]),
+sal::static_int_castDWORD(strlen(aMSFileExt[ind])))
|| ERROR_SUCCESS != RegSetValueExA(hkey, CLSID, 0, REG_SZ,
- (const BYTE *)aClassID, strlen(aClassID)) )
+reinterpret_castconst BYTE *(aClassID),
+sal::static_int_castDWORD(strlen(aClassID
+
[PATCH] Simplify code and correct the erroneous length parameter for...
From Christophe JAILLET christophe.jail...@wanadoo.fr: Christophe JAILLET has uploaded a new change for review. Change subject: Simplify code and correct the erroneous length parameter for macro:/// and align text .. Simplify code and correct the erroneous length parameter for macro:/// and align text Change-Id: Id9eef27636c5c74857ed05b891514bee70903c3b --- M framework/source/lomenubar/MenuItemStatusListener.cxx 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/291/1 -- To view, visit https://gerrit.libreoffice.org/291 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9eef27636c5c74857ed05b891514bee70903c3b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gerrit: polishing web UI
On Tue, Jul 10, 2012 at 7:08 PM, Philipp Riemer ruderphil...@gmail.com wrote: Hi, I would prefer using the new green official artwork (see e.g. core/setup_native/source/mac/ooo core/icon-themes/galaxy/brand) and stretch the green color over the whole width (similar to the gerrit instance at eclipse). I would do it simiar to core/icon-themes/galaxy/brand_dev/intro.png but with code review instead of beta in the box. Find a quick draft attached to this mail. We will have to read and look at that page quite a bit. So real-estate should not be wasted and quite frankly that 'new' white on bright green color theme is maybe very visible but also hard on the eyes. that is the kind of things that would motivate me to write a grease-monkey script or to use the command line. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source extensions/source filter/source sc/source sd/source sfx2/source slideshow/source svtools/source svx/source sw/source tools/inc tools/Package_inc.mk tools/source vcl
cui/source/dialogs/cuigrfflt.cxx |1 cui/source/inc/cuigrfflt.hxx |2 extensions/source/scanner/scanwin.cxx|2 filter/source/graphicfilter/icgm/bundles.cxx |1 filter/source/pdf/pdfexport.cxx |1 filter/source/svg/svgwriter.cxx |1 filter/source/svg/svgwriter.hxx |1 sc/source/ui/view/overlayobject.cxx |1 sd/source/ui/annotations/annotationwindow.cxx|2 sd/source/ui/app/optsitem.cxx|2 sd/source/ui/func/fuoaprms.cxx |2 sd/source/ui/view/drviews8.cxx |2 sd/source/ui/view/grviewsh.cxx |2 sfx2/source/doc/graphhelp.cxx|2 sfx2/source/view/ipclient.cxx|1 slideshow/source/engine/shapes/drawinglayeranimation.cxx |2 slideshow/source/engine/shapes/viewmediashape.cxx|1 svtools/source/filter/wmf/emfwr.cxx |2 svtools/source/filter/wmf/wmfwr.cxx |2 svtools/source/graphic/grfmgr.cxx|2 svtools/source/graphic/provider.cxx |1 svx/source/dialog/_contdlg.cxx |2 svx/source/gallery2/galobj.cxx |2 svx/source/sdr/overlay/overlayanimatedbitmapex.cxx |1 svx/source/sdr/overlay/overlaybitmapex.cxx |1 svx/source/sdr/overlay/overlaycrosshair.cxx |1 svx/source/sdr/overlay/overlayhelpline.cxx |1 svx/source/sdr/overlay/overlayline.cxx |1 svx/source/sdr/overlay/overlaymanager.cxx|1 svx/source/sdr/overlay/overlaymanagerbuffered.cxx|1 svx/source/sdr/overlay/overlayobject.cxx |1 svx/source/sdr/overlay/overlaypolypolygon.cxx|1 svx/source/sdr/overlay/overlayrollingrectangle.cxx |1 svx/source/sdr/overlay/overlaytriangle.cxx |1 svx/source/svdraw/gradtrns.cxx |2 svx/source/svdraw/sdrpagewindow.cxx |2 svx/source/svdraw/svdfmtf.cxx|2 svx/source/svdraw/svdoashp.cxx |2 svx/source/svdraw/svdobj.cxx |2 svx/source/svdraw/svdocapt.cxx |2 svx/source/svdraw/svdograf.cxx |2 svx/source/svdraw/svdopath.cxx |2 svx/source/svdraw/svdotext.cxx |2 svx/source/svdraw/svdotextdecomposition.cxx |2 svx/source/svdraw/svdotextpathdecomposition.cxx |1 svx/source/svdraw/svdpage.cxx|2 svx/source/svdraw/svdpoev.cxx|2 svx/source/table/tablehandles.cxx|1 svx/source/xoutdev/_xpoly.cxx|2 sw/source/core/graphic/ndgrf.cxx |2 sw/source/core/layout/fly.cxx|2 sw/source/filter/rtf/swparrtf.cxx|2 tools/Package_inc.mk |1 tools/inc/tools/gen.hxx | 30 - tools/inc/tools/helpers.hxx | 33 +++ tools/source/generic/line.cxx|1 tools/source/generic/poly.cxx|1 vcl/generic/glyphs/glyphcache.cxx|1 vcl/inc/vcl/salbtype.hxx |2 vcl/source/app/sound.cxx |5 -- vcl/source/gdi/cvtsvm.cxx|2 vcl/source/gdi/impanmvw.cxx |2 vcl/source/gdi/impgraph.cxx |2 vcl/source/gdi/metaact.cxx |2 vcl/source/gdi/print2.cxx|1 vcl/source/gdi/regband.cxx |3 - vcl/source/gdi/region.cxx|1 vcl/unx/generic/app/saldisp.cxx |1 vcl/unx/generic/app/soicon.cxx |1 xmloff/source/draw/shapeexport2.cxx |2 xmloff/source/draw/shapeexport3.cxx |2 xmloff/source/draw/xexptran.cxx |2 72 files changed, 79 insertions(+), 98 deletions(-) New commits: commit 739e20ac58983925f2076a9848435b7d4fb5366a Author: Matteo Casalin matteo.casa...@gmx.com Date: Sun Jul 1 01:06:04 2012 +0200 Decrease
