[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/ui/app/inputhdl.cxx | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
New commits:
commit 2d7d1e59b908ee095e21a55101b380d2dc23008e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Aug 17 15:44:39 2012 -0400
fdo#48868: Allow Ctrl-TAB and Ctrl-Shift-TAB to cycle through candidates.
This applies to two scenarios: 1) cycling through cell values, and 2)
cycling through cell functions in a formula tip window. Both were broken
and this commit fixes both.
Change-Id: I7826efbada827b8ec3edc5f34a1876c84e5e6236
Reviewed-on: https://gerrit.libreoffice.org/441
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index ea0d830..727799a 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -129,6 +129,7 @@ ScTypedCaseStrSet::const_iterator findText(
size_t nPos = std::distance(rDataSet.begin(), itPos);
size_t nRPos = rDataSet.size() - 1 - nPos;
std::advance(it, nRPos);
+++it;
}
for (; it != itEnd; ++it)
@@ -150,7 +151,10 @@ ScTypedCaseStrSet::const_iterator findText(
{
ScTypedCaseStrSet::const_iterator it = rDataSet.begin(), itEnd =
rDataSet.end();
if (itPos != rDataSet.end())
+{
it = itPos;
+++it;
+}
for (; it != itEnd; ++it)
{
@@ -1223,9 +1227,12 @@ void ScInputHandler::NextFormulaEntry( bool bBack )
if ( pActiveView pFormulaData )
{
rtl::OUString aNew;
-miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula,
aAutoSearch, aNew, bBack);
-if (miAutoPosFormula != pFormulaData-end())
-ShowTip( aNew );// als QuickHelp anzeigen
+ScTypedCaseStrSet::const_iterator itNew = findText(*pFormulaData,
miAutoPosFormula, aAutoSearch, aNew, bBack);
+if (itNew != pFormulaData-end())
+{
+miAutoPosFormula = itNew;
+ShowTip(aNew); // Display a quick help.
+}
}
// bei Tab wird vorher immer HideCursor gerufen
@@ -1633,9 +1640,13 @@ void ScInputHandler::NextAutoEntry( bool bBack )
if ( aSel.nEndPos == nParLen aText.getLength() ==
aAutoSearch.getLength() + nSelLen )
{
rtl::OUString aNew;
-miAutoPosColumn = findText(*pColumnData, miAutoPosColumn,
aAutoSearch, aNew, bBack);
-if (miAutoPosColumn != pColumnData-end())
+ScTypedCaseStrSet::const_iterator itNew =
+findText(*pColumnData, miAutoPosColumn, aAutoSearch,
aNew, bBack);
+
+if (itNew != pColumnData-end())
{
+// match found!
+miAutoPosColumn = itNew;
bInOwnChange = true;// disable ModifyHdl
(reset below)
lcl_RemoveLineEnd( aNew );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC-UDPATE](17.08) Impress Remote
On 08/20/2012 05:00 PM, Michael Meeks wrote: One issue is powering up bluetooth on Android: documentation insists that you ask the user to switch on bluetooth: one option is to add an item Search for Bluetooth devices on the selection screen which does this, or alternatively to just ask the user every single time the app is started. I -imagine- that UX wise, enabling bluetooth during a pairing flow, and disabling it again if we don't connect is perhaps the best plan from a UX battery perspective ? Yes, as far as I know, you have to ask the user to turn on Bluetooth. You could create an Intent to show the Settings page for the user to do it. On the battery side: powering the radio down or going to lower power modes is handled by the lower stack, at least for the first round we shouldn't be too concerned about this, I guess (?) Regards, Muthu Subramanian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to handle this - gerrit review on libreoffice-3-6 branch
On Tue, Aug 21, 2012 at 11:12 PM, Kohei Yoshida kohei.yosh...@gmail.com wrote: Hi there, I just noticed this while browsing gerrit: https://gerrit.libreoffice.org/#/c/441/ which is the patch I requested to be reviewed for the 3-6 branch. What's the procedure for handling a backport to a release branch when using gerrit? kohei, the patch above is already destined fro the branch libreoffice-3-6 in gerrit... so all that is needed is a +1 from someone else (as usual for these), and then 'submit' -- which I just did :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#48868: Allow Ctrl-TAB and Ctrl-Shift-TAB to cycle throug...
From Norbert Thiebaud nthieb...@gmail.com: Norbert Thiebaud has submitted this change and it was merged. Change subject: fdo#48868: Allow Ctrl-TAB and Ctrl-Shift-TAB to cycle through candidates. .. fdo#48868: Allow Ctrl-TAB and Ctrl-Shift-TAB to cycle through candidates. This applies to two scenarios: 1) cycling through cell values, and 2) cycling through cell functions in a formula tip window. Both were broken and this commit fixes both. Change-Id: I7826efbada827b8ec3edc5f34a1876c84e5e6236 --- M sc/source/ui/app/inputhdl.cxx 1 file changed, 16 insertions(+), 5 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/441 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7826efbada827b8ec3edc5f34a1876c84e5e6236 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help Locating Base Code
Hi Joel, On 2012-08-21 at 11:10 -0700, Joel Madero wrote: Thanks to everyone who helped me along the way. The code actually ended up being in formcomponenthandler.cxx, FormComponentPropertyHandler::impl_browseImage_nothrow. Great to hear; I hope I did not mislead you too much - that was the other occurrence of FILEOPEN_LINK_PREVIEW/CHECKBOX_LINK :-) I think we need to start looking for a database expert, someone who enjoys it and is willing to get into the grit of the crappy code. Any takers ? ;) Oh - database expert, that's Lionel :-) But of course, having more database experts would be great! I'll get the patch done tonight after I clear all the other stuff I was testing with, going to attempt gerritt for the first time. Looking forward to the patch! All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: unotools/inc unotools/source
unotools/inc/unotools/ucbhelper.hxx |7 +++
unotools/source/ucbhelper/ucbhelper.cxx | 17 -
2 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 27c7682e5e5859eb353443d6091143694a56bee8
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Aug 22 09:11:23 2012 +0200
fdo#46249: UCBContentHelper::GetTitle must not fail for void property
This was a regression introduced with
2af9040d38af7c7353855415dbea0134585058f3
Cleaned up utl::UCBContentHelper. GetSize exhibited the same problem and
has
also been fixed. IsYounger exhibits a similar problem, but has not been
addressed, as it is unclear what to return in case no dates can be
compared; it
is only used in one place (handling SID_EDITDOC in
SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it
appears,
only contents for which DateModified /does/ yield a non-void value are
relevant.
Change-Id: Iff9f5e1ed6f45eede117713d64a265b98f6862b1
diff --git a/unotools/inc/unotools/ucbhelper.hxx
b/unotools/inc/unotools/ucbhelper.hxx
index 9bf80c2..084db94 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -38,6 +38,10 @@ UNOTOOLS_DLLPUBLIC bool IsDocument(rtl::OUString const
url);
UNOTOOLS_DLLPUBLIC bool IsFolder(rtl::OUString const url);
+/// @param title must not be null
+/// @return true iff title has been set (i.e., if obtaining the Title
property
+/// of the given content yields a non-void value without raising a
+/// non-RuntimeException; RuntimeExceptions are passed through)
UNOTOOLS_DLLPUBLIC bool GetTitle(
rtl::OUString const url, rtl::OUString * title);
@@ -50,6 +54,9 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
ucbhelper::Content parent, rtl::OUString const title,
ucbhelper::Content result, bool exclusive = false);
+/// @return the value of the Size property of the given content, or zero if
+/// obtaining the property yields a void value or raises a
+/// non-RuntimeException (RuntimeExceptions are passed through)
UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(rtl::OUString const url);
UNOTOOLS_DLLPUBLIC bool IsYounger(
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx
b/unotools/source/ucbhelper/ucbhelper.cxx
index 408e51f..0709caa 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -191,11 +191,7 @@ bool utl::UCBContentHelper::GetTitle(
{
assert(title != 0);
try {
-*title = content(url).
-getPropertyValue(
-rtl::OUString(Title)).
-getrtl::OUString();
-return true;
+return content(url).getPropertyValue(rtl::OUString(Title)) =
*title;
} catch (css::uno::RuntimeException const ) {
throw;
} catch (css::ucb::CommandAbortedException const ) {
@@ -300,10 +296,13 @@ bool utl::UCBContentHelper::MakeFolder(
sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const url) {
try {
-return
-content(url).getPropertyValue(
-rtl::OUString(Size)).
-getsal_Int64();
+sal_Int64 n = 0;
+bool ok = (content(url).getPropertyValue(rtl::OUString(Size)) = n);
+SAL_INFO_IF(
+!ok, unotools,
+UCBContentHelper::GetSize( url
+ ): Size cannot be determined);
+return n;
} catch (css::uno::RuntimeException const ) {
throw;
} catch (css::ucb::CommandAbortedException const ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - configure.in
configure.in | 85 +++
1 file changed, 57 insertions(+), 28 deletions(-)
New commits:
commit 9a20a1e1a96be6c5d79a9f19a536089a85960f3d
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed Aug 22 03:51:09 2012 -0500
tolerate pkg-config on MacOSX when building mozilla, and allow to overide
Change-Id: Ia1c47ccda6c1fd94e8f4b1b6e6c1650abf791c74
diff --git a/configure.in b/configure.in
index 62ec6a2..87ddf13 100644
--- a/configure.in
+++ b/configure.in
@@ -1085,6 +1085,11 @@ AC_ARG_ENABLE(liblangtag,
implementation.]),
)
+AC_ARG_ENABLE(bogus-pkg-config,
+AS_HELP_STRING([--enable-bogis-pkg-config],
+[MACOSX only: on MacOSX pkg-config can cause trouble. by default if
one is found in the PATH, an error is issued. This flag turn that error into a
warning.]),
+)
+
dnl ===
dnl Optional Packages (--with/without-)
dnl ===
@@ -4413,7 +4418,16 @@ if test $_os = Darwin -a $enable_mozilla = no; then
if test $PKG_CONFIG = /usr/bin/pkg-config ls -l
/usr/bin/pkg-config | $GREP -q Mono.framework; then
AC_MSG_ERROR([yes, from Mono. This *will* break the build. Please
remove or hide $PKG_CONFIG])
else
-AC_MSG_ERROR([yes, from unknown origin. This *will* break the
build. Please remove or hide $PKG_CONFIG])
+if test $enable_mozilla = yes; then
+AC_MSG_RESULT([yes, from unkown origin])
+add_warning Having a $PKG_CONFIG might have unexpected
consequences, please consider hiding it
+else
+if test $enable_bogus_pkg_config = yes; then
+AC_MSG_RESULT([yes, user-approved from unkown origin.])
+else
+ AC_MSG_ERROR([yes, from unknown origin. This *will* break
the build. Please remove or hide $PKG_CONFIG])
+fi
+fi
fi
else
AC_MSG_RESULT([no, good])
commit cf415295e71c5fa95d2ac3b2963ad20f96891acc
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed Aug 22 03:22:24 2012 -0500
cosmetic: consistant configure message related to Mozilla
Change-Id: I589bd95e0cb9b2bf534f76ebcb4f6bd28edf5370
diff --git a/configure.in b/configure.in
index f59f049..62ec6a2 100644
--- a/configure.in
+++ b/configure.in
@@ -8047,7 +8047,8 @@ dnl
===
dnl Check for system mozilla headers
dnl ===
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=
-AC_MSG_CHECKING([which mozilla headers to use])
+AC_MSG_CHECKING([which Mozilla headers to use])
+
if test $with_system_mozilla_headers = yes; then
AC_MSG_RESULT([external])
SYSTEM_MOZILLA_HEADERS=YES
@@ -8083,7 +8084,11 @@ if test $with_system_mozilla_headers = yes; then
CFLAGS=$save_CFLAGS
AC_LANG_POP([C])
else
-AC_MSG_RESULT([internal])
+if test $enable_mozilla = no; then
+AC_MSG_RESULT([none])
+else
+AC_MSG_RESULT([internal])
+fi
SYSTEM_MOZILLA_HEADERS=NO
fi
AC_SUBST(MOZILLA_HEADERS_CFLAGS)
commit 65335b13da74f4f350ba52493b0919a62d1a5bca
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed Aug 22 03:21:08 2012 -0500
restore printing a summary of the imprtant warnings at the end of autogen
Change-Id: Ie0e257d0b2cf961dfe5907e7af7ffa8795be62f7
diff --git a/configure.in b/configure.in
index 65a7325..f59f049 100644
--- a/configure.in
+++ b/configure.in
@@ -49,6 +49,16 @@ PathFormat()
fi
}
+have_WARNINGS=no
+add_warning()
+{
+if test $have_WARNINGS = no ; then
+echo * warn
+fi
+have_WARNINGS=yes
+echo * WARNING : $@ warn
+}
+
if test -n $SOLARENV ; then
AC_MSG_ERROR([You have sourced config_host.mk in this shell. This may
lead to trouble, please run in a fresh (login) shell.])
fi
@@ -86,8 +96,6 @@ AC_SUBST(SRC_ROOT)
AC_SUBST(EXEEXT_FOR_BUILD)
AC_SUBST(x_Cygwin)
-cat /dev/null warn
-
if test z$EUID = z0 -a `uname -o 2/dev/null` = Cygwin; then
AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an
administrative account])
fi
@@ -2386,17 +2394,17 @@ if test $CCACHE != ; then
if test $ccache_size -lt 1024; then
CCACHE=
AC_MSG_WARN([ccache's cache size is less than 1GB using it is
counter-producive: Disabling auto-ccache detection])
-echo ccache's cache size is less than 1GB using it is
counter-producive: auto-ccache detection disabled warn
+add_warning ccache's cache size is less than 1GB using it is
counter-producive: auto-ccache detection disabled
else
# warn that ccache may be too small for debug build
AC_MSG_WARN([ccache's cache size is less than 5GB using it
Re: Help Locating Base Code
Oh - database expert, that's Lionel :-) But of course, having more database experts would be great! I intended that to be me. Having spent more than twenty years writing them I thought I might qualify. I'm reading the lists (here, dev qa) regularly, but unfortunately at the moment I'm bogged down in a new system launch and some consulting. I hope to be here in a month or two. Regards Mark Stanton ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 35079, which changed state. Bug 35079 Summary: EDITING: Drawing element completely in mouse selection frame not selected https://bugs.freedesktop.org/show_bug.cgi?id=35079 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
[PATCH] Change in core[libreoffice-3-6]: fdo#51777: add a hack for 1 twip DOUBLE borders:
From Michael Stahl mst...@redhat.com: Michael Stahl has uploaded a new change for review. Change subject: fdo#51777: add a hack for 1 twip DOUBLE borders: .. fdo#51777: add a hack for 1 twip DOUBLE borders: Arguably such annoyingly thin double borders don't make much sense anyway, because they're essentially 2 hairlines with ~no space between, but unfortunately older LO versions are able to create them; since the refactoring in 2d045cdb69176b280812dda0b813371cf1ac72e2, which changed the BorderWidthImpl::Get* methods to return 0 due to rounding, they were ignored at least in the HTML import, which is a regression. So add a special purpose hack that essentially rounds up the first line to 1 but not the other lines so the visual result is a hairline single border. Change-Id: I20ac4675bcf67ea58a6931a40bff3605390e9c0d (cherry picked from commit 601bfe2ce3113719b2f8edaba2ccb6b630051a9a) --- M svtools/source/control/ctrlbox.cxx M sw/source/filter/html/htmltab.cxx 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/451/1 -- To view, visit https://gerrit.libreoffice.org/451 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I20ac4675bcf67ea58a6931a40bff3605390e9c0d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#53888: fix YaccTarget/LexTarget dependencies:
From Michael Stahl mst...@redhat.com: Michael Stahl has uploaded a new change for review. Change subject: fdo#53888: fix YaccTarget/LexTarget dependencies: .. fdo#53888: fix YaccTarget/LexTarget dependencies: These cannot be order only because if the source file is changed the generated cxx file has to be recompiled as well. Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379 (cherry picked from commit cd0046bca0691fdca45a030903b7cde3bfee544c) --- M solenv/gbuild/LinkTarget.mk 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/450/1 -- To view, visit https://gerrit.libreoffice.org/450 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/inc
svx/inc/svx/polypolygoneditor.hxx |2 --
svx/inc/svx/svdmark.hxx |2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 4f9e522bef181e64f2ed0e0874202a6246d23608
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Aug 22 12:08:36 2012 +0200
Use typedef instead of trivial inheritance
Change-Id: I66155e362d5f44f9be8114099c46473ac846340c
diff --git a/svx/inc/svx/polypolygoneditor.hxx
b/svx/inc/svx/polypolygoneditor.hxx
index 0d768f0..94fabbe 100644
--- a/svx/inc/svx/polypolygoneditor.hxx
+++ b/svx/inc/svx/polypolygoneditor.hxx
@@ -27,8 +27,6 @@
#include basegfx/polygon/b2dpolypolygon.hxx
#include set
-class SdrUShortCont;
-
namespace sdr
{
diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx
index ffae34c..81121c1 100644
--- a/svx/inc/svx/svdmark.hxx
+++ b/svx/inc/svx/svdmark.hxx
@@ -43,7 +43,7 @@ class SdrObjList;
class SdrObject;
class SdrPageView;
-class SdrUShortCont : public std::setsal_uInt16 {};
+typedef std::setsal_uInt16 SdrUShortCont;
// Alles was eine View ueber ein markiertes Objekt wissen muss
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-5]: fdo#46249: UCBContentHelper::GetTitle must not fail for void...
From Stephan Bergmann sberg...@redhat.com: Stephan Bergmann has uploaded a new change for review. Change subject: fdo#46249: UCBContentHelper::GetTitle must not fail for void property .. fdo#46249: UCBContentHelper::GetTitle must not fail for void property This was a regression introduced with 2af9040d38af7c7353855415dbea0134585058f3 Cleaned up utl::UCBContentHelper. GetSize exhibited the same problem and has also been fixed. IsYounger exhibits a similar problem, but has not been addressed, as it is unclear what to return in case no dates can be compared; it is only used in one place (handling SID_EDITDOC in SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it appears, only contents for which DateModified /does/ yield a non-void value are relevant. (cherry picked from commit 27c7682e5e5859eb353443d6091143694a56bee8) Conflicts: unotools/source/ucbhelper/ucbhelper.cxx Change-Id: I748745a1d7f361f8f91be87d7356983ee7261b1e --- M unotools/inc/unotools/ucbhelper.hxx M unotools/source/ucbhelper/ucbhelper.cxx 2 files changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/452/1 -- To view, visit https://gerrit.libreoffice.org/452 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I748745a1d7f361f8f91be87d7356983ee7261b1e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC-UDPATE](17.08) Impress Remote
On Wed, 2012-08-22 at 08:36 +0300, Tor Lillqvist wrote: If it's ok with everyone I'm going to include cleaned bluetooth headers, from android, in the source tree to avoid the need for installing a library which isn't actually linked or used. (Headers viewable ... Sorry for replying late, but I am a bit unsure about this. Is it really a good idea to have these cleaned header copies in our tree? For licensing reasons - yes, if only of perception not reality. If Google has cleaned them, it makes me happier. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - basic/source
basic/source/comp/dim.cxx|4 ++--
basic/source/comp/parser.cxx |2 +-
basic/source/comp/symtbl.cxx |8
basic/source/comp/token.cxx | 20 ++--
basic/source/inc/symtbl.hxx | 22 +++---
basic/source/inc/token.hxx | 30 ++
basic/source/runtime/basrdll.cxx |6 +++---
basic/source/runtime/methods.cxx | 12 ++--
basic/source/sbx/sbxvalue.cxx| 30 --
basic/source/sbx/sbxvar.cxx |2 +-
10 files changed, 52 insertions(+), 84 deletions(-)
New commits:
commit 407509c058c44182859e90a89a6ddb2b28edc053
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Aug 22 19:20:19 2012 +0900
sal_Bool to bool
Change-Id: I75dd089b34c94831bfdfd0e02585af7609013a08
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 5ca13e5..70d441e 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -845,7 +845,7 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
Error( SbERR_UNEXPECTED, ALIAS );
if( pDef-IsCdecl() )
Error( SbERR_UNEXPECTED, _CDECL_ );
-pDef-SetCdecl( sal_False );
+pDef-SetCdecl( false );
pDef-GetLib().Erase();
pDef-GetAlias().Erase();
}
@@ -856,7 +856,7 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
Error( SbERR_UNEXPECTED, ALIAS );
if( pDef-IsCdecl() )
Error( SbERR_UNEXPECTED, _CDECL_ );
-pDef-SetCdecl( sal_False );
+pDef-SetCdecl( false );
pDef-GetAlias().Erase();
}
// Brackets?
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index f642182..c1f1752 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -342,7 +342,7 @@ bool SbiParser::Parse()
Next(); return true;
}
-if( !bSingleLineIf MayBeLabel( sal_True ) )
+if( !bSingleLineIf MayBeLabel( true ) )
{
// is a label
if( !pProc )
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index fe47cbc..395f19a 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -51,7 +51,7 @@ const rtl::OUString SbiStringPool::Find( sal_uInt32 n ) const
return aData[n - 1];
}
-short SbiStringPool::Add( const rtl::OUString rVal, sal_Bool bNoCase )
+short SbiStringPool::Add( const rtl::OUString rVal, bool bNoCase )
{
sal_uInt32 n = aData.size();
for( sal_uInt32 i = 0; i n; ++i )
@@ -372,7 +372,7 @@ SbiSymScope SbiSymDef::GetScope() const
// 3) aLabels: labels
SbiProcDef::SbiProcDef( SbiParser* pParser, const String rName,
-sal_Bool bProcDecl )
+bool bProcDecl )
: SbiSymDef( rName )
, aParams( pParser-aGblStrings, SbPARAM ) // is dumped
, aLabels( pParser-aLclStrings, SbLOCAL ) // is not dumped
@@ -385,8 +385,8 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const String
rName,
nLine2 = 0;
mePropMode = PROPERTY_MODE_NONE;
bPublic = true;
-bCdecl = sal_False;
-bStatic = sal_False;
+bCdecl = false;
+bStatic = false;
// For return values the first element of the parameter
// list is always defined with name and type of the proc
aParams.AddSym( aName );
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index b6b5989..0de57e6 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -213,10 +213,10 @@ SbiTokenizer::SbiTokenizer( const ::rtl::OUString rSrc,
StarBASIC* pb )
{
pTokTable = aTokTable_Basic;
TokenTable *tp;
-bEof = bAs = sal_False;
+bEof = bAs = false;
eCurTok = NIL;
ePush = NIL;
-bEos = bKeywords = bErrorIsSymbol = sal_True;
+bEos = bKeywords = bErrorIsSymbol = true;
if( !nToken )
for( nToken = 0, tp = pTokTable; tp-t; nToken++, tp++ ) {}
}
@@ -329,15 +329,15 @@ SbiToken SbiTokenizer::Next()
if( !NextSym() )
{
-bEof = bEos = sal_True;
+bEof = bEos = true;
return eCurTok = EOLN;
}
if( aSym[0] == '\n' )
{
-bEos = sal_True; return eCurTok = EOLN;
+bEos = true; return eCurTok = EOLN;
}
-bEos = sal_False;
+bEos = false;
if( bNumber )
return eCurTok = NUMBER;
@@ -447,11 +447,11 @@ special:
eCurTok = tp-t;
// AS: data types are keywords
if( tp-t == AS )
-bAs = sal_True;
+bAs = true;
else
{
if( bAs )
-bAs = sal_False;
+bAs = false;
else if( eCurTok = DATATYPE1 eCurTok = DATATYPE2
(bErrorIsSymbol || eCurTok != _ERROR_) )
eCurTok = SYMBOL;
}
@@ -490,12 +490,12 @@ special:
#endif
-sal_Bool SbiTokenizer::MayBeLabel( sal_Bool bNeedsColon )
+bool SbiTokenizer::MayBeLabel( bool bNeedsColon )
{
if( eCurTok == SYMBOL ||
[PUSHED 3-6] Fix for fdo#48868
On Tue, 2012-08-21 at 09:35 -0400, Kohei Yoshida wrote: Review and cherry-pick appreciated. Ping. Found pushed :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/Library_svx.mk svx/source
svx/Library_svx.mk |1 + svx/source/inc/filtnav.hxx |1 - 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 01089138cc76f5717244bd04f25a868602aeaab6 Author: Michael Stahl mst...@redhat.com Date: Wed Aug 22 12:49:08 2012 +0200 fdo#53888: svx: fix dependencies: It appears that since cd0046bca0691fdca45a030903b7cde3bfee544c, 2 tinderboxes fail on including the generated sqlbison.hxx; it turns out one of the inclusions of that in svx is unnecessary and the other is used to call a virtual function, which can apparently be done without linking; just link svx to dbtools anyway, that should fix the build. Change-Id: I7f7b1c4e9561c4dd2b820b173d05bdd5d4c6ba6d diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index a26c1c3..fe3cba3 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ comphelper \ cppuhelper \ cppu \ +dbtools \ drawinglayer \ editeng \ i18nisolang1 \ diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index d1af0c9..cb80e29 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -48,7 +48,6 @@ #include vcl/dockwin.hxx #include svx/fmtools.hxx #include fmexch.hxx -#include connectivity/sqlparse.hxx #include sqlparserclient.hxx class FmFormShell; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basctl/source connectivity/source sd/source unusedcode.easy
basctl/source/basicide/baside2.cxx|5 -
basctl/source/basicide/baside2.hxx|2 --
connectivity/source/drivers/kab/KCatalog.cxx |7
---
connectivity/source/drivers/kab/KCatalog.hxx |2 --
connectivity/source/drivers/kab/KTable.cxx|7
---
connectivity/source/drivers/kab/KTable.hxx|1 -
sd/source/ui/slidesorter/controller/SlideSorterController.cxx |5 +++--
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx |2 +-
unusedcode.easy |6 +-
9 files changed, 5 insertions(+), 32 deletions(-)
New commits:
commit 7887a4e0adb0d60e6b013808dc27eccddd1c0324
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 22 11:46:50 2012 +0100
Resolves: rhbz#846775 Clipboard must be disposed before Selection
Change-Id: I968bc6da85cd444d504b08f85300a1fe251cdeee
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 10ca623..ae9a6e9 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -110,10 +110,10 @@ SlideSorterController::SlideSorterController
(SlideSorter rSlideSorter)
mpPageSelector(),
mpFocusManager(),
mpSlotManager(),
- mpClipboard(),
mpScrollBarManager(),
mpCurrentSlideManager(),
mpSelectionManager(),
+ mpClipboard(),
mpInsertionIndicatorHandler(new InsertionIndicatorHandler(rSlideSorter)),
mpAnimator(new Animator(rSlideSorter)),
mpVisibleAreaManager(new VisibleAreaManager(rSlideSorter)),
@@ -156,9 +156,9 @@ void SlideSorterController::Init (void)
mpPageSelector.reset(new PageSelector(mrSlideSorter));
mpFocusManager.reset(new FocusManager(mrSlideSorter));
mpSlotManager.reset(new SlotManager(mrSlideSorter));
-mpClipboard.reset(new Clipboard(mrSlideSorter));
mpScrollBarManager.reset(new ScrollBarManager(mrSlideSorter));
mpSelectionManager.reset(new SelectionManager(mrSlideSorter));
+mpClipboard.reset(new Clipboard(mrSlideSorter));
mpScrollBarManager-LateInitialization();
@@ -202,6 +202,7 @@ SlideSorterController::~SlideSorterController (void)
void SlideSorterController::Dispose (void)
{
mpInsertionIndicatorHandler-End(Animator::AM_Immediate);
+mpClipboard.reset();
mpSelectionManager.reset();
mpAnimator-Dispose();
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index f456cb4..bf3d844 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -243,10 +243,10 @@ private:
::boost::scoped_ptrPageSelector mpPageSelector;
::boost::scoped_ptrFocusManager mpFocusManager;
::boost::shared_ptrSlotManager mpSlotManager;
-::boost::scoped_ptrcontroller::Clipboard mpClipboard;
::boost::scoped_ptrScrollBarManager mpScrollBarManager;
mutable ::boost::shared_ptrCurrentSlideManager mpCurrentSlideManager;
::boost::shared_ptrSelectionManager mpSelectionManager;
+::boost::scoped_ptrcontroller::Clipboard mpClipboard;
::boost::shared_ptrInsertionIndicatorHandler mpInsertionIndicatorHandler;
::boost::shared_ptrAnimator mpAnimator;
::boost::scoped_ptrVisibleAreaManager mpVisibleAreaManager;
commit 78b2d4d00dfaebb42417a527e01a33ef24e34b7b
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 22 10:14:17 2012 +0100
callcatcher: update list
Change-Id: Id297f32de5fba9d17fec89d2f8ea21c5d1a2a4bc
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 95201da..2475ef6 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1417,11 +1417,6 @@ bool ModulWindow::IsReadOnly()
return GetEditView() GetEditView()-IsReadOnly();
}
-void ModulWindow::SetLineNumberDisplay(bool b)
-{
-aXEditorWindow.SetLineNumberDisplay(b);
-}
-
bool ModulWindow::IsPasteAllowed()
{
bool bPaste = false;
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 0319dd2..0ad755c 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -353,8 +353,6 @@ public:
virtual voidSetReadOnly (bool bReadOnly);
virtual boolIsReadOnly();
-void SetLineNumberDisplay(bool);
-
StarBASIC* GetBasic() { XModule(); return xBasic; }
SbModule* GetSbModule() { return xModule; }
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx
b/connectivity/source/drivers/kab/KCatalog.cxx
index e772300..7c5ec0d 100644
---
[Libreoffice-commits] .: binfilter/bf_starmath binfilter/bf_svx binfilter/inc
binfilter/bf_starmath/source/cfgitem.hxx | 33 +
binfilter/bf_starmath/source/starmath_cfgitem.cxx | 112 +
binfilter/bf_svx/source/inc/fmshimp.hxx |1
binfilter/inc/bf_svtools/svarray.hxx | 415 ++
4 files changed, 273 insertions(+), 288 deletions(-)
New commits:
commit 727a95dafa16e5f5a5c5e61f0c740645c79ca7c5
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 22 09:23:19 2012 +0100
expand macros
Change-Id: I696dcd6b3096025639474b0b10d0973453af809f
diff --git a/binfilter/bf_starmath/source/cfgitem.hxx
b/binfilter/bf_starmath/source/cfgitem.hxx
index 020847a..bbab993 100644
--- a/binfilter/bf_starmath/source/cfgitem.hxx
+++ b/binfilter/bf_starmath/source/cfgitem.hxx
@@ -135,9 +135,40 @@ struct SmFntFmtListEntry
SmFntFmtListEntry( const String rId, const SmFontFormat rFntFmt );
};
+typedef BOOL (*FnForEach_SmFntFmtListEntryArr)( const SmFntFmtListEntry,
void* );
+class SmFntFmtListEntryArr
+{
+protected:
+SmFntFmtListEntry*pData;
+USHORT nFree;
+USHORT nA;
-SV_DECL_OBJARR( SmFntFmtListEntryArr, SmFntFmtListEntry, 8, 8 )
+void _resize(size_t n);
+void _destroy();
+public:
+SmFntFmtListEntryArr( USHORT= 8, BYTE= 8 );
+~SmFntFmtListEntryArr() { _destroy(); }
+
+SmFntFmtListEntry operator[](USHORT nP) const { return *(pData+nP); }
+
+void Insert( const SmFntFmtListEntryArr *pI, USHORT nP,
+USHORT nS = 0, USHORT nE = USHRT_MAX );
+SmFntFmtListEntry GetObject(USHORT nP) const { return (*this)[nP]; }
+void Insert( const SmFntFmtListEntry aE, USHORT nP );
+void Insert( const SmFntFmtListEntry *pE, USHORT nL, USHORT nP );
+void Remove( USHORT nP, USHORT nL = 1 );
+USHORT Count() const { return nA; }
+const SmFntFmtListEntry* GetData() const { return (const
SmFntFmtListEntry*)pData; }
+void ForEach( FnForEach_SmFntFmtListEntryArr fnForEach, void* pArgs = 0 );
+void ForEach( USHORT nS, USHORT nE,
+FnForEach_SmFntFmtListEntryArr fnForEach, void* pArgs = 0
);
+void _ForEach( USHORT nStt, USHORT nE,
+FnForEach_SmFntFmtListEntryArr fnCall, void* pArgs = 0 );
+private:
+SmFntFmtListEntryArr( const SmFntFmtListEntryArr );
+SmFntFmtListEntryArr operator=( const SmFntFmtListEntryArr );
+};
class SmFontFormatList
{
diff --git a/binfilter/bf_starmath/source/starmath_cfgitem.cxx
b/binfilter/bf_starmath/source/starmath_cfgitem.cxx
index ffe8e3d..3b6a72b 100644
--- a/binfilter/bf_starmath/source/starmath_cfgitem.cxx
+++ b/binfilter/bf_starmath/source/starmath_cfgitem.cxx
@@ -43,7 +43,117 @@ static const char* aRootName = Office.Math;
#define SYMBOL_LIST SymbolList
#define FONT_FORMAT_LISTFontFormatList
-/*N*/ SV_IMPL_OBJARR( SmFntFmtListEntryArr, SmFntFmtListEntry );
+SmFntFmtListEntryArr::SmFntFmtListEntryArr( USHORT nInit, BYTE )
+: pData (0),
+ nFree (nInit),
+ nA(0)
+{
+if( nInit )
+{
+pData =
(SmFntFmtListEntry*)(rtl_allocateMemory(sizeof(SmFntFmtListEntry) * nInit));
+DBG_ASSERT( pData, CTOR, allocate);
+}
+}
+
+void SmFntFmtListEntryArr::_destroy()
+{
+if(pData)
+{
+SmFntFmtListEntry* pTmp=pData;
+for(USHORT n=0; n nA; n++,pTmp++ )
+{
+pTmp-~SmFntFmtListEntry();
+}
+rtl_freeMemory(pData);
+pData = 0;
+}
+}
+
+void SmFntFmtListEntryArr::_resize (size_t n)
+{
+USHORT nL = ((n USHRT_MAX) ? USHORT(n) : USHRT_MAX);
+SmFntFmtListEntry* pE = (SmFntFmtListEntry*)(rtl_reallocateMemory (pData,
sizeof(SmFntFmtListEntry) * nL));
+if ((pE != 0) || (nL == 0))
+{
+pData = pE;
+nFree = nL - nA;
+}
+}
+
+void SmFntFmtListEntryArr::Insert( const SmFntFmtListEntryArr *pI, USHORT nP,
+USHORT nS, USHORT nE )
+{
+if( USHRT_MAX == nE )
+nE = pI-nA;
+if( nS nE )
+Insert( (const SmFntFmtListEntry*)pI-pData+nS, (USHORT)nE-nS, nP );
+}
+
+void SmFntFmtListEntryArr::Insert( const SmFntFmtListEntry aE, USHORT nP )
+{
+if (nFree 1)
+_resize (nA + ((nA 1) ? nA : 1));
+if( pData nP nA )
+memmove( pData+nP+1, pData+nP, (nA-nP) * sizeof( SmFntFmtListEntry ));
+SmFntFmtListEntry* pTmp = pData+nP;
+new( (DummyType*) pTmp ) SmFntFmtListEntry( (SmFntFmtListEntry)aE );
+++nA; --nFree;
+}
+
+void SmFntFmtListEntryArr::Insert( const SmFntFmtListEntry *pE, USHORT nL,
USHORT nP )
+{
+if (nFree nL)
+_resize (nA + ((nA nL) ? nA : nL));
+if( pData nP nA )
+memmove( pData+nP+nL, pData+nP, (nA-nP) * sizeof( SmFntFmtListEntry ));
+if( pE )
+{
+SmFntFmtListEntry* pTmp = pData+nP;
+for( USHORT n = 0; n nL; n++, pTmp++, pE++)
+{
+new( (DummyType*) pTmp ) SmFntFmtListEntry(
(SmFntFmtListEntry)*pE );
+}
+}
+nA = nA + nL; nFree = nFree - nL;
+}
+
+void SmFntFmtListEntryArr::Remove( USHORT nP, USHORT nL
[Libreoffice-commits] .: dictionaries/Dictionary_it.mk
dictionaries/Dictionary_it.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 749e85f437b3bb5a6eb50382c8a0e2ee884d65ca Author: Michael Stahl mst...@redhat.com Date: Wed Aug 22 13:35:06 2012 +0200 dictionaries: add CHANGELOG.txt to dict_it.oxt Change-Id: Ie92e237ff0f5987a199f193e9174273ee22faf7f diff --git a/dictionaries/Dictionary_it.mk b/dictionaries/Dictionary_it.mk index ff82426..f7c5364 100644 --- a/dictionaries/Dictionary_it.mk +++ b/dictionaries/Dictionary_it.mk @@ -16,6 +16,7 @@ $(eval $(call gb_Dictionary_add_root_files,dict-it,\ dictionaries/it_IT/README_hyph_it_IT.txt \ dictionaries/it_IT/README_it_IT.txt \ dictionaries/it_IT/README_th_it_IT.txt \ + dictionaries/it_IT/CHANGELOG.txt \ )) $(eval $(call gb_Dictionary_add_thesauri,dict-it,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: notice: module dictionaries converted to gbuild
On 19/08/12 17:09, Andrea Pescetti wrote: On 07/08/2012 David Tardon wrote: When testing the conversion--I wrote a script to compare the old and new content of all the dictionaries--I have identified several files that have not been packed into the extensions previously ... dictionaries/it_IT/CHANGELOG.txt I added this one to the Italian dictionary recently, so it should be added to the generated extension package too. thanks for the hint, have just done that on master: http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=749e85f437b3bb5a6eb50382c8a0e2ee884d65ca ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - android/Bootstrap android/CustomTarget_docloader.mk android/CustomTarget_sdremote.mk android/Module_android.mk configure.in
android/Bootstrap/Makefile.shared |2 +- android/CustomTarget_docloader.mk | 33 + android/CustomTarget_sdremote.mk |6 +- android/Module_android.mk |1 + configure.in | 34 +- 5 files changed, 57 insertions(+), 19 deletions(-) New commits: commit 9bf0c91a7d671e0a7d097a7128bdf30c27c25a44 Author: Tor Lillqvist t...@iki.fi Date: Wed Aug 22 14:33:49 2012 +0300 Untabify where appropriate Change-Id: I0af786208356493928129406fd7d03f0912834f3 diff --git a/configure.in b/configure.in index 87ddf13..39aaecc 100644 --- a/configure.in +++ b/configure.in @@ -1354,7 +1354,7 @@ AC_ARG_WITH(system-icu, AC_ARG_WITH(system-openldap, AS_HELP_STRING([--with-system-openldap], [Use the OpenLDAP LDAP SDK already on system.]),, - [with_system_openldap=$with_system_libs]) +[with_system_openldap=$with_system_libs]) AC_ARG_WITH(system-poppler, AS_HELP_STRING([--with-system-poppler], @@ -2219,15 +2219,15 @@ if test $? -eq 0; then STRIP_COMPONENTS=--strip-components else $GNUTAR --help 2 /dev/null | egrep strip-path 21 /dev/null - if test $? -eq 0; then - STRIP_COMPONENTS=--strip-path - else - STRIP_COMPONENTS=unsupported - fi +if test $? -eq 0; then +STRIP_COMPONENTS=--strip-path +else +STRIP_COMPONENTS=unsupported +fi fi AC_MSG_RESULT($STRIP_COMPONENTS) if test x$STRIP_COMPONENTS == xunsupported; then - AC_MSG_ERROR([you need a tar that is able to strip components.]) +AC_MSG_ERROR([you need a tar that is able to strip components.]) fi AC_SUBST(STRIP_COMPONENTS) @@ -2997,7 +2997,7 @@ if test $_os = WINNT; then if test -z $MSPDB_PATH -a -e $with_cl_home/../Common7/IDE/mspdb100.dll; then MSPDB_PATH=$with_cl_home/../Common7/IDE fi - dnl MSVS 2012 case +dnl MSVS 2012 case if test -z $MSPDB_PATH -a -e $with_cl_home/../Common7/IDE/mspdb110.dll; then MSPDB_PATH=$with_cl_home/../Common7/IDE fi @@ -3006,7 +3006,7 @@ if test $_os = WINNT; then dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty AC_PATH_PROG(MSPDB_PATH, mspdb80.dll) AC_PATH_PROG(MSPDB_PATH, mspdb100.dll) - AC_PATH_PROG(MSPDB_PATH, mspdb110.dll) +AC_PATH_PROG(MSPDB_PATH, mspdb110.dll) MSPDB_PATH=`dirname $MSPDB_PATH` fi @@ -3059,7 +3059,7 @@ if test $_os = WINNT; then printf (\%04d\,vertoken[[i]] ) } }` - if test $CCNUMVER -ge 0017; then +if test $CCNUMVER -ge 0017; then COMEX=14 MSVSVER=2012 elif test $CCNUMVER -ge 0016; then @@ -7769,15 +7769,15 @@ dnl === if test $_os != WINNT; then AC_MSG_CHECKING([which openldap library to use]) if test $with_system_openldap = yes; then - AC_MSG_RESULT([external]) +AC_MSG_RESULT([external]) SYSTEM_OPENLDAP=YES AC_CHECK_HEADERS(ldap.h, [], [AC_MSG_ERROR(ldap.h not found. install openldap libs)], []) - AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:], [AC_MSG_ERROR(openldap lib not found or functional)], []) - AC_CHECK_LIB([ldap], [ldap_set_option], [:], [AC_MSG_ERROR(openldap lib not found or functional)], []) +AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:], [AC_MSG_ERROR(openldap lib not found or functional)], []) +AC_CHECK_LIB([ldap], [ldap_set_option], [:], [AC_MSG_ERROR(openldap lib not found or functional)], []) else AC_MSG_RESULT([internal]) SYSTEM_OPENLDAP=NO - BUILD_TYPE=$BUILD_TYPE OPENLDAP +BUILD_TYPE=$BUILD_TYPE OPENLDAP fi else SYSTEM_OPENLDAP=NO @@ -11557,7 +11557,7 @@ location (/usr/share/java), specify its pathname via --with-junit=..., or disable it via --without-junit]) fi if test $OOO_JUNIT_JAR != ; then - BUILD_TYPE=$BUILD_TYPE QADEVOOO +BUILD_TYPE=$BUILD_TYPE QADEVOOO fi fi AC_SUBST(OOO_JUNIT_JAR) @@ -12005,8 +12005,8 @@ else ;; Linux) - BUILD_NCPUS=`getconf _NPROCESSORS_ONLN` - ;; +BUILD_NCPUS=`getconf _NPROCESSORS_ONLN` +;; # what else than above does profit here *and* has /proc? *) BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l` commit e2a7989765fcf5fe26ea66c83ecff4a827b0e9d3 Author: Tor Lillqvist t...@iki.fi Date: Wed Aug 22 14:26:38 2012 +0300 Build also the DocumentLoader test Android app with gbuild Serialize the Ant cleaning and building of android/abs-lib so that one Ant is not cleaning it while another is building something that depends on it. Change-Id: I22fde47bf84208fa129b8f6a65a2314c885451a0 diff --git
[Libreoffice-commits] .: android/CustomTarget_docloader.mk android/CustomTarget_sdremote.mk
android/CustomTarget_docloader.mk | 14 -- android/CustomTarget_sdremote.mk |8 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) New commits: commit b34b7c93bd35e63fedf280e93a714511fdf436b2 Author: Tor Lillqvist t...@iki.fi Date: Wed Aug 22 14:49:13 2012 +0300 flock is not portable, so use different approach Change-Id: I4a864ddd3681101c8c5d0943d2761ac85bf4161f diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk index d4007e7..326da49 100644 --- a/android/CustomTarget_docloader.mk +++ b/android/CustomTarget_docloader.mk @@ -20,13 +20,15 @@ $(call gb_CustomTarget_get_target,android/docloader) : \ $(call gb_Module_get_target,sw) \ $(call gb_Module_get_target,sc) -$(docloader_DIR)/done : $(gb_Helper_PHONY) +# We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is +# defined. We want that to be built completely first, so that we can +# serialize Ant access to abs-lib, which is used both by DocumentLoader and +# sdremote. We don't want one Ant to be cleaning out abs-lib while another is +# building stuff that depends on it. Yeah, this sucks + +$(docloader_DIR)/done : $(sdremote_DIR)/done $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1) -# Lock needed to serialize the Ant cleaning/building which cleans/builds also -# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be -# cleaning out abs-lib while another is building stuff that depends on -# it. yeah, this sucks - cd $(SRCDIR)/android/experimental/DocumentLoader flock $(SRCDIR)/android/lock sh -c $(MAKE) clean $(MAKE) all + cd $(SRCDIR)/android/experimental/DocumentLoader $(MAKE) clean $(MAKE) all mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk index e3f08d7..ae05350 100644 --- a/android/CustomTarget_sdremote.mk +++ b/android/CustomTarget_sdremote.mk @@ -12,13 +12,9 @@ sdremote_DIR := $(call gb_CustomTarget_get_workdir,android/sdremote) $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done -$(sdremote_DIR)/done : $(gb_Helper_PHONY) +$(sdremote_DIR)/done : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1) -# Lock needed to serialize the Ant cleaning/building which cleans/builds also -# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be -# cleaning out abs-lib while another is building stuff that depends on -# it. yeah, this sucks - cd $(SRCDIR)/android/sdremote flock $(SRCDIR)/android/lock sh -c $(MAKE) clean $(MAKE) all + cd $(SRCDIR)/android/sdremote $(MAKE) clean $(MAKE) all mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
0 files changed New commits: commit 28f04b0aa2239d2e1a38f5923b941ce6b0c3270f Author: Eike Rathke er...@redhat.com Date: Wed Aug 22 14:01:02 2012 +0200 restore executable permission was lost with 2c47c9989e308ddef22066607795eb3feef9f76b Change-Id: Iee6f2caa2e934ed998c186e12a3f8b433fb64574 diff --git a/i18npool/source/isolang/langid.pl b/i18npool/source/isolang/langid.pl old mode 100644 new mode 100755 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svtools/source sw/source
svtools/source/control/ctrlbox.cxx |4
sw/source/filter/html/htmltab.cxx |3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a7a6e3b72d23e7068238953670b6a0bf82ef1243
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 22 00:19:42 2012 +0200
fdo#51777: add a hack for 1 twip DOUBLE borders:
Arguably such annoyingly thin double borders don't make much sense
anyway, because they're essentially 2 hairlines with ~no space between,
but unfortunately older LO versions are able to create them;
since the refactoring in 2d045cdb69176b280812dda0b813371cf1ac72e2,
which changed the BorderWidthImpl::Get* methods to return 0 due to
rounding, they were ignored at least in the HTML import, which is a
regression.
So add a special purpose hack that essentially rounds up the first line
to 1 but not the other lines so the visual result is a hairline single
border.
Change-Id: I20ac4675bcf67ea58a6931a40bff3605390e9c0d
(cherry picked from commit 601bfe2ce3113719b2f8edaba2ccb6b630051a9a)
Reviewed-on: https://gerrit.libreoffice.org/451
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 5665858..4a44d03 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -327,6 +327,10 @@ long BorderWidthImpl::GetLine1( long nWidth ) const
result = std::maxlong(0,
static_castlong((m_nRate1 * nWidth) + 0.5)
- (nConstant2 + nConstantD));
+if (result == 0 m_nRate1 0.0 nWidth 0)
+{ // fdo#51777: hack to essentially treat 1 twip DOUBLE border
+result = 1; // as 1 twip SINGLE border
+}
}
return result;
}
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index bfde623..8a3edd9 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2072,8 +2072,7 @@ void HTMLTable::SetBorders()
sal_uInt16 HTMLTable::GetBorderWidth( const SvxBorderLine rBLine,
sal_Bool bWithDistance ) const
{
-sal_uInt16 nBorderWidth = rBLine.GetOutWidth() + rBLine.GetInWidth() +
-rBLine.GetDistance();
+sal_uInt16 nBorderWidth = rBLine.GetWidth();
if( bWithDistance )
{
if( nCellPadding )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/gbuild_extras'
New branch 'feature/gbuild_extras' available with the following commits: commit 06ffaf45ae6a160b129564a9a3d3b26517849205 Author: David Tardon dtar...@redhat.com Date: Wed Aug 22 13:16:39 2012 +0200 add extras to tail_build Change-Id: I3143c987ed07f2d0033cbcb4fe637d095339807e commit a6880e104f49056108f2ad20c06ad08234905f00 Author: David Tardon dtar...@redhat.com Date: Wed Aug 22 14:07:38 2012 +0200 drop unused files Change-Id: Iba94cd9a6faf3578201761bf8c8ae9b1f437f57e commit 7d16df0e8db16d4dc5b77136d6bdc32c7ef12bd3 Author: David Tardon dtar...@redhat.com Date: Wed Aug 22 13:13:08 2012 +0200 switch extras to gbuild Change-Id: I9707dc268e8380a75ffbebe9aff7c50bebefe9ca commit 5191cbb7e616617ac157e70057c66486c1b7cee7 Author: David Tardon dtar...@redhat.com Date: Mon Aug 20 16:42:49 2012 +0200 convert extras to gbuild Change-Id: I190b1314a91026dcfc39df3e3e178df55d14d90a commit d0e5f7de140b07ceba9d54aaf25477fac9652b0c Author: David Tardon dtar...@redhat.com Date: Mon Aug 20 16:39:34 2012 +0200 add AllLangZip gbuild class Change-Id: I1b0ebafac55bdfb41c5e6e64ded637313e47bae4 commit 32d019039c94cc49b208368d28f487e1d97b2c2c Author: David Tardon dtar...@redhat.com Date: Wed Aug 22 13:01:08 2012 +0200 fix condition Change-Id: I5370bca6689d0d089a6862c70f45a95516e8531e commit 65b900f01b800ebf7a4401385f29f2b4dd1b28f8 Author: David Tardon dtar...@redhat.com Date: Wed Aug 22 12:56:58 2012 +0200 source the right file Change-Id: Id378c5f0a6308964c3d8fb66184f32b72c67d685 commit 0afa663130cd38aba509dfddb5b4550d59313442 Author: David Tardon dtar...@redhat.com Date: Tue Aug 21 09:15:04 2012 +0200 fix make showdeliverables In contexts where several deliverables with different index were registered in one eval block, all indexes but the last one were lost, because the current value of $(gb_Deliver_DELIVERABLES_INDEX) did not contain them yet. We need to use the variable, not its value, here. Change-Id: I537ec949c0491dc5b35461253fdaca1f4887ec31 commit aa82b1517bfeb24aa9ee296f92b6d1f1ed056554 Author: David Tardon dtar...@redhat.com Date: Mon Aug 20 22:01:35 2012 +0200 do not print the dummy command for showdeliverables Change-Id: I70b90e6551a8f4f093947abc382babedd9b784cd commit 46d6946183082fc7fa0deadd27623f9ac70342ec Author: David Tardon dtar...@redhat.com Date: Tue Aug 21 08:25:54 2012 +0200 drop leftover reference of custom target Change-Id: I28dbf37c1dc6a1a97c7626b7dc5ac7ce6503b858 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#51777: add a hack for 1 twip DOUBLE borders:
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has submitted this change and it was merged. Change subject: fdo#51777: add a hack for 1 twip DOUBLE borders: .. fdo#51777: add a hack for 1 twip DOUBLE borders: Arguably such annoyingly thin double borders don't make much sense anyway, because they're essentially 2 hairlines with ~no space between, but unfortunately older LO versions are able to create them; since the refactoring in 2d045cdb69176b280812dda0b813371cf1ac72e2, which changed the BorderWidthImpl::Get* methods to return 0 due to rounding, they were ignored at least in the HTML import, which is a regression. So add a special purpose hack that essentially rounds up the first line to 1 but not the other lines so the visual result is a hairline single border. Change-Id: I20ac4675bcf67ea58a6931a40bff3605390e9c0d (cherry picked from commit 601bfe2ce3113719b2f8edaba2ccb6b630051a9a) --- M svtools/source/control/ctrlbox.cxx M sw/source/filter/html/htmltab.cxx 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/451 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I20ac4675bcf67ea58a6931a40bff3605390e9c0d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: logerrit
logerrit |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f9fa180e42453b95b75d97dc8e50eab7e38c7464
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Aug 22 14:14:46 2012 +0200
logerrit: --code-review=2 in review implies --submit
Change-Id: Ibd21dfdb76536ea0e0a71791a91ec87e31d49960
diff --git a/logerrit b/logerrit
index c936653..bb60473 100755
--- a/logerrit
+++ b/logerrit
@@ -146,6 +146,7 @@ case $1 in
esac
read -p 'is the code looking good (+), bad (-) or none of that
()? ' CODEREVIEW
ask_tristate $CODEREVIEW
+ SUBMITFLAG=
case $ANSWER in
y)
read -p 'do you approve the change (+) too, or
prefer someone else to do that ()? ' CODEREVIEW
@@ -153,6 +154,7 @@ case $1 in
case $ANSWER in
y)
CODEREVIEWFLAG=--code-review=2
+ SUBMITFLAG=--submit
;;
n)
CODEREVIEWFLAG=--code-review=1
@@ -185,7 +187,7 @@ case $1 in
esac
read -p please type a friendly comment$MESSAGEREQ: MESSAGE
get_REVISION_for_change $CHANGEID
- ssh ${GERRITHOST?} gerrit review -m \$MESSAGE\ $VERIFIEDFLAG
$CODEREVIEWFLAG $REVISION
+ ssh ${GERRITHOST?} gerrit review -m \$MESSAGE\ $VERIFIEDFLAG
$CODEREVIEWFLAG $SUBMITFLAG $REVISION
;;
checkout)
get_SHA_for_change $2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_extras' - configure.in extras/Package_extensions.mk ooo.lst.in
configure.in |4 extras/Package_extensions.mk |3 --- ooo.lst.in |1 - 3 files changed, 8 deletions(-) New commits: commit 2a8445e324294bb05b7577c959ce7f18b41be34c Author: David Tardon dtar...@redhat.com Date: Wed Aug 22 15:01:12 2012 +0200 the downloaded ct2n oxt is not used Change-Id: I593f08e91f823e9c9eca2b42b9ec22190e8849f1 diff --git a/configure.in b/configure.in index 1456938..80535eb 100644 --- a/configure.in +++ b/configure.in @@ -10448,17 +10448,13 @@ dnl === dnl Test whether to include ConvertTextToNumber extension dnl === AC_MSG_CHECKING([for ConvertTextToNumber extension integration]) -CT2N_EXTENSION_PACK= if test x$enable_ext_ct2n = xyes -a x$enable_extension_integration != xno; then BUILD_TYPE=$BUILD_TYPE CT2N SCPDEFS=$SCPDEFS -DWITH_EXTENSION_CT2N - CT2N_EXTENSION_PACK=451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt -WITH_EXTRA_EXTENSIONS=YES AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) fi -AC_SUBST(CT2N_EXTENSION_PACK) dnl === dnl Test whether to include Numbertext extension diff --git a/extras/Package_extensions.mk b/extras/Package_extensions.mk index 1c464e4..9579032 100644 --- a/extras/Package_extensions.mk +++ b/extras/Package_extensions.mk @@ -14,9 +14,6 @@ $(eval $(call gb_Package_Package,extras_extensions,$(SRCDIR)/src)) ifneq ($(BARCODE_EXTENSION_PACK),) $(eval $(call gb_Package_add_file,extras_extensions,bin/Barcode.oxt,$(BARCODE_EXTENSION_PACK))) endif -ifneq ($(CT2N_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/ConvertTextToNumber.oxt,$(CT2N_EXTENSION_PACK))) -endif ifneq ($(DIAGRAM_EXTENSION_PACK),) $(eval $(call gb_Package_add_file,extras_extensions,bin/SmART.oxt,$(DIAGRAM_EXTENSION_PACK))) endif diff --git a/ooo.lst.in b/ooo.lst.in index cc88ab1..c7f5c58 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -107,7 +107,6 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/ @OOOP_FONTS_PACK@ @OOOP_SAMPLES_PACK@ @OXYGENOFFICE_PACK@ -@CT2N_EXTENSION_PACK@ @BARCODE_EXTENSION_PACK@ @DIAGRAM_EXTENSION_PACK@ @VALIDATOR_EXTENSION_PACK@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
solver=installation p. 1: including directly vs. delivering external headers
Hi all, with gbuild expanding (thanks to David tirelessly working on that :-)) things are more under control and we don't need to use solver for other modules that much. In theory, (later,) in solver could be only stuff needed for make_installer.pl I think. Or better the solver can be installation. I think the plan for headers is to avoid delivering them, move and use only one include path, mainly because of Windows. And this is waiting for re-licensing. But there are other things to do. What about external headers ? We could move also x11_extensions/, Mesa/, ... but maybe we don't want to mix them ? And we can't move headers from tarball as vigra. So we need either deliver them somewhere* or add include path for them. I think include path could be fine since they are not used that much ? *if we deliver to solver, then there should be another directory for installation, so delivering to workdir could be better. I think the result is going to be cool, esp. for Windows without symlinks but no idea about the time, at worse in a year I hope. Thanks for listening and/or ideas, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreoffice patch
Hi Ricardo, 2012/8/18 Ricardo Montania rica...@linuxafundo.com.br: Hello. First commit. :) EasyHacking, unused code. Any problem, please tell me. The pacth looks good, I'll integrate it soon. Would you mind sending a blanket licence statement to this mailing list, such as All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #91 from t...@tim-passingham.co.uk 2012-08-22 13:21:20 UTC --- Can't use Pivot Tables at all since the results are icorrect, so 3.6 is unusable. https://bugs.freedesktop.org/show_bug.cgi?id=53640 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 t...@tim-passingham.co.uk changed: What|Removed |Added Depends on||53640 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: sd/source
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx |6 +-
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx |8 +--
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx| 26
--
sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx |2
4 files changed, 33 insertions(+), 9 deletions(-)
New commits:
commit c29af1572ad15ac5199a09e5812fb8354c165329
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 22 14:20:32 2012 +0100
Resolves: rhbz#842292 crash in calling callback whose instance was deleted
Change-Id: I4cc04d59f48b42cc105703daa9983dd7c9f7af62
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index b8234b5..c1bf497 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -100,11 +100,13 @@ void DragAndDropContext::UpdatePosition (
::boost::shared_ptrInsertionIndicatorHandler pInsertionIndicatorHandler (
mpTargetSlideSorter-GetController().GetInsertionIndicatorHandler());
-if ( ! (bAllowAutoScroll
+bool bDoAutoScroll = bAllowAutoScroll
mpTargetSlideSorter-GetController().GetScrollBarManager().AutoScroll(
rMousePosition,
::boost::bind(
-DragAndDropContext::UpdatePosition, this, rMousePosition,
eMode, false
+DragAndDropContext::UpdatePosition, this, rMousePosition,
eMode, false));
+
+if (!bDoAutoScroll)
{
pInsertionIndicatorHandler-UpdatePosition(aMouseModelPosition, eMode);
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index a45f640..4a2d808 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -617,13 +617,15 @@ bool ScrollBarManager::RepeatAutoScroll (void)
}
}
-maAutoScrollFunctor = ::boost::functionvoid(void)();
+clearAutoScrollFunctor();
mbIsAutoScrollActive = false;
return false;
}
-
-
+void ScrollBarManager::clearAutoScrollFunctor()
+{
+maAutoScrollFunctor = ::boost::functionvoid(void)();
+}
IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler)
{
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 6217c07..16c23ad 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -273,6 +273,7 @@ private:
SelectionMode meSelectionMode;
Point maSecondCorner;
Pointer maSavedPointer;
+bool mbAutoScrollInstalled;
sal_Int32 mnAnchorIndex;
sal_Int32 mnSecondIndex;
view::ButtonBar::Lock maButtonBarLock;
@@ -1503,6 +1504,7 @@ MultiSelectionModeHandler::MultiSelectionModeHandler (
meSelectionMode(SM_Normal),
maSecondCorner(rMouseModelPosition),
maSavedPointer(mrSlideSorter.GetContentWindow()-GetPointer()),
+ mbAutoScrollInstalled(false),
mnAnchorIndex(-1),
mnSecondIndex(-1),
maButtonBarLock(rSlideSorter)
@@ -1523,6 +1525,12 @@ void MultiSelectionModeHandler::Initialize(const
sal_uInt32 nEventCode)
MultiSelectionModeHandler::~MultiSelectionModeHandler (void)
{
+if (mbAutoScrollInstalled)
+{
+//a call to this handler's MultiSelectionModeHandler::UpdatePosition
+//may be still waiting to be called back
+
mrSlideSorter.GetController().GetScrollBarManager().clearAutoScrollFunctor();
+}
mrSlideSorter.GetContentWindow()-SetPointer(maSavedPointer);
}
@@ -1564,6 +1572,14 @@ void MultiSelectionModeHandler::ProcessEvent (
bool MultiSelectionModeHandler::ProcessButtonUpEvent (
SelectionFunction::EventDescriptor rDescriptor)
{
+if (mbAutoScrollInstalled)
+{
+//a call to this handler's MultiSelectionModeHandler::UpdatePosition
+//may be still waiting to be called back
+
mrSlideSorter.GetController().GetScrollBarManager().clearAutoScrollFunctor();
+mbAutoScrollInstalled = false;
+}
+
if (Match(rDescriptor.mnEventCode, BUTTON_UP | LEFT_BUTTON | SINGLE_CLICK))
{
mrSelectionFunction.SwitchToNormalMode();
@@ -1620,16 +1636,18 @@ void MultiSelectionModeHandler::UpdatePosition (
SharedSdWindow pWindow (mrSlideSorter.GetContentWindow());
const Point aMouseModelPosition (pWindow-PixelToLogic(rMousePosition));
-if ( ! (bAllowAutoScroll
mrSlideSorter.GetController().GetScrollBarManager().AutoScroll(
+bool bDoAutoScroll = bAllowAutoScroll
mrSlideSorter.GetController().GetScrollBarManager().AutoScroll(
rMousePosition,
::boost::bind(
MultiSelectionModeHandler::UpdatePosition,
[Libreoffice-commits] .: filter/source officecfg/registry sfx2/source
filter/source/config/cache/constant.hxx |2 +- filter/source/config/cache/filtercache.cxx |2 +- filter/source/config/fragments/filters/Text.xcu |2 +- filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu |2 +- filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu |2 +- filter/source/config/fragments/filters/Text__encoded_.xcu |2 +- filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu |2 +- filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu |2 +- officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs |2 +- sfx2/source/bastyp/fltfnc.cxx |3 ++- 10 files changed, 11 insertions(+), 10 deletions(-) New commits: commit 45b03c888042052a47cb79bc5a2837d04e115c5e Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Wed Aug 22 09:46:57 2012 -0400 fdo#52451: Some name changes to be consistent with other prop names. We use IMPORT EXPORT flags, so let's stick with the term 'Export' as opposed to 'FileSave'. Also, the file type's extensions are given without the star-dot (*.), so let's strip that as well. Change-Id: Ibde05058f7acb6ae149382009e78f3f10a71d543 diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 22d1074..7d27ffc 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -69,7 +69,7 @@ #define PROPNAME_USERDATA UserData #define PROPNAME_TEMPLATENAME TemplateName #define PROPNAME_FILEFORMATVERSION FileFormatVersion -#define PROPNAME_FILESAVEEXTENSION FileSaveExtension +#define PROPNAME_EXPORTEXTENSION ExportExtension /** @short used to identify a frame loader or detect service item property against the configuration API and can be used diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 2a93c4f..e9dc2cf 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1834,7 +1834,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference css::container:: aItem[PROPNAME_UICOMPONENT ] = xItem-getByName(PROPNAME_UICOMPONENT ); aItem[PROPNAME_FILTERSERVICE] = xItem-getByName(PROPNAME_FILTERSERVICE); aItem[PROPNAME_DOCUMENTSERVICE ] = xItem-getByName(PROPNAME_DOCUMENTSERVICE ); -aItem[PROPNAME_FILESAVEEXTENSION] = xItem-getByName(PROPNAME_FILESAVEEXTENSION); +aItem[PROPNAME_EXPORTEXTENSION ] = xItem-getByName(PROPNAME_EXPORTEXTENSION ); // special handling for flags! Convert it from a list of names to its // int representation ... diff --git a/filter/source/config/fragments/filters/Text.xcu b/filter/source/config/fragments/filters/Text.xcu index 0da24d7..4629f89 100644 --- a/filter/source/config/fragments/filters/Text.xcu +++ b/filter/source/config/fragments/filters/Text.xcu @@ -4,7 +4,7 @@ prop oor:name=FilterService/ prop oor:name=UserDatavalueTEXT/value/prop prop oor:name=FileFormatVersionvalue0/value/prop -prop oor:name=FileSaveExtensionvalue*.txt/value/prop +prop oor:name=ExportExtensionvaluetxt/value/prop prop oor:name=Typevaluegeneric_Text/value/prop prop oor:name=TemplateName/ prop oor:name=DocumentServicevaluecom.sun.star.text.TextDocument/value/prop diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu index bbc8392..0332e3e 100644 --- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu @@ -4,7 +4,7 @@ prop oor:name=FilterService/ prop oor:name=UserDatavalueTEXT/value/prop prop oor:name=FileFormatVersionvalue0/value/prop -prop oor:name=FileSaveExtensionvalue*.txt/value/prop +prop oor:name=ExportExtensionvaluetxt/value/prop prop oor:name=Typevaluegeneric_Text/value/prop prop oor:name=TemplateName/ prop oor:name=DocumentServicevaluecom.sun.star.text.WebDocument/value/prop diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu index a866ff1..498057c 100644 --- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu +++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu @@ -4,7 +4,7 @@ prop
Re: [REVIEW 3-6][REVIEW 3-6-1] Fix for fdo#52451
On 08/22/2012 12:01 AM, Kohei Yoshida wrote: On 08/21/2012 10:34 PM, Kohei Yoshida wrote: Hi there, I'd like https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=ba03f2dc817c692fa8709391ec83d8e01a0f8b28 cherry-picked to 3-6 and 3-6-1 in order to fix https://bugs.freedesktop.org/show_bug.cgi?id=52451 And this one too: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=84d1ff7be178ec3572710e092e85fe548ce3042b And this one https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=45b03c888042052a47cb79bc5a2837d04e115c5e though this shouldn't be strictly necessary functionality-wise. This is just a cleanup to keep things more consistent. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx | 30 +-
1 file changed, 17 insertions(+), 13 deletions(-)
New commits:
commit 4f177fbbab1619b9a2f9afa04d882c5fd415fcc0
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 22 14:38:50 2012 +0100
Resolves: rhbz#841092 don't crash on empty portions (a11y?)
Change-Id: Ibd08fa09370580bff12f19f867219098f0d4980e
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index a0aedb1..027302f 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2477,22 +2477,26 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
pTP-GetLen() = pTP-GetLen() + nNewChars;
}
-// No HYPHENATOR portion is allowed to get stuck right at the end...
-DBG_ASSERT( pParaPortion-GetTextPortions().Count(),
RecalcTextPortions: Nothing left! );
-sal_uInt16 nLastPortion = pParaPortion-GetTextPortions().Count() - 1;
-pTP = pParaPortion-GetTextPortions()[nLastPortion];
-if ( pTP-GetKind() == PORTIONKIND_HYPHENATOR )
+sal_uInt16 nPortionCount = pParaPortion-GetTextPortions().Count();
+assert( nPortionCount );
+if (nPortionCount)
{
-// Discard portion; if possible, correct the ones before,
-// if the Hyphenator portion has swallowed one character...
-if ( nLastPortion pTP-GetLen() )
+// No HYPHENATOR portion is allowed to get stuck right at the
end...
+sal_uInt16 nLastPortion = nPortionCount - 1;
+pTP = pParaPortion-GetTextPortions()[nLastPortion];
+if ( pTP-GetKind() == PORTIONKIND_HYPHENATOR )
{
-TextPortion* pPrev =
pParaPortion-GetTextPortions()[nLastPortion - 1];
-DBG_ASSERT( pPrev-GetKind() == PORTIONKIND_TEXT, Portion?!
);
-pPrev-SetLen( pPrev-GetLen() + pTP-GetLen() );
-pPrev-GetSize().Width() = (-1);
+// Discard portion; if possible, correct the ones before,
+// if the Hyphenator portion has swallowed one character...
+if ( nLastPortion pTP-GetLen() )
+{
+TextPortion* pPrev =
pParaPortion-GetTextPortions()[nLastPortion - 1];
+DBG_ASSERT( pPrev-GetKind() == PORTIONKIND_TEXT,
Portion?! );
+pPrev-SetLen( pPrev-GetLen() + pTP-GetLen() );
+pPrev-GetSize().Width() = (-1);
+}
+pParaPortion-GetTextPortions().Remove( nLastPortion );
}
-pParaPortion-GetTextPortions().Remove( nLastPortion );
}
}
#if OSL_DEBUG_LEVEL 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #92 from Roman Eisele b...@eikota.de 2012-08-22 14:10:00 UTC --- (In reply to comment #88) Supplement: bfoman has added bug 49102 -- Writer: Incorrect numbering when cells are merged in the table, still waiting for confirmation. This is a LibO 3.5.x bug which went wrong in LibO 3.6.x ... Obviously the weather is too hot in these days, it has totally evaporated my knowledge of English grammar; sorry! Please read: This is a LibO 3.5. bug which _went_ _worse_ in LibO 3.6.x ... And bug 49102 is confirmed now, of course. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: 2 commits - android/CustomTarget_docloader.mk android/prj Makefile.top Module_tail_build.mk postprocess/prj
Makefile.top |2 ++ Module_tail_build.mk |1 - android/CustomTarget_docloader.mk |9 + android/prj/build.lst |2 ++ postprocess/prj/build.lst |2 +- 5 files changed, 6 insertions(+), 10 deletions(-) New commits: commit 63088cd934881128d2928faae5486476af55db14 Author: Tor Lillqvist t...@iki.fi Date: Wed Aug 22 16:58:15 2012 +0300 New attempt to have the android module built at a suitable time Yes, I know that eventually what now is known as tail_build will be all there is left. So by that time, by definition nothing can be built after tail_build. Will have to handle that then. Change-Id: I47d228ca7156520db10630861ce52b015a7a169c diff --git a/Makefile.top b/Makefile.top index 071d37d..979671f 100644 --- a/Makefile.top +++ b/Makefile.top @@ -25,6 +25,8 @@ export GMAKE_OPTIONS:=-r endif endif +# This list tells which modules are gbuild ones. It does *not* tell which modules to build. That is directed +# by the module being mentioned in packimages/prj/build.lst, etc, recursively. gbuild_modules:= \ MathMLDTD\ Mesa\ diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk index 57266c5..9dfed32 100644 --- a/android/CustomTarget_docloader.mk +++ b/android/CustomTarget_docloader.mk @@ -10,14 +10,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,android/docloader)) docloader_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/DocumentLoader) -# Depending on the tail_end module hopefully means that all libraries and -# other files that DocumentLoader needs from solver will have been built? Or -# should we just move the stuff from -# android/experimental/DocumentLoader/Makefile here, and depend on them -# explicitly? $(call gb_CustomTarget_get_target,android/docloader) : \ - $(docloader_DIR)/done \ - $(call gb_Module_get_target,tail_end) + $(docloader_DIR)/done # We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is # defined. We want that to be built completely first, so that we can diff --git a/android/prj/build.lst b/android/prj/build.lst new file mode 100644 index 000..bac6f27 --- /dev/null +++ b/android/prj/build.lst @@ -0,0 +1,2 @@ +an android :: tail_build NULL +an android\prj nmake - all an_prj NULL diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 819a19c..51a8035 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL +po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build android NULL po postprocess usr1- all po_mkout NULL po postprocess\checkxmlnmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL commit a6f73e53b640b311564c5a1843b1c2df574bdd43 Author: Tor Lillqvist t...@iki.fi Date: Wed Aug 22 15:28:19 2012 +0300 Depend on the tail_end module instead Change-Id: Icc0c17c66c6e5e2166a34e232acb69c0b434a44c diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 270d6ec..e06241e 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Module_Module,tail_end)) $(eval $(call gb_Module_add_moduledirs,tail_end,\ accessibility \ - android \ animations \ apple_remote \ autodoc \ diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk index 326da49..57266c5 100644 --- a/android/CustomTarget_docloader.mk +++ b/android/CustomTarget_docloader.mk @@ -10,15 +10,14 @@ $(eval $(call gb_CustomTarget_CustomTarget,android/docloader)) docloader_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/DocumentLoader) -# Depending on sw and sc modules hopefully means that all libraries and other -# files from there (plus all those they depend on), that DocumentLoader needs -# from solver will have been built? Or should we just move the stuff from +# Depending on the tail_end module hopefully means that all libraries and +# other files that DocumentLoader needs from solver will have been built? Or +# should we just move the stuff from # android/experimental/DocumentLoader/Makefile here, and depend on them # explicitly? $(call gb_CustomTarget_get_target,android/docloader) : \ $(docloader_DIR)/done \ - $(call gb_Module_get_target,sw) \ - $(call gb_Module_get_target,sc) + $(call
[Libreoffice-commits] .: android/experimental
android/experimental/eagles051387/.classpath.in | 15 --- android/experimental/eagles051387/.gitignore |1 android/experimental/eagles051387/.project | 33 --- android/experimental/eagles051387/AndroidManifest.xml | 23 - android/experimental/eagles051387/lint.xml |3 android/experimental/eagles051387/proguard-project.txt | 20 android/experimental/eagles051387/project.properties | 14 --- android/experimental/eagles051387/res/layout/main.xml |8 - android/experimental/eagles051387/res/layout/star_center_menu_list.xml |6 - android/experimental/eagles051387/res/values/strings.xml |9 -- android/experimental/eagles051387/src/org/libreoffice/experimental/eagles051387/Main_Menu.java | 17 android/experimental/eagles051387/src/org/libreoffice/experimental/eagles051387/StartCenterMenu.java | 42 -- dev/null |binary 13 files changed, 191 deletions(-) New commits: commit 438f5023c3f22b521974c6a1bb4d53b59255b724 Author: Tor Lillqvist t...@iki.fi Date: Wed Aug 22 17:26:33 2012 +0300 Pining for the fjords Change-Id: If0915cfc755031d2cb6a6e822f5682bb7ced71ad diff --git a/android/experimental/eagles051387/.classpath.in b/android/experimental/eagles051387/.classpath.in deleted file mode 100644 index 10e58d3..000 --- a/android/experimental/eagles051387/.classpath.in +++ /dev/null @@ -1,15 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -classpath - classpathentry kind=src path=src/ - classpathentry kind=src path=gen/ - classpathentry kind=con path=com.android.ide.eclipse.adt.LIBRARIES/ - classpathentry kind=lib path=@ANDROID_SDK_HOME@/platforms/android-10/android.jar - attributes - attribute name=javadoc_location value=file:@ANDROID_SDK_HOME@/docs/reference/ - /attributes - accessrules - accessrule kind=nonaccessible pattern=com/android/internal/**/ - /accessrules - /classpathentry - classpathentry kind=output path=bin/classes/ -/classpath diff --git a/android/experimental/eagles051387/.gitignore b/android/experimental/eagles051387/.gitignore deleted file mode 100644 index cddd2a3..000 --- a/android/experimental/eagles051387/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.classpath diff --git a/android/experimental/eagles051387/.project b/android/experimental/eagles051387/.project deleted file mode 100644 index b3a56bf..000 --- a/android/experimental/eagles051387/.project +++ /dev/null @@ -1,33 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -projectDescription - nameExperimental_Android_UI/name - comment/comment - projects - /projects - buildSpec - buildCommand - namecom.android.ide.eclipse.adt.ResourceManagerBuilder/name - arguments - /arguments - /buildCommand - buildCommand - namecom.android.ide.eclipse.adt.PreCompilerBuilder/name - arguments - /arguments - /buildCommand - buildCommand - nameorg.eclipse.jdt.core.javabuilder/name - arguments - /arguments - /buildCommand - buildCommand - namecom.android.ide.eclipse.adt.ApkBuilder/name - arguments - /arguments - /buildCommand - /buildSpec - natures - naturecom.android.ide.eclipse.adt.AndroidNature/nature - natureorg.eclipse.jdt.core.javanature/nature - /natures -/projectDescription diff --git a/android/experimental/eagles051387/AndroidManifest.xml b/android/experimental/eagles051387/AndroidManifest.xml deleted file mode 100644 index fa4abf9..000 --- a/android/experimental/eagles051387/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ -?xml version=1.0 encoding=utf-8? -manifest xmlns:android=http://schemas.android.com/apk/res/android; -package=org.libreoffice.experimentalUI.eagles051387 -android:versionCode=1 -android:versionName=1.0 - -uses-sdk android:minSdkVersion=10 / - -application -android:icon=@drawable/ic_launcher -android:label=@string/app_name -activity -
Re: [PUSHED] libreoffice patch
Pushed, many thanks. Andras 2012/8/18 Ricardo Montania rica...@linuxafundo.com.br: Hello. First commit. :) EasyHacking, unused code. Any problem, please tell me. -- Ricardo Montania Prado de Campos http://www.linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#53399 Word count is inconsistent and wrong with non-brea...
From Muhammad Haggag mhag...@gmail.com: Muhammad Haggag has uploaded a new change for review. Change subject: fdo#53399 Word count is inconsistent and wrong with non-breaking space .. fdo#53399 Word count is inconsistent and wrong with non-breaking space This change replaces lcl_IsSkippableWhitespace with a call to ICU's u_isspace, which covers all Unicode separators. It also updates and fixes one of the SwScanner unit tests. Bug details: SwScanner::NextWord skips whitespace before calling into ICU's BreakIterator. The function used to identify whitespace (lcl_IsSkippableWhitespace) doesn't cover the full category of Unicode separators (code [Zs], 18 in total. See: http://www.fileformat.info/info/unicode/category/Zs/index.htm). Since 0xA0 (no-break space) is not identified as whitespace and not skipped, we end up calling ICU starting at the position 0xA0, asking it to get us the boundary of the next word forward. ICU sees that it's called at the end of a word, and reverses the query direction to backward, and returns the word before. This causes NextWord to think we've hit the end of the string and call it a day, terminating word count for the rest of the line. Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5 --- M sw/qa/core/swdoc-test.cxx M sw/source/core/txtnode/txtedt.cxx 2 files changed, 11 insertions(+), 12 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/453/1 -- To view, visit https://gerrit.libreoffice.org/453 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Muhammad Haggag mhag...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'load' functions in cpp unittest - are they unused?
On Tue, 2012-08-21 at 19:42 +0700, Korrawit Pruegsanusak wrote: sd/qa/unit/regression-test.cxx (line #80) sc/qa/unit/subsequent_filters-test.cxx (line #246) which I think they are unused. Is it ok to remove both of them? [1] http://opengrok.libreoffice.org/search?q=loadproject=coredefs=refs=path=-java+-idl+-osl+qa+cxxhist= I think they're pure virtuals so it'll fail to build with them removed ?, could stub them I suppose, but they'd still exist. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] do not deliver these module-description xml files
From Matúš Kukan matus.ku...@gmail.com: Matúš Kukan has uploaded a new change for review. Change subject: do not deliver these module-description xml files .. do not deliver these module-description xml files Change-Id: Ife2f42b3a917ece10dc7ee9fcd83f1558084c4f1 --- M animations/Module_animations.mk D animations/Package_xml.mk M basctl/Package_xml.mk M sc/Module_sc.mk D sc/Package_xml.mk M sd/Package_xml.mk M store/Module_store.mk D store/Package_xml.mk M sw/Module_sw.mk D sw/Package_xml.mk M ucb/Module_ucb.mk D ucb/Package_xml.mk M uui/Module_uui.mk D uui/Package_xml.mk M xmlhelp/Package_xml.mk 15 files changed, 0 insertions(+), 345 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/454/1 -- To view, visit https://gerrit.libreoffice.org/454 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife2f42b3a917ece10dc7ee9fcd83f1558084c4f1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove unused module-description xml files
From Matúš Kukan matus.ku...@gmail.com: Matúš Kukan has uploaded a new change for review. Change subject: remove unused module-description xml files .. remove unused module-description xml files Change-Id: I531e47538f308ee43e0fe8d7db59f525e45942c3 --- D animations/source/animcore/animcore.xml D basctl/util/basctl.xml D sc/xml/AccessibleEditableTextPara_HeaderFooter.xml D sc/xml/AccessibleEditableTextPara_PreviewCell.xml D sc/xml/AccessibleEditableTextPara_PreviewNote.xml D sc/xml/ScAccessibleCell.xml D sc/xml/ScAccessibleCsvCell.xml D sc/xml/ScAccessibleCsvGrid.xml D sc/xml/ScAccessibleCsvRuler.xml D sc/xml/ScAccessibleDocument.xml D sc/xml/ScAccessibleDocumentPagePreview.xml D sc/xml/ScAccessiblePageHeader.xml D sc/xml/ScAccessiblePageHeaderArea.xml D sc/xml/ScAccessiblePreviewCell.xml D sc/xml/ScAccessiblePreviewHeaderCell.xml D sc/xml/ScAccessiblePreviewTable.xml D sc/xml/ScAccessibleSpreadsheet.xml D sc/xml/ScAnnotationObj.xml D sc/xml/ScAnnotationShapeObj.xml D sc/xml/ScAnnotationsObj.xml D sc/xml/ScAreaLinkObj.xml D sc/xml/ScAreaLinksObj.xml D sc/xml/ScAutoFormatFieldObj.xml D sc/xml/ScAutoFormatObj.xml D sc/xml/ScAutoFormatsObj.xml D sc/xml/ScCellCursorObj.xml D sc/xml/ScCellFieldObj.xml D sc/xml/ScCellFieldsObj.xml D sc/xml/ScCellFormatsEnumeration.xml D sc/xml/ScCellFormatsObj.xml D sc/xml/ScCellObj.xml D sc/xml/ScCellRangeObj.xml D sc/xml/ScCellRangesObj.xml D sc/xml/ScCellSearchObj.xml D sc/xml/ScCellTextCursor.xml D sc/xml/ScCellsEnumeration.xml D sc/xml/ScCellsObj.xml D sc/xml/ScChartObj.xml D sc/xml/ScChartsObj.xml D sc/xml/ScConsolidationDescriptor.xml D sc/xml/ScDDELinkObj.xml D sc/xml/ScDDELinksObj.xml D sc/xml/ScDataPilotFieldGroupItemObj.xml D sc/xml/ScDataPilotFieldGroupObj.xml D sc/xml/ScDataPilotFieldGroupsObj.xml D sc/xml/ScDataPilotFieldObj.xml D sc/xml/ScDataPilotFieldsObj.xml D sc/xml/ScDataPilotItemObj.xml D sc/xml/ScDataPilotItemsObj.xml D sc/xml/ScDataPilotTableObj.xml D sc/xml/ScDataPilotTablesObj.xml D sc/xml/ScDatabaseRangeObj.xml D sc/xml/ScDatabaseRangesObj.xml D sc/xml/ScDocumentConfiguration.xml D sc/xml/ScDrawPageObj.xml D sc/xml/ScDrawPagesObj.xml D sc/xml/ScFilterDescriptorBase.xml D sc/xml/ScFunctionListObj.xml D sc/xml/ScHeaderFieldObj.xml D sc/xml/ScHeaderFieldsObj.xml D sc/xml/ScHeaderFooterContentObj.xml D sc/xml/ScHeaderFooterTextCursor.xml D sc/xml/ScHeaderFooterTextObj.xml D sc/xml/ScIndexEnumeration_CellAnnotationsEnumeration.xml D sc/xml/ScIndexEnumeration_CellAreaLinksEnumeration.xml D sc/xml/ScIndexEnumeration_DDELinksEnumeration.xml D sc/xml/ScIndexEnumeration_DataPilotFieldsEnumeration.xml D sc/xml/ScIndexEnumeration_DataPilotItemsEnumeration.xml D sc/xml/ScIndexEnumeration_DataPilotTablesEnumeration.xml D sc/xml/ScIndexEnumeration_DatabaseRangesEnumeration.xml D sc/xml/ScIndexEnumeration_FunctionDescriptionEnumeration.xml D sc/xml/ScIndexEnumeration_LabelRangesEnumeration.xml D sc/xml/ScIndexEnumeration_NamedRangesEnumeration.xml D sc/xml/ScIndexEnumeration_ScenariosEnumeration.xml D sc/xml/ScIndexEnumeration_SheetCellRangesEnumeration.xml D sc/xml/ScIndexEnumeration_SheetLinksEnumeration.xml D sc/xml/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.xml D sc/xml/ScIndexEnumeration_SpreadsheetsEnumeration.xml D sc/xml/ScIndexEnumeration_SubTotalFieldsEnumeration.xml D sc/xml/ScIndexEnumeration_TableAutoFormatEnumeration.xml D sc/xml/ScIndexEnumeration_TableChartsEnumeration.xml D sc/xml/ScIndexEnumeration_TableColumnsEnumeration.xml D sc/xml/ScIndexEnumeration_TableConditionalEntryEnumeration.xml D sc/xml/ScIndexEnumeration_TableRowsEnumeration.xml D sc/xml/ScIndexEnumeration_TextFieldEnumeration.xml D sc/xml/ScLabelRangeObj.xml D sc/xml/ScLabelRangesObj.xml D sc/xml/ScModelObj.xml D sc/xml/ScNamedRangeObj.xml D sc/xml/ScNamedRangesObj.xml D sc/xml/ScPageObj.xml D sc/xml/ScRecentFunctionsObj.xml D sc/xml/ScScenariosObj.xml D sc/xml/ScShapeObj.xml D sc/xml/ScSheetLinkObj.xml D sc/xml/ScSheetLinksObj.xml D sc/xml/ScSpreadsheetSettings.xml D sc/xml/ScSpreadsheetSettingsObj.xml D sc/xml/ScStyleFamiliesObj.xml D sc/xml/ScStyleFamilyObj.xml D sc/xml/ScStyleObj.xml D sc/xml/ScSubTotalDescriptorBase.xml D sc/xml/ScSubTotalFieldObj.xml D sc/xml/ScTabViewObj.xml D sc/xml/ScTableColumnObj.xml D sc/xml/ScTableColumnsObj.xml D sc/xml/ScTableConditionalEntry.xml D sc/xml/ScTableConditionalFormat.xml D sc/xml/ScTableRowObj.xml D sc/xml/ScTableRowsObj.xml D sc/xml/ScTableSheetObj.xml D sc/xml/ScTableSheetsObj.xml D sc/xml/ScTableValidationObj.xml D sc/xml/ScUniqueCellFormatsEnumeration.xml D sc/xml/ScUniqueCellFormatsObj.xml D sc/xml/ScViewPaneObj.xml D sc/xml/ScXMLExport.xml D sc/xml/ScXMLImport.xml D sd/xml/AccessibleDrawDocumentView.xml D sd/xml/AccessibleOutlineView.xml D sd/xml/AccessiblePageShape.xml D sd/xml/AccessiblePresentationGraphicShape.xml D sd/xml/AccessiblePresentationOLEShape.xml D sd/xml/AccessiblePresentationShape.xml D sd/xml/AccessibleSlideView.xml D
[Libreoffice-commits] .: xmlhelp/source
xmlhelp/source/treeview/tvread.cxx | 83 +
xmlhelp/source/treeview/tvread.hxx |4 +
2 files changed, 80 insertions(+), 7 deletions(-)
New commits:
commit d9eec8f0f0b4ff397dedbfc2041c79c45af4d4a1
Author: Bence Babati b.baa...@gmail.com
Date: Wed Aug 22 15:26:44 2012 +0200
embed extension's help tree into main help tree
Change-Id: Iddb3c542f50078b13c7d420b528aa704a5cb0767
diff --git a/xmlhelp/source/treeview/tvread.cxx
b/xmlhelp/source/treeview/tvread.cxx
index 8357a3b..387ba14 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -75,6 +75,13 @@ namespace treeview {
return children.back();
}
+TVDom* newChild(TVDom* p)
+{
+children.push_back( p );
+p-parent = this;
+return children.back();
+}
+
TVDom* getParent() const
{
@@ -485,8 +492,6 @@ extern C void data_handler( void *userData,
(*tvDom)-setTitle( s,len );
}
-
-
TVChildTarget::TVChildTarget( const ConfigData configData,TVDom* tvDom )
{
Elements.resize( tvDom-children.size() );
@@ -494,10 +499,6 @@ TVChildTarget::TVChildTarget( const ConfigData
configData,TVDom* tvDom )
Elements[i] = new TVRead( configData,tvDom-children[i] );
}
-
-
-
-
TVChildTarget::TVChildTarget( const Reference XMultiServiceFactory xMSF )
{
ConfigData configData = init( xMSF );
@@ -534,8 +535,9 @@ TVChildTarget::TVChildTarget( const Reference
XMultiServiceFactory xMSF )
XML_ParserFree( parser );
delete[] s;
-}
+Check(pTVDom);
+}
// now TVDom holds the relevant information
Elements.resize( tvDom.children.size() );
@@ -548,7 +550,74 @@ TVChildTarget::~TVChildTarget()
{
}
+void TVChildTarget::Check(TVDom* tvDom)
+{
+unsigned i = 0;
+bool h = false;
+
+while((itvDom-children.size()-1) (!h))
+{
+if (((tvDom-children[i])-application ==
(tvDom-children[tvDom-children.size()-1])-application)
+((tvDom-children[i])-id ==
(tvDom-children[tvDom-children.size()-1])-id))
+{
+TVDom* p = tvDom-children[tvDom-children.size()-1];
+
+for(unsigned k=0; kp-children.size(); ++k)
+if (!SearchAndInsert(p-children[k], tvDom-children[i]))
tvDom-children[i]-newChild(p-children[k]);
+tvDom-children.pop_back();
+h = true;
+}
+++i;
+}
+}
+
+bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
+{
+if (p-isLeaf()) return false;
+
+bool h = false;
+sal_Int32 max = 0;
+
+std::vector TVDom* ::iterator max_It, i;
+max_It = tvDom-children.begin();
+
+sal_Int32 c_int;
+sal_Int32 p_int = p-id.toInt32();
+
+check this level in the tree
+for(i = tvDom-children.begin(); i!=tvDom-children.end(); ++i)
+if (!((*i)-isLeaf())
+((*i)-id.getLength() == p-id.getLength())
+(p-id.replaceAt((*i)-parent-id.getLength(),
p-id.getLength()-(*i)-parent-id.getLength(), OUString()) ==
(*i)-parent-id)) //prefix check
+{
+h = true;
+c_int = (*i)-id.toInt32();
+
+if (p_int==c_int)
+{
+(*(tvDom-children.insert(i+1, p)))-parent = tvDom;
+return true;
+}
+else if(c_intmax c_int p_int)
+{
+max = c_int;
+max_It = i+1;
+}
+}
+recursive call if necessary
+if (h) (*(tvDom-children.insert(max_It, p)))-parent = tvDom;
+else
+{
+i = tvDom-children.begin();
+while ((i!=tvDom-children.end()) (!h))
+{
+h = SearchAndInsert(p, *i);
+++i;
+}
+}
+return h;
+}
Any SAL_CALL
TVChildTarget::getByName( const rtl::OUString aName )
diff --git a/xmlhelp/source/treeview/tvread.hxx
b/xmlhelp/source/treeview/tvread.hxx
index 48e22b2..2afcd10 100644
--- a/xmlhelp/source/treeview/tvread.hxx
+++ b/xmlhelp/source/treeview/tvread.hxx
@@ -319,6 +319,10 @@ namespace treeview {
const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xMSgr,
rtl::OUString instpath ) const;
+bool SearchAndInsert(TVDom* p, TVDom* tvDom);
+
+void Check(TVDom* tvDom);
+
}; // end class TVChildTarget
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: widget layout progress
On Tue, 2012-08-21 at 10:38 +0200, Jan Holesovsky wrote: The thing that hit my eyes is the use of string identifiers to address the UI elements. Could we (for the compilation purposes) generate .hxx files out of the .ui files that would allow to do something like: m_pBodyContent = modules::swriter::ui::linenumbering::content::get(m_pUIBuilder); Yesss, that's possible I suppose, seeing as we already do that for the configmgr. Another extremely minor question - why the modules/ prefix? Is that needed? - seems to just repeat on many places (mainly in help), so maybe we could avoid that? So..., I'm currently installing the .ui into our preexisting uiconfig dirs, and the modules in the file path already exist for e.g. toolbars and so forth, e.g. install/share/config/soffice.cfg/modules/swriter/menubar/menubar.xml Then..., the gtk builder format doesn't really (AFAICS) have a direct mapping to our help id idea, so rather than extend the format I reckon that using the path to the file + dialog id + widget id as the helpid is the easiest way to guarantee helpid uniqueness rather than having a policy/set of tooling to enforce, say, dialog name uniqueness across the code base and use just dialogid:widgetid C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: animations/Module_animations.mk animations/Package_xml.mk basctl/Package_xml.mk sc/Module_sc.mk sc/Package_xml.mk sd/Package_xml.mk store/Module_store.mk store/Package_xml.mk
animations/Module_animations.mk |1 animations/Package_xml.mk | 33 - basctl/Package_xml.mk |1 sc/Module_sc.mk |1 sc/Package_xml.mk | 142 sd/Package_xml.mk | 28 --- store/Module_store.mk |1 store/Package_xml.mk| 31 sw/Module_sw.mk |1 sw/Package_xml.mk | 23 -- ucb/Module_ucb.mk |1 ucb/Package_xml.mk | 46 uui/Module_uui.mk |1 uui/Package_xml.mk | 33 - xmlhelp/Package_xml.mk |2 15 files changed, 345 deletions(-) New commits: commit daf23128482894e6efee21463c613bc857e15b5e Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Aug 22 16:45:53 2012 +0200 do not deliver these module-description xml files Change-Id: Ife2f42b3a917ece10dc7ee9fcd83f1558084c4f1 Reviewed-on: https://gerrit.libreoffice.org/454 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/animations/Module_animations.mk b/animations/Module_animations.mk index 66789d5..fe7770a 100644 --- a/animations/Module_animations.mk +++ b/animations/Module_animations.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Module_Module,animations)) $(eval $(call gb_Module_add_targets,animations,\ Library_animcore \ Package_inc \ - Package_xml \ )) # vim: set noet sw=4 ts=4: diff --git a/animations/Package_xml.mk b/animations/Package_xml.mk deleted file mode 100644 index c97bec0..000 --- a/animations/Package_xml.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# http://www.openoffice.org/license.html -# for a copy of the LGPLv3 License. -# -#* - -$(eval $(call gb_Package_Package,animations_xml,$(SRCDIR)/animations/source/animcore)) - -$(eval $(call gb_Package_add_file,animations_xml,xml/animcore.xml,animcore.xml)) - -# vim: set noet sw=4 ts=4: diff --git a/basctl/Package_xml.mk b/basctl/Package_xml.mk index f5dbf10..2acd529 100644 --- a/basctl/Package_xml.mk +++ b/basctl/Package_xml.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Package_Package,basctl_xml,$(SRCDIR)/basctl)) -$(eval $(call gb_Package_add_file,basctl_xml,xml/basctl.xml,util/basctl.xml)) $(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/menubar/menubar.xml,uiconfig/basicide/menubar/menubar.xml)) $(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/statusbar/statusbar.xml,uiconfig/basicide/statusbar/statusbar.xml)) $(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/dialogbar.xml,uiconfig/basicide/toolbar/dialogbar.xml)) diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index bf606df..dc63ff7 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sc,\ Library_scfilt \ Library_scui \ Package_uiconfig \ - Package_xml \ )) ifneq ($(DISABLE_SCRIPTING),TRUE) diff --git a/sc/Package_xml.mk b/sc/Package_xml.mk deleted file mode 100644 index e56ca17..000 --- a/sc/Package_xml.mk +++ /dev/null @@ -1,142 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Norbert
Re: Help Locating Base Code
Thanks for letting me know it's Lionel :) I told Rafael yesterday in the chat that just because I enjoy being angry (actually just enjoy a good challenge) I'll probably assign myself another base bug in the coming weeks and spend 20 hours to fix one line ;) now I know who to bug with every minor question (just kidding!). Best Regards, Joel On Wed, Aug 22, 2012 at 12:16 AM, Jan Holesovsky ke...@suse.cz wrote: Hi Joel, On 2012-08-21 at 11:10 -0700, Joel Madero wrote: Thanks to everyone who helped me along the way. The code actually ended up being in formcomponenthandler.cxx, FormComponentPropertyHandler::impl_browseImage_nothrow. Great to hear; I hope I did not mislead you too much - that was the other occurrence of FILEOPEN_LINK_PREVIEW/CHECKBOX_LINK :-) I think we need to start looking for a database expert, someone who enjoys it and is willing to get into the grit of the crappy code. Any takers ? ;) Oh - database expert, that's Lionel :-) But of course, having more database experts would be great! I'll get the patch done tonight after I clear all the other stuff I was testing with, going to attempt gerritt for the first time. Looking forward to the patch! All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa sw/source
sw/qa/core/swdoc-test.cxx | 10 --
sw/source/core/txtnode/txtedt.cxx | 13 +++--
2 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit 3ba107606682b5e675127483a514f0e6580ecfd1
Author: Muhammad Haggag mhag...@gmail.com
Date: Wed Aug 22 16:46:23 2012 +0200
fdo#53399 Word count is inconsistent and wrong with non-breaking space
This change replaces lcl_IsSkippableWhitespace with a call to ICU's
u_isspace, which covers all Unicode separators. It also updates and fixes one
of the SwScanner unit tests.
Bug details:
SwScanner::NextWord skips whitespace before calling into ICU's
BreakIterator. The function used to identify whitespace
(lcl_IsSkippableWhitespace) doesn't cover the full category of Unicode
separators (code [Zs], 18 in total. See:
http://www.fileformat.info/info/unicode/category/Zs/index.htm).
Since 0xA0 (no-break space) is not identified as whitespace and not
skipped, we end up calling ICU starting at the position 0xA0, asking it to get
us the boundary of the next word forward. ICU sees that it's called at the end
of a word, and reverses the query direction to backward, and returns the word
before. This causes NextWord to think we've hit the end of the string and call
it a day, terminating word count for the rest of the line.
Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5
Reviewed-on: https://gerrit.libreoffice.org/453
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index a5df143..54a1cff 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -423,6 +423,7 @@ void SwDocTest::testSwScanner()
}
//See https://issues.apache.org/ooo/show_bug.cgi?id=89042
+//See https://bugs.freedesktop.org/show_bug.cgi?id=53399
{
SwDocStat aDocStat;
@@ -439,15 +440,20 @@ void SwDocTest::testSwScanner()
CPPUNIT_ASSERT_MESSAGE(Should be 3, aDocStat.nWord == 3);
const sal_Unicode aShouldBeFive[] = {
+// fr e n c h space
0x0046, 0x0072, 0x0065, 0x006E, 0x0063, 0x0068, 0x0020,
+//nbsps a v o i
0x00AB, 0x00A0, 0x0073, 0x0061, 0x0076, 0x006F, 0x0069,
-0x0072, 0x0020, 0x0063, 0x0061, 0x006C, 0x0063, 0x0075,
-0x006C, 0x0065, 0x0072, 0x00A0, 0x00BB
+// rnnbsp c a l c u
+0x0072, 0x202f, 0x0063, 0x0061, 0x006C, 0x0063, 0x0075,
+// le r idspace
+0x006C, 0x0065, 0x0072, 0x3000, 0x00BB
};
m_pDoc-AppendTxtNode(*aPaM.GetPoint());
m_pDoc-InsertString(aPaM, rtl::OUString(aShouldBeFive,
SAL_N_ELEMENTS(aShouldBeFive)));
pTxtNode = aPaM.GetNode()-GetTxtNode();
+aDocStat.Reset();
pTxtNode-CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
CPPUNIT_ASSERT_MESSAGE(Should be 5, aDocStat.nWord == 5);
}
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index 66650ba..ca3b961 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -71,6 +71,7 @@
#include txtatr.hxx
#include fmtautofmt.hxx
#include istyleaccess.hxx
+#include unicode/uchar.h
#include unomid.h
@@ -96,14 +97,6 @@ using namespace ::com::sun::star::smarttags;
extern const SwTxtNode *pLinguNode;
extern SwTxtFrm *pLinguFrm;
-bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh )
-{
-return 0x3000 == cCh ||
- ' ' == cCh ||
- '\t' == cCh ||
- 0x0a == cCh;
-}
-
/*
* This has basically the same function as SwScriptInfo::MaskHiddenRanges,
* only for deleted redlines
@@ -731,7 +724,7 @@ sal_Bool SwScanner::NextWord()
// skip non-letter characters:
while ( nBegin aText.getLength() )
{
-if ( !lcl_IsSkippableWhiteSpace( aText[nBegin] ) )
+if ( !u_isspace( aText[nBegin] ) )
{
if ( !pLanguage )
{
@@ -1877,7 +1870,7 @@ void SwTxtNode::CountWords( SwDocStat rStat,
//do the count
// all counts exclude hidden paras and hidden+redlined within para
// definition of space/white chars in SwScanner (and BreakIter!)
-// uses both lcl_IsSkippableWhiteSpace and BreakIter getWordBoundary in
SwScanner
+// uses both u_isspace and BreakIter getWordBoundary in SwScanner
sal_uInt32 nTmpWords = 0;// count of all words
sal_uInt32 nTmpAsianWords = 0; //count of all Asian codepoints
sal_uInt32 nTmpChars = 0;// count of all chars
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#53399 Word count is inconsistent and wrong with non-brea...
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: fdo#53399 Word count is inconsistent and wrong with non-breaking space .. fdo#53399 Word count is inconsistent and wrong with non-breaking space This change replaces lcl_IsSkippableWhitespace with a call to ICU's u_isspace, which covers all Unicode separators. It also updates and fixes one of the SwScanner unit tests. Bug details: SwScanner::NextWord skips whitespace before calling into ICU's BreakIterator. The function used to identify whitespace (lcl_IsSkippableWhitespace) doesn't cover the full category of Unicode separators (code [Zs], 18 in total. See: http://www.fileformat.info/info/unicode/category/Zs/index.htm). Since 0xA0 (no-break space) is not identified as whitespace and not skipped, we end up calling ICU starting at the position 0xA0, asking it to get us the boundary of the next word forward. ICU sees that it's called at the end of a word, and reverses the query direction to backward, and returns the word before. This causes NextWord to think we've hit the end of the string and call it a day, terminating word count for the rest of the line. Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5 --- M sw/qa/core/swdoc-test.cxx M sw/source/core/txtnode/txtedt.cxx 2 files changed, 11 insertions(+), 12 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/453 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Muhammad Haggag mhag...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - dbaccess/source
dbaccess/source/ui/dlg/queryfilter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0ada624c20b44bdc2bea751a6c2f6e47af0ae4f1
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Aug 21 17:23:34 2012 +0200
fdo#46480 do not double-escape (e.g. date) literals as strings
Change-Id: I50d3f1002468d41d5b5882de170699d44fe5223c
Reviewed-on: https://gerrit.libreoffice.org/443
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx
b/dbaccess/source/ui/dlg/queryfilter.cxx
index 9d481ac..a639828 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -369,7 +369,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox
_rField,const ListBox _rCom
_rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectEntry() );
if ( SQLFilterOperator::SQLNULL != _rFilter.Handle _rFilter.Handle !=
SQLFilterOperator::NOT_SQLNULL )
{
-String sPredicateValue = m_aPredicateInput.getPredicateValue(
_rValue.GetText(), getMatchingColumn( _rValue ), sal_True );
+String sPredicateValue = m_aPredicateInput.getPredicateValue(
_rValue.GetText(), getMatchingColumn( _rValue ), sal_False );
::Replace_OS_PlaceHolder( sPredicateValue );
_rFilter.Value = ::rtl::OUString(sPredicateValue);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/source
connectivity/source/parse/sqlbison.y | 34 +-
1 file changed, 25 insertions(+), 9 deletions(-)
New commits:
commit c90db23996c0580e9cd45db0230062a586fb8a53
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Aug 21 19:27:30 2012 +0200
fdo#53887 ConvertLikeToken(): make escape character properly escape itself
Change-Id: Ic2b79e78f95e298a08794fa11f227d76152244f5
Reviewed-on: https://gerrit.libreoffice.org/444
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index 54cc68e..00fb0b3 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4519,7 +4519,7 @@ const double fMilliSecondsPerDay = 8640.0;
//--
::rtl::OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const
OSQLParseNode* pEscapeNode, sal_Bool bInternational)
{
- ::rtl::OUStringBuffer aMatchStr;
+ ::rtl::OUStringBuffer aMatchStr(0);
if (pTokenNode-isToken())
{
sal_Unicode cEscape = 0;
@@ -4541,18 +4541,34 @@ const double fMilliSecondsPerDay = 8640.0;
sReplace.appendAscii(%_,2);
}
+ bool wasEscape = false;
for (sal_Int32 i = 0; i nLen; i++)
{
const sal_Unicode c = aMatchStr[i];
- if (c == sSearch[0] || c == sSearch[1])
+ // SQL standard requires the escape to be followed
+ // by a meta-character ('%', '_' or itself), else error
+ // We are more lenient here and let it escape anything.
+ // Especially since some databases (e.g. Microsoft SQL
Server)
+ // have more meta-characters than the standard, such as
e.g. '[' and ']'
+ if (wasEscape)
{
- if (i 0 aMatchStr[i - 1] == cEscape)
- continue;
- else
- {
- const sal_Unicode cCharacter =
sReplace[(c == sSearch[0] ? 0 : 1)];
- aMatchStr[i] = cCharacter;
- }
+ wasEscape=false;
+ continue;
+ }
+ if (c == cEscape)
+ {
+ wasEscape=true;
+ continue;
+ }
+ int match = -1;
+ if (c == sSearch[0])
+ match=0;
+ else if (c == sSearch[1])
+ match=1;
+
+ if (match != -1)
+ {
+ aMatchStr[i] = sReplace[match];
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#46480 do not double-escape (e.g. date) literals as strin...
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: fdo#46480 do not double-escape (e.g. date) literals as strings .. fdo#46480 do not double-escape (e.g. date) literals as strings Change-Id: I50d3f1002468d41d5b5882de170699d44fe5223c --- M dbaccess/source/ui/dlg/queryfilter.cxx 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/443 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50d3f1002468d41d5b5882de170699d44fe5223c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#53887 ConvertLikeToken(): make escape character properly...
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: fdo#53887 ConvertLikeToken(): make escape character properly escape itself .. fdo#53887 ConvertLikeToken(): make escape character properly escape itself Change-Id: Ic2b79e78f95e298a08794fa11f227d76152244f5 --- M connectivity/source/parse/sqlbison.y 1 file changed, 25 insertions(+), 9 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/444 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2b79e78f95e298a08794fa11f227d76152244f5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: (great) widget layout progress
On Tue, 2012-08-21 at 12:50 +0100, Michael Meeks wrote: Do we have a GtkFixed style back-compat hack that will continue to nail widgets into their places, but do it in TWIPS such that we could do a one-shot conversion of everything and then iterate ? [ then let the designers re-work them incrementally ]. Planned something of that nature, in parallel with converter utility thing. i.e. have converter do the simplest conversion possible to a GtkGrid rather than guess/assign some layout. [*] maybe the cast-happy syntax looks a bit vile. In my experience it is remarkably common for even programmers to tweak the XML and rename / loose widgets in such a way that the code crashes later ;-) Yeah, maybe's kendy's suggestion might be the way to go, make it a build time problem. Anyhow - I'm rather excited about this - it looks insanely cool :-) are there any notable blockers stopping us getting it into master ? a) I'm working on a windows install to make sure it doesn't fall over and die under windows immediately b) print dialog looks busted, so some change has screwed that over. c) I need to stick my notes on the wiki So, here's a nagging concern of my own, not big enough to bother me greatly, but I haven't measured the size of increase due to the xml .ui files vs the size of reduction of the binary resource format. I presume that the .ui format is bigger, though its possible that the trivially-simple xml format I'm using for just the translations that maps to the single always-there en-US .ui file vs the full resource copy of the binary scheme offsets that a bit. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/source
desktop/source/app/app.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 427529801dee122250e44d2311b34651db92bbdb
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 21 18:55:11 2012 +0200
Typo
Change-Id: I41fd1463b6432818ee36e7f90e920a5fd98c7106
(cherry picked from commit 1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d929787..55ebaca 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -194,7 +194,7 @@ void removeTree(OUString const url) {
osl::FileBase::RC rc = osl::Directory::remove(url);
SAL_WARN_IF(
rc != osl::FileBase::E_None, desktop,
-cannot remove directory url : +rc);
+cannot remove directory url : +rc);
// at least on Windows XP removing some existing directories fails with
// osl::FileBase::E_ACCESS because they are read-only; but keeping
those
// directories around should be harmless once they are empty
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6] missing in fdo#53655: removing extensions\bundled fails on Win XP
Hi Stephan, On Tuesday, 2012-08-21 19:01:00 +0200, Stephan Bergmann wrote: Just noticed a missing in a SAL_WARN_IF in that commit, addressed on master now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b Typo. Cherry-picked to 3-6 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=427529801dee122250e44d2311b34651db92bbdb Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpsbFSVpwlVo.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: (great) widget layout progress
How much work would it be to make this directly use gettext? I thought the long term goal was to switch from custom translation formats to gettext, so using yet another custom translation format for something like this seems a bit odd. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: (great) widget layout progress
Hi there, On Wed, 2012-08-22 at 17:55 +0200, khagaroth wrote: How much work would it be to make this directly use gettext? I thought the long term goal was to switch from custom translation formats to gettext, so using yet another custom translation format for something like this seems a bit odd. We had a prototype patch to use gettext on top of a key-id translation (IIRC). Unfortunately, despite the apparent simplicity of the patch, gettext started returning the most amazing results - perhaps some threading issue or ... I'd like to see some live/gettext integration working first ;-) clearly for translators to be able to see the results of their work quickly would be just wonderful - Andras is the expert here. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: (great) widget layout progress
On Wed, 2012-08-22 at 16:36 +0100, Caolán McNamara wrote:
Planned something of that nature, in parallel with converter utility
thing. i.e. have converter do the simplest conversion possible to a
GtkGrid rather than guess/assign some layout.
Sounds sensible to me :-)
Yeah, maybe's kendy's suggestion might be the way to go, make it a build
time problem.
Would work nicely I think; presumably we need some make magic for these
guys anyway to install them in some clever way.
I wonder if creating a sub-class that you could derive from:
class FooDialog : agen::ui::FooDialog {
};
that had all the Widget *m_pWidget; fluff in it ? and a suitable
pre-canned constructor table that could be size optimised later ?
a) I'm working on a windows install to make sure it doesn't fall over
and die under windows immediately
Great :-)
b) print dialog looks busted, so some change has screwed that over.
c) I need to stick my notes on the wiki
So we're nearly there - exciting times indeed :-)
So, here's a nagging concern of my own, not big enough to bother me
greatly, but I haven't measured the size of increase due to the xml .ui
files vs the size of reduction of the binary resource format. I presume
that the .ui format is bigger, though its possible that the
trivially-simple xml format I'm using for just the translations that
maps to the single always-there en-US .ui file vs the full resource copy
of the binary scheme offsets that a bit.
IMHO binary hand-packed formats are always utterly worse than layering
generic compression on top of something which since we always read
linearly should be trivial.
Can we not whack the UI files into a single .zip file ? I suspect that
would make them substantially smaller (glade produces some quite verbose
XML element-wise IIRC). [ Perhaps with a first-check (like the
images.zip accesses) to a directory tree so people can prototype their
changes in a live build ].
Anyhow - it sounds like some impressive work,
Good stuff,
Michael.
--
michael.me...@suse.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - unotools/inc unotools/source
unotools/inc/unotools/ucbhelper.hxx |7 +++
unotools/source/ucbhelper/ucbhelper.cxx | 17 -
2 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 16a63f16699fd1383eb4bea6abfed9a98ed94838
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Aug 22 09:11:23 2012 +0200
fdo#46249: UCBContentHelper::GetTitle must not fail for void property
This was a regression introduced with
2af9040d38af7c7353855415dbea0134585058f3
Cleaned up utl::UCBContentHelper. GetSize exhibited the same problem and
has
also been fixed. IsYounger exhibits a similar problem, but has not been
addressed, as it is unclear what to return in case no dates can be
compared; it
is only used in one place (handling SID_EDITDOC in
SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it
appears,
only contents for which DateModified /does/ yield a non-void value are
relevant.
Change-Id: Iff9f5e1ed6f45eede117713d64a265b98f6862b1
Reviewed-on: https://gerrit.libreoffice.org/449
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/unotools/inc/unotools/ucbhelper.hxx
b/unotools/inc/unotools/ucbhelper.hxx
index 358d8e1..3ff576b 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -47,6 +47,10 @@ UNOTOOLS_DLLPUBLIC bool IsDocument(rtl::OUString const
url);
UNOTOOLS_DLLPUBLIC bool IsFolder(rtl::OUString const url);
+/// @param title must not be null
+/// @return true iff title has been set (i.e., if obtaining the Title
property
+/// of the given content yields a non-void value without raising a
+/// non-RuntimeException; RuntimeExceptions are passed through)
UNOTOOLS_DLLPUBLIC bool GetTitle(
rtl::OUString const url, rtl::OUString * title);
@@ -62,6 +66,9 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
ucbhelper::Content parent, rtl::OUString const title,
ucbhelper::Content result, bool exclusive = false);
+/// @return the value of the Size property of the given content, or zero if
+/// obtaining the property yields a void value or raises a
+/// non-RuntimeException (RuntimeExceptions are passed through)
UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(rtl::OUString const url);
UNOTOOLS_DLLPUBLIC bool IsYounger(
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx
b/unotools/source/ucbhelper/ucbhelper.cxx
index cbb9ee9..09203df 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -200,11 +200,7 @@ bool utl::UCBContentHelper::GetTitle(
{
assert(title != 0);
try {
-*title = content(url).
-getPropertyValue(
-rtl::OUString(Title)).
-getrtl::OUString();
-return true;
+return content(url).getPropertyValue(rtl::OUString(Title)) =
*title;
} catch (css::uno::RuntimeException const ) {
throw;
} catch (css::ucb::CommandAbortedException const ) {
@@ -337,10 +333,13 @@ bool utl::UCBContentHelper::MakeFolder(
sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const url) {
try {
-return
-content(url).getPropertyValue(
-rtl::OUString(Size)).
-getsal_Int64();
+sal_Int64 n = 0;
+bool ok = (content(url).getPropertyValue(rtl::OUString(Size)) = n);
+SAL_INFO_IF(
+!ok, unotools,
+UCBContentHelper::GetSize( url
+ ): Size cannot be determined);
+return n;
} catch (css::uno::RuntimeException const ) {
throw;
} catch (css::ucb::CommandAbortedException const ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - unotools/inc unotools/source
unotools/inc/unotools/ucbhelper.hxx |7 +++
unotools/source/ucbhelper/ucbhelper.cxx | 23 ++-
2 files changed, 21 insertions(+), 9 deletions(-)
New commits:
commit fc08156b06c82a1a2b9d64b57caaf434485d4d3e
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Aug 22 09:11:23 2012 +0200
fdo#46249: UCBContentHelper::GetTitle must not fail for void property
This was a regression introduced with
2af9040d38af7c7353855415dbea0134585058f3
Cleaned up utl::UCBContentHelper. GetSize exhibited the same problem and
has
also been fixed. IsYounger exhibits a similar problem, but has not been
addressed, as it is unclear what to return in case no dates can be
compared; it
is only used in one place (handling SID_EDITDOC in
SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it
appears,
only contents for which DateModified /does/ yield a non-void value are
relevant.
(cherry picked from commit 27c7682e5e5859eb353443d6091143694a56bee8)
Conflicts:
unotools/source/ucbhelper/ucbhelper.cxx
Change-Id: I748745a1d7f361f8f91be87d7356983ee7261b1e
Reviewed-on: https://gerrit.libreoffice.org/452
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/unotools/inc/unotools/ucbhelper.hxx
b/unotools/inc/unotools/ucbhelper.hxx
index 358d8e1..3ff576b 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -47,6 +47,10 @@ UNOTOOLS_DLLPUBLIC bool IsDocument(rtl::OUString const
url);
UNOTOOLS_DLLPUBLIC bool IsFolder(rtl::OUString const url);
+/// @param title must not be null
+/// @return true iff title has been set (i.e., if obtaining the Title
property
+/// of the given content yields a non-void value without raising a
+/// non-RuntimeException; RuntimeExceptions are passed through)
UNOTOOLS_DLLPUBLIC bool GetTitle(
rtl::OUString const url, rtl::OUString * title);
@@ -62,6 +66,9 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
ucbhelper::Content parent, rtl::OUString const title,
ucbhelper::Content result, bool exclusive = false);
+/// @return the value of the Size property of the given content, or zero if
+/// obtaining the property yields a void value or raises a
+/// non-RuntimeException (RuntimeExceptions are passed through)
UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(rtl::OUString const url);
UNOTOOLS_DLLPUBLIC bool IsYounger(
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx
b/unotools/source/ucbhelper/ucbhelper.cxx
index daee93f..4747d5e 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -200,11 +200,10 @@ bool utl::UCBContentHelper::GetTitle(
{
assert(title != 0);
try {
-*title = content(url).
-getPropertyValue(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Title))).
-getrtl::OUString();
-return true;
+return
+content(url).getPropertyValue(
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Title)))
+= *title;
} catch (css::uno::RuntimeException const ) {
throw;
} catch (css::ucb::CommandAbortedException const ) {
@@ -341,10 +340,16 @@ bool utl::UCBContentHelper::MakeFolder(
sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const url) {
try {
-return
-content(url).getPropertyValue(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Size))).
-getsal_Int64();
+sal_Int64 n = 0;
+bool ok =
+(content(url).getPropertyValue(
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Size)))
+ = n);
+SAL_INFO_IF(
+!ok, unotools,
+UCBContentHelper::GetSize( url
+ ): Size cannot be determined);
+return n;
} catch (css::uno::RuntimeException const ) {
throw;
} catch (css::ucb::CommandAbortedException const ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW-3-6] fdo#53399 Word count is inconsistent and wrong with non-brea...
Hi Muhammad, Thanks for the great fix for a MAB - nice work ! :-) On Wed, 2012-08-22 at 15:23 +, Gerrit wrote: fdo#53399 Word count is inconsistent and wrong with non-breaking space This change replaces lcl_IsSkippableWhitespace with a call to ICU's u_isspace, which covers all Unicode separators. It also updates and fixes one of the SwScanner unit tests. Hopefully there'll be no performance impact for word-counting of the change :-) anyhow - correctness first. It'd be great to have: http://cgit.freedesktop.org/libreoffice/core/commit/?id=3ba107606682b5e675127483a514f0e6580ecfd1 reviewed and cherry-picked by someone - Caolan ? Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#46249: UCBContentHelper::GetTitle must not fail for void...
From Michael Stahl mst...@redhat.com: Michael Stahl has submitted this change and it was merged. Change subject: fdo#46249: UCBContentHelper::GetTitle must not fail for void property .. fdo#46249: UCBContentHelper::GetTitle must not fail for void property This was a regression introduced with 2af9040d38af7c7353855415dbea0134585058f3 Cleaned up utl::UCBContentHelper. GetSize exhibited the same problem and has also been fixed. IsYounger exhibits a similar problem, but has not been addressed, as it is unclear what to return in case no dates can be compared; it is only used in one place (handling SID_EDITDOC in SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it appears, only contents for which DateModified /does/ yield a non-void value are relevant. Change-Id: Iff9f5e1ed6f45eede117713d64a265b98f6862b1 --- M unotools/inc/unotools/ucbhelper.hxx M unotools/source/ucbhelper/ucbhelper.cxx 2 files changed, 15 insertions(+), 9 deletions(-) Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/449 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff9f5e1ed6f45eede117713d64a265b98f6862b1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-5]: fdo#46249: UCBContentHelper::GetTitle must not fail for void...
From Michael Stahl mst...@redhat.com: Michael Stahl has submitted this change and it was merged. Change subject: fdo#46249: UCBContentHelper::GetTitle must not fail for void property .. fdo#46249: UCBContentHelper::GetTitle must not fail for void property This was a regression introduced with 2af9040d38af7c7353855415dbea0134585058f3 Cleaned up utl::UCBContentHelper. GetSize exhibited the same problem and has also been fixed. IsYounger exhibits a similar problem, but has not been addressed, as it is unclear what to return in case no dates can be compared; it is only used in one place (handling SID_EDITDOC in SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it appears, only contents for which DateModified /does/ yield a non-void value are relevant. (cherry picked from commit 27c7682e5e5859eb353443d6091143694a56bee8) Conflicts: unotools/source/ucbhelper/ucbhelper.cxx Change-Id: I748745a1d7f361f8f91be87d7356983ee7261b1e --- M unotools/inc/unotools/ucbhelper.hxx M unotools/source/ucbhelper/ucbhelper.cxx 2 files changed, 21 insertions(+), 9 deletions(-) Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/452 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I748745a1d7f361f8f91be87d7356983ee7261b1e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#53399 Word count is inconsistent and wrong with non-brea...
Hi Muhammad, On Wednesday, 2012-08-22 14:54:18 +, Gerrit wrote: This change replaces lcl_IsSkippableWhitespace with a call to ICU's u_isspace, which covers all Unicode separators. Hmm.. in what context is SwScanner::NextWord() actually used? In other than word count context skipping NBSP actually may be desired and now would be broken. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpkIYFhTIPff.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
gettext (was: (great) widget layout progress)
On 08/22/2012 05:55 PM, khagaroth wrote: How much work would it be to make this directly use gettext? I thought the long term goal was to switch from custom translation formats to gettext, so using yet another custom translation format for something like this seems a bit odd. Seeing gettext mentioned here: What always bothered me about (what little, really, I know about) gettext, is that AFAIU it is based on the assumption that a single string S in input language A can always be mapped to the same string in output language B, even if S appears in multiple places in the source, with potentially different semantics (that just happen to all be representable by the same phrase S in language A, but not necessarily so in language B). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License Statement
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Jung-uk Kim -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAlA1B9gACgkQmlay1b9qnVNZagCfQkC134x8yKSkWvKkN1+BMjQG I28AoIH4zrUlkLXGSJU1uUGUQ8XDc5Ga =21eK -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 46249, which changed state. Bug 46249 Summary: CRASH when browse to HD root directory in FILEOPEN Template dialog https://bugs.freedesktop.org/show_bug.cgi?id=46249 What|Old Value |New Value Resolution||FIXED Status|ASSIGNED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gettext (was: (great) widget layout progress)
Not really, that's what msgctxt is for. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/prj Makefile.top postprocess/prj
Makefile.top |3 +++ android/prj/build.lst |2 +- postprocess/prj/build.lst |2 +- 3 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 9d73597289be9049e8300ff92980fdffbe4d7040 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Aug 22 18:32:05 2012 +0200 another build integrating solution for android ..since it also needs stuff from postprocess. In qa/desktop/Makefile, images_tango.zip is used. If that's not needed, the module can be placed between postprocess and packimages for now. Change-Id: I9951cce0c8da0fc75fd8a7b1246f4083bd38f705 diff --git a/Makefile.top b/Makefile.top index 979671f..54fa900 100644 --- a/Makefile.top +++ b/Makefile.top @@ -406,6 +406,9 @@ else cd instsetoo_native unset MAKEFLAGS \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) endif +ifeq ($(OS),ANDROID) + cd android $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) +endif cross-toolset: bootstrap fetch cd cross_toolset $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) diff --git a/android/prj/build.lst b/android/prj/build.lst index bac6f27..1a0c8c2 100644 --- a/android/prj/build.lst +++ b/android/prj/build.lst @@ -1,2 +1,2 @@ -an android :: tail_build NULL +an android :: packimages postprocess NULL an android\prj nmake - all an_prj NULL diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 51a8035..819a19c 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build android NULL +po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL po postprocess usr1- all po_mkout NULL po postprocess\checkxmlnmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: gettext (was: (great) widget layout progress)
2012/8/22 Stephan Bergmann sberg...@redhat.com: On 08/22/2012 05:55 PM, khagaroth wrote: How much work would it be to make this directly use gettext? I thought the long term goal was to switch from custom translation formats to gettext, so using yet another custom translation format for something like this seems a bit odd. Seeing gettext mentioned here: What always bothered me about (what little, really, I know about) gettext, is that AFAIU it is based on the assumption that a single string S in input language A can always be mapped to the same string in output language B, even if S appears in multiple places in the source, with potentially different semantics (that just happen to all be representable by the same phrase S in language A, but not necessarily so in language B). This is why msgctx (message context) was invented, it solved this problem. In my opinion gettext has other disadvantages in LibreOffice, such as we cannot use it for all localizable content easily (e.g. help, Windows installer, etc.). Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
'make check' failure
Hi, I just ran into this error when running 'make check'. Should I file a bug report on that ? Regards, John Smith * Failures that appeared during scenario execution: sc.ScAccessiblePageHeaderArea 1 of 96 tests failed Job run took: 717865ms [00:11:57] Job -sce /usr/local/src/libreoffice/sc/qa/unoapi/sc.sce failed No core dump at /usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/user, to create core dumps (and stack traces) for crashed soffice instances, enable core dumps with: ulimit -c unlimited E Time: 733.897 There was 1 failure: 1) test(org.openoffice.test.UnoApiTest) java.lang.AssertionError at org.junit.Assert.fail(Assert.java:92) at org.junit.Assert.assertTrue(Assert.java:43) at org.junit.Assert.assertTrue(Assert.java:54) at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:45) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:42) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20) at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:30) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:263) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:68) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:47) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222) at org.junit.runners.ParentRunner.run(ParentRunner.java:300) at org.junit.runners.Suite.runChild(Suite.java:128) at org.junit.runners.Suite.runChild(Suite.java:24) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222) at org.junit.runners.ParentRunner.run(ParentRunner.java:300) at org.junit.runner.JUnitCore.run(JUnitCore.java:157) at org.junit.runner.JUnitCore.run(JUnitCore.java:136) at org.junit.runner.JUnitCore.run(JUnitCore.java:117) at org.junit.runner.JUnitCore.runMain(JUnitCore.java:98) at org.junit.runner.JUnitCore.runMainAndExit(JUnitCore.java:53) at org.junit.runner.JUnitCore.main(JUnitCore.java:45) FAILURES!!! Tests run: 1, Failures: 1 to rerun just this failed test without all others, run: make /usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/user cd into the module dir to run the tests faster Or to do interactive debugging, run two shells with (Linux only): make debugrun make gb_JunitTest_DEBUGRUN=T /usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/done make[2]: *** [/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/done] Error 1 make[2]: *** Waiting for unfinished jobs make[2]: Leaving directory `/usr/local/src/libreoffice' make[1]: *** [subsequentcheck] Error 2 make[1]: Leaving directory `/usr/local/src/libreoffice' make: *** [check] Error 2 # ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - solenv/gbuild
solenv/gbuild/LinkTarget.mk |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit f49be70f1859a2734e9516a5036adb2426939e68 Author: Michael Stahl mst...@redhat.com Date: Tue Aug 21 22:37:03 2012 +0200 fdo#53888: fix YaccTarget/LexTarget dependencies: These cannot be order only because if the source file is changed the generated cxx file has to be recompiled as well. Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379 (cherry picked from commit cd0046bca0691fdca45a030903b7cde3bfee544c) Reviewed-on: https://gerrit.libreoffice.org/450 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index e4185a0..d9632e1 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -206,8 +206,10 @@ $(call gb_YaccTarget_get_target,%) : $(call gb_YaccTarget_get_source,$(SRCDIR),% $(call gb_YaccTarget__command,$,$*,$@,$(call gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*)) define gb_YaccTarget_YaccTarget -$(call gb_YaccTarget_get_grammar_target,$(1)) :| $(call gb_YaccTarget_get_target,$(1)) -$(call gb_YaccTarget_get_header_target,$(1)) :| $(call gb_YaccTarget_get_target,$(1)) +$(call gb_YaccTarget_get_grammar_target,$(1)) : $(call gb_YaccTarget_get_target,$(1)) + touch $$@ +$(call gb_YaccTarget_get_header_target,$(1)) : $(call gb_YaccTarget_get_target,$(1)) + touch $$@ endef @@ -229,7 +231,8 @@ $(call gb_LexTarget_get_target,%) : $(call gb_LexTarget_get_source,$(SRCDIR),%) # gb_LexTarget_LexTarget(scanner-file) define gb_LexTarget_LexTarget -$(call gb_LexTarget_get_scanner_target,$(1)) :| $(call gb_LexTarget_get_target,$(1)) +$(call gb_LexTarget_get_scanner_target,$(1)) : $(call gb_LexTarget_get_target,$(1)) + touch $$@ endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/sdremote sd/source
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
| 118 +-
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
| 11
android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java
|2
android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
|3
sd/source/ui/remotecontrol/BluetoothServer.cxx
| 94 +--
sd/source/ui/remotecontrol/BluetoothServer.hxx
|8
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
| 41 +++
sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
| 23 +
sd/source/ui/remotecontrol/Communicator.cxx
| 31 --
sd/source/ui/remotecontrol/Receiver.cxx
|2
sd/source/ui/remotecontrol/Server.cxx
|4
sd/source/ui/remotecontrol/Transmitter.cxx
|8
sd/source/ui/remotecontrol/Transmitter.hxx
|6
13 files changed, 230 insertions(+), 121 deletions(-)
New commits:
commit 1db66c2a1a8ad5a60c68b09ddacc1bb6e021299f
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Wed Aug 22 12:44:42 2012 +0200
Bluetooth connection working (Linux).
Change-Id: Iac77c3ce0ab0ea7bda3105c58859888e55e64d2d
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
index 6d37351..9880b8f 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothClient.java
@@ -8,6 +8,8 @@
*/
package org.libreoffice.impressremote.communication;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
import java.net.Socket;
import java.util.UUID;
@@ -15,6 +17,8 @@ import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothSocket;
import android.content.Context;
+import android.content.Intent;
+import android.support.v4.content.LocalBroadcastManager;
/**
* Standard Network client. Connects to a server using Sockets.
@@ -31,67 +35,77 @@ public class BluetoothClient extends Client {
super(aContext);
try {
BluetoothAdapter aAdapter = BluetoothAdapter.getDefaultAdapter();
+System.out.println(Attemtping to connect to: + bluetoothAddress);
BluetoothDevice aDevice = aAdapter
.getRemoteDevice(bluetoothAddress);
+aAdapter.cancelDiscovery();
BluetoothSocket aSocket = aDevice
.createRfcommSocketToServiceRecord(UUID
-
.fromString(1101--1000-8000-00805f9b34fb));
+
.fromString(1101--1000-8000-00805F9B34FB));
aSocket.connect();
+//mSocket = aSocket;
+System.out.println(Connected);
+
+mInputStream = aSocket.getInputStream();
+mReader = new BufferedReader(new InputStreamReader(mInputStream,
+CHARSET));
+mOutputStream = aSocket.getOutputStream();
+
+//mOutputStream.write(20);
+//mOutputStream.write(20);
+//mOutputStream.write(20);
+//mOutputStream.flush();
+//System.out.println(reading);
+//while (true) {
+//System.out.println(mInputStream.read());
+//}
+String aTemp = mReader.readLine();
+System.out.println(SF:waited);
+if (!aTemp.equals(LO_SERVER_SERVER_PAIRED)) {
+return;
+}
+while (mReader.readLine().length() != 0) {
+// Get rid of extra lines
+}
+Intent aIntent = new Intent(
+CommunicationService.MSG_PAIRING_SUCCESSFUL);
+LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent);
+startListening();
+// Pairing.
+//Random aRandom = new Random();
+//String aPin = + (aRandom.nextInt(9000) + 1000);
+//while (aPin.length() 4) {
+//aPin = 0 + aPin; // Add leading zeros if
necessary
+//}
+//Intent aIntent = new Intent(
+//
[PUSHED] Change in core[libreoffice-3-6]: fdo#53888: fix YaccTarget/LexTarget dependencies:
From Björn Michaelsen bjoern.michael...@canonical.com: Björn Michaelsen has submitted this change and it was merged. Change subject: fdo#53888: fix YaccTarget/LexTarget dependencies: .. fdo#53888: fix YaccTarget/LexTarget dependencies: These cannot be order only because if the source file is changed the generated cxx file has to be recompiled as well. Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379 (cherry picked from commit cd0046bca0691fdca45a030903b7cde3bfee544c) --- M solenv/gbuild/LinkTarget.mk 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/450 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c1d8e2d90d98a80ce747f8cd1d118e0a83ed379 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#53888: svx: fix dependencies:
From Michael Stahl mst...@redhat.com: Michael Stahl has uploaded a new change for review. Change subject: fdo#53888: svx: fix dependencies: .. fdo#53888: svx: fix dependencies: It appears that since cd0046bca0691fdca45a030903b7cde3bfee544c, 2 tinderboxes fail on including the generated sqlbison.hxx; it turns out one of the inclusions of that in svx is unnecessary and the other is used to call a virtual function, which can apparently be done without linking; just link svx to dbtools anyway, that should fix the build. Change-Id: I7f7b1c4e9561c4dd2b820b173d05bdd5d4c6ba6d (cherry picked from commit 01089138cc76f5717244bd04f25a868602aeaab6) --- M svx/Library_svx.mk M svx/source/inc/filtnav.hxx 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/456/1 -- To view, visit https://gerrit.libreoffice.org/456 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f7b1c4e9561c4dd2b820b173d05bdd5d4c6ba6d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - filter/source officecfg/registry sfx2/source
filter/source/config/cache/constant.hxx |1 filter/source/config/cache/filtercache.cxx |1 filter/source/config/fragments/filters/Text.xcu |1 filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu |1 filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu |1 filter/source/config/fragments/filters/Text__encoded_.xcu |1 filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu |1 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu |1 officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs |3 + sfx2/source/bastyp/fltfnc.cxx | 16 -- 10 files changed, 24 insertions(+), 3 deletions(-) New commits: commit d632fa4d8fc6a42a58cb981865d6267d90951b69 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Aug 21 21:53:52 2012 -0400 fdo#52451: Ensure that the extension for text is .txt from writer. Added a preferred extension property to the filter which overwrites one(s) given by the default file format type associated with it. Normally this property is not used for the majority of the filters, but for plain text filters, we need to use .txt when saving from writer whereas we do .csv from calc. (cherry picked from commit ba03f2dc817c692fa8709391ec83d8e01a0f8b28) (cherry picked from commit 84d1ff7be178ec3572710e092e85fe548ce3042b) (cherry picked from commit 45b03c888042052a47cb79bc5a2837d04e115c5e) Squashed these 3 commits into 1. Also needed rtl::OUString(*.) instead of OUString(*.) in sfx2/source/bastyp/fltfnc.cxx Change-Id: Ic6d769bc1180f88fd75f40909e5e054d45719178 Signed-off-by: Eike Rathke er...@redhat.com diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index a6e28b5..0102b32 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -69,6 +69,7 @@ #define PROPNAME_USERDATA UserData #define PROPNAME_TEMPLATENAME TemplateName #define PROPNAME_FILEFORMATVERSION FileFormatVersion +#define PROPNAME_EXPORTEXTENSION ExportExtension /** @short used to identify a frame loader or detect service item property against the configuration API and can be used diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index e6e1e4f..220eeaa 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1825,6 +1825,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference css::container:: aItem[PROPNAME_UICOMPONENT ] = xItem-getByName(PROPNAME_UICOMPONENT ); aItem[PROPNAME_FILTERSERVICE] = xItem-getByName(PROPNAME_FILTERSERVICE); aItem[PROPNAME_DOCUMENTSERVICE ] = xItem-getByName(PROPNAME_DOCUMENTSERVICE ); +aItem[PROPNAME_EXPORTEXTENSION ] = xItem-getByName(PROPNAME_EXPORTEXTENSION ); // special handling for flags! Convert it from a list of names to its // int representation ... diff --git a/filter/source/config/fragments/filters/Text.xcu b/filter/source/config/fragments/filters/Text.xcu index 4a703d3..4629f89 100644 --- a/filter/source/config/fragments/filters/Text.xcu +++ b/filter/source/config/fragments/filters/Text.xcu @@ -4,6 +4,7 @@ prop oor:name=FilterService/ prop oor:name=UserDatavalueTEXT/value/prop prop oor:name=FileFormatVersionvalue0/value/prop +prop oor:name=ExportExtensionvaluetxt/value/prop prop oor:name=Typevaluegeneric_Text/value/prop prop oor:name=TemplateName/ prop oor:name=DocumentServicevaluecom.sun.star.text.TextDocument/value/prop diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu index 29ad18a..0332e3e 100644 --- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu @@ -4,6 +4,7 @@ prop oor:name=FilterService/ prop oor:name=UserDatavalueTEXT/value/prop prop oor:name=FileFormatVersionvalue0/value/prop +prop oor:name=ExportExtensionvaluetxt/value/prop prop oor:name=Typevaluegeneric_Text/value/prop prop oor:name=TemplateName/ prop oor:name=DocumentServicevaluecom.sun.star.text.WebDocument/value/prop diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
Re: [PUSHED 3-6][REVIEW 3-6-1 1/3] Fix for fdo#52451
Hi, On Wednesday, 2012-08-22 09:52:46 -0400, Kohei Yoshida wrote: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=ba03f2dc817c692fa8709391ec83d8e01a0f8b28 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=84d1ff7be178ec3572710e092e85fe548ce3042b https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=45b03c888042052a47cb79bc5a2837d04e115c5e Cherry-picked and squashed into one https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=d632fa4d8fc6a42a58cb981865d6267d90951b69 (just that OUString(.*) had to be rtl::OUString(.*) instead) Two more reviews needed for 3-6-1 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpGubaCrc7i6.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/core/data/dpcache.cxx|9 ++---
sc/source/ui/docshell/dbdocfun.cxx |6 --
2 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 88979ef6ffe7921200311513d6601f9c5d582a42
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Aug 22 14:55:34 2012 -0400
Don't clear the database data cache here.
This would result in the pivot cache being refreshed twice. This block
of code was a leftover from the previous, non-cached version of pivot
table, and this logic no longer applies today.
In today's pivot table code, the cache gets refreshed first, then the
table gets refreshed afterward. We should never clear the cache data
during table refresh.
Change-Id: Ida6fa1805463facf842cb9ea94f4c1afab716595
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index ffcc59e..c5ac760 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1324,12 +1324,6 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj,
const ScDPObject* pNewOb
}
if ( pDestObj )
{
-// create new database connection for refresh
-// (and re-read column entry collections)
-// so all changes take effect
-if ( pNewObj == pOldObj pDestObj-IsImportData() )
-pDestObj-ClearTableData();
-
pDestObj-ReloadGroupTableData();
pDestObj-InvalidateData(); // before getting the
new output area
commit f4ed9a5adbea3de88870ff4f5cb202bd606e0746
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Aug 22 14:25:01 2012 -0400
fdo#53640: Correctly cache source data coming from database backend.
It was due to a simple misplacement of nRow = 0. Each record was
labeled row 0. No wonder it screws up the result badly.
Change-Id: Ia94f42a62f98a9bd7c9d34df3606351bb487931b
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index d04adf1..ff8fc6e 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -461,24 +461,27 @@ bool ScDPCache::InitFromDataBase (const
Referencesdbc::XRowSet xRowSet, const
Referencesdbc::XRow xRow(xRowSet, UNO_QUERY_THROW);
std::vectorBucket aBuckets;
+ScDPItemData aData;
for (sal_Int32 nCol = 0; nCol mnColumnCount; ++nCol)
{
xRowSet-first();
-ScDPItemData aData;
aBuckets.clear();
Field rField = maFields[nCol];
+SCROW nRow = 0;
do
{
-SCROW nRow = 0;
short nFormatType = NUMBERFORMAT_UNDEFINED;
+aData.SetEmpty();
getItemValue(*this, aData, xRow, aColTypes[nCol], nCol+1,
rNullDate, nFormatType);
-aBuckets.push_back(Bucket(aData, 0, nRow++));
+aBuckets.push_back(Bucket(aData, 0, nRow));
if (!aData.IsEmpty())
{
maEmptyRows.insert_back(nRow, nRow+1, false);
SvNumberFormatter* pFormatter = mpDoc-GetFormatTable();
rField.mnNumFormat = pFormatter ?
pFormatter-GetStandardFormat(nFormatType) : 0;
}
+
+++nRow;
}
while (xRowSet-next());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6][REVIEW 3-6-1] Fix for fdo#53640 - Pivot table from database source
Hi there, I'd like https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=f4ed9a5adbea3de88870ff4f5cb202bd606e0746 cherry-picked to 3-6 and preferably to 3-6-1 as well. This fixes https://bugs.freedesktop.org/show_bug.cgi?id=53640 It's a safe fix in that, the pivot table currently doesn't work at all when pulling data from database source. So, it'd be near impossible to make it any worse. Also, optionally I'd like https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=88979ef6ffe7921200311513d6601f9c5d582a42 backported as well. Leaving this code in would result in re-populating the pivot cache twice unnecessarily, which would degrade performance. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Some cleanup for better localization
Hi,
Working with localization tools I recognized some wrong codes,
which prevent localization from perfect working. I solved some(see
patch), but remained one which not so simply. In
/help/helpcontent2/source/text/swriter/guide/using_hyphen.xhp at the
96. line, there is a localization component without id, exactly with
id=. This is the only one in whole source, so it must be a mistake.
Regards,
Zolnai TamásFrom 9da6db3d8f951550af4fa9206257b24be1d1ab87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= zolniata...@caesar.elte.hu
Date: Wed, 22 Aug 2012 16:18:35 +0200
Subject: [PATCH] Some cleanup for better localization
First: localization tool can not recognize id because
of empty line between id and its definition
Second: same problem because of comment between type and id
Change-Id: If42af406fab252ccae0a6bbc478bab8130210b21
---
svx/source/tbxctrls/tbcontrl.src |2 +-
sw/source/ui/dbui/mailmergechildwindow.src |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index a944544..85b9d43 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -58,8 +58,8 @@ String RID_SVXSTR_TRANSPARENT
{
Text [ en-US ] = No Fill ;
};
-String RID_SVXSTR_FILLPATTERN
+String RID_SVXSTR_FILLPATTERN
{
Text [ en-US ] = Pattern ;
};
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src
index d74713c..304f695 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.src
+++ b/sw/source/ui/dbui/mailmergechildwindow.src
@@ -79,7 +79,7 @@ FloatingWindow DLG_MAILMERGECHILD\
};
//FloatingWindow DLG_MM_SENDMAILS
-ModelessDialog /*ModalDialog*/ DLG_MM_SENDMAILS
+ModelessDialog DLG_MM_SENDMAILS
{
OutputSize = TRUE ;
SVLook = TRUE ;
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source sw/source
svx/source/tbxctrls/tbcontrl.src |2 +-
sw/source/ui/dbui/mailmergechildwindow.src |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 678581c48351572620846390b37a156833b1bb7e
Author: Zolnai Tamás zolniata...@caesar.elte.hu
Date: Wed Aug 22 16:18:35 2012 +0200
Some cleanup for better localization
First: localization tool can not recognize id because
of empty line between id and its definition
Second: same problem because of comment between type and id
Change-Id: If42af406fab252ccae0a6bbc478bab8130210b21
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index a944544..85b9d43 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -58,8 +58,8 @@ String RID_SVXSTR_TRANSPARENT
{
Text [ en-US ] = No Fill ;
};
-String RID_SVXSTR_FILLPATTERN
+String RID_SVXSTR_FILLPATTERN
{
Text [ en-US ] = Pattern ;
};
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src
b/sw/source/ui/dbui/mailmergechildwindow.src
index d74713c..304f695 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.src
+++ b/sw/source/ui/dbui/mailmergechildwindow.src
@@ -79,7 +79,7 @@ FloatingWindow DLG_MAILMERGECHILD\
};
//FloatingWindow DLG_MM_SENDMAILS
-ModelessDialog /*ModalDialog*/ DLG_MM_SENDMAILS
+ModelessDialog DLG_MM_SENDMAILS
{
OutputSize = TRUE ;
SVLook = TRUE ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpcontent2/source
helpcontent2/source/text/swriter/guide/using_hyphen.xhp |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 33af01c6d3ce7807be3e79a43f59329f1a300acc Author: Andras Timar ati...@suse.com Date: Wed Aug 22 21:15:53 2012 +0200 paragraph id was empty Change-Id: I4f53e0cc5743841f5ab556242bf459875afcea80 diff --git a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp index 488ee7d..8d265b9 100644 --- a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp +++ b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp @@ -93,7 +93,7 @@ paragraph xml-lang=en-US id=hd_id3145417 role=heading level=2 l10n=U oldref=36Manual Hyphenation/paragraph paragraph xml-lang=en-US id=par_id3154400 role=paragraph l10n=U oldref=23You can insert a hyphen where you want on a line, or let $[officename] search for the words to hyphenate, and then offer a suggested hyphenation./paragraph - paragraph xml-lang=en-US id= role=heading level=3 l10n=NEWTo Manually Hyphenate Single Words/paragraph + paragraph xml-lang=en-US id=hd_id6587651 role=heading level=3 l10n=NEWTo Manually Hyphenate Single Words/paragraph paragraph xml-lang=en-US id=par_id3153363 role=paragraph l10n=U oldref=24To quickly insert a hyphen, click in the word where you want to add the hyphen, and then press switchinline select=syscaseinline select=MACCommand /caseinlinedefaultinlineCtrl/defaultinline/switchinline+Hyphen(-)./paragraph paragraph xml-lang=en-US id=par_id3154244 role=paragraph l10n=U oldref=37If you insert a manual hyphen in a word, the word is only hyphenated at the manual hyphen. No additional automatic hyphenation is applied for this word. A word with a manual hyphen will be hyphenated without regard to the settings on the emphText Flow/emph tab page./paragraph @@ -114,4 +114,4 @@ embed href=text/swriter/guide/hyphen_prevent.xhp#hyphen_prevent/ paragraph xml-lang=en-US id=par_id3154361 role=paragraph l10n=U oldref=46link href=text/swriter/01/05030200.xhp name=Text FlowText Flow/link/paragraph /body -/helpdocument \ No newline at end of file +/helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] Some cleanup for better localization
2012/8/22 zolniata...@caesar.elte.hu: Hi, Working with localization tools I recognized some wrong codes, which prevent localization from perfect working. I solved some(see patch), but remained one which not so simply. In /help/helpcontent2/source/text/swriter/guide/using_hyphen.xhp at the 96. line, there is a localization component without id, exactly with id=. This is the only one in whole source, so it must be a mistake. Pushed, many thanks. I also fixed the empty id in help (I wrote a random string there, because IDs in help do not have special meaning). Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/source
sc/source/core/data/dpcache.cxx|9 ++---
sc/source/ui/docshell/dbdocfun.cxx |6 --
2 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 257a5fb833c2c03a3a82b19b9ab5a7cb3b5848ef
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Aug 22 14:55:34 2012 -0400
Don't clear the database data cache here.
This would result in the pivot cache being refreshed twice. This block
of code was a leftover from the previous, non-cached version of pivot
table, and this logic no longer applies today.
In today's pivot table code, the cache gets refreshed first, then the
table gets refreshed afterward. We should never clear the cache data
during table refresh.
Change-Id: Ida6fa1805463facf842cb9ea94f4c1afab716595
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index ee642c7..4cb5620 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1329,12 +1329,6 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj,
const ScDPObject* pNewOb
}
if ( pDestObj )
{
-// create new database connection for refresh
-// (and re-read column entry collections)
-// so all changes take effect
-if ( pNewObj == pOldObj pDestObj-IsImportData() )
-pDestObj-ClearTableData();
-
pDestObj-ReloadGroupTableData();
pDestObj-InvalidateData(); // before getting the
new output area
commit a28d9cad672739cbf8dc6cf1f9db7d0f8becfee1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Aug 22 14:25:01 2012 -0400
fdo#53640: Correctly cache source data coming from database backend.
It was due to a simple misplacement of nRow = 0. Each record was
labeled row 0. No wonder it screws up the result badly.
Change-Id: Ia94f42a62f98a9bd7c9d34df3606351bb487931b
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 3299ba0..a11db55 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -461,24 +461,27 @@ bool ScDPCache::InitFromDataBase (const
Referencesdbc::XRowSet xRowSet, const
Referencesdbc::XRow xRow(xRowSet, UNO_QUERY_THROW);
std::vectorBucket aBuckets;
+ScDPItemData aData;
for (sal_Int32 nCol = 0; nCol mnColumnCount; ++nCol)
{
xRowSet-first();
-ScDPItemData aData;
aBuckets.clear();
Field rField = maFields[nCol];
+SCROW nRow = 0;
do
{
-SCROW nRow = 0;
short nFormatType = NUMBERFORMAT_UNDEFINED;
+aData.SetEmpty();
getItemValue(*this, aData, xRow, aColTypes[nCol], nCol+1,
rNullDate, nFormatType);
-aBuckets.push_back(Bucket(aData, 0, nRow++));
+aBuckets.push_back(Bucket(aData, 0, nRow));
if (!aData.IsEmpty())
{
maEmptyRows.insert_back(nRow, nRow+1, false);
SvNumberFormatter* pFormatter = mpDoc-GetFormatTable();
rField.mnNumFormat = pFormatter ?
pFormatter-GetStandardFormat(nFormatType) : 0;
}
+
+++nRow;
}
while (xRowSet-next());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED 3-6] Fix for fdo#53640 - Pivot table from database source
On Wed, 2012-08-22 at 15:05 -0400, Kohei Yoshida wrote: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=f4ed9a5adbea3de88870ff4f5cb202bd606e0746 cherry-picked to 3-6 and preferably to 3-6-1 as well. This fixes Looks sensible - I'm sure clang would have something to say about this sort of incrementing of dead variables ;-) Also, optionally I'd like https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=88979ef6ffe7921200311513d6601f9c5d582a42 backported as well. Leaving this code in would result in re-populating the pivot cache twice unnecessarily, which would degrade performance. I pushed that - though it looks more scary. Even more scary to me is the lack of unit-test-age for this area; though I suppose anything involving a database is a bit of a pain to test. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svtools/source
svtools/source/misc/langtab.src |1 + 1 file changed, 1 insertion(+) New commits: commit 055751056187b2e15a7bfee84000c86b91c75d1e Author: Andras Timar ati...@suse.com Date: Wed Aug 22 21:31:07 2012 +0200 fdo#51911 add Moldovan (ro-MD) to language selection list Change-Id: I916097048b6c8767745bcdd56430d5d2cc832e71 diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index f67f9de..bf44bbc 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -144,6 +144,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE Malayalam ; LANGUAGE_MALAYALAM ; ; Manipuri ; LANGUAGE_MANIPURI ; ; Marathi ; LANGUAGE_MARATHI ; ; + Moldovan ; LANGUAGE_ROMANIAN_MOLDOVA ; ; Nepali (Nepal) ; LANGUAGE_NEPALI ; ; Nepali (India) ; LANGUAGE_NEPALI_INDIA ; ; Norwegian, Bokmål ; LANGUAGE_NORWEGIAN_BOKMAL ; ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[master]: fpicker/source/office/iodlg.src.original
From Dave Richards flbeac...@gmail.com: Dave Richards has uploaded a new change for review. Change subject: fpicker/source/office/iodlg.src.original .. fpicker/source/office/iodlg.src.original fpicker/source/office/iodlg.src.original fpicker/source/office/iodlg.src.original Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813 --- M fpicker/source/office/iodlg.src 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/457/1 -- To view, visit https://gerrit.libreoffice.org/457 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Dave Richards flbeac...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6][REVIEW 3-6-1 2/3] Fix for fdo#53640 - Pivot table from database source
Hi, On Wednesday, 2012-08-22 20:22:19 +0100, Michael Meeks wrote: On Wed, 2012-08-22 at 15:05 -0400, Kohei Yoshida wrote: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=f4ed9a5adbea3de88870ff4f5cb202bd606e0746 cherry-picked to 3-6 and preferably to 3-6-1 as well. This fixes Looks sensible - I'm sure clang would have something to say about this sort of incrementing of dead variables ;-) Michael cherry-picked that to 3-6 as https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=a28d9cad672739cbf8dc6cf1f9db7d0f8becfee1 which has my +1 Also, optionally I'd like https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=88979ef6ffe7921200311513d6601f9c5d582a42 backported as well. Leaving this code in would result in re-populating the pivot cache twice unnecessarily, which would degrade performance. I pushed that - though it looks more scary. In 3-6 as https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=257a5fb833c2c03a3a82b19b9ab5a7cb3b5848ef I can't say much about that without digging into cache/table refreshs other than having to trust Kohei's judgement. +0.5? ;-) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpmYB9ZTMP8G.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License Statement
I have contributed my first patch https://gerrit.libreoffice.org/#/c/457/ and am making a statement that * All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. *Real Name: Dave Richards Git Email: flbeac...@gmail.com IRC Nickname: dave_largo This first patch changes default US strings that are inconsistent and confusing to end users. 1) Tooltip on the file picker indicates Create New Directory, but the next dialog indicates Create new Folder 2) The default shortcut reads Default Directory and should match what appears in Tools Options LibreOffice Paths where it's called My Documents. Many inexperienced users do not use or understand the word Directory. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: (great) widget layout progress
On Wed, 2012-08-22 at 17:55 +0200, khagaroth wrote: How much work would it be to make this directly use gettext? I thought the long term goal was to switch from custom translation formats to gettext, so using yet another custom translation format for something like this seems a bit odd. Timar had/has some plans around moving to using gettext directly throughout LibO. But that doesn't exist right now, so rather than make that a blocker on this I've stuffed in a simple solution. When (if?) we move to gettext natively then it basically becomes fairly trivial to directly use gettext especially as that knows about .ui files already for extraction purposes and doesn't know about .src files. So conversion to .ui is a bit of a help towards directly using gettext. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: fpicker/source
fpicker/source/office/iodlg.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2cf1aac49bfcb986e1a87d4992c8e132ec9ba729
Author: Dave Richards flbeac...@gmail.com
Date: Wed Aug 22 14:20:53 2012 -0400
fpicker/source/office/iodlg.src.original
fpicker/source/office/iodlg.src.original
fpicker/source/office/iodlg.src.original
Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813
Reviewed-on: https://gerrit.libreoffice.org/457
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index f795421..4a25355 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -69,7 +69,7 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
TabStop = FALSE ;
Pos = MAP_APPFONT ( 59 , 6 ) ;
Size = MAP_APPFONT( 12, 12 ) ;
-QuickHelpText [ en-US ] = Create New Directory ;
+QuickHelpText [ en-US ] = Create New Folder ;
};
MenuButton BTN_EXPLORERFILE_UP
{
@@ -228,7 +228,7 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
};
String STR_DEFAULT_DIRECTORY
{
-Text [ en-US ] = Default Directory ;
+Text [ en-US ] = My Documents ;
};
String STR_PLACES_TITLE
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[master]: fpicker/source/office/iodlg.src.original
From Andras Timar ati...@suse.com: Andras Timar has submitted this change and it was merged. Change subject: fpicker/source/office/iodlg.src.original .. fpicker/source/office/iodlg.src.original fpicker/source/office/iodlg.src.original fpicker/source/office/iodlg.src.original Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813 --- M fpicker/source/office/iodlg.src 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/457 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b2bf2a3900a729581d184931efdc98f39067813 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Dave Richards flbeac...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: License Statement
2012/8/22 Dave Richards flbeac...@gmail.com: I have contributed my first patch https://gerrit.libreoffice.org/#/c/457/ Thanks for the patch, I pushed it. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sfx2/source sw/source vcl/inc vcl/source
sfx2/source/dialog/tabdlg.cxx | 21 ++---
sw/source/ui/misc/linenum.cxx | 38 +++---
sw/source/ui/misc/titlepage.cxx | 24
vcl/inc/vcl/builder.hxx | 34 +-
vcl/source/window/builder.cxx |8
5 files changed, 78 insertions(+), 47 deletions(-)
New commits:
commit 4c38e508206348a7923d042261c7a9cdeca4f98d
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 22 21:18:52 2012 +0100
get_by_name - get and pretty up widget type casting
Like Noel G points out, it's not like there any other way to get
a widget other than by_name
Change-Id: Iefe2a16472e2916dbeba1ba3c0c115cc6416ab5b
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 4b3e06f..f66627a 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -524,8 +524,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const
String* pUserButtonText,
*/
{
-fprintf(stderr, BUILDER is %p\n, m_pUIBuilder);
-m_pVBox = m_pUIBuilder ?
static_castVclVBox*(m_pUIBuilder-get_by_name(dialog-vbox1)) : NULL;
+m_pVBox = m_pUIBuilder ? m_pUIBuilder-getVclVBox(dialog-vbox1) : NULL;
m_bOwnsVBox = m_pVBox == NULL;
if (m_bOwnsVBox)
{
@@ -533,7 +532,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const
String* pUserButtonText,
m_pVBox-set_expand(true);
}
-m_pTabCtrl = m_pUIBuilder ?
static_castTabControl*(m_pUIBuilder-get_by_name(SAL_STRINGIFY(ID_TABCONTROL)))
: NULL;
+m_pTabCtrl = m_pUIBuilder ?
m_pUIBuilder-getTabControl(SAL_STRINGIFY(ID_TABCONTROL)) : NULL;
m_bOwnsTabCtrl = m_pTabCtrl == NULL;
if (m_bOwnsTabCtrl)
{
@@ -541,42 +540,42 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const
String* pUserButtonText,
m_pTabCtrl-set_expand(true);
}
-m_pActionArea = m_pUIBuilder ?
static_castVclHButtonBox*(m_pUIBuilder-get_by_name(dialog-action_area1)) :
NULL;
+m_pActionArea = m_pUIBuilder ?
m_pUIBuilder-getVclHButtonBox(dialog-action_area1) : NULL;
m_bOwnsActionArea = m_pActionArea == NULL;
if (m_bOwnsActionArea)
m_pActionArea = new VclHButtonBox(m_pVBox);
-m_pOKBtn = m_pUIBuilder ?
static_castOKButton*(m_pUIBuilder-get_by_name(ok)) : NULL;
+m_pOKBtn = m_pUIBuilder ? m_pUIBuilder-getOKButton(ok) : NULL;
m_bOwnsOKBtn = m_pOKBtn == NULL;
if (m_bOwnsOKBtn)
m_pOKBtn = new OKButton(m_pActionArea);
-m_pApplyBtn = m_pUIBuilder ?
static_castPushButton*(m_pUIBuilder-get_by_name(apply)) : NULL;
+m_pApplyBtn = m_pUIBuilder ? m_pUIBuilder-getPushButton(apply) : NULL;
m_bOwnsApplyBtn = m_pApplyBtn == NULL;
if (m_bOwnsApplyBtn)
m_pApplyBtn = NULL;
-m_pUserBtn = m_pUIBuilder ?
static_castPushButton*(m_pUIBuilder-get_by_name(user)) : NULL;
+m_pUserBtn = m_pUIBuilder ? m_pUIBuilder-getPushButton(user) : NULL;
m_bOwnsUserBtn = m_pUserBtn == NULL;
if (m_bOwnsUserBtn)
m_pUserBtn = pUserButtonText ? new PushButton(m_pActionArea) : NULL;
-m_pCancelBtn = m_pUIBuilder ?
static_castCancelButton*(m_pUIBuilder-get_by_name(cancel)) : NULL;
+m_pCancelBtn = m_pUIBuilder ? m_pUIBuilder-getCancelButton(cancel) :
NULL;
m_bOwnsCancelBtn = m_pCancelBtn == NULL;
if (m_bOwnsCancelBtn)
m_pCancelBtn = new CancelButton(m_pActionArea);
-m_pHelpBtn = m_pUIBuilder ?
static_castHelpButton*(m_pUIBuilder-get_by_name(help)) : NULL;
+m_pHelpBtn = m_pUIBuilder ? m_pUIBuilder-getHelpButton(help) : NULL;
m_bOwnsHelpBtn = m_pHelpBtn == NULL;
if (m_bOwnsHelpBtn)
m_pHelpBtn = new HelpButton(m_pActionArea);
-m_pResetBtn = m_pUIBuilder ?
static_castPushButton*(m_pUIBuilder-get_by_name(reset)) : NULL;
+m_pResetBtn = m_pUIBuilder ? m_pUIBuilder-getPushButton(reset) : NULL;
m_bOwnsResetBtn = m_pResetBtn == NULL;
if (m_bOwnsResetBtn)
m_pResetBtn = new PushButton(m_pActionArea);
-m_pBaseFmtBtn = m_pUIBuilder ?
static_castPushButton*(m_pUIBuilder-get_by_name(standard)) : NULL;
+m_pBaseFmtBtn = m_pUIBuilder ? m_pUIBuilder-getPushButton(standard) :
NULL;
m_bOwnsBaseFmtBtn = m_pBaseFmtBtn == NULL;
if (m_bOwnsBaseFmtBtn)
m_pBaseFmtBtn = new PushButton(m_pActionArea);
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index c28c631..45ceb9d 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -50,24 +50,24 @@
#include IDocumentStylePoolAccess.hxx
SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
-: SfxModalDialog( pVw-GetViewFrame()-GetWindow(),
rtl::OString(LineNumberingDialog),
-rtl::OUString(modules/swriter/ui/linenumbering.ui) )
+: SfxModalDialog( pVw-GetViewFrame()-GetWindow(), LineNumberingDialog,
+modules/swriter/ui/linenumbering.ui )
, pSh(pVw-GetWrtShellPtr())
{
-m_pBodyContent =
[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/uiconfig
sw/uiconfig/sw/ui/20872.ui |1 + sw/uiconfig/sw/ui/20876.ui |1 + 2 files changed, 2 insertions(+) New commits: commit 15dcb4f124282aa341bf21e45e1b8528d1dd0022 Author: Caolán McNamara caol...@redhat.com Date: Wed Aug 22 21:42:24 2012 +0100 we need to set hexpand now that it's implemented to fill the dialog Change-Id: Ib054f474a197c7cab6cd0d4b8ab650f4c78d1e79 diff --git a/sw/uiconfig/sw/ui/20872.ui b/sw/uiconfig/sw/ui/20872.ui index 21d8538..d30d99b 100644 --- a/sw/uiconfig/sw/ui/20872.ui +++ b/sw/uiconfig/sw/ui/20872.ui @@ -100,6 +100,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property +property name=hexpandTrue/property property name=label translatable=yesNumbering followed by/property /object packing diff --git a/sw/uiconfig/sw/ui/20876.ui b/sw/uiconfig/sw/ui/20876.ui index 5f06d72..3959035 100644 --- a/sw/uiconfig/sw/ui/20876.ui +++ b/sw/uiconfig/sw/ui/20876.ui @@ -76,6 +76,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property +property name=hexpandTrue/property property name=label translatable=yesParagraph Style/property /object packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/unocore/unocoll.cxx | 74 ++---
sw/source/ui/index/cnttab.cxx | 10 ++---
2 files changed, 64 insertions(+), 20 deletions(-)
New commits:
commit 45be3ac8151d63ccb61879f876696704542a4ce7
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 22 23:04:34 2012 +0200
fdo#51514: SwXBookmarks: only consider real bookmarks:
Since CWS swrefactormarks2 the SwXBookmarks collection handles not only
bookmarks but at least cross-ref marks as well, which then bother users
when they show up in the Insert-Hyperlink dialog; remove non-bookmarks
again.
(regression from df6d312ca537402463e4eb0530f22b956600fc02)
Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824
diff --git a/sw/source/core/unocore/unocoll.cxx
b/sw/source/core/unocore/unocoll.cxx
index ba6570c..57ac3b5 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -86,6 +86,7 @@
#include vbahelper/vbaaccesshelper.hxx
#include basic/basmgr.hxx
#include comphelper/processfactory.hxx
+#include comphelper/sequenceasvector.hxx
using ::rtl::OUString;
using namespace ::com::sun::star;
@@ -1643,7 +1644,20 @@ sal_Int32 SwXBookmarks::getCount(void)
SolarMutexGuard aGuard;
if(!IsValid())
throw uno::RuntimeException();
-return GetDoc()-getIDocumentMarkAccess()-getBookmarksCount();
+
+sal_Int32 count(0);
+IDocumentMarkAccess* const pMarkAccess =
GetDoc()-getIDocumentMarkAccess();
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess-getBookmarksBegin();
+ ppMark != pMarkAccess-getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+++count; // only count real bookmarks
+}
+}
+return count;
}
uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
@@ -1656,12 +1670,26 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
if(nIndex 0 || nIndex = pMarkAccess-getBookmarksCount())
throw IndexOutOfBoundsException();
-uno::Any aRet;
-::sw::mark::IMark* pBkmk = pMarkAccess-getBookmarksBegin()[nIndex].get();
-const uno::Reference text::XTextContent xRef =
-SwXBookmark::CreateXBookmark(*GetDoc(), *pBkmk);
-aRet = xRef;
-return aRet;
+sal_Int32 count(0);
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess-getBookmarksBegin();
+ ppMark != pMarkAccess-getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+if (count == nIndex)
+{
+uno::Any aRet;
+const uno::Reference text::XTextContent xRef =
+SwXBookmark::CreateXBookmark(*GetDoc(), **ppMark);
+aRet = xRef;
+return aRet;
+}
+++count; // only count real bookmarks
+}
+}
+throw IndexOutOfBoundsException();
}
uno::Any SwXBookmarks::getByName(const rtl::OUString rName)
@@ -1690,13 +1718,19 @@ uno::Sequence OUString
SwXBookmarks::getElementNames(void)
if(!IsValid())
throw uno::RuntimeException();
+::comphelper::SequenceAsVector ::rtl::OUString ret;
IDocumentMarkAccess* const pMarkAccess =
GetDoc()-getIDocumentMarkAccess();
-uno::SequenceOUString aSeq(pMarkAccess-getBookmarksCount());
-sal_Int32 nCnt = 0;
-for(IDocumentMarkAccess::const_iterator_t ppMark =
pMarkAccess-getBookmarksBegin();
-ppMark != pMarkAccess-getBookmarksEnd();)
-aSeq[nCnt++] = (*ppMark++)-GetName();
-return aSeq;
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess-getBookmarksBegin();
+ ppMark != pMarkAccess-getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+ret.push_back((*ppMark)-GetName()); // only add real bookmarks
+}
+}
+return ret.getAsConstList();
}
sal_Bool SwXBookmarks::hasByName(const OUString rName)
@@ -1722,7 +1756,19 @@ sal_Bool SwXBookmarks::hasElements(void)
SolarMutexGuard aGuard;
if(!IsValid())
throw uno::RuntimeException();
-return GetDoc()-getIDocumentMarkAccess()-getBookmarksCount() != 0;
+
+IDocumentMarkAccess* const pMarkAccess =
GetDoc()-getIDocumentMarkAccess();
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess-getBookmarksBegin();
+ ppMark != pMarkAccess-getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+return true;
+}
+}
+return false;
}
SwXNumberingRulesCollection::SwXNumberingRulesCollection( SwDoc* _pDoc ) :
commit c47505a4525c342694ba4196544715467c2bdb8e
Author:
