RE: fdo69552 backward compatibility with optional arguments in calc functions
Hi Eike,
I shall have a look at the code and see if your stepped approach is easy to
apply. Also, I shall have a look if and how this has effect on the Excel
2010 functions
CEILING.PRECISE, ISO.CEILING and FLOOR.PRECISE.
It might in future if we want to map those (or some) to their ODFF equivalent.
1) for the next release (4.3) implement a second function named a little
different in the UI (e.g. CEILING_ODF) with the correct handling of
parameters, do not offer it in the FunctionWizard yet (there's a flag
in scfuncs.src to suppress functions and their descriptions) and when
reading from an ODF document a function that does not have the
optional but so far expected parameter map it to the new function
(CEILING_ODF), else map it to the old function (CEILING). Both are
saved as CEILING again in ODF without intervention, not changing
anything. This enables a release to read and handle future versions
(or correct ODF files).
formula/source/core/resource/core_resource.src has a one-to-one relation of
opcode and function name.
Can you tell me how to map a function in a saved ODF document to one or another
function?
And if this can be done, can't we do this the other way round as well?
I mean using the function CEILING in the UI and saving it as CEILING or
CEILING_ODF depending on the used arguments and when reading a file converting
both CEILING and CEILING_ODF to CEILING in the UI.
This way the user only has to use 1 function name now and in the future.
And with next releases we can gradually skip the CEILING_ODF in the ODF files.
Where would be a good place to put the 'to Do list' (planned changes per
release per function)?
In the code, in a wiki, which file/page?
Wiki would be best, as a subpage of .../Development/Calc/ and categorize
it as [[Category:Calc|{{SUBPAGENAME}}]]
Maybe also as a subpage of .../Development/Calc/Spreadsheet_Functions/
As the wikis are public from the moment it is written, I intend to send the
text to you/the mailinglist for review first.
But, of course, the changes for each release need to be defined first ;)
Winfried
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: I have some questions for libreoffice development.
Hi, [ Please let's keep the discussion on the list, thanks! ] On Tue, Dec 03, 2013 at 10:14:26PM +0800, 刘先洋 rend...@gmail.com wrote: I want to know how the user to insert the object(fieldmark). See how the ODF import filter creates them, search for field.UNHANDLED in xmloff. The Bookmark is not visible，How to display it. I can not find a specific example to show the object. If you double-click on a bookmark in the Navigator, it creates a selection that shows the position of the bookmark. You said some problem,can you tell me more details? IOW, the problem 8d9991c97a3e9574d7424aa3d295e5b6b2830bda fixes is that when you deleted a comment, the fieldmark start/end placeholder characters were not removed from the document text. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: gerritbot/send-daily-digest
gerritbot/send-daily-digest |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c3e3d22a60ba817914cda68eef17e1f06bb2f76e
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Dec 4 10:02:42 2013 +0100
typography
diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index cf31f98..6786db3 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -58,7 +58,7 @@ def get_digest(query):
digest += '+ %s\n in %s from %s%s\n' %
(change['subject'][:73],
change['url'], change['owner']['name'], about)
if freshers != '':
-digest = (' First time contributors doing great things ! \n' +
freshers +
+digest = (' First time contributors doing great things! \n' +
freshers +
End of freshness \n\n + digest )
if digest == '':
digest = 'None'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: deadlock writing to stdout in remotely controlled soffice
On 12/04/2013 07:13 AM, Markus Mohrhard wrote: Thread 2 (Thread 0x7fb868e6f700 (LWP 22391)): #0 0x00352d4e767d in write () from /lib64/libc.so.6 #1 0x00352d476d53 in _IO_new_file_write () from /lib64/libc.so.6 #2 0x00352d4774ef in __GI__IO_file_xsputn () from /lib64/libc.so.6 #3 0x00352d46c73d in fputs () from /lib64/libc.so.6 #4 0x7fb88e855cb3 in (anonymous namespace)::log (level=SAL_DETAIL_LOG_LEVEL_WARN, area=0x7fb8748331b9 legacy.osl, where=0x7fb874833358 /home/buildslave/source/libo-core/sc/source/core/data/documen7.cxx:276: , message=0x7fb868e6bbf0 RemoveFromFormulaTree: nFormulaCodeInTree nRPN) at /home/buildslave/source/libo-core/sal/osl/all/log.cxx:242 #5 0x7fb88e855ee3 in osl::detail::logFormat (level=SAL_DETAIL_LOG_LEVEL_WARN, area=0x7fb8748331b9 legacy.osl, where=0x7fb874833358 /home/buildslave/source/libo-core/sc/source/core/data/documen7.cxx:276: , format=0x7fb87483316b %s, arguments=0x7fb868e6c038) at /home/buildslave/source/libo-core/sal/osl/all/log.cxx:282 #6 0x7fb88e855e2b in sal_detail_logFormat (level=SAL_DETAIL_LOG_LEVEL_WARN, area=0x7fb8748331b9 legacy.osl, where=0x7fb874833358 /home/buildslave/source/libo-core/sc/source/core/data/documen7.cxx:276: , format=0x7fb87483316b %s) at /home/buildslave/source/libo-core/sal/osl/all/log.cxx:265 I assume stderr is a pipe nobody's reading from in a timely way, so that writing to it eventually blocks. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - download.lst external/libodfgen
download.lst |8 +-- external/libodfgen/0001-use-correct-header-for-std-swap.patch | 26 -- external/libodfgen/UnpackedTarball_libodfgen.mk |6 -- 3 files changed, 4 insertions(+), 36 deletions(-) New commits: commit 79eab004dca8413cf99ea688291083df2d146230 Author: David Tardon dtar...@redhat.com Date: Wed Dec 4 10:04:48 2013 +0100 upload libodfgen-0.0.4 Change-Id: I1c0527b01a958fca6e0cb3febb1915762f8a0074 diff --git a/download.lst b/download.lst index 21091e5..03fe799 100644 --- a/download.lst +++ b/download.lst @@ -10,8 +10,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 MWAW_MD5SUM := d794625f156a9fb1c53b3f8a8aa13b5e export MWAW_TARBALL := libmwaw-0.2.0.tar.bz2 -ODFGEN_MD5SUM := 9cafe7f50a3b2c5ebd2dc9c6c509d2b4 -export ODFGEN_TARBALL := libodfgen-0.0.3.tar.bz2 +ODFGEN_MD5SUM := e5483d1f0b71e64c367c1194b54b0f53 +export ODFGEN_TARBALL := libodfgen-0.0.4.tar.bz2 VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40 export VISIO_TARBALL := libvisio-0.0.31.tar.bz2 FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5 diff --git a/external/libodfgen/0001-use-correct-header-for-std-swap.patch b/external/libodfgen/0001-use-correct-header-for-std-swap.patch deleted file mode 100644 index 13502d9..000 --- a/external/libodfgen/0001-use-correct-header-for-std-swap.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9008d84be1eb0b3def0df39b069a309d54aa73ab Mon Sep 17 00:00:00 2001 -From: David Tardon dtar...@redhat.com -Date: Wed, 30 Oct 2013 19:30:30 +0100 -Subject: [PATCH] use correct header for std::swap - - src/GraphicFunctions.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/GraphicFunctions.cxx b/src/GraphicFunctions.cxx -index d8809f9..606c640 100644 a/src/GraphicFunctions.cxx -+++ b/src/GraphicFunctions.cxx -@@ -24,8 +24,8 @@ - * Corel Corporation or Corel Corporation Limited. - */ - -+#include algorithm - #include math.h --#include utility - - #include GraphicFunctions.hxx - --- -1.8.3.1 - diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index 28e589c..1a7f26c 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libodfgen)) $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,libodfgen,\ - external/libodfgen/0001-use-correct-header-for-std-swap.patch \ -)) - # vim: set noet sw=4 ts=4: commit 5ae5901ccb608ed34ae1ed578aa66b3be33cbae4 Author: David Tardon dtar...@redhat.com Date: Wed Dec 4 10:02:45 2013 +0100 upload libetonyek-0.0.2 Change-Id: I3eed72cf1aa4ee1dc1f931a3d4245d8cc4d69897 diff --git a/download.lst b/download.lst index 444d6dc..21091e5 100644 --- a/download.lst +++ b/download.lst @@ -2,8 +2,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112 export CDR_TARBALL := libcdr-0.0.14.tar.bz2 EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095 export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2 -ETONYEK_MD5SUM := 040e0d7ce0cc0eb3a016964699d54a6c -export ETONYEK_TARBALL := libetonyek-0.0.1.tar.bz2 +ETONYEK_MD5SUM := 111f549514ba84845d426d80f2807244 +export ETONYEK_TARBALL := libetonyek-0.0.2.tar.bz2 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043 export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl svtools/source sw/inc toolkit/source vcl/source
include/vcl/outdev.hxx |4 ++--
svtools/source/control/ctrlbox.cxx |4 ++--
svtools/source/control/scriptedtext.cxx |2 +-
svtools/source/misc/sampletext.cxx | 20 ++--
sw/inc/splargs.hxx |2 +-
toolkit/source/awt/vclxfont.cxx |2 +-
vcl/source/gdi/outdev3.cxx | 12 +++-
vcl/source/window/window.cxx|3 +--
8 files changed, 25 insertions(+), 24 deletions(-)
New commits:
commit a073e81c3acb0c4aa3bc4fde146b6eb9869738e1
Author: Noel Grandin n...@peralex.com
Date: Wed Dec 4 11:28:44 2013 +0200
fix SwInterHyphInfo commit
fix for commit eb56848029a3b26a9d4f07a55364749e9e7d8339
convert SwInterHyphInfo from xub_StrLen-sal_Int32
Change-Id: I197edf7d5558cd44200f8f04ba29f028fba25639
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 0210ad5..9b56a21 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -144,7 +144,7 @@ public:
: aCrsrPos( rCrsrPos ),
bNoLang(sal_False), bCheck(sal_False),
nStart(nStartPos),
- nEnd( std::max(SAL_MAX_INT32, nStartPos + nLength) ),
+ nEnd( nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 :
(std::min(SAL_MAX_INT32, nStartPos + nLength)) ),
nWordStart(0), nWordLen(0),
nHyphPos(0), nMinTrail(0)
{ }
commit b273106226ab7e21f68b9e0470e8b28b27f6b726
Author: Noel Grandin n...@peralex.com
Date: Wed Dec 4 11:26:19 2013 +0200
convert OutputDevice::HasGlyphs from xub_StrLen-sal_Int32
Change-Id: Ic8f0ae3d263d6cb02e6faa7226db0241681fc45f
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 52b3cde..ff3278b 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1088,8 +1088,8 @@ public:
sal_BoolGetFontCharMap( FontCharMap rFontCharMap ) const;
boolGetFontCapabilities( vcl::FontCapabilities
rFontCapabilities ) const;
-xub_StrLen HasGlyphs( const Font rFont, const OUString rStr,
-xub_StrLen nIndex = 0, xub_StrLen nLen =
STRING_LEN ) const;
+sal_Int32 HasGlyphs( const Font rFont, const OUString rStr,
+sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ) const;
longGetMinKashida() const;
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 33c15d6..3249308 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1347,7 +1347,7 @@ void FontNameBox::UserDraw( const UserDrawEvent rUDEvt )
OUString sText =
makeShortRepresentativeTextForScript(aScripts[i]);
if (!sText.isEmpty())
{
-bool bHasSampleTextGlyphs = (STRING_LEN ==
rUDEvt.GetDevice()-HasGlyphs(aFont, sText));
+bool bHasSampleTextGlyphs = (-1 ==
rUDEvt.GetDevice()-HasGlyphs(aFont, sText));
if (bHasSampleTextGlyphs)
{
sSampleText = sText;
@@ -1367,7 +1367,7 @@ void FontNameBox::UserDraw( const UserDrawEvent rUDEvt )
OUString sText =
makeShortMinimalTextForScript(aMinimalScripts[i]);
if (!sText.isEmpty())
{
-bool bHasSampleTextGlyphs = (STRING_LEN ==
rUDEvt.GetDevice()-HasGlyphs(aFont, sText));
+bool bHasSampleTextGlyphs = (-1 ==
rUDEvt.GetDevice()-HasGlyphs(aFont, sText));
if (bHasSampleTextGlyphs)
{
sSampleText = sText;
diff --git a/svtools/source/control/scriptedtext.cxx
b/svtools/source/control/scriptedtext.cxx
index 29eab5f..4975c83 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -222,7 +222,7 @@ void SvtScriptedTextHelper_Impl::CalculateBreaks( const
uno::Reference i18n::XB
nScript = i18n::ScriptType::LATIN;
while( (nScript != i18n::ScriptType::WEAK)
(nCharIx == nNextCharIx) )
{
-nNextCharIx = mrOutDevice.HasGlyphs(
GetFont( nScript ), maText, sal::static_int_cast sal_uInt16 (nCharIx),
sal::static_int_cast sal_uInt16 (nNextPos - nCharIx) );
+nNextCharIx = mrOutDevice.HasGlyphs(
GetFont( nScript ), maText, nCharIx, nNextPos - nCharIx );
if( nCharIx == nNextCharIx )
++nScript;
}
diff --git a/svtools/source/misc/sampletext.cxx
b/svtools/source/misc/sampletext.cxx
index da0c90c..d74cad4 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -44,7 +44,7 @@ bool isSymbolFont(const Font rFont)
bool canRenderNameOfSelectedFont(OutputDevice rDevice)
{
Re: locking foo ...
On Wed, 2013-12-04 at 00:02 +0100, Michael Stahl wrote: Well - we could special-case the SolarMutex on Windows - making it not a CriticalSection but a true Windows 'mutex' that we can include in a 'WaitForMultipleObjects' - along with the rest of the things the mainloop wants. Or we could associate a condition with it that can be signalled to wake the mainloop to ask for some event processing now and then - instead of just waiting on the lock/CriticalSection. you mean some way to get the main loop to process outstanding Win32 messages while it fails to acquire SolarMutex? ... sounds crazy ... but what could possibly go wrong with that :) Lol ;-) well - not quite that crazy; but at least processing / these messages that are basically pushing things into the main thread that have to be done there: particularly VCL / GDI / 'yield' requests. Of course, an alternative might be to have a GUI thread that does nothing but run a main-loop, never executing any code - such that we can always safely yield, and/or create/destroy windows/GCs etc. Ho hum ;-) the whole SolarMutex thing needs a ground-up re-design, but it is quite a chunky research task I think: intersecting with everything in the app from the bottom up. Regards, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc
sw/inc/splargs.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 564ee696c9dfe1ee39515fe69e50ecdce2a03b4e
Author: Noel Grandin n...@peralex.com
Date: Wed Dec 4 11:47:58 2013 +0200
fix SwInterHyphInfo commit again
The original commit was eb56848029a3b26a9d4f07a55364749e9e7d8339
convert SwInterHyphInfo from xub_StrLen-sal_Int32
My first attempt at fixing the commit was
a073e81c3acb0c4aa3bc4fde146b6eb9869738e1.
This is the second attempt.
Change-Id: I030c0a3107e1321006744473efe3ca3341251ad4
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 9b56a21..fae40a1 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -144,7 +144,7 @@ public:
: aCrsrPos( rCrsrPos ),
bNoLang(sal_False), bCheck(sal_False),
nStart(nStartPos),
- nEnd( nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 :
(std::min(SAL_MAX_INT32, nStartPos + nLength)) ),
+ nEnd( nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 : nStartPos +
nLength ),
nWordStart(0), nWordLen(0),
nHyphPos(0), nMinTrail(0)
{ }
___
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/rtfexport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1da04bd7a8a804cbfb1d01a3102b1b76cc557122 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 4 10:51:48 2013 +0100 SwRTFWriter: fix string conversion Regression from 02bfed8a53556badfea637930b05d923cf9465f2 (convert sw/source/filter/ww8/*.cxx from String to OUString, 2013-10-14), check for string length before invoking OUString::operator[]. This can be reproduced if copypasting some text inside a Writer doc from normal text to rectangle shapes inside group shapes. Change-Id: Ia8f774b27ca63773792e6af913dfe7e493bea4b8 diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index a711ec8..b70b9be 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1178,7 +1178,7 @@ SwRTFWriter::SwRTFWriter( const OUString rFltName, const OUString rBaseURL ) SAL_INFO(sw.rtf, OSL_THIS_FUNC); SetBaseURL( rBaseURL ); // export outline nodes, only (send outline to clipboard/presentation) -m_bOutOutlineOnly = 'O' == rFltName[0]; +m_bOutOutlineOnly = (!rFltName.isEmpty() 'O' == rFltName[0]); } SwRTFWriter::~SwRTFWriter() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: locking foo ...
On 2013-12-04 11:38, Michael Meeks wrote: Of course, an alternative might be to have a GUI thread that does nothing but run a main-loop, never executing any code - such that we can always safely yield, and/or create/destroy windows/GCs etc. Wasn't the idea that (a) we were going to gradually migrate to running everything on the same thread, (b) except for the handful of places where parallelism is truly beneficial (c) and for those parallel places, each parallel chunk would live in it's own little island, interacting as little as possible with the main thread. ?? Or am I merely projecting my own design ideas onto the past discussions :-) Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-4' - sw/source
sw/source/filter/ww8/ww8par.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 20cd30da8ecf0a41c9bbd7d7311f8f54d6ac0fa8 Author: Michael Stahl mst...@redhat.com Date: Mon Dec 2 22:20:25 2013 +0100 fdo#71749: sw: WW8: don't loop on tables in footnotes (regression from ee1db992b98378b5e2f5e9aa8af0e36c375e582f) Change-Id: Id10b6fb8e9e3697b10a1df605cb48d94a55ad207 (cherry picked from commit 790896d9a557d34ea91d6e5926471de66503be7a) Reviewed-on: https://gerrit.libreoffice.org/6905 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk (cherry picked from commit 6dfc6b717b5e625cbc48c856b73573719c511c8a) Reviewed-on: https://gerrit.libreoffice.org/6910 Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index bf5bea0..223de68 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2383,7 +2383,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool rbReSync, WW8_CP nStartCp) pPlcxMan-GetPap()-Restore( aSave ); } } -} while (nInTable nCellLevel); +} while (!bFtnEdn (nInTable nCellLevel)); return bTableRowEnd; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-4' - xmloff/source
xmloff/source/text/XMLTextFrameContext.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 3da29e6813a64b97fb56436a80dae7fafc39eba3
Author: Michael Stahl mst...@redhat.com
Date: Mon Dec 2 23:28:20 2013 +0100
fdo#71450 fdo#71698: ODF import: fix frame name corner cases
Trying to set a name that is already in use will throw an exception (and
set a different, generated name); if there is actually no name in the
file then there's no point trying to set anything.
(regression from b69d152cfa1da868ba960345d72ba78f9f8e1b35)
Change-Id: Ie54d4a830cc23e2853a6efeb81f77dcc788192ea
(cherry picked from commit 8171e713e74e3d09e86592c28abfe05d0400c071)
Reviewed-on: https://gerrit.libreoffice.org/6907
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit 0763cf6ed7bdc629e59b5df757b9ef4f5273f393)
Reviewed-on: https://gerrit.libreoffice.org/6911
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index 3ca7e86..745ff63 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1291,12 +1291,20 @@ void XMLTextFrameContext_Impl::SetHyperlink( const
OUString rHRef,
void XMLTextFrameContext_Impl::SetName()
{
ReferenceXNamed xNamed(xPropSet, UNO_QUERY);
-if (xNamed.is())
+if (!m_sOrigName.isEmpty() xNamed.is())
{
OUString const name(xNamed-getName());
if (name != m_sOrigName)
{
-xNamed-setName(m_sOrigName);
+try
+{
+xNamed-setName(m_sOrigName);
+}
+catch (uno::Exception const e)
+{ // fdo#71698 document contains 2 frames with same draw:name
+SAL_INFO(xmloff.text, SetName(): exception setting \
+ m_sOrigName \: e.Message);
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: testtools/source
testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 42b733539179547a4030dfe54655b26985936717
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Dec 4 11:35:57 2013 +0100
Revert throw new ... fix in Managed C++ code
...where it is correct and 336353a87e6003e685aab87ea74a158546e1f297 Related
rhbz#867808: More apparently bogus 'throw new ...' in C++ code had changed
it
by accident.
Change-Id: Id7fc1adf8c0068a3b59794d156b21f68b5ac7e72
diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
index 7d08eab..c2e7bda 100644
--- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
+++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
@@ -799,7 +799,7 @@ static bool raiseException(XBridgeTest* xLBT )
bRet = performQueryForUnknownType( xLBT ) bRet;
if (! bRet)
{
-throw unoidl::com::sun::star::uno::RuntimeException(
+throw new unoidl::com::sun::star::uno::RuntimeException(
new String(error: test failed!), 0);
}
}
@@ -819,7 +819,7 @@ static bool raiseException(XBridgeTest* xLBT )
{
if (args-Length 1)
{
-throw RuntimeException(
+throw new RuntimeException(
missing argument for bridgetest!, this );
}
Object* test_obj =
@@ -846,7 +846,7 @@ static bool raiseException(XBridgeTest* xLBT )
s-Append(exc-GetType()-Name);
s-Append(S\n Message: );
s-Append(exc-Message);
-throw unoidl::com::sun::star::uno::RuntimeException(
+throw new unoidl::com::sun::star::uno::RuntimeException(
s-ToString(), 0);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/Rdb_services.mk Repository.mk svtools/Library_hatchwindowfactory.mk svtools/Library_svt.mk svtools/Module_svtools.mk svtools/source svtools/util
Repository.mk |1 postprocess/Rdb_services.mk |1 svtools/Library_hatchwindowfactory.mk | 51 - svtools/Library_svt.mk |4 svtools/Module_svtools.mk |1 svtools/source/hatchwindow/documentcloser.hxx | 82 svtools/source/hatchwindow/hatchwindow.hxx | 72 -- svtools/source/hatchwindow/hatchwindowfactory.component | 29 - svtools/source/hatchwindow/hatchwindowfactory.cxx | 44 svtools/source/hatchwindow/hatchwindowfactory.hxx | 65 svtools/source/inc/documentcloser.hxx | 82 svtools/source/inc/hatchwindow.hxx | 72 ++ svtools/source/inc/hatchwindowfactory.hxx | 65 svtools/source/uno/miscservices.cxx | 32 -- svtools/util/svt.component |7 + 15 files changed, 252 insertions(+), 356 deletions(-) New commits: commit 35c1d6f7617087c18b94e03ec9281c995e6d9e55 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Tue Nov 26 00:03:50 2013 -0200 fdo#60698: Merge hatchwindowfactory into svt They are used at same conditions, and hatchwindowfactory just have four files, so we don'y have any reason to keep them separated. Change-Id: Iae3bb26ab1e95a309bf0d83c4ef17a0bf0261179 Reviewed-on: https://gerrit.libreoffice.org/6811 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/Repository.mk b/Repository.mk index 60a0c76..02bfe0c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -273,7 +273,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ i18npool \ i18nsearch \ - hatchwindowfactory \ hyphen \ icd \ icg \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index e07017d..fc7c671 100755 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -80,7 +80,6 @@ $(eval $(call gb_Rdb_add_components,services,\ svl/source/fsstor/fsstorage \ svl/source/passwordcontainer/passwordcontainer \ svl/util/svl \ - svtools/source/hatchwindow/hatchwindowfactory \ svtools/util/svt \ svgio/svgio \ svx/util/svx \ diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk deleted file mode 100644 index 7511ece..000 --- a/svtools/Library_hatchwindowfactory.mk +++ /dev/null @@ -1,51 +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,hatchwindowfactory)) - -$(eval $(call gb_Library_set_componentfile,hatchwindowfactory,svtools/source/hatchwindow/hatchwindowfactory)) - -$(eval $(call gb_Library_set_include,hatchwindowfactory,\ -$$(INCLUDE) \ --I$(SRCDIR)/svtools/inc \ -)) - -$(eval $(call gb_Library_use_external,hatchwindowfactory,boost_headers)) - -$(eval $(call gb_Library_use_sdk_api,hatchwindowfactory)) - -$(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ -comphelper \ -cppu \ -cppuhelper \ -sal \ -tk \ -tl \ -vcl \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ -svtools/source/hatchwindow/documentcloser \ -svtools/source/hatchwindow/hatchwindow \ -svtools/source/hatchwindow/hatchwindowfactory \ -svtools/source/hatchwindow/ipwin \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index eb1ba8c..915c5b8 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -161,6 +161,10 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/graphic/provider \ svtools/source/graphic/renderer \ svtools/source/graphic/transformer \ +
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 --- Comment #19 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=35c1d6f7617087c18b94e03ec9281c995e6d9e55 fdo#60698: Merge hatchwindowfactory into svt The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dbaccess/source
dbaccess/source/core/api/RowSet.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit d4a709cbf4710555b1518816f1eaa9b43dc5cae7 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Dec 2 23:44:11 2013 +0100 fdo#72163 after updating m_xComposer, command facets are not dirty anymore Else we dispose m_xComposer too eagerly; still used by m_pCacheSet. Change-Id: I205488465c19a356534df17b8a5e9a20ce6766c9 Reviewed-on: https://gerrit.libreoffice.org/6906 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index a58a68a..6002747 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -2295,6 +2295,8 @@ sal_Bool ORowSet::impl_initComposer_throw( OUString _out_rCommandToExecute ) _out_rCommandToExecute = m_xComposer-getQueryWithSubstitution(); +m_bCommandFacetsDirty = sal_False; + return bUseEscapeProcessing; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: padmin/source
padmin/source/prtsetup.cxx | 145 -
padmin/source/prtsetup.hxx | 28
padmin/source/rtsetup.hrc | 11 ---
padmin/source/rtsetup.src | 76 ---
4 files changed, 260 deletions(-)
New commits:
commit 6230cdd2d8971147dcb629c8bd61daa1fefcb7c7
Author: Khaled Hosny khaledho...@eglug.org
Date: Tue Nov 26 14:40:07 2013 +0200
Drop font substitution tab page
The relevant VCL code will be dropped in the next commits.
Change-Id: Ieaa550d671fa43f2e5a96e2df7f256de2faf2fa4
Reviewed-on: https://gerrit.libreoffice.org/6857
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 6588458..a91d43f 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -22,8 +22,6 @@
#include rtsetup.hrc
#include cmddlg.hxx
-#include vcl/fontmanager.hxx
-
#include osl/thread.h
#include officecfg/Office/Common.hxx
@@ -83,7 +81,6 @@ RTSDialog::RTSDialog( const PrinterInfo rJobData, const
OUString rPrinter, boo
, m_pPaperPage(NULL)
, m_pDevicePage(NULL)
, m_pOtherPage(NULL)
-, m_pFontSubstPage(NULL)
, m_pCommandPage(NULL)
, m_aInvalidString(PaResId(RID_RTS_RTSDIALOG_INVALID_TXT).toString())
{
@@ -97,7 +94,6 @@ RTSDialog::RTSDialog( const PrinterInfo rJobData, const
OUString rPrinter, boo
if( ! bAllPages )
{
m_pTabControl-RemovePage(m_pTabControl-GetPageId(other));
-m_pTabControl-RemovePage(m_pTabControl-GetPageId(font));
m_pTabControl-RemovePage(m_pTabControl-GetPageId(command));
}
else if( m_aJobData.m_aDriverName.startsWith(CUPS:) !
PrinterInfoManager::get().isCUPSDisabled() )
@@ -119,7 +115,6 @@ RTSDialog::~RTSDialog()
delete m_pPaperPage;
delete m_pDevicePage;
delete m_pOtherPage;
-delete m_pFontSubstPage;
delete m_pCommandPage;
}
@@ -141,8 +136,6 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
pPage = m_pDevicePage = new RTSDevicePage( this );
else if (sPage == other)
pPage = m_pOtherPage = new RTSOtherPage( this );
-else if (sPage == font)
-pPage = m_pFontSubstPage = new RTSFontSubstPage( this );
else if (sPage == command)
pPage = m_pCommandPage = new RTSCommandPage( this );
if( pPage )
@@ -620,144 +613,6 @@ IMPL_LINK( RTSOtherPage, ClickBtnHdl, Button*, pButton )
return 0;
}
-// --
-
-/*
- * RTSFontSubstPage
- */
-
-RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) :
-TabPage( pParent-m_pTabControl, PaResId( RID_RTS_FONTSUBSTPAGE ) ),
-m_pParent( pParent ),
-m_aSubstitutionsText( this, PaResId( RID_RTS_FS_SUBST_TXT ) ),
-m_aSubstitutionsBox( this, PaResId( RID_RTS_FS_SUBST_BOX ) ),
-m_aFromFontText( this, PaResId( RID_RTS_FS_FROM_TXT ) ),
-m_aFromFontBox( this, PaResId( RID_RTS_FS_FROM_BOX ) ),
-m_aToFontText( this, PaResId( RID_RTS_FS_TO_TXT ) ),
-m_aToFontBox( this, PaResId( RID_RTS_FS_TO_BOX ) ),
-m_aAddButton( this, PaResId( RID_RTS_FS_ADD_BTN ) ),
-m_aRemoveButton( this, PaResId( RID_RTS_FS_REMOVE_BTN ) ),
-m_aEnableBox( this, PaResId( RID_RTS_FS_ENABLE_BTN ) )
-{
-FreeResource();
-
-// fill to box
-PrintFontManager rFontManager = PrintFontManager::get();
-::std::list FastPrintFontInfo aFonts;
-rFontManager.getFontListWithFastInfo( aFonts,
m_pParent-m_aJobData.m_pParser );
-::std::list FastPrintFontInfo ::const_iterator it;
-::boost::unordered_map OUString, int, OUStringHash aToMap, aFromMap;
-for( it = aFonts.begin(); it != aFonts.end(); ++it )
-{
-if( it-m_eType == fonttype::Builtin )
-{
-if( aToMap.find( it-m_aFamilyName ) == aToMap.end() )
-{
-m_aToFontBox.InsertEntry( it-m_aFamilyName );
-aToMap[ it-m_aFamilyName ] = 1;
-}
-}
-else
-{
-if( aFromMap.find( it-m_aFamilyName ) == aFromMap.end() )
-{
-m_aFromFontBox.InsertEntry( it-m_aFamilyName );
-aFromMap[ it-m_aFamilyName ] = 1;
-}
-}
-}
-
-m_aEnableBox.Check( m_pParent-m_aJobData.m_bPerformFontSubstitution );
-m_aRemoveButton.Enable( sal_False );
-if( ! m_pParent-m_aJobData.m_bPerformFontSubstitution )
-{
-m_aSubstitutionsBox.Enable( sal_False );
-m_aSubstitutionsText.Enable( sal_False );
-m_aAddButton.Enable( sal_False );
-m_aToFontBox.Enable( sal_False );
-m_aToFontText.Enable( sal_False );
-m_aFromFontBox.Enable( sal_False );
-m_aFromFontText.Enable( sal_False );
-}
-
-update();
-
-m_aAddButton.SetClickHdl( LINK( this, RTSFontSubstPage,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/filter/excel/xestyle.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 99643319b62c3673b57f31d61a4619625747a444 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sat Nov 30 06:50:50 2013 +0100 write valid dxf record, related fdo#71971 Change-Id: I99f4dfca78cc0fd5d9b947000a99f8414c2a899b (cherry picked from commit 7415fc31f5cdf7ff3f78dd304b9576b931a82aeb) Reviewed-on: https://gerrit.libreoffice.org/6878 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 3186cda..486481a 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -3021,18 +3021,18 @@ void XclExpDxf::SaveXml( XclExpXmlStream rStrm ) sax_fastparser::FSHelperPtr rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet-startElement( XML_dxf, FSEND ); -if (mpAlign) -mpAlign-SaveXml(rStrm); -if (mpBorder) -mpBorder-SaveXml(rStrm); if (mpFont) mpFont-SaveXml(rStrm); if (mpNumberFmt) mpNumberFmt-SaveXml(rStrm); -if (mpProt) -mpProt-SaveXml(rStrm); if (mpColor) mpColor-SaveXml(rStrm); +if (mpAlign) +mpAlign-SaveXml(rStrm); +if (mpBorder) +mpBorder-SaveXml(rStrm); +if (mpProt) +mpProt-SaveXml(rStrm); rStyleSheet-endElement( XML_dxf ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl psprint_config/configuration vcl/generic vcl/inc vcl/null vcl/unx
include/vcl/printerinfomanager.hxx | 21 ---
psprint_config/configuration/psprint.conf | 32 -
vcl/generic/print/common_gfx.cxx | 25
vcl/generic/print/genpspgraphics.cxx |8 -
vcl/generic/print/printerjob.cxx | 30 +---
vcl/generic/print/text_gfx.cxx | 62 +++---
vcl/inc/generic/printergfx.hxx | 14 --
vcl/null/printerinfomanager.cxx|5
vcl/unx/generic/printer/printerinfomanager.cxx | 153 -
9 files changed, 42 insertions(+), 308 deletions(-)
New commits:
commit 24657548a71355e1a087b87d725647793785daa9
Author: Khaled Hosny khaledho...@eglug.org
Date: Tue Nov 26 16:37:16 2013 +0200
Don't perform printer font substitution
The so called printer resident fonts is a relic of a bygone era, when
life was simple and there was only ASCII and Type1 fonts.
It is just broken by design these days, offers nothing useful and can go
wrong in many ways. Since 1f3a91cf2ace315fb332c0149808a2433eb9ae71 this
feature is disabled by default anyway, so scrap this code to make room
for some long due cleanup.
Change-Id: Id124b2cad1a484099701a885c4d96e6a12af8d9a
Reviewed-on: https://gerrit.libreoffice.org/6858
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/printerinfomanager.hxx
b/include/vcl/printerinfomanager.hxx
index 96e7846..b431fad 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -50,24 +50,9 @@ struct PrinterInfo : JobData
// a list of special features separated by ',' not used by psprint
// but assigned from the outside (currently for
fax,pdf=,autoqueue,external_dialog)
OUString m_aFeatures;
-// a mapping of fonts to other fonts.
-// this provides a method for the user
-// to replace arbitrary fonts by printer builtin fonts
-// currently this is only a mapping between font names
-// assuming that only adbobe standard encoding fonts are
-// built into the printer. in future it may be necessary
-// to map to a font name and UCS2 vector which should be mapped
-// this vector is currently implicitly given by the adobe
-// standard encoding
-boolm_bPerformFontSubstitution;
-boost::unordered_map OUString, OUString, OUStringHash
-m_aFontSubstitutes;
-boost::unordered_map fontID, fontID
-m_aFontSubstitutions;
PrinterInfo() :
-JobData(),
-m_bPerformFontSubstitution( false )
+JobData()
{}
};
@@ -133,10 +118,6 @@ protected:
virtual void initialize();
-// fill in font substitutions
-// the resulting boost::unordered_map maps from source to target font ids
-void fillFontSubstitutions( PrinterInfo rInfo ) const;
-
// fill default paper if not configured in config file
// default paper is e.g. locale dependent
// if a paper is already set it will not be overwritten
diff --git a/psprint_config/configuration/psprint.conf
b/psprint_config/configuration/psprint.conf
index b69bfe1..d6c333b 100644
--- a/psprint_config/configuration/psprint.conf
+++ b/psprint_config/configuration/psprint.conf
@@ -61,23 +61,6 @@
; if key is absent the default value is driver specific
; PPD_PageSize=A4
-; Note: the following two key types are in the global section to provide
-; defaults for newly added printers.
-; PerformFontSubstitution: whether to replace downloadable fonts
-; with resident fonts or not
-PerformFontSubstitution=false
-
-; SubstFont_downloadable font: the resident font to replace
-; downloadable font if PerformFontSubstitution is true
-SubstFont_Helmet=Helvetica
-SubstFont_Albany=Helvetica
-SubstFont_Courier New=Courier
-SubstFont_Arial=Helvetica
-SubstFont_Times New Roman=Times
-SubstFont_Thorndale=Times
-SubstFont_Timmons=Times
-SubstFont_Cumberland=Courier
-
[Generic Printer]
; for every printer a group with at least the keys
@@ -114,18 +97,3 @@ Command=
; external_dialog to notify that the print command of a printer will show a
dialog
; and therefore the application should not show its own dialog.
;Features=
-
-; PerformFontSubstitution: whether to replace downloadable fonts
-; with resident fonts or not
-PerformFontSubstitution=false
-
-; SubstFont_downloadable font: the resident font to replace
-; downloadable font if PerformFontSubstitution is true
-SubstFont_Helmet=Helvetica
-SubstFont_Albany=Helvetica
-SubstFont_Courier New=Courier
-SubstFont_Arial=Helvetica
-SubstFont_Times New Roman=Times
-SubstFont_Thorndale=Times
-SubstFont_Timmons=Times
-SubstFont_Cumberland=Courier
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 0582537..851739a 100644
--- a/vcl/generic/print/common_gfx.cxx
+++
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 11/38b2a95c8c985e5682ab4b25b15b00e96cc8e5
11/38b2a95c8c985e5682ab4b25b15b00e96cc8e5 |1 + 1 file changed, 1 insertion(+) New commits: commit e0f457717ce622f43faf5947a6f728cf8342a665 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 4 11:01:34 2013 + Notes added by 'git notes add' diff --git a/11/38b2a95c8c985e5682ab4b25b15b00e96cc8e5 b/11/38b2a95c8c985e5682ab4b25b15b00e96cc8e5 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/11/38b2a95c8c985e5682ab4b25b15b00e96cc8e5 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/aqua vcl/coretext vcl/generic vcl/headless vcl/inc vcl/source vcl/unx vcl/win
include/vcl/outdev.hxx |4 -
vcl/aqua/source/gdi/atsui/salgdi.cxx |7 ---
vcl/coretext/salgdi2.cxx |7 ---
vcl/generic/print/genpspgraphics.cxx |4 -
vcl/headless/svptext.cxx |4 -
vcl/inc/aqua/atsui/salgdi.h |3 -
vcl/inc/coretext/salgdi2.h |3 -
vcl/inc/generic/genpspgraphics.h |1
vcl/inc/headless/svpgdi.hxx |1
vcl/inc/outdev.h |9 +---
vcl/inc/outfont.hxx |3 -
vcl/inc/salgdi.hxx |4 -
vcl/inc/unx/salgdi.h |1
vcl/inc/win/salgdi.h |3 -
vcl/source/app/svmain.cxx|2
vcl/source/gdi/outdev3.cxx | 71 +++
vcl/source/gdi/print.cxx |2
vcl/source/gdi/virdev.cxx|2
vcl/source/window/window.cxx |2
vcl/unx/generic/gdi/salgdi3.cxx |7 ---
vcl/win/source/gdi/salgdi3.cxx |5 --
21 files changed, 23 insertions(+), 122 deletions(-)
New commits:
commit ef1b4c3a5ea6e70a3831d29133ca291aee89f177
Author: Khaled Hosny khaledho...@eglug.org
Date: Tue Nov 26 16:39:17 2013 +0200
Device-specific font substitution is not used
This was only used for printer built in fonts, which was dropped in the
previous commit.
Change-Id: Iff62786284470ff3873c8d4b0aae0614bf69c7f3
Reviewed-on: https://gerrit.libreoffice.org/6859
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index ff3278b..00016cf 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -507,10 +507,6 @@ public:
SAL_DLLPRIVATE sal_Bool ImplIsRecordLayout() const;
- void ImplAddDevFontSubstitute( const OUString
rFontName,
- const OUString
rReplaceFontName,
- sal_uInt16 nFlags = 0 );
-
SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const
Font rFont );
SAL_DLLPRIVATE static sal_Bool ImplIsUnderlineAbove( const Font );
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx
b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 5e91406..cbe3d49 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -596,13 +596,6 @@ sal_Bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId
nGlyphId, Rectangle rR
// ---
-void AquaSalGraphics::GetDevFontSubstList( OutputDevice* )
-{
-// nothing to do since there are no device-specific fonts on Aqua
-}
-
-// ---
-
void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout )
{
}
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index 402bd60..4a58e88 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -423,13 +423,6 @@ sal_Bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId
nGlyphId, Rectangle rR
// ---
-void AquaSalGraphics::GetDevFontSubstList( OutputDevice* )
-{
-// nothing to do since there are no device-specific fonts on Aqua
-}
-
-// ---
-
void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout )
{
}
diff --git a/vcl/generic/print/genpspgraphics.cxx
b/vcl/generic/print/genpspgraphics.cxx
index 682eaa1..f2516df 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -912,10 +912,6 @@ void GenPspGraphics::ClearDevFontCache()
GlyphCache::GetInstance().ClearFontCache();
}
-void GenPspGraphics::GetDevFontSubstList( OutputDevice* )
-{
-}
-
void GenPspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int )
{
const psp::PrintFontManager rMgr = psp::PrintFontManager::get();
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 0a4bbd1..0fde3f0 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -300,10 +300,6 @@ void SvpSalGraphics::ClearDevFontCache()
}
-void SvpSalGraphics::GetDevFontSubstList( OutputDevice* )
-{}
-
-
bool SvpSalGraphics::AddTempDevFont( ImplDevFontList*,
const OUString, const OUString )
{
diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
index b543fe1..acf3b09 100644
--- a/vcl/inc/aqua/atsui/salgdi.h
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -268,9 +268,6 @@ public:
virtual voidGetDevFontList( ImplDevFontList* );
// graphics must drop any cached font info
virtual void ClearDevFontCache();
-// graphics should call ImplAddDevFontSubstitute on supplied
-// OutputDevice for all its device specific preferred font substitutions
-virtual
[Libreoffice-commits] core.git: include/vcl vcl/generic vcl/headless vcl/unx
include/vcl/fontmanager.hxx | 36 ---
vcl/generic/fontmanager/fontcache.cxx | 31 --
vcl/generic/fontmanager/fontmanager.cxx | 341 +---
vcl/generic/print/genpspgraphics.cxx|6
vcl/generic/print/glyphset.cxx |7
vcl/generic/print/text_gfx.cxx |2
vcl/headless/svptext.cxx|5
vcl/unx/generic/gdi/salgdi3.cxx |5
8 files changed, 25 insertions(+), 408 deletions(-)
New commits:
commit 003a3d7a55d9f83d5b68800d54fdac633b4c281a
Author: Khaled Hosny khaledho...@eglug.org
Date: Tue Nov 26 17:08:25 2013 +0200
No more uses of printer built in fonts
Less parsing of AFM files at startup.
Change-Id: I62d4c81d6e892f2356df22b53bb35c0f9f7bc344
Reviewed-on: https://gerrit.libreoffice.org/6860
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/fontmanager.hxx b/include/vcl/fontmanager.hxx
index 7f8511d..ca78376 100644
--- a/include/vcl/fontmanager.hxx
+++ b/include/vcl/fontmanager.hxx
@@ -56,7 +56,6 @@ enum type {
Unknown = 0,
Type1 = 1,
TrueType = 2,
-Builtin = 3
};
}
@@ -141,11 +140,9 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
struct PrintFont;
struct TrueTypeFontFile;
struct Type1FontFile;
-struct BuiltinFont;
friend struct PrintFont;
friend struct TrueTypeFontFile;
friend struct Type1FontFile;
-friend struct BuiltinFont;
friend class FontCache;
struct PrintFontMetrics
@@ -238,16 +235,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider*
pProvider );
};
-struct BuiltinFont : public PrintFont
-{
-int m_nDirectory; // atom containing system
dependent path
-OString m_aMetricFile;
-
-BuiltinFont() : PrintFont( fonttype::Builtin ) {}
-virtual ~BuiltinFont();
-virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider*
pProvider );
-};
-
fontID m_nNextFontID;
boost::unordered_map fontID, PrintFont*m_aFonts;
boost::unordered_map int, FontFamily m_aFamilyTypes;
@@ -292,8 +279,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
return findFontFileID(nDirID, rFile, 0) != 0;
}
-fontID findFontBuiltinID( int nPSNameAtom ) const;
-
FontFamily matchFamilyName( const OUString rFamily ) const;
PrintFont* getFont( fontID nID ) const
@@ -349,16 +334,10 @@ public:
// returns the number of managed fonts
int getFontCount() const { return m_aFonts.size(); }
-// caution: the getFontList* methods can change the font list on demand
-// depending on the pParser argument. That is getFontCount() may
-// return a larger value after getFontList()
-
-// returns the ids of all managed fonts. on pParser != NULL
-// all fonttype::Builtin type fonts are not listed
-// which do not occur in the PPD of pParser
-void getFontList( std::list fontID rFontIDs, const PPDParser* pParser
= NULL );
-// get the font list and fast font info. see getFontList for pParser
-void getFontListWithFastInfo( std::list FastPrintFontInfo rFonts,
const PPDParser* pParser = NULL );
+// returns the ids of all managed fonts.
+void getFontList( std::list fontID rFontIDs );
+// get the font list and fast font info.
+void getFontListWithFastInfo( std::list FastPrintFontInfo rFonts );
// get font info for a specific font
bool getFontInfo( fontID nFontID, PrintFontInfo rInfo ) const;
@@ -453,16 +432,15 @@ public:
// the user is responsible to allocate pArray large enough
bool getMetrics( fontID nFontID, const sal_Unicode* pString, int nLen,
CharacterMetric* pArray, bool bVertical = false ) const;
-// get encoding vector of font, currently only for Type1 and Builtin fonts
-// returns NULL if encoding vector is empty or font is neither type1 or
-// builtin; if ppNonEncoded is set and non encoded type1 glyphs exist
+// get encoding vector of font, currently only for Type1 fonts
+// returns NULL if encoding vector is empty or font is not type1;
+// if ppNonEncoded is set and non encoded type1 glyphs exist
// then *ppNonEncoded is set to the mapping for nonencoded glyphs.
// the encoding vector contains -1 for non encoded glyphs
const std::map sal_Unicode, sal_Int32 * getEncodingMap( fontID nFontID,
const std::map sal_Unicode, OString ** ppNonEncoded ) const;
// evaluates copyright flags for TrueType fonts for printing/viewing
// type1 fonts do not have such a feature, so return for them is true
-// returns true for builtin fonts (surprise!)
bool isFontDownloadingAllowedForPrinting( fontID nFont ) const;
// helper for type 1 fonts
diff --git a/vcl/generic/fontmanager/fontcache.cxx
[Libreoffice-commits] core.git: android/experimental config_host.mk.in configure.ac download.lst external/afms external/Module_external.mk Makefile.fetch scp2/source
Makefile.fetch |1 android/experimental/desktop/Makefile |2 - config_host.mk.in |1 configure.ac| 21 download.lst|1 external/Module_external.mk |1 external/afms/ExternalPackage_fontunxafm.mk | 46 external/afms/Makefile |7 external/afms/Module_afms.mk| 17 -- external/afms/README|1 external/afms/UnpackedTarball_afms.mk | 14 scp2/source/ooo/directory_ooo.scp |9 - scp2/source/ooo/file_extra_ooo.scp | 13 --- 13 files changed, 1 insertion(+), 133 deletions(-) New commits: commit 0b9d8c678ce06d74a9211e4857def48a9eabc36b Author: Khaled Hosny khaledho...@eglug.org Date: Tue Nov 26 17:16:04 2013 +0200 Those AFM files are not used anymore They were used to build metrics for printer built in fonts, which was dropped in the previous commit. Change-Id: Id9fb3108facec61eb6de0a2d16546f1187465e50 Reviewed-on: https://gerrit.libreoffice.org/6861 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/Makefile.fetch b/Makefile.fetch index ae76cf7..5b3f501 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -88,7 +88,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,VISIO,VISIO_TARBALL) \ ,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ - $(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \ $(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_CODEC_TARBALL)) \ $(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_HTTPCLIENT_TARBALL)) \ $(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_LANG_TARBALL)) \ diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index bd75e51..145a9fb 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -117,7 +117,7 @@ copy-stuff: cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program # presets - becomes the users home directory, .stamp forces .zip dir creation for D in $(strip autocorr autotext backup basic config gallery \ -psprint/driver psprint/fontmetric template \ +psprint/driver template \ uno_packages/cache wordbook); do \ mkdir -p assets/presets/$$D ; \ echo content assets/presets/$$D/stamp; \ diff --git a/config_host.mk.in b/config_host.mk.in index 49977f1..e517785 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -577,7 +577,6 @@ export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@ export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@ export WINDRES=@WINDRES@ export WINEGCC=@WINEGCC@ -export WITHOUT_AFMS=@WITHOUT_AFMS@ export WITHOUT_PPDS=@WITHOUT_PPDS@ export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@ export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@ diff --git a/configure.ac b/configure.ac index 3f9b913..3b9abe9 100644 --- a/configure.ac +++ b/configure.ac @@ -1396,13 +1396,6 @@ AC_ARG_WITH(ppds, PPDs are known to be already available (every recent distro with CUPS backend).]), ,) -AC_ARG_WITH(afms, -AS_HELP_STRING([--without-afms], -[Removes bitmap font files from LibreOffice installation set, for people - building for specific distributions where AFM files or TrueType Fonts - are known to be available.]), -,) - AC_ARG_WITH(epm, AS_HELP_STRING([--with-epm], [Decides which epm to use. Default is to use the one from the system if @@ -11483,20 +11476,6 @@ fi AC_SUBST(WITHOUT_PPDS) dnl === -dnl Test whether to include afms -dnl === -AC_MSG_CHECKING([whether to include AFMs]) -if test $with_afms != no; then -AC_MSG_RESULT([yes]) -BUILD_TYPE=$BUILD_TYPE AFMS -else -AC_MSG_RESULT([no]) -WITHOUT_AFMS=YES -SCPDEFS=$SCPDEFS -DWITHOUT_AFMS -fi -AC_SUBST(WITHOUT_AFMS) - -dnl === dnl Test whether to include extra galleries dnl === AC_MSG_CHECKING([whether to include extra galleries]) diff --git a/download.lst b/download.lst index 03fe799..74ff6f1 100644 --- a/download.lst +++ b/download.lst @@ -25,7 +25,6 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 -export AFMS_TARBALL :=
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu | 54 - 1 file changed, 27 insertions(+), 27 deletions(-) New commits: commit 06299d6c1620e5b2f2a3588d7c93790278397cbd Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Sun Dec 1 17:53:05 2013 +0100 Prefer the Liberation fonts over Arial/Times The new Writer template was supposed to use the Liberation fonts: http://nabble.documentfoundation.org/Default-Writer-Template-td4076271.html So I changed the defaults to prefer them over their MS equivalents. When they are not available, they will be substituted as used. This should not cause problems since the Liberation Fonts have the same metrics as Times, Arial and Courier New. Change-Id: I00dc14db2aee3b6f57eec7b6f93b69fcf8e5c2cc Reviewed-on: https://gerrit.libreoffice.org/6886 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 71ff091..ec48498 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -58,25 +58,25 @@ node oor:name=DefaultFonts node oor:name=en oor:op=replace prop oor:name=LATIN_DISPLAY oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=CJK_DISPLAY oor:type=xs:string oor:op=replace valueMS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;AR PL ShanHeiSun Uni;MS PGothic;Arial Unicode MS;Lucida Sans Unicode;Tahoma/value /prop prop oor:name=LATIN_HEADING oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=LATIN_FIXED oor:type=xs:string oor:op=replace -valueCumberland AMT;Cumberland;Courier New;Cousine;Liberation Mono;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced/value +valueLiberation Mono;Cumberland AMT;Cumberland;Courier New;Cousine;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced/value /prop prop oor:name=LATIN_PRESENTATION oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=LATIN_SPREADSHEET oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=LATIN_TEXT oor:type=xs:string oor:op=replace -valueThorndale AMT;Thorndale;Times New Roman;Tinos;Liberation Serif;Nimbus Roman No9 L;DejaVu Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif/value +valueLiberation Serif;Thorndale AMT;Thorndale;Times New Roman;Tinos;Nimbus Roman No9 L;DejaVu Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif/value /prop prop oor:name=CJK_HEADING oor:type=xs:string oor:op=replace valueHG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;AR PL ShanHeiSun Uni;Arial Unicode MS;Lucida Sans Unicode;Tahoma/value @@ -103,22 +103,22 @@ valueTahoma;Lucidasans;Lucida Sans;Arial Unicode MS/value /prop prop oor:name=SANS oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value
[Libreoffice-commits] core.git: 2 commits - filter/qa sw/inc
filter/qa/cppunit/data/tiff/fail/CVE-2013-3906-1.tiff |binary
sw/inc/splargs.hxx| 57 ++
2 files changed, 32 insertions(+), 25 deletions(-)
New commits:
commit bcd6496d0ec5f25e2e371f50e355344c289c158e
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 4 10:43:23 2013 +
add test-case for CVE-2013-3906-1.tiff
Change-Id: I2cac26f3e949cbef16fb0c03e99d6aa9b04a7553
diff --git a/filter/qa/cppunit/data/tiff/fail/CVE-2013-3906-1.tiff
b/filter/qa/cppunit/data/tiff/fail/CVE-2013-3906-1.tiff
new file mode 100644
index 000..a770499
Binary files /dev/null and
b/filter/qa/cppunit/data/tiff/fail/CVE-2013-3906-1.tiff differ
commit 171653e4b71e236ba0e053b5c74f89baacc50482
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 4 09:23:59 2013 +
remove unnecessary inline keyword
Change-Id: I00a0c94dd9131be3969e2cfd1320682774dced3f
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index fae40a1..03938d2 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -128,8 +128,8 @@ class SwInterHyphInfo
{
::css::uno::Reference ::css::linguistic2::XHyphenatedWord xHyphWord;
const Point aCrsrPos;
-sal_BoolbNoLang : 1;
-sal_BoolbCheck : 1;
+bool bNoLang : 1;
+bool bCheck : 1;
public:
sal_Int32 nStart;
sal_Int32 nEnd;
@@ -138,31 +138,38 @@ public:
sal_Int32 nHyphPos;
sal_uInt16 nMinTrail;
-inline SwInterHyphInfo( const Point rCrsrPos,
-sal_Int32 nStartPos = 0,
-sal_Int32 nLength = SAL_MAX_INT32 )
- : aCrsrPos( rCrsrPos ),
- bNoLang(sal_False), bCheck(sal_False),
- nStart(nStartPos),
- nEnd( nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 : nStartPos +
nLength ),
- nWordStart(0), nWordLen(0),
- nHyphPos(0), nMinTrail(0)
- { }
-inline sal_Int32 GetEnd() const
-{ return nEnd; }
-inline const Point *GetCrsrPos() const
-{ return aCrsrPos.X() || aCrsrPos.Y() ? aCrsrPos : 0; }
-inline sal_Bool IsCheck() const { return bCheck; }
-inline void SetCheck( const sal_Bool bNew ) { bCheck = bNew; }
-inline void SetNoLang( const sal_Bool bNew ) { bNoLang = bNew; }
-
-inline void SetHyphWord(const ::css::uno::Reference
::css::linguistic2::XHyphenatedWord rxHW)
-{ xHyphWord = rxHW; }
-inline ::css::uno::Reference ::css::linguistic2::XHyphenatedWord
GetHyphWord()
-{ return xHyphWord; }
+SwInterHyphInfo( const Point rCrsrPos, sal_Int32 nStartPos = 0,
+sal_Int32 nLength = SAL_MAX_INT32 )
+: aCrsrPos(rCrsrPos)
+, bNoLang(false)
+, bCheck(false)
+, nStart(nStartPos)
+, nEnd(nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 : nStartPos + nLength)
+, nWordStart(0), nWordLen(0)
+, nHyphPos(0), nMinTrail(0)
+{
+}
+sal_Int32 GetEnd() const
+{
+return nEnd;
+}
+const Point *GetCrsrPos() const
+{
+return aCrsrPos.X() || aCrsrPos.Y() ? aCrsrPos : 0;
+}
+bool IsCheck() const { return bCheck; }
+void SetCheck( const bool bNew ) { bCheck = bNew; }
+void SetNoLang( const bool bNew ) { bNoLang = bNew; }
+void SetHyphWord(const ::css::uno::Reference
::css::linguistic2::XHyphenatedWord rxHW)
+{
+xHyphWord = rxHW;
+}
+::css::uno::Reference ::css::linguistic2::XHyphenatedWord GetHyphWord()
+{
+return xHyphWord;
+}
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/outdev.h |1 -
1 file changed, 1 deletion(-)
New commits:
commit 14d49ded7177856f095d665edec92ddee5dbb86c
Author: Tor Lillqvist t...@collabora.com
Date: Wed Dec 4 13:08:30 2013 +0200
WaE: private field 'mbPrinter' is not used
Change-Id: I78b364394b3bedafe66b2b72b3191a8ae778432b
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 2d145fe..4b3ec17 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -202,7 +202,6 @@ class ImplFontCache
private:
ImplFontEntry* mpFirstEntry;
int mnRef0Count;// number of unreferenced
ImplFontEntries
-boolmbPrinter;
// cache of recently used font instances
struct IFSD_Equal { bool operator()( const FontSelectPattern, const
FontSelectPattern ) const; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu | 54 - 1 file changed, 27 insertions(+), 27 deletions(-) New commits: commit d54c7b5c373753f990e53f0342bf87e910902eaf Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Sun Dec 1 17:53:05 2013 +0100 Prefer the Liberation fonts over Arial/Times The new Writer template was supposed to use the Liberation fonts: http://nabble.documentfoundation.org/Default-Writer-Template-td4076271.html So I changed the defaults to prefer them over their MS equivalents. When they are not available, they will be substituted as used. This should not cause problems since the Liberation Fonts have the same metrics as Times, Arial and Courier New. Change-Id: I00dc14db2aee3b6f57eec7b6f93b69fcf8e5c2cc Reviewed-on: https://gerrit.libreoffice.org/6886 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 06299d6c1620e5b2f2a3588d7c93790278397cbd) diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 71ff091..ec48498 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -58,25 +58,25 @@ node oor:name=DefaultFonts node oor:name=en oor:op=replace prop oor:name=LATIN_DISPLAY oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=CJK_DISPLAY oor:type=xs:string oor:op=replace valueMS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;AR PL ShanHeiSun Uni;MS PGothic;Arial Unicode MS;Lucida Sans Unicode;Tahoma/value /prop prop oor:name=LATIN_HEADING oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=LATIN_FIXED oor:type=xs:string oor:op=replace -valueCumberland AMT;Cumberland;Courier New;Cousine;Liberation Mono;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced/value +valueLiberation Mono;Cumberland AMT;Cumberland;Courier New;Cousine;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced/value /prop prop oor:name=LATIN_PRESENTATION oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=LATIN_SPREADSHEET oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value /prop prop oor:name=LATIN_TEXT oor:type=xs:string oor:op=replace -valueThorndale AMT;Thorndale;Times New Roman;Tinos;Liberation Serif;Nimbus Roman No9 L;DejaVu Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif/value +valueLiberation Serif;Thorndale AMT;Thorndale;Times New Roman;Tinos;Nimbus Roman No9 L;DejaVu Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif/value /prop prop oor:name=CJK_HEADING oor:type=xs:string oor:op=replace valueHG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;AR PL ShanHeiSun Uni;Arial Unicode MS;Lucida Sans Unicode;Tahoma/value @@ -103,22 +103,22 @@ valueTahoma;Lucidasans;Lucida Sans;Arial Unicode MS/value /prop prop oor:name=SANS oor:type=xs:string oor:op=replace -valueAlbany AMT;Albany;Arial;Arimo;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif/value +valueLiberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu
[Libreoffice-commits] core.git: oox/source sw/qa writerfilter/source
oox/source/drawingml/shapecontext.cxx |1 +
oox/source/drawingml/textbodycontext.cxx |4
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2 ++
4 files changed, 11 insertions(+)
New commits:
commit cbeb028519d0383ae3089c48f9ceefe9ee817188
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Dec 4 11:49:33 2013 +0100
DOCX import: parse drawingML group shapes in oox only
This is similar to commit d5c934d150cb6cea5f96cbbee4fb5e8312bf027e
(n#792778 DOCX import: parse group shapes in oox only, 2012-12-14),
except that was for the VML importer.
The only difference is that in case of drawingML,
OOXMLFastContextHandlerShape::lcl_createFastChildContext() is only
called for the children of the group shape, not for the element itself,
so compare against the start token, not the current element.
Change-Id: Iddeabb20bbd5f0153e2fc4e6df463830126fdd37
diff --git a/oox/source/drawingml/shapecontext.cxx
b/oox/source/drawingml/shapecontext.cxx
index 7a1de2d..7d6971f 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -93,6 +93,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32
aElementToken, const
return new ShapeStyleContext( *this, *mpShapePtr );
case XML_txBody:
+case XML_txbxContent:
{
TextBodyPtr xTextBody( new TextBody );
mpShapePtr-setTextBody( xTextBody );
diff --git a/oox/source/drawingml/textbodycontext.cxx
b/oox/source/drawingml/textbodycontext.cxx
index 80e5657..a276ca1 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -62,6 +62,7 @@ ContextHandlerRef TextParagraphContext::onCreateContext(
sal_Int32 aElementToken
switch( aElementToken )
{
case A_TOKEN( r ): // CT_RegularTextRun Regular Text Run.
+case OOX_TOKEN( doc, r ):
{
TextRunPtr pRun( new TextRun );
mrParagraph.addRun( pRun );
@@ -104,6 +105,7 @@ void RegularTextRunContext::onEndElement( )
switch( getCurrentElement() )
{
case A_TOKEN( t ):
+case OOX_TOKEN( doc, t ):
{
mbIsInText = false;
break;
@@ -135,6 +137,7 @@ ContextHandlerRef RegularTextRunContext::onCreateContext(
sal_Int32 aElementToke
case A_TOKEN( rPr ):// CT_TextCharPropertyBag The text char
properties of this text run.
return new TextCharacterPropertiesContext( *this, rAttribs,
mpRunPtr-getTextCharacterProperties() );
case A_TOKEN( t ): // xsd:string minOccurs=1 The actual text
string.
+case OOX_TOKEN( doc, t ):
mbIsInText = true;
break;
}
@@ -161,6 +164,7 @@ ContextHandlerRef TextBodyContext::onCreateContext(
sal_Int32 aElementToken, con
case A_TOKEN( lstStyle ): // CT_TextListStyle
return new TextListStyleContext( *this, mrTextBody.getTextListStyle()
);
case A_TOKEN( p ): // CT_TextParagraph
+case OOX_TOKEN( doc, p ):
return new TextParagraphContext( *this, mrTextBody.addParagraph() );
}
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index b0903b6..9951ef1 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1561,6 +1561,10 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly,
textbox-wpg-only.docx)
// The relativeFrom attribute was ignored for groupshapes, i.e. these were
text::RelOrientation::FRAME.
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xShape, HoriOrientRelation));
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xShape, VertOrientRelation));
+
+// The 3 paragraphs on the rectangles inside the groupshape ended up in the
+// body text, make sure we don't have multiple paragraphs there anymore.
+CPPUNIT_ASSERT_EQUAL(1, getParagraphs()); // was 4
}
DECLARE_OOXMLIMPORT_TEST(testFdo70457, fdo70457.docx)
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 5cdcef4..14787f7 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -2156,6 +2156,8 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext
uno::Reference xml::sax::XFastContextHandler xContextHandler;
bool bGroupShape = Element == Token_t(NS_vml | OOXML_group);
+// drawingML version also counts as a group shape.
+bGroupShape |= mrShapeContext-getStartToken() == Token_t(NS_wpg |
OOXML_wgp);
sal_uInt32 nNamespace = Element 0x;
switch (nNamespace)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: svx/source svx/uiconfig svx/UIConfig_svx.mk
svx/UIConfig_svx.mk |4 ++
svx/source/dialog/_contdlg.cxx| 10 ++---
svx/source/dialog/contdlg.hrc |4 --
svx/source/dialog/contdlg.src | 21 --
svx/uiconfig/ui/querydeletecontourdialog.ui | 36 ++
svx/uiconfig/ui/querynewcontourdialog.ui | 34 +
svx/uiconfig/ui/querysavecontchangesdialog.ui | 52 ++
svx/uiconfig/ui/queryunlinkgraphicsdialog.ui | 35 +
8 files changed, 166 insertions(+), 30 deletions(-)
New commits:
commit 6931f431331d4cb5b5619c29d5f615f4245a66be
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date: Wed Dec 4 13:40:46 2013 +0300
convert Contour queryboxes to .ui
Change-Id: Ie6dad2409a7d58a1c01973e8740f436cb597cb99
Reviewed-on: https://gerrit.libreoffice.org/6923
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 1780983..fb29eb1 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -21,6 +21,10 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
+ svx/uiconfig/ui/querydeletecontourdialog \
+ svx/uiconfig/ui/querynewcontourdialog \
+ svx/uiconfig/ui/querysavecontchangesdialog \
+ svx/uiconfig/ui/queryunlinkgraphicsdialog \
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index d0fcd9e..a3051b4 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -43,6 +43,7 @@
#include vcl/svapp.hxx
#include vcl/virdev.hxx
#include dlgunit.hxx
+#include vcl/layout.hxx
SFX_IMPL_FLOATINGWINDOW_WITHID( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
@@ -303,8 +304,7 @@ sal_Bool SvxSuperContourDlg::Close()
if ( aTbx1.IsItemEnabled( TBI_APPLY ) )
{
-QueryBoxaQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES,
- CONT_RESID(STR_CONTOURDLG_MODIFY).toString() );
+MessageDialog aQBox(
this,QuerySaveContourChangesDialog,svx/ui/querysavecontchangesdialog.ui);
const long nRet = aQBox.Execute();
if ( nRet == RET_YES )
@@ -439,7 +439,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx
)
{
if ( aTbx1.IsItemChecked( TBI_WORKPLACE ) )
{
-QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO,
CONT_RESID(STR_CONTOURDLG_WORKPLACE).toString() );
+MessageDialog aQBox(
this,QueryDeleteContourDialog,svx/ui/querydeletecontourdialog.ui);
if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() ==
RET_YES ) )
aContourWnd.SetWorkplaceMode( sal_True );
@@ -535,7 +535,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx
)
aStbStatus.Invalidate();
else if ( bGraphicLinked )
{
-QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES,
CONT_RESID(STR_CONTOURDLG_LINKED).toString() );
+MessageDialog aQBox(
this,QueryUnlinkGraphicsDialog,svx/ui/queryunlinkgraphicsdialog.ui);
if ( aQBox.Execute() != RET_YES )
{
@@ -733,7 +733,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl,
ContourWindow*, pWnd )
if( !!aMask )
{
-QueryBoxaQBox( this, WB_YES_NO | WB_DEF_YES,
CONT_RESID(STR_CONTOURDLG_NEWPIPETTE).toString() );
+MessageDialog aQBox(
this,QueryNewContourDialog,svx/ui/querynewcontourdialog.ui);
sal_BoolbNewContour;
aRedoGraphic = Graphic();
diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc
index 07afc01..aec18aa 100644
--- a/svx/source/dialog/contdlg.hrc
+++ b/svx/source/dialog/contdlg.hrc
@@ -61,9 +61,5 @@
/**/
-#define STR_CONTOURDLG_MODIFY (RID_SVX_CONTOURDLG_START + 2)
-#define STR_CONTOURDLG_NEWPIPETTE (RID_SVX_CONTOURDLG_START + 3)
-#define STR_CONTOURDLG_WORKPLACE(RID_SVX_CONTOURDLG_START + 4)
-#define STR_CONTOURDLG_LINKED (RID_SVX_CONTOURDLG_START + 5)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index 41bee84..519b73c 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -220,26 +220,5 @@ FloatingWindow RID_SVXDLG_CONTOUR
};
/**/
-String STR_CONTOURDLG_MODIFY
-{
-Text [ en-US ] = The contour has been modified.\nDo you want to save the
changes? ;
-};
-
-String
Re: deadlock writing to stdout in remotely controlled soffice
Hi Markus, On Wednesday, 2013-12-04 07:13:47 +0100, Markus Mohrhard wrote: My build on that machine is about two weeks old and it seems like I'm able to reproduce the problem each time I hit the same file. Seeing Calc document load there.. if it started to behave that way ~2 weeks ago and worked before, it might be related to an unreleased SolarMutex fixed with e56105a1f24e9eac491c32c841030c69fb2e2d30 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpSRdAOxHO2U.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: locking foo ...
On Wed, 2013-12-04 at 12:13 +0200, Noel Grandin wrote: On 2013-12-04 11:38, Michael Meeks wrote: Of course, an alternative might be to have a GUI thread that does nothing but run a main-loop, never executing any code - such that we can always safely yield, and/or create/destroy windows/GCs etc. ... Wasn't the idea that (a) we were going to gradually migrate to running everything on the same thread, Well - this would be ideal of course =) (b) except for the handful of places where parallelism is truly beneficial And there are a number of those particularly in import / export. (c) and for those parallel places, each parallel chunk would live in it's own little island, interacting as little as possible with the main thread. Which of course is an ideal way to do threading =) Or am I merely projecting my own design ideas onto the past discussions :-) Sure - the question really is how best to deal with the mess we have currently. It's not entirely clear that the above scenario is even achievable with the functionality we've exposed to eg. scripting / Java users today =) someone needs to sit down and carefully work through every threading use-case, and use of the SolarMutex across all the code. Then they need to unwind the UNO appartment model (which was originally intended to be some sort of solution here), and finally all the platform toolkit's thread safety / affinity functionality in this area - which is really not a trivial task. When we have all of that understood - at least in one brain, we can (perhaps) work out what to do for the best =) ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/SpellDialog.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f8d96ebdf71f74c3608e2c6d7cc889a055ed3c2c
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 4 11:42:11 2013 +
Resolves: fdo#72258 options is .ui now, so drop SfxNoLayoutSingleTabDialog
Change-Id: Ie1def5b116c4b998e62f840b992633a8c0d4d61a
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 8c7c59c..5264750 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -502,11 +502,11 @@ void SpellDialog::StartSpellOptDlg_Impl()
};
SfxItemSet aSet( SFX_APP()-GetPool(), aSpellInfos);
aSet.Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL ));
-SfxNoLayoutSingleTabDialog* pDlg =
-new SfxNoLayoutSingleTabDialog( this, aSet, RID_SFXPAGE_LINGU );
-SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg, aSet );
+SfxSingleTabDialog* pDlg =
+new SfxSingleTabDialog(this, aSet);
+SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg-get_content_area(),
aSet );
( (SvxLinguTabPage*)pPage )-HideGroups( GROUP_MODULES );
-pDlg-SetTabPage( pPage );
+pDlg-setTabPage( pPage );
if(RET_OK == pDlg-Execute())
{
InitUserDicts();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/source
cui/source/dialogs/SpellDialog.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 29fb1ed95cbd1a0baf54f8b3ce337c6f46de8e39
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 4 11:42:11 2013 +
Resolves: fdo#72258 options is .ui now, so drop SfxNoLayoutSingleTabDialog
Change-Id: Ie1def5b116c4b998e62f840b992633a8c0d4d61a
(cherry picked from commit f8d96ebdf71f74c3608e2c6d7cc889a055ed3c2c)
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 8c7c59c..5264750 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -502,11 +502,11 @@ void SpellDialog::StartSpellOptDlg_Impl()
};
SfxItemSet aSet( SFX_APP()-GetPool(), aSpellInfos);
aSet.Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL ));
-SfxNoLayoutSingleTabDialog* pDlg =
-new SfxNoLayoutSingleTabDialog( this, aSet, RID_SFXPAGE_LINGU );
-SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg, aSet );
+SfxSingleTabDialog* pDlg =
+new SfxSingleTabDialog(this, aSet);
+SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg-get_content_area(),
aSet );
( (SvxLinguTabPage*)pPage )-HideGroups( GROUP_MODULES );
-pDlg-SetTabPage( pPage );
+pDlg-setTabPage( pPage );
if(RET_OK == pDlg-Execute())
{
InitUserDicts();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/filter/ww8/rtfexport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8807ba77453962dddeceba28ca3d5ad8633d7090 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 4 10:51:48 2013 +0100 SwRTFWriter: fix string conversion Regression from 02bfed8a53556badfea637930b05d923cf9465f2 (convert sw/source/filter/ww8/*.cxx from String to OUString, 2013-10-14), check for string length before invoking OUString::operator[]. This can be reproduced if copypasting some text inside a Writer doc from normal text to rectangle shapes inside group shapes. Change-Id: Ia8f774b27ca63773792e6af913dfe7e493bea4b8 (cherry picked from commit 1da04bd7a8a804cbfb1d01a3102b1b76cc557122) diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 05647b9..93a1cf3 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1178,7 +1178,7 @@ SwRTFWriter::SwRTFWriter( const OUString rFltName, const OUString rBaseURL ) SAL_INFO(sw.rtf, OSL_THIS_FUNC); SetBaseURL( rBaseURL ); // export outline nodes, only (send outline to clipboard/presentation) -m_bOutOutlineOnly = 'O' == rFltName[0]; +m_bOutOutlineOnly = (!rFltName.isEmpty() 'O' == rFltName[0]); } SwRTFWriter::~SwRTFWriter() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/access/acccontext.cxx |3 ++-
sw/source/core/access/accpara.cxx|3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 5802b1bd0725151d3fa0ea311cf4405fb58ff409
Author: Steve Yin stev...@apache.org
Date: Wed Dec 4 10:09:58 2013 +
i121761 - [ia2] Writer crashes on exit with an msvcrt runtime error
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index 039512a..da80a18 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -588,7 +588,8 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap
*pM,
SwAccessibleContext::~SwAccessibleContext()
{
-vos::OGuard aGuard(Application::GetSolarMutex());
+if(Application::GetUnoWrapper())
+vos::OGuard aGuard(Application::GetSolarMutex());
DBG_MSG_CD( destructed )
RemoveFrmFromAccessibleMap();
diff --git a/sw/source/core/access/accpara.cxx
b/sw/source/core/access/accpara.cxx
index ac0c5f1..5dff84d 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -594,7 +594,8 @@ SwAccessibleParagraph::SwAccessibleParagraph(
SwAccessibleParagraph::~SwAccessibleParagraph()
{
-vos::OGuard aGuard(Application::GetSolarMutex());
+if(Application::GetUnoWrapper())
+vos::OGuard aGuard(Application::GetSolarMutex());
delete pPortionData;
delete pHyperTextData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: locking foo ...
On 2013-12-04 13:36, Michael Meeks wrote:
Sure - the question really is how best to deal with the mess we have currently. It's not entirely clear that the above
scenario is even achievable with the functionality we've exposed to eg. scripting / Java users today =) someone needs
to sit down and carefully work through every threading use-case, and use of the SolarMutex across all the code. Then
they need to unwind the UNO appartment model (which was originally intended to be some sort of solution here), and
finally all the platform toolkit's thread safety / affinity functionality in this area - which is really not a
trivial task. When we have all of that understood - at least in one brain, we can (perhaps) work out what to do for
the best =) ATB, Michael.
That would be ideal, for sure.
But perhaps there is a way to get there that does not require
- genius-level IQ
- years of LO experience
- tons of time
?
Something like
(*) Change the UNO/scripting processing model to do something like
while (Message m = readMessage() != null) {
invokeOnMainThread(void f() {
processMessage(m);
});
}
(*) add a configure debug option in SolarMutex that asserts if something
touches it from outside the main thread
(*) gradually fix the places that assert until we get to a point where we can
make the option always on in debug mode.
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1 cui/source/dialogs/SpellDialog.cxx|2 cui/uiconfig/ui/spelloptionsdialog.ui | 81 ++ 3 files changed, 83 insertions(+), 1 deletion(-) New commits: commit cce14c9717e3c21a61bbd4ce620d17fa23feafa2 Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 4 12:17:21 2013 + Related: fdo#72258 re-orient dialog vertically Change-Id: I9f703e2ab5c787641e9cc62f223f39dbd5d02529 diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 4bfd0bd..c540b0e 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -127,6 +127,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/slantcornertabpage \ cui/uiconfig/ui/specialcharacters \ cui/uiconfig/ui/spellingdialog \ + cui/uiconfig/ui/spelloptionsdialog \ cui/uiconfig/ui/splitcellsdialog \ cui/uiconfig/ui/storedwebconnectiondialog \ cui/uiconfig/ui/swpossizepage \ diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 5264750..5eb92a3 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -503,7 +503,7 @@ void SpellDialog::StartSpellOptDlg_Impl() SfxItemSet aSet( SFX_APP()-GetPool(), aSpellInfos); aSet.Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL )); SfxSingleTabDialog* pDlg = -new SfxSingleTabDialog(this, aSet); +new SfxSingleTabDialog(this, aSet, SpellOptionsDialog, cui/ui/spelloptionsdialog.ui); SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg-get_content_area(), aSet ); ( (SvxLinguTabPage*)pPage )-HideGroups( GROUP_MODULES ); pDlg-setTabPage( pPage ); diff --git a/cui/uiconfig/ui/spelloptionsdialog.ui b/cui/uiconfig/ui/spelloptionsdialog.ui new file mode 100644 index 000..1d013cd --- /dev/null +++ b/cui/uiconfig/ui/spelloptionsdialog.ui @@ -0,0 +1,81 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=SpellOptionsDialog +property name=can_focusFalse/property +property name=border_width6/property +property name=title translatable=yesOptions/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing12/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=layout_styleend/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=can_defaultTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + placeholder/ +/child + /object +/child +action-widgets + action-widget response=0ok/action-widget + action-widget response=0cancel/action-widget +
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1 cui/source/dialogs/SpellDialog.cxx|2 cui/uiconfig/ui/spelloptionsdialog.ui | 81 ++ 3 files changed, 83 insertions(+), 1 deletion(-) New commits: commit d517ac379f0fa6ee77bdbb3940c6ffb840032c0b Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 4 12:17:21 2013 + Related: fdo#72258 re-orient dialog vertically Change-Id: I9f703e2ab5c787641e9cc62f223f39dbd5d02529 (cherry picked from commit cce14c9717e3c21a61bbd4ce620d17fa23feafa2) diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index d985912..3f78962 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -125,6 +125,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/slantcornertabpage \ cui/uiconfig/ui/specialcharacters \ cui/uiconfig/ui/spellingdialog \ + cui/uiconfig/ui/spelloptionsdialog \ cui/uiconfig/ui/splitcellsdialog \ cui/uiconfig/ui/storedwebconnectiondialog \ cui/uiconfig/ui/swpossizepage \ diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 5264750..5eb92a3 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -503,7 +503,7 @@ void SpellDialog::StartSpellOptDlg_Impl() SfxItemSet aSet( SFX_APP()-GetPool(), aSpellInfos); aSet.Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL )); SfxSingleTabDialog* pDlg = -new SfxSingleTabDialog(this, aSet); +new SfxSingleTabDialog(this, aSet, SpellOptionsDialog, cui/ui/spelloptionsdialog.ui); SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg-get_content_area(), aSet ); ( (SvxLinguTabPage*)pPage )-HideGroups( GROUP_MODULES ); pDlg-setTabPage( pPage ); diff --git a/cui/uiconfig/ui/spelloptionsdialog.ui b/cui/uiconfig/ui/spelloptionsdialog.ui new file mode 100644 index 000..1d013cd --- /dev/null +++ b/cui/uiconfig/ui/spelloptionsdialog.ui @@ -0,0 +1,81 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=SpellOptionsDialog +property name=can_focusFalse/property +property name=border_width6/property +property name=title translatable=yesOptions/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing12/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=layout_styleend/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=can_defaultTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + placeholder/ +/child + /object +/child +action-widgets + action-widget
LibO 4.2.0.0 - Configuration page
Hey there, I just play a little with the upcomming Version 4.2.0.0. Nice feature - this configuration window :) But - please - make this activation button under tools - options - Libo - Advanced - Expert Config page configurable with config-files (*.xcd files, stored in programm-installation - share/registry). configurable means, that it must be possible to hide or to disable this button and that feature! Reason: This is a killing feature for using LibreOffice in bigger organisations. Those Organisations do have own policies and there is no interest, that every user can change features and options by himself. For example: update, securitity, pathes and so on. Best regards Thomas -- ## Unterstützung der freien Office Suite ## http://de.libreOffice.org - www.LibreOffice.org ## Vorstand Freies Office Deutschland e.V. ## Mitglieder willkommen: www.FroDeV.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 58/02b1bd0725151d3fa0ea311cf4405fb58ff409
58/02b1bd0725151d3fa0ea311cf4405fb58ff409 |1 + 1 file changed, 1 insertion(+) New commits: commit b7801028baa571d12ba74115af9543580470de8a Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 4 12:34:56 2013 + Notes added by 'git notes add' diff --git a/58/02b1bd0725151d3fa0ea311cf4405fb58ff409 b/58/02b1bd0725151d3fa0ea311cf4405fb58ff409 new file mode 100644 index 000..846694c --- /dev/null +++ b/58/02b1bd0725151d3fa0ea311cf4405fb58ff409 @@ -0,0 +1 @@ +reject: thats just crack ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: locking foo ...
On 12/04/2013 01:13 PM, Noel Grandin wrote:
(*) Change the UNO/scripting processing model to do something like
while (Message m = readMessage() != null) {
invokeOnMainThread(void f() {
processMessage(m);
});
}
...which deadlocks as soon as you have a synchronous call chain - A -
B - C where A and C are local and B is a callback to the remote site.
I have very little hopes that any automatic scheme will bring success
here. The only model that would IMO work is to have a single-threaded
GUI (as virtually everybody else does too, for a reason), in the one
direction offloading potentially time-consuming activities triggered by
the GUI event loop to additional threads, and in the other direction
dispatching GUI activities required by non-GUI code (e.g., URP,
scripting) to the GUI event loop, explicitly coded.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: What is the baseline for sdremote?
Hi Christian, The lowest supported API version is 10, it is declared at the AndroidManifest.xml as minSdkVersion. Regards, Artur. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/gdi/salgdicommon.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0d9bd19c5b1740b41581faba9f78e7ea56143c83 Author: Tor Lillqvist t...@collabora.com Date: Wed Dec 4 15:09:57 2013 +0200 Add a comment Change-Id: Icd7ecafa46392133b8f6b82574a699e843ce588f diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx index 4b911d7..7e7e56f 100644 --- a/vcl/aqua/source/gdi/salgdicommon.cxx +++ b/vcl/aqua/source/gdi/salgdicommon.cxx @@ -719,6 +719,7 @@ void AquaSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 ) CGContextDrawPath( mrContext, kCGPathStroke ); Rectangle aRefreshRect( nX1, nY1, nX2, nY2 ); +// Is a call to RefreshRect( aRefreshRect ) missing here? } void AquaSalGraphics::drawMask( const SalTwoRect rPosAry, const SalBitmap rSalBitmap, SalColor nMaskColor ) ___ 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/access/accmap.cxx | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit f141505929c95c97ae4765d7c7221f07e41ef8e7
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 4 13:10:16 2013 +
Relater: rhbz#903281 NULL follow frames on drag/drop
Change-Id: I50319fb218518edd23ff8c859c355265595050d6
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index a79b2d6..ce9d912 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -815,12 +815,18 @@ static bool AreInSameTable( const uno::Reference
XAccessible rAcc,
if( pAccImpl-GetFrm()-IsCellFrm() )
{
const SwTabFrm *pTabFrm1 = pAccImpl-GetFrm()-FindTabFrm();
-while( pTabFrm1-GetFollow() )
- pTabFrm1 = pTabFrm1-GetFollow();
+if (pTabFrm1)
+{
+while (pTabFrm1-GetFollow())
+pTabFrm1 = pTabFrm1-GetFollow();
+}
const SwTabFrm *pTabFrm2 = pFrm-FindTabFrm();
-while( pTabFrm2-GetFollow() )
- pTabFrm2 = pTabFrm2-GetFollow();
+if (pTabFrm2)
+{
+while (pTabFrm2-GetFollow())
+pTabFrm2 = pTabFrm2-GetFollow();
+}
bRet = (pTabFrm1 == pTabFrm2);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/core/access/accmap.cxx | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 2bb2c1ee976aacf7d07e00e123c34c58d3c2bd5e
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 4 13:10:16 2013 +
Relater: rhbz#903281 NULL follow frames on drag/drop
Change-Id: I50319fb218518edd23ff8c859c355265595050d6
(cherry picked from commit f141505929c95c97ae4765d7c7221f07e41ef8e7)
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b8a2ce5..8829214 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -744,12 +744,18 @@ static bool AreInSameTable( const uno::Reference
XAccessible rAcc,
if( pAccImpl-GetFrm()-IsCellFrm() )
{
const SwTabFrm *pTabFrm1 = pAccImpl-GetFrm()-FindTabFrm();
-while( pTabFrm1-GetFollow() )
- pTabFrm1 = pTabFrm1-GetFollow();
+if (pTabFrm1)
+{
+while (pTabFrm1-GetFollow())
+pTabFrm1 = pTabFrm1-GetFollow();
+}
const SwTabFrm *pTabFrm2 = pFrm-FindTabFrm();
-while( pTabFrm2-GetFollow() )
- pTabFrm2 = pTabFrm2-GetFollow();
+if (pTabFrm2)
+{
+while (pTabFrm2-GetFollow())
+pTabFrm2 = pTabFrm2-GetFollow();
+}
bRet = (pTabFrm1 == pTabFrm2);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: locking foo ...
On 2013-12-04 14:36, Stephan Bergmann wrote:
On 12/04/2013 01:13 PM, Noel Grandin wrote:
(*) Change the UNO/scripting processing model to do something like
while (Message m = readMessage() != null) {
invokeOnMainThread(void f() {
processMessage(m);
});
}
...which deadlocks as soon as you have a synchronous call chain - A - B - C where A and C are local and B is a
callback to the remote site.
I have very little hopes that any automatic scheme will bring success here. The only model that would IMO work is
to have a single-threaded GUI (as virtually everybody else does too, for a reason), in the one direction offloading
potentially time-consuming activities triggered by the GUI event loop to additional threads, and in the other
direction dispatching GUI activities required by non-GUI code (e.g., URP, scripting) to the GUI event loop, explicitly
coded.
I think we're mostly talking about the same solution (i.e. single-threaded GUI).
Personally I think we should we ban the kind of synchronous call chain you specify above, but if we absolutely have to
support it, it can still fit into my suggestion using something like (not my idea, copied from other message pump
architectures I have seen) :
void sendMessageAndWaitForReply(Message m) {
sendToSocketAsynchronous(m); // very important, don't want to block here if
the socket buffer is full
if (running on main thread) {
while (true) {
waitForMainThreadAndSocket();
if (wokenUpBecauseOfMainThread()) {
processAnyEventsFromMainThread();
}
if (wokenUpBecauseOfSocket()) {
processIncomingMessageFromSocket();
break;
}
}
} else {
waitForSocket();
processIncomingMessageFromSocket();
}
}
i.e. run a subsidiary message pump.
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libcmis
external/libcmis/UnpackedTarball_cmis.mk|3 external/libcmis/libcmis-0.4.1-properties-fix.patch | 280 2 files changed, 282 insertions(+), 1 deletion(-) New commits: commit e8df1838ec2d4aa52522334e94e77fae00223490 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Wed Dec 4 11:09:45 2013 +0100 fdo#62531: checkout failed due to bad import of properties in libcmis Change-Id: Ic9477039d7a1d9649487be634052608efe0d07b7 diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk index 75f5753..bbac1ac 100644 --- a/external/libcmis/UnpackedTarball_cmis.mk +++ b/external/libcmis/UnpackedTarball_cmis.mk @@ -15,7 +15,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0)) $(eval $(call gb_UnpackedTarball_add_patches,cmis, \ external/libcmis/libcmis-0.4.1.patch \ - external/libcmis/libcmis-0.4.1-empty-path.patch)) + external/libcmis/libcmis-0.4.1-empty-path.patch \ + external/libcmis/libcmis-0.4.1-properties-fix.patch)) ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch)) diff --git a/external/libcmis/libcmis-0.4.1-properties-fix.patch b/external/libcmis/libcmis-0.4.1-properties-fix.patch new file mode 100644 index 000..b3739e9 --- /dev/null +++ b/external/libcmis/libcmis-0.4.1-properties-fix.patch @@ -0,0 +1,280 @@ +From 958b3c763fb52d1bf2ad88c177e7e4f426aab354 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= cbo...@users.sourceforge.net +Date: Wed, 4 Dec 2013 10:44:37 +0100 +Subject: [PATCH] Object creation mixed relationship properties with document + properties + +Added a Unit test to show the problem. We surely don't want the +relationship cmis:properties to be read as properties. This bug caused +some problems with other operations like checkout. +--- + .../data/atom/test-document-relationships.xml | 179 + + qa/libcmis/test-atom.cxx | 34 + src/libcmis/object.cxx | 4 +- + 3 files changed, 215 insertions(+), 2 deletions(-) + create mode 100644 qa/libcmis/data/atom/test-document-relationships.xml + +diff --git qa/libcmis/data/atom/test-document-relationships.xml qa/libcmis/data/atom/test-document-relationships.xml +new file mode 100644 +index 000..bacfda8 +--- /dev/null qa/libcmis/data/atom/test-document-relationships.xml +@@ -0,0 +1,179 @@ ++?xml version=1.0 encoding=UTF-8? ++atom:entry xmlns:atom=http://www.w3.org/2005/Atom; xmlns:cmis=http://docs.oasis-open.org/ns/cmis/core/200908/; xmlns:cmisra=http://docs.oasis-open.org/ns/cmis/restatom/200908/; xmlns:app=http://www.w3.org/2007/app; ++ atom:author ++atom:nameunknown/atom:name ++ /atom:author ++ atom:idSome obscure Id/atom:id ++ atom:published2013-01-28T14:10:06Z/atom:published ++ atom:titleTest Document/atom:title ++ app:edited2013-01-28T14:10:06Z/app:edited ++ atom:updated2013-01-28T14:10:06Z/atom:updated ++ atom:content src=http://mockup/mock/content/data.txt?id=test-document; type=text/plain/ ++ cmisra:object xmlns:ns3=http://docs.oasis-open.org/ns/cmis/messaging/200908/; ++cmis:properties ++ cmis:propertyInteger queryName=cmis:contentStreamLength displayName=Content Length localName=cmis:contentStreamLength propertyDefinitionId=cmis:contentStreamLength ++cmis:value12345/cmis:value ++ /cmis:propertyInteger ++ cmis:propertyId queryName=cmis:objectTypeId displayName=Type-Id localName=cmis:objectTypeId propertyDefinitionId=cmis:objectTypeId ++cmis:valueDocumentLevel2/cmis:value ++ /cmis:propertyId ++ cmis:propertyString queryName=cmis:versionSeriesCheckedOutBy displayName=Checked Out By localName=cmis:versionSeriesCheckedOutBy propertyDefinitionId=cmis:versionSeriesCheckedOutBy/ ++ cmis:propertyHtml queryName=HtmlProp displayName=Sample Html Property localName=HtmlProp propertyDefinitionId=HtmlProp/ ++ cmis:propertyId queryName=cmis:versionSeriesCheckedOutId displayName=Checked Out Id localName=cmis:versionSeriesCheckedOutId propertyDefinitionId=cmis:versionSeriesCheckedOutId/ ++ cmis:propertyId queryName=IdProp displayName=Sample Id Property localName=IdProp propertyDefinitionId=IdProp/ ++ cmis:propertyUri queryName=UriProp displayName=Sample Uri Property localName=UriProp propertyDefinitionId=UriProp/ ++ cmis:propertyDateTime queryName=DateTimePropMV displayName=Sample DateTime multi-value Property localName=DateTimePropMV propertyDefinitionId=DateTimePropMV/ ++ cmis:propertyId queryName=cmis:versionSeriesId displayName=Version Series Id localName=cmis:versionSeriesId propertyDefinitionId=cmis:versionSeriesId/ ++ cmis:propertyDecimal queryName=DecimalProp
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/sfx2 sfx2/source
include/sfx2/dispatch.hxx| 33 -
sfx2/source/control/dispatch.cxx | 72 ---
2 files changed, 68 insertions(+), 37 deletions(-)
New commits:
commit 5d98639ec39f302df3dd38498703630e0556938d
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 20 16:17:54 2013 +
Resolves: fdo#70703 guard against FlushImpl inside FlushImpl
where the inner one deletes Shells that the outer one is still
processing. Push the candidates onto a stack and let inner
FlushImpl modify them to inform outer FlushImpl's that an entry
has been deleted
Change-Id: I1db8546d53e24cc96c72f2cd5cbec57b6cecaff5
Reviewed-on: https://gerrit.libreoffice.org/6735
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 2b02a5e..4cf5fb1 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -27,6 +27,7 @@
#include sfx2/bindings.hxx
#include sfx2/viewfrm.hxx
+#include deque
#include map
#include vector
@@ -76,10 +77,38 @@ public:
}
};
+struct SfxToDo_Impl
+{
+SfxShell* pCluster;
+bool bPush;
+bool bDelete;
+bool bDeleted;
+bool bUntil;
+
+SfxToDo_Impl()
+: pCluster(0)
+, bPush(false)
+, bDelete(false)
+, bDeleted(false)
+, bUntil(false)
+{}
+SfxToDo_Impl( bool bOpPush, bool bOpDelete, bool bOpUntil, SfxShell
rCluster )
+: pCluster(rCluster)
+, bPush(bOpPush)
+, bDelete(bOpDelete)
+, bDeleted(false)
+, bUntil(bOpUntil)
+{}
+
+bool operator==( const SfxToDo_Impl rWith ) const
+{ return pCluster==rWith.pCluster bPush==rWith.bPush; }
+};
+
class SFX2_DLLPUBLIC SfxDispatcher
{
-SfxDispatcher_Impl* pImp;
-sal_BoolbFlushed;
+SfxDispatcher_Impl* pImp;
+sal_Bool bFlushed;
+std::deque std::dequeSfxToDo_Impl aToDoCopyStack;
private:
// Search for temporary evaluated Todos
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 9acf705..3e10fff 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -67,31 +67,6 @@ DBG_NAME(SfxDispatcherFillState)
typedef std::vectorSfxRequest* SfxRequestPtrArray;
-struct SfxToDo_Impl
-{
-SfxShell* pCluster;
-bool bPush;
-bool bDelete;
-bool bUntil;
-
-SfxToDo_Impl()
-: pCluster(0)
-, bPush(false)
-, bDelete(false)
-, bUntil(false)
-{}
-SfxToDo_Impl( bool bOpPush, bool bOpDelete, bool bOpUntil, SfxShell
rCluster )
-: pCluster(rCluster)
-, bPush(bOpPush)
-, bDelete(bOpDelete)
-, bUntil(bOpUntil)
-{}
-~SfxToDo_Impl(){}
-
-bool operator==( const SfxToDo_Impl rWith ) const
-{ return pCluster==rWith.pCluster bPush==rWith.bPush; }
-};
-
struct SfxObjectBars_Impl
{
sal_uInt32 nResId; // Resource - and ConfigId of the Toolbox
@@ -1625,22 +1600,49 @@ void SfxDispatcher::FlushImpl()
bFlushed = sal_True;
OSL_TRACE(Successfully flushed dispatcher!);
+//fdo#70703 FlushImpl may call back into itself so use aToDoCopyStack to
talk
+//to outer levels of ourself. If DoActivate_Impl/DoDeactivate_Impl deletes
+//an entry, then they will walk back up aToDoCopyStack and set outer
+//levels's entries to bDeleted
+aToDoCopyStack.push_back(aToDoCopy);
+std::dequeSfxToDo_Impl rToDoCopy = aToDoCopyStack.back();
// Activate the Shells and possible delete them in the 2nd round
-for(std::dequeSfxToDo_Impl::reverse_iterator i = aToDoCopy.rbegin(); i
!= aToDoCopy.rend(); ++i)
-{
-if(i-bPush)
-{
-if ( pImp-bActive )
-i-pCluster-DoActivate_Impl(pImp-pFrame, sal_True);
-}
-else if ( pImp-bActive )
-i-pCluster-DoDeactivate_Impl(pImp-pFrame, sal_True);
+for(std::dequeSfxToDo_Impl::reverse_iterator i = rToDoCopy.rbegin(); i
!= rToDoCopy.rend(); ++i)
+{
+if (i-bDeleted)
+continue;
+if (!pImp-bActive)
+continue;
+if (i-bPush)
+i-pCluster-DoActivate_Impl(pImp-pFrame, sal_True);
+else
+i-pCluster-DoDeactivate_Impl(pImp-pFrame, sal_True);
}
+aToDoCopy = aToDoCopyStack.back();
+aToDoCopyStack.pop_back();
+
for(std::dequeSfxToDo_Impl::reverse_iterator i = aToDoCopy.rbegin(); i
!= aToDoCopy.rend(); ++i)
{
-if(i-bDelete)
+if (i-bDelete !i-bDeleted)
+{
+if (!aToDoCopyStack.empty())
+{
+//fdo#70703 if there is an outer FlushImpl then inform it that
+//we have deleted this cluster
+for (std::deque
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/drawingml/textcharacterproperties.cxx |2 +-
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |5 +
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 798a563db133ebed3876c245459d90ef54ee7c9a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Dec 4 14:30:43 2013 +0100
drawingml import: don't set CharEscapementHeight unconditionally
Commit 840a8573c8cebe67ddd3c9fe106c7dbd789bb334 (Fix fdo#70220
Superscript not imported from pptx., 2013-10-07) made it possible to set
CharEscapementHeight even if moBaseline is not set, but this causes
problems in the docx importer + not necessary, according to the bugdoc;
so just don't do that.
Change-Id: Ib95ac449bd8fdf6376261ddc86108f0d23f2200e
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index a8a8806..febb28c 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -116,7 +116,7 @@ void TextCharacterProperties::pushToPropMap( PropertyMap
rPropMap, const XmlFil
rPropMap[ PROP_CharStrikeout ] = GetFontStrikeout( moStrikeout.get(
XML_noStrike ) );
rPropMap[ PROP_CharCaseMap ] = GetCaseMap( moCaseMap.get( XML_none ) );
-if( !bUseOptional || moBaseline.has() ) {
+if( moBaseline.has() ) {
rPropMap[ PROP_CharEscapement ] = sal_Int16(moBaseline.get( 0 ) /
1000);
rPropMap[ PROP_CharEscapementHeight ] = sal_Int8(DFLT_ESC_PROP);
}
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 9951ef1..7fc51c6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1565,6 +1565,11 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly,
textbox-wpg-only.docx)
// The 3 paragraphs on the rectangles inside the groupshape ended up in the
// body text, make sure we don't have multiple paragraphs there anymore.
CPPUNIT_ASSERT_EQUAL(1, getParagraphs()); // was 4
+
+// Character escapement was enabled by default, this was 58.
+uno::Referencecontainer::XIndexAccess xGroup(xShape, uno::UNO_QUERY);
+uno::Referencetext::XText xText =
uno::Referencetext::XTextRange(xGroup-getByIndex(0),
uno::UNO_QUERY)-getText();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(100),
getPropertysal_Int32(getRun(getParagraphOfText(1, xText), 1),
CharEscapementHeight));
}
DECLARE_OOXMLIMPORT_TEST(testFdo70457, fdo70457.docx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/tablecontainer.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 56d4f4b7b97eaf212a3bc6bdb1da767106e7224a
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Sun Nov 10 18:05:07 2013 +
fdo#70144 Don't reset Document's modified flag when inserting new table.
It is unclear why the modified flag should ever be blindly overwritten hence
we no longer touch the modified flag here. (This change appears to have no
undesired side-effects.)
Change-Id: I246eb7d84249794fa4d52fcd9b008d8340bbc82d
Reviewed-on: https://gerrit.libreoffice.org/6632
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
diff --git a/dbaccess/source/core/api/tablecontainer.cxx
b/dbaccess/source/core/api/tablecontainer.cxx
index 219f0dd..1dcc68e 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -146,8 +146,7 @@ namespace
void lcl_createDefintionObject(const OUString _rName
,const Reference XNameContainer
_xTableDefinitions
,ReferenceXPropertySet _xTableDefinition
- ,ReferenceXNameAccess _xColumnDefinitions
- ,sal_Bool _bModified)
+ ,ReferenceXNameAccess _xColumnDefinitions)
{
if ( _xTableDefinitions.is() )
{
@@ -158,7 +157,6 @@ void lcl_createDefintionObject(const OUString _rName
// set as folder
_xTableDefinition.set( TableDefinition::createWithName(
::comphelper::getProcessComponentContext(), _rName ), UNO_QUERY);
_xTableDefinitions-insertByName(_rName,makeAny(_xTableDefinition));
-
::dbaccess::notifyDataSourceModified(_xTableDefinitions,_bModified);
}
ReferenceXColumnsSupplier
xColumnsSupplier(_xTableDefinition,UNO_QUERY);
if ( xColumnsSupplier.is() )
@@ -180,7 +178,7 @@ connectivity::sdbcx::ObjectType
OTableContainer::createObject(const OUString _r
{
ReferenceXPropertySet xTableDefinition;
ReferenceXNameAccess xColumnDefinitions;
-
lcl_createDefintionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions,sal_False);
+
lcl_createDefintionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
if ( xSup.is() )
{
@@ -311,7 +309,7 @@ ObjectType OTableContainer::appendObject( const OUString
_rForName, const Refer
ReferenceXPropertySet xTableDefinition;
ReferenceXNameAccess xColumnDefinitions;
-
lcl_createDefintionObject(getNameForObject(descriptor),m_xTableDefinitions,xTableDefinition,xColumnDefinitions,sal_False);
+
lcl_createDefintionObject(getNameForObject(descriptor),m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
ReferenceXColumnsSupplier xSup(descriptor,UNO_QUERY);
ReferenceXDataDescriptorFactory xFac(xColumnDefinitions,UNO_QUERY);
ReferenceXAppend xAppend(xColumnDefinitions,UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua vcl/coretext vcl/inc vcl/Library_vcl.mk
vcl/Library_vcl.mk |2 vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm |2 vcl/aqua/source/gdi/salgdicommon.cxx |2 vcl/aqua/source/gdi/salgdiutils.cxx |2 vcl/aqua/source/gdi/salnativewidgets.cxx |2 vcl/aqua/source/gdi/salprn.cxx |2 vcl/aqua/source/gdi/salvd.cxx|2 vcl/aqua/source/window/salframe.cxx |2 vcl/aqua/source/window/salframeview.mm |2 vcl/coretext/ctfonts.cxx |2 vcl/coretext/ctfonts.hxx |2 vcl/coretext/salgdi.cxx | 889 +++ vcl/coretext/salgdi2.cxx | 889 --- vcl/inc/aqua/salvd.h |2 vcl/inc/coretext/salgdi.h| 433 + vcl/inc/coretext/salgdi2.h | 433 - vcl/inc/headless/svpgdi.hxx |2 vcl/inc/quartz/salbmp.h |2 vcl/inc/saldatabasic.hxx |2 19 files changed, 1337 insertions(+), 1337 deletions(-) New commits: commit 13086125abf5cbf142596be53729342263498613 Author: Khaled Hosny khaledho...@eglug.org Date: Wed Dec 4 16:00:41 2013 +0200 Rename coretext/salgdi2.* to coretext/salgdi.* The 2 part was a temporary measure so an older version of the file, that is long gone, can coexist. Change-Id: I3a22b287bfb1351bb73e9dabbfa67100fe17bb97 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index fbeeaf0..fb7816f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -343,7 +343,7 @@ vcl_quartz_code= \ vcl_coretext_code= \ vcl/coretext/ctfonts \ vcl/coretext/ctlayout \ -vcl/coretext/salgdi2 \ +vcl/coretext/salgdi \ # GUIBASE specific stuff diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm index 0eb8673..a30b8d2 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm @@ -20,7 +20,7 @@ #include aqua/salinst.h #include quartz/utils.h -#include coretext/salgdi2.h +#include coretext/salgdi.h #include aqua11ytextattributeswrapper.h diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx index 7e7e56f..a1691fe 100644 --- a/vcl/aqua/source/gdi/salgdicommon.cxx +++ b/vcl/aqua/source/gdi/salgdicommon.cxx @@ -28,7 +28,7 @@ #include basegfx/polygon/b2dpolygon.hxx #include quartz/salbmp.h -#include coretext/salgdi2.h +#include coretext/salgdi.h #include fontsubset.hxx #include sft.hxx diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx index 8a30e14..0f7f79a 100644 --- a/vcl/aqua/source/gdi/salgdiutils.cxx +++ b/vcl/aqua/source/gdi/salgdiutils.cxx @@ -29,7 +29,7 @@ #include vcl/svapp.hxx -#include coretext/salgdi2.h +#include coretext/salgdi.h #include aqua/salframe.h #include aqua/saldata.hxx diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx index 89ac7c0..d9219cf 100644 --- a/vcl/aqua/source/gdi/salnativewidgets.cxx +++ b/vcl/aqua/source/gdi/salnativewidgets.cxx @@ -22,7 +22,7 @@ #include vcl/svapp.hxx #include vcl/timer.hxx -#include coretext/salgdi2.h +#include coretext/salgdi.h #include aqua/salnativewidgets.h #include aqua/saldata.hxx #include aqua/salframe.h diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index 85c6d43..b64d039 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -27,7 +27,7 @@ #include aqua/salinst.h #include aqua/salprn.h #include aqua/aquaprintview.h -#include coretext/salgdi2.h +#include coretext/salgdi.h #include aqua/saldata.hxx #include quartz/utils.h diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index 2539c38..f58ce6f 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -23,7 +23,7 @@ #include aqua/salvd.h #include aqua/salinst.h -#include coretext/salgdi2.h +#include coretext/salgdi.h #include aqua/saldata.hxx #include aqua/salframe.h diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 9862837..87f1be1 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -29,7 +29,7 @@ #include vcl/syswin.hxx #include aqua/saldata.hxx -#include coretext/salgdi2.h +#include coretext/salgdi.h #include aqua/salframe.h #include aqua/salmenu.h #include aqua/salinst.h diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 0f09532..c46b84d 100644 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm
[Libreoffice-commits] core.git: qadevOOo/tests
qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java | 17
--
1 file changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 8d74243a65da4b0e28a68018657e9b1375ae14d4
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Dec 4 15:06:40 2013 +0100
Improve test code
Change-Id: I196a7f654bf8f061a4b050ea1fbe01fae9f450c2
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
index 7ec0c58..bfcee4d 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
@@ -206,24 +206,21 @@ public class _XAccessibleContext extends MultiMethodTest {
XAccessibleContext parentAC = parent.getAccessibleContext();
try {
-if (parentAC.getAccessibleChild(idx) == null) {
+XAccessible child = parentAC.getAccessibleChild(idx);
+XAccessibleContext childAC = null;
+if (child == null) {
log.println(Parent has no child with this index);
bOK = false;
} else {
-bOK = AccessibilityTools.equals(parentAC.getAccessibleChild(
- idx)
-
.getAccessibleContext(),
- oObj);
+childAC = child.getAccessibleContext();
+bOK = AccessibilityTools.equals(childAC, oObj);
}
if (!bOK) {
log.println(Expected: + util.utils.getImplName(oObj));
-if (parentAC.getAccessibleChild(idx) != null) {
-log.println(Getting: +
-util.utils.getImplName(
-parentAC.getAccessibleChild(idx)
-.getAccessibleContext()));
+if (childAC != null) {
+log.println(Getting: + util.utils.getImplName(childAC));
}
}
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde4/KDESalDisplay.cxx | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
New commits:
commit 95f60222e75486336b6569afa8f34d60b51c94ad
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Thu Nov 21 12:40:57 2013 +0100
fdo#67011: Run Display::Yield through KDEXLib::Yield.
Drag'n'Drop is handled in a second thread, which tries to yield
the display while the main Qt thread probably is already
yielding. Both need the YieldMutex, which freezes the application
until the D'n'D thread times out.
Trying to yield the display throught the application yield
results in a recursive loop.
So this catches and breaks the recursion, but just inside the Qt
thread, so other processes can yield on the display, instead
of simply disabling the Display::Yield.
Change-Id: Ifba91aa89fe5b0a89cc94820935dc996a065112f
Reviewed-on: https://gerrit.libreoffice.org/6750
Tested-by: Jan-Marek Glogowski glo...@fbihome.de
Reviewed-by: Jan-Marek Glogowski glo...@fbihome.de
diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
index 21440fc..ee330e7 100644
--- a/vcl/unx/kde4/KDESalDisplay.cxx
+++ b/vcl/unx/kde4/KDESalDisplay.cxx
@@ -25,6 +25,8 @@
#include assert.h
#include unx/saldata.hxx
+#include qthread.h
+
SalKDEDisplay* SalKDEDisplay::selfptr = NULL;
SalKDEDisplay::SalKDEDisplay( Display* pDisp )
@@ -48,18 +50,26 @@ SalKDEDisplay::~SalKDEDisplay()
void SalKDEDisplay::Yield()
{
-if( DispatchInternalEvent() )
+// We yield the display throught the main Qt thread.
+// Actually this Yield may call the Display::Yield, which results in an
+// unlimited cycle.
+static bool break_cyclic_yield_recursion = false;
+bool is_qt_gui_thread = ( qApp-thread() == QThread::currentThread() );
+
+if( DispatchInternalEvent() || break_cyclic_yield_recursion )
return;
+if( is_qt_gui_thread )
+break_cyclic_yield_recursion = true;
+
DBG_ASSERT(
static_castSalYieldMutex*(GetSalData()-m_pInstance-GetYieldMutex())-GetThreadId()
==
osl::Thread::getCurrentIdentifier(),
will crash soon since solar mutex not locked in
SalKDEDisplay::Yield );
-XEvent event;
-XNextEvent( pDisp_, event );
-if( checkDirectInputEvent( event ))
-return;
-qApp-x11ProcessEvent( event );
+static_castKDEXLib*(GetXLib())-Yield( true, false );
+
+if( is_qt_gui_thread )
+break_cyclic_yield_recursion = false;
}
// HACK: When using Qt event loop, input methods (japanese, etc.) will get
broken because
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 ++ writerfilter/source/dmapper/GraphicImport.cxx |3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 500343105707a9905f5198a4af6ad58fe307b7c2 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 4 15:07:12 2013 +0100 DOCX drawingML shape import: always set Opaque If behindDoc was 0, we did not set Opaque, so it went into the background, fix this. Change-Id: Id5aa683ffb388b1f4de33dcb19559729db5a4e02 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 7fc51c6..6d9837e 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1561,6 +1561,8 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly, textbox-wpg-only.docx) // The relativeFrom attribute was ignored for groupshapes, i.e. these were text::RelOrientation::FRAME. CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getPropertysal_Int16(xShape, HoriOrientRelation)); CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getPropertysal_Int16(xShape, VertOrientRelation)); +// Make sure the shape is not in the background, as we have behindDoc=0 in the doc. +CPPUNIT_ASSERT_EQUAL(true, bool(getPropertysal_Bool(xShape, Opaque))); // The 3 paragraphs on the rectangles inside the groupshape ended up in the // body text, make sure we don't have multiple paragraphs there anymore. diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 8962f39..3f7e0cb 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1043,8 +1043,7 @@ void GraphicImport::lcl_attribute(Id nName, Value val) m_pImpl-applyMargins(xShapeProps); bool bOpaque = m_pImpl-bOpaque !m_pImpl-rDomainMapper.IsInHeaderFooter(); -if (!bOpaque) -xShapeProps-setPropertyValue(Opaque, uno::makeAny(bOpaque)); +xShapeProps-setPropertyValue(Opaque, uno::makeAny(bOpaque)); xShapeProps-setPropertyValue(Surround, uno::makeAny(m_pImpl-nWrap)); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 18 +-
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 13 +
2 files changed, 30 insertions(+), 1 deletion(-)
New commits:
commit 1a2f12f78f6b01a705e3f92ea2a281181dcfcb00
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Dec 4 15:34:37 2013 +0100
writerfilter: support nested mc:AlternateContent
It turns out it's possible to nest this, e.g. mc:Choice
Requires=wps, and inside that, a mc:Choice Requires=wp14.
Change-Id: Icb6250dcc5059894112d8eeba9f327659a42280e
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 14787f7..78a4460 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -155,7 +155,8 @@ OOXMLFastContextHandler::OOXMLFastContextHandler
inPositionV(pContext-inPositionV),
m_xContext(pContext-m_xContext),
m_bDiscardChildren(pContext-m_bDiscardChildren),
- m_bTookChoice(pContext-m_bTookChoice)
+ m_bTookChoice(pContext-m_bTookChoice),
+ m_aSavedAlternateStates(pContext-m_aSavedAlternateStates)
{
if (pContext != NULL)
{
@@ -183,6 +184,14 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t
nElement, const uno::Ref
switch (oox::getBaseToken(nElement))
{
case OOXML_AlternateContent:
+{
+SavedAlternateState aState;
+aState.m_bDiscardChildren = m_bDiscardChildren;
+m_bDiscardChildren = false;
+aState.m_bTookChoice = m_bTookChoice;
+m_bTookChoice = false;
+m_aSavedAlternateStates.push(aState);
+}
break;
case OOXML_Choice:
{
@@ -265,6 +274,13 @@ throw (uno::RuntimeException, xml::sax::SAXException)
if (Element == (NS_mce | OOXML_Choice) || Element == (NS_mce |
OOXML_Fallback))
m_bDiscardChildren = false;
+else if (Element == (NS_mce | OOXML_AlternateContent))
+{
+SavedAlternateState aState(m_aSavedAlternateStates.top());
+m_aSavedAlternateStates.pop();
+m_bDiscardChildren = aState.m_bDiscardChildren;
+m_bTookChoice = aState.m_bTookChoice;
+}
if (!m_bDiscardChildren)
lcl_endFastElement(Element);
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 14a49a3..86a3b25 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -47,6 +47,18 @@ using namespace ::com::sun::star::xml::sax;
typedef boost::shared_ptrStream StreamPointer_t;
+/**
+ * Struct to store our 'alternate state'. If multiple mc:AlternateContent
+ * elements arrive, then while the inner ones are active, the original state is
+ * saved away, and once they inner goes out of scope, the original state is
+ * restored.
+ */
+struct SavedAlternateState
+{
+bool m_bDiscardChildren;
+bool m_bTookChoice; /// Did we take the Choice or want Fallback instead?
+};
+
class OOXMLFastContextHandler:
public ::cppu::WeakImplHelper1
xml::sax::XFastContextHandler
@@ -293,6 +305,7 @@ private:
uno::Reference uno::XComponentContext m_xContext;
bool m_bDiscardChildren;
bool m_bTookChoice; /// Did we take the Choice or want Fallback instead?
+std::stackSavedAlternateState m_aSavedAlternateStates;
static sal_uInt32 mnInstanceCount;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source
include/sfx2/dispatch.hxx| 146 ---
sfx2/source/control/dispatch.cxx | 125 -
sfx2/source/control/shell.cxx| 14 +++
3 files changed, 124 insertions(+), 161 deletions(-)
New commits:
commit d1539f91810cb4b426f3c823c25ab6ac25f6283e
Author: Michael Stahl mst...@redhat.com
Date: Wed Dec 4 15:22:00 2013 +0100
sfx2: SfxItemPtrMap is used only in shell.cxx
Change-Id: I9f76a114fcdf761ddaaf40666e4330d20ca72b98
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index cb48a84..49e4c1d 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -27,7 +27,6 @@
#include sfx2/bindings.hxx
#include sfx2/viewfrm.hxx
-#include map
#include boost/scoped_ptr.hpp
class SfxSlotServer;
@@ -63,17 +62,6 @@ namespace com
//=
-// Maps the Which() field to a pointer to a SfxPoolItem
-class SfxItemPtrMap : public std::mapsal_uInt16, SfxPoolItem*
-{
-public:
-~SfxItemPtrMap()
-{
-for(iterator it = begin(); it != end(); ++it)
-delete it-second;
-}
-};
-
class SFX2_DLLPUBLIC SfxDispatcher
{
boost::scoped_ptrSfxDispatcher_Impl pImp;
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index eaed943..2b9c7f4 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -44,6 +44,20 @@
#include sfx2/msgpool.hxx
#include sfx2/sidebar/ContextChangeBroadcaster.hxx
+#include map
+
+
+// Maps the Which() field to a pointer to a SfxPoolItem
+class SfxItemPtrMap : public std::mapsal_uInt16, SfxPoolItem*
+{
+public:
+~SfxItemPtrMap()
+{
+for(iterator it = begin(); it != end(); ++it)
+delete it-second;
+}
+};
+
//
DBG_NAME(SfxShell)
commit 5e4c26918a0c8130515ee7af0cf2cd2dfe42534d
Author: Michael Stahl mst...@redhat.com
Date: Wed Dec 4 15:20:08 2013 +0100
SfxDispatcher: move implementation details out of header file
Change-Id: Ia831da45c00554086dc692997130688c0b3e28f5
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 151d483..cb48a84 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -27,9 +27,8 @@
#include sfx2/bindings.hxx
#include sfx2/viewfrm.hxx
-#include deque
#include map
-#include vector
+#include boost/scoped_ptr.hpp
class SfxSlotServer;
class SfxShell;
@@ -42,8 +41,6 @@ class SfxPopupMenuManager;
class SfxModule;
struct SfxDispatcher_Impl;
-typedef std::vectorSfxShell* SfxShellStack_Impl;
-
namespace com
{
namespace sun
@@ -77,38 +74,9 @@ public:
}
};
-struct SfxToDo_Impl
-{
-SfxShell* pCluster;
-bool bPush;
-bool bDelete;
-bool bDeleted;
-bool bUntil;
-
-SfxToDo_Impl()
-: pCluster(0)
-, bPush(false)
-, bDelete(false)
-, bDeleted(false)
-, bUntil(false)
-{}
-SfxToDo_Impl( bool bOpPush, bool bOpDelete, bool bOpUntil, SfxShell
rCluster )
-: pCluster(rCluster)
-, bPush(bOpPush)
-, bDelete(bOpDelete)
-, bDeleted(false)
-, bUntil(bOpUntil)
-{}
-
-bool operator==( const SfxToDo_Impl rWith ) const
-{ return pCluster==rWith.pCluster bPush==rWith.bPush; }
-};
-
class SFX2_DLLPUBLIC SfxDispatcher
{
-SfxDispatcher_Impl* pImp;
-sal_Bool bFlushed;
-std::deque std::dequeSfxToDo_Impl aToDoCopyStack;
+boost::scoped_ptrSfxDispatcher_Impl pImp;
private:
// Search for temporary evaluated Todos
@@ -199,7 +167,7 @@ public:
Window *pWin = 0, const Point *pPosPixel = 0 );
sal_BoolIsAppDispatcher() const;
-sal_BoolIsFlushed() const;
+boolIsFlushed() const;
voidFlush();
voidLock( sal_Bool bLock );
sal_BoolIsLocked( sal_uInt16 nSID = 0 ) const;
@@ -236,102 +204,6 @@ public:
SAL_DLLPRIVATE sal_uInt16 GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16
nType, OUString *pStr );
};
-//
-
-inline sal_Bool SfxDispatcher::IsFlushed() const
-
-/* [Description]
-
-This method checks if the stack of the SfxDispatchers is flushed, or if
-push- or pop- commands are pending.
-*/
-
-{
- return bFlushed;
-}
-
-//
-
-inline void SfxDispatcher::Flush()
-
-/* [Description]
-
-This method performs outstanding push- and pop- commands. For SfxShells,
-which are new on the stack, the SfxShell::Activate(sal_Bool) is invoked
with
-bMDI == sal_True, for SfxShells that are removed from the stack, the
-SfxShell::Deactivate(sal_Bool) is invoked with bMDI == sal_True
[Libreoffice-commits] core.git: include/oox include/vcl sc/source
include/oox/helper/progressbar.hxx|4 -
include/vcl/timer.hxx |3 -
sc/source/filter/inc/worksheethelper.hxx | 11 +++
sc/source/filter/oox/workbookfragment.cxx | 88 +++---
sc/source/filter/oox/worksheethelper.cxx | 59 +++-
5 files changed, 140 insertions(+), 25 deletions(-)
New commits:
commit 4bad16b2a27ba44998b107cb3cc5fdca92753ccf
Author: Michael Meeks michael.me...@collabora.com
Date: Wed Dec 4 15:00:36 2013 +
oox: render progress bar in main thread for threaded import.
Experimental only.
This avoids ,us deadlocking as the main thread tries to join it's children,
and the child threads wait to 'Yield' in the progress bar update.
Also it's generally safer to move progress reporting out of the other
threads, and to have the mainloop spinning here.
Finally this allows people to continue to use the LibreOffice suite while
large XLSX spreadsheets are loading.
Change-Id: Id41c18f3941d6fc5eea593f7cfcf6a8b7215b3f8
diff --git a/include/oox/helper/progressbar.hxx
b/include/oox/helper/progressbar.hxx
index 1f61058..cdcbd0f 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -35,7 +35,7 @@ namespace oox {
/** Interface for progress bar classes.
*/
-class IProgressBar
+class OOX_DLLPUBLIC IProgressBar
{
public:
virtual ~IProgressBar();
@@ -66,7 +66,7 @@ typedef ::boost::shared_ptr ISegmentProgressBar
ISegmentProgressBarRef;
/** Interface for a segment in a progress bar, that is able to create sub
segments from itself.
*/
-class ISegmentProgressBar : public IProgressBar
+class OOX_DLLPUBLIC ISegmentProgressBar : public IProgressBar
{
public:
virtual ~ISegmentProgressBar();
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index ff9a4cf..a5b1c95 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -46,7 +46,8 @@ public:
voidStart();
voidStop();
-voidSetTimeout( sal_uLong nTimeout );
+/// set the timeout in milliseconds
+voidSetTimeout( sal_uLong nTimeoutMs );
sal_uLong GetTimeout() const { return mnTimeout; }
sal_BoolIsActive() const { return mbActive ? sal_True : sal_False;
}
diff --git a/sc/source/filter/inc/worksheethelper.hxx
b/sc/source/filter/inc/worksheethelper.hxx
index bbcd152..9e23161 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -180,6 +180,14 @@ struct ValidationModel
class WorksheetGlobals;
typedef ::boost::shared_ptr WorksheetGlobals WorksheetGlobalsRef;
+class IWorksheetProgress {
+public:
+virtual ~IWorksheetProgress() {}
+virtual ISegmentProgressBarRef getRowProgress() = 0;
+virtual void setCustomRowProgress(
+const ISegmentProgressBarRef
rxRowProgress ) = 0;
+};
+
class WorksheetHelper : public WorkbookHelper
{
public:
@@ -191,6 +199,9 @@ public:
WorksheetType eSheetType,
sal_Int16 nSheet );
+// horrible accessor for hidden WorksheetGlobals ...
+static IWorksheetProgress *getWorksheetInterface( const
WorksheetGlobalsRef xRef );
+
//
/** Returns the type of this sheet. */
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index d3c06ac..e4edb09 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -41,6 +41,7 @@
#include viewsettings.hxx
#include workbooksettings.hxx
#include worksheetbuffer.hxx
+#include worksheethelper.hxx
#include worksheetfragment.hxx
#include sheetdatacontext.hxx
#include threadpool.hxx
@@ -51,6 +52,7 @@
#include calcconfig.hxx
#include vcl/svapp.hxx
+#include vcl/timer.hxx
#include oox/core/fastparser.hxx
#include salhelper/thread.hxx
@@ -209,12 +211,15 @@ typedef std::vectorSheetFragmentHandler
SheetFragmentVector;
class WorkerThread : public ThreadTask
{
+sal_Int32 mrSheetsLeft;
WorkbookFragment mrWorkbookHandler;
rtl::ReferenceFragmentHandler mxHandler;
public:
WorkerThread( WorkbookFragment rWorkbookHandler,
- const rtl::ReferenceFragmentHandler xHandler ) :
+ const rtl::ReferenceFragmentHandler xHandler,
+ sal_Int32 rSheetsLeft ) :
+mrSheetsLeft( rSheetsLeft ),
mrWorkbookHandler( rWorkbookHandler ),
mxHandler( xHandler )
{
@@ -235,6 +240,61 @@ public:
SAL_INFO( sc.filter, start import\n );
mrWorkbookHandler.importOoxFragment( mxHandler, *xParser );
SAL_INFO( sc.filter, end import, release solar\n );
+mrSheetsLeft--;
+assert( mrSheetsLeft = 0 );
+if(
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev3.cxx | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 1ded21bfb99951ca947bd11a7442398668202ca6
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 4 15:04:04 2013 +
Resolves: rhbz#912529 Kerkis SmallCaps shown instead of Kerkis Regular
we encounter both fonts, but all their properties that we compare
are the same, so we think they are two versions of the same font
and throw away the Regular version.
Change-Id: I24369f10c7a0edba1faa02621bb78616e880966e
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index c27cd93..f3f5a77 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -665,7 +665,7 @@ PhysicalFontFace::PhysicalFontFace( const
ImplDevFontAttributes rDFA, int nMagi
sal_Int32 PhysicalFontFace::CompareIgnoreSize( const PhysicalFontFace rOther
) const
{
-// compare their width, weight, italic and style name
+// compare their width, weight, italic, style name and family name
if( GetWidthType() rOther.GetWidthType() )
return -1;
else if( GetWidthType() rOther.GetWidthType() )
@@ -681,7 +681,14 @@ sal_Int32 PhysicalFontFace::CompareIgnoreSize( const
PhysicalFontFace rOther )
else if( GetSlant() rOther.GetSlant() )
return 1;
-return GetFamilyName().compareTo( rOther.GetFamilyName() );
+sal_Int32 nRet = GetFamilyName().compareTo( rOther.GetFamilyName() );
+
+if (nRet == 0)
+{
+nRet = GetStyleName().compareTo( rOther.GetStyleName() );
+}
+
+return nRet;
}
sal_Int32 PhysicalFontFace::CompareWithSize( const PhysicalFontFace rOther )
const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added Depends on||71667 --- Comment #118 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- I nominate bug 71667 which is a regression from 4.1.3. It make the functions wizard in Calc less interesting to use. (ATM the bug is marked for version 4.2 but it is reproducible in 4.1.5.0.0+ and I guess in 4.1.4.1 but this version number is not available in BZ). Best regards. JBF -- 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-1-4' - include/sfx2 sfx2/source
include/sfx2/dispatch.hxx| 33 -
sfx2/source/control/dispatch.cxx | 72 ---
2 files changed, 68 insertions(+), 37 deletions(-)
New commits:
commit 039fb1d5671274ba868dbbf12c8d606da27fb469
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 20 16:17:54 2013 +
Resolves: fdo#70703 guard against FlushImpl inside FlushImpl
where the inner one deletes Shells that the outer one is still
processing. Push the candidates onto a stack and let inner
FlushImpl modify them to inform outer FlushImpl's that an entry
has been deleted
Change-Id: I1db8546d53e24cc96c72f2cd5cbec57b6cecaff5
Reviewed-on: https://gerrit.libreoffice.org/6735
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 5d98639ec39f302df3dd38498703630e0556938d)
Reviewed-on: https://gerrit.libreoffice.org/6928
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 2b02a5e..4cf5fb1 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -27,6 +27,7 @@
#include sfx2/bindings.hxx
#include sfx2/viewfrm.hxx
+#include deque
#include map
#include vector
@@ -76,10 +77,38 @@ public:
}
};
+struct SfxToDo_Impl
+{
+SfxShell* pCluster;
+bool bPush;
+bool bDelete;
+bool bDeleted;
+bool bUntil;
+
+SfxToDo_Impl()
+: pCluster(0)
+, bPush(false)
+, bDelete(false)
+, bDeleted(false)
+, bUntil(false)
+{}
+SfxToDo_Impl( bool bOpPush, bool bOpDelete, bool bOpUntil, SfxShell
rCluster )
+: pCluster(rCluster)
+, bPush(bOpPush)
+, bDelete(bOpDelete)
+, bDeleted(false)
+, bUntil(bOpUntil)
+{}
+
+bool operator==( const SfxToDo_Impl rWith ) const
+{ return pCluster==rWith.pCluster bPush==rWith.bPush; }
+};
+
class SFX2_DLLPUBLIC SfxDispatcher
{
-SfxDispatcher_Impl* pImp;
-sal_BoolbFlushed;
+SfxDispatcher_Impl* pImp;
+sal_Bool bFlushed;
+std::deque std::dequeSfxToDo_Impl aToDoCopyStack;
private:
// Search for temporary evaluated Todos
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 9acf705..3e10fff 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -67,31 +67,6 @@ DBG_NAME(SfxDispatcherFillState)
typedef std::vectorSfxRequest* SfxRequestPtrArray;
-struct SfxToDo_Impl
-{
-SfxShell* pCluster;
-bool bPush;
-bool bDelete;
-bool bUntil;
-
-SfxToDo_Impl()
-: pCluster(0)
-, bPush(false)
-, bDelete(false)
-, bUntil(false)
-{}
-SfxToDo_Impl( bool bOpPush, bool bOpDelete, bool bOpUntil, SfxShell
rCluster )
-: pCluster(rCluster)
-, bPush(bOpPush)
-, bDelete(bOpDelete)
-, bUntil(bOpUntil)
-{}
-~SfxToDo_Impl(){}
-
-bool operator==( const SfxToDo_Impl rWith ) const
-{ return pCluster==rWith.pCluster bPush==rWith.bPush; }
-};
-
struct SfxObjectBars_Impl
{
sal_uInt32 nResId; // Resource - and ConfigId of the Toolbox
@@ -1625,22 +1600,49 @@ void SfxDispatcher::FlushImpl()
bFlushed = sal_True;
OSL_TRACE(Successfully flushed dispatcher!);
+//fdo#70703 FlushImpl may call back into itself so use aToDoCopyStack to
talk
+//to outer levels of ourself. If DoActivate_Impl/DoDeactivate_Impl deletes
+//an entry, then they will walk back up aToDoCopyStack and set outer
+//levels's entries to bDeleted
+aToDoCopyStack.push_back(aToDoCopy);
+std::dequeSfxToDo_Impl rToDoCopy = aToDoCopyStack.back();
// Activate the Shells and possible delete them in the 2nd round
-for(std::dequeSfxToDo_Impl::reverse_iterator i = aToDoCopy.rbegin(); i
!= aToDoCopy.rend(); ++i)
-{
-if(i-bPush)
-{
-if ( pImp-bActive )
-i-pCluster-DoActivate_Impl(pImp-pFrame, sal_True);
-}
-else if ( pImp-bActive )
-i-pCluster-DoDeactivate_Impl(pImp-pFrame, sal_True);
+for(std::dequeSfxToDo_Impl::reverse_iterator i = rToDoCopy.rbegin(); i
!= rToDoCopy.rend(); ++i)
+{
+if (i-bDeleted)
+continue;
+if (!pImp-bActive)
+continue;
+if (i-bPush)
+i-pCluster-DoActivate_Impl(pImp-pFrame, sal_True);
+else
+i-pCluster-DoDeactivate_Impl(pImp-pFrame, sal_True);
}
+aToDoCopy = aToDoCopyStack.back();
+aToDoCopyStack.pop_back();
+
for(std::dequeSfxToDo_Impl::reverse_iterator i = aToDoCopy.rbegin(); i
!= aToDoCopy.rend(); ++i)
{
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/libcmis
external/libcmis/UnpackedTarball_cmis.mk|3 external/libcmis/libcmis-0.4.1-properties-fix.patch | 280 2 files changed, 282 insertions(+), 1 deletion(-) New commits: commit 4c9ed76114ace311737dcda487894514ee0991fa Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Wed Dec 4 11:09:45 2013 +0100 fdo#62531: checkout failed due to bad import of properties in libcmis Change-Id: Ic9477039d7a1d9649487be634052608efe0d07b7 (cherry picked from commit e8df1838ec2d4aa52522334e94e77fae00223490) Reviewed-on: https://gerrit.libreoffice.org/6927 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk index 75f5753..bbac1ac 100644 --- a/external/libcmis/UnpackedTarball_cmis.mk +++ b/external/libcmis/UnpackedTarball_cmis.mk @@ -15,7 +15,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0)) $(eval $(call gb_UnpackedTarball_add_patches,cmis, \ external/libcmis/libcmis-0.4.1.patch \ - external/libcmis/libcmis-0.4.1-empty-path.patch)) + external/libcmis/libcmis-0.4.1-empty-path.patch \ + external/libcmis/libcmis-0.4.1-properties-fix.patch)) ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch)) diff --git a/external/libcmis/libcmis-0.4.1-properties-fix.patch b/external/libcmis/libcmis-0.4.1-properties-fix.patch new file mode 100644 index 000..b3739e9 --- /dev/null +++ b/external/libcmis/libcmis-0.4.1-properties-fix.patch @@ -0,0 +1,280 @@ +From 958b3c763fb52d1bf2ad88c177e7e4f426aab354 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= cbo...@users.sourceforge.net +Date: Wed, 4 Dec 2013 10:44:37 +0100 +Subject: [PATCH] Object creation mixed relationship properties with document + properties + +Added a Unit test to show the problem. We surely don't want the +relationship cmis:properties to be read as properties. This bug caused +some problems with other operations like checkout. +--- + .../data/atom/test-document-relationships.xml | 179 + + qa/libcmis/test-atom.cxx | 34 + src/libcmis/object.cxx | 4 +- + 3 files changed, 215 insertions(+), 2 deletions(-) + create mode 100644 qa/libcmis/data/atom/test-document-relationships.xml + +diff --git qa/libcmis/data/atom/test-document-relationships.xml qa/libcmis/data/atom/test-document-relationships.xml +new file mode 100644 +index 000..bacfda8 +--- /dev/null qa/libcmis/data/atom/test-document-relationships.xml +@@ -0,0 +1,179 @@ ++?xml version=1.0 encoding=UTF-8? ++atom:entry xmlns:atom=http://www.w3.org/2005/Atom; xmlns:cmis=http://docs.oasis-open.org/ns/cmis/core/200908/; xmlns:cmisra=http://docs.oasis-open.org/ns/cmis/restatom/200908/; xmlns:app=http://www.w3.org/2007/app; ++ atom:author ++atom:nameunknown/atom:name ++ /atom:author ++ atom:idSome obscure Id/atom:id ++ atom:published2013-01-28T14:10:06Z/atom:published ++ atom:titleTest Document/atom:title ++ app:edited2013-01-28T14:10:06Z/app:edited ++ atom:updated2013-01-28T14:10:06Z/atom:updated ++ atom:content src=http://mockup/mock/content/data.txt?id=test-document; type=text/plain/ ++ cmisra:object xmlns:ns3=http://docs.oasis-open.org/ns/cmis/messaging/200908/; ++cmis:properties ++ cmis:propertyInteger queryName=cmis:contentStreamLength displayName=Content Length localName=cmis:contentStreamLength propertyDefinitionId=cmis:contentStreamLength ++cmis:value12345/cmis:value ++ /cmis:propertyInteger ++ cmis:propertyId queryName=cmis:objectTypeId displayName=Type-Id localName=cmis:objectTypeId propertyDefinitionId=cmis:objectTypeId ++cmis:valueDocumentLevel2/cmis:value ++ /cmis:propertyId ++ cmis:propertyString queryName=cmis:versionSeriesCheckedOutBy displayName=Checked Out By localName=cmis:versionSeriesCheckedOutBy propertyDefinitionId=cmis:versionSeriesCheckedOutBy/ ++ cmis:propertyHtml queryName=HtmlProp displayName=Sample Html Property localName=HtmlProp propertyDefinitionId=HtmlProp/ ++ cmis:propertyId queryName=cmis:versionSeriesCheckedOutId displayName=Checked Out Id localName=cmis:versionSeriesCheckedOutId propertyDefinitionId=cmis:versionSeriesCheckedOutId/ ++ cmis:propertyId queryName=IdProp displayName=Sample Id Property localName=IdProp propertyDefinitionId=IdProp/ ++ cmis:propertyUri queryName=UriProp displayName=Sample Uri Property localName=UriProp propertyDefinitionId=UriProp/ ++ cmis:propertyDateTime queryName=DateTimePropMV displayName=Sample DateTime multi-value Property localName=DateTimePropMV
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - dbaccess/source include/sfx2 sc/source sfx2/source
dbaccess/source/core/api/RowSet.cxx |2 +
include/sfx2/dispatch.hxx | 33 +++-
sc/source/filter/excel/xestyle.cxx | 12 +++---
sfx2/source/control/dispatch.cxx| 72 ++--
4 files changed, 76 insertions(+), 43 deletions(-)
New commits:
commit c064375f611e405434ebfc37034d916ac5bdb60a
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 20 16:17:54 2013 +
Resolves: fdo#70703 guard against FlushImpl inside FlushImpl
where the inner one deletes Shells that the outer one is still
processing. Push the candidates onto a stack and let inner
FlushImpl modify them to inform outer FlushImpl's that an entry
has been deleted
Change-Id: I1db8546d53e24cc96c72f2cd5cbec57b6cecaff5
Reviewed-on: https://gerrit.libreoffice.org/6735
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 2b02a5e..4cf5fb1 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -27,6 +27,7 @@
#include sfx2/bindings.hxx
#include sfx2/viewfrm.hxx
+#include deque
#include map
#include vector
@@ -76,10 +77,38 @@ public:
}
};
+struct SfxToDo_Impl
+{
+SfxShell* pCluster;
+bool bPush;
+bool bDelete;
+bool bDeleted;
+bool bUntil;
+
+SfxToDo_Impl()
+: pCluster(0)
+, bPush(false)
+, bDelete(false)
+, bDeleted(false)
+, bUntil(false)
+{}
+SfxToDo_Impl( bool bOpPush, bool bOpDelete, bool bOpUntil, SfxShell
rCluster )
+: pCluster(rCluster)
+, bPush(bOpPush)
+, bDelete(bOpDelete)
+, bDeleted(false)
+, bUntil(bOpUntil)
+{}
+
+bool operator==( const SfxToDo_Impl rWith ) const
+{ return pCluster==rWith.pCluster bPush==rWith.bPush; }
+};
+
class SFX2_DLLPUBLIC SfxDispatcher
{
-SfxDispatcher_Impl* pImp;
-sal_BoolbFlushed;
+SfxDispatcher_Impl* pImp;
+sal_Bool bFlushed;
+std::deque std::dequeSfxToDo_Impl aToDoCopyStack;
private:
// Search for temporary evaluated Todos
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 9acf705..3e10fff 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -67,31 +67,6 @@ DBG_NAME(SfxDispatcherFillState)
typedef std::vectorSfxRequest* SfxRequestPtrArray;
-struct SfxToDo_Impl
-{
-SfxShell* pCluster;
-bool bPush;
-bool bDelete;
-bool bUntil;
-
-SfxToDo_Impl()
-: pCluster(0)
-, bPush(false)
-, bDelete(false)
-, bUntil(false)
-{}
-SfxToDo_Impl( bool bOpPush, bool bOpDelete, bool bOpUntil, SfxShell
rCluster )
-: pCluster(rCluster)
-, bPush(bOpPush)
-, bDelete(bOpDelete)
-, bUntil(bOpUntil)
-{}
-~SfxToDo_Impl(){}
-
-bool operator==( const SfxToDo_Impl rWith ) const
-{ return pCluster==rWith.pCluster bPush==rWith.bPush; }
-};
-
struct SfxObjectBars_Impl
{
sal_uInt32 nResId; // Resource - and ConfigId of the Toolbox
@@ -1625,22 +1600,49 @@ void SfxDispatcher::FlushImpl()
bFlushed = sal_True;
OSL_TRACE(Successfully flushed dispatcher!);
+//fdo#70703 FlushImpl may call back into itself so use aToDoCopyStack to
talk
+//to outer levels of ourself. If DoActivate_Impl/DoDeactivate_Impl deletes
+//an entry, then they will walk back up aToDoCopyStack and set outer
+//levels's entries to bDeleted
+aToDoCopyStack.push_back(aToDoCopy);
+std::dequeSfxToDo_Impl rToDoCopy = aToDoCopyStack.back();
// Activate the Shells and possible delete them in the 2nd round
-for(std::dequeSfxToDo_Impl::reverse_iterator i = aToDoCopy.rbegin(); i
!= aToDoCopy.rend(); ++i)
-{
-if(i-bPush)
-{
-if ( pImp-bActive )
-i-pCluster-DoActivate_Impl(pImp-pFrame, sal_True);
-}
-else if ( pImp-bActive )
-i-pCluster-DoDeactivate_Impl(pImp-pFrame, sal_True);
+for(std::dequeSfxToDo_Impl::reverse_iterator i = rToDoCopy.rbegin(); i
!= rToDoCopy.rend(); ++i)
+{
+if (i-bDeleted)
+continue;
+if (!pImp-bActive)
+continue;
+if (i-bPush)
+i-pCluster-DoActivate_Impl(pImp-pFrame, sal_True);
+else
+i-pCluster-DoDeactivate_Impl(pImp-pFrame, sal_True);
}
+aToDoCopy = aToDoCopyStack.back();
+aToDoCopyStack.pop_back();
+
for(std::dequeSfxToDo_Impl::reverse_iterator i = aToDoCopy.rbegin(); i
!= aToDoCopy.rend(); ++i)
{
-if(i-bDelete)
+if (i-bDelete !i-bDeleted)
+{
+if (!aToDoCopyStack.empty())
+{
+//fdo#70703 if there is an outer FlushImpl
[Libreoffice-commits] core.git: extensions/source
extensions/source/nsplugin/source/npshell.cxx | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 13448d8afd5981aa09ffb95ace22bca9bcac4c3a
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Dec 4 16:38:46 2013 +0100
Fix one more use of wsprintf
...that would fall into the same trap as
50bd5c11f551f5274be9a4411c5ddcbd32bd9a03 wsprintf is broken by design and
never
writes more than 1024 characters if the length were not currently bounded
by
2 * MAX_PATH + x 1024 anyway.
Change-Id: I2503ba0a9df960f2fdb51925d5fbbcff5bdb998a
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index 644222d..42b99ae 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -274,14 +274,13 @@ int do_init_pipe()
if (iniEnd == NULL) {
return NPERR_GENERIC_ERROR;
}
-boost::scoped_array WCHAR args(
-new WCHAR[
-MY_LENGTH(L\) + (exeEnd - exe) + MY_LENGTH(L\ ) +
-wcslen(s_read_fd) + MY_LENGTH(L ) + wcslen(s_write_fd) +
-MY_LENGTH(L \-env:INIFILENAME=vnd.sun.star.pathname:) +
-(iniEnd - ini) + MY_LENGTH(L\) + 1]); //TODO: overflow
-wsprintfW(
-args.get(),
+size_t len = MY_LENGTH(L\) + (exeEnd - exe) + MY_LENGTH(L\ ) +
+wcslen(s_read_fd) + MY_LENGTH(L ) + wcslen(s_write_fd) +
+MY_LENGTH(L \-env:INIFILENAME=vnd.sun.star.pathname:) +
+(iniEnd - ini) + MY_LENGTH(L\) + 1; //TODO: overflow
+boost::scoped_array WCHAR args(new WCHAR[len]);
+_snwprintf(
+args.get(), len,
L\%s\ %s %s \-env:INIFILENAME=vnd.sun.star.pathname:%s\, exe,
s_read_fd, s_write_fd, ini);
STARTUPINFOW NSP_StarInfo;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - pyuno/zipcore
pyuno/zipcore/python.cxx | 32 +---
1 file changed, 17 insertions(+), 15 deletions(-)
New commits:
commit a8c7e6355542e5afee5975a093f5d5e0bc418e39
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 29 17:26:54 2013 +0100
wsprintf is broken by design and never writes more than 1024 characters
Change-Id: I791e55bb5d98ee82c01271dcebafa7c4672cd424
(cherry picked from commit 50bd5c11f551f5274be9a4411c5ddcbd32bd9a03)
diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 9ef7183..517a6ae 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -192,10 +192,12 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
exit(EXIT_FAILURE);
}
}
-wchar_t * value = new wchar_t[
-(urepathEnd - urepath) + MY_LENGTH(L;) + (pathEnd - path) +
-(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1]; //TODO: overflow
-wsprintfW(value, L%s;%s%s%s, urepath, path, n == 0 ? L : L;, orig);
+std::size_t len = (urepathEnd - urepath) + MY_LENGTH(L;) +
+(pathEnd - path) + (n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1;
+//TODO: overflow
+wchar_t * value = new wchar_t[len];
+_snwprintf(
+value, len, L%s;%s%s%s, urepath, path, n == 0 ? L : L;, orig);
if (!SetEnvironmentVariableW(LPATH, value)) {
exit(EXIT_FAILURE);
}
@@ -218,21 +220,21 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
}
}
#ifdef __MINGW32__
-value = new wchar_t[
-(pathEnd - path) + MY_LENGTH(L;) + (pythonpath2End - pythonpath2) +
+len = (pathEnd - path) + MY_LENGTH(L;) + (pythonpath2End - pythonpath2) +
MY_LENGTH(L;) + (pythonpath4End - pythonpath4) +
MY_LENGTH(L;) + (pythonpath3End - pythonpath3) +
-(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1]; //TODO: overflow
-wsprintfW(
-value, L%s;%s;%s;%s%s%s, path, pythonpath2, pythonpath4, pythonpath3,
-n == 0 ? L : L;, orig);
+(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1; //TODO: overflow
+value = new wchar_t[len];
+_snwprintf(
+value, len, L%s;%s;%s;%s%s%s, path, pythonpath2, pythonpath4,
+pythonpath3, n == 0 ? L : L;, orig);
#else
-value = new wchar_t[
-(pathEnd - path) + MY_LENGTH(L;) + (pythonpath2End - pythonpath2) +
+len = (pathEnd - path) + MY_LENGTH(L;) + (pythonpath2End - pythonpath2) +
MY_LENGTH(L;) + (pythonpath3End - pythonpath3) +
-(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1]; //TODO: overflow
-wsprintfW(
-value, L%s;%s;%s%s%s, path, pythonpath2, pythonpath3,
+(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1; //TODO: overflow
+value = new wchar_t[len];
+_snwprintf(
+value, len, L%s;%s;%s%s%s, path, pythonpath2, pythonpath3,
n == 0 ? L : L;, orig);
#endif
if (!SetEnvironmentVariableW(LPYTHONPATH, value)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/w32/module.cxx | 45 +++--
1 file changed, 19 insertions(+), 26 deletions(-)
New commits:
commit c1da3afa5185e930e15a6ebbd2901c239def02a7
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Dec 4 16:48:16 2013 +0100
HINSTANCE vs. HMODULE clean up
Change-Id: I6fc350f489863ec86c76822053f0a399cef5cd7f
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 4c384d7..d1c0c1d 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -40,7 +40,7 @@
/*/
oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32
/*nRtldMode*/ )
{
-HINSTANCE hInstance;
+HMODULE h;
#if OSL_DEBUG_LEVEL 2
UINT errorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX |
SEM_FAILCRITICALERRORS);
#endif
@@ -56,10 +56,10 @@ oslModule SAL_CALL osl_loadModule(rtl_uString
*strModuleName, sal_Int32 /*nRtldM
if ( osl_File_E_None != nError )
rtl_uString_assign(Module, strModuleName);
-hInstance = LoadLibraryW(reinterpret_castLPCWSTR(Module-buffer));
+h = LoadLibraryW(reinterpret_castLPCWSTR(Module-buffer));
-if (hInstance == NULL)
-hInstance = LoadLibraryExW(reinterpret_castLPCWSTR(Module-buffer),
NULL,
+if (h == NULL)
+h = LoadLibraryExW(reinterpret_castLPCWSTR(Module-buffer), NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
//In case of long path names (\\?\c:\...) try to shorten the filename.
@@ -67,26 +67,22 @@ oslModule SAL_CALL osl_loadModule(rtl_uString
*strModuleName, sal_Int32 /*nRtldM
//In case the path is to long, the function will fail. However, the error
//code can be different. For example, it returned
ERROR_FILENAME_EXCED_RANGE
//on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit)
-if (hInstance == NULL Module-length 260)
+if (h == NULL Module-length 260)
{
std::vectorWCHAR, rtl::AllocatorWCHAR vec(Module-length + 1);
DWORD len =
GetShortPathNameW(reinterpret_castLPCWSTR(Module-buffer),
reinterpret_castLPWSTR(vec[0]),
Module-length + 1);
if (len )
{
-hInstance = LoadLibraryW(reinterpret_castLPWSTR(vec[0]));
+h = LoadLibraryW(reinterpret_castLPWSTR(vec[0]));
-if (hInstance == NULL)
-hInstance = LoadLibraryExW(reinterpret_castLPWSTR(vec[0]),
NULL,
+if (h == NULL)
+h = LoadLibraryExW(reinterpret_castLPWSTR(vec[0]), NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
}
}
-
-if (hInstance = (HINSTANCE)HINSTANCE_ERROR)
-hInstance = 0;
-
-ret = (oslModule) hInstance;
+ret = (oslModule) h;
rtl_uString_release(Module);
#if OSL_DEBUG_LEVEL 2
SetErrorMode(errorMode);
@@ -103,22 +99,19 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char
*pModuleName, sal_Int32 nR
{
(void) nRtldMode; /* avoid warnings */
-HINSTANCE hInstance;
+HMODULE h;
UINT errorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX |
SEM_FAILCRITICALERRORS);
oslModule ret = 0;
SAL_INFO( sal.osl, { osl_loadModule start: pModuleName );
OSL_ASSERT(pModuleName);
-hInstance = LoadLibrary(pModuleName);
-if (hInstance == NULL)
-hInstance = LoadLibraryEx(pModuleName, NULL,
+h = LoadLibrary(pModuleName);
+if (h == NULL)
+h = LoadLibraryEx(pModuleName, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
-if (hInstance = (HINSTANCE)HINSTANCE_ERROR)
-hInstance = 0;
-
-ret = (oslModule) hInstance;
+ret = (oslModule) h;
SetErrorMode(errorMode);
SAL_INFO( sal.osl, } osl_loadModule end: pModuleName );
@@ -139,10 +132,10 @@ sal_Bool SAL_CALL
osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
{
LPCWSTR pName = pModuleName ?
reinterpret_castLPCWSTR(pModuleName-buffer) : NULL;
-HINSTANCE hInstance = GetModuleHandleW(pName);
-if( hInstance )
+HMODULE h = GetModuleHandleW(pName);
+if( h )
{
-*pResult = (oslModule) hInstance;
+*pResult = (oslModule) h;
return sal_True;
}
@@ -154,7 +147,7 @@ osl_getModuleHandle(rtl_uString *pModuleName, oslModule
*pResult)
/*/
void SAL_CALL osl_unloadModule(oslModule Module)
{
-FreeLibrary((HINSTANCE)Module);
+FreeLibrary((HMODULE)Module);
}
/*/
@@ -210,7 +203,7 @@ osl_getAsciiFunctionSymbol( oslModule Module, const
sal_Char *pSymbol )
oslGenericFunction fncAddr = NULL;
if( pSymbol )
-fncAddr=(oslGenericFunction)GetProcAddress((HINSTANCE) Module,
pSymbol);
+fncAddr=(oslGenericFunction)GetProcAddress((HMODULE) Module, pSymbol);
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/workbookfragment.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit d760039be5799a500f802494759dda75499ad908
Author: Michael Meeks michael.me...@collabora.com
Date: Wed Dec 4 16:09:33 2013 +
oox: remove debugging printf.
Change-Id: I79198f926cad736549f3251ea92971374b305999
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index e4edb09..bfc5e7b 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -292,7 +292,6 @@ public:
}
virtual void Timeout()
{
-fprintf( stderr, Progress bar update\n );
for( size_t i = 0; i aSegments.size(); i++)
static_cast ProgressWrapper *( aSegments[ i ].get()
)-UpdateBar();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/metaact.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit bfe74d2254de4e8b7dc488a701d75e5a6169e74d
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Dec 4 16:10:28 2013 +
Add some logging to MetaFile read.
Change-Id: I11bc4a82fd0d09fb255c30f3aeffecd3b4e95c09
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index d205723..5c23c6a 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -159,6 +159,8 @@ MetaAction* MetaAction::ReadMetaAction( SvStream rIStm,
ImplMetaReadData* pData
rIStm nType;
+SAL_INFO(vcl.gdi, ReadMetaAction nType);
+
switch( nType )
{
case( META_NULL_ACTION ): pAction = new MetaAction; break;
@@ -4174,6 +4176,8 @@ void MetaCommentAction::Read( SvStream rIStm,
ImplMetaReadData* )
maComment = read_lenPrefixed_uInt8s_ToOStringsal_uInt16(rIStm);
rIStm mnValue mnDataSize;
+SAL_INFO(vcl.gdi, MetaCommentAction::Read maComment);
+
delete[] mpData;
if( mnDataSize )
___
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/rtfexport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 190c2fa39e18fd129e0efe7371f9ed35ad696a91 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Dec 4 17:41:24 2013 +0100 use OUString::startsWith Change-Id: I248e2e5802ef2404c49fc7bc4c9f4baa794ccdef diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index b70b9be..89539ea 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1178,7 +1178,7 @@ SwRTFWriter::SwRTFWriter( const OUString rFltName, const OUString rBaseURL ) SAL_INFO(sw.rtf, OSL_THIS_FUNC); SetBaseURL( rBaseURL ); // export outline nodes, only (send outline to clipboard/presentation) -m_bOutOutlineOnly = (!rFltName.isEmpty() 'O' == rFltName[0]); +m_bOutOutlineOnly = rFltName.startsWith(O); } SwRTFWriter::~SwRTFWriter() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit f115ec6ce1ff4bf6e68ceb441f716a4c70ecfdf6
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Dec 4 16:57:34 2013 +0100
EMF+: Do not ignore source rectangle of the image to be rendered.
Change-Id: I4f861c7653c89d8f1ca73696e885f33f7bfc3b06
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4172649..ccb8bd6 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1826,6 +1826,7 @@ namespace cppcanvas
sal_Int32 aCount;
ReadRectangle (rMF, sx, sy, sw, sh);
+Rectangle aSource(Point(sx, sy), Size(sw, sh));
SAL_INFO(cppcanvas.emf, EMF+ (type ==
EmfPlusRecordTypeDrawImagePoints ? DrawImagePoints : DrawImage) source
rectangle: sx , sy sw x sh);
@@ -1866,6 +1867,7 @@ namespace cppcanvas
if (bValid) {
BitmapEx aBmp( image.graphic.GetBitmapEx
() );
+aBmp.Crop( aSource );
Size aSize( aBmp.GetSizePixel() );
SAL_INFO(cppcanvas.emf, EMF+ bitmap
size: aSize.Width() x aSize.Height());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/printdlg.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 02efbed152a3a9e364cdb73628af0aed0f5d6f7a Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 4 16:48:08 2013 + Resolves: rhbz#1038189 refresh printer list when print dialog launched which is the the same thing the printer settings dialog does Change-Id: I36fb9f057b66faa8c9fce5a9934ed2fb70786363 diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index b8cb188..21941ca 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -602,6 +602,8 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptrPrinterCont // init reverse print maJobPage.mpReverseOrderBox-Check( maPController-getReversePrint() ); +Printer::updatePrinters(); + // fill printer listbox const std::vector OUString rQueues( Printer::GetPrinterQueues() ); for( std::vector OUString ::const_iterator it = rQueues.begin(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit faf50efc7df5687b2983990078d42d8b4a882bb5
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Dec 4 16:57:34 2013 +0100
EMF+: Do not ignore source rectangle of the image to be rendered.
Change-Id: I4f861c7653c89d8f1ca73696e885f33f7bfc3b06
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index e7fa984..bbf4174 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1828,6 +1828,7 @@ namespace cppcanvas
sal_Int32 aCount;
ReadRectangle (rMF, sx, sy, sw, sh);
+Rectangle aSource(Point(sx, sy), Size(sw, sh));
SAL_INFO(cppcanvas.emf, EMF+ (type ==
EmfPlusRecordTypeDrawImagePoints ? DrawImagePoints : DrawImage) source
rectangle: sx , sy sw x sh);
@@ -1868,6 +1869,7 @@ namespace cppcanvas
if (bValid) {
BitmapEx aBmp( image.graphic.GetBitmapEx
() );
+aBmp.Crop( aSource );
Size aSize( aBmp.GetSizePixel() );
SAL_INFO(cppcanvas.emf, EMF+ bitmap
size: aSize.Width() x aSize.Height());
___
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/docnode/nodedump.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 73cf3fd42e2d852762ad9afd9ea4597213f73f66
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Dec 4 17:14:06 2013 +0100
sw doc model dump: show rsid value
Change-Id: Ic657c4bae045a2663c3b10c569af2fd0c9235775
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index a57e885..76f2217 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -23,6 +23,7 @@
#include svl/itemiter.hxx
#include svl/intitem.hxx
#include editeng/charrotateitem.hxx
+#include editeng/rsiditem.hxx
#include tools/datetimeutils.hxx
#include libxml/encoding.h
@@ -305,7 +306,14 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const
SfxItemSet* pSet)
case RES_CHRATR_CJK_WEIGHT: pWhich = character cjk weight; break;
case RES_CHRATR_CTL_POSTURE: pWhich = character ctl posture;
break;
case RES_CHRATR_CTL_WEIGHT: pWhich = character ctl weight; break;
-case RES_CHRATR_RSID: pWhich = character rsid; break;
+case RES_CHRATR_RSID:
+{
+pWhich = character rsid;
+css::uno::Any aAny;
+static_castconst SvxRsidItem*(pItem)-QueryValue(aAny);
+oValue = OString::number(aAny.getsal_uInt32());
+}
+break;
case RES_CHRATR_ROTATE: pWhich = character rotation; oValue =
OString::number(static_castconst SvxCharRotateItem*(pItem)-GetValue());
break;
case RES_PARATR_OUTLINELEVEL: pWhich = paragraph outline level;
oValue = OString::number(static_castconst SfxUInt16Item*(pItem)-GetValue());
break;
case RES_PARATR_NUMRULE: pWhich = paragraph numbering rule;
oValue = OUStringToOString(static_castconst
SwNumRuleItem*(pItem)-GetValue(), RTL_TEXTENCODING_UTF8); break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 1531f609673a1fdce18648f1ee0ab04e0432914c
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Dec 4 16:57:34 2013 +0100
EMF+: Do not ignore source rectangle of the image to be rendered.
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: I4f861c7653c89d8f1ca73696e885f33f7bfc3b06
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 7b8862c..aeb52af 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1816,6 +1816,7 @@ namespace cppcanvas
sal_Int32 aCount;
ReadRectangle (rMF, sx, sy, sw, sh);
+Rectangle aSource(Point(sx, sy), Size(sw, sh));
EMFP_DEBUG (printf (EMF+ %s source rectangle:
%f,%f %fx%f\n, type == EmfPlusRecordTypeDrawImagePoints ? DrawImagePoints :
DrawImage, sx, sy, sw, sh));
@@ -1856,6 +1857,7 @@ namespace cppcanvas
if (bValid) {
BitmapEx aBmp( image.graphic.GetBitmapEx () );
+aBmp.Crop( aSource );
Size aSize( aBmp.GetSizePixel() );
EMFP_DEBUG (printf (EMF+ bitmap size:
%ldx%ld\n, aSize.Width(), aSize.Height()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - offapi/com sw/inc sw/qa sw/source writerfilter/source
offapi/com/sun/star/style/CharacterProperties.idl | 11 ++
sw/inc/hintids.hxx|2
sw/inc/unoprnms.hxx |1
sw/qa/extras/ooxmlexport/data/theme-preservation.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 20
sw/source/core/bastyp/init.cxx|5 -
sw/source/core/unocore/unomap.cxx |3
sw/source/core/unocore/unoprnms.cxx |1
sw/source/filter/ww8/attributeoutputbase.hxx |3
sw/source/filter/ww8/docxattributeoutput.cxx | 86 ++
sw/source/filter/ww8/docxattributeoutput.hxx |3
sw/source/filter/ww8/rtfattributeoutput.cxx |4
sw/source/filter/ww8/rtfattributeoutput.hxx |3
sw/source/filter/ww8/wrtw8nds.cxx |6 +
sw/source/filter/ww8/ww8atr.cxx |7 +
sw/source/filter/ww8/ww8attributeoutput.hxx |3
writerfilter/source/dmapper/DomainMapper.cxx | 29 --
writerfilter/source/dmapper/PropertyIds.cxx |8 +
writerfilter/source/dmapper/PropertyIds.hxx |8 +
writerfilter/source/dmapper/PropertyMap.cxx | 59
writerfilter/source/dmapper/PropertyMap.hxx | 22 +++-
writerfilter/source/dmapper/StyleSheetTable.cxx | 13 +-
22 files changed, 254 insertions(+), 43 deletions(-)
New commits:
commit 13ce74fd9b5f7b9ea9d3dab34eed27a63aae5468
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Wed Dec 4 14:23:21 2013 +0100
fdo#64232: Unit test for font theme attributes preservation
The unit test checks three cases:
* attributes in run properties
* attributes in default run properties
* attributes in style definitions
Change-Id: Ie3224f41bd29e8b258dbd6823b7c9549e1ef5b1e
diff --git a/sw/qa/extras/ooxmlexport/data/theme-preservation.docx
b/sw/qa/extras/ooxmlexport/data/theme-preservation.docx
new file mode 100644
index 000..c1d879a
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/theme-preservation.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 084968c..ab264fd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2040,6 +2040,26 @@ DECLARE_OOXMLEXPORT_TEST(testMce, mce.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x9bbb59),
getPropertysal_Int32(getShape(1), FillColor));
}
+DECLARE_OOXMLEXPORT_TEST(testThemePreservation, theme-preservation.docx)
+{
+// check default font theme values have been preserved
+xmlDocPtr pXmlStyles = parseExport(word/styles.xml);
+if (!pXmlStyles)
+return;
+assertXPath(pXmlStyles,
/w:styles/w:docDefaults/w:rPrDefault/w:rPr/w:rFonts, asciiTheme,
minorHAnsi);
+assertXPath(pXmlStyles,
/w:styles/w:docDefaults/w:rPrDefault/w:rPr/w:rFonts, eastAsiaTheme,
minorEastAsia);
+
+// check the font theme values in style definitions
+assertXPath(pXmlStyles, /w:styles/w:style[1]/w:rPr/w:rFonts,
eastAsiaTheme, minorEastAsia);
+
+// check direct format font theme values have been preserved
+xmlDocPtr pXmlDocument = parseExport(word/document.xml);
+if (!pXmlDocument)
+return;
+assertXPath(pXmlDocument,
/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w:rFonts, hAnsiTheme, majorBidi);
+assertXPath(pXmlDocument,
/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w:rFonts, cstheme, majorBidi);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
commit 983002475fba1879fd00c75417342be55153b797
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Wed Dec 4 10:17:14 2013 +0100
fdo#64232: Save font theme attributes in rPrDefault
The default values for run properties are stored in the styles.xml
file, in the w:rPrDefault tag. The process of this tag is slightly
different from normal rPr tags.
First, we fix DocxAttributeOutput::OutputDefaultItem to be able to
output the contents of the character grab bag.
Second, we fix StyleSheetTable::applyDefaults to read the property
values using the GetPropertyValue method instead of using an iterator
directly, because the former creates the grab bags and returns them
as properties while the latter returns all the properties individually,
including those that should be inside a grab bag.
Change-Id: I91254ba20fd9ca5a1b02afb587f52a449a215d6c
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index c8b4b9b..6e9cf53 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2634,6 +2634,9 @@ void DocxAttributeOutput::OutputDefaultItem(const
SfxPoolItem rHt)
case RES_PARATR_SNAPTOGRID:
bMustWrite = !static_cast const SvxParaGridItem
(rHt).GetValue();
Re: deadlock writing to stdout in remotely controlled soffice
Thanks, looks like it was something in this direction. It seems that the VM was low on memory and killed a few processes which resulted in this behavior. Now after a restart from cloph everything works fine again and I see some nice results for the crash testing. Regards, Markus 2013/12/4 Stephan Bergmann sberg...@redhat.com On 12/04/2013 07:13 AM, Markus Mohrhard wrote: Thread 2 (Thread 0x7fb868e6f700 (LWP 22391)): #0 0x00352d4e767d in write () from /lib64/libc.so.6 #1 0x00352d476d53 in _IO_new_file_write () from /lib64/libc.so.6 #2 0x00352d4774ef in __GI__IO_file_xsputn () from /lib64/libc.so.6 #3 0x00352d46c73d in fputs () from /lib64/libc.so.6 #4 0x7fb88e855cb3 in (anonymous namespace)::log (level=SAL_DETAIL_LOG_LEVEL_WARN, area=0x7fb8748331b9 legacy.osl, where=0x7fb874833358 /home/buildslave/source/libo- core/sc/source/core/data/documen7.cxx:276: , message=0x7fb868e6bbf0 RemoveFromFormulaTree: nFormulaCodeInTree nRPN) at /home/buildslave/source/libo-core/sal/osl/all/log.cxx:242 #5 0x7fb88e855ee3 in osl::detail::logFormat (level=SAL_DETAIL_LOG_LEVEL_WARN, area=0x7fb8748331b9 legacy.osl, where=0x7fb874833358 /home/buildslave/source/libo- core/sc/source/core/data/documen7.cxx:276: , format=0x7fb87483316b %s, arguments=0x7fb868e6c038) at /home/buildslave/source/libo-core/sal/osl/all/log.cxx:282 #6 0x7fb88e855e2b in sal_detail_logFormat (level=SAL_DETAIL_LOG_LEVEL_WARN, area=0x7fb8748331b9 legacy.osl, where=0x7fb874833358 /home/buildslave/source/libo- core/sc/source/core/data/documen7.cxx:276: , format=0x7fb87483316b %s) at /home/buildslave/source/libo-core/sal/osl/all/log.cxx:265 I assume stderr is a pipe nobody's reading from in a timely way, so that writing to it eventually blocks. Stephan ___ 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: sc/source
sc/source/filter/excel/excform.cxx | 34 +-
1 file changed, 25 insertions(+), 9 deletions(-)
New commits:
commit 0fb70733136f2382e7253ef0515a681c7cec724d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Dec 4 14:35:42 2013 -0500
Assign top cell to the formula group if it's still NULL.
This can happen when Excel's original shared formula range is across
multiple columns, in which case we split that into multiple groups (one
per column), and initialize top cell only for the left most column.
This fixes the crasher on the doc from fdo#31296.
Change-Id: I9e4def9836947fc67523f0d99ca981465709b934
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 06e14b2..2b7175b 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -133,15 +133,31 @@ void ImportExcel::Formula(
if (pLast pLast-mpCell pLast-mnRow == (aScPos.Row()-1))
{
ScFormulaCell* pCell = new ScFormulaCell(pD, aScPos,
xGroup);
-rDoc.getDoc().EnsureTable(aScPos.Tab());
-rDoc.setFormulaCell(aScPos, pCell);
-xGroup-mnLength = aScPos.Row() -
xGroup-mpTopCell-aPos.Row() + 1;
-pCell-SetNeedNumberFormat(false);
-if (!rtl::math::isNan(fCurVal))
-pCell-SetResultDouble(fCurVal);
-
-GetXFRangeBuffer().SetXF(aScPos, nXF);
-SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal, nXF,
pCell);
+
+if (!xGroup-mpTopCell nSharedRow == aScPos.Row())
+// This formula group object is a duplicate of the
+// original one due to Excel's multi-column shared
+// range, and doesn't have the top cell assigned yet.
+// Assign the current cell as its top cell.
+xGroup-mpTopCell = pCell;
+
+if (xGroup-mpTopCell)
+{
+rDoc.getDoc().EnsureTable(aScPos.Tab());
+rDoc.setFormulaCell(aScPos, pCell);
+xGroup-mnLength = aScPos.Row() -
xGroup-mpTopCell-aPos.Row() + 1;
+pCell-SetNeedNumberFormat(false);
+if (!rtl::math::isNan(fCurVal))
+pCell-SetResultDouble(fCurVal);
+
+GetXFRangeBuffer().SetXF(aScPos, nXF);
+SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal,
nXF, pCell);
+}
+else
+{
+// No idea what's going on here...
+delete pCell;
+}
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/excel/excform.cxx | 34 +-
1 file changed, 25 insertions(+), 9 deletions(-)
New commits:
commit fdf5b7b0f9e01735d5721b8080a29bfcb893d12c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Dec 4 14:35:42 2013 -0500
Assign top cell to the formula group if it's still NULL.
This can happen when Excel's original shared formula range is across
multiple columns, in which case we split that into multiple groups (one
per column), and initialize top cell only for the left most column.
This fixes the crasher on the doc from fdo#31296.
Change-Id: I9e4def9836947fc67523f0d99ca981465709b934
(cherry picked from commit 0fb70733136f2382e7253ef0515a681c7cec724d)
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 06e14b2..2b7175b 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -133,15 +133,31 @@ void ImportExcel::Formula(
if (pLast pLast-mpCell pLast-mnRow == (aScPos.Row()-1))
{
ScFormulaCell* pCell = new ScFormulaCell(pD, aScPos,
xGroup);
-rDoc.getDoc().EnsureTable(aScPos.Tab());
-rDoc.setFormulaCell(aScPos, pCell);
-xGroup-mnLength = aScPos.Row() -
xGroup-mpTopCell-aPos.Row() + 1;
-pCell-SetNeedNumberFormat(false);
-if (!rtl::math::isNan(fCurVal))
-pCell-SetResultDouble(fCurVal);
-
-GetXFRangeBuffer().SetXF(aScPos, nXF);
-SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal, nXF,
pCell);
+
+if (!xGroup-mpTopCell nSharedRow == aScPos.Row())
+// This formula group object is a duplicate of the
+// original one due to Excel's multi-column shared
+// range, and doesn't have the top cell assigned yet.
+// Assign the current cell as its top cell.
+xGroup-mpTopCell = pCell;
+
+if (xGroup-mpTopCell)
+{
+rDoc.getDoc().EnsureTable(aScPos.Tab());
+rDoc.setFormulaCell(aScPos, pCell);
+xGroup-mnLength = aScPos.Row() -
xGroup-mpTopCell-aPos.Row() + 1;
+pCell-SetNeedNumberFormat(false);
+if (!rtl::math::isNan(fCurVal))
+pCell-SetResultDouble(fCurVal);
+
+GetXFRangeBuffer().SetXF(aScPos, nXF);
+SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal,
nXF, pCell);
+}
+else
+{
+// No idea what's going on here...
+delete pCell;
+}
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source
dbaccess/source/core/api/tablecontainer.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit c6e36556c14612aa1eaf976efc10db6c88e23fb0
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Sun Nov 10 18:05:07 2013 +
fdo#70144 Don't reset Document's modified flag when inserting new table.
It is unclear why the modified flag should ever be blindly overwritten hence
we no longer touch the modified flag here. (This change appears to have no
undesired side-effects.)
Change-Id: I246eb7d84249794fa4d52fcd9b008d8340bbc82d
Reviewed-on: https://gerrit.libreoffice.org/6632
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu
(cherry picked from commit 56d4f4b7b97eaf212a3bc6bdb1da767106e7224a)
diff --git a/dbaccess/source/core/api/tablecontainer.cxx
b/dbaccess/source/core/api/tablecontainer.cxx
index 32400c8..fc6e924 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -146,8 +146,7 @@ namespace
void lcl_createDefintionObject(const OUString _rName
,const Reference XNameContainer
_xTableDefinitions
,ReferenceXPropertySet _xTableDefinition
- ,ReferenceXNameAccess _xColumnDefinitions
- ,sal_Bool _bModified)
+ ,ReferenceXNameAccess _xColumnDefinitions)
{
if ( _xTableDefinitions.is() )
{
@@ -158,7 +157,6 @@ void lcl_createDefintionObject(const OUString _rName
// set as folder
_xTableDefinition.set( TableDefinition::createWithName(
::comphelper::getProcessComponentContext(), _rName ), UNO_QUERY);
_xTableDefinitions-insertByName(_rName,makeAny(_xTableDefinition));
-
::dbaccess::notifyDataSourceModified(_xTableDefinitions,_bModified);
}
ReferenceXColumnsSupplier
xColumnsSupplier(_xTableDefinition,UNO_QUERY);
if ( xColumnsSupplier.is() )
@@ -180,7 +178,7 @@ connectivity::sdbcx::ObjectType
OTableContainer::createObject(const OUString _r
{
ReferenceXPropertySet xTableDefinition;
ReferenceXNameAccess xColumnDefinitions;
-
lcl_createDefintionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions,sal_False);
+
lcl_createDefintionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
if ( xSup.is() )
{
@@ -311,7 +309,7 @@ ObjectType OTableContainer::appendObject( const OUString
_rForName, const Refer
ReferenceXPropertySet xTableDefinition;
ReferenceXNameAccess xColumnDefinitions;
-
lcl_createDefintionObject(getNameForObject(descriptor),m_xTableDefinitions,xTableDefinition,xColumnDefinitions,sal_False);
+
lcl_createDefintionObject(getNameForObject(descriptor),m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
ReferenceXColumnsSupplier xSup(descriptor,UNO_QUERY);
ReferenceXDataDescriptorFactory xFac(xColumnDefinitions,UNO_QUERY);
ReferenceXAppend xAppend(xColumnDefinitions,UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: threaded progress bar deadlock ...
On Tue, 2013-12-03 at 14:14 +, Michael Meeks wrote: Separately - we wanted to put the progress bar updates into a thread - and we should do that in the main thread I think. That's implemented on master. Only problem is we're just a bit too fast to get back to the interactive main loop while threads are loading the sheets; so double-clicking in the new start center gives us 2x attempts to try to load the same file - General I/O error - or a locking problem. I guess that's worthy of some UX tweaking / investigation at least =) ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Eike Rathke er...@redhat.com changed: What|Removed |Added Depends on||72278 --- Comment #119 from Eike Rathke er...@redhat.com --- Adding bug 72278 that has the same cause as bug 71667. Present in 4.1.4.1 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] mso-dumper.git: msodumper/xlsmodel.py msodumper/xlsparser.py msodumper/xlsrecord.py msodumper/xlsstream.py xls-dump.py
msodumper/xlsmodel.py | 29 + msodumper/xlsparser.py | 31 ++- msodumper/xlsrecord.py | 30 ++ msodumper/xlsstream.py | 30 ++ xls-dump.py| 29 + 5 files changed, 28 insertions(+), 121 deletions(-) New commits: commit 726c606bfb1ce0171d867d6c9bf7891c77d6dd67 Author: Thorsten Behrens tbehr...@suse.com Date: Thu Dec 5 01:33:17 2013 +0100 Move codebase to MPL. SUSE-contributed code is MPLv2, other patch contributors have consented to new license. Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com Signed-off-by: Miklos Vajna vmik...@suse.cz Signed-off-by: Noel Power noel.po...@suse.com Signed-off-by: Sergey Kishchenko void...@gmail.com diff --git a/msodumper/xlsmodel.py b/msodumper/xlsmodel.py index bb4288a..c2bb890 100644 --- a/msodumper/xlsmodel.py +++ b/msodumper/xlsmodel.py @@ -1,29 +1,9 @@ - +# -*- tab-width: 4; indent-tabs-mode: nil -*- # -# Copyright (c) 2010 Kohei Yoshida +# 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/. # -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the Software), to deal in the Software without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following -# conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# - import globals, node, formula @@ -637,3 +617,4 @@ class DataValidation(object): return nd +# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab: diff --git a/msodumper/xlsparser.py b/msodumper/xlsparser.py index 2a58285..0ae9e0c 100644 --- a/msodumper/xlsparser.py +++ b/msodumper/xlsparser.py @@ -1,30 +1,10 @@ -#!/usr/bin/env python2 - +# -*- tab-width: 4; indent-tabs-mode: nil -*- # -# Copyright (c) 2011 Sergey Kishchenko +# 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/. # -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the Software), to deal in the Software without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following -# conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# - + import xlsrecord @@ -751,3 +731,4 @@ class XlsParser(BaseParser): return None return self.__dumpRoot(parsed) +# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab: diff --git a/msodumper/xlsrecord.py b/msodumper/xlsrecord.py index 3e3ebfc..fdacf85 100644 --- a/msodumper/xlsrecord.py +++ b/msodumper/xlsrecord.py @@ -1,29 +1,9 @@ - +# -*- tab-width: 4; indent-tabs-mode: nil -*- # -# Copyright (c) 2010-2012 Kohei Yoshida +#
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/scmod.hxx |1 +
sc/source/ui/app/inputhdl.cxx| 14 ++
sc/source/ui/app/scmod.cxx |7 +++
sc/source/ui/formdlg/formula.cxx |2 +-
sc/source/ui/inc/inputhdl.hxx|1 +
5 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit dfd1a47a38dac743f9ed0f1e9507714bac027d35
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 5 01:50:38 2013 +0100
resolved fdo#71667 and fdo#72278, fdo#69971 follow-up fix
a9d85d62a889288b17899c8defc020da487d8b36 used
ScInputHandler::EnterHandler() to reset all sort of things related to
input EditEngine, but that is a handler for Enter and does not enter a
handler and actually attempts to finalize input, which lead to various
unwanted side effects.
Introduced ScInputHandler::InputTurnOffWinEngine() as only the input bar
window EditEngine needs to be reset in the window switching case (which
EnterHandler also does hence it did prevent that bug). The approach
could be polished with further refinement but most importantly fixes the
actual problems now.
Change-Id: I9a0bc452b49ba11a3313cafbc1e5972f41dc65c7
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 5932904..a90a0b3 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -217,6 +217,7 @@ SC_DLLPUBLICvoidSetAppOptions (
const ScAppOptions rO
voidInputGetSelection( sal_Int32 rStart, sal_Int32 rEnd
);
voidInputSetSelection( sal_Int32 nStart, sal_Int32 nEnd );
voidInputReplaceSelection( const OUString rStr );
+voidInputTurnOffWinEngine();
OUStringInputGetFormulaStr();
voidActivateInputWindow( const OUString* pStr = NULL,
sal_Bool bMatrix = false );
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 9e06c6b..00bcf3c 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3904,6 +3904,20 @@ void ScInputHandler::InputReplaceSelection( const
OUString rStr )
bModified = true;
}
+void ScInputHandler::InputTurnOffWinEngine()
+{
+bInOwnChange = true;// disable ModifyHdl (reset below)
+
+eMode = SC_INPUT_NONE;
+/* TODO: it would be better if there was some way to reset the input bar
+ * engine instead of deleting and having it recreate through
+ * GetFuncEditView(), but first least invasively let this fix fdo#71667 and
+ * fdo#72278 without reintroducing fdo#69971. */
+StopInputWinEngine(true);
+
+bInOwnChange = false;
+}
+
//
// ScInputHdlState
//
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 59e8fcf..dfeeba9 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1543,6 +1543,13 @@ void ScModule::InputReplaceSelection( const OUString
rStr )
pHdl-InputReplaceSelection( rStr );
}
+void ScModule::InputTurnOffWinEngine()
+{
+ScInputHandler* pHdl = GetInputHdl();
+if (pHdl)
+pHdl-InputTurnOffWinEngine();
+}
+
OUString ScModule::InputGetFormulaStr()
{
ScInputHandler* pHdl = GetInputHdl();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index f3b05d5..3dccb81 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -623,7 +623,7 @@ void ScFormulaDlg::setCurrentFormula(const OUString
_sReplacement)
//ScMultiTextWnd::Paint a new editengine will have been created via
//GetEditView with its default Modification handler enabled. So ensure
//its off when we will access it via InputReplaceSelection
-pScMod-InputEnterHandler();
+pScMod-InputTurnOffWinEngine();
}
pScMod-InputReplaceSelection(_sReplacement);
}
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 03a7da1..d3fc3b9 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -233,6 +233,7 @@ public:
voidInputGetSelection ( sal_Int32 rStart, sal_Int32
rEnd );
voidInputSetSelection ( sal_Int32 nStart, sal_Int32 nEnd
);
voidInputReplaceSelection ( const OUString rStr );
+voidInputTurnOffWinEngine();
boolIsFormulaMode() const { return
bFormulaMode; }
ScInputWindow* GetInputWindow(){ return
pInputWin; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 72278, which changed state. Bug 72278 Summary: EDITING: Wizard use in Calc changes format https://bugs.freedesktop.org/show_bug.cgi?id=72278 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/scmod.hxx |1 +
sc/source/ui/app/inputhdl.cxx| 14 ++
sc/source/ui/app/scmod.cxx |7 +++
sc/source/ui/formdlg/formula.cxx |2 +-
sc/source/ui/inc/inputhdl.hxx|1 +
5 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 4bea81272d502c044febc419a16c86bbdadf5513
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 5 01:50:38 2013 +0100
resolved fdo#71667 and fdo#72278, fdo#69971 follow-up fix
a9d85d62a889288b17899c8defc020da487d8b36 used
ScInputHandler::EnterHandler() to reset all sort of things related to
input EditEngine, but that is a handler for Enter and does not enter a
handler and actually attempts to finalize input, which lead to various
unwanted side effects.
Introduced ScInputHandler::InputTurnOffWinEngine() as only the input bar
window EditEngine needs to be reset in the window switching case (which
EnterHandler also does hence it did prevent that bug). The approach
could be polished with further refinement but most importantly fixes the
actual problems now.
Change-Id: I9a0bc452b49ba11a3313cafbc1e5972f41dc65c7
(cherry picked from commit dfd1a47a38dac743f9ed0f1e9507714bac027d35)
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index a871663..5d7572e 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -217,6 +217,7 @@ SC_DLLPUBLICvoidSetAppOptions (
const ScAppOptions rO
voidInputGetSelection( xub_StrLen rStart, xub_StrLen
rEnd );
voidInputSetSelection( xub_StrLen nStart, xub_StrLen nEnd
);
voidInputReplaceSelection( const OUString rStr );
+voidInputTurnOffWinEngine();
OUStringInputGetFormulaStr();
voidActivateInputWindow( const OUString* pStr = NULL,
sal_Bool bMatrix = false );
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 6f901ce..8001e67 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3906,6 +3906,20 @@ void ScInputHandler::InputReplaceSelection( const
OUString rStr )
bModified = true;
}
+void ScInputHandler::InputTurnOffWinEngine()
+{
+bInOwnChange = true;// disable ModifyHdl (reset below)
+
+eMode = SC_INPUT_NONE;
+/* TODO: it would be better if there was some way to reset the input bar
+ * engine instead of deleting and having it recreate through
+ * GetFuncEditView(), but first least invasively let this fix fdo#71667 and
+ * fdo#72278 without reintroducing fdo#69971. */
+StopInputWinEngine(true);
+
+bInOwnChange = false;
+}
+
//
// ScInputHdlState
//
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index b4398e5..7dcbc9f 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1543,6 +1543,13 @@ void ScModule::InputReplaceSelection( const OUString
rStr )
pHdl-InputReplaceSelection( rStr );
}
+void ScModule::InputTurnOffWinEngine()
+{
+ScInputHandler* pHdl = GetInputHdl();
+if (pHdl)
+pHdl-InputTurnOffWinEngine();
+}
+
OUString ScModule::InputGetFormulaStr()
{
ScInputHandler* pHdl = GetInputHdl();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 70571d2..1503a8c 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -623,7 +623,7 @@ void ScFormulaDlg::setCurrentFormula(const OUString
_sReplacement)
//ScMultiTextWnd::Paint a new editengine will have been created via
//GetEditView with its default Modification handler enabled. So ensure
//its off when we will access it via InputReplaceSelection
-pScMod-InputEnterHandler();
+pScMod-InputTurnOffWinEngine();
}
pScMod-InputReplaceSelection(_sReplacement);
}
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 73e97c4..1c2d9c3 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -233,6 +233,7 @@ public:
voidInputGetSelection ( xub_StrLen rStart, xub_StrLen
rEnd );
voidInputSetSelection ( xub_StrLen nStart, xub_StrLen
nEnd );
voidInputReplaceSelection ( const OUString rStr );
+voidInputTurnOffWinEngine();
boolIsFormulaMode() const { return
bFormulaMode; }
ScInputWindow* GetInputWindow(){ return
pInputWin; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source
writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d668a95764d0daced9a6d1d94ba22e201cf6f5b9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Dec 4 20:47:28 2013 -0500
Drop SAL_CALL to get it to build on Windows.
Change-Id: I0f475c396ec76ee7faa2cd0699181c58934e61e7
diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
index 4cf32f5..9b82049 100644
--- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
@@ -108,7 +108,7 @@ css::uno::Sequence ::sal_Int8 SAL_CALL
OOXMLFastTokenHandler::getUTF8Identifi
#endif
}
-::sal_Int32 SAL_CALL OOXMLFastTokenHandler::getTokenDirect( const char *pStr,
sal_Int32 nLength ) const
+sal_Int32 OOXMLFastTokenHandler::getTokenDirect( const char *pStr, sal_Int32
nLength ) const
{
struct tokenmap::token * pToken =
tokenmap::Perfect_Hash::in_word_set( pStr, nLength );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excform.cxx | 49 +---
sc/source/filter/excel/impop.cxx| 33 +---
sc/source/filter/excel/namebuff.cxx | 39
sc/source/filter/inc/excform.hxx|2 -
sc/source/filter/inc/namebuff.hxx | 12 ++--
5 files changed, 48 insertions(+), 87 deletions(-)
New commits:
commit c6ccab60fa881ad80e64168ced4c5f74349512b0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Dec 4 21:52:09 2013 -0500
Never attempt to create formula groups based on Excel's shared formula
ranges.
Because they are wrong more than half the time.
Change-Id: I24e49c53520442be698e43976d28d0f8477648e6
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 2b7175b..0273ddd 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -125,40 +125,18 @@ void ImportExcel::Formula(
if (pFormConv-ReadSharedFormulaPosition(maStrm, nSharedCol,
nSharedRow))
{
ScAddress aRefPos(aScPos.Col(), nSharedRow, GetCurrScTab());
-ScFormulaCellGroupRef xGroup =
pFormConv-GetSharedFormula(aRefPos);
-if (xGroup)
+const ScTokenArray* pSharedCode =
pFormConv-GetSharedFormula(aRefPos);
+if (pSharedCode)
{
-// Make sure the this one follows immediately below another
shared formula cell.
-LastFormula* pLast = GetLastFormula(aScPos.Col());
-if (pLast pLast-mpCell pLast-mnRow == (aScPos.Row()-1))
-{
-ScFormulaCell* pCell = new ScFormulaCell(pD, aScPos,
xGroup);
-
-if (!xGroup-mpTopCell nSharedRow == aScPos.Row())
-// This formula group object is a duplicate of the
-// original one due to Excel's multi-column shared
-// range, and doesn't have the top cell assigned yet.
-// Assign the current cell as its top cell.
-xGroup-mpTopCell = pCell;
-
-if (xGroup-mpTopCell)
-{
-rDoc.getDoc().EnsureTable(aScPos.Tab());
-rDoc.setFormulaCell(aScPos, pCell);
-xGroup-mnLength = aScPos.Row() -
xGroup-mpTopCell-aPos.Row() + 1;
-pCell-SetNeedNumberFormat(false);
-if (!rtl::math::isNan(fCurVal))
-pCell-SetResultDouble(fCurVal);
-
-GetXFRangeBuffer().SetXF(aScPos, nXF);
-SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal,
nXF, pCell);
-}
-else
-{
-// No idea what's going on here...
-delete pCell;
-}
-}
+ScFormulaCell* pCell = new ScFormulaCell(pD, aScPos,
*pSharedCode);
+rDoc.getDoc().EnsureTable(aScPos.Tab());
+rDoc.setFormulaCell(aScPos, pCell);
+pCell-SetNeedNumberFormat(false);
+if (!rtl::math::isNan(fCurVal))
+pCell-SetResultDouble(fCurVal);
+
+GetXFRangeBuffer().SetXF(aScPos, nXF);
+SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal, nXF,
pCell);
}
else
{
@@ -1736,10 +1714,9 @@ bool ExcelToSc::ReadSharedFormulaPosition( XclImpStream
rStrm, SCCOL rCol, SCR
return true;
}
-ScFormulaCellGroupRef ExcelToSc::GetSharedFormula( const ScAddress rRefPos )
+const ScTokenArray* ExcelToSc::GetSharedFormula( const ScAddress rRefPos )
const
{
-ScFormulaCellGroupRef xGroup = GetOldRoot().pShrfmlaBuff-Find(rRefPos);
-return xGroup;
+return GetOldRoot().pShrfmlaBuff-Find(rRefPos);
}
void ExcelToSc::SetError( ScFormulaCell rCell, const ConvErr eErr )
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index bda23cb..b60e62a 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -876,29 +876,22 @@ void ImportExcel::Shrfmla( void )
SCCOL nCol2 = nLastCol;
SCROW nRow1 = mpLastFormula-mnRow;
-pExcRoot-pShrfmlaBuff-Store(
-ScRange(nCol1, nRow1, GetCurrScTab(), nCol2, nRow1, GetCurrScTab()),
*pErgebnis);
+ScAddress aPos(nCol1, nRow1, GetCurrScTab());
+pExcRoot-pShrfmlaBuff-Store(aPos, *pErgebnis);
// Create formula cell for the last formula record.
-ScAddress aPos(nCol1, nRow1, GetCurrScTab());
-ScFormulaCellGroupRef xGroup = pExcRoot-pShrfmlaBuff-Find(aPos);
-if (xGroup)
-{
-ScDocumentImport rDoc = GetDocImport();
-xGroup-compileCode(rDoc.getDoc(), aPos,
formula::FormulaGrammar::GRAM_DEFAULT);
-
-ScFormulaCell* pCell = new ScFormulaCell(pD, aPos, xGroup);
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/impop.cxx |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit 5a295eb97b9461e603c723308135c1477846e839 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Dec 4 21:59:30 2013 -0500 Update the comment use the column position of the last formula record. Change-Id: I877ec2153754328781e5d87b8eca47998b70fa22 diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index b60e62a..913d1ba 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -869,11 +869,9 @@ void ImportExcel::Shrfmla( void ) OSL_ENSURE( pErgebnis, +ImportExcel::Shrfmla(): ScTokenArray is NULL! ); -// The range in this record can be erroneous especially the row range. -// Use the row from the last FORMULA record as the start row. The end row -// will be adjusted by the formula cells that follow. -SCCOL nCol1 = nFirstCol; -SCCOL nCol2 = nLastCol; +// The shared range in this record is erroneous more than half the time. +// Don't ever rely on it. +SCCOL nCol1 = mpLastFormula-mnCol; SCROW nRow1 = mpLastFormula-mnRow; ScAddress aPos(nCol1, nRow1, GetCurrScTab()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - sc/source
sc/source/filter/excel/excform.cxx | 49 +---
sc/source/filter/excel/impop.cxx| 41 +++---
sc/source/filter/excel/namebuff.cxx | 39
sc/source/filter/inc/excform.hxx|2 -
sc/source/filter/inc/namebuff.hxx | 12 ++--
5 files changed, 51 insertions(+), 92 deletions(-)
New commits:
commit c0b0d3abf4919b9375fb8d73dfc7340b40c193b0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Dec 4 21:59:30 2013 -0500
Update the comment use the column position of the last formula record.
Change-Id: I877ec2153754328781e5d87b8eca47998b70fa22
(cherry picked from commit 5a295eb97b9461e603c723308135c1477846e839)
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index b60e62a..913d1ba 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -869,11 +869,9 @@ void ImportExcel::Shrfmla( void )
OSL_ENSURE( pErgebnis, +ImportExcel::Shrfmla(): ScTokenArray is NULL! );
-// The range in this record can be erroneous especially the row range.
-// Use the row from the last FORMULA record as the start row. The end row
-// will be adjusted by the formula cells that follow.
-SCCOL nCol1 = nFirstCol;
-SCCOL nCol2 = nLastCol;
+// The shared range in this record is erroneous more than half the time.
+// Don't ever rely on it.
+SCCOL nCol1 = mpLastFormula-mnCol;
SCROW nRow1 = mpLastFormula-mnRow;
ScAddress aPos(nCol1, nRow1, GetCurrScTab());
commit 2723a03db34e9cb5a510715df442349b71491b88
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Dec 4 21:52:09 2013 -0500
Never attempt to create formula groups based on Excel's shared formula
ranges.
Because they are wrong more than half the time.
Change-Id: I24e49c53520442be698e43976d28d0f8477648e6
(cherry picked from commit c6ccab60fa881ad80e64168ced4c5f74349512b0)
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 2b7175b..0273ddd 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -125,40 +125,18 @@ void ImportExcel::Formula(
if (pFormConv-ReadSharedFormulaPosition(maStrm, nSharedCol,
nSharedRow))
{
ScAddress aRefPos(aScPos.Col(), nSharedRow, GetCurrScTab());
-ScFormulaCellGroupRef xGroup =
pFormConv-GetSharedFormula(aRefPos);
-if (xGroup)
+const ScTokenArray* pSharedCode =
pFormConv-GetSharedFormula(aRefPos);
+if (pSharedCode)
{
-// Make sure the this one follows immediately below another
shared formula cell.
-LastFormula* pLast = GetLastFormula(aScPos.Col());
-if (pLast pLast-mpCell pLast-mnRow == (aScPos.Row()-1))
-{
-ScFormulaCell* pCell = new ScFormulaCell(pD, aScPos,
xGroup);
-
-if (!xGroup-mpTopCell nSharedRow == aScPos.Row())
-// This formula group object is a duplicate of the
-// original one due to Excel's multi-column shared
-// range, and doesn't have the top cell assigned yet.
-// Assign the current cell as its top cell.
-xGroup-mpTopCell = pCell;
-
-if (xGroup-mpTopCell)
-{
-rDoc.getDoc().EnsureTable(aScPos.Tab());
-rDoc.setFormulaCell(aScPos, pCell);
-xGroup-mnLength = aScPos.Row() -
xGroup-mpTopCell-aPos.Row() + 1;
-pCell-SetNeedNumberFormat(false);
-if (!rtl::math::isNan(fCurVal))
-pCell-SetResultDouble(fCurVal);
-
-GetXFRangeBuffer().SetXF(aScPos, nXF);
-SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal,
nXF, pCell);
-}
-else
-{
-// No idea what's going on here...
-delete pCell;
-}
-}
+ScFormulaCell* pCell = new ScFormulaCell(pD, aScPos,
*pSharedCode);
+rDoc.getDoc().EnsureTable(aScPos.Tab());
+rDoc.setFormulaCell(aScPos, pCell);
+pCell-SetNeedNumberFormat(false);
+if (!rtl::math::isNan(fCurVal))
+pCell-SetResultDouble(fCurVal);
+
+GetXFRangeBuffer().SetXF(aScPos, nXF);
+SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal, nXF,
pCell);
}
else
{
@@ -1736,10 +1714,9 @@ bool ExcelToSc::ReadSharedFormulaPosition( XclImpStream
rStrm, SCCOL rCol, SCR
return true;
}
-ScFormulaCellGroupRef ExcelToSc::GetSharedFormula( const ScAddress rRefPos )
LibO 4.2.0.0beta2 can't launch internal help
I had the same behavior with 4.2.0.0 beta1. Right now I'm using: Version: 4.2.0.0.beta2 Build ID: 1a27be92e320f97c20d581a69ef1c8b99ea9885d 64 bits, Ubuntu-Linux 13.10. I installed also the two french tar.gz packages for localisation and for help. A few strings don't appear in french (mostly in the Options Menu for settings). But my main concern is the fact that I can't launch the internal help, only the web version opens. The french help is correctly installed and visible in /opt/libreoffice4.2/help/fr. I double checked with a LibO 4.1 working installation and the 4.2 installation seems similar... The internal help is very useful, very complete and, most of all, can be accessed without an Internet connection. I tried to find in different settings files to correct this behavior :-( but no success... Someone has a hint? Raymond -- View this message in context: http://nabble.documentfoundation.org/LibO-4-2-0-0beta2-can-t-launch-internal-help-tp4086548.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/analysisofvariancedialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9c2a085a45f9acb305fb85367bede360982e71cb Author: Julien Nabet serval2...@yahoo.fr Date: Wed Dec 4 22:38:24 2013 +0100 Resolves: fdo#72280 Wrong title for Analysis of Variance (ANOVA) dialog Change-Id: Ie2e1edee804f3e85eab08d05adecfc25ebbc77c1 Reviewed-on: https://gerrit.libreoffice.org/6934 Reviewed-by: Joren De Cuyper jore...@libreoffice.org Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui index b61c59b..5b318c4 100644 --- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui +++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui @@ -13,7 +13,7 @@ object class=GtkDialog id=AnalysisOfVarianceDialog property name=can_focusFalse/property property name=border_width5/property -property name=title translatable=yesDescriptive Statistics/property +property name=title translatable=yesAnalysis of Variance (ANOVA)/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2013-12-05
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + fdo#39956 Delete JAB in https://gerrit.libreoffice.org/6819 from David Ostrovsky about module accessibility, build, desktop, include, offapi, padmin, postprocess, scp2, vcl, winaccessibility + gbuild: remove obsolete SOLARLIB in https://gerrit.libreoffice.org/6933 from Matúš Kukan about module build, ios, solenv + fdo#60698: Merge odbcbase into odbc in https://gerrit.libreoffice.org/6929 from Marcos Souza about module build, connectivity, solenv + Zip .ui translations per UIConfig target. in https://gerrit.libreoffice.org/6915 from Matúš Kukan about module include, solenv, vcl, xmlreader + fdo#72226: Fix for Stock chart Invalid RT in https://gerrit.libreoffice.org/6925 from Pallavi Jadhav about module oox + fdo#72221: Fixed for doughnut chart - RT is invalid in https://gerrit.libreoffice.org/6924 from Priyanka Gaikwad about module oox End of freshness * Merged changes on master for project core changed in the last 25 hours: + Resolves: fdo#72280 Wrong title for Analysis of Variance (ANOVA) dialog in https://gerrit.libreoffice.org/6934 from Julien Nabet + sw: add CharInteropGrabBag uno property to characters in https://gerrit.libreoffice.org/6828 from Jacobo Aragunde Pérez + EMF+: Do not ignore source rectangle of the image to be rendered. in https://gerrit.libreoffice.org/6931 from Matúš Kukan + fdo#67011: Run Display::Yield through KDEXLib::Yield. in https://gerrit.libreoffice.org/6750 from Jan-Marek Glogowski + fdo#70144 Don't reset Document's modified flag when inserting new table. in https://gerrit.libreoffice.org/6632 from Andrzej Hunt + convert Contour queryboxes to .ui in https://gerrit.libreoffice.org/6923 from Manal Alhassoun + Prefer the Liberation fonts over Arial/Times in https://gerrit.libreoffice.org/6886 from Samuel Mehrbrodt + Those AFM files are not used anymore in https://gerrit.libreoffice.org/6861 from Khaled Hosny + No more uses of printer built in fonts in https://gerrit.libreoffice.org/6860 from Khaled Hosny + Device-specific font substitution is not used in https://gerrit.libreoffice.org/6859 from Khaled Hosny + Don't perform printer font substitution in https://gerrit.libreoffice.org/6858 from Khaled Hosny + Drop font substitution tab page in https://gerrit.libreoffice.org/6857 from Khaled Hosny + VCL : Remove usage of DBG_CTOR and DBG_DTOR. in https://gerrit.libreoffice.org/6805 from Arnaud Versini + fdo#60698: Merge hatchwindowfactory into svt in https://gerrit.libreoffice.org/6811 from Marcos Souza * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + fdo#69552 make calc functions CEILING and FLOOR comply with ODF1.2 in https://gerrit.libreoffice.org/6767 from Winfried Donkers + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fdo#69407 in https://gerrit.libreoffice.org/6316 from matthieu gay + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for dev-tools on 2013-12-05
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: + Bibisect: Add README with step-by-step documentation in https://gerrit.libreoffice.org/6922 from Robinson Tryon + Bibisect: mergeranges: Allow merge into existing branch in https://gerrit.libreoffice.org/6921 from Robinson Tryon + Bibisect: Clarify tag code; silently overwrite tags if they exist in https://gerrit.libreoffice.org/6920 from Robinson Tryon + Bibisect: Factor-out branchName; move initBranch in prep for refactor in https://gerrit.libreoffice.org/6919 from Robinson Tryon + Bibisect: Tweak passed-in commit range to be inclusive in https://gerrit.libreoffice.org/6918 from Robinson Tryon + Bibisect: Update the 'latest' tag when the merge is done in https://gerrit.libreoffice.org/6917 from Robinson Tryon + Bibisect: Add comments and USAGE information to script in https://gerrit.libreoffice.org/6916 from Robinson Tryon * Merged changes on master for project dev-tools changed in the last 25 hours: None * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 2dc16ffab2632c6b2d7b4c295bdba3afaabc45c6 Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 5 08:27:29 2013 +0200 Some TABs had crept in again Change-Id: If48a84fc7ccb1fc1ca37a6e9fe2e29473f1f32a6 diff --git a/configure.ac b/configure.ac index 138fd8c..82909e2 100644 --- a/configure.ac +++ b/configure.ac @@ -3503,11 +3503,11 @@ if test $_os = WINNT; then MSPDB_PATH= if test $BITNESS_OVERRIDE = ; then - if test $vcnum = 120; then - MSPDB_PATH=$VC_PRODUCT_DIR/../VC/bin - else - MSPDB_PATH=$VC_PRODUCT_DIR/../Common7/IDE - fi +if test $vcnum = 120; then +MSPDB_PATH=$VC_PRODUCT_DIR/../VC/bin +else +MSPDB_PATH=$VC_PRODUCT_DIR/../Common7/IDE +fi else MSPDB_PATH=$VC_PRODUCT_DIR/bin/amd64 fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/coretext/salgdi.h |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 47aad4bde8bfbb77bf72c1f82a012b66f60bf5e3 Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 5 09:00:17 2013 +0200 Increase consistency Change-Id: I5469b00a533ef9bf731698d7906a470699e29ba6 diff --git a/vcl/inc/coretext/salgdi.h b/vcl/inc/coretext/salgdi.h index ae18647..d6f8682 100644 --- a/vcl/inc/coretext/salgdi.h +++ b/vcl/inc/coretext/salgdi.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_CORETEXT_SALGDI2_H -#define INCLUDED_VCL_INC_CORETEXT_SALGDI2_H +#ifndef INCLUDED_VCL_INC_CORETEXT_SALGDI_H +#define INCLUDED_VCL_INC_CORETEXT_SALGDI_H #include vector @@ -428,6 +428,6 @@ inline void AquaSalGraphics::RefreshRect( const NSRect rRect ) #endif -#endif // INCLUDED_VCL_INC_CORETEXT_SALGDI2_H +#endif // INCLUDED_VCL_INC_CORETEXT_SALGDI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/salframe.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4aa1c8d9147ed1421b648fc9b954fa69c5bf4b00 Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 5 09:11:18 2013 +0200 Typo fix Change-Id: I994ebbad19873236ad6d8dc99f721908722d302a diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 3712cd7..d75a460 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -208,7 +208,7 @@ public: // public for Sal Implementation // set new parent window virtual voidSetParent( SalFrame* pNewParent ) = 0; // reparent window to act as a plugin; implementation -// may choose to use a new system window inetrnally +// may choose to use a new system window internally // return false to indicate failure virtual boolSetPluginParent( SystemParentData* pNewParent ) = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/uiconfig
sc/uiconfig/scalc/ui/analysisofvariancedialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 771a00e197b23fe654ffa700773198b551d87c3b Author: Julien Nabet serval2...@yahoo.fr Date: Wed Dec 4 22:38:24 2013 +0100 Resolves: fdo#72280 Wrong title for Analysis of Variance (ANOVA) dialog Change-Id: Ie2e1edee804f3e85eab08d05adecfc25ebbc77c1 Reviewed-on: https://gerrit.libreoffice.org/6934 Reviewed-by: Joren De Cuyper jore...@libreoffice.org Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-on: https://gerrit.libreoffice.org/6937 diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui index b61c59b..5b318c4 100644 --- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui +++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui @@ -13,7 +13,7 @@ object class=GtkDialog id=AnalysisOfVarianceDialog property name=can_focusFalse/property property name=border_width5/property -property name=title translatable=yesDescriptive Statistics/property +property name=title translatable=yesAnalysis of Variance (ANOVA)/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] ownCloud for Bugzilla - IMHO a no go
On Tue, Dec 3, 2013 at 1:16 PM, bjoern bjoern.michael...@canonical.com wrote: On Tue, Dec 03, 2013 at 05:48:54PM +0100, Thorsten Behrens wrote: Idly wondering - are we fixing the right problem? How often does the case arise, what's the size distribution of those huge files, and is it really necessary to store those eternally? So _if_ this happens once in eternity, the wiki should be fine. If this happens regularly we should look into it more deeply. It's hard to know how big a problem this is because the filesize limit on bugzilla is absolute, and there's no integrated documentation telling people to upload large files elsewhere...so some number of people undoubtedly give up. I honestly rather assume the first to be the case, given that there are 6000 files on the wiki and skimming the biggest files(*) shows some (maybe 10?) testcases uploaded there, but most of the big files are actually other stuff (e.g. talkyoo mp3). Also, there are only about 250 files bigger than the current bugzilla limit (3MB) at all. IIRC, Rainer set up the wiki page to host files that wouldn't fit in Bugzilla. I can't recall if the logs indicated that anyone else used the wiki for this purpose, if documentation was made available, etc. I do remember a couple of instances in which we couldn't upload files to Bugzilla due to size, and I have talked to users or seen comments in bug reports File too big to upload to bugzilla so this isn't just a theoretical problem anymore. On Tue, Dec 3, 2013 at 7:23 AM, Florian Effenberger flo...@documentfoundation.org wrote: My strong proposal is therefore to raise the attachment limit in our own BugZilla instance when it's ready. By that, files are in the same tool, tied to the same user accounts, and therefore also in the same backup. Sounds great to me. I would suggest we have some kind of fallback plan, even if it's File too big to upload? Please see if you can shrink it in size or compress it before upload. If all else fails, please email us at bugzilla-attachment-assista...@bugs.libreoffice.org. There will always be corner cases, and it might be worth our time to keep an eye on them. On Tue, Dec 3, 2013 at 7:23 AM, Florian Effenberger flo...@documentfoundation.org wrote: My strong proposal is therefore to raise the attachment limit in our own BugZilla instance when it's ready. By that, files are in the same tool, tied to the same user accounts, and therefore also in the same backup. I don't now how long the BugZilla migration will take. If it's just a short period of time, we can stay with ownCloud _TEMPORARILY_ and for a _LIMITED_ amount of time, and then directly host things at BugZilla. Only if it will take too long, options #3-#6 look worthwhile to me. We are ready on our side to make the migration: https://wiki.documentfoundation.org/QA/Bugzilla/LibreOffice_Bugzilla_Proposal Cloph passed along word from Tollef that he hopes to get the first half done til the weekend, but also mentioned that [Tollef] is extremely busy and the migration is still in the planning phase. I'd suggest that we add the File too big to upload? message to FDO right now, were it not for the fact that such a request would take more time away from Tollef. So...I don't have a great answer. I guess I'd say punt and hope that we get some traction on migration this month. Best, --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] ownCloud for Bugzilla - IMHO a no go
Hi, bjoern wrote on 2013-12-03 14:57: That is ouf course intended in the end. But up until then the Wiki is still a better choice than ownCloud as most people already have accounts there. yes, _UNTIL THEN_, the wiki is better, as I don't have to manually approve accounts there. Emphasizing the until then part so heavily, so it's clear to everyone. ;-) And no matter to which value we will raise the limit in the new Bugzilla, there always will be freaky corner cases that might need more space. As essentially everything in bugzilla is there for eternity, we shouldnt raise the limit too high. So in the end, we need some form of storage anyway. Exactly that is the reason why the wiki is not the best solution in the long run either. Anything there is also for eternity, the database grows, we need larger backup storages - it is kind of a domino effect, unneeded for simply file storage. We share the same pain here. ;-) As the wiki has a rather high limit (25MB) and it should be possible to delete stuff again from there (right?), it doesnt look too bad a fallback to me for No, not totally, some database entries are always there in the end, so deleting is not the right word. :) So _if_ we are using a solution that kinda sucks, we should use _one_ (wiki) and not two (wiki and ownCloud). Yes, I agree, as long as it is temporarily. Yes, account creation makes all these a stillborn. For it is easier to tell the reporter to upload to his dropbox/UbuntuOne/Whatever and us to pick it up from there. I am of course happy with that as well, just as I am with other proposals. My only requirement is that uploading (not downloading) must be authenticated to avoid abuse, and that this authentication must be encrypted, which effectively rules out FTP. Towards anything else, I am open, of course. IMHO no. The wiki was used before for this, so lets not throw in another tool into the mix -- so lets roll back on ownCloud usage for this, and _stay_ with the wiki. Not because its the right solution, but because we introduced that already and we dont have anything better right now. Aka: lets not stack one temporary bandaid storage on top of another temporary bandaid storage. Lets stick with the first temporary bandaid (wiki). I agree. IMHO, the best solution we could hope for is something helping us like this - to let the enduser upload the file in question to the Dropbox-equivalent of his choice I agree so far. - then have a TDF service where our QA guys can throw an URL at (via email, webinterface, ssh login) - this service then downloads the file and saves it for us on our mirror Is that really required? It requires some development time (and everybody knows I lack those skills :-) - if it's temporarily anyways, why not just grabbing the file from Dropbox co.? Oh, and welcome to the world of http://www.xkcd.com/1172/ ;) :D Florian (confused that reply-to-all on this lists does not include the original sender... so if you reply, Cc me manually) ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Squashtest
On Tue, Dec 3, 2013 at 11:08 AM, Sophie gautier.sop...@gmail.com wrote: Hi all, As I'm really not happy that Moztrap doesn't handle localization, I'm still searching for a replacement in the future. I've been pointed to Squash, the site is here: http://www.squashtest.org/index.php/en/squash-tm-25664/squash-tm-overview where at least the UI is fully localizable. It handles manual test and even automated tests and run on different versions and projects. License is LGPLv3 after a version is one year old and it's written in Java. I'll approach the company developing it to see how it could handles test localization and will keep you informed. You can run an online demo if you wish and don't hesitate to give me your feedback. Looks interesting -- I'm not that involved with manual tests right now, so I defer to your technical wisdom here. As you mentioned, the company is using a delayed-open-source-release model: http://www.squashtest.org/index.php/en/squash-tm-25664/sources-licence-squashtm What this might mean is that we can't (easily) upstream any changes/improvements to the software. I don't know how much we've customized MozTrap thusfar, but as long as we keep the source of our webapps in git (as well as any modifications thereof), I guess we can re-apply our changes on top of new versions without too much hassle. We could ask Cloph/Floeff their thoughts on the topic. Cheers, --R ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Squashtest
Hello Sophie, *, On Dienstag, 3. Dezember 2013 17:08 Sophie wrote: As I'm really not happy that Moztrap doesn't handle localization, me neither, but ... I'm still searching for a replacement in the future. I've been pointed to Squash, the site is here: http://www.squashtest.org/index.php/en/squash-tm-25664/squash-tm-overview where at least the UI is fully localizable. If I understood their page right, you do not only need the Squash- TM, but also the Squash-SC, Squash-Data and Squash-TA as well to localise your tests, or am I wrong? It handles manual test and even automated tests and run on different versions and projects. Well, maybe on their system ... ;) License is LGPLv3 after a version is one year old and it's written in Java. I'll approach the company developing it to see how it could handles test localization and will keep you informed. You can run an online demo if you wish and don't hesitate to give me your feedback. Cheers I made the mistake to download their Squash-TM package (http://www.squashtest.org/index.php/en/downloads/finish/17-version-stable/83-squash-tm-1-7-5-windows-mac-linux-tar-gz), unpacked it and started bin/startup.sh (as described on https://sites.google.com/a/henix.fr/wiki-squash-tm/installation-and-exploitation-guide/3---run-and-stop-squash-tm). But after nearly three minutes I was not able to do anything, as my /tmp directory was up to 100% ... :( And a restart of my system leads to an nonfunctional system (or better say: A system with no X, though KDM was running) ... :( If you really want to install it on one of the TDF servers, please test it first at your own system (one, that has more power / is newer than mine etc. ... ;) ). I only found the solution to reinstall my Debian, as all tips I found online did not help here ... :( HTH Thomas. -- Will stain. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
