Re: [Libreoffice-commits] replaceAll
On 01/31/2013 01:58 AM, Michael Meeks wrote: On Wed, 2013-01-30 at 16:26 +0100, Stephan Bergmann wrote: fix for the awkward OUString::replaceAll() behaviour Seeing this, that's the reason I've always been unhappy with such a replaceAll function: While it may appear obviously useful, it easily leads to broken code (like if rInfo1 is wanna bet $2 this doesn't work?, say, in the above snippet). We could deprecate it. Do we have a nice macro wrapped around some magic gcc: really warn if return value unused attribute - I assume there is one of those - that might help make it more sane ? You missed my point, which was not the gotcha of ignoring the return value (which is already addressed with SAL_WARN_UNUSED_RESULT anyway), but the gotcha that a sequence of replaceAll calls to replace multiple placeholders with corresponding replacement values is broken in general (unless you can ensure that each invocation in the sequence does not introduce new instances of subsequent placeholders into the operated-upon string). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] replaceAll
On 2013-01-31 10:32, Stephan Bergmann wrote: You missed my point, which was not the gotcha of ignoring the return value (which is already addressed with SAL_WARN_UNUSED_RESULT anyway), but the gotcha that a sequence of replaceAll calls to replace multiple placeholders with corresponding replacement values is broken in general (unless you can ensure that each invocation in the sequence does not introduce new instances of subsequent placeholders into the operated-upon string). Then perhaps we need some kind of OUString replaceArgs(const OUString source, const OUString[] args, const OUString[] values) helper method that DTRT? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/qa
sc/qa/extras/scoutlineobj.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 95692db60e47442924077dc463bbd729cc71ee04
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Jan 31 09:50:29 2013 +0100
port ScOutlineObj to new UnoApiTest ctor
That makes 'make subsequentcheck' pass here again.
Change-Id: I50d74759b6ae6cd2bfa62a76028dc74931ffb3b0
diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx
index 3e5e964..f55178b 100644
--- a/sc/qa/extras/scoutlineobj.cxx
+++ b/sc/qa/extras/scoutlineobj.cxx
@@ -65,6 +65,7 @@ sal_Int32 ScOutlineObj::nTest = 0;
uno::Reference lang::XComponent ScOutlineObj::mxComponent;
ScOutlineObj::ScOutlineObj()
+: UnoApiTest(/sc/qa/extras/testdocuments)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/docvw/edtwin.cxx | 58 ++
1 file changed, 42 insertions(+), 16 deletions(-)
New commits:
commit afab7f25d20936a93b9d075aadbfcbaff9df8f9e
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 30 00:45:44 2013 +0100
fdo#59928: sw: fix mouse selection of fields:
SwEditWin::MouseButtonDown: the selection of fields was messed up by a
call to rSh.SetCursor near the bottom of the method. This used to be
fixed up by SwEditWin::MouseButtonUp previously, but that was broken
with commit dcb080347ca127044313bbb3c11c37761cc2a7a2.
To fix that move the field selection code to a place where it prevents
the other code from running, in the hope that it is not necessary.
Also it does not make any sense to select whole words when clicking on a
field, just selecting the field seems much better.
Change-Id: I8d604450789844b6a446cf3a35f62ed530d0328e
(cherry picked from commit 94721b2aec614e0d99504138d484b2ad6cd550c7)
Reviewed-on: https://gerrit.libreoffice.org/1925
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index af64e0f..289aa15 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -131,6 +131,7 @@
#include IMark.hxx
#include doc.hxx
+#include txatbase.hxx // FIXME this sucks
#include xmloff/odffields.hxx
#include PostItMgr.hxx
@@ -3216,22 +3217,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
if (aVEvt.eEvent == SDREVENT_EXECUTEURL)
bExecDrawTextLink = sal_True;
}
-
-SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD
);
-
-// Are we selecting a field?
-if ( rSh.GetContentAtPos( aDocPos, aFieldAtPos ) )
-{
-// select work, AdditionalMode if applicable
-if ( KEY_MOD1 == rMEvt.GetModifier()
!rSh.IsAddMode() )
-{
-rSh.EnterAddMode();
-rSh.SelWrd( aDocPos );
-rSh.LeaveAddMode();
-}
-else
-rSh.SelWrd( aDocPos );
-}
break;
}
case 2:
@@ -3567,6 +3552,47 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
rSh.ClearGCAttr();
}
+SwContentAtPos aFieldAtPos(SwContentAtPos::SW_FIELD);
+
+// Are we clicking on a field?
+if (rSh.GetContentAtPos(aDocPos, aFieldAtPos))
+{
+bool bAddMode(false); // AdditionalMode if applicable
+if (KEY_MOD1 == rMEvt.GetModifier() !rSh.IsAddMode())
+{
+bAddMode = true;
+rSh.EnterAddMode();
+}
+rSh.SetCursor(aDocPos, bOnlyText);
+// Select the field. Unfortunately cursor may be on field
+// position or on position after field depending on which
+// half of the field was clicked on.
+SwTxtAttr const*const pTxtFld(aFieldAtPos.pFndTxtAttr);
+if (rSh.GetCurrentShellCursor().GetPoint()-nContent
+.GetIndex() == *pTxtFld-GetStart())
+{
+rSh.Right( CRSR_SKIP_CHARS, true, 1, false );
+rSh.NormalizePam();
+}
+else
+{
+assert(rSh.GetCurrentShellCursor().GetPoint()-nContent
+.GetIndex() == (*pTxtFld-GetStart() + 1));
+rSh.Left( CRSR_SKIP_CHARS, true, 1, false );
+}
+// it's a bit of a mystery what this is good for?
+// in this case we assume it's valid since we just
+// selected a field
+bValidCrsrPos = true;
+if (bAddMode)
+{
+rSh.LeaveAddMode();
+}
+// don't go into the !bOverSelect block below - it moves
+// the cursor
+break;
+}
+
sal_Bool bOverSelect = rSh.ChgCurrPam( aDocPos ), bOverURLGrf
= sal_False;
if( !bOverSelect )
bOverURLGrf = bOverSelect = 0 != rSh.IsURLGrfAtPos(
aDocPos );
___
Libreoffice-commits mailing list
[Libreoffice-commits] .: sc/source
sc/source/filter/xml/xmlexprt.cxx | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 3a17d0b3fba7b5eb9f604baa96abcca2b929ee67
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Jan 31 00:19:00 2013 +0100
Hyperlink is an optional property, fdo#58858
Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
Reviewed-on: https://gerrit.libreoffice.org/1930
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 5782dbc..2a595b0 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3095,9 +3095,16 @@ void ScXMLExport::ExportShape(const uno::Reference
drawing::XShape xShape,
{
// #i66550 HLINK_FOR_SHAPES
rtl::OUString sHlink;
-uno::Reference beans::XPropertySet xProps( xShape, uno::UNO_QUERY );
-if ( xProps.is() )
-xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+try
+{
+uno::Reference beans::XPropertySet xProps( xShape,
uno::UNO_QUERY );
+if ( xProps.is() )
+xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+}
+catch ( const beans::UnknownPropertyException )
+{
+// no hyperlink property
+}
std::auto_ptr SvXMLElementExport pDrawA;
// enlose shapes with draw:a element only if sHlink contains
something
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
deps etc.
Hi guys, I was digging for the latest information on the size cost of our dependencies, and was interested to see things like: workdir/unxlngi6.pro/Dep/LinkTarget/Library/libfwklo.so.d contain only lots of: /data/opt/libreoffice/master/workdir/unxlngi6.pro/CxxObject/framework/source/accelerators/globalacceleratorconfiguration.o :$(gb_Helper_PHONY) /data/opt/libreoffice/master/workdir/unxlngi6.pro/CxxObject/framework/source/accelerators/keymapping.o :$(gb_Helper_PHONY) It seems some clever person deferred the dependency generation until an incremental build is done (?) :-) I assume that accelerates the straight-through build too (?). Nice, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: redland/ExternalProject_raptor.mk redland/ExternalProject_rasqal.mk
redland/ExternalProject_raptor.mk |2 +- redland/ExternalProject_rasqal.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a0509900b65f72e9db60eeb660f0586cd5fa775c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 31 10:43:18 2013 +0100 Proper spacing in makefile command line continuations Quoting The Open Group Base Specifications Issue 7 at http://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html#tag_20_76_13_01 Extended Description: Makefile Syntax: When an escaped newline is found in a command line in a makefile, the command line shall contain the backslash, the newline, and the next line, except that the first character of the next line shall not be included if it is a tab. On Mac OS X, this caused raptor and rasqal to erroneously be configured with a --prefix argument that ended in --disable-static. Change-Id: I9455f8e2e624b245a5278a21d8b0f62d8780f9e4 diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index baf0873..4dae07e 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): --without-threestone --with-regex-library=posix --with-decimal=none \ --with-www=xml \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ -$(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO)\ +$(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \ $(if $(filter NO,$(SYSTEM_LIBXML)), \ diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index d52ef3a..0dfcb14 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): --without-postgresql --without-threestone --with-regex-library=posix \ --with-decimal=none --with-www=xml \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO)\ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(MAKE) \ touch $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.3-hotfixes1'
Tag 'libreoffice-4.0.0.3-hotfixes1' created by Petr Mladek pmla...@suse.cz at 2013-01-31 10:56 -0800 Tag libreoffice-4.0.0.3-hotfixes1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRCk3aAAoJEPQ0oe+v7q6jVO4P/iuVmCNKZtlQi4VStp2ilafP btJ6xYTRKQYoFrZONhKzyo2WKprK8xK6pDGZGLYh0XMiHGa6V6vHTsQhXH+caFF0 hw93HzBljaB+jWboy2QmCb7OvTOByzq8QH6/HPrb/maoXLXBZR56KGVjSMbHHZKd Qe+wxPXVEEn2wQJk1QHR+gSbyaglZ8uB3Ac07MfrGya5n9vtm07WNAm/NpzSCwC2 52RycNEYIK2CEIDqtjdxVWXJfyl921ceGTzQ/TKsPzF2BtyvMuvv4HicCxU/lRbP fPDEEMZ4ANCNED9GW8V5lPHUx33fmOKNnGAA5II8a6l3Z7aBo/Ia7jeTkYIBjHqx yJaMJQjSN8BNnf9morRKKO2A1DRDAYBDKGWJFI68GhHZQclBDjAhsmDftcCKqA6g wGnUn29Xlmt35FwOVcGmCY5OYAuQ29Vs0gpP3jcnZEE6V0uFTVWCyQmXpSShplYl dV7fRrpY9/UtmFTDymNyIZ57+kc89kkdEkbO7mKM+eX1U5UT9C7ghCJAJhk+j528 sv79wFrzqtfIbshVvnnccRM1YSzKS9f4La7YpKoya86TNVpjBzI5tK33XIC0u/aP sCbIMV7RJsQhpr6qDgn3YccmiLpBvHUofzsRzuuWA9y++Cukv0+18ghmm+nud8i/ vH/kFtbvPnHWQHUar+zS =jI5j -END PGP SIGNATURE- Changes since libreoffice-4.0.0.3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Change in core[libreoffice-4-0-0]: fdo#51232: i#119987# fix Impress crash when pasting text und...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1933 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/1933/1 fdo#51232: i#119987# fix Impress crash when pasting text under Outline view Patch by: Wang Zhe Testing by: Yan Ji Review by: hdu (cherry picked from commit 484621239c7f743f44579d2b199b0347dc4734cd) Change-Id: I340de4f1b626defa52ecc48938c63ec4d1ce5c1d Signed-off-by: Tor Lillqvist t...@iki.fi Reviewed-on: https://gerrit.libreoffice.org/1897 Reviewed-by: Joren De Cuyper joren.libreoff...@telenet.be Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz (cherry picked from commit 639f739fbcfb5421c7b7173c700136f169e38bc8) --- M sd/source/ui/view/outlnvs2.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 5a2061e..a514bb2 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -243,6 +243,7 @@ else xPresentation-rehearseTimings(); } +Cancel(); rReq.Done(); } break; -- To view, visit https://gerrit.libreoffice.org/1933 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I340de4f1b626defa52ecc48938c63ec4d1ce5c1d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Petr Mladek pmla...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: fdo#59928: sw: fix mouse selection of fields:
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1925 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1925 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d604450789844b6a446cf3a35f62ed530d0328e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Hyperlink is an optional property, fdo#58858
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1930 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1930 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: python3: bug 15833
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1934
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/1934/1
python3: bug 15833
That python bug cause problems when libreoffice is on a read-only
media... which is very common for Mac as the dmg used to package
the produce is seens as a read only volume.
This patch the bug 15833 for MacOSX only since that is the platform that
is most likely to be impacted, and because of bug 15431 that make
patching on Windows more complex/dangerous.
Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
---
M python3/UnpackedTarball_python3.mk
A python3/python-3.3.0-15833.patch.1
2 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/python3/UnpackedTarball_python3.mk
b/python3/UnpackedTarball_python3.mk
index 840108b..eb07def 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -32,4 +32,10 @@
python3/python-3.3.0-ffi-clang.patch.1 \
))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_UnpackedTarball_add_patches,python3,\
+ python3/python-3.3.0-15833.patch.1 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/python3/python-3.3.0-15833.patch.1
b/python3/python-3.3.0-15833.patch.1
new file mode 100644
index 000..71cef94
--- /dev/null
+++ b/python3/python-3.3.0-15833.patch.1
@@ -0,0 +1,25 @@
+iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
+--- a/Lib/importlib/_bootstrap.py
b/Lib/importlib/_bootstrap.py
+@@ -1066,17 +1066,17 @@ class SourceFileLoader(FileLoader, Sourc
+ except FileExistsError:
+ # Probably another Python process already created the dir.
+ continue
+-except PermissionError:
+-# If can't get proper access, then just forget about writing
+-# the data.
++except OSError as exc:
++# Could be a permission error, read-only filesystem: just
forget
++# about writing the data.
++_verbose_message('could not create {!r}: {!r}', parent, exc)
+ return
+ try:
+ _write_atomic(path, data, _mode)
+ _verbose_message('created {!r}', path)
+-except (PermissionError, FileExistsError):
+-# Don't worry if you can't write bytecode or someone is writing
+-# it at the same time.
+-pass
++except OSError as exc:
++# Same as above: just don't write the bytecode.
++_verbose_message('could not create {!r}: {!r}', path, exc)
--
To view, visit https://gerrit.libreoffice.org/1934
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: python3: bug 15833
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1935
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/1935/1
python3: bug 15833
That python bug cause problems when libreoffice is on a read-only
media... which is very common for Mac as the dmg used to package
the produce is seens as a read only volume.
This patch the bug 15833 for MacOSX only since that is the platform that
is most likely to be impacted, and because of bug 15431 that make
patching on Windows more complex/dangerous.
Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
---
M python3/UnpackedTarball_python3.mk
A python3/python-3.3.0-15833.patch.1
2 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/python3/UnpackedTarball_python3.mk
b/python3/UnpackedTarball_python3.mk
index 840108b..eb07def 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -32,4 +32,10 @@
python3/python-3.3.0-ffi-clang.patch.1 \
))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_UnpackedTarball_add_patches,python3,\
+ python3/python-3.3.0-15833.patch.1 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/python3/python-3.3.0-15833.patch.1
b/python3/python-3.3.0-15833.patch.1
new file mode 100644
index 000..71cef94
--- /dev/null
+++ b/python3/python-3.3.0-15833.patch.1
@@ -0,0 +1,25 @@
+iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
+--- a/Lib/importlib/_bootstrap.py
b/Lib/importlib/_bootstrap.py
+@@ -1066,17 +1066,17 @@ class SourceFileLoader(FileLoader, Sourc
+ except FileExistsError:
+ # Probably another Python process already created the dir.
+ continue
+-except PermissionError:
+-# If can't get proper access, then just forget about writing
+-# the data.
++except OSError as exc:
++# Could be a permission error, read-only filesystem: just
forget
++# about writing the data.
++_verbose_message('could not create {!r}: {!r}', parent, exc)
+ return
+ try:
+ _write_atomic(path, data, _mode)
+ _verbose_message('created {!r}', path)
+-except (PermissionError, FileExistsError):
+-# Don't worry if you can't write bytecode or someone is writing
+-# it at the same time.
+-pass
++except OSError as exc:
++# Same as above: just don't write the bytecode.
++_verbose_message('could not create {!r}: {!r}', path, exc)
--
To view, visit https://gerrit.libreoffice.org/1935
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: python3: bug 15833
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1936
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/1936/1
python3: bug 15833
That python bug cause problems when libreoffice is on a read-only
media... which is very common for Mac as the dmg used to package
the produce is seens as a read only volume.
This patch the bug 15833 for MacOSX only since that is the platform that
is most likely to be impacted, and because of bug 15431 that make
patching on Windows more complex/dangerous.
Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
---
M python3/UnpackedTarball_python3.mk
A python3/python-3.3.0-15833.patch.1
2 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/python3/UnpackedTarball_python3.mk
b/python3/UnpackedTarball_python3.mk
index 840108b..eb07def 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -32,4 +32,10 @@
python3/python-3.3.0-ffi-clang.patch.1 \
))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_UnpackedTarball_add_patches,python3,\
+ python3/python-3.3.0-15833.patch.1 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/python3/python-3.3.0-15833.patch.1
b/python3/python-3.3.0-15833.patch.1
new file mode 100644
index 000..71cef94
--- /dev/null
+++ b/python3/python-3.3.0-15833.patch.1
@@ -0,0 +1,25 @@
+iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
+--- a/Lib/importlib/_bootstrap.py
b/Lib/importlib/_bootstrap.py
+@@ -1066,17 +1066,17 @@ class SourceFileLoader(FileLoader, Sourc
+ except FileExistsError:
+ # Probably another Python process already created the dir.
+ continue
+-except PermissionError:
+-# If can't get proper access, then just forget about writing
+-# the data.
++except OSError as exc:
++# Could be a permission error, read-only filesystem: just
forget
++# about writing the data.
++_verbose_message('could not create {!r}: {!r}', parent, exc)
+ return
+ try:
+ _write_atomic(path, data, _mode)
+ _verbose_message('created {!r}', path)
+-except (PermissionError, FileExistsError):
+-# Don't worry if you can't write bytecode or someone is writing
+-# it at the same time.
+-pass
++except OSError as exc:
++# Same as above: just don't write the bytecode.
++_verbose_message('could not create {!r}: {!r}', path, exc)
--
To view, visit https://gerrit.libreoffice.org/1936
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: python3: bug 15833
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1936 Approvals: Tor Lillqvist: Looks good to me, but someone else must approve Petr Mladek: Verified; Looks good to me, approved Fridrich Strba: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/1936 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Petr Mladek pmla...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: python3: bug 15833
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1934 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1934 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - redland/ExternalProject_rasqal.mk redland/ExternalProject_redland.mk
redland/ExternalProject_rasqal.mk |3 +++ redland/ExternalProject_redland.mk |8 +++- 2 files changed, 10 insertions(+), 1 deletion(-) New commits: commit 8acb805b7dd27f389954a6c5e615f0ff662f4e8f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 31 12:01:13 2013 +0100 redland depends on both raptor and rasqal Change-Id: I5b7a2780527c24cba668266ff228f1e6af1d523e diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index af38c5f..a96eccf 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -11,7 +11,10 @@ $(eval $(call gb_ExternalProject_ExternalProject,redland)) $(eval $(call gb_ExternalProject_use_unpacked,redland,redland)) -$(eval $(call gb_ExternalProject_use_package,redland,rasqal)) +$(eval $(call gb_ExternalProject_use_packages,redland, \ +raptor \ +rasqal \ +)) $(eval $(call gb_ExternalProject_register_targets,redland,\ build \ commit 7b4d76772ef76a8de852ed647ed0cad368f70189 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 31 11:49:26 2013 +0100 Call macosx-change-install-names on external libs, too ...at least on those that link against other external libs, as otherwise they will have broken dependencies on those /@.__OOO/lib/... files that did not get rewritten by macosx-change-install-names. In the old build system, solenv/inc/tg_ext.mk took care of this. Change-Id: I5ffeed7d2a19170371db9093d29f3df9a1eb54c8 diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index 0dfcb14..f19e199 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -51,6 +51,9 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(MAKE) \ + $(if $(filter MACOSX,$(OS)), $(PERL) \ +$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ +$(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.1.dylib) \ touch $@ endif # vim: set noet sw=4 ts=4: diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 86fe869..af38c5f 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -56,6 +56,9 @@ $(call gb_ExternalProject_get_state_target,redland,build): $(if $(filter-out ANDROID,$(OS)),--with-threads) \ cd librdf \ $(MAKE) \ + $(if $(filter MACOSX,$(OS)), $(PERL) \ +$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ +$(gb_Package_SOURCEDIR_redland)/librdf/.libs/librdf-lo.0.dylib) \ touch $@ endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/inc
l10ntools/inc/export.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6757480434b2740622070f05fa07da33b8c28d89 Author: Miklos Vajna vmik...@suse.cz Date: Thu Jan 31 11:48:11 2013 +0100 l10ntools: kill RTL_CONSTASCII_STRINGPARAM in defines Change-Id: I7fdd9b6870fbe2c08c05c5dc44f2ff1d7140efd7 diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 35da167..3e01278 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -62,8 +62,8 @@ typedef boost::unordered_maprtl::OString, PFormEntrys*, rtl::OStringHash typedef boost::unordered_maprtl::OString, MergeData*, rtl::OStringHash MergeDataHashMap; -#define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM(en-US)) -#define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM(x-comment)) +#define SOURCE_LANGUAGE en-US +#define X_COMMENT x-comment #define LIST_REFID LIST_REFID typedef OStringHashMap ExportListEntry; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANNOUNCE] libreoffice-4.0.0.3 tag created
On Wed, 2013-01-30 at 17:49 +0100, Petr Mladek wrote: Hi, there have been created the tag libreoffice-4.0.0.3, aka rc3. The corresponding official builds will be available within next few days. It will be used as final if no blocker is found. Ah, the python-related fix on MAC (fdo#60012) opened doors to another python problem on MAC. It has been fixed by http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0-0id=243ae4ae98d2002bab118301f337c3751c8e4c85 The fix affects only MAC builds. It is is included in the tag libreoffice-4.0.0.3-hotfixes1 in the core repository. Also the refreshed main source tarball libreoffice-4.0.0.3.tar.xz can be found at http://dev-builds.libreoffice.org/pre-releases/src/. The submodules and the other source tarballs are not affected. I am sorry for any inconvenience. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Presentation bug
Hi to all! When modifying a box and format it with rounded edges, save the document, close the file and open the it again, no longer round and take the square format by default. Thank you very much and excuse me for my bad English. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
VCL: How to know the width of a text to be drawn
I'm drawing a comment control and I need to know two things: 1. The text width (to move text to right side in RTL systems) 2. The text line base (to align it to an horizontal arrow I draw) By now, I only know how to draw a text with OutputDevice::DrawText(), so I can't make my hack properly. Thank you in advance. Rodolfo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/inc oox/source
oox/inc/oox/vml/vmlshape.hxx | 15 ++-
oox/source/vml/vmlshape.cxx | 23 ++-
2 files changed, 24 insertions(+), 14 deletions(-)
New commits:
commit d10f549943ba416065c754576a2eb8bc90e1e960
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jan 30 16:43:35 2013 +0100
n#792778 oox: implement import of v:line inside v:group
The problem was that in ShapeBase::convertAndInsert(), the rectangle
calculated for a line was zero, that's why it wasn't imported. Fix this
by overriding the get*Rectangle() methods in LineShape, instead of doing
so with implConvertAndInsert().
(cherry picked from commit 7877638814de86202d33b5653a0f91d63341e98c)
Conflicts:
oox/source/vml/vmlshape.cxx
Change-Id: Ie4bb2f7964b438cb56e4f5ee7a4ebe9f8f8eb734
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 68ae1cd..7216941 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -136,12 +136,10 @@ protected:
::com::sun::star::awt::Rectangle getCoordSystem() const;
/** Returns the absolute shape rectangle according to the passed anchor. */
::com::sun::star::awt::Rectangle getRectangle( const ShapeParentAnchor*
pParentAnchor ) const;
-
-private:
/** Returns the absolute shape rectangle. */
-::com::sun::star::awt::Rectangle getAbsRectangle() const;
+virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const;
/** Returns the rectangle relative to the parent coordinate system. */
-::com::sun::star::awt::Rectangle getRelRectangle() const;
+virtual ::com::sun::star::awt::Rectangle getRelRectangle() const;
protected:
DrawingmrDrawing; /// The VML drawing page that
contains this shape.
@@ -346,11 +344,10 @@ public:
explicitLineShape( Drawing rDrawing );
protected:
-/** Creates the corresponding XShape and inserts it into the passed
container. */
-virtual ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape
-implConvertAndInsert(
-const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShapes rxShapes,
-const ::com::sun::star::awt::Rectangle rShapeRect
) const;
+/** Returns the absolute shape rectangle. */
+virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const;
+/** Returns the rectangle relative to the parent coordinate system. */
+virtual ::com::sun::star::awt::Rectangle getRelRectangle() const;
};
//
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index e3f2c62..e61820c 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -298,7 +298,6 @@ Reference XShape ShapeBase::convertAndInsert( const
Reference XShapes rxS
according to some imported shape client data (e.g. Excel cell
anchor). */
Rectangle aShapeRect = calcShapeRectangle( pParentAnchor );
-// convert the shape, if the calculated rectangle is not empty
if( ((aShapeRect.Width 0) || (aShapeRect.Height 0))
rxShapes.is() )
{
xShape = implConvertAndInsert( rxShapes, aShapeRect );
@@ -321,6 +320,8 @@ Reference XShape ShapeBase::convertAndInsert( const
Reference XShapes rxS
mrDrawing.notifyXShapeInserted( xShape, aShapeRect, *this,
bGroupChild );
}
}
+else
+SAL_WARN(oox, not converting shape, as calculated rectangle is
empty);
}
return xShape;
}
@@ -609,10 +610,10 @@ LineShape::LineShape(Drawing rDrawing)
{
}
-ReferenceXShape LineShape::implConvertAndInsert(const ReferenceXShapes
rxShapes, const Rectangle rShapeRect) const
+awt::Rectangle LineShape::getAbsRectangle() const
{
const GraphicHelper rGraphicHelper =
mrDrawing.getFilter().getGraphicHelper();
-Rectangle aShapeRect(rShapeRect);
+awt::Rectangle aShapeRect;
sal_Int32 nIndex = 0;
aShapeRect.X = ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
maShapeModel.maFrom.getToken(0, ',', nIndex), 0, true, true);
@@ -620,8 +621,20 @@ ReferenceXShape LineShape::implConvertAndInsert(const
ReferenceXShapes rxSh
nIndex = 0;
aShapeRect.Width = ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
maShapeModel.maTo.getToken(0, ',', nIndex), 0, true, true) - aShapeRect.X;
aShapeRect.Height = ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
maShapeModel.maTo.getToken(0, ',', nIndex), 0, false, true) - aShapeRect.Y;
+return aShapeRect;
+}
-return SimpleShape::implConvertAndInsert(rxShapes, aShapeRect);
+awt::Rectangle LineShape::getRelRectangle() const
+{
+awt::Rectangle aShapeRect;
+sal_Int32 nIndex = 0;
+
+aShapeRect.X = maShapeModel.maFrom.getToken(0, ',', nIndex).toInt32();
+aShapeRect.Y = maShapeModel.maFrom.getToken(0,
Re: VCL: How to know the width of a text to be drawn
On Thu, 2013-01-31 at 09:38 -0200, Rodolfo wrote: I'm drawing a comment control and I need to know two things: 1. The text width (to move text to right side in RTL systems) 2. The text line base (to align it to an horizontal arrow I draw) By now, I only know how to draw a text with OutputDevice::DrawText(), so I can't make my hack properly. if you look at the vcl/inc/vcl/outdev.hxx header there a few things that might be useful, e.g. GetTextHeight, GetTextWidth, GetTextArray (depending on what you code looks like, might be worth sending a patch with //FIXME: what I want to happen here in them. e.g. there are various parts of vcl for Controls which auto-swap the device so that in RTL mode the Control is swapped around automatically without explicit RTL positioning. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bartosz Kosiorek gan...@poczta.onet.pl changed: What|Removed |Added Depends on||59767 --- Comment #96 from Bartosz Kosiorek gan...@poczta.onet.pl --- I have added bug 59767. It is very important from translators point of view. Please fix it before release LO 4.0 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: deps etc.
On 31/01/13 08:01, Michael Meeks wrote: Hi guys, I was digging for the latest information on the size cost of our dependencies, and was interested to see things like: workdir/unxlngi6.pro/Dep/LinkTarget/Library/libfwklo.so.d contain only lots of: /data/opt/libreoffice/master/workdir/unxlngi6.pro/CxxObject/framework/source/accelerators/globalacceleratorconfiguration.o :$(gb_Helper_PHONY) /data/opt/libreoffice/master/workdir/unxlngi6.pro/CxxObject/framework/source/accelerators/keymapping.o :$(gb_Helper_PHONY) the reason why you are seeing this is that you're a naughty person and not running make check, where the second make invocation would rebuild the LinkTarget .d files. It seems some clever person deferred the dependency generation until an incremental build is done (?) :-) I assume that accelerates the straight-through build too (?). actually it makes a full build from scratch slower, expecially on Windows writing thousands of .d files takes several minutes. the advantage is that you can do a partial build; with the old way of doing things every object file in every module was built to include the .d file even when you only want something like make comphelper.all. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: bnc#492440: Sort autofilter popup items correctly.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1932 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1932 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: deps etc.
On Thursday 31 of January 2013, Michael Stahl wrote: On 31/01/13 08:01, Michael Meeks wrote: Hi guys, I was digging for the latest information on the size cost of our dependencies, and was interested to see things like: workdir/unxlngi6.pro/Dep/LinkTarget/Library/libfwklo.so.d contain only lots of: /data/opt/libreoffice/master/workdir/unxlngi6.pro/CxxObject/framework/sou rce/accelerators/globalacceleratorconfiguration.o :$(gb_Helper_PHONY) /data/opt/libreoffice/master/workdir/unxlngi6.pro/CxxObject/framework/sou rce/accelerators/keymapping.o :$(gb_Helper_PHONY) ... It seems some clever person deferred the dependency generation until an incremental build is done (?) :-) I assume that accelerates the straight-through build too (?). actually it makes a full build from scratch slower, expecially on Windows writing thousands of .d files takes several minutes. It's not as bad when using the patched make (and it's slow because of process forking, making concat-deps a make builtin would presumably make that as fast as on Linux). the advantage is that you can do a partial build; with the old way of doing things every object file in every module was built to include the .d file even when you only want something like make comphelper.all. Are you sure about this? From what I remember when doing the builtins for make, all .d files are first created with dummy content, so having or not having the LinkTarget .d files doesn't change anything there. As far as I understand it, the purpose of LinkTarget .d files is reading less files - gbuild includes only LinkTarget .d, not object .d files . And LinkTarget .d files are dummies (just like object .d files) during the first build, during that build object .d files are updated while building the targets, and before second build LinkTarget .d files are created from object .d using concat-deps. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: compilerplugins/README
compilerplugins/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9b11db848665fb9501b5c88ffb1a5bd81abf7d69 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Jan 31 14:47:50 2013 +0100 rewriters no longer create .new files, they modify sources directly Change-Id: I24bce9dcf46367b5658071ed692d346bb01a83a3 diff --git a/compilerplugins/README b/compilerplugins/README index 9dae9a1..8578005 100644 --- a/compilerplugins/README +++ b/compilerplugins/README @@ -63,7 +63,7 @@ if appropriate. Rewriters analyse and possibly modify given source files. Usage: make COMPILER_PLUGIN_TOOL=rewriter_name -Modifications will be written to files source_file.new . +Modifications will be written directly to the source files. == Code documentation / howtos == ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: deps etc.
On 31/01/13 14:33, Lubos Lunak wrote: On Thursday 31 of January 2013, Michael Stahl wrote: On 31/01/13 08:01, Michael Meeks wrote: Hi guys, I was digging for the latest information on the size cost of our dependencies, and was interested to see things like: workdir/unxlngi6.pro/Dep/LinkTarget/Library/libfwklo.so.d contain only lots of: /data/opt/libreoffice/master/workdir/unxlngi6.pro/CxxObject/framework/sou rce/accelerators/globalacceleratorconfiguration.o :$(gb_Helper_PHONY) /data/opt/libreoffice/master/workdir/unxlngi6.pro/CxxObject/framework/sou rce/accelerators/keymapping.o :$(gb_Helper_PHONY) It seems some clever person deferred the dependency generation until an incremental build is done (?) :-) I assume that accelerates the straight-through build too (?). actually it makes a full build from scratch slower, expecially on Windows writing thousands of .d files takes several minutes. It's not as bad when using the patched make (and it's slow because of process forking, making concat-deps a make builtin would presumably make that as fast as on Linux). i haven't measured it but i guess the majority of the problem is first writing the Object .d files, of which there are a lot more than LinkTarget .d files. which should make it easier because iirc object .d files are just echo foo: .PHONY foo.d while concat-deps has a bit of LO-specific logic (rewriting external headers to .done files, which is necessary for correctness of incremental builds) that doesn't make sense as a make builtin. the advantage is that you can do a partial build; with the old way of doing things every object file in every module was built to include the .d file even when you only want something like make comphelper.all. Are you sure about this? From what I remember when doing the builtins for make, all .d files are first created with dummy content, so having or not having the LinkTarget .d files doesn't change anything there. there were always LinkTarget .d files; the old way (since CWS gnumake4) was to have the object .d files depend on the object files, which causes make to compile everything because the first thing make does is ensure included files are up-to-date. this was reverted in commit 8b5a984d45005d3df1c89eae897d6e04612625d8 (plus numerous follow-ups to actually get it to work) As far as I understand it, the purpose of LinkTarget .d files is reading less files - gbuild includes only LinkTarget .d, not object .d files . And LinkTarget .d files are dummies (just like object .d files) during the first build, during that build object .d files are updated while building the targets, and before second build LinkTarget .d files are created from object .d using concat-deps. yes. not only reading less files, but also the content is de-duplicated a bit nowadays. the LinkTarget .d files are always created via concat-deps from Object .d files, which leads to the result you describe. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Presentation bug
Diego Mérida López schrieb: Hi to all! When modifying a box and format it with rounded edges, save the document, close the file and open the it again, no longer round and take the square format by default. Thank you very much and excuse me for my bad English. Please have a look at https://bugs.freedesktop.org/show_bug.cgi?id=39907 Disable UI 'Corner Radius' for custom shape rectangle Please search in Bugzilla, whether your problem is already known. If not, then write a bug report in Bugzilla. The developers pick the issues from Bugzilla. This mailing list is not for bug reports, but to help developers in coding. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: deps etc.
On Thursday 31 of January 2013, Michael Stahl wrote: i haven't measured it but i guess the majority of the problem is first writing the Object .d files, I have. Replacing concat-deps calls with mkdir+touch (for which there is a builtin) cuts the [build DEP] phase in tail_build to almost a half. But even as it is, the time spent that way is insignificant compared to the whole of the build. of which there are a lot more than LinkTarget .d files. which should make it easier because iirc object .d files are just echo foo: .PHONY foo.d while concat-deps has a bit of LO-specific logic (rewriting external headers to .done files, which is necessary for correctness of incremental builds) that doesn't make sense as a make builtin. Although concat-deps is not a trivial code, it's not that complicated either, and the builtins are already LO-specific code anyway. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: Your message to Libreoffice-commits awaits moderator approval
So, all of a sudden I've started receiving these mails, and I'm not sure what to do. I've never subscribed to the commits list, and I had never received any warnings of this kind. I just started receiving them this morning. Kohei -- Forwarded message -- From: libreoffice-commits-boun...@lists.freedesktop.org Date: Thu, Jan 31, 2013 at 10:16 AM Subject: Your message to Libreoffice-commits awaits moderator approval To: kohei.yosh...@gmail.com Your mail to 'Libreoffice-commits' with the subject .: Branch 'distro/suse/suse-3.6' - filter/source sfx2/inc sfx2/source Is being held until the list moderator can review it for approval. The reason it is being held: Post by non-member to a members-only list Either the message will get posted to the list, or you will receive notification of the moderator's decision. If you would like to cancel this posting, please visit the following URL: http://lists.freedesktop.org/mailman/confirm/libreoffice-commits/d433acceb696112b3da6dd50c39bd8179a4f0693 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Your message to Libreoffice-commits awaits moderator approval
On Thu, Jan 31, 2013 at 5:25 PM, Kohei Yoshida kohei.yosh...@gmail.com wrote: So, all of a sudden I've started receiving these mails, and I'm not sure what to do. I've never subscribed to the commits list, and I had never received any warnings of this kind. I just started receiving them this morning. Probably a change in the mailing list settings, now requiring membership. You can subscribe at http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits Simos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Fwd: Your message to Libreoffice-commits awaits moderator approval
Hi Kohei, On Thu, Jan 31, 2013 at 10:25:41AM -0500, Kohei Yoshida kohei.yosh...@gmail.com wrote: So, all of a sudden I've started receiving these mails, and I'm not sure what to do. I've never subscribed to the commits list, and I had never received any warnings of this kind. I just started receiving them this morning. This is my fault. The commits mailing list mails were originally sent by the fdo users (usern...@kempler.freedesktop.org), and I guess those addresses were whitelisted. I updated the hook to set the From header based on the git commits, to have the real names back again; it turns out this way you hit the moderation queue. Kendy/Thorsten: the hook always sets the X-Git-Repository: mail header -- would it be possible to whitelist such mails on the commits list, please? Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: registry/tools
registry/tools/reg2bin.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b477fce5f8b8f9340cce8da8239c3e93800f0b62
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jan 31 19:18:38 2013 +0100
Some fixes for previous commit (Clang)
Change-Id: If41321bc1c79cb475aae1c4588f8663beccd2209
diff --git a/registry/tools/reg2bin.cxx b/registry/tools/reg2bin.cxx
index 94012cb..08443b0 100644
--- a/registry/tools/reg2bin.cxx
+++ b/registry/tools/reg2bin.cxx
@@ -215,7 +215,7 @@ typereg::Reader getReader(RegistryKey key, std::vector
char * buffer) {
std::exit(EXIT_FAILURE);
}
if (size == 0
-|| size std::numeric_limits std::vector char ::size_type ::max())
+/* || size std::numeric_limits std::vector char ::size_type
::max() */)
{
std::cerr
Bad binary value size size of key \
key.getName()
@@ -482,7 +482,7 @@ void readModule(
RTConstValue v(reader.getFieldValue(j));
if (v.m_type != RT_TYPE_INT32) {
std::cerr
- Unexpected type +v.m_type
+ Unexpected type +v.m_type
of value of field \
reader.getFieldName(j)
\ of enum type with key \ sub.getName()
\ in registry \
roots[0].getRegistryName()
@@ -852,7 +852,7 @@ void readModule(
break;
default:
std::cerr
- Unexpected type +v.m_type
+ Unexpected type +v.m_type
of value of field \
reader.getFieldName(j)
\ of constant group with key \
sub.getName() \ in registry \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/typedescriptionprovider.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ec2470a03c389a5f65cdd5d3648763e2868dd5a
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jan 31 19:24:18 2013 +0100
warning C4701: potentially uninitialized local variable
Change-Id: I6c24bf51acc0d014ede2f36e17e52cef21753d41
diff --git a/cppuhelper/source/typedescriptionprovider.cxx
b/cppuhelper/source/typedescriptionprovider.cxx
index ef9a0e3..adacfee 100644
--- a/cppuhelper/source/typedescriptionprovider.cxx
+++ b/cppuhelper/source/typedescriptionprovider.cxx
@@ -2102,7 +2102,7 @@ void Enumeration::proceed() {
sal_uInt32 off = positions_.top().position-data.get();
int v = file_-read8(off);
bool recurse;
-bool cgroup;
+bool cgroup = bool();
if (v == 0) {
recurse = true;
cgroup = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: registry/tools
registry/tools/reg2bin.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f1624bc648420fd2a75257c5df0d99716e2bc73 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 31 19:25:29 2013 +0100 Typo Change-Id: I12421776ac75bd92fc39eb2d3e79df47107ea1d9 diff --git a/registry/tools/reg2bin.cxx b/registry/tools/reg2bin.cxx index 08443b0..d7f32e2 100644 --- a/registry/tools/reg2bin.cxx +++ b/registry/tools/reg2bin.cxx @@ -625,7 +625,7 @@ void readModule( reader.getFieldName(j), reader.getFieldTypeName(j).replace( '/', '.'), -acc)); +v)); } break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 --- Comment #97 from pierre-yves samyn pierre-yves.sa...@laposte.net --- Add Bug 60132 - FILEOPEN: Error reading file after inserting comment The document can not be opened... -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added Depends on||60132 -- 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
Change in core[master]: gbuild: copy stdlibs into solver again when they are bundled...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1938
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/1938/1
gbuild: copy stdlibs into solver again when they are bundled in the installer
Change-Id: I0f7d87bb161d50748fee05f9c3f6a4b87b788aa4
---
A external/CustomTarget_stdlibs.mk
M external/Module_external.mk
A external/Package_stdlibs.mk
M solenv/gbuild/platform/com_GCC_defs.mk
M solenv/gbuild/platform/unxgcc.mk
5 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/external/CustomTarget_stdlibs.mk b/external/CustomTarget_stdlibs.mk
new file mode 100644
index 000..65f1977
--- /dev/null
+++ b/external/CustomTarget_stdlibs.mk
@@ -0,0 +1,21 @@
+# -*- 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/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,external/stdlibs))
+
+$(eval $(call gb_CustomTarget_register_targets,external/stdlibs,\
+ libgcc_s.so.$(gb_DSHORTSTDC3) \
+ libstdc++.so.$(gb_DSHORTSTDCPP3) \
+))
+
+$(call gb_CustomTarget_get_workdir,external/stdlibs)/lib%:
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),STL,1)
+ $(PERL) -w $(SOLARENV)/bin/gccinstlib.pl $(@F) $(@D)
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/Module_external.mk b/external/Module_external.mk
index c5a312a..757c06b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -30,6 +30,16 @@
))
endif
+ifeq ($(SYSTEM_STDLIBS),NO)
+ifeq ($(gb_CPPU_ENV),gcc3)
+$(eval $(call gb_Module_add_targets,external,\
+ CustomTarget_stdlibs \
+ Package_stdlibs \
+))
+endif
+endif
+
+
ifeq ($(HAVE_GETOPT),NO)
$(eval $(call gb_Module_add_targets,external,\
UnpackedTarball_glibc \
diff --git a/external/Package_stdlibs.mk b/external/Package_stdlibs.mk
new file mode 100644
index 000..b5eeddc
--- /dev/null
+++ b/external/Package_stdlibs.mk
@@ -0,0 +1,17 @@
+# -*- 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/.
+#
+
+$(eval $(call gb_Package_Package,stdlibs,$(call
gb_CustomTarget_get_workdir,external/stdlibs)))
+
+$(eval $(call gb_Package_add_files,stdlibs,lib, \
+ libgcc_s.so.$(gb_DSHORTSTDC3) \
+ libstdc++.so.$(gb_DSHORTSTDCPP3) \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 8350505..ff24aa2 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -52,6 +52,9 @@
gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print
$$1*1+$$2*100+$$3 }')
+gb_DSHORTSTDC3 := 1
+gb_DSHORTSTDCPP3 := 6
+
gb_CPPU_ENV := gcc3
gb_AFLAGS := $(AFLAGS)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5f1eb80..206a598 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -364,18 +364,14 @@
# InstallModuleTarget class
-# NOTE: values of SHORTSTDC3 and SHORTSTDCPP3 are hardcoded, because we
-# do not really need all the variability of definition that was
-# originally in solenv/inc/tg_compv.mk . Each of the macros is only used
-# on one place, and only for Linux.
define gb_InstallModuleTarget_InstallModuleTarget_platform
$(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=gcc3 \
-DCOMNAME=gcc3 \
- -DSHORTSTDC3=1 \
- -DSHORTSTDCPP3=6 \
+ -DSHORTSTDC3=$(gb_SHORTSTDC3) \
+ -DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \
-D_gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
--
To view, visit https://gerrit.libreoffice.org/1938
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f7d87bb161d50748fee05f9c3f6a4b87b788aa4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Petr Mladek pmla...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1804 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1804 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d63df493e85bc095b8a11e3842b0d69c5217c96 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ioan Radu ioan.rad...@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: fdo#46706 Windows 2000 is not supported any more
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1939 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/1939/1 fdo#46706 Windows 2000 is not supported any more It may be install and run on Windows 2000, but nodody really tests it on this old platform, and developers are reluctant to fix bugs specific to this old platform. Change-Id: Ibeb45c0c2e7aef67d2e68bb5d104c5c3c2752dc4 --- M readlicense_oo/docs/readme.xrm 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index 5280b49..6539717 100755 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -57,7 +57,7 @@ div class=WIN id=SystemRequirements_WIN ul li - p id=s2s3sdf2 xml:lang=en-USMicrosoft Windows 2000 (Service Pack 4 or higher), XP, Vista, or Windows 7/p + p id=s2s3sdf21 xml:lang=en-USMicrosoft Windows XP, Vista, Windows 7, or Windows 8/p /li li -- To view, visit https://gerrit.libreoffice.org/1939 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeb45c0c2e7aef67d2e68bb5d104c5c3c2752dc4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: make it possible to update DDE links after loading, fdo#5903...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1940 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/1940/1 make it possible to update DDE links after loading, fdo#59032 Change-Id: Iba49bec62cb9081cdcd9410215f269b59c1be304 --- M formula/source/core/api/FormulaCompiler.cxx 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index c402113..8323e15 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1076,6 +1076,9 @@ pArr-SetRecalcModeOnLoad(); pArr-SetHyperLink(true); break; +case ocDde: +pArr-SetRecalcModeOnLoad(); +break; default: ; // nothing } -- To view, visit https://gerrit.libreoffice.org/1940 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba49bec62cb9081cdcd9410215f269b59c1be304 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Hyperlink is an optional property, fdo#58858
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1941
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/1941/1
Hyperlink is an optional property, fdo#58858
Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
Reviewed-on: https://gerrit.libreoffice.org/1930
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
---
M sc/source/filter/xml/xmlexprt.cxx
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 7ac0351..b599e6e 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3092,9 +3092,16 @@
{
// #i66550 HLINK_FOR_SHAPES
rtl::OUString sHlink;
-uno::Reference beans::XPropertySet xProps( xShape, uno::UNO_QUERY );
-if ( xProps.is() )
-xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+try
+{
+uno::Reference beans::XPropertySet xProps( xShape,
uno::UNO_QUERY );
+if ( xProps.is() )
+xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+}
+catch ( const beans::UnknownPropertyException )
+{
+// no hyperlink property
+}
std::auto_ptr SvXMLElementExport pDrawA;
// enlose shapes with draw:a element only if sHlink contains
something
--
To view, visit https://gerrit.libreoffice.org/1941
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: if no cond format is valid use the existing protection, fdo#...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1942
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/1942/1
if no cond format is valid use the existing protection, fdo#58826
Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254
---
M sc/source/core/data/attarray.cxx
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 201538d..8059b17 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1278,6 +1278,8 @@
const ScProtectionAttr* pCondProtect =
static_castconst ScProtectionAttr*(pItem);
if( pCondProtect-GetProtection() ||
pProtect-GetHideCell() )
bFoundCond = true;
+else
+break;
}
else
{
@@ -1285,7 +1287,7 @@
// but existing one + cell where conditional
// formatting does not remove it
// = we have a protected cell
-bFoundCond = true;
+bFoundCond = bFoundTemp;
}
}
bFoundTemp = bFoundCond;
--
To view, visit https://gerrit.libreoffice.org/1942
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: fdo#42387 Fixed Merging of cells in RTL Tables in impress
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1911 Approvals: Lior Kaplan: Verified Miklos Vajna: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1911 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f31e0c4e0acae84ab5052823fc49932255137d3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Noel Power noel.po...@suse.com Gerrit-Reviewer: gokul s gswaminat...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: show style when dialog is created with existing cond format, ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1943
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/1943/1
show style when dialog is created with existing cond format, fdo#59778
Change-Id: Ic1218179cd9c87ec15826adc861d505339a05f2d
---
M sc/source/ui/condformat/condformatdlgentry.cxx
1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index fb4a30a..f750ed5 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -516,6 +516,8 @@
{
maLbStyle.SelectEntryPos(1);
}
+
+StyleSelectHdl(NULL);
}
void ScFormulaFrmtEntry::Init()
@@ -1175,6 +1177,8 @@
rtl::OUString aStyleName = pFormat-GetStyleName();
maLbStyle.SelectEntry(aStyleName);
}
+
+StyleSelectHdl(NULL);
}
void ScDateFrmtEntry::Init()
--
To view, visit https://gerrit.libreoffice.org/1943
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1218179cd9c87ec15826adc861d505339a05f2d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: we need to parse the cell address after import, fdo#59843
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1944 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/1944/1 we need to parse the cell address after import, fdo#59843 Otherwise we may have problems with sheet names from sheets that are not yet imported. Change-Id: I99a6507567b7d1018b790a90019cd563fa7323a0 --- M sc/source/filter/xml/xmlcondformat.cxx 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index ae0c2d7..443361a 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -567,12 +567,10 @@ rtl::OUString aExpr2; ScConditionMode eMode; GetConditionData(sExpression, eMode, aExpr1, aExpr2); -ScAddress aPos; -sal_Int32 nIndex = 0; -ScRangeStringConverter::GetAddressFromString(aPos, sAddress, GetScImport().GetDocument(), formula::FormulaGrammar::CONV_ODF, nIndex); -ScCondFormatEntry* pFormatEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, GetScImport().GetDocument(), aPos, sStyle, +ScCondFormatEntry* pFormatEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, GetScImport().GetDocument(), ScAddress(), sStyle, rtl::OUString(), rtl::OUString(), formula::FormulaGrammar::GRAM_ODFF, formula::FormulaGrammar::GRAM_ODFF); +pFormatEntry-SetSrcString(sAddress); pFormat-AddEntry(pFormatEntry); } -- To view, visit https://gerrit.libreoffice.org/1944 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99a6507567b7d1018b790a90019cd563fa7323a0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: we need to use SCROW for row numbers, fdo#59894
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1945
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/1945/1
we need to use SCROW for row numbers, fdo#59894
This caused an overflow and resulted in adding endless number of values
until a bad_alloc was thrown.
Change-Id: I954acd801eb18e2c2fe6a449048856cb95d0d8b0
---
M sc/source/core/data/colorscale.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 55b8b43..3fe033a 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -293,7 +293,7 @@
SCTAB nTab = pRange-aStart.Tab();
for(SCCOL nCol = pRange-aStart.Col(); nCol = pRange-aEnd.Col();
++nCol)
{
-for(SCCOL nRow = pRange-aStart.Row(); nRow =
pRange-aEnd.Row(); ++nRow)
+for(SCROW nRow = pRange-aStart.Row(); nRow =
pRange-aEnd.Row(); ++nRow)
{
ScAddress aAddr(nCol, nRow, nTab);
CellType eType = mpDoc-GetCellType(aAddr);
--
To view, visit https://gerrit.libreoffice.org/1945
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I954acd801eb18e2c2fe6a449048856cb95d0d8b0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: bnc#437516: Hide minimum password info in the password dialo...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1946
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/1946/1
bnc#437516: Hide minimum password info in the password dialog.
When launching it from the Security tab of the PDF Options dialog
during PDF export.
Change-Id: Ife2d3a7b508ba2e077018d11478ad680d18d3f0d
---
M filter/source/pdf/impdialog.cxx
M sfx2/inc/sfx2/passwd.hxx
M sfx2/source/dialog/passwd.cxx
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 870209f..1304c5e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1288,6 +1288,7 @@
{
SfxPasswordDialog aPwdDialog( this, msUserPwdTitle );
aPwdDialog.SetMinLen( 0 );
+aPwdDialog.ShowMinLengthText(false);
aPwdDialog.ShowExtras( SHOWEXTRAS_CONFIRM | SHOWEXTRAS_PASSWORD2 |
SHOWEXTRAS_CONFIRM2 );
aPwdDialog.SetText( maStrSetPwd );
aPwdDialog.SetGroup2Text( msOwnerPwdTitle );
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 856916a..1f10c74 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -112,6 +112,9 @@
{
mbAsciiOnly = i_bAsciiOnly;
}
+
+void ShowMinLengthText(bool bShow);
+
virtual short Execute();
};
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 39b4096..40d6d08 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -148,6 +148,11 @@
EditModifyHdl( NULL );
}
+void SfxPasswordDialog::ShowMinLengthText(bool bShow)
+{
+mpMinLengthFT-Show(bShow);
+}
+
// ---
short SfxPasswordDialog::Execute()
--
To view, visit https://gerrit.libreoffice.org/1946
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife2d3a7b508ba2e077018d11478ad680d18d3f0d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: fdo#59393 fdo#44053 fix this again and this time add a testc...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1947
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/1947/1
fdo#59393 fdo#44053 fix this again and this time add a testcase as well
This was about importing RTF tables where different rows had different
number of cells. In the meantime, a better implementation was added for
DOCX, just using that for RTF fixes the import of this bugdoc.
Also fixes a crasher while loading ooo43817-1.rtf.
(cherry picked from commit d276d3f3ae112a11c8cb5768650d147cbb94275e)
Change-Id: I0970275272eca7f33a442bd6acc97a4f8d9dabeb
---
A sw/qa/extras/rtfimport/data/fdo44053.rtf
M sw/qa/extras/rtfimport/rtfimport.cxx
M writerfilter/source/dmapper/DomainMapperTableManager.cxx
M writerfilter/source/dmapper/DomainMapperTableManager.hxx
M writerfilter/source/dmapper/DomainMapper_Impl.hxx
5 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/sw/qa/extras/rtfimport/data/fdo44053.rtf
b/sw/qa/extras/rtfimport/data/fdo44053.rtf
new file mode 100644
index 000..ef5f975
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo44053.rtf
@@ -0,0 +1,15 @@
+{\rtf1
+Title\par
+\trowd \cellx550\cellx7000
+000\cell
+Name\cell
+\pard
+\trowd \cellx550\cellx7000\row
+\trowd \cellx550\cellx1650\cellx5550\cellx7000
+\cell
+\pard \intbl
+Cell1\cell\cell\cell
+\pard
+\trowd \cellx550\cellx1650\cellx5550\cellx7000\row
+\pard\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 3dc2f1b..d2a5c31 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -136,6 +136,7 @@
void testFdo45183();
void testFdo54612();
void testFdo58933();
+void testFdo44053();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -222,6 +223,7 @@
{fdo45183.rtf, Test::testFdo45183},
{fdo54612.rtf, Test::testFdo54612},
{fdo58933.rtf, Test::testFdo58933},
+{fdo44053.rtf, Test::testFdo44053},
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1052,6 +1054,17 @@
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable-getCellNames().getLength());
}
+void Test::testFdo44053()
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTextTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetable::XTableRows xTableRows(xTextTable-getRows(),
uno::UNO_QUERY);
+// The with of the table's A1 and A2 cell should equal.
+CPPUNIT_ASSERT_EQUAL(getProperty
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(0),
TableColumnSeparators)[0].Position,
+getProperty uno::Sequencetext::TableColumnSeparator
(xTableRows-getByIndex(1), TableColumnSeparators)[0].Position);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index afe9d6c..448d6e1 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -41,7 +41,7 @@
using namespace ::std;
-DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, bool
bImplicitMerges) :
+DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
m_nRow(0),
m_nCell(),
m_nGridSpan(1),
@@ -51,7 +51,6 @@
m_nHeaderRepeat(0),
m_nTableWidth(0),
m_bOOXML( bOOXML ),
-m_bImplicitMerges(bImplicitMerges),
m_bPushCurrentWidth(false),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
@@ -525,34 +524,6 @@
TablePropertyMapPtr pPropMap( new TablePropertyMap );
pPropMap-Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny(
aSeparators ) );
-#ifdef DEBUG_DOMAINMAPPER
-dmapper_logger-startElement(rowProperties);
-pPropMap-dumpXml( dmapper_logger );
-dmapper_logger-endElement();
-#endif
-insertRowProps(pPropMap);
-}
-else if (m_bImplicitMerges pTableGrid-size())
-{
-// More grid than cells definitions? Then take the last ones.
-// This feature is used by the RTF implicit horizontal cell merges.
-uno::Sequence text::TableColumnSeparator aSeparators(m_nCell.back(
) - 1);
-text::TableColumnSeparator* pSeparators = aSeparators.getArray();
-
-sal_Int16 nSum = 0;
-sal_uInt32 nPos = 0;
-sal_uInt32 nSizeTableGrid = pTableGrid-size();
-// Ignoring the i=0 case means we assume that the width of the last
cell matches the table width
-for (sal_uInt32 i = m_nCell.back( ); i 1 nSizeTableGrid = i; i--)
-{
-nSum += (*pTableGrid.get())[pTableGrid-size() - i]; // Size of
the current cell
-
Change in core[libreoffice-4-0]: Template Manager: show some icons if there is no thumbnail
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1948
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1948/1
Template Manager: show some icons if there is no thumbnail
Change-Id: I2686d6f1d29862878b5ee0f6ca0d2e746766ef21
---
M sfx2/inc/sfx2/sfx.hrc
M sfx2/inc/templatedlg.hxx
M sfx2/source/appl/sfx.src
M sfx2/source/control/templateview.cxx
M sfx2/source/doc/templatedlg.cxx
5 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 7173366..92bcf1f 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -177,6 +177,11 @@
#define BT_CHECKOUT (RID_SFX_START+126)
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
+#define SFX_THUMBNAIL_TEXT (RID_SFX_START+158)
+#define SFX_THUMBNAIL_SHEET (RID_SFX_START+159)
+#define SFX_THUMBNAIL_PRESENTATION (RID_SFX_START+160)
+#define SFX_THUMBNAIL_DRAWING (RID_SFX_START+161)
+
//=
// group ids
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 44a6653..47c1989 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -49,6 +49,8 @@
DECL_LINK(ActivatePageHdl, void*);
+static BitmapEx getDefaultThumbnail( const rtl::OUString rPath );
+
private:
virtual void MouseButtonDown( const MouseEvent rMEvt );
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 1103841..bffec2b 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -37,3 +37,23 @@
{
Text [ en-US ] = Password ;
};
+
+Bitmap ( SFX_THUMBNAIL_TEXT )
+{
+File = odt_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_SHEET )
+{
+File = ods_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_PRESENTATION )
+{
+File = odp_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_DRAWING )
+{
+File = odg_48_8.png;
+};
diff --git a/sfx2/source/control/templateview.cxx
b/sfx2/source/control/templateview.cxx
index 2efbbda..9758065 100644
--- a/sfx2/source/control/templateview.cxx
+++ b/sfx2/source/control/templateview.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include templatedlg.hxx
#include sfx2/templateview.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
@@ -63,6 +64,11 @@
pItem-maTitle = pCur-aName;
pItem-setPath(pCur-aPath);
pItem-maPreview1 = pCur-aThumbnail;
+if ( pCur-aThumbnail.IsEmpty() )
+{
+// Use the default thumbnail if we have nothing else
+pItem-maPreview1 = SfxTemplateManagerDlg::getDefaultThumbnail(
pItem-getPath() );
+}
pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
mItemList.push_back(pItem);
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index bf51e37..c14a824 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1533,6 +1533,31 @@
}
}
+BitmapEx SfxTemplateManagerDlg::getDefaultThumbnail( const OUString rPath )
+{
+INetURLObject aUrl(rPath);
+OUString aExt = aUrl.getExtension();
+
+BitmapEx aImg;
+if ( aExt == ott || aExt == stw || aExt == oth || aExt == dot ||
aExt == dotx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_TEXT ) );
+}
+else if ( aExt == ots || aExt == stc || aExt == xlt || aExt ==
xltm || aExt == xltx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_SHEET ) );
+}
+else if ( aExt == otp || aExt == sti || aExt == pot || aExt ==
potm || aExt == potx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_PRESENTATION ) );
+}
+else if ( aExt == otg || aExt == std )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_DRAWING ) );
+}
+return aImg;
+}
+
static bool lcl_getServiceName ( const OUString rFileURL, OUString rName )
{
bool bRet = false;
--
To view, visit https://gerrit.libreoffice.org/1948
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2686d6f1d29862878b5ee0f6ca0d2e746766ef21
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: fdo#56976 fixes up Arrow import bug
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1492 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1492 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b9ce3ae1aef7894ab04b9857e90831d715ec1d5 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - python3/python-3.3.0-15833.patch.1 python3/UnpackedTarball_python3.mk
python3/UnpackedTarball_python3.mk |6 ++
python3/python-3.3.0-15833.patch.1 | 25 +
2 files changed, 31 insertions(+)
New commits:
commit 243ae4ae98d2002bab118301f337c3751c8e4c85
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Jan 31 04:12:46 2013 -0600
python3: bug 15833
That python bug cause problems when libreoffice is on a read-only
media... which is very common for Mac as the dmg used to package
the produce is seens as a read only volume.
This patch the bug 15833 for MacOSX only since that is the platform that
is most likely to be impacted, and because of bug 15431 that make
patching on Windows more complex/dangerous.
Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
Reviewed-on: https://gerrit.libreoffice.org/1936
Reviewed-by: Tor Lillqvist t...@iki.fi
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/python3/UnpackedTarball_python3.mk
b/python3/UnpackedTarball_python3.mk
index 840108b..eb07def 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -32,4 +32,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/python-3.3.0-ffi-clang.patch.1 \
))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_UnpackedTarball_add_patches,python3,\
+ python3/python-3.3.0-15833.patch.1 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/python3/python-3.3.0-15833.patch.1
b/python3/python-3.3.0-15833.patch.1
new file mode 100644
index 000..71cef94
--- /dev/null
+++ b/python3/python-3.3.0-15833.patch.1
@@ -0,0 +1,25 @@
+iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
+--- a/Lib/importlib/_bootstrap.py
b/Lib/importlib/_bootstrap.py
+@@ -1066,17 +1066,17 @@ class SourceFileLoader(FileLoader, Sourc
+ except FileExistsError:
+ # Probably another Python process already created the dir.
+ continue
+-except PermissionError:
+-# If can't get proper access, then just forget about writing
+-# the data.
++except OSError as exc:
++# Could be a permission error, read-only filesystem: just
forget
++# about writing the data.
++_verbose_message('could not create {!r}: {!r}', parent, exc)
+ return
+ try:
+ _write_atomic(path, data, _mode)
+ _verbose_message('created {!r}', path)
+-except (PermissionError, FileExistsError):
+-# Don't worry if you can't write bytecode or someone is writing
+-# it at the same time.
+-pass
++except OSError as exc:
++# Same as above: just don't write the bytecode.
++_verbose_message('could not create {!r}: {!r}', path, exc)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: python3/python-3.3.0-15833.patch.1 python3/UnpackedTarball_python3.mk
python3/UnpackedTarball_python3.mk |6 ++
python3/python-3.3.0-15833.patch.1 | 25 +
2 files changed, 31 insertions(+)
New commits:
commit eb96e4325278f31b9e6fbc1d5c6a01543204ded6
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Jan 31 04:12:46 2013 -0600
python3: bug 15833
That python bug cause problems when libreoffice is on a read-only
media... which is very common for Mac as the dmg used to package
the produce is seens as a read only volume.
This patch the bug 15833 for MacOSX only since that is the platform that
is most likely to be impacted, and because of bug 15431 that make
patching on Windows more complex/dangerous.
Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
Reviewed-on: https://gerrit.libreoffice.org/1934
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/python3/UnpackedTarball_python3.mk
b/python3/UnpackedTarball_python3.mk
index 840108b..eb07def 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -32,4 +32,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/python-3.3.0-ffi-clang.patch.1 \
))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_UnpackedTarball_add_patches,python3,\
+ python3/python-3.3.0-15833.patch.1 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/python3/python-3.3.0-15833.patch.1
b/python3/python-3.3.0-15833.patch.1
new file mode 100644
index 000..71cef94
--- /dev/null
+++ b/python3/python-3.3.0-15833.patch.1
@@ -0,0 +1,25 @@
+iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
+--- a/Lib/importlib/_bootstrap.py
b/Lib/importlib/_bootstrap.py
+@@ -1066,17 +1066,17 @@ class SourceFileLoader(FileLoader, Sourc
+ except FileExistsError:
+ # Probably another Python process already created the dir.
+ continue
+-except PermissionError:
+-# If can't get proper access, then just forget about writing
+-# the data.
++except OSError as exc:
++# Could be a permission error, read-only filesystem: just
forget
++# about writing the data.
++_verbose_message('could not create {!r}: {!r}', parent, exc)
+ return
+ try:
+ _write_atomic(path, data, _mode)
+ _verbose_message('created {!r}', path)
+-except (PermissionError, FileExistsError):
+-# Don't worry if you can't write bytecode or someone is writing
+-# it at the same time.
+-pass
++except OSError as exc:
++# Same as above: just don't write the bytecode.
++_verbose_message('could not create {!r}: {!r}', path, exc)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - python3/python-3.3.0-15833.patch.1 python3/UnpackedTarball_python3.mk
python3/UnpackedTarball_python3.mk |6 ++
python3/python-3.3.0-15833.patch.1 | 25 +
2 files changed, 31 insertions(+)
New commits:
commit 1ecd52e7edeea6be5df23cf75b7e649a60a1c265
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Jan 31 04:12:46 2013 -0600
python3: bug 15833
That python bug cause problems when libreoffice is on a read-only
media... which is very common for Mac as the dmg used to package
the produce is seens as a read only volume.
This patch the bug 15833 for MacOSX only since that is the platform that
is most likely to be impacted, and because of bug 15431 that make
patching on Windows more complex/dangerous.
Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
Reviewed-on: https://gerrit.libreoffice.org/1935
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/python3/UnpackedTarball_python3.mk
b/python3/UnpackedTarball_python3.mk
index 840108b..eb07def 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -32,4 +32,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/python-3.3.0-ffi-clang.patch.1 \
))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_UnpackedTarball_add_patches,python3,\
+ python3/python-3.3.0-15833.patch.1 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/python3/python-3.3.0-15833.patch.1
b/python3/python-3.3.0-15833.patch.1
new file mode 100644
index 000..71cef94
--- /dev/null
+++ b/python3/python-3.3.0-15833.patch.1
@@ -0,0 +1,25 @@
+iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
+--- a/Lib/importlib/_bootstrap.py
b/Lib/importlib/_bootstrap.py
+@@ -1066,17 +1066,17 @@ class SourceFileLoader(FileLoader, Sourc
+ except FileExistsError:
+ # Probably another Python process already created the dir.
+ continue
+-except PermissionError:
+-# If can't get proper access, then just forget about writing
+-# the data.
++except OSError as exc:
++# Could be a permission error, read-only filesystem: just
forget
++# about writing the data.
++_verbose_message('could not create {!r}: {!r}', parent, exc)
+ return
+ try:
+ _write_atomic(path, data, _mode)
+ _verbose_message('created {!r}', path)
+-except (PermissionError, FileExistsError):
+-# Don't worry if you can't write bytecode or someone is writing
+-# it at the same time.
+-pass
++except OSError as exc:
++# Same as above: just don't write the bytecode.
++_verbose_message('could not create {!r}: {!r}', path, exc)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/core/tool/typedstrdata.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit b82da7a6681494de0cb9a1009b0de59250ba0533
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jan 30 22:32:28 2013 -0500
bnc#492440: Sort autofilter popup items correctly.
Use locale-aware collator to sort strings, instead of using the
transliterator. The actual sorting algorithm for cell sort uses
collator. Let's be consistent with it.
Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d
Reviewed-on: https://gerrit.libreoffice.org/1932
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/tool/typedstrdata.cxx
b/sc/source/core/tool/typedstrdata.cxx
index 811c5d8..71cf0fa 100644
--- a/sc/source/core/tool/typedstrdata.cxx
+++ b/sc/source/core/tool/typedstrdata.cxx
@@ -29,7 +29,7 @@
#include typedstrdata.hxx
#include global.hxx
-#include unotools/transliterationwrapper.hxx
+#include unotools/collatorwrapper.hxx
bool ScTypedStrData::LessCaseSensitive::operator() (const ScTypedStrData
left, const ScTypedStrData right) const
{
@@ -39,7 +39,7 @@ bool ScTypedStrData::LessCaseSensitive::operator() (const
ScTypedStrData left,
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -51,7 +51,7 @@ bool ScTypedStrData::LessCaseInsensitive::operator() (const
ScTypedStrData left
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -63,7 +63,7 @@ bool ScTypedStrData::EqualCaseSensitive::operator() (const
ScTypedStrData left,
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
@@ -75,7 +75,7 @@ bool ScTypedStrData::EqualCaseInsensitive::operator() (const
ScTypedStrData lef
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |4 +--
2 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 87fc06e0209835bc55ceb475cbc8d931ade94755
Author: Petr Mladek pmla...@suse.cz
Date: Thu Jan 31 14:10:50 2013 +0100
bump product version to 4.0.0.3+, release number to 103
Change-Id: Ife34689c45cbac7867338fa647b51248d1d9fad0
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 342a54c..273be9c 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.0.2
+UREPACKAGEVERSION 4.0.0.3
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.0
@@ -48,12 +48,12 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .0.2
+PRODUCTEXTENSION .0.3
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.0.2
+ABOUTBOXPRODUCTVERSION 4.0.0.3
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
@@ -63,7 +63,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.0.2
+PACKAGEVERSION 4.0.0.3
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -98,13 +98,13 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .0.2
+PRODUCTEXTENSION .0.3
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.0.2
+ABOUTBOXPRODUCTVERSION 4.0.0.3
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
@@ -119,7 +119,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.0.2
+PACKAGEVERSION 4.0.0.3
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -157,9 +157,9 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.0.2
+PACKAGEVERSION 4.0.0.3
PACKAGEREVISION 1
-PRODUCTEXTENSION .0.2
+PRODUCTEXTENSION .0.3
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -190,11 +190,11 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .0.2
+PRODUCTEXTENSION .0.3
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.0.2
+PACKAGEVERSION 4.0.0.3
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -229,12 +229,12 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .0.2
+PRODUCTEXTENSION .0.3
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.0.2
+PACKAGEVERSION 4.0.0.3
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -274,11 +274,11 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .0.2
+PRODUCTEXTENSION .0.3
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.0.2
+PACKAGEVERSION 4.0.0.3
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -313,12 +313,12 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .0.2
+PRODUCTEXTENSION .0.3
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.0.2
+
[Libreoffice-commits] .: fpicker/source sal/inc
fpicker/source/aqua/CFStringUtilities.hxx | 54 +++---
fpicker/source/aqua/CFStringUtilities.mm | 10 +-
fpicker/source/aqua/ControlHelper.mm | 112 +++---
fpicker/source/aqua/NSURL_OOoAdditions.mm |7 +
sal/inc/sal/log-areas.dox |1
5 files changed, 93 insertions(+), 91 deletions(-)
New commits:
commit f9aabc714af41d7c3dd5cd08b6dc0761db904c4d
Author: Radu Ioan ioan.rad...@gmail.com
Date: Mon Jan 21 23:51:56 2013 +0200
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced OSL_TRACE with SAL_INFO
Change-Id: I4d63df493e85bc095b8a11e3842b0d69c5217c96
Reviewed-on: https://gerrit.libreoffice.org/1804
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx
b/fpicker/source/aqua/CFStringUtilities.hxx
index 9845e92..655312e 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -26,7 +26,7 @@
#include postmac.h
#include rtl/ustring.hxx
#include sal/types.h
-#include osl/diagnose.h
+#include sal/log.hxx
enum InfoType {
FULLPATH,
@@ -43,71 +43,71 @@ CFStringRef CFStringCreateWithOUString(const OUString
aString);
#define PARAMFILLER \n
inline void DBG_PRINT_ENTRY() {
-OSL_TRACE( %s, __func__);
+SAL_INFO(fpicker.aqua, __func__);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname) {
-OSL_TRACE( %s::%s, classname, methodname);
+SAL_INFO(fpicker.aqua, classname :: methodname);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const char* value1) {
-OSL_TRACE( %s::%s%s%s = %s, classname, methodname, PARAMFILLER,
param1, value1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = value1);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const OUString value1) {
-OSL_TRACE( %s::%s%s%s = %s, classname, methodname, PARAMFILLER,
param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr());
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = OUStringToOString(value1,
RTL_TEXTENCODING_UTF8).getStr());
}
#if OSL_DEBUG_LEVEL 1
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const CFStringRef value1)
{
-OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 =);
CFShow(value1);
}
#else
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const CFStringRef /* value1 */)
{
-OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 =);
}
#endif
#if OSL_DEBUG_LEVEL 1
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const NSString* value1)
{
-OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 =);
NSLog(value1);
}
#else
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const NSString* /* value1 */)
{
-OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 =);
}
#endif
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const int value1) {
-OSL_TRACE( %s::%s%s%s = %d, classname, methodname, PARAMFILLER,
param1, value1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = value1);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const char* value1, const char* param2, const int value2) {
-OSL_TRACE( %s::%s%s%s = %s%s%s = %d, classname, methodname,
PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = value1 PARAMFILLER param2 =
value2);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const char* value1, const char* param2, const char* value2)
{
-OSL_TRACE( %s::%s%s%s = %s%s%s = %s, classname, methodname,
PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = value1 PARAMFILLER param2 =
value2);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const int value1, const char* param2, const int value2) {
-OSL_TRACE( %s::%s%s%s = %d%s%s = %d, classname, methodname,
[Libreoffice-commits] .: readlicense_oo/docs
readlicense_oo/docs/readme.xrm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 19edf0dca7d759f15929f6b701f3e6b6d1e8b955 Author: Andras Timar ati...@suse.com Date: Thu Jan 31 15:22:32 2013 +0100 fdo#46706 Windows 2000 is not supported any more It may be install and run on Windows 2000, but nodody really tests it on this old platform, and developers are reluctant to fix bugs specific to this old platform. Change-Id: Ibeb45c0c2e7aef67d2e68bb5d104c5c3c2752dc4 diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index 5280b49..6539717 100755 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -57,7 +57,7 @@ div class=WIN id=SystemRequirements_WIN ul li - p id=s2s3sdf2 xml:lang=en-USMicrosoft Windows 2000 (Service Pack 4 or higher), XP, Vista, or Windows 7/p + p id=s2s3sdf21 xml:lang=en-USMicrosoft Windows XP, Vista, Windows 7, or Windows 8/p /li li ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - svx/source
svx/source/table/tablelayouter.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit b8c9c63cdc44eba348b52dd3cb2e70d379d23187
Author: Gokul gswaminat...@kacst.edu.sa
Date: Tue Jan 15 11:41:53 2013 +0300
fdo#42387 Fixed Merging of cells in RTL Tables in impress
The problem was in calculating the cell area, the width should be
subtracted to Right end of cell instead it was adding width to Left
end of the origin cell
Change-Id: I3f31e0c4e0acae84ab5052823fc49932255137d3
Reviewed-on: https://gerrit.libreoffice.org/1686
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
Reviewed-on: https://gerrit.libreoffice.org/1911
Tested-by: Lior Kaplan kaplanl...@gmail.com
Reviewed-by: Miklos Vajna vmik...@suse.cz
diff --git a/svx/source/table/tablelayouter.cxx
b/svx/source/table/tablelayouter.cxx
index 599bf61..15d85e9 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -126,13 +126,23 @@ bool TableLayouter::getCellArea( const CellPos rPos,
basegfx::B2IRectangle rAr
if( xCell.is() !xCell-isMerged() isValid(rPos) )
{
const basegfx::B2ITuple aCellSize( getCellSize( rPos ) );
+const bool bRTL = meWritingMode == WritingMode_RL_TB;
if( (rPos.mnCol ((sal_Int32)maColumns.size()) (rPos.mnRow
((sal_Int32)maRows.size()) ) ) )
{
-const sal_Int32 x = maColumns[rPos.mnCol].mnPos;
const sal_Int32 y = maRows[rPos.mnRow].mnPos;
-rArea = basegfx::B2IRectangle( x, y, x + aCellSize.getX(), y +
aCellSize.getY() );
+if(bRTL)
+{
+///For RTL Table Calculate the Right End of cell instead
of Left
+const sal_Int32 x = maColumns[rPos.mnCol].mnPos +
maColumns[rPos.mnCol].mnSize;
+rArea = basegfx::B2IRectangle( x-aCellSize.getX(), y, x, y
+ aCellSize.getY() );
+}
+else
+{
+const sal_Int32 x = maColumns[rPos.mnCol].mnPos;
+rArea = basegfx::B2IRectangle( x, y, x + aCellSize.getX(),
y + aCellSize.getY() );
+}
return true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - filter/source sfx2/inc sfx2/source
filter/source/pdf/impdialog.cxx |1 +
sfx2/inc/sfx2/passwd.hxx|2 ++
sfx2/source/dialog/passwd.cxx |5 +
3 files changed, 8 insertions(+)
New commits:
commit 2a5f20470513da71adb9ba8d1fae5bee777d7389
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Jan 31 10:06:07 2013 -0500
bnc#437516: Hide minimum password info in the password dialog.
When launching it from the Security tab of the PDF Options dialog
during PDF export.
Conflicts:
sfx2/inc/sfx2/passwd.hxx
Change-Id: Ife2d3a7b508ba2e077018d11478ad680d18d3f0d
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 03de749..ab9bbb8 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1246,6 +1246,7 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl)
{
SfxPasswordDialog aPwdDialog( this, msUserPwdTitle );
aPwdDialog.SetMinLen( 0 );
+aPwdDialog.ShowMinLengthText(false);
aPwdDialog.ShowExtras( SHOWEXTRAS_CONFIRM | SHOWEXTRAS_PASSWORD2 |
SHOWEXTRAS_CONFIRM2 );
aPwdDialog.SetText( maStrSetPwd );
aPwdDialog.SetGroup2Text( msOwnerPwdTitle );
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 2e07153..f86275f 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -97,6 +97,8 @@ public:
voidShowExtras( sal_uInt16 nExtras ) { mnExtras = nExtras; }
voidAllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly =
i_bAsciiOnly; }
+void ShowMinLengthText(bool bShow);
+
virtual short Execute();
};
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 681d368..eee8eaa 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -222,6 +222,11 @@ void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen )
EditModifyHdl( NULL );
}
+void SfxPasswordDialog::ShowMinLengthText(bool bShow)
+{
+maMinLengthFT.Show(bShow);
+}
+
// ---
short SfxPasswordDialog::Execute()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/inc sfx2/source
sfx2/inc/sfx2/sfx.hrc|5 +
sfx2/inc/templatedlg.hxx |2 ++
sfx2/source/appl/sfx.src | 20
sfx2/source/control/templateview.cxx |6 ++
sfx2/source/doc/templatedlg.cxx | 25 +
5 files changed, 58 insertions(+)
New commits:
commit af331776895c1c3d036040599501d3f08a4d5562
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jan 31 16:36:52 2013 +0100
Template Manager: show some icons if there is no thumbnail
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 500063c..5d99d61 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -169,6 +169,11 @@
#define BT_CHECKOUT (RID_SFX_START+126)
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
+#define SFX_THUMBNAIL_TEXT (RID_SFX_START+158)
+#define SFX_THUMBNAIL_SHEET (RID_SFX_START+159)
+#define SFX_THUMBNAIL_PRESENTATION (RID_SFX_START+160)
+#define SFX_THUMBNAIL_DRAWING (RID_SFX_START+161)
+
//=
// group ids
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 4a18ab2..1cc9ae5 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -50,6 +50,8 @@ public:
DECL_LINK(ActivatePageHdl, void*);
+static BitmapEx getDefaultThumbnail( const rtl::OUString rPath );
+
private:
virtual void MouseButtonDown( const MouseEvent rMEvt );
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 1103841..bffec2b 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -37,3 +37,23 @@ String STR_PASSWD
{
Text [ en-US ] = Password ;
};
+
+Bitmap ( SFX_THUMBNAIL_TEXT )
+{
+File = odt_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_SHEET )
+{
+File = ods_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_PRESENTATION )
+{
+File = odp_48_8.png;
+};
+
+Bitmap ( SFX_THUMBNAIL_DRAWING )
+{
+File = odg_48_8.png;
+};
diff --git a/sfx2/source/control/templateview.cxx
b/sfx2/source/control/templateview.cxx
index 01f9206..4a44ea0 100644
--- a/sfx2/source/control/templateview.cxx
+++ b/sfx2/source/control/templateview.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include templatedlg.hxx
#include sfx2/templateview.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
@@ -63,6 +64,11 @@ void TemplateView::InsertItems (const
std::vectorTemplateItemProperties rTemp
pItem-maTitle = pCur-aName;
pItem-setPath(pCur-aPath);
pItem-maPreview1 = pCur-aThumbnail;
+if ( pCur-aThumbnail.IsEmpty() )
+{
+// Use the default thumbnail if we have nothing else
+pItem-maPreview1 = SfxTemplateManagerDlg::getDefaultThumbnail(
pItem-getPath() );
+}
pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
mItemList.push_back(pItem);
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index d3721ab..8bb8035 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1534,6 +1534,31 @@ void SfxTemplateManagerDlg::syncRepositories() const
}
}
+BitmapEx SfxTemplateManagerDlg::getDefaultThumbnail( const OUString rPath )
+{
+INetURLObject aUrl(rPath);
+OUString aExt = aUrl.getExtension();
+
+BitmapEx aImg;
+if ( aExt == ott || aExt == stw || aExt == oth || aExt == dot ||
aExt == dotx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_TEXT ) );
+}
+else if ( aExt == ots || aExt == stc || aExt == xlt || aExt ==
xltm || aExt == xltx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_SHEET ) );
+}
+else if ( aExt == otp || aExt == sti || aExt == pot || aExt ==
potm || aExt == potx )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_PRESENTATION ) );
+}
+else if ( aExt == otg || aExt == std )
+{
+aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_DRAWING ) );
+}
+return aImg;
+}
+
static bool lcl_getServiceName ( const OUString rFileURL, OUString rName )
{
bool bRet = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/drawingml/customshapepresets4.cxx | 217 +++
oox/source/export/shapes.cxx |1
2 files changed, 218 insertions(+)
New commits:
commit d9a18176d6b56119aa91699cd3aa102e36a7805c
Author: Lennard wassert...@nefkom.net
Date: Thu Dec 27 22:12:56 2012 +0100
fdo#56976 fixes up Arrow import bug
Importing an LibreOffice upArrow from an pptx document caused it and
several custom shapes go down the drain.
That was perhaps a memory violation because the procedure to generate it in
working memory was missing.
This patch gets you that procedure. Note it cannot be manipulated yet.
Signed-off-by: Lennard wassert...@nefkom.net
Conflicts:
oox/source/drawingml/customshapepresets4.cxx
Change-Id: I8b9ce3ae1aef7894ab04b9857e90831d715ec1d5
Reviewed-on: https://gerrit.libreoffice.org/1492
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/oox/source/drawingml/customshapepresets4.cxx
b/oox/source/drawingml/customshapepresets4.cxx
index f7a112d..f79fb8e 100644
--- a/oox/source/drawingml/customshapepresets4.cxx
+++ b/oox/source/drawingml/customshapepresets4.cxx
@@ -1651,6 +1651,222 @@ class ShapeCdownArrow : public CustomShapeProvider
return aPropertyMap;
}
};
+class ShapeCupArrow : public CustomShapeProvider
+{
+ virtual PropertyMap getProperties()
+ {
+PropertyMap aPropertyMap;
+
+{
+Sequence EnhancedCustomShapeAdjustmentValue aAdjSequence (2);
+{
+Any aAny ((sal_Int32) 5);
+aAdjSequence [0].Value = aAny;
+aAdjSequence [0].Name = adj1;
+}
+{
+Any aAny ((sal_Int32) 5);
+aAdjSequence [1].Value = aAny;
+aAdjSequence [1].Name = adj2;
+}
+aPropertyMap [PROP_AdjustmentValues] = aAdjSequence;
+}
+{
+static const char *aStrings[] = {
+min(logwidth,logheight),
+10*logheight/?0 ,
+if(0-$0 ,0,if(10-$0 ,$0 ,10)),
+if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 )),
+?0 *?3 /10,
+0+?4 -0,
+logwidth*?2 /20,
+logwidth/2,
+?7 +0-?6 ,
+?7 +?6 -0,
+logwidth/2,
+?8 *?4 /?10 ,
+?5 +0 -?11,
+logwidth,
+logheight
+};
+aPropertyMap [PROP_Equations] = createStringSequence(
SAL_N_ELEMENTS( aStrings ), aStrings );
+}
+{
+Sequence Sequence PropertyValue aPropSequenceSequence (2);
+{
+Sequence PropertyValue aPropSequence (4);
+{
+aPropSequence [0].Name = Position;
+static const CustomShapeProvider::ParameterPairData aData =
+{
+EnhancedCustomShapeParameterType::EQUATION,
+EnhancedCustomShapeParameterType::EQUATION,
+8, 14
+};
+aPropSequence [0].Value = makeAny
(createParameterPair(aData));
+}
+{
+aPropSequence [1].Name = RangeXMaximum;
+EnhancedCustomShapeParameter aParameter;
+Any aAny ((sal_Int32) 10);
+aParameter.Value = aAny;
+aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+aPropSequence [1].Value = makeAny (aParameter);
+}
+{
+aPropSequence [2].Name = RangeXMinimum;
+EnhancedCustomShapeParameter aParameter;
+Any aAny ((sal_Int32) 0);
+aParameter.Value = aAny;
+aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+aPropSequence [2].Value = makeAny (aParameter);
+}
+{
+aPropSequence [3].Name = RefX;
+Any aAny ((sal_Int32) 0);
+aPropSequence [3].Value = makeAny (aAny);
+}
+aPropSequenceSequence [0] = aPropSequence;
+}
+{
+Sequence PropertyValue aPropSequence (4);
+{
+aPropSequence [0].Name = Position;
+static const CustomShapeProvider::ParameterPairData aData =
+{
+EnhancedCustomShapeParameterType::NORMAL,
+EnhancedCustomShapeParameterType::EQUATION,
+0, 5
+};
+aPropSequence [0].Value = makeAny
(createParameterPair(aData));
+}
+{
+aPropSequence [1].Name = RangeYMaximum;
+EnhancedCustomShapeParameter aParameter;
+Any aAny ((sal_Int32) 1);
+aParameter.Value = aAny;
+aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+aPropSequence [1].Value = makeAny (aParameter);
+}
+
[Libreoffice-commits] .: sal/inc
sal/inc/sal/log-areas.dox |2 ++ 1 file changed, 2 insertions(+) New commits: commit 0e63a97066a817f3d01b40d99e3e1ed831ae3598 Author: Tor Lillqvist t...@iki.fi Date: Thu Jan 31 14:03:05 2013 +0200 Add vcl.atsui and vcl.coretext Change-Id: I9c9db51f04db5a0d073bd7493c198e8413299633 diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox index 6e0072f..83440bd 100644 --- a/sal/inc/sal/log-areas.dox +++ b/sal/inc/sal/log-areas.dox @@ -175,7 +175,9 @@ certain functionality. @section VCL +@li @c vcl.atsui - ATSUI (obsolete) -using code for Mac OS X @li @c vcl.control +@li @c vcl.coretext - CoreText-using code for Mac OS X and iOS @li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc. @li @c vcl.gtk - Gtk+ 2/3 plugin @li @c vcl.layout - Widget layout ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config/config_clang.h.in config/config_global.h.in config/config_graphite.h.in config/config_telepathy.h.in config/config_vclplug.h.in config/config_version.h.in config/.gitig
.gitignore |1 + Makefile.in|2 +- config/.gitignore |1 - config/README | 24 config/config_clang.h.in | 19 --- config/config_global.h.in | 22 -- config/config_graphite.h.in|6 -- config/config_telepathy.h.in |6 -- config/config_vclplug.h.in | 15 --- config/config_version.h.in | 26 -- config_host/.gitignore |1 + config_host/README | 24 config_host/config_clang.h.in | 19 +++ config_host/config_global.h.in | 22 ++ config_host/config_graphite.h.in |6 ++ config_host/config_telepathy.h.in |6 ++ config_host/config_vclplug.h.in| 15 +++ config_host/config_version.h.in| 26 ++ configure.ac | 16 +--- cross_tail_build/Makefile |2 ++ cross_toolset/Makefile |2 ++ solenv/gbuild/platform/com_GCC_defs.mk |2 +- 22 files changed, 135 insertions(+), 128 deletions(-) New commits: commit c5b1441ede3c58f1fe92372cbb48864f9d4df6ec Author: Tor Lillqvist t...@iki.fi Date: Thu Jan 31 20:44:25 2013 +0200 Use separate config_*.h files for BUILD and HOST when cross-compiling We have only been lucky so far that there hasn't been any compilation errors caused by using the HOST platform config_*.h files also for the BUILD platform. But as more and more information found out during configury is stored in config_*.h files, sooner or later it will be a problem. Move config/* to config_host/*. When not cross-compiling, the config_*.h files in config_host expanded from config_*.h.in are all there is. When cross-compiling, the generated config_*.h files for the BUILD platform are put into a config_build folder. Then use config_build when building the cross_toolset and config_host otherwise. Change-Id: I3c28cc83866bffd696b45d00dfb68e00bc2ae538 diff --git a/.gitignore b/.gitignore index 99b0a9d..aa5a6fa 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ /config_host.mk /config_host.mk.last /config_host.mk.stamp +/config_build/config_*.h /config_build.mk /configure /Makefile diff --git a/Makefile.in b/Makefile.in index c28ca6b..a4e5710 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,7 @@ else # MAKE_RESTARTS all: build ifeq ($(gb_Side),) -gb_Side:=host +export gb_Side:=host endif include $(BUILDDIR)/config_$(gb_Side).mk diff --git a/config/.gitignore b/config/.gitignore deleted file mode 100644 index 9becb5b..000 --- a/config/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config_*.h diff --git a/config/README b/config/README deleted file mode 100644 index fd58b64..000 --- a/config/README +++ /dev/null @@ -1,24 +0,0 @@ -These are configuration files for various features as detected by configure. - -Include only those files you need (in order to reduce rebuilds when a setting changes). - -Settings here are only C/C++ #define directives, so they apply only to C/C++ source, -not to Makefiles. - - - -Adding a new setting: -= - -- do AC_DEFINE(HAVE_FOO) in configure.ac when a setting should be set -- choose the proper config/config_xxx.h file to use -- if it is a global setting (such as availability of a compiler feature), -use config/config_global.h -- otherwise check if there is a matching config/config_hxx.h file -- if none matches, add a new one: -- add config/config_xxx.h.in here, with just #ifndef include guard -- add AC_CONFIG_HEADERS([config/config_xxx.h]) next to the others -in configure.ac -- add config_hxx.h to config/.gitignore -- add #undef HAVE_FOO to the config/config_hxx.h , possibly with a comment -- add #include config_xxx.h before any #ifdef HAVE_XXX in a source file diff --git a/config/config_clang.h.in b/config/config_clang.h.in deleted file mode 100644 index 056d3e8..000 --- a/config/config_clang.h.in +++ /dev/null @@ -1,19 +0,0 @@ -/* - -Settings related to Clang compiler plugins. - -*/ - -#ifndef CONFIG_CLANG_H -#define CONFIG_CLANG_H - -#undef BUILDDIR -#undef OUTDIR -#undef SRCDIR -#undef WORKDIR - -/* This is actually unused, but it should change whenever Clang changes, -thus causing update of this .h file and triggerring rebuild of our Clang plugin. */ -#undef CLANG_FULL_VERSION - -#endif diff --git a/config/config_global.h.in b/config/config_global.h.in deleted file mode 100644 index 0f85b59..000 --- a/config/config_global.h.in +++ /dev/null @@ -1,22 +0,0 @@ -/* -Global configuration file. - -Only for settings that apply to every
Re: Fwd: Your message to Libreoffice-commits awaits moderator approval
Miklos Vajna wrote: Kendy/Thorsten: the hook always sets the X-Git-Repository: mail header -- would it be possible to whitelist such mails on the commits list, please? Set that - let's see if that works. -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/bplustree' - 4 commits - sw/inc sw/qa
sw/inc/densebplustree.cxx | 79 ++---
sw/inc/densebplustree.hxx |4 -
sw/qa/core/densebplustree-test.cxx | 27
3 files changed, 76 insertions(+), 34 deletions(-)
New commits:
commit a16616044711b2af07284edbb6b49fa5fa20
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Jan 31 21:06:42 2013 +0100
Dense B+ tree: Don't initilize NodeWithIndex in the default constructor.
It is not necessary, and valgrind suggests it takes us some time. Indeed:
BigPtrArray - append: 45 msec
BigPtrArray - insert at front: 6580 msec
BigPtrArray - insert in the middle: 3081 msec
DenseBPlusTree - append: 47 msec
DenseBPlusTree - insert at front: 167 msec
DenseBPlusTree - insert in the middle: 87 msec
I am happy now, I do not think I can do it any better.
Change-Id: If7c6882daf712af37db4b43c13ab6aedb0086da0
diff --git a/sw/inc/densebplustree.hxx b/sw/inc/densebplustree.hxx
index be3252a..90cb400 100644
--- a/sw/inc/densebplustree.hxx
+++ b/sw/inc/densebplustree.hxx
@@ -96,7 +96,7 @@ private:
DBPTreeNode Key, Value *pNode;
Key nIndex;
-NodeWithIndex() : pNode( NULL ), nIndex( 0 ) {}
+NodeWithIndex() {}
NodeWithIndex( DBPTreeNode Key, Value *p, Key n ) : pNode( p ),
nIndex( n ) {}
};
commit 2bcd2598ad45738079889752577fa1cb6f7e0c93
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Jan 31 20:23:20 2013 +0100
Dense B+ tree: Use binary search when searching in the Keys inside nodes.
Also started measuring one more case - inserting in the middle. Before this
change, it took about 100 msec.
BigPtrArray - append: 45 msec
BigPtrArray - insert at front: 6510 msec
BigPtrArray - insert in the middle: 3043 msec
DenseBPlusTree - append: 48 msec
DenseBPlusTree - insert at front: 167 msec
DenseBPlusTree - insert in the middle: 90 msec
Change-Id: I2cc0a151b26931d90c8915a6ba879cf0e386b3b2
diff --git a/sw/inc/densebplustree.cxx b/sw/inc/densebplustree.cxx
index a186546..4ea3892 100644
--- a/sw/inc/densebplustree.cxx
+++ b/sw/inc/densebplustree.cxx
@@ -289,13 +289,28 @@ typename DenseBPlusTree Key, Value ::NodeWithIndex
DenseBPlusTree Key, Value
DBPTreeNode Key, Value *pNode = m_pRoot;
rParentsLength = 0;
-// recursion is nice for the alg. description, but for implementation, we
-// want to unwind it
+// traverse from the root to the leaves
while ( pNode-m_bIsInternal )
{
-int i = 0;
-while ( i pNode-m_nUsed - 1 pNode-m_pKeys[ i ] = nPos )
-++i;
+int i;
+if ( pNode-m_nUsed 2 || nPos pNode-m_pKeys[ 0 ] ) // nPos too
small, we continue leftmost
+i = 0;
+else if ( pNode-m_pKeys[ pNode-m_nUsed - 2 ] = nPos ) // nPos is
too big, continue rightmost
+i = pNode-m_nUsed - 1;
+else
+{
+// binary search, the values are ordered
+i = 1;
+int max = pNode-m_nUsed - 2;
+while ( i max )
+{
+int pivot = i + ( max - i ) / 2;
+if ( pNode-m_pKeys[ pivot ] = nPos )
+i = pivot + 1;
+else
+max = pivot;
+}
+}
// m_pKeys in children are relative
if ( i 0 )
diff --git a/sw/qa/core/densebplustree-test.cxx
b/sw/qa/core/densebplustree-test.cxx
index 0ea0d8e..38e9501 100644
--- a/sw/qa/core/densebplustree-test.cxx
+++ b/sw/qa/core/densebplustree-test.cxx
@@ -70,6 +70,13 @@ int main( int, char** )
print_time( BigPtrArray - insert at front, tv_before, tv_after );
gettimeofday( tv_before, NULL );
+BigPtrArray bparr3;
+for ( int i = 0; i 100; i++ )
+bparr3.Insert( new BigPtrEntryMock(i), bparr3.Count() / 2 );
+gettimeofday( tv_after, NULL );
+print_time( BigPtrArray - insert in the middle, tv_before, tv_after );
+
+gettimeofday( tv_before, NULL );
DenseBPlusTree int, BigPtrEntryMock* aTest;
for ( int i = 0; i 100; ++i )
aTest.Insert( new BigPtrEntryMock(i), aTest.Count() );
@@ -82,6 +89,13 @@ int main( int, char** )
aTest2.Insert( new BigPtrEntryMock(i), 0 );
gettimeofday( tv_after, NULL );
print_time( DenseBPlusTree - insert at front, tv_before, tv_after );
+
+gettimeofday( tv_before, NULL );
+DenseBPlusTree int, BigPtrEntryMock* aTest3;
+for ( int i = 0; i 100; ++i )
+aTest3.Insert( new BigPtrEntryMock(i), aTest3.Count() / 2 );
+gettimeofday( tv_after, NULL );
+print_time( DenseBPlusTree - insert in the middle, tv_before, tv_after );
#endif
#if 0
commit 40605ecc1faa02939e5e03abecdadbaea6afbe12
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Jan 31 18:59:22 2013 +0100
Dense B+ tree: Avoid some unnecessary (and actually wrong) memcpy's.
No performance impact - too rare operation.
BUG#55846
I have been working on this bug and followed the code pointers,but havent been able to figure out the loop-hole,can someone provide some other help,except that provided on BUGZILLAcomments Regards, Janit ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
How-to to write help content ?
Hi all, The FR project has a team willing to work on the help files to follow the feature implementation. If I'm able to map the files to the code and retrieve them (with the help of my old documentation [1]), generate the xml tags, etc. there is still some obscures areas. So: - do you have an how-to write help content - how the id like id=bm_id3154751 or id=hd_id3156042 are generated In short, what would be the best way for us to provide help content. [1] http://sophiegautier.com/Sofy/ Thanks in advance Kind regards Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - scaddins/source
scaddins/source/analysis/analysishelper.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit d078ae7a5642d5dbc823a79384e8fa56cf94f8e2 Author: Regina Henschel rb.hensc...@t-online.de Date: Wed Jan 30 17:34:27 2013 +0100 resolved fdo#60078 correctly calculate IMCSCH and IMSECH For the transformation used see http://de.wikipedia.org/wiki/Sekans_Hyperbolicus_und_Kosekans_Hyperbolicus#Komplexes_Argument (German only) Change-Id: If502b708069d7fcbe09e954b26ce8b7268b6 (cherry picked from commit b884c2e0185e24fc498827b3a53becea9e646b85) Reviewed-on: https://gerrit.libreoffice.org/1926 Reviewed-by: Kohei Yoshida kohei.yosh...@gmail.com Tested-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 08a0967..8fddc7b 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2075,8 +2075,8 @@ void Complex::Sech(void) THROWDEF_RTE_IAE THROW_IAE; double fScale =1.0 / ( cosh( 2.0 * r ) + cos( 2.0 * i )); double r_; -r_ = 2.0 * cosh( 2.0 * r ) * cos( i ) * fScale; -i = - (2.0 * sinh( 2.0 * r ) * sin( i ) * fScale ); +r_ = 2.0 * cosh( r ) * cos( i ) * fScale; +i = - (2.0 * sinh( r ) * sin( i ) * fScale ); r = r_ ; } else @@ -2096,8 +2096,8 @@ void Complex::Csch(void) THROWDEF_RTE_IAE THROW_IAE; double fScale =1.0 / ( cosh( 2.0 * r ) - cos( 2.0 * i )); double r_; -r_ = 2.0 * sinh( 2.0 * r ) * cos( i ) * fScale; -i = - ( 2.0 * cosh( 2.0 * r ) * sin( i ) * fScale ); +r_ = 2.0 * sinh( r ) * cos( i ) * fScale; +i = - ( 2.0 * cosh( r ) * sin( i ) * fScale ); r = r_ ; } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - readlicense_oo/docs
readlicense_oo/docs/readme.xrm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b865d4fceb035d9de481f73724c2473f2a893b6e Author: Andras Timar ati...@suse.com Date: Thu Jan 31 15:22:32 2013 +0100 fdo#46706 Windows 2000 is not supported any more It may be install and run on Windows 2000, but nodody really tests it on this old platform, and developers are reluctant to fix bugs specific to this old platform. Change-Id: Ibeb45c0c2e7aef67d2e68bb5d104c5c3c2752dc4 Reviewed-on: https://gerrit.libreoffice.org/1939 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index 5280b49..6539717 100755 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -57,7 +57,7 @@ div class=WIN id=SystemRequirements_WIN ul li - p id=s2s3sdf2 xml:lang=en-USMicrosoft Windows 2000 (Service Pack 4 or higher), XP, Vista, or Windows 7/p + p id=s2s3sdf21 xml:lang=en-USMicrosoft Windows XP, Vista, Windows 7, or Windows 8/p /li li ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Change in core[libreoffice-4-0]: resolved fdo#60078 correctly calculate IMCSCH and IMSECH
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1926 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1926 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If502b708069d7fcbe09e954b26ce8b7268b6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: fdo#46706 Windows 2000 is not supported any more
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1939 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1939 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibeb45c0c2e7aef67d2e68bb5d104c5c3c2752dc4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/typedescriptionprovider.cxx | 149 +++---
1 file changed, 86 insertions(+), 63 deletions(-)
New commits:
commit 57454a3ed85bf11df59157f3f0a371156a17fb09
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jan 31 22:16:29 2013 +0100
Keep old GCC happy
Change-Id: If9f9dfd450cd010528dd625f50049f4e963b01a6
diff --git a/cppuhelper/source/typedescriptionprovider.cxx
b/cppuhelper/source/typedescriptionprovider.cxx
index adacfee..7946846 100644
--- a/cppuhelper/source/typedescriptionprovider.cxx
+++ b/cppuhelper/source/typedescriptionprovider.cxx
@@ -555,10 +555,11 @@ ModuleDescription::getMembers() throw
(css::uno::RuntimeException) {
return s;
}
-class EnumTypeDescription:
-public cppu::ImplInheritanceHelper1
-PublishableDescription, css::reflection::XEnumTypeDescription
-{
+typedef cppu::ImplInheritanceHelper1
+PublishableDescription, css::reflection::XEnumTypeDescription
+EnumTypeDescription_Base;
+
+class EnumTypeDescription: public EnumTypeDescription_Base {
public:
struct Member {
Member(rtl::OUString const theName, sal_Int32 theValue):
@@ -572,7 +573,7 @@ public:
EnumTypeDescription(
rtl::OUString const name, bool published,
std::vector Member const members):
-ImplInheritanceHelper1(published), name_(name), members_(members)
+EnumTypeDescription_Base(published), name_(name), members_(members)
{ assert(!members_.empty()); }
private:
@@ -623,10 +624,11 @@ css::uno::Sequence sal_Int32
EnumTypeDescription::getEnumValues()
return s;
}
-class PlainStructTypeDescription:
-public cppu::ImplInheritanceHelper1
-PublishableDescription, css::reflection::XStructTypeDescription
-{
+typedef cppu::ImplInheritanceHelper1
+PublishableDescription, css::reflection::XStructTypeDescription
+PlainStructTypeDescription_Base;
+
+class PlainStructTypeDescription: public PlainStructTypeDescription_Base {
public:
struct Member {
Member(rtl::OUString const theName, rtl::OUString const theType):
@@ -641,8 +643,8 @@ public:
css::uno::Reference css::uno::XComponentContext const context,
rtl::OUString const name, bool published, rtl::OUString const base,
std::vector Member const directMembers):
-ImplInheritanceHelper1(published), context_(context), name_(name),
-base_(base), directMembers_(directMembers)
+PlainStructTypeDescription_Base(published), context_(context),
+name_(name), base_(base), directMembers_(directMembers)
{}
private:
@@ -736,9 +738,12 @@ private:
rtl::OUString typeParameterName_;
};
+typedef cppu::ImplInheritanceHelper1
+PublishableDescription, css::reflection::XStructTypeDescription
+PolymorphicStructTypeTemplateDescription_Base;
+
class PolymorphicStructTypeTemplateDescription:
-public cppu::ImplInheritanceHelper1
-PublishableDescription, css::reflection::XStructTypeDescription
+public PolymorphicStructTypeTemplateDescription_Base
{
public:
struct Member {
@@ -758,8 +763,9 @@ public:
rtl::OUString const name, bool published,
std::vector rtl::OUString const typeParameters,
std::vector Member const members):
-ImplInheritanceHelper1(published), context_(context), name_(name),
-typeParameters_(typeParameters), members_(members)
+PolymorphicStructTypeTemplateDescription_Base(published),
+context_(context), name_(name), typeParameters_(typeParameters),
+members_(members)
{}
private:
@@ -843,10 +849,11 @@
PolymorphicStructTypeTemplateDescription::getTypeParameters()
return s;
}
-class ExceptionTypeDescription:
-public cppu::ImplInheritanceHelper1
-PublishableDescription, css::reflection::XCompoundTypeDescription
-{
+typedef cppu::ImplInheritanceHelper1
+PublishableDescription, css::reflection::XCompoundTypeDescription
+ExceptionTypeDescription_Base;
+
+class ExceptionTypeDescription: public ExceptionTypeDescription_Base {
public:
struct Member {
Member(rtl::OUString const theName, rtl::OUString const theType):
@@ -861,8 +868,8 @@ public:
css::uno::Reference css::uno::XComponentContext const context,
rtl::OUString const name, bool published, rtl::OUString const base,
std::vector Member const directMembers):
-ImplInheritanceHelper1(published), context_(context), name_(name),
-base_(base), directMembers_(directMembers)
+ExceptionTypeDescription_Base(published), context_(context),
+name_(name), base_(base), directMembers_(directMembers)
{}
private:
@@ -1234,10 +1241,11 @@ MethodDescription::getExceptions() throw
(css::uno::RuntimeException) {
return s;
}
-class InterfaceTypeDescription:
-public cppu::ImplInheritanceHelper1
-PublishableDescription, css::reflection::XInterfaceTypeDescription2
-{
+typedef
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 59022, which changed state. Bug 59022 Summary: FILEOPEN general error (IOErrorCode_ACCESS_DENIED) when opening OpenDocument file on CIFS filesystem https://bugs.freedesktop.org/show_bug.cgi?id=59022 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Added 6 pixel vertical spacing on the Font tab, fdo#59846
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1949 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/1949/1 Added 6 pixel vertical spacing on the Font tab, fdo#59846 Change-Id: I61c85b75b026e15541101b25cf254aa64c3e1762 --- M cui/uiconfig/ui/charnamepage.ui 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index 2df58c5..87baae1 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -24,6 +24,7 @@ property name=can_focusFalse/property property name=hexpandTrue/property property name=vexpandTrue/property +property name=row_spacing6/property property name=column_spacing6/property child object class=GtkLabel id=westfontnameft-nocjk @@ -218,6 +219,7 @@ property name=can_focusFalse/property property name=hexpandTrue/property property name=vexpandTrue/property +property name=row_spacing6/property property name=column_spacing6/property child object class=GtkLabel id=westfontnameft-cjk @@ -396,6 +398,7 @@ property name=can_focusFalse/property property name=hexpandTrue/property property name=vexpandTrue/property +property name=row_spacing6/property property name=column_spacing6/property child object class=GtkLabel id=eastfontnameft @@ -574,6 +577,7 @@ property name=can_focusFalse/property property name=hexpandTrue/property property name=vexpandTrue/property +property name=row_spacing6/property property name=column_spacing6/property child object class=GtkLabel id=ctlfontnameft -- To view, visit https://gerrit.libreoffice.org/1949 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61c85b75b026e15541101b25cf254aa64c3e1762 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth robert.roth@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Added 6 pixel vertical spacing on the Font effects tab, fdo#...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1950 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1950/1 Added 6 pixel vertical spacing on the Font effects tab, fdo#59846 Change-Id: Id1cd40e3b9e2ae9ba0193708245c62f8ecd9cb96 --- M cui/uiconfig/ui/effectspage.ui 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui index 4fd6862..9ae0686 100644 --- a/cui/uiconfig/ui/effectspage.ui +++ b/cui/uiconfig/ui/effectspage.ui @@ -214,6 +214,7 @@ object class=GtkGrid id=grid8 property name=visibleTrue/property property name=can_focusFalse/property +property name=row_spacing6/property property name=column_spacing6/property child object class=GtkLabel id=fontcolorft @@ -431,11 +432,9 @@ child object class=GtkCheckButton id=outlinecb property name=label translatable=yesOutline/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=use_action_appearanceFalse/property property name=xalign0/property property name=inconsistentTrue/property property name=draw_indicatorTrue/property @@ -450,11 +449,9 @@ child object class=GtkCheckButton id=shadowcb property name=label translatable=yesShadow/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=use_action_appearanceFalse/property property name=xalign0/property property name=inconsistentTrue/property property name=draw_indicatorTrue/property @@ -469,11 +466,9 @@ child object class=GtkCheckButton id=blinkingcb property name=label translatable=yesBlinking/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=use_action_appearanceFalse/property property name=xalign0/property property name=inconsistentTrue/property property name=draw_indicatorTrue/property @@ -488,11 +483,9 @@ child object class=GtkCheckButton id=hiddencb property name=label translatable=yesHidden/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=use_action_appearanceFalse/property property name=xalign0/property property name=inconsistentTrue/property property name=draw_indicatorTrue/property @@ -507,11 +500,9 @@ child object class=GtkCheckButton id=individualwordscb property name=label translatable=yesIndividual words/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=use_action_appearanceFalse/property property name=xalign0/property property name=draw_indicatorTrue/property /object -- To view, visit https://gerrit.libreoffice.org/1950 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1cd40e3b9e2ae9ba0193708245c62f8ecd9cb96 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth robert.roth@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Added dialog title, 6 px spacing on Print dialog like in 3.6...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1951 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/1951/1 Added dialog title, 6 px spacing on Print dialog like in 3.6, fdo#59846 Change-Id: Id7c9ff4c7d7da830f9fdfb5046b627b5235c19be --- M vcl/uiconfig/ui/printdialog.ui 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index ae1f41f..4ef0a6b 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -23,6 +23,7 @@ object class=GtkDialog id=PrintDialog property name=can_focusFalse/property property name=border_width5/property +property name=title translatable=yesPrint/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 @@ -207,6 +208,7 @@ property name=can_focusFalse/property property name=hexpandTrue/property property name=vexpandTrue/property +property name=row_spacing6/property child object class=GtkExpander id=expander property name=visibleTrue/property @@ -383,7 +385,8 @@ object class=GtkGrid id=grid3 property name=visibleTrue/property property name=can_focusFalse/property -property name=column_spacing7/property +property name=row_spacing6/property +property name=column_spacing6/property child object class=GtkSeparator id=copyspacer property name=visibleTrue/property @@ -402,6 +405,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=orientationvertical/property +property name=spacing6/property child object class=GtkBox id=box6 property name=visibleTrue/property @@ -497,12 +501,14 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=orientationvertical/property +property name=spacing6/property child object class=GtkBox id=box16 property name=visibleTrue/property property name=can_focusFalse/property property name=margin_left6/property property name=orientationvertical/property +property name=spacing6/property child object class=GtkRadioButton id=printallsheets property name=label translatable=yesAll sheets/property @@ -578,6 +584,7 @@ property name=can_focusFalse/property property name=margin_left6/property property name=orientationvertical/property +property name=spacing6/property child object class=GtkRadioButton id=printallpages property name=label translatable=yesAll pages/property @@ -773,7 +780,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=orientationvertical/property -property name=spacing3/property +property name=spacing6/property child object class=GtkBox id=box17 property name=visibleTrue/property @@ -943,6 +950,7 @@ object class=GtkGrid id=grid1 property name=visibleTrue/property property name=can_focusFalse/property +property name=row_spacing6/property property name=column_spacing7/property child object class=GtkComboBox
Change in core[libreoffice-4-0]: fdo#59022: revert SfxMedium::GetOutputStream(): re-use exis...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1952
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/1952/1
fdo#59022: revert SfxMedium::GetOutputStream(): re-use existing XStream
Revert commit 0c2206081de38a41597aadfb2255540d6308be63, since this
apparently causes failure to open ODF files via SMB on Linux.
Instead of changing SfxMedium, adjust the ScExportTest: when saving
XLSX files interactively, the SfxFilter::lFormat is always 0, which
causes SfxObjectShell::SaveTo_Impl not to call
SfxMedium::GetOutputStorage() at all, working around the locking issue
on WNT.
Change-Id: I0ab8b4262475e4c8425eebb1413997457e5e9417
(cherry picked from commit 0799130b0ba954715d00feb93cef83dd48e29889)
---
M sc/qa/unit/subsequent_export-test.cxx
M sfx2/source/doc/docfile.cxx
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 7b0fde8..26fe25c 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -125,7 +125,7 @@
aTempFile.EnableKillingFile();
SfxMedium aStoreMedium( aTempFile.GetURL(), STREAM_STD_WRITE );
sal_uInt32 nExportFormat = 0;
-if (nFormatType)
+if (nFormatType == ODS_FORMAT_TYPE)
nExportFormat = SFX_FILTER_EXPORT | SFX_FILTER_USESOPTIONS;
SfxFilter* pExportFilter = new SfxFilter(
rFilter,
@@ -148,7 +148,7 @@
//std::cout File: aTempFile.GetURL() std::endl;
sal_uInt32 nFormat = 0;
-if (nFormatType)
+if (nFormatType == ODS_FORMAT_TYPE)
nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
OUString aPass(test);
@@ -163,7 +163,7 @@
aTempFile.EnableKillingFile();
SfxMedium aStoreMedium( aTempFile.GetURL(), STREAM_STD_WRITE );
sal_uInt32 nExportFormat = 0;
-if (nFormatType)
+if (nFormatType == ODS_FORMAT_TYPE)
nExportFormat = SFX_FILTER_EXPORT | SFX_FILTER_USESOPTIONS;
SfxFilter* pExportFilter = new SfxFilter(
rFilter,
@@ -177,7 +177,7 @@
//std::cout File: aTempFile.GetURL() std::endl;
sal_uInt32 nFormat = 0;
-if (nFormatType)
+if (nFormatType == ODS_FORMAT_TYPE)
nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
return load(aTempFile.GetURL(), rFilter, rUserData, rTypeName, nFormat,
nFormatType);
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 85b7981..3ce8ab7 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -636,20 +636,13 @@
if ( pImp-pTempFile )
{
-// try to re-use XOutStream from xStream if that exists;
-// opening new SvFileStream in this situation may fail on
-// Windows with ERROR_SHARING_VIOLATION
-if (pImp-xStream.is())
-{
-assert(pImp-xStream-getOutputStream().is()); // need that...
-pImp-m_pOutStream = utl::UcbStreamHelper::CreateStream(
-pImp-xStream, false);
-}
-else
-{
-pImp-m_pOutStream = new SvFileStream(
+// don't try to re-use XOutStream from xStream if that exists;
+// it causes fdo#59022 (fails opening files via SMB on Linux)
+// OTOH opening new SvFileStream in this situation may fail on
+// Windows with ERROR_SHARING_VIOLATION... but that is apparently
+// not a problem in practice currently
+pImp-m_pOutStream = new SvFileStream(
pImp-m_aName, STREAM_STD_READWRITE);
-}
CloseStorage();
}
}
--
To view, visit https://gerrit.libreoffice.org/1952
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ab8b4262475e4c8425eebb1413997457e5e9417
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Base tests are disabled?
Hi guys, while I was looking some code that implement it's own version of createFileURL, I saw that dbaccess have some test files, but it seems that's disabled: [marcos@jedi core]$ make dbaccess.subsequentcheck cd dbaccess make -j 2 -rs subsequentcheck /mnt/dados/gitroot/core/solenv/gbuild/Package.mk:44: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /mnt/dados/gitroot/core/solver/unxlngi6/bin/ConnectivityTools.jar. Stop. make: *** [dbaccess.subsequentcheck] Error 2 There is something that we can do for enable these tests again? Or threy're useless(I doubt...)? Thanks guys!! -- Att, Marcos Paulo de Souza Acadêmico de Ciencia da Computação - FURB - SC Github: https://github.com/marcosps/ Uma vida sem desafios é uma vida sem razão A life without challenges, is a non reason life ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How-to to write help content ?
Hi Sophie, On Thu, Jan 31, 2013 at 9:34 PM, Sophie Gautier gautier.sop...@gmail.com wrote: Hi all, The FR project has a team willing to work on the help files to follow the feature implementation. If I'm able to map the files to the code and retrieve them (with the help of my old documentation [1]), generate the xml tags, etc. there is still some obscures areas. So: - do you have an how-to write help content - how the id like id=bm_id3154751 or id=hd_id3156042 are generated In short, what would be the best way for us to provide help content. There is a help authoring extension for OpenOffice, topics can be added/edited in Writer. AFAIK help was authored with this tool. It is available from AOO SVN. I have never used it, it may take some time to learn. IDs in xhp files are just random strings. It is just a convention, that you identify a bookmark with bm_, a heading with hd_, etc. These random identifiers were assigned by the tool mentioned above. If you edit the new xhp file in a plain text editor, you can use consecutive numbers, eg. bm_0001, bm_0002, etc. The only rule is that identifiers must be unique in a single xhp file. There are some obsolete attributes, that should be be used in new content, e.g. l10n and oldref. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - configure.ac Makefile.in solenv/bin
Makefile.in |6 ++
configure.ac |4
solenv/bin/ooinstall |4 +++-
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 2b71c1a9b189e5cf9224d43e3bac4a26f2e0ff99
Author: Tor Lillqvist t...@iki.fi
Date: Thu Jan 31 23:22:35 2013 +0200
Sign the app bundle created by dev-install if an identity is available
Change-Id: If7c61b203b3ca307831187778b951e8310381ca8
diff --git a/Makefile.in b/Makefile.in
index a4e5710..92b680f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -334,6 +334,12 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
ifeq ($(DISABLE_LINKOO),TRUE)
@ooinstall $(DEVINSTALLDIR)/opt
+ifeq ($(OS),MACOSX)
+ identity=`security find-identity -p codesigning -v | grep 'Mac
Developer:' | awk '{print $$2}'`; \
+ if test -n $$identity; then \
+ codesign --verbose --sign $$identity
$(DEVINSTALLDIR)/opt/LibreOffice.app; \
+ fi
+endif
@install-gdb-printers -L
else
@ooinstall -l $(DEVINSTALLDIR)/opt
commit f33c8056a856b20436206682ab72a34b08c15c88
Author: Tor Lillqvist t...@iki.fi
Date: Thu Jan 31 23:20:28 2013 +0200
Enforce DISABLE_LINKOO on OS X
solenv/bin/linkoo doesn't do anything on OS X anyway, and even if it
would do and it would work, it would interfere with signing the app
bundle.
Change-Id: If7a6cecea57cddf8a637a60872d0372eb5093f41
diff --git a/configure.ac b/configure.ac
index b2f7d5c..2c2d272 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4328,6 +4328,10 @@ AC_SUBST(ASSERT_ALWAYS_ABORT)
dnl Determine whether to use linkoo for the smoketest installation
dnl ===
AC_MSG_CHECKING([whether to use linkoo for the smoketest installation])
+if test $_os = Darwin; then
+enable_linkoo=no
+fi
+
if test $enable_linkoo = no; then
DISABLE_LINKOO=TRUE
AC_MSG_RESULT([no])
commit c84e417a0f71778a5d6e0fa1ad4b10844ebd7787
Author: Tor Lillqvist t...@iki.fi
Date: Thu Jan 31 23:19:08 2013 +0200
When debugging ooinstall, assume you want to debug make_installer.pl, too
Change-Id: I80492249471c15778bfafe36e65fa183ccff58f8
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index c2959bc..bcc296c 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -118,7 +118,9 @@ if ($destdir $ENV{DESTDIR} ne / -d
$ENV{DESTDIR}) {
print Running LibreOffice installer\n;
system (cd $ENV{SRC_ROOT}/instsetoo_native/util ; .
-perl -w $ENV{SOLARENV}/bin/make_installer.pl .
+perl .
+(scalar keys(%DB::sub) ? -d : ) .
+-w $ENV{SOLARENV}/bin/make_installer.pl .
-f openoffice.lst -l $langs -p LibreOffice .
-u $tmp_dir .
-buildid $BUILD $destdir $strip $msi .
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source shell/source
extensions/source/nsplugin/source/so_instance.cxx |3 +--
shell/source/unix/exec/urltest.cxx|2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit a96ae2104df11dab6c7255d733aad67043986109
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Jan 31 22:54:53 2013 +0100
Some cppcheck cleaning
Change-Id: I39e1dd985af6029e1fd688ff47350734c85928a6
diff --git a/extensions/source/nsplugin/source/so_instance.cxx
b/extensions/source/nsplugin/source/so_instance.cxx
index 20f54c1..37a9f52 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -98,11 +98,10 @@ SoPluginInstance::~SoPluginInstance()
sal_Bool SoPluginInstance::SetURL(char* aURL)
{
debug_fprintf(NSP_LOG_APPEND, SoPluginInstance::SetURL %s\n, aURL);
-sal_uInt16 encoding = 11;
rtl_Locale* pLocale = NULL;
osl_getProcessLocale(pLocale);
-encoding = osl_getTextEncodingFromLocale(pLocale);
+sal_uInt16 encoding = osl_getTextEncodingFromLocale(pLocale);
m_sURL = ::rtl::OUString(aURL, strlen(aURL), encoding);
debug_fprintf(NSP_LOG_APPEND, SetURL %s\nencoding is: %d\n,
::rtl::OUStringToOString(m_sURL,
diff --git a/shell/source/unix/exec/urltest.cxx
b/shell/source/unix/exec/urltest.cxx
index 725a9db..bfdd69e 100644
--- a/shell/source/unix/exec/urltest.cxx
+++ b/shell/source/unix/exec/urltest.cxx
@@ -132,7 +132,7 @@ int main(int argc, const char *argv[])
if( errors )
{
-printf( Number of tests failing: %d\n, errors);
+printf( Number of tests failing: %u\n, errors);
ret = -3;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source scaddins/source
extensions/source/plugin/win/sysplug.cxx |3 +--
scaddins/source/analysis/bessel.cxx |5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit f6f5bde055f299e18a369714469dd39d6917e09d
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Jan 31 23:01:32 2013 +0100
Some cppcheck cleaning
Change-Id: I57baea223b0f0a78346d9872665ab85c00c8fc51
diff --git a/extensions/source/plugin/win/sysplug.cxx
b/extensions/source/plugin/win/sysplug.cxx
index b446719..1e60f6c 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -82,13 +82,12 @@ PluginComm_Impl::PluginComm_Impl( const OUString
/*rMIME*/, const OUString rNa
#endif
DBG_ASSERT( _plDLL, ### loading plugin dll failed! );
-NPError nErr = NPERR_NO_ERROR;
NPError (WINAPI * pEntry)( NPPluginFuncs* );
retrieveFunction( _T(NP_GetEntryPoints), (void**)pEntry );
_NPPfuncs.size = sizeof( _NPPfuncs );
_NPPfuncs.version = 0;
-nErr = (*pEntry)( _NPPfuncs );
+NPError nErr = (*pEntry)( _NPPfuncs );
DBG_ASSERT( nErr == NPERR_NO_ERROR, ### NP_GetEntryPoints() failed! );
DBG_ASSERT( (_NPPfuncs.version 8) = NP_VERSION_MAJOR,
diff --git a/scaddins/source/analysis/bessel.cxx
b/scaddins/source/analysis/bessel.cxx
index 09ba913..2a67276 100644
--- a/scaddins/source/analysis/bessel.cxx
+++ b/scaddins/source/analysis/bessel.cxx
@@ -180,7 +180,6 @@ double BesselJ( double x, sal_Int32 N ) throw
(IllegalArgumentException, NoConve
double BesselI( double x, sal_Int32 n ) throw( IllegalArgumentException,
NoConvergenceException )
{
-const double fEpsilon = 1.0E-15;
const sal_Int32 nMaxIteration = 2000;
const double fXHalf = x / 2.0;
if( n 0 )
@@ -203,6 +202,7 @@ double BesselI( double x, sal_Int32 n ) throw(
IllegalArgumentException, NoConve
if( fTerm != 0.0 )
{
nK = 1;
+const double fEpsilon = 1.0E-15;
do
{
/* Calculation of TERM(n,k) from TERM(n,k-1):
@@ -400,7 +400,6 @@ double Bessely1( double fX ) throw(
IllegalArgumentException, NoConvergenceExcep
const double EulerGamma = 0.57721566490153286060;
double alpha = 1.0/fX;
double f_bar = -1.0;
-double g = 0.0;
double u = alpha;
double k = 1.0;
double m_bar = 0.0;
@@ -409,7 +408,7 @@ double Bessely1( double fX ) throw(
IllegalArgumentException, NoConvergenceExcep
double g_bar = -2.0 / fX;
double delta_u = g_bar_delta_u / g_bar;
u = u + delta_u;
-g = -1.0/g_bar;
+double g = -1.0/g_bar;
f_bar = f_bar * g;
double sign_alpha = -1.0;
double km1mod2; //will be (k-1) mod 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/qa sfx2/source solenv/gdb
sc/qa/unit/subsequent_export-test.cxx | 10 +-
sfx2/source/doc/docfile.cxx | 19 ++-
solenv/gdb/libreoffice/cppu.py|4 +++-
3 files changed, 14 insertions(+), 19 deletions(-)
New commits:
commit 027bb41aa16793e88e9fc1b3550c8c8933636472
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 31 23:44:36 2013 +0100
gdb: UnoReferencePrinter: prevent ambiguity problems
gdb 7.5.1 complains about ambiguous base class XInterface with cast()
so try dynamic_cast() instead.
Change-Id: I99a21eea7251e663deee395f6a13ca0ed041e8c9
diff --git a/solenv/gdb/libreoffice/cppu.py b/solenv/gdb/libreoffice/cppu.py
index 8db684a..31f1da6 100644
--- a/solenv/gdb/libreoffice/cppu.py
+++ b/solenv/gdb/libreoffice/cppu.py
@@ -63,7 +63,9 @@ class UnoReferencePrinter(object):
def to_string(self):
iface = self.value['_pInterface']
if iface:
-impl = iface.cast(self._itype()).dereference()
+# dynamic_cast hopefully avoids this problem:
+# base class 'com::sun::star::uno::XInterface' is ambiguous
+impl = iface.dynamic_cast(self._itype()).dereference()
return '%s to %s' % (self.typename, str(impl))
else:
return empty %s % self.typename
commit b5592cb22dfa473ce5683f95118287f2bde63c13
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 31 23:33:15 2013 +0100
ScExportTest: enable testPasswordExport on WNT
With the previous commit it appears to work now.
Change-Id: Ifa2c69c6e8617461ec2098ecc959e99a4812565e
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index f43560e..3fd6427 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -81,7 +81,7 @@ public:
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
-#if !defined(MACOSX) !defined(DRAGONFLY) !defined(WNT)
+#if !defined(MACOSX) !defined(DRAGONFLY)
CPPUNIT_TEST(testPasswordExport);
#endif
CPPUNIT_TEST(testConditionalFormatExportXLSX);
commit 0799130b0ba954715d00feb93cef83dd48e29889
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 31 23:19:54 2013 +0100
fdo#59022: revert SfxMedium::GetOutputStream(): re-use existing XStream
Revert commit 0c2206081de38a41597aadfb2255540d6308be63, since this
apparently causes failure to open ODF files via SMB on Linux.
Instead of changing SfxMedium, adjust the ScExportTest: when saving
XLSX files interactively, the SfxFilter::lFormat is always 0, which
causes SfxObjectShell::SaveTo_Impl not to call
SfxMedium::GetOutputStorage() at all, working around the locking issue
on WNT.
Change-Id: I0ab8b4262475e4c8425eebb1413997457e5e9417
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 220877d..f43560e 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -127,7 +127,7 @@ ScDocShellRef
ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const rtl:
aTempFile.EnableKillingFile();
SfxMedium aStoreMedium( aTempFile.GetURL(), STREAM_STD_WRITE );
sal_uInt32 nExportFormat = 0;
-if (nFormatType)
+if (nFormatType == ODS_FORMAT_TYPE)
nExportFormat = SFX_FILTER_EXPORT | SFX_FILTER_USESOPTIONS;
SfxFilter* pExportFilter = new SfxFilter(
rFilter,
@@ -150,7 +150,7 @@ ScDocShellRef
ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const rtl:
//std::cout File: aTempFile.GetURL() std::endl;
sal_uInt32 nFormat = 0;
-if (nFormatType)
+if (nFormatType == ODS_FORMAT_TYPE)
nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
OUString aPass(test);
@@ -165,7 +165,7 @@ ScDocShellRef ScExportTest::saveAndReload(ScDocShell*
pShell, const rtl::OUStrin
aTempFile.EnableKillingFile();
SfxMedium aStoreMedium( aTempFile.GetURL(), STREAM_STD_WRITE );
sal_uInt32 nExportFormat = 0;
-if (nFormatType)
+if (nFormatType == ODS_FORMAT_TYPE)
nExportFormat = SFX_FILTER_EXPORT | SFX_FILTER_USESOPTIONS;
SfxFilter* pExportFilter = new SfxFilter(
rFilter,
@@ -179,7 +179,7 @@ ScDocShellRef ScExportTest::saveAndReload(ScDocShell*
pShell, const rtl::OUStrin
//std::cout File: aTempFile.GetURL() std::endl;
sal_uInt32 nFormat = 0;
-if (nFormatType)
+if (nFormatType == ODS_FORMAT_TYPE)
nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
return load(aTempFile.GetURL(), rFilter, rUserData, rTypeName, nFormat,
nFormatType);
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 85b7981..3ce8ab7 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -636,20 +636,13 @@ SvStream* SfxMedium::GetOutStream()
if ( pImp-pTempFile )
{
-// try to re-use XOutStream from xStream if that exists;
-
[Libreoffice-commits] .: configure.ac
configure.ac |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 6719c7893ba89da2a5c9f45e1c258bb758e48876 Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 1 08:38:28 2013 +0200 Warn about 10.4 compatibility only as required for TDF builds After all, if somebody else wants to distribute builds that require something newer, they are allowed to. diff --git a/configure.ac b/configure.ac index 2c2d272..2862668 100644 --- a/configure.ac +++ b/configure.ac @@ -2608,14 +2608,14 @@ if test $_os = Darwin; then 10.4) ;; *) -AC_MSG_WARN([Building with a SDK 10.4 possibly breaks 10.4 compatibility. Do not use for deliverable build until verified that it really works]) -add_warning Building with a SDK 10.4 possibly breaks 10.4 compatibility. Do not use for deliverable build until verified that it really works +AC_MSG_WARN([Building with a SDK 10.4 possibly breaks 10.4 compatibility. Do not use for the TDF build]) +add_warning Building with a SDK 10.4 possibly breaks 10.4 compatibility. Do not use for the TDF build ;; esac ;; *) -AC_MSG_WARN([Building with a minimum version requirement 10.4 breaks 10.4 compatibility. Do not use for deliverable build]) -add_warning Building with a minimum version requirement 10.4 breaks 10.4 compatibility. Do not use for deliverable build +AC_MSG_WARN([Building with a minimum version requirement 10.4 breaks 10.4 compatibility. Do not use for the TDF build]) +add_warning Building with a minimum version requirement 10.4 breaks 10.4 compatibility. Do not use for the TDF build ;; esac fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Student Open Source Conference
Hi, my name is Antonio Garcia III. I am organizing Flourish, an Open Source software conference at the University of Illinois at Chicago. I am contacting this list because I would love to see someone from the LibreOffice marketing collaborative speak about LibreOffice's virtues and usefulness to diverse audience. Flourish is a two-day conference reflecting on the impact of Free/Libre/Open Source Software (FLOSS) in the worlds of business, politics, education, and daily life. A presence such as yours, the CTO of Dreamworks, would honor us. For more information, please contact me at antoniogarcia...@gmail.com, or you can call me at 773.336.2259. Also, you can visit our website at www.flourishconf.com. I look forward to hearing from you. Thank you. -- Antonio Garcia 312.715.4865 antoniogarcia...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: setup_native/scripts
setup_native/scripts/osx_install_patch.applescript | 156 -
1 file changed, 156 deletions(-)
New commits:
commit 1caf6ef7b727809234076f3b6c83d84bf341ef93
Author: Tor Lillqvist t...@iki.fi
Date: Fri Feb 1 09:56:38 2013 +0200
Remove unused osx_install_patch.applescript
diff --git a/setup_native/scripts/osx_install_patch.applescript
b/setup_native/scripts/osx_install_patch.applescript
deleted file mode 100644
index f82f774..000
--- a/setup_native/scripts/osx_install_patch.applescript
+++ /dev/null
@@ -1,156 +0,0 @@
-(*
-
- This file is part of the LibreOffice project.
-
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
- This file incorporates work covered by the following license notice:
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed
- with this work for additional information regarding copyright
- ownership. The ASF licenses this file to you under the Apache
- License, Version 2.0 (the License); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 .
-
-This script is meant to
- 1) Identify installed instances of the product
- 2) check whether the user has write-access (and if not
- ask for authentification)
- 3) install the shipped tarball
-*)
-
--- strings for localisations - to be meant to be replaced
--- by a makefile or similar
-set OKLabel to [OKLabel]
-set InstallLabel to [InstallLabel]
-set AbortLabel to [AbortLabel]
-set intro to [IntroText1]
-
-[IntroText2]
-
-[IntroText3]
-set chooseMyOwn to [ChooseMyOwnText]
-set listPrompt to [ListPromptText]
-set chooseManual to [ChooseManualText]
-set listOKLabel to [ListOKLabelText]
-set listCancelLabel to [ListCancelLabel]
-set appInvalid to [AppInvalidText1]
-
-[AppInvalidText2] -- string will begin with the chosen application's name
-set startInstall to [StartInstallText1]
-
-[StartInstallText2]
-set IdentifyQ to [IdentifyQText]
-
-[IdentifyQText2]
-set IdentifyYES to [IdentifyYES]
-set IdentifyNO to [IdentifyNO]
-set installFailed to [InstallFailedText]
-set installComplete to [InstallCompleteTextPatch]
-
-set sourcedir to (do shell script dirname quoted form of POSIX path of
(path to of me))
-
-display dialog intro buttons {AbortLabel, InstallLabel} default button 2
-
-if (button returned of result) is AbortLabel then
- return 2
-end if
-
-set the found_ooos_all to (do shell script mdfind \kMDItemContentType ==
'com.apple.application-bundle' kMDItemDisplayName == '[PRODUCTNAME]*'
kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\)
- chooseMyOwn
-
-set found_ooos_all_paragraphs to paragraphs in found_ooos_all
-
-set found_ooos to {}
-repeat with currentApp in found_ooos_all_paragraphs
- if currentApp does not start with /Volumes then
- copy currentApp to the end of found_ooos
- end if
-end repeat
-
--- repeat with oneApp in found_ooos
--- display dialog oneApp
--- end repeat
-
--- the choice returned is of type list
--- Show selection dialog only if more than one or no product was found
--- The first item is an empty string, if no app was found and no app started
with /Volumes
--- The first item is chooseMyOwn, if no app was found and at least one app
started with /Volumes
-if (get first item of found_ooos as string) is then
- set the choice to (choose from list found_ooos default items (get second
item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel
button name listCancelLabel)
- if choice is false then
- -- do nothing, the user cancelled the installation
- return 2 --aborted by user
- else if (choice as string) is chooseMyOwn then
- -- yeah, one needs to use choose file, otherwise
- -- the user would not be able to select the .app
- set the choice to POSIX path of (choose file with prompt chooseManual
of type com.apple.application-bundle without showing package contents and
invisibles)
- end if
-else if (get first item of found_ooos as string) is chooseMyOwn then
- set the choice to (choose from list found_ooos default items (get first item
of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button
name listCancelLabel)
- if choice is false then
- -- do nothing, the user cancelled the installation
- return 2 --aborted by user
- else if (choice as string) is chooseMyOwn then
- -- yeah, one needs to use choose file, otherwise
- -- the user would not be able to select the .app
- set the choice to POSIX path of (choose file with prompt chooseManual
of type com.apple.application-bundle without showing package contents and
invisibles)
- end if
-else if (get second item of
[Libreoffice-commits] .: setup_native/prj
setup_native/prj/d.lst |1 - 1 file changed, 1 deletion(-) New commits: commit 953a75d2db31234901d17035985d7a1ac63cf7dc Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 1 09:59:03 2013 +0200 Remove mention of osx_install_patch.applescript from here, too diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index f578679..475c59e 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -39,6 +39,5 @@ mkdir: %_DEST%\bin\userscripts ..\scripts\*.txt %_DEST%\bin\*.txt ..\scripts\mac_install.script %_DEST%\bin\mac_install.script ..\scripts\osx_install_languagepack.applescript %_DEST%\bin\osx_install_languagepack.applescript -..\scripts\osx_install_patch.applescript %_DEST%\bin\osx_install_patch.applescript ..\%__SRC%\lib\getuid.so %_DEST%\bin\getuid.so ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] [ANNOUNCE] libreoffice-4.0.0.3 tag created
On Wed, 2013-01-30 at 17:49 +0100, Petr Mladek wrote: Hi, there have been created the tag libreoffice-4.0.0.3, aka rc3. The corresponding official builds will be available within next few days. It will be used as final if no blocker is found. Ah, the python-related fix on MAC (fdo#60012) opened doors to another python problem on MAC. It has been fixed by http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0-0id=243ae4ae98d2002bab118301f337c3751c8e4c85 The fix affects only MAC builds. It is is included in the tag libreoffice-4.0.0.3-hotfixes1 in the core repository. Also the refreshed main source tarball libreoffice-4.0.0.3.tar.xz can be found at http://dev-builds.libreoffice.org/pre-releases/src/. The submodules and the other source tarballs are not affected. I am sorry for any inconvenience. Best Regards, Petr ___ 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] Question about BUG 54206 fix for v.4.0
Le 2013-01-28 07:54, Marc Paré a écrit : Sorry for the double post. Le 2013-01-28 06:58, Florian Effenberger a écrit : Hi, Rainer Bielefeld wrote on 2013-01-26 17:13: Do we really need a copy of the readme on the site? [..] I also doubt that such copy is necessary. If we need it because of legl reasons, we need a TOC with links to readme files in all available languages and for all different public versions. I miss the plot on this - which readme are you talking about? ;) Florian It's the readme file whey you unpack the package before going through the installation process. See bugzilla [https://bugs.freedesktop.org/show_bug.cgi?id=54206] for more details. All OS installs get it, and, in all native language groups. Cheers, Marc Florian has fixed the problem with a redirect. I also checked the nl versions and it looks like they also have the same readme file in EN, so the redirect will work for all. I am closing the bug BUT the mention of the link in the readme file, IMO, should be removed. Unless there are any reasons for the link to be there it should be removed. Rainer: If this is the case, could someone patch this? No hurry as there is a redirect on the faulty link. Cheers, Marc -- Marc Paré m...@marcpare.com http://www.parEntreprise.com parEntreprise.com Supports OpenDocument Formats (ODF) parEntreprise.com Supports http://www.LibreOffice.org ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 59953] [RTF] FILEOPEN: wrong column widths for tables with merged cells
https://bugs.freedesktop.org/show_bug.cgi?id=59953 headsup u982t5hg5...@outlook.com changed: What|Removed |Added QA Contact||u982t5hg5...@outlook.com -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60108] New: ASKLIBREOFFICE: Uploading avatar in Ask LibreOffice fails
https://bugs.freedesktop.org/show_bug.cgi?id=60108 Priority: medium Bug ID: 60108 CC: webs...@global.libreoffice.org Assignee: libreoffice-bugs@lists.freedesktop.org Summary: ASKLIBREOFFICE: Uploading avatar in Ask LibreOffice fails Severity: normal Classification: Unclassified OS: All Reporter: mikko.ahlroth+freedesk...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: unspecified Component: WWW Product: LibreOffice Problem description: This is related to the question at http://ask.libreoffice.org/en/question/10200/meta-how-to-upload-avatar-image-on-asklibo/ I seem to be unable to upload an avatar image in Ask LibreOffice. I have tried the latest Chrome on both OS X (1.6.8) and Windows 7 and also Firefox 12 on OS X. Uploading always fails with the error Upload a valid image. The file you uploaded was either not an image or a corrupted image. I sometimes also get an internal server error. There is a screenshot of that in the thread linked above. Steps to reproduce: 1. Upload an avatar 2. See error Current behavior: Error Expected behavior: New avatar uploaded. Operating System: All Version: unspecified -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60105] If selected particular user interface during install, only English would be available
https://bugs.freedesktop.org/show_bug.cgi?id=60105 Urmas davian...@gmail.com changed: What|Removed |Added Hardware|x86 (IA32) |All Component|UI |Installation -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59953] [RTF] FILEOPEN: wrong column widths for tables with merged cells
https://bugs.freedesktop.org/show_bug.cgi?id=59953 --- Comment #3 from headsup u982t5hg5...@outlook.com --- Thanks for reporting. Confirmed on w8 pro x86 32 bit libreoffice Version 4.0.0.2 .0.2 (Build ID: 5991f37846fc3763493029c4958b57282c2597e) and ms office. Seem to be several similar bugs reported re rft tables. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59953] [RTF] FILEOPEN: wrong column widths for tables with merged cells
https://bugs.freedesktop.org/show_bug.cgi?id=59953 headsup u982t5hg5...@outlook.com changed: What|Removed |Added Status|UNCONFIRMED |NEW See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=48440 Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48440] FILEOPEN RTF: TABLE VIEWING destroyed
https://bugs.freedesktop.org/show_bug.cgi?id=48440 headsup u982t5hg5...@outlook.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=59953 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59953] [RTF] FILEOPEN: wrong column widths for tables with merged cells
https://bugs.freedesktop.org/show_bug.cgi?id=59953 headsup u982t5hg5...@outlook.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=50226 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 50226] FILEOPEN RTF: TABLE VIEWING isn't correct
https://bugs.freedesktop.org/show_bug.cgi?id=50226 headsup u982t5hg5...@outlook.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=59953 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
