[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bridges/prj
bridges/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 624d138a590b35c76e9c2125a2e4b9d34303cce7 Author: Herbert Dürr h...@apache.org Date: Wed Dec 11 06:53:03 2013 + #i122195# adapt bridges build.lst to renamed bridge diff --git a/bridges/prj/build.lst b/bridges/prj/build.lst index 654be67..4651b6a 100644 --- a/bridges/prj/build.lst +++ b/bridges/prj/build.lst @@ -22,7 +22,7 @@ brbridges\source\cpp_uno\gcc3_linux_hppa nmake - u br_gcc3lh br_unotypes NULL br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u br_gcc3ll br_unotypes NULL br bridges\source\cpp_uno\gcc3_macosx_intelnmake - u br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL br bridges\source\cpp_uno\gcc3_macosx_powerpc nmake - u br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL -br bridges\source\cpp_uno\cxx_macosx_x86-64nmake - u br_cxxmacoxx br_cppuno_shared br_unotypes br_inc NULL +br bridges\source\cpp_uno\s5abi_macosx_x86-64 nmake - u br_cxxmacoxx br_cppuno_shared br_unotypes br_inc NULL br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes br_cppuno_shared br_inc NULL br bridges\source\cpp_uno\cc5_solaris_sparc64 nmake - u br_cc5sols64 br_unotypes br_cppuno_shared br_inc NULL br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes br_cppuno_shared br_inc NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-) New commits: commit a8c378805a5b384e46bd0fd292fb6f7142aca2dc Author: Adam Co rattles2...@gmail.com Date: Mon Dec 2 18:04:46 2013 +0200 moved 'mergeTopMarks' out of 'WriteCollectedRunProperties' The reason for this - is that the function 'WriteCollectedRunProperties' needs to be used by the redline exporter (to export collected 'redlined' properties) - and the 'mergeTopMarks' is not needed there. Change-Id: I10063b2f28adab53949b4d9de8acd0dab66553b0 Reviewed-on: https://gerrit.libreoffice.org/6899 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b546b37..4ee5656 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -599,15 +599,15 @@ void DocxAttributeOutput::WriteCollectedParagraphProperties() m_pSerializer-singleElementNS( XML_w, XML_spacing, xAttrList ); } - -// Merge the marks for the ordered elements -m_pSerializer-mergeTopMarks( ); } void DocxAttributeOutput::EndParagraphProperties() { WriteCollectedParagraphProperties(); +// Merge the marks for the ordered elements +m_pSerializer-mergeTopMarks( ); + // insert copy of rPr m_pSerializer-copyTopMarkPop(); @@ -1153,9 +1153,6 @@ void DocxAttributeOutput::WriteCollectedRunProperties() m_pSerializer-singleElementNS( XML_w, XML_lang, xAttrList ); } - -// Merge the marks for the ordered elements -m_pSerializer-mergeTopMarks(); } void DocxAttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData ) @@ -1166,6 +1163,9 @@ void DocxAttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData ) WriteCollectedRunProperties(); +// Merge the marks for the ordered elements +m_pSerializer-mergeTopMarks(); + m_pSerializer-endElementNS( XML_w, XML_rPr ); // Clone rPr.../rPr for later re-use, in pPr @@ -1518,6 +1518,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedline) } m_pSerializer-endElementNS( XML_w, XML_rPrChange ); + break; default: SAL_WARN(sw.ww8, Unhandled redline type for export pRedline-GetType()); @@ -3889,11 +3890,19 @@ void DocxAttributeOutput::EndStyleProperties( bool bParProp ) if ( bParProp ) { WriteCollectedParagraphProperties(); + +// Merge the marks for the ordered elements +m_pSerializer-mergeTopMarks( ); + m_pSerializer-endElementNS( XML_w, XML_pPr ); } else { WriteCollectedRunProperties(); + +// Merge the marks for the ordered elements +m_pSerializer-mergeTopMarks(); + m_pSerializer-endElementNS( XML_w, XML_rPr ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 17 - 1 file changed, 17 deletions(-) New commits: commit 545f87379d1a9afb66bb9e4e5f64243f02729357 Author: Adam Co rattles2...@gmail.com Date: Mon Dec 2 18:08:53 2013 +0200 Removed 'XML_lang' tag being auto-written in redline case When there was a redline in a DOCX file that relates to formatting - the DOCX exporter automatically assumed that if the 'after' properties contains an 'XML_lang' node - then also the 'before' properties should also contain the 'XML_lang' node - and this is wrong. Change-Id: I383e10c11c228dd6847fd8eecb35c5c23c5f955e Reviewed-on: https://gerrit.libreoffice.org/6900 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 4ee5656..f580b77 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1500,23 +1500,6 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedline) FSNS( XML_w, XML_date ), aDate.getStr(), FSEND ); -if ( m_pCharLangAttrList ) -{ -if (m_pCharLangAttrList-hasAttribute(FSNS(XML_w, XML_val))) -{ -m_pSerializer-mark(); -m_pSerializer-startElementNS( XML_w, XML_rPr, FSEND ); -sVal = m_pCharLangAttrList-getValue(FSNS(XML_w, XML_val)); -sOVal = OUStringToOString(sVal, RTL_TEXTENCODING_UTF8); -m_pSerializer-startElementNS(XML_w, XML_lang, -FSNS(XML_w, XML_val), sOVal.getStr(), -FSEND); -m_pSerializer-endElementNS(XML_w, XML_lang); -m_pSerializer-endElementNS( XML_w, XML_rPr ); -m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND ); -} -} - m_pSerializer-endElementNS( XML_w, XML_rPrChange ); break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - include/vcl vcl/generic vcl/inc vcl/source vcl/unx
include/vcl/displayconnectiondispatch.hxx | 46 -- include/vcl/fontmanager.hxx | 537 -- include/vcl/octree.hxx| 127 -- include/vcl/regband.hxx | 147 --- vcl/generic/fontmanager/fontconfig.cxx|2 vcl/generic/fontmanager/fontmanager.cxx |2 vcl/generic/glyphs/gcach_ftyp.cxx |2 vcl/generic/print/common_gfx.cxx |2 vcl/generic/print/glyphset.cxx|2 vcl/generic/print/glyphset.hxx|2 vcl/generic/print/text_gfx.cxx|2 vcl/inc/displayconnectiondispatch.hxx | 46 ++ vcl/inc/fontcache.hxx |3 vcl/inc/fontmanager.hxx | 537 ++ vcl/inc/generic/genpspgraphics.h |2 vcl/inc/impoct.hxx|2 vcl/inc/octree.hxx| 127 ++ vcl/inc/regband.hxx | 147 +++ vcl/inc/regionband.hxx|3 vcl/inc/salinst.hxx |2 vcl/inc/xconnection.hxx |2 vcl/source/gdi/bitmap3.cxx|6 vcl/source/gdi/octree.cxx |4 vcl/source/gdi/regband.cxx|6 vcl/unx/generic/gdi/salgdi3.cxx |2 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |2 vcl/unx/kde/salnativewidgets-kde.cxx |2 vcl/unx/kde4/KDESalFrame.cxx |3 29 files changed, 886 insertions(+), 883 deletions(-) New commits: commit cd7bce9e3701942438e420c9dde69f44eab5fa00 Author: Tor Lillqvist t...@collabora.com Date: Wed Dec 11 10:20:07 2013 +0200 regband.hxx is private to vcl Change-Id: If17510b572aa172c8d973f74b881b0d723213eef diff --git a/include/vcl/regband.hxx b/vcl/inc/regband.hxx similarity index 98% rename from include/vcl/regband.hxx rename to vcl/inc/regband.hxx index 65b38cc..11b847b 100644 --- a/include/vcl/regband.hxx +++ b/vcl/inc/regband.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_REGBAND_HXX -#define INCLUDED_VCL_REGBAND_HXX +#ifndef INCLUDED_VCL_INC_REGBAND_HXX +#define INCLUDED_VCL_INC_REGBAND_HXX #include tools/solar.h #include tools/poly.hxx @@ -142,6 +142,6 @@ public: ImplRegionBand* SplitBand (const sal_Int32 nY); }; -#endif // INCLUDED_VCL_REGBAND_HXX +#endif // INCLUDED_VCL_INC_REGBAND_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx index c913cc8..ed48a73 100644 --- a/vcl/inc/regionband.hxx +++ b/vcl/inc/regionband.hxx @@ -18,9 +18,10 @@ #ifndef INCLUDED_VCL_INC_REGIONBAND_HXX #define INCLUDED_VCL_INC_REGIONBAND_HXX -#include vcl/regband.hxx #include vcl/region.hxx +#include regband.hxx + #ifdef DBG_UTIL const char* ImplDbgTestRegionBand(const void*); #endif diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index a5a28fa..4327f33 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include algorithm + #include tools/debug.hxx #include tools/helpers.hxx -#include vcl/regband.hxx #include osl/diagnose.hxx -#include algorithm - +#include regband.hxx // === // commit a1fc912096220648bb2064ff3603bd95fdc84d93 Author: Tor Lillqvist t...@collabora.com Date: Wed Dec 11 10:16:44 2013 +0200 octree.hxx is private to vcl Change-Id: I3cb377cfa99914fdba00504fb7d955e088bfca76 diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx index 3fc916a..c4219e9 100644 --- a/vcl/inc/impoct.hxx +++ b/vcl/inc/impoct.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_IMPOCT_HXX #define INCLUDED_VCL_INC_IMPOCT_HXX -#include vcl/octree.hxx +#include octree.hxx // // - ImpErrorQuad - diff --git a/include/vcl/octree.hxx b/vcl/inc/octree.hxx similarity index 97% rename from include/vcl/octree.hxx rename to vcl/inc/octree.hxx index 0b36cc7..f81f1e5 100644 --- a/include/vcl/octree.hxx +++ b/vcl/inc/octree.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_OCTREE_HXX -#define INCLUDED_VCL_OCTREE_HXX +#ifndef INCLUDED_VCL_INC_OCTREE_HXX +#define INCLUDED_VCL_INC_OCTREE_HXX #include vcl/salbtype.hxx #include vcl/dllapi.h @@ -122,6 +122,6 @@ inline sal_uInt16 InverseColorMap::GetBestPaletteIndex( const BitmapColor rColo ( (sal_uLong) rColor.GetBlue() nBits ) ]; } -#endif // INCLUDED_VCL_OCTREE_HXX +#endif // INCLUDED_VCL_INC_OCTREE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git
Re: [lo-4.2] regview fails to show rdb files
On 12/10/2013 08:55 PM, Neeraj Rai wrote: Traceback (most recent call last): File libreconverter-master/libreconverter.py, line 18, in module import loutils File libreconverter-master/loutils.py, line 39, in module import uno File libreoffice-4.0/lib/libreoffice/program/uno.py, line 38, in module _g_ctx = pyuno.getComponentContext( ) SystemError: Error during bootstrapping uno (RuntimeException):missing whitespace before attribute in file:///path/libreoffice-4.2/lib/libreoffice/program/types/oovbaapi.rdb missing whitespace before attribute is an error message generated in xmlreader/source/xmlreader.cxx, so it smells like your setup is such that it erroneously declares the oovbaapi.rdb as a services rdb (which are in XML format today) rather than a types rdb (which are in binary format). What also looks odd is that your setup apparently mixes libreoffice-4.0/lib/libreoffice/program/uno.py and libreoffice-4.2/lib/libreoffice/program/types/oovbaapi.rdb. What I noticed is that libreconverter's loutils.py has two bugs, one is a missing comma that made it completely nonfunctional at least for me and is fixed with https://github.com/colonelqubit/libreconverter/commit/7e0f81ac96106ccb4baff4951126885841b1e887 Merge pull request #1 from stbergmann/master now. The other is that it hardcodes the location of the LO installation as /usr/lib/libreoffice/program in the _lopaths variable. You presumably do have a LO installation there, but it likely doesn't match the LO installation from which you take the python executable to run libreconverter.py with. What worked for me, trying it out with a local LO 4.2 build, is to patch loutils.py like diff --git a/loutils.py b/loutils.py index 4bac3e1..c2d1364 100644 --- a/loutils.py +++ b/loutils.py @@ -19,7 +19,7 @@ LIBREOFFICE_PORT = 8100 # Find LibreOffice. _lopaths=( -('/usr/lib/libreoffice/program', '/usr/lib/libreoffice/program'), +('/home/sbergman/lo-4.2/core/instdir/program', '/home/sbergman/lo-4.2/core/instdir/program'), ) to match the LO installation of the python executable used when running libreconverter.py, /home/sbergman/lo-4.2/core/instdir/program/python libreconverter.py test-headless3.xlsx output.csv Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 6 commits - basic/inc basic/source include/basic sw/source
basic/inc/global.hxx | 25 basic/inc/sb.hxx |3 basic/inc/sbobjmod.hxx | 104 basic/inc/sbprop.hxx | 67 + basic/inc/sbstdobj.hxx | 136 +++ basic/inc/sbxbase.hxx| 52 ++ basic/source/basmgr/basmgr.cxx |2 basic/source/classes/global.cxx |3 basic/source/classes/sb.cxx |2 basic/source/classes/sbxmod.cxx |2 basic/source/comp/sbcomp.cxx |2 basic/source/runtime/methods.cxx |4 basic/source/runtime/methods1.cxx|2 basic/source/runtime/stdobj.cxx |2 basic/source/runtime/stdobj1.cxx |2 basic/source/sbx/sbxbase.cxx |2 basic/source/sbx/sbxscan.cxx |2 include/basic/global.hxx | 25 include/basic/sbobjmod.hxx | 104 include/basic/sbprop.hxx | 67 - include/basic/sbstdobj.hxx | 136 --- include/basic/sbxbase.hxx| 52 -- sw/source/filter/ww8/docxattributeoutput.cxx |3 23 files changed, 399 insertions(+), 400 deletions(-) New commits: commit 4b0f171b24da9b746fc7cc869aeddbd476df937e Author: Tor Lillqvist t...@collabora.com Date: Wed Dec 11 10:49:57 2013 +0200 sbxbase.hxx is private to basic Change-Id: I108bd247a40ce2b46034cabe8b075fa4f5a396df diff --git a/include/basic/sbxbase.hxx b/basic/inc/sbxbase.hxx similarity index 93% rename from include/basic/sbxbase.hxx rename to basic/inc/sbxbase.hxx index 88c7380..597f292 100644 --- a/include/basic/sbxbase.hxx +++ b/basic/inc/sbxbase.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BASIC_SBXBASE_HXX -#define INCLUDED_BASIC_SBXBASE_HXX +#ifndef INCLUDED_BASIC_INC_SBXBASE_HXX +#define INCLUDED_BASIC_INC_SBXBASE_HXX #include i18nlangtag/lang.h #include basic/sbxdef.hxx @@ -47,6 +47,6 @@ struct SbxAppData BASIC_DLLPUBLIC SbxAppData GetSbxData_Impl(); -#endif +#endif // INCLUDED_BASIC_INC_SBXBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 07b94b3..cc95d5b 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -22,7 +22,7 @@ #include basic/sbx.hxx #include basic/sbxfac.hxx -#include basic/sbxbase.hxx +#include sbxbase.hxx #include rtl/instance.hxx #include rtl/ustring.hxx diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index d16ffcb..15c5074 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -31,7 +31,7 @@ #include ctype.h #include sbxres.hxx -#include basic/sbxbase.hxx +#include sbxbase.hxx #include basic/sbxfac.hxx #include basic/sbxform.hxx #include svtools/svtools.hrc commit d76178b52dc6ab4a9bf22a6051264215a91935cf Author: Tor Lillqvist t...@collabora.com Date: Wed Dec 11 10:48:12 2013 +0200 sbstdobj.hxx is private to basic Change-Id: I131dfeded783edfea94208d1cf8d70a2090785fa diff --git a/include/basic/sbstdobj.hxx b/basic/inc/sbstdobj.hxx similarity index 97% rename from include/basic/sbstdobj.hxx rename to basic/inc/sbstdobj.hxx index 44c9230..9bb855e 100644 --- a/include/basic/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SBSTDOBJ1_HXX -#define _SBSTDOBJ1_HXX +#ifndef INCLUDED_BASIC_INC_SBSTDOBJ_HXX +#define INCLUDED_BASIC_INC_SBSTDOBJ_HXX #include basic/sbxobj.hxx #include vcl/graph.hxx @@ -131,6 +131,6 @@ public: virtual SbxVariable* Find( const OUString, SbxClassType ); }; -#endif +#endif // INCLUDED_BASIC_INC_SBSTDOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 017364a..86ae936 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::uno; #include date.hxx #include stdobj.hxx -#include basic/sbstdobj.hxx +#include sbstdobj.hxx #include rtlproto.hxx #include basrid.hxx #include image.hxx diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index e058f01..43fd11cb 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -20,7 +20,7 @@ #include runtime.hxx #include stdobj.hxx -#include basic/sbstdobj.hxx +#include sbstdobj.hxx #include sal/macros.h #include rtlproto.hxx #include sbintern.hxx diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 20a1a85..629470f 100644 ---
Re: HiDPI Wiki page
I just found the font color, etc. dropdown triangle. It was in the toolbar code and I had been looking in the combo-box, spinfield, ilstbox, etc., etc. I had given up and started looking at the more toolbar buttons indicator, and that triangle drawing routine is right below it ;-) On Tue, Dec 10, 2013 at 8:00 PM, Keith Curtis keit...@gmail.com wrote: Here is a wiki page to track the feature work: https://wiki.documentfoundation.org/Development/HiDpi In there you can see a screenshot of the toolbar issues: https://wiki.documentfoundation.org/File:LibreOffice_HiDPI_toolbar_bugs.pdf And a list of the other issues, and a todo list of places to keep looking ;-) I've mostly fixed the status bar controls on my machine. It was primarily changing the code to not assume it knew the bitmap size, and then doing bitmap doubling. I will submit it to Gerrit when I can write the if() to know when. I'm stuck trying to find where the font color, etc. dropdown triangle is drawn on Linux. I searched for more than an hour, and tried commenting out code in DecoView, ImplButton, etc. to find the place, but no luck. Any pointers? Is there a reason why it can't use the same dropdown logic that the font size uses? It will take a while to fix every place, but I'll keep working on the most annoying ones... -Keith ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/cmdlinehelp.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 326eb94142e0fe9fbb81243fea58261f0203ddcc Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 11 09:58:22 2013 +0100 desktop: document -env cmdline argument Change-Id: Ic8aa78e4d1bcb02e5d71588ac563c07f371afd41 diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 6709741..756dcab 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -124,6 +124,9 @@ namespace desktop --print-to-file --printer-name nasty_lowres_printer --outdir /home/user *.doc\n\ --pidfile file\n\ Store soffice.bin pid to file.\n\ +-env:VAR[=VALUE]\n\ + Set a bootstrap variable.\n\ + Eg. -env:UserInstallation=file:///tmp/test to set a non-default user profile path.\n\ \nRemaining arguments will be treated as filenames or URLs of documents to open.\n\n; OUString ReplaceStringHookProc(const OUString rStr); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] buildbot.git: 4 commits - loperf/loperf.sh
loperf/loperf.sh | 26 +++--- 1 file changed, 15 insertions(+), 11 deletions(-) New commits: commit c201fa0f6f1776749db0d47f72653670e40552fd Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Dec 10 09:34:06 2013 +0100 loperf: Check also export by adding --convert-to. diff --git a/loperf/loperf.sh b/loperf/loperf.sh index 924c8df..2942358 100755 --- a/loperf/loperf.sh +++ b/loperf/loperf.sh @@ -40,7 +40,6 @@ if test $(compareversion $(valgrind --version) $REQUIRED_VALGRIND_VERSION) - fi # Post dependency check -export OOO_EXIT_POST_STARTUP=1 export OOO_DISABLE_RECOVERY=1 OFFICEBIN=$1 VALGRIND_PARAMS=$2 @@ -65,11 +64,14 @@ test -f $CSV_HISTORY || echo -e time,git-commit,offload$(ls docs/* | sed s%do function launch { if test $1 = ; then +export OOO_EXIT_POST_STARTUP=1 valgrind --tool=callgrind $VALGRIND_PARAMS --callgrind-out-file=$CG_LOG-offload.log --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes $OFFICEBIN --splash-pipe=0 --headless /dev/null 21 +unset OOO_EXIT_POST_STARTUP echo -n $CG_LOG-offload.log else fn=${1#docs\/} -valgrind --tool=callgrind $VALGRIND_PARAMS --callgrind-out-file=$CG_LOG-onload-$fn.log --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes $OFFICEBIN $1 --splash-pipe=0 --headless /dev/null 21 +ext=${fn##*.} +valgrind --tool=callgrind $VALGRIND_PARAMS --callgrind-out-file=$CG_LOG-onload-$fn.log --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes $OFFICEBIN --splash-pipe=0 --headless --convert-to $ext --outdir tmp $1 /dev/null 21 echo -n $CG_LOG-onload-$fn.log fi } commit fc795037077a7b021b3f7bd52ad6cd9a28208d1e Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Dec 10 09:01:46 2013 +0100 loperf: Generate also history.fods. diff --git a/loperf/loperf.sh b/loperf/loperf.sh index e12e069..924c8df 100755 --- a/loperf/loperf.sh +++ b/loperf/loperf.sh @@ -60,7 +60,7 @@ CSV_HISTORY=logs/history.csv mkdir -p logs/callgrind /dev/null 21 mkdir -p logs/loperf /dev/null 21 mkdir -p $CSV_LOG_DIR /dev/null 21 -test -f $CSV_HISTORY || echo -e date\ttime\tgit-commit\toffload$(ls docs/* | sed s%docs/%\\t%g | tr -d '\n') $CSV_HISTORY +test -f $CSV_HISTORY || echo -e time,git-commit,offload$(ls docs/* | sed s%docs/%,%g | tr -d '\n') $CSV_HISTORY function launch { @@ -108,7 +108,7 @@ done # CEst = Ir + 10 Bm + 10 L1m + 20 Ge + 100 L2m + 100 LLm CEst=$(expr ${offload[0]} + 10 \* $(expr ${offload[12]} + ${offload[10]}) + 10 \* $(expr ${offload[3]} + ${offload[4]} + ${offload[5]}) + 20 \* ${offload[13]} + 100 \* $(expr ${offload[6]} + ${offload[7]} + ${offload[8]})) echo $'\t'$CEst $CSV_FN -echo -n $TESTDATE$'\t'$LOVERSION$'\t'$CEst $CSV_HISTORY +echo -n $TESTDATE,$LOVERSION,$CEst $CSV_HISTORY # Populate offload to PF_LOG echo Ir Dr Dw I1mr D1mr D1mw ILmr DLmr DLmw Bc Bcm Bi Bim Ge | tee -a $PF_LOG @@ -166,13 +166,14 @@ find docs -type f | grep -Ev \/\. | while read f; do # CEst = Ir + 10 Bm + 10 L1m + 20 Ge + 100 L2m + 100 LLm CEst=$(expr ${onload[0]} + 10 \* $(expr ${onload[12]} + ${onload[10]}) + 10 \* $(expr ${onload[3]} + ${onload[4]} + ${onload[5]}) + 20 \* ${onload[13]} + 100 \* $(expr ${onload[6]} + ${onload[7]} + ${onload[8]})) echo $'\t'$CEst $CSV_FN -echo -n $'\t'$CEst $CSV_HISTORY +echo -n ,$CEst $CSV_HISTORY echo | tee -a $PF_LOG echo | tee -a $PF_LOG done echo $CSV_HISTORY +$OFFICEBIN --headless --convert-to fods --outdir logs $CSV_HISTORY # Clean old callgrind files find logs/callgrind -type f -mtime +10 -exec rm {} \; commit c5afe490ac1adb962ed8649e602db946ad8bf78e Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Dec 3 21:49:41 2013 +0100 loperf: Comment out regression check again. It was uncommented by accident and probably does not work. diff --git a/loperf/loperf.sh b/loperf/loperf.sh index 0a5d557..e12e069 100755 --- a/loperf/loperf.sh +++ b/loperf/loperf.sh @@ -178,9 +178,9 @@ echo $CSV_HISTORY find logs/callgrind -type f -mtime +10 -exec rm {} \; # Regression check -echo Regression Status: | tee -a $PF_LOG -echo - | tee -a $PF_LOG -find $(dirname $(readlink -f $PF_LOG)) -type f | grep -v $PF_LOG | grep log$ | while read rf; do -check_regression $PF_LOG $rf | tee -a $PF_LOG -done -grep '^Regression found!$' $PF_LOG /dev/null || echo Congratulations, no regression found! | tee -a $PF_LOG +# echo Regression Status: | tee -a $PF_LOG +# echo - | tee -a $PF_LOG +# find $(dirname $(readlink -f $PF_LOG)) -type f | grep -v $PF_LOG | grep log$ | while read rf; do +# check_regression $PF_LOG $rf | tee -a $PF_LOG +# done +# grep '^Regression found!$' $PF_LOG /dev/null || echo Congratulations, no regression found! | tee -a $PF_LOG commit 2e41da8674b2a0d1ec147843de8d1b27ff7bbd44 Author: Matúš Kukan
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 62/4d138a590b35c76e9c2125a2e4b9d34303cce7
62/4d138a590b35c76e9c2125a2e4b9d34303cce7 |1 + 1 file changed, 1 insertion(+) New commits: commit fbed34d8fb1f8142e28410bbca8da35dba0514d4 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 11 09:25:22 2013 + Notes added by 'git notes add' diff --git a/62/4d138a590b35c76e9c2125a2e4b9d34303cce7 b/62/4d138a590b35c76e9c2125a2e4b9d34303cce7 new file mode 100644 index 000..d77edff --- /dev/null +++ b/62/4d138a590b35c76e9c2125a2e4b9d34303cce7 @@ -0,0 +1 @@ +prefer: d83de4b1a93ba7ed7bc3243073be3de96a44bfa9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: HiDPI Wiki page
On 2013-12-11 11:02, Keith Curtis wrote: It will take a while to fix every place, but I'll keep working on the most annoying ones... Nice work! I'm not sure, but I think I saw something on the mailing list recently to the effect that the idea was to gradually replace bitmap icons with SVG versions, where they needed to be scaled up. If you do need SVG stuff, and you don't want to do it yourself, the people on the libreoffice-design mailing list may be able to help out. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 21 +++-- sw/source/filter/ww8/docxattributeoutput.hxx |3 +++ sw/source/filter/ww8/docxexport.cxx |1 + 3 files changed, 23 insertions(+), 2 deletions(-) New commits: commit 0cdba4ca17942b5a4f9f8ac3b91a7d0b096bad57 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 11 11:24:44 2013 +0100 DOCX export: write mc:AlternateContent around drawingml shapes Change-Id: Ie4cacea61f84aa1e24df9fc39b9467d08f9ca4f0 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 8150e1c..1209e43 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3321,7 +3321,7 @@ void DocxAttributeOutput::WritePostponedDMLDrawing() it != m_postponedDMLDrawing-end(); ++it ) { -WriteDMLDrawing(it-object, it-frame); +WriteDMLAndVMLDrawing(it-object, *(it-frame), *(it-point)); } delete m_postponedDMLDrawing; m_postponedDMLDrawing = NULL; @@ -3354,6 +3354,23 @@ void DocxAttributeOutput::WriteDMLDrawing( const SdrObject* pSdrObject, const Sw lcl_endDMLAnchorInline(m_pSerializer, pFrmFmt); } +void DocxAttributeOutput::WriteDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt rFrmFmt,const Point rNdTopLeft) +{ +m_pSerializer-startElementNS(XML_mc, XML_AlternateContent, FSEND); + +m_pSerializer-startElementNS(XML_mc, XML_Choice, +XML_Requires, wps, +FSEND); +WriteDMLDrawing(sdrObj, rFrmFmt); +m_pSerializer-endElementNS(XML_mc, XML_Choice); + +m_pSerializer-startElementNS(XML_mc, XML_Fallback, FSEND); +WriteVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft); +m_pSerializer-endElementNS(XML_mc, XML_Fallback); + +m_pSerializer-endElementNS(XML_mc, XML_AlternateContent); +} + void DocxAttributeOutput::WriteVMLDrawing( const SdrObject* sdrObj, const SwFrmFmt rFrmFmt,const Point rNdTopLeft ) { bool bSwapInPage = false; @@ -3427,7 +3444,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame rFrame, const Po if (aMiscOptions.IsExperimentalMode()) { if ( m_postponedDMLDrawing == NULL ) -WriteDMLDrawing( pSdrObj, rFrame.GetFrmFmt()); +WriteDMLAndVMLDrawing( pSdrObj, rFrame.GetFrmFmt(), rNdTopLeft); else // we are writing out attributes, but w:drawing should not be inside w:rPr, so write it out later m_postponedDMLDrawing-push_back(PostponedDrawing(pSdrObj, (rFrame.GetFrmFmt()), rNdTopLeft)); diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index bac7c8a..90c7701 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -376,6 +376,9 @@ private: void WriteVMLDrawing( const SdrObject* sdrObj, const SwFrmFmt rFrmFmt,const Point rNdTopLeft ); /// Writes wp wrapper code around an SdrObject, which itself is written using drawingML syntax. void WriteDMLDrawing( const SdrObject* pSdrObj, const SwFrmFmt* pFrmFmt ); +/// Writes shape in both DML and VML format. +void WriteDMLAndVMLDrawing( const SdrObject* sdrObj, const SwFrmFmt rFrmFmt,const Point rNdTopLeft ); + void InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); void StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); void StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 3aa457f..bbc3673 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -1023,6 +1023,7 @@ XFastAttributeListRef DocxExport::MainXmlNamespaces( FSHelperPtr serializer ) pAttr-add( FSNS( XML_xmlns, XML_w10 ), urn:schemas-microsoft-com:office:word ); pAttr-add( FSNS( XML_xmlns, XML_wp ), http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing; ); pAttr-add( FSNS( XML_xmlns, XML_wps ), http://schemas.microsoft.com/office/word/2010/wordprocessingShape; ); +pAttr-add( FSNS( XML_xmlns, XML_mc ), http://schemas.openxmlformats.org/markup-compatibility/2006; ); return XFastAttributeListRef( pAttr ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 manj_k courrier.oou.fr@googlemail.com changed: What|Removed |Added Depends on||72452 --- Comment #34 from manj_k courrier.oou.fr@googlemail.com --- Nominating Bug 72452 - Other: Page Number begins at 0. Just compare the different page numbering in the recently published LibreOffice 4.1 Draw Guide, DG41-DrawGuideLO.odt[1] – at first with LO v4.1.3.2 (correct), and then with LO-Dev v4.2.0.0.beta2 (messed up). [1] https://wiki.documentfoundation.org/Documentation/Publications#LibreOffice_Draw_Guide (Full book 4.1.x branch) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/table/accessibletableshape.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 5f15e1fc171b5a74c3e54041af888cc77523ff99 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 11 11:25:51 2013 + too many Inits so double acquire called, leak, keeps listening after expected death, loads and loads of crashes in draw with a11y enabled and slide switching with tables in them. regression since 60f11adb950e4f9645cc9ecb0f5af8235cc97366 Change-Id: I182b43ad4a002a8dff0683cd1e991cfd1de75eb6 diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 469ed41..b423a75 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -176,8 +176,6 @@ Reference XAccessible AccessibleTableShapeImpl::getAccessibleChild( sal_Int32 xAccessibleCell-Init(); maChildMap[xCell] = xAccessibleCell; -xAccessibleCell-Init(); - Reference XAccessible xChild( xAccessibleCell.get() ); return xChild; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
General LibreOffice architecture information request
Dear developers of LibreOffice, We are a project team for a university course called Software Patterns. In this course, we want to analyze the architecture of LibreOffice. Using this architecture we want to find any Software Patterns used in your project. We would like to get answers to some questions in order to get our report started, initially we would like to have some information about your stakeholders and key drivers. Is somebody available for us to communicate with about these questions? Of course when the document is finished, we would like to deliver the report to the LibreOffice community. Looking forward to your responds, Best regards, Daniel Kalmann, Wytse Visser, Pascal Bouwers, Diederik Jan Lemkes, Mohamed Sioufy. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - odk/settings ure/source
odk/settings/settings.mk |4 ure/source/README| 43 +-- 2 files changed, 13 insertions(+), 34 deletions(-) New commits: commit ae5013c566e85c49b934d624cacf95049f02d85f Author: Michael Stahl mst...@redhat.com Date: Wed Dec 11 13:38:52 2013 +0100 ure: remove documentation of no longer bundled GCC libraries Change-Id: I28ca12157fcc918ccb8a87d1d1801908d300eca7 diff --git a/ure/source/README b/ure/source/README index 3260915..16fce15 100644 --- a/ure/source/README +++ b/ure/source/README @@ -40,8 +40,6 @@ ELF platforms (Linux, Solaris, *BSD): /opt/openoffice.org/ure/share/misc/types.rdb /opt/openoffice.org/ure/share/misc/services.rdb /opt/openoffice.org/ure/lib/libxml2.so.2 [external] -/opt/openoffice.org/ure/lib/libgcc_s.so.1 [external; Linux x86 only] -/opt/openoffice.org/ure/lib/libstdc++.so.6 [external; Linux x86 only] /opt/openoffice.org/ure/bin/startup.sh [private] /opt/openoffice.org/ure/bin/uno.bin [private] /opt/openoffice.org/ure/lib/unorc [private] @@ -299,17 +297,6 @@ HTML documentation to find out how to set the OO_SDK_JAVA_HOME environment variable. -GNU Compiler Collection on Linux x86 - - -On Linux x86, the URE uses libgcc_s.so.1 to run binary UNO components that were -compiled with the GNU Compiler Collection (GCC). The libgcc_s.so.1 corresponds -to GCC 3.4.1 as built on a glibc 2.2.4 system. To avoid GCC compatibility -issues, use the same GCC version (or later) when you compile the UNO binaries. -Otherwise, use LD_PRELOAD to replace the libgcc_s.so.1 in URE with a matching -version. - - C++ and Java UNO Components --- commit 741b09c473b463918fac53a9b53debef4d4ee942 Author: Michael Stahl mst...@redhat.com Date: Wed Dec 11 13:37:52 2013 +0100 ure: remove references to SunStudio C52 filenames Change-Id: If11655aa56239b9241db43a058244360a8abe1ec diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index b884e75..21d6ceb 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -204,10 +204,6 @@ URLPREFIX=file:// COMID=gcc3 CPPU_ENV=gcc3 -#SALLIB=-luno_sal -#CPPULIB=-luno_cppu -#CPPUHELPERLIB=-luno_cppuhelperC52 -#SALHELPERLIB=-luno_salhelperC52 SALLIB=-luno_sal CPPULIB=-luno_cppu CPPUHELPERLIB=-luno_cppuhelper$(COMID) diff --git a/ure/source/README b/ure/source/README index 88c4492..3260915 100644 --- a/ure/source/README +++ b/ure/source/README @@ -19,7 +19,7 @@ Overview of URE installation - -Linux x86, Solaris x86, and Solaris SPARC: +ELF platforms (Linux, Solaris, *BSD): /opt/openoffice.org/ure/LICENSE /opt/openoffice.org/ure/THIRDPARTYLICENSEREADME.html @@ -29,13 +29,10 @@ Linux x86, Solaris x86, and Solaris SPARC: /opt/openoffice.org/ure/bin/regview /opt/openoffice.org/ure/bin/javaldx /opt/openoffice.org/ure/lib/libuno_cppu.so.3 -/opt/openoffice.org/ure/lib/libuno_cppuhelpergcc3.so.3 [Linux x86 only] -/opt/openoffice.org/ure/lib/libuno_cppuhelperC52.so.3 [Solaris only] -/opt/openoffice.org/ure/lib/libuno_purpenvhelpergcc3.so.3 [Linux x86 only] -/opt/openoffice.org/ure/lib/libuno_purpenvhelperC52.so.3 [Solaris only] +/opt/openoffice.org/ure/lib/libuno_cppuhelpergcc3.so.3 +/opt/openoffice.org/ure/lib/libuno_purpenvhelpergcc3.so.3 /opt/openoffice.org/ure/lib/libuno_sal.so.3 -/opt/openoffice.org/ure/lib/libuno_salhelpergcc3.so.3 [Linux x86 only] -/opt/openoffice.org/ure/lib/libuno_salhelperC52.so.3 [Solaris only] +/opt/openoffice.org/ure/lib/libuno_salhelpergcc3.so.3 /opt/openoffice.org/ure/share/java/unoloader.jar /opt/openoffice.org/ure/share/java/juh.jar /opt/openoffice.org/ure/share/java/jurt.jar @@ -57,8 +54,7 @@ Linux x86, Solaris x86, and Solaris SPARC: /opt/openoffice.org/ure/lib/libsunjavapluginlo.so [private] /opt/openoffice.org/ure/lib/JREProperties.class [private] /opt/openoffice.org/ure/lib/jvmfwk3rc [private] -/opt/openoffice.org/ure/lib/libgcc3_uno.so [private; Linux x86 only] -/opt/openoffice.org/ure/lib/libsunpro5_uno.so [private; Solaris only] +/opt/openoffice.org/ure/lib/libgcc3_uno.so [private] /opt/openoffice.org/ure/lib/libjava_uno.so [private] /opt/openoffice.org/ure/lib/libunsafe_uno_uno.so [private] /opt/openoffice.org/ure/lib/libaffine_uno_uno.so [private] @@ -185,9 +181,9 @@ the SDK Developer's Guide. UNO type or UNO service information. For more details, see the SDK Developer's Guide. -- javaldx is a helper program on Linux x86, Solaris x86, and Solaris SPARC that -enables Java executables to use a Java VM, such as the Sun JDK/JRE. Executables -such as uno run this helper automatically. +- javaldx is a helper program on Linux, Solaris, and *BSD that +enables Java executables to use a Java VM, such as OpenJDK or the Sun JDK/JRE. +Executables such as uno run this helper automatically. - cppu, cppuhelper, purpenvhelper, sal, and salhelper are the public C++ UNO runtime dynamic libraries
[Libreoffice-commits] core.git: 2 commits - svx/source
svx/source/table/accessibletableshape.cxx |1 + svx/source/table/svdotable.cxx| 20 +++- 2 files changed, 20 insertions(+), 1 deletion(-) New commits: commit 1c28065d8fe3e9a1394a7ecfc29e95a9639a1012 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 11 11:57:34 2013 + disposed but not dtored just die when you are supposed to, without this endless amounts of accessiblity cells remain after sorting slides with tables in them Change-Id: Ice9a86b8b806e58f9bf871341a38f7729798dda9 diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index b423a75..9d1ab93 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -132,6 +132,7 @@ void AccessibleTableShapeImpl::dispose() { (*iter).second-dispose(); } +maChildMap.clear(); Reference XModifyListener xListener( this ); mxTable-removeModifyListener( xListener ); mxTable.clear(); commit 0b8e2e5efe20519e8b5563314bac0cbb84a3b967 Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 10 16:54:59 2013 + correctly dispose to avoid cyclic dependencies accessibility cruft is still listening to dead tables so crashes in slidesorting in main panel if moved slide has tables in it after visiting slide sorter once. Change-Id: I09f9a73b01fb2ddf059402146acdc7bd823798b9 diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 1cc828e..9009aa6 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -266,9 +266,9 @@ void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32 nColumns, sal_Int32 n mpTableObj = pTable; mxTable = new TableModel( pTable ); mxTable-init( nColumns, nRows ); -mpLayouter = new TableLayouter( mxTable ); Reference XModifyListener xListener( static_cast ::com::sun::star::util::XModifyListener* (this) ); mxTable-addModifyListener( xListener ); +mpLayouter = new TableLayouter( mxTable ); LayoutTable( mpTableObj-aRect, true, true ); mpTableObj-maLogicRect = mpTableObj-aRect; } @@ -279,6 +279,8 @@ SdrTableObjImpl SdrTableObjImpl::operator=( const SdrTableObjImpl rSource ) { if (this != rSource) { +disconnectTableStyle(); + if( mpLayouter ) { delete mpLayouter; @@ -303,6 +305,8 @@ SdrTableObjImpl SdrTableObjImpl::operator=( const SdrTableObjImpl rSource ) ApplyCellStyles(); mpTableObj-aRect = mpTableObj-maLogicRect; LayoutTable( mpTableObj-aRect, false, false ); + +connectTableStyle(); } return *this; } @@ -449,8 +453,22 @@ bool SdrTableObjImpl::ApplyCellStyles() void SdrTableObjImpl::dispose() { +disconnectTableStyle(); +mxTableStyle.clear(); + +if( mpLayouter ) +{ +delete mpLayouter; +mpLayouter = 0; +} + if( mxTable.is() ) +{ +Reference XModifyListener xListener( static_cast ::com::sun::star::util::XModifyListener* (this) ); +mxTable-removeModifyListener( xListener ); mxTable-dispose(); +mxTable.clear(); +} } // - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/MobileLibreOffice
ios/MobileLibreOffice/MobileLibreOffice/Resources/test1.odt |binary 1 file changed New commits: commit 2fa2d39bf3eb2f216e13f6dd2c6c5c35fd19627c Author: Tor Lillqvist t...@collabora.com Date: Wed Dec 11 15:22:48 2013 +0200 Use same test1.odt as in odk/examples/java/DocumentHandling/test It includes a small PNG image, too. Change-Id: I31169698a7573b7a6e272277a49cefe76c74f959 diff --git a/ios/MobileLibreOffice/MobileLibreOffice/Resources/test1.odt b/ios/MobileLibreOffice/MobileLibreOffice/Resources/test1.odt index 70db63b..6ae5681 100644 Binary files a/ios/MobileLibreOffice/MobileLibreOffice/Resources/test1.odt and b/ios/MobileLibreOffice/MobileLibreOffice/Resources/test1.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 72598] [Easyhack] Remove SunStudio cruft from code base
https://bugs.freedesktop.org/show_bug.cgi?id=72598 Michael Stahl mst...@redhat.com changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org, mst...@redhat.com -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - svx/source
svx/source/table/accessibletableshape.cxx |6 ++ svx/source/table/svdotable.cxx| 20 +++- 2 files changed, 25 insertions(+), 1 deletion(-) New commits: commit a90e08cb15e712e1d15a16de9a2677e57d81fd13 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 11 11:57:34 2013 + disposed but not dtored just die when you are supposed to, without this endless amounts of accessiblity cells remain after sorting slides with tables in them (cherry picked from commit 1c28065d8fe3e9a1394a7ecfc29e95a9639a1012) Conflicts: svx/source/table/accessibletableshape.cxx Change-Id: Ice9a86b8b806e58f9bf871341a38f7729798dda9 diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index a5e910e..8872591 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -113,6 +113,12 @@ void AccessibleTableShapeImpl::dispose() { if( mxTable.is() ) { +//remove all the cell's acc object in table's dispose. +for( AccessibleCellMap::iterator iter( maChildMap.begin() ); iter != maChildMap.end(); iter++ ) +{ +(*iter).second-dispose(); +} +maChildMap.clear(); Reference XModifyListener xListener( this ); mxTable-removeModifyListener( xListener ); mxTable.clear(); commit 3d742188d402b294af9a06ba15bc16d19966bd6f Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 10 16:54:59 2013 + correctly dispose to avoid cyclic dependencies accessibility cruft is still listening to dead tables so crashes in slidesorting in main panel if moved slide has tables in it after visiting slide sorter once. Change-Id: I09f9a73b01fb2ddf059402146acdc7bd823798b9 (cherry picked from commit 0b8e2e5efe20519e8b5563314bac0cbb84a3b967) diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 994076e..9c5e64a 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -266,9 +266,9 @@ void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32 nColumns, sal_Int32 n mpTableObj = pTable; mxTable = new TableModel( pTable ); mxTable-init( nColumns, nRows ); -mpLayouter = new TableLayouter( mxTable ); Reference XModifyListener xListener( static_cast ::com::sun::star::util::XModifyListener* (this) ); mxTable-addModifyListener( xListener ); +mpLayouter = new TableLayouter( mxTable ); LayoutTable( mpTableObj-aRect, true, true ); mpTableObj-maLogicRect = mpTableObj-aRect; } @@ -279,6 +279,8 @@ SdrTableObjImpl SdrTableObjImpl::operator=( const SdrTableObjImpl rSource ) { if (this != rSource) { +disconnectTableStyle(); + if( mpLayouter ) { delete mpLayouter; @@ -303,6 +305,8 @@ SdrTableObjImpl SdrTableObjImpl::operator=( const SdrTableObjImpl rSource ) ApplyCellStyles(); mpTableObj-aRect = mpTableObj-maLogicRect; LayoutTable( mpTableObj-aRect, false, false ); + +connectTableStyle(); } return *this; } @@ -449,8 +453,22 @@ bool SdrTableObjImpl::ApplyCellStyles() void SdrTableObjImpl::dispose() { +disconnectTableStyle(); +mxTableStyle.clear(); + +if( mpLayouter ) +{ +delete mpLayouter; +mpLayouter = 0; +} + if( mxTable.is() ) +{ +Reference XModifyListener xListener( static_cast ::com::sun::star::util::XModifyListener* (this) ); +mxTable-removeModifyListener( xListener ); mxTable-dispose(); +mxTable.clear(); +} } // - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/sax sax/qa sax/source xmloff/inc xmloff/source
include/sax/tools/converter.hxx |9 + sax/qa/cppunit/test_converter.cxx | 138 sax/source/tools/converter.cxx| 213 +++--- xmloff/inc/txtflde.hxx|6 + xmloff/source/text/txtflde.cxx| 24 +++- xmloff/source/text/txtfldi.cxx|4 6 files changed, 331 insertions(+), 63 deletions(-) New commits: commit 4ac4c151af9f743203728792f9840c4bafbb9390 Author: Michael Stahl mst...@redhat.com Date: Tue Dec 10 15:14:00 2013 +0100 sax, xmloff: fix ODF import/export of text:time/text:time-value The value written for an Impress time field is something like text:time-value=-00-00T23:28:07 (in LO 3.5+) or text:time-value=0-00-00T23:28:07 (in OOo 3.3) which contains an invalid all-zero date. Such values are actually rejected by the ODF import since commit ae3e2f170045a1525f67e9f3e9b7e03d94f2b56b. Actually there was no real support to read the RelaxNG type timeOrDateTime before. So fix that by: - adding convertTimeOrDateTime/parseTimeOrDateTime functions to sax::Converter - recognizing and ignoring the 2 invalid all-zero values written by LO 3.5 and historic OOo respectively - writing a bare time in text:time-value if the DateTime struct contains zero Date members (Older OOo versions and AOO cannot actually read that, but everything they _can_ read is invalid ODF...) (cherry picked from commit cc407e50e8a1a74f9d1ed29d444dce9bd2e9167a) The backport contains one change: XMLTextFieldExport::ProcessTimeOrDateTime() still writes the invalid value (to not add new backwards compat issues in stable branch), so this patch only fixes the import side of things. Conflicts: sax/source/tools/converter.cxx xmloff/source/text/txtfldi.cxx Change-Id: I754076caee74a5163ed3f972af0f23796aa14f9f Reviewed-on: https://gerrit.libreoffice.org/7026 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx index 615308c..683fadb 100644 --- a/include/sax/tools/converter.hxx +++ b/include/sax/tools/converter.hxx @@ -160,10 +160,19 @@ public: const com::sun::star::util::DateTime rDateTime, bool bAddTimeIf0AM = false ); +/** convert util::DateTime to ISO time or dateTime string */ +static void convertTimeOrDateTime(OUStringBuffer rBuffer, +const com::sun::star::util::DateTime rDateTime, +sal_Int16 const* pTimeZoneOffset); + /** convert ISO date or dateTime string to util::DateTime */ static bool convertDateTime( com::sun::star::util::DateTime rDateTime, const OUString rString ); +/** convert ISO time or dateTime string to util::DateTime */ +static bool parseTimeOrDateTime(com::sun::star::util::DateTime rDateTime, + const OUString rString); + /** convert ISO date or dateTime string to util::DateTime or util::Date */ static bool convertDateOrDateTime( diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index cfda248..f4b0c12 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -53,6 +53,7 @@ public: void testDuration(); void testDateTime(); +void testTime(); void testDouble(); void testMeasure(); void testBool(); @@ -64,6 +65,7 @@ public: CPPUNIT_TEST_SUITE(ConverterTest); CPPUNIT_TEST(testDuration); CPPUNIT_TEST(testDateTime); +CPPUNIT_TEST(testTime); CPPUNIT_TEST(testDouble); CPPUNIT_TEST(testMeasure); CPPUNIT_TEST(testBool); @@ -240,7 +242,7 @@ void ConverterTest::testDateTime() doTestDateTimeF( 0001-13-01T00:00:00 ); // invalid: M 12 doTestDateTimeF( 0001-01-32T00:00:00 ); // invalid: D 31 doTestDateTimeF( 0001-01-01T25:00:00 ); // invalid: H 24 -doTestDateTimeF( 0001-01-01T00:60:00 ); // invalid: H 59 +doTestDateTimeF( 0001-01-01T00:60:00 ); // invalid: M 59 doTestDateTimeF( 0001-01-01T00:00:60 ); // invalid: S 59 doTestDateTimeF( 0001-01-01T24:01:00 ); // invalid: H=24, but M != 0 doTestDateTimeF( 0001-01-01T24:00:01 ); // invalid: H=24, but S != 0 @@ -251,9 +253,143 @@ void ConverterTest::testDateTime() doTestDateTimeF( 0001-01-02T00:00:00-14:01 ); // invalid: TZ -14:00 doTestDateTimeF( 2100-02-29T00:00:00-00:00 ); // invalid: no leap year doTestDateTimeF( 1900-02-29T00:00:00-00:00 ); // invalid: no leap year +doTestDateTimeF( 00:00:00 ); // invalid: no date +doTestDateTimeF( T00:00:00 ); // invalid: no date SAL_INFO(sax.cppunit,\nSAX CONVERTER TEST END); } +static void doTestTime(util::DateTime const rdt, char const*const pis, +
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 118 +-- sw/source/filter/ww8/docxattributeoutput.hxx |3 2 files changed, 64 insertions(+), 57 deletions(-) New commits: commit 2e32184b5862e54f7dff17d456235f730c1ff5ea Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 11 11:43:29 2013 +0100 VML export: factor out TextFrame handling code to its own method Change-Id: I2158aed3dfe71370add52759976232647286fa7e diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1209e43..1da02b0 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -366,6 +366,66 @@ bool lcl_checkFrameBtlr(SwNode* pStartNode, sax_fastparser::FastAttributeList* p return false; } +void DocxAttributeOutput::WriteVMLTextFrame(sw::Frame* pParentFrame) +{ +const SwFrmFmt rFrmFmt = pParentFrame-GetFrmFmt( ); +const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx(); + +sal_uLong nStt = pNodeIndex ? pNodeIndex-GetIndex()+1 : 0; +sal_uLong nEnd = pNodeIndex ? pNodeIndex-GetNode().EndOfSectionIndex() : 0; + +//Save data here and restore when out of scope +ExportDataSaveRestore aDataGuard(m_rExport, nStt, nEnd, pParentFrame); + +// When a frame has some low height, but automatically expanded due +// to lots of contents, this size contains the real size. +const Size aSize = pParentFrame-GetSize(); +m_pFlyFrameSize = aSize; + +m_bTextFrameSyntax = true; +m_pFlyAttrList = m_pSerializer-createAttrList( ); +m_pTextboxAttrList = m_pSerializer-createAttrList(); +m_aTextFrameStyle = position:absolute; +m_rExport.OutputFormat( pParentFrame-GetFrmFmt(), false, false, true ); +m_pFlyAttrList-add(XML_style, m_aTextFrameStyle.makeStringAndClear()); +XFastAttributeListRef xFlyAttrList( m_pFlyAttrList ); +m_pFlyAttrList = NULL; +m_bFrameBtLr = lcl_checkFrameBtlr(m_rExport.pDoc-GetNodes()[nStt], m_pTextboxAttrList); +XFastAttributeListRef xTextboxAttrList(m_pTextboxAttrList); +m_pTextboxAttrList = NULL; +m_bTextFrameSyntax = false; +m_pFlyFrameSize = 0; +m_rExport.mpParentFrame = NULL; + +m_pSerializer-startElementNS( XML_w, XML_r, FSEND ); +m_pSerializer-startElementNS( XML_w, XML_pict, FSEND ); +m_pSerializer-startElementNS( XML_v, XML_rect, xFlyAttrList ); +lcl_TextFrameShadow(m_pSerializer, rFrmFmt); +if (m_pFlyFillAttrList) +{ +XFastAttributeListRef xFlyFillAttrList(m_pFlyFillAttrList); +m_pFlyFillAttrList = NULL; +m_pSerializer-singleElementNS(XML_v, XML_fill, xFlyFillAttrList); +} +m_pSerializer-startElementNS( XML_v, XML_textbox, xTextboxAttrList ); +m_pSerializer-startElementNS( XML_w, XML_txbxContent, FSEND ); +m_rExport.WriteText( ); +m_pSerializer-endElementNS( XML_w, XML_txbxContent ); +m_pSerializer-endElementNS( XML_v, XML_textbox ); + +if (m_pFlyWrapAttrList) +{ +XFastAttributeListRef xFlyWrapAttrList(m_pFlyWrapAttrList); +m_pFlyWrapAttrList = NULL; +m_pSerializer-singleElementNS(XML_w10, XML_wrap, xFlyWrapAttrList); +} + +m_pSerializer-endElementNS( XML_v, XML_rect ); +m_pSerializer-endElementNS( XML_w, XML_pict ); +m_pSerializer-endElementNS( XML_w, XML_r ); +m_bFrameBtLr = false; +} + void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) { // write the paragraph properties + the run, already in the correct order @@ -379,63 +439,7 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT for (size_t i = 0; i aParentFrames.size(); ++i) { sw::Frame* pParentFrame = aParentFrames[i]; - -const SwFrmFmt rFrmFmt = pParentFrame-GetFrmFmt( ); -const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx(); - -sal_uLong nStt = pNodeIndex ? pNodeIndex-GetIndex()+1 : 0; -sal_uLong nEnd = pNodeIndex ? pNodeIndex-GetNode().EndOfSectionIndex() : 0; - -//Save data here and restore when out of scope -ExportDataSaveRestore aDataGuard(m_rExport, nStt, nEnd, pParentFrame); - -// When a frame has some low height, but automatically expanded due -// to lots of contents, this size contains the real size. -const Size aSize = pParentFrame-GetSize(); -m_pFlyFrameSize = aSize; - -m_bTextFrameSyntax = true; -m_pFlyAttrList = m_pSerializer-createAttrList( ); -m_pTextboxAttrList = m_pSerializer-createAttrList(); -m_aTextFrameStyle = position:absolute; -m_rExport.OutputFormat( pParentFrame-GetFrmFmt(), false, false, true ); -m_pFlyAttrList-add(XML_style, m_aTextFrameStyle.makeStringAndClear()); -XFastAttributeListRef xFlyAttrList( m_pFlyAttrList ); -m_pFlyAttrList = NULL; -m_bFrameBtLr =
Re: callgrind metrics was: Re: minutes of ESC call ...
On Sat, 2013-12-07 at 12:08 +, Michael Meeks wrote: What files should it test ? Currently it's empty.ods, empty.odt, and sample.xlsx - just some numbers in there. I guess we should get QA to create some small files with a chart, a small image, a bit of text attributes, bold, italic etc. Sounds good, how to achieve this? :-) Anyone with commit access can just push documents to buildbot.git/loperf/docs and they will be automatically tested. I'd be happy if we only ran one performance test cycle each eight hours - you see how stable the results are :-) so - I'd be eager to have some larger documents so we can catch new N^2ds that creep in [ the most common cause of grief ], so some 10k row spreadsheets, and some 100 page documents would be good. right, makes sense I guess we should also have import (and ideally export ;-) of all our major formats. So - it looks beautiful - any chance to make it slower more comprehensive ? [ build less, and test more ]. Ok, so I've added --convert-to option which hopefully helps to achieve this. It just needs more documents. I might add some random files there. Where should I upload this history.csv ? Post to the list once in a week, or..? Having it available on-line would be cool; ideally as flat-odf ;-) [ saves a bit of import time ], and we'll graph it. Did you mean .fods ? It does produce .fods now too. It's in http://dev-builds.libreoffice.org/callgrind_report/ Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: locking foo ...
On 04/12/13 00:02, Michael Stahl wrote: On 03/12/13 22:33, Michael Meeks wrote: On Tue, 2013-12-03 at 17:03 +0100, Michael Stahl wrote: and now for another fun problem i've seen: it's possible to deadlock between the Win32 message handling in the main thread and deleting VCL Window on other threads. the ~Window destroys the native Win32 window by sending a Win32 message to it, and the Win32 window apparently is tied to a thread such that that message send blocks until the main thread gets the message and acts on it. Then again - that's a bit intractable; we have to destroy windows on the thread there were created on (unfortunately), and several other types of operation have to be done there - there is about a dozen of them in vcl/win. Each of these mandates a ~synchronous call to the 'main' thread succeeding during them. so what can happen is that some other thread locks SolarMutex, deletes a VCL Window, while main thread is in its message handling and tries to lock SolarMutex itself, e.g. while getting a TopWindow via MSAA (but there are many other messages which require locking SolarMutex); so this is mostly a pre-existing problem and i'm not sure if anything can easily be done about it; PostUserEvent apparently calls PostMessageW too so likely has the same problem. guess i should RTFM more - actually PostMessage is asynchronous, and SendMessage synchronous - so hopefully the deadlock can actually be avoided via PostMessage. what it does is call ~WinSalFrame which does things like remove this from a list of WinSalFrames stored in some SalData thing. if that could be moved to a SalFrame::Dispose() method to be called with SolarMutex locked, and the Win32 thread-affine stuff (DestroyWindow etc.) done from PostMessage we could be getting somewhere... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 138 +-- sw/source/filter/ww8/docxattributeoutput.hxx |3 2 files changed, 131 insertions(+), 10 deletions(-) New commits: commit 863d91c20b4af0a281748d83f3bf359234bc7195 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 11 15:54:52 2013 +0100 Add DocxAttributeOutput::WriteDMLTextFrame that can export a textframe in DML Change-Id: I9600d4fffc4cde7046b43729f95d5a96aa1cdf38 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1da02b0..90198f7 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -140,6 +140,9 @@ using namespace sw::util; using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; +// TODO the whole Sdr code should be factored out to a separate class. +void lcl_startDMLAnchorInline(sax_fastparser::FSHelperPtr pSerializer, const SwFrmFmt* pFrmFmt, const Size rSize); +void lcl_endDMLAnchorInline(sax_fastparser::FSHelperPtr pSerializer, const SwFrmFmt* pFrmFmt); class FFDataWriterHelper { @@ -397,7 +400,6 @@ void DocxAttributeOutput::WriteVMLTextFrame(sw::Frame* pParentFrame) m_pFlyFrameSize = 0; m_rExport.mpParentFrame = NULL; -m_pSerializer-startElementNS( XML_w, XML_r, FSEND ); m_pSerializer-startElementNS( XML_w, XML_pict, FSEND ); m_pSerializer-startElementNS( XML_v, XML_rect, xFlyAttrList ); lcl_TextFrameShadow(m_pSerializer, rFrmFmt); @@ -422,10 +424,79 @@ void DocxAttributeOutput::WriteVMLTextFrame(sw::Frame* pParentFrame) m_pSerializer-endElementNS( XML_v, XML_rect ); m_pSerializer-endElementNS( XML_w, XML_pict ); -m_pSerializer-endElementNS( XML_w, XML_r ); m_bFrameBtLr = false; } +void DocxAttributeOutput::WriteDMLTextFrame(sw::Frame* pParentFrame) +{ +const SwFrmFmt rFrmFmt = pParentFrame-GetFrmFmt( ); +const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx(); + +sal_uLong nStt = pNodeIndex ? pNodeIndex-GetIndex()+1 : 0; +sal_uLong nEnd = pNodeIndex ? pNodeIndex-GetNode().EndOfSectionIndex() : 0; + +//Save data here and restore when out of scope +ExportDataSaveRestore aDataGuard(m_rExport, nStt, nEnd, pParentFrame); + +// When a frame has some low height, but automatically expanded due +// to lots of contents, this size contains the real size. +const Size aSize = pParentFrame-GetSize(); + +lcl_startDMLAnchorInline(m_pSerializer, rFrmFmt, aSize); + +sax_fastparser::FastAttributeList* pDocPrAttrList = m_pSerializer-createAttrList(); +pDocPrAttrList-add(XML_id, OString::number(m_anchorId++).getStr()); +pDocPrAttrList-add(XML_name, OUStringToOString(rFrmFmt.GetName(), RTL_TEXTENCODING_UTF8).getStr()); +XFastAttributeListRef xDocPrAttrListRef(pDocPrAttrList); +m_pSerializer-singleElementNS(XML_wp, XML_docPr, xDocPrAttrListRef); + +m_pSerializer-startElementNS(XML_a, XML_graphic, +FSNS(XML_xmlns, XML_a), http://schemas.openxmlformats.org/drawingml/2006/main;, +FSEND); +m_pSerializer-startElementNS(XML_a, XML_graphicData, +XML_uri, http://schemas.microsoft.com/office/word/2010/wordprocessingShape;, +FSEND); +m_pSerializer-startElementNS(XML_wps, XML_wsp, FSEND); +m_pSerializer-singleElementNS(XML_wps, XML_cNvSpPr, +XML_txBox, 1, +FSEND); + +// Shape properties +m_pSerializer-startElementNS(XML_wps, XML_spPr, FSEND); +m_pSerializer-startElementNS(XML_a, XML_xfrm, FSEND); +m_pSerializer-singleElementNS(XML_a, XML_off, +XML_x, 0, +XML_y, 0, +FSEND); +OString aWidth(OString::number(TwipsToEMU(aSize.Width(; +OString aHeight(OString::number(TwipsToEMU(aSize.Height(; +m_pSerializer-singleElementNS(XML_a, XML_ext, +XML_cx, aWidth.getStr(), +XML_cy, aHeight.getStr(), +FSEND); +m_pSerializer-endElementNS(XML_a, XML_xfrm); +m_pSerializer-singleElementNS(XML_a, XML_prstGeom, +XML_prst, rect, +FSEND); +m_bDMLTextFrameSyntax = true; +m_rExport.OutputFormat( pParentFrame-GetFrmFmt(), false, false, true ); +m_bDMLTextFrameSyntax = false; +m_pSerializer-endElementNS(XML_wps, XML_spPr); + +m_rExport.mpParentFrame = NULL; +m_pSerializer-startElementNS( XML_wps, XML_txbx, FSEND ); +m_pSerializer-startElementNS( XML_w, XML_txbxContent, FSEND ); +m_rExport.WriteText( ); +m_pSerializer-endElementNS( XML_w, XML_txbxContent ); +m_pSerializer-endElementNS( XML_wps, XML_txbx ); +m_pSerializer-singleElementNS( XML_wps, XML_bodyPr, FSEND ); + +m_pSerializer-endElementNS(XML_wps, XML_wsp); +m_pSerializer-endElementNS(XML_a, XML_graphicData); +m_pSerializer-endElementNS(XML_a, XML_graphic); +lcl_endDMLAnchorInline(m_pSerializer, rFrmFmt); +} +
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) New commits: commit 8a0fc37a3714752b764d9d9b752913734412d46c Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 11 16:03:21 2013 +0100 DOCX textframe export: when in experimental mode, use DML instead of VML Change-Id: Idf6a849b08fd76841d0dde75b698e5d730cb diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 90198f7..77d11e7 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -511,7 +511,22 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT { sw::Frame* pParentFrame = aParentFrames[i]; m_pSerializer-startElementNS( XML_w, XML_r, FSEND ); -WriteVMLTextFrame(pParentFrame); +SvtMiscOptions aMiscOptions; +if (aMiscOptions.IsExperimentalMode()) +{ +m_pSerializer-startElementNS(XML_mc, XML_AlternateContent, FSEND); +m_pSerializer-startElementNS(XML_mc, XML_Choice, +XML_Requires, wps, +FSEND); +WriteDMLTextFrame(pParentFrame); +m_pSerializer-endElementNS(XML_mc, XML_Choice); +m_pSerializer-startElementNS(XML_mc, XML_Fallback, FSEND); +WriteVMLTextFrame(pParentFrame); +m_pSerializer-endElementNS(XML_mc, XML_Fallback); +m_pSerializer-endElementNS(XML_mc, XML_AlternateContent); +} +else +WriteVMLTextFrame(pParentFrame); m_pSerializer-endElementNS( XML_w, XML_r ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - bin/lo-xlate-lang comphelper/source connectivity/source filter/source i18nlangtag/source i18npool/source i18nutil/source include/i18nlangtag include/svx inc
bin/lo-xlate-lang |2 comphelper/source/misc/string.cxx |2 connectivity/source/drivers/hsqldb/HDriver.cxx|2 filter/source/msfilter/countryid.cxx |2 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |4 i18nlangtag/source/isolang/isolang.cxx|2 i18nlangtag/source/isolang/mslangid.cxx |2 i18npool/source/breakiterator/data/char.txt |8 - i18npool/source/breakiterator/data/char_in.txt|8 - i18npool/source/localedata/data/or_IN.xml |2 i18npool/source/nativenumber/data/numberchar.h|8 - i18nutil/source/utility/unicode_data.h|2 include/i18nlangtag/lang.h|2 include/svx/ucsubset.hrc |2 include/vcl/fontcapabilities.hxx |2 l10ntools/source/ulfconv/msi-encodinglist.txt |2 linguistic/source/misc.cxx|2 scp2/source/accessories/module_samples_accessories.ulf|8 - scp2/source/accessories/module_templates_accessories.ulf |8 - scp2/source/ooo/module_helppack.ulf |4 scp2/source/ooo/module_langpack.ulf |4 setup_native/source/win32/customactions/sellang/sellang.cxx |2 shell/source/win32/shlxthandler/util/utilities.cxx|2 svtools/source/misc/langtab.src |2 svtools/source/misc/sampletext.cxx|8 - svx/source/dialog/charmap.cxx |2 svx/source/dialog/ucsubset.src|4 vcl/source/fontsubset/sft.cxx | 77 -- vcl/source/gdi/sallayout.cxx |4 vcl/win/source/gdi/salgdi3.cxx|2 30 files changed, 52 insertions(+), 129 deletions(-) New commits: commit 108eee306ea0beef1e8cc5e673a72db0928dd6b8 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 11 13:24:22 2013 + Related: rhbz#1040291 Change language name from 'Oriya' to 'Odia' Except for our external api where the Oriya is stuck (and similar for the vba implementation) Change-Id: I8288c930567385eea49a4c303727b13ef8b8a89f diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang index ede1b65..b7a2879 100755 --- a/bin/lo-xlate-lang +++ b/bin/lo-xlate-lang @@ -144,7 +144,7 @@ __DATA__ :as:assamese :ml:malayalam :mr:marathi -:or:oriya +:or:odia :ur:urdu :fa:farsi :lv:latvian diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 4a5f9df..ae622c2 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -217,7 +217,7 @@ sal_uInt32 decimalStringToNumber( value = c - 0x0C66; else if( c = 0x0BE6 ) // tamil digits value = c - 0x0BE6; -else if( c = 0x0B66 ) // oriya digits +else if( c = 0x0B66 ) // odia digits value = c - 0x0B66; else if( c = 0x0AE6 ) // gujarati digits value = c - 0x0AE6; diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 1e7b6b4..3e2fd0d 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -755,7 +755,7 @@ namespace connectivity ne-NP, Nepali, nl-NL, Dutch, nn-NO, Norwegian, -or-IN, Oriya, +or-IN, Odia, pa-IN, Punjabi, pl-PL, Polish, ps-AF, Pashto, diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx index b36f51b..28b57b3 100644 --- a/filter/source/msfilter/countryid.cxx +++ b/filter/source/msfilter/countryid.cxx @@ -147,7 +147,7 @@ static const CountryEntry pTable[] = { COUNTRY_INDIA,LANGUAGE_URDU_INDIA, true}, { COUNTRY_INDIA,LANGUAGE_PUNJABI, false }, { COUNTRY_INDIA,LANGUAGE_GUJARATI, false }, -{ COUNTRY_INDIA,LANGUAGE_ORIYA, false }, +{ COUNTRY_INDIA,LANGUAGE_ODIA, false }, { COUNTRY_INDIA,LANGUAGE_TAMIL, false }, { COUNTRY_INDIA,LANGUAGE_TELUGU, false }, { COUNTRY_INDIA,LANGUAGE_KANNADA, false }, diff --git
Re: callgrind metrics was: Re: minutes of ESC call ...
On Wed, Dec 11, 2013 at 9:55 AM, Matúš Kukan matus.ku...@collabora.com wrote: On Sat, 2013-12-07 at 12:08 +, Michael Meeks wrote: What files should it test ? Currently it's empty.ods, empty.odt, and sample.xlsx - just some numbers in there. I guess we should get QA to create some small files with a chart, a small image, a bit of text attributes, bold, italic etc. Sure, QA can assemble/make up a set of some test docs. We can try to assemble documents created in other applications, if preferable (and if we can find them :-) Sounds good, how to achieve this? :-) Anyone with commit access can just push documents to buildbot.git/loperf/docs and they will be automatically tested. - you see how stable the results are :-) so - I'd be eager to have some larger documents so we can catch new N^2ds that creep in [ the most common cause of grief ], so some 10k row spreadsheets, and some 100 page documents would be good. The buildbot repo is pretty small right now, which can be useful. How much test data total are we thinking about adding to it? (maybe a separate repo for test documents could be useful beyond perf testing) Thanks, --R ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: locking foo ...
Hi Michael, On Wed, 2013-12-11 at 15:54 +0100, Michael Stahl wrote: guess i should RTFM more - actually PostMessage is asynchronous, and SendMessage synchronous - so hopefully the deadlock can actually be avoided via PostMessage. I suspect PostMessage is only async. up to a point - the queue is only so large =) then again, if it discards after that I imagine we got our point across. what it does is call ~WinSalFrame which does things like remove this from a list of WinSalFrames stored in some SalData thing. if that could be moved to a SalFrame::Dispose() method to be called with SolarMutex locked, and the Win32 thread-affine stuff (DestroyWindow etc.) done from PostMessage we could be getting somewhere... I guess we could queue up some main-thread tasks to do at least around freeing resources when the main thread comes back something like an RCU =) but that of course only handles frame destruction - there are a good number of other bits that need a round-trip to the GUI thread that created those handles. Whether those are involved in a11y is anyone's guess - but ... I for one am a bit nervous of such a low-level change on the -4-2 branch. One alternative might be to have a separate GUI thread that simply manages those operations that cannot be performed on another thread =) that too would involve some pain - writing a cut-down windows specific event-loop that would execute it's own message queue - and (I assume) push window events out of that into the main thread. That might give us a more consistent model but at what performance cost ? HTH, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: callgrind metrics was: Re: minutes of ESC call ...
On Wed, 2013-12-11 at 15:55 +0100, Matúš Kukan wrote: Anyone with commit access can just push documents to buildbot.git/loperf/docs and they will be automatically tested. Nice =) I guess we should also have import (and ideally export ;-) of all our major formats. So - it looks beautiful - any chance to make it slower more comprehensive ? [ build less, and test more ]. Ok, so I've added --convert-to option which hopefully helps to achieve this. It just needs more documents. I might add some random files there. Cool - well; please construct some larger documents for calc - it'd be nice if we had some that triggered re-calculation on load too. For Impress it'd be nice to have some slide-decks with a number of large images in them etc. Then of course, having the (same?) data in multiple formats would be a nice comparison point. In general it's best to have single files that exercise one feature each - so we can chart how that feature performs on import over time. Having it available on-line would be cool; ideally as flat-odf ;-) [ saves a bit of import time ], and we'll graph it. Did you mean .fods ? It does produce .fods now too. It's in http://dev-builds.libreoffice.org/callgrind_report/ That looks beautiful =) I assume that between: 2013-12-11 09:58:25+01:00 cd7bce9e3701942438e420c9dde69f44eab5fa00 2013-12-11 10:46:56+01:00 326eb94142e0fe9fbb81243fea58261f0203ddcc the ~6x slow-down in sample.xlsx is due to the file itself changing ;-) Oh - also, adding a number format like: #,##0 to each of the callgrind pseudo-cycle numbers makes it massively more readable =) actually rounding those numbers to millions of cycles would make them much more tractable too. But hey - this is really awesome progress - really glad to have that there generating stats. Thanks ! Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: callgrind metrics was: Re: minutes of ESC call ...
On Wed, 2013-12-11 at 10:19 -0500, Robinson Tryon wrote: The buildbot repo is pretty small right now, which can be useful. How much test data total are we thinking about adding to it? (maybe a separate repo for test documents could be useful beyond perf testing) Well - big documents don't have to be 100's of Mb large; the zip compression helps a lot for spreadsheets at least. Also - if we're going to load them into a LibreOffice 100x slower than real-time, we should prolly make sure we don't have too many that are too large - particularly if we want to compare filter performance by having the same files in multiple formats =) But it'd be awesome to have help from QA constructing some initially: but when made, we want to ~permanently freeze the documents so we can compare LibreOffice over the long term without changes there. Matus - out of interest - are we still timing / charting startup ? I'd love to see 2x measurements there if possible: first the first ever start where we do a ton of UNO / component bootstrapping and then also a second start =) HTH, Michael. -- michael.me...@collabora.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-1' - sc/inc sc/source
sc/inc/dpobject.hxx | 10 +++--- sc/source/core/data/dpobject.cxx | 57 +-- 2 files changed, 42 insertions(+), 25 deletions(-) New commits: commit b8339a06050fcbff25e3c990e1ff8ca02dc7bad5 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Dec 10 15:56:06 2013 -0500 fdo#66969: Reset group dimension data from all referencing pivot objects. The previous code was doing it only with the first referencing pivot table, which would break the rest of them sharing the same cache if the first one doesn't contain all group dimensions used in all of the referencing pivot tables. Change-Id: I35d6907ef8db7ed69db42583cac92b2b74406e2c (cherry picked from commit b3977983e9f662392426f581516d86d7034ad0fd) Reviewed-on: https://gerrit.libreoffice.org/7028 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 06d4957..51d4790 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -290,7 +290,7 @@ public: private: ScDPCache* getExistingCache(const ScRange rRange); -void updateCache(const ScRange rRange, const ScDPDimensionSaveData* pDimData, std::setScDPObject* rRefs); +void updateCache(const ScRange rRange, std::setScDPObject* rRefs); bool remove(const ScDPCache* p); }; @@ -313,8 +313,7 @@ public: ScDPCache* getExistingCache(const OUString rName); void updateCache( -const OUString rName, const ScRange rRange, -const ScDPDimensionSaveData* pDimData, std::setScDPObject* rRefs); +const OUString rName, const ScRange rRange, std::setScDPObject* rRefs); bool remove(const ScDPCache* p); }; @@ -358,8 +357,9 @@ public: com::sun::star::uno::Referencecom::sun::star::sdbc::XRowSet createRowSet( sal_Int32 nSdbType, const OUString rDBName, const OUString rCommand); -void updateCache(sal_Int32 nSdbType, const OUString rDBName, const OUString rCommand, - const ScDPDimensionSaveData* pDimData, std::setScDPObject* rRefs); +void updateCache( +sal_Int32 nSdbType, const OUString rDBName, const OUString rCommand, +std::setScDPObject* rRefs); bool remove(const ScDPCache* p); }; diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 169231a..653bc0c 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2809,6 +2809,25 @@ struct FindInvalidRange : public std::unary_functionScRange, bool } }; +void setGroupItemsToCache( ScDPCache rCache, const std::setScDPObject* rRefs ) +{ +// Go through all referencing pivot tables, and re-fill the group dimension info. +std::setScDPObject*::const_iterator itRef = rRefs.begin(), itRefEnd = rRefs.end(); +for (; itRef != itRefEnd; ++itRef) +{ +const ScDPObject* pObj = *itRef; +const ScDPSaveData* pSave = pObj-GetSaveData(); +if (!pSave) +continue; + +const ScDPDimensionSaveData* pGroupDims = pSave-GetExistingDimensionData(); +if (!pGroupDims) +continue; + +pGroupDims-WriteToCache(rCache); +} +} + } bool ScDPCollection::SheetCaches::hasCache(const ScRange rRange) const @@ -2926,8 +2945,7 @@ void ScDPCollection::SheetCaches::updateReference( } } -void ScDPCollection::SheetCaches::updateCache( -const ScRange rRange, const ScDPDimensionSaveData* pDimData, std::setScDPObject* rRefs) +void ScDPCollection::SheetCaches::updateCache(const ScRange rRange, std::setScDPObject* rRefs) { RangeIndexType::iterator it = std::find(maRanges.begin(), maRanges.end(), rRange); if (it == maRanges.end()) @@ -2947,12 +2965,15 @@ void ScDPCollection::SheetCaches::updateCache( } ScDPCache rCache = *itCache-second; + +// Update the cache with new cell values. This will clear all group dimension info. rCache.InitFromDoc(mpDoc, rRange); -if (pDimData) -pDimData-WriteToCache(rCache); std::setScDPObject* aRefs(rCache.GetAllReferences()); rRefs.swap(aRefs); + +// Make sure to re-populate the group dimension info. +setGroupItemsToCache(rCache, rRefs); } bool ScDPCollection::SheetCaches::remove(const ScDPCache* p) @@ -3010,8 +3031,7 @@ size_t ScDPCollection::NameCaches::size() const } void ScDPCollection::NameCaches::updateCache( -const OUString rName, const ScRange rRange, const ScDPDimensionSaveData* pDimData, -std::setScDPObject* rRefs) +const OUString rName, const ScRange rRange, std::setScDPObject* rRefs) { CachesType::iterator itr = maCaches.find(rName); if (itr == maCaches.end()) @@ -3021,12 +3041,14 @@ void ScDPCollection::NameCaches::updateCache( } ScDPCache rCache = *itr-second; +// Update the cache with new
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/filter/xml/xmldpimp.cxx | 33 - sc/source/filter/xml/xmldpimp.hxx |7 +++ 2 files changed, 39 insertions(+), 1 deletion(-) New commits: commit 5618ac8ccddbff67b4b27a9c08f97d3bf2bcec3f Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Dec 10 12:50:48 2013 -0500 fdo#66969: Set selected page name after building all dimension members. Because the new implementation relies on the visiblity flag of the dimension members, they need to exist before setting currently selected page, which is still used in documents generated by the older version of LibreOffice. Change-Id: I6cec5fd3d2165f714fc01b596d3761890d87a4ff (cherry picked from commit 2e1b90a4272defb917b23e2e360e171114d6fa4d) Reviewed-on: https://gerrit.libreoffice.org/7027 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 83f58f7..825060c 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -412,6 +412,11 @@ void ScXMLDataPilotTableContext::SetButtons() pDPObject-RefreshAfterLoad(); } +void ScXMLDataPilotTableContext::SetSelectedPage( const OUString rDimName, const OUString rSelected ) +{ +maSelectedPages.insert(SelectedPagesType::value_type(rDimName, rSelected)); +} + void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim) { if (pDPSave) @@ -548,10 +553,36 @@ void ScXMLDataPilotTableContext::EndElement() if ( pDPCollection-GetByName(pDPObject-GetName()) ) pDPObject-SetName( String() ); // ignore the invalid name, create a new name in AfterXMLLoading +ProcessSelectedPages(); + pDPCollection-InsertNewTable(pDPObject); SetButtons(); } +void ScXMLDataPilotTableContext::ProcessSelectedPages() +{ +// Set selected pages after building all dimension members. +if (!pDPObject) +return; + +pDPObject-BuildAllDimensionMembers(); +ScDPSaveData* pSaveData = pDPObject-GetSaveData(); +if (!pSaveData) +return; + +SelectedPagesType::const_iterator it = maSelectedPages.begin(), itEnd = maSelectedPages.end(); +for (; it != itEnd; ++it) +{ +const OUString rDimName = it-first; +const OUString rSelected = it-second; +ScDPSaveDimension* pDim = pSaveData-GetExistingDimensionByName(rDimName); +if (!pDim) +continue; + +pDim-SetCurrentPage(rSelected); +} +} + void ScXMLDataPilotTableContext::SetGrandTotal( XMLTokenEnum eOrientation, bool bVisible, const OUString rDisplayName) { @@ -,7 +1142,7 @@ void ScXMLDataPilotFieldContext::EndElement() pDim-SetOrientation(nOrientation); if (bSelectedPage) { -pDim-SetCurrentPage(sSelectedPage); +pDataPilotTable-SetSelectedPage(pDim-GetName(), sSelectedPage); } pDataPilotTable-AddDimension(pDim); if (bIsGroupField) diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 1aa851d..32f878d 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -71,6 +71,8 @@ public: class ScXMLDataPilotTableContext : public SvXMLImportContext { +typedef boost::unordered_mapOUString, OUString, OUStringHash SelectedPagesType; + struct GrandTotalItem { OUString maDisplayName; @@ -114,9 +116,13 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext boolbDrillDown:1; boolbHeaderGridLayout:1; +SelectedPagesType maSelectedPages; + const ScXMLImport GetScImport() const { return (const ScXMLImport)GetImport(); } ScXMLImport GetScImport() { return (ScXMLImport)GetImport(); } +void ProcessSelectedPages(); + public: ScXMLDataPilotTableContext( ScXMLImport rImport, sal_uInt16 nPrfx, @@ -151,6 +157,7 @@ public: void AddGroupDim(const ScDPSaveNumGroupDimension aNumGroupDim); void AddGroupDim(const ScDPSaveGroupDimension aGroupDim); void SetButtons(); +void SetSelectedPage( const OUString rDimName, const OUString rSelected ); }; class ScXMLDPSourceSQLContext : public SvXMLImportContext ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - ios/MobileLibreOffice vcl/ios vcl/quartz
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 10 ++ vcl/ios/iosinst.cxx |6 ++-- vcl/quartz/salgdi.cxx | 15 ++ 3 files changed, 28 insertions(+), 3 deletions(-) New commits: commit 0f5a7bc99fff074336b8d122a0bcc8f3c8e79a7f Author: Tor Lillqvist t...@collabora.com Date: Wed Dec 11 18:16:58 2013 +0200 Add a file Change-Id: I32bc4852396b0eff9962dc5cd007faf0bb9f5eaa diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj index 3c5be84..858beb7 100644 --- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj +++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj @@ -267,6 +267,7 @@ BE82BE4B1822D10F00A447B5 /* ctfonts.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctfonts.cxx; path = ../../vcl/quartz/ctfonts.cxx; sourceTree = group; }; BE82BE4D1822D10F00A447B5 /* ctlayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctlayout.cxx; path = ../../vcl/quartz/ctlayout.cxx; sourceTree = group; }; BE82BE4E1822D10F00A447B5 /* salgdi.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdi.cxx; path = ../../vcl/quartz/salgdi.cxx; sourceTree = group; }; + BEC9DABC1858BA39009CCCB3 /* svdpagv.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svdpagv.cxx; path = ../../svx/source/svdraw/svdpagv.cxx; sourceTree = group; }; BEE68B5D185715EE0049ECE0 /* salbmp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salbmp.cxx; path = ../../vcl/quartz/salbmp.cxx; sourceTree = group; }; BEE68B5E185715EE0049ECE0 /* salgdicommon.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdicommon.cxx; path = ../../vcl/quartz/salgdicommon.cxx; sourceTree = group; }; BEE68B5F185715EE0049ECE0 /* salgdiutils.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdiutils.cxx; path = ../../vcl/quartz/salgdiutils.cxx; sourceTree = group; }; @@ -484,6 +485,7 @@ isa = PBXGroup; children = ( BEE68B62185746D20049ECE0 /* basebmp */, + BEC9DABA1858B9DB009CCCB3 /* svx */, BE82BDB61822617C00A447B5 /* sw */, BE82BDB51822617500A447B5 /* vcl */, ); @@ -703,6 +705,14 @@ name = quartz; sourceTree = group; }; + BEC9DABA1858B9DB009CCCB3 /* svx */ = { + isa = PBXGroup; + children = ( + BEC9DABC1858BA39009CCCB3 /* svdpagv.cxx */, + ); + name = svx; + sourceTree = group; + }; BEE68B62185746D20049ECE0 /* basebmp */ = { isa = PBXGroup; children = ( commit 69baf700b6ac9c069022714c3d661a632ade93a3 Author: Tor Lillqvist t...@collabora.com Date: Wed Dec 11 18:11:22 2013 +0200 Try to fix colour issues Use RGBA consistenly. Wonder why the code was changed to use BGRA at some point? I got the picture in the document to show up with correct colours but unfortunately not the RED GREEN BLUE etc text. Weird. Even weirder, if I add a temporary hack in CoreTextStyle::SetTextColor() to use some other colours for non-black text (instead of the ones passed in the parameter), those colours do show up. This is a mystery. Change-Id: I591424a19fa02b3f095035e989cbc49fff94b8ca diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index c0f7073..0b3f69f 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -156,7 +156,7 @@ public: sal_uLong nSalFrameStyle, SystemParentData *pSysParent ) : SvpSalFrame( pInstance, pParent, nSalFrameStyle, - true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, + true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA, pSysParent ) { enableDamageTracker(); @@ -361,7 +361,7 @@ IMPL_LINK( IosSalInstance, RenderWindows, RenderWindowsArg*, arg ) CGImageCreate( aDevice-getSize().getX(), aDevice-getSize().getY(), 8, 32, aDevice-getScanlineStride(), CGColorSpaceCreateDeviceRGB(), - kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little, +
l10n process, en_US version, Help files
Hi all, This mail is posted to the dev list and the l10n list, please follow up on the l10n list. I would like to open a discussion on the l10n workflow, the quality of the en_US version and the Help files. All is linked and I would like to discuss how we can improve the process here. I'm sure that having a better understanding between the l10n process and the dev process should help us to improve things :) So here is a proposal, it's a bit long, sorry for that. *Before updating Pootle: - it's important for l10n team to know the approx load of work that will be needed to achieve the whole work. Time between beta1 and rc1 is short and that will help to better organize this time between translation and proof reading. - depending also on the type of changes, we could use different tools to optimize the work. *When the l10n start: - we need a continuous communication and a planing of the updates made in Pootle, those translating off line are always frightened to lose something in the run. - it's exhausting when you think you are over and to see a new bunch of words coming. Knowing it in advance help to manage the time too *After RC1 and l10n integration - we need to know when integration is made after our fixes, there is currently no communication on this == for these three items, I have asked today to Andras and Christian how we can put that in place and where I can help them to do so, knowing also that Christian is managing this part almost alone now. *About the en_US overall quality - the process to rely on the l10n team to fix the en_US version is ok, even if it gives us extra work to understand what is meant before we realized it's a mistake. So it's also error prone for all the translations. - but that doesn't solve the several typos that already exist and that are overlooked by the l10n team (e.g in the Character Font Effect dialog, there is Overline _c_olor and Underline _C_olor and this is the same for several dialogs) - that doesn't solve also the lack of universal vocabulary used in several dialogs (e.g Tab/Pane/Panel/Deck to name the same object or Graphic/Picture/Image). I've nothing to propose here but to define a glossary where developers could pick the good word but I'm not sure it will be used * About the help files - I always wonder why there is a Help button on a new dialog when no help file is appended ;) - more and more functions are undocumented or their help is obsolete. I always think that an undocumented function is lost for the user and a sad thing for a developer because his function will not be used as expected. May be, but I don't know how heavy it would be for developers, the solution would be to open an issue with a special tag like NF for each new feature, with three lines about what the feature is supposed to do. Searching on BZ with this special tag would allow to involve more people in the loop to test it and document it. Thanks for reading :) Cheers Sophie ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/sidebar/paragraph/ParaPropertyPanel.src |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 720a05810183b5f19712395480e4e18d1a9d8133 Author: Maxim Monastirsky momonas...@gmail.com Date: Wed Dec 11 14:42:18 2013 +0200 Fix typo Change-Id: Ie2e3cfa3c35f5ccb59420afb13f5142ecdcb659e Reviewed-on: https://gerrit.libreoffice.org/7034 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src index 7dc425c..459ea6a 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src @@ -49,11 +49,11 @@ Image IMG_BACK_COLOR { -ImageBitmap = Bitmap{File = symphony/sc_backgroundcolor.bmp;}; +ImageBitmap = Bitmap{File = symphony/sc_backgroundcolor.png;}; }; Image IMG_BACK_COLOR_H { -ImageBitmap = Bitmap{File = symphony/sch_backgroundcolor.bmp;}; +ImageBitmap = Bitmap{File = symphony/sch_backgroundcolor.png;}; }; Image IMG_SPACE3 { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: callgrind metrics was: Re: minutes of ESC call ...
On Wed, Dec 11, 2013 at 8:55 AM, Matúš Kukan matus.ku...@collabora.com wrote: On Sat, 2013-12-07 at 12:08 +, Michael Meeks wrote: What files should it test ? Currently it's empty.ods, empty.odt, and sample.xlsx - just some numbers in there. I guess we should get QA to create some small files with a chart, a small image, a bit of text attributes, bold, italic etc. Sounds good, how to achieve this? :-) Anyone with commit access can just push documents to buildbot.git/loperf/docs and they will be automatically tested. hold on... we do have a git repo for test files, aptly named test-files.git I'd rather not bloat buibot.git too much as this need to be cloned on every tb Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/inc writerfilter/source
sw/qa/extras/ooxmlexport/data/theme-preservation.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 28 + sw/source/filter/ww8/docxexport.cxx | 35 + writerfilter/inc/dmapper/DomainMapper.hxx |2 writerfilter/source/dmapper/DomainMapper.cxx |7 writerfilter/source/dmapper/SettingsTable.cxx | 20 + writerfilter/source/dmapper/SettingsTable.hxx |2 writerfilter/source/dmapper/ThemeTable.cxx| 346 ++ writerfilter/source/dmapper/ThemeTable.hxx|7 writerfilter/source/filter/ImportFilter.cxx | 35 + writerfilter/source/ooxml/model.xml |3 11 files changed, 481 insertions(+), 4 deletions(-) New commits: commit ece66b11bd3d294eb27f185c1513744fe28ca523 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Wed Dec 11 16:29:28 2013 +0100 fdo#64232: export w:themeFontLang setting to docx We store the values of themeFontLang tag to the document grab bag so we can save it back to the document on export time. Added unit tests to check that the attribute is properly set back and also that the theme fonts are correctly applied to the text. Change-Id: Ia54c513796ba38a571396ca7b72dfd28463c15fd diff --git a/sw/qa/extras/ooxmlexport/data/theme-preservation.docx b/sw/qa/extras/ooxmlexport/data/theme-preservation.docx index c1d879a..ff7c570 100644 Binary files a/sw/qa/extras/ooxmlexport/data/theme-preservation.docx and b/sw/qa/extras/ooxmlexport/data/theme-preservation.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index c4efcfd..7267838 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2047,7 +2047,7 @@ DECLARE_OOXMLEXPORT_TEST(testThemePreservation, theme-preservation.docx) if (!pXmlStyles) return; assertXPath(pXmlStyles, /w:styles/w:docDefaults/w:rPrDefault/w:rPr/w:rFonts, asciiTheme, minorHAnsi); -assertXPath(pXmlStyles, /w:styles/w:docDefaults/w:rPrDefault/w:rPr/w:rFonts, eastAsiaTheme, minorEastAsia); +assertXPath(pXmlStyles, /w:styles/w:docDefaults/w:rPrDefault/w:rPr/w:rFonts, cstheme, minorBidi); // check the font theme values in style definitions assertXPath(pXmlStyles, /w:styles/w:style[1]/w:rPr/w:rFonts, eastAsiaTheme, minorEastAsia); @@ -2056,8 +2056,30 @@ DECLARE_OOXMLEXPORT_TEST(testThemePreservation, theme-preservation.docx) xmlDocPtr pXmlDocument = parseExport(word/document.xml); if (!pXmlDocument) return; -assertXPath(pXmlDocument, /w:document/w:body/w:p[1]/w:r[1]/w:rPr/w:rFonts, hAnsiTheme, majorBidi); -assertXPath(pXmlDocument, /w:document/w:body/w:p[1]/w:r[1]/w:rPr/w:rFonts, cstheme, majorBidi); +assertXPath(pXmlDocument, /w:document/w:body/w:p[5]/w:r[1]/w:rPr/w:rFonts, hAnsiTheme, majorHAnsi); +assertXPath(pXmlDocument, /w:document/w:body/w:p[5]/w:r[1]/w:rPr/w:rFonts, asciiTheme, majorHAnsi); + +// check the themeFontLang values in settings file +xmlDocPtr pXmlSettings = parseExport(word/settings.xml); +if (!pXmlSettings) +return; +assertXPath(pXmlSettings, /w:settings/w:themeFontLang, val, en-US); +assertXPath(pXmlSettings, /w:settings/w:themeFontLang, eastAsia, zh-CN); +assertXPath(pXmlSettings, /w:settings/w:themeFontLang, bidi, he-IL); + +// check fonts have been applied properly +sal_Unicode fontName[2]; //represents the string å®ä½ +fontName[0] = 0x5b8b; +fontName[1] = 0x4f53; +CPPUNIT_ASSERT_EQUAL(OUString(fontName, 2), getPropertyOUString(getParagraph(1), CharFontNameAsian)); +CPPUNIT_ASSERT_EQUAL(OUString(Arial), + getPropertyOUString(getParagraph(2), CharFontNameComplex)); +CPPUNIT_ASSERT_EQUAL(OUString(Trebuchet MS), + getPropertyOUString(getParagraph(3, Default style theme font), CharFontName)); +CPPUNIT_ASSERT_EQUAL(OUString(Arial Black), + getPropertyOUString(getRun(getParagraph(4, Direct format font), 1), CharFontName)); +CPPUNIT_ASSERT_EQUAL(OUString(Trebuchet MS), + getPropertyOUString(getParagraph(5, Major theme font), CharFontName)); } DECLARE_OOXMLEXPORT_TEST(testcantSplit, 2_table_doc.docx) diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index bbc3673..f825819 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -753,6 +753,41 @@ void DocxExport::WriteSettings() if( m_pAttrOutput-HasEndnotes()) m_pAttrOutput-WriteFootnoteEndnotePr( pFS, XML_endnotePr, pDoc-GetEndNoteInfo(), XML_endnote ); +// Has themeFontLang information +uno::Reference beans::XPropertySet xPropSet( pDoc-GetDocShell()-GetBaseModel(), uno::UNO_QUERY_THROW ); + +uno::Reference beans::XPropertySetInfo xPropSetInfo =
[Libreoffice-commits] core.git: 4 commits - cppuhelper/source cppu/Library_cppu.mk cppu/source include/xmloff vcl/win xmloff/source
cppu/Library_cppu.mk |1 cppu/source/uno/env_subst.cxx | 47 - cppu/source/uno/env_subst.hxx | 35 --- cppu/source/uno/lbenv.cxx |2 - cppuhelper/source/shlib.cxx|2 - include/xmloff/xmlexp.hxx |2 - vcl/win/source/window/salframe.cxx |3 +- xmloff/source/core/xmlexp.cxx |2 - 8 files changed, 4 insertions(+), 90 deletions(-) New commits: commit 87b2bc2cc31b4bc334af8d598684a340242d3633 Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Dec 11 16:03:38 2013 +0100 Use static for this getenv call too. Change-Id: Ieb8dd13763c6d5e6d30ce641683de79d89d135df diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 3602c83..c342b7f 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -291,7 +291,8 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, DWORD nExSysStyle = 0; sal_BoolbSubFrame = FALSE; -if( getenv( SAL_SYNCHRONIZE ) ) // no buffering of drawing commands +static const char* pEnvSynchronize = getenv(SAL_SYNCHRONIZE); +if ( pEnvSynchronize ) // no buffering of drawing commands GdiSetBatchLimit( 1 ); static const char* pEnvTransparentFloats = getenv(SAL_TRANSPARENT_FLOATS ); commit 58b46086e64b6cbe288c146b017d5d4de1ce6db0 Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Dec 11 15:58:45 2013 +0100 Remove unused SvXMLExport::mbEnableExperimentalOdfExport. Change-Id: Ib2dbc4af73394c9c35a7f273fd8966b91ac3eb84 diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 7ef8f3f..b80d096 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -149,7 +149,6 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6 sal_uInt16 mnExportFlags; sal_uInt16 mnErrorFlags; -bool mbEnableExperimentalOdfExport; public: @@ -546,7 +545,6 @@ public: // Written OpenDocument file format doesn't fit to the created text document (#i69627#) sal_Bool writeOutlineStyleAsNormalListStyle() const; - bool isExperimentalOdfExportEnabled() const { return mbEnableExperimentalOdfExport; } ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage GetTargetStorage(); diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 68811c1..b92e729 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -408,8 +408,6 @@ void SvXMLExport::_InitCtor() // Determine model type (#i51726#) _DetermineModelType(); -mbEnableExperimentalOdfExport = getenv(ENABLE_EXPERIMENTAL_ODF_EXPORT) != NULL; - // cl: but only if we do export to current oasis format, old openoffice format *must* always be compatible if( (getExportFlags() EXPORT_OASIS) != 0 ) { commit 938657613982d0edecc1aa71e9314cff6a0bb56f Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Dec 11 13:54:05 2013 +0100 Let's have a static variable for getenv(UNO_ENV_LOG). Change-Id: Id382726b86726515a9ae3017c11fad0420136a4c diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 73f880947..6176b23 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -83,7 +83,7 @@ static void getLibEnv(oslModulelib, if (!pEnv-is() pEnvTypeName) { *pSourceEnv_name = OUString::createFromAscii(pEnvTypeName); -const char * pUNO_ENV_LOG = ::getenv( UNO_ENV_LOG ); +static const char * pUNO_ENV_LOG = ::getenv( UNO_ENV_LOG ); if (pUNO_ENV_LOG rtl_str_getLength(pUNO_ENV_LOG) ) { OString implName(OUStringToOString(cImplName, RTL_TEXTENCODING_ASCII_US)); commit acf233e2bb259759c9167a32e17fcf13e1f54f6c Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Dec 11 13:51:48 2013 +0100 cppu: Avoid uno_direct_getEnvironment() indirection. UNO_ENV_SUBST: should not be used. Change-Id: If23b174de792cd69dc79e70dd8f5e8a31badb96d diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index eacaf83..c00fd8e 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_add_exception_objects,cppu,\ cppu/source/uno/cascade_mapping \ cppu/source/uno/data \ cppu/source/uno/EnvStack \ - cppu/source/uno/env_subst \ cppu/source/uno/IdentityMapping \ cppu/source/uno/lbenv \ cppu/source/uno/lbmap \ diff --git a/cppu/source/uno/env_subst.cxx b/cppu/source/uno/env_subst.cxx deleted file mode 100644 index 63ed295..000 --- a/cppu/source/uno/env_subst.cxx +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the
[Libreoffice-commits] core.git: 2 commits - chart2/qa oox/source
chart2/qa/extras/chart2export.cxx | 22 ++ chart2/qa/extras/data/docx/testStockChart.docx |binary oox/source/export/chartexport.cxx |6 -- oox/source/export/shapes.cxx | 25 +++-- 4 files changed, 41 insertions(+), 12 deletions(-) New commits: commit e516f8be79ddc9d845d8141075f7d558c25c1636 Author: Pallavi Jadhav pallavi.jad...@synerzip.com Date: Wed Dec 4 15:03:00 2013 +0530 fdo#72226: Fix for Stock chart Invalid RT Issue : In chart1.xml, c:chart c:plotArea c:stockChart there are four types of series as Open,Low,High and Close. For Open series, c:ser c:idx val=0 / c:order val=0 / an attribute val should be 1 and not 0. i.e. index should start from 1 and not from 0. Implementation : - In ChartExport::exportCandleStickSeries(), Using idx variable, we are writing index value which should be greater than 0. So for idx=0, we are adding value 1 while writing index value. - Added Unit tese case for chart export Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: I4d5ffefbc8fcf62b50c13ca1b3ed80290962fc4e Reviewed-on: https://gerrit.libreoffice.org/6925 Tested-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index fa4d619..77a823a 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -23,10 +23,13 @@ public: void testErrorBarXLSX(); void testTrendline(); +void testStockChart(); + CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(test); CPPUNIT_TEST(testErrorBarXLSX); CPPUNIT_TEST(testTrendline); +CPPUNIT_TEST(testStockChart); CPPUNIT_TEST_SUITE_END(); private: @@ -255,6 +258,25 @@ void Chart2ExportTest::testTrendline() } +void Chart2ExportTest::testStockChart() +{ +/* For attached file Stock_Chart.docx, in chart1.xml, + * c:stockChart, there are four types of series as + * Open,Low,High and Close. + * For Open series, in c:idx val=0 / + * an attribute val of index should start from 1 and not from 0. + * Which was problem area. + */ +load(/chart2/qa/extras/data/docx/, testStockChart.docx); +{ +xmlDocPtr pXmlDoc = parseExport(word/charts/chart1.xml); +if (!pXmlDoc) + return; + assertXPath(pXmlDoc, /c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:idx, val, 1); + assertXPath(pXmlDoc, /c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:order, val, 1); + assertXPath(pXmlDoc, /c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v, Open); +} +} CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/docx/testStockChart.docx b/chart2/qa/extras/data/docx/testStockChart.docx new file mode 100644 index 000..a804e7d Binary files /dev/null and b/chart2/qa/extras/data/docx/testStockChart.docx differ diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 3768cd3..9655f3e 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1626,6 +1626,7 @@ void ChartExport::exportCandleStickSeries( Reference chart2::XChartDocument xNewDoc( getModel(), uno::UNO_QUERY ); const char* sSeries[] = {values-first,values-max,values-min,values-last,0}; + for( sal_Int32 idx = 0; sSeries[idx] != 0 ; idx++ ) { Reference chart2::data::XLabeledDataSequence xLabeledSeq( lcl_getDataSequenceByRole( aSeqCnt, OUString::createFromAscii(sSeries[idx]) ) ); @@ -1639,11 +1640,12 @@ void ChartExport::exportCandleStickSeries( FSEND ); // TODO: idx and order +// idx attribute should start from 1 and not from 0. pFS-singleElement( FSNS( XML_c, XML_idx ), -XML_val, I32S(idx), +XML_val, I32S(idx+1), FSEND ); pFS-singleElement( FSNS( XML_c, XML_order ), -XML_val, I32S(idx), +XML_val, I32S(idx+1), FSEND ); // export label commit 784d3e2b49fb55bfc46723a99fd00d43f31e090a Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 11 17:07:16 2013 +0100 drawingml export: fix EllipseShape for docx Change-Id: Ifc5e6ae2f3161e33f93b1485269f6dc164f74e40 diff --git a/oox/source/export/shapes.cxx
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - icon-themes/hicontrast icon-themes/sifr svx/source
icon-themes/hicontrast/svx/res/symphony/fill_color.png |binary icon-themes/sifr/svx/res/symphony/fill_color.png |binary svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |2 +- 3 files changed, 1 insertion(+), 1 deletion(-) New commits: commit f9f169bd07b2cbaaa9fbe19ec99c07900ee5fbbd Author: Maxim Monastirsky momonas...@gmail.com Date: Wed Dec 11 15:32:17 2013 +0200 fdo#71748 Fix also for hicontrast and sifr themes A follow-up of commit e239f372c6abcd8371d0a666c828bf1c31195dd4. Didn't notice there is fill_color.png also in these themes. Also fixed the ugly yellow color flash of paragraph color picker while initializing the sidebar (introduced by the above commit). This color picker shows the actual color of a paragraph, so there is no reason to set some default color there. Change-Id: I17eed733d1e35ec71c482e3df906523733383e96 Reviewed-on: https://gerrit.libreoffice.org/7036 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/icon-themes/hicontrast/svx/res/symphony/fill_color.png b/icon-themes/hicontrast/svx/res/symphony/fill_color.png index 7cbafa5..20e5081 100644 Binary files a/icon-themes/hicontrast/svx/res/symphony/fill_color.png and b/icon-themes/hicontrast/svx/res/symphony/fill_color.png differ diff --git a/icon-themes/sifr/svx/res/symphony/fill_color.png b/icon-themes/sifr/svx/res/symphony/fill_color.png index 7cbafa5..a53abdd 100644 Binary files a/icon-themes/sifr/svx/res/symphony/fill_color.png and b/icon-themes/sifr/svx/res/symphony/fill_color.png differ diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index dbb63b1..a746570 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -346,7 +346,7 @@ void ParaPropertyPanel::InitToolBoxBGColor() const sal_uInt16 nIdBackColor = mpTBxBackColor-GetItemId(UNO_PARABACKCOLOR); mpTBxBackColor-SetItemImage(nIdBackColor, GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : maImgBackColor); -mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_BACKGROUND_COLOR, nIdBackColor, mpTBxBackColor)); +mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(0, nIdBackColor, mpTBxBackColor)); mpTBxBackColor-SetItemBits( nIdBackColor, mpTBxBackColor-GetItemBits( nIdBackColor ) | TIB_DROPDOWNONLY ); Link aLink = LINK(this, ParaPropertyPanel, ToolBoxBackColorDDHandler); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 86da09357b86da983c07e2c4636110e772515251 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Dec 11 11:24:05 2013 -0600 temporarely disable testStockChart pending integration of needed changes Change-Id: I084cbb9a4330a81212852d963181297b5bef22e4 diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 77a823a..7ae449a 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -29,7 +29,7 @@ public: CPPUNIT_TEST(test); CPPUNIT_TEST(testErrorBarXLSX); CPPUNIT_TEST(testTrendline); -CPPUNIT_TEST(testStockChart); +//CPPUNIT_TEST(testStockChart); disable pending necessary patch from gerrit 6957 CPPUNIT_TEST_SUITE_END(); private: @@ -258,6 +258,7 @@ void Chart2ExportTest::testTrendline() } +#if 0 // disable until gerrit 6957 is merged in some form */ void Chart2ExportTest::testStockChart() { /* For attached file Stock_Chart.docx, in chart1.xml, @@ -277,6 +278,7 @@ void Chart2ExportTest::testStockChart() assertXPath(pXmlDoc, /c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v, Open); } } +#endif CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/graphicfilter/icgm/class5.cxx | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) New commits: commit dd8c33799ecc243f7c3626e8d146e9dbd78b3e09 Author: Julien Nabet serval2...@yahoo.fr Date: Sat Dec 7 19:05:47 2013 +0100 CID#736170, CID#736171, CID#736172 Out-of-Bounds read/write Let's be sure that nMaxcolorIndex 256 Change-Id: I349184ad92c8e7b10a90a32e093972bfaee52467 Reviewed-on: https://gerrit.libreoffice.org/6970 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com Reviewed-on: https://gerrit.libreoffice.org/6971 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx index c0319b7..eb53788 100644 --- a/filter/source/graphicfilter/icgm/class5.cxx +++ b/filter/source/graphicfilter/icgm/class5.cxx @@ -316,17 +316,16 @@ void CGM::ImplDoClass5() if ( nMaxColorIndex 255 ) { mbStatus = sal_False; +break; } -else -{ -if ( pElement-nLatestColorMaximumIndex nMaxColorIndex ) -pElement-nLatestColorMaximumIndex = nMaxColorIndex; +if ( pElement-nLatestColorMaximumIndex nMaxColorIndex ) +pElement-nLatestColorMaximumIndex = nMaxColorIndex; -for ( nIndex = nColorStartIndex; nIndex = nMaxColorIndex; nIndex++ ) -{ -pElement-aLatestColorTable[ nIndex ] = ImplGetBitmapColor( sal_True ); -} +for ( nIndex = nColorStartIndex; nIndex = nMaxColorIndex; nIndex++ ) +{ +pElement-aLatestColorTable[ nIndex ] = ImplGetBitmapColor( sal_True ); } + pElement-nColorMaximumIndex = pElement-nLatestColorMaximumIndex; for ( nIndex = nColorStartIndex; nIndex = nMaxColorIndex; nIndex++ ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/refreshtimerprotector.hxx|3 ++- sc/source/filter/excel/xestream.cxx | 14 ++ sc/source/ui/docshell/docsh.cxx |3 ++- sc/source/ui/inc/docsh.hxx |5 +++-- 4 files changed, 21 insertions(+), 4 deletions(-) New commits: commit da1392934e043bfd12b94dab7b874ddf940f097b Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Dec 11 12:19:44 2013 -0500 Let's use a status indicator while exporting to xlsx. And reduce header dependency on docsh.hxx which a lot of files include directly or indirectly... Change-Id: I2de25380f8b634456e0add940fbb775ac11414cd diff --git a/sc/inc/refreshtimerprotector.hxx b/sc/inc/refreshtimerprotector.hxx index d2169cd..679586d 100644 --- a/sc/inc/refreshtimerprotector.hxx +++ b/sc/inc/refreshtimerprotector.hxx @@ -11,10 +11,11 @@ #define SC_REFRESHTIMERPROTECTOR_HXX #include sal/config.h +#include scdllapi.h class ScRefreshTimerControl; -class ScRefreshTimerProtector +class SC_DLLPUBLIC ScRefreshTimerProtector { ScRefreshTimerControl * const * ppControl; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 2232f2c..af7aa78 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -39,6 +39,8 @@ #include compiler.hxx #include formulacell.hxx #include tokenarray.hxx +#include refreshtimerprotector.hxx +#include globstr.hrc #include ../../ui/inc/docsh.hxx #include ../../ui/inc/viewdata.hxx @@ -53,6 +55,8 @@ #include sfx2/objsh.hxx #include sfx2/app.hxx +#include com/sun/star/task/XStatusIndicator.hpp + #define DEBUG_XL_ENCRYPTION 0 using ::com::sun::star::embed::XStorage; @@ -64,6 +68,7 @@ using ::com::sun::star::uno::XInterface; using ::utl::OStreamWrapper; using ::std::vector; +using namespace com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; @@ -1089,6 +1094,12 @@ bool XclExpXmlStream::exportDocument() throw() { ScDocShell* pShell = getDocShell(); ScDocument* pDoc = pShell-GetDocument(); +ScRefreshTimerProtector aProt(pDoc-GetRefreshTimerControlAddress()); + +uno::Referencetask::XStatusIndicator xStatusIndicator = getStatusIndicator(); + +xStatusIndicator-start(ScGlobal::GetRscString(STR_SAVE_DOC), 100); + // NOTE: Don't use SotStorage or SvStream any more, and never call // SfxMedium::GetOutStream() anywhere in the xlsx export filter code! // Instead, write via XOutputStream instance. @@ -1120,10 +1131,13 @@ bool XclExpXmlStream::exportDocument() throw() // destruct at the end of the block { ExcDocument aDocRoot( aRoot ); +xStatusIndicator-setValue(10); aDocRoot.ReadDoc(); +xStatusIndicator-setValue(40); aDocRoot.WriteXml( *this ); } +xStatusIndicator-end(); mpRoot = NULL; return true; } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 9726cab..ca39e78 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -108,6 +108,7 @@ #include docparam.hxx #include docshimp.hxx #include sizedev.hxx +#include refreshtimerprotector.hxx #include officecfg/Office/Calc.hxx #include comphelper/processfactory.hxx @@ -3038,7 +3039,7 @@ void ScDocShell::UseSheetSaveEntries() ScDocShellModificator::ScDocShellModificator( ScDocShell rDS ) : rDocShell( rDS ), -aProtector( rDS.GetDocument()-GetRefreshTimerControlAddress() ) +mpProtector(new ScRefreshTimerProtector(rDS.GetDocument()-GetRefreshTimerControlAddress())) { ScDocument* pDoc = rDocShell.GetDocument(); bAutoCalcShellDisabled = pDoc-IsAutoCalcShellDisabled(); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 0b157e7..9bff2f0 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -33,15 +33,16 @@ #include appoptio.hxx #include formulaopt.hxx #include shellids.hxx -#include refreshtimerprotector.hxx #include optutil.hxx #include docuno.hxx #include boost/unordered_map.hpp +#include boost/scoped_ptr.hpp #include cppuhelper/implbase1.hxx #include config_telepathy.h +class ScRefreshTimerProtector; class ScEditEngineDefaulter; class SfxStyleSheetBasePool; class SfxStyleSheetHint; @@ -467,7 +468,7 @@ SV_IMPL_REF(ScDocShell) class SC_DLLPUBLIC ScDocShellModificator { ScDocShell rDocShell; -ScRefreshTimerProtector aProtector; +boost::scoped_ptrScRefreshTimerProtector mpProtector; boolbAutoCalcShellDisabled; boolbIdleEnabled; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/ThemeTable.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 7ab65f71c3f986d46914dd1c4c3790ccdb07bb10 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Wed Dec 11 18:41:56 2013 +0100 Fix member initialization to comply with ISO C++ Change-Id: Id7ec3a3fe546bbd68f74c732c9708a61d400e946 diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index 6d623e0..ff39b6b 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -34,12 +34,13 @@ struct ThemeTable_Impl { ThemeTable_Impl() : m_currentThemeFontId(0), +m_supplementalFontId(0), m_currentFontThemeEntry() {} std::mapsal_uInt32, std::mapsal_uInt32, OUString m_themeFontMap; sal_uInt32 m_currentThemeFontId; std::mapsal_uInt32, OUString m_currentFontThemeEntry; OUString m_supplementalFontName; -sal_uInt32 m_supplementalFontId = 0; +sal_uInt32 m_supplementalFontId; OUString m_themeFontLangEastAsia; OUString m_themeFontLangBidi; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Templates for Fax and Letter doesn't work as expected
On Sun, 2013-12-08 at 23:01 +0100, Andreas Mantke wrote: I tried out the fax and letter wizard of LibO 4.1.4, 4.2-beta2 and the master in different options but I don't get a fax with all the personal data inside in the right column. E.g. I missed my name, phone number etc. The wizard could not copy the data from tools-options to the template. It's by far the best to file bugs in bugzilla =) I think this issue was implemented with the new templates in Summer 2012 and persists since then. In my opinion it is an ugly bug that we should fix for 4.1.5 and 4.2 (and later). Then it should be marked a MAB for 4.1. Thanks ! Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Videotutorial for extensions creation
Hi, On Mon, Dec 09, 2013 at 09:15:15AM +0100, Miklos Vajna wrote: - python example http://extensions.libreoffice.org/extension-center/libreoffice-does-print-on-tuesdays Actually, I failed to upload an extension there TBH :/, but you find the extension in the blogpost itself(*): https://skyfromme.wordpress.com/2013/04/01/libreoffice-prints-on-tuesdays-only/ Best, Bjoern With additional copies at: https://wiki.documentfoundation.org/File:Tuesday.oxt https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=tree;f=TuesdayPython;h=4796208d671b09a9a0ddac54352ecd7246af5d56;hb=8302c8e6a059f34afbd5d6302b6f3f6430120a02 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 72606] [EasyHack] Consistently call Unicode Win32 functions, and define UNICODE globally
https://bugs.freedesktop.org/show_bug.cgi?id=72606 Michael Stahl mst...@redhat.com changed: What|Removed |Added Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 72606] New: [EasyHack] Consistently call Unicode Win32 functions, and define UNICODE globally
https://bugs.freedesktop.org/show_bug.cgi?id=72606 Priority: medium Bug ID: 72606 CC: je...@softcatala.org, libreoffice@lists.freedesktop.org, thomas-l...@arnhold.org, t...@iki.fi Assignee: libreoffice-b...@lists.freedesktop.org Summary: [EasyHack] Consistently call Unicode Win32 functions, and define UNICODE globally Severity: normal Classification: Unclassified OS: Windows (All) Reporter: mst...@redhat.com Hardware: Other Status: NEW Version: 4.3.0.0.alpha0+ Master Component: Libreoffice Product: LibreOffice currently there are lots of places where manually macros UNICODE and _UNICODE are defined: http://blogs.msdn.com/b/oldnewthing/archive/2004/02/12/71851.aspx git grep DUNICODE git grep D_UNICODE we should rather define that globally in solenv/gbuild/com_MSC_defs.mk. also there is no point to ever calling the archaic so-called ANSI Win32 functions (end in *A); probably it's best to call the UCS-2 Unicode ones directly (end in *W). corresponding string literals can be written as Lfoo maybe once every function call is directly to a *W function the UNICODE _UNICODE can be removed altogether, but as a first step it's probably best to define that globally. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/ThemeTable.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit a5297c08660a70f5440608dc158235d0720a2225 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Wed Dec 11 19:35:16 2013 +0100 Fix -Werror=reorder Change-Id: Iecfd714834b1d2f24098d55b9b32daa5ca76b1de diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index ff39b6b..5aa0ea0 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -34,8 +34,9 @@ struct ThemeTable_Impl { ThemeTable_Impl() : m_currentThemeFontId(0), -m_supplementalFontId(0), -m_currentFontThemeEntry() {} +m_currentFontThemeEntry(), +m_supplementalFontId(0) +{} std::mapsal_uInt32, std::mapsal_uInt32, OUString m_themeFontMap; sal_uInt32 m_currentThemeFontId; std::mapsal_uInt32, OUString m_currentFontThemeEntry; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: EasyHack
On Wed, Dec 11, 2013 at 11:35 AM, Amul Mehta mht.a...@gmail.com wrote: Hi Norbert, First please keep thing on the list as much as possible... Started to explore the source code with the help of documentation. And since there where many modules , started randomly. after spending some time on the module there was a very less i could really understand. No surprising. this is a big code base with a lot of history, hence oddities.. would you recommend how to begin and which module to begin with ??.. I recommend to be task oriented rather than module oriented.. iow find a task to do... and then try to do it, regardless of which module is impacted... overtime you'll get aquainted with the differents modules (well at leaast some of them).. and how they relate to each other.. otoh one of the message of this thread pointed you to a nice graphic of the big-picture dependency of these 'modules' The next thing i tried was to build the project and was a little more successful here (After a dozen of unsuccessful ones !!). Good.. getting comfortable with the build is a prerequisite to make any progress at all :-) Getting aquainted with git and gerrit is a prerequisite to be able to upstream any patches :-) I also took a glance at the 'easy hacks' , did not really understand what the bug is and how to proceed further.. Well, take a look at https://wiki.documentfoundation.org/Development/Easy_Hacks/lists/by_Required_Skill browse the bug reference there and find one that you think is interesting and that you can do... There is nothing wrong to start with simple cosmetic tasks to get used to the overall process... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: EasyHack
Hi, On Wed, Dec 11, 2013 at 12:46:34PM -0600, Norbert Thiebaud wrote: Getting aquainted with git and gerrit is a prerequisite to be able to upstream any patches :-) Im a fan of gerrit and as soon as you have more than one patch its easier to use as manual patch fumbling, but we also keep the plain patch option as a fallback. So, if someone likes pain, torture, and slow and reluct review, sending a patch to this list is also an option. Shouldnt be the first though, in case that wasnt clear ;) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: EasyHack
On Wed, Dec 11, 2013 at 12:57 PM, bjoern bjoern.michael...@canonical.com wrote: Hi, On Wed, Dec 11, 2013 at 12:46:34PM -0600, Norbert Thiebaud wrote: Getting aquainted with git and gerrit is a prerequisite to be able to upstream any patches :-) Im a fan of gerrit and as soon as you have more than one patch its easier to use as manual patch fumbling, but we also keep the plain patch option as a fallback. So, if someone likes pain, torture, and slow and reluct review, sending a patch to this list is also an option. Shouldnt be the first though, in case that wasnt clear ;) That's ok I guess for an old crusty dev set in his last-century ways... But for a young aspiring developer like Amul, learning git is a 'good thing(tm)', that will serve him well, regardless of LibreOffice :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Andreas Mantke ma...@gmx.de changed: What|Removed |Added CC||ma...@gmx.de Depends on||72604 --- Comment #121 from Andreas Mantke ma...@gmx.de --- Bug 72604 - Fax-Wizard - Personal Data are only partial adopted The wizards are available to start a new fax (etc.) document from scratch. If the personal data are not adopted in the created fax document (and are not in the correct order) the wizard is not useful. This is also a very visible issue, because normal office users will create documents using a wizard. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Templates for Fax and Letter doesn't work as expected
Hello, Am 11.12.2013 18:52, schrieb Michael Meeks: On Sun, 2013-12-08 at 23:01 +0100, Andreas Mantke wrote: I tried out the fax and letter wizard of LibO 4.1.4, 4.2-beta2 and the master in different options but I don't get a fax with all the personal data inside in the right column. E.g. I missed my name, phone number etc. The wizard could not copy the data from tools-options to the template. It's by far the best to file bugs in bugzilla =) already done: https://bugs.freedesktop.org/show_bug.cgi?id=72604 I think this issue was implemented with the new templates in Summer 2012 and persists since then. In my opinion it is an ugly bug that we should fix for 4.1.5 and 4.2 (and later). Then it should be marked a MAB for 4.1. Done. Regards, Andreas -- ## Developer LibreOffice ## Freie Office-Suite für Linux, Mac, Windows ## http://LibreOffice.org ## Support the Document Foundation (http://documentfoundation.org) ## Meine Seite: http://www.amantke.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/CustomTarget_source.mk writerfilter/source
writerfilter/CustomTarget_source.mk |7 writerfilter/source/doctok/resources.xsl | 464 --- writerfilter/source/doctok/resourcesimpl.xsl |2 3 files changed, 1 insertion(+), 472 deletions(-) New commits: commit bbb9f4f74724213d62154bb17876953064cd2d62 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 11 20:51:26 2013 +0100 writerfilter: remove unused resources.xsl Change-Id: Id9bb0ae05395fe635aec1a42e8b3c0995cf81463 diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 01be99b..57b2b57 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -44,7 +44,6 @@ writerfilter_OOXMLNAMESPACES= \ writerfilter_ALL = \ $(writerfilter_GEN_doctok_ResourceIds_hxx) \ $(writerfilter_GEN_doctok_Resources_cxx) \ - $(writerfilter_GEN_doctok_Resources_hxx) \ $(writerfilter_GEN_doctok_QNameToStr_cxx) \ $(writerfilter_GEN_doctok_SprmIds_hxx) \ $(writerfilter_GEN_model_SprmCodeToStr_cxx) \ @@ -65,7 +64,6 @@ writerfilter_ALL = \ writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/generated)/misc/namespaces.txt writerfilter_GEN_doctok_ResourceIds_hxx=$(writerfilter_WORK)/doctok/resourceids.hxx writerfilter_GEN_doctok_Resources_cxx=$(writerfilter_WORK)/resources.cxx -writerfilter_GEN_doctok_Resources_hxx=$(writerfilter_WORK)/doctok/resources.hxx writerfilter_GEN_doctok_QNameToStr_cxx=$(writerfilter_WORK)/doctok/qnametostr.cxx writerfilter_GEN_doctok_SprmIds_hxx=$(writerfilter_WORK)/doctok/sprmids.hxx writerfilter_GEN_model_SprmCodeToStr_cxx=$(writerfilter_WORK)/sprmcodetostr.cxx @@ -90,7 +88,6 @@ writerfilter_SRC_doctok_QNameToStr_xsl=$(writerfilter_SRC)/doctok/qnametostr.xsl writerfilter_SRC_doctok_ResourceIds_xsl=$(writerfilter_SRC)/doctok/resourceids.xsl writerfilter_SRC_doctok_ResourceTools_xsl=$(writerfilter_SRC)/doctok/resourcetools.xsl writerfilter_SRC_doctok_ResourcesImpl_xsl=$(writerfilter_SRC)/doctok/resourcesimpl.xsl -writerfilter_SRC_doctok_Resources_xsl=$(writerfilter_SRC)/doctok/resources.xsl writerfilter_SRC_doctok_SprmCodeToStr_xsl=$(writerfilter_SRC)/doctok/sprmcodetostr.xsl writerfilter_SRC_doctok_SprmIds_xsl=$(writerfilter_SRC)/doctok/sprmids.xsl writerfilter_SRC_model_NamespacePreprocess=$(writerfilter_SRC)/resourcemodel/namespace_preprocess.pl @@ -118,10 +115,6 @@ $(writerfilter_GEN_doctok_Resources_cxx) : $(writerfilter_SRC_doctok_Model) $(wr $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_ResourcesImpl_xsl) $(writerfilter_SRC_doctok_Model)) $@ -$(writerfilter_GEN_doctok_Resources_hxx) : $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_Resources_xsl) | $(writerfilter_WORK)/doctok/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) - $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_Resources_xsl) $(writerfilter_SRC_doctok_Model)) $@ - $(writerfilter_GEN_doctok_SprmIds_hxx) : $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_SprmIds_xsl) | $(writerfilter_WORK)/doctok/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_SprmIds_xsl) $(writerfilter_SRC_doctok_Model)) $@ diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl deleted file mode 100644 index a5cdadc..000 --- a/writerfilter/source/doctok/resources.xsl +++ /dev/null @@ -1,464 +0,0 @@ -!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . --- -xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/refreshtimerprotector.hxx|3 ++- sc/source/filter/excel/xestream.cxx | 14 ++ sc/source/ui/docshell/docsh.cxx |3 ++- sc/source/ui/inc/docsh.hxx |5 +++-- 4 files changed, 21 insertions(+), 4 deletions(-) New commits: commit 3e2dff3a18e52c153b3bebd2fa0f4aee7f3f671b Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Dec 11 12:19:44 2013 -0500 Let's use a status indicator while exporting to xlsx. And reduce header dependency on docsh.hxx which a lot of files include directly or indirectly... Change-Id: I2de25380f8b634456e0add940fbb775ac11414cd (cherry picked from commit da1392934e043bfd12b94dab7b874ddf940f097b) diff --git a/sc/inc/refreshtimerprotector.hxx b/sc/inc/refreshtimerprotector.hxx index d2169cd..679586d 100644 --- a/sc/inc/refreshtimerprotector.hxx +++ b/sc/inc/refreshtimerprotector.hxx @@ -11,10 +11,11 @@ #define SC_REFRESHTIMERPROTECTOR_HXX #include sal/config.h +#include scdllapi.h class ScRefreshTimerControl; -class ScRefreshTimerProtector +class SC_DLLPUBLIC ScRefreshTimerProtector { ScRefreshTimerControl * const * ppControl; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 2232f2c..af7aa78 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -39,6 +39,8 @@ #include compiler.hxx #include formulacell.hxx #include tokenarray.hxx +#include refreshtimerprotector.hxx +#include globstr.hrc #include ../../ui/inc/docsh.hxx #include ../../ui/inc/viewdata.hxx @@ -53,6 +55,8 @@ #include sfx2/objsh.hxx #include sfx2/app.hxx +#include com/sun/star/task/XStatusIndicator.hpp + #define DEBUG_XL_ENCRYPTION 0 using ::com::sun::star::embed::XStorage; @@ -64,6 +68,7 @@ using ::com::sun::star::uno::XInterface; using ::utl::OStreamWrapper; using ::std::vector; +using namespace com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; @@ -1089,6 +1094,12 @@ bool XclExpXmlStream::exportDocument() throw() { ScDocShell* pShell = getDocShell(); ScDocument* pDoc = pShell-GetDocument(); +ScRefreshTimerProtector aProt(pDoc-GetRefreshTimerControlAddress()); + +uno::Referencetask::XStatusIndicator xStatusIndicator = getStatusIndicator(); + +xStatusIndicator-start(ScGlobal::GetRscString(STR_SAVE_DOC), 100); + // NOTE: Don't use SotStorage or SvStream any more, and never call // SfxMedium::GetOutStream() anywhere in the xlsx export filter code! // Instead, write via XOutputStream instance. @@ -1120,10 +1131,13 @@ bool XclExpXmlStream::exportDocument() throw() // destruct at the end of the block { ExcDocument aDocRoot( aRoot ); +xStatusIndicator-setValue(10); aDocRoot.ReadDoc(); +xStatusIndicator-setValue(40); aDocRoot.WriteXml( *this ); } +xStatusIndicator-end(); mpRoot = NULL; return true; } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 0760425..1904f1b 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -108,6 +108,7 @@ #include docshimp.hxx #include sizedev.hxx +#include refreshtimerprotector.hxx #include officecfg/Office/Calc.hxx #include comphelper/processfactory.hxx @@ -3024,7 +3025,7 @@ void ScDocShell::UseSheetSaveEntries() ScDocShellModificator::ScDocShellModificator( ScDocShell rDS ) : rDocShell( rDS ), -aProtector( rDS.GetDocument()-GetRefreshTimerControlAddress() ) +mpProtector(new ScRefreshTimerProtector(rDS.GetDocument()-GetRefreshTimerControlAddress())) { ScDocument* pDoc = rDocShell.GetDocument(); bAutoCalcShellDisabled = pDoc-IsAutoCalcShellDisabled(); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 818a63f..7e10390 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -33,15 +33,16 @@ #include appoptio.hxx #include formulaopt.hxx #include shellids.hxx -#include refreshtimerprotector.hxx #include optutil.hxx #include docuno.hxx #include boost/unordered_map.hpp +#include boost/scoped_ptr.hpp #include cppuhelper/implbase1.hxx #include config_telepathy.h +class ScRefreshTimerProtector; class ScEditEngineDefaulter; class SfxStyleSheetBasePool; class SfxStyleSheetHint; @@ -462,7 +463,7 @@ SV_IMPL_REF(ScDocShell) class SC_DLLPUBLIC ScDocShellModificator { ScDocShell rDocShell; -ScRefreshTimerProtector aProtector; +boost::scoped_ptrScRefreshTimerProtector mpProtector; boolbAutoCalcShellDisabled; boolbIdleEnabled; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Jorendc jore...@libreoffice.org changed: What|Removed |Added Depends on||72614 --- Comment #122 from Jorendc jore...@libreoffice.org --- I nominate Bug 72614 - Impress hangs on creating new style -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: android/experimental chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_import.mk cppuhelper/source dbaccess/CppunitTest_dbaccess_dialog_save.mk dbaccess/Cpp
Repository.mk|1 android/experimental/LibreOffice4Android/native-code.cxx |2 android/experimental/desktop/native-code.cxx |2 chart2/CppunitTest_chart2_export.mk |1 chart2/CppunitTest_chart2_import.mk |1 cppuhelper/source/shlib.cxx |2 dbaccess/CppunitTest_dbaccess_dialog_save.mk |1 dbaccess/CppunitTest_dbaccess_macros_test.mk |1 ios/experimental/LibreOffice/LibreOffice/lo.mm |2 ios/qa/sc/Makefile |4 - ios/qa/sc/filters-test.m |1 ios/shared/ios_sharedlo/cxx/mlo.mm |3 oox/Library_oox.mk |2 postprocess/Rdb_services.mk |1 sax/CppunitTest_sax_parser.mk|2 sax/Library_expwrap.mk | 14 +++- sax/Library_fastsax.mk | 48 --- sax/Module_sax.mk|2 sax/StaticLibrary_sax_shared.mk | 23 --- sax/source/expatwrap/expwrap.component |3 sax/source/expatwrap/sax_expat.cxx | 18 + sax/source/fastparser/fastparser.cxx | 35 -- sax/source/fastparser/fastsax.component | 25 --- sc/CppunitTest_sc_annotationobj.mk |1 sc/CppunitTest_sc_annotationshapeobj.mk |1 sc/CppunitTest_sc_annotationsobj.mk |1 sc/CppunitTest_sc_cellrangeobj.mk|1 sc/CppunitTest_sc_chart_regression_test.mk |1 sc/CppunitTest_sc_databaserangeobj.mk|1 sc/CppunitTest_sc_datapilotfieldobj.mk |1 sc/CppunitTest_sc_datapilottableobj.mk |1 sc/CppunitTest_sc_editfieldobj_cell.mk |1 sc/CppunitTest_sc_editfieldobj_header.mk |1 sc/CppunitTest_sc_filters_test.mk|1 sc/CppunitTest_sc_macros_test.mk |1 sc/CppunitTest_sc_modelobj.mk|1 sc/CppunitTest_sc_namedrangeobj.mk |1 sc/CppunitTest_sc_namedrangesobj.mk |1 sc/CppunitTest_sc_opencl_test.mk |1 sc/CppunitTest_sc_outlineobj.mk |1 sc/CppunitTest_sc_rangelst_test.mk |1 sc/CppunitTest_sc_subsequent_export_test.mk |1 sc/CppunitTest_sc_subsequent_filters_test.mk |1 sc/CppunitTest_sc_tableautoformatfield.mk|1 sc/CppunitTest_sc_tablesheetobj.mk |1 sc/CppunitTest_sc_tablesheetsobj.mk |1 sd/CppunitTest_sd_filters_test.mk|1 sd/CppunitTest_sd_import_tests.mk|1 sw/CppunitTest_sw_filters_test.mk|1 sw/CppunitTest_sw_htmlexport.mk |1 sw/CppunitTest_sw_layout_test.mk |1 sw/CppunitTest_sw_macros_test.mk |1 sw/CppunitTest_sw_odfexport.mk |1 sw/CppunitTest_sw_ooxmlexport.mk |1 sw/CppunitTest_sw_ooxmlimport.mk |1 55 files changed, 34 insertions(+), 192 deletions(-) New commits: commit eebc1e9a8a5c7fd04b795c62791a70eed65995e4 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Wed Dec 11 12:01:21 2013 -0200 fdo#60698: Merge fastsax and sax_shared into expwrap Change-Id: I6f8c6827c00db50184a46f39968f882b944d18d4 Reviewed-on: https://gerrit.libreoffice.org/6967 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: LibreOffice gerrit bot ger...@libreoffice.org diff --git a/Repository.mk b/Repository.mk index 5405d69..d4a103c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -253,7 +253,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ evtatt \ exp \ expwrap \ - fastsax \ flat \ file \ filterconfig \ diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx index 00fec00..9e65d8d 100644 --- a/android/experimental/LibreOffice4Android/native-code.cxx +++ b/android/experimental/LibreOffice4Android/native-code.cxx @@ -22,7 +22,6 @@ extern C extern void * emboleobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * evtatt_component_getFactory( const char *
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 --- Comment #20 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=eebc1e9a8a5c7fd04b795c62791a70eed65995e4 fdo#60698: Merge fastsax and sax_shared into expwrap The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xestream.cxx | 12 1 file changed, 8 insertions(+), 4 deletions(-) New commits: commit defc4faef618d4273ee5056359f4b8e5eed24a7c Author: Stephan Bergmann sberg...@redhat.com Date: Wed Dec 11 21:50:26 2013 +0100 getStatusIndicator can apparently return null ...at least in CppunitTests Change-Id: I75f05581db5423dc54ea7810a8cd2bd0f9c0c3f0 diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index af7aa78..795f86ba 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1098,7 +1098,8 @@ bool XclExpXmlStream::exportDocument() throw() uno::Referencetask::XStatusIndicator xStatusIndicator = getStatusIndicator(); -xStatusIndicator-start(ScGlobal::GetRscString(STR_SAVE_DOC), 100); +if (xStatusIndicator.is()) +xStatusIndicator-start(ScGlobal::GetRscString(STR_SAVE_DOC), 100); // NOTE: Don't use SotStorage or SvStream any more, and never call // SfxMedium::GetOutStream() anywhere in the xlsx export filter code! @@ -1131,13 +1132,16 @@ bool XclExpXmlStream::exportDocument() throw() // destruct at the end of the block { ExcDocument aDocRoot( aRoot ); -xStatusIndicator-setValue(10); +if (xStatusIndicator.is()) +xStatusIndicator-setValue(10); aDocRoot.ReadDoc(); -xStatusIndicator-setValue(40); +if (xStatusIndicator.is()) +xStatusIndicator-setValue(40); aDocRoot.WriteXml( *this ); } -xStatusIndicator-end(); +if (xStatusIndicator.is()) +xStatusIndicator-end(); mpRoot = NULL; return true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: astyle.options
astyle.options |1 + 1 file changed, 1 insertion(+) New commits: commit f48d89167a57971fed2bbf55fecf06626ce8772d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Dec 11 09:51:31 2013 +0100 Allow equal identing of functions diff --git a/astyle.options b/astyle.options index 9d46215..806e3e7 100644 --- a/astyle.options +++ b/astyle.options @@ -5,6 +5,7 @@ align-pointer=name break-closing-brackets pad-header unpad-paren +max-instatement-indent=120 # processing options recursive ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: astyle.options
astyle.options |1 + 1 file changed, 1 insertion(+) New commits: commit 98177d97e4c4f5f281cdc7bd2005de046333cddd Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Dec 11 09:51:31 2013 +0100 Allow equal identing of functions diff --git a/astyle.options b/astyle.options index 9d46215..806e3e7 100644 --- a/astyle.options +++ b/astyle.options @@ -5,6 +5,7 @@ align-pointer=name break-closing-brackets pad-header unpad-paren +max-instatement-indent=120 # processing options recursive ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: astyle.options
astyle.options |1 + 1 file changed, 1 insertion(+) New commits: commit 8cb37e2404b3fe621af0ab5f36bbb2754d30def0 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Dec 11 09:51:31 2013 +0100 Allow equal identing of functions diff --git a/astyle.options b/astyle.options index 9d46215..806e3e7 100644 --- a/astyle.options +++ b/astyle.options @@ -5,6 +5,7 @@ align-pointer=name break-closing-brackets pad-header unpad-paren +max-instatement-indent=120 # processing options recursive ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRContentCollector.cpp |4 ++-- src/lib/CDRParser.cpp |8 src/lib/CDRStylesCollector.cpp |2 +- 3 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 6d30f036332c31b3bcc1a4e54d831ca63b6caa5d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Dec 11 22:07:53 2013 +0100 Re-astyle Change-Id: Ic84f176d190362364a3f6d13a811df3447fa32e6 diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp index 5884f51..2979a21 100644 --- a/src/lib/CDRContentCollector.cpp +++ b/src/lib/CDRContentCollector.cpp @@ -591,8 +591,8 @@ void libcdr::CDRContentCollector::collectFillStyle(unsigned short fillType, cons } void libcdr::CDRContentCollector::collectLineStyle(unsigned short lineType, unsigned short capsType, unsigned short joinType, double lineWidth, -double stretch, double angle, const CDRColor color, const std::vectorunsigned dashArray, -const CDRPath startMarker, const CDRPath endMarker) + double stretch, double angle, const CDRColor color, const std::vectorunsigned dashArray, + const CDRPath startMarker, const CDRPath endMarker) { m_currentLineStyle = CDRLineStyle(lineType, capsType, joinType, lineWidth, stretch, angle, color, dashArray, startMarker, endMarker); } diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp index e3cbbb9..c204ad1 100644 --- a/src/lib/CDRParser.cpp +++ b/src/lib/CDRParser.cpp @@ -384,9 +384,9 @@ bool libcdr::CDRParser::parseWaldo(librevenge::RVNGInputStream *input) } bool libcdr::CDRParser::gatherWaldoInformation(librevenge::RVNGInputStream *input, std::vectorWaldoRecordInfo records, std::mapunsigned, WaldoRecordInfo records2, -std::mapunsigned, WaldoRecordInfo records3, std::mapunsigned, WaldoRecordInfo records4, -std::mapunsigned, WaldoRecordInfo records6, std::mapunsigned, WaldoRecordInfo records7, -std::mapunsigned, WaldoRecordInfo records8, std::mapunsigned, WaldoRecordInfo recordsOther) + std::mapunsigned, WaldoRecordInfo records3, std::mapunsigned, WaldoRecordInfo records4, + std::mapunsigned, WaldoRecordInfo records6, std::mapunsigned, WaldoRecordInfo records7, + std::mapunsigned, WaldoRecordInfo records8, std::mapunsigned, WaldoRecordInfo recordsOther) { try { @@ -435,7 +435,7 @@ bool libcdr::CDRParser::gatherWaldoInformation(librevenge::RVNGInputStream *inpu bool libcdr::CDRParser::parseWaldoStructure(librevenge::RVNGInputStream *input, std::stackWaldoRecordType1 waldoStack, -const std::mapunsigned, WaldoRecordType1 records1, std::mapunsigned, WaldoRecordInfo records2) +const std::mapunsigned, WaldoRecordType1 records1, std::mapunsigned, WaldoRecordInfo records2) { while (!waldoStack.empty()) { diff --git a/src/lib/CDRStylesCollector.cpp b/src/lib/CDRStylesCollector.cpp index 4febb01..d1f60b8 100644 --- a/src/lib/CDRStylesCollector.cpp +++ b/src/lib/CDRStylesCollector.cpp @@ -229,7 +229,7 @@ void libcdr::CDRStylesCollector::collectPaletteEntry(unsigned colorId, unsigned } void libcdr::CDRStylesCollector::collectText(unsigned textId, unsigned styleId, const std::vectorunsigned char data, -const std::vectorunsigned char charDescriptions, const std::mapunsigned, CDRCharacterStyle styleOverrides) + const std::vectorunsigned char charDescriptions, const std::mapunsigned, CDRCharacterStyle styleOverrides) { if (data.empty() || charDescriptions.empty()) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBCollector.cpp| 28 - src/lib/MSPUBParser.cpp | 46 +- src/lib/MSPUBParser.h |2 - src/lib/MSPUBParser2k.cpp | 16 +++--- src/lib/MSPUBParser97.cpp |2 - src/lib/PolygonUtils.cpp | 32 ++--- src/lib/ShapeGroupElement.cpp |2 - 7 files changed, 64 insertions(+), 64 deletions(-) New commits: commit d452d5853bd3f2c94f9f796d4f2e59d211dbbfee Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Dec 11 22:07:55 2013 +0100 Re-astyle Change-Id: I07970ababe907fff2595f605abebb91fbd10db85 diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp index fa28b0e..4636a16 100644 --- a/src/lib/MSPUBCollector.cpp +++ b/src/lib/MSPUBCollector.cpp @@ -130,55 +130,55 @@ librevenge::RVNGBinaryData libmspub::MSPUBCollector::addEOTFont(const libreveng } void libmspub::MSPUBCollector::setShapePictureRecolor(unsigned seqNum, -const ColorReference recolor) + const ColorReference recolor) { m_shapeInfosBySeqNum[seqNum].m_pictureRecolor = recolor; } void libmspub::MSPUBCollector::setShapePictureBrightness(unsigned seqNum, -int brightness) + int brightness) { m_shapeInfosBySeqNum[seqNum].m_pictureBrightness = brightness; } void libmspub::MSPUBCollector::setShapePictureContrast(unsigned seqNum, -int contrast) + int contrast) { m_shapeInfosBySeqNum[seqNum].m_pictureContrast = contrast; } void libmspub::MSPUBCollector::setShapeBeginArrow(unsigned seqNum, -const Arrow arrow) + const Arrow arrow) { m_shapeInfosBySeqNum[seqNum].m_beginArrow = arrow; } void libmspub::MSPUBCollector::setShapeVerticalTextAlign(unsigned seqNum, -VerticalAlign va) + VerticalAlign va) { m_shapeInfosBySeqNum[seqNum].m_verticalAlign = va; } void libmspub::MSPUBCollector::setShapeEndArrow(unsigned seqNum, -const Arrow arrow) +const Arrow arrow) { m_shapeInfosBySeqNum[seqNum].m_endArrow = arrow; } void libmspub::MSPUBCollector::setShapeTableInfo(unsigned seqNum, -const TableInfo ti) + const TableInfo ti) { m_shapeInfosBySeqNum[seqNum].m_tableInfo = ti; } void libmspub::MSPUBCollector::setShapeNumColumns(unsigned seqNum, -unsigned numColumns) + unsigned numColumns) { m_shapeInfosBySeqNum[seqNum].m_numColumns = numColumns; } void libmspub::MSPUBCollector::setShapeColumnSpacing(unsigned seqNum, -unsigned spacing) + unsigned spacing) { m_shapeInfosBySeqNum[seqNum].m_columnSpacing = spacing; } @@ -309,7 +309,7 @@ void libmspub::MSPUBCollector::setShapeBorderImageId(unsigned seqNum, unsigned i } void libmspub::MSPUBCollector::setShapeCustomPath(unsigned seqNum, -const DynamicCustomShape shape) + const DynamicCustomShape shape) { m_shapeInfosBySeqNum[seqNum].m_customShape = shape; } @@ -1004,14 +1004,14 @@ csd_fail: } void libmspub::MSPUBCollector::setShapeLineBackColor(unsigned shapeSeqNum, -ColorReference backColor) + ColorReference backColor) { m_shapeInfosBySeqNum[shapeSeqNum].m_lineBackColor = backColor; } void libmspub::MSPUBCollector::writeImage(double x, double y, -double height, double width, ImgType type, const librevenge::RVNGBinaryData blob, -boost::optionalColor oneBitColor) const + double height, double width, ImgType type, const librevenge::RVNGBinaryData blob, + boost::optionalColor oneBitColor) const { librevenge::RVNGPropertyList props; if (!!oneBitColor) @@ -1600,7 +1600,7 @@ bool libmspub::MSPUBCollector::addImage(unsigned index, ImgType type, librevenge } librevenge::RVNGBinaryData *libmspub::MSPUBCollector::addBorderImage(ImgType type, -unsigned borderArtIndex) + unsigned borderArtIndex) { while (borderArtIndex = m_borderImages.size()) { diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp index 5a3ed8a..e28708b 100644 --- a/src/lib/MSPUBParser.cpp +++ b/src/lib/MSPUBParser.cpp @@ -69,7 +69,7 @@ libmspub::MSPUBParser::~MSPUBParser() } bool libmspub::MSPUBParser::lineExistsByFlagPointer(unsigned *flags, -unsigned *geomFlags) +unsigned *geomFlags) { return flags !(((*flags) FLAG_USE_LINE) !((*flags)
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/types/generic_Text.xcu |2 +- filter/source/textfilterdetect/filterdetect.cxx |2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 511a59ef2c1b580a4391fa6e5d95cc6826420d65 Author: Maxim Monastirsky momonas...@gmail.com Date: Wed Dec 11 20:25:57 2013 +0200 Open .tab files with Calc .tab extension is a known extension for tab-separated values according to Wikipedia. Also add .tsv .tab files to the list of known text files, so XML detection code won't run on it, and won't output errors to console. Change-Id: Ifb8edc40900cb4669264e1e989c01efd61ff24bf Reviewed-on: https://gerrit.libreoffice.org/7038 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/filter/source/config/fragments/types/generic_Text.xcu b/filter/source/config/fragments/types/generic_Text.xcu index e0dc31d..45df03f 100644 --- a/filter/source/config/fragments/types/generic_Text.xcu +++ b/filter/source/config/fragments/types/generic_Text.xcu @@ -18,7 +18,7 @@ node oor:name=generic_Text oor:op=replace prop oor:name=DetectServicevaluecom.sun.star.comp.filters.PlainTextFilterDetect/value/prop prop oor:name=URLPattern/ -prop oor:name=Extensionsvaluecsv txt/value/prop +prop oor:name=Extensionsvaluecsv tsv tab txt/value/prop prop oor:name=MediaTypevaluetext/plain/value/prop prop oor:name=Preferredvaluefalse/value/prop prop oor:name=UIName diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index 360d8d4..deaeecd8 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -89,6 +89,8 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequencebeans::PropertyVal setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); else if (aExt == tsv) setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); +else if (aExt == tab) +setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); else if (aExt == xls) setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); else if (aExt == txt) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/config/fragments/types/generic_Text.xcu |2 +- filter/source/textfilterdetect/filterdetect.cxx |2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 86c7b2559eb1390fb72c97f8b54e41b6fdee0d7c Author: Maxim Monastirsky momonas...@gmail.com Date: Wed Dec 11 20:25:57 2013 +0200 Open .tab files with Calc .tab extension is a known extension for tab-separated values according to Wikipedia. Also add .tsv .tab files to the list of known text files, so XML detection code won't run on it, and won't output errors to console. Change-Id: Ifb8edc40900cb4669264e1e989c01efd61ff24bf Reviewed-on: https://gerrit.libreoffice.org/7039 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/filter/source/config/fragments/types/generic_Text.xcu b/filter/source/config/fragments/types/generic_Text.xcu index e0dc31d..45df03f 100644 --- a/filter/source/config/fragments/types/generic_Text.xcu +++ b/filter/source/config/fragments/types/generic_Text.xcu @@ -18,7 +18,7 @@ node oor:name=generic_Text oor:op=replace prop oor:name=DetectServicevaluecom.sun.star.comp.filters.PlainTextFilterDetect/value/prop prop oor:name=URLPattern/ -prop oor:name=Extensionsvaluecsv txt/value/prop +prop oor:name=Extensionsvaluecsv tsv tab txt/value/prop prop oor:name=MediaTypevaluetext/plain/value/prop prop oor:name=Preferredvaluefalse/value/prop prop oor:name=UIName diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index 360d8d4..deaeecd8 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -89,6 +89,8 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequencebeans::PropertyVal setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); else if (aExt == tsv) setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); +else if (aExt == tab) +setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); else if (aExt == xls) setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); else if (aExt == txt) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
4.2 BugHunting Session + QA Meeting Minutes
Hi everyone, Just a quick thank-you to everyone who participated in the 4.2 BugHunting Session this past weekend. I saw a few new faces in the QA IRC channel, and I answered a slew of questions about LibreOffice on the reddit posts announcing the event. We'll have a little after-action discussion at the next QA Meeting talking about what went well for us during the 4.2 BugHunting Session and what we might do differently for our next community event. Speaking of...it looks like we were so busy last week that I forgot to spam everyone with the QA Meeting Minutes :-) Here are the notes from our last meeting: https://wiki.documentfoundation.org/QA/Meetings/2013/December_02 And here is the agenda for our upcoming meeting: https://wiki.documentfoundation.org/QA/Meetings/2013/December_16 We've got a number of great things either completed or in the works, including - Big updates to the BSA - Beta-testing the Feedback site - Buildbot improvements - New bibisect repo(s) ...and more! I hope to see all of you at the Dec 16th meeting! (see wiki page for the minutiae) Cheers, --R ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: locking foo ...
On 11/12/13 16:33, Michael Meeks wrote: Hi Michael, On Wed, 2013-12-11 at 15:54 +0100, Michael Stahl wrote: guess i should RTFM more - actually PostMessage is asynchronous, and SendMessage synchronous - so hopefully the deadlock can actually be avoided via PostMessage. I suspect PostMessage is only async. up to a point - the queue is only so large =) then again, if it discards after that I imagine we got our point across. msdn says it's got room for 1 messages ... and possibly more if you edit a registry key :) what it does is call ~WinSalFrame which does things like remove this from a list of WinSalFrames stored in some SalData thing. if that could be moved to a SalFrame::Dispose() method to be called with SolarMutex locked, and the Win32 thread-affine stuff (DestroyWindow etc.) done from PostMessage we could be getting somewhere... I guess we could queue up some main-thread tasks to do at least around freeing resources when the main thread comes back something like an RCU =) but that of course only handles frame destruction - there are a good number of other bits that need a round-trip to the GUI thread that created those handles. ... but alas now i see it won't help much - when creating a window there is the same problem with WinSalFrame::CreateFrame using SendMessage with SAL_MSG_CREATEFRAME (to get the Win32 window created on the main thread), and in that case it's of course hopeless to do anything asynchronously. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] HiDPI fixes for squiggly underlines
I wanted to follow up with the underline issue clipping code below and send a new patch. I have looked again at the code and did more testing. I started by commenting out the check again and was able to see problems so I can say that code is sometimes still important. But it doesn't appear to need a fix for the yStart++ statement. I didn't increment the nEndY because the value is currently unused later in the function ;-) The maMetric.mnWUnderlineSize value is itself a calculated value that tries to be about 1/2 the descent, and so not entirely to be trusted on how much space is actually available. Between that logic, and the logic to shrink the wave line at small descents, it appears fine. At the very least this bug will only show up on HiDPI computers so that decreases the risk. Respecting that clipping boundary by setting nStartAddditional = 1 often makes the spelling underlines only 4 pixels tall at normal zooms with 12 point text on my screen. As I say in the comment, the check should be using the full descent which gives it more space, but that diff is bigger. In any case, in this new version I have put in a variable that handles that issue if someone runs into problems. I'm happy to look at bugs but in here I've got a fix ready to go. I could consider to fix properly for a future version, but for now small fixes are best. Finding the relevant code is often harder than making the fix. It is like digging in the desert. Opengrok is invaluable. I can fix about 2 places per session. Yesterday I wrote the code to fix the treeelistview + / - controls only to eventually find out it was a native one that doesn't seem to allow being drawn bigger! So I gave up on that issue. If the fix isn't relevant to Linux, then screw it ;-) Hopefully it is native on all platforms and the internal bitmaps, etc. can be removed. -Keith diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index f3f5a77..c6de53f 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -5299,11 +5299,28 @@ void OutputDevice::DrawWaveLine( const Point rStartPos, const Point rEndPos, } long nWaveHeight; +long nStartAdditional = 0; + if ( nStyle == WAVE_NORMAL ) { nWaveHeight = 3; nStartY++; nEndY++; + +if (1) //hidpi +{ +nWaveHeight = 5; +nStartY++; //Shift down an additional pixel for hidpi screens. + //TODO: Probably should be done above, before the rotation happens + +//Shifting down an additional pixel could cause problems because the #109280# code below +//doesn't know. However, the value itself is about half the descent and so we do have more +//space than we think. +//Furthermore, when I did enable nStartAdditional = 1, then the lines LibreOffice +//drew were very frequently just 4 pixels at normal zooms and don't look as good. If that pixel causes +//repaint problems, set this value to 1 and consider to revisit the below check to do something +//based on descent which is a better measure of space available. Why LO isn't already doing that is beyond me. +nStartAdditional = 0; //Set to 1 if HiDPI redraw problems. +} } else if( nStyle == WAVE_SMALL ) { @@ -5316,11 +5333,11 @@ void OutputDevice::DrawWaveLine( const Point rStartPos, const Point rEndPos, // #109280# make sure the waveline does not exceed the descent to avoid paint problems ImplFontEntry* pFontEntry = mpFontEntry; - if( nWaveHeight pFontEntry-maMetric.mnWUnderlineSize ) - nWaveHeight = pFontEntry-maMetric.mnWUnderlineSize; + if( nWaveHeight + nStartAdditional pFontEntry-maMetric.mnWUnderlineSize ) + nWaveHeight = pFontEntry-maMetric.mnWUnderlineSize - nStartAdditional; ImplDrawWaveLine( nStartX, nStartY, 0, 0, - nEndX-nStartX, nWaveHeight, 1, + nEndX-nStartX, nWaveHeight, 2, nOrientation, GetLineColor() ); if( mpAlphaVDev ) mpAlphaVDev-DrawWaveLine( rStartPos, rEndPos, nStyle ); ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/ctlayout.cxx | 33 + 1 file changed, 33 insertions(+) New commits: commit b200f8d73c7ae1561f410ed7857d0c4f7642d051 Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 12 00:33:38 2013 +0200 Fix the iOS coloured text problem The eventual text colour is not known yet when LayoutText() is called. So we need to re-do the layout and justification in DrawText() in case we have a text colour. For some reason this is needed only on iOS. On OS X, the original code manages to display coloured text correctly. But then, on iOS a virtual device is used, and who knows what other strange things going on. Some of the scary warnings printed make you a tad unsure everything is working correcly... (Like SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), this should never be needed (!)) Change-Id: Ide99c163dea0f758a373c8dab9c54681ff57f624 diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx index 56d8696..b1ce5fb 100644 --- a/vcl/quartz/ctlayout.cxx +++ b/vcl/quartz/ctlayout.cxx @@ -64,6 +64,8 @@ private: // mutable members since these details are all lazy initialized mutable double mfCachedWidth; // cached value of resulting typographical width +mutable float mfAdjustedLineLength; + // x-offset relative to layout origin // currently only used in RTL-layouts mutable double mfBaseAdv; @@ -75,6 +77,7 @@ CTLayout::CTLayout( const CoreTextStyle* pTextStyle ) , mpCTLine( NULL ) , mnCharCount( 0 ) , mfCachedWidth( -1 ) +, mfAdjustedLineLength( 0 ) , mfBaseAdv( 0 ) { } @@ -159,6 +162,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs rArgs ) CFRelease( mpCTLine ); mpCTLine = pNewCTLine; mfCachedWidth = nPixelWidth; +mfAdjustedLineLength = nPixelWidth - fTrailingSpace; } // When drawing right aligned text, rounding errors in the position returned by @@ -221,7 +225,36 @@ void CTLayout::DrawText( SalGraphics rGraphics ) const } CGContextSetTextPosition( rAquaGraphics.mrContext, aTextPos.x, aTextPos.y ); +#ifdef MACOSX +// For some reason on OS X the problem with text colour being out of sync +// does not seem to occur. CTLineDraw( mpCTLine, rAquaGraphics.mrContext ); +#else +if( CFDictionaryGetValue( mpTextStyle-GetStyleDict(), kCTFontAttributeName) ) +{ +// We did likely not know the correct intended colour of the +// text in LayoutText(), so have to redo layout and justify. +CFStringRef aCFText = CFAttributedStringGetString( mpAttrString ); +CFAttributedStringRef pAttrString = CFAttributedStringCreate( NULL, aCFText, mpTextStyle-GetStyleDict() ); +CTLineRef pCTLine = CTLineCreateWithAttributedString( pAttrString ); +CFRelease( pAttrString ); +if( mfAdjustedLineLength 0 ) +{ +CTLineRef pNewCTLine = CTLineCreateJustifiedLine( pCTLine, 1.0, mfAdjustedLineLength ); +CFRelease( pCTLine ); +pCTLine = pNewCTLine; +} +CTLineDraw( pCTLine, rAquaGraphics.mrContext ); +CFRelease( pCTLine ); +} +else +{ +// FIXME: can the colour be wrong also the other way around: +// some leftover wrong colour was used in LayoutText(), but +// then here the style does not actually contain any colour? +CTLineDraw( mpCTLine, rAquaGraphics.mrContext ); +} +#endif #ifndef IOS // request an update of the changed window area if( rAquaGraphics.IsWindowGraphics() ) ___ 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/Accessibility/AccessibleSpreadsheet.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 77e7301aebe56b24562865efdebdbf66521942d3 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 12 00:29:42 2013 +0100 Keep maActiveCell, mpAccCell in sync Otherwise ScAccessibleSpreadsheet::GetAccessibleCellAt could return wrong results and JunitTest_sc_unoapi would fail at least on Mac OS X. Change-Id: I65e9231920d13393a6991db318d330ee42a985d4 diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 5a525d0..6aa263b 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -551,7 +551,9 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster rBC, const SfxHint rHint } else { -xChild = getAccessibleCellAt(aNewCell.Row(),aNewCell.Col()); +mpAccCell = GetAccessibleCellAt(aNewCell.Row(),aNewCell.Col()); +xChild = mpAccCell; +mpAccCell-Init(); maActiveCell = aNewCell; aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/ucalc.cxx| 38 ++ sc/qa/unit/ucalc.hxx|4 +++- sc/source/core/data/column3.cxx |2 +- 3 files changed, 42 insertions(+), 2 deletions(-) New commits: commit 4f94e6c20b2fee11429d7cbaef6b6fd1880317b2 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Dec 11 18:37:42 2013 -0500 Fix paste as link, and a test case to catch it in the future. Change-Id: I55fd3fabb7594ee2c635cc0b02dbf506bd5ab3df diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index cc235cb..1ba3db1 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -3171,6 +3171,44 @@ void Test::testCopyPaste() m_pDoc-DeleteTab(0); } +void Test::testCopyPasteAsLink() +{ +sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // Turn on auto calc. + +m_pDoc-InsertTab(0, Sheet1); +m_pDoc-InsertTab(1, Sheet2); + +m_pDoc-SetValue(ScAddress(0,0,0), 1); // A1 +m_pDoc-SetValue(ScAddress(0,1,0), 2); // A2 +m_pDoc-SetValue(ScAddress(0,2,0), 3); // A3 + +ScRange aRange(0,0,0,0,2,0); // Copy A1:A3 to clip. +ScDocument aClipDoc(SCDOCMODE_CLIP); +copyToClip(m_pDoc, aRange, aClipDoc); + +aRange = ScRange(1,1,1,1,3,1); // Paste to B2:B4 on Sheet2. +ScMarkData aMark; +aMark.SetMarkArea(aRange); +// Paste range as link. +m_pDoc-CopyFromClip(aRange, aMark, IDF_CONTENTS, NULL, aClipDoc, true, true); + +// Check pasted content to make sure they reference the correct cells. +ScFormulaCell* pFC = m_pDoc-GetFormulaCell(ScAddress(1,1,1)); +CPPUNIT_ASSERT_MESSAGE(This should be a formula cell., pFC); +CPPUNIT_ASSERT_EQUAL(1.0, pFC-GetValue()); + +pFC = m_pDoc-GetFormulaCell(ScAddress(1,2,1)); +CPPUNIT_ASSERT_MESSAGE(This should be a formula cell., pFC); +CPPUNIT_ASSERT_EQUAL(2.0, pFC-GetValue()); + +pFC = m_pDoc-GetFormulaCell(ScAddress(1,3,1)); +CPPUNIT_ASSERT_MESSAGE(This should be a formula cell., pFC); +CPPUNIT_ASSERT_EQUAL(3.0, pFC-GetValue()); + +m_pDoc-DeleteTab(1); +m_pDoc-DeleteTab(0); +} + void Test::testCopyPasteTranspose() { diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index f87047a..2af0e65 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/ucalc.hxx @@ -220,6 +220,7 @@ public: void testDataArea(); void testAutofilter(); void testCopyPaste(); +void testCopyPasteAsLink(); void testCopyPasteTranspose(); void testMoveBlock(); void testCopyPasteRelativeFormula(); @@ -362,8 +363,9 @@ public: CPPUNIT_TEST(testToggleRefFlag); CPPUNIT_TEST(testAutofilter); CPPUNIT_TEST(testCopyPaste); -CPPUNIT_TEST(testMoveBlock); +CPPUNIT_TEST(testCopyPasteAsLink); CPPUNIT_TEST(testCopyPasteTranspose); +CPPUNIT_TEST(testMoveBlock); CPPUNIT_TEST(testCopyPasteRelativeFormula); CPPUNIT_TEST(testMergedCells); CPPUNIT_TEST(testUpdateReference); diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 7a7f0a7..921fd43 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -690,7 +690,7 @@ class CopyCellsFromClipHandler void insertRefCell(SCROW nSrcRow, SCROW nDestRow) { -ScAddress aSrcPos(mnCol, nSrcRow, mnTab); +ScAddress aSrcPos(mnSrcCol, nSrcRow, mnSrcTab); ScAddress aDestPos(mnCol, nDestRow, mnTab); ScSingleRefData aRef; aRef.InitAddress(aSrcPos); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/qa sc/source
sc/qa/unit/ucalc.cxx| 38 ++ sc/qa/unit/ucalc.hxx|4 +++- sc/source/core/data/column3.cxx |2 +- 3 files changed, 42 insertions(+), 2 deletions(-) New commits: commit 01e4c7a68289a0c820ab08c1d447f1779e8adde7 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Dec 11 18:37:42 2013 -0500 Fix paste as link, and a test case to catch it in the future. Change-Id: I55fd3fabb7594ee2c635cc0b02dbf506bd5ab3df (cherry picked from commit 4f94e6c20b2fee11429d7cbaef6b6fd1880317b2) diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 681283c..107825b 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -3167,6 +3167,44 @@ void Test::testCopyPaste() m_pDoc-DeleteTab(0); } +void Test::testCopyPasteAsLink() +{ +sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // Turn on auto calc. + +m_pDoc-InsertTab(0, Sheet1); +m_pDoc-InsertTab(1, Sheet2); + +m_pDoc-SetValue(ScAddress(0,0,0), 1); // A1 +m_pDoc-SetValue(ScAddress(0,1,0), 2); // A2 +m_pDoc-SetValue(ScAddress(0,2,0), 3); // A3 + +ScRange aRange(0,0,0,0,2,0); // Copy A1:A3 to clip. +ScDocument aClipDoc(SCDOCMODE_CLIP); +copyToClip(m_pDoc, aRange, aClipDoc); + +aRange = ScRange(1,1,1,1,3,1); // Paste to B2:B4 on Sheet2. +ScMarkData aMark; +aMark.SetMarkArea(aRange); +// Paste range as link. +m_pDoc-CopyFromClip(aRange, aMark, IDF_CONTENTS, NULL, aClipDoc, true, true); + +// Check pasted content to make sure they reference the correct cells. +ScFormulaCell* pFC = m_pDoc-GetFormulaCell(ScAddress(1,1,1)); +CPPUNIT_ASSERT_MESSAGE(This should be a formula cell., pFC); +CPPUNIT_ASSERT_EQUAL(1.0, pFC-GetValue()); + +pFC = m_pDoc-GetFormulaCell(ScAddress(1,2,1)); +CPPUNIT_ASSERT_MESSAGE(This should be a formula cell., pFC); +CPPUNIT_ASSERT_EQUAL(2.0, pFC-GetValue()); + +pFC = m_pDoc-GetFormulaCell(ScAddress(1,3,1)); +CPPUNIT_ASSERT_MESSAGE(This should be a formula cell., pFC); +CPPUNIT_ASSERT_EQUAL(3.0, pFC-GetValue()); + +m_pDoc-DeleteTab(1); +m_pDoc-DeleteTab(0); +} + void Test::testCopyPasteTranspose() { diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index 1298e73..1e2a483 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/ucalc.hxx @@ -220,6 +220,7 @@ public: void testDataArea(); void testAutofilter(); void testCopyPaste(); +void testCopyPasteAsLink(); void testCopyPasteTranspose(); void testMoveBlock(); void testCopyPasteRelativeFormula(); @@ -361,8 +362,9 @@ public: CPPUNIT_TEST(testToggleRefFlag); CPPUNIT_TEST(testAutofilter); CPPUNIT_TEST(testCopyPaste); -CPPUNIT_TEST(testMoveBlock); +CPPUNIT_TEST(testCopyPasteAsLink); CPPUNIT_TEST(testCopyPasteTranspose); +CPPUNIT_TEST(testMoveBlock); CPPUNIT_TEST(testCopyPasteRelativeFormula); CPPUNIT_TEST(testMergedCells); CPPUNIT_TEST(testUpdateReference); diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 7a7f0a7..921fd43 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -690,7 +690,7 @@ class CopyCellsFromClipHandler void insertRefCell(SCROW nSrcRow, SCROW nDestRow) { -ScAddress aSrcPos(mnCol, nSrcRow, mnTab); +ScAddress aSrcPos(mnSrcCol, nSrcRow, mnSrcTab); ScAddress aDestPos(mnCol, nDestRow, mnTab); ScSingleRefData aRef; aRef.InitAddress(aSrcPos); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [lo-4.2] regview fails to show rdb files
Hi Stephan, that was it. I had modified the loutil.py to add both 4.0 and 4.2 and since 4.0 was before 4.2, it was being picked up. With 4.2, the python version from 4.0 was messing things up. After I removed program 4.0 etc, it works for 4.2 as expected. For some reason it work for me with and without , . thanks for the help and time. Neeraj On Wed, Dec 11, 2013 at 3:36 AM, Stephan Bergmann sberg...@redhat.comwrote: On 12/10/2013 08:55 PM, Neeraj Rai wrote: Traceback (most recent call last): File libreconverter-master/libreconverter.py, line 18, in module import loutils File libreconverter-master/loutils.py, line 39, in module import uno File libreoffice-4.0/lib/libreoffice/program/uno.py, line 38, in module _g_ctx = pyuno.getComponentContext( ) SystemError: Error during bootstrapping uno (RuntimeException):missing whitespace before attribute in file:///path/libreoffice-4.2/lib/libreoffice/program/types/oovbaapi.rdb missing whitespace before attribute is an error message generated in xmlreader/source/xmlreader.cxx, so it smells like your setup is such that it erroneously declares the oovbaapi.rdb as a services rdb (which are in XML format today) rather than a types rdb (which are in binary format). What also looks odd is that your setup apparently mixes libreoffice-4.0/lib/libreoffice/program/uno.py and libreoffice-4.2/lib/ libreoffice/program/types/oovbaapi.rdb. What I noticed is that libreconverter's loutils.py has two bugs, one is a missing comma that made it completely nonfunctional at least for me and is fixed with https://github.com/colonelqubit/libreconverter/commit/ 7e0f81ac96106ccb4baff4951126885841b1e887 Merge pull request #1 from stbergmann/master now. The other is that it hardcodes the location of the LO installation as /usr/lib/libreoffice/program in the _lopaths variable. You presumably do have a LO installation there, but it likely doesn't match the LO installation from which you take the python executable to run libreconverter.py with. What worked for me, trying it out with a local LO 4.2 build, is to patch loutils.py like diff --git a/loutils.py b/loutils.py index 4bac3e1..c2d1364 100644 --- a/loutils.py +++ b/loutils.py @@ -19,7 +19,7 @@ LIBREOFFICE_PORT = 8100 # Find LibreOffice. _lopaths=( -('/usr/lib/libreoffice/program', '/usr/lib/libreoffice/program'), +('/home/sbergman/lo-4.2/core/instdir/program', '/home/sbergman/lo-4.2/core/instdir/program'), ) to match the LO installation of the python executable used when running libreconverter.py, /home/sbergman/lo-4.2/core/instdir/program/python libreconverter.py test-headless3.xlsx output.csv Stephan -- = Intuition - is the inability to figure out the facts on which we based the decision. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/inc writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo72560.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 ++ writerfilter/inc/dmapper/DomainMapper.hxx|1 - writerfilter/source/dmapper/DomainMapper.cxx | 25 ++--- 4 files changed, 32 insertions(+), 8 deletions(-) New commits: commit b0db93d00e1dd208baa96eb3e10df12950cdcb49 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Thu Dec 12 08:20:00 2013 +0300 DOCX: fdo#72560 better solution for exchange alignment for RTL Change-Id: I39462fc722a58b32e8829a9f2005a411871f255d diff --git a/sw/qa/extras/ooxmlimport/data/fdo72560.docx b/sw/qa/extras/ooxmlimport/data/fdo72560.docx new file mode 100644 index 000..b21535b Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo72560.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 5da974f..db722f6 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1638,6 +1638,20 @@ DECLARE_OOXMLIMPORT_TEST(testLOCrash,file_crash.docx) //The problem was libreoffice crash while opening the file. getParagraph(1,Contents); } + +DECLARE_OOXMLIMPORT_TEST(testFdo72560, fdo72560.docx) +{ +// The problem was libreoffice confuse when there RTL default style for paragraph +uno::Referenceuno::XInterface xParaLeftRTL(getParagraph( 1, RTL LEFT)); +uno::Referenceuno::XInterface xParaRightLTR(getParagraph( 2, LTR RIGHT)); + +// this will test the text direction and alignment for paragraphs +CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, getPropertysal_Int16( xParaLeftRTL, WritingMode )); +CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT), getProperty sal_Int32 ( xParaLeftRTL, ParaAdjust )); + +CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, getPropertysal_Int16( xParaRightLTR, WritingMode )); +CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_RIGHT), getProperty sal_Int32 ( xParaRightLTR, ParaAdjust )); +} #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index 9775bac..4a168d9 100644 --- a/writerfilter/inc/dmapper/DomainMapper.hxx +++ b/writerfilter/inc/dmapper/DomainMapper.hxx @@ -165,7 +165,6 @@ private: sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue); sal_Int32 mnBackgroundColor; bool mbIsHighlightSet; -bool mbIsBIDI; bool mbIsSplitPara; boost::scoped_ptr GraphicZOrderHelper zOrderHelper; }; diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 2fcd4fb..26dfa11 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -97,7 +97,7 @@ LoggedProperties(dmapper_logger, DomainMapper), LoggedTable(dmapper_logger, DomainMapper), LoggedStream(dmapper_logger, DomainMapper), m_pImpl( new DomainMapper_Impl( *this, xContext, xModel, eDocumentType, xInsertTextRange, bIsNewDoc )), -mnBackgroundColor(0), mbIsHighlightSet(false), mbIsBIDI(false), mbIsSplitPara(false) +mnBackgroundColor(0), mbIsHighlightSet(false), mbIsSplitPara(false) { // #i24363# tab stops relative to indent m_pImpl-SetDocumentSettingsProperty( @@ -1597,7 +1597,7 @@ sal_Int32 lcl_getCurrentNumberingProperty(uno::Referencecontainer::XIndexAccess } // In rtl-paragraphs the meaning of left/right are to be exchanged -static bool ExchangeLeftRight( const PropertyMapPtr rContext, bool mbIsBIDI) +static bool ExchangeLeftRight( const PropertyMapPtr rContext, DomainMapper_Impl* m_pImpl ) { bool bExchangeLeftRight = false; PropertyMap::const_iterator aPropParaIte = rContext-find(PROP_WRITING_MODE); @@ -1608,7 +1608,20 @@ sal_Int32 lcl_getCurrentNumberingProperty(uno::Referencecontainer::XIndexAccess bExchangeLeftRight = true; } else -return mbIsBIDI; +{ +// check if there RTL bidi in default style for the paragraph +StyleSheetEntryPtr pTable = m_pImpl-GetStyleSheetTable()-FindDefaultParaStyle(); +if ( pTable ) +{ +PropertyMap::const_iterator aPropStyle = pTable-pProperties-find(PROP_WRITING_MODE); +if( aPropStyle != pTable-pProperties-end()) +{ +sal_Int32 aDirect; +if( (aPropStyle-second.getValue() = aDirect) aDirect == text::WritingMode2::RL_TB ) +bExchangeLeftRight = true; +} +} +} return bExchangeLeftRight; } @@ -1638,7 +1651,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm, PropertyMapPtr rContext, SprmType break; // sprmPIncLvl case NS_sprm::LN_PJcExtra: // sprmPJc Asian (undocumented) case NS_sprm::LN_PJc: // sprmPJc -handleParaJustification(nIntValue, rContext, ExchangeLeftRight( rContext, mbIsBIDI )); +
LibreOffice Gerrit News for core on 2013-12-12
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + Don't hold css::uno::Type instances by pointer in https://gerrit.libreoffice.org/7037 from Stephan Bergmann about module chart2, comphelper, dbaccess, editeng, extensions, filter, forms, include, linguistic, reportdesign, sc, sd, sfx2, starmath, svl, svtools, svx, sw, xmloff + fdo#71748 Fix also for hicontrast and sifr themes in https://gerrit.libreoffice.org/7035 from Maxim Monastirsky about module icon-themes, svx + Add OS X 10.5 support to configure.ac in https://gerrit.libreoffice.org/7030 from Douglas Mencken about module build + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7019 from Mohamed-Ali BEN MANSOUR about module sw + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7029 from Mohamed-Ali BEN MANSOUR about module sw + fdo#72345: Fixed for Charts - Up Down Bars are missing after Round trip in https://gerrit.libreoffice.org/7032 from Yogesh Bharate about module include, oox + Fix typo in https://gerrit.libreoffice.org/7033 from Maxim Monastirsky about module svx + Export redline 'paragraph formatting changes' back to DOCX in https://gerrit.libreoffice.org/6993 from Adam CloudOn about module sw + DOCX Import of 'paragraph formatting track changes' in https://gerrit.libreoffice.org/6992 from Adam CloudOn about module oox, writerfilter + Changed 'Para Change' to 'Para Marker Change' in DOCX importer in https://gerrit.libreoffice.org/6991 from Adam CloudOn about module writerfilter + Add 'redline - paragraph index' to XML node dump in https://gerrit.libreoffice.org/6990 from Adam CloudOn about module sw + Export redline 'formatting changes' back to DOCX in https://gerrit.libreoffice.org/6909 from Adam CloudOn about module sw + DOCX Import of 'run formatting track changes' in https://gerrit.libreoffice.org/6908 from Adam CloudOn about module writerfilter + Add support in the 'makeRedline' function for 'formatting properties' in https://gerrit.libreoffice.org/6902 from Adam CloudOn about module sw + Add new 'SwRedlineExtraData_FormattingChanges' class for formatting chang in https://gerrit.libreoffice.org/6901 from Adam CloudOn about module sw + fdo#65836 Do not compress WMF / EMF file incase of OOXML export in https://gerrit.libreoffice.org/6849 from Nikhil Walvekar about module filter, include, oox, sw End of freshness * Merged changes on master for project core changed in the last 25 hours: + Open .tab files with Calc in https://gerrit.libreoffice.org/7038 from Maxim Monastirsky + fdo#60698: Merge fastsax and sax_shared into expwrap in https://gerrit.libreoffice.org/6967 from Marcos Souza + fdo#72226: Fix for Stock chart Invalid RT in https://gerrit.libreoffice.org/6925 from Pallavi Jadhav + Removed 'XML_lang' tag being auto-written in redline case in https://gerrit.libreoffice.org/6900 from Adam CloudOn + moved 'mergeTopMarks' out of 'WriteCollectedRunProperties' in https://gerrit.libreoffice.org/6899 from Adam CloudOn * Abandoned changes on master for project core changed in the last 25 hours: + Fix a lot of warnings like warning: this decimal constant is unsigned on in https://gerrit.libreoffice.org/7031 from Douglas Mencken * Open changes needing tweaks, but being untouched for more than a week: + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 deepjungle.m...@gmail.com changed: What|Removed |Added Depends on||72628 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #35 from deepjungle.m...@gmail.com --- Regression bug 72628 EDITING: Wrong font rendering of SVG graphics in the editor (PDF export is fine) from 4.1 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: qadevOOo/runner qadevOOo/tests
qadevOOo/runner/lib/MultiMethodTest.java | 46 +-- qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java |2 2 files changed, 15 insertions(+), 33 deletions(-) New commits: commit cff72ec4bf87c6484be97d954966309ba7a5eb8a Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 12 07:46:53 2013 +0100 Minor qadevOOo improvement Change-Id: Ibeefc8e9aad57c28722b62610231d14ebc8a7403 diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index dd467af..b28194b 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -180,7 +180,6 @@ public class MultiMethodTest } System.out.println( is iface: [ + testedClassName + ] testcode: [ + entry.entryName + ]); -tEnv.getTestObject(); Object oObj = UnoRuntime.queryInterface(testedClass, tEnv.getTestObject()); if (oObj == null) @@ -200,7 +199,16 @@ public class MultiMethodTest } //setting the field oObj -setField(oObj, oObj); +try +{ +setField(oObj, oObj); +} +catch (Exception e) +{ +e.printStackTrace(); +setSubStates(e.toString()); +return tRes; +} } // to perform some stuff before all method tests @@ -464,37 +472,9 @@ public class MultiMethodTest return clName.substring(clName.lastIndexOf('.') + 1); } -/** - * Initializes codefieldName/code of the subclass with - * codevalue/code. - * - * @return Status describing the result of the operation. - */ -protected Status setField(String fieldName, Object value) +private void setField(String fieldName, Object value) +throws NoSuchFieldException, IllegalAccessException { -Field objField; - -try -{ -objField = this.getClass().getField(fieldName); -} -catch (NoSuchFieldException nsfE) -{ -return Status.exception(nsfE); -} - -try -{ -objField.set(this, value); -return Status.passed(true); -} -catch (IllegalArgumentException iaE) -{ -return Status.exception(iaE); -} -catch (IllegalAccessException iaE) -{ -return Status.exception(iaE); -} +this.getClass().getField(fieldName).set(this, value); } } diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java index d7c513c..ff8296a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java @@ -62,6 +62,8 @@ public class _XDataPilotTable2 extends MultiMethodTest private ArrayListInteger mDataFieldDims = null; private ArrayListCellAddress mResultCells = null; +public XDataPilotTable2 oObj; + /** * exception to be thrown when obtaining a result data for a cell fails * (probably because the cell is not a result cell). ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 4 commits - sal/inc sd/inc sd/source svl/inc svl/source svx/inc svx/source
sal/inc/rtl/strbuf.hxx | 17 + sd/inc/sdpage.hxx|3 +++ sd/source/core/drawdoc3.cxx | 22 -- sd/source/core/sdpage2.cxx | 37 + svl/inc/svl/itemset.hxx |1 + svl/source/items/itemset.cxx | 16 svx/inc/svx/svdobj.hxx |2 ++ svx/source/svdraw/svdobj.cxx | 40 8 files changed, 132 insertions(+), 6 deletions(-) New commits: commit c67cbc42ec5f0d37f70aeda4e11e3dd90edad892 Author: Muthu Subramanian sumu...@collabora.com Date: Thu Dec 12 12:57:02 2013 +0530 Force int16 as int32 diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 2aceba9..f61cab0 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -599,8 +599,8 @@ OString SdPage::stringify() const /*append(OUStringToOString(maCreatedPageName, RTL_TEXTENCODING_UTF8)). append(OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)).*/ append(OUStringToOString(maBookmarkName, RTL_TEXTENCODING_UTF8)). - append(mbScaleObjects).append(mbBackgroundFullSize).append((sal_Int32)meCharSet).append(mnPaperBin). - append((sal_Int32)meOrientation).append(mnTransitionType).append(mnTransitionSubtype).append(mbTransitionDirection). + append(mbScaleObjects).append(mbBackgroundFullSize).append((sal_Int32)meCharSet).append((sal_Int32)mnPaperBin). + append((sal_Int32)meOrientation).append((sal_Int32)mnTransitionType).append((sal_Int32)mnTransitionSubtype).append(mbTransitionDirection). append(mnTransitionFadeColor).append(mfTransitionDuration);//.append(mbIsPrecious); sal_Int32 n = GetObjCount(); commit 3c16c85a8766aa6f4b4e292a9d1700e1a35366c1 Author: Muthu Subramanian sumu...@collabora.com Date: Thu Dec 12 12:55:39 2013 +0530 Force enums as ints - to avoid warning/errors. diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 9f621fd..2aceba9 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -592,15 +592,15 @@ void SdPage::setTransitionDuration ( double fTranstionDuration ) OString SdPage::stringify() const { OStringBuffer aString(100); - aString.append(mePageKind).append(meAutoLayout).append(mbSelected).append(mePresChange).append(mbSoundOn).append(mbExcluded). + aString.append((sal_Int32)mePageKind).append((sal_Int32)meAutoLayout).append(mbSelected).append((sal_Int32)mePresChange).append(mbSoundOn).append(mbExcluded). append(OUStringToOString( maLayoutName, RTL_TEXTENCODING_UTF8 )). append(OUStringToOString(maSoundFile, RTL_TEXTENCODING_UTF8 )). append(mbLoopSound).append(mbStopSound). /*append(OUStringToOString(maCreatedPageName, RTL_TEXTENCODING_UTF8)). append(OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)).*/ append(OUStringToOString(maBookmarkName, RTL_TEXTENCODING_UTF8)). - append(mbScaleObjects).append(mbBackgroundFullSize).append(meCharSet).append(mnPaperBin). - append(meOrientation).append(mnTransitionType).append(mnTransitionSubtype).append(mbTransitionDirection). + append(mbScaleObjects).append(mbBackgroundFullSize).append((sal_Int32)meCharSet).append(mnPaperBin). + append((sal_Int32)meOrientation).append(mnTransitionType).append(mnTransitionSubtype).append(mbTransitionDirection). append(mnTransitionFadeColor).append(mfTransitionDuration);//.append(mbIsPrecious); sal_Int32 n = GetObjCount(); commit a3e222581b3ded07285a5e1ad18f5a5abb5d95b9 Author: Muthu Subramanian sumu...@collabora.com Date: Thu Dec 12 12:53:55 2013 +0530 Add append(bool) to OStringBuffer. diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx index ed627ce..d8112ea 100644 --- a/sal/inc/rtl/strbuf.hxx +++ b/sal/inc/rtl/strbuf.hxx @@ -510,6 +510,23 @@ public: } /** +Appends the string representation of the codebool/code +argument to the string buffer. + +The argument is converted to a string as if by the method +codeString.valueOf/code, and the characters of that +string are then appended to this string buffer. + +@param b a codebool/code. +@return this string buffer. + */ +OStringBuffer append(bool b) +{ +sal_Char sz[RTL_STR_MAX_VALUEOFBOOLEAN]; +return append( sz, rtl_str_valueOfBoolean( sz, b ) ); +} + +/** Appends the string representation of the codechar/code argument to this string buffer. commit 4e09cb4645e1b8b0393acf956c325150fe1c52fc Author: Muthu Subramanian sumu...@collabora.com Date: Thu Dec 12 12:50:13 2013 +0530 n#753460: Copying slides having same master page name. diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index f62b2ae..0c99930 100644 ---
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/data/pptx/n828390_2.pptx |binary sd/qa/unit/import-tests.cxx | 21 + 2 files changed, 21 insertions(+) New commits: commit 0b578e51cd1eabbbe375e25927df86fac7552641 Author: Muthu Subramanian sumu...@collabora.com Date: Thu Dec 12 13:19:36 2013 +0530 n#828390: Add unit test for new line import. diff --git a/sd/qa/unit/data/pptx/n828390_2.pptx b/sd/qa/unit/data/pptx/n828390_2.pptx new file mode 100644 index 000..e30948f Binary files /dev/null and b/sd/qa/unit/data/pptx/n828390_2.pptx differ diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 9b00403..f912d11 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -49,6 +49,7 @@ public: void testFdo64512(); void testFdo71075(); void testN828390(); +void testN828390_2(); void testFdo68594(); CPPUNIT_TEST_SUITE(SdFiltersTest); @@ -59,6 +60,7 @@ public: CPPUNIT_TEST(testFdo64512); CPPUNIT_TEST(testFdo71075); CPPUNIT_TEST(testN828390); +CPPUNIT_TEST(testN828390_2); CPPUNIT_TEST(testFdo68594); CPPUNIT_TEST_SUITE_END(); @@ -227,6 +229,25 @@ void SdFiltersTest::testN828390() CPPUNIT_ASSERT_MESSAGE(Subscript not exported properly, bPassed); } +void SdFiltersTest::testN828390_2() +{ +::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc(/sd/qa/unit/data/pptx/n828390_2.pptx) ); +CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() ); +CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() ); +CPPUNIT_ASSERT_MESSAGE( not in destruction, !xDocShRef-IsInDestruction() ); + +SdDrawDocument *pDoc = xDocShRef-GetDoc(); +CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL ); +const SdrPage *pPage = pDoc-GetPage(1); +CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL ); + +SdrObject *pObj = pPage-GetObj(0); +SdrTextObj *pTxtObj = dynamic_castSdrTextObj *( pObj ); +const EditTextObject aEdit = pTxtObj-GetOutlinerParaObject()-GetTextObject(); +CPPUNIT_ASSERT(aEdit.GetText(0) == OUString(Linux )); +CPPUNIT_ASSERT(aEdit.GetText(1) == OUString(Standard Platform)); +} + void SdFiltersTest::testN778859() { ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/n778859.pptx)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Tinderboxes: Holiday Wishlist
Some old requests 1) Clear explanation of what are the differences between the builds from the several TB. If there are none then one daily build per OS is enough 2) If no one cares to explain then please indicate which is the recommended build to test. Currently my understanding is that the recommended, for the Windows OS, is from TDF owned TB #47. Unfortunately that rule currently only applies to the Master branch... 3) Consistent filenames across TB (hint to Thorsten ;) ) Not needed if one build per OS is enough (see point 1) 4) Text file with details associated with each installer (since the executables have NO reference to the TB that produced them). Again, not needed if one build per OS is enough (see point 1) Sidenote: I would say that having a 4.2 daily build is currently more important than a Master build (since 4.3 is only planned for code freeze in May...) Just my 2 outsider cents... -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Tinderboxes-Holiday-Wishlist-tp4087669p4087708.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] old Windows x86 libreoffice master builds
Hi, Is there any way to procure old Windows x86 libreoffice master builds? On all Windows tinderboxes (39,42,47) I can see builds from late November onwards. I would like to have builds from October timeframe. Are the builds archived somewhere? regards, Roopesh Kohad -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] old Windows x86 libreoffice master builds
Roopesh, It would be up to the individual TinderBox maintainer to archive the builds, I don't believe any do as it is possible to configure git to build at a particular historical commit point. The actual release RC band final builds are archived here: http://downloadarchive.documentfoundation.org/libreoffice/old/ but that is probably not as granular as what you were looking for. Of habit I keep copies of the install packages I load for testing. Kind of sparse for October but you're welcome to any of them if they'll help. http://nabble.documentfoundation.org/file/n4087769/LODev_master_archive_vsfoote.png Stuart -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-old-Windows-x86-libreoffice-master-builds-tp4087741p4087769.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Git error with bibisect40
Hello Ken, all, On Wed, Dec 11, 2013 at 12:09 PM, Ken Biondi kenbio...@hotmail.com wrote: Unfortunately neither git checkout . nor git clean -fd, git reset --hard solved my problem. I wonder what is your output of git status. Anyway, I would try delete everything except one .git/ hidden folder, and do git checkout oldest. Note: I didn't try bibisect40 yet, so this may not work. :-) Best Regards, -- Korrawit Pruegsanusak ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] old Windows x86 libreoffice master builds
On Wed, Dec 11, 2013 at 8:53 AM, Roopesh Kohad roopesh.ko...@synerzip.com wrote: Hi, Is there any way to procure old Windows x86 libreoffice master builds? On all Windows tinderboxes (39,42,47) I can see builds from late November onwards. I would like to have builds from October timeframe. Are the builds archived somewhere? At some point soon we're going to spin-up our windows bibisect capabilities and will likely create a set of builds covering that time frame. - How soon do you need these Windows builds? - Would you be interested in helping us get the windows bibisect system in place? Thanks, --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANN] LibreOffice 4.1.4 RC2 test builds available
Hi *, for the upcoming new version 4.1.4, the builds for RC2 are now available on pre-releases. It is the second of two planned RCs (so supposed to be the final version) - see the plan here: https://wiki.documentfoundation.org/ReleasePlan/4.1#4.1.4_release Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. NOTE: This build is in a release configuration and _will_ replace your existing LibreOffice install on Windows. The list of fixed bugs relative to 4.1.4RC1 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-1-4-release-4.1.4.2.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Special thanks to all QA, developers, bugreporters who did make this possible. Björn did write a script to create some bug-handler stats - you'll find the number of bugs along with the names in the wiki ( https://wiki.documentfoundation.org/Releases/4.1.4/RC2#Thanks_to_all_who_took_part_in_handling_the_issues ) Of course also big thanks to contributors who do great work in other areas that cannot be put into numbers! Thanks a lot for your help, ciao Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Git error with bibisect40
On Wed, 2013-12-11 at 23:14 +0700, Korrawit Pruegsanusak wrote: Hello Ken, all, On Wed, Dec 11, 2013 at 12:09 PM, Ken Biondi kenbio...@hotmail.com wrote: Unfortunately neither git checkout . nor git clean -fd, git reset --hard solved my problem. I wonder what is your output of git status. Anyway, I would try delete everything except one .git/ hidden folder, and do git checkout oldest. I have added Ken's pair of commands from his earlier email and his recommendation from below to the wiki, with no more explanation than if one does not solve the problem, try the next. The change: https://wiki.documentfoundation.org/index.php?title=QA% 2FHowToBibisectaction=historysubmitdiff=81218oldid=81064; the result: https://wiki.documentfoundation.org/QA/HowToBibisect#Installed_LibreOffice_became_modified_unexpectedly. Note: I didn't try bibisect40 yet, so this may not work. :-) Several times along the way, I have resorted to the extreme measure of deleting the directory with the bibisect repository and extracting it again from the tarfile. That is perhaps the ultimate repair. Terry. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Git error with bibisect40
On Wed, Dec 11, 2013 at 3:00 PM, Terrence Enger ten...@iseries-guru.com wrote: On Wed, 2013-12-11 at 23:14 +0700, Korrawit Pruegsanusak wrote: Hello Ken, all, On Wed, Dec 11, 2013 at 12:09 PM, Ken Biondi kenbio...@hotmail.com wrote: Unfortunately neither git checkout . nor git clean -fd, git reset --hard solved my problem. I wonder what is your output of git status. Anyway, I would try delete everything except one .git/ hidden folder, and do git checkout oldest. I have added Ken's pair of commands from his earlier email and his recommendation from below to the wiki, with no more explanation than if one does not solve the problem, try the next. The change: https://wiki.documentfoundation.org/index.php?title=QA% 2FHowToBibisectaction=historysubmitdiff=81218oldid=81064; the result: https://wiki.documentfoundation.org/QA/HowToBibisect#Installed_LibreOffice_became_modified_unexpectedly. Note: I didn't try bibisect40 yet, so this may not work. :-) Several times along the way, I have resorted to the extreme measure of deleting the directory with the bibisect repository and extracting it again from the tarfile. That is perhaps the ultimate repair. provide that you do have a .git directory in there then rm -fr * (will delete everything but .git /.gitignore and othe .* files) then git checkout newest (assuming that the repo has a 'newest' tag) should bring you back in a 'sane state' then again maybe you are in the middle of a bisection.. then git bisect --reset may help it is a bit hard to fix thing 'blind'.. but assuredly it is fixable... it is just a matter of understanding in what state your tree is Norbert ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Git error with bibisect40
On Wed, Dec 11, 2013 at 4:00 PM, Terrence Enger ten...@iseries-guru.com wrote: Several times along the way, I have resorted to the extreme measure of deleting the directory with the bibisect repository and extracting it again from the tarfile. That is perhaps the ultimate repair. Yes, that is the most drastic approach :-) In most cases we hopefully can avoid needing to take that step! Many of the bibisect woes that we've encountered in the past have been tracked back to interactions with other running instances of soffice (often touching the same user profile). Things I would try include - Shutting down all versions of Libre/Open Office - Checking again (ps aux|grep office) - Restarting the computer To avoid these types of interactions in the future, I suggest using a wrapper script (not checked-in, but located in the same directory as the bibisect repo). Here's one I cooked up based on Miroslaw's suggestions (I'm in the process of getting it added to the buildbot repo): http://testing.eagleeyet.net/~qubit/bibisect/run-libreoffice.sh Cheers, --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] old Windows x86 libreoffice master builds
Hello Stuart, It would be great if you could make couple of builds available from October timeframe. I can see that there are two of them dated 10, 25 Oct. regards, Roopesh Of habit I keep copies of the install packages I load for testing. Kind of sparse for October but you're welcome to any of them if they'll help. http://nabble.documentfoundation.org/file/n4087769/LODev_master_archive_vsfoote.png -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] old Windows x86 libreoffice master builds
I would definitely like to help except for the fact that I have very little knowledge of bibisect work so cannot gauge how involved it would be and we don't do Windows build just as yet. We are working for our sponsor on a tight schedule. But do tap me when time comes. regards, Roopesh On Wed, Dec 11, 2013 at 9:41 PM, Robinson Tryon bishop.robin...@gmail.comwrote: On Wed, Dec 11, 2013 at 8:53 AM, Roopesh Kohad roopesh.ko...@synerzip.com wrote: Hi, Is there any way to procure old Windows x86 libreoffice master builds? On all Windows tinderboxes (39,42,47) I can see builds from late November onwards. I would like to have builds from October timeframe. Are the builds archived somewhere? At some point soon we're going to spin-up our windows bibisect capabilities and will likely create a set of builds covering that time frame. - How soon do you need these Windows builds? - Would you be interested in helping us get the windows bibisect system in place? Thanks, --R -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 72587] CRASH - Sigsegv when closing multiple Template Manager windows
https://bugs.freedesktop.org/show_bug.cgi?id=72587 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Priority|medium |high -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72587] CRASH - Sigsegv when closing multiple Template Manager windows
https://bugs.freedesktop.org/show_bug.cgi?id=72587 --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- If the app didn't allow multiple asynchronous instances of the Template Manager dialog, perhaps this problem would not exist ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56544] FILEOPEN: Do not create lock file on samba share.
https://bugs.freedesktop.org/show_bug.cgi?id=56544 Maxim Monastirsky momonas...@gmail.com changed: What|Removed |Added CC||momonas...@gmail.com --- Comment #7 from Maxim Monastirsky momonas...@gmail.com --- (In reply to comment #5) I don't understand the Gnoem workaround described in comment #2. What described there is not a workaround you can apply. It's what GNOME itself do in order to support apps that don't use GIO. Note that starting with 4.1 you have 'X-GIO-NoFuse=true' in .desktop files, so LO deals itself with network using GIO. It is only gvfs (via smb:// in nautilus) that doesn't lock the file. With 'X-GIO-NoFuse=true' or without it? This problem also exists for other file types What do you mean? Other application that usually create locks, don't create lock in that case? so I don't know that it is a LibreOffice bug per se. I'm not sure. If LO has write permissions to the share, there is no reason why it couldn't create a lock file there. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72323] LibreOffice and Antidote
https://bugs.freedesktop.org/show_bug.cgi?id=72323 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |NOTOURBUG --- Comment #25 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #23) 0x0001 (NEEDED) Shared library: [libreg.so.3] 0x0001 (NEEDED) Shared library: [libstore.so.3] Ach, I see now what's going wrong. Those two libraries are private parts of LO (cf. ure/source/README) that extensions must not link against, and their names changed in LO 4.1, so libAntidote_32.OOo.MT.P100.so cannot find them any longer. There should be a workaround, creating symlinks (in /opt/openoffice.org/ure/lib, as libAntidote_32.OOo.MT.P100.so also has a bogus RPATH, which should be harmless but comes in handy here), but the exact recipe would depend on your answer to comment 24. In any event, this is an error that would need fixing in the extension. (I'm not sure why they link against the LO-internal reg and store libraries at all, there's not much functionality in them that should be of use for extension developers. We did erroneously document that functionality at api.libreoffice.org in the past, though.) If you can establish a contact to the authors of that extension, I'd be willing to talk to them whether and how best to address this problem. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72511] Comment note on a DOC from MS Word for Mac 2008 appears wrong on Writer
https://bugs.freedesktop.org/show_bug.cgi?id=72511 Kumāra kumara.bhik...@gmail.com changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #4 from Kumāra kumara.bhik...@gmail.com --- With the needed info provided, I set the status back to NEW. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72587] CRASH - Sigsegv when closing multiple Template Manager windows
https://bugs.freedesktop.org/show_bug.cgi?id=72587 Cédric Bosdonnat cedric.bosdonnat@free.fr changed: What|Removed |Added CC|cedric.bosdonnat.ooo@free.f | |r | --- Comment #2 from Cédric Bosdonnat cedric.bosdonnat@free.fr --- Now working on LibreOffice as volunteer I restricted my action's area to CMIS-related topics. Removed me from CC -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs