Re: Why dev-www.libreoffice.org is unreachable
On 2013-07-14 04:19, LOH KOK HOE wrote: I did try to manually connect to dev-www.libreoffice.org http://dev-www.libreoffice.org but failed. I then issue the make command again and this time I got timed out error as shown below: It's working for me now. Either there was a temporary failure, or you are behind a proxy and have not configured your proxy settings on that box. 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: sc/AllLangResTarget_sc.mk sc/inc sc/source sc/UIConfig_scalc.mk
sc/AllLangResTarget_sc.mk |1 sc/UIConfig_scalc.mk |1 sc/inc/globstr.hrc | 21 ++ sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 54 ++--- sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.src | 99 ++ 5 files changed, 150 insertions(+), 26 deletions(-) New commits: commit 79aa0c50dae2ff6d143d99212d3a32a8ac28f306 Author: Tomaž Vajngerl qui...@gmail.com Date: Mon Jul 15 08:31:52 2013 +0200 RNG: Externalize strings and add .ui to UIConfig Change-Id: I98620d235044365bcc67e29a72f036f5fdfd5e45 diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 52a6ec3..536e954 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -83,6 +83,7 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/formdlg/formdlgs.src \ sc/source/ui/formdlg/dwfunctr.src \ sc/source/ui/sidebar/CellAppearancePropertyPanel.src \ +sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.src \ sc/source/core/src/compiler.src \ )) diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index ddf13e8..cab8091 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -91,6 +91,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/printareasdialog \ sc/uiconfig/scalc/ui/printeroptions \ sc/uiconfig/scalc/ui/protectsheetdlg \ + sc/uiconfig/scalc/ui/randomnumbergenerator \ sc/uiconfig/scalc/ui/rightfooterdialog \ sc/uiconfig/scalc/ui/rightheaderdialog \ sc/uiconfig/scalc/ui/scgeneralpage \ diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 314f29a..31694f1 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -683,6 +683,27 @@ #define STR_COUNT 553 +#define STR_UNDO_DISTRIBUTION_TEMPLATE 554 +#define STR_DISTRIBUTION_UNIFORM_REAL 555 +#define STR_DISTRIBUTION_UNIFORM_INTEGER556 +#define STR_DISTRIBUTION_NORMAL 557 +#define STR_DISTRIBUTION_CAUCHY 558 +#define STR_DISTRIBUTION_BERNOULLI 559 +#define STR_DISTRIBUTION_BINOMIAL 560 +#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL 561 +#define STR_DISTRIBUTION_CHI_SQUARED562 +#define STR_DISTRIBUTION_GEOMETRIC 563 + +#define STR_RNG_PARAMETER_MINIMUM 564 +#define STR_RNG_PARAMETER_MAXIMUM 565 +#define STR_RNG_PARAMETER_MEAN 566 +#define STR_RNG_PARAMETER_STANDARD_DEVIATION567 +#define STR_RNG_PARAMETER_STANDARD_MEDIAN 568 +#define STR_RNG_PARAMETER_STANDARD_SIGMA569 +#define STR_RNG_PARAMETER_STANDARD_PROBABILITY 570 +#define STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS 571 +#define STR_RNG_PARAMETER_STANDARD_NU_VALUE 572 + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 80a2da7..356a54d 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -213,63 +213,63 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers() { boost::random::uniform_real_distribution distribution(parameter1, parameter2); boost::variate_generatorboost::mt19937, boost::random::uniform_real_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(Uniform Real)); +GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_UNIFORM_REAL))); break; } case DIST_UNIFORM_INTEGER: { boost::random::uniform_int_distribution distribution(parameterInteger1, parameterInteger2); boost::variate_generatorboost::mt19937, boost::random::uniform_int_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(Uniform Integer)); +GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_UNIFORM_INTEGER))); break; } case DIST_NORMAL: { boost::random::normal_distribution distribution(parameter1, parameter2); boost::variate_generatorboost::mt19937, boost::random::normal_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(Normal)); +GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_NORMAL))); break; } case DIST_CAUCHY: { boost::random::cauchy_distribution distribution(parameter1); boost::variate_generatorboost::mt19937, boost::random::cauchy_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(Cauchy)); +GenerateNumbers(rng,
Re: Building LO 4.0.4.2 on illumos based OS
Hi, I could set up the correct env to build correctly up to soffice.bin and going on over extensions. I ended up with a problem linking with Xm Motif libraries (a problem inside my distro that I'm solving). I was wandering why Motif libraries are needed by these extension. Is it absolutely necessary? Any way to skip Motif dependencies? Gabriele. Da: Gabriele Bulfon A: Michael Stahl Cc: michael.me...@suse.com libreoffice-dev Data: 9 luglio 2013 18.01.19 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS usually libs should contain not just search paths but also the libraries to be linked, e.g. in config_host.mk with a system nss i get: export NSS_LIBS=$(gb_SPACE)-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl also i guess only Sun ld knows -R, the GNU ld equivalent is -Wl,-rpath, Well done! With this env the build went on the unopkg.bin! CONFIGURE_ENV += NSS_CFLAGS=-I/usr/include/mps CONFIGURE_ENV += NSS_LIBS=-Wl,-rpath,/usr/lib/mps -L/usr/lib/mps -lssl3 -lsmime3 -lnss3 - lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl I prefer to use my userland Makefile options instead of modifying the solaris.mk Now the build is going on.let's wait and see... ;) Gabriele. Ok, it stopped later with this: [build LNK] Executable/pluginapp.bin S=/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1 O=$S/solver/unxsogi.pro W=$S/workdir/unxsogi.pro mkdir -p $W/LinkTarget/Executable/ /usr/gcc/4.4/bin/g++ -Wl,-z,origin '-Wl,-rpath,$ORIGIN:$ORIGIN/../ure-link/lib' -Wl,-rpath-link,$O/lib -z nodefs $W/CxxObject/extensions/source/plugin/unx/npwrap.o $W/CxxObject/extensions/source/plugin/unx/npnapi.o -Wl,--start-group $O/lib/libplugcon.a -Wl,--end-group -Wl,--no-as-needed -lm -lnsl -lsocket -lXm -lXt -lXext -lX11 -ldl -lgthread-2.0 -lpthread -lglib-2.0 -R/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgdk_pixbuf_xlib-2.0 -lgmodule-2.0 -lpthread -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -R/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lglib-2.0 -luno_sal -o $W/LinkTarget/Executable/pluginapp.bin /usr/gnu/bin/ld: cannot find -luno_sal collect2: ld returned 1 exit status I guess I'm missing a librarynot built? ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - libvisio/libvisio-0.0.30-msvc.patch.1 libvisio/UnpackedTarball_libvisio.mk
libvisio/UnpackedTarball_libvisio.mk |4 libvisio/libvisio-0.0.30-msvc.patch.1 | 12 2 files changed, 16 insertions(+) New commits: commit eb1da44288bd02763644a6d7fa410abe6313ae0b Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sat Jul 13 08:13:39 2013 +0200 Fix some runtime exceptions with msvc-built libvisio The previous code was causing silent exceptions in some particular cases. Passing through a temporary works well. Change-Id: I71a9a58b98b5f392da4d8a4c8d08ddc1487ec79f (cherry picked from commit ae9003af4c3942aa184b67c3cb7687f9dfc7dd5e) Reviewed-on: https://gerrit.libreoffice.org/4880 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/libvisio/UnpackedTarball_libvisio.mk b/libvisio/UnpackedTarball_libvisio.mk index e4c0561..8b41f4a 100644 --- a/libvisio/UnpackedTarball_libvisio.mk +++ b/libvisio/UnpackedTarball_libvisio.mk @@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio)) $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\ + libvisio/libvisio-0.0.30-msvc.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/libvisio/libvisio-0.0.30-msvc.patch.1 b/libvisio/libvisio-0.0.30-msvc.patch.1 new file mode 100644 index 000..4483806 --- /dev/null +++ b/libvisio/libvisio-0.0.30-msvc.patch.1 @@ -0,0 +1,12 @@ +--- a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp +@@ -655,7 +655,8 @@ void libvisio::VSDContentCollector::_flushText() + { + // Insert duplicate + std::vectorVSDCharStyle::iterator charIt = m_charFormats.begin() + charIndex; +-m_charFormats.insert(charIt, m_charFormats[charIndex]); ++VSDCharStyle tmpCharFormat = m_charFormats[charIndex]; ++m_charFormats.insert(charIt, tmpCharFormat); + m_charFormats[charIndex].charCount = paraCharCount; + m_charFormats[charIndex+1].charCount -= paraCharCount; + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building LO 4.0.4.2 on illumos based OS
Thanks! I'll check and try to disable this on my build. Also, it's not about a Solaris general problem, usually Solaris 10/11 have X11 and motif libs correctly configured. It's my own XStreamOS/illumos dev machine that has new X11 and old Motif libs not happy each other. For this, I will build and switch to open-motif shortly. Gabriele. -- Da: Michael Meeks A: Gabriele Bulfon Cc: Michael Stahl libreoffice-dev Data: 15 luglio 2013 10.15.18 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On Mon, 2013-07-15 at 09:44 +0200, Gabriele Bulfon wrote: I was wandering why Motif libraries are needed by these extension. Is it absolutely necessary? I'm amazed to hear that we link to motif in the modern world; it seems to be only this extension: $W/CxxObject/extensions/source/plugin/unx/npwrap.o $W/CxxObject/extensions/source/plugin/unx/npnapi.o I'd disable this I guess in configure.ac we have: dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents I imagine we should just disable that for Solaris [ for now ]. Quite why we think Mozilla requires motif still I'm not sure I'd be amazed if they still had a hard dep on that. HTH, Michael. -- michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC] CMIS updates
Hi all, This is a progress update of my GSOC project concerning CMIS support. The last weeks I've managed to: - Fix some bugs in the properties dialog UI. - Enable CMIS properties updating. - Add Google Drive support in LO code. The code can be found in the branch feature/cmis. Feel free to test it, however you will also have to build libCMIS. I currently have some problems as following, it would be great if anybody has a hint to fix them faster :-) - Refine the UI, including conversion from .src to .ui: + The current UI uses a Windows to support mouse scroll, I'm still not sure how to convert a Window to .ui? + How can we convert a HeaderBar to .ui file? - The file picker has some problems with object ID of a file which prevents a correct navigation. I will have to change to using object path ( which doesn't support in Google Drive) or fix those problems. - A property of CMIS file can have multiple values, need to add support for that. - in libCMIS, move to use libboost for JSON parser instead of libjson to reduce dependencies. Bests, CC Ngo. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LO 4.0.4.2 on illumos based OS
I momentarily disabled with this patch (treated SunOS as for iOS and Android). Gabriele. -- Da: Michael Meeks A: Gabriele Bulfon Cc: Michael Stahl libreoffice-dev Data: 15 luglio 2013 10.15.18 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On Mon, 2013-07-15 at 09:44 +0200, Gabriele Bulfon wrote: I was wandering why Motif libraries are needed by these extension. Is it absolutely necessary? I'm amazed to hear that we link to motif in the modern world; it seems to be only this extension: $W/CxxObject/extensions/source/plugin/unx/npwrap.o $W/CxxObject/extensions/source/plugin/unx/npnapi.o I'd disable this I guess in configure.ac we have: dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents I imagine we should just disable that for Solaris [ for now ]. Quite why we think Mozilla requires motif still I'm not sure I'd be amazed if they still had a hard dep on that. HTH, Michael. -- michael.me...@suse.com sonicle-configure.patch Description: binary/octet-stream ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 46 +-- sc/uiconfig/scalc/ui/randomnumbergenerator.ui | 125 +- 2 files changed, 94 insertions(+), 77 deletions(-) New commits: commit a86af5919e19d989ee9344071b1bb13140cb83ef Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 15 09:50:21 2013 +0100 attempt at HIG compliance (./bin/lint-ui.py path/to/.ui) and tweak some strings Change-Id: Ib5886e8bbb6de653682df36b59aa60d9c39aef30 diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 356a54d..cc06041 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -213,63 +213,63 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers() { boost::random::uniform_real_distribution distribution(parameter1, parameter2); boost::variate_generatorboost::mt19937, boost::random::uniform_real_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_UNIFORM_REAL))); +GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_UNIFORM_REAL)); break; } case DIST_UNIFORM_INTEGER: { boost::random::uniform_int_distribution distribution(parameterInteger1, parameterInteger2); boost::variate_generatorboost::mt19937, boost::random::uniform_int_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_UNIFORM_INTEGER))); +GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_UNIFORM_INTEGER)); break; } case DIST_NORMAL: { boost::random::normal_distribution distribution(parameter1, parameter2); boost::variate_generatorboost::mt19937, boost::random::normal_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_NORMAL))); +GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_NORMAL)); break; } case DIST_CAUCHY: { boost::random::cauchy_distribution distribution(parameter1); boost::variate_generatorboost::mt19937, boost::random::cauchy_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_CAUCHY))); +GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_CAUCHY)); break; } case DIST_BERNOULLI: { boost::random::bernoulli_distribution distribution(parameter1); boost::variate_generatorboost::mt19937, boost::random::bernoulli_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_BERNOULLI))); +GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_BERNOULLI)); break; } case DIST_BINOMIAL: { boost::random::binomial_distribution distribution(parameterInteger2, parameter1); boost::variate_generatorboost::mt19937, boost::random::binomial_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_BINOMIAL))); +GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_BINOMIAL)); break; } case DIST_NEGATIVE_BINOMIAL: { boost::random::negative_binomial_distribution distribution(parameterInteger2, parameter1); boost::variate_generatorboost::mt19937, boost::random::negative_binomial_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_NEGATIVE_BINOMIAL))); +GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_NEGATIVE_BINOMIAL)); break; } case DIST_CHI_SQUARED: { boost::random::chi_squared_distribution distribution(parameter1); boost::variate_generatorboost::mt19937, boost::random::chi_squared_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_CHI_SQUARED))); +GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_CHI_SQUARED)); break; } case DIST_GEOMETRIC: { boost::random::geometric_distribution distribution(parameter1); boost::variate_generatorboost::mt19937, boost::random::geometric_distribution rng(seed, distribution); -GenerateNumbers(rng, OUString(ScResId(STR_DISTRIBUTION_GEOMETRIC))); +GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_GEOMETRIC)); break; } } @@ -278,8 +278,8 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers() templateclass RNG void
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sw/source
sw/source/ui/uiview/formatclipboard.cxx | 13 + 1 file changed, 1 insertion(+), 12 deletions(-) New commits: commit 09b20c794a6647d3dd364e0f12d139532a1689bd Author: Miklos Vajna vmik...@suse.cz Date: Fri Jul 12 16:02:43 2013 +0200 bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributes Paragraph attributes were set directly on the SwTxtNodes, instead of going through SwWrtShell::SetAttr(), which handles undo/redo. Regression from 357fac9713875302d30185feabaf5c165e040ca4. (cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61) Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6 Reviewed-on: https://gerrit.libreoffice.org/4868 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com (cherry picked from commit 5156749cde88c5274b36a22dab7b561d59b93cf1) Reviewed-on: https://gerrit.libreoffice.org/4871 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 5dd7ef2..f7e41a6 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -538,19 +538,8 @@ void SwFormatClipboard::Paste( SwWrtShell rWrtShell, SfxStyleSheetBasePool* pPo // remove attribute that were applied by named text and paragraph formatting lcl_RemoveEqualItems( *pTemplateItemSet, aItemVector ); -// it can't be a multiple selection -SwPaM* pCrsr = rWrtShell.GetCrsr(); - // apply the paragraph automatic attributes to all the nodes in the selection -for (SwNodeIndex pNodeIndexIterator = pCrsr-Start()-nNode, - pNodeIndexEnd = pCrsr-End()-nNode; -pNodeIndexIterator != pNodeIndexEnd; -++pNodeIndexIterator ) -{ -pNodeIndexIterator.GetNode().GetCntntNode()-SetAttr( *pTemplateItemSet ); -} -// same as pCrsr-End()-nNode.GetNode().GetCntntNode()-SetAttr -pCrsr-GetCntntNode()-SetAttr( *pTemplateItemSet ); +rWrtShell.SetAttr(*pTemplateItemSet); // store the attributes in aItemVector in order not to apply them as // text automatic formating attributes later in the code ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Weekly report about character border
Hi all, In the previous week I started to implement the painting. Some special problem came up, which might give me a hard time. The first very annoying one stem from the unpunctuality of the recent border painting (frame painting). It seems the border primitives are shifted toward the origo with some twips (1-2). In general it isn't a visible bug but character border magnifies the problem. Some screen shot: https://docs.google.com/document/d/12bm6XOXlj6N79GNnvMKull5KY8xe63QIidrg67GnQyE/edit?pli=1 First I got lcl_AlighWidth() and lcl_AlignHeight() methods which make similar modification on coordinates, however removing them improve the accuracy (so I don't know why these methods used at all), but it is not enough. So two thing can be erroneous: 1, painting of border line primitive 2, view transformation matrix (twip - pixel) Questions of these week. - In what unit does the geometrical object are? (logic\twip, convert to pixels for vcl processor) - Which part of the text is repainted while typing? (part of the text portion area, some character position before current cursor position) - How does the view changes the painting of objects? (character border now: when just the part of the text portion is seen on the screen then the hole border is painted around this part and so border is in the middle of the portion. Columns with dotted separator line: some extra dot is painted on the edges of the screen, so scrolling up and down can make the dotted line more thicker.) - How change the size of a text portion and make the cursor skip the border area? (start with SwTxtSizeInfo and SwTxtCursor) Regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Weekly report about character border
Hi all, In the previous week I started to implement the painting. Some special problem came up, which might give me a hard time. The first very annoying one stem from the unpunctuality of the recent border painting (frame painting). It seems the border primitives are shifted toward the origo with some twips (1-2). In general it isn't a visible bug but character border magnifies the problem. Some screenshot: https://docs.google.com/document/d/12bm6XOXlj6N79GNnvMKull5KY8xe63QIidrg67GnQyE/edit?pli=1 First I got lcl_AlighWidth() and lcl_AlignHeight() methods which make similar modification on coordinates, however removing them improve the accuracy (so I don't know why these methods used at all), but it is not enough. So two thing can be erroneous: 1, painting of border line primitive 2, view transformation matrix (twip - pixel) Questions of these week. - In what unit does the geometrical object are? (logic\twip, convert to pixels for vcl processor) - Which part of the text is repainted while typing? (part of the text portion area, some character position before current cursor position) - How does the view changes the painting of objects? (character border now: when just the part of the text portion is seen on the screen then the hole border is painted around this part and so border is in the middle of the portion. Columns with dotted separator line: some extra dot is painted on the edges of the screen, so scrolling up and down can make the dotted line more thicker.) - How change the size of a text portion and make the cursor skip the border area? (start with SwTxtSizeInfo and SwTxtCursor) Regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scripting/source
scripting/source/pyprov/mailmerge.py | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) New commits: commit 24078e3501042e8693ef1f9d3edebbc47e37ce12 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 15 10:25:31 2013 +0100 Related: fdo#66761 the double-encoding bug appears gone in python 3.3.2 i.e. I see the bug in our built-in python3 3.3.0 but not in my system python 3.3.2 and there's a raft of email related bug fixes in the 3.3.2/3.3.1 python Changelog Change-Id: I257770cd0ec41fc3b2f2a638009b075b9a2f325f diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index 6ed046b..201b5c9 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -189,8 +189,14 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): #it's a bytesequence, get raw bytes textbody = textbody.value if sys.version = '3': - #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w - textbody = textbody.decode('iso8859-1') + if sys.version_info.minor 3 or (sys.version_info.minor == 3 and sys.version_info.micro = 1): + #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w + #see http://bugs.python.org/16564, etc. basically it now *seems* to be all ok + #in python 3.3.2 onwards, but a little busted in 3.3.0 + + textbody = textbody.decode('iso8859-1') + else: + textbody = textbody.decode('utf-8') c = Charset('utf-8') c.body_encoding = QP textmsg.set_payload(textbody, c) @@ -472,15 +478,15 @@ class PyMailMessage(unohelper.Base, XMailMessage): self.bccrecipients.append(bccrecipient) def getRecipients( self ): if dbg: - print(PyMailMessage.getRecipients: + self.recipients, file=dbgout) + print(PyMailMessage.getRecipients: + str(self.recipients), file=dbgout) return tuple(self.recipients) def getCcRecipients( self ): if dbg: - print(PyMailMessage.getCcRecipients: + self.ccrecipients, file=dbgout) + print(PyMailMessage.getCcRecipients: + str(self.ccrecipients), file=dbgout) return tuple(self.ccrecipients) def getBccRecipients( self ): if dbg: - print(PyMailMessage.getBccRecipients: + self.bccrecipients, file=dbgout) + print(PyMailMessage.getBccRecipients: + str(self.bccrecipients), file=dbgout) return tuple(self.bccrecipients) def addAttachment( self, aMailAttachment ): if dbg: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo54900.rtf | 17 + sw/qa/extras/rtfimport/rtfimport.cxx | 13 + writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 + 3 files changed, 31 insertions(+) New commits: commit 431853bfae7dccd139804caf7ac2505a7c283e63 Author: Miklos Vajna vmik...@suse.cz Date: Mon Jul 15 11:24:39 2013 +0200 fdo#54900 RTF import: support setting para align after text Both Word and Writer typically write all paragraph properties before the first text in each paragraph, but at least for paragraph alignment, it's valid to write them at the end. Change-Id: I0337e63678ad45c662a204ab2fc59378607abe74 diff --git a/sw/qa/extras/rtfimport/data/fdo54900.rtf b/sw/qa/extras/rtfimport/data/fdo54900.rtf new file mode 100644 index 000..0ebd9d1 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo54900.rtf @@ -0,0 +1,17 @@ +{\rtf1\ansi\ansicpg1251\deflang1033 +{\fonttbl +{\f0\froman\fcharset204 TIMES NEW ROMAN;\f1\froman\fcharset204 TIMES NEW ROMAN;\f2\froman\fcharset204 ARIAL;\f3\froman\fcharset204 ARIAL;} +} +\sectd\lndscpsxn\pgwsxn16840\pghsxn11907\marglsxn1133\margrsxn850\margtsxn850\margbsxn850\linex0\headery709\footery709\colsx709\endnhere\sectdefaultcl +\b0\i0\nosupersub\b\f2 \fs28 +{\qc +\b0\i0\nosupersub\b\f3 \fs24 foo +\b0\i0\nosupersub\b\f2 \fs24 \par} +{\trowd\trql\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrdb\brdrw10\clbrdrr\brdrs\brdrw10\cellx453 +\intbl +{\b\f0\fs16 N +} +{\qc\b\f0\fs16\li0\ri0 \cell} +{\row} +\pard} +\par} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index bc8c7fc..8e89c7d 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -18,6 +18,7 @@ #include com/sun/star/style/CaseMap.hpp #include com/sun/star/style/LineSpacing.hpp #include com/sun/star/style/LineSpacingMode.hpp +#include com/sun/star/style/ParagraphAdjust.hpp #include com/sun/star/table/BorderLine2.hpp #include com/sun/star/table/BorderLineStyle.hpp #include com/sun/star/text/RelOrientation.hpp @@ -153,6 +154,7 @@ public: void testFdo39001(); void testGroupshape(); void testFdo66565(); +void testFdo54900(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -291,6 +293,7 @@ void Test::run() {fdo39001.rtf, Test::testFdo39001}, {groupshape.rtf, Test::testGroupshape}, {fdo66565.rtf, Test::testFdo66565}, +{fdo54900.rtf, Test::testFdo54900}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1419,6 +1422,16 @@ void Test::testFdo66565() CPPUNIT_ASSERT_EQUAL(sal_Int16(304), getProperty uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(1), TableColumnSeparators)[0].Position); } +void Test::testFdo54900() +{ +uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY); +uno::Referencetext::XTextTable xTable(xTables-getByIndex(0), uno::UNO_QUERY); +uno::Referencetext::XTextRange xCell(xTable-getCellByName(A1), uno::UNO_QUERY); +// Paragraph was aligned to left, should be center. +CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, static_caststyle::ParagraphAdjust(getPropertysal_Int16(getParagraphOfText(1, xCell-getText()), ParaAdjust))); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index b3374de..1673b73 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2027,6 +2027,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) { RTFValue::Pointer_t pValue(new RTFValue(nParam)); m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PJc, pValue); +m_bNeedPap = true; return 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - .gitignore ios/iosremote
.gitignore |2 dev/null |binary ios/iosremote/.DS_Store |binary ios/iosremote/ic_launcher.png|binary ios/iosremote/ic_launc...@2x.png |binary ios/iosremote/ic_launc...@2x.psd |binary ios/iosremote/iosremote/.DS_Store|binary ios/iosremote/iosremote/Communication/Client.m | 54 ++- ios/iosremote/iosremote/Communication/CommunicationManager.m | 15 +-- ios/iosremote/iosremote/Communication/pinValidation_vc.m |1 10 files changed, 42 insertions(+), 30 deletions(-) New commits: commit 062de1e49312fda5e184d12576d37a569769bb86 Author: siqi m...@siqi.fr Date: Mon Jul 15 12:04:17 2013 +0200 improved thread safety during disconnection diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store index eb47908..493f094 100644 Binary files a/ios/iosremote/.DS_Store and b/ios/iosremote/.DS_Store differ diff --git a/ios/iosremote/ic_launcher.png b/ios/iosremote/ic_launcher.png index f81bf7a..508d947 100644 Binary files a/ios/iosremote/ic_launcher.png and b/ios/iosremote/ic_launcher.png differ diff --git a/ios/iosremote/ic_launc...@2x.png b/ios/iosremote/ic_launc...@2x.png index 308..6febfad 100644 Binary files a/ios/iosremote/ic_launc...@2x.png and b/ios/iosremote/ic_launc...@2x.png differ diff --git a/ios/iosremote/ic_launc...@2x.psd b/ios/iosremote/ic_launc...@2x.psd index 2b8023b..7b50ef9 100644 Binary files a/ios/iosremote/ic_launc...@2x.psd and b/ios/iosremote/ic_launc...@2x.psd differ diff --git a/ios/iosremote/iosremote/.DS_Store b/ios/iosremote/iosremote/.DS_Store index 5008ddf..ef99c3a 100644 Binary files a/ios/iosremote/iosremote/.DS_Store and b/ios/iosremote/iosremote/.DS_Store differ diff --git a/ios/iosremote/iosremote/Communication/Client.m b/ios/iosremote/iosremote/Communication/Client.m index 1320de1..a17f097 100644 --- a/ios/iosremote/iosremote/Communication/Client.m +++ b/ios/iosremote/iosremote/Communication/Client.m @@ -42,12 +42,14 @@ dispatch_queue_t backgroundQueue; +NSLock *streamStatusLock; - (id) initWithServer:(Server*)server managedBy:(CommunicationManager*)manager interpretedBy:(CommandInterpreter*)receiver { self = [self init]; +streamStatusLock = [[NSLock alloc] init]; if (self) { self.connected = NO; @@ -65,7 +67,7 @@ dispatch_queue_t backgroundQueue; - (void)startConnectionTimeoutTimerwithInterval:(double) interval { [self stopConnectionTimeoutTimer]; // Or make sure any existing timer is stopped before this method is called - + self.connectionTimeoutTimer = [NSTimer scheduledTimerWithTimeInterval:interval target:self selector:@selector(handleConnectionTimeout) @@ -101,17 +103,17 @@ dispatch_queue_t backgroundQueue; { // Look up if there is already a pin code for this client. NSUserDefaults * userDefaluts = [NSUserDefaults standardUserDefaults]; - + if(!userDefaluts) NSLog(@userDefaults nil); NSInteger newPin = [userDefaluts integerForKey:self.name]; - + // If not, generate one. if (!newPin) { newPin = arc4random() % ; [userDefaluts setInteger:newPin forKey:self.name]; } - + return newPin; } @@ -121,12 +123,12 @@ dispatch_queue_t backgroundQueue; CFReadStreamRef readStream; CFWriteStreamRef writeStream; CFStreamCreatePairWithSocketToHost(kCFAllocatorDefault, (__bridge CFStringRef)ip, portNumber, readStream, writeStream); - + if(readStream writeStream) { CFReadStreamSetProperty(readStream, kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanTrue); CFWriteStreamSetProperty(writeStream, kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanTrue); - + //Setup mInputStream self.inputStream = (__bridge NSInputStream *)readStream; [self.inputStream setDelegate:self]; @@ -134,7 +136,7 @@ dispatch_queue_t backgroundQueue; [self.inputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; }); [self.inputStream open]; - + //Setup outputstream self.outputStream = (__bridge NSOutputStream *)writeStream; [self.outputStream setDelegate:self]; @@ -142,10 +144,10 @@ dispatch_queue_t backgroundQueue; [self.outputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; }); [self.outputStream open]; - + NSArray *temp = [[NSArray alloc]initWithObjects:@LO_SERVER_CLIENT_PAIR\n, self.name, @\n, self.pin, @\n\n, nil]; NSString *command =
[Libreoffice-commits] core.git: vcl/coretext
vcl/coretext/ctlayout.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 9a6ba2dacbcad6a326613a691b005348e3d8cedd Author: Khaled Hosny khaledho...@eglug.org Date: Mon Jul 15 11:32:30 2013 +0200 fdo#66577: Cursor displaced in Web Layout Using lrint() helps a bit, but does not fix the issue entirely. Change-Id: Ib80e2c5a57d632f289e49322d3712c6321ae1ec2 diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx index dd3b2ea..935dc94 100644 --- a/vcl/coretext/ctlayout.cxx +++ b/vcl/coretext/ctlayout.cxx @@ -342,7 +342,7 @@ int CTLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point rPos, int // convert glyph details for VCL *(pGlyphIDs++) = pCGGlyphIdx[ nSubIndex ]; if( pGlyphAdvances ) -*(pGlyphAdvances++) = pCGGlyphAdvs[ nSubIndex ].width; +*(pGlyphAdvances++) = lrint(pCGGlyphAdvs[ nSubIndex ].width); if( pCharIndexes ) *(pCharIndexes++) = pCGGlyphStrIdx[ nSubIndex] + mnMinCharPos; if( pFallbackFonts ) @@ -407,7 +407,7 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const CTRunGetStringIndices( pGlyphRun, aFullRange, aIndexVec[0] ); for( int i = 0; i != nGlyphCount; ++i ) { const int nRelIdx = aIndexVec[i]; -pDXArray[ nRelIdx ] += aSizeVec[i].width; +pDXArray[ nRelIdx ] += lrint(aSizeVec[i].width); } } } @@ -501,10 +501,10 @@ bool CTLayout::GetBoundRect( SalGraphics rGraphics, Rectangle rVCLRect ) const CGContextRestoreGState( rAquaGraphics.mrContext ); -rVCLRect.Left() = aVclPos.x + aMacRect.origin.x; -rVCLRect.Right() = aVclPos.x + (aMacRect.origin.x + aMacRect.size.width); -rVCLRect.Bottom() = aVclPos.x - (aMacRect.origin.y); -rVCLRect.Top()= aVclPos.x - (aMacRect.origin.y + aMacRect.size.height); +rVCLRect.Left() = aVclPos.x + lrint(aMacRect.origin.x); +rVCLRect.Right() = aVclPos.x + lrint(aMacRect.origin.x + aMacRect.size.width); +rVCLRect.Bottom() = aVclPos.x - lrint(aMacRect.origin.y); +rVCLRect.Top()= aVclPos.x - lrint(aMacRect.origin.y + aMacRect.size.height); return true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/frmdlg/frmpage.cxx |5 + sw/source/ui/inc/frmpage.hxx |1 + sw/uiconfig/swriter/ui/frmaddpage.ui |2 +- 3 files changed, 7 insertions(+), 1 deletion(-) New commits: commit 2d3caece27d2353d0e7d82917c32aceba45859c5 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sun Jul 14 19:39:19 2013 -0300 Remove a glitch left in sweb frame dialog widget UI Under Writer Web, Pictures and OLE objects have no properties Change-Id: I18bf1820512a54181181d32b89356aebd0dfa4cb Reviewed-on: https://gerrit.libreoffice.org/4905 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 4240747..1045e27 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2752,6 +2752,7 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet rSet ) : get(pProtectFrameCB,protectframe); get(pProtectSizeCB,protectsize); +get(pPropertiesFrame,properties); get(pEditInReadonlyCB,editinreadonly); get(pPrintFrameCB,printframe); get(pTextFlowFT,textflow_label); @@ -2782,6 +2783,10 @@ void SwFrmAddPage::Reset(const SfxItemSet rSet ) if ( DLG_FRM_GRF == nDlgType || DLG_FRM_OLE == nDlgType ) { pEditInReadonlyCB-Hide(); +if (bHtmlMode) +{ +pPropertiesFrame-Hide(); +} } if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_ALT_NAME, sal_False, pItem)) diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 4a7ab7d..4858bbd 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -284,6 +284,7 @@ class SwFrmAddPage : public SfxTabPage CheckBox* pProtectFrameCB; CheckBox* pProtectSizeCB; +VclContainer* pPropertiesFrame; CheckBox* pEditInReadonlyCB; CheckBox* pPrintFrameCB; FixedText*pTextFlowFT; diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui index 168dac7..96e6fa6 100644 --- a/sw/uiconfig/swriter/ui/frmaddpage.ui +++ b/sw/uiconfig/swriter/ui/frmaddpage.ui @@ -271,7 +271,7 @@ /packing /child child - object class=GtkFrame id=frame3 + object class=GtkFrame id=properties property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property ___ 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 Bug 60270 depends on bug 57631, which changed state. Bug 57631 Summary: FILESAVE: [REGRESSION] After saving a drawing all formcontrol settings are not saved - reverts to default after reloading https://bugs.freedesktop.org/show_bug.cgi?id=57631 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/unodraw/unoshape.cxx | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) New commits: commit d3d95afe5856ef06659d61c3572c7682e5a03766 Author: David Tardon dtar...@redhat.com Date: Mon Jul 15 12:23:40 2013 +0200 fdo#57631 fix collection of property states Change-Id: I607518da26c9430916d922b8e36143cc6dd76f25 diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 4c1628b..68267c7 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3030,16 +3030,8 @@ uno::Sequence beans::PropertyState SAL_CALL SvxShape::getPropertyStates( cons uno::Sequence beans::PropertyState aRet( nCount ); beans::PropertyState* pState = aRet.getArray(); -if( mpImpl-mpMaster ) -{ -for( sal_Int32 nIdx = 0; nIdx nCount; nIdx++ ) -pState[nIdx] = mpImpl-mpMaster-getPropertyState( pNames[nIdx] ); -} -else -{ -for( sal_Int32 nIdx = 0; nIdx nCount; nIdx++ ) -pState[nIdx] = _getPropertyState( pNames[nIdx] ); -} +for( sal_Int32 nIdx = 0; nIdx nCount; nIdx++ ) +pState[nIdx] = getPropertyState( pNames[nIdx] ); return aRet; } ___ 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-0' - sc/source sd/source
sc/source/ui/unoobj/scdetect.cxx |5 ++--- sd/source/ui/unoidl/sddetect.cxx |4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) New commits: commit e7a43ee7c00b2e244ceb6218b8d342f7656736a9 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Fri Jul 12 18:02:23 2013 -0400 fdo#64448: Don't get type name from incorrect filter. This causes wrong format type to get detected when testing for a completely different file format type. Change-Id: I230759e2be432beeae2db24c12369ccb4585f334 Reviewed-on: https://gerrit.libreoffice.org/4877 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz Reviewed-by: David Tardon dtar...@redhat.com diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 6d8a7dc..fd81a8c 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -794,10 +794,9 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequencebeans::PropertyValue l lDescriptor[nIndexOfFilterName].Value = OUString(pFilter-GetName()); } -if ( pFilter ) -aTypeName = pFilter-GetTypeName(); -else +if (!pFilter) aTypeName.Erase(); + return aTypeName; } diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index b598093..9e98a7b 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -496,9 +496,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence beans::PropertyValue lDes lDescriptor[nIndexOfDocumentTitle].Value = aDocumentTitle; } -if ( pFilter ) -aTypeName = pFilter-GetTypeName(); -else +if (!pFilter) aTypeName = OUString(); return aTypeName; ___ 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' - scripting/source
scripting/source/pyprov/mailmerge.py | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) New commits: commit c71f67198cd6fc98f77289c4f0276a45d19700d8 Author: Caolán McNamara caol...@redhat.com Date: Sat Jul 13 21:45:29 2013 +0100 Related: fdo#66761 the double-encoding bug appears gone in python 3.3.2 i.e. I see the bug in our built-in python3 3.3.0 but not in my system python 3.3.2 and there's a raft of email related bug fixes in the 3.3.2/3.3.1 python Changelog Change-Id: I257770cd0ec41fc3b2f2a638009b075b9a2f325f (cherry picked from commit 24078e3501042e8693ef1f9d3edebbc47e37ce12) Related: fdo#66761 we want the bytes, not a str representation of them Change-Id: I3c268b0c51f7e1ddd2fa6588f40412a33f316b52 (cherry picked from commit f460556bfa6bd55df3cd4b2288524d63db284d7e) Reviewed-on: https://gerrit.libreoffice.org/4909 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index af10dbe..3cfb6d3 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -182,12 +182,20 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): textmsg['MIME-Version'] = '1.0' try: + #it's a string, get it as utf-8 bytes textbody = textbody.encode('utf-8') except: - textbody = str(textbody.value).encode('utf-8') + #it's a bytesequence, get raw bytes + textbody = textbody.value if sys.version = '3': - #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w - textbody = textbody.decode('iso8859-1') + if sys.version_info.minor 3 or (sys.version_info.minor == 3 and sys.version_info.micro = 1): + #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w + #see http://bugs.python.org/16564, etc. basically it now *seems* to be all ok + #in python 3.3.2 onwards, but a little busted in 3.3.0 + + textbody = textbody.decode('iso8859-1') + else: + textbody = textbody.decode('utf-8') c = Charset('utf-8') c.body_encoding = QP textmsg.set_payload(textbody, c) @@ -469,15 +477,15 @@ class PyMailMessage(unohelper.Base, XMailMessage): self.bccrecipients.append(bccrecipient) def getRecipients( self ): if dbg: - print(PyMailMessage.getRecipients: + self.recipients, file=dbgout) + print(PyMailMessage.getRecipients: + str(self.recipients), file=dbgout) return tuple(self.recipients) def getCcRecipients( self ): if dbg: - print(PyMailMessage.getCcRecipients: + self.ccrecipients, file=dbgout) + print(PyMailMessage.getCcRecipients: + str(self.ccrecipients), file=dbgout) return tuple(self.ccrecipients) def getBccRecipients( self ): if dbg: - print(PyMailMessage.getBccRecipients: + self.bccrecipients, file=dbgout) + print(PyMailMessage.getBccRecipients: + str(self.bccrecipients), file=dbgout) return tuple(self.bccrecipients) def addAttachment( self, aMailAttachment ): if dbg: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||57631 -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|57631 | -- 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: librelogo/source
librelogo/source/ChangeLog | 16 +++- librelogo/source/LibreLogo/LibreLogo.py | 42 +--- 2 files changed, 49 insertions(+), 9 deletions(-) New commits: commit 6fb6817e30f746d8d2100cc606a3cfbb1cbea86a Author: László Németh nem...@numbertext.org Date: Mon Jul 15 12:41:37 2013 +0200 librelogo: hexa arguments fdo#66917 and cropped SVG saving Change-Id: I12ad6b63221bce0ed7d988f5c0f91dce81055ec0 diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog index 0a04813..e056c19 100644 --- a/librelogo/source/ChangeLog +++ b/librelogo/source/ChangeLog @@ -1,4 +1,18 @@ -2012-02-24 László Németh: +2013-07-15 László Németh: +* optional named PICTURE blocks: PICTURE name [ CIRCLE 5 ] +* save PICTURE as cropped SVG file using path names, for example: + PICTURE example.svg [ CIRCLE 5 CIRCLE 20 ] ; save in the home directory + PICTURE /home/user/example.svg [ CIRCLE 10 ] ; absolute path (on Linux) + PICTURE tmp/example.svg [ CIRCLE 10 ] ; relative to the home directory +* support hexadecimal arguments + +2013-06-26 László Németh +* clockwise HEADING + +2013-04-30 László Németh +* fix hide/show turtle + +2013-02-24 László Németh: * fix Asian and CTL language support. Language recognition depends from the UI language of LibreOffice and the language(s) of the document. * fix turtle shape, the problem with the old arrow-like turtle shape diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index c13c705..e73a173 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -697,10 +697,13 @@ def __cs__(select = True): if select: _.doc.CurrentController.select(_.drawpage) -def __dispatcher__(s, properties = ()): +def __dispatcher__(s, properties = (), doc = 0): ctx = XSCRIPTCONTEXT.getComponentContext() d = ctx.ServiceManager.createInstanceWithContext(com.sun.star.frame.DispatchHelper, ctx) -d.executeDispatch(_.doc.CurrentController.Frame, s, , 0, properties) +if doc != 0: + d.executeDispatch(doc.CurrentController.Frame, s, , 0, properties) +else: + d.executeDispatch(_.doc.CurrentController.Frame, s, , 0, properties) def __getshape__(shapename): try: @@ -1195,15 +1198,17 @@ def position(n = -1): pos.X, pos.Y = pos.X + turtle.BoundRect.Width / 2.0, pos.Y + turtle.BoundRect.Height / 2.0 return [ pos.X * __MM10_TO_TWIP__ / __PT_TO_TWIP__, pos.Y * __MM10_TO_TWIP__ / __PT_TO_TWIP__ ] -def __groupstart__(): +def __groupstart__(name = ): global __group__, __grouplefthang__, __groupstack__ __removeshape__(__ACTUAL__) __groupstack__.append(__group__) +if name != : # store pic name (for correct repcount) + __groupstack__.append(name) __groupstack__.append(__grouplefthang__) __group__ = uno.getComponentContext().ServiceManager.createInstance('com.sun.star.drawing.ShapeCollection') __grouplefthang__ = 0 -def __groupend__(): +def __groupend__(name = ): global __group__, __grouplefthang__, __groupstack__ g = 0 if __group__.getCount() 1: @@ -1223,6 +1228,26 @@ def __groupend__(): elif __group__.getCount() == 1: g = __group__.getByIndex(0) __grouplefthang__ = min(__groupstack__.pop(), __grouplefthang__) +if name != : + name = __groupstack__.pop() +if name and .SVG == name[-4:].upper() and g: + _.doc.CurrentController.select(g) + __dispatcher__(.uno:Copy) + ctx = XSCRIPTCONTEXT.getComponentContext() + d = ctx.ServiceManager.createInstanceWithContext(com.sun.star.frame.Desktop, ctx) + draw = d.loadComponentFromURL(private:factory/sdraw, _blank, 0, ()) + drawpage = draw.getDrawPages().getByIndex(0) + __dispatcher__(.uno:Paste, (), draw) + pic = drawpage.getByIndex(0) + pic.setPosition(__Point__((g.BoundRect.Width - g.Size.Width)//2, (g.BoundRect.Height - g.Size.Height)//2)) + drawpage.Height, drawpage.Width = g.BoundRect.Height, g.BoundRect.Width + __time__.sleep(1) # avoid writing problem + if not os.path.isabs(name): +name = os.path.expanduser('~') + os.path.sep + name + __dispatcher__(.uno:ExportTo, (__getprop__(URL, unohelper.systemPathToFileUrl(name)), __getprop__(FilterName, draw_svg_Export)), draw) + __time__.sleep(1) + draw.dispose() + __group__ = __groupstack__.pop() if __group__ and g: __group__.add(g) @@ -1255,7 +1280,8 @@ def __loadlang__(lang, a): { i: repcount + str(next(loopi)), j: repcount, orig: re.sub( r(?ui)(?!:)\b%s\b % repcount, repcount + str(next(loopi)-1), r.group(0)) } __comp__[lang] = [ [r(?i)(?!:)(\b|(?=[-:]))(?:%s)\b % |.join([a[i].lower() for i in a if not _ in i and i != DECIMAL]), lambda s: s.group().upper()], # uppercase all native commands in the source code -
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo54900.rtf | 17 + sw/qa/extras/rtfimport/rtfimport.cxx | 13 + writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 + 3 files changed, 31 insertions(+) New commits: commit 49d3f271b0da11f1793135b067b9b5d4f48cf537 Author: Miklos Vajna vmik...@suse.cz Date: Mon Jul 15 11:24:39 2013 +0200 fdo#54900 RTF import: support setting para align after text Both Word and Writer typically write all paragraph properties before the first text in each paragraph, but at least for paragraph alignment, it's valid to write them at the end. (cherry picked from commit 431853bfae7dccd139804caf7ac2505a7c283e63) Change-Id: I0337e63678ad45c662a204ab2fc59378607abe74 Reviewed-on: https://gerrit.libreoffice.org/4913 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/sw/qa/extras/rtfimport/data/fdo54900.rtf b/sw/qa/extras/rtfimport/data/fdo54900.rtf new file mode 100644 index 000..0ebd9d1 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo54900.rtf @@ -0,0 +1,17 @@ +{\rtf1\ansi\ansicpg1251\deflang1033 +{\fonttbl +{\f0\froman\fcharset204 TIMES NEW ROMAN;\f1\froman\fcharset204 TIMES NEW ROMAN;\f2\froman\fcharset204 ARIAL;\f3\froman\fcharset204 ARIAL;} +} +\sectd\lndscpsxn\pgwsxn16840\pghsxn11907\marglsxn1133\margrsxn850\margtsxn850\margbsxn850\linex0\headery709\footery709\colsx709\endnhere\sectdefaultcl +\b0\i0\nosupersub\b\f2 \fs28 +{\qc +\b0\i0\nosupersub\b\f3 \fs24 foo +\b0\i0\nosupersub\b\f2 \fs24 \par} +{\trowd\trql\clbrdrt\brdrdb\brdrw10\clbrdrl\brdrdb\brdrw10\clbrdrr\brdrs\brdrw10\cellx453 +\intbl +{\b\f0\fs16 N +} +{\qc\b\f0\fs16\li0\ri0 \cell} +{\row} +\pard} +\par} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index fd05bdc..58353bf 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -17,6 +17,7 @@ #include com/sun/star/style/CaseMap.hpp #include com/sun/star/style/LineSpacing.hpp #include com/sun/star/style/LineSpacingMode.hpp +#include com/sun/star/style/ParagraphAdjust.hpp #include com/sun/star/table/BorderLine2.hpp #include com/sun/star/table/BorderLineStyle.hpp #include com/sun/star/text/RelOrientation.hpp @@ -144,6 +145,7 @@ public: void testN823655(); void testFdo39001(); void testFdo66565(); +void testFdo54900(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -276,6 +278,7 @@ void Test::run() {n823655.rtf, Test::testN823655}, {fdo39001.rtf, Test::testFdo39001}, {fdo66565.rtf, Test::testFdo66565}, +{fdo54900.rtf, Test::testFdo54900}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1330,6 +1333,16 @@ void Test::testFdo66565() CPPUNIT_ASSERT_EQUAL(sal_Int16(304), getProperty uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(1), TableColumnSeparators)[0].Position); } +void Test::testFdo54900() +{ +uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY); +uno::Referencetext::XTextTable xTable(xTables-getByIndex(0), uno::UNO_QUERY); +uno::Referencetext::XTextRange xCell(xTable-getCellByName(A1), uno::UNO_QUERY); +// Paragraph was aligned to left, should be center. +CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, static_caststyle::ParagraphAdjust(getPropertysal_Int16(getParagraphOfText(1, xCell-getText()), ParaAdjust))); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 8bf0e06..fe15892 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2006,6 +2006,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) { RTFValue::Pointer_t pValue(new RTFValue(nParam)); m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PJc, pValue); +m_bNeedPap = true; return 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/iosremote
dev/null |binary 1 file changed New commits: commit 84ceab8140e6460ed42e04bdc72bab598ed167ba Author: siqi m...@siqi.fr Date: Mon Jul 15 13:00:36 2013 +0200 remove DS_Store cache diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store deleted file mode 100644 index c8e6f9f..000 Binary files a/ios/iosremote/.DS_Store and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - ios/iosremote
ios/iosremote/.DS_Store |binary ios/iosremote/ic_launcher.psd|binary ios/iosremote/iosremote/Communication/CommunicationManager.m | 40 +++ 3 files changed, 29 insertions(+), 11 deletions(-) New commits: commit a2e2873ac39a7882b1c596b12c402504ffb5a4d8 Author: siqi m...@siqi.fr Date: Mon Jul 15 12:59:06 2013 +0200 help button diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store index 24bebe4..c8e6f9f 100644 Binary files a/ios/iosremote/.DS_Store and b/ios/iosremote/.DS_Store differ diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m b/ios/iosremote/iosremote/Communication/CommunicationManager.m index 306b6c9..5538736 100644 --- a/ios/iosremote/iosremote/Communication/CommunicationManager.m +++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m @@ -18,7 +18,7 @@ #define ExistingServersKey @CommunicationManager.ExistingServers -@interface CommunicationManager() +@interface CommunicationManager() UIAlertViewDelegate @end // Singlton Pattern @@ -49,7 +49,7 @@ if([[note name] isEqualToString:@connection.status.connected]){ if (self.state!=CONNECTED){ NSLog(@Connected, waiting for pairing response); -// A 5 seconds timer waiting for pairing response. +// A 5 seconds timer waiting for pairing response. [self.client startConnectionTimeoutTimerwithInterval:5.0]; self.transmitter = [[CommandTransmitter alloc] initWithClient:self.client]; } @@ -61,8 +61,8 @@ self.state = DISCONNECTED; dispatch_async(dispatch_get_main_queue(), ^{ UIAlertView *message = [[UIAlertView alloc] initWithTitle:@Failed to reach server - message:@Please verify the IP address and try again later - delegate:nil + message:@Please verify your IP address and make sure that LibreOffice Impress is running with impress remote feature enabled. + delegate:self cancelButtonTitle:@OK otherButtonTitles:@Help, nil]; [message show]; @@ -71,6 +71,24 @@ } } +- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{ +if (buttonIndex == 0){ +[alertView dismissWithClickedButtonIndex:0 animated:YES]; +}else if (buttonIndex == 1){ +[alertView dismissWithClickedButtonIndex:0 animated:YES]; +UIAlertView *message = [[UIAlertView alloc] initWithTitle:@Pairing instructions + message:@1. Launch your LibreOffice Impress on your Computer\n\n +@2. Enable Preferences - LibreOffice Impress - General - Enable remote control\n\n +@3. Enable Preferences - LibreOffice Impress - Advanced - Enable Experimental Features\n\n +@4. Make sure your Computer and your device are connected to the same WiFi network and Enter your Computer's IP address\n\n +@5. Connect and Enjoy!\n\n + delegate:nil +cancelButtonTitle:@OK +otherButtonTitles:nil]; +[message show]; +} +} + - (id) init { self = [super init]; @@ -108,7 +126,7 @@ self.servers = [[NSMutableArray alloc] initWithArray:oldSavedArray]; else self.servers = [[NSMutableArray alloc] init]; -} +} return self; } @@ -117,12 +135,12 @@ if (self.state == CONNECTING) { return; } else { -[self.client disconnect]; -self.state = CONNECTING; -// initialise it with a given server -self.client = [[Client alloc]initWithServer:server managedBy:self interpretedBy:self.interpreter]; -self.transmitter = [[CommandTransmitter alloc] initWithClient:self.client]; -[self.client connect]; +[self.client disconnect]; +self.state = CONNECTING; +// initialise it with a given server +self.client = [[Client alloc]initWithServer:server managedBy:self interpretedBy:self.interpreter]; +self.transmitter = [[CommandTransmitter alloc] initWithClient:self.client]; +[self.client connect]; } } commit bd3bbccd59e0f7b67d4082228fe45bfa763fc3f4 Author: siqi m...@siqi.fr Date: Mon Jul 15 12:54:40 2013 +0200 icon psd diff --git a/ios/iosremote/ic_launcher.psd b/ios/iosremote/ic_launcher.psd new
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - offapi/com offapi/UnoApi_offapi.mk svtools/source
offapi/UnoApi_offapi.mk |1 offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl | 38 -- svtools/source/uno/treecontrolpeer.cxx| 10 ++-- 3 files changed, 6 insertions(+), 43 deletions(-) New commits: commit 4079afed49aaa5b1d84443a21f63007754ba31ae Author: Noel Power noel.po...@suse.com Date: Fri Jul 12 14:22:30 2013 +0100 fix fdo#66586 Revert fdo#46808, create IDL fortree::DefaultTreeDataModel This reverts commit fcd01fba69db6de6cfc983fae65b6ba6764de0d6. Service DefaultTreeDataModel actually doens't exist ( and we can't find when/where it used to :-( ) The treecontrolpeer.cxx change to use the new service also had the undesired effect of throwing an exception when the UnoTreeControl model is inserted ( previously this failed silently ) The net effect is the dialog control is malformed and not initialised correctly (cherry picked from commit df9f26c22a59ae2309201d2709ea5f8a0ecbf247) also partial revert of f50553593613cbefb7f197fed66498bb6556a39a on DefaultTreeDataModel.idl so the revert above would apply Change-Id: Id76cc12a5360f6435bd39ca86020655feba20c9f Reviewed-on: https://gerrit.libreoffice.org/4865 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 63ec527..4ebb043 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -70,7 +70,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\ UnoControlTabPageModel \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\ - DefaultTreeDataModel \ MutableTreeDataModel \ MutableTreeNode \ TreeControl \ diff --git a/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl b/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl deleted file mode 100644 index f8ad7b6..000 --- a/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/** - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef __com_sun_star_awt_tree_DefaultTreeDataModel_idl__ -#define __com_sun_star_awt_tree_DefaultTreeDataModel_idl__ - -#include com/sun/star/awt/tree/XTreeDataModel.idl - - -module com { module sun { module star { module awt { module tree { - - -/** -@since LibreOffice 4.1 - */ -service DefaultTreeDataModel : XTreeDataModel; - - -}; }; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index a403e31..e4976a6 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -22,8 +22,6 @@ #include com/sun/star/lang/XServiceInfo.hpp #include com/sun/star/lang/DisposedException.hpp #include com/sun/star/view/SelectionType.hpp -#include com/sun/star/awt/tree/DefaultTreeDataModel.hpp - #include toolkit/helper/property.hxx #include toolkit/helper/vclunohelper.hxx @@ -1230,8 +1228,12 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl rTree, const Refere if( !xDataModel.is() ) { -Reference XComponentContext xORB( ::comphelper::getProcessComponentContext() ); -mxDataModel.query( DefaultTreeDataModel::create(xORB)); +static const OUString aSN( RTL_CONSTASCII_USTRINGPARAM( com.sun.star.awt.tree.DefaultTreeDataModel ) ); +Reference XMultiServiceFactory xORB( ::comphelper::getProcessServiceFactory() ); +if( xORB.is() ) +{ +mxDataModel.query( xORB-createInstance( aSN ) ); +} } mxDataModel = xDataModel; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc3' - firebird/ExternalPackage_firebird.mk firebird/ExternalProject_firebird.mk firebird/firebird-macosx.patch.1 firebird/UnpackedTarball_fi
firebird/ExternalPackage_firebird.mk |6 + firebird/ExternalProject_firebird.mk |4 firebird/UnpackedTarball_firebird.mk |6 + firebird/firebird-macosx.patch.1 | 153 ++ solenv/bin/macosx-change-install-names.pl |4 5 files changed, 171 insertions(+), 2 deletions(-) New commits: commit d5753044ed89a34f8b17a2219eef3e81bd930309 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Mon Jul 15 13:07:14 2013 +0200 Patch firebird to build on Mac. Change-Id: I47ac500922d7e834f5915cc8fb1e19d584675620 diff --git a/firebird/ExternalPackage_firebird.mk b/firebird/ExternalPackage_firebird.mk index 8039bec..43127b5 100644 --- a/firebird/ExternalPackage_firebird.mk +++ b/firebird/ExternalPackage_firebird.mk @@ -15,9 +15,15 @@ ifeq ($(OS)-$(COM),WNT-MSC) $(eval $(call gb_ExternalPackage_add_file,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) $(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib)) else +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.2.5.2.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.2.5.dylib,gen/firebird/lib/libfbembed.dylib.2.5)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib)) +else $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5)) $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so)) endif +endif # vim: set noet sw=4 ts=4: diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk index 7f43d17..b0f639c 100644 --- a/firebird/ExternalProject_firebird.mk +++ b/firebird/ExternalProject_firebird.mk @@ -38,7 +38,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -L$(OUTDIR)/lib \ -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ export LD_LIBRARY_PATH=$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ -export PATH=$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib) \ +export DYLD_LIBRARY_PATH=$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ + $(if $(filter WNT,$(OS)), export PATH=$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)) \ ./configure \ --without-editline \ --disable-superserver \ @@ -46,6 +47,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ +export CHANGE_INSTALL_NAMES=$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl fb OOO \ $(MAKE) firebird_embedded \ ) # vim: set noet sw=4 ts=4: diff --git a/firebird/UnpackedTarball_firebird.mk b/firebird/UnpackedTarball_firebird.mk index b37cebb..b474b00 100644 --- a/firebird/UnpackedTarball_firebird.mk +++ b/firebird/UnpackedTarball_firebird.mk @@ -20,4 +20,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ firebird/firebird-cygwin-msvc.patch.1 \ )) endif + +ifeq ($(OS),MACOSX) +$(eval $(call gb_UnpackedTarball_add_patches,firebird,\ + firebird/firebird-macosx.patch.1 \ +)) +endif # vim: set noet sw=4 ts=4: diff --git a/firebird/firebird-macosx.patch.1 b/firebird/firebird-macosx.patch.1 new file mode 100644 index 000..5794a96 --- /dev/null +++ b/firebird/firebird-macosx.patch.1 @@ -0,0 +1,153 @@ +Only in firebird: Makefile +Only in firebird: build.log +diff -ur firebird.org/builds/posix/Makefile.in.codes firebird/builds/posix/Makefile.in.codes +--- firebird.org/builds/posix/Makefile.in.codes2013-07-12 20:55:46.0 +0200 firebird/builds/posix/Makefile.in.codes2013-07-15 11:43:26.0 +0200 +@@ -63,7 +63,7 @@ + + $(BIN)/codes$(EXEC_EXT): $(CODES_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS) +- ++ $(CHANGE_INSTALL_NAMES) $@ + + # Rebuild ids.h + $(SRC_ROOT)/include/gen/ids.h:$(SRC_ROOT)/misc/ids.m $(SRC_ROOT)/jrd/relations.h +diff -ur firebird.org/builds/posix/Makefile.in.examples firebird/builds/posix/Makefile.in.examples +--- firebird.org/builds/posix/Makefile.in.examples
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard |3 ++- ios/iosremote/iosremote/slideShow_vc.m |8 +++- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 99aaa7d985a84302a9945633727bcb444329353e Author: siqi m...@siqi.fr Date: Mon Jul 15 13:09:26 2013 +0200 click on next slide preview will bring users to the next slide diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index 1867d81..9e5f891 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -299,7 +299,7 @@ rect key=frame x=3 y=3 width=86 height=172/ autoresizingMask key=autoresizingMask widthSizable=YES flexibleMaxX=YES heightSizable=YES/ subviews -imageView userInteractionEnabled=NO contentMode=scaleAspectFit verticalCompressionResistancePriority=1000 id=B2g-rO-b9G +imageView contentMode=scaleAspectFit verticalCompressionResistancePriority=1000 id=B2g-rO-b9G rect key=frame x=0.0 y=104 width=86 height=68/ autoresizingMask key=autoresizingMask widthSizable=YES flexibleMinY=YES heightSizable=YES/ color key=backgroundColor white=1 alpha=1 colorSpace=calibratedWhite/ @@ -627,6 +627,7 @@ class className=slideShowPreviewTable_vc superclassName=UITableViewController source key=sourceIdentifier type=project relativePath=./Classes/slideShowPreviewTable_vc.h/ relationships +relationship kind=action name=startPresentationAction:/ relationship kind=outlet name=optionsTable candidateClass=UITableView/ /relationships /class diff --git a/ios/iosremote/iosremote/slideShow_vc.m b/ios/iosremote/iosremote/slideShow_vc.m index 9504e79..c8f58fc 100644 --- a/ios/iosremote/iosremote/slideShow_vc.m +++ b/ios/iosremote/iosremote/slideShow_vc.m @@ -186,8 +186,8 @@ } - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { +UITouch *touch = [[event allTouches] anyObject]; if (!self.touchPointerImage.isHidden){ -UITouch *touch = [[event allTouches] anyObject]; CGPoint loc = [touch locationInView:self.touchPointerImage]; if (loc.x = 0 loc.x = self.touchPointerImage.frame.size.width loc.y = 0 loc.y = self.touchPointerImage.frame.size.height){ @@ -198,6 +198,12 @@ [self.movingPointer setHidden:NO]; } } + +if ([touch view] == self.secondarySlideView) +{ +// Change to the next slide when secondary slide is clicked +[self nextSlideAction:nil]; +} } - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cmis' - ucb/source
ucb/source/ucp/cmis/cmis_content.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fd4d31b16702fa1f8e522350df0766e16a86b5e0 Author: Cao Cuong Ngo cao.cuong@gmail.com Date: Mon Jul 15 13:11:28 2013 +0200 CMIS create session Add sslCheck flag in CreateSession Change-Id: I0dda9b89e529623cbed00f35f10a924120475480 diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index e4a206c..3d35567 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -326,7 +326,7 @@ namespace cmis m_pSession = libcmis::SessionFactory::createSession( OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ), -rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), oauth2Data ); +rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), sal_False, oauth2Data ); if ( m_pSession == NULL ) ucbhelper::cancelCommandExecution( ucb::IOErrorCode_INVALID_DEVICE, ___ 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-0' - drawinglayer/source include/drawinglayer
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 20 --- include/drawinglayer/processor2d/vclpixelprocessor2d.hxx |5 +++ 2 files changed, 21 insertions(+), 4 deletions(-) New commits: commit 99cf5f9b1ca3471ee9d9b869127dbfc355418054 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 12 19:04:21 2013 +0200 fdo#66745: drawinglayer: properly restore anti-aliasing mode VclPixelProcessor2D: the constructor changes the anti-aliasing mode of the given output device, and the destructor restores a hard-coded mode instead of what was there before. Due to this commit 5913506b2193e93ca2767ab7365ab2e76ed7848f turned off anti-aliasing for FontWork objects simply by creating a temporary VclPixelProcessor2D. Change-Id: I7f7fcbf86b0dd425f599cd8e62fce3c69a2744bb (cherry picked from commit 420aa16af0bbab4bdef80ceeb8d44cabe65840e0) Reviewed-on: https://gerrit.libreoffice.org/4872 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org (cherry picked from commit 56ed1221d4d578260d9e20715d073b70a099efa4) Reviewed-on: https://gerrit.libreoffice.org/4903 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index dde9bb5..a626d60 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -62,8 +62,18 @@ namespace drawinglayer { namespace processor2d { +struct VclPixelProcessor2D::Impl +{ +sal_uInt16 m_nOrigAntiAliasing; + +explicit Impl(OutputDevice const rOutDev) +: m_nOrigAntiAliasing(rOutDev.GetAntialiasing()) +{ } +}; + VclPixelProcessor2D::VclPixelProcessor2D(const geometry::ViewInformation2D rViewInformation, OutputDevice rOutDev) -: VclProcessor2D(rViewInformation, rOutDev) +: VclProcessor2D(rViewInformation, rOutDev) +, m_pImpl(new Impl(rOutDev)) { // prepare maCurrentTransformation matrix with viewTransformation to target directly to pixels maCurrentTransformation = rViewInformation.getObjectToViewTransformation(); @@ -75,11 +85,13 @@ namespace drawinglayer // react on AntiAliasing settings if(getOptionsDrawinglayer().IsAntiAliasing()) { - mpOutputDevice-SetAntialiasing(mpOutputDevice-GetAntialiasing() | ANTIALIASING_ENABLE_B2DDRAW); +mpOutputDevice-SetAntialiasing( + m_pImpl-m_nOrigAntiAliasing | ANTIALIASING_ENABLE_B2DDRAW); } else { - mpOutputDevice-SetAntialiasing(mpOutputDevice-GetAntialiasing() ~ANTIALIASING_ENABLE_B2DDRAW); +mpOutputDevice-SetAntialiasing( + m_pImpl-m_nOrigAntiAliasing ~ANTIALIASING_ENABLE_B2DDRAW); } } @@ -89,7 +101,7 @@ namespace drawinglayer mpOutputDevice-Pop(); // restore AntiAliasing -mpOutputDevice-SetAntialiasing(mpOutputDevice-GetAntialiasing() ~ANTIALIASING_ENABLE_B2DDRAW); +mpOutputDevice-SetAntialiasing(m_pImpl-m_nOrigAntiAliasing); } void VclPixelProcessor2D::processBasePrimitive2D(const primitive2d::BasePrimitive2D rCandidate) diff --git a/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx index c3003f0..f280da7 100644 --- a/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx +++ b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx @@ -25,6 +25,8 @@ #include drawinglayer/processor2d/vclprocessor2d.hxx #include vcl/outdev.hxx +#include boost/scoped_ptr.hpp + // namespace drawinglayer @@ -40,6 +42,9 @@ namespace drawinglayer class DRAWINGLAYER_DLLPUBLIC VclPixelProcessor2D : public VclProcessor2D { private: +struct Impl; +boost::scoped_ptrImpl m_pImpl; + protected: /* the local processor for BasePrinitive2D-Implementation based primitives, called from the common process()-implementation ___ 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-0' - sc/inc sc/source
sc/inc/datauno.hxx|1 sc/inc/dpresfilter.hxx|4 +- sc/inc/dptabres.hxx |2 + sc/inc/dputil.hxx | 11 +-- sc/source/core/data/dpobject.cxx | 10 +- sc/source/core/data/dptabres.cxx | 45 sc/source/core/data/dptabsrc.cxx |2 - sc/source/core/data/dputil.cxx| 59 +- sc/source/filter/xml/xmldrani.cxx |4 +- sc/source/ui/unoobj/cellsuno.cxx | 55 +-- sc/source/ui/unoobj/datauno.cxx | 37 ++- 11 files changed, 114 insertions(+), 116 deletions(-) New commits: commit 556519f0a1dcc92eab5078dcbaaf2cec4dbaa179 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Thu Jul 11 22:00:54 2013 -0400 fdo#66655: Get GETPIVOTDATA to work again. 1) Compare data field name as it is displayed in the table output. 2) In the result tree, store field member names as strings as displayed in the table output, instead of as ScDPItemData. GETPIVOTDATA operates on displayed cell values and do textural comparison. There is no use storing ScDPItemData which screws up value lookup in the result tree. Change-Id: I31bc03a6800f4fadf2ba1180d1958354d43e8a07 Reviewed-on: https://gerrit.libreoffice.org/4853 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com Reviewed-on: https://gerrit.libreoffice.org/4869 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Eike Rathke er...@redhat.com Reviewed-by: Eike Rathke er...@redhat.com diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 2acde18..a2562c2 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -68,7 +68,6 @@ typedef boost::ptr_vectorXDBRefreshListenerRef XDBRefreshListenerArr_Impl; class ScDataUnoConversion { public: -static ScSubTotalFunc GeneralToSubTotal( com::sun::star::sheet::GeneralFunction eSummary ); static com::sun::star::sheet::GeneralFunction SubTotalToGeneral( ScSubTotalFunc eSubTotal ); }; diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx index bde3c02..be84b8c 100644 --- a/sc/inc/dpresfilter.hxx +++ b/sc/inc/dpresfilter.hxx @@ -24,7 +24,7 @@ namespace com { namespace sun { namespace star { namespace sheet { struct ScDPResultFilter { OUString maDimName; -ScDPItemData maValue; +OUString maValue; bool mbHasValue:1; bool mbDataLayout:1; @@ -55,7 +55,7 @@ private: struct MemberNode; struct DimensionNode; -typedef std::mapScDPItemData, MemberNode* MembersType; +typedef std::mapOUString, MemberNode* MembersType; typedef std::mapOUString, DimensionNode* DimensionsType; struct DimensionNode : boost::noncopyable diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index e6289be..e39b1da 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -380,6 +380,8 @@ public: ScDPInitState rInitState); void CheckShowEmpty( bool bShow = false ); OUString GetName() const; +OUString GetDisplayName() const; + voidFillItemData( ScDPItemData rData ) const; bool IsValid() const; bool IsVisible() const; diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx index 425d333..294ca97 100644 --- a/sc/inc/dputil.hxx +++ b/sc/inc/dputil.hxx @@ -7,11 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __SC_DPUTIL_HXX__ -#define __SC_DPUTIL_HXX__ +#ifndef SC_DPUTIL_HXX +#define SC_DPUTIL_HXX #include rtl/ustring.hxx #include scdllapi.h +#include global.hxx + +#include com/sun/star/sheet/GeneralFunction.hpp class SvNumberFormatter; struct ScDPNumGroupInfo; @@ -38,6 +41,10 @@ public: static sal_Int32 getDatePartValue( double fValue, const ScDPNumGroupInfo rInfo, sal_Int32 nDatePart, SvNumberFormatter* pFormatter); + +static OUString getDisplayedMeasureName(const OUString rName, ScSubTotalFunc eFunc); + +static ScSubTotalFunc toSubTotalFunc(com::sun::star::sheet::GeneralFunction eGenFunc); }; #endif diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index dff56a5..fba73d6 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1289,11 +1289,19 @@ public: FindByName(const OUString rName) : maName(rName) {} bool operator() (const ScDPSaveDimension* pDim) const { +// Layout name takes precedence. const OUString* pLayoutName = pDim-GetLayoutName(); if (pLayoutName) return *pLayoutName == maName; -return maName == pDim-GetName(); +sheet::GeneralFunction eGenFunc = static_castsheet::GeneralFunction(pDim-GetFunction()); +ScSubTotalFunc eFunc = ScDPUtil::toSubTotalFunc(eGenFunc); +OUString aSrcName =
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 33484, which changed state. Bug 33484 Summary: Printing multiple files from Windows Explorer at once makes LibreOffice unusable https://bugs.freedesktop.org/show_bug.cgi?id=33484 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/TestFlightSDK1.2.6/README.md| 223 +++ ios/iosremote/TestFlightSDK1.2.6/TestFlight.h | 114 ++ ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a |binary ios/iosremote/TestFlightSDK1.2.6/release_notes.md | 249 ++ ios/iosremote/iosremote.xcodeproj/project.pbxproj | 36 +++ ios/iosremote/iosremote/AppDelegate.m |2 ios/iosremote/iosremote/Communication/Client.m|2 ios/iosremote/iosremote/iosremote-Prefix.pch |1 8 files changed, 626 insertions(+), 1 deletion(-) New commits: commit a8e8d46020702c64ff314adbe87e6f21e73e1999 Author: siqi m...@siqi.fr Date: Mon Jul 15 13:23:07 2013 +0200 TestFlight integration diff --git a/ios/iosremote/TestFlightSDK1.2.6/README.md b/ios/iosremote/TestFlightSDK1.2.6/README.md new file mode 100644 index 000..e8e02159 --- /dev/null +++ b/ios/iosremote/TestFlightSDK1.2.6/README.md @@ -0,0 +1,223 @@ +##Introduction + +The TestFlight SDK allows you to track how beta testers are testing your application. Out of the box we track simple usage information, such as which tester is using your application, their device model/OS, how long they used the application, logs of their test session, and automatic recording of any crashes they encounter. + +To get the most out of the SDK we have provided the Checkpoint API. + +The Checkpoint API is used to help you track exactly how your testers are using your application. Curious about which users passed level 5 in your game, or posted their high score to Twitter, or found that obscure feature? With a single line of code you can finally gather all this information. Wondering how many times your app has crashed? Wondering who your power testers are? We've got you covered. See more information on the Checkpoint API in section 4. + +Alongside the Checkpoint API is the Questions interface. The Questions interface is managed on a per build basis on the TestFlight website. Find out more about the Questions Interface in section 6. + +For more detailed debugging we have a remote logging solution. Find out more about our logging system with TFLog in the Remote Logging section. + + +##Considerations + +Information gathered by the SDK is sent to the website in real time. When an application is put into the background (iOS 4.x) or terminated (iOS 3.x) we try to send the finalizing information for the session during the time allowed for finalizing the application. Should all of the data not get sent the remaining data will be sent the next time the application is launched. As such, to get the most out of the SDK we recommend your application support iOS 4.0 and higher. + +This SDK can be run from both the iPhone Simulator and Device and has been tested using Xcode 4.0. + +The AdSupport.framework is required for iOS 6.0+ in order to estimate the number of unique users your app has. You may weak link the framework in you app. If your app does not link with the AdSupport.framework, the TestFlight SDK will automatically load it for apps running on iOS 6.0+. + + +##Integration + +1. Add the files to your project: File -gt; Add Files to +1. Find and select the folder that contains the SDK +2. Make sure that Copy items into destination folder (if needed) is checked +3. Set Folders to Create groups for any added folders +4. Select all targets that you want to add the SDK to +2. Verify that libTestFlight.a has been added to the Link Binary With Libraries Build Phase for the targets you want to use the SDK with +1. Select your Project in the Project Navigator +2. Select the target you want to enable the SDK for +3. Select the Build Phases tab +4. Open the Link Binary With Libraries Phase +5. If libTestFlight.a is not listed, drag and drop the library from your Project Navigator to the Link Binary With Libraries area +6. Repeat Steps 2 - 5 until all targets you want to use the SDK with have the SDK linked +3. Add libz to your Link Binary With Libraries Build Phase +1. Select your Project in the Project Navigator +2. Select the target you want to enable the SDK for +3. Select the Build Phases tab +4. Open the Link Binary With Libraries Phase +5. Click the + to add a new library +6. Find libz.dylib in the list and add it +7. Repeat Steps 2 - 6 until all targets you want to use the SDK with have libz.dylib + +4. In your Application Delegate: +1. Import TestFlight: `#import TestFlight.h` + +***NOTE:*** Rather than importing `TestFlight.h` in every file you may add the above line into you pre-compiled header (`projectname_Prefix.pch`) file inside of the + + +#ifdef __OBJC__ + + +section. This will give you access to the SDK across all files. + +2. Get your Application Token which you can find at
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - scripting/source
scripting/source/pyprov/mailmerge.py | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) New commits: commit aab42944ad90e86ac43dedc7e11be8eb2019d833 Author: Caolán McNamara caol...@redhat.com Date: Sat Jul 13 21:45:29 2013 +0100 Related: fdo#66761 the double-encoding bug appears gone in python 3.3.2 i.e. I see the bug in our built-in python3 3.3.0 but not in my system python 3.3.2 and there's a raft of email related bug fixes in the 3.3.2/3.3.1 python Changelog Change-Id: I257770cd0ec41fc3b2f2a638009b075b9a2f325f (cherry picked from commit 24078e3501042e8693ef1f9d3edebbc47e37ce12) Related: fdo#66761 we want the bytes, not a str representation of them Change-Id: I3c268b0c51f7e1ddd2fa6588f40412a33f316b52 (cherry picked from commit f460556bfa6bd55df3cd4b2288524d63db284d7e) Reviewed-on: https://gerrit.libreoffice.org/4909 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com (cherry picked from commit c71f67198cd6fc98f77289c4f0276a45d19700d8) Reviewed-on: https://gerrit.libreoffice.org/4914 diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index af10dbe..3cfb6d3 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -182,12 +182,20 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): textmsg['MIME-Version'] = '1.0' try: + #it's a string, get it as utf-8 bytes textbody = textbody.encode('utf-8') except: - textbody = str(textbody.value).encode('utf-8') + #it's a bytesequence, get raw bytes + textbody = textbody.value if sys.version = '3': - #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w - textbody = textbody.decode('iso8859-1') + if sys.version_info.minor 3 or (sys.version_info.minor == 3 and sys.version_info.micro = 1): + #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w + #see http://bugs.python.org/16564, etc. basically it now *seems* to be all ok + #in python 3.3.2 onwards, but a little busted in 3.3.0 + + textbody = textbody.decode('iso8859-1') + else: + textbody = textbody.decode('utf-8') c = Charset('utf-8') c.body_encoding = QP textmsg.set_payload(textbody, c) @@ -469,15 +477,15 @@ class PyMailMessage(unohelper.Base, XMailMessage): self.bccrecipients.append(bccrecipient) def getRecipients( self ): if dbg: - print(PyMailMessage.getRecipients: + self.recipients, file=dbgout) + print(PyMailMessage.getRecipients: + str(self.recipients), file=dbgout) return tuple(self.recipients) def getCcRecipients( self ): if dbg: - print(PyMailMessage.getCcRecipients: + self.ccrecipients, file=dbgout) + print(PyMailMessage.getCcRecipients: + str(self.ccrecipients), file=dbgout) return tuple(self.ccrecipients) def getBccRecipients( self ): if dbg: - print(PyMailMessage.getBccRecipients: + self.bccrecipients, file=dbgout) + print(PyMailMessage.getBccRecipients: + str(self.bccrecipients), file=dbgout) return tuple(self.bccrecipients) def addAttachment( self, aMailAttachment ): if dbg: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fwd: Why dev-www.libreoffice.org is unreachable
CC this error to everyone. -- Forwarded message -- From: LOH KOK HOE huahsi...@gmail.com Date: Mon, Jul 15, 2013 at 7:36 PM Subject: Re: Why dev-www.libreoffice.org is unreachable To: Noel Grandin n...@peralex.com Ya, I did a try on this morning was working fine, but when I reach home at night, I can't connect connect anymore. Is the server went down again? Let me try to compile tomorrow. On Mon, Jul 15, 2013 at 2:18 PM, Noel Grandin n...@peralex.com wrote: On 2013-07-14 04:19, LOH KOK HOE wrote: I did try to manually connect to dev-www.libreoffice.org but failed. I then issue the make command again and this time I got timed out error as shown below: It's working for me now. Either there was a temporary failure, or you are behind a proxy and have not configured your proxy settings on that box. -- 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: comphelper/source connectivity/source extensions/source forms/source offapi/com offapi/type_reference offapi/UnoApi_offapi.mk oox/source qadevOOo/tests reportdesign/sou
comphelper/source/misc/anycompare.cxx |3 connectivity/source/commontools/dbconversion.cxx|5 connectivity/source/drivers/file/FDateFunctions.cxx | 10 connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx |5 connectivity/source/drivers/odbcbase/OResultSet.cxx |5 extensions/source/propctrlr/standardcontrol.cxx |3 forms/source/xforms/convert.cxx | 10 offapi/UnoApi_offapi.mk |3 offapi/com/sun/star/util/Date.idl |3 offapi/com/sun/star/util/DateTime.idl |7 offapi/com/sun/star/util/DateTimeRange.idl |8 offapi/com/sun/star/util/DateTimeWithTimezone.idl | 43 ++ offapi/com/sun/star/util/DateWithTimezone.idl | 43 ++ offapi/com/sun/star/util/Time.idl |7 offapi/com/sun/star/util/TimeWithTimezone.idl | 44 ++ offapi/type_reference/offapi.rdb|binary oox/source/docprop/docprophandler.cxx |4 qadevOOo/tests/java/ifc/sdbc/_XParameters.java |4 reportdesign/source/core/sdr/RptObject.cxx |3 sax/qa/cppunit/test_converter.cxx | 63 +-- sax/source/tools/converter.cxx | 204 -- sc/source/filter/oox/unitconverter.cxx | 14 sd/source/ui/annotations/annotationmanager.cxx |5 sfx2/source/appl/sfxpicklist.cxx|2 sfx2/source/dialog/dinfdlg.cxx | 16 sfx2/source/doc/SfxDocumentMetaData.cxx |5 sfx2/source/doc/objcont.cxx |4 sfx2/source/doc/oleprops.cxx| 13 sfx2/source/view/viewprn.cxx|2 svl/source/items/dateitem.cxx |4 svtools/source/misc/templatefoldercache.cxx |3 svtools/source/svhtml/parhtml.cxx |3 sw/source/core/doc/docglbl.cxx |3 sw/source/filter/ww8/ww8par.cxx |2 toolkit/source/controls/unocontrols.cxx |2 ucb/source/ucp/ftp/ftpdirp.hxx |3 ucb/source/ucp/gio/gio_content.cxx |2 unotools/source/misc/datetime.cxx |3 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 xmloff/source/chart/SchXMLExport.cxx|2 40 files changed, 452 insertions(+), 115 deletions(-) New commits: commit 652ccbdf3111766fadc379a8cf4650b744e1e19c Author: Michael Stahl mst...@redhat.com Date: Fri Jun 28 00:43:19 2013 +0200 i#108348 API CHANGE: add IsUTC to css.util.DateTime etc. Add IsUTC member to: com.sun.star.util.DateTime com.sun.star.util.DateTimeRange com.sun.star.util.Time Add new stucts with explicit time zones: com.sun.star.util.DateTimeWithTimezone com.sun.star.util.DateWithTimezone com.sun.star.util.TimeWithTimezone Adapt the sax::Converter to read/write timezones, and fix the unit test. Everything else just uses default (no time zone), this commit is just to fix the API. STRUCT: /UCR/com/sun/star/util/DateTime nFields1 = 7 != nFields2 = 8 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/DateTimeRange nFields1 = 14 != nFields2 = 15 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/Time nFields1 = 4 != nFields2 = 5 Registry2 contains 1 more fields Conflicts: sc/source/filter/oox/unitconverter.cxx Change-Id: I01f7a6d082a6b090c8efe71d2de137474c495c18 Reviewed-on: https://gerrit.libreoffice.org/4833 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx index 775386e..30e805a 100644 --- a/comphelper/source/misc/anycompare.cxx +++ b/comphelper/source/misc/anycompare.cxx @@ -70,6 +70,7 @@ namespace comphelper || !( _rhs = rhs ) ) throw ::com::sun::star::lang::IllegalArgumentException(); +// FIXME Timezone? if ( lhs.Year rhs.Year ) return true; @@ -100,6 +101,7
[PATCH] i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.
Hello Lionel Elie Mamane, LibreOffice gerrit bot, Michael Stahl, Michael Meeks, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/4833 to look at the new patch set (#5). Change subject: i#108348 API CHANGE: add IsUTC to css.util.DateTime etc. .. i#108348 API CHANGE: add IsUTC to css.util.DateTime etc. Add IsUTC member to: com.sun.star.util.DateTime com.sun.star.util.DateTimeRange com.sun.star.util.Time Add new stucts with explicit time zones: com.sun.star.util.DateTimeWithTimezone com.sun.star.util.DateWithTimezone com.sun.star.util.TimeWithTimezone Adapt the sax::Converter to read/write timezones, and fix the unit test. Everything else just uses default (no time zone), this commit is just to fix the API. STRUCT: /UCR/com/sun/star/util/DateTime nFields1 = 7 != nFields2 = 8 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/DateTimeRange nFields1 = 14 != nFields2 = 15 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/Time nFields1 = 4 != nFields2 = 5 Registry2 contains 1 more fields Conflicts: sc/source/filter/oox/unitconverter.cxx Change-Id: I01f7a6d082a6b090c8efe71d2de137474c495c18 --- M comphelper/source/misc/anycompare.cxx M connectivity/source/commontools/dbconversion.cxx M connectivity/source/drivers/file/FDateFunctions.cxx M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx M connectivity/source/drivers/odbcbase/OResultSet.cxx M extensions/source/propctrlr/standardcontrol.cxx M forms/source/xforms/convert.cxx M offapi/UnoApi_offapi.mk M offapi/com/sun/star/util/Date.idl M offapi/com/sun/star/util/DateTime.idl M offapi/com/sun/star/util/DateTimeRange.idl A offapi/com/sun/star/util/DateTimeWithTimezone.idl A offapi/com/sun/star/util/DateWithTimezone.idl M offapi/com/sun/star/util/Time.idl A offapi/com/sun/star/util/TimeWithTimezone.idl M offapi/type_reference/offapi.rdb M oox/source/docprop/docprophandler.cxx M qadevOOo/tests/java/ifc/sdbc/_XParameters.java M reportdesign/source/core/sdr/RptObject.cxx M sax/qa/cppunit/test_converter.cxx M sax/source/tools/converter.cxx M sc/source/filter/oox/unitconverter.cxx M sd/source/ui/annotations/annotationmanager.cxx M sfx2/source/appl/sfxpicklist.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/doc/SfxDocumentMetaData.cxx M sfx2/source/doc/objcont.cxx M sfx2/source/doc/oleprops.cxx M sfx2/source/view/viewprn.cxx M svl/source/items/dateitem.cxx M svtools/source/misc/templatefoldercache.cxx M svtools/source/svhtml/parhtml.cxx M sw/source/core/doc/docglbl.cxx M sw/source/filter/ww8/ww8par.cxx M toolkit/source/controls/unocontrols.cxx M ucb/source/ucp/ftp/ftpdirp.hxx M ucb/source/ucp/gio/gio_content.cxx M unotools/source/misc/datetime.cxx M writerfilter/source/rtftok/rtfdocumentimpl.cxx M xmloff/source/chart/SchXMLExport.cxx 40 files changed, 452 insertions(+), 115 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/4833/5 -- To view, visit https://gerrit.libreoffice.org/4833 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I01f7a6d082a6b090c8efe71d2de137474c495c18 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4833 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4833 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01f7a6d082a6b090c8efe71d2de137474c495c18 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/inc
vcl/inc/pch/precompiled_vcl.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 17249bb757b775f0956cdca437108943d2a50b71 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jul 15 13:53:14 2013 +0200 do not include UNO header that does not seem to exist(?) in 4.1 Change-Id: Iea8a41c8fac98eb647a2cd135d2ba9038d03ecaf diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 8b49d62..d767b33 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -35,7 +35,6 @@ #include com/sun/star/configuration/theDefaultProvider.hpp #include com/sun/star/container/XNameAccess.hpp #include com/sun/star/datatransfer/XTransferable.hpp -#include com/sun/star/datatransfer/clipboard/SystemClipboard.hpp #include com/sun/star/datatransfer/clipboard/XClipboard.hpp #include com/sun/star/datatransfer/clipboard/XClipboardEx.hpp #include com/sun/star/datatransfer/clipboard/XClipboardListener.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Why dev-www.libreoffice.org is unreachable
Sorry for my bad, my home machine doesn't connect to any proxy server. I think this is due to the network in my area was so unstable, just now I was able to download the source from the site, but few minutes later it was failed. I was thinking is there a way to make an offline compile? I am worry this could be time consuming if I was almost 90% complete the download but due to the network connection lost, I am require to restart again. On Mon, Jul 15, 2013 at 7:44 PM, Noel Grandin n...@peralex.com wrote: No, it's more likely that your home machine does not have it's proxy settings correct. On 2013-07-15 13:36, LOH KOK HOE wrote: Ya, I did a try on this morning was working fine, but when I reach home at night, I can't connect connect anymore. Is the server went down again? Let me try to compile tomorrow. On Mon, Jul 15, 2013 at 2:18 PM, Noel Grandin n...@peralex.com wrote: On 2013-07-14 04:19, LOH KOK HOE wrote: I did try to manually connect to dev-www.libreoffice.org but failed. I then issue the make command again and this time I got timed out error as shown below: It's working for me now. Either there was a temporary failure, or you are behind a proxy and have not configured your proxy settings on that box. -- Disclaimer: http://www.peralex.com/disclaimer.html -- 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: solenv/gbuild
solenv/gbuild/platform/com_MSC_class.mk | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 8bcb9090efe5a8c08881d0a39f102c5f736f2da6 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jul 15 14:13:13 2013 +0200 add gb_JunitTest_SOFFICEARG setting also for windows Needed since e352abc2e60abd21e383ebf971e545ca510ac4ed . Change-Id: I1f46a01f319703a2225386e89fc94ca286b301ca diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index e8c30bf..dd5ceed 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -443,6 +443,17 @@ endef gb_defaultlangiso := en-US gb_smoketest_instset := $(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip +ifneq ($(OOO_TEST_SOFFICE),) +gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE) +else +ifneq ($(gb_JunitTest_DEBUGRUN),) +gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER) +else +gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/program/soffice +endif +endif + + define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ -Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(gb_DEVINSTALLROOT)/program/soffice.exe} \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] update help ids for opt new dictionary dialog .ui conversion
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4918 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/18/4918/1 update help ids for opt new dictionary dialog .ui conversion Change-Id: I36d3b7c9f216d9a9f940885c8d4b2f16706ddc01 --- M helpers/help_hid.lst M source/text/shared/optionen/01010400.xhp 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 72fab47..14816d7 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6960,7 +6960,6 @@ svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709, -svx_CheckBox_RID_SFXDLG_NEWDICT_BTN_EXCEPT,1270400014, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CALCULATE,1368851483, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CONSTRAINT,1368851479, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_READONLY,1368851481, @@ -7043,7 +7042,6 @@ svx_Edit_RID_DLG_NEWLIB_ED_LIBNAME,1242335246, svx_Edit_RID_SFXDLG_EDITDICT_ED_REPLACE,1270417446, svx_Edit_RID_SFXDLG_EDITDICT_ED_WORD,1270417444, -svx_Edit_RID_SFXDLG_NEWDICT_ED_DICTNAME,1270401035, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT,1368852494, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME,1368852492, svx_Edit_RID_SVXDLG_ADD_INSTANCE_ED_INST_NAME,1368950796, @@ -7198,7 +7196,6 @@ svx_ListBox_RID_OPTPAGE_CHART_DEFCOLORS_LB_CHART_COLOR_LIST,705613314, svx_ListBox_RID_SFXDLG_EDITDICT_LB_ALLDICTS,1270418976, svx_ListBox_RID_SFXDLG_EDITDICT_LB_DICTLANG,1270418957, -svx_ListBox_RID_SFXDLG_NEWDICT_LB_DICTLANG,1270402573, svx_ListBox_RID_SVXDLG_ADD_DATAITEM_LB_DATATYPE,1368854034, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568, diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index cebabdc..8c93bd5 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -65,15 +65,15 @@ paragraph role=paragraph id=par_id3146794 xml-lang=en-US l10n=U oldref=64ahelp hid=SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DICOpens the emphNew Dictionary/emph dialog, in which you can name a new user-defined dictionary or dictionary of exceptions and specify the language./ahelp/paragraph paragraph role=heading id=hd_id3151054 xml-lang=en-US level=3 l10n=U oldref=65New Dictionary/paragraph paragraph role=paragraph id=par_id3153360 xml-lang=en-US l10n=U oldref=66In the emphDictionary/emph section you can name a new user-defined dictionary or dictionary of exceptions and specify the language./paragraph -bookmark xml-lang=en-US branch=hid/cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME id=bm_id3151210 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/optnewdictionarydialog/nameedit id=bm_id3151210 localize=false/ paragraph role=heading id=hd_id3150398 xml-lang=en-US level=3 l10n=U oldref=67Name/paragraph -paragraph role=paragraph id=par_id3153192 xml-lang=en-US l10n=U oldref=68ahelp hid=SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAMESpecifies the name of the new custom dictionary./ahelp The file extension *.DIC is automatically appended./paragraph -bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG id=bm_id3148451 localize=false/ +paragraph role=paragraph id=par_id3153192 xml-lang=en-US l10n=U oldref=68ahelp hid=cui/ui/optnewdictionarydialog/nameeditSpecifies the name of the new custom dictionary./ahelp The file extension *.DIC is automatically appended./paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/optnewdictionarydialog/language id=bm_id3148451 localize=false/ paragraph role=heading id=hd_id3150767 xml-lang=en-US level=3 l10n=U oldref=69Language/paragraph -paragraph role=paragraph id=par_id3148920 xml-lang=en-US l10n=U oldref=70ahelp hid=SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANGBy selecting a certain language you can limit the use of the custom dictionary./ahelp By selecting emphAll/emph the custom dictionary is used independently of the current language./paragraph -bookmark xml-lang=en-US branch=hid/cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT id=bm_id3145606 localize=false/ +paragraph role=paragraph id=par_id3148920 xml-lang=en-US l10n=U oldref=70ahelp hid=cui/ui/optnewdictionarydialog/languageBy selecting a certain language you can limit the use of the custom dictionary./ahelp By selecting emphAll/emph the custom dictionary is used independently of the current language./paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/optnewdictionarydialog/except id=bm_id3145606 localize=false/ paragraph role=heading id=hd_id3153106 xml-lang=en-US level=3 l10n=U oldref=71Exceptions (-)/paragraph -paragraph role=paragraph id=par_id3149561 xml-lang=en-US l10n=CHG oldref=72ahelp hid=SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPTSpecifies whether
Re: [GSOC] iOS remote control weekly update 5 (workable milestone)
Hello Jonathan, Tor and all LibO developers and QA testers, I've just integrated TestFlight into the app and now I need to register beta-testers' iOS devices in order to distribute this beta-testing version to you. For that I've created a gdoc to gather unique identifiers from all beta testers which is available here: https://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/edit?usp=sharing Please, feel free to register your iOS devices as testing devices so that I can register your devices for the ad-hoc distribution. You will then get a copy of the beta-testing distribution (.ipa) and try out this new app on your devices :-D This app gets better because of you! Happy testing and poke me for all questions you may have. Please also let me know if there is any mailing list that might be more appropriate for this matter. Thank you! Siqi 2013/7/14 Jonathan Aquilina eagles051...@gmail.com For app testing there is a website that allows testing of ios apps called test flight. https://testflightapp.com/ On Sun, Jul 14, 2013 at 10:50 AM, Tor Lillqvist t...@iki.fi wrote: The progress is really impressive! Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? I don't think it is a good idea to publish it before it is ready for real use; one is not supposed to publish beta test versions in the App Store. I would assume any hint at it being a test version in its description or in the app itself will automatically mean it won't get approved into the store. And on the other hand, if you publish it, knowing it has still problems, but without being able to tell so to customers, that will just generate bad press for it, LibreOffice published their Impress Remote for iOS but it doesn't work. Better to use the ad-hoc distribution mechanism, I think, where if I understand correctly you specifically add provisioning to the app to run on up to 100 named tester devices, and then distribute the app to these testers. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC] iOS remote control weekly update 5 (workable milestone)
What is the oldest version of iOS this will work with as i have an older ipod touch with 4.1 on it. On Mon, Jul 15, 2013 at 2:39 PM, Siqi Liu m...@siqi.fr wrote: Hello Jonathan, Tor and all LibO developers and QA testers, I've just integrated TestFlight into the app and now I need to register beta-testers' iOS devices in order to distribute this beta-testing version to you. For that I've created a gdoc to gather unique identifiers from all beta testers which is available here: https://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/edit?usp=sharing Please, feel free to register your iOS devices as testing devices so that I can register your devices for the ad-hoc distribution. You will then get a copy of the beta-testing distribution (.ipa) and try out this new app on your devices :-D This app gets better because of you! Happy testing and poke me for all questions you may have. Please also let me know if there is any mailing list that might be more appropriate for this matter. Thank you! Siqi 2013/7/14 Jonathan Aquilina eagles051...@gmail.com For app testing there is a website that allows testing of ios apps called test flight. https://testflightapp.com/ On Sun, Jul 14, 2013 at 10:50 AM, Tor Lillqvist t...@iki.fi wrote: The progress is really impressive! Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? I don't think it is a good idea to publish it before it is ready for real use; one is not supposed to publish beta test versions in the App Store. I would assume any hint at it being a test version in its description or in the app itself will automatically mean it won't get approved into the store. And on the other hand, if you publish it, knowing it has still problems, but without being able to tell so to customers, that will just generate bad press for it, LibreOffice published their Impress Remote for iOS but it doesn't work. Better to use the ad-hoc distribution mechanism, I think, where if I understand correctly you specifically add provisioning to the app to run on up to 100 named tester devices, and then distribute the app to these testers. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Configuring the iOS app to open DOCX files
On Sun, Jul 14, 2013 at 11:18:16AM +0300, Ptyl Dragon p...@cloudon.com wrote: So, what are we doing wrong? What should we do to make the iOS app open docx files? As a start, you can with a debugger if WriterFilter::filter() is reached: http://opengrok.libreoffice.org/xref/core/writerfilter/source/filter/ImportFilter.cxx#47 If yes, check where that filter() method fails. If not, put a breakpoint in that method in a normal desktop build, get the backtrace and check what's the last method that is called on iOS as well, that should point in the right direction. (No idea about iOS, but this is in general what you can do on any platform when it comes to DOCX problems.) signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/module-deps.pl
bin/module-deps.pl | 32 1 file changed, 32 insertions(+) New commits: commit c5d0d5114e06705d43a9ef6a7dd58006bdd25b10 Author: Michael Meeks michael.me...@suse.com Date: Mon Jul 15 13:32:49 2013 +0100 Prune some leaves for a cleaner top-to-bottom view of deps. Change-Id: I98e803bee37359405f0e06a62c063fbe9da82ea0 diff --git a/bin/module-deps.pl b/bin/module-deps.pl index acf072a..e77db25 100755 --- a/bin/module-deps.pl +++ b/bin/module-deps.pl @@ -9,6 +9,7 @@ my $gnumake; my $src_root; my $makefile_build; my $verbose = 0; +my $no_leaf; my $from_file; my $to_file; my $graph_file; @@ -251,6 +252,33 @@ sub collapse_lib_to_module($) return optimize_tree(\%digraph); } +sub prune_leaves($) +{ +my $tree = shift; +my %newtree; +my %name_has_deps; + +# we like a few leaves around: +for my $nonleaf ('desktop', 'sw', 'sc', 'sd', 'starmath') { +$name_has_deps{$nonleaf} = 1; +} + +# find which modules are depended on by others +for my $name (keys %{$tree}) { +for my $dep (@{$tree-{$name}-{deps}}) { +$name_has_deps{$dep} = 1; +} +} + +# prune modules with no deps +for my $name (keys %{$tree}) { +delete $tree-{$name} if (!defined $name_has_deps{$name}); +} + +return optimize_tree($tree); +} + + sub dump_graphviz($) { my $tree = shift; @@ -300,6 +328,7 @@ sub parse_options() 'preserve-libs|p' = \$preserve_libs, 'write-dep-file|w=s' = \$to_file, 'read-dep-file|f=s' = \$from_file, +'no-leaf|l' = \$no_leaf, 'graph-file|o=s' = \$graph_file); GetOptions(%h) or pod2usage(2); pod2usage(1) if $help; @@ -320,6 +349,9 @@ sub main() if (!$preserve_libs !defined($ENV{PRESERVE_LIBS})) { $tree = collapse_lib_to_module($tree); } +if ($no_leaf) { +$tree = prune_leaves($tree); +} dump_graphviz($tree); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC] iOS remote control weekly update 5 (workable milestone)
Hello Jonathan, For now I've only tested it against iOS5.0 and later so I don't think it's compatible with iOS4.1. The app is pretty much based on storyBoard which is one of the main features of iOS5, so sadly iOS4 will not be compatible :'-( Siqi 2013/7/15 Jonathan Aquilina eagles051...@gmail.com What is the oldest version of iOS this will work with as i have an older ipod touch with 4.1 on it. On Mon, Jul 15, 2013 at 2:39 PM, Siqi Liu m...@siqi.fr wrote: Hello Jonathan, Tor and all LibO developers and QA testers, I've just integrated TestFlight into the app and now I need to register beta-testers' iOS devices in order to distribute this beta-testing version to you. For that I've created a gdoc to gather unique identifiers from all beta testers which is available here: https://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/edit?usp=sharing Please, feel free to register your iOS devices as testing devices so that I can register your devices for the ad-hoc distribution. You will then get a copy of the beta-testing distribution (.ipa) and try out this new app on your devices :-D This app gets better because of you! Happy testing and poke me for all questions you may have. Please also let me know if there is any mailing list that might be more appropriate for this matter. Thank you! Siqi 2013/7/14 Jonathan Aquilina eagles051...@gmail.com For app testing there is a website that allows testing of ios apps called test flight. https://testflightapp.com/ On Sun, Jul 14, 2013 at 10:50 AM, Tor Lillqvist t...@iki.fi wrote: The progress is really impressive! Also, should I publish this version on the app store so that people don't have to compile it? Or export it to an ipa file? I don't think it is a good idea to publish it before it is ready for real use; one is not supposed to publish beta test versions in the App Store. I would assume any hint at it being a test version in its description or in the app itself will automatically mean it won't get approved into the store. And on the other hand, if you publish it, knowing it has still problems, but without being able to tell so to customers, that will just generate bad press for it, LibreOffice published their Impress Remote for iOS but it doesn't work. Better to use the ad-hoc distribution mechanism, I think, where if I understand correctly you specifically add provisioning to the app to run on up to 100 named tester devices, and then distribute the app to these testers. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- -- Jonathan Aquilina -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LO 4.0.4.2 on illumos based OS
Ok, I could go over extension by disabling that motif dependent plugin. Now, later, it's trying to build xmlsec1, and looks like it can't find libs I actually have! checking for pkg-config... yes checking for libxslt libraries= 1.0.20... no [I have it, it's 1.1.26] checking for openssl libraries= 0.9.6... no[I have both 0.9.6 and 1.0.0j] checking for NSS... no checking for NSS... no checking for NSS... no checking for NSS... no checking for NSS... no checking for nspr libraries= 4.0... no [I have nspr 4] checking for nss libraries= 3.2... no [I have nss 3.13.5] checking for gnutls libraries= 0.8.1... no[I have 3.1.9] checking for mscrypto libraries... none checking for crypto library... configure: error: At least one crypto library should exist for xmlsec1 I can't find the config.log of this component, this may hold the info I need to solve it. Can you help? gabriele. Da: Gabriele Bulfon A: michael.me...@suse.com Cc: Michael Stahl libreoffice-dev Data: 15 luglio 2013 10.42.52 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS I momentarily disabled with this patch (treated SunOS as for iOS and Android). Gabriele. -- Da: Michael Meeks A: Gabriele Bulfon Cc: Michael Stahl libreoffice-dev Data: 15 luglio 2013 10.15.18 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On Mon, 2013-07-15 at 09:44 +0200, Gabriele Bulfon wrote: I was wandering why Motif libraries are needed by these extension. Is it absolutely necessary? I'm amazed to hear that we link to motif in the modern world; it seems to be only this extension: $W/CxxObject/extensions/source/plugin/unx/npwrap.o $W/CxxObject/extensions/source/plugin/unx/npnapi.o I'd disable this I guess in configure.ac we have: dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents I imagine we should just disable that for Solaris [ for now ]. Quite why we think Mozilla requires motif still I'm not sure I'd be amazed if they still had a hard dep on that. HTH, Michael. -- michael.me...@suse.com ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source
basctl/source/basicide/baside2.hxx | 30 ++- basctl/source/basicide/baside2b.cxx | 96 2 files changed, 115 insertions(+), 11 deletions(-) New commits: commit cf8d21808a3a5365f0de2419ab60bdec03f84434 Author: Gergo Mocsi gmocs...@gmail.com Date: Mon Jul 15 15:14:23 2013 +0200 GSOC work, Window instead a FloatingWindow Changed CodeCompleteListBox into a Window which contains a single ListBox. Navigation with arrows is enabled, window closes on ESC key. Double click inserts the selected method into the source code. Visible line count in ListBox is set to 8 lines, width is adopted from the longest entry. Change-Id: I6b6ceb0ce78f9fc727aed53952dc6ee24cba47df diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index e949a19..3d8afde 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -51,6 +51,9 @@ class SvxSearchItem; #include set #include boost/scoped_ptr.hpp +#include vcl/floatwin.hxx +#include vcl/textdata.hxx + namespace com { namespace sun { namespace star { namespace beans { class XMultiPropertySet; } } } } @@ -60,6 +63,7 @@ namespace basctl class ObjectCatalog; class CodeCompleteListBox; +class CodeCompleteFloatWindow; DBG_NAMEEX( ModulWindow ) @@ -112,7 +116,8 @@ private: ::com::sun::star::uno::Reference ::com::sun::star::awt::XWindowPeer GetComponentInterface(sal_Bool bCreate = true); std::vector CodeCompleteData aCodeCompleteCache; -CodeCompleteListBox* aListBox; +CodeCompleteFloatWindow* pCodeCompleteWnd; +//CodeCompleteListBox* aListBox; OUString GetActualSubName( sal_uLong nLine ); // gets the actual subroutine name according to line number std::vector OUString Split( const OUString sStr, const sal_Unicode aChar ); @@ -469,6 +474,29 @@ private: } aSyntaxColors; }; +class CodeCompleteFloatWindow: public Window +{ +private: +EditorWindow* pParent; // parent window +TextSelection aTextSelection; +ListBox* pListBox; + +void InitListBox(); // initialize the ListBox +DECL_LINK(ImplDoubleClickHdl, void*); + +public: +CodeCompleteFloatWindow( EditorWindow* pPar ); +virtual ~CodeCompleteFloatWindow(); + +void InsertEntry( const OUString aStr ); +void ClearListBox(); +void SetTextSelection( const TextSelection aSel ); +void ResizeListBox(); + +protected: +virtual void KeyInput( const KeyEvent rKeyEvt ); +}; + class CodeCompleteListBox: public ListBox { private: diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 4d15c48..77db23d 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -250,7 +250,9 @@ EditorWindow::EditorWindow (Window* pParent, ModulWindow* pModulWindow) : s[0] = OUString( FontHeight ); s[1] = OUString( FontName ); n-addPropertiesChangeListener(s, listener_.get()); -aListBox = new CodeCompleteListBox(this); +//aListBox = new CodeCompleteListBox(this); +//pCodeCopleteWnd = new CodeCompleteFloatWindow(this); +pCodeCompleteWnd = new CodeCompleteFloatWindow( this ); } @@ -272,7 +274,9 @@ EditorWindow::~EditorWindow() EndListening( *pEditEngine ); pEditEngine-RemoveView(pEditView.get()); } -delete aListBox; + +//delete aListBox; +delete pCodeCompleteWnd; } OUString EditorWindow::GetWordAtCursor() @@ -570,17 +574,21 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt ) if( aMethods.getLength() != 0 ) { Rectangle aRect = ( (TextEngine*) GetEditEngine() )-PaMtoEditCursor( aSel.GetEnd() , false ); -aListBox-SetPosPixel( aRect.TopLeft() ); -aListBox-SetSizePixel( Size(150,150) ); +GetEditView()-EnableCursor( false ); + +aSel.GetStart().GetIndex() += 1; +aSel.GetEnd().GetIndex() += 1; +pCodeCompleteWnd-ClearListBox(); +pCodeCompleteWnd-SetTextSelection(aSel); +pCodeCompleteWnd-SetPosPixel( aRect.BottomRight() ); for(sal_Int32 l = 0; l aMethods.getLength(); ++l) { -aListBox-InsertEntry( OUString(aMethods[l]-getName()) ); -std::cerr aMethods[l]-getName() std::endl; +pCodeCompleteWnd-InsertEntry( OUString(aMethods[l]-getName()) ); } - -aListBox-GetFocus(); -aListBox-ToggleDropDown(); +pCodeCompleteWnd-ResizeListBox(); +pCodeCompleteWnd-Show(); +
[Libreoffice-commits] core.git: 2 commits - include/sax include/sfx2 offapi/com sax/qa sax/source sc/source sfx2/source xmloff/source
include/sax/tools/converter.hxx | 22 ++- include/sfx2/dinfdlg.hxx | 12 + offapi/com/sun/star/util/DateTimeWithTimezone.idl|2 offapi/com/sun/star/util/DateWithTimezone.idl|2 offapi/com/sun/star/util/TimeWithTimezone.idl|2 sax/qa/cppunit/test_converter.cxx|6 sax/source/tools/converter.cxx | 95 --- sc/source/filter/xml/XMLCalculationSettingsContext.cxx |2 sc/source/filter/xml/XMLConverter.cxx|2 sc/source/filter/xml/XMLTrackedChangesContext.cxx|2 sfx2/source/dialog/dinfdlg.cxx | 68 -- sfx2/source/doc/SfxDocumentMetaData.cxx | 75 --- xmloff/source/chart/SchXMLCalculationSettingsContext.cxx |2 xmloff/source/chart/SchXMLExport.cxx |2 xmloff/source/core/DocumentSettingsContext.cxx |2 xmloff/source/core/SettingsExportHelper.cxx |2 xmloff/source/core/xmluconv.cxx |2 xmloff/source/draw/sdxmlexp.cxx |2 xmloff/source/draw/ximppage.cxx |2 xmloff/source/forms/handler/vcl_date_handler.cxx |4 xmloff/source/text/XMLChangedRegionImportContext.cxx |2 xmloff/source/text/XMLRedlineExport.cxx |4 xmloff/source/text/txtflde.cxx |4 xmloff/source/text/txtfldi.cxx |6 xmloff/source/xforms/SchemaRestrictionContext.cxx|2 xmloff/source/xforms/xformsexport.cxx|2 26 files changed, 209 insertions(+), 119 deletions(-) New commits: commit 20cbf5bd3042ed547408f324e020a3d6405705f7 Author: Michael Stahl mst...@redhat.com Date: Thu Jul 11 17:27:06 2013 +0200 i#108348: support DateTimeWithTimezone in user defined Document Properties - fix interface of sax::Converter to allow passing time zones (rename the parsing methods while at it to reduce pointless overloading) - SfxDocumentMetaData supports DateWithTimezone and DateTimeWithTimezone in user-defined properties - add some ugly hacks to SfxCustomPropertiesPage to preserve existing time zones (which are not displayed in UI currently) Change-Id: Ice94112b9d79c285f80b5beda15f0ace91db97f3 diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx index 615308c..1e89d2c 100644 --- a/include/sax/tools/converter.hxx +++ b/include/sax/tools/converter.hxx @@ -22,6 +22,8 @@ #include sax/saxdllapi.h +#include boost/optional/optional.hpp + #include sal/types.h #include rtl/ustring.hxx #include rtl/ustrbuf.hxx @@ -36,6 +38,8 @@ namespace com { namespace sun { namespace star { namespace util { struct Date; struct DateTime; +struct DateWithTimeZone; +struct DateTimeWithTimeZone; struct Duration; } } } } @@ -153,23 +157,33 @@ public: /** convert util::Date to ISO date string */ static void convertDate( OUStringBuffer rBuffer, -const com::sun::star::util::Date rDate ); +const com::sun::star::util::Date rDate, +sal_Int16 const* pTimeZoneOffset); /** convert util::DateTime to ISO date or dateTime string */ static void convertDateTime( OUStringBuffer rBuffer, const com::sun::star::util::DateTime rDateTime, + sal_Int16 const* pTimeZoneOffset, bool bAddTimeIf0AM = false ); +static void convertDateTZ( OUStringBuffer rBuffer, +com::sun::star::util::DateWithTimeZone const rDate ); + +static void convertDateTimeTZ( OUStringBuffer rBuffer, +com::sun::star::util::DateTimeWithTimeZone const rDateTime ); + /** convert ISO date or dateTime string to util::DateTime */ -static bool convertDateTime( com::sun::star::util::DateTime rDateTime, +static bool parseDateTime( com::sun::star::util::DateTime rDateTime, + boost::optionalsal_Int16 * pTimeZoneOffset, const OUString rString ); /** convert ISO date or dateTime string to util::DateTime or util::Date */ -static bool convertDateOrDateTime( -com::sun::star::util::Date rDate, +static bool parseDateOrDateTime( +com::sun::star::util::Date * pDate, com::sun::star::util::DateTime rDateTime, bool rbDateTime, +boost::optionalsal_Int16 * pTimeZoneOffset, const OUString rString ); /** gets the position of the first comma after npos in the string diff --git a/include/sfx2/dinfdlg.hxx
[PUSHED] i#108348: support DateTimeWithTimezone in user defined Docum...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4834 -- To view, visit https://gerrit.libreoffice.org/4834 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice94112b9d79c285f80b5beda15f0ace91db97f3 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] i#108348: support DateTimeWithTimezone in user defined Docum...
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/4834 to look at the new patch set (#3). Change subject: i#108348: support DateTimeWithTimezone in user defined Document Properties .. i#108348: support DateTimeWithTimezone in user defined Document Properties - fix interface of sax::Converter to allow passing time zones (rename the parsing methods while at it to reduce pointless overloading) - SfxDocumentMetaData supports DateWithTimezone and DateTimeWithTimezone in user-defined properties - add some ugly hacks to SfxCustomPropertiesPage to preserve existing time zones (which are not displayed in UI currently) Change-Id: Ice94112b9d79c285f80b5beda15f0ace91db97f3 --- M include/sax/tools/converter.hxx M include/sfx2/dinfdlg.hxx M sax/qa/cppunit/test_converter.cxx M sax/source/tools/converter.cxx M sc/source/filter/xml/XMLCalculationSettingsContext.cxx M sc/source/filter/xml/XMLConverter.cxx M sc/source/filter/xml/XMLTrackedChangesContext.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/doc/SfxDocumentMetaData.cxx M xmloff/source/chart/SchXMLCalculationSettingsContext.cxx M xmloff/source/chart/SchXMLExport.cxx M xmloff/source/core/DocumentSettingsContext.cxx M xmloff/source/core/SettingsExportHelper.cxx M xmloff/source/core/xmluconv.cxx M xmloff/source/draw/sdxmlexp.cxx M xmloff/source/draw/ximppage.cxx M xmloff/source/forms/handler/vcl_date_handler.cxx M xmloff/source/text/XMLChangedRegionImportContext.cxx M xmloff/source/text/XMLRedlineExport.cxx M xmloff/source/text/txtflde.cxx M xmloff/source/text/txtfldi.cxx M xmloff/source/xforms/SchemaRestrictionContext.cxx M xmloff/source/xforms/xformsexport.cxx 23 files changed, 206 insertions(+), 116 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/4834/3 -- To view, visit https://gerrit.libreoffice.org/4834 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice94112b9d79c285f80b5beda15f0ace91db97f3 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LO 4.0.4.2 on illumos based OS
Yes, I could find it, but it says nothing particular, just that it cannot find the libs. But I'm sure I have them. Any idea? -- Da: Michael Stahl A: Gabriele Bulfon Cc: michael.me...@suse.com libreoffice-dev Data: 15 luglio 2013 15.23.29 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On 15/07/13 15:07, Gabriele Bulfon wrote: Ok, I could go over extension by disabling that motif dependent plugin. Now, later, it's trying to build xmlsec1, and looks like it can't find libs I actually have! checking for pkg-config... yes checking for libxslt libraries= 1.0.20... no [I have it, it's 1.1.26] checking for openssl libraries= 0.9.6... no [I have both 0.9.6 and 1.0.0j] checking for NSS... no checking for NSS... no checking for NSS... no checking for NSS no checking for NSS... no checking for nspr libraries= 4.0... no [I have nspr 4] checking for nss libraries= 3.2... no [I have nss 3.13.5] checking for gnutls libraries= 0.8.1... no [I have 3.1.9] checking for mscrypto libraries... none checking for crypto library... configure: error: At least one crypto library should exist for xmlsec1 I can't find the config.log of this component, this may hold the info I need to solve it. Can you help? it's in workdir/*/UnpackedTarball/xmlsec/config.log ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LO 4.0.4.2 on illumos based OS
I see no switch in global configure to force it to use system xmlsec. How does it decide to install its own? One possibility is that I make and install my own component of xmlsec. Will the build system see it and decide not to build its own? Gabriele. Da: Gabriele Bulfon A: Michael Stahl Cc: michael.me...@suse.com libreoffice-dev Data: 15 luglio 2013 15.36.11 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS Yes, I could find it, but it says nothing particular, just that it cannot find the libs. But I'm sure I have them. Any idea? -- Da: Michael Stahl A: Gabriele Bulfon Cc: michael.me...@suse.com libreoffice-dev Data: 15 luglio 2013 15.23.29 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On 15/07/13 15:07, Gabriele Bulfon wrote: Ok, I could go over extension by disabling that motif dependent plugin. Now, later, it's trying to build xmlsec1, and looks like it can't find libs I actually have! checking for pkg-config... yes checking for libxslt libraries= 1.0.20... no [I have it, it's 1.1.26] checking for openssl libraries= 0.9.6... no [I have both 0.9.6 and 1.0.0j] checking for NSS... no checking for NSS... no checking for NSS... no checking for NSS no checking for NSS... no checking for nspr libraries= 4.0... no [I have nspr 4] checking for nss libraries= 3.2... no [I have nss 3.13.5] checking for gnutls libraries= 0.8.1... no [I have 3.1.9] checking for mscrypto libraries... none checking for crypto library... configure: error: At least one crypto library should exist for xmlsec1 I can't find the config.log of this component, this may hold the info I need to solve it. Can you help? it's in workdir/*/UnpackedTarball/xmlsec/config.log ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/unodraw/unoshape.cxx | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) New commits: commit a5bfa0a75ddae5f5d824d439e99dff6d4329e965 Author: David Tardon dtar...@redhat.com Date: Mon Jul 15 12:23:40 2013 +0200 fdo#57631 fix collection of property states Change-Id: I607518da26c9430916d922b8e36143cc6dd76f25 (cherry picked from commit d3d95afe5856ef06659d61c3572c7682e5a03766) Signed-off-by: David Tardon dtar...@redhat.com Reviewed-on: https://gerrit.libreoffice.org/4910 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 5aee667..57270ea 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3030,16 +3030,8 @@ uno::Sequence beans::PropertyState SAL_CALL SvxShape::getPropertyStates( cons uno::Sequence beans::PropertyState aRet( nCount ); beans::PropertyState* pState = aRet.getArray(); -if( mpImpl-mpMaster ) -{ -for( sal_Int32 nIdx = 0; nIdx nCount; nIdx++ ) -pState[nIdx] = mpImpl-mpMaster-getPropertyState( pNames[nIdx] ); -} -else -{ -for( sal_Int32 nIdx = 0; nIdx nCount; nIdx++ ) -pState[nIdx] = _getPropertyState( pNames[nIdx] ); -} +for( sal_Int32 nIdx = 0; nIdx nCount; nIdx++ ) +pState[nIdx] = getPropertyState( pNames[nIdx] ); return aRet; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 11 -- source/text/schart/01/0406.xhp | 38 - 2 files changed, 17 insertions(+), 32 deletions(-) New commits: commit 7885eab3d5f01e8208310ca2f4258df5cbfdb999 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 15 14:39:03 2013 +0100 update help ids for chart series to axis options page Change-Id: I26f081c3db9bb9eb1b8cd49ae112e68891647663 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index d9f4ccf..f499e74 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5819,9 +5819,6 @@ chart2_CheckBox_TP_CHARTTYPE_CB_SPLINES,551781380, chart2_CheckBox_TP_CHARTTYPE_CB_STACKED,551781379, chart2_CheckBox_TP_CHARTTYPE_CB_XVALUE_SORTING,551781381, chart2_CheckBox_TP_CHARTTYPE_CB_X_AXIS_CATEGORIES,551781377, -chart2_CheckBox_TP_OPTIONS_CB_BARS_SIDE_BY_SIDE,551748618, -chart2_CheckBox_TP_OPTIONS_CB_CONNECTOR,551748617, -chart2_CheckBox_TP_OPTIONS_CB_INCLUDE_HIDDEN_CELLS,551748624, chart2_CheckBox_TP_POLAROPTIONS_CB_CLOCKWISE,551764993, chart2_CheckBox_TP_POLAROPTIONS_CB_INCLUDE_HIDDEN_CELLS_POLAR,551764994, chart2_CheckBox_TP_RANGECHOOSER_CB_FIRST_COLUMN_ASLABELS,551797762, @@ -5866,8 +5863,6 @@ chart2_MetricField_TP_3D_SCENEGEOMETRY_MTR_FLD_PERSPECTIVE,551868932, chart2_MetricField_TP_3D_SCENEGEOMETRY_MTR_FLD_X_ROTATION,551868929, chart2_MetricField_TP_3D_SCENEGEOMETRY_MTR_FLD_Y_ROTATION,551868930, chart2_MetricField_TP_3D_SCENEGEOMETRY_MTR_FLD_Z_ROTATION,551868931, -chart2_MetricField_TP_OPTIONS_MT_GAP,551754244, -chart2_MetricField_TP_OPTIONS_MT_OVERLAP,551754245, chart2_MetricField_TP_SCALE_MT_STEPHELP,551672330, chart2_ModalDialog_DLG_DATA_YERRORBAR,1087537152, chart2_NumericField_TP_POLAROPTIONS_NF_STARTING_ANGLE,551770113, @@ -5885,11 +5880,6 @@ chart2_RadioButton_TP_AXIS_LABEL_RB_AXIS_LABEL_UPDOWN,551944719, chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y,551780866, chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y_PERCENT,551780867, chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Z,551780868, -chart2_RadioButton_TP_OPTIONS_RBT_OPT_AXIS_1,551748098, -chart2_RadioButton_TP_OPTIONS_RBT_OPT_AXIS_2,551748099, -chart2_RadioButton_TP_OPTIONS_RB_ASSUME_ZERO,551748110, -chart2_RadioButton_TP_OPTIONS_RB_CONTINUE_LINE,551748111, -chart2_RadioButton_TP_OPTIONS_RB_DONT_PAINT,551748109, chart2_RadioButton_TP_RANGECHOOSER_RB_DATACOLS,551797250, chart2_RadioButton_TP_RANGECHOOSER_RB_DATAROWS,551797249, chart2_SpinField_TP_AXIS_POSITIONS_EDT_AXIS_LABEL_DISTANCE,551687173, @@ -5904,7 +5894,6 @@ chart2_TabPage_TP_AXIS_POSITIONS,551682048, chart2_TabPage_TP_DATA_SOURCE,551845888, chart2_TabPage_TP_LAYOUT,551731200, chart2_TabPage_TP_LOCATION,551829504, -chart2_TabPage_TP_OPTIONS,551747584, chart2_TabPage_TP_POLAROPTIONS,551763968, chart2_TabPage_TP_RANGECHOOSER,551796736, chart2_TabPage_TP_SCALE,551665664, diff --git a/source/text/schart/01/0406.xhp b/source/text/schart/01/0406.xhp index 3535086..0202e3e 100644 --- a/source/text/schart/01/0406.xhp +++ b/source/text/schart/01/0406.xhp @@ -32,6 +32,7 @@ bookmark_valuecharts; aligning/bookmark_value bookmark_valuepie charts;options/bookmark_value /bookmark +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_SeriesToAxis/TP_OPTIONS id=bm_id8064517 localize=false/ paragraph xml-lang=en-US id=hd_id3149400 role=heading level=1 l10n=U oldref=1link href=text/schart/01/0406.xhp name=OptionsOptions/link/paragraph paragraph xml-lang=en-US id=par_id3155067 role=paragraph l10n=CHG oldref=2Use this dialog to define some options that are available for specific chart types. The contents of the Options dialog vary with the chart type./paragraph /section @@ -40,30 +41,25 @@ /section paragraph xml-lang=en-US id=hd_id3150043 role=heading level=2 l10n=U oldref=9Align data series to:/paragraph paragraph xml-lang=en-US id=par_id3145228 role=paragraph l10n=U oldref=10In this area you can choose between two Y axis scaling modes. The axes can only be scaled and given properties separately./paragraph -!-- removed HID SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_1 -- -bookmark xml-lang=en-US branch=hid/chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1 id=bm_id8064516 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_SeriesToAxis/RBT_OPT_AXIS_1 id=bm_id8064516 localize=false/ paragraph xml-lang=en-US id=hd_id3147346 role=heading level=2 l10n=U oldref=4Primary Y axis/paragraph - paragraph xml-lang=en-US id=par_id3147005 role=paragraph l10n=U oldref=15ahelp hid=SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_1This option is active as default. All data series are aligned to the primary Y axis./ahelp/paragraph -!-- removed HID SCH:RADIOBUTTON:TP_OPTIONS:RBT_OPT_AXIS_2 -- -bookmark xml-lang=en-US branch=hid/chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2 id=bm_id9959715 localize=false/ + paragraph xml-lang=en-US id=par_id3147005 role=paragraph l10n=U
[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/AllLangResTarget_chartcontroller.mk |1 chart2/UIConfig_chart2.mk|1 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 177 +++- chart2/source/controller/dialogs/tp_SeriesToAxis.hrc | 39 - chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 35 - chart2/source/controller/dialogs/tp_SeriesToAxis.src | 187 - chart2/uiconfig/ui/tp_SeriesToAxis.ui| 384 +++ 7 files changed, 469 insertions(+), 355 deletions(-) New commits: commit 7aa0f418f7ebe3f94062ed52e3234d10687180c8 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Mon Jul 15 00:22:56 2013 -0300 Convert tp_SeriesToAxis.src to tp_SeriesToAxis.ui Change-Id: Ida1be6cc97e2a965373c8d6dc91c451adf7a Reviewed-on: https://gerrit.libreoffice.org/4906 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index 3532030..c60a3f4 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/tp_PolarOptions.src \ chart2/source/controller/dialogs/tp_RangeChooser.src \ chart2/source/controller/dialogs/tp_Scale.src \ -chart2/source/controller/dialogs/tp_SeriesToAxis.src \ chart2/source/controller/dialogs/tp_TitleRotation.src \ chart2/source/controller/dialogs/tp_Trendline.src \ chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \ diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk index 91d101b..76ab924 100644 --- a/chart2/UIConfig_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -34,6 +34,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ chart2/uiconfig/ui/insertgriddlg \ chart2/uiconfig/ui/smoothlinesdlg \ chart2/uiconfig/ui/steppedlinesdlg \ + chart2/uiconfig/ui/tp_SeriesToAxis \ )) # vim: set noet sw=4 ts=4: diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index c7b1782..fab77a2 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -18,7 +18,6 @@ */ #include tp_SeriesToAxis.hxx -#include tp_SeriesToAxis.hrc #include ResId.hxx #include chartview/ChartSfxItemIds.hxx @@ -40,31 +39,31 @@ namespace chart //. SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet rInAttrs) : -SfxTabPage(pWindow, SchResId(TP_OPTIONS), rInAttrs), -aGrpAxis(this, SchResId(GRP_OPT_AXIS)), -aRbtAxis1(this,SchResId(RBT_OPT_AXIS_1)), -aRbtAxis2(this,SchResId(RBT_OPT_AXIS_2)), - -aGrpBar(this, SchResId(GB_BAR)), -aFTGap(this,SchResId(FT_GAP)), -aMTGap(this,SchResId(MT_GAP)), -aFTOverlap(this,SchResId(FT_OVERLAP)), -aMTOverlap(this,SchResId(MT_OVERLAP)), -aCBConnect(this,SchResId(CB_CONNECTOR)), -aCBAxisSideBySide(this,SchResId(CB_BARS_SIDE_BY_SIDE)), -m_aFL_PlotOptions(this,SchResId(FL_PLOT_OPTIONS)), -m_aFT_MissingValues(this,SchResId(FT_MISSING_VALUES)), -m_aRB_DontPaint(this,SchResId(RB_DONT_PAINT)), -m_aRB_AssumeZero(this,SchResId(RB_ASSUME_ZERO)), -m_aRB_ContinueLine(this,SchResId(RB_CONTINUE_LINE)), -m_aCBIncludeHiddenCells(this,SchResId(CB_INCLUDE_HIDDEN_CELLS)), +SfxTabPage(pWindow, + TP_OPTIONS, + modules/schart/ui/tp_SeriesToAxis.ui, + rInAttrs), m_bProvidesSecondaryYAxis(true), m_bProvidesOverlapAndGapWidth(false) { -FreeResource(); - -aRbtAxis1.SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl )); -aRbtAxis2.SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl )); +get(m_pGrpAxis,frameGrpAxis); +get(m_pRbtAxis1,RBT_OPT_AXIS_1); +get(m_pRbtAxis2,RBT_OPT_AXIS_2); + +get(m_pGrpBar,frameSettings); +get(m_pMTGap,MT_GAP); +get(m_pMTOverlap,MT_OVERLAP); +get(m_pCBConnect,CB_CONNECTOR); +get(m_pCBAxisSideBySide,CB_BARS_SIDE_BY_SIDE); + +get(m_pGridPlotOptions,gridPLOT_OPTIONS); +get(m_pRB_DontPaint,RB_DONT_PAINT); +get(m_pRB_AssumeZero,RB_ASSUME_ZERO); +get(m_pRB_ContinueLine,RB_CONTINUE_LINE); +get(m_pCBIncludeHiddenCells,CB_INCLUDE_HIDDEN_CELLS); + +m_pRbtAxis1-SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl )); +m_pRbtAxis2-SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl )); } SchOptionTabPage::~SchOptionTabPage() @@ -74,9 +73,9 @@ SchOptionTabPage::~SchOptionTabPage() IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl) { if( m_nAllSeriesAxisIndex == 0 ) -aCBAxisSideBySide.Enable( aRbtAxis2.IsChecked()); +m_pCBAxisSideBySide-Enable( m_pRbtAxis2-IsChecked()); else if(
[Libreoffice-commits] core.git: 2 commits - chart2/source chart2/uiconfig helpcontent2
chart2/source/controller/dialogs/tp_ChartType.cxx |4 chart2/uiconfig/ui/smoothlinesdlg.ui |1 chart2/uiconfig/ui/steppedlinesdlg.ui | 335 +++--- chart2/uiconfig/ui/tp_SeriesToAxis.ui | 16 - helpcontent2 |2 5 files changed, 181 insertions(+), 177 deletions(-) New commits: commit 3f48ec8e73a5cb2cdffaf5edf0eb1e8c44cbc20f Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 15 13:58:50 2013 +0100 HIG spacing and indents Change-Id: I97888b8659bb978595157e881c18ce51c1482b46 diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 420aa33..34446a9 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -535,14 +535,14 @@ private: }; SteppedPropertiesDialog::SteppedPropertiesDialog( Window* pParent ) -: ModalDialog( pParent, SteppedLinesDialog, modules/schart/ui/steppedlinesdlg.ui) +: ModalDialog( pParent, SteppedLinesDialog, modules/schart/ui/steppedlinesdlg.ui) { get(m_pRB_Start, step_start_rb); get(m_pRB_End, step_end_rb); get(m_pRB_CenterX, step_center_x_rb); get(m_pRB_CenterY, step_center_y_rb); -this-SetText( String( SchResId( STR_DLG_STEPPED_LINE_PROPERTIES ) ) ); +SetText(SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES)); } SteppedPropertiesDialog::~SteppedPropertiesDialog() diff --git a/chart2/uiconfig/ui/smoothlinesdlg.ui b/chart2/uiconfig/ui/smoothlinesdlg.ui index 65464d7..9b1b34c 100644 --- a/chart2/uiconfig/ui/smoothlinesdlg.ui +++ b/chart2/uiconfig/ui/smoothlinesdlg.ui @@ -40,6 +40,7 @@ object class=GtkLabel id=TypeLabel property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign0/property property name=label translatable=yesLine _Type:/property property name=use_underlineTrue/property /object diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui b/chart2/uiconfig/ui/steppedlinesdlg.ui index ff1b5c0..2afedbe 100644 --- a/chart2/uiconfig/ui/steppedlinesdlg.ui +++ b/chart2/uiconfig/ui/steppedlinesdlg.ui @@ -4,177 +4,13 @@ !-- interface-local-resource-path /home/eric/Documents/computers/libreoffice/core/icon-themes/galaxy/chart2 -- object class=GtkDialog id=SteppedLinesDialog property name=can_focusFalse/property -property name=border_width5/property +property name=border_width6/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 property name=can_focusFalse/property property name=orientationvertical/property -property name=spacing2/property -child - object class=GtkBox id=box4 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=orientationvertical/property -child - object class=GtkLabel id=label1 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=label translatable=yesChoose the type of stepping:/property - /object - packing -property name=expandFalse/property -property name=fillTrue/property -property name=position0/property - /packing -/child -child - object class=GtkGrid id=grid2 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=column_spacing6/property -child - object class=GtkImage id=step_center_x_img -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufchart2/res/step_center_x_30.png/property - /object - packing -property name=left_attach0/property -property name=top_attach1/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=GtkImage id=step_end_img -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufchart2/res/step_end_30.png/property - /object - packing -property name=left_attach2/property -property name=top_attach0/property -property name=width1/property -property name=height1/property -
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 2a/396edb739820b5c8e516fe12876f3f4e385396 f5/d8c188925db694bc7e37a57ea276b05ea4de24
2a/396edb739820b5c8e516fe12876f3f4e385396 |1 + f5/d8c188925db694bc7e37a57ea276b05ea4de24 |1 + 2 files changed, 2 insertions(+) New commits: commit b2baaf072a0fefee7583bc91866bd1b48488c3d7 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 15 15:04:22 2013 +0100 Notes added by 'git notes add' diff --git a/2a/396edb739820b5c8e516fe12876f3f4e385396 b/2a/396edb739820b5c8e516fe12876f3f4e385396 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/2a/396edb739820b5c8e516fe12876f3f4e385396 @@ -0,0 +1 @@ +ignore: aoo commit 23f4fb79ab6be6d0e4cdd7101325db0e748bcc42 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 15 15:04:12 2013 +0100 Notes added by 'git notes add' diff --git a/f5/d8c188925db694bc7e37a57ea276b05ea4de24 b/f5/d8c188925db694bc7e37a57ea276b05ea4de24 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/f5/d8c188925db694bc7e37a57ea276b05ea4de24 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building LO 4.0.4.2 on illumos based OS
Ok. I see. Problem is, I could easily build, package and install my xmlsec1 component in few minutes, and it did see all the required libs (openssl, and so on). How can I debug why the LO internal configure cannot see the deps? Gabriele. -- Da: Rene Engelhard A: Gabriele Bulfon Cc: Michael Stahl michael.me...@suse.com libreoffice-dev Data: 15 luglio 2013 16.05.26 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On Mon, Jul 15, 2013 at 03:48:15PM +0200, Gabriele Bulfon wrote: I see no switch in global configure to force it to use system xmlsec. Yes, there is none... How does it decide to install its own? By just doing it unconditionally and everywhere. One possibility is that I make and install my own component of xmlsec. Will the build system see it and decide not to build its own? Nope. It's so heavily patched that it *might* build but not work afaicr. system-xmlsec was once tried by abandonded for that reason. :/ (It's - besides rhino - the only library which is needed internally...) Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/unodraw/unoshape.cxx | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) New commits: commit 5ecbe5df8034895273942fd19a3cd6c9544e1025 Author: David Tardon dtar...@redhat.com Date: Mon Jul 15 12:23:40 2013 +0200 fdo#57631 fix collection of property states Change-Id: I607518da26c9430916d922b8e36143cc6dd76f25 (cherry picked from commit d3d95afe5856ef06659d61c3572c7682e5a03766) Signed-off-by: David Tardon dtar...@redhat.com Reviewed-on: https://gerrit.libreoffice.org/4912 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 4c9a52e..5e3ef5f 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3043,16 +3043,8 @@ uno::Sequence beans::PropertyState SAL_CALL SvxShape::getPropertyStates( cons uno::Sequence beans::PropertyState aRet( nCount ); beans::PropertyState* pState = aRet.getArray(); -if( mpImpl-mpMaster ) -{ -for( sal_Int32 nIdx = 0; nIdx nCount; nIdx++ ) -pState[nIdx] = mpImpl-mpMaster-getPropertyState( pNames[nIdx] ); -} -else -{ -for( sal_Int32 nIdx = 0; nIdx nCount; nIdx++ ) -pState[nIdx] = _getPropertyState( pNames[nIdx] ); -} +for( sal_Int32 nIdx = 0; nIdx nCount; nIdx++ ) +pState[nIdx] = getPropertyState( pNames[nIdx] ); return aRet; } ___ 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' - sax/qa sax/source
sax/qa/cppunit/test_converter.cxx |6 -- sax/source/tools/converter.cxx| 22 ++ 2 files changed, 18 insertions(+), 10 deletions(-) New commits: commit f6dab88453fc2cec29f0fe95663452d98a74fd17 Author: Michael Stahl mst...@redhat.com Date: Sat Jun 29 17:16:07 2013 +0200 i#108348 sax::Converter: support negative date and dateTime Change-Id: Ie2726c7ec941a5690e053d39212d7f516e2c27ba (cherry picked from commit 56dc79822d5c464b33b1d0199558ca684e94c069) Reviewed-on: https://gerrit.libreoffice.org/4920 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Reviewed-by: Petr Mladek pmla...@suse.cz Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index 31e96bc..8a5f728 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -192,8 +192,10 @@ void ConverterTest::testDateTime() doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1), 0001-01-01T00:00:00 ); doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1), 0001-01-01T00:00:00Z, 0001-01-01T00:00:00 ); -//doTest( util::DateTime(0, 0, 0, 0, 1, 1, -1), -0001-01-01T00:00:00 ); -//doTest( util::DateTime(0, 0, 0, 0, 1, 1, -1), -0001-01-01T00:00:00Z ); +doTest( util::DateTime(0, 0, 0, 0, 1, 1, -1), -0001-01-01T00:00:00); +//doTest( util::DateTime(0, 0, 0, 0, 1, 1, -1), -0001-01-01T00:00:00Z); +doTest( util::DateTime(0, 0, 0, 0, 1, 1, -324), +-0324-01-01T00:00:00 ); doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1), 0001-01-01T00:00:00-00:00, 0001-01-01T00:00:00 ); doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1), diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 33a8257..690c3e5 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -1207,16 +1207,20 @@ void Converter::convertDateTime( const sal_Unicode zero('0'); const sal_Unicode tee ('T'); -if (i_rDateTime.Year 1000) { +sal_Int32 const nYear(abs(i_rDateTime.Year)); +if (i_rDateTime.Year 0) { +i_rBuffer.append(dash); // negative +} +if (nYear 1000) { i_rBuffer.append(zero); } -if (i_rDateTime.Year 100) { +if (nYear 100) { i_rBuffer.append(zero); } -if (i_rDateTime.Year 10) { +if (nYear 10) { i_rBuffer.append(zero); } -i_rBuffer.append( static_castsal_Int32(i_rDateTime.Year) ).append(dash); +i_rBuffer.append(nYear).append(dash); if( i_rDateTime.Month 10 ) { i_rBuffer.append(zero); } @@ -1330,6 +1334,7 @@ bool Converter::convertDateOrDateTime( bool rbDateTime, const OUString rString ) { bool bSuccess = true; +bool isNegative(false); const OUString string = rString.trim().toAsciiUpperCase(); sal_Int32 nPos(0); @@ -1337,7 +1342,7 @@ bool Converter::convertDateOrDateTime( { if (sal_Unicode('-') == string[nPos]) { -//Negative Number +isNegative = true; ++nPos; } } @@ -1530,8 +1535,8 @@ bool Converter::convertDateOrDateTime( { if (bHaveTime) // time is optional { -// util::DateTime does not support negative years! -rDateTime.Year = static_castsal_uInt16(nYear); +rDateTime.Year = +((isNegative) ? (-1) : (+1)) * static_castsal_Int16(nYear); rDateTime.Month = static_castsal_uInt16(nMonth); rDateTime.Day = static_castsal_uInt16(nDay); rDateTime.Hours = static_castsal_uInt16(nHours); @@ -1542,7 +1547,8 @@ bool Converter::convertDateOrDateTime( } else { -rDate.Year = static_castsal_uInt16(nYear); +rDate.Year = +((isNegative) ? (-1) : (+1)) * static_castsal_Int16(nYear); rDate.Month = static_castsal_uInt16(nMonth); rDate.Day = static_castsal_uInt16(nDay); rbDateTime = false; ___ 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-0' - scripting/source
scripting/source/pyprov/mailmerge.py | 23 +-- 1 file changed, 17 insertions(+), 6 deletions(-) New commits: commit 6a5ba90664634b288296c4e8eebc4cd6eabe6105 Author: Caolán McNamara caol...@redhat.com Date: Sat Jul 13 15:56:41 2013 +0100 Resolves: fdo#66761 Macro controlled Python Mailmerge broken Change-Id: Id8bbf06a5571534aa5eef8624e89565fe3715938 (cherry picked from commit c4aa13c931da11164835a7aafbfd7e44bd5714ca) Related: fdo#66761 the double-encoding bug appears gone in python 3.3.2 i.e. I see the bug in our built-in python3 3.3.0 but not in my system python 3.3.2 and there's a raft of email related bug fixes in the 3.3.2/3.3.1 python Changelog Change-Id: I257770cd0ec41fc3b2f2a638009b075b9a2f325f (cherry picked from commit 24078e3501042e8693ef1f9d3edebbc47e37ce12) Related: fdo#66761 we want the bytes, not a str representation of them Change-Id: I3c268b0c51f7e1ddd2fa6588f40412a33f316b52 (cherry picked from commit f460556bfa6bd55df3cd4b2288524d63db284d7e) Reviewed-on: https://gerrit.libreoffice.org/4909 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com (cherry picked from commit c71f67198cd6fc98f77289c4f0276a45d19700d8) Reviewed-on: https://gerrit.libreoffice.org/4915 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index f70f034..3cfb6d3 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -181,10 +181,21 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): textmsg['Content-Type'] = mimeEncoding textmsg['MIME-Version'] = '1.0' - textbody = textbody.encode('utf-8') + try: + #it's a string, get it as utf-8 bytes + textbody = textbody.encode('utf-8') + except: + #it's a bytesequence, get raw bytes + textbody = textbody.value if sys.version = '3': - #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w - textbody = textbody.decode('iso8859-1') + if sys.version_info.minor 3 or (sys.version_info.minor == 3 and sys.version_info.micro = 1): + #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w + #see http://bugs.python.org/16564, etc. basically it now *seems* to be all ok + #in python 3.3.2 onwards, but a little busted in 3.3.0 + + textbody = textbody.decode('iso8859-1') + else: + textbody = textbody.decode('utf-8') c = Charset('utf-8') c.body_encoding = QP textmsg.set_payload(textbody, c) @@ -466,15 +477,15 @@ class PyMailMessage(unohelper.Base, XMailMessage): self.bccrecipients.append(bccrecipient) def getRecipients( self ): if dbg: - print(PyMailMessage.getRecipients: + self.recipients, file=dbgout) + print(PyMailMessage.getRecipients: + str(self.recipients), file=dbgout) return tuple(self.recipients) def getCcRecipients( self ): if dbg: - print(PyMailMessage.getCcRecipients: + self.ccrecipients, file=dbgout) + print(PyMailMessage.getCcRecipients: + str(self.ccrecipients), file=dbgout) return tuple(self.ccrecipients) def getBccRecipients( self ): if dbg: - print(PyMailMessage.getBccRecipients: + self.bccrecipients, file=dbgout) + print(PyMailMessage.getBccRecipients: + str(self.bccrecipients), file=dbgout) return tuple(self.bccrecipients) def addAttachment( self, aMailAttachment ): if dbg: ___ Libreoffice-commits
Re: Building LO 4.0.4.2 on illumos based OS
Or maybe I could build the patched xmlsec1 component out of the LO fetched tarball, as a system library (naming it as LO version), then force the LO build not to build that component? Da: Gabriele Bulfon A: Rene Engelhard Cc: michael.me...@suse.com Michael Stahl libreoffice-dev Data: 15 luglio 2013 16.08.16 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS Ok. I see. Problem is, I could easily build, package and install my xmlsec1 component in few minutes, and it did see all the required libs (openssl, and so on). How can I debug why the LO internal configure cannot see the deps? Gabriele. -- Da: Rene Engelhard A: Gabriele Bulfon Cc: Michael Stahl michael.me...@suse.com libreoffice-dev Data: 15 luglio 2013 16.05.26 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On Mon, Jul 15, 2013 at 03:48:15PM +0200, Gabriele Bulfon wrote: I see no switch in global configure to force it to use system xmlsec. Yes, there is none... How does it decide to install its own? By just doing it unconditionally and everywhere. One possibility is that I make and install my own component of xmlsec. Will the build system see it and decide not to build its own? Nope. It's so heavily patched that it *might* build but not work afaicr. system-xmlsec was once tried by abandonded for that reason. :/ (It's - besides rhino - the only library which is needed internally...) Regards, Rene ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___ 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/dpfilteredcache.hxx |5 sc/source/core/data/dpfilteredcache.cxx | 12 + sc/source/core/data/dpgroup.cxx | 300 +++- 3 files changed, 201 insertions(+), 116 deletions(-) New commits: commit eb426753811befc69b3929146ac68cb97f92f7b0 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Sat Jul 13 16:59:16 2013 -0400 fdo#63998: Filtering by page fields to work again. Change-Id: I267ccb30cfa6347313fa1de96e18731f0e22d57d (cherry picked from commit 76488b00ed75bf7915d6d57af9875c6434e740d6) Reviewed-on: https://gerrit.libreoffice.org/4894 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index c65b95c..b601db0 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -56,6 +56,8 @@ public: /** returns true if the matching condition is met for a single cell value, or false otherwise. */ virtual bool match( const ScDPItemData rCellData ) const = 0; + +virtual std::vectorScDPItemData getMatchValues() const = 0; }; /** ordinary single-item filter. */ @@ -66,7 +68,7 @@ public: virtual ~SingleFilter() {} virtual bool match(const ScDPItemData rCellData) const; - +virtual std::vectorScDPItemData getMatchValues() const; const ScDPItemData getMatchValue() const; private: @@ -82,6 +84,7 @@ public: GroupFilter(); virtual ~GroupFilter() {} virtual bool match(const ScDPItemData rCellData) const; +virtual std::vectorScDPItemData getMatchValues() const; void addMatchItem(const ScDPItemData rItem); size_t getMatchItemCount() const; diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 51bf571..62c33eb 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -62,6 +62,13 @@ bool ScDPFilteredCache::SingleFilter::match(const ScDPItemData rCellData) const return maItem == rCellData; } +std::vectorScDPItemData ScDPFilteredCache::SingleFilter::getMatchValues() const +{ +std::vectorScDPItemData aValues; +aValues.push_back(maItem); +return aValues; +} + const ScDPItemData ScDPFilteredCache::SingleFilter::getMatchValue() const { return maItem; @@ -83,6 +90,11 @@ bool ScDPFilteredCache::GroupFilter::match(const ScDPItemData rCellData) const return false; } +std::vectorScDPItemData ScDPFilteredCache::GroupFilter::getMatchValues() const +{ +return maItems; +} + void ScDPFilteredCache::GroupFilter::addMatchItem(const ScDPItemData rItem) { maItems.push_back(rItem); diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 5368523..1e8059a 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -54,41 +54,58 @@ const sal_uInt16 SC_DP_LEAPYEAR = 1648; // arbitrary leap year for date calc class ScDPGroupNumFilter : public ScDPFilteredCache::FilterBase { public: -ScDPGroupNumFilter(const ScDPItemData rValue, const ScDPNumGroupInfo rInfo); +ScDPGroupNumFilter(const std::vectorScDPItemData rValues, const ScDPNumGroupInfo rInfo); virtual ~ScDPGroupNumFilter() {} virtual bool match(const ScDPItemData rCellData) const; +virtual std::vectorScDPItemData getMatchValues() const; private: -ScDPItemData maValue; +std::vectorScDPItemData maValues; ScDPNumGroupInfo maNumInfo; }; -ScDPGroupNumFilter::ScDPGroupNumFilter(const ScDPItemData rValue, const ScDPNumGroupInfo rInfo) : -maValue(rValue), maNumInfo(rInfo) {} +ScDPGroupNumFilter::ScDPGroupNumFilter(const std::vectorScDPItemData rValues, const ScDPNumGroupInfo rInfo) : +maValues(rValues), maNumInfo(rInfo) {} bool ScDPGroupNumFilter::match(const ScDPItemData rCellData) const { if (rCellData.GetType() != ScDPItemData::Value) return false; -double fVal = maValue.GetValue(); -if (rtl::math::isInf(fVal)) +std::vectorScDPItemData::const_iterator it = maValues.begin(), itEnd = maValues.end(); +for (; it != itEnd; ++it) { -if (rtl::math::isSignBitSet(fVal)) +double fVal = it-GetValue(); +if (rtl::math::isInf(fVal)) { -// Less than the min value. -return rCellData.GetValue() maNumInfo.mfStart; +if (rtl::math::isSignBitSet(fVal)) +{ +// Less than the min value. +if (rCellData.GetValue() maNumInfo.mfStart) +return true; +} + +// Greater than the max value. +if (maNumInfo.mfEnd rCellData.GetValue()) +return true; + +continue; } -// Greater than the max value. -return maNumInfo.mfEnd rCellData.GetValue(); +double low = fVal; +
Re: Building LO 4.0.4.2 on illumos based OS
A deeper check of the xmlsec1 config.log, shows there are many vars that are empty, not passed by main configure, such as NSS_LIBS and NSS_CFLAGS. These are set up during configure, and I used them to build against system nspr that is in a different location, but are empty in this internal xmlsec1 config.log. Probably I could pass also other libs like OPENSSL_CFLAGS and OPENSSL_LIBS, but I should understand how to pass them. Da: Gabriele Bulfon A: Rene Engelhard Cc: michael.me...@suse.com libreoffice-dev Michael Stahl Data: 15 luglio 2013 16.34.41 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS Or maybe I could build the patched xmlsec1 component out of the LO fetched tarball, as a system library (naming it as LO version), then force the LO build not to build that component? Da: Gabriele Bulfon A: Rene Engelhard Cc: michael.me...@suse.com Michael Stahl libreoffice-dev Data: 15 luglio 2013 16.08.16 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS Ok. I see. Problem is, I could easily build, package and install my xmlsec1 component in few minutes, and it did see all the required libs (openssl, and so on). How can I debug why the LO internal configure cannot see the deps? Gabriele. -- Da: Rene Engelhard A: Gabriele Bulfon Cc: Michael Stahl michael.me...@suse.com libreoffice-dev Data: 15 luglio 2013 16.05.26 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On Mon, Jul 15, 2013 at 03:48:15PM +0200, Gabriele Bulfon wrote: I see no switch in global configure to force it to use system xmlsec. Yes, there is none... How does it decide to install its own? By just doing it unconditionally and everywhere. One possibility is that I make and install my own component of xmlsec. Will the build system see it and decide not to build its own? Nope. It's so heavily patched that it *might* build but not work afaicr. system-xmlsec was once tried by abandonded for that reason. :/ (It's - besides rhino - the only library which is needed internally...) Regards, Rene ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/inc sc/source
sc/inc/dpfilteredcache.hxx |5 sc/source/core/data/dpfilteredcache.cxx | 12 + sc/source/core/data/dpgroup.cxx | 300 +++- 3 files changed, 201 insertions(+), 116 deletions(-) New commits: commit 6877ddc50d601f57d4cf77379ae613a33df19711 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Sat Jul 13 16:59:16 2013 -0400 fdo#63998: Filtering by page fields to work again. Conflicts: sc/source/core/data/dpgroup.cxx Change-Id: I267ccb30cfa6347313fa1de96e18731f0e22d57d Reviewed-on: https://gerrit.libreoffice.org/4897 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index 9caa2f8..c0002f2 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -56,6 +56,8 @@ public: /** returns true if the matching condition is met for a single cell value, or false otherwise. */ virtual bool match( const ScDPItemData rCellData ) const = 0; + +virtual std::vectorScDPItemData getMatchValues() const = 0; }; /** ordinary single-item filter. */ @@ -66,7 +68,7 @@ public: virtual ~SingleFilter() {} virtual bool match(const ScDPItemData rCellData) const; - +virtual std::vectorScDPItemData getMatchValues() const; const ScDPItemData getMatchValue() const; private: @@ -82,6 +84,7 @@ public: GroupFilter(); virtual ~GroupFilter() {} virtual bool match(const ScDPItemData rCellData) const; +virtual std::vectorScDPItemData getMatchValues() const; void addMatchItem(const ScDPItemData rItem); size_t getMatchItemCount() const; diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index ff82719..44e249f 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -63,6 +63,13 @@ bool ScDPFilteredCache::SingleFilter::match(const ScDPItemData rCellData) const return maItem == rCellData; } +std::vectorScDPItemData ScDPFilteredCache::SingleFilter::getMatchValues() const +{ +std::vectorScDPItemData aValues; +aValues.push_back(maItem); +return aValues; +} + const ScDPItemData ScDPFilteredCache::SingleFilter::getMatchValue() const { return maItem; @@ -84,6 +91,11 @@ bool ScDPFilteredCache::GroupFilter::match(const ScDPItemData rCellData) const return false; } +std::vectorScDPItemData ScDPFilteredCache::GroupFilter::getMatchValues() const +{ +return maItems; +} + void ScDPFilteredCache::GroupFilter::addMatchItem(const ScDPItemData rItem) { maItems.push_back(rItem); diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 614b5b5..392173e 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -57,41 +57,58 @@ const sal_uInt16 SC_DP_LEAPYEAR = 1648; // arbitrary leap year for date calc class ScDPGroupNumFilter : public ScDPFilteredCache::FilterBase { public: -ScDPGroupNumFilter(const ScDPItemData rValue, const ScDPNumGroupInfo rInfo); +ScDPGroupNumFilter(const std::vectorScDPItemData rValues, const ScDPNumGroupInfo rInfo); virtual ~ScDPGroupNumFilter() {} virtual bool match(const ScDPItemData rCellData) const; +virtual std::vectorScDPItemData getMatchValues() const; private: -ScDPItemData maValue; +std::vectorScDPItemData maValues; ScDPNumGroupInfo maNumInfo; }; -ScDPGroupNumFilter::ScDPGroupNumFilter(const ScDPItemData rValue, const ScDPNumGroupInfo rInfo) : -maValue(rValue), maNumInfo(rInfo) {} +ScDPGroupNumFilter::ScDPGroupNumFilter(const std::vectorScDPItemData rValues, const ScDPNumGroupInfo rInfo) : +maValues(rValues), maNumInfo(rInfo) {} bool ScDPGroupNumFilter::match(const ScDPItemData rCellData) const { if (rCellData.GetType() != ScDPItemData::Value) return false; -double fVal = maValue.GetValue(); -if (rtl::math::isInf(fVal)) +std::vectorScDPItemData::const_iterator it = maValues.begin(), itEnd = maValues.end(); +for (; it != itEnd; ++it) { -if (rtl::math::isSignBitSet(fVal)) +double fVal = it-GetValue(); +if (rtl::math::isInf(fVal)) { -// Less than the min value. -return rCellData.GetValue() maNumInfo.mfStart; +if (rtl::math::isSignBitSet(fVal)) +{ +// Less than the min value. +if (rCellData.GetValue() maNumInfo.mfStart) +return true; +} + +// Greater than the max value. +if (maNumInfo.mfEnd rCellData.GetValue()) +return true; + +continue; } -// Greater than the max value. -return maNumInfo.mfEnd rCellData.GetValue(); +double low = fVal; +double high
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/fldbas.hxx|2 -- sw/source/core/fields/fldbas.cxx |7 ++- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 02c1f4128b2011ceea6e4a0ceb054ec74315ec54 Author: Matteo Casalin matteo.casa...@yahoo.com Date: Sun Jun 23 23:46:05 2013 +0200 Reduce scope of global array and make in constant Change-Id: I914aff27234e3acede7ae6ade72530dc0fea9dc9 Reviewed-on: https://gerrit.libreoffice.org/4922 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 06e3f80..53ab826 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -218,8 +218,6 @@ enum SwDateTimeSubType }; -extern sal_uInt16 aTypeTab[]; - /// General tools. String GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM); voidSetErrorStr(const String rStr); diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index d6bdb92..524e185 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -70,7 +70,10 @@ static sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFmt, /// field names std::vectorString* SwFieldType::pFldNames = 0; -sal_uInt16 aTypeTab[] = { +namespace +{ + +const sal_uInt16 aTypeTab[] = { /* RES_DBFLD*/ TYP_DBFLD, /* RES_USERFLD */ TYP_USERFLD, /* RES_FILENAMEFLD */ TYP_FILENAMEFLD, @@ -113,6 +116,8 @@ std::vectorString* SwFieldType::pFldNames = 0; /* RES_DROPDOWN */ TYP_DROPDOWN }; +} + const String SwFieldType::GetTypeStr(sal_uInt16 nTypeId) { if( !pFldNames ) ___ 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' - comphelper/source connectivity/source extensions/source forms/source offapi/com offapi/type_reference offapi/UnoApi_offapi.mk oox/source qade
comphelper/source/misc/anycompare.cxx |3 connectivity/source/commontools/dbconversion.cxx|5 connectivity/source/drivers/file/FDateFunctions.cxx | 10 connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx |5 connectivity/source/drivers/odbcbase/OResultSet.cxx |5 extensions/source/propctrlr/standardcontrol.cxx |3 forms/source/xforms/convert.cxx | 10 offapi/UnoApi_offapi.mk |3 offapi/com/sun/star/util/Date.idl |3 offapi/com/sun/star/util/DateTime.idl |7 offapi/com/sun/star/util/DateTimeRange.idl |8 offapi/com/sun/star/util/DateTimeWithTimezone.idl | 43 ++ offapi/com/sun/star/util/DateWithTimezone.idl | 43 ++ offapi/com/sun/star/util/Time.idl |7 offapi/com/sun/star/util/TimeWithTimezone.idl | 44 ++ offapi/type_reference/offapi.rdb|binary oox/source/docprop/docprophandler.cxx |4 qadevOOo/tests/java/ifc/sdbc/_XParameters.java |4 reportdesign/source/core/sdr/RptObject.cxx |3 sax/qa/cppunit/test_converter.cxx | 63 +-- sax/source/tools/converter.cxx | 204 -- sc/source/filter/oox/unitconverter.cxx |2 sd/source/ui/annotations/annotationmanager.cxx |5 sfx2/source/appl/sfxpicklist.cxx|2 sfx2/source/dialog/dinfdlg.cxx | 16 sfx2/source/doc/SfxDocumentMetaData.cxx |5 sfx2/source/doc/objcont.cxx |4 sfx2/source/doc/oleprops.cxx| 13 sfx2/source/view/viewprn.cxx|2 svl/source/items/dateitem.cxx |4 svtools/source/misc/templatefoldercache.cxx |3 svtools/source/svhtml/parhtml.cxx |3 sw/source/core/doc/docglbl.cxx |3 sw/source/filter/ww8/ww8par.cxx |2 toolkit/source/controls/unocontrols.cxx |2 ucb/source/ucp/ftp/ftpdirp.hxx |3 ucb/source/ucp/gio/gio_content.cxx |2 unotools/source/misc/datetime.cxx |3 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 xmloff/source/chart/SchXMLExport.cxx|2 40 files changed, 446 insertions(+), 109 deletions(-) New commits: commit dd780228cca25dc818ca7fdb628ff607c109618e Author: Michael Stahl mst...@redhat.com Date: Fri Jun 28 00:43:19 2013 +0200 i#108348 API CHANGE: add IsUTC to css.util.DateTime etc. Add IsUTC member to: com.sun.star.util.DateTime com.sun.star.util.DateTimeRange com.sun.star.util.Time Add new stucts with explicit time zones: com.sun.star.util.DateTimeWithTimezone com.sun.star.util.DateWithTimezone com.sun.star.util.TimeWithTimezone Adapt the sax::Converter to read/write timezones, and fix the unit test. Everything else just uses default (no time zone), this commit is just to fix the API. STRUCT: /UCR/com/sun/star/util/DateTime nFields1 = 7 != nFields2 = 8 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/DateTimeRange nFields1 = 14 != nFields2 = 15 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/Time nFields1 = 4 != nFields2 = 5 Registry2 contains 1 more fields Conflicts: sc/source/filter/oox/unitconverter.cxx Reviewed-on: https://gerrit.libreoffice.org/4833 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com (cherry picked from commit 652ccbdf3111766fadc379a8cf4650b744e1e19c) i#108348: fix TimeZone - Timezone in struct names (cherry picked from commit 604aae1fd240254fe851d93dc35b5408bd13296c) Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Lionel Elie Mamane lio...@mamane.lu Signed-off-by: Michael Meeks michael.me...@suse.com Conflicts: forms/source/xforms/convert.cxx offapi/type_reference/offapi.rdb reportdesign/source/core/sdr/RptObject.cxx
Re: Building LO 4.0.4.2 on illumos based OS
...I also found that the old README.Solaris mentions a --disable-xmlsec, but the configure script doesn't mention it. Any other way to avoid building xmlsec? Da: Gabriele Bulfon A: Rene Engelhard Cc: michael.me...@suse.com libreoffice-dev Michael Stahl Data: 15 luglio 2013 16.47.25 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS A deeper check of the xmlsec1 config.log, shows there are many vars that are empty, not passed by main configure, such as NSS_LIBS and NSS_CFLAGS. These are set up during configure, and I used them to build against system nspr that is in a different location, but are empty in this internal xmlsec1 config.log. Probably I could pass also other libs like OPENSSL_CFLAGS and OPENSSL_LIBS, but I should understand how to pass them. Da: Gabriele Bulfon A: Rene Engelhard Cc: michael.me...@suse.com libreoffice-dev Michael Stahl Data: 15 luglio 2013 16.34.41 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS Or maybe I could build the patched xmlsec1 component out of the LO fetched tarball, as a system library (naming it as LO version), then force the LO build not to build that component? Da: Gabriele Bulfon A: Rene Engelhard Cc: michael.me...@suse.com Michael Stahl libreoffice-dev Data: 15 luglio 2013 16.08.16 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS Ok. I see. Problem is, I could easily build, package and install my xmlsec1 component in few minutes, and it did see all the required libs (openssl, and so on). How can I debug why the LO internal configure cannot see the deps? Gabriele. -- Da: Rene Engelhard A: Gabriele Bulfon Cc: Michael Stahl michael.me...@suse.com libreoffice-dev Data: 15 luglio 2013 16.05.26 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On Mon, Jul 15, 2013 at 03:48:15PM +0200, Gabriele Bulfon wrote: I see no switch in global configure to force it to use system xmlsec. Yes, there is none... How does it decide to install its own? By just doing it unconditionally and everywhere. One possibility is that I make and install my own component of xmlsec. Will the build system see it and decide not to build its own? Nope. It's so heavily patched that it *might* build but not work afaicr. system-xmlsec was once tried by abandonded for that reason. :/ (It's - besides rhino - the only library which is needed internally...) Regards, Rene ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement
All of my past and future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/osl oox/source ucb/source
include/osl/time.h|2 +- oox/source/docprop/docprophandler.cxx |2 +- ucb/source/ucp/webdav-neon/DateTimeHelper.cxx |4 ++-- ucb/source/ucp/webdav/DateTimeHelper.cxx |4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 51745327e55ad5ffb5df620142c27c0ad956ef1d Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 12:11:42 2013 +0200 API change: oslDateTime signed year to match the rest of our date-related data structures, which were recently switched to signed year. Change-Id: Ic4f1e424b130fd2ccca379adbe0a66836b6cac41 Reviewed-on: https://gerrit.libreoffice.org/4735 Reviewed-by: Michael Stahl mst...@redhat.com Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/include/osl/time.h b/include/osl/time.h index 297cc95..484adb0 100644 --- a/include/osl/time.h +++ b/include/osl/time.h @@ -92,7 +92,7 @@ typedef struct _oslDateTime /*--*/ /** is the year. */ -sal_uInt16 Year; +sal_Int16 Year; } oslDateTime; diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 6f15245..e7ecd97 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -97,7 +97,7 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString aChar sal_Int32 nLen = aChars.getLength(); if ( nLen = 4 ) { -aOslDTime.Year = (sal_uInt16)aChars.copy( 0, 4 ).toInt32(); +aOslDTime.Year = (sal_Int16)aChars.copy( 0, 4 ).toInt32(); if ( nLen = 7 aChars.getStr()[4] == (sal_Unicode)'-' ) { diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx index 4bf2ea8..ce99c2d 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx @@ -89,7 +89,7 @@ bool DateTimeHelper::ISO8601_To_DateTime (const OUString s, aDateTime.Day = sal::static_int_cast sal_uInt16 (day); // 1-31 aDateTime.DayOfWeek = 0; // 0-6, 0 = Sunday aDateTime.Month = sal::static_int_cast sal_uInt16 (month); // 1-12 -aDateTime.Year= sal::static_int_cast sal_uInt16 (year); +aDateTime.Year= sal::static_int_cast sal_Int16 (year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( aDateTime, aTimeValue ) ) @@ -206,7 +206,7 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString s, aDateTime.DayOfWeek = 0; //dayofweek; // 0-6, 0 = Sunday aDateTime.Month = sal::static_int_cast sal_uInt16 (month); // 1-12 -aDateTime.Year= sal::static_int_cast sal_uInt16 (year); +aDateTime.Year= sal::static_int_cast sal_Int16 (year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( aDateTime, diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx index c4ccbca..7ca9a3d 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx @@ -79,7 +79,7 @@ bool DateTimeHelper::ISO8601_To_DateTime (const OUString s, aDateTime.Day = sal::static_int_cast sal_uInt16 (day); // 1-31 aDateTime.DayOfWeek = 0; // 0-6, 0 = Sunday aDateTime.Month = sal::static_int_cast sal_uInt16 (month); // 1-12 -aDateTime.Year= sal::static_int_cast sal_uInt16 (year); +aDateTime.Year= sal::static_int_cast sal_Int16 (year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( aDateTime, aTimeValue ) ) @@ -218,7 +218,7 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString s, aDateTime.DayOfWeek = 0; //dayofweek; // 0-6, 0 = Sunday aDateTime.Month = sal::static_int_cast sal_uInt16 (month); // 1-12 -aDateTime.Year= sal::static_int_cast sal_uInt16 (year); +aDateTime.Year= sal::static_int_cast sal_Int16 (year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( aDateTime, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/win
vcl/inc/pch/precompiled_vcl.hxx |1 - vcl/source/app/svmain.cxx |8 vcl/source/filter/graphicfilter.cxx |5 ++--- vcl/source/gdi/image.cxx|7 +++ vcl/source/gdi/outdev3.cxx |2 +- vcl/source/helper/canvastools.cxx |5 ++--- vcl/source/window/toolbox.cxx |3 +-- vcl/win/source/gdi/salgdi3.cxx |9 + 8 files changed, 14 insertions(+), 26 deletions(-) New commits: commit 7650a82702ec9d13e3a52ea84b9666ee4e9f9a62 Author: Jelle van der Waa je...@vdwaa.nl Date: Sat Jul 13 15:08:03 2013 +0200 fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO Change-Id: I85a3cfeac16e2c8e20724e1f6a5dd16c2c143a49 Reviewed-on: https://gerrit.libreoffice.org/4882 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 8b49d62..76d533e 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -321,7 +321,6 @@ #include rtl/crc.h #include rtl/digest.h #include rtl/instance.hxx -#include rtl/logfile.hxx #include rtl/math.h #include rtl/math.hxx #include rtl/process.h diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index e2766b0..f9d571f 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -145,7 +145,7 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo int ImplSVMain() { // The 'real' SVMain() -RTL_LOGFILE_CONTEXT( aLog, vcl (ss112471) ::SVMain ); +SAL_INFO( vcl.app, vcl (ss112471) ::SVMain ); ImplSVData* pSVData = ImplGetSVData(); @@ -241,7 +241,7 @@ uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString Nam bool InitVCL() { -RTL_LOGFILE_CONTEXT( aLog, vcl (ss112471) ::InitVCL ); +SAL_INFO( vcl.app, vcl (ss112471) ::InitVCL ); if( pExceptionHandler != NULL ) return false; @@ -266,11 +266,11 @@ bool InitVCL() pSVData-mnMainThreadId = ::osl::Thread::getCurrentIdentifier(); // Initialize Sal -RTL_LOGFILE_CONTEXT_TRACE( aLog, { ::CreateSalInstance ); +SAL_INFO( vcl.app, { ::CreateSalInstance ); pSVData-mpDefInst = CreateSalInstance(); if ( !pSVData-mpDefInst ) return false; -RTL_LOGFILE_CONTEXT_TRACE( aLog, } ::CreateSalInstance ); +SAL_INFO( vcl.app, } ::CreateSalInstance ); // Desktop Environment context (to be able to get value of system.desktop-environment as soon as possible) com::sun::star::uno::setCurrentContext( diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index eb38d56..650609c 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -57,7 +57,6 @@ #include unotools/localfilehelper.hxx #include rtl/bootstrap.hxx #include rtl/instance.hxx -#include rtl/logfile.hxx #include vcl/metaact.hxx #include vector @@ -1739,7 +1738,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic rGraphic, const INetURLO return GRFILTER_FORMATERROR; #else -RTL_LOGFILE_CONTEXT( aLog, GraphicFilter::ExportGraphic() (thb) ); +SAL_INFO( vcl.filter, GraphicFilter::ExportGraphic() (thb) ); sal_uInt16 nRetValue = GRFILTER_FORMATERROR; DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID ); bool bAlreadyExists = DirEntryExists( rPath ); @@ -1789,7 +1788,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic rGraphic, const String return GRFILTER_FORMATERROR; #else -RTL_LOGFILE_CONTEXT( aLog, GraphicFilter::ExportGraphic() (thb) ); +SAL_INFO( vcl.filter, GraphicFilter::ExportGraphic() (thb) ); sal_uInt16 nFormatCount = GetExportFormatCount(); ResetLastError(); diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index e508b2c..0e33a63 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -20,7 +20,6 @@ #include boost/scoped_ptr.hpp #include boost/scoped_array.hpp -#include rtl/logfile.hxx #include tools/debug.hxx #include tools/stream.hxx @@ -296,7 +295,7 @@ ImageList::ImageList( const ResId rResId ) : mnInitSize( 1 ), mnGrowSize( 4 ) { -RTL_LOGFILE_CONTEXT( aLog, vcl: ImageList::ImageList( const ResId rResId ) ); +SAL_INFO( vcl.gdi, vcl: ImageList::ImageList( const ResId rResId ) ); DBG_CTOR( ImageList, NULL ); @@ -346,7 +345,7 @@ ImageList::ImageList( const ::std::vector OUString rNameVector, mnInitSize( 1 ), mnGrowSize( 4 ) { -RTL_LOGFILE_CONTEXT( aLog, vcl: ImageList::ImageList(const vector OUString ... ); +SAL_INFO( vcl.gdi, vcl: ImageList::ImageList(const vector OUString ... ); DBG_CTOR( ImageList, NULL ); @@ -675,7 +674,7 @@ OUString ImageList::GetImageName( sal_uInt16 nPos ) const void ImageList::GetImageNames(
[GSOC] about:config utility - Weekly Report #4
Hi, This week I only did debugging. Configuration management code is a little complicated. I could handle it mostly. Learned a lot about about configuration process now. I know where is the config codes mostly. But I don't know how to use it. Also there was no good internet access this week. I couldn't asked as much information this week. As I understand: -configmgr/source stores codes for taking settings from configxmls, -unotools/source/config stores configmgr, and other cxx files. They handle settings to use on other parts of the code. -configmgr and configItem are important for using the config files in other files. I will take save options for the first. There are some questions for this week I will deal: -What is XNameAccess and why we use it? (It is not quite important I think but I may need it.) -Why some cxx files have cfgmgr.cxx in includes and others don't? What is the difference of them? -What notify methods do and how this aspects the behavior of program? -Should I need new cxx files for every single options group? Or how much I need them in case of ? -Which part of code I should use for my project? (I think I need to look around configmgr.cxx on /unotools) -How options dialog saves new options? Which part of the code it uses? (I assume it is same file which loades the settings. And probably I should really look into configmgr.cxx) Best, -- Efe Gürkan YALAMAN http://about.me/efegurkan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 38 +-- 1 file changed, 36 insertions(+), 2 deletions(-) New commits: commit 0563f5f43bf244732ef2da32b30470fa2549c072 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Jul 15 11:30:40 2013 -0400 Example code on how to handle input and output for matrix inversion. Right now this code simply puts the original matrix values back. Re-write this code to perform inversion for real. Change-Id: I0330db77b000ed14cc810cc3ddf616e56d036c1b diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 5f343d9..8de7713 100755 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -57,9 +57,43 @@ public: const ScFormulaCellGroupRef xGroup, ScTokenArray rCode); }; -ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix /* rMat */) +ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix rMat) { -return ScMatrixRef(); +SCSIZE nC, nR; +rMat.GetDimensions(nC, nR); +if (nC != nR || nC == 0) +// Input matrix must be square. Return an empty matrix on failure and +// the caller will calculate it via CPU. +return ScMatrixRef(); + +// This vector will contain a series of doubles from the first column to +// the last, chained together in a single array. +std::vectordouble aDoubles; +rMat.GetDoubleArray(aDoubles); + +// TODO: Inverse this matrix and put the result back into xInv. Right now, +// I'll just put the original, non-inversed matrix values back, just to +// demonstrate how to put the values back after inversion. There are two +// ways to put the values back (depending on what the GPU output is). +ScMatrixRef xInv(new ScMatrix(nR, nR, 0.0)); + +#if 0 +// One way is to put the whole value as one array. This method assumes +// that the array size equals column x row, and is oriented column-wise. +// This method is slightly more efficient than the second, but I wouldn't +// expect too much of a difference. +xInv-PutDouble(aDoubles[0], aDoubles.size(), 0, 0); +#else +// Another way is to put the values one column at a time. +const double* p = aDoubles[0]; +for (SCSIZE i = 0; i nC; ++i) +{ +xInv-PutDouble(p, nR, i, 0); +p += nR; +} +#endif + +return xInv; } bool FormulaGroupInterpreterOpenCL::interpret(ScDocument rDoc, const ScAddress rTopPos, ___ 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-0' - include/osl oox/source ucb/source
include/osl/time.h|2 +- oox/source/docprop/docprophandler.cxx |2 +- ucb/source/ucp/webdav-neon/DateTimeHelper.cxx |4 ++-- ucb/source/ucp/webdav/DateTimeHelper.cxx |4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 0fc41b8a89d9cfabf146657fb01c58a158056360 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 12:11:42 2013 +0200 API change: oslDateTime signed year to match the rest of our date-related data structures, which were recently switched to signed year. Change-Id: Ic4f1e424b130fd2ccca379adbe0a66836b6cac41 Reviewed-on: https://gerrit.libreoffice.org/4735 Reviewed-by: Michael Stahl mst...@redhat.com Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz (cherry picked from commit 51745327e55ad5ffb5df620142c27c0ad956ef1d) diff --git a/include/osl/time.h b/include/osl/time.h index 4be9e72..6bb48f2 100644 --- a/include/osl/time.h +++ b/include/osl/time.h @@ -92,7 +92,7 @@ typedef struct _oslDateTime /*--*/ /** is the year. */ -sal_uInt16 Year; +sal_Int16 Year; } oslDateTime; diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 6f15245..e7ecd97 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -97,7 +97,7 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString aChar sal_Int32 nLen = aChars.getLength(); if ( nLen = 4 ) { -aOslDTime.Year = (sal_uInt16)aChars.copy( 0, 4 ).toInt32(); +aOslDTime.Year = (sal_Int16)aChars.copy( 0, 4 ).toInt32(); if ( nLen = 7 aChars.getStr()[4] == (sal_Unicode)'-' ) { diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx index 4bf2ea8..ce99c2d 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx @@ -89,7 +89,7 @@ bool DateTimeHelper::ISO8601_To_DateTime (const OUString s, aDateTime.Day = sal::static_int_cast sal_uInt16 (day); // 1-31 aDateTime.DayOfWeek = 0; // 0-6, 0 = Sunday aDateTime.Month = sal::static_int_cast sal_uInt16 (month); // 1-12 -aDateTime.Year= sal::static_int_cast sal_uInt16 (year); +aDateTime.Year= sal::static_int_cast sal_Int16 (year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( aDateTime, aTimeValue ) ) @@ -206,7 +206,7 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString s, aDateTime.DayOfWeek = 0; //dayofweek; // 0-6, 0 = Sunday aDateTime.Month = sal::static_int_cast sal_uInt16 (month); // 1-12 -aDateTime.Year= sal::static_int_cast sal_uInt16 (year); +aDateTime.Year= sal::static_int_cast sal_Int16 (year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( aDateTime, diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx index c4ccbca..7ca9a3d 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx @@ -79,7 +79,7 @@ bool DateTimeHelper::ISO8601_To_DateTime (const OUString s, aDateTime.Day = sal::static_int_cast sal_uInt16 (day); // 1-31 aDateTime.DayOfWeek = 0; // 0-6, 0 = Sunday aDateTime.Month = sal::static_int_cast sal_uInt16 (month); // 1-12 -aDateTime.Year= sal::static_int_cast sal_uInt16 (year); +aDateTime.Year= sal::static_int_cast sal_Int16 (year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( aDateTime, aTimeValue ) ) @@ -218,7 +218,7 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString s, aDateTime.DayOfWeek = 0; //dayofweek; // 0-6, 0 = Sunday aDateTime.Month = sal::static_int_cast sal_uInt16 (month); // 1-12 -aDateTime.Year= sal::static_int_cast sal_uInt16 (year); +aDateTime.Year= sal::static_int_cast sal_Int16 (year); TimeValue aTimeValue; if ( osl_getTimeValueFromDateTime( aDateTime, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 38 +-- 1 file changed, 36 insertions(+), 2 deletions(-) New commits: commit 69f2c96b3196cb8e9430d8abab84032a6da61352 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Jul 15 11:30:40 2013 -0400 Example code on how to handle input and output for matrix inversion. Right now this code simply puts the original matrix values back. Re-write this code to perform inversion for real. Change-Id: I0330db77b000ed14cc810cc3ddf616e56d036c1b diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index dee465e..c24f13a 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -57,9 +57,43 @@ public: const ScFormulaCellGroupRef xGroup, ScTokenArray rCode); }; -ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix /* rMat */) +ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix rMat) { -return ScMatrixRef(); +SCSIZE nC, nR; +rMat.GetDimensions(nC, nR); +if (nC != nR || nC == 0) +// Input matrix must be square. Return an empty matrix on failure and +// the caller will calculate it via CPU. +return ScMatrixRef(); + +// This vector will contain a series of doubles from the first column to +// the last, chained together in a single array. +std::vectordouble aDoubles; +rMat.GetDoubleArray(aDoubles); + +// TODO: Inverse this matrix and put the result back into xInv. Right now, +// I'll just put the original, non-inversed matrix values back, just to +// demonstrate how to put the values back after inversion. There are two +// ways to put the values back (depending on what the GPU output is). +ScMatrixRef xInv(new ScMatrix(nR, nR, 0.0)); + +#if 0 +// One way is to put the whole value as one array. This method assumes +// that the array size equals column x row, and is oriented column-wise. +// This method is slightly more efficient than the second, but I wouldn't +// expect too much of a difference. +xInv-PutDouble(aDoubles[0], aDoubles.size(), 0, 0); +#else +// Another way is to put the values one column at a time. +const double* p = aDoubles[0]; +for (SCSIZE i = 0; i nC; ++i) +{ +xInv-PutDouble(p, nR, i, 0); +p += nR; +} +#endif + +return xInv; } bool FormulaGroupInterpreterOpenCL::interpret(ScDocument rDoc, const ScAddress rTopPos, ___ 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' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Views.xcu |7 +++ 1 file changed, 7 insertions(+) New commits: commit 7d191b1ab0cf43c64ad25ad28da8d1d91214098c Author: Jan Holesovsky ke...@suse.cz Date: Mon Jul 15 17:32:40 2013 +0200 Enable sidebar by default when the Experimental Sidebar is put to 'on'. Change-Id: I525f15bc3f6b40522bf0dce754dd8e99386cd775 Reviewed-on: https://gerrit.libreoffice.org/4926 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu index bd3a06b..65d02dd 100644 --- a/officecfg/registry/data/org/openoffice/Office/Views.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu @@ -24,5 +24,12 @@ valuefalse/value /prop /node + +!-- show Sidebar child window by default (when enabled via the Experimental settings) - oor:name == SID_SIDEBAR -- +node oor:name=10336 oor:op=replace + prop oor:name=Visible oor:type=xs:boolean +valuetrue/value + /prop +/node /node /oor:component-data ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/export/vmlexport.cxx |2 ++ sw/qa/extras/ooxmlexport/data/bnc581614.doc |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 10 ++ 3 files changed, 12 insertions(+) New commits: commit ba8988a59716acc405ce5e5233e3f472e0066cbc Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jul 15 17:41:36 2013 +0200 explicitly export no fill to .docx when fillstyle is set to none (bnc#581614) The shapes have detectmouseclick=t for some reason, leading to the v:fill tag being written, but the default is solid fill, so if there's otherwise actually no fill, explicitly say so. Change-Id: I2a8d24ce4d0da1082b4eefbad0db51e2e6fe1bc9 diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 5381d2f..5635158 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -545,6 +545,8 @@ void VMLExport::Commit( EscherPropertyContainer rProps, const Rectangle rRect if ( pFillType ) pAttrList-add( XML_type, pFillType ); } +else +pAttrList-add( XML_on, false ); if ( rProps.GetOpt( ESCHER_Prop_fillColor, nValue ) ) impl_AddColor( m_pShapeAttrList, XML_fillcolor, nValue ); diff --git a/sw/qa/extras/ooxmlexport/data/bnc581614.doc b/sw/qa/extras/ooxmlexport/data/bnc581614.doc new file mode 100644 index 000..f56525e Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/bnc581614.doc differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 9535083..ff5dc8f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -94,6 +94,7 @@ public: void testFdo66688(); void testFdo66773(); void testFdo58577(); +void testBnc581614(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -158,6 +159,7 @@ void Test::run() {fdo66688.docx, Test::testFdo66688}, {fdo66773.docx, Test::testFdo66773}, {fdo58577.odt, Test::testFdo58577}, +{bnc581614.doc, Test::testBnc581614}, }; // Don't test the first import of these, for some reason those tests fail const char* aBlacklist[] = { @@ -943,6 +945,14 @@ void Test::testFdo58577() CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess-getCount()); } +void Test::testBnc581614() +{ +uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY); +uno::Referencebeans::XPropertySet xFrame(xDraws-getByIndex(0), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, getPropertydrawing::FillStyle(xFrame, FillStyle)); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sax sax/source
include/sax/tools/converter.hxx |8 sax/source/tools/converter.cxx |8 2 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 4ce40c0b06888cff6bc593669d0fb94139485620 Author: Michael Stahl mst...@redhat.com Date: Mon Jul 15 17:56:56 2013 +0200 sax: more s/TimeZone/Timezone/ Change-Id: I9b50e53b131fc835e792c52de6560d77ac454be9 diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx index 1e89d2c..7d253f3 100644 --- a/include/sax/tools/converter.hxx +++ b/include/sax/tools/converter.hxx @@ -38,8 +38,8 @@ namespace com { namespace sun { namespace star { namespace util { struct Date; struct DateTime; -struct DateWithTimeZone; -struct DateTimeWithTimeZone; +struct DateWithTimezone; +struct DateTimeWithTimezone; struct Duration; } } } } @@ -167,10 +167,10 @@ public: bool bAddTimeIf0AM = false ); static void convertDateTZ( OUStringBuffer rBuffer, -com::sun::star::util::DateWithTimeZone const rDate ); +com::sun::star::util::DateWithTimezone const rDate ); static void convertDateTimeTZ( OUStringBuffer rBuffer, -com::sun::star::util::DateTimeWithTimeZone const rDateTime ); +com::sun::star::util::DateTimeWithTimezone const rDateTime ); /** convert ISO date or dateTime string to util::DateTime */ static bool parseDateTime( com::sun::star::util::DateTime rDateTime, diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 911de8a..3954f97 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -22,8 +22,8 @@ #include com/sun/star/i18n/UnicodeType.hpp #include com/sun/star/util/DateTime.hpp #include com/sun/star/util/Date.hpp -#include com/sun/star/util/DateTimeWithTimeZone.hpp -#include com/sun/star/util/DateWithTimeZone.hpp +#include com/sun/star/util/DateTimeWithTimezone.hpp +#include com/sun/star/util/DateWithTimezone.hpp #include com/sun/star/util/Duration.hpp #include com/sun/star/util/Time.hpp #include com/sun/star/uno/Sequence.hxx @@ -1224,13 +1224,13 @@ lcl_AppendTimezone(OUStringBuffer i_rBuffer, sal_Int16 const nOffset) } void Converter::convertDateTZ( OUStringBuffer rBuffer, -com::sun::star::util::DateWithTimeZone const rDate) +com::sun::star::util::DateWithTimezone const rDate) { convertDate(rBuffer, rDate.DateInTZ, rDate.Timezone); } void Converter::convertDateTimeTZ( OUStringBuffer rBuffer, -com::sun::star::util::DateTimeWithTimeZone const rDateTime) +com::sun::star::util::DateTimeWithTimezone const rDateTime) { convertDateTime(rBuffer, rDateTime.DateTimeInTZ, rDateTime.Timezone); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/gvfs/gvfs_content.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5ff4ccc6c49b0d69a3a9f80f9abdc65fe60f8aec Author: Michael Stahl mst...@redhat.com Date: Mon Jul 15 18:09:07 2013 +0200 ucb: fix DateTime in gvfs Change-Id: I5733e1490f3f162045fa5040efaabb6550d235a7 diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index 5645cd6..61443d9 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -559,7 +559,7 @@ getDateFromUnix (time_t t) if ( osl_getDateTimeFromTimeValue( tv, dt ) ) return util::DateTime( 0, dt.Seconds, dt.Minutes, dt.Hours, - dt.Day, dt.Month, dt.Year); + dt.Day, dt.Month, dt.Year, false); else return util::DateTime(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1 cui/source/inc/optdict.hxx| 15 -- cui/source/options/optdict.cxx| 46 ++- cui/source/options/optdict.hrc|8 - cui/source/options/optdict.src| 71 -- cui/uiconfig/ui/optnewdictionarydialog.ui | 194 ++ 6 files changed, 218 insertions(+), 117 deletions(-) New commits: commit 766458eafb855a44b1c4c9a5342bbb3748b7ef23 Author: Csikós Tamás csks.t...@gmail.com Date: Mon Jul 15 14:16:42 2013 +0200 modern .ui widgetlayout for optdict/newdictdlg Change-Id: I8bd0a334bffee9adcf23fe2f597b66924b57ce30 Reviewed-on: https://gerrit.libreoffice.org/4917 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 5f51232..0908fef 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -55,6 +55,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/optjsearchpage \ cui/uiconfig/ui/optlanguagespage \ cui/uiconfig/ui/optmemorypage \ + cui/uiconfig/ui/optnewdictionarydialog \ cui/uiconfig/ui/optonlineupdatepage \ cui/uiconfig/ui/optpathspage \ cui/uiconfig/ui/optproxypage \ diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 2251a2b..246b091 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -50,15 +50,12 @@ namespace linguistic2{ class SvxNewDictionaryDialog : public ModalDialog { private: -FixedLineaNewDictBox; -FixedText aNameText; -EditaNameEdit; -FixedText aLanguageText; -SvxLanguageBox aLanguageLB; -CheckBoxaExceptBtn; -OKButtonaOKBtn; -CancelButtonaCancelBtn; -HelpButton aHelpBtn; +Edit*pNameEdit; +SvxLanguageBox* pLanguageLB; +CheckBox*pExceptBtn; +OKButton*pOKBtn; +CancelButton*pCancelBtn; +HelpButton* pHelpBtn; ::com::sun::star::uno::Reference ::com::sun::star::linguistic2::XSpellChecker1 xSpell; ::com::sun::star::uno::Reference diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 36af1fb..020cb17 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -82,41 +82,29 @@ static CDE_RESULT cmpDicEntry_Impl( const String rText1, const String rText2 ) SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, Reference XSpellChecker1 xSpl ) : -ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ), - -aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ), -aNameText ( this, CUI_RES( FT_DICTNAME ) ), -aNameEdit ( this, CUI_RES( ED_DICTNAME ) ), -aLanguageText ( this, CUI_RES( FT_DICTLANG ) ), -aLanguageLB ( this, CUI_RES( LB_DICTLANG ) ), -aExceptBtn ( this, CUI_RES( BTN_EXCEPT ) ), -aOKBtn ( this, CUI_RES( BTN_NEWDICT_OK ) ), -aCancelBtn ( this, CUI_RES( BTN_NEWDICT_ESC ) ), -aHelpBtn( this, CUI_RES( BTN_NEWDICT_HLP ) ), +ModalDialog( pParent, OptNewDictionaryDialog , cui/ui/optnewdictionarydialog.ui ), + xSpell( xSpl ) { +get(pNameEdit,nameedit); +get(pLanguageLB,language); +get(pExceptBtn,except); +get(pOKBtn,ok); // install handler -aNameEdit.SetModifyHdl( +pNameEdit-SetModifyHdl( LINK( this, SvxNewDictionaryDialog, ModifyHdl_Impl ) ); -aOKBtn.SetClickHdl( LINK( this, SvxNewDictionaryDialog, OKHdl_Impl ) ); +pOKBtn-SetClickHdl( LINK( this, SvxNewDictionaryDialog, OKHdl_Impl ) ); // display languages -aLanguageLB.SetLanguageList( LANG_LIST_ALL, sal_True, sal_True ); -aLanguageLB.SelectEntryPos(0); - -aNameText.SetAccessibleRelationMemberOf( aNewDictBox ); -aNameEdit.SetAccessibleRelationMemberOf( aNewDictBox ); -aLanguageText.SetAccessibleRelationMemberOf( aNewDictBox ); -aLanguageLB.SetAccessibleRelationMemberOf( aNewDictBox ); - -FreeResource(); +pLanguageLB-SetLanguageList( LANG_LIST_ALL, sal_True, sal_True ); +pLanguageLB-SelectEntryPos(0); } // --- IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) { -OUString sDict = comphelper::string::stripEnd(aNameEdit.GetText(), ' '); +OUString sDict = comphelper::string::stripEnd(pNameEdit-GetText(), ' '); // add extension for personal dictionaries sDict += .dic; @@ -138,16 +126,16 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) { // duplicate names? InfoBox( this, CUI_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute(); -aNameEdit.GrabFocus(); +pNameEdit-GrabFocus(); return 0; } // create and add -sal_uInt16 nLang =
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svgio/source
svgio/source/svgreader/svgstyleattributes.cxx | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) New commits: commit 1898f94578f266de42f92602a36518fb12bacf5a Author: Armin Le Grand a...@apache.org Date: Mon Jul 15 14:22:12 2013 + i122724 Better handling of line-only paths diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 45214cb..795b8bc 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -997,12 +997,9 @@ namespace svgio const basegfx::B2DPolyPolygon rPath, drawinglayer::primitive2d::Primitive2DSequence rTarget) const { -const bool bIsLine(1 == rPath.count() - !rPath.areControlPointsUsed() - 2 == rPath.getB2DPolygon(0).count()); - if(!rPath.count()) { +// no geometry at all return; } @@ -1010,13 +1007,7 @@ namespace svgio if(aGeoRange.isEmpty()) { -return; -} - -if(!bIsLine // not for lines -(basegfx::fTools::equalZero(aGeoRange.getWidth()) -|| basegfx::fTools::equalZero(aGeoRange.getHeight( -{ +// no geometry range return; } @@ -1024,11 +1015,21 @@ namespace svgio if(basegfx::fTools::equalZero(fOpacity)) { +// not visible return; } +// check if it's a line +const bool bNoWidth(basegfx::fTools::equalZero(aGeoRange.getWidth())); +const bool bNoHeight(basegfx::fTools::equalZero(aGeoRange.getHeight())); +const bool bIsTwoPointLine(1 == rPath.count() + !rPath.areControlPointsUsed() + 2 == rPath.getB2DPolygon(0).count()); +const bool bIsLine(bIsTwoPointLine || bNoWidth || bNoHeight); + if(!bIsLine) { +// create fill basegfx::B2DPolyPolygon aPath(rPath); const bool bNeedToCheckClipRule(SVGTokenPath == mrOwner.getType() || SVGTokenPolygon == mrOwner.getType()); const bool bClipPathIsNonzero(!bIsLine bNeedToCheckClipRule mbIsClipPathContent FillRule_nonzero == maClipRule); @@ -1043,6 +1044,7 @@ namespace svgio add_fill(aPath, rTarget, aGeoRange); } +// create stroke add_stroke(rPath, rTarget, aGeoRange); // Svg supports markers for path, polygon, polyline and line ___ 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' - vcl/inc
vcl/inc/pch/precompiled_vcl.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 96bd69962f90c286461734bb3a4d218c56104cd3 Author: Eike Rathke er...@redhat.com Date: Mon Jul 15 18:13:16 2013 +0200 build breaker: remove XSystemClipboard.hpp from pch again Commit 60455c972b09ca02b18660c6fb3dafc03b30b2b5 reverted introduction of XSystemClipboard but not from pch. Change-Id: I2c59a575c0649cc3a2cfc3a4f2e812be9a902573 diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index d767b33..0d0ccbe 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -39,7 +39,6 @@ #include com/sun/star/datatransfer/clipboard/XClipboardEx.hpp #include com/sun/star/datatransfer/clipboard/XClipboardListener.hpp #include com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp -#include com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp #include com/sun/star/datatransfer/dnd/DNDConstants.hpp #include com/sun/star/datatransfer/dnd/XDragSource.hpp #include com/sun/star/datatransfer/dnd/XDropTarget.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/sfx2 include/svx
cui/source/factory/dlgfact.cxx| 18 +++--- cui/source/factory/dlgfact.hxx|3 +-- cui/source/inc/helpid.hrc |1 - cui/source/options/optlingu.cxx |2 +- cui/uiconfig/ui/optnewdictionarydialog.ui | 13 - include/sfx2/sfx.hrc |1 - include/svx/svxdlg.hxx|3 +-- 7 files changed, 14 insertions(+), 27 deletions(-) New commits: commit 1766de5a5e0c831127e735b60e46e32b984c524f Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 15 15:26:38 2013 +0100 can drop RID_SFXDLG_NEWDICT Change-Id: I15d1669a870f991ae4c8428838b22c33a2c021f0 diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 1bc9399..94a7a16 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1420,22 +1420,10 @@ AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordN } AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( Window* pParent, -::Reference ::com::sun::star::linguistic2::XSpellChecker1 xSpl, -sal_uInt32 nResId ) +::Reference ::com::sun::star::linguistic2::XSpellChecker1 xSpl ) { -SvxNewDictionaryDialog* pDlg=NULL; -switch ( nResId ) -{ -case RID_SFXDLG_NEWDICT : -pDlg = new SvxNewDictionaryDialog( pParent, xSpl ); -break; -default: -break; -} - -if ( pDlg ) -return new AbstractSvxNewDictionaryDialog_Impl( pDlg ); -return 0; +SvxNewDictionaryDialog* pDlg = new SvxNewDictionaryDialog( pParent, xSpl ); +return new AbstractSvxNewDictionaryDialog_Impl( pDlg ); } VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent, diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 34c4913..4c36e81 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -692,8 +692,7 @@ public: sal_Int32 nInitialFlags); virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ); virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, -::com::sun::star::uno::Reference ::com::sun::star::linguistic2::XSpellChecker1 xSpl, -sal_uInt32 nResId ); //add for SvxNewDictionaryDialog +::com::sun::star::uno::Reference ::com::sun::star::linguistic2::XSpellChecker1 xSpl ); virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, const String rName, ::com::sun::star::uno::Reference ::com::sun::star::linguistic2::XSpellChecker1 xSpl, diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index b0d050d..0c30fea 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1651,7 +1651,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { -AbstractSvxNewDictionaryDialog* aDlg = pFact-CreateSvxNewDictionaryDialog( this, xSpellChecker1, RID_SFXDLG_NEWDICT ); +AbstractSvxNewDictionaryDialog* aDlg = pFact-CreateSvxNewDictionaryDialog( this, xSpellChecker1 ); DBG_ASSERT(aDlg, Dialogdiet fail!); uno::Reference XDictionary xNewDic; if ( aDlg-Execute() == RET_OK ) diff --git a/cui/uiconfig/ui/optnewdictionarydialog.ui b/cui/uiconfig/ui/optnewdictionarydialog.ui index 643465d..9158de3a 100644 --- a/cui/uiconfig/ui/optnewdictionarydialog.ui +++ b/cui/uiconfig/ui/optnewdictionarydialog.ui @@ -23,7 +23,8 @@ property name=labelgtk-ok/property property name=visibleTrue/property property name=can_focusTrue/property -property name=has_focusTrue/property +property name=can_defaultTrue/property +property name=has_defaultTrue/property property name=receives_defaultTrue/property property name=use_stockTrue/property /object diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 7d1fc0a..4044de2 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -222,7 +222,6 @@ #define RID_SFXPAGE_SAVE(RID_OPTIONS_START + 0) #define RID_SFXPAGE_GENERAL (RID_OPTIONS_START + 1) -#define RID_SFXDLG_NEWDICT (RID_OPTIONS_START + 3) #define RID_SFXDLG_EDITDICT (RID_OPTIONS_START + 4)
[Libreoffice-commits] core.git: filter/Library_placeware.mk filter/Library_xsltfilter.mk
filter/Library_placeware.mk |2 ++ filter/Library_xsltfilter.mk |1 + 2 files changed, 3 insertions(+) New commits: commit fd3c5d3a0651b3128fb15725944b6da81ec5bb32 Author: Michael Stahl mst...@redhat.com Date: Mon Jul 15 18:18:06 2013 +0200 filter: need more boost_headers Change-Id: Id927d5494bed8d4d8fa27f38dfcde14b95081cc1 diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index 948ecf1..439293f 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,placeware)) $(eval $(call gb_Library_set_componentfile,placeware,filter/source/placeware/placeware)) +$(eval $(call gb_Library_use_external,placeware,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,placeware)) $(eval $(call gb_Library_use_libraries,placeware,\ diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index d221bf8..eb48793 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ )) $(eval $(call gb_Library_use_externals,xsltfilter,\ + boost_headers \ libxml2 \ libxslt \ libexslt \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2b5e401d4cc3db80f02674bab9b52cba3f199810 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 15 17:20:58 2013 +0100 Updated core Project: help cd1389b4c35e4e028b1e433246093cf2f1f13b42 diff --git a/helpcontent2 b/helpcontent2 index 6962734..cd1389b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 696273411433e4de4411d84837307d8815f42378 +Subproject commit cd1389b4c35e4e028b1e433246093cf2f1f13b42 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 712019343e002ed64e7f4e00cc224af3559ed912 Author: Csikós Tamás csks.t...@gmail.com Date: Mon Jul 15 14:33:18 2013 +0200 Updated core Project: help 696273411433e4de4411d84837307d8815f42378 update help ids for opt new dictionary dialog .ui conversion Change-Id: I36d3b7c9f216d9a9f940885c8d4b2f16706ddc01 Reviewed-on: https://gerrit.libreoffice.org/4918 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 7885eab..6962734 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7885eab3d5f01e8208310ca2f4258df5cbfdb999 +Subproject commit 696273411433e4de4411d84837307d8815f42378 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |3 --- source/text/shared/optionen/01010400.xhp | 12 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) New commits: commit 696273411433e4de4411d84837307d8815f42378 Author: Csikós Tamás csks.t...@gmail.com Date: Mon Jul 15 14:33:18 2013 +0200 update help ids for opt new dictionary dialog .ui conversion Change-Id: I36d3b7c9f216d9a9f940885c8d4b2f16706ddc01 Reviewed-on: https://gerrit.libreoffice.org/4918 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index f499e74..3fff662 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6948,7 +6948,6 @@ svx_CheckBox_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS,809206786, svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709, -svx_CheckBox_RID_SFXDLG_NEWDICT_BTN_EXCEPT,1270400014, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CALCULATE,1368851483, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CONSTRAINT,1368851479, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_READONLY,1368851481, @@ -7031,7 +7030,6 @@ svx_Edit_MD_MENU_ORGANISER_EDIT_MENU_NAME,1079953796, svx_Edit_RID_DLG_NEWLIB_ED_LIBNAME,1242335246, svx_Edit_RID_SFXDLG_EDITDICT_ED_REPLACE,1270417446, svx_Edit_RID_SFXDLG_EDITDICT_ED_WORD,1270417444, -svx_Edit_RID_SFXDLG_NEWDICT_ED_DICTNAME,1270401035, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT,1368852494, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME,1368852492, svx_Edit_RID_SVXDLG_ADD_INSTANCE_ED_INST_NAME,1368950796, @@ -7185,7 +7183,6 @@ svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095, svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY,809160323, svx_ListBox_RID_SFXDLG_EDITDICT_LB_ALLDICTS,1270418976, svx_ListBox_RID_SFXDLG_EDITDICT_LB_DICTLANG,1270418957, -svx_ListBox_RID_SFXDLG_NEWDICT_LB_DICTLANG,1270402573, svx_ListBox_RID_SVXDLG_ADD_DATAITEM_LB_DATATYPE,1368854034, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568, diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index cebabdc..8c93bd5 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -65,15 +65,15 @@ paragraph role=paragraph id=par_id3146794 xml-lang=en-US l10n=U oldref=64ahelp hid=SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DICOpens the emphNew Dictionary/emph dialog, in which you can name a new user-defined dictionary or dictionary of exceptions and specify the language./ahelp/paragraph paragraph role=heading id=hd_id3151054 xml-lang=en-US level=3 l10n=U oldref=65New Dictionary/paragraph paragraph role=paragraph id=par_id3153360 xml-lang=en-US l10n=U oldref=66In the emphDictionary/emph section you can name a new user-defined dictionary or dictionary of exceptions and specify the language./paragraph -bookmark xml-lang=en-US branch=hid/cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME id=bm_id3151210 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/optnewdictionarydialog/nameedit id=bm_id3151210 localize=false/ paragraph role=heading id=hd_id3150398 xml-lang=en-US level=3 l10n=U oldref=67Name/paragraph -paragraph role=paragraph id=par_id3153192 xml-lang=en-US l10n=U oldref=68ahelp hid=SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAMESpecifies the name of the new custom dictionary./ahelp The file extension *.DIC is automatically appended./paragraph -bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG id=bm_id3148451 localize=false/ +paragraph role=paragraph id=par_id3153192 xml-lang=en-US l10n=U oldref=68ahelp hid=cui/ui/optnewdictionarydialog/nameeditSpecifies the name of the new custom dictionary./ahelp The file extension *.DIC is automatically appended./paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/optnewdictionarydialog/language id=bm_id3148451 localize=false/ paragraph role=heading id=hd_id3150767 xml-lang=en-US level=3 l10n=U oldref=69Language/paragraph -paragraph role=paragraph id=par_id3148920 xml-lang=en-US l10n=U oldref=70ahelp hid=SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANGBy selecting a certain language you can limit the use of the custom dictionary./ahelp By selecting emphAll/emph the custom dictionary is used independently of the current language./paragraph -bookmark xml-lang=en-US branch=hid/cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT id=bm_id3145606 localize=false/ +paragraph role=paragraph id=par_id3148920 xml-lang=en-US l10n=U oldref=70ahelp hid=cui/ui/optnewdictionarydialog/languageBy selecting a certain language you can limit the use of the custom dictionary./ahelp By selecting emphAll/emph the custom dictionary is used independently of the current language./paragraph +bookmark
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/01010400.xhp |1 + 1 file changed, 1 insertion(+) New commits: commit cd1389b4c35e4e028b1e433246093cf2f1f13b42 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 15 17:20:58 2013 +0100 add a help id for the over all dialog Change-Id: I79d00e64ab2666973c4e6a8e3a47cf500e54c9cd diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index 8c93bd5..7a3dcbf 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -63,6 +63,7 @@ bookmark xml-lang=en-US branch=hid/cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC id=bm_id3154923 localize=false/ paragraph role=heading id=hd_id3144511 xml-lang=en-US level=3 l10n=U oldref=63New/paragraph paragraph role=paragraph id=par_id3146794 xml-lang=en-US l10n=U oldref=64ahelp hid=SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DICOpens the emphNew Dictionary/emph dialog, in which you can name a new user-defined dictionary or dictionary of exceptions and specify the language./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/optnewdictionarydialog/OptNewDictionaryDialog id=bm_id3151211 localize=false/ paragraph role=heading id=hd_id3151054 xml-lang=en-US level=3 l10n=U oldref=65New Dictionary/paragraph paragraph role=paragraph id=par_id3153360 xml-lang=en-US l10n=U oldref=66In the emphDictionary/emph section you can name a new user-defined dictionary or dictionary of exceptions and specify the language./paragraph bookmark xml-lang=en-US branch=hid/cui/ui/optnewdictionarydialog/nameedit id=bm_id3151210 localize=false/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] update help ids for opt new dictionary dialog .ui conversion
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4918 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4918 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36d3b7c9f216d9a9f940885c8d4b2f16706ddc01 Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Tamás Csikós csks.t...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/misc/UpdateHelperImpl.hxx |9 - 1 file changed, 9 deletions(-) New commits: commit 5730dd48cad67f71a2ab3792b59920470dd7c682 Author: Ricardo Montania rica...@linuxafundo.com.br Date: Mon Jul 15 07:12:26 2013 -0300 fdo#63690 drop RTL_LOGFILE_CONTEXT_AUTHOR Change-Id: I46823bb2c6fc44a4871d9535c1f59bd24ba75858 Reviewed-on: https://gerrit.libreoffice.org/4908 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx index 0d81d25..6e4dcb3 100644 --- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx +++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx @@ -26,7 +26,6 @@ #include com/sun/star/sdbc/XRowSet.hpp #include com/sun/star/sdbc/XResultSetMetaData.hpp #include IUpdateHelper.hxx -#include rtl/logfile.hxx namespace dbaui { @@ -93,37 +92,30 @@ namespace dbaui virtual ~OParameterUpdateHelper() {} virtual void updateString(sal_Int32 _nPos, const OUString _sValue) { -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, misc, ocke.jans...@sun.com, OParameterUpdateHelper::updateString ); m_xParameters-setString(_nPos, _sValue); } virtual void updateDouble(sal_Int32 _nPos,const double _nValue) { -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, misc, ocke.jans...@sun.com, OParameterUpdateHelper::updateDouble ); m_xParameters-setDouble(_nPos, _nValue); } virtual void updateDate(sal_Int32 _nPos,const ::com::sun::star::util::Date _nValue) { -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, misc, ocke.jans...@sun.com, OParameterUpdateHelper::updateDouble ); m_xParameters-setDate(_nPos, _nValue); } virtual void updateTime(sal_Int32 _nPos,const ::com::sun::star::util::Time _nValue) { -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, misc, ocke.jans...@sun.com, OParameterUpdateHelper::updateDouble ); m_xParameters-setTime(_nPos, _nValue); } virtual void updateTimestamp(sal_Int32 _nPos,const ::com::sun::star::util::DateTime _nValue) { -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, misc, ocke.jans...@sun.com, OParameterUpdateHelper::updateDouble ); m_xParameters-setTimestamp(_nPos, _nValue); } virtual void updateInt(sal_Int32 _nPos,const sal_Int32 _nValue) { -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, misc, ocke.jans...@sun.com, OParameterUpdateHelper::updateInt ); m_xParameters-setInt(_nPos, _nValue); } virtual void updateNull(sal_Int32 _nPos, ::sal_Int32 sqlType) { -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, misc, ocke.jans...@sun.com, OParameterUpdateHelper::updateNull ); m_xParameters-setNull(_nPos,sqlType); } virtual void moveToInsertRow() @@ -131,7 +123,6 @@ namespace dbaui } virtual void insertRow() { -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, misc, ocke.jans...@sun.com, OParameterUpdateHelper::insertRow ); m_xPrepared-executeUpdate(); } }; ___ 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-0' - include/osl sal/osl sdext/source
include/osl/time.h |8 sal/osl/unx/time.c |8 sal/osl/w32/time.c |8 sdext/source/presenter/PresenterToolBar.cxx |2 +- 4 files changed, 13 insertions(+), 13 deletions(-) New commits: commit 86472223fc5eaf6e8c956e525e470fa55b31fac4 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jul 5 12:13:36 2013 +0200 API change: osl/time.h take const pointers where appropriate Should be backwards-compatible... Change-Id: I6b04bec2c032ff8c57a1b5192b2d3962dcc96c84 Reviewed-on: https://gerrit.libreoffice.org/4736 Reviewed-by: Michael Stahl mst...@redhat.com Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/include/osl/time.h b/include/osl/time.h index 6bb48f2..484adb0 100644 --- a/include/osl/time.h +++ b/include/osl/time.h @@ -111,7 +111,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getSystemTime( @return sal_False if any error occurs else sal_True. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( -TimeValue* pTimeVal, oslDateTime* pDateTime ); +const TimeValue* pTimeVal, oslDateTime* pDateTime ); /** Get the GMT from a oslDateTime and fill a TimeValue @@ -121,7 +121,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( @return sal_False if any error occurs else sal_True. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getTimeValueFromDateTime( -oslDateTime* pDateTime, TimeValue* pTimeVal ); +const oslDateTime* pDateTime, TimeValue* pTimeVal ); /** Convert GMT to local time @@ -131,7 +131,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getTimeValueFromDateTime( @return sal_False if any error occurs else sal_True. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( -TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal ); +const TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal ); /** Convert local time to GMT @@ -141,7 +141,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( @return sal_False if any error occurs else sal_True. */ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( -TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal ); +const TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal ); /** Get the value of the global timer diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c index c99036b..971a63a 100644 --- a/sal/osl/unx/time.c +++ b/sal/osl/unx/time.c @@ -70,7 +70,7 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv) * osl_getDateTimeFromTimeValue *-*/ -sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime* pDateTime ) +sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDateTime* pDateTime ) { struct tm *pSystemTime; struct tm tmBuf; @@ -104,7 +104,7 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime * osl_getTimeValueFromDateTime *--*/ -sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValue* pTimeVal ) +sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const oslDateTime* pDateTime, TimeValue* pTimeVal ) { struct tm aTime; time_t nSeconds; @@ -174,7 +174,7 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( oslDateTime* pDateTime, TimeValu * osl_getLocalTimeFromSystemTime *--*/ -sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal ) +sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( const TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal ) { struct tm *pLocalTime; struct tm tmBuf; @@ -211,7 +211,7 @@ sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( TimeValue* pSystemTimeVal, Tim * osl_getSystemTimeFromLocalTime *--*/ -sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal ) +sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( const TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal ) { struct tm *pLocalTime; struct tm tmBuf; diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c index 49f33c2..e0f89ce 100644 --- a/sal/osl/w32/time.c +++ b/sal/osl/w32/time.c @@ -65,7 +65,7 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal) // osl_getDateTimeFromTimeValue //-- -sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( TimeValue* pTimeVal, oslDateTime* pDateTime ) +sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDateTime* pDateTime ) { FILETIMEaFileTime; SYSTEMTIME aSystemTime; @@
[Libreoffice-commits] core.git: sax/CppunitTest_sax.mk
sax/CppunitTest_sax.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 9d639f6b2f88aafa2c94a73a31b57ddd4122f436 Author: Michael Stahl mst...@redhat.com Date: Mon Jul 15 18:51:45 2013 +0200 sax: even more boost_headers Change-Id: I6d78c737d7cd049c7b148da3b4d30166bb7c8517 diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index edb8429..0747522 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -14,6 +14,8 @@ $(eval $(call gb_CppunitTest_use_api,sax_cpputest,\ udkapi \ )) +$(eval $(call gb_CppunitTest_use_external,sax_cpputest,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \ sax \ sal \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[no subject]
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Ricardo Montania Prado de Campos http://www.linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 5 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk include/sax oox/source sax/source sc/source sw/qa ucb/source
Rebased ref, commits from common ancestor: commit 0e65ac4ff185aaa21da2aaf785b914866037c8c8 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Jul 15 11:30:40 2013 -0400 Example code on how to handle input and output for matrix inversion. Right now this code simply puts the original matrix values back. Re-write this code to perform inversion for real. Change-Id: I0330db77b000ed14cc810cc3ddf616e56d036c1b diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index dee465e..c24f13a 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -57,9 +57,43 @@ public: const ScFormulaCellGroupRef xGroup, ScTokenArray rCode); }; -ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix /* rMat */) +ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix rMat) { -return ScMatrixRef(); +SCSIZE nC, nR; +rMat.GetDimensions(nC, nR); +if (nC != nR || nC == 0) +// Input matrix must be square. Return an empty matrix on failure and +// the caller will calculate it via CPU. +return ScMatrixRef(); + +// This vector will contain a series of doubles from the first column to +// the last, chained together in a single array. +std::vectordouble aDoubles; +rMat.GetDoubleArray(aDoubles); + +// TODO: Inverse this matrix and put the result back into xInv. Right now, +// I'll just put the original, non-inversed matrix values back, just to +// demonstrate how to put the values back after inversion. There are two +// ways to put the values back (depending on what the GPU output is). +ScMatrixRef xInv(new ScMatrix(nR, nR, 0.0)); + +#if 0 +// One way is to put the whole value as one array. This method assumes +// that the array size equals column x row, and is oriented column-wise. +// This method is slightly more efficient than the second, but I wouldn't +// expect too much of a difference. +xInv-PutDouble(aDoubles[0], aDoubles.size(), 0, 0); +#else +// Another way is to put the values one column at a time. +const double* p = aDoubles[0]; +for (SCSIZE i = 0; i nC; ++i) +{ +xInv-PutDouble(p, nR, i, 0); +p += nR; +} +#endif + +return xInv; } bool FormulaGroupInterpreterOpenCL::interpret(ScDocument rDoc, const ScAddress rTopPos, commit 766458eafb855a44b1c4c9a5342bbb3748b7ef23 Author: Csikós Tamás csks.t...@gmail.com Date: Mon Jul 15 14:16:42 2013 +0200 modern .ui widgetlayout for optdict/newdictdlg Change-Id: I8bd0a334bffee9adcf23fe2f597b66924b57ce30 Reviewed-on: https://gerrit.libreoffice.org/4917 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 5f51232..0908fef 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -55,6 +55,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/optjsearchpage \ cui/uiconfig/ui/optlanguagespage \ cui/uiconfig/ui/optmemorypage \ + cui/uiconfig/ui/optnewdictionarydialog \ cui/uiconfig/ui/optonlineupdatepage \ cui/uiconfig/ui/optpathspage \ cui/uiconfig/ui/optproxypage \ diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 2251a2b..246b091 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -50,15 +50,12 @@ namespace linguistic2{ class SvxNewDictionaryDialog : public ModalDialog { private: -FixedLineaNewDictBox; -FixedText aNameText; -EditaNameEdit; -FixedText aLanguageText; -SvxLanguageBox aLanguageLB; -CheckBoxaExceptBtn; -OKButtonaOKBtn; -CancelButtonaCancelBtn; -HelpButton aHelpBtn; +Edit*pNameEdit; +SvxLanguageBox* pLanguageLB; +CheckBox*pExceptBtn; +OKButton*pOKBtn; +CancelButton*pCancelBtn; +HelpButton* pHelpBtn; ::com::sun::star::uno::Reference ::com::sun::star::linguistic2::XSpellChecker1 xSpell; ::com::sun::star::uno::Reference diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 36af1fb..020cb17 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -82,41 +82,29 @@ static CDE_RESULT cmpDicEntry_Impl( const String rText1, const String rText2 ) SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, Reference XSpellChecker1 xSpl ) : -ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ), - -aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ), -aNameText ( this, CUI_RES( FT_DICTNAME ) ), -aNameEdit ( this, CUI_RES( ED_DICTNAME ) ), -aLanguageText ( this, CUI_RES( FT_DICTLANG
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/column3.cxx | 14 ++ 1 file changed, 2 insertions(+), 12 deletions(-) New commits: commit 466cb70c14ffbf6831b68f44173941af0e617f82 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Jul 15 13:48:07 2013 -0400 No point having this indirection. Change-Id: Idab46933ef6740e478f44e8b420805de9bc39b82 diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 07d6e94..5288cc5 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -66,11 +66,8 @@ using ::com::sun::star::i18n::LocaleDataItem; // Err527 Workaroand extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx using namespace formula; -// STATIC DATA --- -namespace { - -void broadcastCells(ScDocument rDoc, SCCOL nCol, SCROW nTab, const std::vectorSCROW rRows) +void ScColumn::BroadcastCells( const std::vectorSCROW rRows ) { if (rRows.empty()) return; @@ -81,17 +78,10 @@ void broadcastCells(ScDocument rDoc, SCCOL nCol, SCROW nTab, const std::vector for (; itRow != itRowEnd; ++itRow) { aHint.GetAddress().SetRow(*itRow); -rDoc.Broadcast(aHint); +pDocument-Broadcast(aHint); } } -} - -void ScColumn::BroadcastCells( const std::vectorSCROW rRows ) -{ -broadcastCells(*pDocument, nCol, nTab, rRows); -} - struct DirtyCellInterpreter { void operator() (size_t, ScFormulaCell* p) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/ic_launcher.png |binary ios/iosremote/ic_launc...@2x.png |binary ios/iosremote/iosremote.xcodeproj/project.pbxproj | 35 + ios/iosremote/iosremote.xcodeproj/xcuserdata/siqi.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist | 13 ios/iosremote/iosremote/Communication/Client.m | 21 - ios/iosremote/iosremote/Communication/SlideShow.m |5 ios/iosremote/iosremote/UIImage+Resize.m | 186 + ios/iosremote/iosremote/UIImage-categories/UIImage+Alpha.h | 11 ios/iosremote/iosremote/UIImage-categories/UIImage+Alpha.m | 127 ++ ios/iosremote/iosremote/UIImage-categories/UIImage+Resize.h | 18 ios/iosremote/iosremote/UIImage-categories/UIImage+Resize.m | 188 ++ ios/iosremote/iosremote/UIImage-categories/UIImage+RoundedCorner.h |9 ios/iosremote/iosremote/UIImage-categories/UIImage+RoundedCorner.m | 58 +++ ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 51 -- ios/iosremote/iosremote/iosremote-Info.plist |4 ios/iosremote/iosremote/newServer_vc.m |2 16 files changed, 660 insertions(+), 68 deletions(-) New commits: commit 71a80c52d73607384851da708735e4a48079fc62 Author: siqi m...@siqi.fr Date: Mon Jul 15 20:07:03 2013 +0200 UIImage categories used for load optimisation Change-Id: Icf31e42c9be1fb749da912a2b3c79822f16a49e5 diff --git a/ios/iosremote/ic_launcher.png b/ios/iosremote/ic_launcher.png index 508d947..d39ebd1 100644 Binary files a/ios/iosremote/ic_launcher.png and b/ios/iosremote/ic_launcher.png differ diff --git a/ios/iosremote/ic_launc...@2x.png b/ios/iosremote/ic_launc...@2x.png index 6febfad..308 100644 Binary files a/ios/iosremote/ic_launc...@2x.png and b/ios/iosremote/ic_launc...@2x.png differ diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index 539a83f..bba51b0 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -11,6 +11,9 @@ 5711026D1794127E007D343B /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 571102691794127E007D343B /* README.md */; }; 5711026E1794127E007D343B /* release_notes.md in Resources */ = {isa = PBXBuildFile; fileRef = 5711026A1794127E007D343B /* release_notes.md */; }; 571102701794128E007D343B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711026F1794128E007D343B /* libz.dylib */; }; + 5711027B17946186007D343B /* UIImage+Alpha.m in Sources */ = {isa = PBXBuildFile; fileRef = 5711027617946185007D343B /* UIImage+Alpha.m */; }; + 5711027C17946186007D343B /* UIImage+Resize.m in Sources */ = {isa = PBXBuildFile; fileRef = 5711027817946186007D343B /* UIImage+Resize.m */; }; + 5711027D17946186007D343B /* UIImage+RoundedCorner.m in Sources */ = {isa = PBXBuildFile; fileRef = 5711027A17946186007D343B /* UIImage+RoundedCorner.m */; }; 571BFAD1178AADA200EF1BDB /* more_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 571BFAD0178AADA200EF1BDB /* more_icon.png */; }; 571D4807178B2F080063D93B /* timer_clear_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = 571D4805178B2F080063D93B /* timer_clear_btn.png */; }; 571D4808178B2F080063D93B /* timer_start_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = 571D4806178B2F080063D93B /* timer_start_btn.png */; }; @@ -65,6 +68,12 @@ 5711026A1794127E007D343B /* release_notes.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_notes.md; sourceTree = group; }; 5711026B1794127E007D343B /* TestFlight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestFlight.h; sourceTree = group; }; 5711026F1794128E007D343B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = compiled.mach-o.dylib; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + 5711027517946185007D343B /* UIImage+Alpha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIImage+Alpha.h; sourceTree = group; }; + 5711027617946185007D343B /*
[Libreoffice-commits] core.git: include/sal
include/sal/log-areas.dox |3 +++ 1 file changed, 3 insertions(+) New commits: commit 5e6cf64783b1925cdc8f0fba944a8f8edfa3c807 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jul 15 20:10:08 2013 +0200 add missing log areas From 7650a82702ec9d13e3a52ea84b9666ee4e9f9a62 . Change-Id: Ie20010fa0a8be6992a1ac7fb4c4dffc8cf0c9cbd diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 122bf00..64da465 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -290,15 +290,18 @@ certain functionality. @li @c vcl @li @c vcl.a11y +@li @c vcl.app @li @c vcl.atsui - ATSUI (obsolete) -using code for Mac OS X @li @c vcl.control @li @c vcl.coretext - CoreText-using code for Mac OS X and iOS @li @c vcl.emf - EMF/EMF+ processing +@li @c vcl.filter @li @c vcl.fonts - font-specific code @li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc. @li @c vcl.gtk - Gtk+ 2/3 plugin @li @c vcl.harfbuzz - HarfBuzz text layout @li @c vcl.headless - bitmap-based backend +@li @c vcl.helper @li @c vcl.kde - KDE @li @c vcl.kde4 - KDE4 @li @c vcl.layout - Widget layout ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits