Re: minutes of ESC call ...
Hi, Michael Meeks píše v Čt 08. 11. 2012 v 16:39 +: + bundling libre logo ? (Andras) + cf. motivational mail to dev list + around 200k with icons license etc. + is it useful for office suite users (Stephan) + useful for school children fun in draw + not eager for bundled extensions + built it into the core (Stephan) It is a bit unclear here; I think the not eager for bundled extensions, built it into the core was more a general statement than resolution of the LibreLogo bundling - like, I understood it so that if we decide to bundle an extension, it should be on the basis that the long term goal is to integrate that functionality into the core. I myself would prefer not to bundle LibreLogo, but instead improve our extension download / installation experience in general - like some 'featured selection' of extensions that we would be able to show in the Start Centre, or something. Of course, until it happens, why to block a nice feature :-) - but I don't think we should make its toolbar visible by default, which consequently means that very few people will know about that anyway; something that is more easily fixable (blogging, etc.) if it is an (unbundled) extension. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - readlicense_oo/eula
readlicense_oo/eula/EULA_en-US.rtf |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8e59df8cab52b58e9727e124fa7d2b5122615e58
Author: Andras Timar ati...@suse.com
Date: Fri Nov 9 09:25:06 2012 +0100
[SUSE only] update EULA
Change-Id: Ia55ff9b54202dad6c0df46a69235543d88f43e61
diff --git a/readlicense_oo/eula/EULA_en-US.rtf
b/readlicense_oo/eula/EULA_en-US.rtf
index f472403..12a821c 100644
--- a/readlicense_oo/eula/EULA_en-US.rtf
+++ b/readlicense_oo/eula/EULA_en-US.rtf
@@ -198,7 +198,7 @@ Other. The application of the United Nations Convention of
Contracts for the Int
\u169\'a91993,
2000-2012}{\dbch\af21\langfe1033\dbch\af23\afs20\alang1025\rtlch
\ltrch\loch\fs20\lang1033\loch\f10
Novell, Inc. or its affiliates. All Rights Reserved.}
\par \pard\plain
\s22\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\sb0\sa0\dbch\af18\langfe1033\dbch\af18\afs20\loch\f8\fs20\lang1033\qj\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0{\dbch\af21\langfe1033\dbch\af23\afs20\alang1025\rtlch
\ltrch\loch\fs20\lang1033\loch\f10
-(052912)}
+(110112)}
\par \pard\plain
\s22\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\sb0\sa0\dbch\af18\langfe1033\dbch\af18\afs20\loch\f8\fs20\lang1033\qj\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0{\dbch\af11\langfe1033\dbch\af18\afs20\alang1025\rtlch
\ltrch\loch\fs20\lang1033\loch\f11
}
\par \pard\plain
\s22\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\sb0\sa0\dbch\af18\langfe1033\dbch\af18\afs20\loch\f8\fs20\lang1033\qj\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0{\dbch\af21\langfe1033\dbch\af23\afs20\alang1025\rtlch
\ltrch\loch\fs20\lang1033\loch\f10
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - binfilter lcms2/ExternalPackage_lcms2.mk lcms2/ExternalProject_lcms2.mk
binfilter |1 - lcms2/ExternalPackage_lcms2.mk |2 +- lcms2/ExternalProject_lcms2.mk |4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 0aa1baa80b439740f176249d4f05007f715cf2b0 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Nov 9 09:27:19 2012 +0100 Trying to fix lcms2 again Change-Id: I376b03d12f8ae59fcf75046c42bcd6ba5d29af2c diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index 1d62736..1500476 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms else ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a)) -$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2.dll,src/.libs/liblcms2.dll)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll)) else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2.lib,bin/lcms2.lib)) $(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2.dll)) diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk index 2703c38..c2fd878 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/lcms2/ExternalProject_lcms2.mk @@ -34,9 +34,9 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): cd $(EXTERNAL_WORKDIR) \ ./configure --without-jpeg --without-tiff --with-pic \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS=-Wl,--export-all-symbols -Wl,--enable-stdcall-fixup -Wl,--enable-runtime-pseudo-reloc-v2) \ CPPFLAGS= $(SOLARINC) \ - $(if $(filter IOS ANDROID,$(OS)),--disable-shared, --enable-shared --disable-static) \ + $(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS= -DCMS_DLL_BUILD) \ + $(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \ cd src \ $(MAKE) \ touch $@ commit 0f25bad134dbd103c614b1299e800e3be22d5e0d Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Nov 9 09:27:04 2012 +0100 fix binfilter removal diff --git a/binfilter b/binfilter deleted file mode 16 index 63f492b..000 --- a/binfilter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 63f492b8333f5994294c8ea88fd8c5aa163ec6ff ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Le 08/11/2012 17:39, Michael Meeks a écrit : + should we drop Rhino, Beanshell javascript in 4.0 ? (Michael) + could be turned into an extension + was in the past was turned off (Stephan) AA: + disable Rhino / Beanshell unless in experimental mode (Michael) + for future deprecation / removal. + upgrade bundled python to 3.0 Surely, shouldn't we be promoting access to UNO via a variety of scripting languages rather than removing the bits that others have managed to successfully integrate in the past ? Is there some issue with maintenance or known future compatibility headaches ? AFAIR some effort went into converting these from optional extensions into pre-compiled features, so why remove them (or make them hard to find) in 4.0 ? Just my 2cents FWIW Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: modules removal surprises
On 11/08/2012 08:46 PM, Michael Stahl wrote: stlport is only necessary for compatibility of existing extensions that may be linked against it; it is no longer used by LO code. So is a welcome candidate for orderly removal. Like announcing its planned removal with LO 4.0 and actually removing it with 4.1. (It can already be considered deprecated for quite a while, so I would not mind removing it already in 4.0, either, if need be. For authors of old extensions, all that should be necessary is to rebuild them with a recent SDK.) If there are no objections, I'll take care of the 4.0-announcment, 4.1-removal plan. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/ui/app/swmodul1.cxx|8
sw/source/ui/inc/pview.hxx |5 -
sw/source/ui/inc/view.hxx|6 ++
sw/source/ui/uiview/pview.cxx| 27 +++
sw/source/ui/uiview/view.cxx |4 ++--
sw/source/ui/uiview/viewmdi.cxx | 19 +--
sw/source/ui/uiview/viewport.cxx |9 +
7 files changed, 69 insertions(+), 9 deletions(-)
New commits:
commit 3d303cb331ab273538d63b226250a6950718ea1f
Author: Ivan Timofeev timofeev@gmail.com
Date: Thu Nov 8 12:47:21 2012 +0400
fdo#35427: repair Tools Options Writer View - Show Scroll Slider
options
Change-Id: I2bacd52a182a2dba3dbe6c6d63861470e87b6066
Reviewed-on: https://gerrit.libreoffice.org/1008
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 186ae80..24630bd 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -93,11 +93,11 @@ void lcl_SetUIPrefs(const SwViewOption rPref, SwView*
pView, ViewShell* pSh )
// Scrollbars on / off
if(bVScrollChanged)
{
-pView-ShowVScrollbar(pNewPref-IsViewVScrollBar());
+pView-EnableVScrollbar(pNewPref-IsViewVScrollBar());
}
if(bHScrollChanged)
{
-pView-ShowHScrollbar( pNewPref-IsViewHScrollBar() ||
pNewPref-getBrowseMode() );
+pView-EnableHScrollbar( pNewPref-IsViewHScrollBar() ||
pNewPref-getBrowseMode() );
}
//if only the position of the vertical ruler has been changed initiate an
update
if(bVAlignChanged !bHScrollChanged !bVScrollChanged)
@@ -172,8 +172,8 @@ void SwModule::ApplyUsrPref(const SwViewOption rUsrPref,
SwView* pActView,
{
if(!bViewOnly)
pPref-SetUIOptions( rUsrPref );
-pPPView-ShowVScrollbar(pPref-IsViewVScrollBar());
-pPPView-ShowHScrollbar(pPref-IsViewHScrollBar());
+pPPView-EnableVScrollbar(pPref-IsViewVScrollBar());
+pPPView-EnableHScrollbar(pPref-IsViewHScrollBar());
if(!bViewOnly)
{
pPref-SetPagePrevRow(rUsrPref.GetPagePrevRow());
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index 329ba5e..f9242b4 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -193,6 +193,8 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
// MDI control elements
SwScrollbar *pHScrollbar;
SwScrollbar *pVScrollbar;
+boolmbHScrollbarEnabled;
+boolmbVScrollbarEnabled;
ImageButton *pPageUpBtn,
*pPageDownBtn;
// dummy window for filling the lower right edge when both scrollbars are
active
@@ -269,8 +271,9 @@ public:
voidScrollViewSzChg();
voidScrollDocSzChg();
voidShowHScrollbar(sal_Bool bShow);
-
voidShowVScrollbar(sal_Bool bShow);
+voidEnableHScrollbar(bool bEnable);
+voidEnableVScrollbar(bool bEnable);
sal_uInt16 GetPageCount() const{ return mnPageCount; }
sal_uInt16 GetSelectedPage() const {return aViewWin.SelectedPage();}
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 229e8f5..2d9dbe8 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -221,6 +221,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SwScrollbar *pHScrollbar, // MDI control elements
*pVScrollbar;
+boolmbHScrollbarEnabled;
+boolmbVScrollbarEnabled;
+
Window *pScrollFill; // dummy window for filling the lower
right edge
// when both scrollbars are active
@@ -517,6 +520,9 @@ public:
voidShowVScrollbar(sal_Bool bShow);
sal_BoolIsVScrollbarVisible()const;
+voidEnableHScrollbar(bool bEnable);
+voidEnableVScrollbar(bool bEnable);
+
int CreateVLineal();
int KillVLineal();
int CreateTab();
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index ecdc27d..ad00552 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1142,6 +1142,9 @@ void SwPagePreView::Init(const SwViewOption * pPrefs)
if( !pPrefs )
pPrefs = SW_MOD()-GetUsrPref(sal_False);
+mbHScrollbarEnabled = pPrefs-IsViewHScrollBar();
+mbVScrollbarEnabled = pPrefs-IsViewVScrollBar();
+
// die Felder aktualisieren
// ACHTUNG: hochcasten auf die EditShell, um die SS zu nutzen.
// In den Methoden wird auf die akt. Shell abgefragt!
@@ -1661,6 +1664,9 @@ void SwPagePreView::ScrollViewSzChg()
bShowVScrollbar = true;
}
+if (!mbVScrollbarEnabled)
[PUSHED] Change in core[libreoffice-3-6]: fdo#35427: repair Tools Options Writer View - Show Scr...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1008 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1008 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2bacd52a182a2dba3dbe6c6d63861470e87b6066 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Ivan Timofeev timofeev@gmail.com Gerrit-Reviewer: Ivan Timofeev timofeev@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding the browser to Libreoffice
On 09/11/12 07:17, khagaroth wrote: -1. If you want to add something new instead of improving the current functionality, the only thing that would make sense is an Outlook counterpart. That's the only thing that's missing for a complete office suite. i wonder why people say that an office suite needs to have an email client: is that only because Microsoft Office includes one? having never been a user of Microsoft Office: what specifically are the benefits of having an email client in the suite that are not currently supported in LibreOffice by its various Send As Email / Mail Merge / Address Book integration etc. features that are configurable to work with a number of external mail clients such as Thunderbird, Evolution, etc.? surely nobody actually wants to embed a mail client into a Writer document as an OLE object? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [tdf-discuss] Re: Adding the browser to Libreoffice
On 09/11/12 08:28, Florian Monfort wrote: Mmmh. What about extensions for existing browsers ? You talk about creating a browser without even a differenciation factor which makes the idea irrelevant. And I'm not even talking about the resources as some of you might have mentioned. But on the other side, browser extensions might actually be a good idea, especially for Firefox and Chrome. Opening an odt directly in you browser via a LibreOffice extension for example ? there is already a NPAPI plugin that can display documents in a compatible browser like Firefox (don't know if IE or Chrome still support NPAPI plugins). however i've never used it and don't know whether it is enabled or even installed in a default installation. also LO implements the other side of that interface so you can embed content using NPAPI plugins in LO documents and display e.g. SWF (Flash) that way (which i've also never used, but i fixed a crash in it once because some unit test failed :). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On 11/09/2012 09:16 AM, Jan Holesovsky wrote: Michael Meeks píše v Čt 08. 11. 2012 v 16:39 +: + bundling libre logo ? (Andras) + cf. motivational mail to dev list + around 200k with icons license etc. + is it useful for office suite users (Stephan) + useful for school children fun in draw + not eager for bundled extensions + built it into the core (Stephan) It is a bit unclear here; I think the not eager for bundled extensions, built it into the core was more a general statement than resolution of the LibreLogo bundling - like, I understood it so that if we decide to bundle an extension, it should be on the basis that the long term goal is to integrate that functionality into the core. Yes, that was my intent. /If/ we include some functionality in the product, it typically does not make sense to include it as a bundled extension. (As it complicates things, e.g., the extension code not being able to link against non-URE code; trouble with first-start bundled extensions checks. The only benefit of bundled extensions is that users can override them with later versions without installing a complete new LO -- that was the original motivation to have dictionaries, with release schedules varying from OOo's release schdules, as bundled extensions.) I myself would prefer not to bundle LibreLogo, but instead improve our extension download / installation experience in general - like some 'featured selection' of extensions that we would be able to show in the Start Centre, or something. Of course, until it happens, why to block a nice feature :-) - but I don't think we should make its toolbar visible by default, which consequently means that very few people will know about that anyway; something that is more easily fixable (blogging, etc.) if it is an (unbundled) extension. My main concern is whether to include this in the LO repo at all. (That is, even if it is a non-bundled extension, I would prefer not to include it in the repo.) We generally suffer from too much code, not too little, so I'm skeptical about additions. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding the browser to Libreoffice
Hi there, On Thu, 2012-11-08 at 22:04 +0100, Randolph D. wrote: after some talks with some board members, the request rised to include more members and developers in the idea of adding a browser to Libreoffice. As one of the board members Randolph E-mailed since I responded to him; here are my thoughts. IMHO there could be benefits to bundling LibreOffice with other open-source products in one easy-to-get package (particularly for systems with weak package management). The nice Valo CD does this eg. Probably in future that advantage goes away in the future as app-stores become far more popular accessible. On the other hand, I don't imagine we as TDF would want to do that just now. Furthermore, if we had to bundle a browser why Dooble ? it looks like a simple wrapper around webkit. Why would we not want to bundle Chrome instead if WebKit is the answer ? or more likely Mozilla ? Of course - if the Dooble guys want to bundle LibreOffice they are more than welcome - the license allows that. Furthermore this discussion in no way belongs on the developer list, there is no code involved, please restrict replies to the discuss list. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: modules removal surprises
On Fri, 2012-11-09 at 10:01 +0100, Stephan Bergmann wrote: (It can already be considered deprecated for quite a while, so I would not mind removing it already in 4.0, either, if need be. Sounds reasonable to remove it now (to me) :-) having at least some sort of impedance mismatch for 4.0 is expected I think (?); that is unless we want to save some of that up for a 4.1 ;-) 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: minutes of ESC call ...
On 11/09/2012 09:29 AM, Alex Thurgood wrote: Le 08/11/2012 17:39, Michael Meeks a écrit : + should we drop Rhino, Beanshell javascript in 4.0 ? (Michael) + could be turned into an extension + was in the past was turned off (Stephan) AA: + disable Rhino / Beanshell unless in experimental mode (Michael) + for future deprecation / removal. Surely, shouldn't we be promoting access to UNO via a variety of scripting languages rather than removing the bits that others have managed to successfully integrate in the past ? Is there some issue with maintenance or known future compatibility headaches ? AFAIR some effort went into converting these from optional extensions into pre-compiled features, so why remove them (or make them hard to find) in 4.0 ? The change from bundled extensions to truly integrated parts of the code was for technical reasons (the extensions directly accessed non-URE functionality, which does not work). The idea to make them experimental-mode--only was to find out whether people actually use them (i.e., see whether there will be complaints that the functionality is gone, and then tell the complainers how to get the functionality after all). From a maintenance perspective, there /is/ occasional trouble with those scripting providers, and also their integration is somewhat second-class, cf. their editor windows with a distinct Java lf. So I personally wouldn't mind if we drop them, if their user base is vanishingly small enough (which is always hard to tell). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: libcdr/ExternalProject_libcdr.mk
libcdr/ExternalProject_libcdr.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 52a7a8e81a0cc3327de5ee27d02f9320c2cee3e4 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Nov 9 10:40:37 2012 +0100 fix libcdr with system lcms2 LCMS2_CFLAGS must be non-empty for it to override pkg-config. diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 01380d3..007f2e0 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -62,8 +62,8 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : WPG_CFLAGS= $(WPG_CFLAGS) \ WPG_LIBS= $(WPG_LIBS) \ $(if $(filter YES,$(SYSTEM_LCMS2)),\ - LCMS2_CFLAGS=$(LCMS2_CFLAGS) \ - LCMS2_LIBS=$(LCMS2_LIBS), \ + LCMS2_CFLAGS= $(LCMS2_CFLAGS) \ + LCMS2_LIBS= $(LCMS2_LIBS), \ LCMS2_CFLAGS=-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $(if $(filter MACOSX,$(OS)),-Wno-long-long) \ LCMS2_LIBS=-L$(OUTDIR)/lib -llcms2 ) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: modules removal surprises
On Thu, 2012-11-08 at 20:51 +0100, Andras Timar wrote: I used migrationanalysis (Professional Analysis Wizard) a few years ago. It created nice spreadsheets and charts about potential document migration problems: OpenOffice.org does not support this or that feature. The problem is that even some years ago, it looked outdated. Now it must be completely obsoleted. Document compatibility is getting better release by release. The unmaintaned Professional Analysis Wizard is useless and produces misleading reports. It is a good candidate for removal. Sounds good to me - added to the ESC list of things to discuss / do before 4.0 - I was always personally deeply skeptical of this migration analysis thing - but it dates from a bygone binary-file-format era now I suspect. I didn't realise we were building or shipping it either ;-) Thanks Matus ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: fdo#51004: some progress and 10 years old bug pending
On 11/09/2012 08:48 AM, David Ostrovsky wrote: * deprecate moz shipping as it may be needed for some extensions. That why Stephan reverted my patch: don't compile moz module on all non windows platforms Which commit are you talking about here? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo51550.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 45 +++
sw/source/filter/ww8/docxattributeoutput.hxx | 11 --
4 files changed, 44 insertions(+), 22 deletions(-)
New commits:
commit bd6ae389008e110be62a335dfcd82c655d512e63
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Nov 9 10:42:47 2012 +0100
fdo#51550 fix DOCX export dataloss on non-math/chart OLE export
This is still not complete, but having the replacement graphic only is
far better than having nothing.
Change-Id: I141a3de1a449f4261c7086e10f2c141b3f6cdb10
diff --git a/sw/qa/extras/ooxmlexport/data/fdo51550.odt
b/sw/qa/extras/ooxmlexport/data/fdo51550.odt
new file mode 100644
index 000..4cade5b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo51550.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 24618ff..1a1c157 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -65,6 +65,7 @@ public:
void testTablePosition();
void testFdo47669();
void testTableBorders();
+void testFdo51550();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -101,6 +102,7 @@ void Test::run()
{table-position.docx, Test::testTablePosition},
{fdo47669.docx, Test::testFdo47669},
{table-borders.docx, Test::testTableBorders},
+{fdo51550.odt, Test::testFdo51550},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -472,6 +474,14 @@ void Test::testTableBorders() {
}
}
+void Test::testFdo51550()
+{
+// The problem was that we lacked the fallback to export the replacement
graphic for OLE objects.
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws-getCount());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5a91c43..9a9b30f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -984,7 +984,7 @@ void DocxAttributeOutput::WritePostponedGraphic()
for( std::list PostponedGraphic ::const_iterator it =
m_postponedGraphic-begin();
it != m_postponedGraphic-end();
++it )
-FlyFrameGraphic( *( it-grfNode ), it-size );
+FlyFrameGraphic( it-grfNode, it-size );
delete m_postponedGraphic;
m_postponedGraphic = NULL;
}
@@ -1988,17 +1988,18 @@ void DocxAttributeOutput::DefaultStyle( sal_uInt16
nStyle )
#endif
}
-void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode rGrfNode, const
Size rSize )
+void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const
Size rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode )
{
-OSL_TRACE( TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode
rGrfNode, const Size rSize ) - some stuff still missing );
+OSL_TRACE( TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode*
pGrfNode, const Size rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode
) - some stuff still missing );
+const SwFrmFmt* pFrmFmt = pGrfNode ? pGrfNode-GetFlyFmt() : pOLEFrmFmt;
// create the relation ID
OString aRelId;
sal_Int32 nImageType;
-if ( rGrfNode.IsLinkedFile() )
+if ( pGrfNode pGrfNode-IsLinkedFile() )
{
// linked image, just create the relation
String aFileName;
-rGrfNode.GetFileFilterNms( aFileName, 0 );
+pGrfNode-GetFileFilterNms( aFileName, 0 );
// TODO Convert the file name to relative for better interoperability
@@ -2011,10 +2012,14 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode rGrfNode, const Size
else
{
// inline, we also have to write the image itself
-Graphic rGraphic = const_cast Graphic ( rGrfNode.GetGrf() );
+Graphic* pGraphic = 0;
+if (pGrfNode)
+pGraphic = const_cast Graphic ( pGrfNode-GetGrf() );
+else
+pGraphic = pOLENode-GetGraphic();
m_rDrawingML.SetFS( m_pSerializer ); // to be sure that we write to
the right stream
-OUString aImageId = m_rDrawingML.WriteImage( rGraphic );
+OUString aImageId = m_rDrawingML.WriteImage( *pGraphic );
aRelId = OUStringToOString( aImageId, RTL_TEXTENCODING_UTF8 );
@@ -2026,11 +2031,11 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode rGrfNode, const Size
m_pSerializer-startElementNS( XML_w, XML_drawing,
FSEND );
-bool isAnchor =
Re: fdo#51004: some progress and 10 years old bug pending
Hi David, On Fri, 2012-11-09 at 08:48 +0100, David Ostrovsky wrote: As discussed with Fridrich on LO Congress, i took a look at seamonkey way to handle it. They simple open MAPI.DLL and use WAB restriction API to access it. Moreover the algorithms and the data strucures in mozab (and therefore in mork driver) seems to match 1 to 1 to these api. Sounds very promising. So one straightforward way to integrate both O and OE would be to borrow these 5 files from seamonkey tree and adapt it for our need. That would be great; of course licensing-wise there is no issue re-using and re-targetting that code. It'd be nice (if there is a new / updated version of that code) to use a modern / MPLv2 version of it rather than whatever old stuff we happen to have in the tree. Another promissing option would be to pick up this wrapper library: http://svn.jetbrains.org/omeaopen/trunk/Omea/Src/Plugin/Primary/EmapiLib/ not sure about License: It is GPL. That'd be much less promising IMHO :-) * mork driver ist still not activated on windows: to access Thunderbird/Icedove AB mozab driver is still in use Oh ? there was a great-white-hope to drop the mozilla madness entirely for 4.0 - but of course, three weeks before the feature-freeze that's perhaps a 4.1 issue :-) Did we get the cert. management pieces we need out of Mozilla too ? Great work there though ! 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] .: sal/inc
sal/inc/rtl/ustrbuf.hxx | 156
1 file changed, 156 insertions(+)
New commits:
commit c61a3ff06e57c7c324e69419aaed0f92b37befd0
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Nov 8 11:01:33 2012 -0600
add indexOf family of function to OUStringBuffer
it is fairly common when converting String to OUString
to find code that search for thing and replace/delete
these things... the later need OUStringBuffer, the former
OUString.
This add the search feature provided by the indexOf family
of function found in OUString, into OUStringBuffer
Change-Id: I2de818e6317a94ed520f338ebc9ed08d5f17765c
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 426d129..8400ac9 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -941,6 +941,162 @@ public:
*pInternalCapacity = nCapacity;
}
+
+/**
+ Returns the index within this string of the first occurrence of the
+ specified character, starting the search at the specified index.
+
+ @since LibreOffice 4.0
+
+ @paramch character to be located.
+ @paramfromIndex the index to start the search from.
+ The index must be greater or equal than 0
+ and less or equal as the string length.
+ @return the index of the first occurrence of the character in the
+ character sequence represented by this string that is
+ greater than or equal to fromIndex, or
+ -1 if the character does not occur.
+*/
+sal_Int32 indexOf( sal_Unicode ch, sal_Int32 fromIndex = 0 ) const
SAL_THROW(())
+{
+sal_Int32 ret = rtl_ustr_indexOfChar_WithLength(
pData-buffer+fromIndex, pData-length-fromIndex, ch );
+return (ret 0 ? ret : ret+fromIndex);
+}
+
+/**
+ Returns the index within this string of the last occurrence of the
+ specified character, searching backward starting at the end.
+
+ @since LibreOffice 4.0
+
+ @paramch character to be located.
+ @return the index of the last occurrence of the character in the
+ character sequence represented by this string, or
+ -1 if the character does not occur.
+*/
+sal_Int32 lastIndexOf( sal_Unicode ch ) const SAL_THROW(())
+{
+return rtl_ustr_lastIndexOfChar_WithLength( pData-buffer,
pData-length, ch );
+}
+
+/**
+ Returns the index within this string of the last occurrence of the
+ specified character, searching backward starting before the specified
+ index.
+
+ @since LibreOffice 4.0
+
+ @paramch character to be located.
+ @paramfromIndex the index before which to start the search.
+ @return the index of the last occurrence of the character in the
+ character sequence represented by this string that
+ is less than fromIndex, or -1
+ if the character does not occur before that point.
+*/
+sal_Int32 lastIndexOf( sal_Unicode ch, sal_Int32 fromIndex ) const
SAL_THROW(())
+{
+return rtl_ustr_lastIndexOfChar_WithLength( pData-buffer, fromIndex,
ch );
+}
+
+/**
+ Returns the index within this string of the first occurrence of the
+ specified substring, starting at the specified index.
+
+ If str doesn't include any character, always -1 is
+ returned. This is also the case, if both strings are empty.
+
+ @since LibreOffice 4.0
+
+ @paramstr the substring to search for.
+ @paramfromIndex the index to start the search from.
+ @return If the string argument occurs one or more times as a substring
+ within this string at the starting index, then the index
+ of the first character of the first such substring is
+ returned. If it does not occur as a substring starting
+ at fromIndex or beyond, -1 is returned.
+*/
+sal_Int32 indexOf( const OUString str, sal_Int32 fromIndex = 0 ) const
SAL_THROW(())
+{
+sal_Int32 ret = rtl_ustr_indexOfStr_WithLength(
pData-buffer+fromIndex, pData-length-fromIndex,
+str.pData-buffer,
str.pData-length );
+return (ret 0 ? ret : ret+fromIndex);
+}
+
+/**
+ @overload
+ This function accepts an ASCII string literal as its argument.
+
+ @since LibreOffice 4.0
+*/
+template typename T
+typename internal::ConstCharArrayDetector T, sal_Int32 ::Type indexOf(
T literal, sal_Int32 fromIndex = 0 ) const SAL_THROW(())
+{
+sal_Int32 ret = rtl_ustr_indexOfAscii_WithLength(
+pData-buffer + fromIndex, pData-length - fromIndex, literal,
+internal::ConstCharArrayDetector T, void ::size - 1);
[PUSHED] add indexOf family of function to OUStringBuffer
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1006 -- To view, visit https://gerrit.libreoffice.org/1006 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2de818e6317a94ed520f338ebc9ed08d5f17765c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: fdo#51004: some progress and 10 years old bug pending
On 11/09/2012 10:58 AM, Michael Meeks wrote: Did we get the cert. management pieces we need out of Mozilla too ? My understanding is that this is covered by linking against module nss rather than module moz, and by connectivity/Library_mozbootstrap.mk accessing Mozilla certificate data via a plain file-based interface. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: fdo#51004: some progress and 10 years old bug pending
On 11/09/2012 11:19 AM, Stephan Bergmann wrote: On 11/09/2012 10:58 AM, Michael Meeks wrote: Did we get the cert. management pieces we need out of Mozilla too ? My understanding is that this is covered by linking against module nss rather than module moz, and by connectivity/Library_mozbootstrap.mk accessing Mozilla certificate data via a plain file-based interface. (One potential gotcha is that Windows uses connectivity/Library_mozabdrv.mk instead of connectivity/Library_mozbootstrap.mk for the latter, which share code but use different #ifdef branches in the code, and mozabdr /is/ linked against moz. So what would need verification is whether mozbootstrap works as a replacement for mozabdr for accessing Mozilla certificate data on Windows, in case we want to access any Mozilla certificate data at all on Windows -- but I assume we instead use some Windows API for certificate management there, anyway?) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Fri, 2012-11-09 at 06:19 +0100, Lionel Elie Mamane wrote: On Thu, Nov 08, 2012 at 04:39:22PM +, Michael Meeks wrote: * 4.0 pending tasks + should we drop Rhino, Beanshell javascript in 4.0 ? (Michael) + could be turned into an extension + was in the past was turned off (Stephan) AA: + disable Rhino / Beanshell unless in experimental mode (Michael) + for future deprecation / removal. *Why*? Is there some problem with these scripting languages, are they hard to maintain, ...? When I last looked at Rhino (an impl. of Javascript in Java) it was rather under-maintained itself, and as one of those big-lumps-of-java not the loveliest thing to build, maintain use etc. IMHO gathering stats on whether anyone uses it is a sensible thing to do with a view to deprecation; clearly we don't want to pile up relatively pointless features, and encourage millions of people to download, install and not-use them for no good reason :-) At least, this was the thinking around not shipping the Logo stuff built-in IIRC - good to be consistent. Sorry the minutes were not terribly clear, nor (IMHO) did we reach a terribly clear conclusion on the logo topic - which is perhaps all to the best; it hadn't appeared on the list yet. 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: fdo#51004: some progress and 10 years old bug pending
Quoting Stephan Bergmann sberg...@redhat.com: On 11/09/2012 08:48 AM, David Ostrovsky wrote: * deprecate moz shipping as it may be needed for some extensions. That why Stephan reverted my patch: don't compile moz module on all non windows platforms Which commit are you talking about here? this one: 903065dda1e574f4791ff40c31e39f14ba710424 which you have partially reverted (removing that section): +dnl --enable-mozilla is supported only on Windows +dnl === + +if test $_os != WINNT ; then + if test $enable_mozilla = yes; then + AC_MSG_ERROR([--enable-mozilla is only available on Windows]) + fi + +fi My concern about it was (and still is), that someone in the wild still compiles moz on non windows platform without actually using it in any way. Regards David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: default CUPS printing format Re: [PATCH] fdo#44664: printer truncates Landscape orientation pages to ...
Hi Michael, On Thu, 2012-11-08 at 12:23 +0100, Michael Stahl wrote: this patch appears to change the default format for printing via CUPS from PDF to PostScript. this was changed from PostScript to PDF in OOo 3.3. Urk ! - right, reverting that is not a good fix. apparently there are some printers or CUPS setups that don't work well with PDF as a default, the bug appears to have a long CC: list: Right - particularly transparency support and other long lists of horrors with the (by now really obsolete) PostScript. but i don't think that changing the default format back to PS is the solution here, because PDF is the designated default print format for Linux systems: Agreed. the real fix for this is most likely to file bugs against CUPS and/or specific printer drivers that exhibit these problems, so that we can get to reliably working PDF printing on Linux systems in time. No shortage of horrendous bugs (and code) in CUPS :-) I'll poke our CUPS guys to ask what's up. Thanks for the nice write-up, 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] .: canvas/source
canvas/source/cairo/cairo_textlayout.cxx | 25 ++---
1 file changed, 2 insertions(+), 23 deletions(-)
New commits:
commit 638f6cb6a666aa611d3e0bef5a29e5824b0574ee
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Nov 9 11:38:11 2012 +0100
bnc#681110: Fix squashed glyphs with Cairo canvas.
I suppose it is the same misconception as in fdo#55931 - I am convinced that
the font metrics should not be used here.
Looks to me as if in the past, the font width computation was broken
somewhere
deep inside OOo, and everyone instead of fixing the root cause was just
working that around by using the FontMetric; and then one day the root cause
was fixed, and all the workarounds broke ;-) - but that is just a theory.
Change-Id: I741bf8f4eaea4f7d8bc698dc9a8124109dfb8c20
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 6fa5562..317ea26 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -545,32 +545,13 @@ namespace cairocanvas
// Font rotation and scaling
cairo_matrix_t m;
Font aFont = rOutDev.GetFont();
-FontMetric aMetric( rOutDev.GetFontMetric(aFont) );
-long nWidth = 0;
-
-// width calculation is deep magic and platform/font dependant.
-// width == 0 means no scaling, and usually width == height means
the same.
-// Other values mean horizontal scaling (narrow or stretching)
-// see issue #101566
-
-//proper scale calculation across platforms
-if (aFont.GetWidth() == 0)
-{
-nWidth = aFont.GetHeight();
-}
-else
-{
-// any scaling needs to be relative to the platform-dependent
definition
-// of height of the font
-nWidth = aFont.GetWidth() * aFont.GetHeight() /
aMetric.GetHeight();
-}
cairo_matrix_init_identity(m);
if (aSysLayoutData.orientation)
cairo_matrix_rotate(m, (3600 - aSysLayoutData.orientation) *
M_PI / 1800.0);
-cairo_matrix_scale(m, nWidth, aFont.GetHeight());
+cairo_matrix_scale(m, aFont.GetWidth(), aFont.GetHeight());
//faux italics
if (rSysFontData.bFakeItalic)
@@ -583,11 +564,9 @@ namespace cairocanvas
#else
# define TEMP_TRACE_FONT ::rtl::OUStringToOString( aFont.GetName(),
RTL_TEXTENCODING_UTF8 ).getStr()
#endif
-OSL_TRACE(\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), W:%d-%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s,
+OSL_TRACE(\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s,
aFont.GetWidth(),
aFont.GetHeight(),
- aMetric.GetWidth(),
- nWidth,
(int) rOutpos.X(),
(int) rOutpos.Y(),
cairo_glyphs.size() 0 ? cairo_glyphs[0].index : -1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 35427, which changed state. Bug 35427 Summary: UI: 'Tools Options Writer View - Show Scroll Slider' checkboxes without enduring effect https://bugs.freedesktop.org/show_bug.cgi?id=35427 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: icu/makefile.mk
icu/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5a32d167da40d9f95a1dd86873e4b569986f8b12 Author: Tor Lillqvist tlillqv...@suse.com Date: Fri Nov 9 14:37:04 2012 +0200 Fix comment Change-Id: Ie648ce55fdc11f907f5f5b3b958c13c695f392c5 diff --git a/icu/makefile.mk b/icu/makefile.mk index 95a91a0..e5f8f57 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -190,7 +190,7 @@ OUT2LIB= \ $(BUILD_DIR)$/lib$/libicui18n.a \ $(BUILD_DIR)$/lib$/libicule.a \ $(BUILD_DIR)$/lib$/libicutu.a -.ELIF $(OS)==ANDROID # The so far normal, non-DISABLE_DYNLOADING case for Android +.ELIF $(OS)==ANDROID # The no longer normal, non-DISABLE_DYNLOADING case for Android BUILD_ACTION+= cat uconfig.h.prepend common/unicode/uconfig.h common/unicode/uconfig.h.new mv common/unicode/uconfig.h.new common/unicode/uconfig.h OUT2LIB= \ $(BUILD_DIR)$/lib$/libicudatalo.so \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Results of yesterday's admin meeting
Hello, I was asked to spread the information about the infra work broadly to the project, so I'm forwarding you this (and probably subsequent) message. If you think it's offtopic, please let me know. For discussions on infra topics, we should use the webs...@global.libreoffice.org mailing list. Florian Original Message Subject: Results of yesterday's admin meeting Date: Fri, 09 Nov 2012 12:38:51 +0100 From: Florian Effenberger flo...@documentfoundation.org Organization: The Document Foundation To: webs...@global.libreoffice.org, hostmas...@documentfoundation.org Hello, yesterday, November 8th, we had an informal admin meeting in Pfronten, Germany. Participants were Alin Creţu, Chistian Lohmaier, Robert Einsle, Alexander Werner and myself. We have all unanimously agreed to the following proposal, which I would like to share with you. The basic problem is that our infrastructure needs to keep pace with the community growth, so it needs to grow rapidly. For that to happen, we need to establish better structures than now, and a better internal communication. To solve that issue, we propose the following: 1. categorizing and prioritizing of services We run various services. Some of them are crucial (like gerrit, email and the download page), others are important, but not that crucial. We need to get an overview of all running services and attach a category/priority to them. For normal services, the four eyes principle should be enforced, i.e. at least two people are fully in the know. For crucial services, a six eyes principle should be enforced, i.e. at least three people are fully in the know. Exceptions can be granted when needed, but the above should be the general rule. 2. creation of a core team To reflect the actual working areas and bandwith of working, we propose the setup of a core team (the name is a working title), composed of those who are experienced and have been involved in many parts of the infrastructure, in other words, those who not only have a focus on one aspect, those who have the big picture. 3. policy for new software and services New software and services should only be installed after the majority of the core team approved them. 4. defining responsible parties For all servers, VMs and services, at least one responsible party needs to be defined. Responsible means that it's their responsibility of keeping the service running and ensure proper updating, especially in terms of security fixes. 5. advance update planning For updates to be applied, especially those involving a restart of services or the reboot of an entire machine, a proper update and reboot procedure should be set in place. This also includes a fixed update window for regular updates, when downtime of services can be expected. However, in case of security updates, there is one major rule: Safety and security first. In other words, as soon as a crucial update is available, it will be immediately installed without any further delay. 6. documentation New services will only be installed after they have been properly documented beforehand. Exceptions can be granted by the core team. General rule: No productive services without proper documentation. We will come up with a proposal on how to document. Wiki and ODT have not been working out, so we will evaluate other options. An idea was to use RST files (restructured text), using Sphinx. Those text files could be managed via a git repository. We will come up with a proper template, e.g. for layout, but also with some basic principles (paths, commands, scriptable configuration and the like) for documentation. In addition, etckeeper and git will be used for tracking changes and manage the configuration. Furthermore, certain policies on when to use either source packages, or distribution packages, or a self-hosted repository will be defined. 7. OTRS We will make more use of OTRS in the future, especially for change management. 8. regular meetings Since e-mail is basically filling everyone's inbox, it becomes incredibly hard to keep up with all important aspects. We therefore plan at least monthly admin phone conference meetings to keep up with recent developments. In addition, depending of time availability and budgets, we plan to have one real life meeting per quarter. 9. todo/task management Every admin currently has their very own todo list. We will try to make these lists public, using one common tool. 10. housekeeping We will check the current recipient list of the internal admin list, removing those not being active for months. 11. adding new team members In addition, as a general rule, we try to involve new participants even better. Due to a lack of time, structure and enough VMs we failed at that, but it's important for the future growth of the admin team. As a general rule, we will be very careful of granting root access to all machines. There is no need to grow that current list of account holders.
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - canvas/source
canvas/source/cairo/cairo_textlayout.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit cad7a5814775adf458f8a490700fa5ef6b8f8638
Author: Flex Liu wind...@gmail.com
Date: Fri Oct 26 15:18:35 2012 +0100
Resolves: fdo#47432 Improve the faux bold in cairo canvas
The faux bold make the bold font in Asian ugly unacceptable,
Adjust improve the faux bold to make the bold font better.
Change-Id: I2e02156ffc30629476b80134ffb0b50e793f7ead
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index adea863..d6de60a 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -618,14 +618,15 @@ namespace cairocanvas
if (rSysFontData.bFakeBold)
{
double bold_dx = 0.5 * sqrt( 0.7 * aFont.GetHeight() );
-int total_steps = 2 * ((int) (bold_dx + 0.5));
+int total_steps = 1 * ((int) (bold_dx + 0.5));
// loop to draw the text for every half pixel of displacement
for (int nSteps = 0; nSteps total_steps; nSteps++)
{
for(int nGlyphIdx = 0; nGlyphIdx (int)
cairo_glyphs.size(); nGlyphIdx++)
{
-cairo_glyphs[nGlyphIdx].x += bold_dx * nSteps /
total_steps;
+cairo_glyphs[nGlyphIdx].x += (bold_dx * nSteps /
total_steps) / 4;
+cairo_glyphs[nGlyphIdx].y -= (bold_dx * nSteps /
total_steps) / 4;
}
cairo_show_glyphs(pSCairo.get(), cairo_glyphs[0],
cairo_glyphs.size());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
On Fri, Nov 09, 2012 at 06:19:22AM +0100, Lionel Elie Mamane wrote: On Thu, Nov 08, 2012 at 04:39:22PM +, Michael Meeks wrote: * 4.0 pending tasks + should we drop Rhino, Beanshell javascript in 4.0 ? (Michael) + could be turned into an extension + was in the past was turned off (Stephan) AA: + disable Rhino / Beanshell unless in experimental mode (Michael) + for future deprecation / removal. *Why*? Is there some problem with these scripting languages, are they hard to maintain, ...? Well, if there are bugs there, we likely wont care about them, creating useless clutter on bugzilla f.e.. Also there is some packaging work for them (dep-wise) that is hardly justified by the benefit. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - canvas/source
canvas/source/cairo/cairo_textlayout.cxx | 30 +-
1 file changed, 5 insertions(+), 25 deletions(-)
New commits:
commit 827a7070d44524f805bad715b6bfbe0948bfbae5
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Nov 9 11:38:11 2012 +0100
bnc#681110: Fix squashed glyphs with Cairo canvas.
I suppose it is the same misconception as in fdo#55931 - I am convinced that
the font metrics should not be used here.
Looks to me as if in the past, the font width computation was broken
somewhere
deep inside OOo, and everyone instead of fixing the root cause was just
working that around by using the FontMetric; and then one day the root cause
was fixed, and all the workarounds broke ;-) - but that is just a theory.
Change-Id: I741bf8f4eaea4f7d8bc698dc9a8124109dfb8c20
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index d6de60a..f425436 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -554,32 +554,13 @@ namespace cairocanvas
// Font rotation and scaling
cairo_matrix_t m;
Font aFont = rOutDev.GetFont();
-FontMetric aMetric( rOutDev.GetFontMetric(aFont) );
-long nWidth = 0;
-
-// width calculation is deep magic and platform/font dependant.
-// width == 0 means no scaling, and usually width == height means
the same.
-// Other values mean horizontal scaling (narrow or stretching)
-// see issue #101566
-
-//proper scale calculation across platforms
-if (aFont.GetWidth() == 0)
-{
-nWidth = aFont.GetHeight();
-}
-else
-{
-// any scaling needs to be relative to the platform-dependent
definition
-// of height of the font
-nWidth = aFont.GetWidth() * aFont.GetHeight() /
aMetric.GetHeight();
-}
cairo_matrix_init_identity(m);
if (aSysLayoutData.orientation)
cairo_matrix_rotate(m, (3600 - aSysLayoutData.orientation) *
M_PI / 1800.0);
-cairo_matrix_scale(m, nWidth, aFont.GetHeight());
+cairo_matrix_scale(m, aFont.GetWidth(), aFont.GetHeight());
//faux italics
if (rSysFontData.bFakeItalic)
@@ -592,11 +573,9 @@ namespace cairocanvas
#else
# define TEMP_TRACE_FONT ::rtl::OUStringToOString( aFont.GetName(),
RTL_TEXTENCODING_UTF8 ).getStr()
#endif
-OSL_TRACE(\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), W:%d-%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s,
+OSL_TRACE(\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s,
aFont.GetWidth(),
aFont.GetHeight(),
- aMetric.GetWidth(),
- nWidth,
(int) rOutpos.X(),
(int) rOutpos.Y(),
cairo_glyphs.size() 0 ? cairo_glyphs[0].index : -1,
commit 0897c61304c582e611dd3ced09ce1a7dc0b7cfc3
Author: Flex Liu wind...@gmail.com
Date: Fri Oct 26 15:18:35 2012 +0100
Resolves: fdo#47432 Improve the faux bold in cairo canvas
The faux bold make the bold font in Asian ugly unacceptable,
Adjust improve the faux bold to make the bold font better.
Change-Id: I2e02156ffc30629476b80134ffb0b50e793f7ead
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index adea863..d6de60a 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -618,14 +618,15 @@ namespace cairocanvas
if (rSysFontData.bFakeBold)
{
double bold_dx = 0.5 * sqrt( 0.7 * aFont.GetHeight() );
-int total_steps = 2 * ((int) (bold_dx + 0.5));
+int total_steps = 1 * ((int) (bold_dx + 0.5));
// loop to draw the text for every half pixel of displacement
for (int nSteps = 0; nSteps total_steps; nSteps++)
{
for(int nGlyphIdx = 0; nGlyphIdx (int)
cairo_glyphs.size(); nGlyphIdx++)
{
-cairo_glyphs[nGlyphIdx].x += bold_dx * nSteps /
total_steps;
+cairo_glyphs[nGlyphIdx].x += (bold_dx * nSteps /
total_steps) / 4;
+cairo_glyphs[nGlyphIdx].y -= (bold_dx * nSteps /
total_steps) / 4;
}
cairo_show_glyphs(pSCairo.get(), cairo_glyphs[0],
cairo_glyphs.size());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[REVIEW 3-6] Fix squashed glyphs with Cairo canvas
Hi Thorsten, Can you please cherry-pick http://cgit.freedesktop.org/libreoffice/core/commit/?id=638f6cb6a666aa611d3e0bef5a29e5824b0574ee to libreoffice-3-6? It fixes https://bugzilla.novell.com/show_bug.cgi?id=681110 [public] It smells very similar to https://bugs.freedesktop.org/show_bug.cgi?id=55931 Again we are (mis?)using font metrics to behave differently in the x-axis, while doing the right thing with y :-) I believe we just shouldn't do such things. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
gbuild, deps and ccache
Hi, so the way gbuild generates dependencies prevents ccache to be confident about using its cache most of the time. To see this: do a/ build b/ make clean c/build from an empty ccache dir once with and without dep-tracking. The solution IMHO is to make gbuild run g++ twice, if building with deps and ccache: g++ -E $(DEP_GEN_OPTIONS) $(OTHER) foo.cxx ccache g++ $(OTHER) foo.cxx The first will then only generate the deps without compiling, while the second one will compile and not confuse ccache. So: Are there volunteers for this to make the build quite a bit faster for devs? If not I will have to EasyHackify this ... Comments welcome. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - i18npool/source
i18npool/source/languagetag/languagetag.cxx| 31 +
i18npool/source/languagetag/simple-langtag.cxx | 57 +++--
2 files changed, 39 insertions(+), 49 deletions(-)
New commits:
commit 1b28795d14d8fe4e326b545ecbd6bb0838dab303
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 9 14:08:08 2012 +0100
adapt to liblangtag 0.4.0 types
Change-Id: I0ab5a25cafdd246828ba09db8d01bb498e7012ab
diff --git a/i18npool/source/languagetag/simple-langtag.cxx
b/i18npool/source/languagetag/simple-langtag.cxx
index 849f37a..d96f721 100644
--- a/i18npool/source/languagetag/simple-langtag.cxx
+++ b/i18npool/source/languagetag/simple-langtag.cxx
@@ -22,34 +22,29 @@
namespace {
-typedef char gchar;
-typedef void* gpointer;
-typedef int gint;
-typedef gint gboolean;
+typedef int lt_bool_t;
-struct GError {
-char *message;
-GError() : message(NULL) {}
+struct lt_error_t {
+void *something;
+lt_error_t() : something(NULL) {}
};
-typedef struct GError lt_error_t;
-
-static gpointer g_malloc(size_t s)
+static void* g_malloc(size_t s)
{
return malloc(s);
}
-static void g_free(gpointer p)
+static void g_free(void* p)
{
if (p)
free(p);
}
-static void __attribute__((used)) g_error_free(GError *error)
+static void lt_error_unref(lt_error_t *error)
{
if (error)
{
-g_free( error-message);
+g_free( error-something);
g_free( error);
}
}
@@ -65,7 +60,7 @@ struct my_ref
struct my_t_impl : public my_ref
{
-gchar* mpStr;
+char* mpStr;
explicit my_t_impl() : my_ref(), mpStr(NULL) {}
virtual ~my_t_impl() { g_free( mpStr); }
explicit my_t_impl( const my_t_impl r )
@@ -82,30 +77,30 @@ struct my_t_impl : public my_ref
mpStr = (r.mpStr ? strdup( r.mpStr) : NULL);
return *this;
}
-void assign( const gchar* str )
+void assign( const char* str )
{
g_free( mpStr);
mpStr = (str ? strdup( str) : NULL);
}
-void assign( const gchar* str, const gchar* stop )
+void assign( const char* str, const char* stop )
{
g_free( mpStr);
if (str str stop)
{
-mpStr = static_castgchar*(g_malloc( stop - str + 1));
+mpStr = static_castchar*(g_malloc( stop - str + 1));
memcpy( mpStr, str, stop - str);
mpStr[stop - str] = 0;
}
else
mpStr = NULL;
}
-void append( const gchar* str, const gchar* stop )
+void append( const char* str, const char* stop )
{
if (str str stop)
{
size_t nOld = mpStr ? strlen( mpStr) : 0;
size_t nNew = nOld + (stop - str) + 1;
-char* p = static_castgchar*(g_malloc( nNew));
+char* p = static_castchar*(g_malloc( nNew));
if (nOld)
memcpy( p, mpStr, nOld);
memcpy( p + nOld, str, stop - str);
@@ -164,7 +159,7 @@ struct lt_tag_t : public my_t_impl
maRegion = r.maRegion;
return *this;
}
-void assign( const gchar* str )
+void assign( const char* str )
{
maLanguage.zero();
maScript.zero();
@@ -200,9 +195,9 @@ static void lt_tag_unref(lt_tag_t *tag)
any i-* irregular and x-* privateuse. Subtags are not checked for validity
(alpha, digit, registered, ...).
*/
-static gboolean lt_tag_parse(lt_tag_t *tag,
-const gchar *tag_string,
-GError **error)
+static lt_bool_t lt_tag_parse(lt_tag_t *tag,
+ const char *tag_string,
+ lt_error_t **error)
{
(void) error;
if (!tag)
@@ -213,9 +208,9 @@ static gboolean lt_tag_parse(lt_tag_t *tag,
// In case we supported other subtags this would get more complicated.
my_t_impl* aSubtags[] = { tag-maLanguage, tag-maScript,
tag-maRegion, NULL };
my_t_impl** ppSub = aSubtags[0];
-const gchar* pStart = tag_string;
-const gchar* p = pStart;
-const gchar* pEnd = pStart + strlen( pStart); // scanning includes \0
+const char* pStart = tag_string;
+const char* p = pStart;
+const char* pEnd = pStart + strlen( pStart); // scanning includes \0
bool bStartLang = true;
bool bPrivate = false;
for ( ; p = pEnd ppSub *ppSub; ++p)
@@ -352,8 +347,8 @@ static gboolean lt_tag_parse(lt_tag_t *tag,
return !0;
}
-static gchar* lt_tag_canonicalize(lt_tag_t *tag,
- GError **error)
+static char* lt_tag_canonicalize(lt_tag_t *tag,
+ lt_error_t **error)
{
(void) error;
return tag tag-mpStr ? strdup( tag-mpStr) : NULL;
@@ -374,17 +369,17 @@ static const lt_region_t *lt_tag_get_region(const
lt_tag_t *tag)
return tag tag-maRegion.mpStr ? tag-maRegion : NULL;
}
-static const gchar *lt_lang_get_tag(const lt_lang_t *lang)
+static const char
[Libreoffice-commits] .: lcms2/ExternalPackage_lcms2.mk
lcms2/ExternalPackage_lcms2.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 44b96a2fce52b6e3e683dc917fab219cf75001db Author: Peter Foley pefol...@verizon.net Date: Fri Nov 9 08:25:42 2012 -0500 fix lcms2 for mac Change-Id: If2477b9a391d75672a349ba240ceb61e0b06611a diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index 1500476..7c2a75a 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -11,7 +11,8 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2)) $(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2)) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.2.dylib)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.dylib)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib)) else ifeq ($(filter-out IOS ANDROID,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a)) else ifeq ($(OS),WNT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] cppCheck: redundant assignment and Possible null pointer der...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1015 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/1015/1 cppCheck: redundant assignment and Possible null pointer dereference. Test against pOldFormat is useless because it is already used above. Could it be NULL, then this part of the function should be written another way. I also turned a memmove into a memcpy. The 2 memory areas can not overlap. Change-Id: Id4f984f9eb5dea1ba59631281d6967d259948e5b --- M sc/source/ui/docshell/docfunc.cxx 1 file changed, 3 insertions(+), 6 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1015 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4f984f9eb5dea1ba59631281d6967d259948e5b 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
[PATCH] s/aIter++/++aIter/
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1016 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/1016/1 s/aIter++/++aIter/ Change-Id: Id80013cbab8f1633db59d2d4492c7363224871bd Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr --- M xmloff/source/text/XMLRedlineExport.cxx 1 file changed, 1 insertion(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1016 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id80013cbab8f1633db59d2d4492c7363224871bd 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: [tdf-discuss] Adding the browser to Libreoffice
I can see the point behind working with one or more of the open source browsers to better integrate libreoffice with the browser. I can even see the point of offering that browser as part of the download, but I am not convinced that writing yet another open source browser is a good idea. It seems a waste of developer resources and it would be unlikely that enough good developers could be attracted to do the work in order to compete with the established projects. I use coffee every day in the office but I don't expect libreoffice to supply me with it :-) Just my 2p for what its worth I am not a libreoffice developer. Thanks Tim On 8 November 2012 21:04, Randolph D. rdohm...@gmail.com wrote: Dear all, after some talks with some board members, the request rised to include more members and developers in the idea of adding a browser to Libreoffice. We know this needs time and work, but would not be impossible to add it to the installer and create a place to be for it, and see, how the community reacts to it and requests more interaction. This security orientated webkit browser would be a good codebasis for that: http://sourceforge.net/projects/dooble/ Any pro or cons from anyone? No person in the office works today without the internet, the consequence is, an office suite needs or could provide an open source browser. Anyone interested to test or join the idea or recommendations for the steps to plan? Regards Randolph -- Unsubscribe instructions: E-mail to discuss+h...@documentfoundation.org Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://listarchives.documentfoundation.org/www/discuss/ All messages sent to this list will be publicly archived and cannot be deleted -- Course View Towers, Plot 21 Yusuf Lule Road, Kampala T +256 (0) 312 314 418 M +256 (0) 752 963 325 www.weberpafrica.com @TimSchofield2 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding the browser to Libreoffice
-1 here too. I don't see it as a good idea, but then, unless I just didn't notice, there haven't been any reasons given, which might make a difference I suppose. I do think fixing existing functionality would be much better spent effort though. Mark Stanton One small step for mankind... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [tdf-discuss] Re: Adding the browser to Libreoffice
- Ursprüngliche Mail - Mmmh. What about extensions for existing browsers ? You talk about creating a browser without even a differenciation factor which makes the idea irrelevant. And I'm not even talking about the resources as some of you might have mentioned. But on the other side, browser extensions might actually be a good idea, especially for Firefox and Chrome. Opening an odt directly in you browser via a LibreOffice extension for example ? +1 !! ___ 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 51550, which changed state. Bug 51550 Summary: FILESAVE as .docx looses embedded OLE objects https://bugs.freedesktop.org/show_bug.cgi?id=51550 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#51550 fix DOCX export dataloss on non-math/chart OLE exp...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1017 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/1017/1 fdo#51550 fix DOCX export dataloss on non-math/chart OLE export This is still not complete, but having the replacement graphic only is far better than having nothing. (cherry picked from commit bd6ae389008e110be62a335dfcd82c655d512e63) Conflicts: sw/source/filter/ww8/docxattributeoutput.cxx Change-Id: I141a3de1a449f4261c7086e10f2c141b3f6cdb10 --- M sw/source/filter/ww8/docxattributeoutput.cxx M sw/source/filter/ww8/docxattributeoutput.hxx 2 files changed, 33 insertions(+), 21 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1017 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I141a3de1a449f4261c7086e10f2c141b3f6cdb10 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gbuild, deps and ccache
On 09/11/12 14:04, Bjoern Michaelsen wrote: Hi, so the way gbuild generates dependencies prevents ccache to be confident about using its cache most of the time. To see this: do a/ build b/ make clean c/build from an empty ccache dir once with and without dep-tracking. The solution IMHO is to make gbuild run g++ twice, if building with deps and ccache: g++ -E $(DEP_GEN_OPTIONS) $(OTHER) foo.cxx ccache g++ $(OTHER) foo.cxx The first will then only generate the deps without compiling, while the second one will compile and not confuse ccache. if invoking g++ twice in this silly fashion improves anything then that sounds like a bug in ccache to me. why don't you suggest fixing ccache then instead of complicating our build system? So: Are there volunteers for this to make the build quite a bit faster for devs? If not I will have to EasyHackify this ... please argue more convincingly why we need this. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: liblangtag/liblangtag-0.4.0-windows.patch
liblangtag/liblangtag-0.4.0-windows.patch |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8226caa2a5b8b8dd8e355a2abf84b5d84e899b3b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Nov 9 14:57:56 2012 +0100
This is a bit more elegant
Change-Id: I0f458caa1bda23882c76cbae414b738a5d04ab32
diff --git a/liblangtag/liblangtag-0.4.0-windows.patch
b/liblangtag/liblangtag-0.4.0-windows.patch
index 270f280..ca87c37 100644
--- a/liblangtag/liblangtag-0.4.0-windows.patch
+++ b/liblangtag/liblangtag-0.4.0-windows.patch
@@ -58,7 +58,7 @@
+{
+ lt_return_val_if_fail (v != NULL, 0);
+
-+ return (int)InterlockedExchangeAdd((LONG*)v, 0);
++ return (int)InterlockedExchange((LONG*)v, (LONG)*v);
+}
+
+LT_INLINE_FUNC int
@@ -66,7 +66,7 @@
+{
+ lt_return_val_if_fail (v != NULL, 0);
+
-+ return (int)InterlockedExchangeAdd((LONG*)v, 1) + 1;
++ return (int)InterlockedIncrement((LONG*)v);
+}
+
+lt_bool_t
@@ -74,7 +74,7 @@
+{
+ lt_return_val_if_fail (v != NULL, FALSE);
+
-+ return 0 == (InterlockedExchangeAdd((LONG*)v, -1) - 1);
++ return !InterlockedDecrement((LONG*)v);
+}
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] cppCheck: remove dead assignment
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1018 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/1018/1 cppCheck: remove dead assignment Change-Id: Iea8388c16de3399853dc384e7df6bfcc92170ea2 Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr --- M sw/source/core/layout/hffrm.cxx 1 file changed, 2 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1018 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea8388c16de3399853dc384e7df6bfcc92170ea2 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
[PATCH] cppCheck: remove dead assignment + a little formatting
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1019 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/1019/1 cppCheck: remove dead assignment + a little formatting Change-Id: I78f7f7ae7373e00e0750abc4566c71a8b9c1640a Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr --- M sc/source/ui/dbgui/tpsubt.cxx 1 file changed, 3 insertions(+), 4 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1019 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78f7f7ae7373e00e0750abc4566c71a8b9c1640a 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: gbuild, deps and ccache
On Fri, Nov 9, 2012 at 7:04 AM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: Hi, so the way gbuild generates dependencies prevents ccache to be confident about using its cache most of the time. To see this: do a/ build b/ make clean c/build from an empty ccache dir once with and without dep-tracking. 1/ presumably, now-a-day with everything under gbuild, the dep tracking should be fairly reliable, hence rending ccache less relevant. It might be that we should not auto-enable ccache when dep-tracking is enabled. 2/ that problem seems to me related to switching dep-tracink between build... that is a very limited corner case that is not worth optimizing, especially not at the expense of complexity and overhead to the common cases. iow: if it hurt when you do it... stop doing it :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: README.Android README.cross
README.Android |6 +- README.cross |4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 09189c3facdc87c16bff5fdd2b03c27981891229 Author: Miklos Vajna vmik...@suse.cz Date: Fri Nov 9 15:12:47 2012 +0100 README.cross: yes, that list was almost enough Change-Id: I581fb38e3f3d24987dcf92e73caf736203fa9385 diff --git a/README.Android b/README.Android index 04d1684..f86c872 100644 --- a/README.Android +++ b/README.Android @@ -9,7 +9,11 @@ reality... the data partition size right in the GUI, that is doomed to producing and AVD that doesn't work. Instead start it from the console: - emulator-arm -avd Name -partition-size 500 + LD_LIBRARY_PATH=$(pwd)/lib emulator-arm -avd Name -partition-size 500 + +In order to have proper acceleration, you need the 32-bit libGL.so: + +sudo zypper in Mesa-libGL-devel-32bit Where Name is the literal name of the AVD that you entered. diff --git a/README.cross b/README.cross index c57b14c..833e177 100644 --- a/README.cross +++ b/README.cross @@ -334,8 +334,8 @@ will probably drive you insane. You will also need the SDK as full make also builds a couple of Android apps (written in Java). Use the android tool from the SDK to -install the SDK Tools, SDK Platform Tools, the API 14 SDK Platform, -and the Android Support Library. (Hopefully that list is enough.) +install the SDK Tools, SDK Platform Tools, the API 14 SDK Platform + ARM EABI +v7a System Image, and the Android Support Library. Here is an autogen.lastrun for Android, when cross-compiling from Mac OS X 10.8 with Xcode 4.4.1: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: gbuild, deps and ccache
Hi, On Fri, Nov 09, 2012 at 02:45:45PM +0100, Michael Stahl wrote: please argue more convincingly why we need this. I just tried to get convincing numbers with a reproducable scenario, but cant. :/ But I an certain to have seen cache misses going up during a build when they shouldnt, as since Rene saw that too, I dont think I am seeing phantoms. Another sideeffect of the measurement is that we know that dep-checking costs ~30 seconds for a dev-install. Anyway, I will try to hunt down that ghost next time I see it. Best, Bjoern These are my results (make clean dev-install, measuring the second run): with deps: cache hit (direct) 8663 cache hit (preprocessed) 41 cache miss 8672 called for link 880 called for preprocessing 164 compile failed30 preprocessor error20 bad compiler arguments18 unsupported source language2 autoconf compile/link206 unsupported compiler option 1292 no input file148 files in cache 25955 cache size 1.2 Gbytes max cache size 6.0 Gbytes 3 min 51 sec without deps: cache directory /home/bjoern/.ccache_upstream-master/ cache hit (direct) 8692 cache hit (preprocessed) 12 cache miss 8672 called for link 880 called for preprocessing 164 compile failed30 preprocessor error20 bad compiler arguments18 unsupported source language2 autoconf compile/link206 unsupported compiler option 1292 no input file140 files in cache 17472 cache size 916.8 Mbytes max cache size 6.0 Gbytes cache directory /home/bjoern/.ccache_upstream-master/ cache hit (direct) 8692 cache hit (preprocessed) 12 cache miss 8672 called for link 880 called for preprocessing 164 compile failed30 preprocessor error20 bad compiler arguments18 unsupported source language2 autoconf compile/link206 unsupported compiler option 1292 no input file140 files in cache 17472 cache size 916.8 Mbytes max cache size 6.0 Gbytes 3 min 20 sec build with empty ccache: 18 min ./autogen.sh --disable-mozilla --disable-binfilter --disable-odk --disable-postgresql-sdbc --disable-gnome-vfs --without-help --without-myspell-dicts --with-external-tar=/home/bjoern/.jenkins/jobs/upstreamtarballs/workspace --disable-zenity --with-system-libs --without-doxygen --without-system-vigra --without-system-sane --without-system-orcus --disable-extensions --disable-ext-report-builder --disable-scripting-beanshell --with-junit=/usr/share/junit-4/lib/junit.jar ___ 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 54898, which changed state. Bug 54898 Summary: Sum error with hours in PIVOTTABLE https://bugs.freedesktop.org/show_bug.cgi?id=54898 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gbuild, deps and ccache
On Fri, Nov 09, 2012 at 08:07:42AM -0600, Norbert Thiebaud nthieb...@gmail.com wrote: 1/ presumably, now-a-day with everything under gbuild, the dep tracking should be fairly reliable, hence rending ccache less relevant. It might be that we should not auto-enable ccache when dep-tracking is enabled. I agree that the situation is improved, but given that most tinderboxes only check from scratch building, for example I still do a from scratch build after almost every pull (with dep tracking enabled of course), and ccache does help a lot. Let's not turn it off again, I'm happy we don't have to pullute autogen.lastrun with ccache tweaks today. :-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/XMLRedlineExport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d34e2f8bf150210355d6717be7b2ad95c869af25
Author: jailletc36 christophe.jail...@wanadoo.fr
Date: Fri Nov 9 14:28:58 2012 +0100
s/aIter++/++aIter/
Change-Id: Id80013cbab8f1633db59d2d4492c7363224871bd
Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr
Reviewed-on: https://gerrit.libreoffice.org/1016
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/xmloff/source/text/XMLRedlineExport.cxx
b/xmloff/source/text/XMLRedlineExport.cxx
index 917fb95..11d6e2e 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -107,7 +107,7 @@ XMLRedlineExport::~XMLRedlineExport()
// delete changes lists
for( ChangesMapType::iterator aIter = aChangeMap.begin();
aIter != aChangeMap.end();
- aIter++ )
+ ++aIter )
{
delete aIter-second;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/uiconfig
sw/uiconfig/swriter/ui/charurlpage.ui |2 ++ 1 file changed, 2 insertions(+) New commits: commit 812052063db50b8fb432bde85fab017f5a7e8d6e Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 8 20:57:16 2012 + center these buttons vertically, rather than fill the row Change-Id: I9acf8198ac19c3e448bb7d65116e408ac179993e diff --git a/sw/uiconfig/swriter/ui/charurlpage.ui b/sw/uiconfig/swriter/ui/charurlpage.ui index a39e0e2..bdd9742 100644 --- a/sw/uiconfig/swriter/ui/charurlpage.ui +++ b/sw/uiconfig/swriter/ui/charurlpage.ui @@ -86,6 +86,7 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property +property name=valigncenter/property property name=use_action_appearanceFalse/property /object packing @@ -148,6 +149,7 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property +property name=valigncenter/property property name=use_action_appearanceFalse/property /object packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] s/aIter++/++aIter/
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1016 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1016 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id80013cbab8f1633db59d2d4492c7363224871bd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'libo-3-6'
New branch 'libo-3-6' available with the following commits: commit 78cb2c6368d0fdcdbcd1b2f3e4d033774e1b4b60 Author: Jan Holesovsky ke...@suse.cz Date: Fri Nov 9 11:38:11 2012 +0100 bnc#681110: Fix squashed glyphs with Cairo canvas. I suppose it is the same misconception as in fdo#55931 - I am convinced that the font metrics should not be used here. Looks to me as if in the past, the font width computation was broken somewhere deep inside OOo, and everyone instead of fixing the root cause was just working that around by using the FontMetric; and then one day the root cause was fixed, and all the workarounds broke ;-) - but that is just a theory. Change-Id: I741bf8f4eaea4f7d8bc698dc9a8124109dfb8c20 Signed-off-by: Thorsten Behrens tbehr...@suse.com ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - canvas/source
canvas/source/cairo/cairo_textlayout.cxx | 25 ++---
1 file changed, 2 insertions(+), 23 deletions(-)
New commits:
commit 78cb2c6368d0fdcdbcd1b2f3e4d033774e1b4b60
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Nov 9 11:38:11 2012 +0100
bnc#681110: Fix squashed glyphs with Cairo canvas.
I suppose it is the same misconception as in fdo#55931 - I am convinced that
the font metrics should not be used here.
Looks to me as if in the past, the font width computation was broken
somewhere
deep inside OOo, and everyone instead of fixing the root cause was just
working that around by using the FontMetric; and then one day the root cause
was fixed, and all the workarounds broke ;-) - but that is just a theory.
Change-Id: I741bf8f4eaea4f7d8bc698dc9a8124109dfb8c20
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index d6de60a..f425436 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -554,32 +554,13 @@ namespace cairocanvas
// Font rotation and scaling
cairo_matrix_t m;
Font aFont = rOutDev.GetFont();
-FontMetric aMetric( rOutDev.GetFontMetric(aFont) );
-long nWidth = 0;
-
-// width calculation is deep magic and platform/font dependant.
-// width == 0 means no scaling, and usually width == height means
the same.
-// Other values mean horizontal scaling (narrow or stretching)
-// see issue #101566
-
-//proper scale calculation across platforms
-if (aFont.GetWidth() == 0)
-{
-nWidth = aFont.GetHeight();
-}
-else
-{
-// any scaling needs to be relative to the platform-dependent
definition
-// of height of the font
-nWidth = aFont.GetWidth() * aFont.GetHeight() /
aMetric.GetHeight();
-}
cairo_matrix_init_identity(m);
if (aSysLayoutData.orientation)
cairo_matrix_rotate(m, (3600 - aSysLayoutData.orientation) *
M_PI / 1800.0);
-cairo_matrix_scale(m, nWidth, aFont.GetHeight());
+cairo_matrix_scale(m, aFont.GetWidth(), aFont.GetHeight());
//faux italics
if (rSysFontData.bFakeItalic)
@@ -592,11 +573,9 @@ namespace cairocanvas
#else
# define TEMP_TRACE_FONT ::rtl::OUStringToOString( aFont.GetName(),
RTL_TEXTENCODING_UTF8 ).getStr()
#endif
-OSL_TRACE(\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), W:%d-%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s,
+OSL_TRACE(\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s,
aFont.GetWidth(),
aFont.GetHeight(),
- aMetric.GetWidth(),
- nWidth,
(int) rOutpos.X(),
(int) rOutpos.Y(),
cairo_glyphs.size() 0 ? cairo_glyphs[0].index : -1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [tdf-discuss] Adding the browser to Libreoffice
+1 to Tim below. IMHO if we're on the topic of adding another program to LibreOffice - Project Management (PM) should be considered over adding yet another open source Browser. I'm reasonably certain there are not enough resources at the moment to do this - at least not without partnering/forking one of the existing open source PM projects. ... I can see the point behind working with one or more of the open source browsers to better integrate libreoffice with the browser. I can even see the point of offering that browser as part of the download, but I am not convinced that writing yet another open source browser is a good idea. It seems a waste of developer resources and it would be unlikely that enough good developers could be attracted to do the work in order to compete with the established projects. ... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docrecord.py src/docsprm.py
src/docrecord.py |7 ++-
src/docsprm.py | 98 +++
2 files changed, 102 insertions(+), 3 deletions(-)
New commits:
commit f6e54cf23853aa2096f90d204749c36dcf1c4cd0
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Nov 9 16:38:04 2012 +0100
add names for sprm opcodes
diff --git a/src/docrecord.py b/src/docrecord.py
index 44552bb..bc83750 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1,8 +1,9 @@
#!/usr/bin/env python
import struct
-from docdirstream import DOCDirStream
import globals
+from docdirstream import DOCDirStream
+import docsprm
class FcCompressed(DOCDirStream):
The FcCompressed structure specifies the location of text in the
WordDocument Stream.
@@ -130,8 +131,8 @@ class Sprm(DOCDirStream):
4: 'section',
5: 'table'
}
-print 'sprm value=%s ispmd=%s fSpec=%s sgc=%s spra=%s
operandSize=%s operand=%s/' % (
-hex(self.sprm), hex(self.ispmd), hex(self.fSpec),
sgcmap[self.sgc], hex(self.spra), self.getOperandSize(), hex(self.operand)
+print 'sprm value=%s name=%s ispmd=%s fSpec=%s sgc=%s
spra=%s operandSize=%s operand=%s/' % (
+hex(self.sprm), docsprm.parMap[self.sprm], hex(self.ispmd),
hex(self.fSpec), sgcmap[self.sgc], hex(self.spra), self.getOperandSize(),
hex(self.operand)
)
def getOperandSize(self):
diff --git a/src/docsprm.py b/src/docsprm.py
new file mode 100755
index 000..b60d782
--- /dev/null
+++ b/src/docsprm.py
@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+
+# see 2.6.2 of the spec
+parMap = {
+0x4600: sprmPIstd,
+0xC601: sprmPIstdPermute,
+0x2602: sprmPIncLvl,
+0x2403: sprmPJc80,
+0x2405: sprmPFKeep,
+0x2406: sprmPFKeepFollow,
+0x2407: sprmPFPageBreakBefore,
+0x260A: sprmPIlvl,
+0x460B: sprmPIlfo,
+0x240C: sprmPFNoLineNumb,
+0xC60D: sprmPChgTabsPapx,
+0x840E: sprmPDxaRight80,
+0x840F: sprmPDxaLeft80,
+0x4610: sprmPNest80,
+0x8411: sprmPDxaLeft180,
+0x6412: sprmPDyaLine,
+0xA413: sprmPDyaBefore,
+0xA414: sprmPDyaAfter,
+0xC615: sprmPChgTabs,
+0x2416: sprmPFInTable,
+0x2417: sprmPFTtp,
+0x8418: sprmPDxaAbs,
+0x8419: sprmPDyaAbs,
+0x841A: sprmPDxaWidth,
+0x261B: sprmPPc,
+0x2423: sprmPWr,
+0x6424: sprmPBrcTop80,
+0x6425: sprmPBrcLeft80,
+0x6426: sprmPBrcBottom80,
+0x6427: sprmPBrcRight80,
+0x6428: sprmPBrcBetween80,
+0x6629: sprmPBrcBar80,
+0x242A: sprmPFNoAutoHyph,
+0x442B: sprmPWHeightAbs,
+0x442C: sprmPDcs,
+0x442D: sprmPShd80,
+0x842E: sprmPDyaFromText,
+0x842F: sprmPDxaFromText,
+0x2430: sprmPFLocked,
+0x2431: sprmPFWidowControl,
+0x2433: sprmPFKinsoku,
+0x2434: sprmPFWordWrap,
+0x2435: sprmPFOverflowPunct,
+0x2436: sprmPFTopLinePunct,
+0x2437: sprmPFAutoSpaceDE,
+0x2438: sprmPFAutoSpaceDN,
+0x4439: sprmPWAlignFont,
+0x443A: sprmPFrameTextFlow,
+0x2640: sprmPOutLvl,
+0x2441: sprmPFBiDi,
+0x2443: sprmPFNumRMIns,
+0xC645: sprmPNumRM,
+0x6646: sprmPHugePapx,
+0x2447: sprmPFUsePgsuSettings,
+0x2448: sprmPFAdjustRight,
+0x6649: sprmPItap,
+0x664A: sprmPDtap,
+0x244B: sprmPFInnerTableCell,
+0x244C: sprmPFInnerTtp,
+0xC64D: sprmPShd,
+0xC64E: sprmPBrcTop,
+0xC64F: sprmPBrcLeft,
+0xC650: sprmPBrcBottom,
+0xC651: sprmPBrcRight,
+0xC652: sprmPBrcBetween,
+0xC653: sprmPBrcBar,
+0x4455: sprmPDxcRight,
+0x4456: sprmPDxcLeft,
+0x4457: sprmPDxcLeft1,
+0x4458: sprmPDylBefore,
+0x4459: sprmPDylAfter,
+0x245A: sprmPFOpenTch,
+0x245B: sprmPFDyaBeforeAuto,
+0x245C: sprmPFDyaAfterAuto,
+0x845D: sprmPDxaRight,
+0x845E: sprmPDxaLeft,
+0x465F: sprmPNest,
+0x8460: sprmPDxaLeft1,
+0x2461: sprmPJc,
+0x2462: sprmPFNoAllowOverlap,
+0x2664: sprmPWall,
+0x6465: sprmPIpgp,
+0xC666: sprmPCnf,
+0x6467: sprmPRsid,
+0xC669: sprmPIstdListPermute,
+0x646B: sprmPTableProps,
+0xC66C: sprmPTIstdInfo,
+0x246D: sprmPFContextualSpacing,
+0xC66F: sprmPPropRMark,
+0x2470: sprmPFMirrorIndents,
+0x2471: sprmPTtwo,
+}
+
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
localization contributors in credits ?
Hi Valta, I moved your query about adding localization contributors to the credits to a better place - the developers' list. It sounds like a great idea; I'd love to have that on the credits page: http://www.libreoffice.org/about-us/credits/ IMHO, this would be very appreciated by the majority of them, as we are not all programmers/coders. We would need someone to contribute some code to make that happen. Sebastien maintains that but is busy, the repo is at IIRC: https://bitbucket.org/spaetz/gitanaly Contributions most welcome :-) Sebastian did some work recently to split out the artwork contributors which improved things there. The hope is that that same file ends up as CREDITS.odt in the distribution - though the updating is currently done non-automatically. 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] .: offapi/org offapi/UnoApi_offapi.mk postprocess/packcomponents Repository.mk scp2/source shell/Library_losessioninstall.mk shell/Module_shell.mk shell/source
Repository.mk|1
offapi/UnoApi_offapi.mk |6
offapi/org/freedesktop/PackageKit/XModify.idl| 104 ++
offapi/org/freedesktop/PackageKit/XQuery.idl | 48
offapi/org/freedesktop/PackageKit/XSyncDbusSessionHelper.idl | 31 +++
postprocess/packcomponents/makefile.mk |1
scp2/source/ooo/file_library_ooo.scp |1
scp2/source/ooo/module_hidden_ooo.scp|1
shell/Library_losessioninstall.mk| 41 +++
shell/Module_shell.mk|1
shell/source/sessioninstall/SyncDbusSessionHelper.cxx| 113 +++
shell/source/sessioninstall/SyncDbusSessionHelper.hxx| 60 +
shell/source/sessioninstall/losessioninstall.component | 15 +
shell/source/sessioninstall/services.cxx | 31 +++
14 files changed, 454 insertions(+)
New commits:
commit 8cd6a947d92a5657e4133693df5392c34bf115ca
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 9 19:10:38 2012 +0100
making org.freedesktop.PackageKit.Query and .Modify available
- partial implementation of the SessionInstaller interfaces
- accessable via service:
org.freedesktop.PackageKit.SyncDbusSessionHelper
Change-Id: Ica91f481d041a066215fba3e808bf587e1271f1b
diff --git a/Repository.mk b/Repository.mk
index f4b6985..657e841 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -558,6 +558,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
ldapbe2 \
localebe1 \
lomenubar \
+losessioninstall \
macbe1 \
migrationoo2 \
migrationoo3 \
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index d812927..0f15482 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4292,4 +4292,10 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\
XDataType \
))
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/org/freedesktop/PackageKit,\
+XSyncDbusSessionHelper \
+XModify \
+XQuery \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/offapi/org/freedesktop/PackageKit/XModify.idl
b/offapi/org/freedesktop/PackageKit/XModify.idl
new file mode 100644
index 000..79e2f79
--- /dev/null
+++ b/offapi/org/freedesktop/PackageKit/XModify.idl
@@ -0,0 +1,104 @@
+/* -*- 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/.
+ */
+
+#ifndef org_freedesktop_PackageKit_XModify_idl
+#define org_freedesktop_PackageKit_XModify_idl
+
+#include com/sun/star/uno/XInterface.idl
+
+module org
+{
+module freedesktop
+{
+module PackageKit
+{
+/**
+ * The interface used for modifying the package database.
+ */
+interface XModify : com::sun::star::uno::XInterface
+{
+/**
+ * Installs local package sequence string files or service packs.
+ * @since LibreOffice 3.7
+ */
+
+void InstallPackageFiles( [in] unsigned long xid, [in] sequence string
files, [in] string interaction);
+
+/**
+ * Installs sequence string packages to provide sequence string
files.
+ * @since LibreOffice 3.7
+ */
+
+void InstallProvideFiles( [in] unsigned long xid, [in] sequence string
files, [in] string interaction);
+
+/**
+ * Installs sequence string packages to provide sequence string
files.
+ * @since LibreOffice 3.7
+ */
+
+void InstallCatalogs( [in] unsigned long xid, [in] sequence string
files, [in] string interaction);
+
+/**
+ * Installs sequence string packages from a configured software source.
+ * @since LibreOffice 3.7
+ */
+
+void InstallPackageNames( [in] unsigned long xid, [in] sequence string
packages, [in] string interaction);
+
+/**
+ * Installs mimetype handlers from a configured software source.
+ * @since LibreOffice 3.7
+ */
+
+void InstallMimeTypes( [in] unsigned long xid, [in] sequence string
mime_types, [in] string interaction);
+
+/**
+ * Installs fontconfig resources ( [in] usually fonts) from a configured
software source.
+ * @since LibreOffice 3.7
+ */
+
+void InstallFontconfigRessources( [in] unsigned long xid, [in] sequence
string resources, [in] string interaction);
+
+/**
+ * Installs GStreamer resources ( [in] usually codecs) from a configured
software source.
+ * @since LibreOffice 3.7
+ */
+
+void InstalliGStreamerRessources( [in] unsigned long xid, [in] sequence
string resources, [in] string interaction);
+
+/**
+ * Installs resources of a given type from a configured
REMINDER: Release 3.6.4-rc1 from libreoffice-3-6 branch
Hi, please note that the commit deadline for 3.6.4-rc1 is on Monday, November 12, 2012. The tag and branch libreoffice-3-6-4 is going to be created the day after. Only commits with 3 reviewers will be allowed for that branch. See also http://wiki.documentfoundation.org/ReleasePlan#3.6_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr PS: Please, help with reviewing pending commits. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - config_host.mk.in configure.ac libcdr/ExternalProject_libcdr.mk libvisio/ExternalProject_libvisio.mk mythes/ExternalProject_mythes.mk oox/source
config_host.mk.in| 215 ++-
configure.ac |5
libcdr/ExternalProject_libcdr.mk | 12 -
libvisio/ExternalProject_libvisio.mk |8 -
mythes/ExternalProject_mythes.mk |2
oox/source/ole/axcontrol.cxx | 21 ++-
oox/source/vml/vmldrawing.cxx|3
7 files changed, 132 insertions(+), 134 deletions(-)
New commits:
commit 691c8fc64ce0711e8be93f4c454c537e51b1163e
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 9 14:28:43 2012 +0100
libcdr: move LCMS2_CFLAGS/LIBS setup to configure
Change-Id: I50f4396e6a8abf32d1a0f63cbfa93d2c59375326
diff --git a/configure.ac b/configure.ac
index 2439053..059d6e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7014,6 +7014,11 @@ if test $with_system_lcms2 = yes; then
else
AC_MSG_RESULT([internal])
SYSTEM_LCMS2=NO
+LCMS2_LIBS=-L${OUTDIR}/lib -llcms2
+LCMS2_CFLAGS=-I${WORKDIR}/UnpackedTarball/lcms2/include
+if test $GCC = yes; then
+LCMS2_CFLAGS=${LCMS2_CFLAGS} -Wno-long-long
+fi
LCMS2_TARBALL=861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
BUILD_TYPE=$BUILD_TYPE LCMS2
fi
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index f575dd8..f4dcab5 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -57,12 +57,6 @@ else
$(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR) \
PKG_CONFIG= \
- $(if $(filter YES,$(SYSTEM_LCMS2)),\
- LCMS2_CFLAGS= $(LCMS2_CFLAGS) \
- LCMS2_LIBS= $(LCMS2_LIBS), \
- LCMS2_CFLAGS=-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
- $(if $(filter MACOSX,$(OS)),-Wno-long-long) \
- LCMS2_LIBS=-L$(OUTDIR)/lib -llcms2 ) \
./configure \
--with-pic \
--enable-static \
commit cedd9ebdd260e99e74ad54391c0d0b1d1ebd9891
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 9 14:20:42 2012 +0100
configure: define FOO_CFLAGS/FOO_LIBS so that they are never empty
This allows us to simply pass the already exported variables to invoked
configures, where the non-empty values will override the detection logic
there.
Change-Id: I7353a313814c58922e34843aeae380e5afa442ca
diff --git a/config_host.mk.in b/config_host.mk.in
index b1bc535..e98fc79 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -2,6 +2,13 @@
# this file is intented to be able to be included in a Makefile
# and not to be sourced in a shell session
#
+
+# Horrible hack to prepend spaces to expansions
+# Spaces are usually eaten by make parser but not if variable expands to space.
+# Space prefix is desirable because system CFLAGS may be completely empty,
+# which means that the variables defined here would need extra twiddling
+# to get them into invoked external configures and override pkg-config there.
+gb_SPACE:=$(gb_SPACE) $(gb_SPACE)
export SRC_ROOT=@SRC_ROOT@
export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
@@ -46,24 +53,24 @@ export BUILD_TYPE=@BUILD_TYPE@
export BUILD_UNOWINREG=@BUILD_UNOWINREG@
export BUILD_VER_STRING=@BUILD_VER_STRING@
export BUILD_X64=@BUILD_X64@
-export CAIRO_CFLAGS=@CAIRO_CFLAGS@
-export CAIRO_LIBS=@CAIRO_LIBS@
+export CAIRO_CFLAGS=$(gb_SPACE)@CAIRO_CFLAGS@
+export CAIRO_LIBS=$(gb_SPACE)@CAIRO_LIBS@
export CAIRO_TARBALL=@CAIRO_TARBALL@
export CC=@CC@
export CC_FOR_BUILD=@CC_FOR_BUILD@
-export CDR_CFLAGS=@CDR_CFLAGS@
-export CDR_LIBS=@CDR_LIBS@
+export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@
+export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
export CDR_TARBALL=@CDR_TARBALL@
ifneq ($(strip @CFLAGS@),)
export CFLAGS=@CFLAGS@
endif
export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
-export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
-export CLUCENE_LIBS=@CLUCENE_LIBS@
+export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
+export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
export CLUCENE_TARBALL=@CLUCENE_TARBALL@
-export CMIS_CFLAGS=@CMIS_CFLAGS@
-export CMIS_LIBS=@CMIS_LIBS@
+export CMIS_CFLAGS=$(gb_SPACE)@CMIS_CFLAGS@
+export CMIS_LIBS=$(gb_SPACE)@CMIS_LIBS@
export CMIS_TARBALL=@CMIS_TARBALL@
export COM=@COM@
export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
@@ -76,8 +83,8 @@ export COMPATH=@COMPATH@
export COMPILER_PLUGINS=@COMPILER_PLUGINS@
export COMP_ENV=@OUTPATH@
export COM_FOR_BUILD=@COM_FOR_BUILD@
-export CPPUNIT_CFLAGS=@CPPUNIT_CFLAGS@
-export CPPUNIT_LIBS=@CPPUNIT_LIBS@
+export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
+export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPPUNIT_TARBALL=@CPPUNIT_TARBALL@
export CPU=@CPU@
export CPUNAME=@CPUNAME@
@@ -86,8 +93,8 @@ export CPU_FOR_BUILD=@CPU_FOR_BUILD@
export CROSS_COMPILING=@CROSS_COMPILING@
export CT2N_TARBALL=@CT2N_TARBALL@
export CURL_TARBALL=@CURL_TARBALL@
-export CURL_CFLAGS=@CURL_CFLAGS@
-export CURL_LIBS=@CURL_LIBS@
+export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
+export
[Libreoffice-commits] .: connectivity/CppunitTest_connectivity_ado.mk
connectivity/CppunitTest_connectivity_ado.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7704c7a3e6f064e1d7cef7bbf510ece1435c3bd7 Author: David Ostrovsky da...@ostrovsky.org Date: Fri Nov 9 17:41:00 2012 +0100 use dir function Change-Id: Icba39756a54d1225514048c55ddad0f31ce31699 diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk index 7ce0941..784aa78 100644 --- a/connectivity/CppunitTest_connectivity_ado.mk +++ b/connectivity/CppunitTest_connectivity_ado.mk @@ -69,7 +69,7 @@ $(eval $(call gb_CppunitTest_use_configuration,connectivity_ado)) $(call gb_CppunitTest_get_target,connectivity_ado) : $(WORKDIR)/CppunitTest/TS001018407.mdb $(WORKDIR)/CppunitTest/TS001018407.mdb : $(SRCDIR)/connectivity/qa/connectivity/ado/TS001018407.mdb - mkdir -p $(WORKDIR)/CppunitTest + mkdir -p $(dir $@) $(call gb_Deliver_deliver,$,$@) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.ac
config_host.mk.in | 20 +--- configure.ac | 15 +++ 2 files changed, 20 insertions(+), 15 deletions(-) New commits: commit 136d8962d7a29b833a24b0461958b47fc4d23d18 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Nov 9 17:53:13 2012 +0100 remove make-specific code from config_host.mk Apparently some people still try to source it from shell (scripts). Change-Id: If26a5c5eb83739d3ccce043afd095000d355a543 diff --git a/config_host.mk.in b/config_host.mk.in index e98fc79..f4d31c3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -61,9 +61,7 @@ export CC_FOR_BUILD=@CC_FOR_BUILD@ export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@ export CDR_TARBALL=@CDR_TARBALL@ -ifneq ($(strip @CFLAGS@),) -export CFLAGS=@CFLAGS@ -endif +@x_CFLAGS@ export CFLAGS=@CFLAGS@ export CHECK_PARALLELISM=@CHECK_PARALLELISM@ export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@ export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@ @@ -98,9 +96,7 @@ export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@ export CXX=@CXX@ export CXX_FOR_BUILD=@CXX_FOR_BUILD@ export CXX_X64_BINARY=@CXX_X64_BINARY@ -ifneq ($(strip @CXXFLAGS@),) -export CXXFLAGS=@CXXFLAGS@ -endif +@x_CXXFLAGS@ export CXXFLAGS=@CXXFLAGS@ export DATADIR=@DATADIR@ export DBGHELP_DLL=@DBGHELP_DLL@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@ @@ -324,9 +320,7 @@ export L10N_MODULE=@L10N_MODULE@ export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@ export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@ export LCMS2_TARBALL=@LCMS2_TARBALL@ -ifneq ($(strip @LDFLAGS@),) -export LDFLAGS=@LDFLAGS@ -endif +@x_LDFLAGS@ export LDFLAGS=@LDFLAGS@ export LFS_CFLAGS=@LFS_CFLAGS@ export LIBBASE_JAR=@LIBBASE_JAR@ export LIBDIR=@LIBDIR@ @@ -462,12 +456,8 @@ export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@ export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@ export NSS_TARBALL=@NSS_TARBALL@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ -ifneq ($(strip @OBJCFLAGS@),) -export OBJCFLAGS=@OBJCFLAGS@ -endif -ifneq ($(strip @OBJCXXFLAGS@),) -export OBJCXXFLAGS=@OBJCXXFLAGS@ -endif +@x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@ +@x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@ export OBJDUMP=@OBJDUMP@ export OOOBLOGGER_EXTENSION_PACK=@OOOBLOGGER_EXTENSION_PACK@ export OOODMAKEMODE=YES diff --git a/configure.ac b/configure.ac index 059d6e0..c968dc2 100644 --- a/configure.ac +++ b/configure.ac @@ -3350,38 +3350,53 @@ dnl by our build system, but explicit override is possible. AC_MSG_CHECKING(for explicit CFLAGS) if test -n $CFLAGS; then AC_MSG_RESULT([$CFLAGS]) +x_CFLAGS= else AC_MSG_RESULT(no) +x_CFLAGS=[\#] fi AC_MSG_CHECKING(for explicit CXXFLAGS) if test -n $CXXFLAGS; then AC_MSG_RESULT([$CXXFLAGS]) +x_CXXFLAGS= else AC_MSG_RESULT(no) +x_CXXFLAGS=[\#] fi AC_MSG_CHECKING(for explicit OBJCFLAGS) if test -n $OBJCFLAGS; then AC_MSG_RESULT([$OBJCFLAGS]) +x_OBJCFLAGS= else AC_MSG_RESULT(no) +x_OBJCFLAGS=[\#] fi AC_MSG_CHECKING(for explicit OBJCXXFLAGS) if test -n $OBJCXXFLAGS; then AC_MSG_RESULT([$OBJCXXFLAGS]) +x_OBJCXXFLAGS= else AC_MSG_RESULT(no) +x_OBJCXXFLAGS=[\#] fi AC_MSG_CHECKING(for explicit LDFLAGS) if test -n $LDFLAGS; then AC_MSG_RESULT([$LDFLAGS]) +x_LDFLAGS= else AC_MSG_RESULT(no) +x_LDFLAGS=[\#] fi AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(OBJCFLAGS) AC_SUBST(OBJCXXFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST(x_CFLAGS) +AC_SUBST(x_CXXFLAGS) +AC_SUBST(x_OBJCFLAGS) +AC_SUBST(x_OBJCXXFLAGS) +AC_SUBST(x_LDFLAGS) # # determine CPU, CPUNAME, GUI, GUIBASE, ... ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - src/docrecord.py src/docsprm.py src/docstream.py
src/docrecord.py | 93 ++-
src/docsprm.py | 11 ++
src/docstream.py |8
3 files changed, 110 insertions(+), 2 deletions(-)
New commits:
commit 044364980ff76108d0cc479fec40ae031110ac51
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Nov 9 17:26:31 2012 +0100
dump Chpx
diff --git a/src/docrecord.py b/src/docrecord.py
index 0694cd8..4aaeaa6 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -131,8 +131,12 @@ class Sprm(DOCDirStream):
4: 'section',
5: 'table'
}
+nameMap = {
+1: docsprm.parMap,
+2: docsprm.chrMap,
+}
print 'sprm value=%s name=%s ispmd=%s fSpec=%s sgc=%s
spra=%s operandSize=%s operand=%s/' % (
-hex(self.sprm), docsprm.parMap[self.sprm], hex(self.ispmd),
hex(self.fSpec), sgcmap[self.sgc], hex(self.spra), self.getOperandSize(),
hex(self.operand)
+hex(self.sprm), nameMap[self.sgc][self.sprm], hex(self.ispmd),
hex(self.fSpec), sgcmap[self.sgc], hex(self.spra), self.getOperandSize(),
hex(self.operand)
)
def getOperandSize(self):
@@ -172,6 +176,23 @@ class GrpPrlAndIstd(DOCDirStream):
pos += prl.getSize()
print '/grpPrlAndIstd'
+class Chpx(DOCDirStream):
+The Chpx structure specifies a set of properties for text.
+def __init__(self, bytes, mainStream, offset):
+DOCDirStream.__init__(self, bytes)
+self.pos = offset
+
+def dump(self):
+print 'chpx type=Chpx offset=%d' % self.pos
+self.printAndSet(cb, self.getInt8())
+self.pos += 1
+pos = self.pos
+while (self.cb - (pos - self.pos)) 0:
+prl = Prl(self.bytes, pos)
+prl.dump()
+pos += prl.getSize()
+print '/chpx'
+
class PapxInFkp(DOCDirStream):
The PapxInFkp structure specifies a set of text properties.
def __init__(self, bytes, mainStream, offset):
@@ -229,6 +250,10 @@ class ChpxFkp(DOCDirStream):
pos += 4
# rgbx
+offset = PLC.getPLCOffset(self.pos, self.crun, 1, i)
+chpxOffset = self.getInt8(pos = offset) * 2
+chpx = Chpx(self.bytes, self.mainStream, self.pos + chpxOffset)
+chpx.dump()
print '/rgfc'
self.printAndSet(crun, self.crun)
diff --git a/src/docsprm.py b/src/docsprm.py
index b60d782..32e52d8 100755
--- a/src/docsprm.py
+++ b/src/docsprm.py
@@ -95,4 +95,15 @@ parMap = {
0x2471: sprmPTtwo,
}
+# TODO incomplete
+chrMap = {
+0x4A43: sprmCHps,
+0x6816: sprmCRsidText,
+0x4A4F: sprmCRgFtc0,
+0x4A51: sprmCRgFtc2,
+0x4A61: sprmCHpsBi,
+0x0835: sprmCFBold,
+0x085C: sprmCFBoldBi,
+}
+
# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
commit e0176f0bbd9012e59e66df437a3069b3362c3902
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Nov 9 17:06:59 2012 +0100
dump ChpxFkp
diff --git a/src/docrecord.py b/src/docrecord.py
index a817a33..0694cd8 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -209,6 +209,31 @@ class BxPap(DOCDirStream):
def getSize():
return 13 # in bytes, see 2.9.23
+class ChpxFkp(DOCDirStream):
+The ChpxFkp structure maps text to its character properties.
+def __init__(self, bytes, mainStream, offset, size):
+DOCDirStream.__init__(self, mainStream.bytes)
+self.pos = offset
+self.size = size
+
+def dump(self):
+print 'chpxFkp type=ChpxFkp offset=%d size=%d bytes' %
(self.pos, self.size)
+self.crun = self.getInt8(pos = self.pos + self.size - 1)
+pos = self.pos
+for i in range(self.crun):
+# rgfc
+start = self.getInt32(pos = pos)
+end = self.getInt32(pos = pos + 4)
+print 'rgfc index=%d start=%d end=%d' % (i, start, end)
+print 'transformed value=%s/' %
globals.encodeName(self.bytes[start:end])
+pos += 4
+
+# rgbx
+print '/rgfc'
+
+self.printAndSet(crun, self.crun)
+print '/chpxFkp'
+
class PapxFkp(DOCDirStream):
The PapxFkp structure maps paragraphs, table rows, and table cells to
their properties.
def __init__(self, bytes, mainStream, offset, size):
@@ -250,6 +275,8 @@ class PnFkpChpx(DOCDirStream):
buf = self.getInt32()
self.pos += 4
self.printAndSet(pn, buf (2**22-1))
+chpxFkp = ChpxFkp(self.bytes, self.mainStream, self.pn*512, 512)
+chpxFkp.dump()
print '/%s' % self.name
class PnFkpPapx(DOCDirStream):
commit 6fd34191f47b5b18d143459d143d96508af6923f
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Nov 9 17:03:40 2012 +0100
dump PlcBteChpx and PnFkpChpx
diff --git a/src/docrecord.py b/src/docrecord.py
index bc83750..a817a33 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -237,6 +237,21
[PATCH] Change in core[libreoffice-3-6]: fix for fdo#55875 numbers as text converted strangely
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1020 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/1020/1 fix for fdo#55875 numbers as text converted strangely old code used to use XCell-setString, new code uses rDoc.SetString which by default tries to detect number formats. The ScColumn::SetString that eventually gets called seems to do lots of additional checks ( and apparently even if an ScSetStringParam instance with mbDetectNumberFormat ( false ) was passed it seems that it will still try to detect decimal number formats. With that in mind I restore and un-unoified version of what XCell-setString used do Change-Id: Ifaef74c78b198f492a390a3d5dc1721622a01ea4 --- M sc/source/filter/oox/worksheethelper.cxx 1 file changed, 8 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1020 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifaef74c78b198f492a390a3d5dc1721622a01ea4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/worksheethelper.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit f39238693096fe0001f8d526f22b920fc0be185b
Author: Noel Power noel.po...@suse.com
Date: Fri Nov 9 16:58:00 2012 +
fix for fdo#55875 numbers as text converted strangely
old code used to use XCell-setString, new code uses rDoc.SetString which
by default tries to detect number formats. The ScColumn::SetString that
eventually
gets called seems to do lots of additional checks ( and apparently even if
an ScSetStringParam instance with mbDetectNumberFormat ( false ) was passed
it seems that it will still try to detect decimal number formats. With that
in mind I restore and un-unoified version of what XCell-setString used do
Change-Id: Ifaef74c78b198f492a390a3d5dc1721622a01ea4
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index 32da418..3fec888 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1543,7 +1543,14 @@ void WorksheetHelper::putString( const CellAddress
rAddress, const OUString rT
{
ScAddress aAddress;
ScUnoConversion::FillScAddress( aAddress, rAddress );
-getScDocument().SetString( aAddress.Col(), aAddress.Row(), aAddress.Tab(),
rText );
+ScBaseCell* pNewCell = NULL;
+ScDocument rDoc = getScDocument();
+if ( !rText.isEmpty() )
+pNewCell = ScBaseCell::CreateTextCell( rText, rDoc );
+if ( pNewCell )
+rDoc.PutCell( aAddress, pNewCell );
+else
+rDoc.SetString( aAddress.Col(), aAddress.Row(), aAddress.Tab(), rText
);
}
void WorksheetHelper::putRichString( const CellAddress rAddress, const
RichString rString, const Font* pFirstPortionFont ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
On 09.11.2012 07:06, Tor Lillqvist wrote: Argh, I hate myself for continuing this thread, but isn't there a risk that people will think --enable-backtrace is related to the code we have (but have disabled for some reason?), or used to have, to display backtraces in the application itself, when it notices some fatal signal/exception (but still is alive enough to be able to display a backtrace)? That thread is closed now ;-) so please, don't respond to it, just create your own... After thinking about it again and again i decided (because no one did) that the lesser evil is to preserve the old name: --enable-symbols. Newbie wouldn't understand all 4 different debug options anyway (no matter what name you would choose), and the core developers (who actually use it) already know it under this name. See also the commit message: https://gerrit.libreoffice.org/975 Thanks David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gbuild, deps and ccache
On Friday 09 of November 2012, Michael Stahl wrote: On 09/11/12 14:04, Bjoern Michaelsen wrote: Hi, so the way gbuild generates dependencies prevents ccache to be confident about using its cache most of the time. To see this: do a/ build b/ make clean c/build from an empty ccache dir once with and without dep-tracking. The solution IMHO is to make gbuild run g++ twice, if building with deps and ccache: g++ -E $(DEP_GEN_OPTIONS) $(OTHER) foo.cxx ccache g++ $(OTHER) foo.cxx The first will then only generate the deps without compiling, while the second one will compile and not confuse ccache. if invoking g++ twice in this silly fashion improves anything then that sounds like a bug in ccache to me. why don't you suggest fixing ccache then instead of complicating our build system? I don't quite understand the problem description, but if I'm getting it right that the problem is that ccache doesn't reuse cached objects that just differ in (not) using the -M* options for generating dependencies, then that's a feature and I doubt anybody would be bothered to do much about it. Ccache simply also caches the command line used for the compile, so that's why any difference there is an automatic miss. I don't see why this matters anyway. Tinderboxes build without deps the whole time, so this doesn't matter. Developers doing development without deps are asking for trouble, so they would get it. Why would anyone actually need this? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: shell/Library_losessioninstall.mk
shell/Library_losessioninstall.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 7b213e05a4f6aecd8b5388fb8fa8cec355302b07 Author: Michael Stahl mst...@redhat.com Date: Fri Nov 9 19:20:00 2012 +0100 shell: explicitly linking gb_STDLIBS breaks the build now Change-Id: If693e440327331ea007722ff575b8015d727e5bc diff --git a/shell/Library_losessioninstall.mk b/shell/Library_losessioninstall.mk index eb5f123..ebd98af 100644 --- a/shell/Library_losessioninstall.mk +++ b/shell/Library_losessioninstall.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_libraries,losessioninstall,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) ifeq ($(RTL_OS),Linux) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac sal/Library_sal.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk
configure.ac |1 +
sal/Library_sal.mk |5 +
vcl/Library_vcl.mk |5 +
vcl/Library_vclplug_gen.mk |5 +
4 files changed, 4 insertions(+), 12 deletions(-)
New commits:
commit 89f80c167112837346ec5a63873f620a07a76493
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 9 19:29:05 2012 +0100
configure: why not set up VALGRIND_CFLAGS all in one place
Also unbreaks the build because VALGRIND_CFLAGS is now never
empty with cedd9ebdd260e99e74ad54391c0d0b1d1ebd9891.
Change-Id: Ide5ca799b3656ccaff483ca05dbc18682136345f
diff --git a/configure.ac b/configure.ac
index c968dc2..77a6011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5058,6 +5058,7 @@ if test $cross_compiling != yes -a -n
$ENABLE_DBGUTIL -a \
AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=])
fi
CPPFLAGS=$prev_cppflags
+VALGRIND_CFLAGS=${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1
fi
AC_SUBST([VALGRIND_CFLAGS])
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 73335be..854e95f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,sal,\
))
$(eval $(call gb_Library_add_defs,sal,\
- $(if $(VALGRIND_CFLAGS), \
- $(VALGRIND_CFLAGS) \
- -DHAVE_MEMCHECK_H=1 \
- ) \
+ $(VALGRIND_CFLAGS) \
$(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC), \
-DFORCE_SYSALLOC \
) \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 469aa5e..6b1545a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -471,10 +471,7 @@ vcl_headless_code=\
vcl/headless/svpvd
$(eval $(call gb_Library_add_defs,vcl,\
-$(if $(VALGRIND_CFLAGS), \
-$(VALGRIND_CFLAGS) \
--DHAVE_MEMCHECK_H=1 \
-) \
+ $(VALGRIND_CFLAGS) \
))
ifeq ($(GUIBASE),unx)
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 0f709fd..38b866c 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -123,10 +123,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
endif
$(eval $(call gb_Library_add_defs,vclplug_gen,\
-$(if $(VALGRIND_CFLAGS), \
-$(VALGRIND_CFLAGS) \
--DHAVE_MEMCHECK_H=1 \
-) \
+ $(VALGRIND_CFLAGS) \
))
## handle Xinerama
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d91c37274fda0d18eeba684e905c2a2201d85134
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 9 19:59:04 2012 +0100
configure: oops, let's try to fix that valgrind thing again...
Change-Id: I151aa45838edbaa713b40716e45a75e812b7c782
diff --git a/configure.ac b/configure.ac
index 77a6011..f7bf0f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5057,8 +5057,10 @@ if test $cross_compiling != yes -a -n
$ENABLE_DBGUTIL -a \
CPPFLAGS=$VALGRIND_CFLAGS
AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=])
fi
+if test -n $VALGRIND_CFLAGS; then
+VALGRIND_CFLAGS=${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1
+fi
CPPFLAGS=$prev_cppflags
-VALGRIND_CFLAGS=${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1
fi
AC_SUBST([VALGRIND_CFLAGS])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac RepositoryExternal.mk sal/Library_sal.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk
RepositoryExternal.mk |6 --
configure.ac |3 ---
sal/Library_sal.mk |5 -
vcl/Library_vcl.mk |5 +
vcl/Library_vclplug_gen.mk |5 +
5 files changed, 10 insertions(+), 14 deletions(-)
New commits:
commit 3bdb950f5edac0cdb09318cea307b4342a0fd714
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 9 20:20:04 2012 +0100
RepositoryExternal: fix gb_LinkTarget__use_valgrind
... which i've also managed to break, unaware of its existence.
Consolidate 2 different ways to use VALGRIND_CFLAGS.
Change-Id: I245c7a9a2b6bc904a227a15063cf5d8a2f64313c
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3c0dc3a..782f3e5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1527,11 +1527,13 @@ endef
endif # SYSTEM_CURL
-ifneq ($(VALGRIND_CFLAGS),)
+# strip because of gb_SPACE
+ifneq ($(strip $(VALGRIND_CFLAGS)),)
define gb_LinkTarget__use_valgrind
$(call gb_LinkTarget_add_defs,$(1),\
--DHAVE_VALGRIND_H \
+ -DHAVE_VALGRIND_H \
+ -DHAVE_MEMCHECK_H \
)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/configure.ac b/configure.ac
index f7bf0f7..c968dc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5057,9 +5057,6 @@ if test $cross_compiling != yes -a -n
$ENABLE_DBGUTIL -a \
CPPFLAGS=$VALGRIND_CFLAGS
AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=])
fi
-if test -n $VALGRIND_CFLAGS; then
-VALGRIND_CFLAGS=${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1
-fi
CPPFLAGS=$prev_cppflags
fi
AC_SUBST([VALGRIND_CFLAGS])
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 854e95f..51e6d9e 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_include,sal,\
))
$(eval $(call gb_Library_add_defs,sal,\
- $(VALGRIND_CFLAGS) \
$(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC), \
-DFORCE_SYSALLOC \
) \
@@ -60,6 +59,10 @@ $(eval $(call gb_Library_use_libraries,sal,\
$(gb_UWINAPI) \
))
+$(eval $(call gb_Library_use_externals,sal,\
+valgrind \
+))
+
$(eval $(call gb_Library_use_system_win32_libs,sal,\
advapi32 \
comdlg32 \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6b1545a..efb39b8 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -470,10 +470,6 @@ vcl_headless_code=\
vcl/headless/svptext \
vcl/headless/svpvd
-$(eval $(call gb_Library_add_defs,vcl,\
- $(VALGRIND_CFLAGS) \
-))
-
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_defs,vcl,\
-DSAL_DLLPREFIX=\$(gb_Library_SYSPRE)\ \
@@ -497,6 +493,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
dbus \
fontconfig \
freetype \
+ valgrind \
x11extensions \
))
endif
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 38b866c..341b48f 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
graphite \
icule \
icuuc \
+ valgrind \
Xrender \
))
@@ -122,10 +123,6 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
))
endif
-$(eval $(call gb_Library_add_defs,vclplug_gen,\
- $(VALGRIND_CFLAGS) \
-))
-
## handle Xinerama
ifneq ($(USE_XINERAMA),NO)
ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fail to build LO on Windows, Cannot link against library/libraries advapi32.lib
Hello, First thank you Michael for your fix about this problem: http://nabble.documentfoundation.org/Fail-to-build-LO-on-Windows-missing-separator-in-sal-tp4015192.html Now I've got this: /home/annie/libreoffice/master/shell/Library_losessioninstall.mk:19: *** Cannot link against library/libraries advapi32.lib. Libraries must be registered in Repository.mk. Stop. Here are more info: logs.txt http://nabble.documentfoundation.org/file/n4017805/logs.txt Here's my autogen.lastrun: autogen.lastrun http://nabble.documentfoundation.org/file/n4017805/autogen.lastrun master sources updated today and I use GNU Make 3.82 Built for i686-pc-cygwin Any idea? Julien -- View this message in context: http://nabble.documentfoundation.org/Fail-to-build-LO-on-Windows-Cannot-link-against-library-libraries-advapi32-lib-tp4017805.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: scp2/source shell/Library_losessioninstall.mk shell/Module_shell.mk
scp2/source/gnome/file_gnome.scp |2 ++ scp2/source/gnome/module_gnome.scp |1 + scp2/source/ooo/file_library_ooo.scp |1 - shell/Library_losessioninstall.mk|4 shell/Module_shell.mk|7 +++ 5 files changed, 10 insertions(+), 5 deletions(-) New commits: commit 2154fca1fb30dc4b26cac8a98c27d51c78ff6a8f Author: Michael Stahl mst...@redhat.com Date: Fri Nov 9 20:54:11 2012 +0100 scp2: try to move losessioninstall so it does not break WNT build Also MSVC does not like libraries that do not have any objects. Change-Id: I172fe0b61db9de6c7c4975a7b7c7fa63624b1865 diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 27968b5..9672965 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -33,6 +33,8 @@ File gid_File_Lib_GIO Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX)); End + +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno) #endif #ifdef ENABLE_GNOMEVFS diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 80ec3f7..3a2604d 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -55,6 +55,7 @@ Module gid_Module_Optional_Gnome #endif #ifdef ENABLE_GIO gid_File_Lib_GIO, + gid_File_Lib_Losessioninstall, #endif #ifdef ENABLE_GCONF gid_File_Lib_Gconfbe, diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 27c5b2b..d3c08f3 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -94,7 +94,6 @@ End #endif SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno) -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno ) File gid_File_Lib_Ldapbe2 LIB_FILE_BODY; diff --git a/shell/Library_losessioninstall.mk b/shell/Library_losessioninstall.mk index ebd98af..65dee35 100644 --- a/shell/Library_losessioninstall.mk +++ b/shell/Library_losessioninstall.mk @@ -23,8 +23,6 @@ $(eval $(call gb_Library_use_libraries,losessioninstall,\ sal \ )) -ifeq ($(RTL_OS),Linux) -ifeq ($(ENABLE_GIO),TRUE) $(eval $(call gb_Library_use_externals,losessioninstall,\ dbus \ gio \ @@ -34,7 +32,5 @@ $(eval $(call gb_Library_add_exception_objects,losessioninstall,\ shell/source/sessioninstall/SyncDbusSessionHelper \ shell/source/sessioninstall/services \ )) -endif -endif # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 50687ac..3726c4f 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -30,8 +30,15 @@ $(eval $(call gb_Module_Module,shell)) $(eval $(call gb_Module_add_targets,shell,\ Library_desktopbe \ Library_localebe \ +)) + +ifeq ($(OS),LINUX) +ifeq ($(ENABLE_GIO),TRUE) +$(eval $(call gb_Module_add_targets,shell,\ Library_losessioninstall \ )) +endif +endif ifeq ($(ENABLE_GCONF),TRUE) $(eval $(call gb_Module_add_targets,shell,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fail to build LO on Windows, Cannot link against library/libraries advapi32.lib
On 09/11/12 20:47, julien2412 wrote: Hello, First thank you Michael for your fix about this problem: http://nabble.documentfoundation.org/Fail-to-build-LO-on-Windows-missing-separator-in-sal-tp4015192.html Now I've got this: /home/annie/libreoffice/master/shell/Library_losessioninstall.mk:19: *** Cannot link against library/libraries advapi32.lib. Libraries must be registered in Repository.mk. Stop. have fixed that problem already. and just fixed the next problem from that makefile. i hope my msvc build will finally finish now... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [fdo#40325] PRINTING: order of page not respected with Handout
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi All, I forgot to tell that I was not subscribed to the design-list, so I reply on this mail after read the replies online. I think this default-option is very confusing. It seems to me really a bug that in this option doesn't respect the order I set. But this brings only a old discussion back. I want to propose a small change that should make it more clear. Can we disable the order of page-option when default is selected? Another option to add is to set the correct order of page that the default-option is following in that disabled state. - -- Greetings, Rob Snelders Op 07-11-12 18:29, Rob Snelders schreef: Hi All, This bug describes that the printing of handouts doesn't respect the order of page-option. It seems some parts of the working of this already functions but the default-option still is weird. It defaults to 6 slides and doesn't respect the order of page-option it always prints vertically first. I think it would be better to remove te default-option for the slides and default to 6 slides with the left to right then down selected for order of page. Anybody any thoughts on that? -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQEcBAEBAgAGBQJQnWJzAAoJEGs78UIq7mKyM0QH/R7G0AuCR62pHCO2yAJelYu3 aCVt/q3xGs7iLq7TQo0ybBaR6AjAdn0JwJXy4lbCZdvasXQh1nef5IDrKd2f1RHQ ypZq2NwpZCxhLGCut/s6X6xxZ1wf2yn931y/KLVS/fkyqSEfvClZcuXXEp61vdKz 8G7+41bid/b22mioCITetULUiqii0Cx4GE1mzK03lxO7b5Y3LFqKkYEUzidKoZB+ UjNb67Of6tNBPR4TIoc3RmkBfkddCJD324iDfzhawkmMg/VFfybktLNcKjB3dqgx M1R0qmpJUFQ37w9EE3qWDOvkJdzx0kBOkANKlxYpTDMBjWEMtsPwoVid6d6YVhk= =GR+5 -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: postprocess/packcomponents
postprocess/packcomponents/makefile.mk |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 2fb005c2e0bbdc8b968ef07fa9dc0c6cfd6a43c1 Author: Michael Stahl mst...@redhat.com Date: Fri Nov 9 21:30:55 2012 +0100 more losessioninstall fixing Change-Id: If026dd160e2abe51470273115cbdd8b556ee9356 diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 27447e2..3d0a493 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -93,7 +93,6 @@ my_components = \ component/sot/util/sot \ component/starmath/util/sm \ component/starmath/util/smd \ -component/shell/source/sessioninstall/losessioninstall \ component/svl/source/fsstor/fsstorage \ component/svl/source/passwordcontainer/passwordcontainer \ component/svl/util/svl \ @@ -251,7 +250,9 @@ my_components += component/shell/source/backends/gconfbe/gconfbe1 .END .IF $(ENABLE_GIO) != -my_components += component/ucb/source/ucp/gio/ucpgio +my_components += \ +component/shell/source/sessioninstall/losessioninstall \ +component/ucb/source/ucp/gio/ucpgio .END .IF $(ENABLE_GNOMEVFS) != ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.source
config_host.mk.source |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7cf93f92cc3c6126c1cbe4ccef7ec3f76f1a6ca9
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 9 22:07:52 2012 +0100
fix that silly config_host.mk shell sourcing nonsense
Change-Id: Ia563ee1e100bc86e9b7196bdce6311e24bc36f9c
diff --git a/config_host.mk.source b/config_host.mk.source
index efd014d..786e271 100644
--- a/config_host.mk.source
+++ b/config_host.mk.source
@@ -5,7 +5,8 @@
# source ./config_host.mk.source
temp_conf=`mktemp config_host.mk.XX`
-sed -n -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/p' \
+sed -n -e 's/$(gb_SPACE)/ /g' \
+-e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/p' \
-e 's/^\s*export\s\+\([A-Z0-9_]*\)?=\(.*\)$/export \1=${\1:-\2}/p'
config_host.mk $temp_conf
source ./$temp_conf
rm $temp_conf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: accessibility/source
accessibility/source/extended/textwindowaccessibility.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit a73c98a708ee41b8c4cf4f2063c5bc4b30044284
Author: Michael Meeks michael.me...@suse.com
Date: Fri Nov 9 16:58:00 2012 +
Better fix for fdo#56473, Crash when inserting a simple macro
old code used to use XCell-setString, new code uses rDoc.SetString which
by default tries to detect number formats. The ScColumn::SetString that
eventually
gets called seems to do lots of additional checks ( and apparently even if
an ScSetStringParam instance with mbDetectNumberFormat ( false ) was passed
it seems that it will still try to detect decimal number formats. With that
in mind I restore and un-unoified version of what XCell-setString used do
Change-Id: Ifaef74c78b198f492a390a3d5dc1721622a01ea4
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 1e2da2e..f25c46c 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include accessibility/extended/textwindowaccessibility.hxx
#include comphelper/accessibleeventnotifier.hxx
#include unotools/accessiblerelationsethelper.hxx
@@ -2124,18 +2123,19 @@ void Document::handleSelectionChangeNotification()
void Document::notifySelectionChange( sal_Int32 nFirst, sal_Int32 nLast )
{
-if ( nFirst nLast )
+nFirst = std::max( nFirst, sal_Int32( 0 ) );
+nLast = std::min( nLast, sal_Int32( m_xParagraphs-size() ) );
+Paragraphs::iterator iFirst(m_xParagraphs-begin() + nFirst);
+Paragraphs::iterator iLast(m_xParagraphs-begin() + nLast);
+if ( iFirst m_aVisibleBegin )
+iFirst = m_aVisibleBegin;
+if ( iLast m_aVisibleEnd )
+iLast = m_aVisibleEnd;
+if ( iFirst iLast )
{
-Paragraphs::iterator aItBound1 = m_xParagraphs-begin();
-for (sal_Int32 i = 0; i nLast aItBound1 != m_xParagraphs-end()
; ++aItBound1, ++i);
-Paragraphs::iterator aEnd( ::std::min( aItBound1, m_aVisibleEnd ) );
-
-Paragraphs::iterator aItBound2 = m_xParagraphs-begin();
-for (sal_Int32 i = 0; i nFirst aItBound2 != m_xParagraphs-end()
; ++aItBound2, ++i);
-
-for ( Paragraphs::iterator aIt = ::std::max( aItBound2,
m_aVisibleBegin ); aIt != aEnd; ++aIt )
+for ( Paragraphs::iterator i = iFirst; i != iLast; i++ )
{
-::rtl::Reference ParagraphImpl xParagraph( getParagraph( aIt )
);
+::rtl::Reference ParagraphImpl xParagraph( getParagraph( i ) );
if ( xParagraph.is() )
{
xParagraph-notifyEvent(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/rb10'
New branch 'feature/rb10' available with the following commits: commit 2dbc4660bcc504641c96484963f3c07b1bdecf3f Author: Michael Meeks michael.me...@suse.com Date: Tue Nov 6 12:12:33 2012 + re-base on ALv2 code. Includes: Patches contributed by Pedro Giffuni: Avoid some uses of non portable #!/bin/bash in shell scripts. http://svn.apache.org/viewvc?view=revisionrevision=1235297 Reduce the dependencies on non standard GNU copy. http://svn.apache.org/viewvc?view=revisionrevision=1238684 Correct /usr/bin/env path. http://svn.apache.org/viewvc?view=revisionrevision=1235619 Complex Toolbar Controls Extension from the SDK Patches contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revisionrevision=1190390 i118615 - make epm more verbose http://svn.apache.org/viewvc?view=revisionrevision=1204288 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revisionrevision=1394707 http://svn.apache.org/viewvc?view=revisionrevision=1394326 Patches contributed by Juergen Schmidt: jsc341: i117327: take care if no dependency node in current description exists, create one http://svn.apache.org/viewvc?view=revisionrevision=1172101 jsc341: i117327: add extra extension dependency check http://svn.apache.org/viewvc?view=revisionrevision=1172098 make initial branding changes http://svn.apache.org/viewvc?view=revisionrevision=1231878 Patches contributed by Ingo Schmidt native373: #i117733# no linux jre installation on 64 bit systems http://svn.apache.org/viewvc?view=revisionrevision=1167536 native373: ##164464# improve debian support http://svn.apache.org/viewvc?view=revisionrevision=1167537 Patch contribtued by Armin Le-Grand: Changed various aspects concerning usages of old vendor names http://svn.apache.org/viewvc?view=revisionrevision=1293313 fix for neon webdav, remove coinmp bits, improve odk script, cleanup remove OS/2 conditionals, system ucpp fixes, remove OS/2 conditionals, restore our license filenames. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 4 commits - sc/inc sc/source
sc/inc/orcusfilters.hxx |4
sc/inc/orcusxml.hxx | 25 +
sc/source/core/tool/orcusxml.cxx|8 +
sc/source/filter/inc/orcusfiltersimpl.hxx |3
sc/source/filter/orcus/orcusfiltersimpl.cxx | 82 -
sc/source/ui/inc/xmlsourcedlg.hxx |5 +
sc/source/ui/src/xmlsourcedlg.src |3
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 128 +---
8 files changed, 237 insertions(+), 21 deletions(-)
New commits:
commit fce1dd3c1707fe722c5a82db864c967c9390cea2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Nov 9 17:25:02 2012 -0500
Implement the required get_sheet() interface method.
Now we can import single-linked elements.
Change-Id: I0e2f2fd618bf6dadfcc18e8b96e235e3c08f443b
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 9b2244b..2ced6b5 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -66,6 +66,7 @@ class ScOrcusSheet : public
orcus::spreadsheet::iface::import_sheet
public:
ScOrcusSheet(ScDocument rDoc, SCTAB nTab);
+// Orcus import interface
virtual void set_auto(row_t row, col_t col, const char* p, size_t n);
virtual void set_format(row_t row, col_t col, size_t xf_index);
virtual void set_formula(row_t row, col_t col, formula_grammar_t grammar,
const char* p, size_t n);
@@ -79,6 +80,8 @@ public:
virtual void set_shared_formula(row_t row, col_t col, size_t sindex);
virtual void set_string(row_t row, col_t col, size_t sindex);
virtual void set_value(row_t row, col_t col, double value);
+
+SCTAB getIndex() const { return mnTab; }
};
ScOrcusFactory::ScOrcusFactory(ScDocument rDoc) : mrDoc(rDoc) {}
@@ -94,10 +97,36 @@ orcus::spreadsheet::iface::import_sheet*
ScOrcusFactory::append_sheet(const char
return maSheets.back();
}
-orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::get_sheet(const char*
/*sheet_name*/, size_t /*sheet_name_length*/)
+class FindSheetByIndex : std::unary_functionScOrcusSheet, bool
{
-// TODO: Implement this.
-return NULL;
+SCTAB mnTab;
+public:
+FindSheetByIndex(SCTAB nTab) : mnTab(nTab) {}
+bool operator() (const ScOrcusSheet rSheet) const
+{
+return rSheet.getIndex() == mnTab;
+}
+};
+
+orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::get_sheet(const char*
sheet_name, size_t sheet_name_length)
+{
+OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
+SCTAB nTab = -1;
+if (!mrDoc.GetTable(aTabName, nTab))
+// Sheet by that name not found.
+return NULL;
+
+// See if we already have an orcus sheet instance by that index.
+boost::ptr_vectorScOrcusSheet::iterator it =
+std::find_if(maSheets.begin(), maSheets.end(), FindSheetByIndex(nTab));
+
+if (it != maSheets.end())
+// We already have one. Return it.
+return (*it);
+
+// Create a new orcus sheet instance for this.
+maSheets.push_back(new ScOrcusSheet(mrDoc, nTab));
+return maSheets.back();
}
orcus::spreadsheet::iface::import_shared_strings*
ScOrcusFactory::get_shared_strings()
commit fa25861e163fed7b64b93691ce103067912d3c01
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Nov 9 17:05:49 2012 -0500
Set all single cell links to orcus_xml, and start reading the file.
Alas, data won't get imported because I haven't implemented get_sheet()
interface method.
Change-Id: Id53b2c68b2fdf4c03fa6d6de25dd7762a51bd610
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index 2baac69..1a0b192 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -57,19 +57,22 @@ struct ScOrcusImportXMLParam
struct CellLink
{
ScAddress maPos;
-rtl::OUString maPath;
+rtl::OString maPath;
-CellLink(const ScAddress rPos, const rtl::OUString rPath);
+CellLink(const ScAddress rPos, const rtl::OString rPath);
};
struct RangeLink
{
ScAddress maPos;
-std::vectorrtl::OUString maFieldPaths;
+std::vectorrtl::OString maFieldPaths;
};
-std::vectorCellLink maCellLinks;
-std::vectorRangeLink maRangeLinks;
+typedef std::vectorCellLink CellLinksType;
+typedef std::vectorRangeLink RangeLinksType;
+
+CellLinksType maCellLinks;
+RangeLinksType maRangeLinks;
};
#endif
diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx
index fb74fec..5ad41de 100644
--- a/sc/source/core/tool/orcusxml.cxx
+++ b/sc/source/core/tool/orcusxml.cxx
@@ -24,7 +24,7 @@ const ScOrcusXMLTreeParam::EntryData*
ScOrcusXMLTreeParam::getUserData(const SvT
return static_castconst
ScOrcusXMLTreeParam::EntryData*(rEntry.GetUserData());
}
-ScOrcusImportXMLParam::CellLink::CellLink(const ScAddress rPos, const
OUString
Re: Fail to build LO on Windows, MSVCR80.dll: cannot open shared object file
Thank you again Michael :-) Now, I've got MSVCR80.dll: cannot open shared object file: No such file or directory I don't understand since I made the external/msvcp80 thing (see http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies#Pre-built_Mozilla_libraries) + I installed vcredist_x86.exe Julien -- View this message in context: http://nabble.documentfoundation.org/Fail-to-build-LO-on-Windows-Cannot-link-against-library-libraries-advapi32-lib-tp4017805p4017831.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: libexttextcat/ExternalPackage_libexttextcat.mk libexttextcat/ExternalProject_libexttextcat.mk libexttextcat/Makefile libexttextcat/makefile.mk libexttextcat/Module_libexttextc
Makefile.top |2 Module_tail_build.mk |1 RepositoryExternal.mk| 24 +-- RepositoryModule_ooo.mk |1 libexttextcat/ExternalPackage_libexttextcat.mk | 19 +++ libexttextcat/ExternalProject_libexttextcat.mk | 27 libexttextcat/Makefile |7 + libexttextcat/Module_libexttextcat.mk| 29 libexttextcat/StaticLibrary_exttextcat.mk| 25 +++ libexttextcat/UnpackedTarball_libexttextcat.mk | 18 ++ libexttextcat/Zip_fingerprint.mk | 37 + libexttextcat/makefile.mk| 94 --- libexttextcat/prj/d.lst | 10 - lingucomponent/source/languageguessing/guess.cxx |4 lingucomponent/source/languageguessing/guesslang.cxx |4 lingucomponent/source/languageguessing/simpleguesser.cxx |8 + tail_build/prj/build.lst |2 17 files changed, 192 insertions(+), 120 deletions(-) New commits: commit 31219f0f97d081d94d927b5c3d08bb8677b22506 Author: Peter Foley pefol...@verizon.net Date: Fri Nov 9 17:25:56 2012 -0500 convert libexttextcat to gbuild Change-Id: I633892a6d611e6481e49f9bd2739d3886563a24a diff --git a/Makefile.top b/Makefile.top index 9e67a71..5ab6e59 100644 --- a/Makefile.top +++ b/Makefile.top @@ -108,6 +108,7 @@ languagetool\ lcms2\ libcdr\ libcmis\ +libexttextcat\ libmspub\ liborcus\ libpng\ @@ -224,7 +225,6 @@ external\ helpcontent2 \ icu\ instsetoo_native\ -libexttextcat\ liblangtag\ libxml2\ libxmlsec\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index f1a43f9..7917d7f 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -95,6 +95,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ $(call gb_Helper_optional,LCMS2,lcms2) \ libcdr \ libcmis \ + $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ libmspub \ liborcus \ librelogo \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 782f3e5..6ffed9a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -487,32 +487,28 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(LIBEXTTEXTCAT_CFLAGS) \ ) +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_LIBEXTTEXTCAT \ +) $(call gb_LinkTarget_add_libs,$(1),$(LIBEXTTEXTCAT_LIBS)) endef else # !SYSTEM_LIBEXTTEXTCAT -ifeq ($(OS),WNT) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - libexttextcat \ -)) -else $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - exttextcat-1.0 \ + exttextcat \ )) -endif define gb_LinkTarget__use_libexttextcat -ifeq ($(OS),WNT) -$(call gb_LinkTarget_use_libraries,$(1),\ - libexttextcat \ -) -else $(call gb_LinkTarget_use_static_libraries,$(1),\ - exttextcat-1.0 \ + exttextcat \ +) + +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libexttextcat/src) \ + $$(INCLUDE) \ ) -endif endef diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index e77c1c8..6814078 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -105,6 +105,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ $(call gb_Helper_optional,LCMS2,lcms2) \ libcdr \ libcmis \ + $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ libmspub \ liborcus \ libpng \ diff --git a/libexttextcat/ExternalPackage_libexttextcat.mk b/libexttextcat/ExternalPackage_libexttextcat.mk new file mode 100644 index 000..c6140a4 --- /dev/null +++ b/libexttextcat/ExternalPackage_libexttextcat.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,libexttextcat,libexttextcat)) + +ifneq ($(COM),MSC) + +$(eval $(call gb_ExternalPackage_use_external_project,libexttextcat,libexttextcat)) + +$(eval $(call gb_ExternalPackage_add_file,libexttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-1.0.a)) + +endif +# vim: set noet sw=4 ts=4: diff --git a/libexttextcat/ExternalProject_libexttextcat.mk b/libexttextcat/ExternalProject_libexttextcat.mk new file mode 100644 index 000..e792b3f --- /dev/null +++ b/libexttextcat/ExternalProject_libexttextcat.mk @@ -0,0 +1,27 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is
Re: [PUSHED] binfilter.die.die.die
On Fri, 2012-11-09 at 07:58 +, Tor Lillqvist (via Code Review) wrote: Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1014 Approvals: Tor Lillqvist: Verified; Looks good to me, approved There are some potential extra tidy-ups in smoketest to remove the conditionals on those formats. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
VS 2010 Express merge module issue
Hello VS2010 Express works great to build LO, but not for packaging. Although all MSVC*100.dll are there, the express version does not ship the merge module. This makes the packaging abort, because it expects the msm file to insert msvc files into the msi. Should we manage to store an msm version somewhere (like http://dev-www.libreoffice.org/extern) or provide a workaround to define ? TY -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Module_tail_build.mk tail_build/prj
Module_tail_build.mk |1 + tail_build/prj/build.lst |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 0d909e7532176e59a393d6fecca9a50ab4e26e9a Author: Peter Foley pefol...@verizon.net Date: Fri Nov 9 18:47:06 2012 -0500 add boost to tail_build Change-Id: I9cb276963155004361be86ec7a05c3597ff4ba4b diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 7917d7f..6fe3b67 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ basegfx \ basic \ bean \ + $(call gb_Helper_optional,BOOST,boost) \ $(call gb_Helper_optional,BSH,beanshell) \ binaryurp \ $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 6813399..383136c 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libexttextcat/ExternalPackage_libexttextcat.mk
libexttextcat/ExternalPackage_libexttextcat.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit bee51e6bb9d400fbf75ed47f7f2ac755ec05f28d Author: Peter Foley pefol...@verizon.net Date: Fri Nov 9 21:30:58 2012 -0500 fix libexttextcat for mingw Change-Id: Idb8c0587fd180416af2079d94fcc3e1fb5c734b4 diff --git a/libexttextcat/ExternalPackage_libexttextcat.mk b/libexttextcat/ExternalPackage_libexttextcat.mk index c6140a4..781a274 100644 --- a/libexttextcat/ExternalPackage_libexttextcat.mk +++ b/libexttextcat/ExternalPackage_libexttextcat.mk @@ -14,6 +14,9 @@ ifneq ($(COM),MSC) $(eval $(call gb_ExternalPackage_use_external_project,libexttextcat,libexttextcat)) $(eval $(call gb_ExternalPackage_add_file,libexttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-1.0.a)) +ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,libexttextcat,bin/libexttextcat.dll,src/.libs/libexttextcat-1.0.dll)) +endif endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/inc sc/source
sc/inc/orcusxml.hxx |3 -
sc/source/core/tool/orcusxml.cxx|2
sc/source/filter/orcus/orcusfiltersimpl.cxx | 67 -
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 75 +++-
4 files changed, 122 insertions(+), 25 deletions(-)
New commits:
commit b5f009b9cfbda95571fe05d26326c9ca0ca29650
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Nov 9 22:10:54 2012 -0500
Register range links to orcus_xml too.
But range links fail to import. Looks like sheet names are corrupted.
I need to debug this...
Change-Id: If2aeb3b81db65749f05edfbdd2f3388be4f2539c
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index 1a0b192..c3a981d 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -31,7 +31,8 @@ struct ScOrcusXMLTreeParam
{
EntryType meType;
ScAddress maLinkedPos; /// linked cell position (invalid if unlinked)
-bool mbRangeParent;
+bool mbRangeParent:1;
+bool mbLeafNode:1; /// Leaf if it has no child elements. Child
Attributes don't count.
SC_DLLPUBLIC EntryData(EntryType eType);
};
diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx
index 5ad41de..3f3c93c 100644
--- a/sc/source/core/tool/orcusxml.cxx
+++ b/sc/source/core/tool/orcusxml.cxx
@@ -12,7 +12,7 @@
#include svtools/treelistbox.hxx
ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType) :
-meType(eType), maLinkedPos(ScAddress::INITIALIZE_INVALID),
mbRangeParent(false) {}
+meType(eType), maLinkedPos(ScAddress::INITIALIZE_INVALID),
mbRangeParent(false), mbLeafNode(true) {}
ScOrcusXMLTreeParam::EntryData*
ScOrcusXMLTreeParam::getUserData(SvTreeListEntry rEntry)
{
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 2ced6b5..ba3701a 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -113,8 +113,11 @@ orcus::spreadsheet::iface::import_sheet*
ScOrcusFactory::get_sheet(const char* s
OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
SCTAB nTab = -1;
if (!mrDoc.GetTable(aTabName, nTab))
+{
// Sheet by that name not found.
+fprintf(stdout, ScOrcusFactory::get_sheet: no such sheet!!!
(%s)\n, rtl::OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr());
return NULL;
+}
// See if we already have an orcus sheet instance by that index.
boost::ptr_vectorScOrcusSheet::iterator it =
@@ -211,11 +214,12 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument rDoc,
const OUString rPath) cons
namespace {
-void setUserDataToEntry(
+ScOrcusXMLTreeParam::EntryData setUserDataToEntry(
SvTreeListEntry rEntry, ScOrcusXMLTreeParam::UserDataStoreType rStore,
ScOrcusXMLTreeParam::EntryType eType)
{
rStore.push_back(new ScOrcusXMLTreeParam::EntryData(eType));
rEntry.SetUserData(rStore.back());
+return rStore.back();
}
void populateTree(
@@ -229,7 +233,7 @@ void populateTree(
// Can this ever happen!?
return;
-setUserDataToEntry(
+ScOrcusXMLTreeParam::EntryData rEntryData = setUserDataToEntry(
*pEntry, rParam.maUserDataStore,
bRepeat ? ScOrcusXMLTreeParam::ElementRepeat :
ScOrcusXMLTreeParam::ElementDefault);
@@ -266,6 +270,9 @@ void populateTree(
rWalker.get_children(aNames);
+// Non-leaf if it has child elements, leaf otherwise.
+rEntryData.mbLeafNode = aNames.empty();
+
// Insert child elements recursively.
for (it = aNames.begin(), itEnd = aNames.end(); it != itEnd; ++it)
{
@@ -333,6 +340,22 @@ bool ScOrcusFiltersImpl::loadXMLStructure(
return true;
}
+namespace {
+
+class InsertFieldPath : std::unary_functionOString, void
+{
+orcus::orcus_xml mrFilter;
+public:
+InsertFieldPath(orcus::orcus_xml rFilter) : mrFilter(rFilter) {}
+void operator() (const OString rPath)
+{
+fprintf(stdout, InsertFieldPath::(): field path = '%s'\n,
rPath.getStr());
+mrFilter.append_field_link(rPath.getStr());
+}
+};
+
+}
+
bool ScOrcusFiltersImpl::importXML(
ScDocument rDoc, const rtl::OUString rPath, const ScOrcusImportXMLParam
rParam) const
{
@@ -344,18 +367,38 @@ bool ScOrcusFiltersImpl::importXML(
orcus::orcus_xml filter(aFactory, NULL);
// Set cell links.
-ScOrcusImportXMLParam::CellLinksType::const_iterator it =
rParam.maCellLinks.begin();
-ScOrcusImportXMLParam::CellLinksType::const_iterator itEnd =
rParam.maCellLinks.end();
+{
+ScOrcusImportXMLParam::CellLinksType::const_iterator it =
rParam.maCellLinks.begin();
+ScOrcusImportXMLParam::CellLinksType::const_iterator itEnd =
rParam.maCellLinks.end();
+for (; it != itEnd; ++it)
+{
+const ScOrcusImportXMLParam::CellLink rLink = *it;
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source
sc/source/filter/orcus/orcusfiltersimpl.cxx |4
sc/source/ui/xmlsource/xmlsourcedlg.cxx |7 +--
2 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 2ad0600711e613d7955f445d6ebaa35a530f2751
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Nov 9 23:04:29 2012 -0500
Remove debug statements.
Change-Id: I3e3d4863bef27e91b95f9e6cbe5c2daa81ece0b2
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index ba3701a..2584770 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -113,11 +113,8 @@ orcus::spreadsheet::iface::import_sheet*
ScOrcusFactory::get_sheet(const char* s
OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
SCTAB nTab = -1;
if (!mrDoc.GetTable(aTabName, nTab))
-{
// Sheet by that name not found.
-fprintf(stdout, ScOrcusFactory::get_sheet: no such sheet!!!
(%s)\n, rtl::OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr());
return NULL;
-}
// See if we already have an orcus sheet instance by that index.
boost::ptr_vectorScOrcusSheet::iterator it =
@@ -349,7 +346,6 @@ public:
InsertFieldPath(orcus::orcus_xml rFilter) : mrFilter(rFilter) {}
void operator() (const OString rPath)
{
-fprintf(stdout, InsertFieldPath::(): field path = '%s'\n,
rPath.getStr());
mrFilter.append_field_link(rPath.getStr());
}
};
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 62d2f40..5f3a6e1 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -125,8 +125,6 @@ void ScXMLSourceDlg::SetReference(const ScRange rRange,
ScDocument* pDoc)
OUString aStr;
rRange.aStart.Format(aStr, SCA_ABS_3D, pDoc, pDoc-GetAddressConvention());
mpActiveEdit-SetRefString(aStr);
-
-fprintf(stdout, ScXMLSourceDlg::SetReference: ref str = '%s'\n,
rtl::OUStringToOString(aStr, RTL_TEXTENCODING_UTF8).getStr());
}
void ScXMLSourceDlg::Deactivate()
@@ -431,9 +429,8 @@ void getFieldLinks(ScOrcusImportXMLParam::RangeLink
rRangeLink, const SvTreeLis
{
const SvTreeListEntry rChild = *it;
OUString aPath = getXPath(rTree, rChild);
-
const ScOrcusXMLTreeParam::EntryData* pUserData =
ScOrcusXMLTreeParam::getUserData(rChild);
-fprintf(stdout, getFieldLinks: path = '%s' leaf = %d\n,
rtl::OUStringToOString(aPath, RTL_TEXTENCODING_UTF8).getStr(),
pUserData-mbLeafNode);
+
if (pUserData pUserData-mbLeafNode)
{
if (!aPath.isEmpty())
@@ -510,8 +507,6 @@ void ScXMLSourceDlg::RefEditModified()
ScAddress aLinkedPos;
sal_uInt16 nRes = aLinkedPos.Parse(aRefStr, mpDoc,
mpDoc-GetAddressConvention());
bool bValid = (nRes SCA_VALID) == SCA_VALID;
-fprintf(stdout, ScXMLSourceDlg::RefEditModified: ref str = '%s' valid
= %d\n,
-rtl::OUStringToOString(aRefStr, RTL_TEXTENCODING_UTF8).getStr(),
bValid);
// TODO: For some unknown reason, setting the ref invalid will hide the
text altogether.
// Find out how to make this work.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] unusedcode.ease cleanup
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1021 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/1021/1 unusedcode.ease cleanup This commit removes some unused code from unusedcode.easy Change-Id: If3cad67a508cc85dbffd70d6344e1427bac0c775 Signed-off-by: José Guilherme Vanz guilherme@gmail.com --- M canvas/source/cairo/cairo_canvashelper.cxx M canvas/source/cairo/cairo_canvashelper.hxx M canvas/source/cairo/cairo_spritedevicehelper.cxx M canvas/source/cairo/cairo_spritedevicehelper.hxx M canvas/source/cairo/cairo_textlayout.cxx M canvas/source/cairo/cairo_textlayout.hxx 6 files changed, 0 insertions(+), 46 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1021 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3cad67a508cc85dbffd70d6344e1427bac0c775 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/layout/hffrm.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit fabf0ef1f1f8fec3a349ab5c14e3fdfc9047f376
Author: jailletc36 christophe.jail...@wanadoo.fr
Date: Fri Nov 9 14:56:12 2012 +0100
cppCheck: remove dead assignment
Change-Id: Iea8388c16de3399853dc384e7df6bfcc92170ea2
Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr
Reviewed-on: https://gerrit.libreoffice.org/1018
Reviewed-by: Ivan Timofeev timofeev@gmail.com
Tested-by: Ivan Timofeev timofeev@gmail.com
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 1f496c5..1944d7b 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -74,11 +74,10 @@ static SwTwips lcl_GetFrmMinHeight(const SwLayoutFrm rFrm)
static SwTwips lcl_CalcContentHeight(SwLayoutFrm frm)
{
-SwFrm* pFrm = frm.Lower();
-
SwTwips nRemaining = 0;
sal_uInt16 nNum = 0;
-pFrm = frm.Lower();
+SwFrm* pFrm = frm.Lower();
+
while ( pFrm )
{
SwTwips nTmp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] cppCheck: remove dead assignment
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1018 Approvals: Ivan Timofeev: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1018 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea8388c16de3399853dc384e7df6bfcc92170ea2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr Gerrit-Reviewer: Ivan Timofeev timofeev@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
binfilter removed in LO 4.0 : how to communicate on this change?
Hi, In order to make this change as smooth as possible, I think we should give clear and complete information to the users: - release a complete list of legacy formats which are dropped. Is there something else than sd? formats (StarOffice 5 formats) ? - perhaps it would be fair to add a warning message when the user try to open a file that is in a dropped format - what the user can do with its old files: I think it is not enough to say you have to convert them with an old version of LibreOffice. For example, I have old sdw and sxw files in my laboratory diary and I do not want to lose their modification date if I convert them in ODF. What should I do and what advice I could give to an end-user who is in the same position? Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] counter for Find All button
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1022 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/1022/1 counter for Find All button This patch will add new feature to the Find All button. This feature simply works when you click the Find All button it will display a message box showing the number of words found in the script. Change-Id: I97ca136fd9fd27faa63ebc7a9b6f8e37b6ed025d --- M sw/source/ui/uiview/view.hrc M sw/source/ui/uiview/view.src M sw/source/ui/uiview/viewsrch.cxx 3 files changed, 28 insertions(+), 4 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1022 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97ca136fd9fd27faa63ebc7a9b6f8e37b6ed025d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulelah Alarifi asalar...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: shell/source
shell/source/sessioninstall/SyncDbusSessionHelper.cxx |8 +--
shell/source/sessioninstall/SyncDbusSessionHelper.hxx | 46 +-
2 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 40c1e728c40ac03a2744bccefd0fb64ed5209776
Author: David Tardon dtar...@redhat.com
Date: Sat Nov 10 08:46:53 2012 +0100
WaE: unused parameter
Change-Id: Ib9956bd2671434fc15905e7c4fd56bd8f7162b60
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index 1653cb3..47f0749 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -17,8 +17,8 @@
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::comphelper;
-using namespace ::std;;
-using namespace ::rtl;;
+using namespace ::std;
+using namespace ::rtl;
namespace
{
@@ -29,7 +29,7 @@ namespace
{
GError* m_pError;
public:
-GErrorWrapper(GError* pError) : m_pError(pError) {};
+GErrorWrapper(GError* pError) : m_pError(pError) {}
~GErrorWrapper()
{
if(!m_pError)
@@ -55,7 +55,7 @@ namespace
if(!proxy)
throw RuntimeException(OUString(couldnt get a proxy!),NULL);
return proxy;
-};
+}
}
namespace shell { namespace sessioninstall
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index bbb1201..4aab68c 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -21,33 +21,33 @@ namespace shell { namespace sessioninstall
{
public:
SyncDbusSessionHelper(::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext const);
-virtual ~SyncDbusSessionHelper() {};
+virtual ~SyncDbusSessionHelper() {}
// XModify Methods
-virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 xid, const
::com::sun::star::uno::Sequence ::rtl::OUString packages, const
::rtl::OUString interaction ) throw (::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 /* xid */,
const ::com::sun::star::uno::Sequence ::rtl::OUString /* packages */, const
::rtl::OUString /* interaction */ ) throw
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 xid, const
::com::sun::star::uno::Sequence ::rtl::OUString files, const
::rtl::OUString interaction ) throw (::com::sun::star::uno::RuntimeException)
-{ throw ::com::sun::star::uno::RuntimeException(); }; // not
implemented
-virtual void SAL_CALL InstallProvideFiles( ::sal_uInt32 xid, const
::com::sun::star::uno::Sequence ::rtl::OUString files, const
::rtl::OUString interaction ) throw (::com::sun::star::uno::RuntimeException)
-{ throw ::com::sun::star::uno::RuntimeException(); }; // not
implemented
-virtual void SAL_CALL InstallCatalogs( ::sal_uInt32 xid, const
::com::sun::star::uno::Sequence ::rtl::OUString files, const
::rtl::OUString interaction ) throw (::com::sun::star::uno::RuntimeException)
-{ throw ::com::sun::star::uno::RuntimeException(); }; // not
implemented
-virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 xid, const
::com::sun::star::uno::Sequence ::rtl::OUString mime_types, const
::rtl::OUString interaction ) throw (::com::sun::star::uno::RuntimeException)
-{ throw ::com::sun::star::uno::RuntimeException(); }; // not
implemented
-virtual void SAL_CALL InstallFontconfigRessources( ::sal_uInt32
xid, const ::com::sun::star::uno::Sequence ::rtl::OUString resources, const
::rtl::OUString interaction ) throw (::com::sun::star::uno::RuntimeException)
-{ throw ::com::sun::star::uno::RuntimeException(); }; // not
implemented
-virtual void SAL_CALL InstalliGStreamerRessources( ::sal_uInt32
xid, const ::com::sun::star::uno::Sequence ::rtl::OUString resources, const
::rtl::OUString interaction ) throw (::com::sun::star::uno::RuntimeException)
-{ throw ::com::sun::star::uno::RuntimeException(); }; // not
implemented
-virtual void SAL_CALL InstallRessources( ::sal_uInt32 xid, const
::com::sun::star::uno::Sequence ::rtl::OUString types, const
::com::sun::star::uno::Sequence ::rtl::OUString resources, const
::rtl::OUString interaction ) throw (::com::sun::star::uno::RuntimeException)
-{ throw ::com::sun::star::uno::RuntimeException(); }; // not
implemented
-virtual void SAL_CALL RemovePackageByFiles( ::sal_uInt32 xid,
const ::com::sun::star::uno::Sequence ::rtl::OUString files, const
::rtl::OUString interaction ) throw
Re: [Libreoffice-qa] minutes of ESC call ...
On Fri, 2012-11-09 at 06:19 +0100, Lionel Elie Mamane wrote: On Thu, Nov 08, 2012 at 04:39:22PM +, Michael Meeks wrote: * 4.0 pending tasks + should we drop Rhino, Beanshell javascript in 4.0 ? (Michael) + could be turned into an extension + was in the past was turned off (Stephan) AA: + disable Rhino / Beanshell unless in experimental mode (Michael) + for future deprecation / removal. *Why*? Is there some problem with these scripting languages, are they hard to maintain, ...? When I last looked at Rhino (an impl. of Javascript in Java) it was rather under-maintained itself, and as one of those big-lumps-of-java not the loveliest thing to build, maintain use etc. IMHO gathering stats on whether anyone uses it is a sensible thing to do with a view to deprecation; clearly we don't want to pile up relatively pointless features, and encourage millions of people to download, install and not-use them for no good reason :-) At least, this was the thinking around not shipping the Logo stuff built-in IIRC - good to be consistent. Sorry the minutes were not terribly clear, nor (IMHO) did we reach a terribly clear conclusion on the logo topic - which is perhaps all to the best; it hadn't appeared on the list yet. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 56911] New: FORMATTING: import fichier pptx
https://bugs.freedesktop.org/show_bug.cgi?id=56911 Priority: medium Bug ID: 56911 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: import fichier pptx Severity: normal Classification: Unclassified OS: All Reporter: verbe...@orange.fr Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 3.6.3.2 release Component: Presentation Product: LibreOffice Problem description: problème d'affichage fichier pptx Steps to reproduce: 1. double clic sur le fichier pptx à ouvrir 2. 3. Current behavior: - aucun graphiques - pas de couleur sur la première diapo Expected behavior: affichage correct avec openoffice 3.3 Platform (if different from the browser): Browser: Mozilla/5.0 (Windows NT 6.1; rv:16.0) Gecko/20100101 Firefox/16.0 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56357] The language selection entry in Language Settings of Options dialogue adding an unknown character prefix and suffix
https://bugs.freedesktop.org/show_bug.cgi?id=56357 --- Comment #8 from LittleHo iania...@yahoo.com.tw --- I am source reporter of this bug, sorry my english level is not good, so Cheng-Chia Tseng help me to translate bug from chinese to english. thanks Cheng-Chia Tseng very much. my Environment is MacBook pro 13(intel mac) + MacOSX 10.7.5 Traditional Chinese （Taiwan） interface + libreoffice 3.6.2.2 Traditional Chinese （Taiwan） interface ， my system have（installed） four fonts BabelStone Han， BabelStone Modern ， TW-Sung-98_1（全字庫正宋體）， TW-Kai-98_1（全字庫正楷體）， they can display “LRE” “uni202A，“PDF”“uni202C perfectly。 this fonts is Necessary for me to process Traditional Chinese （Taiwan） Documents. useful link: http://www.babelstone.co.uk/fonts/index.html TW-Sung-98_1 TW-Kai-98_1 http://www.cns11643.gov.tw/AIDB/download.do?name=字型下載 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
