[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #55 from Stephan Bergmann sberg...@redhat.com --- I just notice that this clean-up involves changing occurrences of sal_uLong to sal_uIntPtr, and I doubt that is a good idea. The sal_uLong typedef was originally introduced to do a mass removal of tools/solar.h's ULONG (which clashed with a Windows typedef of the same name), without having to inspect all uses of ULONG and decide for an appropriate replacement type in each case---those inspections could be deferred for a later time by preserving the information about ULONG occurrences via the newly introduced sal_uLong (which happens to be a typedef to sal_uIntPtr because that happens to have the exact same underlying type as ULONG did). So, occurrences of sal_uLong should not be blindly changed to sal_uIntPtr. (Semantically, that often does not make sense, anyway.) They should either be left alone or inspected to determine what other type they should actually be changed to (likely sal_uInt32, as the comment in tools/solar.h states). -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - configure.ac
configure.ac | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 2044aef13b163e8ba977013c152e919271ac4352 Author: Tor Lillqvist t...@collabora.com Date: Thu Feb 20 11:18:56 2014 +0200 Don't bother mentioning the Tru64 'setld' package format Change-Id: I2a9707c70637fe5bae5d16fd45e9603318d5d82f diff --git a/configure.ac b/configure.ac index f506ecf..1c4ba06 100644 --- a/configure.ac +++ b/configure.ac @@ -1402,7 +1402,7 @@ AC_ARG_WITH(package-format, [Specify package format(s) for LibreOffice installation sets. The implicit --without-package-format leads to no installation sets being generated. Possible values: aix, archive, bsd, deb, dmg, - installed, msi, native, osx, pkg, portable, rpm, and setld. + installed, msi, native, osx, pkg, portable, and rpm. Example: --with-package-format='deb rpm']), ,) @@ -4451,7 +4451,7 @@ AC_MSG_CHECKING([which package format to use]) if test -n $with_package_format -a $with_package_format != no; then for i in $with_package_format; do case $i in -aix | bsd | deb | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi) +aix | bsd | deb | osx | pkg | rpm | native | portable | archive | dmg | installed | msi) ;; *) AC_MSG_ERROR([unsupported format $i. Supported by EPM are: @@ -4461,7 +4461,6 @@ deb - Debian software distribution osx - MacOS X software distribution pkg - Solaris software distribution rpm - RedHat software distribution -setld - Tru64 (setld) software distribution native - Native software distribution for the platform portable - Portable software distribution @@ -7256,7 +7255,7 @@ if test $enable_epm = yes; then else for i in $PKGFORMAT; do case $i in -aix | bsd | deb | osx | pkg | rpm | setld | native | portable) +aix | bsd | deb | osx | pkg | rpm | native | portable) AC_MSG_ERROR( [--with-package-format='$PKGFORMAT' requires --enable-epm]) ;; commit 26eb80ac7a1fa0ce56a0137e6243625c91b4c580 Author: Tor Lillqvist t...@collabora.com Date: Thu Feb 20 11:18:04 2014 +0200 Don't bother mentioning the IRIX 'inst' and 'tardist' package formats Change-Id: I11c2f7fa72a1bc8a2c621ed928dc33a8410f1eee diff --git a/configure.ac b/configure.ac index 4f71d15..f506ecf 100644 --- a/configure.ac +++ b/configure.ac @@ -1401,8 +1401,8 @@ AC_ARG_WITH(package-format, AS_HELP_STRING([--with-package-format], [Specify package format(s) for LibreOffice installation sets. The implicit --without-package-format leads to no installation sets being - generated. Possible values: aix, archive, bsd, deb, dmg, inst, - installed, msi, native, osx, pkg, portable, rpm, setld, and tardist. + generated. Possible values: aix, archive, bsd, deb, dmg, + installed, msi, native, osx, pkg, portable, rpm, and setld. Example: --with-package-format='deb rpm']), ,) @@ -4451,14 +4451,13 @@ AC_MSG_CHECKING([which package format to use]) if test -n $with_package_format -a $with_package_format != no; then for i in $with_package_format; do case $i in -aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi) +aix | bsd | deb | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi) ;; *) AC_MSG_ERROR([unsupported format $i. Supported by EPM are: aix - AIX software distribution bsd - FreeBSD, NetBSD, or OpenBSD software distribution deb - Debian software distribution -inst or tardist - IRIX software distribution osx - MacOS X software distribution pkg - Solaris software distribution rpm - RedHat software distribution @@ -7257,7 +7256,7 @@ if test $enable_epm = yes; then else for i in $PKGFORMAT; do case $i in -aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable) +aix | bsd | deb | osx | pkg | rpm | setld | native | portable) AC_MSG_ERROR( [--with-package-format='$PKGFORMAT' requires --enable-epm]) ;; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: HTML tags must be uppercase
Hi,
On Thu, Feb 20, 2014 at 1:56 AM, Kohei Yoshida
kohei.yosh...@collabora.com wrote:
Just FYI,
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3d481254a07fe82d11953f9825a2f8fc6eeabc0b
we need to stick with uppercased HTML tags because using lower-cased
tags apparently breaks Windows clipboard functionality.
https://bugs.freedesktop.org/show_bug.cgi?id=74584
https://bugs.freedesktop.org/show_bug.cgi?id=74537
No idea why lower-cased html tags won't work there, but the condition
appears to be indepdent of applications. I've tested Word, Excel and
Firefox, and the bug reporters have tested several others such as Google
Chrome and Thunderbird.
The 4.2 backport request is pending here:
https://gerrit.libreoffice.org/#/c/8132/
Kohei
Actually our clipboard html format [1] is wrong and this is most
probably the cause. I inspected the clipboard with InsideClipboard
[2]. StartHTML, EndHTML, StartFragment, EndFragment have the wrong
numbers (see the attachement). I think this could be the problem.
Regards, Tomaž
[1]
http://msdn.microsoft.com/en-us/library/windows/desktop/ms649015%28v=vs.85%29.aspx
[2] http://www.nirsoft.net/utils/inside_clipboard.html
Version:1.0
StartHTML:000103
EndHTML:000112
StartFragment:000105
EndFragment:000104
!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN
html
head
meta http-equiv=content-type content=text/html; charset=utf-8
title/title
meta name=generator content=LibreOfficeDev 4.3.0.0.alpha0
(Windows)
style type=text/css!--
body,div,table,thead,tbody,tfoot,tr,th,td,p {
font-family:Arial; font-size:x-small }
--
/style
/head
body
table cellspacing=0 border=0
colgroup width=86/colgroup
tr
td height=17 align=right valign=bottom sdval=1
sdnum=1033;1/td
/tr
tr
td height=17 align=right valign=bottom sdval=2
sdnum=1033;2/td
/tr
tr
td height=17 align=right valign=bottom sdval=3
sdnum=1033;3/td
/tr
/table
/body
/html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/IDocumentLinksAdministration.hxx |2 ++
sw/inc/IDocumentRedlineAccess.hxx | 11 +++
sw/inc/IDocumentSettingAccess.hxx |1 +
sw/inc/IDocumentState.hxx |2 ++
sw/inc/accessibilityoptions.hxx |2 ++
sw/inc/authratr.hxx |2 ++
sw/inc/crsskip.hxx |3 ++-
sw/inc/cshtyp.hxx |4
sw/inc/docfac.hxx |2 ++
sw/inc/format.hxx |3 +++
sw/inc/hintids.hxx | 17 +
sw/inc/index.hxx| 11 +--
sw/inc/itabenum.hxx |3 +++
sw/inc/mdiexp.hxx |1 +
sw/inc/ndtyp.hxx|4
sw/inc/pch/precompiled_msword.hxx |1 +
sw/inc/pch/precompiled_sw.hxx |1 +
sw/inc/splargs.hxx | 19 ---
sw/inc/swatrset.hxx |2 +-
sw/inc/swdbdata.hxx |1 +
sw/inc/swevent.hxx |2 ++
sw/inc/swtypes.hxx |2 +-
sw/inc/swunohelper.hxx |1 +
sw/inc/swwait.hxx |1 +
sw/inc/tabcol.hxx |2 ++
sw/inc/toxwrap.hxx |2 ++
sw/inc/txatbase.hxx |9 +
sw/inc/txatritr.hxx |5 +
sw/inc/unocoll.hxx |9 +++--
sw/source/core/bastyp/index.cxx |7 +++
sw/source/core/inc/GetMetricVal.hxx |2 ++
sw/source/core/inc/SwPortionHandler.hxx |1 +
sw/source/core/inc/drawfont.hxx |1 +
sw/source/core/inc/laycache.hxx |7 ---
sw/source/core/inc/unofldmid.h |2 ++
sw/source/filter/html/htmlfly.hxx |2 +-
sw/source/filter/inc/rtf.hxx|2 ++
sw/source/filter/inc/wrtswtbl.hxx | 19 ++-
sw/source/filter/ww8/WW8Sttbf.hxx |1 +
sw/source/filter/xml/xmlexpit.hxx |1 +
sw/source/filter/xml/xmlimpit.hxx |2 ++
sw/source/filter/xml/xmlitem.hxx|2 ++
sw/source/ui/inc/fldmgr.hxx | 27 +--
sw/source/ui/inc/initui.hxx |1 +
sw/source/ui/uiview/viewfunc.hxx|1 +
45 files changed, 154 insertions(+), 49 deletions(-)
New commits:
commit 4137f39d7b13c0ad2e649d7efb02ecfc14a31a25
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 20 10:48:55 2014 +0100
Revert fdo#63154 Remove unused solar.h reference in sw.
sal_uIntPtr should only be used to represent pointers cast to integers.
This reverts commit 067d08029384af6e620f0fc48e31ff2a740e1fc8.
diff --git a/sw/inc/IDocumentLinksAdministration.hxx
b/sw/inc/IDocumentLinksAdministration.hxx
index e72ad04..a0b3ee6 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
#define INCLUDED_SW_INC_IDOCUMENTLINKSADMINISTRATION_HXX
+#include tools/solar.h
+
namespace com { namespace sun { namespace star { namespace uno { class Any; }
} } }
namespace sfx2 { class SvLinkSource; class LinkManager; }
diff --git a/sw/inc/IDocumentRedlineAccess.hxx
b/sw/inc/IDocumentRedlineAccess.hxx
index 0385fd2..48320be 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -21,7 +21,10 @@
#define INCLUDED_SW_INC_IDOCUMENTREDLINEACCESS_HXX
#include sal/types.h
+ #include tools/solar.h
+
#include limits.h
+
#include com/sun/star/uno/Sequence.hxx
class SwRangeRedline;
@@ -95,6 +98,10 @@ public:
public:
+/*
+Query
+*/
+
/** Query the currently set redline mode
@returns
@@ -130,6 +137,10 @@ public:
virtual bool IsInRedlines(const SwNode rNode) const = 0;
+/***
+Manipulation
+ ***/
+
/** Append a new redline
@param pPtr
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index d33695a..6e66fd0 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
#define INCLUDED_SW_INC_IDOCUMENTSETTINGACCESS_HXX
+#include tools/solar.h
#include rtl/ref.hxx
#include chcmprse.hxx
#include fldupde.hxx
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index e44b09d..9230dd3 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
#define INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
+ #include tools/solar.h
+
/** Get
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #56 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Stahl committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=4137f39d7b13c0ad2e649d7efb02ecfc14a31a25 Revert fdo#63154 Remove unused solar.h reference in sw. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 6c6e798d09f490a172033baef2e71c2dc642c60c Author: Tor Lillqvist t...@collabora.com Date: Thu Feb 20 12:01:48 2014 +0200 Remove obsolete warning Change-Id: Ic33df13d5c46a7e87a06822c79b0f56930f59ea5 diff --git a/configure.ac b/configure.ac index 1c4ba06..5576172 100644 --- a/configure.ac +++ b/configure.ac @@ -943,9 +943,7 @@ AC_ARG_ENABLE(python, AS_HELP_STRING([--enable-python=no/auto/system/internal], [Enables or disables Python support at run-time and build-time. Also specifies what Python to use. 'auto' is the - default. Note that Python can be disabled with - --disable-python or --enable-python=no only if no - translations are required.])) + default.])) AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unity for HiDPI
Hi Keith, On Wed, Feb 19, 2014 at 11:01:51PM -0500, Keith Curtis wrote: Do you know if they will return 192 DPI when on these screens like what Gnome 3.10 does? I could find some Unity alias and ask, but you might know or be able to encourage them ;-) To be honest, I havent tracked HiDPI at all as I already have to watch out for too many lose ends. I asked on #ubuntu-desktop and this is what I got: 11:08 Sweetshark I got an email request about HiDPI asking: Do you know if they will return 192 DPI when on these screens like what Gnome 3.10 does? I could find some Unity alias and ask, but you might know or be able to encourage them ;-) -- anyone having a quick answer to that? 11:09 darkxst Sweetshark, if they are asking for HiDPI on Full HD panels, it wont happen, atleast not from the GNOME side HTH, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - compilerplugins/Makefile-clang.mk config_host.mk.in configure.ac external/clucene sc/source sd/source solenv/gbuild sw/source
compilerplugins/Makefile-clang.mk |2 +-
config_host.mk.in |2 +-
configure.ac |5 ++---
external/clucene/Makefile |4
sc/source/ui/attrdlg/scabstdlg.cxx |2 +-
sc/source/ui/attrdlg/scuiexp.cxx |6 +-
sd/source/ui/dlg/sdabstdlg.cxx |2 +-
sd/source/ui/dlg/sduiexp.cxx |6 +-
solenv/gbuild/platform/com_GCC_defs.mk |2 +-
solenv/gbuild/platform/com_MSC_defs.mk |2 +-
sw/source/ui/dialog/swabstdlg.cxx |2 +-
sw/source/ui/dialog/swuiexp.cxx|6 +-
12 files changed, 12 insertions(+), 29 deletions(-)
New commits:
commit 52e99e9e957a228d95d55935acc96175ee494f30
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Feb 20 09:40:11 2014 +0100
Rename functions to avoid name collisions more generally.
Luckily, in this case it's easy to find the only place where we load the
symbol.
Change-Id: I224fd1e08f268095f8be58b089a643d434bc7a98
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx
b/sc/source/ui/attrdlg/scabstdlg.cxx
index 88768ed..5da6897 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -50,7 +50,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule,
aStrBuf.makeStringAndClear(),
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( ScAbstractDialogFactory* (SAL_CALL*)() )
-aDialogLibrary.getFunctionSymbol( OUString(CreateDialogFactory)
);
+aDialogLibrary.getFunctionSymbol(
OUString(ScCreateDialogFactory) );
#else
fp = ScCreateDialogFactory();
#endif
diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index 77e5b2e..01f1926 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/sc/source/ui/attrdlg/scuiexp.cxx
@@ -36,13 +36,9 @@ namespace scui
}
}
-#ifdef DISABLE_DYNLOADING
-#define CreateDialogFactory ScCreateDialogFactory
-#endif
-
extern C
{
-SAL_DLLPUBLIC_EXPORT ScAbstractDialogFactory* CreateDialogFactory()
+SAL_DLLPUBLIC_EXPORT ScAbstractDialogFactory* ScCreateDialogFactory()
{
return ::scui::GetFactory();
}
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 34b737a..0fc9320 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -46,7 +46,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
static const OUString sLibName(::vcl::unohelper::CreateLibraryName(sdui,
sal_True));
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule,
sLibName ) )
fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
-aDialogLibrary.getFunctionSymbol( CreateDialogFactory );
+aDialogLibrary.getFunctionSymbol( SdCreateDialogFactory );
#else
fp = SdCreateDialogFactory();
#endif
diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx
index d1a64e5..3c52638 100644
--- a/sd/source/ui/dlg/sduiexp.cxx
+++ b/sd/source/ui/dlg/sduiexp.cxx
@@ -20,13 +20,9 @@
#include sddlgfact.hxx
#include sal/types.h
-#ifdef DISABLE_DYNLOADING
-#define CreateDialogFactory SdCreateDialogFactory
-#endif
-
extern C
{
-SAL_DLLPUBLIC_EXPORT SdAbstractDialogFactory* CreateDialogFactory()
+SAL_DLLPUBLIC_EXPORT SdAbstractDialogFactory* SdCreateDialogFactory()
{
static SdAbstractDialogFactory_Impl aFactory;
return aFactory;
diff --git a/sw/source/ui/dialog/swabstdlg.cxx
b/sw/source/ui/dialog/swabstdlg.cxx
index db26ac1..74fde17 100644
--- a/sw/source/ui/dialog/swabstdlg.cxx
+++ b/sw/source/ui/dialog/swabstdlg.cxx
@@ -46,7 +46,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule,
sLibName,
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( SwAbstractDialogFactory* (SAL_CALL*)() )
-aDialogLibrary.getFunctionSymbol( OUString(CreateDialogFactory));
+aDialogLibrary.getFunctionSymbol(
OUString(SwCreateDialogFactory));
#else
fp = SwCreateDialogFactory();
#endif
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index 7b92e892..f2139af 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -33,13 +33,9 @@ namespace swui
}
}
-#ifdef DISABLE_DYNLOADING
-#define CreateDialogFactory SwCreateDialogFactory
-#endif
-
extern C
{
-SAL_DLLPUBLIC_EXPORT SwAbstractDialogFactory* CreateDialogFactory()
+SAL_DLLPUBLIC_EXPORT SwAbstractDialogFactory* SwCreateDialogFactory()
{
return ::swui::GetFactory();
}
commit 193d15277cfa23e6bd03cf723095c00de3c630b1
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Feb 20 07:57:16 2014
[Libreoffice-commits] core.git: 2 commits - pyuno/Module_pyuno.mk pyuno/PythonTest_pytests.mk pyuno/PythonTest_pyuno_pytests_insertremovecells.mk pyuno/qa
pyuno/Module_pyuno.mk |7 +
pyuno/PythonTest_pytests.mk | 29 ++
pyuno/PythonTest_pyuno_pytests_insertremovecells.mk | 20
pyuno/qa/pytests/insertremovecells.py | 85
pyuno/qa/pytests/testdocuments/fdo74824.ods |binary
5 files changed, 141 insertions(+)
New commits:
commit f2471280c7c625e39369f76bd0efa1d2402f62bf
Author: Kevin Hunter hunt...@earlham.edu
Date: Sun Feb 16 22:12:27 2014 -0500
Test for fdo#74824.
The bug in question crashed LibO when inserting a group of cells.
This bug was quashed, per se, by commit
07e2c31831ad265b018e5fdf59bdde048fbb4d35, but it occurs to me that at
least the particular functionality of inserting a group of cells could
use more testing.
Change-Id: Icdbfff86fb0265eef325bcc94d9fc9f3e9e38413
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 31c831a..b79c21d 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -63,6 +63,7 @@ endif # SYSTEM_PYTHON
ifneq (,$(filter PythonTest_pytests,$(MAKECMDGOALS)))
$(eval $(call gb_Module_add_targets,pyuno, \
PythonTest_pytests \
+PythonTest_pyuno_pytests_insertremovecells \
))
endif
diff --git a/pyuno/PythonTest_pytests.mk b/pyuno/PythonTest_pytests.mk
index afb4ba5..63ffbb6 100644
--- a/pyuno/PythonTest_pytests.mk
+++ b/pyuno/PythonTest_pytests.mk
@@ -24,5 +24,6 @@
$(eval $(call gb_PythonTest_PythonTest,pytests))
$(call gb_PythonTest_get_target,pytests) : \
+$(call gb_PythonTest_get_target,pyuno_pytests_insertremovecells) \
# vim: set noet sw=4 ts=4:
diff --git a/pyuno/PythonTest_pyuno_pytests_insertremovecells.mk
b/pyuno/PythonTest_pyuno_pytests_insertremovecells.mk
new file mode 100644
index 000..3b3e3c0
--- /dev/null
+++ b/pyuno/PythonTest_pyuno_pytests_insertremovecells.mk
@@ -0,0 +1,20 @@
+# -*- 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_PythonTest_PythonTest,pyuno_pytests_insertremovecells))
+
+$(eval $(call gb_PythonTest_set_defs,pyuno_pytests_insertremovecells,\
+TDOC=$(SRCDIR)/pyuno/qa/pytests/testdocuments \
+))
+
+$(eval $(call
gb_PythonTest_add_modules,pyuno_pytests_insertremovecells,$(SRCDIR)/pyuno/qa/pytests,\
+insertremovecells \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/pyuno/qa/pytests/insertremovecells.py
b/pyuno/qa/pytests/insertremovecells.py
new file mode 100644
index 000..4ce2707
--- /dev/null
+++ b/pyuno/qa/pytests/insertremovecells.py
@@ -0,0 +1,85 @@
+import unittest
+
+from os import getenv, path
+
+try:
+from urllib.parse import quote
+except ImportError:
+from urllib import quote
+
+from org.libreoffice.unotest import pyuno, mkPropertyValue
+
+class InsertRemoveCells(unittest.TestCase):
+
+@classmethod
+def setUpClass(cls):
+cls.xContext = pyuno.getComponentContext()
+pyuno.experimentalExtraMagic()
+
+
+# no need for a tearDown(cls) method.
+
+
+def test_fdo74824_load(self):
+ctxt = self.xContext
+assert(ctxt)
+
+smgr = ctxt.ServiceManager
+desktop = smgr.createInstanceWithContext('com.sun.star.frame.Desktop',
ctxt)
+loadProps = tuple(mkPropertyValue(k, v) for (k, v) in (
+ ('Hidden', True),
+ ('ReadOnly', False)
+))
+tdoc_dir = getenv('TDOC')
+url = 'file://' + quote(path.join(tdoc_dir, 'fdo74824.ods'))
+doc = desktop.loadComponentFromURL(url, _blank, 0, loadProps)
+
+sheet = doc.Sheets.Sheet1
+area = sheet.getCellRangeByName( 'A2:B4' )
+addr = area.getRangeAddress()
+
+# 2 = intended to shift cells right, but I don't know where to find
+# the ENUM to put in it's place. Corrections welcome.
+sheet.insertCells( addr, 2 )
+
+# basically, the insertCells call is the test: it should not crash
+# LibreOffice. However, for completeness, we should test the cell
+# contents as well.
+
+empty_cells = (
+ (0, 0), (0, 1), (0, 2), (0, 3), (1, 0), (1, 1), (1, 2), (1, 3),
+ (3, 1), (4, 0), (4, 2), (5, 0), (5, 2), (5, 3),
+)
+formula_cells = (
+ (2, 0, '=(1+GDR)^-D1', '1.000', 1.0),
+ (4, 1, '=(1+GDR)^-F2', '0.125', 0.125),
+ (4, 3, '=SUM(C1:C2)', '1.000', 1.0),
+)
+value_cells = (
+ (2, 2, '2010', 2010.0),
+ (2, 3, '7', 7.0),
+ (3, 0, '0', 0),
+ (3, 2, '2012', 2012.0),
+ (3, 3, '6', 6.0),
+ (5, 1, '1', 1.0),
+)
+for pos in empty_cells:
+cell = sheet.getCellByPosition(*pos)
+self.assertEqual( 'EMPTY', cell.Type.value )
+
Re: Testing/Working on PyUNO?
On 02/19/2014 12:02 PM, Stephan Bergmann wrote: So, what can we do here? How about an additional code module dedicated to subsequentchecks written in Python, which, while serving the useful purpose of testing specific application functionality (and in which role they may deliberately duplicate existing native tests), are meant more as a means to improve the PyUNO situation. The idea would be that Kevin (and others) would fill this with PyUNO coding scenarios that cross their mind, discover errors in the PyUNO infrastructure, ideally distill tests for those specific errors out of the more general tests (that could then even go into more specific code modules like pyuno or testtools), and eventually prune test snippets again that are no longer useful. To get that started, I created http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e887567c5b4b06646ab1340376e240d6c5af9cb A rudimentary framework for additional Python tests not run by default and moved the previously abandoned http://cgit.freedesktop.org/libreoffice/core/commit/?id=f2471280c7c625e39369f76bd0efa1d2402f62bf Test for fdo#74824 there. At least for now, the tests are not run by default, but need an explicit make PythonTest_pytests. See the commit message of http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e887567c5b4b06646ab1340376e240d6c5af9cb for details. Let me know whether that is useful. Happy hacking, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #57 from Alexandre Vicenzi vicenzi.alexan...@gmail.com --- (In reply to comment #55) I just notice that this clean-up involves changing occurrences of sal_uLong to sal_uIntPtr, and I doubt that is a good idea. The sal_uLong typedef was originally introduced to do a mass removal of tools/solar.h's ULONG (which clashed with a Windows typedef of the same name), without having to inspect all uses of ULONG and decide for an appropriate replacement type in each case---those inspections could be deferred for a later time by preserving the information about ULONG occurrences via the newly introduced sal_uLong (which happens to be a typedef to sal_uIntPtr because that happens to have the exact same underlying type as ULONG did). So, occurrences of sal_uLong should not be blindly changed to sal_uIntPtr. (Semantically, that often does not make sense, anyway.) They should either be left alone or inspected to determine what other type they should actually be changed to (likely sal_uInt32, as the comment in tools/solar.h states). Stephan, I understand your point of view, and probably it's the best idea. It's wrong to put sal_uLong definition in sal/types.h? -- 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 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #58 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #57) I understand your point of view, and probably it's the best idea. It's wrong to put sal_uLong definition in sal/types.h? Yes, that's wrong. sal_uLong is a temporary hack for a problem in code above the URE interface, so it should not find its way into the URE stable interface. Looks like there is a handful things (SVLIBRARY. sal_uLong) that best stay in tools/solar.h for now, even if that means that tools/solar.h cannot be removed completely for now. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b74870f27557265e347f2e191a222f514d1b8c50 Author: Andras Timar andras.ti...@collabora.com Date: Thu Feb 20 11:55:43 2014 +0100 Updated core Project: help 2539bfabb242613f8ec788e6addcebcca576beee diff --git a/helpcontent2 b/helpcontent2 index f9e2d68..2539bfa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f9e2d688f6755c85b099cb659dd865dae775b607 +Subproject commit 2539bfabb242613f8ec788e6addcebcca576beee ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - upload-wiki.pl
upload-wiki.pl | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 2539bfabb242613f8ec788e6addcebcca576beee
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Feb 20 11:55:43 2014 +0100
Retry wiki page upload on error
Change-Id: I9a9621198d4fc02a03ef94eccdddb481109c73fd
diff --git a/upload-wiki.pl b/upload-wiki.pl
index 8a78944..58de4fb 100755
--- a/upload-wiki.pl
+++ b/upload-wiki.pl
@@ -134,11 +134,19 @@ sub upload_article {
my $text = read_file( $_ );
+RETRY:
print Uploading page '$pagename'\n;
-$mw-edit( {
+if ( $mw-edit( {
action = 'edit',
title = $pagename,
-text = $text }, { skip_encoding = 1 } ) || print 'Error: ' .
$mw-{error}-{code} . ': ' . $mw-{error}-{details} . \n;
+text = $text }, { skip_encoding = 1 } ) )
+{
+print 'Error: ' . $mw-{error}-{code} . ': ' .
$mw-{error}-{details} . \n;
+print Waiting for 10 seconds...\n;
+sleep 10;
+print Retry!\n;
+goto RETRY;
+}
}
File::Find::find( {wanted = \upload_article}, 'wiki/' );
commit aa981e2b1df11aebacf2d146ebf24895376324ad
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Feb 20 11:08:03 2014 +0100
line break instead of literal \n
Change-Id: I0617304a7523ab06b862bdca108265b8ea969ab6
diff --git a/upload-wiki.pl b/upload-wiki.pl
index 4dd63bf..8a78944 100755
--- a/upload-wiki.pl
+++ b/upload-wiki.pl
@@ -138,7 +138,7 @@ sub upload_article {
$mw-edit( {
action = 'edit',
title = $pagename,
-text = $text }, { skip_encoding = 1 } ) || print 'Error: ' .
$mw-{error}-{code} . ': ' . $mw-{error}-{details} . '\n';
+text = $text }, { skip_encoding = 1 } ) || print 'Error: ' .
$mw-{error}-{code} . ': ' . $mw-{error}-{details} . \n;
}
File::Find::find( {wanted = \upload_article}, 'wiki/' );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/svx svx/source sw/source
include/svx/svdobj.hxx |6 ++
svx/source/svdraw/svdobj.cxx |5 +
sw/source/core/layout/anchoreddrawobject.cxx | 17 -
sw/source/core/unocore/unodraw.cxx | 19 ---
sw/source/core/unocore/unomap.cxx|2 ++
5 files changed, 45 insertions(+), 4 deletions(-)
New commits:
commit 90519c0436bacc50136b33039bd107e4f6bdb24c
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Feb 20 12:18:23 2014 +0100
SwAnchoredDrawObject: respect SdrObject::GetRelativeWidth/HeightRelation()
Change-Id: Ie107ea749a1f4c261106f0f18f3818b85d65e9b4
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx
b/sw/source/core/layout/anchoreddrawobject.cxx
index 65416d4..e9630a9 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -630,16 +630,31 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
// Resize objects with relative width or height
if ( !bGroupShape GetPageFrm( ) ( GetDrawObj( )-GetRelativeWidth( )
|| GetDrawObj()-GetRelativeHeight( ) ) )
{
-Rectangle aPageRect = GetPageFrm( )-GetBoundRect( ).SVRect();
Rectangle aCurrObjRect = GetDrawObj()-GetCurrentBoundRect();
long nTargetWidth = aCurrObjRect.GetWidth( );
if ( GetDrawObj( )-GetRelativeWidth( ) )
+{
+Rectangle aPageRect;
+if (GetDrawObj()-GetRelativeWidthRelation() ==
text::RelOrientation::FRAME)
+// Exclude margins.
+aPageRect = GetPageFrm()-Prt().SVRect();
+else
+aPageRect = GetPageFrm( )-GetBoundRect( ).SVRect();
nTargetWidth = aPageRect.GetWidth( ) * GetDrawObj(
)-GetRelativeWidth( ).get( );
+}
long nTargetHeight = aCurrObjRect.GetHeight( );
if ( GetDrawObj( )-GetRelativeHeight( ) )
+{
+Rectangle aPageRect;
+if (GetDrawObj()-GetRelativeHeightRelation() ==
text::RelOrientation::FRAME)
+// Exclude margins.
+aPageRect = GetPageFrm()-Prt().SVRect();
+else
+aPageRect = GetPageFrm( )-GetBoundRect( ).SVRect();
nTargetHeight = aPageRect.GetHeight( ) * GetDrawObj(
)-GetRelativeHeight( ).get( );
+}
if ( nTargetWidth != aCurrObjRect.GetWidth( ) || nTargetHeight !=
aCurrObjRect.GetHeight( ) )
{
commit b548b2efb1a8aafcd5e56a1d26b933354ff02a47
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Feb 20 12:07:51 2014 +0100
sw: enable Relative{Height,Width}Relation UNO properties for shapes
Change-Id: I40080bd9b096b9fa5d660b11c4e5821db31fd412
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 4b48e46..b3c7c0c 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1258,7 +1258,9 @@ void SwXShape::setPropertyValue(const OUString
rPropertyName, const uno::Any a
}
}
else if( RES_FRM_SIZE == pEntry-nWID
-( pEntry-nMemberId == MID_FRMSIZE_REL_HEIGHT ||
pEntry-nMemberId == MID_FRMSIZE_REL_WIDTH ) )
+( pEntry-nMemberId == MID_FRMSIZE_REL_HEIGHT ||
pEntry-nMemberId == MID_FRMSIZE_REL_WIDTH
+ || pEntry-nMemberId ==
MID_FRMSIZE_REL_HEIGHT_RELATION
+ || pEntry-nMemberId ==
MID_FRMSIZE_REL_WIDTH_RELATION ) )
{
SvxShape* pSvxShape = GetSvxShape();
SAL_WARN_IF(!pSvxShape, sw.uno, No SvxShape found!);
@@ -1267,10 +1269,21 @@ void SwXShape::setPropertyValue(const OUString
rPropertyName, const uno::Any a
SdrObject* pObj = pSvxShape-GetSdrObject();
sal_Int16 nPercent(100);
aValue = nPercent;
-if ( pEntry-nMemberId == MID_FRMSIZE_REL_WIDTH )
+switch (pEntry-nMemberId)
+{
+case MID_FRMSIZE_REL_WIDTH:
pObj-SetRelativeWidth( nPercent / 100.0 );
-else
+break;
+case MID_FRMSIZE_REL_HEIGHT:
pObj-SetRelativeHeight( nPercent / 100.0 );
+break;
+case MID_FRMSIZE_REL_WIDTH_RELATION:
+pObj-SetRelativeWidthRelation(nPercent);
+break;
+case MID_FRMSIZE_REL_HEIGHT_RELATION:
+pObj-SetRelativeHeightRelation(nPercent);
+break;
+}
}
}
else
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index eac4e79..1c59657
[Libreoffice-commits] core.git: include/tools
include/tools/color.hxx |1 - include/tools/stream.hxx |1 - 2 files changed, 2 deletions(-) New commits: commit 7fa9530f8c2fa992a50353c9442a3300df04fd02 Author: Alexandre Vicenzi vicenzi.alexan...@gmail.com Date: Wed Feb 19 15:01:03 2014 -0300 fdo#63154 Remove unused solar.h ref. in tools Change-Id: Iedcf030178c4bf875db01ba6b1f5202dae18bca2 Reviewed-on: https://gerrit.libreoffice.org/8134 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/include/tools/color.hxx b/include/tools/color.hxx index 9fedd25..6a3c096 100644 --- a/include/tools/color.hxx +++ b/include/tools/color.hxx @@ -24,7 +24,6 @@ class SvStream; class ResId; -#include tools/solar.h #include basegfx/color/bcolor.hxx // Color types diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 16472b7..4f8085d 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -22,7 +22,6 @@ #include limits #include osl/process.h #include tools/toolsdllapi.h -#include tools/solar.h #include tools/lineend.hxx #include tools/errinf.hxx #include tools/ref.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #59 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=7fa9530f8c2fa992a50353c9442a3300df04fd02 fdo#63154 Remove unused solar.h ref. in tools The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ba28d85c15e1841fdfa337375893f42bc9bcceae Author: Andras Timar andras.ti...@collabora.com Date: Thu Feb 20 12:50:35 2014 +0100 Updated core Project: help d7a29031adf51b1ae5eee7cbeb4ff4f33c6e5675 diff --git a/helpcontent2 b/helpcontent2 index 2539bfa..d7a2903 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2539bfabb242613f8ec788e6addcebcca576beee +Subproject commit d7a29031adf51b1ae5eee7cbeb4ff4f33c6e5675 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/guide/access2base.xhp | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit d7a29031adf51b1ae5eee7cbeb4ff4f33c6e5675 Author: Andras Timar andras.ti...@collabora.com Date: Thu Feb 20 12:50:35 2014 +0100 fix help xml syntax in access2base.xhp Change-Id: Id1cc4ed9a9be1db0c4ffda0196439ae39c5643bf diff --git a/source/text/sbasic/guide/access2base.xhp b/source/text/sbasic/guide/access2base.xhp index 135adc5..f7470a6 100644 --- a/source/text/sbasic/guide/access2base.xhp +++ b/source/text/sbasic/guide/access2base.xhp @@ -9,7 +9,7 @@ === Access2Base is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of + but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Access2Base is free software; you can redistribute it and/or modify it under the terms of either (at your option): @@ -29,11 +29,11 @@ topic id=textsbasicsharedA2B001xml indexer=include status=PUBLISH title id=tit xml-lang=en-USAccess2Base/title filename/text/sbasic/guide/access2base.xhp/filename - history - created date=2013-11-01T00:00:00Access2Base topic first insertion, by Jean-Pierre Ledure/created - lastedited date=2013-11-01T00:00:00None/lastedited - /history /topic + history + created date=2013-11-01T00:00:00Access2Base topic first insertion, by Jean-Pierre Ledure/created + lastedited date=2013-11-01T00:00:00None/lastedited + /history /meta body bookmark xml-lang=en-US branch=index id=bm_idA2B001bookmark_valueAccess2Base/bookmark_value @@ -43,7 +43,6 @@ paragraph role=paragraph id=par_idA2B004 xml-lang=en-US l10n=UAccess2Base is a LibreOffice Basic library of macros for (business or personal) application developers and advanced users. It is one of the libraries stored in LibreOffice macros and dialogs./paragraph paragraph role=paragraph id=par_idA2B005 xml-lang=en-US l10n=UThe provided macros implement functionalities, all directly inspired by Microsoft Access. The macros are callable from a LibreOffice emphBase/emph application only./paragraph paragraph role=paragraph id=par_idA2B006 xml-lang=en-US l10n=UThe API provided by Access2Base is intended to be more concise, intuitive and easy to learn than the standard UNO API (API = Application Programming Interface)./paragraph - br/ paragraph role=warning id=par_idA2B007 xml-lang=en-US l10n=UemphThe library is documented online on link href=http://www.access2base.com; name=http://www.access2base.com;http://www.access2base.com/link/emph/paragraph paragraph role=heading id=hd_idA2B008 xml-lang=en-US level=2 l10n=UThe implemented macros include:/paragraph list type=ordered format=1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source vcl/source
sc/source/ui/view/viewfun5.cxx |3 +++
vcl/source/filter/wmf/enhwmf.cxx |3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 55112988e67d627dc807fd30478c1c3f952c75f2
Author: Tor Lillqvist t...@collabora.com
Date: Thu Feb 20 13:46:21 2014 +0200
Combine two subsequent SAL_INFO calls into one
Change-Id: Iec931ddb77ce09df72ee9ce321e443e6f5a785f1
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index b83a5cf..e2292a0 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -497,8 +497,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
pWMF-ReadUInt32( length );
-SAL_INFO(vcl.emf, \tGDI comment);
-SAL_INFO(vcl.emf, \t\tlength: length);
+SAL_INFO(vcl.emf, \tGDI comment, length: length);
if( pWMF-good() length = 4 ) {
sal_uInt32 id;
commit debbddf12bd266102d93e417934ca98365db9987
Author: Tor Lillqvist t...@collabora.com
Date: Thu Feb 20 13:37:04 2014 +0200
Re-introduce code to try to get GDI metafile replacement image
The code was commented out in 2009 (with any rationale lost from
version history) and then cleaned away in 2011. Re-introduce the bit
that tries FORMAT_GDIMETAFILE. Seems to work, knock on wood.
Change-Id: Ie0cfdde98afb127233ac928e899165209f439a6c
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index ef4777f..9a7910b 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -181,6 +181,9 @@ bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
Graphic aGraphic;
sal_uLong nGrFormat = 0;
+if (aDataHelper.GetGraphic( FORMAT_GDIMETAFILE, aGraphic )
)
+nGrFormat = SOT_FORMAT_GDIMETAFILE;
+
// insert replacement image ( if there is one ) into the
object helper
if ( nGrFormat )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/svx svx/source sw/source
include/svx/framelink.hxx | 14 +++---
svx/source/dialog/framelink.cxx| 32
sw/source/core/layout/paintfrm.cxx |3 ++-
3 files changed, 25 insertions(+), 24 deletions(-)
New commits:
commit 9fb9fc301502c2762ad4a8059d8d1c818d2843db
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 20 12:32:51 2014 +0100
fdo#75118: actually these are floats, compare with approxEqual
Change-Id: Ib195af3ebd5f602761d1660abb1798d72d0f352d
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 169a358..8fa85c6 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2596,7 +2596,8 @@ void SwTabFrmPainter::PaintLines(OutputDevice rDev,
const SwRect rRect) const
aPaintStart.Y() -= nTwipYCorr;
aPaintEnd.Y() -= nTwipYCorr;
-if (aStyles[0].Prim() = 0 aStyles[0].Secn() = 0)
+if (::rtl::math::approxEqual(aStyles[0].Prim(), 0.0)
+::rtl::math::approxEqual(aStyles[0].Secn(), 0.0))
{
continue; // fdo#75118 do not paint zero-width lines
}
commit c96da60124652bac4bd8d2ebf18be67e1365d89d
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 20 12:05:52 2014 +0100
svx::frame::Style::Set(): typo: subtract if it's _not_ 0
(regression from 2c91cb08d65cd35fa8ef6eaca3677aa82fb58cbe)
Change-Id: I9803b630067de26503fceb32b5d7c6a46f352a7a
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index b220a08..52a992f 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -1229,7 +1229,7 @@ void Style::Set( const SvxBorderLine rBorder, double
fScale, sal_uInt16 nMaxWid
// Still too thick? Decrease the line widths.
if( GetWidth() nMaxWidth )
{
-if (rtl::math::approxEqual(mfPrim, 0.0)
rtl::math::approxEqual(mfPrim, mfSecn))
+if (!rtl::math::approxEqual(mfPrim, 0.0)
rtl::math::approxEqual(mfPrim, mfSecn))
{
// Both lines equal - decrease both to keep symmetry.
--mfPrim;
commit 474b2ff232591442fb22363c82abc66e7e2101a0
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 20 11:51:43 2014 +0100
svx: these Style members are floats
Change-Id: Id1a5e363c8c39b3ad9e61f9b914461d15f5c3028
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index afae83e..b8f2bfc 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -124,14 +124,14 @@ public:
inline const Color GetColorSecn() const { return maColorSecn; }
inline const Color GetColorGap() const { return maColorGap; }
inline bool UseGapColor() const { return mbUseGapColor; }
-inline double Prim() const { return mnPrim; }
-inline double Dist() const { return mnDist; }
-inline double Secn() const { return mnSecn; }
+inline double Prim() const { return mfPrim; }
+inline double Dist() const { return mfDist; }
+inline double Secn() const { return mfSecn; }
double Scale() const;
inline editeng::SvxBorderStyle Type() const { return mnType; }
/** Returns the total width of this frame style. */
-inline double GetWidth() const { return mnPrim + mnDist + mnSecn; }
+inline double GetWidth() const { return mfPrim + mfDist + mfSecn; }
/** Sets the frame style to invisible state. */
voidClear();
@@ -165,9 +165,9 @@ private:
Color maColorGap;
boolmbUseGapColor;
RefMode meRefMode; /// Reference point handling for this
frame border.
-double mnPrim; /// Width of primary (single, left, or
top) line.
-double mnDist; /// Distance between primary and secondary
line.
-double mnSecn; /// Width of secondary (right or bottom)
line.
+double mfPrim; /// Width of primary (single, left, or
top) line.
+double mfDist; /// Distance between primary and secondary
line.
+double mfSecn; /// Width of secondary (right or bottom)
line.
double mfScale;
editeng::SvxBorderStyle mnType;
};
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 8268374..b220a08 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -1176,16 +1176,16 @@ void Style::Clear()
void Style::Set( double nP, double nD, double nS )
{
-/* nP nD nS - mnPrim mnDist mnSecn
+/* nP nD nS - mfPrim mfDist mfSecn
--
any any 0 nP 0 0
0 any 0 nS 0 0
0 0 0 nP 0 0
0 0 0 nP nD
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/tool/interpr6.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b8365f8649251298e2ba6a3a0109620b5586e172 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Feb 20 00:28:06 2014 -0500 fdo#75228: We still need to get the value only to pop value from the stack. Change-Id: Iad231aa97ed35f91b96cddf8157ebcd9af0f8ec9 (cherry picked from commit 9e183fbfdbfbe364d17f9d36a0b33d2fae89862d) Reviewed-on: https://gerrit.libreoffice.org/8141 Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index f404561..a32b3c1 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -891,6 +891,7 @@ void ScInterpreter::ScCount() } break; case svDouble: +GetDouble(); nCount++; nFuncFmtType = NUMBERFORMAT_NUMBER; break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 77d63291ceaf147b19bcddd0f0912045be00314f Author: Andras Timar andras.ti...@collabora.com Date: Thu Feb 20 14:33:45 2014 +0100 Updated core Project: help db935b234688a7d4690246e48530c3d3f99b5fe3 diff --git a/helpcontent2 b/helpcontent2 index d7a2903..db935b2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d7a29031adf51b1ae5eee7cbeb4ff4f33c6e5675 +Subproject commit db935b234688a7d4690246e48530c3d3f99b5fe3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: upload-wiki.pl
upload-wiki.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit db935b234688a7d4690246e48530c3d3f99b5fe3
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Feb 20 14:33:45 2014 +0100
use 'unless' instead of 'if'
Change-Id: Ie40681e6f7097a1d9b2935e238cfb0ecfb840db4
diff --git a/upload-wiki.pl b/upload-wiki.pl
index 58de4fb..a42d809 100755
--- a/upload-wiki.pl
+++ b/upload-wiki.pl
@@ -136,7 +136,7 @@ sub upload_article {
RETRY:
print Uploading page '$pagename'\n;
-if ( $mw-edit( {
+unless ( $mw-edit( {
action = 'edit',
title = $pagename,
text = $text }, { skip_encoding = 1 } ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 10 +- source/text/schart/01/0301.xhp | 21 ++--- 2 files changed, 11 insertions(+), 20 deletions(-) New commits: commit b789fc2c930c10d8a9ac60e7b92680fde990209c Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 20 13:37:15 2014 + update help ids for chart data source dialog .ui conversion Change-Id: I6e51547a0e2496ea073609d729a5ccff2bfc0479 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 4af0655..1c347d5 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2948,7 +2948,6 @@ HID_RPT_VERT_SCROLLBAR,64459, HID_RUBY_DIALOG,34187, HID_SCDLG_CONFLICTS,59023, HID_SCH_CHART_AUTO_FORMAT,63324, -HID_SCH_CTL_DATA,63290, HID_SCH_CTL_TYPE,63293, HID_SCH_CTL_VARIANT,63294, HID_SCH_CT_INDICATE,63291, @@ -2964,14 +2963,7 @@ HID_SCH_STATISTIK_BIGERROR,63349, HID_SCH_STATISTIK_BIGERROR_VALUE,63352, HID_SCH_STATISTIK_MEANVALUE,63344, HID_SCH_STATISTIK_PERCENT_VALUE,63351, -HID_SCH_TBI_DATA_DELETE_COL,63306, -HID_SCH_TBI_DATA_DELETE_ROW,63305, -HID_SCH_TBI_DATA_INSERT_COL,63304, -HID_SCH_TBI_DATA_INSERT_ROW,63303, -HID_SCH_TBI_DATA_SWAP_COL,63307, -HID_SCH_TBI_DATA_SWAP_ROW,63308, -HID_SCH_TBX_DATA,63314, -HID_SCH_TEXTDIRECTION_EQUATION,63397, +eID_SCH_TEXTDIRECTION_EQUATION,63397, HID_SCH_TITLE_X,63362, HID_SCH_TITLE_Y,63363, HID_SCH_TITLE_Z,63364, diff --git a/source/text/schart/01/0301.xhp b/source/text/schart/01/0301.xhp index 0ce5328..5831faa 100644 --- a/source/text/schart/01/0301.xhp +++ b/source/text/schart/01/0301.xhp @@ -30,7 +30,9 @@ /meta body section id=diagrammdaten -bookmark xml-lang=en-US branch=hid/.uno:DiagramData id=bm_id3153771 localize=false/paragraph role=heading id=hd_id3150869 xml-lang=en-US level=1 l10n=CHG oldref=1link href=text/schart/01/0301.xhp name=Data TableData Table/link/paragraph +bookmark xml-lang=en-US branch=hid/.uno:DiagramData id=bm_id3153771 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/chartdatadialog/ChartDataDialog id=bm_id3153772 localize=false/ +paragraph role=heading id=hd_id3150869 xml-lang=en-US level=1 l10n=CHG oldref=1link href=text/schart/01/0301.xhp name=Data TableData Table/link/paragraph paragraph role=paragraph id=par_id3151115 xml-lang=en-US l10n=CHG oldref=2ahelp hid=.uno:DiagramDataOpens theemph Data Table /emphdialog where you can edit the chart data./ahelp/paragraph /section paragraph role=paragraph id=par_id3149667 xml-lang=en-US l10n=CHG oldref=51Theemph Data Table /emphdialog is not available if you insert a chart that is based on a Calc sheet or on a Writer table.commentUFI: fixes #i31208#/comment/paragraph @@ -69,16 +71,13 @@ paragraph role=paragraph id=par_id9116794 xml-lang=en-US l10n=CHGThe order of the categories or data points in the chart is the same as in the data table. Use the emphMove Row Down/emph icon to switch the current row with its neighbor below./paragraph /listitem /list -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_INSERT_ROW id=bm_id3154022 localize=false/commentinsert row/commentparagraph role=paragraph id=par_id3150297 xml-lang=en-US l10n=U oldref=20ahelp hid=. visibility=hiddenInserts a new row below the current row./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_INSERT_COL id=bm_id3152988 localize=false/commentinsert series/commentparagraph role=paragraph id=par_id3145384 xml-lang=en-US l10n=U oldref=23ahelp hid=. visibility=hiddenInserts a new data series after the current column./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL id=bm_id3156022 localize=false/commentinsert text column/commentparagraph role=paragraph id=par_id3152297 xml-lang=en-USahelp hid=. visibility=hiddenInserts a new text column after the current column for hierarchical axes descriptions./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_DELETE_ROW id=bm_id3150215 localize=false/commentdelete row/commentparagraph role=paragraph id=par_id3159231 xml-lang=en-US l10n=U oldref=26ahelp hid=. visibility=hiddenDeletes the current row. It is not possible to delete the label row./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_DELETE_COL id=bm_id3153959 localize=false/commentdelete series/commentparagraph role=paragraph id=par_id3153336 xml-lang=en-US l10n=U oldref=29ahelp hid=. visibility=hiddenDeletes the current series or text column. It is not possible to delete the first text column./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_SWAP_COL id=bm_id8501846 localize=false/commentmove series right/commentparagraph role=paragraph id=par_id4089175 xml-lang=en-US l10n=CHGahelp hid=. visibility=hiddenSwitches the current column with its neighbor at the right./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_TBI_DATA_SWAP_ROW id=bm_id4469130
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d390eafb98af602065fea291e67bb457ded79045 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 20 13:37:15 2014 + Updated core Project: help b789fc2c930c10d8a9ac60e7b92680fde990209c diff --git a/helpcontent2 b/helpcontent2 index db935b2..b789fc2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit db935b234688a7d4690246e48530c3d3f99b5fe3 +Subproject commit b789fc2c930c10d8a9ac60e7b92680fde990209c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk sc/source svx/source vcl/source
chart2/AllLangResTarget_chartcontroller.mk |1
chart2/UIConfig_chart2.mk|1
chart2/source/controller/dialogs/DataBrowser.cxx | 98 +++---
chart2/source/controller/dialogs/DataBrowser.hxx |2
chart2/source/controller/dialogs/dlg_DataEditor.cxx | 174 ---
chart2/source/controller/dialogs/dlg_DataEditor.hrc | 38 --
chart2/source/controller/dialogs/dlg_DataEditor.src | 132
chart2/source/controller/inc/HelpIds.hrc | 11
chart2/source/controller/inc/dlg_DataEditor.hxx | 24 -
chart2/uiconfig/ui/chartdatadialog.ui| 298 +++
sc/source/filter/xml/xmlcelli.cxx|2
sc/source/filter/xml/xmlfilti.cxx|1
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |5
vcl/source/window/builder.cxx|9
14 files changed, 458 insertions(+), 338 deletions(-)
New commits:
commit b0cf499b3ebeee66ca96dc4dc2310a198da0f2fc
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 20 08:57:22 2014 +
convert chart data dialog to .ui
this one was a complete pig to convert with the
conflicting home-grown existing layout code.
Change-Id: I135bd486d10f7d972e143daae44d6b24a6e8fdb8
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index fd12cb7..5f6126d 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
))
$(eval $(call gb_SrsTarget_add_files,chart2/res,\
-chart2/source/controller/dialogs/dlg_DataEditor.src \
chart2/source/controller/dialogs/res_BarGeometry.src \
chart2/source/controller/dialogs/Strings_AdditionalControls.src \
chart2/source/controller/dialogs/Strings_ChartTypes.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 515ddf0..b9a728c 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/3dviewdialog \
chart2/uiconfig/ui/attributedialog \
chart2/uiconfig/ui/chardialog \
+ chart2/uiconfig/ui/chartdatadialog \
chart2/uiconfig/ui/charttypedialog \
chart2/uiconfig/ui/datarangedialog \
chart2/uiconfig/ui/dlg_DataLabel \
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 0a9c1d1..6836e8f 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -39,6 +39,7 @@
#include vcl/fixed.hxx
#include vcl/image.hxx
+#include vcl/layout.hxx
#include vcl/msgbox.hxx
#include rtl/math.hxx
@@ -118,7 +119,9 @@ SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) :
Edit( pParent ),
m_nStartColumn( 0 ),
m_bShowWarningBox( false )
-{}
+{
+SetHelpId(HID_SCH_DATA_SERIES_LABEL);
+}
SeriesHeaderEdit::~SeriesHeaderEdit()
{}
@@ -150,7 +153,7 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent
rMEvt )
class SeriesHeader
{
public:
-explicit SeriesHeader( Window * pParent );
+explicit SeriesHeader(Window * pParent, Window *pColorParent);
void SetColor( const Color rCol );
void SetPos( const Point rPos );
@@ -160,7 +163,6 @@ public:
void SetSeriesName( const OUString rName );
void SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol );
-void SetPixelPosX( sal_Int32 nPos );
void SetPixelWidth( sal_Int32 nWidth );
sal_Int32 GetStartColumn() const;
@@ -169,6 +171,7 @@ public:
static sal_Int32 GetRelativeAppFontXPosForNameField();
void Show();
+void Hide();
/** call this before destroying the class. This notifies the listeners to
changes of the edit field for the series name.
@@ -203,10 +206,10 @@ private:
bool m_bSeriesNameChangePending;
};
-SeriesHeader::SeriesHeader( Window * pParent ) :
+SeriesHeader::SeriesHeader( Window * pParent, Window *pColorParent ) :
m_spSymbol( new FixedImage( pParent, WB_NOBORDER )),
m_spSeriesName( new SeriesHeaderEdit( pParent )),
-m_spColorBar( new FixedText( pParent, WB_NOBORDER )),
+m_spColorBar( new FixedText( pColorParent, WB_NOBORDER )),
m_pDevice( pParent ),
m_nStartCol( 0 ),
m_nEndCol( 0 ),
@@ -255,29 +258,32 @@ void SeriesHeader::SetPos( const Point rPos )
m_aPos = rPos;
// chart type symbol
-Point aPos( rPos );
-aPos.setY( aPos.getY() + nSymbolDistance );
Size aSize( nSymbolHeight, nSymbolHeight );
-m_spSymbol-SetPosPixel( m_pDevice-LogicToPixel( aPos, MAP_APPFONT ));
-m_spSymbol-SetSizePixel( m_pDevice-LogicToPixel( aSize, MAP_APPFONT ));
-aPos.setY( aPos.getY() - nSymbolDistance );
+aSize =
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1e/403aa7bbfe0353db3d8f02dba5d29ba5876f4d
1e/403aa7bbfe0353db3d8f02dba5d29ba5876f4d |1 + 1 file changed, 1 insertion(+) New commits: commit 6926f2458995ae5a1e968fd8c6b7e1c1c7b88ecb Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 20 13:50:32 2014 + Notes added by 'git notes add' diff --git a/1e/403aa7bbfe0353db3d8f02dba5d29ba5876f4d b/1e/403aa7bbfe0353db3d8f02dba5d29ba5876f4d new file mode 100644 index 000..aad02d0 --- /dev/null +++ b/1e/403aa7bbfe0353db3d8f02dba5d29ba5876f4d @@ -0,0 +1 @@ +merged as: 15ddc6aacc3124a3b1f7cc83151f85d942c85ec5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/core/layout/paintfrm.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 1639e174ebb3945f4fda08c30f535f98d3e54d7e
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 19 21:46:11 2014 +0100
fdo#75118: sw: do not paint zero-width lines
Since commit 6a3fb868b2b8af21f7b6140424b6f8377599a786 zero-width
BorderLinePrimitive2D will actually be painted as hairlines by
VclPixelProcessor2D::tryDrawBorderLinePrimitive2DDirect(), so don't
create such pointless primitives.
(cherry picked from commit 128d3d51c208ec5c37a105ea5c751530bd017d4b)
fdo#75118: actually these are floats, compare with approxEqual
(cherry picked from commit 9fb9fc301502c2762ad4a8059d8d1c818d2843db)
Change-Id: I4c2404b73f106156b83a6d72efa3c8991e5d659e
Reviewed-on: https://gerrit.libreoffice.org/8144
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index ba57797..54de397 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2474,8 +2474,8 @@ void SwTabFrmPainter::PaintLines( OutputDevice rDev,
const SwRect rRect ) cons
break;
const SwLineEntrySet rEntrySet = (*aIter).second;
-SwLineEntrySetConstIter aSetIter = rEntrySet.begin();
-while ( aSetIter != rEntrySet.end() )
+for (SwLineEntrySetConstIter aSetIter = rEntrySet.begin();
+ aSetIter != rEntrySet.end(); ++aSetIter)
{
const SwLineEntry rEntry = *aSetIter;
const svx::frame::Style rEntryStyle( (*aSetIter).maAttribute );
@@ -2608,6 +2608,12 @@ void SwTabFrmPainter::PaintLines( OutputDevice rDev,
const SwRect rRect ) cons
aPaintStart.Y() -= nTwipYCorr;
aPaintEnd.Y() -= nTwipYCorr;
+if (::rtl::math::approxEqual(aStyles[0].Prim(), 0.0)
+::rtl::math::approxEqual(aStyles[0].Secn(), 0.0))
+{
+continue; // fdo#75118 do not paint zero-width lines
+}
+
// Here comes the painting stuff: Thank you, DR, great job!!!
if ( bHori )
{
@@ -2642,8 +2648,6 @@ void SwTabFrmPainter::PaintLines( OutputDevice rDev,
const SwRect rRect ) cons
);
}
}
-
-++aSetIter;
}
++aIter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/wrapper/wrapper.cxx | 39 +++--
1 file changed, 5 insertions(+), 34 deletions(-)
New commits:
commit 7f8e7741194d85e97f6cd6ce54235e735c883aa0
Author: Vort vv...@yandex.ru
Date: Wed Feb 19 11:43:08 2014 +0200
fdo#75195 PDF import: Revert commit 128adf7e5c06fff378c8d72b44ec4be1e462984f
Change-Id: Icb03088809e57a388317f98046f9de3197772a41
Reviewed-on: https://gerrit.libreoffice.org/8126
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 03eb945..e4cde03 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -140,8 +140,6 @@ class Parser
sal_Int32m_nNextToken;
sal_Int32m_nCharIndex;
-const double minAreaThreshold;
-const double minLineWidth;
OString readNextToken();
void readInt32( sal_Int32 o_Value );
@@ -151,7 +149,7 @@ class Parser
double readDouble();
void readBinaryData( uno::Sequencesal_Int8 rBuf );
-uno::Referencerendering::XPolyPolygon2D readPath( double* );
+uno::Referencerendering::XPolyPolygon2D readPath();
void readChar();
void readLineCap();
@@ -184,9 +182,7 @@ public:
m_aLine(),
m_aFontMap(101),
m_nNextToken(-1),
-m_nCharIndex(-1),
-minAreaThreshold( 300.0 ),
-minLineWidth( 12 )
+m_nCharIndex(-1)
{}
void parseLine( const OString rLine );
@@ -293,7 +289,7 @@ void Parser::readBinaryData( uno::Sequencesal_Int8 rBuf )
OSL_PRECOND(nRes==osl_File_E_None, inconsistent data);
}
-uno::Referencerendering::XPolyPolygon2D Parser::readPath( double* pArea =
NULL )
+uno::Referencerendering::XPolyPolygon2D Parser::readPath()
{
const OString aSubPathMarker( subpath );
@@ -353,15 +349,6 @@ uno::Referencerendering::XPolyPolygon2D
Parser::readPath( double* pArea = NULL
readNextToken();
}
-if( pArea )
-{
-basegfx::B2DRange aRange( aResult.getB2DRange() );
-if( aRange.getWidth() = minLineWidth || aRange.getHeight() =
minLineWidth)
-*pArea = 0.0;
-else
-*pArea = aRange.getWidth() * aRange.getHeight();
-}
-
return static_castrendering::XLinePolyPolygon2D*(
new basegfx::unotools::UnoPolyPolygon(aResult));
}
@@ -841,25 +828,9 @@ void Parser::parseLine( const OString rLine )
case EOCLIPPATH:
m_pSink-intersectEoClip(readPath()); break;
case EOFILLPATH:
-{
-double area = 0.0;
-uno::Referencerendering::XPolyPolygon2D path = readPath( area );
-m_pSink-eoFillPath(path);
-// if area is smaller than required, add borders.
-if(area minAreaThreshold)
-m_pSink-strokePath(path);
-}
-break;
+m_pSink-eoFillPath(readPath()); break;
case FILLPATH:
-{
-double area = 0.0;
-uno::Referencerendering::XPolyPolygon2D path = readPath( area );
-m_pSink-fillPath(path);
-// if area is smaller than required, add borders.
-if(area minAreaThreshold)
-m_pSink-strokePath(path);
-}
-break;
+m_pSink-fillPath(readPath()); break;
case RESTORESTATE:
m_pSink-popState(); break;
case SAVESTATE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/Package_gallbullets.mk
extras/Package_gallbullets.mk | 30 ++ 1 file changed, 30 insertions(+) New commits: commit d8680de7012fb92a393066c957f82e1473b60575 Author: Maxim Monastirsky momonas...@gmail.com Date: Wed Feb 19 01:09:21 2014 +0200 Add missing files to gallery bullets makefile They are used in Bullets Numbering dialog, and in sidebar Bullets popup. Change-Id: I543cad1108f8c45cc3dcc56a0c42fda2fbeb5467 Reviewed-on: https://gerrit.libreoffice.org/8125 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk index 296250c..d152336 100644 --- a/extras/Package_gallbullets.mk +++ b/extras/Package_gallbullets.mk @@ -10,6 +10,36 @@ $(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets)) $(eval $(call gb_Package_add_files,extras_gallbullets,$(LIBO_SHARE_FOLDER)/gallery/bullets,\ + Bullet01-Circle-DarkRed.svg \ + Bullet02-Circle-Blue.svg \ + Bullet03-Circle-Green.svg \ + Bullet04-Square-Black.svg \ + Bullet05-Square-Orange.svg \ + Bullet06-Square-Purple.svg \ + Bullet07-Diamond-Blue.svg \ + Bullet08-Diamond-LightBlue.svg \ + Bullet09-Diamond-Red.svg \ + Bullet10-Star-Yellow.svg \ + Bullet11-Star-Blue.svg \ + Bullet12-Triangle-Blue.svg \ + Bullet13-Triangle-DarkGreen.svg \ + Bullet14-Arrow-Red.svg \ + Bullet15-Arrow-Blue.svg \ + Bullet16-Box-Blue.svg \ + Bullet17-Box-Red.svg \ + Bullet18-Asterisk-LightBlue.svg \ + Bullet19-Leaves-Red.svg \ + Bullet20-Target-Blue.svg \ + Bullet21-Arrow-Blue.svg \ + Bullet22-Arrow-DarkBlue.svg \ + Bullet23-Arrow-Brown.svg \ + Bullet24-Flag-Red.svg \ + Bullet25-Flag-Green.svg \ + Bullet26-X-Red.svg \ + Bullet27-X-Black.svg \ + Bullet28-Checkmark-Green.svg \ + Bullet29-Checkmark-Blue.svg \ + Bullet30-Square-DarkRed.svg \ blkpearl.gif \ bluarrow.gif \ bluball.gif \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Ed Barnat e...@amgeek.com changed: What|Removed |Added Version|4.2.0.3 rc |4.2.0.4 release --- Comment #99 from Ed Barnat e...@amgeek.com --- Problem description: Steps to reproduce: 1. open a LibO (writer) document. Copy and paste from within that LibO (writer) document to within that LibO document. 2. Open a web page or non-LibO document and copy web page text or url 3. Past that text/url into the still open LibO (writer) document Current behavior: The copied text from step 1 is pasted into the document Expected behavior: The copied text from the web page/non-LibO document should be pasted into the document. Current work around is to close all LibO documents, which clears the LibO clipboard. Re-open the LibO document and paste before doing any cut/copy from within LibO Previously reported in Bug 62196 which does not appear in current known bug list. Also see running issue in OpenOffice https://forum.openoffice.org/en/forum/viewtopic.php?f=7t=60299 Successfully submited now as bug 70200 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 75228, which changed state. Bug 75228 Summary: FUNCTION COUNT https://bugs.freedesktop.org/show_bug.cgi?id=75228 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Version|4.2.0.4 release |4.2.0.0.alpha0+ Master --- Comment #100 from tommy27 ba...@quipo.it --- @Ed Barnat please do not discuss unrelated bugs here and do not change version field. this is the list for MOST ANNOYING BUGS of the 4.2.x branch. bugs about other branches have no place here. -- 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
Reboot of Gerrit/Jenkins/Ask
Hi, due to necessary security updates of the VM host gerrit/jenkins/ask are located on, there will be a short outage of these services around 20:00 UTC. Sorry for the inconveniences, Alex -- Alexander Werner a...@documentfoundation.org Admin Team of The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 Berlin Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Message signed with OpenPGP using GPGMail ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 +++---
sw/source/filter/ww8/docxsdrexport.cxx|4 ++--
writerfilter/source/dmapper/GraphicImport.cxx | 26 ++
3 files changed, 19 insertions(+), 17 deletions(-)
New commits:
commit c2485b4c38a574416dc3948fec85b0232109eb61
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Feb 20 16:32:23 2014 +0100
DOCX export: handle wp14:sizeRelH/V relativeFrom=margin for shapes
Change-Id: I913fe328376a246bf410512c4cfb018fc573094b
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1a83cf7..dc434a3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2303,8 +2303,8 @@ DECLARE_OOXMLEXPORT_TEST(testDmlShapeRelsize,
dml-shape-relsize.docx)
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
if (!pXmlDoc)
return;
-// Relative size wasn't exported at all.
-assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH,
relativeFrom, page);
+// Relative size wasn't exported all, then relativeFrom was page, not
margin.
+assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH,
relativeFrom, margin);
}
DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeRelsize,
dml-groupshape-relsize.docx)
@@ -2313,7 +2313,7 @@ DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeRelsize,
dml-groupshape-relsize.docx
if (!pXmlDoc)
return;
// Relative size wasn't imported.
-assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH,
relativeFrom, page);
+assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH,
relativeFrom, margin);
}
DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeParaspacing,
dml-groupshape-paraspacing.docx)
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 1211ef3..170be93 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -491,7 +491,7 @@ void DocxSdrExport::Impl::writeDMLDrawing(const SdrObject*
pSdrObject, const SwF
{
// At the moment drawinglayer objects are always relative from page.
pFS-startElementNS(XML_wp14, XML_sizeRelH,
-XML_relativeFrom, page,
+XML_relativeFrom,
(pSdrObject-GetRelativeWidthRelation() == text::RelOrientation::FRAME ?
margin : page),
FSEND);
pFS-startElementNS(XML_wp14, XML_pctWidth, FSEND);
pFS-writeEscaped(OUString::number(*pSdrObject-GetRelativeWidth() *
100 * oox::drawingml::PER_PERCENT));
@@ -501,7 +501,7 @@ void DocxSdrExport::Impl::writeDMLDrawing(const SdrObject*
pSdrObject, const SwF
if (pSdrObject-GetRelativeHeight())
{
pFS-startElementNS(XML_wp14, XML_sizeRelV,
-XML_relativeFrom, page,
+XML_relativeFrom,
(pSdrObject-GetRelativeHeightRelation() == text::RelOrientation::FRAME ?
margin : page),
FSEND);
pFS-startElementNS(XML_wp14, XML_pctHeight, FSEND);
pFS-writeEscaped(OUString::number(*pSdrObject-GetRelativeHeight() *
100 * oox::drawingml::PER_PERCENT));
commit 418800e2e8d6b2c1b2723a7b066aca27abe8f5f8
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Feb 20 15:36:57 2014 +0100
DOCX import: handle wp14:sizeRelH/V relativeFrom=margin
No explicit code for this was necessary in case for TextFrames, but for
drawinglayer shapes the default is relativeFrom=page. To keep things
simpler, just always set these, regardless what the LO default is.
Change-Id: I9f651d7cce4a12ce7f545e42656b92d078a74327
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 2009bf5..3bccb1c 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -754,16 +754,17 @@ void GraphicImport::lcl_attribute(Id nName, Value val)
switch (nIntValue)
{
case NS_ooxml::LN_ST_SizeRelFromH_margin:
+if (m_xShape.is())
+{
+uno::Referencebeans::XPropertySet
xPropertySet(m_xShape, uno::UNO_QUERY);
+
xPropertySet-setPropertyValue(RelativeWidthRelation,
uno::makeAny(text::RelOrientation::FRAME));
+}
break;
case NS_ooxml::LN_ST_SizeRelFromH_page:
if (m_xShape.is())
{
-uno::Referencelang::XServiceInfo
xServiceInfo(m_xShape, uno::UNO_QUERY_THROW);
-if
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/subsequent_export-test.cxx | 89 +
sc/qa/unit/subsequent_filters-test.cxx | 69 -
sc/source/filter/excel/xestyle.cxx |8 +-
3 files changed, 93 insertions(+), 73 deletions(-)
New commits:
commit 1c1f42fdbad774cae7c45a7f8d60b9af766dee0a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 20 11:27:32 2014 -0500
fdo#75130: Export cell borders to xls and xlsx correctly.
Change-Id: Ic629fb4852d2ada9724dfee7618e2436c0fa28a8
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index f4f8ffc..c753228 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1570,18 +1570,18 @@ void lclGetBorderLine(
switch (pLine-GetBorderLineStyle())
{
case table::BorderLineStyle::DASHED:
+case table::BorderLineStyle::FINE_DASHED:
rnXclLine = EXC_LINE_DASHED;
break;
case table::BorderLineStyle::DOTTED:
rnXclLine = EXC_LINE_DOTTED;
break;
-case table::BorderLineStyle::FINE_DASHED:
-rnXclLine = EXC_LINE_HAIR;
-break;
default:
break;
}
}
+else if (nOuterWidth = EXC_BORDER_HAIR)
+rnXclLine = EXC_LINE_HAIR;
else
rnXclLine = EXC_LINE_NONE;
}
@@ -1726,7 +1726,7 @@ static const char* ToLineStyle( sal_uInt8 nLineStyle )
case EXC_LINE_HAIR: return hair;
case EXC_LINE_DOTTED: return dotted;
case EXC_LINE_DASHED: return dashed;
-case EXC_LINE_MEDIUMDASHED: return mediumdashed;
+case EXC_LINE_MEDIUMDASHED: return mediumDashed;
}
return *unknown*;
}
commit 6d5270dab5c8ea8bae1ac3462aa5f6768f7d2c8f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 20 11:26:38 2014 -0500
fdo#75130: Move these tests to the export test and test their export.
Change-Id: Ia6a155f12e3b50c5841211d32e0f8ff2de2bc9c8
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 26fc12a..e834ca6 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -42,6 +42,9 @@
#include editeng/editobj.hxx
#include editeng/section.hxx
#include editeng/crossedoutitem.hxx
+#include editeng/borderline.hxx
+
+#include com/sun/star/table/BorderLineStyle.hpp
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -79,6 +82,9 @@ public:
void testFormulaReferenceXLS();
void testSheetProtectionXLSX();
+void testCellBordersXLS();
+void testCellBordersXLSX();
+
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
#if !defined(MACOSX) !defined(DRAGONFLY)
@@ -100,10 +106,14 @@ public:
CPPUNIT_TEST(testEmbeddedChartXLS);
CPPUNIT_TEST(testFormulaReferenceXLS);
CPPUNIT_TEST(testSheetProtectionXLSX);
+CPPUNIT_TEST(testCellBordersXLS);
+CPPUNIT_TEST(testCellBordersXLSX);
CPPUNIT_TEST_SUITE_END();
private:
+void testExcelCellBorders( sal_uLong nFormatType );
+
uno::Referenceuno::XInterface m_xCalcComponent;
};
@@ -991,6 +1001,85 @@ void ScExportTest::testSheetProtectionXLSX()
xDocSh-DoClose();
}
+namespace {
+
+const char* toBorderName( sal_Int16 eStyle )
+{
+switch (eStyle)
+{
+case table::BorderLineStyle::SOLID: return SOLID;
+case table::BorderLineStyle::DOTTED: return DOTTED;
+case table::BorderLineStyle::DASHED: return DASHED;
+case table::BorderLineStyle::DOUBLE: return DOUBLE;
+case table::BorderLineStyle::FINE_DASHED: return FINE_DASHED;
+default:
+;
+}
+
+return ;
+}
+
+}
+
+void ScExportTest::testExcelCellBorders( sal_uLong nFormatType )
+{
+ScDocShellRef xDocSh = loadDoc(cell-borders., nFormatType);
+
+CPPUNIT_ASSERT_MESSAGE(Failed to load file, xDocSh.Is());
+ScDocument* pDoc = xDocSh-GetDocument();
+
+struct
+{
+SCROW mnRow;
+sal_Int16 mnStyle;
+long mnWidth;
+} aChecks[] = {
+{ 1, table::BorderLineStyle::SOLID,1L }, // hair
+{ 3, table::BorderLineStyle::DOTTED, 15L }, // thin
+{ 9, table::BorderLineStyle::FINE_DASHED, 15L }, // dashed
+{ 11, table::BorderLineStyle::SOLID, 15L }, // thin
+{ 19, table::BorderLineStyle::DASHED, 35L }, // medium dashed
+{ 21, table::BorderLineStyle::SOLID, 35L }, // medium
+{ 23, table::BorderLineStyle::SOLID, 50L }, // thick
+{ 25, table::BorderLineStyle::DOUBLE, -1L }, // double (don't
check width)
+};
+
+for (size_t i = 0; i SAL_N_ELEMENTS(aChecks); ++i)
+{
+const editeng::SvxBorderLine* pLine = NULL;
+
[Libreoffice-commits] core.git: 7 commits - oox/source writerfilter/CustomTarget_source.mk writerfilter/Library_writerfilter.mk writerfilter/source
oox/source/token/namespaces.txt|2
oox/source/token/tokens.txt|2
writerfilter/CustomTarget_source.mk|1
writerfilter/Library_writerfilter.mk |1
writerfilter/source/dmapper/DomainMapper.cxx | 19 +
writerfilter/source/dmapper/PropertyIds.cxx|1
writerfilter/source/dmapper/PropertyIds.hxx|1
writerfilter/source/dmapper/TextEffectsHandler.cxx | 226
writerfilter/source/dmapper/TextEffectsHandler.hxx | 52
writerfilter/source/ooxml/model.xml| 232 -
10 files changed, 534 insertions(+), 3 deletions(-)
New commits:
commit 6e157dc78d495d94948e33822405addb48467e74
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Thu Feb 20 17:46:18 2014 +0100
writerfilter: Write w14:glow and subelements into a CharGrabBag
TextEffectsHandler is responsible to add all subelements
(using nesting of Sequence and Property objects) of text
effects (like w14:glow) into a CharGrabBag.
Change-Id: Ie011a059b905b7cd43528dd7d40be186c4fc4229
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 855f013..592970e 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -122,6 +122,7 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/TDefTableHandler \
writerfilter/source/dmapper/TablePositionHandler \
writerfilter/source/dmapper/TablePropertiesHandler \
+writerfilter/source/dmapper/TextEffectsHandler \
writerfilter/source/dmapper/TblStylePrHandler \
writerfilter/source/dmapper/ThemeTable \
writerfilter/source/dmapper/WrapPolygonHandler \
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 3ac0ac3..9d8754a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -62,6 +62,7 @@
#include comphelper/storagehelper.hxx
#include filter/msfilter/util.hxx
+#include TextEffectsHandler.hxx
#include CellColorHandler.hxx
#include SectionColumnHandler.hxx
#include GraphicHelpers.hxx
@@ -2340,6 +2341,24 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_tblEnd:
m_pImpl-m_nTableDepth--;
break;
+case NS_ooxml::LN_glow_glow:
+{
+writerfilter::ReferenceProperties::Pointer_t pProperties =
rSprm.getProps();
+if( pProperties.get())
+{
+TextEffectsHandlerPtr pTextEffectsHandlerPtr( new
TextEffectsHandler );
+sal_Bool bEnableTempGrabBag =
!pTextEffectsHandlerPtr-isInteropGrabBagEnabled();
+if( bEnableTempGrabBag )
+pTextEffectsHandlerPtr-enableInteropGrabBag( glow );
+
+pProperties-resolve(*pTextEffectsHandlerPtr);
+
+rContext-Insert(PROP_CHAR_GLOW_TEXT_EFFECT,
pTextEffectsHandlerPtr-getInteropGrabBag().Value, true, CHAR_GRAB_BAG);
+if(bEnableTempGrabBag)
+pTextEffectsHandlerPtr-disableInteropGrabBag();
+}
+}
+break;
default:
{
#ifdef DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 9ae0d50..ce007e2 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -376,6 +376,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId )
const
case PROP_TOC_NEW_LINE: sName = TOCNewLine; break;
case PROP_TOC_PARAGRAPH_OUTLINE_LEVEL : sName =
TOCParagraphOutlineLevel; break;
case PROP_CHAR_THEME_COLOR_TINT : sName =
CharThemeColorTint; break;
+case PROP_CHAR_GLOW_TEXT_EFFECT : sName =
CharGlowTextEffect; break;
}
::std::pairPropertyNameMap_t::iterator,bool aInsertIt =
m_pImpl-aNameMap.insert( PropertyNameMap_t::value_type( eId,
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index ce2459c..c8155b1 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -347,6 +347,7 @@ enum PropertyIds
,PROP_TOC_NEW_LINE
,PROP_TOC_PARAGRAPH_OUTLINE_LEVEL
,PROP_CHAR_THEME_COLOR_TINT
+,PROP_CHAR_GLOW_TEXT_EFFECT
};
struct PropertyNameSupplier_Impl;
class PropertyNameSupplier
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx
b/writerfilter/source/dmapper/TextEffectsHandler.cxx
new file mode 100644
index 000..6596a35
--- /dev/null
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -0,0 +1,226 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/filter/excel/xestyle.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 073e782c5ff58a18d93c99fb1a3d9642d52d023d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 20 11:27:32 2014 -0500
fdo#75130: Export cell borders to xls and xlsx correctly.
Change-Id: Ic629fb4852d2ada9724dfee7618e2436c0fa28a8
(cherry picked from commit 1c1f42fdbad774cae7c45a7f8d60b9af766dee0a)
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 486481a..2851ec4 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1570,18 +1570,18 @@ void lclGetBorderLine(
switch (pLine-GetBorderLineStyle())
{
case table::BorderLineStyle::DASHED:
+case table::BorderLineStyle::FINE_DASHED:
rnXclLine = EXC_LINE_DASHED;
break;
case table::BorderLineStyle::DOTTED:
rnXclLine = EXC_LINE_DOTTED;
break;
-case table::BorderLineStyle::FINE_DASHED:
-rnXclLine = EXC_LINE_HAIR;
-break;
default:
break;
}
}
+else if (nOuterWidth = EXC_BORDER_HAIR)
+rnXclLine = EXC_LINE_HAIR;
else
rnXclLine = EXC_LINE_NONE;
}
@@ -1726,7 +1726,7 @@ static const char* ToLineStyle( sal_uInt8 nLineStyle )
case EXC_LINE_HAIR: return hair;
case EXC_LINE_DOTTED: return dotted;
case EXC_LINE_DASHED: return dashed;
-case EXC_LINE_MEDIUMDASHED: return mediumdashed;
+case EXC_LINE_MEDIUMDASHED: return mediumDashed;
}
return *unknown*;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/annotation-formatting.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 12
writerfilter/source/dmapper/DomainMapper_Impl.cxx|3 +-
writerfilter/source/dmapper/PropertyMap.cxx | 21 ++-
writerfilter/source/dmapper/PropertyMap.hxx |2 -
5 files changed, 30 insertions(+), 8 deletions(-)
New commits:
commit deabda6b38417e4c7037c0d0274a4f81b338e552
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Feb 20 18:25:26 2014 +0100
DOCX import: fix missing underline in comment text
Regression from fb5ee5c9953635a423d3102b901e409d15800096 (sw: Add
support for different grab bags at PropertyMap., 2013-11-29),
PropertyMap::GetPropertyValues() assumed all XTextRange implementations
support the new property, which is not true for at least editeng.
Change-Id: Ib5657be522d30f203cecbbbae74d6594cef984fb
diff --git a/sw/qa/extras/ooxmlimport/data/annotation-formatting.docx
b/sw/qa/extras/ooxmlimport/data/annotation-formatting.docx
new file mode 100755
index 000..87af02b
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/annotation-formatting.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7436e58..acfe4ea 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -13,6 +13,7 @@
#if !defined(WNT)
#include com/sun/star/awt/XBitmap.hpp
+#include com/sun/star/awt/FontUnderline.hpp
#include com/sun/star/awt/FontWeight.hpp
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/document/XEmbeddedObjectSupplier2.hpp
@@ -1869,6 +1870,17 @@ DECLARE_OOXMLIMPORT_TEST(testFloatingTablesAnchor,
floating-tables-anchor.docx
xText.set(xRange-getText(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(Anchor point), xText-getString());
}
+
+DECLARE_OOXMLIMPORT_TEST(testAnnotationFormatting,
annotation-formatting.docx)
+{
+uno::Referencebeans::XPropertySet xTextField = getProperty
uno::Referencebeans::XPropertySet (getRun(getParagraph(2), 2), TextField);
+uno::Referencetext::XText xText = getProperty
uno::Referencetext::XText (xTextField, TextRange);
+// Make sure we test the right annotation.
+uno::Referencetext::XTextRange xParagraph = getParagraphOfText(1, xText,
days);
+// Formatting was lost: the second text portion was NONE, not SINGLE.
+CPPUNIT_ASSERT_EQUAL(awt::FontUnderline::SINGLE,
getPropertysal_Int16(getRun(xParagraph, 1), CharUnderline));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d8237f3..70b7320 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1120,7 +1120,8 @@ void DomainMapper_Impl::appendTextPortion( const
OUString rString, PropertyMapP
{
try
{
-uno::Sequence beans::PropertyValue pValues =
pPropertyMap-GetPropertyValues();
+// If we are in comments, then disable CharGrabBag, comment text
doesn't support that.
+uno::Sequence beans::PropertyValue pValues =
pPropertyMap-GetPropertyValues(/*bCharGrabBag=*/!m_bIsInComments);
sal_Int32 len = pValues.getLength();
if (m_bStartTOC || m_bStartIndex)
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index f90cb20..19d8714 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -60,7 +60,7 @@ PropertyMap::~PropertyMap()
}
-uno::Sequence beans::PropertyValue PropertyMap::GetPropertyValues()
+uno::Sequence beans::PropertyValue PropertyMap::GetPropertyValues(bool
bCharGrabBag)
{
if(!m_aValues.getLength() size())
{
@@ -73,8 +73,14 @@ uno::Sequence beans::PropertyValue
PropertyMap::GetPropertyValues()
else if ( i-second.getGrabBagType() == PARA_GRAB_BAG )
nParaGrabBag++;
}
+
+// In case there are properties to be grab-bagged and we can have a
char grab-bag, allocate one slot for it.
+size_t nCharGrabBagSize = 0;
+if (bCharGrabBag)
+nCharGrabBagSize = nCharGrabBag ? 1 : 0;
+
// If there are any grab bag properties, we need one slot for them.
-m_aValues.realloc( size() - nCharGrabBag + (nCharGrabBag ? 1 : 0)
+m_aValues.realloc( size() - nCharGrabBag + nCharGrabBagSize
- nParaGrabBag + (nParaGrabBag ? 1 : 0));
::com::sun::star::beans::PropertyValue* pValues = m_aValues.getArray();
uno::Sequencebeans::PropertyValue aCharGrabBagValues(nCharGrabBag);
@@ -116,9 +122,12 @@ uno::Sequence beans::PropertyValue
PropertyMap::GetPropertyValues()
{
if (
Would like some help building Android APK that includes the native (jni) library...
Hello. I thought I wrote and asked about this already but now I'm not sure if it worked. We are interested in creating an accessible Android office suite (accessible to blind users). I've been able to build LibreOffice on Linux and also the Android libraries and experimental apps. The problem is that my APK doesn't include the native libraries. The jni directories are empty. If I try to run ndk-build I get the error: /home/kcreasy/ndk/build/core/build-shared-library.mk:23: *** Android NDK: Missing LOCAL_MODULE before including BUILD_SHARED_LIBRARY in jni/Android.mk . Stop. I'm thinking that there is a shared library I just need to add to my project but just don't know which library or where to find it in the overall project. If someone can give me some pointers on how to get this building a runnable APK it would be very helpful. We are interested in contributing and sharing our work toward an Android word processor and perhaps other apps with the community. Regards, Keith -Original Message- From: libreoffice-boun...@lists.freedesktop.org [mailto:libreoffice-boun...@lists.freedesktop.org] On Behalf Of Bjoern Michaelsen Sent: Wednesday, February 19, 2014 10:54 AM To: Christian Lohmaier Cc: libreoffice-dev Subject: Re: interim release 4.2.1 -- branches and outstanding patches On Wed, Feb 19, 2014 at 03:31:45PM +0100, Christian Lohmaier wrote: * release will be done from libreoffice-4-2-2 branch. * everything that is in 4-2-1 branch must be cherry-picked to 4-2-2 branch to be included in the tag/release * cherry-picking from 4-2-1 branch to 4-2-2 branch doesn't require review. understood, that should work, Thanks! Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 12 +-
writerfilter/source/doctok/resources.xmi | 124 -
writerfilter/source/ooxml/model.xml|8 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 -
4 files changed, 13 insertions(+), 137 deletions(-)
New commits:
commit 52b6c17a7ac69fc645ae4e824533e08e3dc5d2f0
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Feb 20 19:03:12 2014 +0100
writerfilter: convert sprm:P{FBiDi,ContextualSpacing,Jc,FrameTextFlow}
Change-Id: Id28eed2ecc177cf0724813dca29bd448f5c51d27
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 9d8754a..acd7f8b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -992,7 +992,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case 2: // sprmPIstd
case 0x4600:
break; // sprmPIstd - style code
-case NS_sprm::LN_PJc: // sprmPJc
+case NS_ooxml::LN_CT_PPrBase_jc:
handleParaJustification(nIntValue, rContext, ExchangeLeftRight(
rContext, m_pImpl ));
break;
case NS_ooxml::LN_CT_PPrBase_keepLines:
@@ -1258,8 +1258,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
rContext-Insert( PROP_PARA_VERT_ALIGNMENT, uno::makeAny(
nAlignment) );
}
break; // sprmPWAlignFont
-case NS_sprm::LN_PFrameTextFlow:
-break; // sprmPFrameTextFlow
+case NS_ooxml::LN_CT_PPrBase_textDirection:
+break;
case NS_sprm::LN_POutLvl:
{
sal_Int16 nLvl = static_cast sal_Int16 ( nIntValue );
@@ -1276,7 +1276,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
}
}
break; // sprmPOutLvl
-case NS_sprm::LN_PFBiDi:
+case NS_ooxml::LN_CT_PPrBase_bidi:
{
if (nIntValue != 0)
{
@@ -1290,7 +1290,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
}
}
-break; // sprmPFBiDi
+break;
case NS_ooxml::LN_EG_SectPrContents_bidi:
if (pSectionContext != NULL)
pSectionContext-Insert(PROP_WRITING_MODE, uno::makeAny(
text::WritingMode2::RL_TB));
@@ -2269,7 +2269,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
break;
case NS_ooxml::LN_EG_RPrBase_snapToGrid: // Use document grid settings
for inter-paragraph spacing
break;
-case NS_sprm::LN_PContextualSpacing:
+case NS_ooxml::LN_CT_PPrBase_contextualSpacing:
rContext-Insert(PROP_PARA_CONTEXT_MARGIN, uno::makeAny( sal_Bool(
nIntValue ) ));
break;
case NS_ooxml::LN_CT_PPrBase_mirrorIndents: // mirrorIndents
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 1905178..18d9e64 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -7,37 +7,6 @@
UML:Model name=WW8Document
UML:Namespace.ownedElement
!--SPRMS--
-!--SPRM sprmPContextualSpacing--
-UML:Class xmi.id=sprmPContextualSpacing
name=sprmPContextualSpacing
- UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8sprm/
- /UML:ModelElement.stereotype
- UML:ModelElement.taggedValue
-UML:TaggedValue
- UML:TaggedValue.dataValue0x246D/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmcode/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
- UML:ModelElement.taggedValue
-UML:TaggedValue
-
UML:TaggedValue.dataValuertf:sprmPIContextualSpacing/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmid/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
- UML:ModelElement.taggedValue
-UML:TaggedValue
- UML:TaggedValue.dataValueparagraph/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=kind/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
-/UML:Class
-!--SPRM sprmPContextualSpacing--
!--SPRM sprmTCantSplit--
UML:Class xmi.id=sprmTCantSplit name=sprmTCantSplit
UML:ModelElement.stereotype
@@ -69,37 +38,6 @@
/UML:ModelElement.taggedValue
/UML:Class
!--SPRM sprmTCantSplit--
-!--SPRM sprmPJc--
-UML:Class xmi.id=sprmPJc name=sprmPJc
- UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8sprm/
-
[Bug 48140] Remove uno calls from xlsx import
https://bugs.freedesktop.org/show_bug.cgi?id=48140 bfoman bfo.bugm...@spamgourmet.com changed: What|Removed |Added Status|ASSIGNED|NEW CC||bfo.bugm...@spamgourmet.com --- Comment #6 from bfoman bfo.bugm...@spamgourmet.com --- This bug is confirmed but unowned - back to NEW. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TextEffectsHandler.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 03e3c2284058eb489b0896603a77e12bd124b6e6
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 20 19:29:02 2014 +0100
-Werror,-Wunused-variable
Change-Id: Icd55f3d51c94be6b14ab8e6cb66755180db6e290
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx
b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 6596a35..ad3fb75 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -104,7 +104,6 @@ TextEffectsHandler::~TextEffectsHandler()
void TextEffectsHandler::lcl_attribute(Id aName, Value aValue)
{
-OUString sValue = aValue.getString();
sal_Int32 nValue = aValue.getInt();
switch(aName)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salgdi3.cxx |1 + vcl/win/source/gdi/salnativewidgets-luna.cxx |1 + 2 files changed, 2 insertions(+) New commits: commit a9053502af21d3dff6757093e6e87c4d86574cad Author: Michael Stahl mst...@redhat.com Date: Thu Feb 20 19:32:29 2014 +0100 vcl: fix windows build Change-Id: Ic55c02f7f17b4d4b2c36e194749bb48bb8fe493d diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 24b2c33..7c7e52f 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -40,6 +40,7 @@ #include tools/helpers.hxx #include vcl/sysdata.hxx +#include vcl/settings.hxx #include win/saldata.hxx #include win/salgdi.h diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 161cc39..d3f1412 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -36,6 +36,7 @@ #include osl/module.h #include vcl/svapp.hxx +#include vcl/settings.hxx #include win/svsys.h #include win/salgdi.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx vcl/quartz
vcl/osx/printaccessoryview.mm |1 + vcl/osx/salframeview.mm |1 + vcl/quartz/ctfonts.cxx|2 ++ 3 files changed, 4 insertions(+) New commits: commit 7e5ce8c4fce2be0d1e73fe3c8003a17bad221625 Author: Michael Stahl mst...@redhat.com Date: Thu Feb 20 19:37:20 2014 +0100 vcl: try to fix the Mac build a bit Change-Id: Icc4cb23594d9c866a2a73676ceb649db54efab67 diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm index 517dcc0..fd77619 100644 --- a/vcl/osx/printaccessoryview.mm +++ b/vcl/osx/printaccessoryview.mm @@ -26,6 +26,7 @@ #include vcl/virdev.hxx #include vcl/svapp.hxx #include vcl/unohelp.hxx +#include vcl/settings.hxx #include osx/printview.h #include osx/salinst.h diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index a8fda42..a84f5aa 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -23,6 +23,7 @@ #include tools/helpers.hxx #include vcl/window.hxx #include vcl/svapp.hxx +#include vcl/settings.hxx #include osx/salinst.h #include quartz/salgdi.h diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 6008aef..7239939 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -31,6 +31,8 @@ #include quartz/utils.h #include ctfonts.hxx +#include vcl/settings.hxx + #include basegfx/polygon/b2dpolygon.hxx #include basegfx/matrix/b2dhommatrix.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/salframe.cxx |1 + vcl/osx/salnativewidgets.cxx |1 + 2 files changed, 2 insertions(+) New commits: commit 58038cb26abf7c64c2459cad9241a731ff6c687d Author: Michael Stahl mst...@redhat.com Date: Thu Feb 20 19:40:39 2014 +0100 vcl: fix Mac build a little more Change-Id: I29c73865679fbd041fdc033aa1b62495a0ec95c2 diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index e592649..0b448d0 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -27,6 +27,7 @@ #include vcl/svapp.hxx #include vcl/window.hxx #include vcl/syswin.hxx +#include vcl/settings.hxx #include osx/saldata.hxx #include quartz/salgdi.h diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 6f33978..55b4e5e 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -21,6 +21,7 @@ #include vcl/decoview.hxx #include vcl/svapp.hxx #include vcl/timer.hxx +#include vcl/settings.hxx #include quartz/salgdi.h #include osx/salnativewidgets.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/tools svl/source tools/source
compilerplugins/clang/plugin.cxx| 26 +-
compilerplugins/clang/plugin.hxx|4 +---
compilerplugins/clang/pluginhandler.cxx |5 +
compilerplugins/clang/pluginhandler.hxx |4
include/tools/stream.hxx|1 +
svl/source/items/cenumitm.cxx |4 ++--
svl/source/items/ctypeitm.cxx |4 ++--
svl/source/items/visitem.cxx|4 ++--
svl/source/numbers/zformat.cxx | 10 +-
tools/source/stream/stream.cxx | 24
10 files changed, 63 insertions(+), 23 deletions(-)
New commits:
commit 9c9e4b1942b2bb7bb80d0317f40488a4cf1f9b9a
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 20 19:51:04 2014 +0100
Add SvStream::ReadCharAsBool
Change-Id: I9dc0525e04de5ae79205872b779dcd0115a9cc14
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 4f8085d..d04109f 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -308,6 +308,7 @@ public:
SvStream ReadSChar( signed char rChar );
SvStream ReadChar( char rChar );
SvStream ReadUChar( unsigned char rChar );
+SvStream ReadCharAsBool( bool rBool );
SvStream ReadFloat( float rFloat );
SvStream ReadDouble( double rDouble );
SvStream ReadStream( SvStream rStream );
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 74a6314..bf13761 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -169,8 +169,8 @@ TYPEINIT1_AUTOFACTORY(SfxBoolItem, SfxPoolItem);
SfxBoolItem::SfxBoolItem(sal_uInt16 const nWhich, SvStream rStream)
: SfxPoolItem(nWhich)
{
-unsigned char tmp = 0;
-rStream.ReadUChar( tmp );
+bool tmp = false;
+rStream.ReadCharAsBool( tmp );
m_bValue = tmp;
}
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index d2299ae..16a8bf8 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -71,8 +71,8 @@ SfxPoolItem* CntContentTypeItem::Create( SvStream rStream,
rStream.ReadUInt32( nMagic );
if (nMagic == CNTSTRINGITEM_STREAM_MAGIC)
{
-unsigned char bEncrypted = sal_False;
-rStream.ReadUChar( bEncrypted );
+bool bEncrypted = false;
+rStream.ReadCharAsBool( bEncrypted );
DBG_ASSERT(!bEncrypted,
CntContentTypeItem::Create() reads encrypted data);
}
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index dbd8ec5..8adc762 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -33,8 +33,8 @@ SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which,
SvStream rStream):
SfxPoolItem(which)
{
DBG_CTOR(SfxVisibilityItem, 0);
-unsigned char bValue = 0;
-rStream.ReadUChar( bValue );
+bool bValue = false;
+rStream.ReadCharAsBool( bValue );
m_nValue.bVisible = bValue;
}
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 73072a3..6bf72257 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -184,8 +184,8 @@ void ImpSvNumberformatInfo::Load(SvStream rStream,
sal_uInt16 nAnz)
sStrArray[i] = SvNumberformat::LoadString( rStream );
rStream.ReadInt16( nTypeArray[i] );
}
-unsigned char bStreamThousand;
-rStream.ReadInt16( eScannedType ).ReadUChar( bStreamThousand ).ReadUInt16(
nThousand )
+bool bStreamThousand;
+rStream.ReadInt16( eScannedType ).ReadCharAsBool( bStreamThousand
).ReadUInt16( nThousand )
.ReadUInt16( nCntPre ).ReadUInt16( nCntPost ).ReadUInt16( nCntExp );
bThousand = bStreamThousand;
}
@@ -1702,9 +1702,9 @@ NfHackConversion SvNumberformat::Load( SvStream rStream,
rHdr.StartEntry();
sal_uInt16 nOp1, nOp2;
sFormatstring = SvNumberformat::LoadString( rStream );
-unsigned char bStreamStandard, bStreamUsed;
+bool bStreamStandard, bStreamUsed;
rStream.ReadInt16( eType ).ReadDouble( fLimit1 ).ReadDouble( fLimit2 )
- .ReadUInt16( nOp1 ).ReadUInt16( nOp2 ).ReadUChar( bStreamStandard
).ReadUChar( bStreamUsed );
+ .ReadUInt16( nOp1 ).ReadUInt16( nOp2 ).ReadCharAsBool(
bStreamStandard ).ReadCharAsBool( bStreamUsed );
bStandard = bStreamStandard;
bIsUsed = bStreamUsed;
NfHackConversion eHackConversion = NF_CONVERT_NONE;
@@ -1795,7 +1795,7 @@ NfHackConversion SvNumberformat::Load( SvStream rStream,
}
break;
case nNewStandardFlagVersionId :
-rStream.ReadUChar( bStreamStandard ); // the real standard flag
+rStream.ReadCharAsBool( bStreamStandard ); // the real standard
flag
bStandard = bStreamStandard;
break;
default:
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index ea34d30..acd48dd 100644
---
Re: Reboot of Gerrit/Jenkins/Ask
The host has been rebooted, all services should be working again. Please write to the website list if you encounter any issues. Thanks, Alex -- Alexander Werner a...@documentfoundation.org Admin Team of The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 Berlin Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Message signed with OpenPGP using GPGMail ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/tools
include/tools/date.hxx |1 - include/tools/datetime.hxx |1 - 2 files changed, 2 deletions(-) New commits: commit c340131d16e49d91f15a2bd9c102a7da8c906602 Author: Alexandre Vicenzi vicenzi.alexan...@gmail.com Date: Wed Feb 19 18:42:51 2014 -0300 fdo#63154 Remove unused solar.h reference in tools Change-Id: Ic450a82a201cb4da3b0c2992908b597220038871 Reviewed-on: https://gerrit.libreoffice.org/8135 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/include/tools/date.hxx b/include/tools/date.hxx index f8b52ef..6b08e4a 100644 --- a/include/tools/date.hxx +++ b/include/tools/date.hxx @@ -20,7 +20,6 @@ #define INCLUDED_TOOLS_DATE_HXX #include tools/toolsdllapi.h -#include tools/solar.h #include com/sun/star/util/Date.hpp #include sal/log.hxx diff --git a/include/tools/datetime.hxx b/include/tools/datetime.hxx index eae54ad..c5e45ec 100644 --- a/include/tools/datetime.hxx +++ b/include/tools/datetime.hxx @@ -20,7 +20,6 @@ #define INCLUDED_TOOLS_DATETIME_HXX #include tools/toolsdllapi.h -#include tools/solar.h #include tools/date.hxx #include tools/time.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #60 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=c340131d16e49d91f15a2bd9c102a7da8c906602 fdo#63154 Remove unused solar.h reference in tools The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75280] New: [Easyhack] Convert inappropriate use of sal_uIntPtr to better integer types
https://bugs.freedesktop.org/show_bug.cgi?id=75280 Priority: medium Bug ID: 75280 CC: libreoffice@lists.freedesktop.org, vicenzi.alexan...@gmail.com Assignee: libreoffice-b...@lists.freedesktop.org Summary: [Easyhack] Convert inappropriate use of sal_uIntPtr to better integer types Severity: normal Classification: Unclassified OS: All Reporter: mst...@redhat.com Hardware: Other Status: NEW Version: Inherited From OOo Component: Libreoffice Product: LibreOffice During the removal of the tools types, the ULONG type was initially converted to sal_uIntPtr, before those doing that work switched to using the stop-gap sal_uLong type instead. sal_uIntPtr has a very special purpose, variables of this type hold pointers that are converted to integers. any use of the sal_uIntPtr type that is actually just an integer should be replaced by an appropriate unsigned integer type, depending on the situation sal_uInt32, sal_uInt64, size_t or unsigned int are likely candidates. as an example, take the UniqueIndexImpl class. it stores sal_uInt32 internally but its public interfaces are defined on sal_uIntPtr; it is obvious that sal_uIntPtr should be replaced by sal_uInt32 here in UniqueIndexImpl and its clients. -- 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 75280] [Easyhack] Convert inappropriate use of sal_uIntPtr to better integer types
https://bugs.freedesktop.org/show_bug.cgi?id=75280 Michael Stahl mst...@redhat.com changed: What|Removed |Added Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/android
vcl/android/androidinst.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f538522a3b5e9a60ee7371485ca9446cd213a586 Author: Michael Stahl mst...@redhat.com Date: Thu Feb 20 21:58:10 2014 +0100 vcl: try to make android tinderbox happy too Change-Id: If83b12578ce1e5dcae688589e92a54b96040abdd diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index a061365..25f8853 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -20,6 +20,7 @@ #include rtl/strbuf.hxx #include basebmp/scanlineformats.hxx #include touch/touch.h +#include vcl/settings.hxx #define LOGTAG LibreOffice/androidinst #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOGTAG, __VA_ARGS__)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 347 +-
sc/qa/unit/ucalc.hxx | 10
sc/qa/unit/ucalc_formula.cxx | 348 +++
sc/source/ui/docshell/externalrefmgr.cxx | 33 ++
4 files changed, 395 insertions(+), 343 deletions(-)
New commits:
commit 2bcd18892f1903d2434bc5dc6828841e49bb78a2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 20 16:05:51 2014 -0500
fdo#72041: Intern strings in the external ref cache with the host document.
To ensure that string comparison with those from the external ref cache
works correctly in functions such as VLOOKUP.
Change-Id: Ib5a466cb6c4b26439abe61b0c17406fc8139f6c0
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 343194f..7d77afb 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1300,7 +1300,7 @@ IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl)
//
-static FormulaToken* convertToToken( ScRefCellValue rCell )
+static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument*
pSrcDoc, ScRefCellValue rCell )
{
if (rCell.hasEmptyValue())
{
@@ -1312,7 +1312,11 @@ static FormulaToken* convertToToken( ScRefCellValue
rCell )
{
case CELLTYPE_EDIT:
case CELLTYPE_STRING:
-return new formula::FormulaStringToken(rCell.getString(NULL));
+{
+OUString aStr = rCell.getString(pSrcDoc);
+svl::SharedString aSS =
pHostDoc-GetSharedStringPool().intern(aStr);
+return new formula::FormulaStringToken(aSS);
+}
case CELLTYPE_VALUE:
return new formula::FormulaDoubleToken(rCell.mfValue);
case CELLTYPE_FORMULA:
@@ -1342,13 +1346,20 @@ static FormulaToken* convertToToken( ScRefCellValue
rCell )
templateclass T
struct ColumnBatch
{
+ScDocument* mpHostDoc;
+ScDocument* mpSrcDoc;
+
std::vectorT maStorage;
CellType meType1;
CellType meType2;
SCROW mnRowStart;
-ColumnBatch(CellType eType1, CellType eType2) :
-meType1(eType1), meType2(eType2), mnRowStart(-1) {}
+ColumnBatch( ScDocument* pHostDoc, ScDocument* pSrcDoc, CellType eType1,
CellType eType2 ) :
+mpHostDoc(pHostDoc),
+mpSrcDoc(pSrcDoc),
+meType1(eType1),
+meType2(eType2),
+mnRowStart(-1) {}
void update(ScRefCellValue raCell, const SCCOL nCol, const SCROW nRow,
ScMatrixRef xMat)
{
@@ -1380,7 +1391,8 @@ struct ColumnBatch
template
inline svl::SharedString
ColumnBatchsvl::SharedString::getValue(ScRefCellValue rCell) const
{
-return svl::SharedString(rCell.getString(NULL));
+OUString aStr = rCell.getString(mpSrcDoc);
+return mpHostDoc-GetSharedStringPool().intern(aStr);
}
templateclass T
@@ -1402,7 +1414,7 @@ inline void ColumnBatchT::putValues(ScMatrixRef xMat,
const SCCOL nCol) const
}
static ScTokenArray* convertToTokenArray(
-ScDocument* pSrcDoc, ScRange rRange,
vectorScExternalRefCache::SingleRangeData rCacheData )
+ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRange rRange,
vectorScExternalRefCache::SingleRangeData rCacheData )
{
ScAddress s = rRange.aStart;
ScAddress e = rRange.aEnd;
@@ -1448,8 +1460,8 @@ static ScTokenArray* convertToTokenArray(
static_castSCSIZE(nCol2-nCol1+1),
static_castSCSIZE(nRow2-nRow1+1));
ScRefCellValue aCell;
-ColumnBatchsvl::SharedString aStringBatch(CELLTYPE_STRING,
CELLTYPE_EDIT);
-ColumnBatchdouble aDoubleBatch(CELLTYPE_VALUE, CELLTYPE_VALUE);
+ColumnBatchsvl::SharedString aStringBatch(pHostDoc, pSrcDoc,
CELLTYPE_STRING, CELLTYPE_EDIT);
+ColumnBatchdouble aDoubleBatch(pHostDoc, pSrcDoc, CELLTYPE_VALUE,
CELLTYPE_VALUE);
for (SCCOL nCol = nDataCol1; nCol = nDataCol2; ++nCol)
{
@@ -1483,6 +1495,7 @@ static ScTokenArray* convertToTokenArray(
else
{
svl::SharedString aStr = pFCell-GetString();
+aStr =
pHostDoc-GetSharedStringPool().intern(aStr.getString());
xMat-PutString(aStr, nC, nR);
}
}
@@ -2033,7 +2046,7 @@ ScExternalRefCache::TokenRef
ScExternalRefManager::getSingleRefTokenFromSrcDoc(
// Get the cell from src doc, and convert it into a token.
ScRefCellValue aCell;
aCell.assign(*pSrcDoc, rPos);
-ScExternalRefCache::TokenRef pToken(convertToToken(aCell));
+ScExternalRefCache::TokenRef pToken(convertToToken(mpDoc, pSrcDoc, aCell));
if (!pToken.get())
{
@@ -2086,7 +2099,7 @@ ScExternalRefCache::TokenArrayRef
ScExternalRefManager::getDoubleRefTokensFromSr
aRange.aStart.SetTab(nTab1);
[Libreoffice-commits] core.git: tools/source
tools/source/datetime/tdate.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit ae838de0a3840e0fd490db5447bd6d481616e9d7
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Feb 20 21:26:20 2014 +
fdo#66507 - accelerate date calculations as used vs. empty cells.
Change-Id: I5cd642db4e0595c96e1af8adf7c7a45f589a259e
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 719219a..720692b 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -33,7 +33,7 @@ struct tm *localtime_r(const time_t *timep, struct tm
*buffer);
#endif
static const sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
- 31, 31, 30, 31, 30, 31 };
+ 31, 31, 30, 31, 30, 31 };
#define MAX_DAYS3636532
@@ -195,7 +195,7 @@ sal_uInt16 Date::GetDayOfYear() const
}
sal_uInt16 Date::GetWeekOfYear( DayOfWeek eStartDay,
-sal_Int16 nMinimumNumberOfDaysInWeek ) const
+sal_Int16 nMinimumNumberOfDaysInWeek ) const
{
short nWeek;
short n1WDay = (short)Date( 1, 1, GetYear() ).GetDayOfWeek();
@@ -407,6 +407,10 @@ Date Date::operator +=( long nDays )
sal_uInt16 nDay;
sal_uInt16 nMonth;
sal_uInt16 nYear;
+
+if (nDays == 0)
+return *this;
+
longnTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
nTempDays += nDays;
@@ -428,6 +432,10 @@ Date Date::operator -=( long nDays )
sal_uInt16 nDay;
sal_uInt16 nMonth;
sal_uInt16 nYear;
+
+if (nDays == 0)
+return *this;
+
longnTempDays = DateToDays( GetDay(), GetMonth(), GetYear() );
nTempDays -= nDays;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 53472] FORMATTING: Integral Symbols too small for some integrands
https://bugs.freedesktop.org/show_bug.cgi?id=53472 --- Comment #12 from Matteo Campanelli matteo.campane...@gmail.com --- Hi everybody, I was planning to put hands on this issue as my first time hacking L.O.. I would like to ask some questions on which general directions it may be better to take: - Reading past discussion, it seems to me that there is some agreement on the fact that dynamically-sized integrals/sums/products/etc. should be given as a command additional to int C.. In other words, dynamic size should be optional. Is that correct? - There seems to be some work done by Véghelyi András in the past (see previous commments in this issue). That code may possibly be a good starting point. I'm not familiar at all with Gerrit and the rest of the patch/merge workflow in L.O., but is this code available anywhere? Was it integrated at the time in L.O.? Or, how could I check such a thing? Comments of any kind are very appreciated. Thanks, Matteo -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
New commits:
commit faaaddeea42996bf0aa9089fc851eb594165f7d5
Author: Kevin Hunter hunt...@earlham.edu
Date: Thu Feb 20 10:43:58 2014 -0500
Enable relative paths.
The documentation for the --with-external-tar was previously not
specific that it required an absolute path. So rather than fix the
help text, convert the path to an absolute one.
Change-Id: I794cd77235e68a2270acd09895bf994527e847c4
Reviewed-on: https://gerrit.libreoffice.org/8146
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/configure.ac b/configure.ac
index 9c317cc..cf9a3a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,23 @@ PathFormat()
fi
}
+AbsolutePath()
+{
+# There appears to be no simple and portable method to get an absolute and
+# canonical path, so we try creating the directory if does not exist and
+# utilizing the shell and pwd.
+rel=$1
+absolute_path=
+test ! -e $rel mkdir -p $rel
+if test -d $rel ; then
+cd $rel || AC_MSG_ERROR([absolute path resolution failed for
$rel.])
+absolute_path=$(pwd)
+cd - /dev/null
+else
+AC_MSG_ERROR([Failed to resolve absolute path. $rel does not exist
or is not a directory.])
+fi
+}
+
rm -f warn
have_WARNINGS=no
add_warning()
@@ -1333,8 +1350,8 @@ AC_ARG_WITH(gnu-cp,
,)
AC_ARG_WITH(external-tar,
-AS_HELP_STRING([--with-external-tar=TARFILE PATH],
-[Specify path to tarfiles manually.]),
+AS_HELP_STRING([--with-external-tar=TARFILE_PATH],
+[Specify an absolute path of where to find (and store) tarfiles.]),
TARFILE_LOCATION=$withval ,
)
@@ -4729,6 +4746,9 @@ if test -z $TARFILE_LOCATION; then
ln -s $SRC_ROOT/external/tarballs $SRC_ROOT/src
fi
TARFILE_LOCATION=$SRC_ROOT/external/tarballs
+else
+AbsolutePath $TARFILE_LOCATION
+TARFILE_LOCATION=${absolute_path}
fi
AC_SUBST(TARFILE_LOCATION)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/excel/xestyle.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d6d06b230bf923492c4a6ff42781cca25a28ef25
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 20 11:27:32 2014 -0500
fdo#75130: Export cell borders to xls and xlsx correctly.
Change-Id: Ic629fb4852d2ada9724dfee7618e2436c0fa28a8
(cherry picked from commit 1c1f42fdbad774cae7c45a7f8d60b9af766dee0a)
Reviewed-on: https://gerrit.libreoffice.org/8147
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 59603eb..f3ce557 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1570,18 +1570,18 @@ void lclGetBorderLine(
switch (pLine-GetBorderLineStyle())
{
case table::BorderLineStyle::DASHED:
+case table::BorderLineStyle::FINE_DASHED:
rnXclLine = EXC_LINE_DASHED;
break;
case table::BorderLineStyle::DOTTED:
rnXclLine = EXC_LINE_DOTTED;
break;
-case table::BorderLineStyle::FINE_DASHED:
-rnXclLine = EXC_LINE_HAIR;
-break;
default:
break;
}
}
+else if (nOuterWidth = EXC_BORDER_HAIR)
+rnXclLine = EXC_LINE_HAIR;
else
rnXclLine = EXC_LINE_NONE;
}
@@ -1726,7 +1726,7 @@ static const char* ToLineStyle( sal_uInt8 nLineStyle )
case EXC_LINE_HAIR: return hair;
case EXC_LINE_DOTTED: return dotted;
case EXC_LINE_DASHED: return dashed;
-case EXC_LINE_MEDIUMDASHED: return mediumdashed;
+case EXC_LINE_MEDIUMDASHED: return mediumDashed;
}
return *unknown*;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/docshell/externalrefmgr.cxx | 33 +--
1 file changed, 23 insertions(+), 10 deletions(-)
New commits:
commit 9da3e4f6bece47218a7149e7c37e5f2f06c8e480
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 20 16:05:51 2014 -0500
fdo#72041: Intern strings in the external ref cache with the host document.
To ensure that string comparison with those from the external ref cache
works correctly in functions such as VLOOKUP.
Change-Id: Ib5a466cb6c4b26439abe61b0c17406fc8139f6c0
(cherry picked from commit 2bcd18892f1903d2434bc5dc6828841e49bb78a2)
Reviewed-on: https://gerrit.libreoffice.org/8149
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 4646103..b2a19d9 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1300,7 +1300,7 @@ IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl)
//
-static FormulaToken* convertToToken( ScRefCellValue rCell )
+static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument*
pSrcDoc, ScRefCellValue rCell )
{
if (rCell.hasEmptyValue())
{
@@ -1312,7 +1312,11 @@ static FormulaToken* convertToToken( ScRefCellValue
rCell )
{
case CELLTYPE_EDIT:
case CELLTYPE_STRING:
-return new formula::FormulaStringToken(rCell.getString(NULL));
+{
+OUString aStr = rCell.getString(pSrcDoc);
+svl::SharedString aSS =
pHostDoc-GetSharedStringPool().intern(aStr);
+return new formula::FormulaStringToken(aSS);
+}
case CELLTYPE_VALUE:
return new formula::FormulaDoubleToken(rCell.mfValue);
case CELLTYPE_FORMULA:
@@ -1342,13 +1346,20 @@ static FormulaToken* convertToToken( ScRefCellValue
rCell )
templateclass T
struct ColumnBatch
{
+ScDocument* mpHostDoc;
+ScDocument* mpSrcDoc;
+
std::vectorT maStorage;
CellType meType1;
CellType meType2;
SCROW mnRowStart;
-ColumnBatch(CellType eType1, CellType eType2) :
-meType1(eType1), meType2(eType2), mnRowStart(-1) {}
+ColumnBatch( ScDocument* pHostDoc, ScDocument* pSrcDoc, CellType eType1,
CellType eType2 ) :
+mpHostDoc(pHostDoc),
+mpSrcDoc(pSrcDoc),
+meType1(eType1),
+meType2(eType2),
+mnRowStart(-1) {}
void update(ScRefCellValue raCell, const SCCOL nCol, const SCROW nRow,
ScMatrixRef xMat)
{
@@ -1380,7 +1391,8 @@ struct ColumnBatch
template
inline svl::SharedString
ColumnBatchsvl::SharedString::getValue(ScRefCellValue rCell) const
{
-return svl::SharedString(rCell.getString(NULL));
+OUString aStr = rCell.getString(mpSrcDoc);
+return mpHostDoc-GetSharedStringPool().intern(aStr);
}
templateclass T
@@ -1402,7 +1414,7 @@ inline void ColumnBatchT::putValues(ScMatrixRef xMat,
const SCCOL nCol) const
}
static ScTokenArray* convertToTokenArray(
-ScDocument* pSrcDoc, ScRange rRange,
vectorScExternalRefCache::SingleRangeData rCacheData )
+ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRange rRange,
vectorScExternalRefCache::SingleRangeData rCacheData )
{
ScAddress s = rRange.aStart;
ScAddress e = rRange.aEnd;
@@ -1448,8 +1460,8 @@ static ScTokenArray* convertToTokenArray(
static_castSCSIZE(nCol2-nCol1+1),
static_castSCSIZE(nRow2-nRow1+1));
ScRefCellValue aCell;
-ColumnBatchsvl::SharedString aStringBatch(CELLTYPE_STRING,
CELLTYPE_EDIT);
-ColumnBatchdouble aDoubleBatch(CELLTYPE_VALUE, CELLTYPE_VALUE);
+ColumnBatchsvl::SharedString aStringBatch(pHostDoc, pSrcDoc,
CELLTYPE_STRING, CELLTYPE_EDIT);
+ColumnBatchdouble aDoubleBatch(pHostDoc, pSrcDoc, CELLTYPE_VALUE,
CELLTYPE_VALUE);
for (SCCOL nCol = nDataCol1; nCol = nDataCol2; ++nCol)
{
@@ -1483,6 +1495,7 @@ static ScTokenArray* convertToTokenArray(
else
{
svl::SharedString aStr = pFCell-GetString();
+aStr =
pHostDoc-GetSharedStringPool().intern(aStr.getString());
xMat-PutString(aStr, nC, nR);
}
}
@@ -2033,7 +2046,7 @@ ScExternalRefCache::TokenRef
ScExternalRefManager::getSingleRefTokenFromSrcDoc(
// Get the cell from src doc, and convert it into a token.
ScRefCellValue aCell;
aCell.assign(*pSrcDoc, rPos);
-ScExternalRefCache::TokenRef pToken(convertToToken(aCell));
+ScExternalRefCache::TokenRef pToken(convertToToken(mpDoc, pSrcDoc, aCell));
if (!pToken.get())
{
@@ -2086,7 +2099,7 @@ ScExternalRefCache::TokenArrayRef
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - extras/Package_gallbullets.mk
extras/Package_gallbullets.mk | 30 ++ 1 file changed, 30 insertions(+) New commits: commit aa9db1cdc92218b035df3ec0dd8f80d2c2687be0 Author: Maxim Monastirsky momonas...@gmail.com Date: Wed Feb 19 01:09:21 2014 +0200 Add missing files to gallery bullets makefile They are used in Bullets Numbering dialog, and in sidebar Bullets popup. Change-Id: I543cad1108f8c45cc3dcc56a0c42fda2fbeb5467 Reviewed-on: https://gerrit.libreoffice.org/8125 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit d8680de7012fb92a393066c957f82e1473b60575) Reviewed-on: https://gerrit.libreoffice.org/8145 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk index 296250c..d152336 100644 --- a/extras/Package_gallbullets.mk +++ b/extras/Package_gallbullets.mk @@ -10,6 +10,36 @@ $(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets)) $(eval $(call gb_Package_add_files,extras_gallbullets,$(LIBO_SHARE_FOLDER)/gallery/bullets,\ + Bullet01-Circle-DarkRed.svg \ + Bullet02-Circle-Blue.svg \ + Bullet03-Circle-Green.svg \ + Bullet04-Square-Black.svg \ + Bullet05-Square-Orange.svg \ + Bullet06-Square-Purple.svg \ + Bullet07-Diamond-Blue.svg \ + Bullet08-Diamond-LightBlue.svg \ + Bullet09-Diamond-Red.svg \ + Bullet10-Star-Yellow.svg \ + Bullet11-Star-Blue.svg \ + Bullet12-Triangle-Blue.svg \ + Bullet13-Triangle-DarkGreen.svg \ + Bullet14-Arrow-Red.svg \ + Bullet15-Arrow-Blue.svg \ + Bullet16-Box-Blue.svg \ + Bullet17-Box-Red.svg \ + Bullet18-Asterisk-LightBlue.svg \ + Bullet19-Leaves-Red.svg \ + Bullet20-Target-Blue.svg \ + Bullet21-Arrow-Blue.svg \ + Bullet22-Arrow-DarkBlue.svg \ + Bullet23-Arrow-Brown.svg \ + Bullet24-Flag-Red.svg \ + Bullet25-Flag-Green.svg \ + Bullet26-X-Red.svg \ + Bullet27-X-Black.svg \ + Bullet28-Checkmark-Green.svg \ + Bullet29-Checkmark-Blue.svg \ + Bullet30-Square-DarkRed.svg \ blkpearl.gif \ bluarrow.gif \ bluball.gif \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-1' - vcl/source
vcl/source/window/layout.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 47ff82608b065c3c0d98557583bb822b20fb4081
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 17 16:57:44 2014 +
Resolves: fdo#74284 use AccessibleRole::PANEL for VclBoxes under windows
(cherry picked from commit 685ec1899435037205d98a102a32ca8b6a4836d0)
Change-Id: Ic8c743c2646c8610b3d90425024413b40dfdab13
Reviewed-on: https://gerrit.libreoffice.org/8105
Reviewed-by: Michael Meeks michael.me...@collabora.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 35e76a4..8d8ab0d 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -322,7 +322,13 @@ bool VclBox::set_property(const OString rKey, const
OString rValue)
sal_uInt16 VclBox::getDefaultAccessibleRole() const
{
+#if defined(WNT)
+//fdo#74284 call Boxes Panels, keep then as Filler under
+//at least Linux seeing as that's what Gtk does for GtkBoxes
+return com::sun::star::accessibility::AccessibleRole::PANEL;
+#else
return com::sun::star::accessibility::AccessibleRole::FILLER;
+#endif
}
#define DEFAULT_CHILD_MIN_WIDTH 85
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 53472] FORMATTING: Integral Symbols too small for some integrands
https://bugs.freedesktop.org/show_bug.cgi?id=53472 --- Comment #13 from Roberto rgno...@gmail.com --- (In reply to comment #12) Hi everybody, I was planning to put hands on this issue as my first time hacking L.O.. I would like to ask some questions on which general directions it may be better to take: - Reading past discussion, it seems to me that there is some agreement on the fact that dynamically-sized integrals/sums/products/etc. should be given as a command additional to int C.. In other words, dynamic size should be optional. Is that correct? - There seems to be some work done by Véghelyi András in the past (see previous commments in this issue). That code may possibly be a good starting point. I'm not familiar at all with Gerrit and the rest of the patch/merge workflow in L.O., but is this code available anywhere? Was it integrated at the time in L.O.? Or, how could I check such a thing? Comments of any kind are very appreciated. Thanks, Matteo Dear Mateo: About your first point, my humble opinion is that dynamic size should be optional (some people think that different instances of the same operator, belonging to the same line, should not have different sizes; despite of the size of their operands. Check https://issues.apache.org/ooo/show_bug.cgi?id=45511 for details). I have no information about your questions in your second point. Kind regards. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - dtrans/source include/svtools vcl/osx
dtrans/source/win32/dtobj/FmtFilter.cxx | 10
include/svtools/htmlkywd.hxx| 654
vcl/osx/HtmlFmtFlt.cxx |8
3 files changed, 336 insertions(+), 336 deletions(-)
New commits:
commit 88c6cbda921f1e3627910f9028ff2e29f26160e7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 20 20:19:07 2014 -0500
fdo#74584: These tags should be lowercase for correct clipboard handling.
Change-Id: I323b96cecbf7158919fad534a202f158965ca99f
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx
b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 532c49c..6f67a3b 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -357,13 +357,13 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t
endHtml, size_t startFr
// the office always writes the start and end html tag in upper cases and
// without spaces both tags don't allow parameters
-const std::string TAG_HTML = std::string(HTML);
-const std::string TAG_END_HTML = std::string(/HTML);
+const std::string TAG_HTML = std::string(html);
+const std::string TAG_END_HTML = std::string(/html);
// The body tag may have parameters so we need to search for the
-// closing '' manually e.g. BODY param #92840#
-const std::string TAG_BODY = std::string(BODY);
-const std::string TAG_END_BODY = std::string(/BODY);
+// closing '' manually e.g. body param #92840#
+const std::string TAG_BODY = std::string(body);
+const std::string TAG_END_BODY = std::string(/body);
Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
{
diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index e629f11..f5e0b22 100644
--- a/vcl/osx/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
@@ -73,13 +73,13 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t
endHtml, size_t startFr
// the office always writes the start and end html tag in upper cases and
// without spaces both tags don't allow parameters
-const std::string TAG_HTML = std::string(HTML);
-const std::string TAG_END_HTML = std::string(/HTML);
+const std::string TAG_HTML = std::string(html);
+const std::string TAG_END_HTML = std::string(/html);
// The body tag may have parameters so we need to search for the
// closing '' manually e.g. BODY param #92840#
-const std::string TAG_BODY = std::string(BODY);
-const std::string TAG_END_BODY = std::string(/BODY);
+const std::string TAG_BODY = std::string(body);
+const std::string TAG_END_BODY = std::string(/body);
Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
{
commit f1f8b3bfdc3406ea79b662a2fda3d0c1cb87bb10
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 20 20:02:16 2014 -0500
fdo#74584: Revert various previous changes to upcase HTML tags.
This reverts
commit 3c84fa61570113d1dfb2523ab88f268eeeb46c3c.
commit 96a1f60aeb2a7954533da9b4aa4947efb7a65e70.
commit 1f74a3ce201bad68f160584900285e2c087ab2c0.
commit 3d481254a07fe82d11953f9825a2f8fc6eeabc0b.
diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 7b22d9c..63c3f70 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -26,122 +26,122 @@
HTML PUBLIC \-//W3C//DTD HTML 4.0 Transitional//EN\
// diese werden nur eingeschaltet
-#define OOO_STRING_SVTOOLS_HTML_area AREA
-#define OOO_STRING_SVTOOLS_HTML_base BASE
+#define OOO_STRING_SVTOOLS_HTML_area area
+#define OOO_STRING_SVTOOLS_HTML_base base
#define OOO_STRING_SVTOOLS_HTML_comment !--
#define OOO_STRING_SVTOOLS_HTML_doctype !DOCTYPE
-#define OOO_STRING_SVTOOLS_HTML_embed EMBED
-#define OOO_STRING_SVTOOLS_HTML_horzrule HR
-#define OOO_STRING_SVTOOLS_HTML_image IMG
-#define OOO_STRING_SVTOOLS_HTML_input INPUT
-#define OOO_STRING_SVTOOLS_HTML_linebreak BR
-#define OOO_STRING_SVTOOLS_HTML_li LI
-#define OOO_STRING_SVTOOLS_HTML_link LINK
-#define OOO_STRING_SVTOOLS_HTML_meta META
-#define OOO_STRING_SVTOOLS_HTML_nobr NOBR
-#define OOO_STRING_SVTOOLS_HTML_option OPTION
-#define OOO_STRING_SVTOOLS_HTML_param PARAM
-#define OOO_STRING_SVTOOLS_HTML_spacer SPACER
+#define OOO_STRING_SVTOOLS_HTML_embed embed
+#define OOO_STRING_SVTOOLS_HTML_horzrule hr
+#define OOO_STRING_SVTOOLS_HTML_image img
+#define OOO_STRING_SVTOOLS_HTML_input input
+#define OOO_STRING_SVTOOLS_HTML_linebreak br
+#define OOO_STRING_SVTOOLS_HTML_li li
+#define OOO_STRING_SVTOOLS_HTML_link link
+#define OOO_STRING_SVTOOLS_HTML_meta meta
+#define OOO_STRING_SVTOOLS_HTML_nobr nobr
+#define OOO_STRING_SVTOOLS_HTML_option option
+#define OOO_STRING_SVTOOLS_HTML_param param
+#define OOO_STRING_SVTOOLS_HTML_spacer spacer
// diese werden wieder abgeschaltet
-#define OOO_STRING_SVTOOLS_HTML_abbreviation ABBREV
-#define OOO_STRING_SVTOOLS_HTML_acronym ACRONYM
-#define OOO_STRING_SVTOOLS_HTML_address ADDRESS
-#define OOO_STRING_SVTOOLS_HTML_anchor A
-#define OOO_STRING_SVTOOLS_HTML_applet APPLET
-#define
[Libreoffice-commits] core.git: vcl/ios
vcl/ios/iosinst.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 24dd10c727ab2d7a38368292498520e11d98e3cb Author: tsahi glik tsahi.g...@cloudon.com Date: Thu Feb 20 17:59:14 2014 -0800 fix compilation of ios diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 3d8472a..a8dccdf 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -30,6 +30,7 @@ #include headless/svpdummies.hxx #include generic/gendata.hxx #include quartz/utils.h +#include vcl/settings.hxx // Horrible hack static int viewWidth = 1, viewHeight = 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 10 commits - configure.cmd desktop/os2 drawinglayer/source dtrans/source filter/source i18npool/source sal/osl svtools/Executable_g2g.mk sw/inc sw/
configure.cmd|2 desktop/os2/source/applauncher/launcher.hxx |2 drawinglayer/source/primitive2d/textlayoutdevice.cxx |6 - dtrans/source/win32/ftransl/ftransl.cxx |4 filter/source/graphicfilter/eras/makefile.mk |3 filter/source/graphicfilter/etiff/makefile.mk|3 filter/source/graphicfilter/expm/makefile.mk |3 filter/source/graphicfilter/idxf/makefile.mk |3 filter/source/graphicfilter/ieps/makefile.mk |3 filter/source/graphicfilter/ios2met/makefile.mk |3 filter/source/graphicfilter/ipbm/makefile.mk |3 filter/source/graphicfilter/ipcd/makefile.mk |3 filter/source/graphicfilter/ipcx/makefile.mk |3 filter/source/graphicfilter/ipict/makefile.mk|3 filter/source/graphicfilter/ipsd/makefile.mk |3 filter/source/graphicfilter/iras/makefile.mk |3 filter/source/graphicfilter/itga/makefile.mk |3 filter/source/graphicfilter/itiff/makefile.mk|3 i18npool/source/textconversion/data/makefile.mk |4 sal/osl/os2/module.c |2 svtools/Executable_g2g.mk|5 sw/inc/pam.hxx |2 sw/sdi/_basesh.sdi |2 sw/sdi/_textsh.sdi |3 sw/source/core/crsr/crsrsh.cxx | 32 ++--- sw/source/core/crsr/pam.cxx | 104 +-- sw/source/core/edit/eddel.cxx|2 sw/source/core/edit/edfcol.cxx |7 - sw/source/core/edit/ednumber.cxx | 39 +++ sw/source/ui/docvw/edtwin.cxx| 100 -- sw/source/ui/shells/basesh.cxx |7 + sw/source/ui/shells/textsh1.cxx | 10 + vcl/aqua/source/gdi/ctlayout.cxx | 16 ++ vcl/os2/source/gdi/salgdi3.cxx |2 34 files changed, 230 insertions(+), 163 deletions(-) New commits: commit 3bd259ce52b15e968302ecca39f72d06af66e301 Author: Armin Le Grand a...@apache.org Date: Thu Feb 20 15:49:56 2014 + i124085 improved support for PNG clipboard format on windows diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 258b597..cfceddc1 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -513,9 +513,9 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable() //SOT_FORMATSTR_ID_DIALOG_60 m_TranslTable.push_back(FormatEntry(application/vnd.sun.xml.dialog, Dialog 6.0, NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_BMP -m_TranslTable.push_back(FormatEntry(image/bmp, Windows Bitmap, NULL, 49657 /* ID for image/bmp CF_INVALID*/, CPPUTYPE_DEFAULT)); +m_TranslTable.push_back(FormatEntry(image/bmp, Windows Bitmap, NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_PNG -m_TranslTable.push_back(FormatEntry(image/png, PNG, NULL, 49656 /* ID for image/png CF_INVALID*/, CPPUTYPE_DEFAULT)); +m_TranslTable.push_back(FormatEntry(image/png, PNG, NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_DUMMY3 m_TranslTable.push_back(FormatEntry(application/x-openoffice-dummy3;windows_formatname=\SO_DUMMYFORMAT_3\, SO_DUMMYFORMAT_3, NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_DUMMY4 commit c6d291416fecd48f56782d2c92f58d10b9ba2c27 Author: Yuri Dario yda...@apache.org Date: Thu Feb 20 15:42:08 2014 + #i118923# OS/2 port, add CPPULIB to resolve uno constructors. diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index dd2ba34..8e109dc 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -42,6 +42,11 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\ vos3 \ $(gb_STDLIBS) \ )) +ifeq ($(OS),OS2) +$(eval $(call gb_Executable_add_linked_libs,g2g,\ +cppu \ +)) +endif ifneq ($(USE_SYSTEM_STL),YES) ifeq ($(PRODUCT),) commit c3f761a8e6f6d3f959b756401e84c9a1efe35419 Author: Yuri Dario yda...@apache.org Date: Thu Feb 20 15:33:05 2014 + #i118923# OS/2 port, remove parenthesis around soffice name constant. diff --git a/desktop/os2/source/applauncher/launcher.hxx b/desktop/os2/source/applauncher/launcher.hxx index 29f9e72..736e70c 100644 --- a/desktop/os2/source/applauncher/launcher.hxx +++ b/desktop/os2/source/applauncher/launcher.hxx @@ -24,7 +24,7 @@ #define INCL_PM #include os2.h -#define OFFICE_IMAGE_NAME (soffice) +#define OFFICE_IMAGE_NAME soffice extern CHAR APPLICATION_SWITCH[]; commit 9ef080c6f3d59fd3f27559b780d456106396cb84 Author: Yuri Dario yda...@apache.org Date: Thu Feb 20 15:30:57 2014 + #i118923# OS/2 port, use
[Libreoffice-commits] core.git: desktop/source extensions/source forms/source fpicker/source package/source reportdesign/inc reportdesign/source salhelper/qa sal/workben
desktop/source/app/officeipcthread.cxx |4 ++--
extensions/source/propctrlr/browserview.cxx |4 ++--
forms/source/component/ImageControl.cxx |4 ++--
forms/source/misc/InterfaceContainer.cxx| 18 +-
forms/source/xforms/submission.cxx |5 ++---
forms/source/xforms/submission/submission.hxx |2 ++
forms/source/xforms/submission/submission_get.cxx |6 +++---
fpicker/source/office/asyncfilepicker.cxx |4 ++--
package/source/zippackage/ZipPackage.cxx|4 ++--
package/source/zippackage/ZipPackageFolder.cxx |2 +-
package/source/zippackage/zipfileaccess.cxx |2 --
reportdesign/inc/UndoActions.hxx|1 -
reportdesign/source/ui/misc/toolboxcontroller.cxx |2 --
sal/workben/clipboardwben/testcopy/XTDataObject.cxx |1 -
salhelper/qa/test_api.cxx |4 +---
15 files changed, 24 insertions(+), 39 deletions(-)
New commits:
commit 5f17e5eaad665337c7d8b7f05a61adc21d80a073
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Feb 21 14:33:44 2014 +0900
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I674b7ee507258555b667657a13db6fda9b8d8372
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index f3e46ec..44d8c89 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -23,7 +23,7 @@
#include officeipcthread.hxx
#include cmdlineargs.hxx
#include dispatchwatcher.hxx
-#include memory
+#include boost/scoped_ptr.hpp
#include stdio.h
#include osl/process.h
#include unotools/bootstrap.hxx
@@ -713,7 +713,7 @@ void OfficeIPCThread::execute()
if (aArguments.isEmpty())
continue;
-std::auto_ptr CommandLineArgs aCmdLineArgs;
+boost::scoped_ptr CommandLineArgs aCmdLineArgs;
try
{
Parser p(aArguments);
diff --git a/extensions/source/propctrlr/browserview.cxx
b/extensions/source/propctrlr/browserview.cxx
index d607134..cec411b 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -21,7 +21,7 @@
#include propertyeditor.hxx
#include propctrlr.hrc
#include tools/debug.hxx
-#include memory
+#include boost/scoped_ptr.hpp
//
namespace pcr
@@ -67,7 +67,7 @@ namespace pcr
sal_uInt16 nTmpPage = m_pPropBox-GetCurPage();
if (nTmpPage)
m_nActivePage = nTmpPage;
-::std::auto_ptrWindow aTemp(m_pPropBox);
+boost::scoped_ptrWindow aTemp(m_pPropBox);
m_pPropBox = NULL;
}
diff --git a/forms/source/component/ImageControl.cxx
b/forms/source/component/ImageControl.cxx
index fe648ab..c959ab9 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -56,7 +56,7 @@
#include unotools/ucbstreamhelper.hxx
#include svl/urihelper.hxx
-#include memory
+#include boost/scoped_ptr.hpp
#define ID_OPEN_GRAPHICS1
#define ID_CLEAR_GRAPHICS 2
@@ -412,7 +412,7 @@ void OImageControlModel::read(const
ReferenceXObjectInputStream _rxInStream)
sal_Bool OImageControlModel::impl_updateStreamForURL_lck( const OUString
_rURL, ValueChangeInstigator _eInstigator )
{
// create a stream for the image specified by the URL
-::std::auto_ptr SvStream pImageStream;
+boost::scoped_ptr SvStream pImageStream;
Reference XInputStream xImageStream;
if ( ::svt::GraphicAccess::isSupportedURL( _rURL ) )
diff --git a/forms/source/misc/InterfaceContainer.cxx
b/forms/source/misc/InterfaceContainer.cxx
index f76f8a0..7954470 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -45,7 +45,7 @@
#include tools/diagnose_ex.h
#include algorithm
-#include memory
+#include boost/scoped_ptr.hpp
//.
#include com/sun/star/frame/XModel.hpp
@@ -809,9 +809,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex,
const Reference XProper
// SYNCHRONIZED -
::osl::ClearableMutexGuard aGuard( m_rMutex );
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr ElementDescription aAutoDeleteMetaData;
-SAL_WNODEPRECATED_DECLARATIONS_POP
+boost::scoped_ptr ElementDescription aAutoDeleteMetaData;
ElementDescription* pElementMetaData = _pApprovalResult;
if ( !pElementMetaData )
{ // not yet approved by the caller - do ourself
@@ -819,9 +817,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex,
const Reference XProper
DBG_ASSERT( pElementMetaData, OInterfaceContainer::implInsert:
createElementMetaData returned nonsense! );
// ensure that the meta
Re: Testing/Working on PyUNO?
At 6:09am -0500 Thu, 20 Feb 2014, Stephan Bergmann wrote: On 02/19/2014 12:02 PM, Stephan Bergmann wrote: The idea would be that Kevin (and others) would fill this with PyUNO coding scenarios that cross their mind, discover errors in the PyUNO infrastructure, ideally distill tests for those specific errors out of the more general tests (that could then even go into more specific code modules like pyuno or testtools), and eventually prune test snippets again that are no longer useful. To get that started, I created http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e887567c5b4b06646ab1340376e240d6c5af9cb A rudimentary framework for additional Python tests not run by default and moved the previously abandoned http://cgit.freedesktop.org/libreoffice/core/commit/?id=f2471280c7c625e39369f76bd0efa1d2402f62bf Test for fdo#74824 there. At least for now, the tests are not run by default, but need an explicit make PythonTest_pytests. See the commit message of http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e887567c5b4b06646ab1340376e240d6c5af9cb for details. That's great, and now means that there is at least an appropriate place to put the functional tests that are currently in my purview. If James DuPont (for instance, since he commented on this thread, and [hint, hint]) were able to identify problem areas he's run across in test form, that would be most appreciated as well! :-) Cheers, Kevin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-02-21
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#63154 Remove unused solar.h reference in editeng in https://gerrit.libreoffice.org/8119 from Alexandre Vicenzi about module include + fdo#63154 Remove unused solar.h and replace sal_uLong in https://gerrit.libreoffice.org/8118 from Alexandre Vicenzi about module dbaccess, editeng, filter, framework, include, lotuswordpro, reportdesign, rsc, uui + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji about module sw End of freshness + fdo#70414: Add dependencies for solution and create solution for all proj in https://gerrit.libreoffice.org/8150 from Honza Havlíček about module bin + fdo#71077 wrong tips for some calc functions in https://gerrit.libreoffice.org/8143 from Winfried Donkers about module sc + fdo#74105 : Prservation of Numbered lists-Starting with Value '0' in https://gerrit.libreoffice.org/7710 from Pallavi Jadhav about module sw, writerfilter + Change semantics of GetGraphics in https://gerrit.libreoffice.org/8070 from Chris Sherlock about module vcl * Merged changes on master for project core changed in the last 25 hours: + Enable relative paths. in https://gerrit.libreoffice.org/8146 from Kevin Hunter Kesling + fdo#63154 Remove unused solar.h reference in tools in https://gerrit.libreoffice.org/8135 from Alexandre Vicenzi + Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxx in https://gerrit.libreoffice.org/7933 from Tobias Lippert + Add missing files to gallery bullets makefile in https://gerrit.libreoffice.org/8125 from Maxim Monastirsky + fdo#75195 PDF import: Revert commit 128adf7e5c06fff378c8d72b44ec4be1e4629 in https://gerrit.libreoffice.org/8126 from Vort + fdo#63154 Remove unused solar.h ref. in tools in https://gerrit.libreoffice.org/8134 from Alexandre Vicenzi * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + upgrade liborcus in https://gerrit.libreoffice.org/7310 from Markus Mohrhard + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + Export CoreText-related SPI stuff in https://gerrit.libreoffice.org/7143 from Douglas Mencken + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 7 commits - basctl/source config_host/config_options.h.in config_host.mk.in configure.ac external/libpng idl/source sc/source sc/util sd/source sfx2/source solenv/gbuil
basctl/source/basicide/basidesh.cxx |2 +
config_host.mk.in |1
config_host/config_options.h.in | 15
configure.ac|8 ++
external/libpng/StaticLibrary_png.mk|1
idl/source/objects/types.cxx|2 -
sc/source/ui/app/typemap.cxx|2 +
sc/source/ui/vba/service.cxx| 18 ---
sc/source/ui/vba/vbaeventshelper.cxx| 17 --
sc/source/ui/vba/vbaglobals.cxx | 18 +--
sc/source/ui/vba/vbatextframe.cxx | 12 --
sc/util/vbaobj.component|9 +--
sd/source/core/typemap.cxx |1
sfx2/source/appl/appbas.cxx |2 +
solenv/gbuild/platform/unxgcc.mk|1
starmath/source/typemap.cxx |2 +
svx/source/form/typemap.cxx |2 +
sw/source/ui/shells/slotadd.cxx |1
sw/source/ui/vba/vbaglobals.cxx |6 +
vbahelper/source/msforms/vbabutton.cxx | 38
vbahelper/source/msforms/vbabutton.hxx |4 +--
vbahelper/source/msforms/vbacontrol.cxx |4 +--
22 files changed, 87 insertions(+), 79 deletions(-)
New commits:
commit f96926c1c22a1bceea42f4ebd5ec610d48833c18
Author: Matúš Kukan matus.ku...@collabora.com
Date: Fri Feb 21 00:10:57 2014 +0100
vbaobj: One more ctor feature for ScVbaGlobals.
Change-Id: I741d1e0af1d6f631b321b76172b988262c0f709f
diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx
index 31e28d3..76dbc359 100644
--- a/sc/source/ui/vba/service.cxx
+++ b/sc/source/ui/vba/service.cxx
@@ -46,10 +46,6 @@ namespace window
{
extern sdecl::ServiceDecl const serviceDecl;
}
-namespace globals
-{
-extern sdecl::ServiceDecl const serviceDecl;
-}
namespace hyperlink
{
extern sdecl::ServiceDecl const serviceDecl;
@@ -66,7 +62,7 @@ extern C
registry::XRegistryKey * pRegistryKey )
{
void* pRet = component_getFactoryHelper(
-pImplName, pServiceManager, pRegistryKey, range::serviceDecl,
workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl,
window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
+pImplName, pServiceManager, pRegistryKey, range::serviceDecl,
workbook::serviceDecl, worksheet::serviceDecl, window::serviceDecl,
hyperlink::serviceDecl, application::serviceDecl );
return pRet;
}
}
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index 919da33..334338c 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include vbahelper/helperdecl.hxx
#include vbaglobals.hxx
#include sal/macros.h
@@ -288,14 +287,12 @@ ScVbaGlobals::getServiceNames()
return aServiceNames;
}
-namespace globals
+extern C SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+ScVbaGlobals_get_implementation(
+css::uno::XComponentContext *context,
+css::uno::Sequencecss::uno::Any const arguments)
{
-namespace sdecl = comphelper::service_decl;
-sdecl::vba_service_class_ScVbaGlobals, sdecl::with_argstrue serviceImpl;
-extern sdecl::ServiceDecl const serviceDecl(
-serviceImpl,
-ScVbaGlobals,
-ooo.vba.excel.Globals );
+return cppu::acquire(new ScVbaGlobals(arguments, context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/util/vbaobj.component b/sc/util/vbaobj.component
index 07769a3..4e250aa 100644
--- a/sc/util/vbaobj.component
+++ b/sc/util/vbaobj.component
@@ -26,7 +26,8 @@
constructor=ScVbaEventsHelper_get_implementation
service name=com.sun.star.script.vba.VBASpreadsheetEventProcessor/
/implementation
- implementation name=ScVbaGlobals
+ implementation name=ScVbaGlobals
+ constructor=ScVbaGlobals_get_implementation
service name=ooo.vba.excel.Globals/
/implementation
implementation name=ScVbaHyperlink
commit 65a43d682f979bfb6189dfc4e138ad9ac34adcae
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Feb 20 23:59:52 2014 +0100
Linking globals named 'sDocCtxName': symbol multiply defined!
Change-Id: Ib199ecb02b0e0f8382fcf1702652d9ad0fcb1765
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index 813eb1c..919da33 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -42,16 +42,15 @@ using namespace ::ooo::vba;
//
=
//ScVbaGlobals::ScVbaGlobals( css::uno::Reference
css::uno::XComponentContext const rxContext, ) : ScVbaGlobals_BASE(
uno::Reference XHelperInterface (), rxContext )
-OUString sDocCtxName( ExcelDocumentContext );
-ScVbaGlobals::ScVbaGlobals( uno::Sequence uno::Any const
Re: [Libreoffice-qa] 'free' testing on Moztrap
Hi, Le 19/02/2014 16:43, mariosv a écrit : El 19/02/14 15:37, sophi [via Document Foundation Mail Archive] escribió: Hi all, I'm still reviewing the test we have in Moztrap and increasing them. Because of the amount of bugs we had on Calc, we discussed about 'free' tests on Moztrap where the tester just test one of his document and report in Moztrap what's work/fail. Unfortunately, it will be impossible for me to track the feedback in case of failures and make a report on BZ based on it. I can't reach the tester and I won't be able to reproduce with no clear steps and expected results. Have you some suggestions on how that testing could be made possible? Cheers Sophie ___ Hi Sphie, all. In my point of view, link in Moztrap to BZ samples files good for test. I think in this way could be easy in the future if one test fails, track their bug, reopen it, contact developer who patch it, etc. With a minimal expense of disk space, avoiding file duplication. We are green :-)?. Maybe better invest the time in make easier report bugs. Moztrap is done for people who are not able or who have no time to do more QA, and also is supposed to be for non English speakers in the future. Although may be it's possible to separate the tests, I'm not sure if it's the best to tied it to BZ for beginners or occasional testers in several languages. Thinking around, could be possible use bugzilla, specially when it will be in our administration, for have the test in it. It's a knowed administration, easy for search, for use as reference from bug reports, much more visibility when publish, one place less to administrate. I don't know but I think merits for take a think about. It's a good idea, but in my opinion separated from MozTrap which should stay a simple tool to participate in testing over regressions. Cheers Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Congratulations to our QA Volunteers!
The Document Foundation and the LibreOffice QA Team congratulate volunteers Thomas Hackert and Ahitagni Mandal on their contributions to our QA Triage Contest. We've sent each of them a Kiva Card (http://www.kiva.org/) and give them our hearty thanks for their work in helping us track-down and triage bugs before the release of LibreOffice to the public. LibreOffice QA holds Community Bug-hunting/Triage events 1-2 times each year in preparation for new releases of LibreOffice. We welcome all LibreOffice users to join us in testing new features and reviewing existing functionality to ensure that our final releases are a delight for all of our users. Events such as the QA Triage Contest are made possible by the gracious contributions of our partners and sponsors. We love to award small prizes and gifts to our Bug-hunting Event volunteers, and are interested in expanding our programming to give even more users an opportunity to get involved in the LibreOffice community. If you or your company are interested in sponsoring an event or providing prizes for our teams, please get in touch with Italo Vignoli italo.vign...@documentfoundation.org. Cheers, Robinson Tryon TDF QA Team Coordinator ___ 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 75175] UI: Options get cut off because window is too small
https://bugs.freedesktop.org/show_bug.cgi?id=75175 --- Comment #4 from Jeff jdorenb...@gmail.com --- (In reply to comment #2) tested under Win7x64 with 4.2.0.4 options menus are not cut off probably a Linux specific issue Version: 4.2.1.1 Build ID: 420m0(Build:1) Operating System: Ubuntu Version: 4.2.0.4 release are you reporting the bug against 4.2.1.1 or 4.2.0.4 or both? I'm not sure why two versions were listed, but to clarify, the current installed version I have is 4.2.1.1 and that's what I'm reporting this bug from. However, I've noticied this issue since I upgraded, so any version of 4.2.x that I had installed was affected. -- 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 75035] LibreOffice missing shortcut
https://bugs.freedesktop.org/show_bug.cgi?id=75035 --- Comment #2 from ari.al...@gmail.com --- Everything is OK now. Problem disappeared when I turned the power off and restarted my computer. With kind regards,Ari. 2014-02-19 20:59 GMT+02:00 bugzilla-dae...@freedesktop.org: tommy27 ba...@quipo.it changed bug 75035https://bugs.freedesktop.org/show_bug.cgi?id=75035 What Removed Added Status UNCONFIRMED NEEDINFO Ever confirmed 1 -- You are receiving this mail because: - You reported the bug. -- 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 75035] LibreOffice missing shortcut
https://bugs.freedesktop.org/show_bug.cgi?id=75035 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME --- Comment #3 from tommy27 ba...@quipo.it --- ok. setting as RESOLVED -- 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 74528] FILEIMPORT: HTML, FILEEXPORT: XHTML results in output that gives doctype syntax error
https://bugs.freedesktop.org/show_bug.cgi?id=74528 --- Comment #2 from Qubit qu...@runcibility.com --- Created attachment 94414 -- https://bugs.freedesktop.org/attachment.cgi?id=94414action=edit Attempt at XHTML output (In reply to comment #1) (In reply to comment #0) Line Number 1, Column 62:!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN -^ This suggests that the file was produced by internal HTML export, not the XHTML XSLT export. But I have no idea how this could have happened if you really used export to xhtml... I am surprised as well... :-) I tested using attachment 78645 [details] from bug 64067. I had trouble opening the file in the GUI, so I did the conversion headless on the command line: ./soffice --headless --convert-to xhtml index.html This produces well-formed XHTML file here. Could you attach your output? Output compressed and attached as index.xhtml.zip -- 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 74528] FILEIMPORT: HTML, FILEEXPORT: XHTML results in output that gives doctype syntax error
https://bugs.freedesktop.org/show_bug.cgi?id=74528 Qubit qu...@runcibility.com changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED CC||qu...@runcibility.com Ever confirmed|1 |0 --- Comment #3 from Qubit qu...@runcibility.com --- (In reply to comment #1) ./soffice --headless --convert-to xhtml index.html This produces well-formed XHTML file here. Could you attach your output? For reference, I'm using 4.2.0.4 on Ubuntu 12.04.3 (x86_64). (Moving Status back to UNCONFIRMED) -- 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 75249] New: Search, search and replace. Typing in search words, is difficult or nearly impossible.
https://bugs.freedesktop.org/show_bug.cgi?id=75249 Priority: medium Bug ID: 75249 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Search, search and replace. Typing in search words, is difficult or nearly impossible. Severity: normal Classification: Unclassified OS: Linux (All) Reporter: davidhoch...@googlemail.com Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 3.6.2.2 release Component: Libreoffice Product: LibreOffice When trying to type in a search word or phrase, then the previous search term ist highlighted and makes it impossible to type in the new word.But if you have finally made it to enter a new word, then, after pressing Enter or find and replace, libreoffice jumps back to the previous search term. -- 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 75188] FORMATTING: Use of master slides
https://bugs.freedesktop.org/show_bug.cgi?id=75188 --- Comment #6 from Cor Nouws c...@nouenoff.nl --- (In reply to comment #5) I shall spend this weekend working on a report of what sort of improvements this system within Impress could use. Thanks, thaat would be great! If your request for me to suggest as to how it can be done is a request for me to suggest coding, I'm afraid I don't have much experience in that area at all. No that is not what I meant. As such, good and clear reports are very useful. For people in the UX, team, developers looking through the open issues. One clear well worked out report is wordt more then a dozen half baken ones ;) Cor -- 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 75188] FORMATTING: Use of master slides
https://bugs.freedesktop.org/show_bug.cgi?id=75188 --- Comment #7 from Cor Nouws c...@nouenoff.nl --- (In reply to comment #6) One clear well worked out report is worth more then a dozen half baken ones ;) (sorry for the typos) -- 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 74654] PDF Security options (can't print file)
https://bugs.freedesktop.org/show_bug.cgi?id=74654 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Whiteboard|BSA PossibleRegression |Bibisectrequest CC||c...@nouenoff.nl Keywords||regression -- 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 61369] EDITING Paste Special does not work in outline mode - pasting with formatting can be annoying here
https://bugs.freedesktop.org/show_bug.cgi?id=61369 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Whiteboard||BSA, ProposedEasyHack Severity|minor |normal CC||c...@nouenoff.nl Summary|Paste Special does not work |EDITING Paste Special does |in outline mode |not work in outline mode - ||pasting with formatting can ||be annoying here Version|3.6.2.2 release |Inherited From OOo --- Comment #2 from Cor Nouws c...@nouenoff.nl --- It's already broken in OOo 3.3.0 Lately in LibreOffice the menu Edit Paste special has been disabled. However, it's a very convenient view to work in with texts, but pasting when formatting can't be omited, sometimes is a PITA there.. So I set this to normal and to proposed easy hack. -- 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 73462] Libre Office SDK not able to convert files having special character #, $
https://bugs.freedesktop.org/show_bug.cgi?id=73462 --- Comment #6 from Vikram j.vik...@samsung.com --- Hello File name having url test#.doc was renamed as test%23.doc, test###.doc to test%23%23%23.doc, test#$.doc to test%23%24.doc On converting these documents to PDF, corrupt files gets genearetd which do not have any extension Libre Office should have produce PDFs:test#.pdf, test###.pdf and test#$.pdf respectivrly but it forms file with name 'test' in each case with no file type. Regards Vikram -- 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 73462] Libre Office SDK not able to convert files having special character #, $
https://bugs.freedesktop.org/show_bug.cgi?id=73462 --- Comment #7 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #6) File name having url test#.doc was renamed as test%23.doc, test###.doc to test%23%23%23.doc, test#$.doc to test%23%24.doc On converting these documents to PDF, corrupt files gets genearetd which do not have any extension Hard to comment on this without seeing your code. -- 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 73462] Libre Office SDK not able to convert files having special character #, $
https://bugs.freedesktop.org/show_bug.cgi?id=73462 --- Comment #8 from Vikram j.vik...@samsung.com --- Hello APIs calls made are: 1. loadComponentFromURL 2. storeToURL are being use for conerting docuemnt to PDF. If file name does not have '#', '$', then pdf is formed correctly otherwise corrupt file is forming. Regards Vikram -- 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 73462] Libre Office SDK not able to convert files having special character #, $
https://bugs.freedesktop.org/show_bug.cgi?id=73462 --- Comment #9 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #8) APIs calls made are: 1. loadComponentFromURL 2. storeToURL are being use for conerting docuemnt to PDF. If file name does not have '#', '$', then pdf is formed correctly otherwise corrupt file is forming. Attaching a minimal, working reproducer here would make it much more likely that somebody will actually look at the problem. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75250] New: SaveAs dialog too big for netbook screen (1280x600)
https://bugs.freedesktop.org/show_bug.cgi?id=75250 Priority: medium Bug ID: 75250 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: SaveAs dialog too big for netbook screen (1280x600) Severity: normal Classification: Unclassified OS: Linux (All) Reporter: 2460...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.1.2.3 release Component: Writer Product: LibreOffice Created attachment 94420 -- https://bugs.freedesktop.org/attachment.cgi?id=94420action=edit Save As dialog box going off screen at the bottom The save as dialog box is too large for the screen. See attatched images. Interestingly, when I went to save the screen shot, the same dialog box came up but it *did* fit on the screen. The extra format options in LO take up the extra space. -- 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 75250] SaveAs dialog too big for netbook screen (1280x600)
https://bugs.freedesktop.org/show_bug.cgi?id=75250 --- Comment #1 from 2460...@gmail.com --- Created attachment 94421 -- https://bugs.freedesktop.org/attachment.cgi?id=94421action=edit Save As dialog box from the screenshot utility fits just right -- 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 72884] FILEOPEN: Very long opening - opening time five minutes
https://bugs.freedesktop.org/show_bug.cgi?id=72884 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #11 from Michael Meeks michael.me...@collabora.com --- As with all of these we need a callgrind trace of this opening under Linux with a build with debugging symbols installed thus: export OOO_EXIT_POST_STARTUP=1 export OOO_DISABLE_RECOVERY=1 valgrind --tool=callgrind --simulate-cache=yes --dump-instr=yes ./soffice.bin --splash-pipe=0 my-test-file.doc zip and provide the callgrind.12345.txt file - hopefully the slowness jumps out of that =) Thanks -- 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 75250] SaveAs dialog too big for netbook screen (1280x600)
https://bugs.freedesktop.org/show_bug.cgi?id=75250 2460...@gmail.com changed: What|Removed |Added Attachment #94420|text/plain |image/png mime type|| -- 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 73462] Libre Office SDK not able to convert files having special character #, $
https://bugs.freedesktop.org/show_bug.cgi?id=73462 --- Comment #10 from Vikram j.vik...@samsung.com --- Hello Similar iisue is oberved while converting files to PDF with libre office SDK/Editor. Reg -- 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 71356] SLIDESHOW OSX 10.9 dual monitor - both presentation and presenter console on the same monitor
https://bugs.freedesktop.org/show_bug.cgi?id=71356 --- Comment #10 from Foss f...@openmailbox.org --- I still can't seem to be able to reproduce the issue. Opening test file with Version: 4.2.1.1 then hit F5. Monitor 2 shows slideshow, Monitor 1 shows slideoverview, timing controls etc. so all good. 10.9.1 here as well. Tanel: Could you test and see how 4.2.1.1 behaves for you? -- 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 75174] PDF: PDF generate links from plain text URLs
https://bugs.freedesktop.org/show_bug.cgi?id=75174 Dominique Boutry dominique.bout...@laposte.net changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from Dominique Boutry dominique.bout...@laposte.net --- Reproduced with LibO 4.2.0.4 on Win7 -- 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 31206] Remove quickstarter systray icon for GNOME 3
https://bugs.freedesktop.org/show_bug.cgi?id=31206 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |INVALID --- Comment #5 from Caolán McNamara caol...@redhat.com --- fine, we don't enable it by default anymore and its deprecated, so its only really for old configs that get migrated forward -- 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 57635] FILEOPEN: Cell text formatting on xlsx files not opened correctly
https://bugs.freedesktop.org/show_bug.cgi?id=57635 Xisco Faulí aniste...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #2 from Xisco Faulí aniste...@gmail.com --- I close this bug report as WORKSFORME because it is no longer reproducible. Tested on: - Libreoffice 4.1.4.2 Build ID: 0a0440ccc0227ad9829de5f46be37cfb6edcf72 - Libreoffice 4.2.0.4 Build ID: 05dceb5d363845f2cf968344d7adab8dcfb2ba71 - Libreoffice 4.3.0.0.alpha0+ Build ID: e076b5290e706b8a69abd397a9f255eba6a0cd1a Feel free to open this bug report again if you find that the bug is still reproducible under some special circumstances, etc. -- 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 75250] SaveAs dialog too big for netbook screen (1280x600)
https://bugs.freedesktop.org/show_bug.cgi?id=75250 --- Comment #2 from 2460...@gmail.com --- I just upgraded to 4.2.0.4 and the problem is still there. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73462] Libre Office SDK not able to convert files having special character #, $
https://bugs.freedesktop.org/show_bug.cgi?id=73462 --- Comment #11 from Vikram j.vik...@samsung.com --- In reply to comment Hard to comment on this without seeing your code. Attaching a minimal, working reproducer here would make it much more likely that somebody will actually look at the problem. Prblem with API storeToURL, is not converting files with special characters is generating corrupt files, if files is not having specail characters is not converting to pdf properly. If API is able to convert all the possible character to pdf and not special characters file names then above comments are strange observations -- 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 75162] [Accessibility] the root of a LibreOffice document must be of role document, not window
https://bugs.freedesktop.org/show_bug.cgi?id=75162
--- Comment #15 from James Teh ja...@nvaccess.org ---
(In reply to comment #14)
+{COMMENT, ROLE_SYSTEM_WINDOW /* ?FIXME? */ },
+{COMMENT_END, ROLE_SYSTEM_WINDOW /* ?FIXME? */ },
Jamie, what are the best mappings for these two?
First, ROLE_SYSTEM_WINDOW probably shouldn't be used by anything else except
oleacc. This role generally refers to the window itself, including the
non-client areas such as the title bar, system menu bar, application menu bar,
etc. If you need a fallback role for text stuff, I'd probably go with
IA2_ROLE_TEXT_FRAME.
As for these two, the best I can come up with for now is IA2_ROLE_NOTE. We've
never had to map these before. If it becomes an issue, we may need to try to
get new roles into the IA2 spec.
--
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 75167] Tools | Options | LibreOffice Calc | Calculate | Enable Regular Expressions in formulas setting not saved
https://bugs.freedesktop.org/show_bug.cgi?id=75167 Dominique Boutry dominique.bout...@laposte.net changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Dominique Boutry dominique.bout...@laposte.net --- Hi. I can't understand your sentence ...is not saved between exiting the spreadsheet.. Could you please provide a step by step ? Thanks -- 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 68467] Other: Font (Frutiger family) is displayed wrong on Mac OS X
https://bugs.freedesktop.org/show_bug.cgi?id=68467 --- Comment #9 from ulg...@gmx.net --- Created attachment 94424 -- https://bugs.freedesktop.org/attachment.cgi?id=94424action=edit calc showing text in an unexpected way -- 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
