RE: Killing the gerrit to dev-list spam ...
I would be happy with a daily digest. Next question to ask though with daily digests how many times a day will they be sent out? would they be sent out every hour every few hours once to twice a day? I had once a day in my mind, but every 8 hours might be better, given the world wide community. Except when there's nothing to report, of course. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/viewer/mediawindow.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit bdf1731fbb526adc276286c8eede5ec3ed4662bd Author: Joel Madero jmadero@gmail.com Date: Wed May 1 08:50:20 2013 -0700 fdo#64003 - added rmi and snd to insert - movie sound list RMI and SND files were already supported but were missing from the list of movie sound menu. Added these in alpha order modified: avmedia/source/viewer/mediawindow.cxx Change-Id: I3241f1cdd8972fb3da85e8e2bdd26b25f61a53ec Reviewed-on: https://gerrit.libreoffice.org/3727 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index c75b4d9..310d564 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -225,6 +225,8 @@ void MediaWindow::getMediaFilters( FilterNameVector rFilterNameVector ) MPEG Video, mpg;mpeg;mpv;mp4, Ogg Audio, ogg;oga;, Ogg Video, ogv;ogx;, + RMI MIDI Audio, rmi, + SND (SouND) Audio, snd, Quicktime Video, mov, Vivo Video, viv, WAVE Audio, wav, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#64003 - added rmi and snd to insert - movie sound lis...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3727 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3727 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3241f1cdd8972fb3da85e8e2bdd26b25f61a53ec Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joel Madero jmadero@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cppcanvas/source include/sal
cppcanvas/source/mtfrenderer/implrenderer.cxx | 18 ++
include/sal/log-areas.dox |1 +
include/sal/log.hxx |2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit af41ad9b9473b782b50828b7e77ff23f30007c60
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Thu May 2 02:05:46 2013 +1000
Convert from EMFP_DEBUG to SAL_INFO
* Change to SAL_INFO instead of EMFP_DEBUG in implrenderer.cxx
* Add new log area cppcanvas.emf
* Update comment in log.hxx to reference the new location of log-areas.dox
Change-Id: I5d710725339f58a111a2f3494c3a72f685624322
Reviewed-on: https://gerrit.libreoffice.org/3726
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 6d355a8..635a5fb 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -81,12 +81,6 @@
#include outdevstate.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
-#if OSL_DEBUG_LEVEL 1
-#define EMFP_DEBUG(x) x
-#else
-#define EMFP_DEBUG(x)
-#endif
-
using namespace ::com::sun::star;
@@ -1326,7 +1320,7 @@ namespace cppcanvas
// - SetFont to process font metric specific actions
pCurrAct-Execute( rVDev );
-EMFP_DEBUG(printf(MTF\trecord type: 0x%x (%d)\n,
pCurrAct-GetType(), pCurrAct-GetType()));
+SAL_INFO(cppcanvas.emf, MTF\trecord type: 0x
pCurrAct-GetType() ( pCurrAct-GetType() ));
switch( pCurrAct-GetType() )
{
@@ -1834,22 +1828,22 @@ namespace cppcanvas
count = 0;
if (char *env = getenv (EMF_PLUS_LIMIT)) {
limit = atoi (env);
-EMFP_DEBUG (printf (EMF+ records limit:
%d\n, limit));
+SAL_INFO (cppcanvas.emf, EMF+ records
limit: limit);
}
}
-EMFP_DEBUG (printf (EMF+ passed to canvas mtf
renderer, size: %u\n, (unsigned int)pAct-GetDataSize ()));
+SAL_INFO (cppcanvas.emf, EMF+ passed to canvas
mtf renderer, size: pAct-GetDataSize ());
if (count limit)
processEMFPlus( pAct, rFactoryParms,
rStates.getState(), rCanvas );
count ++;
} else if(
pAct-GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM(EMF_PLUS_HEADER_INFO))
) {
-EMFP_DEBUG (printf (EMF+ passed to canvas mtf
renderer - header info, size: %u\n, (unsigned int)pAct-GetDataSize ()));
+SAL_INFO (cppcanvas.emf, EMF+ passed to canvas
mtf renderer - header info, size: pAct-GetDataSize ());
SvMemoryStream rMF ((void*) pAct-GetData (),
pAct-GetDataSize (), STREAM_READ);
rMF nFrameLeft nFrameTop nFrameRight
nFrameBottom;
-EMFP_DEBUG (printf (EMF+ picture frame: %d,%d -
%d,%d\n, (int)nFrameLeft, (int)nFrameTop, (int)nFrameRight,
(int)nFrameBottom));
+SAL_INFO (cppcanvas.emf, EMF+ picture frame:
nFrameLeft , nFrameTop - nFrameRight ,
nFrameBottom);
rMF nPixX nPixY nMmX nMmY;
-EMFP_DEBUG (printf (EMF+ ref device pixel size:
%dx%d mm size: %dx%d\n, (int)nPixX, (int)nPixY, (int)nMmX, (int)nMmY));
+SAL_INFO (cppcanvas.emf, EMF+ ref device pixel
size: nPixX x nPixY mm size: nMmX x nMmY);
rMF aBaseTransform;
//aWorldTransform.Set (aBaseTransform);
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 44549e7..5f9039d 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -330,6 +330,7 @@ certain functionality.
@li @c comphelper
@li @c configmgr
@li @c cppcanvas
+@li @c cppcanvas.emf
@li @c cppuhelper
@li @c cppu
@li @c forms
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 6eae1b5..80721d0 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -203,7 +203,7 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER
StreamIgnore const ) {
@endverbatim
For a list of areas used see @ref sal_log_areas SAL debug areas. Whenever
-you use a new log area, add it to the file sal/inc/sal/log-areas.dox .
+you use a new log area, add it to the file include/sal/log-areas.dox .
Whether these macros generate any log output is controlled in a two-stage
process.
___
Libreoffice-commits mailing list
[PUSHED] Convert from EMFP_DEBUG to SAL_INFO
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3726 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3726 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d710725339f58a111a2f3494c3a72f685624322 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/output2.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 5fc1ba6e6bf22effe4391e22fe94a2ec0fc10100
Author: navin patidar pati...@kacst.edu.sa
Date: Wed May 1 09:45:58 2013 +0300
fix fdo#64085 : set proper alignment for justified align text.
According to cell writing direction, set alignment for justified align text.
Change-Id: I91e1c52f1aa13a806e2a91dc7120960a4cc3f5c1
Reviewed-on: https://gerrit.libreoffice.org/3704
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index d4fb35f..76d3a5e 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1673,7 +1673,14 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
eOutHorJust = aVars.GetHorJust();
if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust
== SVX_HOR_JUSTIFY_REPEAT )
-eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is
not yet implemented
+{
+const SfxPoolItem* pItem = mpDoc-GetAttr( nCellX,
nCellY, nTab, ATTR_WRITINGDIR );
+const SvxFrameDirectionItem* pCurrentWritingMode =
(const SvxFrameDirectionItem*) pItem;
+if (pCurrentWritingMode-GetValue() ==
FRMDIR_HORI_LEFT_TOP)
+eOutHorJust = SVX_HOR_JUSTIFY_LEFT;
+else
+eOutHorJust = SVX_HOR_JUSTIFY_RIGHT;
+}
bool bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust()
== SVX_HOR_JUSTIFY_BLOCK );
// #i111387# #o11817313# disable automatic line breaks
only for General number format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fix fdo#64085 : set proper alignment for justified align tex...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3704 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3704 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91e1c52f1aa13a806e2a91dc7120960a4cc3f5c1 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/testrtftok.cxx |7 +++
writerfilter/source/rtftok/rtfsprm.hxx |2 ++
2 files changed, 9 insertions(+)
New commits:
commit 576187250222eae50ce057698b364f91dc926c7f
Author: Miklos Vajna vmik...@suse.cz
Date: Thu May 2 09:24:18 2013 +0200
writerfilter: few more doxygen comments
Change-Id: I4893e2b3297adadf4e19ab22b298aaef4044b52e
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
index 9a386d1..3342f12 100644
--- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
@@ -18,6 +18,13 @@
using namespace ::com::sun::star;
+/**
+ * Unit test invoking the Writer RTF import filter.
+ *
+ * This does only minimal testing, checking if the filter crashes and returns
+ * the expected bool value for given inputs. More fine-grained tests can be
+ * found under sw/qa/extras/rtfimport/.
+ */
class RtfTest
: public test::FiltersTest
, public test::BootstrapFixture
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx
b/writerfilter/source/rtftok/rtfsprm.hxx
index 687c2b4..dc82256 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -18,6 +18,8 @@ namespace writerfilter {
namespace rtftok {
typedef std::vector std::pairId, RTFValue::Pointer_t
RTFSprmsImplBase;
+
+/// The payload of RTFSprms which is only copied on write.
class RTFSprmsImpl : public RTFSprmsImplBase
{
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Killing the gerrit to dev-list spam ...
Le 02/05/2013 07:49, Jonathan Aquilina a écrit : If there is nothing to report is it necessary to send anything out at all? Perhaps: if you do not receive anything, you do not know if there nothing to receive or if there is a problem on the sender side or on the receiver side or if the link between them is broken. JBF On Thu, May 2, 2013 at 7:48 AM, Tor Lillqvist t...@iki.fi mailto:t...@iki.fi wrote: Next question to ask though with daily digests how many times a day will they be sent out? Every few hours definitely, except on Mondays of odd-numbered weeks when the daily digest should be sent just twice. And if there is nothing to digest, they should say so, Nothing to report. --tml -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Killing the gerrit to dev-list spam ...
Hi, On Wed, May 1, 2013 at 9:33 PM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: So, is there anyone who is _not_ a sponsored developer opposing to kill the mail spammage? If so: - could this be mitigated by a separate gerrit-patches mailing list? - could this be mitigated by a daily digest of gerrit news? - could this be mitigated by other means? I vote to have a daily digest with just the newly subbmitted patches. I think it is important with some sort of visibility of the patch flow on the dev-list, for general heads-up on what is going on, and more importantly as an instrument to reduce risk of duplication of work. I'm against having a separate mailinglist for this.i wouldn't subscribe to this list, and I guess newcomers will simply miss out on this. In this case pointing to those summaries ought to be enough https://gerrit.libreoffice.org/#/q/status:open,n,z https://gerrit.libreoffice.org/#/q/status:merged,n,z https://gerrit.libreoffice.org/#/q/status:abandoned,n,z http://cgit.freedesktop.org/libreoffice/core/log Maybe these links could be inluded into the daily digest as part of some standard introduction. /Albert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit ac747088247fef5dca0acf417973bdf89128fcb1 Author: László Németh nem...@numbertext.org Date: Tue Apr 30 12:30:00 2013 +0200 fdo#64082 logo: fix hide/showturtle Change-Id: I1aa1152940697f6390155871c0128519211abddd Reviewed-on: https://gerrit.libreoffice.org/3696 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 2fa250d..2231646 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -456,7 +456,7 @@ def __initialize__(): _.doc.CurrentController.select(shape) shape.FillColor, transparence = __splitcolor__(_.areacolor) shape.LineColor, shape.LineTransparence = __splitcolor__(_.pencolor) -else: +elif shape.Visible: _.areacolor = shape.FillColor + (int(255.0 * shape.FillTransparence/100) 24) _.pencolor = shape.LineColor + (int(255.0 * shape.LineTransparence/100) 24) if shape.LineWidth != round((1 + _.pen * 2) * __PT_TO_TWIP__ / __MM10_TO_TWIP__) and shape.LineWidth != round(__LINEWIDTH__ / __MM10_TO_TWIP__): @@ -513,7 +513,7 @@ def __visible__(shape, visible = -1): # for OOo 3.2 compatibility def hideturtle(): turtle = __getshape__(__TURTLE__) -if turtle: +if turtle and turtle.Visible: z = turtle.getPosition() z = __Point__(z.X + turtle.BoundRect.Width / 2.0, z.Y + turtle.BoundRect.Height / 2.0) turtle.PolyPolygon = __TURTLESHAPE__[1] @@ -524,7 +524,7 @@ def hideturtle(): def showturtle(): turtle = __getshape__(__TURTLE__) -if turtle: +if turtle and not turtle.Visible: if not turtle.Parent: _.drawpage.add(turtle) z = turtle.getPosition() @@ -532,12 +532,12 @@ def showturtle(): turtle.PolyPolygon, turtle.RotateAngle = __TURTLESHAPE__[0], r z = __Point__(z.X - turtle.BoundRect.Width / 2.0, z.Y - turtle.BoundRect.Height / 2.0) turtle.setPosition(z) +__visible__(turtle, True) pencolor(_.pencolor) fillcolor(_.areacolor) pensize(_.pensize/__PT_TO_TWIP__) -__visible__(turtle, True) _.doc.CurrentController.select(__getshape__(__TURTLE__)) -else: +elif not turtle: __initialize__() def left(arg=None): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#64082 logo: fix hide/showturtle
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3696 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3696 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1aa1152940697f6390155871c0128519211abddd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Németh László nem...@numbertext.org Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Killing the gerrit to dev-list spam ...
Don't u consider sending nothing to report spam in a way? On May 2, 2013 9:42 AM, Jean-Baptiste Faure jbf.fa...@sud-ouest.org wrote: Le 02/05/2013 07:49, Jonathan Aquilina a écrit : If there is nothing to report is it necessary to send anything out at all? Perhaps: if you do not receive anything, you do not know if there nothing to receive or if there is a problem on the sender side or on the receiver side or if the link between them is broken. JBF On Thu, May 2, 2013 at 7:48 AM, Tor Lillqvist t...@iki.fi mailto:t...@iki.fi wrote: Next question to ask though with daily digests how many times a day will they be sent out? Every few hours definitely, except on Mondays of odd-numbered weeks when the daily digest should be sent just twice. And if there is nothing to digest, they should say so, Nothing to report. --tml -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sfx2: kill tiny qstart_gtk library
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3735 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/3735/1 sfx2: kill tiny qstart_gtk library Include the source file directly into sfx library, like we do for Windows and Mac OS X. notify_file_changed now checks for the sfx library. Change-Id: I18d47082065371e4d6c670bc636bc7e352d36786 --- M scp2/InstallModule_gnome.mk M scp2/source/gnome/file_gnome.scp M scp2/source/gnome/module_gnome.scp M scp2/source/ooo/file_library_ooo.scp D sfx2/Library_qstart_gtk.mk M sfx2/Library_sfx.mk M sfx2/Module_sfx2.mk M sfx2/source/appl/shutdownicon.cxx M sfx2/source/appl/shutdownicon.hxx M sfx2/source/appl/shutdowniconunx.cxx 10 files changed, 24 insertions(+), 152 deletions(-) diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 816f3b2..193fa53 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -17,7 +17,6 @@ ENABLE_GTK \ ENABLE_GTK3 \ ENABLE_LOCKDOWN \ - ENABLE_SYSTRAY_GTK \ )) $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\ diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 9f824d8..7790da9 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -48,12 +48,3 @@ #ifdef ENABLE_GCONF STD_LIB_FILE( gid_File_Lib_Gconfbe, gconfbe1 ) #endif - -#ifdef ENABLE_SYSTRAY_GTK -File gid_File_Lib_QStart_Gtk -Name = LIBNAME(qstart_gtk); -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -End -#endif diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 3a2604d..9f08a80 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -47,9 +47,6 @@ #ifdef ENABLE_GTK3 gid_File_Lib_Vclplug_Gtk3, #endif -#ifdef ENABLE_SYSTRAY_GTK - gid_File_Lib_QStart_Gtk, -#endif #ifdef ENABLE_GNOMEVFS gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application, #endif diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index ab3105e..3c20df3 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -164,19 +164,6 @@ #endif -#ifdef UNX -#ifdef ENABLE_GTK -#ifdef ENABLE_SYSTRAY_GTK -File gid_File_Lib_QStart_Gtk -Name = LIBNAME(qstart_gtk); -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -End -#endif -#endif -#endif - File gid_File_Lib_Dbpool LIB_FILE_BODY; Styles = (PACKED); diff --git a/sfx2/Library_qstart_gtk.mk b/sfx2/Library_qstart_gtk.mk deleted file mode 100644 index 2090658..000 --- a/sfx2/Library_qstart_gtk.mk +++ /dev/null @@ -1,69 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# 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 . -# - - -$(eval $(call gb_Library_Library,qstart_gtk)) - -$(eval $(call gb_Library_set_include,qstart_gtk,\ -$$(INCLUDE) \ --I$(SRCDIR)/sfx2/inc \ --I$(SRCDIR)/include/sfx2/ \ -)) - -$(eval $(call gb_Library_use_sdk_api,qstart_gtk)) - -$(eval $(call gb_Library_add_defs,qstart_gtk,-DENABLE_QUICKSTART_APPLET)) - -ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) -$(eval $(call gb_Library_add_defs,qstart_gtk,-DENABLE_SYSTRAY_GTK)) -endif - -$(eval $(call gb_Library_use_libraries,qstart_gtk,\ -comphelper \ -cppu \ -cppuhelper \ -fwe \ -i18nlangtag \ -sal \ -sax \ -sb \ -sot \ -svl \ -svt \ -tk \ -tl \ -ucbhelper \ -utl \ -vcl \ -sfx \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_use_externals,qstart_gtk,\ - boost_headers \ - gio \ - gtk \ - libxml2 \ -)) - -$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ -sfx2/source/appl/shutdowniconunx \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index ef81f31..2188629 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -43,14 +43,6 @@ $(if $(filter TRUE,$(ENABLE_CUPS)),-DENABLE_CUPS) \ )) -ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) -$(eval $(call gb_Library_add_defs,sfx,\ --DENABLE_QUICKSTART_APPLET \ -
Re: Killing the gerrit to dev-list spam ...
On Wed, May 01, 2013 at 09:33:49PM +0200, Bjoern Michaelsen wrote: Looking at: http://nabble.documentfoundation.org/Dev-f1639786.html depending on time of day you find 50-90% patch mails on there. As the writer of mail forward I have been repeatedly asked if we can kill this spam. I fully agree with this sentiment (...) So, is there anyone who is _not_ a sponsored developer opposing to kill the mail spammage? I'm unhappy about the current situation, but in the *other* direction. The most important part of gerrit is the *discussion* on patches, and that's absent from the current mails; having to constantly go to a browser is disruptive; Mail / mailing lists have all kind of tools that I can use to manage what I'm interested in and what not, from e.g. ignore this thread, watch this thread, etc, which gerrit only imperfectly has. Even more basically: when it is a mailing list, my MUA keeps track for me of what I have read and what I have not read yet, which gerrit does not do at all. (Never mind that the tools I have to manage mailing list mails are under my control and choice: I can patch my MUA locally, but I'm dependent on what the centrally installed gerrit offers as services.) So, that's IMO; obviously a ML is a shared resource, so if the others disagree... - could this be mitigated by a separate gerrit-patches mailing list? Yes. I would call it patch-discuss or code-discuss rather than gerrit-patches; gerrit is just *one* technical way to submit / discuss patches, there is AFAIK no reason to separate gerrit patches from sent to Mailing List patches. Actually, separating: 1) discussion on exact code (a concrete patch) on the one hand, and 2) general design discussions, process discussions, hi I'm a new developer mail, etc. into two different mailing lists could make sense. That is generalising a bit your proposal, but to me it makes sense :) - could this be mitigated by a daily digest of gerrit news? If I can undigest it automatically on my side, I don't mind. - could this be mitigated by other means? Probably. Not that this does: - not mean that it is evil to send a patch to the list (although its a bit misguided given how gerrit simplifies and enables things ;) ) It would make more sense to me that a patch manually sent to the list goes to the same list as the gerrit patches. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Killing the gerrit to dev-list spam ...
On 01.05.2013 21:33, Bjoern Michaelsen wrote: So, is there anyone who is _not_ a sponsored developer opposing to kill the mail spammage? If so: - could this be mitigated by a separate gerrit-patches mailing list? - could this be mitigated by a daily digest of gerrit news? - could this be mitigated by other means? I would prefer splitting it to a gerrit list where the mails come as usual. Like libreoffice-commits... Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Killing the gerrit to dev-list spam ...
On Wed, May 01, 2013 at 10:01:12PM +0200, Mat M wrote: Yes, IMO, the goal is to have an overview of what was commited, IMO, no, it is not. It is about seeing what is proposed to come in *before* it does. To see stuff after the fact we have *another* mailing list, namely http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: fdo#55814: unit test is missing
On 01/05/13 23:33, David Ostrovsky wrote: On 30.04.2013 23:46, Stephan Bergmann wrote: On 04/29/2013 11:42 PM, David Ostrovsky wrote: cli_ure is failing to compile here atm. How's it failing for you exactly? I'd hope it does work now, across various Windows build configurations. yes, after you've fixed it ;-) so, with this patch https://gerrit.libreoffice.org/#/c/3728/1 unit tests are invoked now on windows, but python is failing to locate the tests: ImportError: No module named 'get_expression' that's because the PYTHONPATH was not extended: PYTHONPATH=$S/instdir/wntmsci13.pro/program/python-core-3.3.0/lib;$S/instdir/wntmsci13.pro/program/python-core-3.3.0/lib/lib-dynload:$S/instdir/wntmsci13.pro/program as expected with this function (PythonTest.mk): # gb_PythonTest_add_modules directory module(s) define gb_PythonTest_add_modules $(call gb_PythonTest_get_target,$(1)) : PYPATH := $$(PYPATH):$(2) [...] And i don't see why ;-( problem is the :, on Windows it should be ;... the CLASSPATH stuff in the java makefiles has the same problem, there is some variable there for the separator that should fix that. by the way if the test fails to create a document the first thing you should check in the debugger is if the process has 2 tklo.dll loaded (that's what happened last time i tried and it definitely doesn't work). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 4.0.3 RC2 test builds available
Hi *, for the upcoming new version 4.0.3, the RC2 builds now start to be available on pre-releases. This build is slated to be second release candidate build on the way towards 4.0.3, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#4.0.3_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. NOTE: This build is in a release configuration and _will_ replace your existing LibreOffice install on Windows. The list of fixed bugs relative to 4.0.3 RC1 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-0-3-release-4.0.3.2.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Help to push to gerrit using https
Hi, Anybody can please tell me how to push to gerrit using https (username/password)? Because I'm under proxy and can't user ssh. Thanks a lot, Cuong. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Killing the gerrit to dev-list spam ...
Hi, On Thu, 02 May 2013 06:58:50 +0200 Jean-Baptiste Faure jbf.fa...@sud-ouest.org wrote: Hi, Le 01/05/2013 21:33, Bjoern Michaelsen a écrit : [...] So, is there anyone who is _not_ a sponsored developer opposing to kill the mail spammage? If so: [...] Opinions? Even if I am able to filter gerrit mails, I agree that a separate gerrit-patches mailing list would be better. I also use filtering provided by my email service provider (previously, by my client) and I find this sufficient, so I would just suggest people to proceed this way. If we feel it is better to switch to digest or separate mailing list, I would prefer the latter: I think it should be easier to implement (the guys working on Gerrit already did a great work!) but, most of all, I would still be able to see all of mail organized in a thread per issue way, which is very useful and provide a quick overview of what is going on. Cheers Matteo Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: android/experimental cppuhelper/source
android/experimental/DocumentLoader/native-code.cxx |2 -
android/experimental/LibreOffice4Android/native-code.cxx |2 -
android/experimental/desktop/native-code.cxx |2 -
cppuhelper/source/shlib.cxx | 20 +--
4 files changed, 10 insertions(+), 16 deletions(-)
New commits:
commit 802a87e181dc8b372f247dd5ca7138bd6bd875a1
Author: Tor Lillqvist t...@iki.fi
Date: Thu May 2 10:28:44 2013 +0300
Adapt to library name changes for Android, too
Change-Id: I6da1f38c5a9693c13ef841442cbef017d388416a
diff --git a/android/experimental/DocumentLoader/native-code.cxx
b/android/experimental/DocumentLoader/native-code.cxx
index 3961e00..e7ee9f3 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -65,7 +65,7 @@ lo_get_libmap(void)
{ libevtattlo.a, evtatt_component_getFactory },
{ libfileacc.a, fileacc_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
-{ libfsstorage.uno.a, fsstorage_component_getFactory },
+{ libfsstoragelo.a, fsstorage_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
{ libfwllo.a, fwl_component_getFactory },
{ libfwmlo.a, fwm_component_getFactory },
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
index aebe61b..3fe4435 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -92,7 +92,7 @@ lo_get_libmap(void)
{ libfileacc.a, fileacc_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
-{ libfsstorage.uno.a, fsstorage_component_getFactory },
+{ libfsstoragelo.a, fsstorage_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
{ libfwllo.a, fwl_component_getFactory },
{ libfwmlo.a, fwm_component_getFactory },
diff --git a/android/experimental/desktop/native-code.cxx
b/android/experimental/desktop/native-code.cxx
index b4b71b0..9321124 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -97,7 +97,7 @@ lo_get_libmap(void)
{ libfileacc.a, fileacc_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
-{ libfsstorage.uno.a, fsstorage_component_getFactory },
+{ libfsstoragelo.a, fsstorage_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
{ libfwllo.a, fwl_component_getFactory },
{ libfwmlo.a, fwm_component_getFactory },
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index f53a672..db741ad 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -533,38 +533,32 @@ Reference XInterface SAL_CALL
loadSharedLibComponentFactory(
{ bootstrap.uno.a, bootstrap_component_getFactory },
{ libbootstrap.uno.a, bootstrap_component_getFactory },
-// The .uno ones seems to consistently have a lib prefix now for
Android,
+// The .uno ones seem to consistently have a lib prefix now for
Android,
// but not iOS, hmm.
#ifdef ANDROID
-{ libconfigmgr.uno.a, configmgr_component_getFactory },
-{ libexpwrap.uno.a, expwrap_component_getFactory },
-{ libfastsax.uno.a, fastsax_component_getFactory },
-{ libi18npool.uno.a, i18npool_component_getFactory },
{ libintrospection.uno.a, introspection_component_getFactory },
-{ liblocalebe1.uno.a, localebe1_component_getFactory },
{ libreflection.uno.a, reflection_component_getFactory },
{ libstocservices.uno.a, stocservices_component_getFactory },
-{ libucpexpand1.uno.a, ucpexpand1_component_getFactory },
#else
-{ libconfigmgrlo.a, configmgr_component_getFactory },
-{ libexpwraplo.a, expwrap_component_getFactory },
-{ libfastsaxlo.a, fastsax_component_getFactory },
-{ libi18npoollo.a, i18npool_component_getFactory },
{ introspection.uno.a, introspection_component_getFactory },
-{ liblocalebe1lo.a, localebe1_component_getFactory },
{ reflection.uno.a, reflection_component_getFactory },
{ stocservices.uno.a, stocservices_component_getFactory },
-{ libucpexpand1lo.a, ucpexpand1_component_getFactory },
#endif
{ libcomphelper.a, comphelp_component_getFactory },
+{ libconfigmgrlo.a, configmgr_component_getFactory },
{ libdeployment.a, deployment_component_getFactory },
+{ libexpwraplo.a, expwrap_component_getFactory },
+{ libfastsaxlo.a, fastsax_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory
[Libreoffice-commits] core.git: framework/source include/tools tools/source
framework/source/uielement/recentfilesmenucontroller.cxx | 28 ---
include/tools/urlobj.hxx |8
tools/source/fsys/urlobj.cxx |6 +++
3 files changed, 23 insertions(+), 19 deletions(-)
New commits:
commit 2092f8810a20938a0d0dbf5364c850a6ad9981ad
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Tue Apr 30 20:13:30 2013 +0200
Show only filename in Recent Files list
As discussed here:
http://nabble.documentfoundation.org/Libreoffice-ux-advise-Recent-files-dropdown-td4052945.html#a4052996
The changes are (inspired by Gedit):
* Display only the filename, not the (abbreviated) path
* Show the protocol name before the file, if not local (e.g. ftp:
myfile.odt)
* After the keyboard shortcut (a number from 1 to 10) display a '.' instead
of a ':' (because the protocol has a ':')
* FIX: Display whitespace as whitespace, not %20
Change-Id: I47472c901aa866adb76c7c7ab36bc871f82ad8df
Reviewed-on: https://gerrit.libreoffice.org/3700
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx
b/framework/source/uielement/recentfilesmenucontroller.cxx
index 3d8d9c9..2be9117 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -40,13 +40,12 @@ using namespace com::sun::star::frame;
using namespace com::sun::star::beans;
using namespace com::sun::star::util;
-#define MAX_STR_WIDTH 46
#define MAX_MENU_ITEMS 99
static const char SFX_REFERER_USER[] = private:user;
static const char CMD_CLEAR_LIST[] = .uno:ClearRecentFileList;
static const char CMD_PREFIX[] =
vnd.sun.star.popup:RecentFileList?entry=;
-static const char MENU_SHOTCUT[] = ~N: ;
+static const char MENU_SHORTCUT[] = ~N. ;
namespace framework
{
@@ -133,17 +132,17 @@ void RecentFilesMenuController::fillPopupMenu( Reference
css::awt::XPopupMenu
if ( i = 9 )
{
if ( i == 9 )
-aMenuShortCut.append( 1~0: );
+aMenuShortCut.append( 1~0. );
else
{
-aMenuShortCut.append( MENU_SHOTCUT );
+aMenuShortCut.append( MENU_SHORTCUT );
aMenuShortCut[ 1 ] = sal_Unicode( i + '1' );
}
}
else
{
aMenuShortCut.append( sal_Int32( i + 1 ) );
-aMenuShortCut.append( : );
+aMenuShortCut.append( . );
}
OUStringBuffer aStrBuffer;
@@ -152,28 +151,19 @@ void RecentFilesMenuController::fillPopupMenu( Reference
css::awt::XPopupMenu
OUString aURLString( aStrBuffer.makeStringAndClear() );
// Abbreviate URL
-OUString aTipHelpText;
OUString aMenuTitle;
INetURLObject aURL( m_aRecentFilesItems[i].aURL );
+OUString aTipHelpText( aURL.getFSysPath(
INetURLObject::FSYS_DETECT ) );
if ( aURL.GetProtocol() == INET_PROT_FILE )
{
-// Do handle file URL differently = convert it to a system
-// path and abbreviate it with a special function:
-OUString aSystemPath( aURL.getFSysPath(
INetURLObject::FSYS_DETECT ) );
-aTipHelpText = aSystemPath;
-
-OUString aCompactedSystemPath;
-if ( osl_abbreviateSystemPath( aSystemPath.pData,
aCompactedSystemPath.pData, MAX_STR_WIDTH, NULL ) == osl_File_E_None )
-aMenuTitle = aCompactedSystemPath;
-else
-aMenuTitle = aSystemPath;
+// Do handle file URL differently: don't show the
protocol, just the file name
+aMenuTitle =
aURL.GetLastName(INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8);
}
else
{
-// Use INetURLObject to abbreviate all other URLs
-aMenuTitle = aURL.getAbbreviated( xStringLength,
MAX_STR_WIDTH, INetURLObject::DECODE_UNAMBIGUOUS );
-aTipHelpText = aURLString;
+// In all other URLs show the protocol name before the
file name
+aMenuTitle = aURL.GetSchemeName(aURL.GetProtocol()) + :
+ aURL.getName();
}
aMenuShortCut.append( aMenuTitle );
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index fef9f46..8905334 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -484,6 +484,14 @@ public:
*/
static OUString
Re: some file format spec problems with the OOXML chart import/export
On 02/05/13 00:24, Markus Mohrhard wrote: Hey, so I have been fixing some chart OOXML issues recently and there are some general problems. There are a number of comments like (from typegroupcontext.cxx:147) // default is 'false', not 'true' as specified but testing this in Excel showed that Excel respects the standard in contrast to our import and export. Does anyone know why these comments have been introduced or does anyone have a reason why we should not fix this stuff? I already fixed a few of these problems that made my simple test document look awful when being imported into Excel. no idea; perhaps it is the case that different versions (or even different patch levels) of MSO have different defaults? If there is nobody opposing it I will slowly fix these issues in the chart import/export where I see them. Sadly there is no way to automatically test these things as they are wrong in the import and the export filter. The only way is to check the OOXML standard and check how our exported documents look in MSO. if in doubt i guess it can't hurt to write the explicit value and not rely on any defaults. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Show only filename in Recent Files list
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3700 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3700 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47472c901aa866adb76c7c7ab36bc871f82ad8df Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Update pch
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3736 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3736/1 Update pch Change-Id: Ia400389ca7c4fbe752e19ca2d38f2fee00f6ee7d --- M oox/inc/pch/precompiled_oox.hxx M sc/inc/pch/precompiled_sc.hxx M writerfilter/inc/pch/precompiled_writerfilter.hxx 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index f9ea8b6..1125be4 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -283,6 +283,7 @@ #include com/sun/star/text/SizeType.hpp #include com/sun/star/text/TextContentAnchorType.hpp #include com/sun/star/text/VertOrientation.hpp +#include com/sun/star/text/WrapTextMode.hpp #include com/sun/star/text/WritingMode.hpp #include com/sun/star/text/XNumberingRulesSupplier.hpp #include com/sun/star/text/XSimpleText.hpp diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index bb42081..a913837 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -53,6 +53,7 @@ #include formula/grammar.hxx #include formula/opcode.hxx #include formula/token.hxx +#include formula/vectortoken.hxx #include i18nlangtag/lang.h #include i18nlangtag/mslangid.hxx #include rtl/math.hxx diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 6e840a6..641211a 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -71,6 +71,7 @@ #include com/sun/star/form/XFormComponent.hpp #include com/sun/star/form/XFormsSupplier.hpp #include com/sun/star/frame/XFrame.hpp +#include com/sun/star/frame/XModel.hpp #include com/sun/star/graphic/GraphicProvider.hpp #include com/sun/star/graphic/XGraphic.hpp #include com/sun/star/graphic/XGraphicProvider.hpp @@ -146,6 +147,7 @@ #include com/sun/star/uri/UriReferenceFactory.hpp #include com/sun/star/util/XNumberFormatsSupplier.hpp #include com/sun/star/util/XRefreshable.hpp +#include com/sun/star/view/XFormLayerAccess.hpp #include com/sun/star/xml/sax/Parser.hpp #include com/sun/star/xml/sax/SAXException.hpp #include com/sun/star/xml/sax/XParser.hpp -- To view, visit https://gerrit.libreoffice.org/3736 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia400389ca7c4fbe752e19ca2d38f2fee00f6ee7d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aurimas Fišeras auri...@members.fsf.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: some file format spec problems with the OOXML chart import/export
Marcus, If you like, I can test documents for you in MSO 2007 and send screenshots. It's a version without any service packs installed - the oldest MSO version that natively reads and writes OOXML. 2013/5/2 Michael Stahl mst...@redhat.com On 02/05/13 00:24, Markus Mohrhard wrote: Hey, so I have been fixing some chart OOXML issues recently and there are some general problems. There are a number of comments like (from typegroupcontext.cxx:147) // default is 'false', not 'true' as specified but testing this in Excel showed that Excel respects the standard in contrast to our import and export. Does anyone know why these comments have been introduced or does anyone have a reason why we should not fix this stuff? I already fixed a few of these problems that made my simple test document look awful when being imported into Excel. no idea; perhaps it is the case that different versions (or even different patch levels) of MSO have different defaults? If there is nobody opposing it I will slowly fix these issues in the chart import/export where I see them. Sadly there is no way to automatically test these things as they are wrong in the import and the export filter. The only way is to check the OOXML standard and check how our exported documents look in MSO. if in doubt i guess it can't hurt to write the explicit value and not rely on any defaults. ___ 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
[Libreoffice-commits] core.git: oox/inc sc/inc writerfilter/inc
oox/inc/pch/precompiled_oox.hxx |1 + sc/inc/pch/precompiled_sc.hxx |1 + writerfilter/inc/pch/precompiled_writerfilter.hxx |2 ++ 3 files changed, 4 insertions(+) New commits: commit cf685e9299ab9d196b7f90803f03d4fea8d16091 Author: Aurimas Fišeras auri...@members.fsf.org Date: Thu May 2 09:52:32 2013 +0300 Update pch Change-Id: Ia400389ca7c4fbe752e19ca2d38f2fee00f6ee7d Reviewed-on: https://gerrit.libreoffice.org/3736 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index f9ea8b6..1125be4 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -283,6 +283,7 @@ #include com/sun/star/text/SizeType.hpp #include com/sun/star/text/TextContentAnchorType.hpp #include com/sun/star/text/VertOrientation.hpp +#include com/sun/star/text/WrapTextMode.hpp #include com/sun/star/text/WritingMode.hpp #include com/sun/star/text/XNumberingRulesSupplier.hpp #include com/sun/star/text/XSimpleText.hpp diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index bb42081..a913837 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -53,6 +53,7 @@ #include formula/grammar.hxx #include formula/opcode.hxx #include formula/token.hxx +#include formula/vectortoken.hxx #include i18nlangtag/lang.h #include i18nlangtag/mslangid.hxx #include rtl/math.hxx diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 6e840a6..641211a 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -71,6 +71,7 @@ #include com/sun/star/form/XFormComponent.hpp #include com/sun/star/form/XFormsSupplier.hpp #include com/sun/star/frame/XFrame.hpp +#include com/sun/star/frame/XModel.hpp #include com/sun/star/graphic/GraphicProvider.hpp #include com/sun/star/graphic/XGraphic.hpp #include com/sun/star/graphic/XGraphicProvider.hpp @@ -146,6 +147,7 @@ #include com/sun/star/uri/UriReferenceFactory.hpp #include com/sun/star/util/XNumberFormatsSupplier.hpp #include com/sun/star/util/XRefreshable.hpp +#include com/sun/star/view/XFormLayerAccess.hpp #include com/sun/star/xml/sax/Parser.hpp #include com/sun/star/xml/sax/SAXException.hpp #include com/sun/star/xml/sax/XParser.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Update pch
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3736 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3736 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia400389ca7c4fbe752e19ca2d38f2fee00f6ee7d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aurimas Fišeras auri...@members.fsf.org Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Revert Added Tango colors to palette
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3738 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/3738/1 Revert Added Tango colors to palette Tango icons are in its own tango.soc palette. No need to add them to the standard palette. This reverts commit b9c98414ec9084cf97b5dcc911fb9941b5e57ebb. Change-Id: Id19d869ce8744cf55e64f4d003b8011f9df0023f --- M extras/source/palettes/standard.soc 1 file changed, 0 insertions(+), 2 deletions(-) diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 4981c86..6361f7b 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -100,6 +100,4 @@ draw:color draw:name=Chart 10 draw:color=#ff950e/ draw:color draw:name=Chart 11 draw:color=#c5000b/ draw:color draw:name=Chart 12 draw:color=#0084d1/ - draw:color draw:name=Tango: Sky Blue 1 draw:color=#729fcf / - draw:color draw:name=Tango: Sky Blue 2 draw:color=#3465a4 / /office:color-table -- To view, visit https://gerrit.libreoffice.org/3738 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id19d869ce8744cf55e64f4d003b8011f9df0023f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com Gerrit-Reviewer: Alexander Wilms alexander.wi...@zoho.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/sfx2 oox/source reportdesign/source sfx2/sdi sfx2/source sw/source
include/sfx2/sfxsids.hrc |1 oox/source/core/filterbase.cxx |2 - reportdesign/source/ui/report/ReportController.cxx |4 +++ sfx2/sdi/sfx.sdi |9 ++- sfx2/source/appl/appuno.cxx|9 +-- sfx2/source/doc/guisaveas.cxx | 25 - sfx2/source/doc/objserv.cxx| 22 -- sw/source/ui/uiview/srcview.cxx|3 ++ sw/source/ui/uiview/view.hrc |2 + 9 files changed, 51 insertions(+), 26 deletions(-) New commits: commit 7061e8403a3afddae253ad0a016e5613616030bb Author: Ãdám Csaba Király kiraly.adam.cs...@gmail.com Date: Wed Apr 3 21:05:12 2013 +0200 fdo#60780, refactor Save a Copy and fix Refactor Save a Copy, basing it on Export functionality. SID_SAVEACOPY takes its parameters, and sends a SID_EXPORTDOC request with them, using SID_SAVEACOPYITEM to differentiate Save a Copy from regular Export. Fix storing docx to url, by preventing finalizeFilter method, in filterbase.cxx, from writing back to the original file's MediaDescriptor. Change-Id: I876dbe17e43b26a43f29e797fdb157e31889ee1e Reviewed-on: https://gerrit.libreoffice.org/3355 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 00923ff..cd25c9e 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -118,6 +118,7 @@ #define SID_OPENTEMPLATE(SID_SFX_START + 594) #define SID_SAVEASDOC (SID_SFX_START + 502) #define SID_SAVEACOPY (SID_SFX_START + 999) +#define SID_SAVEACOPYITEM (SID_SFX_START + 998) #define SID_CLOSING (SID_SFX_START +1539) #define SID_CLOSEDOC(SID_SFX_START + 503) #define SID_CLOSEDOCS (SID_SFX_START + 595) diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 4d31f05..13551fe 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -507,7 +507,7 @@ sal_Bool SAL_CALL FilterBase::filter( const Sequence PropertyValue rMediaDes } break; } -mxImpl-finalizeFilter(); +mxImpl-mxModel-unlockControllers(); } return bRet; } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 27c76ab..aa56679 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -793,6 +793,9 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_SAVEASDOC: aReturn.bEnabled = isConnected() isEditable(); break; +case SID_SAVEACOPY: +aReturn.bEnabled = isConnected() isEditable(); +break; case SID_EDITDOC: aReturn.bChecked = isEditable(); break; @@ -1913,6 +1916,7 @@ void OReportController::describeSupportedFeatures() implDescribeSupportedFeature( .uno:NewDoc, SID_NEWDOC, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( .uno:Save, SID_SAVEDOC,CommandGroup::DOCUMENT ); implDescribeSupportedFeature( .uno:SaveAs, SID_SAVEASDOC, CommandGroup::DOCUMENT ); +implDescribeSupportedFeature( .uno:SaveACopy, SID_SAVEACOPY, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( .uno:InsertPageNumberField, SID_INSERT_FLD_PGNUMBER,CommandGroup::INSERT ); implDescribeSupportedFeature( .uno:InsertDateTimeField, SID_DATETIME, CommandGroup::INSERT ); diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index ad70c3a..b8823d2 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -5586,8 +5586,9 @@ SfxBoolItem SaveAsTemplate SID_DOCTEMPLATE ] //-- + SfxBoolItem SaveACopy SID_SAVEACOPY -(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxBoolItem PasswordInteraction SID_PASSWORDINTERACTION,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem VersionAuthor SID_DOCINFO_AUTHOR,SfxBoolItem Overwrite SID_OVERWRITE,SfxBoolItem Unpacked SID_UNPACK,SfxBoolItem SaveTo SID_SAVETO) +(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxBoolItem Overwrite SID_OVERWRITE, SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxBoolItem SaveACopy SID_SAVEACOPYITEM) [ /* flags: */
[PUSHED] fdo#60780, refactor Save a Copy and fix
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3355 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3355 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I876dbe17e43b26a43f29e797fdb157e31889ee1e Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ádám Király kiraly.adam.cs...@gmail.com Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Ádám Király kiraly.adam.cs...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: some file format spec problems with the OOXML chart import/export
2013/5/2 Stephan van den Akker stephanv...@gmail.com: Marcus, If you like, I can test documents for you in MSO 2007 and send screenshots. It's a version without any service packs installed - the oldest MSO version that natively reads and writes OOXML. No need for that. I have all Excel versions for testing if I need them but I Excel 2007 does not implement OOXML (they implement an initial proposal but can't work with compliant OOXML files) and 2010 is the version that can deal with it. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/inftxt.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c18d8bd2d2ec5ba8dd9c43a99117aed82a919267
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu May 2 11:51:53 2013 +0200
Don't crash with empty *pTxt
Change-Id: I5fdd0cbc70dec1119b1b6a76cb3c5805f11c11ed
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 2faee80..0fd3922 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -265,7 +265,7 @@ public:
inline const SwViewOption GetOpt() const { return *pOpt; }
inline const OUString GetTxt() const { return *pTxt; }
inline sal_Unicode GetChar( const sal_Int32 nPos ) const
-{ return (*pTxt)[ nPos ]; }
+{ if (pTxt !pTxt-isEmpty()) return (*pTxt)[ nPos ]; return 0; }
inline KSHORT GetTxtHeight() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtww8.cxx |3 ++- sw/source/filter/ww8/wrtww8.hxx |3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 52bd4ffaac9a48e4838f8e06d6b97fb1c1dd4bb2 Author: Armin Le Grand a...@apache.org Date: Tue Jun 26 13:30:33 2012 + Resolves: #120098# Memoryleak fixed at escher sw export remember and destroy the used stream. Found by: Chao Huang Patch by: Chao Huang Review by: alg (cherry picked from commit 9914b3172fd4e3867693e5e63c8085dd66f18b5f) Conflicts: sw/source/filter/ww8/wrtww8.cxx Change-Id: I5bccdd71312f32f861291fc600396dc111fc11c7 diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 7753d3c..53308d8 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2743,7 +2743,8 @@ void WW8Export::WriteFkpPlcUsw() the existence of an ObjectPool dir is necessary for triggering some magic. cmc */ -GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool), +// avoid memory leak #i120098#, the unnamed obj will be released in destructor. +xEscherStg = GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool), STREAM_READWRITE | STREAM_SHARE_DENYALL); } diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 7d33f29..3339bfe 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -923,6 +923,9 @@ protected: SwWW8Writer*m_pWriter; /// Pointer to the writer WW8AttributeOutput *m_pAttrOutput; /// Converting attributes to stream data +private: +SvStorageRef xEscherStg; /// memory leak #i120098#, to hold the reference to unnamed SotStorage obj + public: /// Access to the attribute output class. virtual AttributeOutputBase AttrOutput() const; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - drawinglayer/source include/vcl vcl/source
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 322 +++--
include/vcl/textview.hxx |4
vcl/source/edit/textview.cxx |9
3 files changed, 197 insertions(+), 138 deletions(-)
New commits:
commit 92e5232dcbda1696a0e7c05defb3b6a00f4abdd7
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 2 09:55:04 2013 +0100
double lock drawinglayer statics
move related statics into classes and the make safe static singleton
instances
of those clases.
We still have to have the additional mutex (now per singleton) on the
methods that return the buffered data, as it may be modified per
call
Change-Id: I5873ae8271f48a0ebf4b584c1734688b77cd1d42
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 495c06f..266738a 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include boost/noncopyable.hpp
#include drawinglayer/primitive3d/polygontubeprimitive3d.hxx
#include drawinglayer/attribute/materialattribute3d.hxx
#include basegfx/matrix/b3dhommatrix.hxx
@@ -25,6 +26,7 @@
#include basegfx/polygon/b3dpolypolygontools.hxx
#include drawinglayer/primitive3d/transformprimitive3d.hxx
#include drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
+#include rtl/instance.hxx
//
@@ -34,190 +36,254 @@ namespace drawinglayer
{
namespace // anonymous namespace
{
-Primitive3DSequence getLineTubeSegments(
-sal_uInt32 nSegments,
-const attribute::MaterialAttribute3D rMaterial)
+class TubeBuffer : boost::noncopyable
{
-// static data for buffered tube primitives
-static Primitive3DSequence aLineTubeList;
-static sal_uInt32 nLineTubeSegments(0L);
-static attribute::MaterialAttribute3D aLineMaterial;
-static ::osl::Mutex aMutex;
-
-// may exclusively change static data, use mutex
-::osl::MutexGuard aGuard(aMutex);
-
-if(nSegments != nLineTubeSegments || !(rMaterial ==
aLineMaterial))
+private:
+// data for buffered tube primitives
+Primitive3DSequence m_aLineTubeList;
+sal_uInt32 m_nLineTubeSegments;
+attribute::MaterialAttribute3D m_aLineMaterial;
+::osl::Mutex m_aMutex;
+public:
+TubeBuffer()
+: m_nLineTubeSegments(0L)
{
-nLineTubeSegments = nSegments;
-aLineMaterial = rMaterial;
-aLineTubeList = Primitive3DSequence();
}
-if(!aLineTubeList.hasElements() 0L != nLineTubeSegments)
+Primitive3DSequence getLineTubeSegments(
+sal_uInt32 nSegments,
+const attribute::MaterialAttribute3D rMaterial)
{
-const basegfx::B3DPoint aLeft(0.0, 0.0, 0.0);
-const basegfx::B3DPoint aRight(1.0, 0.0, 0.0);
-basegfx::B3DPoint aLastLeft(0.0, 1.0, 0.0);
-basegfx::B3DPoint aLastRight(1.0, 1.0, 0.0);
-basegfx::B3DHomMatrix aRot;
-aRot.rotate(F_2PI / (double)nLineTubeSegments, 0.0, 0.0);
-aLineTubeList.realloc(nLineTubeSegments);
-
-for(sal_uInt32 a(0L); a nLineTubeSegments; a++)
+// may exclusively change cached data, use mutex
+::osl::MutexGuard aGuard(m_aMutex);
+
+if (nSegments != m_nLineTubeSegments || !(rMaterial ==
m_aLineMaterial))
{
-const basegfx::B3DPoint aNextLeft(aRot * aLastLeft);
-const basegfx::B3DPoint aNextRight(aRot * aLastRight);
-basegfx::B3DPolygon aNewPolygon;
+m_nLineTubeSegments = nSegments;
+m_aLineMaterial = rMaterial;
+m_aLineTubeList = Primitive3DSequence();
+}
-aNewPolygon.append(aNextLeft);
-aNewPolygon.setNormal(0L, basegfx::B3DVector(aNextLeft
- aLeft));
+if (!m_aLineTubeList.hasElements() m_nLineTubeSegments
!= 0)
+{
+const basegfx::B3DPoint aLeft(0.0, 0.0, 0.0);
+const basegfx::B3DPoint aRight(1.0, 0.0, 0.0);
+basegfx::B3DPoint aLastLeft(0.0,
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 99/14b3172fd4e3867693e5e63c8085dd66f18b5f
99/14b3172fd4e3867693e5e63c8085dd66f18b5f |1 + 1 file changed, 1 insertion(+) New commits: commit 753083bb76615e44948f20b171b36d74b1f13d79 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 11:06:41 2013 +0100 Notes added by 'git notes add' diff --git a/99/14b3172fd4e3867693e5e63c8085dd66f18b5f b/99/14b3172fd4e3867693e5e63c8085dd66f18b5f new file mode 100644 index 000..b747b5d --- /dev/null +++ b/99/14b3172fd4e3867693e5e63c8085dd66f18b5f @@ -0,0 +1 @@ +merged as: 52bd4ffaac9a48e4838f8e06d6b97fb1c1dd4bb2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/palettes/standard.soc |2 -- 1 file changed, 2 deletions(-) New commits: commit de7b2781bdb03858379fe6e792ea32f62a8208ec Author: Andres Gomez ago...@igalia.com Date: Thu May 2 12:31:08 2013 +0300 Revert Added Tango colors to palette Tango icons are in its own tango.soc palette. No need to add them to the standard palette. This reverts commit b9c98414ec9084cf97b5dcc911fb9941b5e57ebb. Change-Id: Id19d869ce8744cf55e64f4d003b8011f9df0023f Reviewed-on: https://gerrit.libreoffice.org/3738 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 4981c86..6361f7b 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -100,6 +100,4 @@ draw:color draw:name=Chart 10 draw:color=#ff950e/ draw:color draw:name=Chart 11 draw:color=#c5000b/ draw:color draw:name=Chart 12 draw:color=#0084d1/ - draw:color draw:name=Tango: Sky Blue 1 draw:color=#729fcf / - draw:color draw:name=Tango: Sky Blue 2 draw:color=#3465a4 / /office:color-table ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/source sw/CppunitTest_sw_ooxmlimport.mk sw/qa writerfilter/Library_writerfilter.mk writerfilter/source
sd/source/core/sdpage.cxx | 12 +-
sw/CppunitTest_sw_ooxmlimport.mk |2
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |5
writerfilter/Library_writerfilter.mk |1
writerfilter/source/dmapper/DomainMapper.cxx | 41 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 63 --
writerfilter/source/dmapper/DomainMapper_Impl.hxx |8 -
writerfilter/source/dmapper/SdtHelper.cxx | 129 ++
writerfilter/source/dmapper/SdtHelper.hxx | 68 +++
writerfilter/source/ooxml/model.xml |3
10 files changed, 261 insertions(+), 71 deletions(-)
New commits:
commit 3ec2d26dc2017ac4a27483febfc63328632f352d
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Apr 30 17:26:36 2013 +0200
bnc#779630 initial DOCX import of w:sdt's w:date
Also factor out the w:sdt-related methods to a helper class to avoid
DomainMapper_Impl become a God object.
Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index de4e207..b558073 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
embeddedobj/util/embobj \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
+forms/util/frm \
framework/util/fwk \
i18npool/util/i18npool \
linguistic/source/lng \
@@ -66,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
sw/util/msword \
sfx2/util/sfx \
svl/source/fsstor/fsstorage \
+svl/util/svl \
svtools/util/svt \
toolkit/util/tk \
ucb/source/core/ucb1 \
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 423900f..ccde3ff 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -901,7 +901,10 @@ void Test::testN779627()
*/
uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
-uno::Referencebeans::XPropertySet xShapeProperties(
xDraws-getByIndex(2), uno::UNO_QUERY );
+uno::Referencebeans::XPropertySet xShapeProperties(
xDraws-getByIndex(3), uno::UNO_QUERY );
+uno::Referencedrawing::XShapeDescriptor
xShapeDescriptor(xShapeProperties, uno::UNO_QUERY);
+// If this goes wrong, probably the index of the shape is changed and the
test should be adjusted.
+CPPUNIT_ASSERT_EQUAL(OUString(com.sun.star.drawing.RectangleShape),
xShapeDescriptor-getShapeType());
sal_Int16 nValue;
xShapeProperties-getPropertyValue(HoriOrient) = nValue;
CPPUNIT_ASSERT_EQUAL_MESSAGE(Not centered horizontally,
text::HoriOrientation::CENTER, nValue);
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index fdde17f..81d7df2 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -106,6 +106,7 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/PropertyIds \
writerfilter/source/dmapper/PropertyMap \
writerfilter/source/dmapper/PropertyMapHelper \
+writerfilter/source/dmapper/SdtHelper \
writerfilter/source/dmapper/SectionColumnHandler \
writerfilter/source/dmapper/SettingsTable \
writerfilter/source/dmapper/StyleSheetTable \
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4d6f905..16ac29c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -19,6 +19,7 @@
#include PageBordersHandler.hxx
#include resourcemodel/ResourceModelHelper.hxx
+#include SdtHelper.hxx
#include DomainMapper_Impl.hxx
#include ConversionHelper.hxx
#include ModelEventListener.hxx
@@ -1435,14 +1436,14 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
break;
case NS_ooxml::LN_CT_SdtBlock_sdtEndContent:
m_pImpl-SetSdt(false);
-if (!m_pImpl-m_aDropDownItems.empty())
-m_pImpl-createDropDownControl();
+if (!m_pImpl-m_pSdtHelper-getDropDownItems().empty())
+m_pImpl-m_pSdtHelper-createDropDownControl();
break;
case NS_ooxml::LN_CT_SdtListItem_displayText:
// TODO handle when this is != value
break;
case NS_ooxml::LN_CT_SdtListItem_value:
-m_pImpl-m_aDropDownItems.push_back(sStringValue);
+m_pImpl-m_pSdtHelper-getDropDownItems().push_back(sStringValue);
break;
default:
{
@@ -3311,6 +3312,26 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
[PUSHED] Revert Added Tango colors to palette
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3738 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3738 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id19d869ce8744cf55e64f4d003b8011f9df0023f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com Gerrit-Reviewer: Alexander Wilms alexander.wi...@zoho.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source solenv/gbuild
l10ntools/inc/export.hxx | 64 -
l10ntools/source/cfgmerge.cxx | 15 -
l10ntools/source/export.cxx| 496 ++---
l10ntools/source/helpmerge.cxx | 15 -
l10ntools/source/merge.cxx | 84 +-
l10ntools/source/xrmmerge.cxx | 14 -
solenv/gbuild/HelpTarget.mk|2
7 files changed, 267 insertions(+), 423 deletions(-)
New commits:
commit c7ef2522272579a12eecddded0cbed6d222d3742
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Thu May 2 12:09:35 2013 +0200
Make localization a bit more effective
1. get rid of some unefficiency
The old executables used to parse items which has
other language than en-US. To this items executables
search MergeEntrys(read from po) and change the content if
possible. This mixed localization method not need any longer.
-cfgex: cfgmerge:WorkOnText()
-xrmex: xrmmerge:WorkOnText()
-transex3: export:PrepareTextToMerge()
2. Change the container of MergeData to get a bit efficiency.
The new MergeDataHashMap is exploit that in most case the
insertion and search happen in the same order.(similar to fifo)
So add an iterator-chain to define an insertion order in the
original hashmap.
Every call of find it is a hint that the next element, to
the last found one, is the searched one. If not than search
such like in a HasMap.
3. Set up some order in helpex
Helpex is the only one, which was not used to merge strings
in the same order as export, so change it to work effective
with the new HashMap.
Helpex works with all file of a specific directory and po
files contain the strings of these files in lexical order
so use the same order for merge.(HelpTarget.mk)
4. Make export use MergeDataHashMap a bit more effective
-The same MergeData contains strings to all language,
so it need to get only once.
-Just text entrys have MergeData, others not need to
search for it. (e.g. bitmap)
Plus delete some unused code.
Change-Id: I6ec80cd2323ffea8f783d0b59dc89ca7eac3c205
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 7a6f911..a7f8ea1 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -52,9 +52,6 @@ typedef boost::unordered_mapOString, OString, OStringHash
typedef boost::unordered_mapOString, bool, OStringHash
OStringBoolHashMap;
-typedef boost::unordered_mapOString, MergeData*, OStringHash
-MergeDataHashMap;
-
#define SOURCE_LANGUAGE en-US
#define X_COMMENT x-comment
#define LIST_REFID LIST_REFID
@@ -193,7 +190,6 @@ private:
bool bSkipFile;
sal_Bool bMergeMode;
OString sMergeSrc;
-OString sLastListLine;
sal_Bool bError;// any errors while export?
sal_Bool bReadOver;
sal_Bool bDontWriteOutput;
@@ -219,8 +215,12 @@ private:
void CleanValue( OString rValue );
OString GetText(const OString rSource, int nToken);
-sal_Bool PrepareTextToMerge(OString rText, sal_uInt16 nTyp,
-OString rLangIndex, ResData *pResData);
+/**
+ Get all MergeEntrys for the ExportList identified by pResData
+ Check whether list can merge and load all needed MergeEntry from
DataBase.
+*/
+bool GetAllMergeEntrysOfList(ResData *pResData, std::vectorMergeEntrys*
o_vMergeEntrys, ExportList* o_pList);
+
void ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OString
rTextType );
void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
void ConvertMergeContent( OString rText );
@@ -277,10 +277,56 @@ public:
bTitleFirst[ rId ] = true;
}
sal_Bool GetText( OString rReturn, sal_uInt16 nTyp, const OString
nLangIndex, sal_Bool bDel = sal_False );
+
+/**
+ Generate QTZ string with ResData
+ For executable which works one language and without PO files.
+*/
static OString GetQTZText(const ResData rResData, const OString
rOrigText);
};
+/** Container for MergeData
+
+ This class is an HashMap with a hidden insertion
+ order. The class can used just like a simple
+ HashMap, but good to know that it's use is
+ more effective if the accessing(find) order
+ match with the insertion order.
+
+ In the most case, this match is good.
+ (e.g. reading PO files of different languages,
+ executables merging)
+*/
+class MergeDataHashMap
+{
+private:
+typedef boost::unordered_mapOString, MergeData*, OStringHash
HashMap_t;
+
+public:
+MergeDataHashMap():bFirstSearch(true){};
+~MergeDataHashMap(){};
+
+typedef HashMap_t::iterator iterator;
+typedef HashMap_t::const_iterator const_iterator;
+
+std::pairiterator,bool insert(const OString rKey, MergeData*
pMergeData);
+iterator find(const OString rKey);
+
+iterator begin() {return m_aHashMap.begin();}
+iterator end() {return m_aHashMap.end();}
+
+
Re: [Libreoffice-commits] core.git: drawinglayer/source svx/source
On Tue, 2013-04-30 at 12:17 +0200, Thorsten Behrens wrote: diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 77487db..495c06f 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -42,9 +42,10 @@ namespace drawinglayer static Primitive3DSequence aLineTubeList; static sal_uInt32 nLineTubeSegments(0L); static attribute::MaterialAttribute3D aLineMaterial; +static ::osl::Mutex aMutex; // may exclusively change static data, use mutex -::osl::Mutex m_mutex; +::osl::MutexGuard aGuard(aMutex); Thanks a lot for that cleanup! There are two more instances of that kind in this file though, and beyond that - anyone eager to replace this with proper rtl::Static (with the benefit of much faster subsequent access to the statics)? Usage is rather nicely documented in include/rtl/instance.hxx - for this case, StaticWithInit seems ideal. Seeing as the statics in there aren't read-only init-once type of things, but rather modifyable things the lock taken when they get potentially modified needs to remain. I wrapped up those related statics into classes and made safe singletons of those, and locked their get_modified_cache_thingies as http://cgit.freedesktop.org/libreoffice/core/commit/?id=92e5232dcbda1696a0e7c05defb3b6a00f4abdd7 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ae/e07d48ed6a24ffd4b4dac73236fb3a3ec5e800
ae/e07d48ed6a24ffd4b4dac73236fb3a3ec5e800 |1 + 1 file changed, 1 insertion(+) New commits: commit 5ab2a6082907393e270e47f9cb461d361c89c133 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 11:20:07 2013 +0100 Notes added by 'git notes add' diff --git a/ae/e07d48ed6a24ffd4b4dac73236fb3a3ec5e800 b/ae/e07d48ed6a24ffd4b4dac73236fb3a3ec5e800 new file mode 100644 index 000..3c5c403 --- /dev/null +++ b/ae/e07d48ed6a24ffd4b4dac73236fb3a3ec5e800 @@ -0,0 +1 @@ +merged as: 3af051aa4a554c33e146a2329d8d504cf8908022 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/shapes.cxx | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 73740b2f75558eef73bf102c7209a90aaf3e7c2e
Author: Michael Meeks michael.me...@suse.com
Date: Thu May 2 11:22:41 2013 +0100
fdo#60549 - pptx export presentation as well as draw shape objects.
Change-Id: Ibe6e0b9fa55bab7a7d02e55560c1db4c8ed84132
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index f26a527..dab14ce 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -822,11 +822,18 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference
XShape xShape, const
if( NonEmptyText( xShape ) )
{
-WriteTextShape( xShape );
+// avoid treating all 'IsPresentationObject' objects as having text.
+Reference XSimpleText xText( xShape, UNO_QUERY );
-//DBG(dump_pset(mXPropSet));
+if( xText.is() xText-getString().getLength() )
+{
+DBG(printf(graphicObject: wrote only text\n));
-return;
+WriteTextShape( xShape );
+
+//DBG(dump_pset(mXPropSet));
+return;
+}
}
DBG(printf(graphicObject without text\n));
@@ -1124,6 +1131,12 @@ static const NameToConvertMapType lcl_GetConverters()
shape_converters[ com.sun.star.drawing.OLE2Shape ]=
ShapeExport::WriteOLE2Shape;
shape_converters[ com.sun.star.drawing.TableShape ] =
ShapeExport::WriteTableShape;
shape_converters[ com.sun.star.drawing.TextShape ]=
ShapeExport::WriteTextShape;
+
+shape_converters[ com.sun.star.presentation.GraphicObjectShape ] =
ShapeExport::WriteGraphicObjectShape;
+shape_converters[ com.sun.star.presentation.OLE2Shape ] =
ShapeExport::WriteOLE2Shape;
+shape_converters[ com.sun.star.presentation.TableShape ] =
ShapeExport::WriteTableShape;
+shape_converters[ com.sun.star.presentation.TextShape ] =
ShapeExport::WriteTextShape;
+
shape_converters[ com.sun.star.presentation.DateTimeShape ] =
ShapeExport::WriteTextShape;
shape_converters[ com.sun.star.presentation.FooterShape ] =
ShapeExport::WriteTextShape;
shape_converters[ com.sun.star.presentation.HeaderShape ] =
ShapeExport::WriteTextShape;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: hints asked for fdo#59727
Hi Eike, Only if the .xlsx was saved with Calc 4.0, then the file contains com.sun.star.sheet.addin.DateFunctions.getDiffMonths, an original file containing MONTHS() also does not work though, the MONTHS is not recognized hence displayed as lowercase months. Seems to be a specific problem with Add-In functions. There are more problems with the add-in functions, see attachments with bug 59727. But, since this does not seem to happen for all Add-In functions I suspect something else to be the culprit, maybe in the mappings/flags of the Excel import/export function name maps. Given the large number of misbehaviour with add-in functions, I seek some more advice before I start digging in the code. I have summarised the misbehaviours I noticed in comment 8 of the bug If you get stuck with it I'd take over. I'm not stuck (yet), but don't know where to begin... Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/core/sdpage.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 843e5560389011cbec2b51d0bb3bd8b8554b1fa9
Author: Tor Lillqvist t...@iki.fi
Date: Thu May 2 13:24:29 2013 +0300
Let's avoid adding new pointless comments
Surely *any* line of code that frees memory could have a comment [avoid]
memory leak, lol. Such comments are pointless.
Change-Id: I4394db9423fa1470bbe7912519b6fd99ca91101c
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 8261bf8..48d5662 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -785,7 +785,7 @@ void SdPage::CreateTitleAndLayout(sal_Bool bInit, sal_Bool
bCreate )
}
else
{
-SdrObject::Free( pObj ); // memory leak i120050
+SdrObject::Free( pObj );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 60549, which changed state. Bug 60549 Summary: Pictures not saved to .pptx https://bugs.freedesktop.org/show_bug.cgi?id=60549 What|Removed |Added Status|NEW |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: basctl/source
basctl/source/basicide/baside3.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 96004917df7f93203c04ad879702c3fe03161c16
Author: Armin Le Grand a...@apache.org
Date: Thu Aug 16 08:59:54 2012 +
Related: #i120515# fixed memory leak
(cherry picked from commit b24737fc55e797d03002d44a1fa325a101617c55)
Change-Id: Ib59957fb2c9e198012898293aaa2e5afbe561ef4
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index debf652..2643400 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -225,7 +225,10 @@ void DialogWindow::Command( const CommandEvent rCEvt )
IMPL_LINK( DialogWindow, NotifyUndoActionHdl, SfxUndoAction *, pUndoAction )
{
-(void)pUndoAction;
+// #i120515# pUndoAction needs to be deleted, this hand over is an
ownership
+// change. As long as it does not get added to the undo manager, it needs
at
+// least to be deleted.
+delete pUndoAction;
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b2/4737fc55e797d03002d44a1fa325a101617c55
b2/4737fc55e797d03002d44a1fa325a101617c55 |1 + 1 file changed, 1 insertion(+) New commits: commit 909d246bd0691873a885d6d804eac2191714c692 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 11:27:36 2013 +0100 Notes added by 'git notes add' diff --git a/b2/4737fc55e797d03002d44a1fa325a101617c55 b/b2/4737fc55e797d03002d44a1fa325a101617c55 new file mode 100644 index 000..c4c65da --- /dev/null +++ b/b2/4737fc55e797d03002d44a1fa325a101617c55 @@ -0,0 +1 @@ +merged as: 96004917df7f93203c04ad879702c3fe03161c16 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/source
sw/AllLangResTarget_sw.mk |1
sw/source/ui/inc/table.hrc |1
sw/source/ui/table/chartins.cxx |1
sw/source/ui/table/chartins.hrc | 41 -
sw/source/ui/table/chartins.src | 120
5 files changed, 164 deletions(-)
New commits:
commit db426786a7690943143659adbf38a3768e2c17fe
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 2 11:05:09 2013 +0100
unused old insert chart dialog
Change-Id: Ibce96479b440dd3406cb7a46896b89834a14460f
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 7c0b1b0..f0ec55f 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -136,7 +136,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/ribbar/workctrl.src \
sw/source/ui/shells/shells.src \
sw/source/ui/smartmenu/stmenu.src \
-sw/source/ui/table/chartins.src \
sw/source/ui/table/table.src \
sw/source/ui/table/tabledlg.src \
sw/source/ui/uiview/view.src \
diff --git a/sw/source/ui/inc/table.hrc b/sw/source/ui/inc/table.hrc
index b3a..6f7635b 100644
--- a/sw/source/ui/inc/table.hrc
+++ b/sw/source/ui/inc/table.hrc
@@ -26,7 +26,6 @@
-#define DLG_INSERT_CHART(RC_TABLE_BEGIN + 12)
#define MSG_WRONG_TABLENAME (RC_TABLE_BEGIN + 13)
#define TABLE_ACT_END MSG_WRONG_TABLENAME
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index d19b1ff..de5399b 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -41,7 +41,6 @@
#include edtwin.hxx
#include cmdid.h
-#include chartins.hrc
#include anchoredobject.hxx
#include comphelper/classids.hxx
diff --git a/sw/source/ui/table/chartins.hrc b/sw/source/ui/table/chartins.hrc
deleted file mode 100644
index 2aa1e04..000
--- a/sw/source/ui/table/chartins.hrc
+++ /dev/null
@@ -1,41 +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 _CHARTINS_HRC
-#define _CHARTINS_HRC
-
-#include rcid.hrc
-#include table.hrc
-
-#define ED_RANGE1
-#define FT_RANGE2
-#define BT_NEXT 3
-#define BT_FINISH 4
-#define BT_HELP 5
-#define BT_CANCEL 6
-#define CB_FIRST_ROW7
-#define CB_FIRST_COL8
-#define BT_PREV 9
-#define FL_HLINE10
-#define FT_TEXT 11
-#define FL_112
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/chartins.src b/sw/source/ui/table/chartins.src
deleted file mode 100644
index ffc77cd..000
--- a/sw/source/ui/table/chartins.src
+++ /dev/null
@@ -1,120 +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 .
- */
-/* StarView resource file */
-#include chartins.hrc
-#include helpid.h
-ModelessDialog DLG_INSERT_CHART
-{
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 297 , 169 ) ;
-Moveable = TRUE ;
-HelpID = HID_INSERT_CHART ;
-Hide = TRUE ;
-Text [ en-US ] = AutoFormat Chart (1-4) ;
-FixedLine FL_1
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 285 , 8 ) ;
-Text [ en-US ] = Selection ;
-};
-FixedText FT_RANGE
-{
-
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 40421, which changed state. Bug 40421 Summary: PRINTING shapes with transparent(?) Bitmap background loses bezier curves https://bugs.freedesktop.org/show_bug.cgi?id=40421 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- 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: embeddedobj/source
embeddedobj/source/msole/olecomponent.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 334086d0bdd0ff8a8fc07632c97f02917db6047f
Author: Jian Fang Zhang zhan...@apache.org
Date: Mon Sep 3 05:40:25 2012 +
Resolves: #i113605# missing :ReleaseStgMedium() call on STGMEDIUM object
which causes obvious memory leaks
Found by: zhangjf
Patch by: zhangjf
(cherry picked from commit e0d9b7a23ca3e7ba181134cd89f3f18233031ef1)
Change-Id: I5f99f8cf02e155e5284df3df89feb49d9a30c2c1
diff --git a/embeddedobj/source/msole/olecomponent.cxx
b/embeddedobj/source/msole/olecomponent.cxx
index cb5967d..74b801b 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1197,6 +1197,9 @@ awt::Size OleComponent::GetExtent( sal_Int64 nAspect )
OSL_FAIL( Unexpected size is provided! );
}
}
+// i113605, to release storage medium
+if ( SUCCEEDED( hr ) )
+::ReleaseStgMedium(aMedium);
}
}
@@ -1568,6 +1571,7 @@ uno::Any SAL_CALL OleComponent::getTransferData( const
datatransfer::DataFlavor
if ( SUCCEEDED( hr ) )
{
bSupportedFlavor = m_pNativeImpl-ConvertDataForFlavor(
aMedium, aFlavor, aResult );
+::ReleaseStgMedium(aMedium); // i113605, to release
storage medium
if ( bSupportedFlavor )
{
// TODO/LATER: bring the optimization back when other
aspects are supported
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e0/d9b7a23ca3e7ba181134cd89f3f18233031ef1
e0/d9b7a23ca3e7ba181134cd89f3f18233031ef1 |1 + 1 file changed, 1 insertion(+) New commits: commit 811499692e9d497e442722e54fde1d95267ca5a3 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 11:34:12 2013 +0100 Notes added by 'git notes add' diff --git a/e0/d9b7a23ca3e7ba181134cd89f3f18233031ef1 b/e0/d9b7a23ca3e7ba181134cd89f3f18233031ef1 new file mode 100644 index 000..1b047b9 --- /dev/null +++ b/e0/d9b7a23ca3e7ba181134cd89f3f18233031ef1 @@ -0,0 +1 @@ +merged as: 334086d0bdd0ff8a8fc07632c97f02917db6047f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 40421, which changed state. Bug 40421 Summary: PRINTING shapes with transparent(?) Bitmap background loses bezier curves https://bugs.freedesktop.org/show_bug.cgi?id=40421 What|Removed |Added Status|RESOLVED|REOPENED Resolution|DUPLICATE |--- -- 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: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 32a247e35efe1e04cb222d1b85e2213ee969d116 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 11:05:59 2013 +0100 Updated core Project: help 6f2db000656709d2dd442188b85498efb4ee64b1 diff --git a/helpcontent2 b/helpcontent2 index c64ceaa..6f2db00 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c64ceaae688be1f6cedcd942d0e3ab35e2060a2c +Subproject commit 6f2db000656709d2dd442188b85498efb4ee64b1 ___ 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
helpers/help_hid.lst |6 -- 1 file changed, 6 deletions(-) New commits: commit 6f2db000656709d2dd442188b85498efb4ee64b1 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 11:05:59 2013 +0100 drop unused DLG_INSERT_CHART helpids Change-Id: I3c7d8e7fed2dc5465f5b588863549462d6958fd0 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 8f44d26..c7b9eac 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -8136,8 +8136,6 @@ sw_CheckBox_DLG_GLOSSARY_CB_FILE_REL,1428636740, sw_CheckBox_DLG_GLOSSARY_CB_INSERT_TIP,1428636677, sw_CheckBox_DLG_GLOSSARY_CB_NET_REL,1428636741, sw_CheckBox_DLG_GLOSSARY_CB_SHOW_EXAMPLE,1428636745, -sw_CheckBox_DLG_INSERT_CHART_CB_FIRST_COL,2499118088, -sw_CheckBox_DLG_INSERT_CHART_CB_FIRST_ROW,2499118087, sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_HTML,1446609941, sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942, sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940, @@ -8269,7 +8267,6 @@ sw_ComboBox_TP_TOX_ENTRY_CB_FILLCHAR,879153198, sw_Edit_DLG_BIB_BASE_ED_NAME,1428719626, sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700, sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698, -sw_Edit_DLG_INSERT_CHART_ED_RANGE,2499119105, sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977, sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969, sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960, @@ -8622,9 +8619,6 @@ sw_PushButton_DLG_FLD_DROPDOWN_PB_EDIT,1419645447, sw_PushButton_DLG_FLD_DROPDOWN_PB_NEXT,1419645445, sw_PushButton_DLG_GLOSSARY_PB_BIB,1428640310, sw_PushButton_DLG_GLOSSARY_PB_PATH,1428640312, -sw_PushButton_DLG_INSERT_CHART_BT_FINISH,2499121668, -sw_PushButton_DLG_INSERT_CHART_BT_NEXT,2499121667, -sw_PushButton_DLG_INSERT_CHART_BT_PREV,2499121673, sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_CLOSE,1972294214, sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210, sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/output.hxx |6
sc/source/ui/view/output2.cxx | 381 --
2 files changed, 154 insertions(+), 233 deletions(-)
New commits:
commit ca8b63523885c89c694799622c319260346b00f6
Author: Minh Ngo nlmin...@gmail.com
Date: Thu May 2 11:52:13 2013 +0100
fdo#39593 - share copy/paste code, and add a few consts.
Change-Id: I471e2f8ecc8c386007d55de49a1a3fa8138fea53
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index dc36f23..7e9af7f 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -241,6 +241,12 @@ private:
ScFieldEditEngine* CreateOutputEditEngine();
+void ShowClipMarks( DrawEditParam rParam, long nEngineHeight, const Size
aCellSize,
+bool bMerged, OutputAreaParam aAreaParam );
+
+bool Clip( DrawEditParam rParam, const Size aCellSize, OutputAreaParam
aAreaParam,
+ long nEngineHeight, bool bWrapFields);
+
public:
ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
ScTableInfo rTabInfo, ScDocument* pNewDoc,
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 76d3a5e..c0b5b52 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -3079,13 +3079,125 @@ void ScOutputData::DrawEditStandard(DrawEditParam
rParam)
rParam.adjustForHyperlinkInPDF(aURLStart, mpDev);
}
+void ScOutputData::ShowClipMarks( DrawEditParam rParam, long nEngineHeight,
const Size aCellSize,
+ bool bMerged, OutputAreaParam aAreaParam)
+{
+// Show clip marks if height is at least 5pt too small and
+// there are several lines of text.
+// Not for asian vertical text, because that would interfere
+// with the default right position of the text.
+// Only with automatic line breaks, to avoid having to find
+// the cells with the horizontal end of the text again.
+if ( nEngineHeight - aCellSize.Height() 100
+rParam.mbBreak bMarkClipped
+( rParam.mpEngine-GetParagraphCount() 1 ||
rParam.mpEngine-GetLineCount(0) 1 ) )
+{
+CellInfo* pClipMarkCell = NULL;
+if ( bMerged )
+{
+// anywhere in the merged area...
+SCCOL nClipX = ( rParam.mnX nX1 ) ? nX1 : rParam.mnX;
+pClipMarkCell = pRowInfo[(rParam.mnArrY != 0) ? rParam.mnArrY :
1].pCellInfo[nClipX+1];
+}
+else
+pClipMarkCell = rParam.mpThisRowInfo-pCellInfo[rParam.mnX+1];
+
+pClipMarkCell-nClipMark |= SC_CLIPMARK_RIGHT; //! also allow
left?
+bAnyClipped = true;
+
+const long nMarkPixel = static_castlong( SC_CLIPMARK_SIZE * mnPPTX );
+if ( aAreaParam.maClipRect.Right() - nMarkPixel
aAreaParam.maClipRect.Left() )
+aAreaParam.maClipRect.Right() -= nMarkPixel;
+}
+}
+
+bool ScOutputData::Clip( DrawEditParam rParam, const Size aCellSize,
+ OutputAreaParam aAreaParam, long nEngineHeight,
+ bool bWrapFields)
+{
+if ( aAreaParam.maClipRect.Left() nScrX )
+{
+aAreaParam.maClipRect.Left() = nScrX;
+aAreaParam.mbLeftClip = true;
+}
+if ( aAreaParam.maClipRect.Right() nScrX + nScrW )
+{
+aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one?
+aAreaParam.mbRightClip = true;
+}
+
+bool bClip = aAreaParam.mbLeftClip || aAreaParam.mbRightClip;
+bool bSimClip = false;
+
+if ( bWrapFields )
+{
+// Fields in a cell with automatic breaks: clip to cell width
+bClip = true;
+}
+
+if ( aAreaParam.maClipRect.Top() nScrY )
+{
+aAreaParam.maClipRect.Top() = nScrY;
+bClip = true;
+}
+if ( aAreaParam.maClipRect.Bottom() nScrY + nScrH )
+{
+aAreaParam.maClipRect.Bottom() = nScrY + nScrH; //! minus one?
+bClip = true;
+}
+
+const Size aRefOne = mpRefDevice-PixelToLogic(Size(1,1));
+if ( nEngineHeight = aCellSize.Height() + aRefOne.Height() )
+{
+const ScMergeAttr* pMerge =
+(ScMergeAttr*)rParam.mpPattern-GetItem(ATTR_MERGE);
+const bool bMerged = pMerge-GetColMerge() 1 ||
pMerge-GetRowMerge() 1;
+
+// Don't clip for text height when printing rows with optimal height,
+// except when font size is from conditional formatting.
+//! Allow clipping when vertically merged?
+if ( eType != OUTTYPE_PRINTER ||
+( mpDoc-GetRowFlags( rParam.mnCellY, nTab ) CR_MANUALSIZE ) ||
+( rParam.mpCondSet SFX_ITEM_SET ==
+rParam.mpCondSet-GetItemState(ATTR_FONT_HEIGHT, true) ) )
+bClip = true;
+else
+bSimClip = true;
+
+ShowClipMarks( rParam, nEngineHeight, aCellSize, bMerged, aAreaParam);
+}
+
+Rectangle aLogicClip;
+
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/NumberingManager.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4314e6548356a5d2f1dc45e2aa501e37bd5a794e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu May 2 12:57:40 2013 +0200
Fix out-of-bonds Sequence access in NumberingManager with page numbering
Change-Id: Ib35fcee1605215fb22ae9838b29fe1d8be5eaf58
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 9308d82..3c6019d 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -527,7 +527,8 @@ uno::Sequence uno::Sequence beans::PropertyValue
ListDef::GetPropertyValue
// Merge the results of [2] in [1]
sal_Int32 nThisCount = aThis.getLength( );
-for ( sal_Int32 i = 0; i nThisCount; i++ )
+sal_Int32 nAbstractCount = aAbstract.getLength( );
+for ( sal_Int32 i = 0; i nThisCount i nAbstractCount; i++ )
{
uno::Sequence beans::PropertyValue level = aThis[i];
if ( level.hasElements() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] Fix out-of-bonds Sequence access in NumberingManager with pa...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3739
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/3739/1
Fix out-of-bonds Sequence access in NumberingManager with page numbering
Change-Id: Ib35fcee1605215fb22ae9838b29fe1d8be5eaf58
(cherry picked from commit 4314e6548356a5d2f1dc45e2aa501e37bd5a794e)
---
M writerfilter/source/dmapper/NumberingManager.cxx
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 470cb0c..0cd9138 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -492,7 +492,8 @@
// Merge the results of [2] in [1]
sal_Int32 nThisCount = aThis.getLength( );
-for ( sal_Int32 i = 0; i nThisCount; i++ )
+sal_Int32 nAbstractCount = aAbstract.getLength( );
+for ( sal_Int32 i = 0; i nThisCount i nAbstractCount; i++ )
{
uno::Sequence beans::PropertyValue level = aThis[i];
if ( level.hasElements() )
--
To view, visit https://gerrit.libreoffice.org/3739
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib35fcee1605215fb22ae9838b29fe1d8be5eaf58
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objstor.cxx |3 +
sfx2/source/doc/sfxbasemodel.cxx | 72 ++-
2 files changed, 45 insertions(+), 30 deletions(-)
New commits:
commit cdfad2dbbf180d3c556964c7aa8e0bb3b299d5e3
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Jun 26 13:48:58 2012 +
Resolves: #i119366# ensure password can be removed via Save As...
Found by: DonJaime donjaime at freenet dot de
Patch by: zhengfan zheng.easyfan at gmail dot com
Review by: Oliver orw at apache dot org
(cherry picked from commit 9957730bb807c6d81f243e14a19cbb6a91035194)
Conflicts:
sfx2/source/doc/sfxbasemodel.cxx
Change-Id: I93bfdd7f32671171f1b219f9fd2dbeac30a92254
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b92a10a..c57c79a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2749,6 +2749,9 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
// in SaveAs title and password will be cleared ( maybe the new itemset
contains new values, otherwise they will be empty )
pMergedParams-ClearItem( SID_ENCRYPTIONDATA );
pMergedParams-ClearItem( SID_PASSWORD );
+// #i119366# - As the SID_ENCRYPTIONDATA and SID_PASSWORD are using for
setting password together, we need to clear them both.
+// Also, ( maybe the new itemset contains new values, otherwise they will
be empty )
+pMergedParams-ClearItem( SID_ENCRYPTIONDATA );
pMergedParams-ClearItem( SID_DOCINFO_TITLE );
pMergedParams-ClearItem( SID_INPUTSTREAM );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 90fe7e5..d5d5814 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2950,45 +2950,57 @@ void SfxBaseModel::impl_store( const OUString
sURL
const SfxFilter* pFilter = pMedium-GetFilter();
if ( pFilter aFilterName.equals( pFilter-GetFilterName() )
)
{
-aArgHash.erase( aFilterString );
-aArgHash.erase( OUString( URL ) );
-
-try
+// #i119366# - If the former file saving with password, do
not trying in StoreSelf anyway...
+bool bFormerPassword = false;
{
-storeSelf( aArgHash.getAsConstPropertyValueList() );
-bSaved = sal_True;
+uno::Sequence beans::NamedValue aOldEncryptionData;
+if (GetEncryptionData_Impl( pMedium-GetItemSet(),
aOldEncryptionData ))
+{
+bFormerPassword = true;
+}
}
-catch( const lang::IllegalArgumentException )
+if ( !bFormerPassword )
{
-#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
-// some additional arguments do not allow to use
saving, SaveAs should be done
-// but only for normal documents, the shared documents
would be overwritten in this case
-// that would mean an information loss
-// TODO/LATER: need a new interaction for this case
-if ( m_pData-m_pObjectShell-IsDocShared() )
-{
-m_pData-m_pObjectShell-AddLog( OUString(
OSL_LOG_PREFIX Can't store shared document! ) );
-m_pData-m_pObjectShell-StoreLog();
+aArgHash.erase( aFilterString );
+aArgHash.erase( OUString( URL ) );
-Sequence beans::NamedValue aNewEncryptionData =
aArgHash.getUnpackedValueOrDefault( OUString( EncryptionData ), Sequence
beans::NamedValue () );
-if ( !aNewEncryptionData.getLength() )
+try
+{
+storeSelf( aArgHash.getAsConstPropertyValueList()
);
+bSaved = sal_True;
+}
+catch( const lang::IllegalArgumentException )
+{
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
+// some additional arguments do not allow to use
saving, SaveAs should be done
+// but only for normal documents, the shared
documents would be overwritten in this case
+// that would mean an information loss
+// TODO/LATER: need a new interaction for this case
+if ( m_pData-m_pObjectShell-IsDocShared() )
{
-OUString aNewPassword =
aArgHash.getUnpackedValueOrDefault( OUString( Password ), OUString() );
-aNewEncryptionData =
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 99/57730bb807c6d81f243e14a19cbb6a91035194
99/57730bb807c6d81f243e14a19cbb6a91035194 |1 + 1 file changed, 1 insertion(+) New commits: commit 58a0dfd68adcd32996a0fdfce559def59b98a788 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 12:11:06 2013 +0100 Notes added by 'git notes add' diff --git a/99/57730bb807c6d81f243e14a19cbb6a91035194 b/99/57730bb807c6d81f243e14a19cbb6a91035194 new file mode 100644 index 000..8c2d6a0 --- /dev/null +++ b/99/57730bb807c6d81f243e14a19cbb6a91035194 @@ -0,0 +1 @@ +merged as: cdfad2dbbf180d3c556964c7aa8e0bb3b299d5e3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/manager/dp_extensionmanager.cxx |4 1 file changed, 4 insertions(+) New commits: commit af37523b69b9e445fdf860e98e896daabf386e41 Author: Andre Fischer a...@apache.org Date: Mon Jun 25 15:12:42 2012 + Resolves: #i119272# Trigger deletion of temporary files of extension manager (cherry picked from commit 84598594a6f36c2e3fc219d8cf1ec74b902e5e11) Change-Id: I5f581cb46e21c738ebf95eb30bcb517922e7f24b diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 55d9802..85f0566 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -1171,6 +1171,10 @@ uno::Sequence uno::SequenceReferencedeploy::XPackage getBundledRepository()-getDeployedPackages(xAbort, xCmdEnv); addExtensionsToMap(mapExt, bundledExt, bundled); +// Create the tmp repository to trigger its clean up (deletion +// of old temporary data.) +getTmpRepository(); + //copy the values of the map to a vector for sorting ::std::vector ::std::vectorReferencedeploy::XPackage vecExtensions; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 84/598594a6f36c2e3fc219d8cf1ec74b902e5e11
84/598594a6f36c2e3fc219d8cf1ec74b902e5e11 |1 + 1 file changed, 1 insertion(+) New commits: commit 04ca95a32e7ab45bc70dc8301c0da666e5353105 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 12:14:24 2013 +0100 Notes added by 'git notes add' diff --git a/84/598594a6f36c2e3fc219d8cf1ec74b902e5e11 b/84/598594a6f36c2e3fc219d8cf1ec74b902e5e11 new file mode 100644 index 000..a51e2e7 --- /dev/null +++ b/84/598594a6f36c2e3fc219d8cf1ec74b902e5e11 @@ -0,0 +1 @@ +merged as: af37523b69b9e445fdf860e98e896daabf386e41 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED] sfx2: kill tiny qstart_gtk library
Matúš Kukan has abandoned this change. Change subject: sfx2: kill tiny qstart_gtk library .. Patch Set 1: Abandoned All right, so I understand that the difference is that if gtk is not there, osl::Module.loadRelative on qstart_gtk will not fail but just continue and we can handle that. abandoning.. -- To view, visit https://gerrit.libreoffice.org/3735 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I18d47082065371e4d6c670bc636bc7e352d36786 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Rene Engelhard r...@debian.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Killing the gerrit to dev-list spam ...
The dev-ML is to discuss code. code come as patch, and preferably as gerrit patch... so seing the patch that are proposed via gerrit is the core function of the ML, just like before gerrit they where posted to the ML . and yes I agree with Bjoern that the 'pos-facto' email are the less interesting part... but the 'heads-up' part _is_ the interesting part for the dev-ML... If we remove all the [PATCH] from the ML, what is left ? a dev-discuss list ? Norbert PS: if you really do not care about [PATCH] it is really not that hard to set-up filter on your client side ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63154: Remove _CL and _LF from solar.h
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3740
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/3740/1
fdo#63154: Remove _CL and _LF from solar.h
And use RTL_CHAR_{CR,LF} from rtl/string.h
Change-Id: I05b0325006845e48eb5483485a9042aa7b0cd22a
---
M include/rtl/string.h
M include/tools/solar.h
M sc/source/core/tool/formularesult.cxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/ui/docshell/docsh.cxx
M sc/source/ui/docshell/impex.cxx
M svl/source/items/slstitm.cxx
M svtools/source/svhtml/parhtml.cxx
M sw/source/filter/html/htmlform.cxx
M sw/source/filter/html/swhtml.cxx
M sw/source/ui/misc/redlndlg.cxx
M tools/source/generic/config.cxx
M tools/source/stream/stream.cxx
M vcl/source/app/dbggui.cxx
M vcl/source/control/edit.cxx
M vcl/source/gdi/outdev3.cxx
M vcl/source/gdi/pdfwriter_impl.cxx
M vcl/source/window/status.cxx
18 files changed, 65 insertions(+), 66 deletions(-)
diff --git a/include/rtl/string.h b/include/rtl/string.h
index 93cffa1..e9825d4 100644
--- a/include/rtl/string.h
+++ b/include/rtl/string.h
@@ -31,6 +31,9 @@
extern C {
#endif
+#define RTL_CHAR_CR ('\x0D')
+#define RTL_CHAR_LF ('\x0A')
+
/* === */
/** Return the length of a string.
diff --git a/include/tools/solar.h b/include/tools/solar.h
index 7ef683f..0645a61 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -107,9 +107,6 @@
#endif
#endif
-#define _LF ((char)0x0A)
-#define _CR ((char)0x0D)
-
// pragmas
#if defined _MSC_VER
diff --git a/sc/source/core/tool/formularesult.cxx
b/sc/source/core/tool/formularesult.cxx
index c044ec1..01d00c7 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -261,7 +261,7 @@
if (meMultiline == MULTILINE_UNKNOWN)
{
const String rStr = GetString();
-if (rStr.Len() rStr.Search( _LF ) != STRING_NOTFOUND)
+if (rStr.Len() rStr.Search( RTL_CHAR_LF ) != STRING_NOTFOUND)
const_castScFormulaResult*(this)-meMultiline = MULTILINE_TRUE;
else
const_castScFormulaResult*(this)-meMultiline = MULTILINE_FALSE;
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 1517c81..9b988be 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1159,7 +1159,7 @@
else
{
String aStr = aStrOut;
-xub_StrLen nPos = aStr.Search( _LF );
+xub_StrLen nPos = aStr.Search( RTL_CHAR_LF );
if ( nPos == STRING_NOTFOUND )
{
OUT_STR( aStrOut );
@@ -1174,7 +1174,7 @@
TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak );
nStartPos = nPos + 1;
}
-while( ( nPos = aStr.Search( _LF, nStartPos ) ) !=
STRING_NOTFOUND );
+while( ( nPos = aStr.Search( RTL_CHAR_LF, nStartPos ) ) !=
STRING_NOTFOUND );
String aSingleLine( aStr, nStartPos, aStr.Len() - nStartPos );
OUT_STR( aSingleLine );
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index c99ca76..5e20522 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1759,7 +1759,7 @@
sal_Int32 nPos = rStr.indexOf(rTextSep);
rNeedQuotes = rAsciiOpt.bQuoteAllText || (nPos = 0) ||
(rStr.indexOf(rFieldSep) = 0) ||
-(rStr.indexOf(sal_Unicode(_LF)) = 0);
+(rStr.indexOf(sal_Unicode(RTL_CHAR_LF)) = 0);
return nPos;
}
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index b6c4869..8dc1b90 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -528,13 +528,13 @@
switch ( rStrm.GetLineDelimiter() )
{
case LINEEND_CR :
-rStrm sal_Unicode(_CR);
+rStrm sal_Unicode(RTL_CHAR_CR);
break;
case LINEEND_LF :
-rStrm sal_Unicode(_LF);
+rStrm sal_Unicode(RTL_CHAR_LF);
break;
default:
-rStrm sal_Unicode(_CR) sal_Unicode(_LF);
+rStrm sal_Unicode(RTL_CHAR_CR) sal_Unicode(RTL_CHAR_LF);
}
}
else
@@ -727,7 +727,7 @@
else
rString.SearchAndReplaceAll( OUString(DOUBLE_DOUBLEQUOTE),
OUString('') );
-rString.SearchAndReplaceAll( OUString(SYLK_LF), OUString(_LF) );
+rString.SearchAndReplaceAll( OUString(SYLK_LF), OUString(RTL_CHAR_LF) );
}
static const sal_Unicode* lcl_ScanSylkString( const sal_Unicode* p,
@@ -1196,7 +1196,7 @@
}
// Standard or date not determined - SetString / EditCell
-if( rStr.Search( _LF ) == STRING_NOTFOUND )
+if( rStr.Search( RTL_CHAR_LF ) == STRING_NOTFOUND )
{
ScSetStringParam aParam;
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.cxx | 56 +++-
1 file changed, 39 insertions(+), 17 deletions(-)
New commits:
commit f38604fa73702ff94f715208d9375b5aa4685c30
Author: Armin Le Grand a...@apache.org
Date: Mon Jun 25 10:47:20 2012 +
Resolves: #i119516# allow 0x1 0x1 as well as 0x8 0x1 detection for canvases
Be prepared to allow not only 0x8 0x1 detection for canvases, but also 0x1
0x1.
Patch by: Lei Debin
Detected by: louqle
Review by: alg(cherry picked from commit
0711fae8c3f99c53bc1cb091eb218f10f3d8b15f)
Conflicts:
sw/source/filter/ww8/ww8par.cxx
Change-Id: Ib1d8d892470261639fa46ae9955079759c0aebaa
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9a42e20..a987c10 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3186,27 +3186,49 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
graphic preview of an associated ole2 object (or a simple
graphic of course)
*/
-if (!IsInlineEscherHack())
+//normally in the canvas field, the code is 0x8 0x1.
+//in a special case, the code is 0x1 0x1, which yields a simple
picture
{
-SwFrmFmt *pResult = 0;
-if (bObj)
-pResult = ImportOle();
-else if (bSpec)
-pResult = ImportGraf();
-
-// If we have a bad 0x1 insert a space instead.
-if (!pResult)
+bool bReadObj = IsInlineEscherHack();
+if( bReadObj )
{
-cInsert = ' ';
-OSL_ENSURE(!bObj !bEmbeddObj !nObjLocFc,
-WW8: Please report this document, it may have a
-missing graphic);
+long nCurPos = pStrm-Tell();
+sal_uInt16 nWordCode(0);
+
+if( bIsUnicode )
+*pStrm nWordCode;
+else
+{
+sal_uInt8 nByteCode(0);
+*pStrm nByteCode;
+nWordCode = nByteCode;
+}
+if( nWordCode == 0x1 )
+bReadObj = false;
+pStrm-Seek( nCurPos );
}
-else
+if( !bReadObj )
{
-// reset the flags.
-bObj = bEmbeddObj = false;
-nObjLocFc = 0;
+SwFrmFmt *pResult = 0;
+if (bObj)
+pResult = ImportOle();
+else if (bSpec)
+pResult = ImportGraf();
+
+//#102160# If we have a bad 0x1 insert a space instead.
+if (!pResult)
+{
+cInsert = ' ';
+OSL_ENSURE(!bObj !bEmbeddObj !nObjLocFc,
+WW8: Please report this document, it may have a
+missing graphic);
+}
+else
+{
+// reset the flags.
+bObj = bEmbeddObj = false;
+nObjLocFc = 0;
+}
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 07/11fae8c3f99c53bc1cb091eb218f10f3d8b15f
07/11fae8c3f99c53bc1cb091eb218f10f3d8b15f |1 + 1 file changed, 1 insertion(+) New commits: commit 829aa838eba1bd1022e095250f8f8286941e531f Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 12:48:50 2013 +0100 Notes added by 'git notes add' diff --git a/07/11fae8c3f99c53bc1cb091eb218f10f3d8b15f b/07/11fae8c3f99c53bc1cb091eb218f10f3d8b15f new file mode 100644 index 000..6237c68 --- /dev/null +++ b/07/11fae8c3f99c53bc1cb091eb218f10f3d8b15f @@ -0,0 +1 @@ +merged as: f38604fa73702ff94f715208d9375b5aa4685c30 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source solenv/bin
connectivity/source/drivers/postgresql/pq_connection.cxx |1 connectivity/source/drivers/postgresql/pq_connection.hxx |1 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |1 connectivity/source/drivers/postgresql/pq_databasemetadata.hxx |1 solenv/bin/modules/t/installer-packagelist.t | 25 +- solenv/bin/modules/t/installer-profiles.t | 25 +- solenv/bin/modules/t/installer-scpzipfiles.t | 25 +- solenv/bin/modules/t/installer-setupscript.t | 25 +- solenv/bin/modules/t/packager-work.t | 25 +- 9 files changed, 20 insertions(+), 109 deletions(-) New commits: commit 3e52762c5a9b4d1976b968634c72b172927a51d8 Author: Michael Meeks michael.me...@suse.com Date: Thu May 2 12:42:08 2013 +0100 Move to MPLv2 license headers, with ESC decision and author's permission. Change-Id: I9f1102d4f0e189a048d8fccfe9cae246c0136311 diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 7eb4371..0b52ff7 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -31,7 +31,6 @@ *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/. - *Version: MPL 1.1 / GPLv3+ / LGPLv2.1+ * / diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index 8b8a5cd..588cfcb 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -31,7 +31,6 @@ *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/. - *Version: MPL 1.1 / GPLv3+ / LGPLv2.1+ * / diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index c2839be..2442bba 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -31,7 +31,6 @@ *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/. - *Version: MPL 1.1 / GPLv3+ / LGPLv2.1+ * * Some portions were adapted from JDBC PostgreSQL driver: * diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx index 23026bc..3652a23 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx @@ -31,7 +31,6 @@ *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/. - *Version: MPL 1.1 / GPLv3+ / LGPLv2.1+ * / diff --git a/solenv/bin/modules/t/installer-packagelist.t b/solenv/bin/modules/t/installer-packagelist.t index b4ef6ce..c51683b 100644 --- a/solenv/bin/modules/t/installer-packagelist.t +++ b/solenv/bin/modules/t/installer-packagelist.t @@ -1,27 +1,10 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ # -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ +# This file is part of the LibreOffice project. # -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. +# 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/. # -# Major Contributor(s): -# [ Copyright (C) 2012 Tim Retout t...@retout.co.uk (initial developer) ] -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/axes/VCartesianAxis.cxx | 27 +++
1 file changed, 19 insertions(+), 8 deletions(-)
New commits:
commit 1bb53530e811d7f5df4878db079538b4707410b6
Author: Muthu Subramanian sumu...@suse.com
Date: Thu May 2 17:06:48 2013 +0530
n#816939: Improved label overlap detection - Part 2
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 62097105..c231110 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -138,6 +138,19 @@ bool lcl_doesShapeOverlapWithTickmark( const Reference
drawing::XShape xShap
return aShapeRect.isInside(aPosition);
}
+void lcl_getRotatedPolygon( B2DPolygon aPoly, const ::basegfx::B2DRectangle
aRect, const awt::Point aPos, const double fRotationAngleDegree )
+{
+::basegfx::B2DHomMatrix aMatrix;
+
+aPoly = basegfx::tools::createPolygonFromRect( aRect );
+aMatrix.translate( -aRect.getWidth()/2, -aRect.getHeight()/2);
+aMatrix.rotate( fRotationAngleDegree*M_PI/180.0 );
+aPoly.transform( aMatrix );
+aMatrix = ::basegfx::B2DHomMatrix();
+aMatrix.translate( aRect.getWidth()/2+aPos.X, aRect.getHeight()/2+aPos.Y);
+aPoly.transform( aMatrix );
+}
+
bool doesOverlap( const Reference drawing::XShape xShape1
, const Reference drawing::XShape xShape2
, double fRotationAngleDegree )
@@ -145,15 +158,13 @@ bool doesOverlap( const Reference drawing::XShape
xShape1
if( !xShape1.is() || !xShape2.is() )
return false;
-::basegfx::B2DRectangle aRect1( BaseGFXHelper::makeRectangle(
xShape1-getPosition(), ShapeFactory::getSizeAfterRotation( xShape1, 0 ) ));
-::basegfx::B2DRectangle aRect2( BaseGFXHelper::makeRectangle(
xShape2-getPosition(), ShapeFactory::getSizeAfterRotation( xShape2, 0 ) ));
+::basegfx::B2DRectangle aRect1( BaseGFXHelper::makeRectangle(
awt::Point(0,0), xShape1-getSize()));
+::basegfx::B2DRectangle aRect2( BaseGFXHelper::makeRectangle(
awt::Point(0,0), xShape2-getSize()));
-B2DPolygon aPoly1 = basegfx::tools::createPolygonFromRect( aRect1 );
-B2DPolygon aPoly2 = basegfx::tools::createPolygonFromRect( aRect2 );
-::basegfx::B2DHomMatrix aMatrix;
-aMatrix.rotate( fRotationAngleDegree );
-aPoly1.transform( aMatrix );
-aPoly2.transform( aMatrix );
+B2DPolygon aPoly1;
+B2DPolygon aPoly2;
+lcl_getRotatedPolygon( aPoly1, aRect1, xShape1-getPosition(),
fRotationAngleDegree );
+lcl_getRotatedPolygon( aPoly2, aRect2, xShape2-getPosition(),
fRotationAngleDegree );
B2DPolyPolygon aPolyPoly1, aPolyPoly2;
aPolyPoly1.append( aPoly1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: drawinglayer/source svx/source
Caolan McNamara wrote: Seeing as the statics in there aren't read-only init-once type of things, but rather modifyable things the lock taken when they get potentially modified needs to remain. Ah - looked no further than static sal_uInt32 nSegments - sorry. Thanks for the fixup! -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Eike Rathke er...@redhat.com changed: What|Removed |Added Depends on||63779 -- 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: sw/source
sw/source/core/unocore/unoframe.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit 9a37613b5e8f08fae585d54a5745e887eb08f8ce
Author: Jian Hong Cheng chen...@apache.org
Date: Tue Jun 26 00:29:13 2012 +
Resolves: #i119922 Graphic in header and footer can not be displayed
correctly
* sw/source/core/unocore/unoframe.cxx
odf compatibility
Patch by: Jane Kang,kangjane2...@gmail.com
Found by: Yan Ji,yanji...@gmail.com
Review by: Jian Hong Cheng,chen...@apache.org
(cherry picked from commit f8ecf85d889ba70b48c2b49ebd650afc0a5ab776)
Conflicts:
sw/source/core/unocore/unoframe.cxx
Change-Id: Iffbe79efd43119e78f6983e27b99ba278118555d
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index d3d5ed5..2f255e1 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -99,6 +99,8 @@
#include osl/mutex.hxx
#include vcl/svapp.hxx
#include sfx2/printer.hxx
+#include sfx2/docfile.hxx
+#include sfx2/docfilt.hxx
#include SwStyleNameMapper.hxx
#include editeng/xmlcnitm.hxx
#include poolfmt.hxx
@@ -557,6 +559,20 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SwDoc*
pDoc, SfxItemSet rToSe
aFmtFollowTextFlow.PutValue(*pFollowTextFlow, 0);
rToSet.Put(aFmtFollowTextFlow);
}
+else
+{
+// #i119922# Set default value for Follow text flow to false if a
+// previous version didn't support Follow text flow
+SfxMedium* pMedium = NULL;
+const SfxFilter * pFilter = NULL;
+if ( ( pMedium = pDoc-GetDocShell()-GetMedium() )
+( pFilter = pMedium-GetFilter() ) )
+{
+bool bOasis = pFilter-GetVersion() SOFFICE_FILEFORMAT_60;
+if (bOasis)
+rToSet.Put( SwFmtFollowTextFlow() );
+}
+}
// #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
const ::uno::Any* pWrapInfluenceOnObjPos = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f8/ecf85d889ba70b48c2b49ebd650afc0a5ab776
f8/ecf85d889ba70b48c2b49ebd650afc0a5ab776 |1 + 1 file changed, 1 insertion(+) New commits: commit 80ef30162ebca15d794a87c61075f606ff0ea4c7 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 13:12:47 2013 +0100 Notes added by 'git notes add' diff --git a/f8/ecf85d889ba70b48c2b49ebd650afc0a5ab776 b/f8/ecf85d889ba70b48c2b49ebd650afc0a5ab776 new file mode 100644 index 000..22f5282 --- /dev/null +++ b/f8/ecf85d889ba70b48c2b49ebd650afc0a5ab776 @@ -0,0 +1 @@ +merged as: 9a37613b5e8f08fae585d54a5745e887eb08f8ce ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/source
oox/source/export/shapes.cxx | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit d47ca56c8019d7112dbbc99853f9e081d04b93ff
Author: Michael Meeks michael.me...@suse.com
Date: Thu May 2 11:22:41 2013 +0100
fdo#60549 - pptx export presentation as well as draw shape objects.
Change-Id: Ibe6e0b9fa55bab7a7d02e55560c1db4c8ed84132
Signed-off-by: Muthu Subramanian sumu...@suse.com
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 87b8e55..af43620 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -826,11 +826,18 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference
XShape xShape, Graph
if( NonEmptyText( xShape ) )
{
-WriteTextShape( xShape );
+// avoid treating all 'IsPresentationObject' objects as having text.
+Reference XSimpleText xText( xShape, UNO_QUERY );
-//DBG(dump_pset(mXPropSet));
+if( xText.is() xText-getString().getLength() )
+{
+DBG(printf(graphicObject: wrote only text\n));
-return;
+WriteTextShape( xShape );
+
+//DBG(dump_pset(mXPropSet));
+return;
+}
}
DBG(printf(graphicObject without text\n));
@@ -1126,6 +1133,12 @@ static const NameToConvertMapType lcl_GetConverters()
shape_converters[ com.sun.star.drawing.OLE2Shape ]=
ShapeExport::WriteOLE2Shape;
shape_converters[ com.sun.star.drawing.TableShape ] =
ShapeExport::WriteTableShape;
shape_converters[ com.sun.star.drawing.TextShape ]=
ShapeExport::WriteTextShape;
+
+shape_converters[ com.sun.star.presentation.GraphicObjectShape ] =
ShapeExport::WriteGraphicObjectShape;
+shape_converters[ com.sun.star.presentation.OLE2Shape ] =
ShapeExport::WriteOLE2Shape;
+shape_converters[ com.sun.star.presentation.TableShape ] =
ShapeExport::WriteTableShape;
+shape_converters[ com.sun.star.presentation.TextShape ] =
ShapeExport::WriteTextShape;
+
shape_converters[ com.sun.star.presentation.DateTimeShape ] =
ShapeExport::WriteTextShape;
shape_converters[ com.sun.star.presentation.FooterShape ] =
ShapeExport::WriteTextShape;
shape_converters[ com.sun.star.presentation.HeaderShape ] =
ShapeExport::WriteTextShape;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlimport/data/n779630.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 27 +++
2 files changed, 27 insertions(+)
New commits:
commit 9e6570f16ebf76a6bd6725baea9ee46e8b885950
Author: Miklos Vajna vmik...@suse.cz
Date: Thu May 2 14:14:16 2013 +0200
bnc#779630 testcase
Change-Id: Ia888670ad7a5b51c9b6a3d05676b192456311704
diff --git a/sw/qa/extras/ooxmlimport/data/n779630.docx
b/sw/qa/extras/ooxmlimport/data/n779630.docx
new file mode 100755
index 000..97812d6
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n779630.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ccde3ff..8c64063 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -10,6 +10,7 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/document/XEmbeddedObjectSupplier2.hpp
#include com/sun/star/drawing/XDrawPageSupplier.hpp
+#include com/sun/star/drawing/XControlShape.hpp
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/style/XStyleFamiliesSupplier.hpp
#include com/sun/star/text/HoriOrientation.hpp
@@ -109,6 +110,7 @@ public:
void testFdo63685();
void testN592908_Frame();
void testN592908_Picture();
+void testN779630();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -188,6 +190,7 @@ void Test::run()
{fdo63685.docx, Test::testFdo63685},
{n592908-frame.docx, Test::testN592908_Frame},
{n592908-picture.docx, Test::testN592908_Picture},
+{n779630.docx, Test::testN779630},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1342,6 +1345,30 @@ void Test::testN592908_Picture()
CPPUNIT_ASSERT_EQUAL(eValue, text::WrapTextMode_PARALLEL);
}
+void Test::testN779630()
+{
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+
+// First shape: date picker
+uno::Referencedrawing::XControlShape
xControlShape(xDraws-getByIndex(0), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet
xPropertySet(xControlShape-getControl(), uno::UNO_QUERY);
+uno::Referencelang::XServiceInfo xServiceInfo(xPropertySet,
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(true,
bool(xServiceInfo-supportsService(com.sun.star.form.component.DateField)));
+CPPUNIT_ASSERT_EQUAL(OUString(date default text),
getPropertyOUString(xPropertySet, HelpText));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(8), getPropertysal_Int16(xPropertySet,
DateFormat));
+CPPUNIT_ASSERT_EQUAL(true, bool(getPropertysal_Bool(xPropertySet,
Dropdown)));
+
+// Second shape: combo box
+xControlShape.set(xDraws-getByIndex(1), uno::UNO_QUERY);
+xPropertySet.set(xControlShape-getControl(), uno::UNO_QUERY);
+xServiceInfo.set(xPropertySet, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(true,
bool(xServiceInfo-supportsService(com.sun.star.form.component.ComboBox)));
+CPPUNIT_ASSERT_EQUAL(OUString(dropdown default text),
getPropertyOUString(xPropertySet, DefaultText));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty uno::SequenceOUString
(xPropertySet, StringItemList).getLength());
+CPPUNIT_ASSERT_EQUAL(true, bool(getPropertysal_Bool(xPropertySet,
Dropdown)));
+}
+
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: svtools/source
svtools/source/table/tablecontrol_impl.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 951cdf4c406292d79766c4dbf1d19e8464134eec
Author: Jürgen Schmidt j...@apache.org
Date: Mon Jun 25 13:13:11 2012 +
Resolves: #i117461# set row count to 0 and add further check
Patch By: Tsutomu Uchino
Review By: jsc
(cherry picked from commit d56225de586f878acd2f953bcf3208fe9a3c79a3)
Change-Id: I91ea7add253a5c40272ee112d207fcf510cd3935
diff --git a/svtools/source/table/tablecontrol_impl.cxx
b/svtools/source/table/tablecontrol_impl.cxx
index 5b059ae..cf89b13 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -597,9 +597,17 @@ namespace svt { namespace table
if ( m_nRowCount 0 )
goTo( m_nCurColumn, m_nRowCount - 1 );
else
+{
m_nCurRow = ROW_INVALID;
+m_nTopRow = 0;
+}
+}
+else if ( m_nRowCount == 0 )
+{
+m_nTopRow = 0;
}
+
// relayout, since the scrollbar need might have changed
impl_ni_relayout();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d5/6225de586f878acd2f953bcf3208fe9a3c79a3
d5/6225de586f878acd2f953bcf3208fe9a3c79a3 |1 + 1 file changed, 1 insertion(+) New commits: commit d252d22ee54564fe89b861dc81f3fdd3b77d90ff Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 13:20:30 2013 +0100 Notes added by 'git notes add' diff --git a/d5/6225de586f878acd2f953bcf3208fe9a3c79a3 b/d5/6225de586f878acd2f953bcf3208fe9a3c79a3 new file mode 100644 index 000..5fa3642 --- /dev/null +++ b/d5/6225de586f878acd2f953bcf3208fe9a3c79a3 @@ -0,0 +1 @@ +merged as: 951cdf4c406292d79766c4dbf1d19e8464134eec ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f04463012e630f439dd0004120c6717b90c52a54 Author: Andre Fischer a...@apache.org Date: Fri Jun 29 06:18:01 2012 + Fixed typo (missing $) in configure.ac (cherry picked from commit e755623a1d2cb24fc8c339eb0c0888c42d6c0ba7) Conflicts: configure.in Change-Id: I2a7a9ab83ac29c0306366303374e93ab08cd10ce diff --git a/configure.ac b/configure.ac index 0f19e1b..25fc5cd 100644 --- a/configure.ac +++ b/configure.ac @@ -6900,7 +6900,7 @@ if test $enable_epm = yes; then AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.]) fi fi -if echo PKGFORMAT | $EGREP osx 21 /dev/null; then +if echo $PKGFORMAT | $EGREP osx 21 /dev/null; then if test $_os = Darwin; then AC_MSG_CHECKING([for PackageMaker availability]) if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e7/55623a1d2cb24fc8c339eb0c0888c42d6c0ba7
e7/55623a1d2cb24fc8c339eb0c0888c42d6c0ba7 |1 + 1 file changed, 1 insertion(+) New commits: commit 1d6d7e872b7c8e5b8f8b4378f09dddbcc0bd7b78 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 13:23:24 2013 +0100 Notes added by 'git notes add' diff --git a/e7/55623a1d2cb24fc8c339eb0c0888c42d6c0ba7 b/e7/55623a1d2cb24fc8c339eb0c0888c42d6c0ba7 new file mode 100644 index 000..a651303 --- /dev/null +++ b/e7/55623a1d2cb24fc8c339eb0c0888c42d6c0ba7 @@ -0,0 +1 @@ +merged as: f04463012e630f439dd0004120c6717b90c52a54 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/poolfmt.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit eea39218ca7c22e40b997b5efd0d9ea08e01090b
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Apr 30 16:22:48 2013 +0200
make parent style for 'frame contents' be 'standard' rather than 'text'
The actual reason for this change is a .docx document, which has a textframe
and a modified 'text' style. The textframe in MSO has 'normal' style
(which is like our 'standard') and so the style is not written to the docx.
LO however uses 'frame contents' for the textframe, and since it was
based on 'text', it used the modified style, unlike in MSO.
But even on its own, this change seems to make sense. It's similar
to 4014d40c96b9d70796a154f0ac48cf5b685cf187, and I see no particular
reason why contents of textframes should be the same style like the main
text of the document, while footnotes, footers, headers, tables, etc.
are different.
Change-Id: Ibe7bfd6a2820cff5cf29c669fd60b575c63500b0
Reviewed-on: https://gerrit.libreoffice.org/3697
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 245efdb..e15e044 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -2388,12 +2388,10 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
case COLL_EXTRA_BITS:
switch( nId )
{
-case RES_POOLCOLL_FRAME:
-nRet = RES_POOLCOLL_TEXT; break;
-
case RES_POOLCOLL_TABLE_HDLN:
nRet = RES_POOLCOLL_TABLE; break;
+case RES_POOLCOLL_FRAME:
case RES_POOLCOLL_TABLE:
case RES_POOLCOLL_FOOTNOTE:
case RES_POOLCOLL_ENDNOTE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7d528592ac756f5495b2fb300f4302cce89ca017 Author: Tor Lillqvist t...@iki.fi Date: Thu May 2 15:23:44 2013 +0300 android: Keep the images_tango.zip name as is Not sure why I used to store it as images.zip. Probably just a mistake. The code uses the images_tango.name.zip when trying to open it. Sure, no toolbar with images is displayed currently anyway, so having this file in the .apk is pointless, but there has been talk of reverting the disabling of toolbars, sigh. Change-Id: I12dfd3abe8f329d660b518f6b37904aa00423bc2 diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 4993776..4d4fe6d 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -114,7 +114,7 @@ copy-stuff: # Pieces not from DocumentLoader # tango artwork / icons mkdir -p assets/share/config - cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config/images.zip + cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config # shell / splash images mkdir -p assets/program cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6e/c8398d5e76070a5a48e7e40d0bdbb800b1bf8d
6e/c8398d5e76070a5a48e7e40d0bdbb800b1bf8d |1 + 1 file changed, 1 insertion(+) New commits: commit dace08239f531e7e3f2da52ea2f27c400cb32f1f Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 13:29:02 2013 +0100 Notes added by 'git notes add' diff --git a/6e/c8398d5e76070a5a48e7e40d0bdbb800b1bf8d b/6e/c8398d5e76070a5a48e7e40d0bdbb800b1bf8d new file mode 100644 index 000..7fcfc7d --- /dev/null +++ b/6e/c8398d5e76070a5a48e7e40d0bdbb800b1bf8d @@ -0,0 +1 @@ +prefer: dbf832c5a5a33112f94766c7a872b228d5ac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] make parent style for 'frame contents' be 'standard' rather ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3697 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3697 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe7bfd6a2820cff5cf29c669fd60b575c63500b0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source
writerfilter/source/dmapper/NumberingManager.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f98dcf9b07ee5ce6e2a241679086b1326072a28d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu May 2 12:57:40 2013 +0200
Fix out-of-bonds Sequence access in NumberingManager with page numbering
Change-Id: Ib35fcee1605215fb22ae9838b29fe1d8be5eaf58
(cherry picked from commit 4314e6548356a5d2f1dc45e2aa501e37bd5a794e)
Reviewed-on: https://gerrit.libreoffice.org/3739
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 470cb0c..0cd9138 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -492,7 +492,8 @@ uno::Sequence uno::Sequence beans::PropertyValue
ListDef::GetPropertyValue
// Merge the results of [2] in [1]
sal_Int32 nThisCount = aThis.getLength( );
-for ( sal_Int32 i = 0; i nThisCount; i++ )
+sal_Int32 nAbstractCount = aAbstract.getLength( );
+for ( sal_Int32 i = 0; i nThisCount i nAbstractCount; i++ )
{
uno::Sequence beans::PropertyValue level = aThis[i];
if ( level.hasElements() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] Fix out-of-bonds Sequence access in NumberingManager with pa...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3739 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3739 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib35fcee1605215fb22ae9838b29fe1d8be5eaf58 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: jvmfwk/distributions jvmfwk/plugins
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |4 ++-- jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |4 ++-- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) New commits: commit 55d2d982d0722e2ede96811d2a38ad3d70fc9d62 Author: Ariel Constenla-Haile arie...@apache.org Date: Sun Jun 10 22:31:42 2012 + Resolves: #i66923# Add support for JRockit JVM (cherry picked from commit cb38ee0da6fa928118fbc1da118a707d7799cb40) Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Change-Id: Iffd413ba1d74ae3b7da58df7b092c43c4f64a7c9 diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 97c2550..2ff9946 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -20,14 +20,14 @@ javaSelection xmlns=http://openoffice.org/2004/java/framework/1.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - updated2012-07-12/updated + updated2013-05-02/updated vendorInfos vendor name=Sun Microsystems Inc. minVersion1.5.0/minVersion /vendor vendor name=Oracle Corporation -minVersion1.7.0/minVersion +minVersion1.6.0/minVersion /vendor vendor name=IBM Corporation minVersion1.5.0/minVersion diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 3ad59c3..e48037f 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -20,14 +20,14 @@ javaSelection xmlns=http://openoffice.org/2004/java/framework/1.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - updated2012-07-12/updated + updated2013-05-02/updated vendorInfos vendor name=Sun Microsystems Inc. minVersion1.5.0/minVersion /vendor vendor name=Oracle Corporation -minVersion1.7.0/minVersion +minVersion1.6.0/minVersion /vendor vendor name=IBM Corporation minVersion1.5.0/minVersion diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index f82a286..180bbb9 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -57,6 +57,7 @@ char const* const* SunInfo::getRuntimePaths(int * size) /bin/client/jvm.dll, /bin/hotspot/jvm.dll, /bin/classic/jvm.dll, +/bin/jrockit/jvm.dll, // The 64-bit JRE has the jvm in bin/server /bin/server/jvm.dll #elif defined MACOSX defined X86_64 @@ -65,7 +66,8 @@ char const* const* SunInfo::getRuntimePaths(int * size) #elif defined UNX /lib/ JFW_PLUGIN_ARCH /client/libjvm.so, /lib/ JFW_PLUGIN_ARCH /server/libjvm.so, -/lib/ JFW_PLUGIN_ARCH /classic/libjvm.so +/lib/ JFW_PLUGIN_ARCH /classic/libjvm.so, +/lib/ JFW_PLUGIN_ARCH /jrockit/libjvm.so #endif }; *size = SAL_N_ELEMENTS(ar); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cb/38ee0da6fa928118fbc1da118a707d7799cb40
cb/38ee0da6fa928118fbc1da118a707d7799cb40 |1 + 1 file changed, 1 insertion(+) New commits: commit fdc470f9754de53e03b1defaabfb0c1080ad1c45 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 13:38:32 2013 +0100 Notes added by 'git notes add' diff --git a/cb/38ee0da6fa928118fbc1da118a707d7799cb40 b/cb/38ee0da6fa928118fbc1da118a707d7799cb40 new file mode 100644 index 000..cf7d505 --- /dev/null +++ b/cb/38ee0da6fa928118fbc1da118a707d7799cb40 @@ -0,0 +1 @@ +merged as: 55d2d982d0722e2ede96811d2a38ad3d70fc9d62 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a01e4aa97b086b898499b84760ac271b0cc4a479
Author: Andre Fischer a...@apache.org
Date: Tue Jun 12 10:44:51 2012 +
Resolves: #i119554# Fixed export of viewpoint property.
Patch by: Lei Debin
Reviewed by: Andre
(cherry picked from commit 9667c78f99156ff4dd49002da270bc610bf75920)
Change-Id: I993ee9497e5da5d0af499fcab1d203766a18a4a9
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 57a761c..d75f020 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1856,8 +1856,8 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream rIn, SfxIt
// ViewPoint in 1/100mm
if ( IsProperty( DFF_Prop_c3DXViewpoint ) || IsProperty(
DFF_Prop_c3DYViewpoint ) || IsProperty( DFF_Prop_c3DZViewpoint ) )
{
-double fViewX = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DXViewpoint, 1249920 )) / 360.0;
-double fViewY = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DYViewpoint, (sal_uInt32)-1249920 ))/ 360.0;
+double fViewX = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DXViewpoint, 125 )) / 360.0;
+double fViewY = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DYViewpoint, (sal_uInt32)-125 ))/ 360.0;
double fViewZ = (double)((sal_Int32)GetPropertyValue(
DFF_Prop_c3DZViewpoint, 900 )) / 360.0;
::com::sun::star::drawing::Position3D aExtrusionViewPoint( fViewX,
fViewY, fViewZ );
const OUString sExtrusionViewPoint( ViewPoint );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 96/67c78f99156ff4dd49002da270bc610bf75920
96/67c78f99156ff4dd49002da270bc610bf75920 |1 + 1 file changed, 1 insertion(+) New commits: commit 62b16854e0aebaa12bd9439ae2b2033ea73eec9d Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 13:49:19 2013 +0100 Notes added by 'git notes add' diff --git a/96/67c78f99156ff4dd49002da270bc610bf75920 b/96/67c78f99156ff4dd49002da270bc610bf75920 new file mode 100644 index 000..7c0c719 --- /dev/null +++ b/96/67c78f99156ff4dd49002da270bc610bf75920 @@ -0,0 +1 @@ +merged as: a01e4aa97b086b898499b84760ac271b0cc4a479 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |4 1 file changed, 4 insertions(+) New commits: commit 51ba7dbee1a9b9424fcb1ac47ce9eaabf0561c62 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu May 2 12:19:35 2013 +0200 do not fail when using disabled liblangtag external; just do nothing Change-Id: I3e9027ac1d4a19b953bd3404c82f069334f5f4ff diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 819e171..a1d01cf 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -839,6 +839,10 @@ endef endif # SYSTEM_LIBLANGTAG +else + +gb_LinkTarget__use_liblangtag := + endif # ENABLE_LIBLANGTAG ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
regarding include path
-- HIMANSHU CHOUDHARY B.Tech, IV year Electronics and Communication Engineering MNIT Jaipur +91-7737499762 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerperfect/source writerperfect/StaticLibrary_writerperfect.mk
writerperfect/StaticLibrary_writerperfect.mk| 26 writerperfect/source/common/DocumentElement.cxx | 55 writerperfect/source/common/DocumentElement.hxx | 86 writerperfect/source/common/DocumentHandler.cxx | 64 writerperfect/source/common/DocumentHandler.hxx | 48 writerperfect/source/common/FilterInternal.cxx | 29 writerperfect/source/common/FilterInternal.hxx | 63 writerperfect/source/common/FontStyle.cxx | 74 writerperfect/source/common/FontStyle.hxx | 65 writerperfect/source/common/InternalHandler.cxx | 44 writerperfect/source/common/InternalHandler.hxx | 38 writerperfect/source/common/ListStyle.cxx | 178 + writerperfect/source/common/ListStyle.hxx | 69 writerperfect/source/common/OdfDocumentHandler.hxx | 28 writerperfect/source/common/OdgGenerator.cxx| 1756 writerperfect/source/common/OdgGenerator.hxx| 56 writerperfect/source/common/OdtGenerator.cxx| 1482 + writerperfect/source/common/OdtGenerator.hxx| 105 writerperfect/source/common/PageSpan.cxx| 247 ++ writerperfect/source/common/PageSpan.hxx| 48 writerperfect/source/common/SectionStyle.cxx| 75 writerperfect/source/common/SectionStyle.hxx| 35 writerperfect/source/common/Style.hxx | 77 writerperfect/source/common/TableStyle.cxx | 156 + writerperfect/source/common/TableStyle.hxx | 78 writerperfect/source/common/TextRunStyle.cxx| 279 ++ writerperfect/source/common/TextRunStyle.hxx| 116 + writerperfect/source/common/WPXSvStream.cxx | 303 ++ writerperfect/source/common/WPXSvStream.hxx | 42 writerperfect/source/draw/CDRImportFilter.cxx |6 writerperfect/source/draw/CMXImportFilter.cxx |6 writerperfect/source/draw/MSPUBImportFilter.cxx |6 writerperfect/source/draw/VisioImportFilter.cxx |6 writerperfect/source/draw/WPGImportFilter.cxx |6 writerperfect/source/filter/DocumentElement.cxx | 55 writerperfect/source/filter/DocumentElement.hxx | 86 writerperfect/source/filter/DocumentHandler.cxx | 82 writerperfect/source/filter/DocumentHandler.hxx | 48 writerperfect/source/filter/FilterInternal.cxx | 29 writerperfect/source/filter/FilterInternal.hxx | 63 writerperfect/source/filter/FontStyle.cxx | 74 writerperfect/source/filter/FontStyle.hxx | 65 writerperfect/source/filter/InternalHandler.cxx | 44 writerperfect/source/filter/InternalHandler.hxx | 38 writerperfect/source/filter/ListStyle.cxx | 178 - writerperfect/source/filter/ListStyle.hxx | 69 writerperfect/source/filter/OdfDocumentHandler.hxx | 28 writerperfect/source/filter/OdgGenerator.cxx| 1756 writerperfect/source/filter/OdgGenerator.hxx| 56 writerperfect/source/filter/OdtGenerator.cxx| 1482 - writerperfect/source/filter/OdtGenerator.hxx| 105 writerperfect/source/filter/PageSpan.cxx| 247 -- writerperfect/source/filter/PageSpan.hxx| 48 writerperfect/source/filter/SectionStyle.cxx| 75 writerperfect/source/filter/SectionStyle.hxx| 35 writerperfect/source/filter/Style.hxx | 77 writerperfect/source/filter/TableStyle.cxx | 156 - writerperfect/source/filter/TableStyle.hxx | 78 writerperfect/source/filter/TextRunStyle.cxx| 279 -- writerperfect/source/filter/TextRunStyle.hxx| 116 - writerperfect/source/stream/WPXSvStream.cxx | 303 -- writerperfect/source/stream/WPXSvStream.h | 42 writerperfect/source/writer/MSWorksImportFilter.cxx |8 writerperfect/source/writer/MWAWImportFilter.cxx|8 writerperfect/source/writer/WordPerfectImportFilter.cxx | 10 65 files changed, 5737 insertions(+), 5755 deletions(-) New commits: commit e1ffd555b5c70e4bdc693711917ebffbb2423579 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu May 2 15:04:05 2013 +0200 simplify writerperfect structure and prepare for libodfgen Change-Id: Ib2e56280a5a6bfdfee18a5b213dd67b9fbfc8949 diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk index a936e4e..e82fd0e 100644 --- a/writerperfect/StaticLibrary_writerperfect.mk +++ b/writerperfect/StaticLibrary_writerperfect.mk @@ -36,19 +36,19 @@ $(eval $(call gb_StaticLibrary_use_api,writerperfect,\ )) $(eval $(call
[Libreoffice-commits] core.git: drawinglayer/source include/drawinglayer svx/source
drawinglayer/source/attribute/fillhatchattribute.cxx | 17 +
drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx | 42 --
drawinglayer/source/primitive2d/metafileprimitive2d.cxx |1
drawinglayer/source/primitive2d/primitivetools2d.cxx |2
include/drawinglayer/attribute/fillhatchattribute.hxx | 14
include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx | 11 +++
include/drawinglayer/primitive2d/primitivetools2d.hxx |7 ++
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx |1
svx/source/sdr/overlay/overlaytools.cxx |1
svx/source/sdr/primitive2d/sdrattributecreator.cxx|1
10 files changed, 88 insertions(+), 9 deletions(-)
New commits:
commit 8f43c78e9a607df8c72232f03be4f9a7c80538de
Author: Armin Le Grand a...@apache.org
Date: Mon Jul 23 15:40:53 2012 +
Resolves: #i120230# Adapt hatch processing for a more pleasant visualisation
Adapt hatch processing to keep a view-dependent minimal distance for a more
pleasant visualisation
(cherry picked from commit 6a036e7ac17a1d4394d60471bd8931d9b16b7bb4)
Conflicts:
drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
drawinglayer/source/attribute/fillhatchattribute.cxx
Change-Id: I15cd784ef7d3e47a20308f16d370c24ef46d2f22
diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx
b/drawinglayer/source/attribute/fillhatchattribute.cxx
index e89628b..1d56bad 100644
--- a/drawinglayer/source/attribute/fillhatchattribute.cxx
+++ b/drawinglayer/source/attribute/fillhatchattribute.cxx
@@ -35,6 +35,7 @@ namespace drawinglayer
double mfDistance;
double mfAngle;
basegfx::BColor maColor;
+sal_uInt32 mnMinimalDiscreteDistance;
// bitfield
unsignedmbFillBackground : 1;
@@ -44,11 +45,13 @@ namespace drawinglayer
double fDistance,
double fAngle,
const basegfx::BColor rColor,
+sal_uInt32 nMinimalDiscreteDistance,
bool bFillBackground)
: meStyle(eStyle),
mfDistance(fDistance),
mfAngle(fAngle),
maColor(rColor),
+mnMinimalDiscreteDistance(nMinimalDiscreteDistance),
mbFillBackground(bFillBackground)
{
}
@@ -58,6 +61,7 @@ namespace drawinglayer
mfDistance(0.0),
mfAngle(0.0),
maColor(basegfx::BColor()),
+mnMinimalDiscreteDistance(3), // same as VCL
mbFillBackground(false)
{
}
@@ -67,6 +71,7 @@ namespace drawinglayer
double getDistance() const { return mfDistance; }
double getAngle() const { return mfAngle; }
const basegfx::BColor getColor() const { return maColor; }
+sal_uInt32 getMinimalDiscreteDistance() const { return
mnMinimalDiscreteDistance; }
bool isFillBackground() const { return mbFillBackground; }
bool operator==(const ImpFillHatchAttribute rCandidate) const
@@ -75,7 +80,8 @@ namespace drawinglayer
getDistance() == rCandidate.getDistance()
getAngle() == rCandidate.getAngle()
getColor() == rCandidate.getColor()
- isFillBackground() == rCandidate.isFillBackground());
+ getMinimalDiscreteDistance() ==
rCandidate.getMinimalDiscreteDistance()
+ isFillBackground() == rCandidate.isFillBackground());
}
};
@@ -90,9 +96,11 @@ namespace drawinglayer
double fDistance,
double fAngle,
const basegfx::BColor rColor,
+sal_uInt32 nMinimalDiscreteDistance,
bool bFillBackground)
: mpFillHatchAttribute(ImpFillHatchAttribute(
-eStyle, fDistance, fAngle, rColor, bFillBackground))
+eStyle, fDistance, fAngle, rColor,
+nMinimalDiscreteDistance, bFillBackground))
{
}
@@ -147,6 +155,11 @@ namespace drawinglayer
return mpFillHatchAttribute-getColor();
}
+sal_uInt32 FillHatchAttribute::getMinimalDiscreteDistance() const
+{
+return mpFillHatchAttribute-getMinimalDiscreteDistance();
+}
+
bool FillHatchAttribute::isFillBackground() const
{
return mpFillHatchAttribute-isFillBackground();
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6a/036e7ac17a1d4394d60471bd8931d9b16b7bb4
6a/036e7ac17a1d4394d60471bd8931d9b16b7bb4 |1 + 1 file changed, 1 insertion(+) New commits: commit 3fd9dd46659f4a48f13a78f323e4d19dbdafa533 Author: Caolán McNamara caol...@redhat.com Date: Thu May 2 14:16:52 2013 +0100 Notes added by 'git notes add' diff --git a/6a/036e7ac17a1d4394d60471bd8931d9b16b7bb4 b/6a/036e7ac17a1d4394d60471bd8931d9b16b7bb4 new file mode 100644 index 000..b3c5b6d --- /dev/null +++ b/6a/036e7ac17a1d4394d60471bd8931d9b16b7bb4 @@ -0,0 +1 @@ +merged as: 8f43c78e9a607df8c72232f03be4f9a7c80538de ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 58480, which changed state. Bug 58480 Summary: Temporarily unresponding when FILEOPEN .ods with cell with hundreds of linefeeds https://bugs.freedesktop.org/show_bug.cgi?id=58480 What|Removed |Added Status|NEW |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: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/animations/CustomAnimationDialog.cxx | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 7eb5815354a2ba9a02b66c61a1eb3c58c4c0e534
Author: Zhe Wang wangz...@apache.org
Date: Mon Jun 25 05:04:59 2012 +
for #120049#(cherry picked from commit
9b4e6064f9598c834a9c36c39932f3e326419d44)
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 64dc36c..d356078 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2325,15 +2325,20 @@ void CustomAnimationTextAnimTabPage::update(
STLPropertySet* pSet )
pSet-setPropertyValue( nHandleTextGroupingAuto, makeAny(
fTextGroupingAuto ) );
}
}
+//bug 120049
+//[crash] Aoo crash when modify the Random effects animation effect's
trigger condition to Start effect on click of .
+//If this control is disabled, we should ignore its value
+if (maCBXAnimateForm.IsEnabled())
+{
+sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
+sal_Bool bOldAnimateForm = !bAnimateForm;
-sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
-sal_Bool bOldAnimateForm = !bAnimateForm;
-
-if(mpSet-getPropertyState( nHandleAnimateForm ) !=
STLPropertyState_AMBIGUOUS)
-mpSet-getPropertyValue( nHandleAnimateForm ) = bOldAnimateForm;
+if(mpSet-getPropertyState( nHandleAnimateForm ) !=
STLPropertyState_AMBIGUOUS)
+mpSet-getPropertyValue( nHandleAnimateForm ) = bOldAnimateForm;
-if( bAnimateForm != bOldAnimateForm )
-pSet-setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
+if( bAnimateForm != bOldAnimateForm )
+pSet-setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm
) );
+}
}
void CustomAnimationTextAnimTabPage::updateControlStates()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/search/textsearch.cxx | 69 --
1 file changed, 57 insertions(+), 12 deletions(-)
New commits:
commit db46a7336e330516f4df4e41f6895aa1afb03450
Author: Eike Rathke er...@redhat.com
Date: Thu May 2 15:37:27 2013 +0200
resolved fdo#63779 case-insensitive non-regex search broken
Broken with 531538892795bec909bb8baff6bbf9e19baf809e
Change-Id: I0302baee0532ab8f10853c648bf695a58cfe273c
diff --git a/i18npool/source/search/textsearch.cxx
b/i18npool/source/search/textsearch.cxx
index 997b01d..7762832 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star;
-static sal_Int32 COMPLEX_TRANS_MASK_TMP =
+static const sal_Int32 COMPLEX_TRANS_MASK_TMP =
TransliterationModules_ignoreBaFa_ja_JP |
TransliterationModules_ignoreIterationMark_ja_JP |
TransliterationModules_ignoreTiJi_ja_JP |
@@ -59,10 +59,23 @@ static sal_Int32 COMPLEX_TRANS_MASK_TMP =
TransliterationModules_ignoreIandEfollowedByYa_ja_JP |
TransliterationModules_ignoreKiKuFollowedBySa_ja_JP |
TransliterationModules_ignoreProlongedSoundMark_ja_JP;
-static const sal_Int32 COMPLEX_TRANS_MASK = COMPLEX_TRANS_MASK_TMP |
TransliterationModules_IGNORE_KANA | TransliterationModules_FULLWIDTH_HALFWIDTH;
-static const sal_Int32 SIMPLE_TRANS_MASK = ~(COMPLEX_TRANS_MASK |
TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE
| TransliterationModules_LOWERCASE_UPPERCASE);
-// Above 2 transliteration is simple but need to take effect in
-// complex transliteration
+
+// These 2 transliterations are simple but need to take effect in
+// complex transliteration.
+static const sal_Int32 COMPLEX_TRANS_MASK =
+COMPLEX_TRANS_MASK_TMP |
+TransliterationModules_IGNORE_KANA |
+TransliterationModules_FULLWIDTH_HALFWIDTH;
+
+static const sal_Int32 SIMPLE_TRANS_MASK = ~COMPLEX_TRANS_MASK;
+
+// Regex patterns are case sensitive.
+static const sal_Int32 SIMPLE_TRANS_MASK_REPATTERN =
+~(COMPLEX_TRANS_MASK |
+TransliterationModules_IGNORE_CASE |
+TransliterationModules_UPPERCASE_LOWERCASE |
+TransliterationModules_LOWERCASE_UPPERCASE);
+
TextSearch::TextSearch(const Reference XComponentContext rxContext)
: m_xContext( rxContext )
@@ -123,14 +136,46 @@ void TextSearch::setOptions( const SearchOptions
rOptions ) throw( RuntimeExcep
sSrchStr = aSrchPara.searchString;
-// use transliteration here
-if ( xTranslit.is() aSrchPara.transliterateFlags SIMPLE_TRANS_MASK )
-sSrchStr = xTranslit-transliterateString2String(
-aSrchPara.searchString, 0, aSrchPara.searchString.getLength());
+// Transliterate search string.
+if (aSrchPara.algorithmType == SearchAlgorithms_REGEXP)
+{
+if (aSrchPara.transliterateFlags SIMPLE_TRANS_MASK_REPATTERN)
+{
+if ((aSrchPara.transliterateFlags SIMPLE_TRANS_MASK_REPATTERN) !=
+(aSrchPara.transliterateFlags SIMPLE_TRANS_MASK))
+{
+com::sun::star::uno::Reference XExtendedTransliteration
xTranslitPattern(
+ Transliteration::create( m_xContext ));
+if (xTranslitPattern.is())
+{
+xTranslitPattern-loadModule(
+(TransliterationModules)(
aSrchPara.transliterateFlags SIMPLE_TRANS_MASK_REPATTERN ),
+aSrchPara.Locale);
+sSrchStr = xTranslitPattern-transliterateString2String(
+aSrchPara.searchString, 0,
aSrchPara.searchString.getLength());
+}
+}
+else
+{
+if (xTranslit.is())
+sSrchStr = xTranslit-transliterateString2String(
+aSrchPara.searchString, 0,
aSrchPara.searchString.getLength());
+}
+// xTranslit2 complex transliterated sSrchStr2 is not used in
+// regex, see TextSearch::searchForward() and
+// TextSearch::searchBackward()
+}
+}
+else
+{
+if ( xTranslit.is() aSrchPara.transliterateFlags
SIMPLE_TRANS_MASK )
+sSrchStr = xTranslit-transliterateString2String(
+aSrchPara.searchString, 0,
aSrchPara.searchString.getLength());
-if ( xTranslit2.is() aSrchPara.transliterateFlags COMPLEX_TRANS_MASK )
-sSrchStr2 = xTranslit2-transliterateString2String(
-aSrchPara.searchString, 0, aSrchPara.searchString.getLength());
+if ( xTranslit2.is() aSrchPara.transliterateFlags
COMPLEX_TRANS_MASK )
+sSrchStr2 = xTranslit2-transliterateString2String(
+aSrchPara.searchString, 0,
aSrchPara.searchString.getLength());
[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source
l10ntools/inc/cfgmerge.hxx | 19 ++
l10ntools/inc/common.hxx |7 ++--
l10ntools/inc/export.hxx | 70
l10ntools/inc/helper.hxx |9 -
l10ntools/inc/lngmerge.hxx | 14 ++--
l10ntools/inc/po.hxx | 10 ++---
l10ntools/inc/propmerge.hxx| 10 +++--
l10ntools/inc/treemerge.hxx| 18 ++
l10ntools/inc/xmlparse.hxx | 25 ++
l10ntools/inc/xrmmerge.hxx | 17 -
l10ntools/source/cfgmerge.cxx | 30 ++---
l10ntools/source/export.cxx| 39 --
l10ntools/source/merge.cxx | 10 ++---
l10ntools/source/po.cxx| 69 ---
l10ntools/source/treemerge.cxx | 15 +++-
l10ntools/source/xrmmerge.cxx | 71 +
16 files changed, 151 insertions(+), 282 deletions(-)
New commits:
commit 29400c568a84339066ef238e836cfeb19f732873
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Thu May 2 15:06:23 2013 +0200
Some code scrubing
Add doxygen documentation for classes and methods
Delete useless comments.
Add include guards where missing.
Delete some useless typedef.
Change-Id: I9bba16560790239d7775fcd40981465e70e5d437
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 9710008..03addd1 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -64,12 +64,10 @@ public:
// class CfgStack
//
-typedef std::vector CfgStackData* CfgStackList;
-
class CfgStack
{
private:
-CfgStackList maList;
+std::vector CfgStackData* maList;
public:
CfgStack() {}
@@ -92,10 +90,7 @@ public:
size_t size() const { return maList.size(); }
};
-//
-// class CfgParser
-//
-
+/// Parser for *.xcu files
class CfgParser
{
protected:
@@ -136,10 +131,7 @@ public:
int Execute( int nToken, char * pToken );
};
-//
-// class CfgExport
-//
-
+/// Export strings from *.xcu files
class CfgExport : public CfgParser
{
private:
@@ -162,10 +154,7 @@ public:
~CfgExport();
};
-//
-// class CfgMerge
-//
-
+/// Merge strings to *.xcu files
class CfgMerge : public CfgParser
{
private:
diff --git a/l10ntools/inc/common.hxx b/l10ntools/inc/common.hxx
index 93f2d00..5a12bbb 100644
--- a/l10ntools/inc/common.hxx
+++ b/l10ntools/inc/common.hxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-/// Methods used by all of executables
+// Methods used by all of executables
#ifndef INCLUDED_L10NTOOLS_SOURCE_COMMON_HXX
#define INCLUDED_L10NTOOLS_SOURCE_COMMON_HXX
@@ -20,7 +20,7 @@
namespace common {
-//result type of handleArguments()
+/// Result type of handleArguments()
struct HandledArgs
{
OString m_sInputFile;
@@ -37,10 +37,13 @@ struct HandledArgs
{}
};
+/// Handle command line parameters
bool handleArguments(int argc, char * argv[], HandledArgs o_aHandledArgs);
+/// Write out a help about usage
void writeUsage(const OString rName, const OString rFileType);
+/// Write out a PoEntry with attention to excaptions
void writePoEntry(
const OString rExecutable, PoOfstream rPoStream, const OString
rSourceFile,
const OString rResType, const OString rGroupId, const OString rLocalId,
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index a7f8ea1..d23cc6f 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -30,9 +30,9 @@
#include osl/file.h
#include boost/unordered_map.hpp
-#include iterator /* std::iterator*/
-#include set /* std::set*/
-#include vector /* std::vector*/
+#include iterator
+#include set
+#include vector
#include queue
#include string
@@ -44,7 +44,6 @@
#define NO_TRANSLATE_ISOx-no-translate
class MergeEntrys;
-class MergeData;
typedef boost::unordered_mapOString, OString, OStringHash
OStringHashMap;
@@ -56,17 +55,18 @@ typedef boost::unordered_mapOString, bool, OStringHash
#define X_COMMENT x-comment
#define LIST_REFID LIST_REFID
-typedef OStringHashMap ExportListEntry;
-typedef ::std::vector ExportListEntry* ExportListBase;
-
//
// class ExportList
//
+typedef OStringHashMap ExportListEntry;
+
+
+/// Container for parse different types of string lists
class ExportList
{
private:
-ExportListBase maList;
+std::vector ExportListEntry* maList;
std::size_t nSourceLanguageListEntryCount;
public:
@@ -85,13 +85,9 @@ public:
#define REFID_NONE 0x
//
-// struct ResData
+// class ResData
//
-/**
-* Purpose: holds mandatory data to export a single res (used with ResStack)
-**/
-
#define ID_LEVEL_NULL 0x
#define ID_LEVEL_AUTOID 0x0001
#define ID_LEVEL_TEXT 0x0002
@@ -100,6 +96,8 @@ public:
#define ID_LEVEL_IDENTIFIER
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 3 commits - writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |1
writerfilter/source/dmapper/DomainMapper.cxx | 59 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 +
writerfilter/source/dmapper/DomainMapper_Impl.hxx |5
writerfilter/source/dmapper/ModelEventListener.cxx |7 +
writerfilter/source/dmapper/SdtHelper.cxx | 129 +
writerfilter/source/dmapper/SdtHelper.hxx | 68 +++
writerfilter/source/ooxml/model.xml| 12 +
8 files changed, 290 insertions(+), 1 deletion(-)
New commits:
commit 88fc08abd3ddce062bcac889af04870c60c3814b
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Apr 30 17:26:36 2013 +0200
bnc#779630 initial DOCX import of w:sdt's w:date
Also factor out the w:sdt-related methods to a helper class to avoid
DomainMapper_Impl become a God object.
(cherry picked from commit 3ec2d26dc2017ac4a27483febfc63328632f352d)
Conflicts:
sw/CppunitTest_sw_ooxmlimport.mk
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx
Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 1d62fad..a6b9596 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -111,6 +111,7 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/PropertyIds \
writerfilter/source/dmapper/PropertyMap \
writerfilter/source/dmapper/PropertyMapHelper \
+writerfilter/source/dmapper/SdtHelper \
writerfilter/source/dmapper/SectionColumnHandler \
writerfilter/source/dmapper/SettingsTable \
writerfilter/source/dmapper/StyleSheetTable \
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 9a06950..1a33f6e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -28,6 +28,7 @@
#include PageBordersHandler.hxx
#include resourcemodel/ResourceModelHelper.hxx
+#include SdtHelper.hxx
#include DomainMapper_Impl.hxx
#include ConversionHelper.hxx
#include ModelEventListener.hxx
@@ -1496,14 +1497,14 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
break;
case NS_ooxml::LN_CT_SdtBlock_sdtEndContent:
m_pImpl-SetSdt(false);
-if (!m_pImpl-m_aDropDownItems.empty())
-m_pImpl-createDropDownControl();
+if (!m_pImpl-m_pSdtHelper-getDropDownItems().empty())
+m_pImpl-m_pSdtHelper-createDropDownControl();
break;
case NS_ooxml::LN_CT_SdtListItem_displayText:
// TODO handle when this is != value
break;
case NS_ooxml::LN_CT_SdtListItem_value:
-m_pImpl-m_aDropDownItems.push_back(sStringValue);
+m_pImpl-m_pSdtHelper-getDropDownItems().push_back(sStringValue);
break;
default:
{
@@ -3366,6 +3367,26 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
pProperties-resolve(*this);
}
break;
+case NS_ooxml::LN_CT_SdtPr_date:
+{
+writerfilter::ReferenceProperties::Pointer_t pProperties =
rSprm.getProps();
+if (pProperties.get() != NULL)
+pProperties-resolve(*this);
+}
+break;
+case NS_ooxml::LN_CT_SdtDate_dateFormat:
+{
+if (sStringValue == M/d/)
+// See com/sun/star/awt/UnoControlDateFieldModel.idl, DateFormat;
sadly there are no constants for this.
+m_pImpl-m_pSdtHelper-getDateFormat().reset(8);
+else
+{
+// Set default format, so at least the date picker is created.
+m_pImpl-m_pSdtHelper-getDateFormat().reset(0);
+SAL_WARN(writerfilter, unhandled w:dateFormat value);
+}
+}
+break;
default:
{
#ifdef DEBUG_DOMAINMAPPER
@@ -3643,9 +3664,19 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
aBuffer.append( (const sal_Unicode *) data_, len);
sText = aBuffer.makeStringAndClear();
-if (!m_pImpl-m_aDropDownItems.empty())
+if (!m_pImpl-m_pSdtHelper-getDropDownItems().empty())
{
-m_pImpl-m_aSdtTexts.append(sText);
+m_pImpl-m_pSdtHelper-getSdtTexts().append(sText);
+return;
+}
+else if (m_pImpl-m_pSdtHelper-getDateFormat())
+{
+/*
+ * Here we assume w:sdt only contains a single text token. We need to
+ * create the control early, as in Writer, it's part of the cell, but
+ * in OOXML, the sdt contains the cell.
+ */
+m_pImpl-m_pSdtHelper-createDateControl(sText);
return;
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
