[MERGE FAILED] quiet external module build log unless failure
Norbert Thiebaud has submitted this change and it FAILED to merge. Change subject: quiet external module build log unless failure .. Your change could not be merged due to a path conflict. Please merge (or rebase) the change locally and upload the resolution for review. -- To view, visit https://gerrit.libreoffice.org/2304 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merge-failed Gerrit-Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/OfficeFilePicker.hxx | 25 + 1 file changed, 17 insertions(+), 8 deletions(-) New commits: commit c04c95958030bd4872fbbc0b3d4bc996fb041488 Author: Noel Grandin n...@peralex.com Date: Thu Feb 21 15:41:36 2013 +0200 fix for fdo#61187 ... CRASH when click 'Add' in EXTENSIONS Manager to open LibO File Dialog This one must have been broken for a long while, because it didn't even implement XFilePicker before. Change-Id: I7c5d4e4c3ba14f4c6dffa91a25a745e6ca51ec37 Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 2e90ebd..4feadbe 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -19,12 +19,10 @@ #ifndef INCLUDED_SVT_FILEPICKER_HXX #define INCLUDED_SVT_FILEPICKER_HXX -#include cppuhelper/implbase7.hxx +#include cppuhelper/implbase5.hxx #include com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp -#include com/sun/star/ui/dialogs/XFilePickerNotifier.hpp #include com/sun/star/ui/dialogs/XFilePreview.hpp -#include com/sun/star/ui/dialogs/XFilterManager.hpp -#include com/sun/star/ui/dialogs/XFilterGroupManager.hpp +#include com/sun/star/ui/dialogs/XFilePicker3.hpp #include com/sun/star/ui/dialogs/XFilePickerListener.hpp #include com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp #include com/sun/star/lang/XServiceInfo.hpp @@ -52,11 +50,9 @@ typedef ::com::sun::star::uno::Sequence OUString OUStringList; // can be t // class SvtFilePicker --- -typedef ::cppu::ImplHelper7 ::com::sun::star::ui::dialogs::XFilePickerControlAccess -, ::com::sun::star::ui::dialogs::XFilePickerNotifier +typedef ::cppu::ImplHelper5::com::sun::star::ui::dialogs::XFilePicker3 +, ::com::sun::star::ui::dialogs::XFilePickerControlAccess , ::com::sun::star::ui::dialogs::XFilePreview -, ::com::sun::star::ui::dialogs::XFilterManager -, ::com::sun::star::ui::dialogs::XFilterGroupManager , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::ui::dialogs::XAsynchronousExecutableDialog SvtFilePicker_Base; @@ -164,6 +160,19 @@ public: // virtual void SAL_CALL appendFilterGroup( const OUString sGroupTitle, const com::sun::star::uno::Sequence com::sun::star::beans::StringPair aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + + // +// these methods are here because they're ambiguous + // +virtual void SAL_CALL cancel() throw( ::com::sun::star::uno::RuntimeException ) + { ::svt::OCommonPicker::cancel(); } +virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ) + { ::svt::OCommonPicker::dispose(); } +virtual void SAL_CALL addEventListener(const com::sun::star::uno::Referencecom::sun::star::lang::XEventListener l) throw( ::com::sun::star::uno::RuntimeException ) + { ::svt::OCommonPicker::addEventListener(l); } +virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Referencecom::sun::star::lang::XEventListener l) throw( ::com::sun::star::uno::RuntimeException ) + { ::svt::OCommonPicker::removeEventListener(l); } + // // XInitialization functions // ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-accessibility] introduction
Hi Jonathan, Thanks a lot for your proposal. I'm sending your mail to the developers list so we are sure they are aware of it. Kind regards Sophie On 21/02/2013 23:33, Jonathan Nadeau wrote: Hello list, My name is Jonathan Nadeau and I'm the executive director of the Accessible Computing Foundation located here http://www.accessiblecomputingfoundation.org I'm looking to fund some developers to fix some accessibility bugs with Libreoffice and the Orca screen reader. I was hoping either someone on the list would be interested in fixing some bugs or that the list might know of some people that would like to earn some money to fix some bugs. Please let me know if this is not the right place to look for help or if there are any other suggestions. Thanks for your time and help. -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] quiet external module build log unless failure
Hello LibreOffice gerrit bot, David Tardon, David Ostrovsky, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2304 to look at the new patch set (#7). Change subject: quiet external module build log unless failure .. quiet external module build log unless failure ExternalProject usually involve a configure and a make step that produce a bunch of output usually irrelevant including a large number of warning and other mess. now that everything is pretty much in tail_build these output get interleaved with useful output from the build of the product and actually drown them in a logorrhea of messy noise. This store the output of external modules in a log file and only print them as a whole if the module failed do build. on a non-verbose build. Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647 --- M apache-commons/ExternalProject_apache_commons_codec.mk M apache-commons/ExternalProject_apache_commons_httpclient.mk M apache-commons/ExternalProject_apache_commons_lang.mk M apache-commons/ExternalProject_apache_commons_logging.mk M beanshell/ExternalProject_beanshell.mk M cairo/ExternalProject_cairo.mk M cairo/ExternalProject_pixman.mk M cppunit/ExternalProject_cppunit.mk M curl/ExternalProject_curl.mk M expat/ExternalProject_expat.mk M fontconfig/ExternalProject_fontconfig.mk M hsqldb/ExternalProject_hsqldb.mk M hunspell/ExternalProject_hunspell.mk M hyphen/ExternalProject_hyphen.mk M icu/ExternalProject_icu.mk M jfreereport/ExternalProject_jfreereport_flow_engine.mk M jfreereport/ExternalProject_jfreereport_flute.mk M jfreereport/ExternalProject_jfreereport_libbase.mk M jfreereport/ExternalProject_jfreereport_libfonts.mk M jfreereport/ExternalProject_jfreereport_libformula.mk M jfreereport/ExternalProject_jfreereport_liblayout.mk M jfreereport/ExternalProject_jfreereport_libloader.mk M jfreereport/ExternalProject_jfreereport_librepository.mk M jfreereport/ExternalProject_jfreereport_libserializer.mk M jfreereport/ExternalProject_jfreereport_libxml.mk M jfreereport/ExternalProject_jfreereport_sac.mk M lcms2/ExternalProject_lcms2.mk M libcdr/ExternalProject_libcdr.mk M libexttextcat/ExternalProject_exttextcat.mk M liblangtag/ExternalProject_langtag.mk M libmspub/ExternalProject_libmspub.mk M liborcus/ExternalProject_liborcus.mk M libvisio/ExternalProject_libvisio.mk M libwpd/ExternalProject_libwpd.mk M libxml2/ExternalProject_xml2.mk M libxmlsec/ExternalProject_xmlsec.mk M libxslt/ExternalProject_xslt.mk M lpsolve/ExternalProject_lpsolve.mk M mythes/ExternalProject_mythes.mk M nss/ExternalProject_nss.mk M openldap/ExternalProject_openldap.mk M openssl/ExternalProject_openssl.mk M postgresql/ExternalProject_postgresql.mk M python3/ExternalProject_python3.mk M pyuno/CustomTarget_zipcore.mk M redland/ExternalProject_raptor.mk M redland/ExternalProject_rasqal.mk M redland/ExternalProject_redland.mk M rhino/ExternalProject_rhino.mk M solenv/gbuild/ExternalProject.mk M solenv/gbuild/Helper.mk M solenv/gbuild/gbuild.mk M tomcat/ExternalProject_tomcat.mk M xpdf/ExternalProject_xpdf.mk 54 files changed, 934 insertions(+), 910 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/2304/7 -- To view, visit https://gerrit.libreoffice.org/2304 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647 Gerrit-PatchSet: 7 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] [PUSHED] quiet external module build log unless failure
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2304 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2304 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647 Gerrit-PatchSet: 8 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - extras/CustomTarget_autocorr.mk extras/source extras/Zip_autocorr.mk
extras/CustomTarget_autocorr.mk|7 extras/Zip_autocorr.mk |1 extras/source/autotext/lang/ca/acor/BlockList.xml | 17 extras/source/autotext/lang/ca/acor/DocumentList.xml | 355 + extras/source/autotext/lang/ca/acor/META-INF/manifest.xml | 17 extras/source/autotext/lang/ca/acor/SentenceExceptList.xml | 173 ++ extras/source/autotext/lang/ca/acor/WordExceptList.xml | 15 7 files changed, 585 insertions(+) New commits: commit d66ade0944ddedc7d802518a74f9eaf3c6913499 Author: Andras Timar ati...@suse.com Date: Fri Feb 22 09:24:26 2013 +0100 fdo#61138 add Catalan autocorrection data to makefiles Change-Id: I88dabffc98825d6e7df14165d448302697cebe21 diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk index bb40d73..b04bebf 100644 --- a/extras/CustomTarget_autocorr.mk +++ b/extras/CustomTarget_autocorr.mk @@ -12,6 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,extras/source/autotext)) extras_AUTOCORR_LANGS := \ af-ZA:af-ZA \ bg:bg-BG \ + ca:ca \ cs:cs-CZ \ da:da-DK \ de:de-DE \ @@ -61,6 +62,11 @@ extras_AUTOCORR_XMLFILES := \ bg/acor/META-INF/manifest.xml \ bg/acor/SentenceExceptList.xml \ bg/acor/WordExceptList.xml \ + ca/acor/BlockList.xml \ + ca/acor/DocumentList.xml \ + ca/acor/META-INF/manifest.xml \ + ca/acor/SentenceExceptList.xml \ + ca/acor/WordExceptList.xml \ cs/acor/BlockList.xml \ cs/acor/DocumentList.xml \ cs/acor/META-INF/manifest.xml \ @@ -228,6 +234,7 @@ extras_AUTOCORR_XMLFILES := \ extras_AUTOCORR_MIMETYPEFILES := \ af-ZA/acor/mimetype \ bg/acor/mimetype \ + ca/acor/mimetype \ cs/acor/mimetype \ da/acor/mimetype \ de/acor/mimetype \ diff --git a/extras/Zip_autocorr.mk b/extras/Zip_autocorr.mk index 8decc51..adf5651 100644 --- a/extras/Zip_autocorr.mk +++ b/extras/Zip_autocorr.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Zip_add_files,autocorr,\ acor_af-ZA.dat \ acor_bg-BG.dat \ acor_cs-CZ.dat \ + acor_ca.dat \ acor_da-DK.dat \ acor_de-DE.dat \ acor_en-AU.dat \ commit 860663f22a1a4bee420ecf3d84b759a6f68c4b51 Author: Joan Montane j...@montane.cat Date: Fri Feb 22 09:11:54 2013 +0100 fdo#61138 add Catalan autocorrection data Change-Id: I5f28e8968bc993c2f5b545919f1a26929038f882 diff --git a/extras/source/autotext/lang/ca/acor/BlockList.xml b/extras/source/autotext/lang/ca/acor/BlockList.xml new file mode 100644 index 000..9344bf7 --- /dev/null +++ b/extras/source/autotext/lang/ca/acor/BlockList.xml @@ -0,0 +1,17 @@ +?xml version=1.0 encoding=utf-8? +!-- + * 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/. + * +-- +block-list:block-list xmlns:block-list=http://openoffice.org/2001/block-list; block-list:list-name=acor_ca + block-list:block block-list:abbreviated-name=--gt; block-list:package-name=+AC0ALQA+- block-list:name=--gt; block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=-gt; block-list:package-name=+AC0APg- block-list:name=-gt; block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=lt;- block-list:package-name=+ADwALQ- block-list:name=lt;- block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=lt;-- block-list:package-name=+ADwALQAt- block-list:name=lt;-- block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=lt;--gt; block-list:package-name=+ADwALQAtAD4- block-list:name=lt;--gt; block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=lt;-gt; block-list:package-name=+ADwALQA+- block-list:name=lt;-gt; block-list:unformatted-text=false/ +/block-list:block-list diff --git a/extras/source/autotext/lang/ca/acor/DocumentList.xml b/extras/source/autotext/lang/ca/acor/DocumentList.xml new file mode 100644 index 000..826fc46 --- /dev/null +++ b/extras/source/autotext/lang/ca/acor/DocumentList.xml @@ -0,0 +1,355 @@ +?xml version=1.0 encoding=utf-8? +!-- + * 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/. + * +-- +!--- + +Aquest document és (c)2013 Jordi Mas i Hernà ndez j...@softcatala.org. + +Han col·laborat Jordi Jover jord...@softcatala.org, Joan Moratinos + j...@softcatala.org i Joan Montane jmont...@softcatala.org + + Es permet l'ús, distribució i modificació d'aquest document d'acord + amb la GNU
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dochdl/gloshdl.cxx |2 - sw/source/ui/inc/gloslst.hxx |2 - sw/source/ui/inc/initui.hxx |2 - sw/source/ui/inc/navipi.hxx |4 +- sw/source/ui/ribbar/workctrl.cxx |2 - sw/source/ui/utlui/content.cxx | 58 +++ sw/source/ui/utlui/glbltree.cxx | 24 sw/source/ui/utlui/gloslst.cxx |4 +- sw/source/ui/utlui/initui.cxx|2 - sw/source/ui/utlui/navipi.cxx| 20 ++--- 10 files changed, 60 insertions(+), 60 deletions(-) New commits: commit 59e8e8151ae1f13a5a08d0af81c499413c15bc4d Author: Takeshi Abe t...@fixedpoint.jp Date: Fri Feb 22 15:10:30 2013 +0900 sal_Bool to bool Change-Id: I33bb3e133b49fad6503aace3afda65c3b3371da9 diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index a56454d..dac5f79 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -437,7 +437,7 @@ sal_Bool SwGlossaryHdl::Expand( const String rShortName, { // get group name with path-extension String sTitle; -String sGroupName = pGlossaryList-GetGroupName(i - 1, sal_False, sTitle); +String sGroupName = pGlossaryList-GetGroupName(i - 1, false, sTitle); if(sGroupName == pGlossary-GetName()) continue; sal_uInt16 nBlockCount = pGlossaryList-GetBlockCount(i -1); diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index 97e8ec1..e0ccd23 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -61,7 +61,7 @@ public: String rShortName, String rGroupName ); sal_uInt16 GetGroupCount(); -String GetGroupName(sal_uInt16 nPos, sal_Bool bNoPath = sal_True, String* pTitle = 0); +String GetGroupName(sal_uInt16 nPos, bool bNoPath = true, String* pTitle = 0); sal_uInt16 GetBlockCount(sal_uInt16 nGroup); String GetBlockName(sal_uInt16 nGroup, sal_uInt16 nBlock, String rShortName); diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/ui/inc/initui.hxx index 62604eb..31f355b 100644 --- a/sw/source/ui/inc/initui.hxx +++ b/sw/source/ui/inc/initui.hxx @@ -60,7 +60,7 @@ SW_DLLPUBLIC SwGlossaries* GetGlossaries(); class SwGlossaryList; -sal_Bool HasGlossaryList(); +bool HasGlossaryList(); SwGlossaryList* GetGlossaryList(); extern void _InitUI(); diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index 1d1489c..1082a6a 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -150,7 +150,7 @@ public: voidUpdate() { FillBox(); } voidUpdateListBox(); -voidMoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, sal_Bool bWithCilds); +voidMoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, bool bWithCilds); virtual voidStateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); @@ -168,7 +168,7 @@ public: sal_BoolIsGlobalMode() const {returnbGlobalMode;} SwView* GetCreateView() const; -voidCreateNavigationTool(const Rectangle rRect, sal_Bool bSetFocus); +voidCreateNavigationTool(const Rectangle rRect, bool bSetFocus); }; class SwNavigationChild : public SfxChildWindowContext diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index e9373a7..17b170e 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -304,7 +304,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu) SwGlossaryList* pGlossaryList = ::GetGlossaryList(); String sShortName; -String sGroup = pGlossaryList-GetGroupName(nBlock - 1, sal_False); +String sGroup = pGlossaryList-GetGroupName(nBlock - 1, false); SwGlossaryHdl* pGlosHdl = pView-GetGlosHdl(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 50e4089..07502f07 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -277,7 +277,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) { SwContentArr* pOldMember = 0; sal_uInt16 nOldRegionCount = 0; -sal_Bool bInvalidate = sal_False; +bool bInvalidate = false; if(!pMember) pMember = new SwContentArr; else if(!pMember-empty()) @@ -320,7 +320,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) if(nOldRegionCount nPos ((*pOldMember)[nPos])-IsInvisible() != pCnt-IsInvisible()) -bInvalidate = sal_True; +
[Libreoffice-commits] core.git: filter/source fpicker/source offapi/com starmath/source sw/source vcl/inc vcl/unx
filter/source/graphicfilter/ipcd/ipcd.cxx |2 +- filter/source/graphicfilter/itiff/itiff.cxx |2 +- fpicker/source/win32/filepicker/helppopupwindow.cxx |2 +- offapi/com/sun/star/ui/dialogs/XFilePreview.idl |2 +- starmath/source/node.cxx|4 ++-- sw/source/core/layout/tabfrm.cxx|2 +- vcl/inc/ilstbox.hxx |2 +- vcl/unx/gtk/window/gtkframe.cxx |2 +- 8 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 78425b0df6462a3c63c3b0241f0d71d464bb7b0c Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 22 10:14:47 2013 +0200 s/heigth/height/ Change-Id: Idfc117f3026d45845dcce64d31aad6fc0af9c00a diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 4f6a334..c5ec1a7 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -59,7 +59,7 @@ private: PCDResolution eResolution;// which resolution we want sal_uLong nWidth; // width of the PCD picture -sal_uLong nHeight;// heigth of the PCD picture +sal_uLong nHeight;// height of the PCD picture sal_uLong nImagePos; // position of the picture within the PCD file // temporary lLue-Green-Red-Bitmap diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 55b7182..1a45750 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -68,7 +68,7 @@ private: sal_uLong nNewSubFile;// sal_uLong nSubFile; // sal_uLong nImageWidth;// picture width in pixels -sal_uLong nImageLength; // picture heigth in pixels +sal_uLong nImageLength; // picture height in pixels sal_uLong nBitsPerSample; // bits per pixel per layer sal_uLong nCompression; // kind of compression sal_uLong nPhotometricInterpretation; // diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx index 7b0ddf2..c0f70a7 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.cxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx @@ -123,7 +123,7 @@ void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y ) { OSL_ENSURE( NULL == m_hwnd, method should not be called twice in sequence ); -// we create a window with length and heigth of 0 +// we create a window with length and height of 0 // first in order to get a device context of this // window, then we calculate the upper left corner // and the dimensions and resize the window diff --git a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl index 10b88b6..c6d749b 100644 --- a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl +++ b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl @@ -65,7 +65,7 @@ published interface XFilePreview: com::sun::star::uno::XInterface 0 will be returned. @returns -The heigth of the preview window in pixel. +The height of the preview window in pixel. */ long getAvailableHeight( ); diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 6710666..3e0ddb2 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2680,7 +2680,7 @@ void SmMathSymbolNode::AdaptToY(const OutputDevice rDev, sal_uLong nHeight) GetFont().FreezeBorderWidth(); Size aFntSize (GetFont().GetSize()); -// Since we only want to scale the heigth, we might have +// Since we only want to scale the height, we might have // to determine the font width in order to keep it if (aFntSize.Width() == 0) { @@ -3056,7 +3056,7 @@ void SmBlankNode::Arrange(const OutputDevice rDev, const SmFormat rFormat) SmTmpDevice aTmpDev ((OutputDevice ) rDev, true); aTmpDev.SetFont(GetFont()); -// make distance depend on the font heigth +// make distance depend on the font height // (so that it increases when scaling (e.g. size *2 {a ~ b}) long nDist = GetFont().GetSize().Height() / 10L, nSpace = nNum * nDist; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index ac641d0..3e9a642 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -5565,7 +5565,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const nKeepHeight = lcl_GetHeightOfRows( GetLower(), nKeepRows ); } -// For master tables, the height of the headlines + the heigth of the +// For
[Libreoffice-commits] core.git: 5 commits - cui/source cui/uiconfig cui/UI_cui.mk extras/source sw/uiconfig
cui/UI_cui.mk |1 cui/source/customize/cfg.cxx| 40 ++ cui/source/customize/cfg.hrc|3 cui/source/customize/cfg.src| 60 - cui/source/inc/cfg.hxx | 26 ++-- cui/uiconfig/ui/borderpage.ui |4 cui/uiconfig/ui/effectspage.ui | 57 ++--- cui/uiconfig/ui/name.ui | 167 -- cui/uiconfig/ui/newtoolbardialog.ui | 175 cui/uiconfig/ui/zoomdialog.ui |4 extras/source/glade/libreoffice-catalog.xml |6 sw/uiconfig/swriter/ui/insertbreak.ui | 44 ++- sw/uiconfig/swriter/ui/insertscript.ui | 21 --- 13 files changed, 278 insertions(+), 330 deletions(-) New commits: commit 6fb6bc4b4e45df954dc0ee0d5a53d35dae686fa0 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 21 21:44:07 2013 + adapt code to New Toolbar Dialog .ui conversion Change-Id: Ie1b7a0cf5fbb9dbfc04a07bb58d5f55f83a096f3 diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk index b255d76..9e3a396 100644 --- a/cui/UI_cui.mk +++ b/cui/UI_cui.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\ cui/uiconfig/ui/messbox \ cui/uiconfig/ui/namedialog \ cui/uiconfig/ui/newtabledialog \ + cui/uiconfig/ui/newtoolbardialog \ cui/uiconfig/ui/numberingformatpage \ cui/uiconfig/ui/numberingoptionspage \ cui/uiconfig/ui/numberingpositionpage \ diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 20956ae..dd01214 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -4653,24 +4653,24 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton ) SaveInData* pData = (SaveInData*) aSaveInListBox.GetEntryData( i ); -nInsertPos = pNameDialog-aSaveInListBox.InsertEntry( +nInsertPos = pNameDialog-m_pSaveInListBox-InsertEntry( aSaveInListBox.GetEntry( i ) ); -pNameDialog-aSaveInListBox.SetEntryData( nInsertPos, pData ); +pNameDialog-m_pSaveInListBox-SetEntryData( nInsertPos, pData ); } -pNameDialog-aSaveInListBox.SelectEntryPos( +pNameDialog-m_pSaveInListBox-SelectEntryPos( aSaveInListBox.GetSelectEntryPos(), sal_True ); bool ret = pNameDialog-Execute(); if ( ret == RET_OK ) { -pNameDialog-GetName( aNewName ); +aNewName = pNameDialog-GetName(); -nInsertPos = pNameDialog-aSaveInListBox.GetSelectEntryPos(); +nInsertPos = pNameDialog-m_pSaveInListBox-GetSelectEntryPos(); ToolbarSaveInData* pData = (ToolbarSaveInData*) -pNameDialog-aSaveInListBox.GetEntryData( nInsertPos ); +pNameDialog-m_pSaveInListBox-GetEntryData( nInsertPos ); if ( GetSaveInData() != pData ) { @@ -4954,24 +4954,16 @@ sal_Bool SvxToolbarEntriesListBox::NotifyCopying( return sal_False; } -SvxNewToolbarDialog::SvxNewToolbarDialog( -Window* pWindow, const String rName ) -: -ModalDialog ( pWindow, CUI_RES( MD_NEW_TOOLBAR ) ), -aFtDescription ( this, CUI_RES( FT_NAME ) ), -aEdtName( this, CUI_RES( EDT_STRING ) ), -aSaveInText ( this, CUI_RES( TXT_SAVEIN ) ), -aBtnOK ( this, CUI_RES( BTN_OK ) ), -aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), -aBtnHelp( this, CUI_RES( BTN_HELP ) ), -aSaveInListBox ( this, CUI_RES( LB_SAVEIN ) ) +SvxNewToolbarDialog::SvxNewToolbarDialog(Window* pWindow, const OUString rName) +: ModalDialog(pWindow, NewToolbarDialog, cui/ui/newtoolbardialog.ui) { -FreeResource(); - -aEdtName.SetText( rName ); -aEdtName.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); -ModifyHdl(aEdtName); -aEdtName.SetModifyHdl(LINK(this, SvxNewToolbarDialog, ModifyHdl)); +get(m_pEdtName, edit); +get(m_pBtnOK, ok); +get(m_pSaveInListBox, savein); +m_pEdtName-SetText( rName ); +m_pEdtName-SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); +ModifyHdl(m_pEdtName); +m_pEdtName-SetModifyHdl(LINK(this, SvxNewToolbarDialog, ModifyHdl)); } IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit) @@ -4979,7 +4971,7 @@ IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit) (void)pEdit; if(aCheckNameHdl.IsSet()) -aBtnOK.Enable(aCheckNameHdl.Call(this) 0); +m_pBtnOK-Enable(aCheckNameHdl.Call(this) 0); return 0; } diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc index 64e0cef..7db7f26 100644 --- a/cui/source/customize/cfg.hrc +++ b/cui/source/customize/cfg.hrc @@ -79,12 +79,9 @@ #define BTN_IMPORT (97 + CFG_OFFSET) #define IMAGE_BTN_COLOR (98 + CFG_OFFSET) -#define MD_NEW_TOOLBAR (101 + CFG_OFFSET) -#define EDT_STRING (102 + CFG_OFFSET) #define BTN_OK (103 + CFG_OFFSET) #define BTN_CANCEL (104 +
Implementing alternate compatibility functions (such as 0^0 = ERROR)
Hello, I've seen this was implemented in Apache Openoffice recently. Probably we can just merge it into Libreoffice. Commit: http://cgit.freedesktop.org/libreoffice/core/commit/?h=aoo/trunkid=908088f614cda46d9c996e40579611df27276394 Regards, Xisco ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 443f058da182e83bb2099a8aacfecff90d94a9a2 Author: Andras Timar ati...@suse.com Date: Fri Feb 22 10:03:18 2013 +0100 Updated core Project: dictionaries 892bb8a4b02d261d9fda2648f595139c06b59913 diff --git a/dictionaries b/dictionaries index 350dc59..892bb8a 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 350dc590b04041f15d6c570075ade425e4db93ad +Subproject commit 892bb8a4b02d261d9fda2648f595139c06b59913 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|5 - source/text/shared/guide/edit_symbolbar.xhp |4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) New commits: commit 289af485bb9a21cb97426c7721ff144f1392edf6 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 09:07:42 2013 + update help ids for new toolbar dialog .ui conversion Change-Id: Ide65e39610b7b86dc1d1e20e20c98a1130ae93b6 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e4dd7c2..4a86eec 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3874,8 +3874,6 @@ HID_SVX_MDLG_ERR_REP_OPTIONS,40036, HID_SVX_MDLG_ERR_REP_PREVIEW,40037, HID_SVX_MODIFY_TOOLBAR,40051, HID_SVX_MODIFY_TOOLBAR_ITEM,40041, -HID_SVX_NEW_TOOLBAR,40050, -HID_SVX_NEW_TOOLBAR_ITEM,40052, HID_SVX_OPTIONS_ONLINEUPDATE,40054, HID_SVX_SAVE_IN,40042, HID_SVX_TABDLG_DOCRECOVERY,40029, @@ -7656,7 +7654,6 @@ svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_FRAMENAME,1598212100, svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_URL,1598212102, svx_Edit_MD_LINKEDIT_ED_FULL_SOURCE_NAME,1598097409, svx_Edit_MD_MENU_ORGANISER_EDIT_MENU_NAME,1079953796, -svx_Edit_MD_NEW_TOOLBAR_EDT_STRING,1080314258, svx_Edit_RID_DLG_NEWLIB_ED_LIBNAME,1242335246, svx_Edit_RID_OFAPAGE_AUTOCORR_EXCEPT_ED_ABBREV,808912913, svx_Edit_RID_OFAPAGE_AUTOCORR_EXCEPT_ED_DOUBLE_CAPS,808912918, @@ -7817,7 +7814,6 @@ svx_ImageButton_RID_SVXPAGE_TEXTANIMATION_BTN_UP,703737345, svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_HORZ,1238295050, svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_VERT,1238295052, svx_ListBox_DLG_CHINESEDICTIONARY_LB_PROPERTY,1078676993, -svx_ListBox_MD_NEW_TOOLBAR_LB_SAVEIN,1080315716, svx_ListBox_MD_PASTE_OBJECT_LB_INSERT_LIST,1598049799, svx_ListBox_OFA_TP_LANGUAGES_LB_ASIAN_LANG,810569224, svx_ListBox_OFA_TP_LANGUAGES_LB_COMPLEX_LANG,810569226, @@ -8103,7 +8099,6 @@ svx_ModalDialog_MD_ICONCHANGE,1080606720, svx_ModalDialog_MD_INSERT_OBJECT_APPLET,1598177280, svx_ModalDialog_MD_INSERT_OBJECT_IFRAME,1598210048, svx_ModalDialog_MD_LINKEDIT,1598095360, -svx_ModalDialog_MD_NEW_TOOLBAR,1080311808, svx_ModalDialog_MD_PASTE_OBJECT,1598046208, svx_ModalDialog_MD_UPDATE_BASELINKS,1598062592, svx_ModalDialog_RID_DEFAULTABOUT,1078001664, diff --git a/source/text/shared/guide/edit_symbolbar.xhp b/source/text/shared/guide/edit_symbolbar.xhp index 4cc8eb2..f99690b 100644 --- a/source/text/shared/guide/edit_symbolbar.xhp +++ b/source/text/shared/guide/edit_symbolbar.xhp @@ -35,7 +35,9 @@ bookmark_valueconfiguring; toolbars/bookmark_value bookmark_valueediting; toolbars/bookmark_value bookmark_valueinserting;buttons in toolbars/bookmark_value -/bookmarkcommentMW changed adding; to inserting;/commentparagraph role=heading id=hd_id3159201 xml-lang=en-US level=1 l10n=U oldref=79variable id=edit_symbolbarlink href=text/shared/guide/edit_symbolbar.xhp name=Adding Buttons to ToolbarsAdding Buttons to Toolbars/link +/bookmark +bookmark xml-lang=en-US branch=hid/cui/ui/newtoolbardialog/NewToolbarDialog id=bm_id3148647 localize=false/ +paragraph role=heading id=hd_id3159201 xml-lang=en-US level=1 l10n=U oldref=79variable id=edit_symbolbarlink href=text/shared/guide/edit_symbolbar.xhp name=Adding Buttons to ToolbarsAdding Buttons to Toolbars/link /variable/paragraph section id=edtext paragraph role=heading id=hd_id3153561 xml-lang=en-US level=3 l10n=U oldref=85To add a button to a toolbar:/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a70d4856366fca2502b7f248db224f0f2d59a80c Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 09:07:42 2013 + Updated core Project: help 289af485bb9a21cb97426c7721ff144f1392edf6 diff --git a/helpcontent2 b/helpcontent2 index 7a607b7..289af48 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7a607b7a563b85f5c0b884e8c32c4791c14cd66f +Subproject commit 289af485bb9a21cb97426c7721ff144f1392edf6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit ea4581a914cb1aad29f16b73e35350f05f8adc1c Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Feb 22 10:08:44 2013 +0100 We need to escape special characters in slide names diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx index 4474b48..d166a09 100644 --- a/writerperfect/source/filter/OdgGenerator.cxx +++ b/writerperfect/source/filter/OdgGenerator.cxx @@ -665,12 +665,10 @@ void OdgGenerator::startGraphics(const ::WPXPropertyList propList) WPXString sValue; if (propList[draw:name]) -pDrawPageOpenElement-addAttribute(draw:name, propList[draw:name]-getStr()); +sValue = WPXString(propList[draw:name]-getStr(), true); // escape special xml characters else -{ sValue.sprintf(page%i, mpImpl-miPageIndex); -pDrawPageOpenElement-addAttribute(draw:name, sValue); -} +pDrawPageOpenElement-addAttribute(draw:name, sValue); #ifdef MULTIPAGE_WORKAROUND pStyleMasterPageOpenElement-addAttribute(style:page-layout-name, PM0); pStylePageLayoutOpenElement-addAttribute(style:page-layout-name, PM0); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl sal/qa sal/rtl sal/textenc
sal/osl/unx/file_url.cxx |2 +- sal/osl/unx/process.cxx |2 +- sal/osl/unx/salinit.cxx |2 +- sal/osl/w32/file_dirvol.cxx |4 ++-- sal/osl/w32/file_url.cxx |2 +- sal/osl/w32/module.cxx|2 +- sal/osl/w32/process.cxx |2 +- sal/osl/w32/profile.cxx |2 +- sal/qa/osl/file/osl_File.cxx | 14 +++--- sal/qa/osl/mutex/osl_Mutex.cxx| 14 +++--- sal/qa/osl/pipe/osl_Pipe.cxx |6 +++--- sal/qa/osl/socket/osl_ConnectorSocket.cxx |2 +- sal/qa/osl/socket/osl_Socket.cxx |8 sal/qa/osl/socket/osl_SocketAddr.cxx |4 ++-- sal/qa/osl/socket/osl_StreamSocket.cxx|8 sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx|2 +- sal/qa/rtl_strings/rtl_OUString.cxx |2 +- sal/rtl/source/unload.cxx |2 +- sal/textenc/tcvtmb.cxx|2 +- sal/textenc/tcvtutf8.cxx |2 +- 20 files changed, 42 insertions(+), 42 deletions(-) New commits: commit fc090acf829d0053c0a611acd73f08b51128031d Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 22 11:13:56 2013 +0200 Fix misspellings detected by https://github.com/lyda/misspell-check Just as a test to check the usefulness of that tool. It needs some improvement before really usable. Change-Id: I875e79c1992ed5f3b695736b0d49938ad0ba2d55 diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index 7c28b8c..203d17f 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -182,7 +182,7 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt { nOffset += nIndex; -/* break url down in '/' devided tokens tokens */ +/* break url down in '/' divided tokens tokens */ nIndex = rtl_ustr_indexOfChar_WithLength( ustrFileURL-buffer + nOffset, ustrFileURL-length - nOffset, (sal_Unicode) '/' ); /* copy token to new string */ diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index cf246c5..aa71c36 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -1158,7 +1158,7 @@ static int is_timeout(const struct timeval* tend) } /** - kill(pid, 0) is usefull for checking if a + kill(pid, 0) is useful for checking if a process is still alive, but remember that kill even returns 0 if the process is already a zombie. diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx index 4211d08..49fddea 100644 --- a/sal/osl/unx/salinit.cxx +++ b/sal/osl/unx/salinit.cxx @@ -46,7 +46,7 @@ void sal_detail_initialize(int argc, char ** argv) { // https://bugs.freedesktop.org/show_bug.cgi?id=50603 Unable to update // LibreOffice without resetting user profile). But closing fds in // restartOnMac before calling exec does not work, as additional threads -// might still be running then, wich can still use those fds and cause +// might still be running then, which can still use those fds and cause // crashes. Therefore, the simples solution is to close fds at process // start (as early as possible, so that no other threads have been created // yet that might already have opened some fds); this is done for all kinds diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 89d286b..5d8c3a5 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -491,7 +491,7 @@ static oslFileError osl_openLocalRoot( ZeroMemory( pDirImpl, sizeof(Directory_Impl) ); rtl_uString_newFromString( pDirImpl-m_pDirectoryPath, strSysPath ); -/* Append backslash if neccessary */ +/* Append backslash if necessary */ /* @@@ToDo use function ensure backslash @@ -556,7 +556,7 @@ static oslFileError SAL_CALL osl_openFileDirectory( ZeroMemory( pDirImpl, sizeof(Directory_Impl) ); rtl_uString_newFromString( pDirImpl-m_pDirectoryPath, strDirectoryPath ); -/* Append backslash if neccessary */ +/* Append backslash if necessary */ /* @@@ToDo use function ensure backslash diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx index 2527cbd..324eca1 100644 --- a/sal/osl/w32/file_url.cxx +++ b/sal/osl/w32/file_url.cxx @@ -998,7 +998,7 @@ oslFileError SAL_CALL osl_searchFileURL( LPCTSTR lpszSearchFile = reinterpret_castLPCTSTR(ustrSysPath-buffer); /* Allocate space for buffer according to previous returned count of required chars */ -/* +1 is not neccessary if we follow MSDN documentation but for robustness we do so */ +/* +1 is not necessary if we follow MSDN documentation but for robustness we do so */ nBufferLength = dwResult + 1;
Re: Implementing alternate compatibility functions (such as 0^0 = ERROR)
I've seen this was implemented in Apache Openoffice recently. Probably we can just merge it into Libreoffice. And you did not notice the flood of useless discussion that ensued on the AOO list, with one contributor (partially) leaving AOO? PLEASE STOP THIS DISCUSSION NOW! ;) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
gerrit reboot
Hello, once again, a pending kernel update requires a reboot of the VM host where gerrit is running on, leading to an outage of 5 minutes approximately. I will install this update this evening, at around 1800 UTC, unless someone objects. Please write directly to hostmas...@documentfoundation.org, so I don't miss any mail. Thanks, Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
short downtime of bilbo (again)
Hello, since last time our ISP did not change the disk, we will have a short downtime of bilbo again, our mail server for mail, mailing lists and downloads. This time, the disk will be replaced. In parallel, I'll now order the replacement hardware for bilbo, so those painful and extremely odd disk outages hopefully vanish in the future. Because of the frequent disk outages, I expect some other hardware problem, hopefully cured by a shiny new server. Admins are available at #tdf-infra on Freenode during the outage. Sorry for any inconveniences, Florian (who probaly should invest in shares of SSD vendors...) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9d7a8bc5ab4adfe583cdeadabcb8164990fec7b9 Author: Andras Timar ati...@suse.com Date: Fri Feb 22 10:03:18 2013 +0100 Updated core Project: dictionaries 05601c2395351070ebb4c690a207faa97bcb6ed7 fdo#61139 update Catalan dictionaries Change-Id: If4595c3d94803b22e1f0b635a623260715696230 Reviewed-on: https://gerrit.libreoffice.org/2331 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dictionaries b/dictionaries index 8669b40..05601c2 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 8669b40a8835c007682507d1efd06f7f24452226 +Subproject commit 05601c2395351070ebb4c690a207faa97bcb6ed7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extras/source
extras/source/autotext/lang/ca/acor/BlockList.xml | 17 extras/source/autotext/lang/ca/acor/DocumentList.xml | 355 + extras/source/autotext/lang/ca/acor/META-INF/manifest.xml | 17 extras/source/autotext/lang/ca/acor/SentenceExceptList.xml | 173 ++ extras/source/autotext/lang/ca/acor/WordExceptList.xml | 15 5 files changed, 577 insertions(+) New commits: commit 4bed5266e90d1741894acf2521c0219a1925105c Author: Joan Montane j...@montane.cat Date: Fri Feb 22 09:11:54 2013 +0100 fdo#61138 add Catalan autocorrection data Change-Id: I5f28e8968bc993c2f5b545919f1a26929038f882 Reviewed-on: https://gerrit.libreoffice.org/2328 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extras/source/autotext/lang/ca/acor/BlockList.xml b/extras/source/autotext/lang/ca/acor/BlockList.xml new file mode 100644 index 000..9344bf7 --- /dev/null +++ b/extras/source/autotext/lang/ca/acor/BlockList.xml @@ -0,0 +1,17 @@ +?xml version=1.0 encoding=utf-8? +!-- + * 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/. + * +-- +block-list:block-list xmlns:block-list=http://openoffice.org/2001/block-list; block-list:list-name=acor_ca + block-list:block block-list:abbreviated-name=--gt; block-list:package-name=+AC0ALQA+- block-list:name=--gt; block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=-gt; block-list:package-name=+AC0APg- block-list:name=-gt; block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=lt;- block-list:package-name=+ADwALQ- block-list:name=lt;- block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=lt;-- block-list:package-name=+ADwALQAt- block-list:name=lt;-- block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=lt;--gt; block-list:package-name=+ADwALQAtAD4- block-list:name=lt;--gt; block-list:unformatted-text=false/ + block-list:block block-list:abbreviated-name=lt;-gt; block-list:package-name=+ADwALQA+- block-list:name=lt;-gt; block-list:unformatted-text=false/ +/block-list:block-list diff --git a/extras/source/autotext/lang/ca/acor/DocumentList.xml b/extras/source/autotext/lang/ca/acor/DocumentList.xml new file mode 100644 index 000..826fc46 --- /dev/null +++ b/extras/source/autotext/lang/ca/acor/DocumentList.xml @@ -0,0 +1,355 @@ +?xml version=1.0 encoding=utf-8? +!-- + * 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/. + * +-- +!--- + +Aquest document és (c)2013 Jordi Mas i Hernà ndez j...@softcatala.org. + +Han col·laborat Jordi Jover jord...@softcatala.org, Joan Moratinos + j...@softcatala.org i Joan Montane jmont...@softcatala.org + + Es permet l'ús, distribució i modificació d'aquest document d'acord + amb la GNU Lesser General Public License versió 3.0 o superior publicada + per la Free Software Foundation o la Mozilla Public Licences versió 2.0 +o superior publicada per la Mozilla Foundation, a la vostra elecció. + + Requisits: + + 1. Al ser un sistema automà tic no volem que les correccions pugin + introduir nous errors. Per aquest motiu, per exemple, no es fa substitució + automà tica de barbarismes quan el gènere de la incorrecció és diferent + al del mot correcte. + + 2. Volem que la llista contingui aproximadament un 200 mots per no relantizar + el funcionament del LibreOffice. + + 3. Volem que sigui capaç de corregir els errors més comuns fent un + blanceig entre anà lisi estadÃstic, errors tipogrà fics comuns, i errades + documentades en reculls lingüÃstics. + + PART 1. Implementació: + + Per elaborar aquesta part s'ha creat un corpus amb uns 10.000 documents + provinents d'Internet i s'han escollit les paraules amb una freqüència (tf, term + frequency) d'aparició més alta. Un cop classificades s'han seguit els següents criteris: + + 1. Que podem escriure sense accent i que només tenen un forma correcta. + + 2. Que s'escriuen amb doble ss i poden ser escrites amb una s + + 3. Que s'escriuen amb doble mm i poden ser escrites amb nm per influència del castellà + + 4. Que s'escriuen amb diesi i que poden ser escrites sense + + 5. Que s'escriuen amb ela geminada i que poden ser escrites sense + + PART 2. Errors tipogrà fics comuns + + PART 3. Barbarimes. S'han intentat escollir els barbarismes més comuns + + PART 4. Errors comuns registrats a diferents reculls
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - extras/CustomTarget_autocorr.mk extras/Zip_autocorr.mk
extras/CustomTarget_autocorr.mk |7 +++ extras/Zip_autocorr.mk |1 + 2 files changed, 8 insertions(+) New commits: commit ffc603cb1b5cc5a4a2098e1d9057f52aa6bdc392 Author: Andras Timar ati...@suse.com Date: Fri Feb 22 09:24:26 2013 +0100 fdo#61138 add Catalan autocorrection data to makefiles Change-Id: I88dabffc98825d6e7df14165d448302697cebe21 Reviewed-on: https://gerrit.libreoffice.org/2329 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk index bb40d73..b04bebf 100644 --- a/extras/CustomTarget_autocorr.mk +++ b/extras/CustomTarget_autocorr.mk @@ -12,6 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,extras/source/autotext)) extras_AUTOCORR_LANGS := \ af-ZA:af-ZA \ bg:bg-BG \ + ca:ca \ cs:cs-CZ \ da:da-DK \ de:de-DE \ @@ -61,6 +62,11 @@ extras_AUTOCORR_XMLFILES := \ bg/acor/META-INF/manifest.xml \ bg/acor/SentenceExceptList.xml \ bg/acor/WordExceptList.xml \ + ca/acor/BlockList.xml \ + ca/acor/DocumentList.xml \ + ca/acor/META-INF/manifest.xml \ + ca/acor/SentenceExceptList.xml \ + ca/acor/WordExceptList.xml \ cs/acor/BlockList.xml \ cs/acor/DocumentList.xml \ cs/acor/META-INF/manifest.xml \ @@ -228,6 +234,7 @@ extras_AUTOCORR_XMLFILES := \ extras_AUTOCORR_MIMETYPEFILES := \ af-ZA/acor/mimetype \ bg/acor/mimetype \ + ca/acor/mimetype \ cs/acor/mimetype \ da/acor/mimetype \ de/acor/mimetype \ diff --git a/extras/Zip_autocorr.mk b/extras/Zip_autocorr.mk index 8decc51..adf5651 100644 --- a/extras/Zip_autocorr.mk +++ b/extras/Zip_autocorr.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Zip_add_files,autocorr,\ acor_af-ZA.dat \ acor_bg-BG.dat \ acor_cs-CZ.dat \ + acor_ca.dat \ acor_da-DK.dat \ acor_de-DE.dat \ acor_en-AU.dat \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Implementing alternate compatibility functions (such as 0^0 = ERROR)
On Thu, 2013-02-21 at 21:50 -0600, Norbert Thiebaud wrote: The issue is purely academic, but if it _has_ to be resolved then yes a compatibility mode has a much better value that creating an 'alternate' function. True - though clearly there is some residual benefit in importing ODF files with this sort of function in them - luckily there is a ~zero deployed-base of that so far. As a general yard-stick, we take function compatibility with Excel extremely seriously - it is clearly imperative to our users to have confidence that their spreadsheets continue to work as they move to the world of ODF implementations. Having said that - when it comes to corner-cases we have much bigger problems in this area than this issue. One example would be the absence of a true 'boolean' type in our core; such that when you run the gnumeric test sheet here: http://git.gnome.org/browse/gnumeric/plain/samples/excel/operator.xls you can ponder at length whether: '=TRUE() Liz' should be true or false for example ;-) So - IMHO there is little value at all in further discussion on this topic, and backwards-compatibility with ODF + numeric sanity trumps the corner-case at least until we have a much more consistent set of corner-case solutions. But of course, I would defer to the calc team; and as Tor and Norbert says - -strongly- discourage an endless bike-shed on this from those outside the set of people who have already contributed code to calc. All the best :-) 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] core.git: Branch 'libreoffice-4-0' - extras/source
extras/source/autotext/lang/tr/crdbus50.bau |binary extras/source/autotext/lang/tr/template.bau |binary 2 files changed New commits: commit e5144e5f49ac04c769accb4e796edfbd6973e137 Author: Andras Timar ati...@suse.com Date: Thu Feb 21 15:16:24 2013 +0100 convert Turkish AutoText files from old binary to zipped XML I wonder when the support of old binary format was discontinued, but at least in LibreOffice 3.6 it did not work. I converted the files with OpenOffice.org 1.0.3. Change-Id: Ie68371b613ab0464eefe909d083dbb8567623a2b Reviewed-on: https://gerrit.libreoffice.org/2313 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/extras/source/autotext/lang/tr/crdbus50.bau b/extras/source/autotext/lang/tr/crdbus50.bau index cd8ca31..a9eb8dc 100644 Binary files a/extras/source/autotext/lang/tr/crdbus50.bau and b/extras/source/autotext/lang/tr/crdbus50.bau differ diff --git a/extras/source/autotext/lang/tr/template.bau b/extras/source/autotext/lang/tr/template.bau index 60d51dc..b1b2b63 100644 Binary files a/extras/source/autotext/lang/tr/template.bau and b/extras/source/autotext/lang/tr/template.bau differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - extras/source
extras/source/autotext/lang/tr/crdbus50.bau |binary extras/source/autotext/lang/tr/template.bau |binary 2 files changed New commits: commit 94c54d373443b7f9fe667b7d1f2ca009fd792164 Author: Andras Timar ati...@suse.com Date: Thu Feb 21 15:16:24 2013 +0100 convert Turkish AutoText files from old binary to zipped XML I wonder when the support of old binary format was discontinued, but at least in LibreOffice 3.6 it did not work. I converted the files with OpenOffice.org 1.0.3. Change-Id: Ie68371b613ab0464eefe909d083dbb8567623a2b Reviewed-on: https://gerrit.libreoffice.org/2314 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extras/source/autotext/lang/tr/crdbus50.bau b/extras/source/autotext/lang/tr/crdbus50.bau index cd8ca31..a9eb8dc 100644 Binary files a/extras/source/autotext/lang/tr/crdbus50.bau and b/extras/source/autotext/lang/tr/crdbus50.bau differ diff --git a/extras/source/autotext/lang/tr/template.bau b/extras/source/autotext/lang/tr/template.bau index 60d51dc..b1b2b63 100644 Binary files a/extras/source/autotext/lang/tr/template.bau and b/extras/source/autotext/lang/tr/template.bau differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Implementing alternate compatibility functions (such as 0^0 = ERROR)
I'm sorry, I didn't know about that discussion. You're right, it's pointless to do the same here, so it's better just to stop the discussion. Please accept my apologies Xisco 2013/2/22 Tor Lillqvist t...@iki.fi I've seen this was implemented in Apache Openoffice recently. Probably we can just merge it into Libreoffice. And you did not notice the flood of useless discussion that ensued on the AOO list, with one contributor (partially) leaving AOO? PLEASE STOP THIS DISCUSSION NOW! ;) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 4ad4e50763c0f04a286f7ff784e3cd70835ca077 Author: Andras Timar ati...@suse.com Date: Fri Feb 22 10:59:25 2013 +0100 unused local variable Change-Id: I8d8019b6947c1f989d897389379f2b6bb396cfbb diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 0eb325a..60fa166 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -856,7 +856,6 @@ DBG_NAME(OFinalDBPageSetup) { DBG_CTOR(OFinalDBPageSetup,NULL); -OUString stext = m_aFTFinalHeader.GetText(); SetControlFontWeight(m_aFTFinalHeader); m_aCBOpenAfterwards.SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected)); m_aCBStartTableWizard.SetClickHdl(getControlModifiedLink()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - chart2/source
chart2/source/tools/ExplicitCategoriesProvider.cxx | 24 + 1 file changed, 15 insertions(+), 9 deletions(-) New commits: commit 74d1466914547aaa5369f18727c228db9ce88121 Author: Eike Rathke er...@redhat.com Date: Tue Feb 19 19:22:27 2013 +0100 do not access vector elements beyond size, rhbz#847519 related The actual bug (crash) is not triggered anymore because the categories are assembled differently, nevertheless the code in question could expose the same behavior under different preconditions. Change-Id: Ic37f6b34effaf4e5252e80aab46b021547b36efb (cherry picked from commit d1ba2cd612a4c39976e2980c7dc4e3fa38c88470) Reviewed-on: https://gerrit.libreoffice.org/2272 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index e3d800f..00b481c 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -353,11 +353,14 @@ Sequence OUString lcl_getExplicitSimpleCategories( } for( aOuterIt=rComplexCats.begin(); aOuterIt != aOuterEnd; ++aOuterIt ) { -sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt ); -if( nCurrentCount nMaxCategoryCount ) +if ( !aOuterIt-empty() ) { -ComplexCategory rComplexCategory = aOuterIt-back(); -rComplexCategory.Count += (nMaxCategoryCount-nCurrentCount); +sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt ); +if( nCurrentCount nMaxCategoryCount ) +{ +ComplexCategory rComplexCategory = aOuterIt-back(); +rComplexCategory.Count += (nMaxCategoryCount-nCurrentCount); +} } } } @@ -389,12 +392,15 @@ Sequence OUString lcl_getExplicitSimpleCategories( OUString aText; for( aOuterIt=aComplexCatsPerIndex.begin() ; aOuterIt != aOuterEnd; ++aOuterIt ) { -OUString aAddText = (*aOuterIt)[nN].Text; -if( !aAddText.isEmpty() ) +if ( static_castsize_t(nN) aOuterIt-size() ) { -if(!aText.isEmpty()) -aText += aSpace; -aText += aAddText; +OUString aAddText = (*aOuterIt)[nN].Text; +if( !aAddText.isEmpty() ) +{ +if(!aText.isEmpty()) +aText += aSpace; +aText += aAddText; +} } } aRet[nN]=aText; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extras/source sfx2/source
extras/source/glade/libreoffice-catalog.xml |8 +++- sfx2/source/bastyp/fltfnc.cxx |2 +- sfx2/source/doc/docfile.cxx | 10 +- 3 files changed, 13 insertions(+), 7 deletions(-) New commits: commit 45739fad0b1d55e72cc1ed508b8ea33a74219290 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 10:00:42 2013 + fix sfx2 build Change-Id: I17b8ab426e7aabeb5db9d49391e0c1be99e63a51 diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 049823b..97dbaec 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -551,7 +551,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium rMedium, const SfxFilter** sal_Bool bPreview = rMedium.IsPreview_Impl(); SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False); -if ( bPreview rMedium.IsRemote() ( !pReferer || pReferer-GetValue().CompareToAscii(private:searchfolder:,21 ) != COMPARE_EQUAL ) ) +if ( bPreview rMedium.IsRemote() ( !pReferer || !pReferer-GetValue().match(private:searchfolder:) ) ) return ERRCODE_ABORT; ErrCode nErr = GuessFilter( rMedium, pFilter ); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index d2f6164..0fc15a8 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1721,12 +1721,12 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString aURL, SfxItemSet SFX_ITEMSET_ARG( aTargetSet, pNewPassItem, SfxStringItem, SID_PASSWORD, false ); SFX_ITEMSET_ARG( GetItemSet(), pOldPassItem, SfxStringItem, SID_PASSWORD, false ); if ( ( !pNewPassItem !pOldPassItem ) - || ( pNewPassItem pOldPassItem pNewPassItem-GetValue().Equals( pOldPassItem-GetValue() ) ) ) + || ( pNewPassItem pOldPassItem pNewPassItem-GetValue() == pOldPassItem-GetValue() ) ) { // the filter must be the same SFX_ITEMSET_ARG( aTargetSet, pNewFilterItem, SfxStringItem, SID_FILTER_NAME, false ); SFX_ITEMSET_ARG( GetItemSet(), pOldFilterItem, SfxStringItem, SID_FILTER_NAME, false ); -if ( pNewFilterItem pOldFilterItem pNewFilterItem-GetValue().Equals( pOldFilterItem-GetValue() ) ) +if ( pNewFilterItem pOldFilterItem pNewFilterItem-GetValue() == pOldFilterItem-GetValue() ) { // get the input stream and copy it // in case of success return true @@ -2459,7 +2459,7 @@ void SfxMedium::Init_Impl() pImp-bDisposeStorage = false; SFX_ITEMSET_ARG( pImp-m_pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); -if ( pSalvageItem !pSalvageItem-GetValue().Len() ) +if ( pSalvageItem pSalvageItem-GetValue().isEmpty() ) { pSalvageItem = NULL; pImp-m_pSet-ClearItem( SID_DOC_SALVAGE ); @@ -2492,7 +2492,7 @@ void SfxMedium::Init_Impl() } } -if ( pSalvageItem pSalvageItem-GetValue().Len() ) +if ( pSalvageItem !pSalvageItem-GetValue().isEmpty() ) { pImp-m_aLogicName = pSalvageItem-GetValue(); DELETEZ( pImp-m_pURLObj ); @@ -2894,7 +2894,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence ::com::sun::star::b if( pSalvageItem ) { // QUESTION: there is some treatment of Salvage in Init_Impl; align! -if ( pSalvageItem-GetValue().Len() ) +if ( !pSalvageItem-GetValue().isEmpty() ) { // if an URL is provided in SalvageItem that means that the FileName refers to a temporary file // that must be copied here commit 321bd3a06e3aa78f3223ef1aa7a0baac9176f83d Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 09:15:44 2013 + more custom widgets for glade catalog Change-Id: I9637244a7f117496feeb879618a28ba55ced84f4 diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml index e028f73..0612baa 100644 --- a/extras/source/glade/libreoffice-catalog.xml +++ b/extras/source/glade/libreoffice-catalog.xml @@ -30,8 +30,14 @@ glade-widget-class title=Color ListBox name=svtlo-ColorListBox generic-name=LookUpComboBox parent=GtkComboBox icon-name=widget-gtk-combobox/ +glade-widget-class title=Font Name ListBox name=svtlo-FontNameBox +generic-name=Font name ListBox parent=GtkComboBox +icon-name=widget-gtk-combobox/ +glade-widget-class title=Font Size ListBox name=svtlo-FontSizeBox +generic-name=Font Size ListBox parent=GtkComboBox +icon-name=widget-gtk-combobox/ glade-widget-class title=Line ListBox name=svtlo-LineListBox -generic-name=LineListBox parent=GtkComboBox +generic-name=Line ListBox parent=GtkComboBox icon-name=widget-gtk-combobox/ glade-widget-class title=Language
Re: minutes of ESC call ...
On 21/02/13 17:00, Michael Meeks wrote: + issues with libunordflo loading in dbgutil builds AI: + look into it before publishing updated stats (Michael S) the problem was that the rpath of several external libraries contained not $ORIGIN but some random PID. after several hours of cursing heavily at arcane tools the proper quoting to preserve the $ was found. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Looking for PyUno Contributor(s)
Joel Madero píše v St 20. 02. 2013 v 07:11 -0800: Hi All! I am one of the members of the Quality Assurance team with LibreOffice and we are looking for a volunteer to work with myself designing (and coding) the framework to start automating our stats. It's been on my list for much too long and I just don't have the technical know how to do it. If there are are users or developers who can slowly get this accomplished it would greatly help QA as well as Marketing as our stats are done almost completely manually at this point, not only is this time consuming but it's also likely that there could be mistakes or missing data. If there are any takers, again this would be a great help, I have a general idea of what I'd like to do, just trying to find people who are capable of implementation. This a good candidate for an easy hack. Please, create a bug in bugzilla and add the needed flags. I think that many new volunteers might have scripting skills and it might be a good starter for them. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
license statement
Hello, All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Regards Prashant Pandey ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/lib
src/lib/VSD5Parser.cpp |2 - src/lib/VSD5Parser.h|2 + src/lib/VSDCollector.h |2 - src/lib/VSDContentCollector.cpp |6 ++-- src/lib/VSDContentCollector.h |2 - src/lib/VSDDocumentStructure.h |1 src/lib/VSDPages.cpp|4 ++ src/lib/VSDPages.h |1 src/lib/VSDParser.cpp | 54 src/lib/VSDParser.h |6 src/lib/VSDStylesCollector.cpp |2 - src/lib/VSDStylesCollector.h|2 - src/lib/VSDTypes.h |4 ++ src/lib/VSDXMLParserBase.cpp|2 - 14 files changed, 77 insertions(+), 13 deletions(-) New commits: commit cb055a1b99ba51a6dc9aa407c18e7ea2ffc746f9 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Feb 22 11:24:18 2013 +0100 Read and push to the api the names of the pages if they exist diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp index 9d7c164..f49fafa 100644 --- a/src/lib/VSD5Parser.cpp +++ b/src/lib/VSD5Parser.cpp @@ -381,7 +381,7 @@ void libvisio::VSD5Parser::readShape(WPXInputStream *input) void libvisio::VSD5Parser::readPage(WPXInputStream *input) { unsigned backgroundPageID = getUInt(input); - m_collector-collectPage(m_header.id, m_header.level, backgroundPageID, m_isBackgroundPage, WPXString()); + m_collector-collectPage(m_header.id, m_header.level, backgroundPageID, m_isBackgroundPage, VSDName()); } void libvisio::VSD5Parser::readTextBlock(WPXInputStream *input) diff --git a/src/lib/VSD5Parser.h b/src/lib/VSD5Parser.h index 4430e1c..d6cf0ae 100644 --- a/src/lib/VSD5Parser.h +++ b/src/lib/VSD5Parser.h @@ -73,6 +73,8 @@ protected: virtual void readStyleSheet(WPXInputStream *input); + virtual void readNameIDX(WPXInputStream *) {} + virtual unsigned getUInt(WPXInputStream *input); virtual int getInt(WPXInputStream *input); diff --git a/src/lib/VSDCollector.h b/src/lib/VSDCollector.h index 1633726..f53545b 100644 --- a/src/lib/VSDCollector.h +++ b/src/lib/VSDCollector.h @@ -79,7 +79,7 @@ public: virtual void collectShapesOrder(unsigned id, unsigned level, const std::vectorunsigned shapeIds) = 0; virtual void collectForeignDataType(unsigned level, unsigned foreignType, unsigned foreignFormat, double offsetX, double offsetY, double width, double height) = 0; virtual void collectPageProps(unsigned id, unsigned level, double pageWidth, double pageHeight, double shadowOffsetX, double shadowOffsetY, double scale) = 0; - virtual void collectPage(unsigned id, unsigned level, unsigned backgroundPageID, bool isBackgroundPage, const WPXString pageName) = 0; + virtual void collectPage(unsigned id, unsigned level, unsigned backgroundPageID, bool isBackgroundPage, const VSDName pageName) = 0; virtual void collectShape(unsigned id, unsigned level, unsigned parent, unsigned masterPage, unsigned masterShape, unsigned lineStyle, unsigned fillStyle, unsigned textStyle) = 0; virtual void collectSplineStart(unsigned id, unsigned level, double x, double y, double secondKnot, double firstKnot, double lastKnot, unsigned degree) = 0; virtual void collectSplineKnot(unsigned id, unsigned level, double x, double y, double knot) = 0; diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp index 09b268b..8901fa1 100644 --- a/src/lib/VSDContentCollector.cpp +++ b/src/lib/VSDContentCollector.cpp @@ -1699,11 +1699,13 @@ void libvisio::VSDContentCollector::collectPageProps(unsigned /* id */, unsigned m_currentPage.m_pageHeight = m_scale*m_pageHeight; } -void libvisio::VSDContentCollector::collectPage(unsigned /* id */, unsigned level, unsigned backgroundPageID, bool isBackgroundPage, const WPXString pageName) +void libvisio::VSDContentCollector::collectPage(unsigned /* id */, unsigned level, unsigned backgroundPageID, bool isBackgroundPage, const VSDName pageName) { _handleLevelChange(level); m_currentPage.m_backgroundPageID = backgroundPageID; - m_currentPage.m_pageName = pageName; + m_currentPage.m_pageName.clear(); + if (!pageName.empty()) +_convertDataToString(m_currentPage.m_pageName, pageName.m_data, pageName.m_format); m_isBackgroundPage = isBackgroundPage; } diff --git a/src/lib/VSDContentCollector.h b/src/lib/VSDContentCollector.h index 0c273c2..25ec85b 100644 --- a/src/lib/VSDContentCollector.h +++ b/src/lib/VSDContentCollector.h @@ -100,7 +100,7 @@ public: void collectShapesOrder(unsigned id, unsigned level, const std::vectorunsigned shapeIds); void collectForeignDataType(unsigned level, unsigned foreignType, unsigned foreignFormat, double offsetX, double offsetY, double width, double height); void collectPageProps(unsigned id, unsigned level, double pageWidth, double pageHeight, double shadowOffsetX, double shadowOffsetY, double scale); - void collectPage(unsigned id, unsigned level, unsigned backgroundPageID, bool isBackgroundPage, const WPXString pageName); + void
Re: minutes of ESC call ...
On Thu, 2013-02-21 at 20:56 +0100, Michael Stahl wrote: On 21/02/13 17:00, Michael Meeks wrote: + full-word selection / editing ergonomics cf. UX-advise https://bugs.freedesktop.org/show_bug.cgi?id=46517 + pending input from Caolan / Cedric / Michael S so i have finally looked at this bug and added a comment, which basically says meh. how the heck did this get on the ESC agenda? UX team asked for some input there :-) 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] core.git: 2 commits - basctl/source editeng/source vcl/source
basctl/source/basicide/basicbox.cxx |2 +- editeng/source/items/paraitem.cxx |2 +- vcl/source/app/svmain.cxx |3 --- 3 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 805f1ed598ef18157710cf3655d329b09a735389 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 10:13:44 2013 + fix editeng and basctl build Change-Id: I0d70449ad9b42219969c82e2054694c4a5830dcf diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 5b6b399..0d869ab 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -510,7 +510,7 @@ void LanguageBox::Update( const SfxStringItem* pItem ) { FillBox(); -if ( pItem pItem-GetValue().Len() 0 ) +if ( pItem !pItem-GetValue().isEmpty() ) { m_sCurrentText = pItem-GetValue(); if ( GetSelectEntry() != m_sCurrentText ) diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index d247bb83..7962c1d 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -1357,7 +1357,7 @@ SfxItemPresentation SvxPageModelItem::GetPresentation ) const { rText = OUString(); -bool bSet = ( GetValue().Len() 0 ); +bool bSet = !GetValue().isEmpty(); switch ( ePres ) { commit 92ea45dc5d84360b69322194b31390860b4c5414 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 10:11:12 2013 + drop someones stray debugging fprintfs Change-Id: I4423ea0952282ea2b64c72e4cc73e42f0afe4649 diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 9d08192..9b83c6d 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -156,13 +156,10 @@ int ImplSVMain() sal_Bool bInit = InitVCL(); -fprintf (stderr, init vcl %d\n, bInit); - if( bInit ) { // call application main pSVData-maAppData.mbInAppMain = sal_True; -fprintf(stderr, call app main from vcl!\n); nReturn = pSVData-mpApp-Main(); pSVData-maAppData.mbInAppMain = sal_False; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/drawdoc.hxx |5 + sd/source/core/drawdoc.cxx |1 + sd/source/ui/docshell/docshel4.cxx | 13 + sd/source/ui/inc/DrawDocShell.hxx |2 ++ sd/source/ui/unoidl/UnoDocumentSettings.cxx | 21 - 5 files changed, 41 insertions(+), 1 deletion(-) New commits: commit 64cdf8072a79491903c5d1b107c6486b33da04d3 Author: Radek Doulik r...@novell.com Date: Fri Feb 22 12:03:54 2013 +0100 added EmbedFonts property, added File/Properties/Font tab Change-Id: Id2a812c4b5347e2851149a1bd46eaec4b40d0f12 diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 2ab95ab..56bab28 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -188,6 +188,8 @@ private: std::vector rtl::OUString maAnnotationAuthors; +boolmbUseEmbedFonts; + protected: virtual ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface createUnoModel(); @@ -557,6 +559,9 @@ public: sal_uInt16 GetAnnotationAuthorIndex( const rtl::OUString rAuthor ); +bool IsUsingEmbededFonts() { return mbUseEmbedFonts; } +void SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts = bUse; } + private: /** This member stores the printer independent layout mode. Please refer to memberSetPrinterIndependentLayout()/member for its diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 18a04bd..5b7d3e4 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -163,6 +163,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) , mpLocale(NULL) , mpDrawPageListWatcher(0) , mpMasterPageListWatcher(0) +, mbUseEmbedFonts(false) { mpDrawPageListWatcher = ::std::auto_ptrImpDrawPageListWatcher( new ImpDrawPageListWatcher(*this)); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 936e86e..195ca1c 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -29,6 +29,7 @@ #include svl/aeitem.hxx #include svl/flagitem.hxx #include sot/storage.hxx +#include sfx2/dinfdlg.hxx #include sfx2/docfile.hxx #include sfx2/docfilt.hxx #include sfx2/dispatch.hxx @@ -997,6 +998,18 @@ void DrawDocShell::OpenBookmark( const String rBookmarkURL ) ( mpViewShell ? mpViewShell-GetViewFrame() : SfxViewFrame::Current() )-GetBindings().Execute( SID_OPENHYPERLINK, ppArgs ); } +SfxDocumentInfoDialog* DrawDocShell::CreateDocumentInfoDialog( ::Window *pParent, const SfxItemSet rSet ) +{ +SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog( pParent, rSet ); +DrawDocShell* pDocSh = PTR_CAST(DrawDocShell,SfxObjectShell::Current()); + +if( pDocSh == this ) +{ +pDlg-AddFontTabPage(); +} +return pDlg; +} + } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index bcf7d4a..eb75a3c 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -98,6 +98,8 @@ public: virtual SizeGetFirstPageSize(); virtual voidFillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, String* pAppName, String* pFullTypeName, String* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; virtual voidSetModified( sal_Bool = sal_True ); +virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent, + const SfxItemSet rSet ); using SotObject::GetInterface; using SfxObjectShell::GetVisArea; diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index c83a3f8..7c3ba84 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -141,7 +141,7 @@ enum SdDocumentSettingsPropertyHandles HANDLE_PRINTER_INDEPENDENT_LAYOUT // #i33095# ,HANDLE_LOAD_READONLY, HANDLE_SAVE_VERSION -,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL +,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL, HANDLE_EMBED_FONTS }; #define MID_PRINTER 1 @@ -202,6 +202,7 @@ enum SdDocumentSettingsPropertyHandles // -- #i33095# { MAP_LEN(LoadReadonly), HANDLE_LOAD_READONLY, ::getBooleanCppuType(),0, 0 }, { MAP_LEN(SaveVersionOnClose),HANDLE_SAVE_VERSION, ::getBooleanCppuType(),0, 0 }, +{ MAP_LEN(EmbedFonts),HANDLE_EMBED_FONTS, ::getBooleanCppuType(),0, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; @@ -902,6 +903,18 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c } break; +case HANDLE_EMBED_FONTS:
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b4a89972cb6a6370224d5de3b88f9e642f93624a Author: Andras Timar ati...@suse.com Date: Fri Feb 22 12:19:06 2013 +0100 fdo#54087 build npsoplugin on Windows, it does not depend on GTK+ there Change-Id: I033ee2316337dab549f1beddbfb7919a35d73c8e diff --git a/configure.ac b/configure.ac index 59e17a8..ffecd10 100644 --- a/configure.ac +++ b/configure.ac @@ -8590,7 +8590,7 @@ dnl === dnl Check for NPAPI interface to plug LibreOffice into browser windows dnl === AC_MSG_CHECKING([whether to plug LibreOffice into browser windows]) -if test $_os != Android -a $_os != Darwin -a $_os != iOS -a \ +if test $_os == WINNT -o $_os != Android -a $_os != Darwin -a $_os != iOS -a \ $enable_headless != yes -a $enable_gtk != no then AC_MSG_RESULT([yes]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xeroot.cxx |2 +- sc/source/ui/docshell/docfunc.cxx |2 +- sc/source/ui/docshell/docsh.cxx |6 +++--- sc/source/ui/docshell/docsh4.cxx |6 +++--- sc/source/ui/formdlg/formula.cxx |2 +- sc/source/ui/inc/docfunc.hxx |2 +- sc/source/ui/inc/viewfunc.hxx |2 +- sc/source/ui/view/gridwin.cxx |2 +- sc/source/ui/view/viewfunc.cxx|2 +- 9 files changed, 13 insertions(+), 13 deletions(-) New commits: commit def619581f3a833c4c476548c6d17a76d204dd28 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 11:13:35 2013 + fix sc build Change-Id: I2c5ad65863a516516f8a944fb1344753e08d6c9e diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 6016d7d..475a0c2 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -341,7 +341,7 @@ uno::Sequence beans::NamedValue XclExpRoot::GetEncryptionData() const { // try to get the encryption data from the password SFX_ITEMSET_ARG( GetMedium().GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false ); -if ( pPasswordItem pPasswordItem-GetValue().Len() ) +if ( pPasswordItem !pPasswordItem-GetValue().isEmpty() ) aEncryptionData = GenerateEncryptionData( pPasswordItem-GetValue() ); } diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index cc73064..d9d0646 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1154,7 +1154,7 @@ bool ScDocFunc::SetNoteText( const ScAddress rPos, const String rText, sal_Boo // -bool ScDocFunc::ReplaceNote( const ScAddress rPos, const String rNoteText, const String* pAuthor, const String* pDate, sal_Bool bApi ) +bool ScDocFunc::ReplaceNote( const ScAddress rPos, const OUString rNoteText, const OUString* pAuthor, const OUString* pDate, sal_Bool bApi ) { bool bDone = false; diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 917c88b..24e4c82 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -803,11 +803,11 @@ void ScDocShell::Notify( SfxBroadcaster, const SfxHint rHint ) aValues[0].Value = ::rtl::OUString( GetMedium()-GetFilter()-GetFilterName() ); SFX_ITEMSET_ARG( GetMedium()-GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); -if ( pPasswordItem pPasswordItem-GetValue().Len() ) +if ( pPasswordItem !pPasswordItem-GetValue().isEmpty() ) { aValues.realloc( 2 ); -aValues[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Password) ); -aValues[1].Value = ::rtl::OUString( pPasswordItem-GetValue() ); +aValues[1].Name = OUString(Password); +aValues[1].Value = pPasswordItem-GetValue(); } SC_MOD()-SetInSharedDocSaving( true ); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 4509c11..5591d60 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2345,11 +2345,11 @@ uno::Reference frame::XModel ScDocShell::LoadSharedDocument() if ( GetMedium() ) { SFX_ITEMSET_ARG( GetMedium()-GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); -if ( pPasswordItem pPasswordItem-GetValue().Len() ) +if ( pPasswordItem !pPasswordItem-GetValue().isEmpty() ) { aArgs.realloc( 2 ); -aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Password )); -aArgs[1].Value = ::rtl::OUString( pPasswordItem-GetValue() ); +aArgs[1].Name = OUString(Password); +aArgs[1].Value = pPasswordItem-GetValue(); } } diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index a5db312..10dbb17 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -546,7 +546,7 @@ void ScFormulaDlg::dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked) // Wenn durch Dokument-Umschalterei die Eingabezeile weg war/ist, // ist der String leer. Dann nicht die alte Formel loeschen. -if ( !aStrItem.GetValue().Len() ) +if ( aStrItem.GetValue().isEmpty() ) aRetItem.SetValue( false ); // sal_False = Cancel
Re: [libreoffice-accessibility] introduction
On Fri, 2013-02-22 at 09:29 +0100, Sophie Gautier wrote: Hi Jonathan, Thanks a lot for your proposal. I'm sending your mail to the developers list so we are sure they are aware of it. Kind regards Sophie On 21/02/2013 23:33, Jonathan Nadeau wrote: Hello list, My name is Jonathan Nadeau and I'm the executive director of the Accessible Computing Foundation located here http://www.accessiblecomputingfoundation.org I'm looking to fund some developers to fix some accessibility bugs with Libreoffice and the Orca screen reader. Nadeau isn't cc'ed on Sophie's original email and I don't know if he's subscribed to any of these email lists, but I think it's worth mentioning that the work in progress of moving our dialogs to the gtk builder file format now makes it super super easy to: a) set that a label is the right mnemonic widget for something else, which sets up the default a11y label for, label by relationships between them b) add a11y descriptions, a11y names, explicit label-for, label-by and member-of etc relations I'm not particularly a11y experienced, but I fired up orca a few weeks ago and tweaked our a11y support a bit until it read out the format-title page dialog the same way as it would read it if it was a native gtk dialog. Obviously there's a lot more a11y-wise to just our dialogs, but at least for those new-format dialogs anyone with experience in tweaking gtk a11y issues via glade can directly apply that experience to our new dialogs. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New feature in Calc: Stepped Lines graphs
Regina Henschel wrote: Where do I find that information? In the JIRA issue you quoted - https://tools.oasis-open.org/issues/browse/OFFICE-3662 :) Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: embeddedobj/source sc/source toolkit/inc toolkit/source vcl/inc vcl/source vcl/win
embeddedobj/source/general/docholder.cxx |8 embeddedobj/source/inc/docholder.hxx |4 ++-- sc/source/ui/inc/gridwin.hxx |2 +- sc/source/ui/view/gridwin.cxx|4 ++-- toolkit/inc/toolkit/awt/vclxmenu.hxx |2 +- toolkit/source/awt/vclxmenu.cxx | 12 ++-- vcl/inc/vcl/settings.hxx | 10 +- vcl/source/app/settings.cxx |6 +++--- vcl/source/window/decoview.cxx |2 +- vcl/win/source/window/salframe.cxx | 10 +- 10 files changed, 30 insertions(+), 30 deletions(-) New commits: commit 5c89214a80f0284eafaf4eba23243dfe3c9f7193 Author: Thomas Arnhold tho...@arnhold.org Date: Thu Feb 21 12:32:16 2013 +0100 fdo#39674: Rename menues to menu Change-Id: Idc22167d1a0dc518b3f9e96884213140d07b565b Reviewed-on: https://gerrit.libreoffice.org/2316 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 6a81290..79e4897 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -601,7 +601,7 @@ void DocumentHolder::FindConnectPoints( } //--- -uno::Reference container::XIndexAccess DocumentHolder::MergeMenuesForInplace( +uno::Reference container::XIndexAccess DocumentHolder::MergeMenusForInplace( const uno::Reference container::XIndexAccess xContMenu, const uno::Reference frame::XDispatchProvider xContDisp, const ::rtl::OUString aContModuleName, @@ -648,7 +648,7 @@ uno::Reference container::XIndexAccess DocumentHolder::MergeMenuesForInplace( } //--- -sal_Bool DocumentHolder::MergeMenues_Impl( const uno::Reference ::com::sun::star::frame::XLayoutManager xOwnLM, +sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference ::com::sun::star::frame::XLayoutManager xOwnLM, const uno::Reference ::com::sun::star::frame::XLayoutManager xContLM, const uno::Reference frame::XDispatchProvider xContDisp, const ::rtl::OUString aContModuleName ) @@ -667,7 +667,7 @@ sal_Bool DocumentHolder::MergeMenues_Impl( const uno::Reference ::com::sun::sta uno::Reference container::XIndexAccess xOwnMenu = RetrieveOwnMenu_Impl(); uno::Reference frame::XDispatchProvider xOwnDisp( m_xFrame, uno::UNO_QUERY_THROW ); -uno::Reference container::XIndexAccess xMergedMenu = MergeMenuesForInplace( xContMenu, xContDisp, aContModuleName, xOwnMenu, xOwnDisp ); +uno::Reference container::XIndexAccess xMergedMenu = MergeMenusForInplace( xContMenu, xContDisp, aContModuleName, xOwnMenu, xOwnDisp ); uno::Reference ::com::sun::star::frame::XMenuBarMergingAcceptor xMerge( xOwnLM, uno::UNO_QUERY_THROW ); bMenuMerged = xMerge-setMergedMenuBar( xMergedMenu ); @@ -709,7 +709,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference ::com::sun::star::frame:: xOwnLM-setDockingAreaAcceptor( xDocAreaAcc ); // try to merge menus; don't do anything else if it fails -if ( MergeMenues_Impl( xOwnLM, xContainerLM, xContainerDP, aContModuleName ) ) +if ( MergeMenus_Impl( xOwnLM, xContainerLM, xContainerDP, aContModuleName ) ) { // make sure that the container LM does not control the size of the containers window anymore // this must be done after merging menus as we won't get the container menu otherwise diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index a76faae..a04dbb6 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -93,7 +93,7 @@ private: void ResizeWindows_Impl( const ::com::sun::star::awt::Rectangle aHatchRect ); ::com::sun::star::uno::Reference ::com::sun::star::container::XIndexAccess RetrieveOwnMenu_Impl(); -sal_Bool MergeMenues_Impl( +sal_Bool MergeMenus_Impl( const ::com::sun::star::uno::Reference ::com::sun::star::frame::XLayoutManager xOwnLM, const ::com::sun::star::uno::Reference ::com::sun::star::frame::XLayoutManager xContLM, const ::com::sun::star::uno::Reference ::com::sun::star::frame::XDispatchProvider xContDisp, @@ -106,7 +106,7 @@ public: sal_Int32 nConnectPoints[2] ) throw ( ::com::sun::star::uno::Exception ); -static ::com::sun::star::uno::Reference ::com::sun::star::container::XIndexAccess
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docfmt.cxx|2 +- sw/source/core/doc/docnum.cxx|2 +- sw/source/core/docnode/node.cxx |4 ++-- sw/source/core/txtnode/ndtxt.cxx |8 sw/source/filter/ww8/wrtww8.cxx |8 +--- sw/source/filter/ww8/ww8atr.cxx |4 ++-- sw/source/filter/xml/swxml.cxx |2 +- sw/source/ui/dialog/regionsw.cxx |6 -- sw/source/ui/shells/textsh1.cxx |4 ++-- sw/source/ui/shells/txtattr.cxx |2 +- sw/source/ui/uiview/view2.cxx|2 +- sw/source/ui/utlui/attrdesc.cxx |2 +- 12 files changed, 25 insertions(+), 21 deletions(-) New commits: commit 753628eec23f4b4ba037953f05c1430b5108bf15 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 11:49:40 2013 + fix sw build Change-Id: I2d42420307f359b30cce5422629689bdc964ebd9 diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 6355ec2..1a90245 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -226,7 +226,7 @@ static bool lcl_RstAttr( const SwNodePtr rpNd, void* pArgs ) break; case RES_PARATR_NUMRULE: { -bSave = 0 != ((SwNumRuleItem*)pItem)-GetValue().Len(); +bSave = !((SwNumRuleItem*)pItem)-GetValue().isEmpty(); } break; case RES_PARATR_OUTLINELEVEL: //#outline level,add by zhaojianwei diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 5b16808..c4a3c1f 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -159,7 +159,7 @@ void SwDoc::PropagateOutlineRule() const SwNumRuleItem rCollRuleItem = pColl-GetNumRule( sal_False ); // Check on document setting OUTLINE_LEVEL_YIELDS_OUTLINE_RULE no longer needed. -if ( rCollRuleItem.GetValue().Len() == 0 ) +if ( rCollRuleItem.GetValue().isEmpty() ) { SwNumRule * pMyOutlineRule = GetOutlineNumRule(); diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 3c77fbb..cca5729 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1041,7 +1041,7 @@ sal_Bool SwCntntNode::InvalidateNumRule() const SfxPoolItem* pItem; if( GetNodes().IsDocNodes() 0 != ( pItem = GetNoCondAttr( RES_PARATR_NUMRULE, sal_True )) -((SwNumRuleItem*)pItem)-GetValue().Len() +!((SwNumRuleItem*)pItem)-GetValue().isEmpty() 0 != (pRule = GetDoc()-FindNumRulePtr( ((SwNumRuleItem*)pItem)-GetValue() ) ) ) { @@ -1405,7 +1405,7 @@ sal_Bool SwCntntNode::SetAttr( const SfxItemSet rSet ) const SfxPoolItem* pNameItem = 0; if ( 0 != GetCondFmtColl() || SFX_ITEM_SET != mpAttrSet-GetItemState( RES_FRMATR_STYLE_NAME, sal_False, pNameItem ) || - 0 == static_castconst SfxStringItem*(pNameItem)-GetValue().Len() ) + static_castconst SfxStringItem*(pNameItem)-GetValue().isEmpty() ) AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetAnyFmtColl(), GetFmtColl() ); else const_castSfxItemSet*(mpAttrSet.get())-SetParent( GetFmtColl()-GetAttrSet() ); diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 9866117..a0bc301 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -2358,7 +2358,7 @@ SwNumRule* SwTxtNode::_GetNumRule(sal_Bool bInParent) const if ( pColl ) { const SwNumRuleItem rDirectItem = pColl-GetNumRule( sal_False ); -if ( rDirectItem.GetValue().Len() == 0 ) +if ( rDirectItem.GetValue().isEmpty() ) { pRet = 0L; } @@ -3465,7 +3465,7 @@ namespace { if ( rTxtNode.IsEmptyListStyleDueToSetOutlineLevelAttr() ) { const SwNumRuleItem rNumRuleItem = rTxtNode.GetTxtColl()-GetNumRule(); -if ( rNumRuleItem.GetValue().Len() 0 ) +if ( !rNumRuleItem.GetValue().isEmpty() ) { rTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); } @@ -4292,7 +4292,7 @@ namespace { const SwNumRuleItem pNumRuleItem = dynamic_castconst SwNumRuleItem(pItem); -if ( pNumRuleItem.GetValue().Len() 0 ) +if ( !pNumRuleItem.GetValue().isEmpty() ) { mbAddTxtNodeToList = true; // #i105562# @@ -4406,7 +4406,7 @@ namespace { const SwNumRuleItem* pNumRuleItem = dynamic_castconst
pending gbuild patches
these pending gbuild patches [1], [2] move the location of main targets. Which actions should be taken (other then making it compile on windows ;-) prior to merging it, like uploading nightly build, odk publishing, etc.? [1] https://gerrit.libreoffice.org/#/c/2242/ [2] https://gerrit.libreoffice.org/#/c/2288/ David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/qa
sal/qa/rtl/textenc/rtl_textcvt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 294d7afb66503af554850c64f4d195f727fa2371 Author: Michael Meeks michael.me...@suse.com Date: Fri Feb 22 12:16:26 2013 + silence warning. Change-Id: Ibf82038c15c9ecf6de502bae1dd21e2393cafe09 diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index ba7074f..5c957f6 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -252,7 +252,7 @@ void doComplexCharSetTest(ComplexCharSetTest const rTest) { rtl_destroyTextToUnicodeConverter(aConverter); } if (rTest.m_bNoContext rTest.m_bForward) { -sal_Unicode aUnicode[TEST_STRING_SIZE]; +sal_Unicode aUnicode[TEST_STRING_SIZE] = { 0, }; int nSize = 0; rtl_TextToUnicodeConverter aConverter = rtl_createTextToUnicodeConverter(rTest.m_nEncoding); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH]
On Mon, 2013-02-11 at 19:40 +0530, Janit Anjaria wrote: I am hereby attaching the patch for the bug#57950 where the replacement of .append() calls had to be done with a + operator. Wrong patch, you attached Robert's patch for converting a dialog to the new format. Possibly you didn't commit your work before getting the top commit of your tree so got whatever happened to be at the top of your tree. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Need help regarding GSOC...
I want to contribute to open source software world through GSOC - 2013 and want to contribute to libreoffice... I am not an amazing programmer but want learn more in this field... I am having an idea but not sure where or with whom i must discuss it with... I would like to discuss it with the libreoffice mentors but not sure which is right portal..so if you could guide me it'll be really helpfull..Thank you.. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need help regarding GSOC...
A student has much higher chance to be considered as a viable GSoC candidate if (s)he is part of the community. The canonical way to start to contribute to LibreOffice is to pick some of the easy and not-so-easy hacks referenced on this page https://wiki.documentfoundation.org/Development/Easy_Hacks and start to work on them. It does not mean that you will be automatically chosen for GSoC, but it is a great way to start to contribute to LibreOffice. Fridrich On 22/02/13 13:35, Sujay m wrote: I want to contribute to open source software world through GSOC - 2013 and want to contribute to libreoffice... I am not an amazing programmer but want learn more in this field... I am having an idea but not sure where or with whom i must discuss it with... I would like to discuss it with the libreoffice mentors but not sure which is right portal..so if you could guide me it'll be really helpfull..Thank you.. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Gdb support for exceptions (Re: using backtrace() in exception throwing?)
Hi Tom, On Wed, 2013-02-20 at 14:28 -0700, Tom Tromey wrote: FWIW we have the same problem in reverse: the gdb group at Red Hat is, among other things, tasked with improving the C++ debugging experience. However, most of us don't actually debug C++ programs on a regular basis. We do know some issues, via bugzilla and other discussions, but I feel sure we are also missing things. Oh wow :-) so Lubos' feedback here is really great; personally I feel like rather an inadequate gdb user myself ;-) Solving this in general looks tricky to me. I am not really sure how to do it, but I will think about it some more. The basic debugging experience in these an exception broke something flows is that we get an exception thrown that ultimately ends up in a pathalogical situation - an abort, or some similar horrible badness. At that point the most interesting thing is not the catcher - which usually ends up being utterly random - but the last guy that threw the exception. So then as Lubos says comes the knotty job of trying to put a breakpoint on the -one- exception that ends up being caught where we are now [ and that of course requires re-running, and inevitably we throw dozens of exceptions in the normal case ]. Meanwhile, I did whip up a quick-and-dirty Python-based approach. It adds a new track-throws command. This command installs a breakpoint that records the point of the most recent throw. Then you can examine the result with info last-throw. This of course goes a huge way to solving the above problem :-) Really nice ! though of course - having a full stack trace would make that very substantially more useful. Even better than this would (perhaps) be a break inside thrower that is caught here type breakpoint - that we could invoke to land us in whatever code is going to throw as it does that [ and before it started all the magic cleanup / unwinding work ]. That is - assuming that it's possible for the code to know (at that point) where it will ultimately end up (? ;-) Anyhow - it's great to have some python help here; I guess we could bundle that into our existing grab-bag of nice python fixes today :-) 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] core.git: 2 commits - sd/source sw/source
sd/source/ui/docshell/docshel2.cxx |2 +- sw/source/core/txtnode/ndtxt.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 30fee57e6c8d5d71e744ad61aec8b240a81909b8 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Feb 22 13:49:13 2013 +0100 fix build in debug code Change-Id: I829699340525b6a1c5840e1162028bd593d2b96e diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index a0bc301..9c271c2 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -4307,7 +4307,7 @@ namespace { { const SfxStringItem pListIdItem = dynamic_castconst SfxStringItem(pItem); -OSL_ENSURE( pListIdItem.GetValue().Len() 0, +OSL_ENSURE( pListIdItem.GetValue().getLength() 0, HandleSetAttrAtTxtNode(..) - empty list id attribute not excepted. Serious defect - please inform OD. ); const String sListIdOfTxtNode = rTxtNode.GetListId(); if ( pListIdItem.GetValue() != sListIdOfTxtNode ) commit 55b00473eb09796ff66dcab2d33c67782dcb5230 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Feb 22 13:48:54 2013 +0100 fix incorrect code alignment Change-Id: I80f181966f0e47ec0030eeab7762a6b7fb0095cb diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 72b0ef6..f56c4a4 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -283,7 +283,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe if ( pPageView-GetLockedLayers() != pFrameView-GetLockedLayers() ) pPageView-SetLockedLayers( pFrameView-GetLockedLayers() ); -pPageView-SetHelpLines( pFrameView-GetStandardHelpLines() ); +pPageView-SetHelpLines( pFrameView-GetStandardHelpLines() ); } if ( pView-GetActiveLayer() != pFrameView-GetActiveLayer() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Help update - Hyperlink Bar removal
On Sun, 2013-02-10 at 17:41 +0100, Stanislav Horáček wrote: Hi, this patch for help removes the pages related to the Hyperlink Bar which was - if I understand it correctly - removed from LO completely. Your patch seems to remove the help for e.g. insert-hyperlink which we still have, so we don't want to remove that. What we removed, IIRC, was the hyperlink bar which was a different thing. http://cgit.freedesktop.org/libreoffice/help/commit/?id=54108f6fd3f8355d12db0217d21fbab9dccf5ed8 removed the help for that, or at least most of it. I don't see any existing references in our help to that removed bar, or is there some still left ? https://bugs.freedesktop.org/show_bug.cgi?id=43915 suggests that it was still mentioned in the help at one stage in 3.4, but that it got fixed for 3.5 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/scuiasciiopt.cxx |2 ++ sc/source/ui/docshell/impex.cxx | 19 +++ sc/source/ui/inc/impex.hxx |2 ++ 3 files changed, 23 insertions(+) New commits: commit 8970e14d7494859c6079ef2a976416598823ba50 Author: Eike Rathke er...@redhat.com Date: Fri Feb 22 00:27:26 2013 +0100 resolved fdo#57841 ignore embedded NULL characters in CSV import Change-Id: Ib0eb044f009227c0aa6e1bc520905d605323c3db diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index cfa4d4e..9624fde 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -540,6 +540,8 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, rtl::OUString rText ) if ( mpDatStream-GetError() == ERRCODE_IO_CANTSEEK ) mpDatStream-ResetError(); +ScImportExport::EmbeddedNullTreatment( rText); + return bRet; } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 6e7e16c..8cff0c9 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1335,6 +1335,8 @@ bool ScImportExport::ExtText2Doc( SvStream rStrm ) if ( rStrm.IsEof() aLine.isEmpty() ) break; +EmbeddedNullTreatment( aLine); + sal_Int32 nLineLen = aLine.getLength(); SCCOL nCol = nStartCol; bool bMultiLine = false; @@ -1473,6 +1475,23 @@ bool ScImportExport::ExtText2Doc( SvStream rStrm ) } +void ScImportExport::EmbeddedNullTreatment( OUString rStr ) +{ +// A nasty workaround for data with embedded NULL characters. As long as we +// can't handle them properly as cell content (things assume 0-terminated +// strings at too many places) simply strip all NULL characters from raw +// data. Excel does the same. See fdo#57841 for sample data. + +// The normal case is no embedded NULL, check first before de-/allocating +// ustring stuff. +sal_Unicode cNull = 0; +if (rStr.indexOf( cNull) = 0) +{ +rStr = rStr.replaceAll( OUString( cNull, 1), OUString()); +} +} + + const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p, String rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool rbIsQuoted, bool rbOverflowCell ) diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index c427206..8c7e36b 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -102,6 +102,8 @@ public: bool IsUndo() const { return bUndo; } void SetUndo( bool b ) { bUndo = b;} +SC_DLLPUBLIC static void EmbeddedNullTreatment( OUString rStr ); + static bool IsFormatSupported( sal_uLong nFormat ); static const sal_Unicode* ScanNextFieldFromString( const sal_Unicode* p, String rField, sal_Unicode cStr, const sal_Unicode* pSeps, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source vcl/unx
desktop/source/app/app.cxx |4 vcl/unx/gtk/app/gtkinst.cxx |1 - 2 files changed, 5 deletions(-) New commits: commit 1a4bcd1b0d05f7dcafd7aebeaa0e0e91f6b102ea Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 12:58:07 2013 + these stray fprintfs drive people demented Change-Id: Ifee5c39423957bcc4708a7933c760d9467e2ac27 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 5f544ef..a07f2bb 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -562,8 +562,6 @@ Desktop::~Desktop() void Desktop::Init() { -fprintf (stderr, Desktop::Init()\n); - RTL_LOGFILE_CONTEXT( aLog, desktop (cd13) ::Desktop::Init ); SetBootstrapStatus(BS_OK); @@ -595,8 +593,6 @@ void Desktop::Init() } } -fprintf( stderr, OfficeIPCThread %d ...\n, m_aBootstrapError == BE_OK ); - if ( 1 ) { const CommandLineArgs rCmdLineArgs = GetCommandLineArgs(); diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 294fd1a..cc69ccb 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -341,7 +341,6 @@ SalPrinter* GtkInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) { #if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0) mbPrinterInit = true; -fprintf(stderr, gtk printer\n); return new GtkSalPrinter( pInfoPrinter ); #else return Superclass_t::CreatePrinter( pInfoPrinter ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Grammar checker] Undocumented change in the API for LO 4
On Sun, 2013-01-20 at 08:25 -0800, Olivier R. wrote: With LibreOffice 4, each paragraph of a text is passed several times to this function in the parameter aText, and the parameters nStartOfSentencePosition and nSuggestedBehindEndOfSentencePosition are the beginning and the end of each sentence of this paragraph. Is this a bug ? a feature ? an undocumented change ? No idea, IMO it would be worth bibisecting this to find where it changed to re-examine if it was intentional or not. Would then likely be a good candidate for a unit test to lock in whichever is the right behaviour. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: storing chart doc on load ?
On Sat, 2012-12-22 at 22:05 +, Michael Meeks wrote: Either way, our whole approach to loading and converting-to-native all embedded OLE2 streams for charts etc. on load always seemed to me to be extremely curious / slow ;-) but probably I mis-understood something quite profoundly: I always wanted to have some time to dig through that to see what could be safely deferred: It was a super quick hack done in an afternoon IIRC. We should in theory really be able to disable all that convert on load stuff completely and render the preview as is normal, but on ole object activation if there's no actual application registered to load them then have an attempt at loading it ourself. Like, disable it, load an example, double click on it and track down from where the error about not being able to handle it comes from and see what happens if we hack in ourselves as a fallback there and fix things up on that route. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: MS Word import: bug-to-bug or correct
On Tue, 2012-12-18 at 14:51 +0100, Lionel Elie Mamane wrote: Hi, What is our policy about MS Word import? Should it give the same result as in MS Word, or where MS Word is buggy it should give a correct result? The ideal is that we get the same results as in MS Word. Where there is a conflict between fidelity and correctness (or our own legacy behaviour) then add new compatibility options. We've a few of those already, (tools-options-writer-compatibility) plenty of them are MSWord compatibility options, and MSWord itself has a load of such options, like layout asian text like word 6 and line break like wordperfect 2 (well options *like* that if not exactly those ones). In theory we should have every compatibility option that MSWord has plus a bunch more. That's the general idea anyway, gets tricky in practice of course to identify and isolate what's going on to identify if there's a specific compatibility tweak required and its exact required behaviour C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Mysql Connector Extension Size Confusion
Hi all, On my 64bit Linux build of master, I'm seeing the following in my tree after a successful build of the mysql connector extension : Hmm, some strange things going on somewhere : -rw-rw-r-- 1 1000 1000 5379260 janv. 3 03:44 /home/alex/Development/libo/core/mysqlc/unxlngx6.pro/bin/mysql-connector-ooo.oxt -rw-rw-r-- 1 1000 1000 2575973 févr. 13 12:20 /home/alex/Development/libo/core/solver/unxlngx6.pro/bin/mysql-connector-ooo.oxt -rw-rw-r-- 1 1000 1000 2575973 févr. 13 12:20 /home/alex/Development/libo/core/workdir/unxlngx6.pro/ExtensionTarget/mysql-connector-ooo.oxt I have no idea why the /ExtensionTarget and /solver copies of the OXT are only half the size of the unxlngx6.pro/bin copy. Any ideas ? Since I always thought that it was the file in solver that got registered in the final build product, I am a bit confused as to which is the correct file that should be used to make available for downloads, and this may also explain why my 2Mb files that I have made available in the past didn't work for many users that tried it. On Mac OSX, when the connector does successfully build, it has a size of about 4Mb. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Mysql Connector Extension Size Confusion
On 22/02/13 14:37, Alexander Thurgood wrote: Hi all, On my 64bit Linux build of master, I'm seeing the following in my tree after a successful build of the mysql connector extension : Hmm, some strange things going on somewhere : -rw-rw-r-- 1 1000 1000 5379260 janv. 3 03:44 /home/alex/Development/libo/core/mysqlc/unxlngx6.pro/bin/mysql-connector-ooo.oxt this is created by the old build system. -rw-rw-r-- 1 1000 1000 2575973 févr. 13 12:20 /home/alex/Development/libo/core/solver/unxlngx6.pro/bin/mysql-connector-ooo.oxt -rw-rw-r-- 1 1000 1000 2575973 févr. 13 12:20 /home/alex/Development/libo/core/workdir/unxlngx6.pro/ExtensionTarget/mysql-connector-ooo.oxt this is created by the new build system, to which mysqlc was migrated earlier this year. I have no idea why the /ExtensionTarget and /solver copies of the OXT are only half the size of the unxlngx6.pro/bin copy. Any ideas ? you could check if there are any files missing in the oxt or anything looks obviously wrong; last i checked it looked fine here but there are apparently several different configure options that affect the extension so YMMV. Since I always thought that it was the file in solver that got registered in the final build product, I am a bit confused as to which is the correct file that should be used to make available for downloads, and this may also explain why my 2Mb files that I have made available in the past didn't work for many users that tried it. AFAIK the extension always requires some mysql library or other installed on the system. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Cppcheck reports an 2 assignments which isn't used in drawinglayer module
On Fri, 2012-12-28 at 09:28 -0800, julien2412 wrote: Hello, Cppcheck reported these: [drawinglayer/source/primitive2d/sceneprimitive2d.cxx:196]: (style) Variable 'fViewSizeX' is assigned a value that is never used. [drawinglayer/source/primitive2d/sceneprimitive2d.cxx:197]: (style) Variable 'fViewSizeY' is assigned a value that is never used. ... Indeed, fViewSizeX and fViewSizeY. this time I don't think they should be removed, I rather think something is lacking. Any idea? So taking fViewSizeX lets have a look at what the history of these lines is. git log --follow -S fViewSizeX drawinglayer/source/primitive2d/sceneprimitive2d.cxx gives commit 2a0a3168f4354285e59dd79d4477a4199c2f773b Author: Armin Weiss a...@openoffice.org Date: Tue Oct 20 15:36:32 2009 + #i105065# speedup 3D/FontWork commit 407f7ae14844d0e55b9f0f87a19a7208762b05ed Author: Armin Le Grand armin.le.gr...@sun.com Date: Wed Oct 7 14:25:40 2009 +0200 #i105323# added FastPath for 3D scene HitTest for 3d CustomShapes by re-using the buffered last render result commit 2d634e6084547875a170d8350850110238b9e55c Author: Armin Le Grand armin.le.gr...@sun.com Date: Tue Sep 29 15:35:35 2009 +0200 #i105323# speedup of 3D handling mostly for CustomShapes; HitTest and interactions optimized commit 57cc1366165559c8a958486c12af08790e6995f9 Author: Armin Weiss a...@openoffice.org Date: Tue Feb 26 07:28:52 2008 + removals, OLE, optimizations for primitives commit 821e3b2b3026f21e396a8da3e152781a546ef5f5 Author: Armin Weiss a...@openoffice.org Date: Thu Oct 19 09:40:02 2006 + #i39532# primitive To see what the file actually looked like at a given revision... git show 57cc1366165559c8a958486c12af08790e6995f9:drawinglayer/source/primitive2d/sceneprimitive2d.cxx git show 821e3b2b3026f21e396a8da3e152781a546ef5f5:drawinglayer/source/primitive2d/sceneprimitive2d.cxx So looking through those fViewSizeX became assigned a value that is never used with 57cc1366165559c8a958486c12af08790e6995f9 and every other commit just moved it around or adapted it to later changes. Seeing as this commit happened in 2008 and the rest of that commit looks reasonable I think you should go ahead and remove those never used variables. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/lib
src/lib/VSD5Parser.cpp | 18 +- src/lib/VSD5Parser.h |2 +- src/lib/VSDDocumentStructure.h |1 + src/lib/VSDParser.cpp | 24 +--- src/lib/VSDParser.h|1 + 5 files changed, 41 insertions(+), 5 deletions(-) New commits: commit d9358fa7e6eeaf9075042b0cc98909f5866aea8a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Feb 22 15:14:47 2013 +0100 More page names for versions = 5 diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp index f49fafa..447dea7 100644 --- a/src/lib/VSD5Parser.cpp +++ b/src/lib/VSD5Parser.cpp @@ -381,7 +381,7 @@ void libvisio::VSD5Parser::readShape(WPXInputStream *input) void libvisio::VSD5Parser::readPage(WPXInputStream *input) { unsigned backgroundPageID = getUInt(input); - m_collector-collectPage(m_header.id, m_header.level, backgroundPageID, m_isBackgroundPage, VSDName()); + m_collector-collectPage(m_header.id, m_header.level, backgroundPageID, m_isBackgroundPage, m_currentPageName); } void libvisio::VSD5Parser::readTextBlock(WPXInputStream *input) @@ -424,6 +424,22 @@ void libvisio::VSD5Parser::readTextField(WPXInputStream *input) } } +void libvisio::VSD5Parser::readNameIDX(WPXInputStream *input) +{ + VSD_DEBUG_MSG((VSD5Parser::readNameIDX\n)); + std::mapunsigned, VSDName names; + unsigned recordCount = readU16(input); + for (unsigned i = 0; i recordCount; ++i) + { +unsigned elementId = readU16(input); +unsigned nameId = readU16(input); +std::mapunsigned, VSDName::const_iterator iter = m_names.find(nameId); +if (iter != m_names.end()) + names[elementId] = iter-second; + } + m_namesMapMap[m_header.level] = names; +} + unsigned libvisio::VSD5Parser::getUInt(WPXInputStream *input) { diff --git a/src/lib/VSD5Parser.h b/src/lib/VSD5Parser.h index d6cf0ae..64f4c6c 100644 --- a/src/lib/VSD5Parser.h +++ b/src/lib/VSD5Parser.h @@ -73,7 +73,7 @@ protected: virtual void readStyleSheet(WPXInputStream *input); - virtual void readNameIDX(WPXInputStream *) {} + virtual void readNameIDX(WPXInputStream *input); virtual unsigned getUInt(WPXInputStream *input); virtual int getInt(WPXInputStream *input); diff --git a/src/lib/VSDDocumentStructure.h b/src/lib/VSDDocumentStructure.h index b6a2c98..69fee18 100644 --- a/src/lib/VSDDocumentStructure.h +++ b/src/lib/VSDDocumentStructure.h @@ -52,6 +52,7 @@ #define VSD_NAME_LIST2 0x32 #define VSD_NAME2 0x33 +#define VSD_NAMEIDX123 0x34 #define VSD_PAGE_SHEET 0x46 #define VSD_SHAPE_GROUP 0x47 diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp index 84c2124..605f102 100644 --- a/src/lib/VSDParser.cpp +++ b/src/lib/VSDParser.cpp @@ -226,7 +226,7 @@ void libvisio::VSDParser::handleStreams(WPXInputStream *input, unsigned ptrType, FontFaces[i] = ptr; else if (ptr.Type == VSD_NAME_LIST2) NameList[i] = ptr; - else if (ptr.Type == VSD_NAMEIDX) + else if (ptr.Type == VSD_NAMEIDX || ptr.Type == VSD_NAMEIDX123) NameIDX[i] = ptr; else if (ptr.Type != 0) PtrList[i] = ptr; @@ -337,8 +337,7 @@ void libvisio::VSDParser::handleStream(const Pointer ptr, unsigned idx, unsigne if ((ptr.Format 4) == 0x4 || (ptr.Format 4) == 0x5 || (ptr.Format 4) == 0x0) { -if (ptr.Length 4) - handleBlob(tmpInput, shift, level+1); +handleBlob(tmpInput, shift, level+1); if ((ptr.Format 4) == 0x5 ptr.Type != VSD_COLORS) handleStreams(tmpInput, ptr.Type, shift, level+1); } @@ -504,6 +503,9 @@ void libvisio::VSDParser::handleChunk(WPXInputStream *input) case VSD_NAMEIDX: readNameIDX(input); break; + case VSD_NAMEIDX123: +readNameIDX123(input); +break; case VSD_PAGE_PROPS: readPageProps(input); break; @@ -745,6 +747,22 @@ void libvisio::VSDParser::readNameIDX(WPXInputStream *input) m_namesMapMap[m_header.level] = names; } +void libvisio::VSDParser::readNameIDX123(WPXInputStream *input) +{ + std::mapunsigned, VSDName names; + long endPosition = input-tell() + m_header.dataLength; + while (!input-atEOS() input-tell() endPosition) + { +unsigned nameId = getUInt(input); +unsigned elementId = getUInt(input); +std::mapunsigned, VSDName::const_iterator iter = m_names.find(nameId); +if (iter != m_names.end()) + names[elementId] = iter-second; + } + m_namesMapMap[m_header.level] = names; + +} + void libvisio::VSDParser::readEllipse(WPXInputStream *input) { input-seek(1, WPX_SEEK_CUR); diff --git a/src/lib/VSDParser.h b/src/lib/VSDParser.h index 351b681..4e89631 100644 --- a/src/lib/VSDParser.h +++ b/src/lib/VSDParser.h @@ -129,6 +129,7 @@ protected: void readOLEData(WPXInputStream *input); virtual void readNameIDX(WPXInputStream *input); + virtual void readNameIDX123(WPXInputStream *input); // parser of one pass bool parseDocument(WPXInputStream *input, unsigned shift); ___
Re: Mysql Connector Extension Size Confusion
Le 22/02/2013 14:42, Michael Stahl a écrit : -rw-rw-r-- 1 1000 1000 5379260 janv. 3 03:44 /home/alex/Development/libo/core/mysqlc/unxlngx6.pro/bin/mysql-connector-ooo.oxt this is created by the old build system. Ah, ok, so a make clean and rebuild might be in order here then. -rw-rw-r-- 1 1000 1000 2575973 févr. 13 12:20 /home/alex/Development/libo/core/solver/unxlngx6.pro/bin/mysql-connector-ooo.oxt -rw-rw-r-- 1 1000 1000 2575973 févr. 13 12:20 /home/alex/Development/libo/core/workdir/unxlngx6.pro/ExtensionTarget/mysql-connector-ooo.oxt this is created by the new build system, to which mysqlc was migrated earlier this year. Hmm, that's what I thought, and that file size corresponds to those of previous connectors I had built and made available in the past on the extensions website. you could check if there are any files missing in the oxt or anything looks obviously wrong; last i checked it looked fine here but there are apparently several different configure options that affect the extension so YMMV. Almost certainly will be something missing, am investigating now. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/lib
src/lib/VSD5Parser.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2cca79df4c7a46e54c40ab19a2afd779b059667e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Feb 22 15:27:39 2013 +0100 Fix an error in order of variables diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp index 447dea7..1ccb7d8 100644 --- a/src/lib/VSD5Parser.cpp +++ b/src/lib/VSD5Parser.cpp @@ -431,8 +431,8 @@ void libvisio::VSD5Parser::readNameIDX(WPXInputStream *input) unsigned recordCount = readU16(input); for (unsigned i = 0; i recordCount; ++i) { -unsigned elementId = readU16(input); unsigned nameId = readU16(input); +unsigned elementId = readU16(input); std::mapunsigned, VSDName::const_iterator iter = m_names.find(nameId); if (iter != m_names.end()) names[elementId] = iter-second; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-accessibility] introduction
Hi Jonathan, On 22/02/2013 15:30, Jonathan Nadeau wrote: Thank you can you give me a link to join the developers list? Thanks here is the link to subscribe http://lists.freedesktop.org/mailman/listinfo/libreoffice and the link to the archive with Caolan answer this morning http://lists.freedesktop.org/archives/libreoffice/2013-February/046323.html Kind regards Sophie On 02/22/2013 03:29 AM, Sophie Gautier wrote: Hi Jonathan, Thanks a lot for your proposal. I'm sending your mail to the developers list so we are sure they are aware of it. Kind regards Sophie On 21/02/2013 23:33, Jonathan Nadeau wrote: Hello list, My name is Jonathan Nadeau and I'm the executive director of the Accessible Computing Foundation located here http://www.accessiblecomputingfoundation.org I'm looking to fund some developers to fix some accessibility bugs with Libreoffice and the Orca screen reader. I was hoping either someone on the list would be interested in fixing some bugs or that the list might know of some people that would like to earn some money to fix some bugs. Please let me know if this is not the right place to look for help or if there are any other suggestions. Thanks for your time and help. -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Mysql Connector Extension Size Confusion
So, here are the differences : unzip -l Archive: /home/alex/Development/libo/core/workdir/unxlngx6.pro/ExtensionTarget/mysql-connector-ooo.oxt Length DateTimeName - -- - 0 2013-01-30 14:46 META-INF/ 1391 2013-02-13 12:20 META-INF/manifest.xml 255 2013-01-30 11:41 description-en-US.txt 1743 2013-02-13 12:20 description.xml 838 2013-01-30 11:41 images/extension_32.png 4722905 2013-02-10 11:51 libmysqlcppconn.so 4180182 2013-02-13 12:19 mysqlc.uno.so 0 2013-01-30 14:46 registration/ 436392 2013-02-13 12:20 registration/LICENSE 3561 2013-01-30 11:44 registry/data/org/openoffice/Office/DataAccess/Drivers.xcu 311 2013-02-10 14:26 components.rdb - --- 9347578 11 files unzip -l Archive: /home/alex/Development/libo/core/mysqlc/unxlngx6.pro/bin/mysql-connector-ooo.oxt Length DateTimeName - -- - 0 2013-01-03 03:44 META-INF/ 1392 2013-01-03 03:44 META-INF/manifest.xml 255 2013-01-03 03:44 description-en-US.txt 1743 2013-01-03 03:44 description.xml 0 2013-01-03 03:44 images/ 838 2013-01-03 03:44 images/extension_32.png 739047 2013-01-03 03:44 libmysqlcppconn.so 4186992 2013-01-03 03:44 mysqlc.uno.so 0 2013-01-03 03:44 registration/ 442492 2013-01-03 03:44 registration/LICENSE 0 2013-01-03 03:44 registry/ 0 2013-01-03 03:44 registry/data/ 0 2013-01-03 03:44 registry/data/org/ 0 2013-01-03 03:44 registry/data/org/openoffice/ 0 2013-01-03 03:44 registry/data/org/openoffice/Office/ 0 2013-01-03 03:44 registry/data/org/openoffice/Office/DataAccess/ 3561 2013-01-03 03:44 registry/data/org/openoffice/Office/DataAccess/Drivers.xcu - --- 5376320 17 files Both contain libmysqlcppconn and mysqlc.uno.so, but again have different file sizes (less of a difference in mysqlc.uno.so, but nonetheless a small difference). The libmysqlcppconn.so in the new build system is nearly 6 times a big - I'm trying to understand why that might be ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Mysql Connector Extension Size Confusion
Alex, On 22/02/13 15:35, Alex Thurgood wrote: So, here are the differences : Both contain libmysqlcppconn and mysqlc.uno.so, but again have different file sizes (less of a difference in mysqlc.uno.so, but nonetheless a small difference). The libmysqlcppconn.so in the new build system is nearly 6 times a big - I'm trying to understand why that might be ? Did you try whether it works? Maybe the question is only moot. Just saying. F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 4c0e53e6530c5590f7123f506a1a58bcbd04e13d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Feb 19 16:44:51 2013 +0100 Allow specifying of page names Allow specifying of page names (cherry picked from commit bee8ed6772f420f9eefc57fee01da29ff466a8e9) We need to escape special characters in slide names (cherry picked from commit ea4581a914cb1aad29f16b73e35350f05f8adc1c) Change-Id: I5f523642b980469afa46e1895cfd39aa08b9941d Reviewed-on: https://gerrit.libreoffice.org/2333 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx index 8661138..1caebdd 100644 --- a/writerperfect/source/filter/OdgGenerator.cxx +++ b/writerperfect/source/filter/OdgGenerator.cxx @@ -664,7 +664,10 @@ void OdgGenerator::startGraphics(const ::WPXPropertyList propList) TagOpenElement *pStylePageLayoutOpenElement = new TagOpenElement(style:page-layout); WPXString sValue; -sValue.sprintf(page%i, mpImpl-miPageIndex); +if (propList[draw:name]) +sValue = WPXString(propList[draw:name]-getStr(), true); // escape special xml characters +else +sValue.sprintf(page%i, mpImpl-miPageIndex); pDrawPageOpenElement-addAttribute(draw:name, sValue); #ifdef MULTIPAGE_WORKAROUND pStyleMasterPageOpenElement-addAttribute(style:page-layout-name, PM0); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Mysql Connector Extension Size Confusion
Le 22/02/2013 15:42, Fridrich Strba a écrit : Hi Fridrich, Did you try whether it works? Maybe the question is only moot. Just saying. F. All I know is that the new gbuild one doesn't work on other people's systems, as I have made the connector available for download from my Dropbox account (both 32bit and 64bit Linux versions) for testing purposes. It works on my own dev-install build. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/guisaveas.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 555d09b57892389fb0c34510da780f31912e47ef Author: Stephan Bergmann sberg...@redhat.com Date: Fri Feb 22 16:12:25 2013 +0100 Better debugging messages Change-Id: I7c10329f87edfe5d6f801c0aa70e1f6860780c8b diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index d603ce5..e6fd041 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -595,8 +595,9 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString aFilte { throw; } -catch( const uno::Exception ) +catch( const uno::Exception e ) { +SAL_WARN(sfx2.doc, ignoring UNO exception e.Message); } return bDialogUsed; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Implementing alternate compatibility functions (such as 0^0 = ERROR)
On 02/22/2013 04:51 AM, Michael Meeks wrote: On Thu, 2013-02-21 at 21:50 -0600, Norbert Thiebaud wrote: The issue is purely academic, but if it _has_ to be resolved then yes a compatibility mode has a much better value that creating an 'alternate' function. True - though clearly there is some residual benefit in importing ODF files with this sort of function in them - luckily there is a ~zero deployed-base of that so far. As a general yard-stick, we take function compatibility with Excel extremely seriously - it is clearly imperative to our users to have confidence that their spreadsheets continue to work as they move to the world of ODF implementations. Having said that - when it comes to corner-cases we have much bigger problems in this area than this issue. One example would be the absence of a true 'boolean' type in our core; such that when you run the gnumeric test sheet here: http://git.gnome.org/browse/gnumeric/plain/samples/excel/operator.xls you can ponder at length whether: '=TRUE() Liz' should be true or false for example ;-) So - IMHO there is little value at all in further discussion on this topic, and backwards-compatibility with ODF + numeric sanity trumps the corner-case at least until we have a much more consistent set of corner-case solutions. But of course, I would defer to the calc team; and as Tor and Norbert says - -strongly- discourage an endless bike-shed on this from those outside the set of people who have already contributed code to calc. All the best :-) Michael. My opinion is that it is probably useful to document any known issues, especially issues that may be considered for implementation. If we are able to identify issues, especially issues with easy solutions, then those can be added to the list of easy things to do in LO for new contributors. Norbert, along this same line, you stated: I think there are many more interop problems with much more visible and real-life effect that would be a better use of one's time. Do you consider any of these visible issues as something that can be posed as easy things for a developer new to LO to attempt? -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
C++ extensions requiring LIBO_UDK_4.1 (was: Re: Mysql Connector Extension Size Confusion)
On 22/02/13 15:53, Alexander Thurgood wrote: Le 22/02/2013 15:42, Fridrich Strba a écrit : Hi Fridrich, Did you try whether it works? Maybe the question is only moot. Just saying. F. All I know is that the new gbuild one doesn't work on other people's systems, as I have made the connector available for download from my Dropbox account (both 32bit and 64bit Linux versions) for testing purposes. It works on my own dev-install build. it's possible that this is because it requires functions that were added after the 4.0 release on master (i suspect this happens automatically due to some OUString changes); for example here i'm getting a dependency on LIBO_UDK_4.1 symbol version, which none of the current releases supply. readelf --version-info /work/lo/master/solver/unxlngx6/lib/mysqlc.uno.so | grep LIBO_UDK 01c: a (LIBO_UDK_3.6) 4 (UDK_3_0_0) 2 (UDK_3_0_0) 4 (UDK_3_0_0) 08c: 12 (LIBO_UDK_4.1) 7 (UDK_3_0_0) 4 (UDK_3_0_0) b (CXXABI_1.3) 0x0030: Name: LIBO_UDK_4.1 Flags: none Version: 18 0x0060: Name: LIBO_UDK_3.6 Flags: none Version: 10 i'm not sure if this affects only extensions built with LO build system or also those build with ODK. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Setup.xcu | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) New commits: commit 48bf145cf4f84703b9920e2cffafbba448ae7ae1 Author: Petr Mladek pmla...@suse.cz Date: Fri Feb 22 14:38:08 2013 +0100 migrate even more configuration setting (fdo#57061) + application windows size + I was afraid to migrate any /org.openoffice.Setup stuff because there seemed to be many hardcoded values; But the parts mentioned in registrymodifications.xcu should be configurable and thus safe to migrate + âEnable macro recordingâ and âEnable experimental featuresâ options + sigh, we do not want to migrate /org.openoffice.Office.Common/Misc/FirstRun; thus we need to explicitely mention all the other items which is error prone + Tools/Options/LibreOffice/Paths/My documents + ah, the paths are handled on two locations: /org.openoffice.Office.Paths and /org.openoffice.Office.Common/Path + Macros + I was afraid to copy user/basic because there were some content out of box. I though that it might be version specific. In fact, the default content is just empty templates that look the same even in old releases = it should be secure to copy it after all Change-Id: Ie1c04e9df36f6b6961bbaaeb922e29d64128ade4 diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index b4e5e7c..6bca381 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -824,6 +824,7 @@ value it.*/autotext/.*/it it.*/autocorr/.*/it +it.*/basic/.*/it it.*/config/.*\.so[bcdegh]/it it.*/config/soffice.cfg/modules/.*/menubar/.*\.xml/it it.*/config/soffice.cfg/modules/.*/statusbar/.*\.xml/it @@ -860,16 +861,23 @@ it/org.openoffice.Office.Common/I18N/it it/org.openoffice.Office.Common/InternalMSExport/it it/org.openoffice.Office.Common/Load/it +it/org.openoffice.Office.Common/Misc/AlwaysAllowSave/it + it/org.openoffice.Office.Common/Misc/DisableUICustomization/it +it/org.openoffice.Office.Common/Misc/ExperimentalMode/it it/org.openoffice.Office.Common/Misc/FormControlPilotsEnabled/it +it/org.openoffice.Office.Common/Misc/MacroRecorderMode/it it/org.openoffice.Office.Common/Misc/PluginsEnabled/it + it/org.openoffice.Office.Common/Misc/ShowLinkWarningDialog/it it/org.openoffice.Office.Common/Misc/SymbolSet/it +it/org.openoffice.Office.Common/Misc/SymbolStyle/it +it/org.openoffice.Office.Common/Misc/ToolboxStyle/it it/org.openoffice.Office.Common/Misc/UseSystemFileDialog/it it/org.openoffice.Office.Common/Misc/UseSystemPrintDialog/it -it/org.openoffice.Office.Common/Misc/SymbolStyle/it it/org.openoffice.Office.Common/Misc/FilePickerPlacesNames/it it/org.openoffice.Office.Common/Misc/FilePickerPlacesUrls/it it/org.openoffice.Office.Common/ODF/it it/org.openoffice.Office.Common/Passwords/it +it/org.openoffice.Office.Common/Path/it it/org.openoffice.Office.Common/Print/PrintingModifiesDocument/it it/org.openoffice.Office.Common/Print/Warning/it it/org.openoffice.Office.Common/Vectorize/it @@ -937,6 +945,11 @@ value/org.openoffice.Office.Security/value /prop /node + node oor:name=Setup oor:op=replace +prop oor:name=IncludedNodes + value/org.openoffice.Setup/Office/Factories/value +/prop + /node node oor:name=UI oor:op=replace prop oor:name=IncludedNodes value/org.openoffice.Office.UI/ColorScheme/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/DbAdminImpl.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 03a381eaa58d77cf26dfa8d916d1ecda865c1937 Author: Michael Stahl mst...@redhat.com Date: Fri Feb 22 16:38:00 2013 +0100 fix string conversion 1da3af5f1eb6a32fd0ab10da7cf2f8ddb298a3a1 Change-Id: I18f80b5fd6aa11ed78fe2b1bee3cb9f843cf203e diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 9962d6f..e79538a 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -260,11 +260,12 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence Propert OUString sTemp = sName; sName = ::dbaui::getStrippedDatabaseName(NULL,sTemp); if ( sName.getLength() ) -sLoginRequest.replaceAll($name$, sName); +sLoginRequest = sLoginRequest.replaceAll($name$, sName); else { -sLoginRequest.replaceAll(\$name$\, OUString()); -sLoginRequest.replaceAll($name$, OUString()); // just to be sure that in other languages the string will be deleted +sLoginRequest = sLoginRequest.replaceAll(\$name$\, OUString()); +// ensure that in other languages the string will be deleted +sLoginRequest = sLoginRequest.replaceAll($name$, OUString()); } // the request ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: C++ extensions requiring LIBO_UDK_4.1
Le 22/02/2013 16:30, Michael Stahl a écrit : it's possible that this is because it requires functions that were added after the 4.0 release on master (i suspect this happens automatically due to some OUString changes); for example here i'm getting a dependency on LIBO_UDK_4.1 symbol version, which none of the current releases supply. Two questions, both of which may be dumb, because I don't really know what is going on here, but : Shouldn't it default to the lowest common denominator, i.e. 3.6 ? Is this only a problem with symbol-enabled builds ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source svgio/source
drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx |9 + drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 83 +++--- svgio/source/svgreader/svgstyleattributes.cxx|2 3 files changed, 71 insertions(+), 23 deletions(-) New commits: commit 99501a839f6d777c24bc9210787fd14dc3aad67d Author: Armin Le Grand a...@apache.org Date: Thu Feb 21 17:51:40 2013 +0100 #120616# Corrected SVG gradient primitive and it's decomposition Conflicts: drawinglayer/source/primitive2d/svggradientprimitive2d.cxx Change-Id: I04c148303e7153a5376eae79803c540f6eba0b00 diff --git a/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx index 39115a7..2c9e34f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -111,6 +111,11 @@ namespace drawinglayer boolmbSingleEntry : 1; boolmbFullyOpaque : 1; +// true = interpret in unit coordinate system - object aspect ratio will scale result +// false = interpret in object coordinate system - object aspect ratio will not scale result +// (related to SVG's gradientUnits (userSpaceOnUse|objectBoundingBox) +boolmbUseUnitCoordinates : 1; + protected: /// local helpers Primitive2DSequence createSingleGradientEntryFill() const; @@ -145,6 +150,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon rPolyPolygon, const SvgGradientEntryVector rGradientEntries, const basegfx::B2DPoint rStart, +bool bUseUnitCoordinates, SpreadMethod aSpreadMethod = Spread_pad); virtual ~SvgGradientHelper() {} @@ -152,6 +158,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon getPolyPolygon() const { return maPolyPolygon; } const SvgGradientEntryVector getGradientEntries() const { return maGradientEntries; } const basegfx::B2DPoint getStart() const { return maStart; } +bool getUseUnitCoordinates() const { return mbUseUnitCoordinates; } SpreadMethod getSpreadMethod() const { return maSpreadMethod; } /// compare operator @@ -194,6 +201,7 @@ namespace drawinglayer const SvgGradientEntryVector rGradientEntries, const basegfx::B2DPoint rStart, const basegfx::B2DPoint rEnd, +bool bUseUnitCoordinates, SpreadMethod aSpreadMethod = Spread_pad); virtual ~SvgLinearGradientPrimitive2D() {} @@ -261,6 +269,7 @@ namespace drawinglayer const SvgGradientEntryVector rGradientEntries, const basegfx::B2DPoint rStart, double fRadius, +bool bUseUnitCoordinates, SpreadMethod aSpreadMethod = Spread_pad, const basegfx::B2DPoint* pFocal = 0); diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index a8c60da..98dc1ca 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -283,6 +283,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon rPolyPolygon, const SvgGradientEntryVector rGradientEntries, const basegfx::B2DPoint rStart, +bool bUseUnitCoordinates, SpreadMethod aSpreadMethod) : maPolyPolygon(rPolyPolygon), maGradientEntries(rGradientEntries), @@ -291,7 +292,8 @@ namespace drawinglayer mbPreconditionsChecked(false), mbCreatesContent(false), mbSingleEntry(false), -mbFullyOpaque(true) +mbFullyOpaque(true), +mbUseUnitCoordinates(bUseUnitCoordinates) { } @@ -302,6 +304,7 @@ namespace drawinglayer return (getPolyPolygon() == rCompare.getPolyPolygon() getGradientEntries() == rCompare.getGradientEntries() getStart() == rCompare.getStart() + getUseUnitCoordinates() == rCompare.getUseUnitCoordinates() getSpreadMethod() == rCompare.getSpreadMethod()); } @@ -388,20 +391,37 @@ namespace drawinglayer basegfx::tools::createScaleTranslateB2DHomMatrix( fPolyWidth, fPolyHeight, aPolyRange.getMinX(), aPolyRange.getMinY())); +basegfx::B2DHomMatrix aUnitGradientToObject; +static bool bInterpretAbsolute(true); -// create unit transform from
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - drawinglayer/inc drawinglayer/source svgio/source
drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx |9 + drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 83 +++--- svgio/source/svgreader/svgstyleattributes.cxx|2 3 files changed, 71 insertions(+), 23 deletions(-) New commits: commit 708a937a2bcd7ab70e55466ab263b9b94b5cd638 Author: Armin Le Grand a...@apache.org Date: Thu Feb 21 17:51:40 2013 +0100 #120616# Corrected SVG gradient primitive and it's decomposition Signed-off-by: Petr Mladek pmla...@suse.cz Conflicts: drawinglayer/source/primitive2d/svggradientprimitive2d.cxx Change-Id: I04c148303e7153a5376eae79803c540f6eba0b00 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx index 39115a7..2c9e34f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -111,6 +111,11 @@ namespace drawinglayer boolmbSingleEntry : 1; boolmbFullyOpaque : 1; +// true = interpret in unit coordinate system - object aspect ratio will scale result +// false = interpret in object coordinate system - object aspect ratio will not scale result +// (related to SVG's gradientUnits (userSpaceOnUse|objectBoundingBox) +boolmbUseUnitCoordinates : 1; + protected: /// local helpers Primitive2DSequence createSingleGradientEntryFill() const; @@ -145,6 +150,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon rPolyPolygon, const SvgGradientEntryVector rGradientEntries, const basegfx::B2DPoint rStart, +bool bUseUnitCoordinates, SpreadMethod aSpreadMethod = Spread_pad); virtual ~SvgGradientHelper() {} @@ -152,6 +158,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon getPolyPolygon() const { return maPolyPolygon; } const SvgGradientEntryVector getGradientEntries() const { return maGradientEntries; } const basegfx::B2DPoint getStart() const { return maStart; } +bool getUseUnitCoordinates() const { return mbUseUnitCoordinates; } SpreadMethod getSpreadMethod() const { return maSpreadMethod; } /// compare operator @@ -194,6 +201,7 @@ namespace drawinglayer const SvgGradientEntryVector rGradientEntries, const basegfx::B2DPoint rStart, const basegfx::B2DPoint rEnd, +bool bUseUnitCoordinates, SpreadMethod aSpreadMethod = Spread_pad); virtual ~SvgLinearGradientPrimitive2D() {} @@ -261,6 +269,7 @@ namespace drawinglayer const SvgGradientEntryVector rGradientEntries, const basegfx::B2DPoint rStart, double fRadius, +bool bUseUnitCoordinates, SpreadMethod aSpreadMethod = Spread_pad, const basegfx::B2DPoint* pFocal = 0); diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index a8c60da..98dc1ca 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -283,6 +283,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon rPolyPolygon, const SvgGradientEntryVector rGradientEntries, const basegfx::B2DPoint rStart, +bool bUseUnitCoordinates, SpreadMethod aSpreadMethod) : maPolyPolygon(rPolyPolygon), maGradientEntries(rGradientEntries), @@ -291,7 +292,8 @@ namespace drawinglayer mbPreconditionsChecked(false), mbCreatesContent(false), mbSingleEntry(false), -mbFullyOpaque(true) +mbFullyOpaque(true), +mbUseUnitCoordinates(bUseUnitCoordinates) { } @@ -302,6 +304,7 @@ namespace drawinglayer return (getPolyPolygon() == rCompare.getPolyPolygon() getGradientEntries() == rCompare.getGradientEntries() getStart() == rCompare.getStart() + getUseUnitCoordinates() == rCompare.getUseUnitCoordinates() getSpreadMethod() == rCompare.getSpreadMethod()); } @@ -388,20 +391,37 @@ namespace drawinglayer basegfx::tools::createScaleTranslateB2DHomMatrix( fPolyWidth, fPolyHeight, aPolyRange.getMinX(), aPolyRange.getMinY())); +basegfx::B2DHomMatrix aUnitGradientToObject; +
Re: [PATCH] Help update - Hyperlink Bar removal
I'll try to explain it: The patch should remove all the stuff related to this page: https://help.libreoffice.org/Common/Hyperlink_Bar - which should be completely obsolete. The page itself was removed by the patch you mentioned, but subpages describing buttons of the bar still remains. If there is some of the buttons in UI the help must be kept, but I think they are gone. Insert-hyperlink is still covered by the page https://help.libreoffice.org/Common/Inserting_Hyperlinks Regards, Stan 2013/2/22 Caolán McNamara caol...@redhat.com On Sun, 2013-02-10 at 17:41 +0100, Stanislav Horáček wrote: Hi, this patch for help removes the pages related to the Hyperlink Bar which was - if I understand it correctly - removed from LO completely. Your patch seems to remove the help for e.g. insert-hyperlink which we still have, so we don't want to remove that. What we removed, IIRC, was the hyperlink bar which was a different thing. http://cgit.freedesktop.org/libreoffice/help/commit/?id=54108f6fd3f8355d12db0217d21fbab9dccf5ed8 removed the help for that, or at least most of it. I don't see any existing references in our help to that removed bar, or is there some still left ? https://bugs.freedesktop.org/show_bug.cgi?id=43915 suggests that it was still mentioned in the help at one stage in 3.4, but that it got fixed for 3.5 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Looking for PyUno Contributor(s)
On 02/20/2013 04:11 PM, Joel Madero wrote: I am one of the members of the Quality Assurance team with LibreOffice and we are looking for a volunteer to work with myself designing (and coding) the framework to start automating our stats. It's been on my list for much too long and I just don't have the technical know how to do it. If there are are users or developers who can slowly get this accomplished it would greatly help QA as well as Marketing as our stats are done almost completely manually at this point, not only is this time consuming but it's also likely that there could be mistakes or missing data. How is the above related to PyUno (i.e., the Python-UNO bridge)? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/misc/dsntypes.cxx | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) New commits: commit 5677e3f2514d5b797c239d99edce0189d5cf364b Author: Michael Stahl mst...@redhat.com Date: Fri Feb 22 17:15:16 2013 +0100 fix strings more in 1da3af5f1eb6a32fd0ab10da7cf2f8ddb298a3a1 Change-Id: I7d4cf698721fcf972bf35babb6d53369719eed18 diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 29ac584..e9c48e2 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -337,19 +337,21 @@ ODsnTypeCollection::TypeIterator ODsnTypeCollection::end() const DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString _rDsn) const { OUString sDsn(comphelper::string::stripEnd(_rDsn, '*')); -sal_uInt16 nSeparator = sDsn.indexOf((sal_Unicode)':'); -if (STRING_NOTFOUND == nSeparator) +sal_Int32 nSeparator = sDsn.indexOf(static_castsal_Unicode(':')); +if (-1 == nSeparator) { // there should be at least one such separator OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the colon !); return DST_UNKNOWN; } // find first : -sal_uInt16 nOracleSeparator = sDsn.indexOf((sal_Unicode)':', nSeparator + 1); -if ( nOracleSeparator != STRING_NOTFOUND ) +sal_Int32 nOracleSeparator = +sDsn.indexOf(static_castsal_Unicode(':'), nSeparator + 1); +if (-1 != nOracleSeparator) { -nOracleSeparator = sDsn.indexOf((sal_Unicode)':', nOracleSeparator + 1); -if (nOracleSeparator != STRING_NOTFOUND sDsn.equalsIgnoreAsciiCaseAsciiL(jdbc:oracle:thin, nOracleSeparator)) +nOracleSeparator = +sDsn.indexOf(static_castsal_Unicode(':'), nOracleSeparator + 1); +if (-1 != nOracleSeparator sDsn.equalsIgnoreAsciiCaseAsciiL(jdbc:oracle:thin, nOracleSeparator)) return DST_ORACLE_JDBC; } @@ -360,8 +362,8 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString _rDsn) const return DST_EMBEDDED_HSQLDB; // find second : -nSeparator = sDsn.indexOf((sal_Unicode)':', nSeparator + 1); -if (STRING_NOTFOUND == nSeparator) +nSeparator = sDsn.indexOf(static_castsal_Unicode(':'), nSeparator + 1); +if (-1 == nSeparator) { // at the moment only jdbc is allowed to have just one separator OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the second colon !); @@ -370,11 +372,11 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString _rDsn) const if (sDsn.equalsIgnoreAsciiCaseAsciiL(sdbc:ado:, nSeparator)) { -nSeparator = sDsn.indexOf((sal_Unicode)':', nSeparator + 1); -if (STRING_NOTFOUND != nSeparator sDsn.equalsIgnoreAsciiCaseAsciiL(sdbc:ado:access, nSeparator) ) +nSeparator = sDsn.indexOf(static_castsal_Unicode(':'), nSeparator + 1); +if (-1 != nSeparator sDsn.equalsIgnoreAsciiCaseAsciiL(sdbc:ado:access, nSeparator) ) { -nSeparator = sDsn.indexOf((sal_Unicode)';', nSeparator + 1); -if (STRING_NOTFOUND != nSeparator sDsn.equalsIgnoreAsciiCaseAsciiL(sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0, nSeparator) ) +nSeparator = sDsn.indexOf(static_castsal_Unicode(';'), nSeparator + 1); +if (-1 != nSeparator sDsn.equalsIgnoreAsciiCaseAsciiL(sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0, nSeparator) ) return DST_MSACCESS_2007; return DST_MSACCESS; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 6b59ccd5d4edb981496122a2d78cedaa052f0c70 Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 22 18:25:44 2013 +0200 WaE: unused variable Change-Id: I108ea85db7904e31cbeb1cd2dec89cb1cdf6275b diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index 98dc1ca..ef1c7ba 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -392,7 +392,6 @@ namespace drawinglayer fPolyWidth, fPolyHeight, aPolyRange.getMinX(), aPolyRange.getMinY())); basegfx::B2DHomMatrix aUnitGradientToObject; -static bool bInterpretAbsolute(true); if(getUseUnitCoordinates()) { @@ -720,7 +719,6 @@ namespace drawinglayer fPolyWidth, fPolyHeight, aPolyRange.getMinX(), aPolyRange.getMinY())); basegfx::B2DHomMatrix aUnitGradientToObject; -static bool bInterpretAbsolute(true); if(getUseUnitCoordinates()) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/toolbox.h |3 + vcl/source/window/toolbox2.cxx | 69 - 2 files changed, 18 insertions(+), 54 deletions(-) New commits: commit 5dff2d0822bb299c134a05a64747ce1bb42ad7cd Author: Chr. Rossmanith chrrossman...@gmx.de Date: Thu Feb 21 22:56:21 2013 +0100 Replace duplicate code from ImplToolItem constructors with init method Change-Id: I2e2950045d8970eec3d1e04269bfe2ecbc9c3e6f Reviewed-on: https://gerrit.libreoffice.org/2267 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 0547e57..7fa82d9 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -107,6 +107,9 @@ struct ImplToolItem // returns sal_True if the toolbar item is currently clipped, which can happen for docked toolbars sal_Bool IsClipped() const; + +private: +void init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, sal_Bool bEmptyBtn); }; namespace vcl diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 081f524..85f7ca9 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -86,24 +86,30 @@ ImplToolBoxPrivateData::~ImplToolBoxPrivateData() } // --- -ImplToolItem::ImplToolItem() +void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, +sal_Bool bEmptyBtn) { -mnId= 0; +mnId= nItemId; mpWindow= NULL; mpUserData = NULL; meType = TOOLBOXITEM_BUTTON; -mnBits = 0; +mnBits = nItemBits; meState = STATE_NOCHECK; mbEnabled = sal_True; mbVisible = sal_True; -mbEmptyBtn = sal_True; +mbEmptyBtn = bEmptyBtn; mbShowWindow= sal_False; mbBreak = sal_False; mnSepSize = TB_SEP_SIZE; mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH; mnImageAngle= 0; -mbMirrorMode= sal_False; -mbVisibleText = sal_False; +mbMirrorMode= false; +mbVisibleText = false; +} + +ImplToolItem::ImplToolItem() +{ +init(0, 0, sal_True); } // --- @@ -112,22 +118,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image rImage, ToolBoxItemBits nItemBits ) : maImage( rImage ) { -mnId= nItemId; -mpWindow= NULL; -mpUserData = NULL; -meType = TOOLBOXITEM_BUTTON; -mnBits = nItemBits; -meState = STATE_NOCHECK; -mbEnabled = sal_True; -mbVisible = sal_True; -mbEmptyBtn = sal_False; -mbShowWindow= sal_False; -mbBreak = sal_False; -mnSepSize = TB_SEP_SIZE; -mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH; -mnImageAngle= 0; -mbMirrorMode= false; -mbVisibleText = false; +init(nItemId, nItemBits, sal_False); } // --- @@ -136,22 +127,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const XubString rText, ToolBoxItemBits nItemBits ) : maText( rText ) { -mnId= nItemId; -mpWindow= NULL; -mpUserData = NULL; -meType = TOOLBOXITEM_BUTTON; -mnBits = nItemBits; -meState = STATE_NOCHECK; -mbEnabled = sal_True; -mbVisible = sal_True; -mbEmptyBtn = sal_False; -mbShowWindow= sal_False; -mbBreak = sal_False; -mnSepSize = TB_SEP_SIZE; -mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH; -mnImageAngle= 0; -mbMirrorMode= false; -mbVisibleText = false; +init(nItemId, nItemBits, sal_False); } // --- @@ -161,22 +137,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image rImage, maImage( rImage ), maText( rText ) { -mnId= nItemId; -mpWindow= NULL; -mpUserData = NULL; -meType = TOOLBOXITEM_BUTTON; -mnBits = nItemBits; -meState = STATE_NOCHECK; -mbEnabled = sal_True; -mbVisible = sal_True; -mbEmptyBtn = sal_False; -mbShowWindow= sal_False; -mbBreak = sal_False; -mnSepSize = TB_SEP_SIZE; -mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH; -mnImageAngle= 0; -mbMirrorMode= false; -mbVisibleText = false; +init(nItemId, nItemBits, sal_False); } // --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tblr-height.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 13 + writerfilter/source/dmapper/DomainMapperTableManager.cxx | 10 ++ writerfilter/source/dmapper/DomainMapperTableManager.hxx |7 +++ writerfilter/source/dmapper/TablePropertiesHandler.cxx |8 +++- 5 files changed, 37 insertions(+), 1 deletion(-) New commits: commit 0208ead70a9412ccd554fcef3e9308f8ca17037b Author: Miklos Vajna vmik...@suse.cz Date: Fri Feb 22 17:08:39 2013 +0100 DOCX import: improve btLr table cell support The problem was that in case the contents didn't fit into a single line, multiple lines were created, which is not what btLr wants. Set the size type to fixed in this case. Change-Id: Ibab1313f95dc16dd0366d21a00109a6f38fa3526 diff --git a/sw/qa/extras/ooxmlimport/data/tblr-height.docx b/sw/qa/extras/ooxmlimport/data/tblr-height.docx new file mode 100755 index 000..6a16c81 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tblr-height.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index eec5e70..f6eb0ef 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -51,6 +51,7 @@ #include com/sun/star/view/XSelectionSupplier.hpp #include com/sun/star/table/BorderLine2.hpp #include com/sun/star/table/TableBorder2.hpp +#include com/sun/star/text/SizeType.hpp #include vcl/svapp.hxx @@ -115,6 +116,7 @@ public: void testN793998(); void testGroupshapeLine(); void testN779642(); +void testTbLrHeight(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -182,6 +184,7 @@ void Test::run() {n793998.docx, Test::testN793998}, {groupshape-line.docx, Test::testGroupshapeLine}, {n779642.docx, Test::testN779642}, +{tblr-height.docx, Test::testTbLrHeight}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1183,6 +1186,16 @@ void Test::testN779642() CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong vertical orientation relation, nValue, text::RelOrientation::PAGE_PRINT_AREA); } +void Test::testTbLrHeight() +{ +uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY); +uno::Referencetext::XTextTable xTable(xTables-getByIndex(0), uno::UNO_QUERY); +uno::Referencetable::XTableRows xTableRows(xTable-getRows(), uno::UNO_QUERY); +// btLr text direction was imported as MIN, it should be FIX to avoid incorrectly large height in case of too much content. +CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, getPropertysal_Int16(xTableRows-getByIndex(0), SizeType)); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index d3ddf82..1f9853b 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -52,6 +52,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) : m_nTableWidth(0), m_bOOXML( bOOXML ), m_bPushCurrentWidth(false), +m_bRowSizeTypeInserted(false), m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) ) { m_pTablePropsHandler-SetTableManager( this ); @@ -261,10 +262,18 @@ bool DomainMapperTableManager::sprm(Sprm rSprm) SAL_INFO( writerfilter, Have inserted textDirection nIntValue ); break; case 3: // btLr +{ // We have to fake this text direction pPropMap-Insert( PROP_FRM_DIRECTION, false, uno::makeAny( text::WritingMode2::LR_TB )); pPropMap-Insert( PROP_CHAR_ROTATION, false, uno::makeAny( sal_Int16( 900 ) )); SAL_INFO( writerfilter, Have inserted textDirection nIntValue ); + +// We're faking a text direction, so don't allow multiple lines. +TablePropertyMapPtr pRowPropMap( new TablePropertyMap ); +pRowPropMap-Insert(PROP_SIZE_TYPE, false, uno::makeAny(text::SizeType::FIX)); +m_bRowSizeTypeInserted = true; +insertRowProps(pRowPropMap); +} break; case 4: // lrTbV pPropMap-Insert( PROP_FRM_DIRECTION, false, uno::makeAny( text::WritingMode2::LR_TB )); @@ -583,6 +592,7 @@ void DomainMapperTableManager::endOfRowAction() pCellWidths-clear(); m_nGridBefore = m_nGridAfter = 0; +m_bRowSizeTypeInserted = false; #ifdef
[Libreoffice-commits] core.git: 2 commits - extras/source sc/uiconfig vcl/inc vcl/source
extras/source/glade/libreoffice-catalog.xml | 15 +++ sc/uiconfig/scalc/ui/sortoptionspage.ui |3 ++- vcl/inc/vcl/combobox.hxx|4 vcl/inc/vcl/lstbox.hxx |4 vcl/source/control/combobox.cxx | 17 + vcl/source/control/lstbox.cxx | 21 + vcl/source/window/builder.cxx |2 +- 7 files changed, 64 insertions(+), 2 deletions(-) New commits: commit 6c68f2c8edb47d8165521ce97799092ab449a9b7 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 16:54:59 2013 + wrap max-width-chars in a custom widget to avoid it getting dropped silently Change-Id: I7ccbd4b2e1aebc84a59bb9000e7322c8aa62ffd7 diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml index 0612baa..93f4dc6 100644 --- a/extras/source/glade/libreoffice-catalog.xml +++ b/extras/source/glade/libreoffice-catalog.xml @@ -57,5 +57,20 @@ glade-widget-class title=Table Container name=svxcorelo-SvxSimpleTableContainer generic-name=Simple Table Container parent=GtkTreeView icon-name=widget-gtk-treeview/ + +glade-widget-class title=VclComboBoxText name=VclComboBoxText +generic-name=ComboBoxText parent=GtkComboBoxText +icon-name=widget-gtk-comboboxtext + properties +property save=True query=False id=max-width-chars default=-1 name=Maximum Width in Characters + parameter-spec +typeGParamInt/type +min-1/min + /parameter-spec + tooltipThe desired maximum width of the ComboBox, in characters/tooltip +/property + /properties +/glade-widget-class + /glade-widget-classes /glade-catalog diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui index 2b0a9cc..0fc7eeb 100644 --- a/sc/uiconfig/scalc/ui/sortoptionspage.ui +++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui @@ -164,7 +164,7 @@ /packing /child child - object class=GtkComboBox id=sortuserlb + object class=VclComboBoxText id=sortuserlb property name=visibleTrue/property property name=can_focusFalse/property property name=margin_left20/property diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 264bf92..facb2e5 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1060,7 +1060,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString name, const OStri } else if (name == GtkLinkButton) pWindow = new FixedHyperlink(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK|WB_NOLABEL); -else if ((name == GtkComboBox) || (name == GtkComboBoxText)) +else if ((name == GtkComboBox) || (name == GtkComboBoxText) || (name == VclComboBoxText)) { extractModel(id, rMap); if (extractEntry(rMap)) commit 7c760f34a00462d5904d0e2eed4132761c2e51c5 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 22 15:41:00 2013 + Resolves: fdo#60764 sort options can grow too wide to fit on screen Change-Id: Id3aed9ef251f61710b43ceda1a28c6895e91872f diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui index 805e0cc..2b0a9cc 100644 --- a/sc/uiconfig/scalc/ui/sortoptionspage.ui +++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui @@ -168,6 +168,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=margin_left20/property +property name=max_width_chars72/property accessibility relation type=labelled-by target=sortuser/ /accessibility diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index 33a4382..1a73983 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -47,6 +47,7 @@ private: sal_BoolmbDDAutoSize: 1; sal_BoolmbSyntheticModify : 1; sal_BoolmbMatchCase : 1; +sal_Int32 m_nMaxWidthChars; LinkmaSelectHdl; LinkmaDoubleClickHdl; @@ -214,6 +215,9 @@ public: */ using Control::GetIndexForPoint; long GetIndexForPoint( const Point rPoint, sal_uInt16 rPos ) const; + +sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } +void setMaxWidthChars(sal_Int32 nWidth); }; #endif // _COMBOBOX_HXX diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx index 694f45c..74dc854 100644 --- a/vcl/inc/vcl/lstbox.hxx +++ b/vcl/inc/vcl/lstbox.hxx @@ -44,6 +44,7 @@ private:
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/sdxmlexp.cxx | 13 + xmloff/source/draw/sdxmlexp_impl.hxx |1 + 2 files changed, 14 insertions(+) New commits: commit f0cd6fe9075cd0aa00162474784ad804a07ed138 Author: Radek Doulik r...@novell.com Date: Fri Feb 22 18:06:18 2013 +0100 use document settings / embed fonts when exporting odp Change-Id: I9e8db1ae08b570f093b13d50bfde823c85cdba95 diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index d33db72..441dbf0 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2901,4 +2901,17 @@ OUString SAL_CALL SdXMLExport::getImplementationName() throw( uno::RuntimeExcept } } +XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool() +{ +bool bEmbedFonts = false; +Reference lang::XMultiServiceFactory xFac( GetModel(), UNO_QUERY ); +if( xFac.is() ) +{ +Reference beans::XPropertySet xProps( xFac-createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( com.sun.star.document.Settings ) ) ), UNO_QUERY ); +if( xProps.is() ) +xProps-getPropertyValue(EmbedFonts) = bEmbedFonts; +} +return new XMLFontAutoStylePool( *this, bEmbedFonts ); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index 166f573..cc5a5ed 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -174,6 +174,7 @@ class SdXMLExport : public SvXMLExport protected: virtual void GetViewSettings(com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue aProps); virtual void GetConfigurationSettings(com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue aProps); +virtual XMLFontAutoStylePool* CreateFontAutoStylePool(); public: SdXMLExport( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - reportdesign/source
reportdesign/source/ui/inspection/GeometryHandler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 211a4d041933a85364c4693cc741fc3a601f821c Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Feb 22 16:30:03 2013 +0100 Compare strings with proper length Change-Id: If88f79a7f63edb254ad5356e9a0fccc5573af106 Reviewed-on: https://gerrit.libreoffice.org/2338 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index cfb5cba..923bf49 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -1430,7 +1430,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr } else if ( PropertyName.equalsAsciiL(PROPERTY_FORMULA.ascii, PROPERTY_FORMULA.length) || PropertyName.equalsAsciiL(PROPERTY_INITIALFORMULA.ascii, PROPERTY_INITIALFORMULA.length) -|| PropertyName.equalsAsciiL(PROPERTY_DATAFIELD.ascii, PROPERTY_INITIALFORMULA.length) +|| PropertyName.equalsAsciiL(PROPERTY_DATAFIELD.ascii, PROPERTY_DATAFIELD.length) || PropertyName.equalsAsciiL(PROPERTY_CONDITIONALPRINTEXPRESSION.ascii, PROPERTY_CONDITIONALPRINTEXPRESSION.length)) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sfx2/source svl/source xmloff/source
sfx2/source/appl/sfxhelp.cxx | 43 ++- sfx2/source/bastyp/helper.cxx| 10 sfx2/source/inc/helper.hxx |4 +-- svl/source/items/custritm.cxx| 16 ++--- xmloff/source/draw/sdxmlimp.cxx | 11 xmloff/source/draw/sdxmlimp_impl.hxx |1 6 files changed, 45 insertions(+), 40 deletions(-) New commits: commit eb451cbc1aa2f96b1a913d85823ef27275ad367b Author: Radek Doulik r...@novell.com Date: Fri Feb 22 18:15:22 2013 +0100 set document settings / embed fonts when importing odp Change-Id: Ib7160c3b00399e704cd02a41735b0ff4f13d8554 diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 6797c73..3c86883 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -1068,4 +1068,15 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString rName, const ::rtl::OU return aDecl.maStrText; } +void SdXMLImport::NotifyEmbeddedFontRead() +{ +uno::Reference lang::XMultiServiceFactory xFac( GetModel(), uno::UNO_QUERY ); +if( xFac.is() ) +{ +uno::Reference beans::XPropertySet xProps( xFac-createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( com.sun.star.document.Settings ) ) ), uno::UNO_QUERY ); +if( xProps.is() ) +xProps-setPropertyValue(EmbedFonts, uno::makeAny( true ) ); +} +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index dbede52..43ba353 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -310,6 +310,7 @@ public: ::rtl::OUString GetFooterDecl( const ::rtl::OUString rName ) const; ::rtl::OUString GetDateTimeDecl( const ::rtl::OUString rName, sal_Bool rbFixed, ::rtl::OUString rDateTimeFormat ); +virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE; }; #endif // _SDXMLIMP_HXX commit 046ad9ffad7b4647fcc66291dec73bbb67a7fe85 Author: Ivan Timofeev timofeev@gmail.com Date: Fri Feb 22 21:09:12 2013 +0400 fix string conversion in 1da3af5f1eb6a32fd0ab10da7cf2f8ddb298a3a1 Change-Id: I683002c12f9bb8f053dafea70c889a2881a70b99 diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 3b3128d..d44b43c 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -54,19 +54,9 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const rWith) const DBG_CHKTHIS(CntUnencodedStringItem, 0); DBG_ASSERT(rWith.ISA(CntUnencodedStringItem), CntUnencodedStringItem::Compare(): Bad type); -switch (m_aValue.compareTo(static_cast CntUnencodedStringItem const * ( - rWith)- - m_aValue)) -{ -case COMPARE_LESS: -return -1; - -case COMPARE_EQUAL: -return 0; - -default: // COMPARE_GREATER -return 1; -} +sal_Int32 nCmp = m_aValue.compareTo( +static_cast CntUnencodedStringItem const * (rWith)-m_aValue); +return (nCmp == 0) ? 0 : (nCmp 0) ? -1 : 1; } // commit 3a5ae29f0d2f4467ec75803d6e3b5b461672428a Author: Ivan Timofeev timofeev@gmail.com Date: Fri Feb 22 15:19:38 2013 +0400 String - OUString Change-Id: I5b577a8e0675d7849ca22e24bb99ee2d8602ae6a diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index fa346a8..6b6aeea 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -126,12 +126,12 @@ static OUString HelpLocaleString() if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None) { bOk = false; -String sLang(aLocaleStr); -xub_StrLen nSepPos = sLang.Search( '-' ); -if (nSepPos != STRING_NOTFOUND) +OUString sLang(aLocaleStr); +sal_Int32 nSepPos = sLang.indexOf( '-' ); +if (nSepPos != -1) { bOk = true; -sLang = sLang.Copy( 0, nSepPos ); +sLang = sLang.copy( 0, nSepPos ); sHelpPath = aBaseInstallPath + OUString::createFromAscii(szHelpPath) + sLang; if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None) @@ -185,7 +185,7 @@ sal_Bool GetHelpAnchor_Impl( const OUString _rURL, OUString _rAnchor ) if ( !sAnchor.isEmpty() ) { -_rAnchor = String( sAnchor ); +_rAnchor = sAnchor; bRet = sal_True; } } @@ -307,7 +307,7 @@ public: ~SfxHelp_Impl(); SfxHelpOptions_Impl*GetOptions(); -static String GetHelpText( const OUString
[MERGE FAILED] String cleanup in filter
Norbert Thiebaud has submitted this change and it FAILED to merge. Change subject: String cleanup in filter .. Your change could not be merged due to a path conflict. Please merge (or rebase) the change locally and upload the resolution for review. -- To view, visit https://gerrit.libreoffice.org/1970 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merge-failed Gerrit-Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd Gerrit-PatchSet: 7 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/docpool.cxx |4 +- sc/source/core/data/dpdimsave.cxx |2 - sc/source/core/data/dputil.cxx |2 - sc/source/core/data/drwlayer.cxx|2 - sc/source/core/data/global.cxx |4 +- sc/source/core/data/stlpool.cxx |2 - sc/source/core/data/table4.cxx |4 +- sc/source/core/tool/address.cxx | 12 +++ sc/source/core/tool/compiler.cxx|8 ++-- sc/source/filter/excel/excdoc.cxx |2 - sc/source/filter/excel/excform.cxx |2 - sc/source/filter/excel/excform8.cxx |2 - sc/source/filter/excel/namebuff.cxx | 10 ++--- sc/source/filter/excel/xehelper.cxx |2 - sc/source/filter/excel/xename.cxx |2 - sc/source/filter/excel/xistyle.cxx |2 - sc/source/filter/ftools/ftools.cxx |4 +- sc/source/filter/html/htmlexp.cxx |2 - sc/source/filter/starcalc/scflt.cxx |2 - sc/source/filter/xml/xmlwrap.cxx|4 +- sc/source/ui/Accessibility/AccessibleCsvControl.cxx |2 - sc/source/ui/dbgui/asciiopt.cxx | 12 +++ sc/source/ui/dbgui/csvgrid.cxx |2 - sc/source/ui/dbgui/csvruler.cxx |4 +- sc/source/ui/dbgui/imoptdlg.cxx |4 +- sc/source/ui/dbgui/sortkeydlg.cxx |2 - sc/source/ui/docshell/dbdocimp.cxx |2 - sc/source/ui/docshell/docsh5.cxx|2 - sc/source/ui/docshell/docsh8.cxx| 16 - sc/source/ui/docshell/impex.cxx | 16 - sc/source/ui/docshell/tpstat.cxx|6 +-- sc/source/ui/formdlg/dwfunctr.cxx |4 +- sc/source/ui/miscdlgs/acredlin.cxx |4 +- sc/source/ui/miscdlgs/instbdlg.cxx |2 - sc/source/ui/miscdlgs/optsolver.cxx |2 - sc/source/ui/miscdlgs/sharedocdlg.cxx |2 - sc/source/ui/navipi/content.cxx |2 - sc/source/ui/unoobj/chart2uno.cxx |6 +-- sc/source/ui/unoobj/filtuno.cxx |2 - sc/source/ui/vba/vbaworksheet.cxx |4 +- sc/source/ui/vba/vbaworksheets.cxx |4 +- sc/source/ui/view/cellsh.cxx|4 +- sc/source/ui/view/cellsh3.cxx |2 - sc/source/ui/view/colrowba.cxx |4 +- sc/source/ui/view/dbfunc3.cxx |2 - sc/source/ui/view/gridwin4.cxx |2 - sc/source/ui/view/preview.cxx |4 +- sc/source/ui/view/prevwsh.cxx | 12 +++ sc/source/ui/view/printfun.cxx |2 - sc/source/ui/view/tabview.cxx |2 - sc/source/ui/view/tabview4.cxx |8 ++-- sc/source/ui/view/viewdata.cxx | 34 ++-- 52 files changed, 125 insertions(+), 125 deletions(-) New commits: commit bb5fa449378d6535932d39f2357c06e181647346 Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com Date: Wed Feb 20 00:17:30 2013 +0100 fdo#38838 search replace for String::CreateFromInt32(). I ran the following code replace: s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/ Change-Id: I45edaec4de2481ad45f9bcae2e280d5aca487714 Reviewed-on: https://gerrit.libreoffice.org/2281 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 535a480..e7f008c 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -917,7 +917,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_NAMELESS: { String aPages( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_PAGES ) ); -aPages.SearchAndReplaceAscii( %1, String::CreateFromInt32( nPagNo ) ); +aPages.SearchAndReplaceAscii( %1, OUString::number( nPagNo ) ); rText += aPages; } break; @@ -946,7 +946,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation( rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FIRSTPAGENO) + aStrSep; // break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: -rText += String::CreateFromInt32( nPagNo ); +rText += OUString::number(
[Libreoffice-commits] core.git: filter/inc filter/source sd/source
filter/inc/filter/msfilter/svdfppt.hxx | 28 +++--- filter/source/msfilter/svdfppt.cxx | 138 - sd/source/filter/ppt/pptin.cxx | 48 +-- sd/source/filter/ppt/propread.cxx | 18 ++-- sd/source/filter/ppt/propread.hxx |2 5 files changed, 117 insertions(+), 117 deletions(-) New commits: commit e904749eb8e1109f9a884b309fad6de5f78ad623 Author: Ricardo Montania rica...@linuxafundo.com.br Date: Sun Feb 3 00:02:38 2013 -0200 String cleanup in filter Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd Reviewed-on: https://gerrit.libreoffice.org/1970 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 79272f5..fcc704f 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -63,7 +63,7 @@ struct MSFILTER_DLLPUBLIC PptCurrentUserAtom sal_uInt16 nDocFileVersion; sal_uInt8 nMajorVersion; sal_uInt8 nMinorVersion; -String aCurrentUser; +OUStringaCurrentUser; public: @@ -92,13 +92,13 @@ struct SdHyperlinkEntry sal_Int32 nPrivate2; sal_Int32 nPrivate3; sal_Int32 nInfo; -String aTarget; -String aSubAdress; +OUStringaTarget; +OUStringaSubAdress; sal_Int32 nStartPos; sal_Int32 nEndPos; -String aConvSubString; +OUStringaConvSubString; ESelection aESelection; sal_BoolbSelection; }; @@ -260,7 +260,7 @@ public: struct PptFontEntityAtom { -String aName; +OUStringaName; double fScaling; sal_uInt8 lfClipPrecision; sal_uInt8 lfQuality; @@ -416,7 +416,7 @@ protected: sal_BoolbTimesNewRomanChecked : 1; sal_BoolbTimesNewRomanAvailable : 1; -sal_BoolReadString( rtl::OUString rStr ) const; +sal_BoolReadString( OUString rStr ) const; // nur fuer PowerPoint-Filter: virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const; @@ -425,7 +425,7 @@ public: PowerPointImportParam rImportParam; -SdrEscherImport( PowerPointImportParam, const String rBaseURL ); +SdrEscherImport( PowerPointImportParam, const OUString rBaseURL ); virtual ~SdrEscherImport(); virtual boolGetColorFromPalette( sal_uInt16 nNum, Color rColor ) const; virtual sal_BoolSeekToShape( SvStream rSt, void* pClientData, sal_uInt32 nId ) const; @@ -453,7 +453,7 @@ struct MSFILTER_DLLPUBLIC PPTFieldEntry sal_uInt16 nTextRangeEnd; SvxFieldItem* pField1; SvxFieldItem* pField2; -String* pString; +OUString* pString; PPTFieldEntry() : nPos( 0 ), nTextRangeEnd( 0 ), pField1( NULL ), pField2( NULL ), pString( NULL ) {}; ~PPTFieldEntry(); @@ -471,7 +471,7 @@ struct MSFILTER_DLLPUBLIC PPTFieldEntry struct MSFILTER_DLLPUBLIC HeaderFooterEntry { const PptSlidePersistEntry* pMasterPersist; -String pPlaceholder[ 4 ]; +OUStringpPlaceholder[ 4 ]; sal_uInt32 nAtom; sal_uInt32 GetMaskForInstance( sal_uInt32 nInstance ); @@ -575,7 +575,7 @@ protected: voidSeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOptions ); public: -SdrPowerPointImport( PowerPointImportParam, const String rBaseURL ); +SdrPowerPointImport( PowerPointImportParam, const OUString rBaseURL ); virtual ~SdrPowerPointImport(); sal_uInt16 GetPageCount( PptPageKind eKind = PPT_SLIDEPAGE ) const; voidSetPageNum( sal_uInt16 nPageNum, PptPageKind = PPT_SLIDEPAGE ); @@ -916,7 +916,7 @@ struct PPTCharPropSet sal_uInt32 mnOriginalTextPos; sal_uInt32 mnParagraph; -String maString; +OUStringmaString; SvxFieldItem* mpFieldItem; sal_uInt16 mnLanguage[ 3 ]; @@ -1049,7 +1049,7 @@ struct PPTStyleTextPropReader SvStream rIn, SdrPowerPointImport rMan, const DffRecordHeader rTextHeader, -const String aString, +const OUString aString, PPTTextRulerInterpreter rRuler, sal_uInt32 nCharCount, sal_Bool bTextPropAtom @@ -1057,7 +1057,7 @@ struct PPTStyleTextPropReader voidReadCharProps( SvStream rIn, PPTCharPropSet aCharPropSet, -const String aString, +const OUString aString, sal_uInt32 nCharCount, sal_uInt32 nCharAnzRead,
[PATCH] String cleanup in filter
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/1970 to look at the new patch set (#8). Change subject: String cleanup in filter .. String cleanup in filter Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd --- M filter/inc/filter/msfilter/svdfppt.hxx M filter/source/msfilter/svdfppt.cxx M sd/source/filter/ppt/pptin.cxx M sd/source/filter/ppt/propread.cxx M sd/source/filter/ppt/propread.hxx 5 files changed, 117 insertions(+), 117 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/1970/8 -- To view, visit https://gerrit.libreoffice.org/1970 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd Gerrit-PatchSet: 8 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] [PUSHED] String cleanup in filter
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1970 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1970 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If9fac2f277550cc786baffe4f89c7181b2d10dfd Gerrit-PatchSet: 9 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86edaa34e8ac4c67543941ce290aa7a472d4e525 Author: Tor Lillqvist t...@iki.fi Date: Tue Feb 19 19:57:12 2013 +0200 Avoid infinite recursion (cherry picked from commit 0d05957cf0c38abab45030ba172025e4ef318f43) Change-Id: I3085b82a80228211951b5230b7e8d3bcf535e052 Reviewed-on: https://gerrit.libreoffice.org/2269 Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx index e2c7a4a..dcec4e3 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx @@ -67,7 +67,7 @@ void BufferedStreamSocket::close() mSocket = -1; } else -close(); +::osl::StreamSocket::close(); } sal_Int32 BufferedStreamSocket::readLine( OString aLine ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/vmlexport.cxx | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) New commits: commit 685c6dadaad760169749c62cdefb4b3ae5a8ddf9 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Feb 21 20:50:05 2013 -0600 coverity#738776 Uninitialized scalar field Change-Id: I98770ba5cf3179a743d1f3fe0684f12adc65c29b Reviewed-on: https://gerrit.libreoffice.org/2322 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index a69b607..d865f91 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -35,14 +35,15 @@ using namespace sax_fastparser; using namespace oox::vml; VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr pSerializer, VMLTextExport* pTextExport ) -: EscherEx( EscherExGlobalRef(new EscherExGlobal(0)), 0 ), - m_pSerializer( pSerializer ), - m_pTextExport( pTextExport ), - m_pSdrObject( 0 ), - m_pShapeAttrList( NULL ), - m_nShapeType( ESCHER_ShpInst_Nil ), - m_pShapeStyle( new OStringBuffer( 200 ) ), - m_pShapeTypeWritten( new bool[ ESCHER_ShpInst_COUNT ] ) +: EscherEx( EscherExGlobalRef(new EscherExGlobal(0)), 0 ) +, m_pSerializer( pSerializer ) +, m_pTextExport( pTextExport ) +, m_pSdrObject( 0 ) +, m_pShapeAttrList( NULL ) +, m_nShapeType( ESCHER_ShpInst_Nil ) +, m_nShapeFlags(0) +, m_pShapeStyle( new OStringBuffer( 200 ) ) +, m_pShapeTypeWritten( new bool[ ESCHER_ShpInst_COUNT ] ) { mnGroupLevel = 1; memset( m_pShapeTypeWritten, 0, ESCHER_ShpInst_COUNT * sizeof( bool ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/inc
oox/inc/oox/ole/axbinarywriter.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit c522001687676327b6f04d0d72a1d45fe3f2b110 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Feb 21 20:43:13 2013 -0600 coverity#738777 Uninitialized scalar field = unused member Change-Id: Id4ddd4d4581aa35abfab0251737607d794a944f3 Reviewed-on: https://gerrit.libreoffice.org/2321 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/oox/inc/oox/ole/axbinarywriter.hxx b/oox/inc/oox/ole/axbinarywriter.hxx index fbd0921..c344285 100644 --- a/oox/inc/oox/ole/axbinarywriter.hxx +++ b/oox/inc/oox/ole/axbinarywriter.hxx @@ -181,7 +181,6 @@ private: sal_Int64 mnPropFlagsStart; /// pos of Prop flags sal_Int64 mnPropFlags;/// Flags specifying existing properties. sal_Int64 mnNextProp; /// Next property to read. -sal_Int64 mnPropsEnd; /// End position of simple/large properties. boolmbValid;/// True = stream still valid. boolmb64BitPropFlags; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/docprop/docprophandler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f9ec3b34774c0f5822b42a49a28447c5e888de41 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Feb 21 21:10:05 2013 -0600 coverity#736043 Missing break in switch Change-Id: Ia75cc63035119f243e8145e982d1f5267078c1e8 Reviewed-on: https://gerrit.libreoffice.org/2323 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 1067315..8ae78a7 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -614,7 +614,7 @@ void SAL_CALL OOXMLDocPropHandler::characters( const ::rtl::OUString aChars ) case VT_TOKEN( date ): case VT_TOKEN( filetime ): AddCustomProperty( uno::makeAny( GetDateTimeFromW3CDTF( aChars ) ) ); - +break; case VT_TOKEN( i1 ): case VT_TOKEN( i2 ): AddCustomProperty( uno::makeAny( (sal_Int16)aChars.toInt32() ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/docprop/docprophandler.cxx | 508 +- 1 file changed, 254 insertions(+), 254 deletions(-) New commits: commit 0041d05b560e878ccd28d05268ba73394f681b59 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Feb 21 21:25:08 2013 -0600 cosmetic clean-ups Change-Id: I951d0f52b12bde4df8cb444a654e6f45c66c5f57 Reviewed-on: https://gerrit.libreoffice.org/2324 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 8ae78a7..d0aa157 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -33,13 +33,14 @@ namespace oox { namespace docprop { // -OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference uno::XComponentContext xContext, const uno::Reference document::XDocumentProperties xDocProp ) -: m_xContext( xContext ) -, m_xDocProp( xDocProp ) -, m_nState( 0 ) -, m_nBlock( 0 ) -, m_nType( 0 ) -, m_nInBlock( 0 ) +OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference uno::XComponentContext xContext, + const uno::Reference document::XDocumentProperties xDocProp ) +: m_xContext( xContext ) +, m_xDocProp( xDocProp ) +, m_nState( 0 ) +, m_nBlock( 0 ) +, m_nType( 0 ) +, m_nInBlock( 0 ) { if ( !xContext.is() || !xDocProp.is() ) throw uno::RuntimeException(); @@ -55,7 +56,7 @@ void OOXMLDocPropHandler::InitNew() { m_nState = 0; m_nBlock = 0; -m_aCustomPropertyName = ::rtl::OUString(); +m_aCustomPropertyName = ; m_nType = 0; m_nInBlock = 0; } @@ -87,7 +88,7 @@ void OOXMLDocPropHandler::AddCustomProperty( const uno::Any aAny ) } // -util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const ::rtl::OUString aChars ) +util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString aChars ) { oslDateTime aOslDTime = { 0, 0, 0, 0, 0, 0, 0, 0 }; sal_Int32 nLen = aChars.getLength(); @@ -153,11 +154,11 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const ::rtl::OUString } // -uno::Sequence ::rtl::OUString OOXMLDocPropHandler::GetKeywordsSet( const ::rtl::OUString aChars ) +uno::Sequence OUString OOXMLDocPropHandler::GetKeywordsSet( const OUString aChars ) { if ( !aChars.isEmpty() ) { -uno::Sequence ::rtl::OUString aResult( 20 ); +uno::Sequence OUString aResult( 20 ); sal_Int32 nCounter = 0; const sal_Unicode* pStr = aChars.getStr(); @@ -165,24 +166,24 @@ uno::Sequence ::rtl::OUString OOXMLDocPropHandler::GetKeywordsSet( const ::rt { switch( pStr[nInd] ) { -case (sal_Unicode)' ': -case (sal_Unicode)',': -case (sal_Unicode)';': -case (sal_Unicode)':': -case (sal_Unicode)'\t': -// this is a delimiter -// unfortunately I did not find any specification for the possible delimiters -if ( !aResult[nCounter].isEmpty() ) -{ -if ( nCounter = aResult.getLength() ) -aResult.realloc( nCounter + 10 ); -nCounter++; -} -break; +case (sal_Unicode)' ': +case (sal_Unicode)',': +case (sal_Unicode)';': +case (sal_Unicode)':': +case (sal_Unicode)'\t': +// this is a delimiter +// unfortunately I did not find any specification for the possible delimiters +if ( !aResult[nCounter].isEmpty() ) +{ +if ( nCounter = aResult.getLength() ) +aResult.realloc( nCounter + 10 ); +nCounter++; +} +break; -default: -// this should be a part of keyword -aResult[nCounter] += ::rtl::OUString( (sal_Unicode)pStr[nInd] ); +default: +// this should be a part of keyword +aResult[nCounter] += OUString( (sal_Unicode)pStr[nInd] ); } } @@ -190,10 +191,10 @@ uno::Sequence ::rtl::OUString OOXMLDocPropHandler::GetKeywordsSet( const ::rt return aResult; } -return uno::Sequence ::rtl::OUString (); +return uno::Sequence OUString (); } // -lang::Locale OOXMLDocPropHandler::GetLanguage( const ::rtl::OUString aChars ) +lang::Locale OOXMLDocPropHandler::GetLanguage( const OUString aChars ) { lang::Locale aResult; if (
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - oox/inc writerfilter/source
oox/inc/oox/vml/vmltextbox.hxx |2 +- writerfilter/source/dmapper/DomainMapperTableManager.hxx |1 - 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 6c6c6c3e876a831fcd954fc3fedb7d21bc142fe8 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Fri Feb 22 18:48:51 2013 +0100 Fixed conflict resolution problems Change-Id: Icfe653b3a5f307d21a8c99ce4c133234aa36378b diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx index 427bb79..754ec21 100644 --- a/oox/inc/oox/vml/vmltextbox.hxx +++ b/oox/inc/oox/vml/vmltextbox.hxx @@ -95,7 +95,7 @@ public: /// Text distance from the border (inset attribute of v:textbox), valid only if set. bool borderDistanceSet; int borderDistanceLeft, borderDistanceTop, borderDistanceRight, borderDistanceBottom; -OUString maLayoutFlow; +::rtl::OUString maLayoutFlow; private: typedef ::std::vector TextPortionModel PortionVector; diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 97866b0..424c108 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -92,7 +92,6 @@ public: IntVectorPtr getCurrentCellWidths( ); const ::rtl::OUString getTableStyleName() const { return m_sTableStyleName; } -const com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue getTablePosition() { return m_aTablePosition; } const com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue getCurrentTablePosition(); /// copy the text properties of the table style and its parent into pContext ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/colrowba.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ad830cacb72ef0a2062706dc80c253f0bcf65cb7 Author: Michael Stahl mst...@redhat.com Date: Fri Feb 22 18:55:56 2013 +0100 sc: insert a temporary String conversion until ScColToAlpha is converted Change-Id: I35494ccfeba77b173a2d227d1bd2235e81aa2d9b diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index b4ca85e..fda9c55 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -92,7 +92,7 @@ sal_uInt16 ScColBar::GetEntrySize( SCCOLROW nEntryNo ) String ScColBar::GetEntryText( SCCOLROW nEntryNo ) { return UseNumericHeader() -? OUString::number( nEntryNo + 1 ) +? String(OUString::number(nEntryNo + 1)) //FIXME remove String again : ScColToAlpha( static_castSCCOL(nEntryNo) ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gdb support for exceptions (Re: using backtrace() in exception throwing?)
Michael == Michael Meeks michael.me...@suse.com writes: Michael The basic debugging experience in these an exception broke Michael something flows is that we get an exception thrown that Michael ultimately ends up in a pathalogical situation - an abort, or Michael some similar horrible badness. At that point the most Michael interesting thing is not the catcher - which usually ends up Michael being utterly random - but the last guy that threw the Michael exception. So then as Lubos says comes the knotty job of trying Michael to put a breakpoint on the -one- exception that ends up being Michael caught where we are now [ and that of course requires Michael re-running, and inevitably we throw dozens of exceptions in the Michael normal case ]. Thanks. This kind of discussion is very helpful to me. This problem is a bit tricky. The various low-level exception-related functions, like __cxa_throw, treat the exception object as a void *. However, the value of this seems to change depending on the throw point. It's clear that this can't always be the argument to throw, due to scalar and object throws. So I wonder what exactly it refers to. I'll have to dig a bit deeper to see how all this code really works. Anyway, this makes tracking backward from std::terminate to the original throw point more difficult. It helps a bit to install the libstdc++ debuginfo. Then at least you can dig into some of the details. However, due to optimization, even with the improvements in newer version of gcc, this turns out to be less than perfect. I tried this out to see what it was like. It is kind of awful! At least, I had to dig around through several frames of libstdc++ to find the object that lead to std::terminate being called: terminate called after throwing an instance of 'char const*' Program received signal SIGABRT, Aborted. 0x003be3036285 in __GI_raise (sig=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 64return INLINE_SYSCALL (tgkill, 3, pid, selftid, sig); (gdb) up #1 0x003be3037b9b in __GI_abort () at abort.c:91 91raise (SIGABRT); (gdb) up #2 0x003be80bbc5d in __gnu_cxx::__verbose_terminate_handler () at ../../../../libstdc++-v3/libsupc++/vterminate.cc:95 95 abort(); (gdb) up #3 0x003be80b9e16 in __cxxabiv1::__terminate (handler=optimized out) at ../../../../libstdc++-v3/libsupc++/eh_terminate.cc:40 40handler (); (gdb) up #4 0x003be80b9e43 in std::terminate () at ../../../../libstdc++-v3/libsupc++/eh_terminate.cc:50 50__terminate (__terminate_handler); (gdb) up #5 0x003be80b9f3e in __cxxabiv1::__cxa_throw (obj=0x601090, tinfo=optimized out, dest=optimized out) at ../../../../libstdc++-v3/libsupc++/eh_throw.cc:83 83std::terminate (); At this point I can do: (gdb) catch throw Catchpoint 1 (throw) (gdb) cond 1 obj == 0x601090 (gdb) r The program being debugged has been started already. Start it from the beginning? (y or n) y [Inferior 25299 exited] Starting program: /tmp/r warning: failed to reevaluate condition for breakpoint 1: No symbol obj in current context. warning: failed to reevaluate condition for breakpoint 1: No symbol obj in current context. warning: failed to reevaluate condition for breakpoint 1: No symbol obj in current context. Catchpoint 1 (exception thrown), __cxxabiv1::__cxa_throw (obj=0x601090, tinfo= 0x600a60, dest=0) at ../../../../libstdc++-v3/libsupc++/eh_throw.cc:70 70header-exc.unexpectedHandler = __unexpected_handler; Ignore the warnings; I'm not sure what they are about, but I will file a bug. ... but all this still fails if you insert a manual re-throw like throw x; into the call chain. At that point it gets really messy :( Michael Really nice ! though of course - having a full stack trace Michael would make that very substantially more useful. This is reasonably easy to implement. It may be expensive. I've appended a version that does this... well, it lists file name and line number for all the frames. If you want to get a really full stack trace, capturing the arguments and locals, then you would have to do more work. Michael Even better than this would (perhaps) be a break inside thrower that Michael is caught here type breakpoint - that we could invoke to land us in Michael whatever code is going to throw as it does that [ and before it started Michael all the magic cleanup / unwinding work ]. That is - assuming that it's Michael possible for the code to know (at that point) where it will ultimately Michael end up (? ;-) I think it isn't possible in general. When an exception is thrown, I think all that can really be determined is the next catch point. What this means is that if you have a series of throws and re-throws, winding up at some catch, then the best you could do is stop at the re-throw that leads to that catch. Does that make sense? Like: void doit() { throw hi; } void dd2() { try {
Re: Looking for PyUno Contributor(s)
Several developers have told me that python and uno will be needed to extract the data from FDO, create a spreadsheet from this data and then create the graphs/summaries that I am hoping we can create automagically. If I'm incorrect, please let me know what is correct - but I'm pretty sure that someone with some PyUno skills will be needed. Best. Joel On Fri, Feb 22, 2013 at 8:03 AM, Stephan Bergmann sberg...@redhat.comwrote: On 02/20/2013 04:11 PM, Joel Madero wrote: I am one of the members of the Quality Assurance team with LibreOffice and we are looking for a volunteer to work with myself designing (and coding) the framework to start automating our stats. It's been on my list for much too long and I just don't have the technical know how to do it. If there are are users or developers who can slowly get this accomplished it would greatly help QA as well as Marketing as our stats are done almost completely manually at this point, not only is this time consuming but it's also likely that there could be mistakes or missing data. How is the above related to PyUno (i.e., the Python-UNO bridge)? Stephan -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/draw/dflyobj.cxx | 87 --- sw/source/core/draw/dview.cxx| 108 ++- sw/source/core/edit/edatmisc.cxx | 26 - 3 files changed, 67 insertions(+), 154 deletions(-) New commits: commit 1fd796f036b0062d79960c153f06da42f75ac1ec Author: Matthias Freund matti...@yahoo.de Date: Sat Feb 16 22:44:17 2013 +0100 Comment translation german-english Change-Id: I39ad80b9a952462e178be87ca5e53785036cdaf6 Reviewed-on: https://gerrit.libreoffice.org/2190 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 4ca8244..016b1cd 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -68,13 +68,7 @@ static bool bInResize = false; TYPEINIT1( SwFlyDrawObj, SdrObject ) TYPEINIT1( SwVirtFlyDrawObj, SdrVirtObj ) -/* -|* -|* SwFlyDrawObj::Ctor -|* -*/ - - +// SwFlyDrawObj::Ctor namespace sdr { @@ -112,7 +106,6 @@ namespace sdr } // end of namespace contact } // end of namespace sdr - sdr::properties::BaseProperties* SwFlyDrawObj::CreateObjectSpecificProperties() { @@ -135,11 +128,7 @@ SwFlyDrawObj::~SwFlyDrawObj() { } -/* -|* -|* SwFlyDrawObj::Factory-Methoden -|* -*/ +// SwFlyDrawObj - Factory-Methods sal_uInt32 SwFlyDrawObj::GetObjInventor() const { @@ -158,13 +147,8 @@ sal_uInt16 SwFlyDrawObj::GetObjVersion() const return SwDrawFirst; } -/* -|* -|* SwVirtFlyDrawObj::CToren, Dtor -|* -*/ +// SwVirtFlyDrawObj::CToren, Dtor -// // AW: Need own primitive to get the FlyFrame paint working namespace drawinglayer @@ -274,7 +258,6 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer -// // AW: own sdr::contact::ViewContact (VC) sdr::contact::ViewObjectContact (VOC) needed // since offset is defined different from SdrVirtObj's sdr::contact::ViewContactOfVirtObj. // For paint, that offset is used by setting at the OutputDevice; for primitives this is @@ -343,7 +326,6 @@ namespace sdr } // end of namespace contact } // end of namespace sdr -// basegfx::B2DRange SwVirtFlyDrawObj::getOuterBound() const { @@ -418,15 +400,12 @@ SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject rNew, SwFlyFrm* pFly) : SwVirtFlyDrawObj::~SwVirtFlyDrawObj() { -if ( GetPage() )//Der SdrPage die Verantwortung entziehen. +if ( GetPage() )//Withdraw SdrPage the responsibility. GetPage()-RemoveObject( GetOrdNum() ); } -/* -|* -|* SwVirtFlyDrawObj::GetFmt() -|* -*/ +// SwVirtFlyDrawObj::GetFmt() + const SwFrmFmt *SwVirtFlyDrawObj::GetFmt() const { @@ -439,11 +418,7 @@ SwFrmFmt *SwVirtFlyDrawObj::GetFmt() return GetFlyFrm()-GetFmt(); } -/* -|* -|* SwVirtFlyDrawObj::Paint() -|* -*/ +// SwVirtFlyDrawObj::Paint() // -- OD #i102707# namespace @@ -527,11 +502,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject() const } } -/* -|* -|* SwVirtFlyDrawObj::TakeObjInfo() -|* -*/ +// SwVirtFlyDrawObj::TakeObjInfo() void SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec rInfo ) const { @@ -545,12 +516,7 @@ void SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec rInfo ) const rInfo.bCanConvToPathLineToArea = rInfo.bCanConvToPolyLineToArea = sal_False; } - -/* -|* -|* SwVirtFlyDrawObj::Groessenermittlung -|* -*/ +// SwVirtFlyDrawObj - Size Determination void SwVirtFlyDrawObj::SetRect() const { @@
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java | 13 +++--- 1 file changed, 5 insertions(+), 8 deletions(-) New commits: commit 754bd309dd346f9930a6ede418ab01fcfa5f74f9 Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 22 20:46:27 2013 +0200 BitmapView can be a member class Change-Id: I172cfc0bcad780e99469ac01c9ba7467befe53de diff --git a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java index 6087528..3bf2da9 100644 --- a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java +++ b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java @@ -287,31 +287,28 @@ public class Desktop } Log.i(TAG, onCreate - set content view\n); -setContentView(new BitmapView(this, this)); +setContentView(new BitmapView()); } -} class BitmapView extends android.view.View { -Desktop mDesktop; Bitmap mBitmap; -public BitmapView(Context context, Desktop desktop) +public BitmapView() { -super(context); -mDesktop = desktop; +super(Desktop.this); mBitmap = Bitmap.createBitmap(1000, 600, Bitmap.Config.ARGB_); } @Override protected void onDraw(Canvas canvas) { //canvas.drawColor(0xFF1ABCDD); -mDesktop.renderVCL(mBitmap); +renderVCL(mBitmap); canvas.drawBitmap(mBitmap, 0, 0, null); // re-call ourselves a bit later ... invalidate(); } } - +} // vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/svdfppt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fb1991e7c1b17bd4e3b5e0f9aa572d958eb243f4 Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 22 21:04:29 2013 +0200 WaE: ´nLen´ may be used uninitialized in this function Looking at the change to this line in e904749eb8e1109f9a884b309fad6de5f78ad623 , I think this line was changed incorrectly. So I won't simply fix the warninig by initialising nLen to some value like zero, but instead reinstate the use of the nCharCount2 here instead of nLen. Change-Id: Ice4a5cb751a244c38b3cfc4e05e3206cb939484a diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 373e909..99f662c 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5195,7 +5195,7 @@ void PPTStyleTextPropReader::Init( SvStream rIn, SdrPowerPointImport rMan, con } else { -aCharPropSet.maString = aString.copy(nCharAnzRead, nLen); +aCharPropSet.maString = aString.copy(nCharAnzRead, nCharCount); aCharPropList.push_back( new PPTCharPropSet( aCharPropSet, nCurrentPara ) ); nCharAnzRead += nCharCount; bEmptyParaPossible = sal_False; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits