fdo#53472 adjust size of integral, sum, product marks
Véghelyi András has abandoned this change. Change subject: fdo#53472 adjust size of integral, sum, product marks .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/1059 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I1e9ad059d3b04a14e51a8b0df40521a3394e8635 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Véghelyi András veaqaai2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Funding Wishlist
Hi everyone, Just a reminder to your teams about this. We are seriously looking at different teams' wishlists. Please do take a little time out of your busy schedule and speak to your teams about any funding for items that you think may be of importance to your team or the enhance the functioning of your team's work on the project. So far there are only the website and marketing teams who are working on some items. Feel free to ask if you have any questions regarding this. At this point, anything goes, as long as the requests are reasonable. We need these items for planning more effective funding drives as well as for budgeting. It would really help if your suggestions come along with approximate costs where possible. Cheers, Marc Le 2012-10-13 16:45, marc.p...@libreoffice.org a écrit : Hi everyone, In trying to better assess the TDF/LibreOffice funding requirements, we are compiling a wishlist of funding request particular to your team's needs. While there is no guarantee that this will get you funding for any particular item, it will help to better assess and prioritize the project's needs. I have volunteered to take care of setting up, as well as, document (facilitate) the proposal from Florian (below)[1] snip == What we effectively need now is a (senseful) wishlist from the various teams. Think of it as a Christmas wishlist: You write a dozen things on it, eventually you get two or three, which is fantastic! Besides the infrastructure and cost for ongoing operations, I can also imagine some developer machines are required, more travel funding, a marketing campaign, funds to produce collaterals and swags for giving them away, and many more. My proposal is to create a wiki page, asking the various groups to write down their wishes, and eventually distill a wishlist out of that. Does that sound senseful? Are there any volunteers for mailing the various lists and compiling an initial wiki page? (Florian Effenberger) == I think the key words in Florian's proposal are senseful-whishlist. If there are multiple items, you may want to prioritize them in the right order. I have set up a wiki page to collect your team's list[2]. Feel free to add these to the wiki page after discussing it with your team, or, I can also help out with collecting your suggestions by re-visiting this thread and then add them to the wiki page. Cheers, Marc [1] http://permalink.gmane.org/gmane.comp.documentation.libreoffice.marketing/6143 [2] http://wiki.documentfoundation.org/Marketing/Funding_Priorities -- Marc Paré m...@marcpare.com http://www.parEntreprise.com parEntreprise.com Supports OpenDocument Formats (ODF) parEntreprise.com Supports http://www.LibreOffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Crash when setting Thunderbird as default email client in LO master
Can anyone reproduce this report on Linux 32bit or is it just something in my config? https://bugs.freedesktop.org/show_bug.cgi?id=57265 Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: what's the problem with system cairo ?
Enrico Weigelt wrote: Why not ? There are so many gtk-applications running fine in KDE. IMHO (not an KDE-user so didn't check it), the l+f will be just like Qt. I doubt that. Also there's more KDE platform integration than just the GUI. As long as there's someone actively maintaining that (relatively small) part of the code base - which is the case - it is really not a question that we do want to keep that. In fact, it is rude to suggest otherwise. Why would you consider that kde and gtk are the same 'platform' and Mac and Windows are not from a UI perspective ? [snip] My idea was, consolidating to one crossplatform widget toolkit for *nix as the first step, which should be pretty easy. Later also consolidate the other platforms (not sure how complex that would be). By the way: anybody working on porting the gtk or qt vcl to win32 or mac ? Making platform experience worse for the overwhelming majority of the user base (mac windows) does not sound like a winning strategy. Then again, helping us to reduce application code coupling with our GUI toolkit improving user experience by making dialogs more malleable is clearly a worthy goal - see Caolan's talk here http://conference.libreoffice.org/talks/content/sessions/015 , as currently the major hurdle to any changes in GUI platform abstraction is the ton of code relying on vcl implementation details. Would be awesome to get a helping hand with that. Cheers, -- Thorsten pgp0wSk6l7Mx1.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Daily builds x86_32bits Linux debs from master available again
On Sun, 2012-11-18 at 18:30 +0100, Enrico Weigelt wrote: http://dev-builds.libreoffice.org/daily/Linux-x86_10-Release-Configuration/master/ Cool. Where can I find the corresponding ./debian/* files ? These are built with EPM, as previously discussed :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#53472 adjust size of integral, sum, product marks
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1101 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/1101/1 fdo#53472 adjust size of integral, sum, product marks Change-Id: I445ccba5f07ccaba1ead0ad99a582d3ad89c954a --- M dbaccess/source/ui/querydesign/QueryDesignView.cxx M dbaccess/source/ui/querydesign/querycontroller.cxx M starmath/inc/node.hxx M starmath/source/node.cxx 4 files changed, 1 insertion(+), 16 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1101 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I445ccba5f07ccaba1ead0ad99a582d3ad89c954a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Véghelyi András veaqaai2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac moz/makefile.mk ooo.lst.in
configure.ac| 55 ++-
moz/makefile.mk | 19 +--
ooo.lst.in |4
3 files changed, 51 insertions(+), 27 deletions(-)
New commits:
commit 67fca36dbecaf0d35322f930d6462ab0d4ea56c5
Author: Mathias Michel m...@gmx.fr
Date: Mon Nov 19 01:07:53 2012 +0100
Better handling of well-know prerequisites under windows
Add moz prebuilt msvcrt80 copy
Change-Id: I335c25904c16db534a4878ff6a17db202eaef4f5
Reviewed-on: https://gerrit.libreoffice.org/1100
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/configure.ac b/configure.ac
index 78440ae..c85e0e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8225,19 +8225,37 @@ else
fi
fi
else
-AC_MSG_CHECKING([which pre-built Mozilla module in moz/zipped])
-if test -e $SRC_ROOT/moz/zipped/${OS}${COM}${CPU}inc.zip -a \
--e $SRC_ROOT/moz/zipped/${OS}${COM}${CPU}lib.zip -a \
--e $SRC_ROOT/moz/zipped/${OS}${COM}${CPU}runtime.zip; then
+AC_MSG_CHECKING([which pre-built Mozilla module in $TARFILE_LOCATION])
+MOZ_ZIP_INC=${OS}${COM}${CPU}inc.zip
+MOZ_ZIP_LIB=${OS}${COM}${CPU}lib.zip
+MOZ_ZIP_RUNTIME=${OS}${COM}${CPU}runtime.zip
+PREBUILD_MOZAB=YES
+if test -e $TARFILE_LOCATION/${OS}${COM}${CPU}inc.zip -a \
+-e $TARFILE_LOCATION/${OS}${COM}${CPU}lib.zip -a \
+-e $TARFILE_LOCATION/${OS}${COM}${CPU}runtime.zip; then
AC_MSG_RESULT([Found])
-PREBUILD_MOZAB=YES
-if test $_os = WINNT; then
-AC_MSG_CHECKING([for MSVC 2005 runtime needed for prebuilt
Mozilla])
-if test -e
$SRC_ROOT/external/msvcp80/Microsoft.VC80.CRT.manifest -a \
--e $SRC_ROOT/external/msvcp80/msvcp80.dll -a \
--e $SRC_ROOT/external/msvcp80/msvcr80.dll; then
+MOZ_ZIP_INC=
+MOZ_ZIP_LIB=
+MOZ_ZIP_RUNTIME=
+fi
+if test $_os = WINNT; then
+AC_MSG_CHECKING([for MSVC 2005 runtime needed for prebuilt
Mozilla])
+if test -e
$SRC_ROOT/external/msvcp80/Microsoft.VC80.CRT.manifest -a \
+-e $SRC_ROOT/external/msvcp80/msvcp80.dll -a \
+-e $SRC_ROOT/external/msvcp80/msvcr80.dll; then
+AC_MSG_RESULT([Found])
+else
+#uwin-prefixed paths are with no quotes to allow for mask, and
uwin to not have spaces, btw
+uwin=`cygpath -d $WINDIR`
+uwin=`cygpath -u $uwin`
+#if we have one we have all
+if test -e
$uwin/winsxs/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053* ; then
+MSVC80_DLL_DIR=`cd $uwin/winsxs/; ls -d
x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053*`
+MSVC80_MNFST=`ls
$uwin/winsxs/Manifests/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053_*.manifest`
AC_MSG_RESULT([Found])
else
+MSVC80_DLL_DIR=
+MSVC80_MNFST=
AC_MSG_RESULT([Not Found])
AC_MSG_ERROR([For the pre-built Mozilla libraries, you
need MSVC 2005 runtime files
Microsoft.VC80.CRT.manifest, msvcp80.dll, and msvcr80.dll
@@ -8245,19 +8263,9 @@ in external/msvcp80.
You can get them by installing:
http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE
-and copying the abovementioned files from:
-c:/windows/winsxs/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989/
-and
-c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989.manifest
-])
+and relaunch ./autogen.sh])
fi
fi
-else
-AC_MSG_RESULT([Not Found])
-AC_MSG_ERROR([If you don't use system mozilla and also disable the
build of internal mozilla, you must provided the appropriate libraries yourself.
-You need to copy $OS$COM$CPU{inc,lib,runtime}.zip into moz/zipped.
-These files can be found at http://dev-www.libreoffice.org/mozilla/
-])
fi
fi
fi
@@ -8275,6 +8283,11 @@ AC_SUBST(MOZ_INC)
AC_SUBST(MOZ_LIB)
AC_SUBST(MOZ_LIB_XPCOM)
AC_SUBST(MOZ_TARBALL)
+AC_SUBST(MSVC80_DLL_DIR)
+AC_SUBST(MSVC80_MNFST)
+AC_SUBST(MOZ_ZIP_INC)
+AC_SUBST(MOZ_ZIP_LIB)
+AC_SUBST(MOZ_ZIP_RUNTIME)
# libxmlsec is mandatory
if test $_os != Android -a $_os != iOS ; then
diff --git a/moz/makefile.mk b/moz/makefile.mk
index f154b95..a30c87e 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -32,7 +32,7 @@ TARGET=ooo_mozab
# --- Settings -
-.INCLUDE : settings.mk
+.INCLUDE :settings.mk
# --- Files
@@ -66,7
Re: what's the problem with system cairo ?
Hi Enrico, Dropping VCL and moving to something else is a gargantuan task. It is worth discussing -only- if we can do it completely, and the target toolkit meets all the platform, licensing, maturity and feature requirements we have. As far as I know as of today, no non-VCL toolkit does this. A further pre-condition would be having the man-decade of resource available to finish and test a complete transition to said new toolkit. Then - finally, if we have that man-decade it's not clear that this would be a priority - we have plenty of big problems around the place. If you want to do something constructive in this area - then moving away from VCL's horrific positional widget set is something that starts to reduce our toolkit API surface, improves our visual look, and allows more flexibility for native widget choice in the future - checkout: http://wiki.documentfoundation.org/Development/WidgetLayout And get stuck in ! :-) we have a feature-freeze in ~2 weeks - the more commonly-used dialogs we can get ported to .ui files before then the better we'll look for 4.0 :-) In the meantime discussing at length things that are not going to happen serves little useful purpose than creating noise ( it seems to me ). 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] Better handling of well-know prerequisites under windows
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1100 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1100 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I335c25904c16db534a4878ff6a17db202eaef4f5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Broken commits in our repo
On Sun, 2012-11-18 at 18:32 -0600, Norbert Thiebaud wrote: 1/ this is harmless 2/ this certainly is not worth the extreme pain of a git-rewrite Agreed - we have very significant annotations of specific git hashes left and right to double-check the re-basing work; anything that hinders that process in the next months is incredibly under-appreciated. So - if it's just a few harmless warnings - we should leave it for now. 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] .: sw/source
sw/source/core/txtnode/txatritr.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 4ac093519d786c271df212510084ed8074343a28 Author: Matteo Casalin matteo.casa...@gmx.com Date: Wed Nov 14 01:01:37 2012 +0100 remove unnecessary #include Change-Id: I5b05a7aded3ed80e0269155100ad075bffecf9ea diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx index cdb40b7..bcf127c 100644 --- a/sw/source/core/txtnode/txatritr.cxx +++ b/sw/source/core/txtnode/txatritr.cxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include hintids.hxx +#include txatritr.hxx #include com/sun/star/i18n/ScriptType.hpp #include tools/string.hxx -#include editeng/langitem.hxx -#include txatritr.hxx #include fchrfmt.hxx #include charfmt.hxx #include breakit.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: Crash when setting Thunderbird as default email client in LO master
Hi Alex, Can anyone reproduce this report on Linux 32bit or is it just something in my config? https://bugs.freedesktop.org/show_bug.cgi?id=57265 I will check for you later today and put the result in the bug. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash when setting Thunderbird as default email client in LO master
Le 19/11/2012 10:58, Winfried Donkers a écrit : Hi Winfried, Can anyone reproduce this report on Linux 32bit or is it just something in my config? https://bugs.freedesktop.org/show_bug.cgi?id=57265 I will check for you later today and put the result in the bug. Thanks, much appreciated. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: python3/ExternalProject_python3.mk
python3/ExternalProject_python3.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f36b2f43208b343189952ca70a922e7759dae3b2 Author: Tor Lillqvist t...@iki.fi Date: Mon Nov 19 12:17:32 2012 +0200 Using --with-system-expat does seem to work also for a bundled one Change-Id: Iff8904ac0c856dd3175b429b4919a04a57c1b6ad diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index dc8e0ff..3dbf205 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -57,7 +57,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : cd $(EXTERNAL_WORKDIR) \ ./configure \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter YES,$(SYSTEM_EXPAT)),--with-system-expat) \ + --with-system-expat \ $(if $(strip $(VALGRIND_CFLAGS)),--with-valgrind) \ --prefix=/$(if $(filter MACOSX,$(OS)),@__OOO,python-inst) \ $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads CFLAGS=-g0) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
fdo#50950 add/modify calc formula WEEKNUM and ISOWEEKNUM as ...
Winfried Donkers has abandoned this change. Change subject: fdo#50950 add/modify calc formula WEEKNUM and ISOWEEKNUM as in ODFF1.2 .. Patch Set 2: Abandoned Patch description is incorrect (refers to wrong bug number). I will try to resubmit later with correct description. -- To view, visit https://gerrit.libreoffice.org/1095 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2af326c1052c1c8d47d1fea956b332c73ebe12e4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - fontconfig/ExternalProject_fontconfig.mk freetype/ExternalProject_freetype.mk redland/raptor redland/rasqal redland/redland tools/inc vcl/unx
fontconfig/ExternalProject_fontconfig.mk |3 ++-
freetype/ExternalProject_freetype.mk |3 ++-
redland/raptor/makefile.mk |5 +
redland/rasqal/makefile.mk |6 +-
redland/redland/makefile.mk |1 +
tools/inc/tools/solar.h |6 --
vcl/unx/generic/app/saldisp.cxx |8
vcl/unx/generic/gdi/salvd.cxx|2 +-
8 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit f83cf4e4c093012f966656e416b5ed5a44c75155
Author: Tor Lillqvist t...@iki.fi
Date: Mon Nov 19 12:21:12 2012 +0200
Try to use -fvisibility=hidden when DISABLE_DYNLOADING
Change-Id: I92a5de2344e82f99ac94608e1455afa8c33bd54a
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index fa759f5..8244d0d 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -129,6 +129,11 @@ CFLAGS:=-g
.ELSE
CFLAGS:=-O
.ENDIF
+
+.IF $(DISABLE_DYNLOADING)==TRUE
+CFLAGS+=-fvisibility=hidden
+.ENDIF
+
.IF $(COM)==C52 $(CPU)==U
CFLAGS+=-m64
.ENDIF
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 9911e2f..d10239b 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -104,8 +104,12 @@ LDFLAGS:=-Wl,-z,origin
-Wl,-rpath,'ORIGIN:ORIGIN/../ure-link/lib' -Wl,-n
LDFLAGS:=-Wl,-R'ORIGIN:ORIGIN/../ure-link/lib'
.ENDIF # $(OS)$(COM)==SOLARISC52
+.IF $(DISABLE_DYNLOADING)==TRUE
+CFLAGS=-fvisibility=hidden
+.ENDIF
+
.IF $(COM)==C52 $(CPU)==U
-CFLAGS=-m64
+CFLAGS+=-m64
.EXPORT: CFLAGS
.ENDIF
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 1fe3d6d..6459f6b 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -145,6 +145,7 @@ CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH=..$/..$/..$/bin:$$PATH
CONFIGURE_FLAGS=--disable-gtk-doc --with-openssl-digests
--with-xml-parser=libxml --with-raptor=system --with-rasqual=system
--without-bdb --without-sqlite --without-mysql --without-postgresql
--without-threestore --with-regex-library=posix --with-decimal=none
--with-www=xml
.IF $(OS)==IOS || $(OS)==ANDROID
+CFLAGS=-fvisibility=hidden
CONFIGURE_FLAGS+= --disable-shared
.ELSE
CONFIGURE_FLAGS+= --disable-static
commit b6c016da23d309b4ac7d154bc33a22397974ed73
Author: Tor Lillqvist t...@iki.fi
Date: Mon Nov 19 11:16:15 2012 +0200
Use gb_VISIBILITY_FLAGS
Change-Id: I6be70c0b8d73f4d1d1428c0df94ea6d8bdc782f7
diff --git a/fontconfig/ExternalProject_fontconfig.mk
b/fontconfig/ExternalProject_fontconfig.mk
index c0b1878..d882ecf 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -21,7 +21,8 @@ $(eval $(call gb_ExternalProject_register_targets,fontconfig,\
$(call gb_ExternalProject_get_state_target,fontconfig,build) :
cd $(EXTERNAL_WORKDIR) \
-$(if $(debug),CFLAGS=-g) $(if $(filter ANDROID,$(OS)),LIBS=-lm)
./configure \
+CFLAGS=$(if $(debug),-g) $(gb_VISIBILITY_FLAGS) $(if $(filter
ANDROID,$(OS)),LIBS=-lm) \
+ ./configure \
--disable-shared \
--with-arch=arm \
--with-expat-includes=$(OUTDIR)/inc/external/expat \
diff --git a/freetype/ExternalProject_freetype.mk
b/freetype/ExternalProject_freetype.mk
index 914007b..aa9c56c 100644
--- a/freetype/ExternalProject_freetype.mk
+++ b/freetype/ExternalProject_freetype.mk
@@ -17,7 +17,8 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\
$(call gb_ExternalProject_get_state_target,freetype,build) :
cd $(EXTERNAL_WORKDIR) \
-./configure \
+CFLAGS=$(if $(debug),-g) $(gb_VISIBILITY_FLAGS) \
+ ./configure \
--disable-shared \
--without-zlib \
--without-bzip2 \
commit 7238177ba30d51f68d7f43dc3f87283af17f382b
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Nov 19 10:42:34 2012 +0200
Drop ILLEGAL_POINTER sillyness
Change-Id: I19316f0fd04f75d980719676c928c3455e0f07b7
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index b1f3dac..5818e8f 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -50,12 +50,6 @@ typedef sal_uIntPtrsal_uLong; /* Replaces type ULONG */
#define __LOADONCALLAPI
#endif
-#if defined UNX
-#define ILLEGAL_POINTER ((void*)1)
-#else
-#define ILLEGAL_POINTER NULL
-#endif
-
// solar binary types
/* Solar (portable) Binary (exchange) Type; OSI 6 subset
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 0522d61..b010359 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -343,8 +343,8 @@ void SalDisplay::doDestruct()
if( IsDisplay() )
{
-delete mpInputMethod, mpInputMethod =
(SalI18N_InputMethod*)ILLEGAL_POINTER;
-delete mpKbdExtension, mpKbdExtension =
fdo#53472 adjust size of integral, sum, product marks
Véghelyi András has abandoned this change. Change subject: fdo#53472 adjust size of integral, sum, product marks .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/1101 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I445ccba5f07ccaba1ead0ad99a582d3ad89c954a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Véghelyi András veaqaai2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#53472 adjust size of integral, sum, product marks
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1102 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/1102/1 fdo#53472 adjust size of integral, sum, product marks Change-Id: I666bcba7f09ccaba1ead0ad83a344d3ad19c722a --- M starmath/inc/node.hxx M starmath/source/node.cxx 2 files changed, 21 insertions(+), 4 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1102 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I666bcba7f09ccaba1ead0ad83a344d3ad19c722a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Véghelyi András veaqaai2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/test
desktop/test/deployment/active/active_native.cxx | 125 -
desktop/test/deployment/passive/passive_native.cxx | 112 +++---
2 files changed, 97 insertions(+), 140 deletions(-)
New commits:
commit 63cb9b5ee42c3e08e7fc29461487426af891c983
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 19 11:59:37 2012 +0100
Clean up desktop/test/deployment/{active,passive}
Change-Id: I7f5bbbd1d8a2491c86c2875ae155ef4b10154377
diff --git a/desktop/test/deployment/active/active_native.cxx
b/desktop/test/deployment/active/active_native.cxx
index 493728d..afdfcc1 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -28,12 +28,13 @@
#include sal/config.h
+#include cassert
+
#include boost/noncopyable.hpp
#include com/sun/star/awt/MessageBoxButtons.hpp
#include com/sun/star/awt/Rectangle.hpp
#include com/sun/star/awt/Toolkit.hpp
#include com/sun/star/awt/XMessageBox.hpp
-#include com/sun/star/awt/XMessageBoxFactory.hpp
#include com/sun/star/awt/XWindowPeer.hpp
#include com/sun/star/beans/PropertyValue.hpp
#include com/sun/star/frame/DispatchDescriptor.hpp
@@ -43,7 +44,6 @@
#include com/sun/star/frame/XFrame.hpp
#include com/sun/star/frame/XStatusListener.hpp
#include com/sun/star/lang/XComponent.hpp
-#include com/sun/star/lang/XMultiComponentFactory.hpp
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/registry/XRegistryKey.hpp
#include com/sun/star/uno/DeploymentException.hpp
@@ -57,11 +57,11 @@
#include cppuhelper/factory.hxx
#include cppuhelper/implbase2.hxx
#include cppuhelper/implementationentry.hxx
+#include cppuhelper/supportsservice.hxx
#include cppuhelper/weak.hxx
-#include osl/diagnose.h
#include rtl/textenc.h
-#include rtl/ustring.h
#include rtl/ustring.hxx
+#include sal/log.hxx
#include sal/types.h
#include uno/lbnames.h
@@ -80,32 +80,32 @@ public:
SAL_THROW((css::uno::Exception))
{ return static_cast cppu::OWeakObject * (new Provider(xContext)); }
-static rtl::OUString SAL_CALL static_getImplementationName();
+static OUString SAL_CALL static_getImplementationName();
-static css::uno::Sequence rtl::OUString SAL_CALL
+static css::uno::Sequence OUString SAL_CALL
static_getSupportedServiceNames();
private:
Provider(
css::uno::Reference css::uno::XComponentContext const context):
-context_(context) { OSL_ASSERT(context.is()); }
+context_(context) { assert(context.is()); }
virtual ~Provider() {}
-virtual rtl::OUString SAL_CALL getImplementationName()
+virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException)
{ return static_getImplementationName(); }
-virtual sal_Bool SAL_CALL supportsService(rtl::OUString const
ServiceName)
+virtual sal_Bool SAL_CALL supportsService(OUString const ServiceName)
throw (css::uno::RuntimeException)
-{ return ServiceName == getSupportedServiceNames()[0]; } //TODO
+{ return cppu::supportsService(this, ServiceName); }
-virtual css::uno::Sequence rtl::OUString SAL_CALL
+virtual css::uno::Sequence OUString SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException)
{ return static_getSupportedServiceNames(); }
virtual css::uno::Reference css::frame::XDispatch SAL_CALL
queryDispatch(
-css::util::URL const , rtl::OUString const , sal_Int32)
+css::util::URL const , OUString const , sal_Int32)
throw (css::uno::RuntimeException);
virtual css::uno::Sequence css::uno::Reference css::frame::XDispatch
@@ -116,39 +116,31 @@ private:
css::uno::Reference css::uno::XComponentContext context_;
};
-rtl::OUString Provider::static_getImplementationName() {
-return rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(
-com.sun.star.comp.test.deployment.active_native));
+OUString Provider::static_getImplementationName() {
+return rtl::OUString(com.sun.star.comp.test.deployment.active_native);
}
-css::uno::Sequence rtl::OUString Provider::static_getSupportedServiceNames()
+css::uno::Sequence OUString Provider::static_getSupportedServiceNames()
{
-rtl::OUString name(
-RTL_CONSTASCII_USTRINGPARAM(
-com.sun.star.test.deployment.active_native));
-return css::uno::Sequence rtl::OUString (name, 1);
+OUString name(com.sun.star.test.deployment.active_native);
+return css::uno::Sequence OUString (name, 1);
}
css::uno::Reference css::frame::XDispatch Provider::queryDispatch(
-css::util::URL const , rtl::OUString const , sal_Int32)
+css::util::URL const , OUString const , sal_Int32)
throw (css::uno::RuntimeException)
{
css::uno::Reference css::frame::XDispatch dispatch;
if (!(context_-getValueByName(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
-
[Libreoffice-commits] .: sw/qa writerfilter/inc writerfilter/source
sw/qa/extras/ooxmlimport/data/n780645.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 13 ++
writerfilter/inc/resourcemodel/TableManager.hxx |5 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 68 ++-
writerfilter/source/dmapper/DomainMapperTableManager.hxx |5 +
5 files changed, 90 insertions(+), 1 deletion(-)
New commits:
commit ad913681c0e0cdaaa706329f518f59ee54b86d43
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Nov 19 12:41:39 2012 +0100
n#780645 DOCX import: add support for fixed column width
In general, DOCX tables provide a grid for the table, then use spans in
case different number of cells are used in different rows. In this case,
the cell width is ignored, as the wished width can be counted from the
grid and span values.
However, it's also valid to simply provide more cells then the amount
defined by the grid, and in this case the cell width should decide the
final width of the cells. This commit adds support for this later case.
Change-Id: I0dd6c1f0c06f81c2afa00489b7ad1f33ff300a7c
diff --git a/sw/qa/extras/ooxmlimport/data/n780645.docx
b/sw/qa/extras/ooxmlimport/data/n780645.docx
new file mode 100755
index 000..12ffa38
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n780645.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2c98832..36fdba3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -107,6 +107,7 @@ public:
void testFdo52208();
void testN785767();
void testN773061();
+void testN780645();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -167,6 +168,7 @@ void Test::run()
{fdo52208.docx, Test::testFdo52208},
{n785767.docx, Test::testN785767},
{n773061.docx, Test::testN773061},
+{n780645.docx, Test::testN780645},
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1030,6 +1032,17 @@ void Test::testN773061()
CPPUNIT_ASSERT_EQUAL( getProperty sal_Int32 ( xFrame,
BottomBorderDistance ), sal_Int32( 0 ));
}
+void Test::testN780645()
+{
+// The problem was that when the number of cells didn't match the grid, we
+// didn't take care of direct cell widths.
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTextTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetable::XTableRows xTableRows(xTextTable-getRows(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2135), getProperty
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(1),
TableColumnSeparators)[0].Position); // was 1999
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx
b/writerfilter/inc/resourcemodel/TableManager.hxx
index 71d9a81..b6555cc 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -467,6 +467,11 @@ protected:
sal_uInt32 getTableDepthNew() { return mnTableDepthNew; }
/**
+ Return the current table difference, i.e. 1 if we are in the first cell
of a new table, etc.
+ */
+sal_uInt32 getTableDepthDifference() { return mnTableDepthNew -
mnTableDepth; }
+
+/**
Action to be carried out at the end of the last paragraph of a
cell.
*/
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 0853700..afe9d6c 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include boost/optional.hpp
#include DomainMapperTableManager.hxx
#include resourcemodel/WW8ResourceModel.hxx
#include BorderHandler.hxx
@@ -51,6 +52,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML, bool bImplicitMe
m_nTableWidth(0),
m_bOOXML( bOOXML ),
m_bImplicitMerges(bImplicitMerges),
+m_bPushCurrentWidth(false),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
m_pTablePropsHandler-SetTableManager( this );
@@ -282,7 +284,21 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
break;
}
case NS_ooxml::LN_CT_TcPrBase_tcW:
-break; //fixed column width is not supported
+{
+// Contains unit and value, but unit is not interesting for
+// us, later we'll just distribute these values in
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/saldisp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fe71e7bd0c7630b6452e418df14d780dd87ba946
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 19 12:39:56 2012 +0100
SalColormap: -Werror=conversion-null
That is actually XID, not a pointer.
Change-Id: I9fa807fc4f33c07b2b4ebbb5e1b7163eb53411c3
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index b010359..3310e6d 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2687,7 +2687,7 @@ SalColormap::SalColormap( sal_uInt16 nDepth )
SalColormap::~SalColormap()
{
#ifdef DBG_UTIL
-m_hColormap = NULL;
+m_hColormap = None;
m_pDisplay = NULL;
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unusedcode.exclude unusedcode.README
unusedcode.README |2 ++ unusedcode.exclude | 26 ++ 2 files changed, 28 insertions(+) New commits: commit 4e0766bced731504dc141857b865dfcbc9b4fdfa Author: Enrico Weigelt, metux ITS metuxitserv...@googlemail.com Date: Thu Nov 15 19:45:28 2012 +0100 unusedcode exclude file: symbols known to be required The file unused.easy contains a lot of symbols which are known to be required, even they're currently not referenced by anyone. Change-Id: I048c1656b240f7d601e4c99b8d9c4969b3954c87 Reviewed-on: https://gerrit.libreoffice.org/1084 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/unusedcode.README b/unusedcode.README index ee4f9b9..895ad6b 100644 --- a/unusedcode.README +++ b/unusedcode.README @@ -41,5 +41,7 @@ g) there's more actually unused code then what's listed. The idea is that what's code from the release binaries which only makes sense in debug/dbgutil configurations, and then tackle unused virtual method slots :-) +Symbols that are known to be false alarms are listed in: unused.exclude + [1] http://www.skynet.ie/~caolan/Packages/callcatcher.html [2] https://bugs.freedesktop.org/show_bug.cgi?id=38832 diff --git a/unusedcode.exclude b/unusedcode.exclude new file mode 100644 index 000..f6dc906 --- /dev/null +++ b/unusedcode.exclude @@ -0,0 +1,26 @@ +# +# list of symbols that should not be dropped, even they're not +# referenced in current (linux) builds +# + +# test functions that aren't used yet, but will be in near future +# https://gerrit.libreoffice.org/#/c/1077/ + +ScFiltersTest::testColorScaleODS() +ScFiltersTest::testColorScaleXLSX() +apitest::XCellRangesQuery::testQueryFormulaCells() +apitest::XDataPilotDescriptor::testGetHiddenFields() +apitest::XDataPilotFieldGrouping::testCreateDateGroup() +apitest::XCellRangesQuery::testQueryFormulaCells() +apitest::XElementAccess::testGetElementType() +apitest::XElementAccess::testHasElements() +apitest::XIndexAccess::XIndexAccess(int) +apitest::XIndexAccess::testGetByIndex() +apitest::XIndexAccess::testGetByIndexException() +apitest::XIndexAccess::testGetCount() +apitest::XNameReplace::testReplaceByName() +apitest::XPropertySet::testAddPropertyChangeListener() +apitest::XPropertySet::testAddVetoableChangeListener() +apitest::XPropertySet::testRemovePropertyChangeListener() +apitest::XPropertySet::testRemoveVetoableChangeListener() +apitest::XSpreadsheetDocument::testGetSheets() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] unusedcode exclude file: symbols known to be required
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1084 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1084 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I048c1656b240f7d601e4c99b8d9c4969b3954c87 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.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 'distro/suse/suse-3.6' - writerfilter/inc writerfilter/source
writerfilter/inc/resourcemodel/TableManager.hxx |5 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 68 ++-
writerfilter/source/dmapper/DomainMapperTableManager.hxx |5 +
3 files changed, 77 insertions(+), 1 deletion(-)
New commits:
commit c31270abc1605a9de505f4753f1192520fd4130d
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Nov 19 12:41:39 2012 +0100
n#780645 DOCX import: add support for fixed column width
In general, DOCX tables provide a grid for the table, then use spans in
case different number of cells are used in different rows. In this case,
the cell width is ignored, as the wished width can be counted from the
grid and span values.
However, it's also valid to simply provide more cells then the amount
defined by the grid, and in this case the cell width should decide the
final width of the cells. This commit adds support for this later case.
(cherry picked from commit ad913681c0e0cdaaa706329f518f59ee54b86d43)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableManager.cxx
Change-Id: I0dd6c1f0c06f81c2afa00489b7ad1f33ff300a7c
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx
b/writerfilter/inc/resourcemodel/TableManager.hxx
index 651cf40..72b575a 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -476,6 +476,11 @@ protected:
sal_uInt32 getTableDepthNew() { return mnTableDepthNew; }
/**
+ Return the current table difference, i.e. 1 if we are in the first cell
of a new table, etc.
+ */
+sal_uInt32 getTableDepthDifference() { return mnTableDepthNew -
mnTableDepth; }
+
+/**
Action to be carried out at the end of the last paragraph of a
cell.
*/
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 62d70bb..50f0cb0 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
/
+#include boost/optional.hpp
#include DomainMapperTableManager.hxx
#include resourcemodel/WW8ResourceModel.hxx
#include BorderHandler.hxx
@@ -60,6 +61,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML, bool bImplicitMe
m_nTableWidth(0),
m_bOOXML( bOOXML ),
m_bImplicitMerges(bImplicitMerges),
+m_bPushCurrentWidth(false),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
m_pTablePropsHandler-SetTableManager( this );
@@ -291,7 +293,21 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
break;
}
case NS_ooxml::LN_CT_TcPrBase_tcW:
-break; //fixed column width is not supported
+{
+// Contains unit and value, but unit is not interesting for
+// us, later we'll just distribute these values in a
+// 0..1 scale.
+writerfilter::ReferenceProperties::Pointer_t pProperties
= rSprm.getProps();
+if( pProperties.get())
+{
+MeasureHandlerPtr pMeasureHandler(new
MeasureHandler());
+pProperties-resolve(*pMeasureHandler);
+
getCurrentCellWidths()-push_back(pMeasureHandler-getMeasureValue());
+if (getTableDepthDifference() 0)
+m_bPushCurrentWidth = true;
+}
+}
+break;
case NS_ooxml::LN_CT_TrPrBase_cnfStyle:
{
TablePropertyMapPtr pProps( new TablePropertyMap );
@@ -347,6 +363,11 @@ boost::shared_ptr vector sal_Int32
DomainMapperTableManager::getCurrentSpa
return m_aGridSpans.back( );
}
+boost::shared_ptr vector sal_Int32
DomainMapperTableManager::getCurrentCellWidths( )
+{
+return m_aCellWidths.back( );
+}
+
const rtl::OUString DomainMapperTableManager::getTableVertAnchor() const
{
return m_sTableVertAnchor;
@@ -356,18 +377,33 @@ void DomainMapperTableManager::startLevel( )
{
DomainMapperTableManager_Base_t::startLevel( );
+// If requested, pop the value that was pushed too early.
+boost::optionalsal_Int32 oCurrentWidth;
+if (m_bPushCurrentWidth !m_aCellWidths.empty()
!m_aCellWidths.back()-empty())
+{
+oCurrentWidth.reset(m_aCellWidths.back()-back());
+m_aCellWidths.back()-pop_back();
+}
+
IntVectorPtr pNewGrid( new vectorsal_Int32 );
IntVectorPtr pNewSpans( new vectorsal_Int32 );
+IntVectorPtr pNewCellWidths( new vectorsal_Int32 );
m_aTableGrid.push_back( pNewGrid );
m_aGridSpans.push_back( pNewSpans );
+m_aCellWidths.push_back(
[Libreoffice-commits] .: svl/source
svl/source/numbers/zforlist.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 760ef2ef7457aad9486a12a7f21da2b298749bf1 Author: Michael Stahl mst...@redhat.com Date: Mon Nov 19 13:33:45 2012 +0100 SvNumberFormatter: warning C4701 pot. uninitialized variable nCheckPos used Change-Id: I497d7ddc90bdfed9cd49e0b0c988a74f733bfa36 diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index ae02773..f609417 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -422,7 +422,7 @@ void SvNumberFormatter::ReplaceSystemCL( LanguageType eOldLanguage ) ChangeIntl( eOldLanguage ); LanguageType eLge = eOldLanguage; // ConvertMode changes this bool bCheck = false; -xub_StrLen nCheckPos; +xub_StrLen nCheckPos = 0; SvNumberformat* pNewEntry = new SvNumberformat( aString, pFormatScanner, pStringScanner, nCheckPos, eLge ); if ( nCheckPos != 0 ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: python3/ExternalProject_python3.mk
python3/ExternalProject_python3.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 1f8d5eed2a1055438b226838b2480677030619a0 Author: Michael Stahl mst...@redhat.com Date: Mon Nov 19 13:36:56 2012 +0100 python3: fix typos in makefile Change-Id: I61ea54ff5a5771ad2dee1b3514c97fbdd9f241b9 diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 3dbf205..af3653d 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -27,19 +27,19 @@ $(call gb_ExternalProject_get_state_target,python3,build) : ifeq ($(VCVER),110) cd $(EXTERNAL_WORKDIR)/PCbuild \ MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /p:PlatformToolset=v110 \ - cd $(EXTERNAL_WORKDIR) \ +cd $(EXTERNAL_WORKDIR) \ ln -s $(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild) LO_lib \ touch $@ else ifeq ($(VCVER),100) cd $(EXTERNAL_WORKDIR)/PCbuild \ MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 \ - cd $(EXTERNAL_WORKDIR) \ +cd $(EXTERNAL_WORKDIR) \ ln -s $(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild) LO_lib \ touch $@ else ifeq ($(VCVER),90) cd $(EXTERNAL_WORKDIR)/PC/VS9.0 \ MAKEFLAGS= $(COMPATH)/vcpackages/vcbuild.exe pcbuild.sln Release|$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ - cd $(EXTERNAL_WORKDIR) \ +cd $(EXTERNAL_WORKDIR) \ ln -s $(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild) LO_lib \ touch $@ endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libwpd/ExternalProject_libwpd.mk
libwpd/ExternalProject_libwpd.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 98e9b5dc402171fd370dca8cc8ec9f7b3f3c8684 Author: Tor Lillqvist t...@iki.fi Date: Mon Nov 19 14:35:52 2012 +0200 Use gb_VISIBILITY_FLAGS Change-Id: I8ff9bb01bef265af70390ae94b762930689aa1ba diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index b0cb692..08d506c 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -37,7 +37,8 @@ else $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR) \ -./configure \ +$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS=$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS) CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)) \ + ./configure \ --with-pic \ --enable-static \ --disable-shared \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Bug 51309 - Names of DatabaseRanges should not be case sensitive
Hey Mathieu, 2012/11/14 Mathieu D. call.protec...@gmail.com: Hi, Sorry for the last mails. Here is the mail, hopefully correct. I submitted a patch for the bug 51309 - Names of DatabaseRanges should not be case sensitive : https://bugs.freedesktop.org/show_bug.cgi?id=51309 You will the diff file attached and on the bug's page. https://bugs.freedesktop.org/page.cgi?id=splinter.htmlbug=51309attachment=69115 Changes : - ScDBData::less::operator() is modified to compare upper strings - All the calls to NamedDBs::findByName() are now NamedDBs::findByUpperName(). - In case of a call to findByUpperName by an argument, the function ScGlobal::pCharClass-uppercase(aName) was used to ensure upper case. - The definitions of FindByName() are deleted. All of my past and future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Thanks, I pushed your patch to master. Do you have any area that you'd like to hack next? Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/inc sc/qa sc/source
sc/inc/dbdata.hxx |1 -
sc/qa/unit/subsequent_filters-test.cxx |4 ++--
sc/source/core/data/cell.cxx |4 ++--
sc/source/core/data/documen3.cxx |2 +-
sc/source/core/tool/dbdata.cxx | 20 +---
sc/source/core/tool/rangeutl.cxx |2 +-
sc/source/ui/dbgui/dbnamdlg.cxx|4 ++--
sc/source/ui/docshell/arealink.cxx |4 ++--
sc/source/ui/docshell/dbdocfun.cxx | 12 ++--
sc/source/ui/docshell/docsh4.cxx |2 +-
sc/source/ui/docshell/docsh5.cxx |2 +-
sc/source/ui/navipi/content.cxx|2 +-
sc/source/ui/undo/undodat.cxx |4 ++--
sc/source/ui/unoobj/datauno.cxx|4 ++--
sc/source/ui/view/dbfunc.cxx |2 +-
15 files changed, 25 insertions(+), 44 deletions(-)
New commits:
commit aafe2fcbcb754b2fff8d7c3bf1f61781df259b67
Author: Mathieu D call.protec...@gmail.com
Date: Mon Nov 19 14:08:27 2012 +0100
database names are case insensitive, fdo#51309
Change-Id: Iac9ac4e48115ea09aeffa11bbd8da399266aede9
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index d607b4e..5f7133f 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -185,7 +185,6 @@ public:
const_iterator begin() const;
const_iterator end() const;
ScDBData* findByIndex(sal_uInt16 nIndex);
-ScDBData* findByName(const ::rtl::OUString rName);
ScDBData* findByUpperName(const ::rtl::OUString rName);
bool insert(ScDBData* p);
void erase(iterator itr);
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index fd49ed1..a72629a 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -958,11 +958,11 @@ void ScFiltersTest::testBugFixesODS()
{
// fdo#40426
-ScDBData* pDBData =
pDoc-GetDBCollection()-getNamedDBs().findByName(DBRange1);
+ScDBData* pDBData =
pDoc-GetDBCollection()-getNamedDBs().findByUpperName(DBRANGE1);
CPPUNIT_ASSERT(pDBData);
CPPUNIT_ASSERT(pDBData-HasHeader());
// no header
-pDBData =
pDoc-GetDBCollection()-getNamedDBs().findByName(DBRange2);
+pDBData =
pDoc-GetDBCollection()-getNamedDBs().findByUpperName(DBRANGE2);
CPPUNIT_ASSERT(pDBData);
CPPUNIT_ASSERT(!pDBData-HasHeader());
}
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index e27339e..4c0bd4b 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -203,7 +203,7 @@ void adjustDBRange(ScToken* pToken, ScDocument rNewDoc,
const ScDocument* pOldD
ScDBData* pDBData = aOldNamedDBs.findByIndex(pToken-GetIndex());
if (!pDBData)
return; //invalid index
-rtl::OUString aDBName = pDBData-GetName();
+rtl::OUString aDBName = pDBData-GetUpperName();
//search in new document
ScDBCollection* pNewDBCollection = rNewDoc.GetDBCollection();
@@ -212,7 +212,7 @@ void adjustDBRange(ScToken* pToken, ScDocument rNewDoc,
const ScDocument* pOldD
pNewDBCollection = new ScDBCollection(rNewDoc);
}
ScDBCollection::NamedDBs aNewNamedDBs = pNewDBCollection-getNamedDBs();
-ScDBData* pNewDBData = aNewNamedDBs.findByName(aDBName);
+ScDBData* pNewDBData = aNewNamedDBs.findByUpperName(aDBName);
if (!pNewDBData)
{
pNewDBData = new ScDBData(*pDBData);
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 600bf60..4c5c04a 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -250,7 +250,7 @@ void ScDocument::SetDBCollection( ScDBCollection*
pNewDBCollection, bool bRemove
bool bFound = false;
if (pNewDBCollection)
{
-ScDBData* pNewData =
pNewDBCollection-getNamedDBs().findByName(rOldData.GetName());
+ScDBData* pNewData =
pNewDBCollection-getNamedDBs().findByUpperName(rOldData.GetUpperName());
if (pNewData)
{
if (pNewData-HasAutoFilter())
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 7b142cc..3290f18 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -53,7 +53,7 @@ using ::std::pair;
bool ScDBData::less::operator() (const ScDBData left, const ScDBData right)
const
{
-return ScGlobal::GetpTransliteration()-compareString(left.GetName(),
right.GetName()) 0;
+return ScGlobal::GetpTransliteration()-compareString(left.GetUpperName(),
right.GetUpperName()) 0;
}
ScDBData::ScDBData( const ::rtl::OUString rName,
@@ -643,17 +643,6 @@ public:
}
};
-class FindByName : public unary_functionScDBData, bool
-{
-const ::rtl::OUString mrName;
-public:
-FindByName(const ::rtl::OUString rName) : mrName(rName) {}
-bool operator() (const ScDBData r) const
-{
-return
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 57198, which changed state. Bug 57198 Summary: Mac OSX Daily installation package to small and invalid https://bugs.freedesktop.org/show_bug.cgi?id=57198 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - desktop/source
desktop/source/app/app.cxx|2
desktop/source/app/check_ext_deps.cxx |2
desktop/source/deployment/manager/dp_extensionmanager.cxx | 30 +-
3 files changed, 31 insertions(+), 3 deletions(-)
New commits:
commit d7c5f37d137041d7bc8abaed6b3a454899e9670f
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 19 14:17:21 2012 +0100
Some clean-up
Change-Id: I02c56a86454b5ed6df29c3af60b3da2c7bd4b7e1
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 400da64..44821e5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -221,7 +221,7 @@ void removeTree(OUString const url) {
// com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
// contained data nevertheless.
//
-// When a LO upgrade is detected (i.e., no/ user/extensions/bundled/buildid or
+// When a LO upgrade is detected (i.e., no user/extensions/bundled/buildid or
// one containing an old build ID), then user/extensions/bundled,
// user/extensions/shared, and user/uno_packages/cache/registry/
// com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc are
diff --git a/desktop/source/app/check_ext_deps.cxx
b/desktop/source/app/check_ext_deps.cxx
index a6221a9..fcb2573 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -433,7 +433,7 @@ void Desktop::SynchronizeExtensionRepositories()
} else {
// reinstallDeployedExtensions above already calls syncRepositories
// internally:
-dp_misc::syncRepositories(m_bCleanedExtensionCache, silent);
+dp_misc::syncRepositories(false, silent);
}
}
commit 6f9c3bc8edc93be07273d9de13dda19ea6c1da4a
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 19 14:14:50 2012 +0100
fdo#57224: Preserve disabled-state across reinstallDeployedExtensions
Change-Id: I8d65b76fd93b63b51db88b7b09902ba64732dd97
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 4ba5584..b0c65e0 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -65,6 +65,7 @@
#include list
#include boost/unordered_map.hpp
#include algorithm
+#include set
namespace deploy = com::sun::star::deployment;
namespace lang = com::sun::star::lang;
@@ -1234,6 +1235,31 @@ void ExtensionManager::reinstallDeployedExtensions(
Referencedeploy::XPackageManager
xPackageManager = getPackageManager(repository);
+std::set OUString disabledExts;
+{
+const uno::Sequence Referencedeploy::XPackage extensions(
+xPackageManager-getDeployedPackages(xAbortChannel, xCmdEnv));
+for ( sal_Int32 pos = 0; pos extensions.getLength(); ++pos )
+{
+try
+{
+beans::Optional beans::Ambiguous sal_Bool registered(
+extensions[pos]-isRegistered(xAbortChannel, xCmdEnv));
+if (!registered.IsPresent
+|| registered.Value.IsAmbiguous
+|| !registered.Value.Value)
+{
+const OUString id = dp_misc::getIdentifier(extensions[
pos ]);
+OSL_ASSERT(!id.isEmpty());
+disabledExts.insert(id);
+}
+}
+catch (const lang::DisposedException )
+{
+}
+}
+}
+
::osl::MutexGuard guard(getMutex());
xPackageManager-reinstallDeployedPackages(
force, xAbortChannel, xCmdEnv);
@@ -1250,7 +1276,9 @@ void ExtensionManager::reinstallDeployedExtensions(
const OUString id = dp_misc::getIdentifier(extensions[ pos ]);
const OUString fileName = extensions[ pos ]-getName();
OSL_ASSERT(!id.isEmpty());
-activateExtension(id, fileName, false, true, xAbortChannel,
xCmdEnv );
+activateExtension(
+id, fileName, disabledExts.find(id) != disabledExts.end(),
+true, xAbortChannel, xCmdEnv );
}
catch (const lang::DisposedException )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/source
svx/source/tbxctrls/verttexttbxctrl.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit ae31ccfb1727f50cdfa3259146b0e864c81a9d27
Author: Noel Power noel.po...@suse.com
Date: Wed Nov 14 10:29:57 2012 +
fix wae ( bVisible not used )
Change-Id: I61570274857f4c2b4e1be56321a673496a685b82
(cherry picked from commit 52ecc7125d546a85cdf91f209015a0a102242a7c)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx
b/svx/source/tbxctrls/verttexttbxctrl.cxx
index d6f6da2..90cc166 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -71,7 +71,6 @@ void SvxVertCTLTextTbxCtrl::StateChanged(
{
SvtLanguageOptions aLangOptions;
sal_Bool bCalc = sal_False;
-sal_Bool bVisible = GetToolBox().IsItemVisible(GetId());
sal_Bool bEnabled = sal_False;
if ( nSID == SID_VERTICALTEXT_STATE )
bEnabled = aLangOptions.IsVerticalTextEnabled();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: fdo#57224: Preserve disabled-state across reinstallDeployedE...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1115 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/1115/1 fdo#57224: Preserve disabled-state across reinstallDeployedExtensions Change-Id: I8d65b76fd93b63b51db88b7b09902ba64732dd97 (cherry picked from commit 6f9c3bc8edc93be07273d9de13dda19ea6c1da4a) --- M desktop/source/deployment/manager/dp_extensionmanager.cxx 1 file changed, 29 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1115 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d65b76fd93b63b51db88b7b09902ba64732dd97 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ 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 chauk.m...@gmail.com changed: What|Removed |Added Depends on||57203 --- Comment #166 from chauk.m...@gmail.com --- Add 57203 : LibO 3.6.3.2 is a great release but cannot be automated by Automation compatible script languages (VBScript, Ruby, ...) as the OLE bridge is broken. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-6]: fdo#57224: Preserve disabled-state across reinstallDeployedE...
Stephan Bergmann has abandoned this change. Change subject: fdo#57224: Preserve disabled-state across reinstallDeployedExtensions .. Patch Set 1: Abandoned doesn't work after all -- To view, visit https://gerrit.libreoffice.org/1115 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8d65b76fd93b63b51db88b7b09902ba64732dd97 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#56124 add calc functions IFERROR and IFNA as in ODFF1.2
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1116 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/1116/1 fdo#56124 add calc functions IFERROR and IFNA as in ODFF1.2 Change-Id: I82c90b7bec9f648f84d3551f64144e5cab5ceff8 --- M formula/inc/formula/compiler.hrc M formula/inc/formula/opcode.hxx M formula/source/core/resource/core_resource.src M sc/inc/helpids.h M sc/qa/unit/ucalc.cxx M sc/source/core/inc/interpre.hxx M sc/source/core/tool/interpr1.cxx M sc/source/core/tool/interpr4.cxx M sc/source/ui/src/scfuncs.src M sc/util/hidother.src 10 files changed, 261 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1116 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82c90b7bec9f648f84d3551f64144e5cab5ceff8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/dialogcontrol.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ce1d0822d0a0fdb4ed3f2583cc1f63ef98381097
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 19 15:27:35 2012 +0100
warning C4100: unreferenced formal parameter
Change-Id: I49da06b94bdc91b1cdc4bb3d047804d353b0aba8
diff --git a/toolkit/source/controls/dialogcontrol.cxx
b/toolkit/source/controls/dialogcontrol.cxx
index 922ad41..1d711d3 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -643,7 +643,7 @@ void SAL_CALL UnoMultiPageControl::inserted(
SAL_UNUSED_PARAMETER ::sal_Int32 )
void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 )
throw (RuntimeException)
{
}
-void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32
ID,
+void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32,
SAL_UNUSED_PARAMETER const
Sequence NamedValue ) throw (RuntimeException)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/killsdf' - mysqlc/source
mysqlc/source/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c82935d52db04230c77b4a6df7dda07507b34805 Author: Zolnai Tamás zolnaitamas20...@gmail.com Date: Mon Nov 19 15:29:59 2012 +0100 Extend localization to mysqlc Change-Id: If67b4991dec8c20d02d41032923bbd5945a5704a diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index c36e836..232bc1f 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -236,7 +236,7 @@ $(COMPONENT_DESCRIPTIONS_PACKDEP) : $(DESCRIPTION) $(DESCRIPTION_SRC): description.xml +-$(RM) $@ .IF $(WITH_LANG) != -$(XRMEX) -p $(PRJNAME) -i $ -o $@ -m $(LOCALIZESDF) -l all +$(XRMEX) -p $(PRJNAME) -i $ -o $@ -m $(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG)) $(SRCDIR)$/newtrans.1.0/source/$(lang)/$(PRJNAME)$/$(PATH_IN_MODULE).po)) -l all $(SED) s/#VERSION#/$(EXTENSION_VERSION)/ $@ $@.new mv $@.new $@ @$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Calc / Kerning
On Fri, Nov 16, 2012 at 3:48 PM, Bernhard Schiffner
bernhard.schiff...@gmx.net wrote:
Questions:
1.) Is it possible to text-edit a text cell directly entering something
like
{\b Bold}?
Nope.
2.) Copy and paste from other rtf sources?
Yes.
3.) Is there a way to do so by (external) software?
The answer would depend on what exactly you mean by to do so here. But
in general if you can count the extension mechanism as external software,
then it should be possible.
4.) What's about something like =cell(resulting_string, A1) be it API or
internal?
Sorry, you lost me here. What exactly do you want this function to do?
Kohei
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/crsr/findattr.cxx|4 ++--
sw/source/core/text/EnhancedPDFExportHelper.cxx |4 ++--
sw/source/filter/basflt/fltini.cxx |6 +++---
sw/source/filter/html/css1atr.cxx |4 ++--
sw/source/filter/html/htmlcss1.cxx |4 ++--
sw/source/filter/html/htmlgrin.cxx |4 ++--
sw/source/filter/html/svxcss1.cxx |4 ++--
sw/source/filter/html/wrthtml.cxx |4 ++--
sw/source/filter/ww8/docxattributeoutput.cxx|4 ++--
sw/source/filter/ww8/ww8atr.cxx |4 ++--
sw/source/filter/ww8/ww8par.cxx |4 ++--
sw/source/ui/app/appopt.cxx |7 ---
sw/source/ui/dbui/dbmgr.cxx |6 +++---
sw/source/ui/lingu/olmenu.cxx |3 ++-
sw/source/ui/shells/textsh1.cxx |4 ++--
sw/source/ui/uno/unotxdoc.cxx |4 ++--
sw/source/ui/vba/vbastyle.cxx |6 +++---
17 files changed, 39 insertions(+), 37 deletions(-)
New commits:
commit 8ac150eb163b4ce200068313db26121a8b808d46
Author: Eike Rathke er...@redhat.com
Date: Mon Nov 19 15:49:09 2012 +0100
use LanguageTag
Change-Id: I4ffa1aa2dce0bf1d0c87d56f72589112ec1222a1
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 9490c41..451c2a5 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -29,7 +29,7 @@
#include com/sun/star/lang/Locale.hpp
#include com/sun/star/util/SearchOptions.hpp
#include com/sun/star/util/SearchFlags.hpp
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include hintids.hxx
#include vcl/svapp.hxx
#include svl/itemiter.hxx
@@ -1107,7 +1107,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove,
const SwPaM* pRegion,
aTmp.searchFlag |= (SearchFlags::REG_NOT_BEGINOFLINE |
SearchFlags::REG_NOT_ENDOFLINE);
-MsLangId::convertLanguageToLocale( LANGUAGE_SYSTEM,
aTmp.Locale );
+aTmp.Locale = LanguageTag( LANGUAGE_SYSTEM ).getLocale();
pSTxt = new utl::TextSearch( aTmp );
}
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 324eb74..6f3186c 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -77,7 +77,7 @@
#include porfld.hxx
#include SwStyleNameMapper.hxx
#include itrpaint.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include IMark.hxx
#include SwNodeNum.hxx
#include switerator.hxx
@@ -1580,7 +1580,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
//
// set the document locale
//
-com::sun::star::lang::Locale aDocLocale =
MsLangId::convertLanguageToLocale(
SwEnhancedPDFExportHelper::GetDefaultLanguage() );
+com::sun::star::lang::Locale aDocLocale( LanguageTag(
SwEnhancedPDFExportHelper::GetDefaultLanguage() ).getLocale() );
pPDFExtOutDevData-SetDocumentLocale( aDocLocale );
//
diff --git a/sw/source/filter/basflt/fltini.cxx
b/sw/source/filter/basflt/fltini.cxx
index 7c2fa60..cee3d0c 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -30,7 +30,7 @@
#include stdio.h // sscanf
#include hintids.hxx
#include i18npool/lang.h
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include vcl/msgbox.hxx
#include svtools/parhtml.hxx
#include sot/storage.hxx
@@ -784,7 +784,7 @@ void SwAsciiOptions::ReadUserData( const String rStr )
sFont = sToken;
break;
case 3: // Language
-nLanguage = MsLangId::convertIsoStringToLanguage( sToken );
+nLanguage = LanguageTag( sToken ).getLanguageType();
break;
}
}
@@ -820,7 +820,7 @@ void SwAsciiOptions::WriteUserData( String rStr )
// 4. Language
if (nLanguage)
{
-rtl::OUString sTmp = MsLangId::convertLanguageToIsoString( nLanguage );
+rtl::OUString sTmp = LanguageTag( nLanguage ).getBcp47();
rStr += (String)sTmp;
}
rStr += ',';
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index fd3f511..e973a64 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -63,7 +63,7 @@
#include tools/urlobj.hxx
#include tools/bigint.hxx
#include unotools/charclass.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include charfmt.hxx
#include fmtcol.hxx
#include fmtfsize.hxx
@@ -2797,7 +2797,7 @@ static Writer OutCSS1_SvxLanguage( Writer rWrt, const
SfxPoolItem rHt )
if(
[PATCH] Stop a memory leak in text_textsearch.cxx
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1118 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/1118/1 Stop a memory leak in text_textsearch.cxx Change-Id: I4dad05dbbe668ac7d7058cb43989f6a9f8e488a6 --- M i18npool/qa/cppunit/test_textsearch.cxx 1 file changed, 1 insertion(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1118 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4dad05dbbe668ac7d7058cb43989f6a9f8e488a6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - desktop/source xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source
desktop/source/deployment/manager/dp_extensionmanager.cxx |6 +++---
xmlsecurity/Library_xsec_xmlsec.mk|2 +-
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 14 ++
3 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit a05e1e4967a21f3dd5a49215d97df99a7ec84f18
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 19 16:06:43 2012 +0100
fdo#57224: Fix logic of considering optional/ambiguous value as disabled
...so that only a not-registered that is non-optional and non-ambiguous is
considered as disabled by user's intention. Other combinations can occur
for
broken extensions (that will thus become disabled again anyway when we try
to
automatically enable them) and for originally enabled extensions for which
cleanExtensionCache in desktop/source/app/app.cxx has forecefully removed
user/uno_packages/cache/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
(and which should rather be kept enabled).
Change-Id: Ic85b609ec9b3634cfa94a77151d42c07b9488030
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index b0c65e0..5f701c6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1245,9 +1245,9 @@ void ExtensionManager::reinstallDeployedExtensions(
{
beans::Optional beans::Ambiguous sal_Bool registered(
extensions[pos]-isRegistered(xAbortChannel, xCmdEnv));
-if (!registered.IsPresent
-|| registered.Value.IsAmbiguous
-|| !registered.Value.Value)
+if (registered.IsPresent
+!(registered.Value.IsAmbiguous ||
+ registered.Value.Value))
{
const OUString id = dp_misc::getIdentifier(extensions[
pos ]);
OSL_ASSERT(!id.isEmpty());
commit 8648c974ea5e222027a5ac1c9a01cd9ac6e344a8
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 19 14:26:58 2012 +0100
Clean-up SYSTEM_MOZILLA - SYSTEM_NSS
Change-Id: I47ec3aeb14445b697bf8f5af34c5d16a14069735
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk
b/xmlsecurity/Library_xsec_xmlsec.mk
index 4eceb30..6808cbc 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -156,7 +156,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\
))
$(eval $(call gb_Library_add_defs,xsec_xmlsec,\
- -DSYSTEM_MOZILLA \
+ -DSYSTEM_NSS \
))
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index a1c01d3..af92f34 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -248,9 +248,9 @@ void deleteRootsModule()
//the location of the roots module to the profile, which makes FF2 and TB2 use
//it instead of there own module.
//
-//When using SYSTEM_MOZILLA then the libnss3.so lib is typically found in
-///usr/lib. This folder may, however, NOT contain the roots certificate
-//module. That is, just providing the library name in SECMOD_LoadUserModule or
+//When using SYSTEM_NSS then the libnss3.so lib is typically found in /usr/lib.
+//This folder may, however, NOT contain the roots certificate module. That is,
+//just providing the library name in SECMOD_LoadUserModule or
//SECMOD_AddNewModule will FAIL to load the mozilla unless the LD_LIBRARY_PATH
//contains an FF or TB installation.
//ATTENTION: DO NOT call this function directly instead use initNSS
@@ -305,13 +305,13 @@ bool nsscrypto_initialize( const css::uno::Reference
css::uno::XComponentContex
out_nss_init = true;
#ifdef XMLSEC_CRYPTO_NSS
-#if defined SYSTEM_MOZILLA
+#if defined SYSTEM_NSS
if (!SECMOD_HasRootCerts())
-{
#endif
+{
deleteRootsModule();
-#if defined SYSTEM_MOZILLA
+#if defined SYSTEM_NSS
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM(libnssckbi
SAL_DLLEXTENSION));
#else
OUString
rootModule(RTL_CONSTASCII_USTRINGPARAM(${LO_LIB_DIR}/libnssckbi
SAL_DLLEXTENSION));
@@ -365,10 +365,8 @@ bool nsscrypto_initialize( const css::uno::Reference
css::uno::XComponentContex
xmlsec_trace(Adding new root certificate module failed.);
return_value = false;
}
-#if SYSTEM_MOZILLA
}
#endif
-#endif
return return_value;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/qa
i18npool/qa/cppunit/test_textsearch.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7228c24e38363ed4684936f69eb49a7905b5a16b Author: Zolnai Tamás zolnaitamas20...@gmail.com Date: Mon Nov 19 15:58:52 2012 +0100 Stop a memory leak in text_textsearch.cxx Change-Id: I4dad05dbbe668ac7d7058cb43989f6a9f8e488a6 Reviewed-on: https://gerrit.libreoffice.org/1118 Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz diff --git a/i18npool/qa/cppunit/test_textsearch.cxx b/i18npool/qa/cppunit/test_textsearch.cxx index 682a607..c26550b 100644 --- a/i18npool/qa/cppunit/test_textsearch.cxx +++ b/i18npool/qa/cppunit/test_textsearch.cxx @@ -92,6 +92,7 @@ void TestTextSearch::testICU() CPPUNIT_ASSERT( nErr == U_ZERO_ERROR ); CPPUNIT_ASSERT( pRegexMatcher-end( nErr ) == 1 ); CPPUNIT_ASSERT( nErr == U_ZERO_ERROR ); +delete pRegexMatcher; } void TestTextSearch::testSearches() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Stop a memory leak in text_textsearch.cxx
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1118 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1118 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4dad05dbbe668ac7d7058cb43989f6a9f8e488a6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - doc-dump.py src/docrecord.py src/globals.py
doc-dump.py |2 ++
src/docrecord.py | 44
src/globals.py |4 ++--
3 files changed, 28 insertions(+), 22 deletions(-)
New commits:
commit b2b4859c6f8d692804a3eb33f68981b337e11022
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Nov 19 16:28:40 2012 +0100
FcCompressed: support fCompressed = 0
This seems to be used for non-ascii text.
diff --git a/doc-dump.py b/doc-dump.py
index ac1fba6..28e7bcb 100755
--- a/doc-dump.py
+++ b/doc-dump.py
@@ -1,6 +1,8 @@
#!/usr/bin/env python
import sys
+sys = reload(sys)
+sys.setdefaultencoding(utf-8)
sys.path.append(sys.path[0]+/src)
import globals
import docstream
diff --git a/src/docrecord.py b/src/docrecord.py
index 64d2865..46369d3 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -21,11 +21,21 @@ class FcCompressed(DOCDirStream):
self.printAndSet(r1, self.getBit(buf, 31))
print '/fcCompressed'
-def getTransformedAddress(self):
-if self.fCompressed:
-return self.fc/2
-else:
-print 'todo what=FcCompressed: fCompressed = 0 not supported/'
+def getTransformedValue(self, start, end):
+if self.fCompressed:
+offset = self.fc/2
+return
globals.encodeName(self.mainStream.bytes[offset:offset+end-start])
+else:
+offset = self.fc
+return
globals.encodeName(self.mainStream.bytes[offset:offset+end*2-start].decode('utf-16'),
lowOnly = True)
+
+@staticmethod
+def getFCTransformedValue(bytes, start, end):
+# This is a bit ugly, but at this state we don't know yet if the text
is compressed or not.
+try:
+return globals.encodeName(bytes[start:end].decode('utf-16'),
lowOnly = True)
+except UnicodeDecodeError:
+return globals.encodeName(bytes[start:end])
class Pcd(DOCDirStream):
The Pcd structure specifies the location of text in the WordDocument
Stream and additional properties for this text.
@@ -85,8 +95,7 @@ class PlcPcd(DOCDirStream, PLC):
aPcd = Pcd(self.bytes, self.mainStream, self.getOffset(self.pos,
i), 8)
aPcd.dump()
-offset = aPcd.fc.getTransformedAddress()
-print 'transformed value=%s/' %
globals.encodeName(self.mainStream.bytes[offset:offset+end-start])
+print 'transformed value=%s/' %
aPcd.fc.getTransformedValue(start, end)
print '/aCP'
print '/plcPcd'
@@ -251,7 +260,7 @@ class ChpxFkp(DOCDirStream):
start = self.getuInt32(pos = pos)
end = self.getuInt32(pos = pos + 4)
print 'rgfc index=%d start=%d end=%d' % (i, start, end)
-print 'transformed value=%s/' %
globals.encodeName(self.bytes[start:end])
+print 'transformed value=%s/' %
FcCompressed.getFCTransformedValue(self.bytes, start, end)
pos += 4
# rgbx
@@ -280,7 +289,7 @@ class PapxFkp(DOCDirStream):
start = self.getuInt32(pos = pos)
end = self.getuInt32(pos = pos + 4)
print 'rgfc index=%d start=%d end=%d' % (i, start, end)
-print 'transformed value=%s/' %
globals.encodeName(self.bytes[start:end])
+print 'transformed value=%s/' %
FcCompressed.getFCTransformedValue(self.bytes, start, end)
pos += 4
# rgbx
commit e6ed69713adc34f7fe554b268dda3d97eb71ae74
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Nov 19 16:05:14 2012 +0100
globals.encodeName: allow not encoding high characters
diff --git a/src/globals.py b/src/globals.py
index ca7a92e..dbb6690 100644
--- a/src/globals.py
+++ b/src/globals.py
@@ -151,7 +151,7 @@ def debug (msg):
sys.stderr.write(DEBUG: %s\n%msg)
-def encodeName (name):
+def encodeName (name, lowOnly = False):
Encode name that contains unprintable characters.
n = len(name)
@@ -160,7 +160,7 @@ def encodeName (name):
newname = ''
for i in xrange(0, n):
-if ord(name[i]) = 20 or ord(name[i]) = 127:
+if ord(name[i]) = 20 or ((not lowOnly) and ord(name[i]) = 127):
newname += \\x%2.2X%ord(name[i])
else:
newname += name[i]
commit 52055fd71dda9407f8728b0584a2f3dc440f9f37
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Nov 13 11:14:14 2012 +0100
drop pointless getSize methods
diff --git a/src/docrecord.py b/src/docrecord.py
index 9931173..64d2865 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -222,22 +222,19 @@ class PapxInFkp(DOCDirStream):
class BxPap(DOCDirStream):
The BxPap structure specifies the offset of a PapxInFkp in PapxFkp.
+size = 13 # in bytes, see 2.9.23
def __init__(self, bytes, mainStream, offset, parentoffset):
DOCDirStream.__init__(self, bytes)
self.pos = offset
self.parentpos = parentoffset
def dump(self):
-print 'bxPap type=BxPap offset=%d size=%d
[Libreoffice-commits] .: test/unicode.rtf
test/unicode.rtf |5 +
1 file changed, 5 insertions(+)
New commits:
commit 2e5e3bbeb28ed1003e330a798835a420111a6f7a
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Nov 19 16:30:04 2012 +0100
doc: unicode testcase
diff --git a/test/unicode.rtf b/test/unicode.rtf
new file mode 100755
index 000..f1334dd
--- /dev/null
+++ b/test/unicode.rtf
@@ -0,0 +1,5 @@
+{\rtf1
+\pard\plain
+Hello world! \uc2 \u233\'c3\'a9\u225\'c3\'a1\u337\'c5\'91\u369\'c5\'b1\uc1
+\par
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Calc / Kerning
On Fri, 2012-11-16 at 20:18 +0100, Bernhard Schiffner wrote: Bernhard - anything else you're interested in hacking on that might be easier ? :-) For sure! :-) Cool :-) so one area we're trying to get people to help-out with before the feature-freeze for 4.0 (which is now under 2 weeks away) is: https://wiki.documentfoundation.org/Development/WidgetLayout Converting old ugly dialogs to the new .ui format - there are plenty of older dialogs in calc (and elsewhere) that need that attention, any chance of having a poke at some of them ? It seems the re-work of the calc / string handling core is rather an advanced post 4.0 feature :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6-4]: fdo#57224: Preserve disabled-state across reinstallDeployedE...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1120 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/1120/1 fdo#57224: Preserve disabled-state across reinstallDeployedExtensions (cherry picked from commit 6f9c3bc8edc93be07273d9de13dda19ea6c1da4a plus follow- up a05e1e4967a21f3dd5a49215d97df99a7ec84f18 fdo#57224: Fix logic of considering optional/ambiguous value as 'disabled') Change-Id: Ic4f6cda4de758df4789e80b48b30f11ef810d2bd --- M desktop/source/deployment/manager/dp_extensionmanager.cxx 1 file changed, 29 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1120 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4f6cda4de758df4789e80b48b30f11ef810d2bd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6-4 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#57224: Preserve disabled-state across reinstallDeployedE...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1119 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/1119/1 fdo#57224: Preserve disabled-state across reinstallDeployedExtensions (cherry picked from commit 6f9c3bc8edc93be07273d9de13dda19ea6c1da4a plus follow- up a05e1e4967a21f3dd5a49215d97df99a7ec84f18 fdo#57224: Fix logic of considering optional/ambiguous value as 'disabled') Change-Id: Ic4f6cda4de758df4789e80b48b30f11ef810d2bd --- M desktop/source/deployment/manager/dp_extensionmanager.cxx 1 file changed, 29 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1119 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4f6cda4de758df4789e80b48b30f11ef810d2bd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[libreoffice-dev] - Scalc.java ported to C++ , uses DocumentLoader
Hi Enrico and Julien, Thanks for the feedback. I am attaching the 3 files. As mentioned before, this is a port of Scalc.java to C++. The code is mostly cut+paste from examples/cpp/DocumentLoader and examples/java/Scalc.java. I am expecting it'll belong in examples/cpp/Scalcpp. I'd appreciate if someone reviews it and incorporates it as part of dist. Please let me know if more is needed from my end. Thx Neeraj -Original Message- From: libreoffice-bounces+neeraj.rai=citi@lists.freedesktop.org [mailto:libreoffice-bounces+neeraj.rai=citi@lists.freedesktop.org] On Behalf Of julien2412 Sent: Saturday, November 17, 2012 9:03 AM To: libreoffice@lists.freedesktop.org Subject: Re: [libreoffice-users] - Scalc.java ported to C++ , uses DocumentLoader Hi, As proposed Enrico, you can use gerrit (see http://wiki.documentfoundation.org/Development/gerrit). You can also send a post here with a patch attached (see http://wiki.documentfoundation.org/Development/Patch_Handling_Guidelines) Julien -- View this message in context: http://nabble.documentfoundation.org/libreoffice-users-Scalc-java-ported-to-C-uses-DocumentLoader-tp4018993p4019174.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice scalc.ods Description: scalc.ods SCalcpp.cxx Description: SCalcpp.cxx Makefile Description: Makefile ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RFC: Generic wrapper for external helpr applications
Hi folks, I'm currently thinking about a generic ways for configuring external helpers, eg. mail client, web browser, etc. (at least on *nix ;-p) For now, many applications (eg. libreoffice) have their own settings, which adds additional code/complexity and requires the user to set it in each single application. Let's imagine some approach which allows it on a system-wide, user-wide, system-wide as well as application-wide basis - how could that look like ? From individual application side, it just wants to know which command to call. It then just would call an universal wrapper, eg. like this: common-helper-app --caller=LibreOffice web-browser --url=http://foo.bar; common-helper-app --caller=LibreOffice web-add-bookmark --url http://www.libreoffice.org; --title LibreOffice Homepage common-helper-app --caller=LibreOffice mail-compose --mailto f...@bar.org --subject Hello world common-helper-app --caller=LibreOffice mail-mailbox --inbox common-helper-app --caller=LibreOffice show-document --auto --file ~/my_image.png common-helper-app --caller=LibreOffice edit-document --auto --file ~/funny_pic.jpg If an application wants to launch an settings dialog for itself, it would call: common-helper-app --caller=LibreOffice configure This 'common-helper-app' could be written in shellscript or whatever language one likes and is provided by the distro. It's now fully up to that command to decide what really to do (it could even consider session specific things like whether to use a graphical or text terminal, use desktop environment specific settings, etc, etc). What do you think about this idea ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Broken commits in our repo
Agreed - we have very significant annotations of specific git hashes left and right to double-check the re-basing work; anything that hinders that process in the next months is incredibly under-appreciated. So - if it's just a few harmless warnings - we should leave it for now. Well, technically, they're quite harmless (normal git operations still work fine), but certain git hosters (at least github) refuse uploading. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/layout/trvlfrm.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7615f62b81be351daba463d79598abe5665e0adf Author: Michael Stahl mst...@redhat.com Date: Mon Nov 19 16:43:09 2012 +0100 warning C4805: '==': unsafe mix of bool and sal_Bool Change-Id: Ia3a21febe934b73401a008091c84766a2b798ca0 diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 5578946..60660f1 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -2529,7 +2529,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr rCrsr, sal_Bool bIsTblMode ) } //Now the frames between, if there are any -sal_Bool bBody = pStartFrm-IsInDocBody(); +bool const bBody = pStartFrm-IsInDocBody(); const SwTableBox* pCellBox = pStartFrm-GetUpper()-IsCellFrm() ? ((SwCellFrm*)pStartFrm-GetUpper())-GetTabBox() : 0; const SwCntntFrm *pCntnt = pStartFrm-GetNextCntntFrm(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk xmlsecurity/Library_xsec_xmlsec.mk
RepositoryExternal.mk |2 +- xmlsecurity/Library_xsec_xmlsec.mk | 31 +-- 2 files changed, 2 insertions(+), 31 deletions(-) New commits: commit ea64122c013f0b6c9fc862eeba81b154901ae6ab Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 19 16:40:33 2012 +0100 Further SYSTEM_MOZILLA/SYSTEM_NSS clean-up ...past 8648c974ea5e222027a5ac1c9a01cd9ac6e344a8 Clean-up 'SYSTEM_MOZILLA' - 'SYSTEM_NSS.' Looks like -DSYSTEM_MOZILLA in RepositoryExternal.mk's gb_LinkTarget__use_nss3 was only relevant for xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (for which it had been set explicitly in xmlsecurity/Library_xsec_xmlsec.mk, and renamed to SYSTEM_NSS already). And looks like xmlsecurity/Library_xsec_xmlsec.mk's explicit SYSTEM_NSS code was more or less a duplication of RepositoryExternal.mk's gb_LinkTarget__use_nss3, so made that DRY. Change-Id: Ie6eca2c4eb7fb70f6a36c97d8681b4140f9870cb diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d6c6fca..ad12be0 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2153,7 +2153,7 @@ ifeq ($(SYSTEM_NSS),YES) define gb_LinkTarget__use_nss3 $(call gb_LinkTarget_add_defs,$(1),\ - -DSYSTEM_MOZILLA \ + -DSYSTEM_NSS \ ) $(call gb_LinkTarget_set_include,$(1),\ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 6808cbc..29010b7 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ + nss3 \ )) $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ @@ -148,36 +149,6 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ endif # ifeq ($(GUI)$(CROSS_COMPILING),WNT) -ifeq ($(SYSTEM_NSS),YES) - -$(eval $(call gb_Library_set_include,xsec_xmlsec,\ - $$(INCLUDE) \ - $(NSS_CFLAGS) \ -)) - -$(eval $(call gb_Library_add_defs,xsec_xmlsec,\ - -DSYSTEM_NSS \ -)) - -$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ - $(NSS_LIBS) \ -)) - -else - -$(eval $(call gb_Library_set_include,xsec_xmlsec,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/mozilla/nspr \ - -I$(OUTDIR)/inc/mozilla/nss \ -)) - -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - nspr4 \ - nss3 \ -)) - -endif # ifeq ($(SYSTEM_NSS),YES) - ifeq ($(OS),SOLARIS) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ -ldl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/lo-pack-sources
bin/lo-pack-sources | 147 +---
1 file changed, 73 insertions(+), 74 deletions(-)
New commits:
commit b479f7f7675b8a539b35faaa6edcd282e09bba97
Author: Petr Mladek pmla...@suse.cz
Date: Mon Nov 19 17:02:19 2012 +0100
lo-pack-sources: use the same top-level directory in all tarballs
It allows to avoid symlinks more easily.
In addition, I did some clean up. I removed support for packing pieces
from standalone checkout. I guess that noone is using it.
Change-Id: I3c712f5eb12108229a157c636e0a63eca4ae0d6b
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index c49ba6d..1c452e8 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -7,7 +7,8 @@ use strict;
use File::Copy;
use File::Temp qw/ tempfile tempdir /;
-my %piece_dir = (
+my %piece_dirname = (
+core = ,
dictionaries = dictionaries,
help = helpcontent2,
translations = translations
@@ -88,27 +89,45 @@ sub copy_dir_filter_and_show_progress($$)
print \n;
}
+# copy files to temp dir; showing a progress; using a black list
+sub remove_empty_submodules($)
+{
+my ($target_topdir) = @_;
+
+foreach my $submodule (sort values %piece_dirname) {
+next unless ($submodule);
+print Removing empty submodule: $submodule...\n;
+rmdir $target_topdir/$submodule || die Error: Can't remove
submodule directory: $target_topdir/$submodule;
+}
+}
+
# copy the piece lo source directory into a tmp directory
# omit the .git subdirectories
sub copy_lo_piece_to_tempdir($$$)
{
-my ($piece_dir, $piece, $piece_tarball_name) = @_;
+my ($source_dir, $piece, $lo_topdir_name) = @_;
my $tempdir = tempdir( 'libreoffice-XX', DIR = File::Spec-tmpdir );
-mkdir $tempdir/$piece_tarball_name || die Can't create directory
\$tempdir/$piece_tarball_name\: $!\n;
-copy_dir_filter_and_show_progress($piece_dir,
$tempdir/$piece_tarball_name);
+mkdir $tempdir/$lo_topdir_name || die Can't create directory
\$tempdir/$lo_topdir_name\: $!\n;
+mkdir $tempdir/$lo_topdir_name/$piece_dirname{$piece} || die Can't
create directory \$tempdir/$lo_topdir_name/$piece_dirname{$piece}\: $!\n if
($piece_dirname{$piece});
+
+copy_dir_filter_and_show_progress($source_dir/$piece_dirname{$piece},
$tempdir/$lo_topdir_name/$piece_dirname{$piece});
+remove_empty_submodules($tempdir/$lo_topdir_name/) if ($piece eq core);
return $tempdir;
}
sub generate_lo_piece_changelog($$$)
{
-my ($lo_piece_clone, $lo_piece_release_dir, $piece) = @_;
+my ($source_dir, $lo_piece_release_topdir, $piece) = @_;
+
+my $log_name = ChangeLog;
+$log_name .= -$piece_dirname{$piece} if ($piece_dirname{$piece});
print Generating changelog for $piece...\n;
#print 1:$lo_piece_clone, 2:$lo_piece_release_dir, 3:$piece\n;
-system (cd $lo_piece_clone .
+system (cd $source_dir/$piece_dirname{$piece} .
git log --date=short --pretty='format:@%cd %an %ae
[%H]%n%n%s%n%n%e%b' | .
- sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||'
$lo_piece_release_dir/ChangeLog )
+ sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||'
$lo_piece_release_topdir/$log_name )
die Error: generating failed: $!\n;
}
@@ -230,30 +249,25 @@ sub check_if_file_exists($$)
}
}
-sub check_if_already_released($$$)
+sub check_if_already_released($$)
{
-my ($lo_core_tarball_name, $p_piece_tarball_name, $force, $bzip2, $xz,
$pack_lo_core, $pack_lo_pieces) = @_;
+my ($p_piece_tarball_name, $force, $bzip2, $xz, $pack_lo_core,
$pack_lo_pieces) = @_;
-check_if_file_exists($lo_core_tarball_name.tar.bz2, $force) if
($pack_lo_core defined $bzip2);
-check_if_file_exists($lo_core_tarball_name.tar.xz, $force) if
($pack_lo_core defined $xz);
-
-if ($pack_lo_pieces) {
-foreach my $tarball_name ( values %{$p_piece_tarball_name} ) {
-check_if_file_exists($tarball_name.tar.bz2, $force) if (defined
$bzip2);
-check_if_file_exists($tarball_name.tar.xz, $force) if (defined
$xz);
-}
+foreach my $tarball_name ( sort values %{$p_piece_tarball_name} ) {
+check_if_file_exists($tarball_name.tar.bz2, $force) if (defined
$bzip2);
+check_if_file_exists($tarball_name.tar.xz, $force) if (defined $xz);
}
}
sub prepare_piece_sources()
{
-my ($piece_dir, $release_version, $piece, $piece_tarball_name) = @_;
+my ($source_dir, $release_version, $piece, $lo_topdir_name) = @_;
# prepare sources
-my $temp_dir = copy_lo_piece_to_tempdir($piece_dir, $piece,
$piece_tarball_name);
-generate_lo_piece_changelog($piece_dir, $temp_dir/$piece_tarball_name,
$piece);
-run_autoreconf($temp_dir/$piece_tarball_name, $piece) if ($piece eq
'core');
-generate_sources_version_file($temp_dir/$piece_tarball_name,
$release_version) if ($piece eq 'core');
+my
Re: RFC: Generic wrapper for external helpr applications
On Mon, 2012-11-19 at 16:41 +0100, Enrico Weigelt wrote: I'm currently thinking about a generic ways for configuring external helpers, eg. mail client, web browser, etc. (at least on *nix ;-p) For now, many applications (eg. libreoffice) have their own settings, which adds additional code/complexity and requires the user to set it in each single application. So there is that xdg-open wrapper which we try to use for sending E-mail / opening composers or opening URLs - at least when we can find it etc. http://portland.freedesktop.org/xdg-utils-1.0/ I'd suggest extending that helper at freedesktop and when it is deployed discoverable adding support to LibreOffice. 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] .: configure.ac extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk postprocess/packcomponents Repository.mk scp2/source
Repository.mk | 14 -- configure.ac |7 --- extensions/Module_extensions.mk| 11 +++ np_sdk/Module_np_sdk.mk|9 ++--- postprocess/packcomponents/makefile.mk |2 +- scp2/source/ooo/file_library_ooo.scp |2 +- scp2/source/ooo/file_ooo.scp | 22 +++--- 7 files changed, 26 insertions(+), 41 deletions(-) New commits: commit f9059d4eee8e53c0a6b531fff16e1fade58cb8b0 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 19 17:41:01 2012 +0100 Key all browser plugin features to --enable-nsplugin ...instead of having them spread across --enable-nsplugin (plug LO into browser windows) and --enable-mozilla (plug browser plugins into LO documents). The ultimate goal is to clean up the various configure options mentioning mozilla and WITH_MOZILLA. Change-Id: I6f4b1c3a5701424f586cc1e303af90c9d59a91b6 diff --git a/Repository.mk b/Repository.mk index 754fc20..82aac94 100755 --- a/Repository.mk +++ b/Repository.mk @@ -190,21 +190,15 @@ endif ifeq ($(ENABLE_NSPLUGIN),YES) $(eval $(call gb_Helper_register_executables,OOO,\ nsplugin \ -)) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ -npsoplugin \ -)) -endif - -ifeq ($(WITH_MOZILLA),YES) -$(eval $(call gb_Helper_register_executables,OOO,\ pluginapp.bin \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ pl \ )) -endif # WITH_MOZILLA - +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ +npsoplugin \ +)) +endif ifeq ($(OS),MACOSX) diff --git a/configure.ac b/configure.ac index c85e0e0..101ea03 100644 --- a/configure.ac +++ b/configure.ac @@ -1015,7 +1015,9 @@ AC_ARG_ENABLE(zenity, AC_ARG_ENABLE(nsplugin, AS_HELP_STRING([--disable-nsplugin], -[Do not build nsplugin extension for browser embedding.]) +[Do not build NPAPI-based plugin features (allowing to plug LibreOffice + into browser windows, and to plug browser plugins into LibreOffice + documents.]) ) AC_ARG_ENABLE(cups, @@ -8387,8 +8389,7 @@ if test $with_system_npapi_headers = yes; then AC_LANG_POP([C]) else AC_MSG_RESULT([internal]) -dnl ...but will not be built/used unless ENABLE_NSPLUGIN or WITH_MOZILLA -dnl is YES +dnl ...but will not be built/used unless ENABLE_NSPLUGIN is YES SYSTEM_NPAPI_HEADERS=NO fi AC_SUBST(NPAPI_HEADERS_CFLAGS) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 67133d0..99ec13f 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -104,19 +104,14 @@ endif # DISABLE_ATL endif # WNT ifeq ($(ENABLE_NSPLUGIN),YES) + $(eval $(call gb_Module_add_targets,extensions,\ Executable_nsplugin \ Library_npsoplugin \ + Library_pl \ StaticLibrary_npsoenv \ WinResTarget_npsoplugin \ )) -endif - -ifeq ($(WITH_MOZILLA),YES) - -$(eval $(call gb_Module_add_targets,extensions,\ - Library_pl \ -)) ifeq ($(GUI),UNX) ifneq ($(GUIBASE),aqua) @@ -127,7 +122,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ endif endif -endif # WITH_MOZILLA=YES +endif # ENABLE_PLUGIN=YES ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk index 6ebba87..81c3742 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/np_sdk/Module_np_sdk.mk @@ -27,10 +27,11 @@ $(eval $(call gb_Module_Module,np_sdk)) -ifneq (,$(filter YES,$(ENABLE_NSPLUGIN) $(WITH_MOZILLA))) +ifeq ($(ENABLE_NSPLUGIN),YES) $(eval $(call gb_Module_add_targets,np_sdk,\ Package_inc \ + StaticLibrary_nputils \ )) ifeq ($(SYSTEM_NPAPI_HEADERS),NO) @@ -39,12 +40,6 @@ $(eval $(call gb_Module_add_targets,np_sdk,\ )) endif -ifeq ($(ENABLE_NSPLUGIN),YES) -$(eval $(call gb_Module_add_targets,np_sdk,\ - StaticLibrary_nputils \ -)) -endif - endif # vim: set noet sw=4 ts=4: diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 47c6c2b..d8d6edd 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -298,7 +298,7 @@ my_components += \ component/wizards/com/sun/star/wizards/web/web .END -.IF $(WITH_MOZILLA) != NO +.IF $(ENABLE_NSPLUGIN) == YES my_components += component/extensions/source/plugin/pl .END diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b4bb392..1e038f8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -934,7 +934,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui) STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) -#ifndef WITHOUT_MOZILLA +#if defined ENABLE_NSPLUGIN STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif diff --git a/scp2/source/ooo/file_ooo.scp
[Libreoffice-commits] .: bin/lo-commit-stat
bin/lo-commit-stat | 144 ++---
1 file changed, 73 insertions(+), 71 deletions(-)
New commits:
commit 0746c95f260c0b722547e760c28cd0daecc8ceba
Author: Petr Mladek pmla...@suse.cz
Date: Mon Nov 19 17:50:42 2012 +0100
lo-commit-stat: make it working with git submodules
renamed options:
--no-piece to --no-submodule
--piece=piece to --module=module
Change-Id: Ic4f1e3f4bdbe4f4fc175fea82e670310753ce130
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 81aa700..910d4ad 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -7,8 +7,13 @@ use strict;
use LWP::UserAgent;
use utf8;
-my $main_repo=core;
-my @pieces=(dictionaries, help, translations);
+my %module_dirname = (
+core = ,
+dictionaries = dictionaries,
+help = helpcontent2,
+translations = translations
+);
+
my %bugzillas = (
fdo = https://bugs.freedesktop.org/show_bug.cgi?id=;,
@@ -20,7 +25,7 @@ my %bugzillas = (
sub search_bugs()
{
-my ($pdata, $piece, $commit_id, $line) = @_;
+my ($pdata, $module, $commit_id, $line) = @_;
my $bug = ;
my $bug_orig;
@@ -61,8 +66,8 @@ sub search_bugs()
# someone mistyped fdo as fd0
$bug =~ s/^fd0\#/fdo#/;
# save the bug number
-%{$pdata-{$piece}{$commit_id}{'bugs'}} = () if (! defined
%{$pdata-{$piece}{$commit_id}{'bugs'}});
-$pdata-{$piece}{$commit_id}{'bugs'}{$bug} = 1;
+%{$pdata-{$module}{$commit_id}{'bugs'}} = () if (! defined
%{$pdata-{$module}{$commit_id}{'bugs'}});
+$pdata-{$module}{$commit_id}{'bugs'}{$bug} = 1;
}
return $line;
@@ -89,23 +94,24 @@ sub standardize_summary($)
sub load_git_log($)
{
-my ($pdata, $repo_dir, $piece, $branch_name, $git_command) = @_;
+my ($pdata, $repo_dir, $module, $branch_name, $git_command) = @_;
my $cmd = cd $repo_dir; $git_command;
my $commit_id;
my $summary;
-print STDERR Analyzing log from the git repo: $piece...\n;
+print STDERR Analyzing log from the git repo: $module...\n;
-my $repo_branch_name = get_branch_name($repo_dir);
-if ( $branch_name ne $repo_branch_name ) {
-die Error: mismatch of branches:\n .
- main repo is on the branch: $branch_name\n .
- $piece repo is on the branch: $repo_branch_name\n;
-}
+# FIXME: ./g pull move submodules in unnamed branches
+#my $repo_branch_name = get_branch_name($repo_dir);
+#if ( $branch_name ne $repo_branch_name ) {
+#die Error: mismatch of branches:\n .
+# main repo is on the branch: $branch_name\n .
+# $module repo is on the branch: $repo_branch_name\n;
+#}
open (GIT, $cmd 21|) || die Can't run $cmd: $!;
-%{$pdata-{$piece}} = ();
+%{$pdata-{$module}} = ();
while (my $line = GIT) {
chomp $line;
@@ -113,7 +119,7 @@ sub load_git_log($)
if ( $line =~ m/^commit ([0-9a-z]{20})/ ) {
$commit_id = $1;
$summary=undef;
-%{$pdata-{$piece}{$commit_id}} = ();
+%{$pdata-{$module}{$commit_id}} = ();
next;
}
@@ -121,10 +127,10 @@ sub load_git_log($)
# get rid of extra empty spaces;
my $name = $1;
$name =~ s/\s+$//;
-die Error: Author already defined for the commit {$commit_id}\n
if defined ($pdata-{$piece}{$commit_id}{'author'});
-%{$pdata-{$piece}{$commit_id}{'author'}} = ();
-$pdata-{$piece}{$commit_id}{'author'}{'name'} = $name;
-$pdata-{$piece}{$commit_id}{'author'}{'email'} = $2;
+die Error: Author already defined for the commit {$commit_id}\n
if defined ($pdata-{$module}{$commit_id}{'author'});
+%{$pdata-{$module}{$commit_id}{'author'}} = ();
+$pdata-{$module}{$commit_id}{'author'}{'name'} = $name;
+$pdata-{$module}{$commit_id}{'author'}{'email'} = $2;
next;
}
@@ -138,13 +144,13 @@ sub load_git_log($)
next;
}
-$line = search_bugs($pdata, $piece, $commit_id, $line);
+$line = search_bugs($pdata, $module, $commit_id, $line);
# FIXME: need to be implemented
#search_keywords($pdata, $line);
-unless (defined $pdata-{$piece}{$commit_id}{'summary'}) {
+unless (defined $pdata-{$module}{$commit_id}{'summary'}) {
$summary = standardize_summary($line);
-$pdata-{$piece}{$commit_id}{'summary'} = $summary;
+$pdata-{$module}{$commit_id}{'summary'} = $summary;
}
}
@@ -172,21 +178,10 @@ sub get_repo_name($)
sub load_data($)
{
-my ($pdata, $top_dir, $piece, $branch_name, $git_command) = @_;
+my ($pdata, $top_dir, $p_module_dirname, $branch_name, $git_command) = @_;
-if (defined $piece) {
-my
[Libreoffice-commits] .: sc/source
sc/source/core/tool/addincol.cxx |8
sc/source/core/tool/cellkeytranslator.cxx |2 +-
sc/source/filter/xml/xmlimprt.cxx |2 +-
sc/source/ui/dbgui/tpsort.cxx |8
sc/source/ui/docshell/impex.cxx |6 +++---
sc/source/ui/unoobj/convuno.cxx |6 +++---
sc/source/ui/unoobj/defltuno.cxx |4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 36e2f00bca174342ba1391e49c56c4602ec97394
Author: Eike Rathke er...@redhat.com
Date: Mon Nov 19 17:49:18 2012 +0100
use LanguageTag
Change-Id: I93bc72d3938775b4e7c599b0477a76ed0ce5d4ac
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 4ca1cff..d7a19cd 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -27,7 +27,7 @@
/
#include comphelper/processfactory.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include vcl/svapp.hxx
#include sfx2/objsh.hxx
#include unotools/charclass.hxx
@@ -185,7 +185,7 @@ sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType
eDestLang, ::rtl::OUStri
long i;
rtl::OUString aLangStr, aCountryStr;
-MsLangId::convertLanguageToIsoNames( eDestLang, aLangStr, aCountryStr
);
+LanguageTag( eDestLang ).getIsoLanguageCountry( aLangStr, aCountryStr
);
rtl::OUString aUserLang = aLangStr.toAsciiLowerCase();
rtl::OUString aUserCountry = aCountryStr.toAsciiUpperCase();
@@ -792,7 +792,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const
uno::Referenceuno::XInterface
// AddIns must use the language for which the office is installed
LanguageType eOfficeLang = Application::GetSettings().GetUILanguage();
-lang::Locale aLocale( MsLangId::convertLanguageToLocale( eOfficeLang
));
+lang::Locale aLocale( LanguageTag( eOfficeLang ).getLocale());
xAddIn-setLocale( aLocale );
::rtl::OUString aServiceName( xName-getServiceName() );
@@ -1047,7 +1047,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const
uno::Referenceuno::XInterface
if ( xLoc.is() )// optional in new add-ins
{
LanguageType eOfficeLang = Application::GetSettings().GetUILanguage();
-lang::Locale aLocale( MsLangId::convertLanguageToLocale( eOfficeLang
));
+lang::Locale aLocale( LanguageTag( eOfficeLang ).getLocale());
xLoc-setLocale( aLocale );
}
diff --git a/sc/source/core/tool/cellkeytranslator.cxx
b/sc/source/core/tool/cellkeytranslator.cxx
index 1a654b5..fd74e96 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -165,7 +165,7 @@ void ScCellKeywordTranslator::transKeyword(String rName,
const Locale* pLocale,
if ( !spInstance.get() )
spInstance.reset( new ScCellKeywordTranslator );
-LanguageType eLang = pLocale ?
MsLangId::convertLocaleToLanguageWithFallback(*pLocale) : LANGUAGE_SYSTEM;
+LanguageType eLang = pLocale ?
LanguageTag(*pLocale).makeFallback().getLanguageType() : LANGUAGE_SYSTEM;
Sequencesal_Int32 aOffsets;
rName = spInstance-maTransWrapper.transliterate(rName, eLang, 0,
rName.Len(), aOffsets);
lclMatchKeyword(rName, spInstance-maStringNameMap, eOpCode, pLocale);
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 14d1022..b16dba4 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2301,7 +2301,7 @@ void ScXMLImport::ExamineDefaultStyle()
else
{
LocaleDataWrapper aLocaleData(
comphelper::getComponentContext(pDoc-GetServiceManager()),
-MsLangId::convertLanguageToLocale( nFormatLang ) );
+LanguageTag( nFormatLang ).getLocale() );
aDecSep = aLocaleData.getNumDecimalSep();
}
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 0955b8a..6c075bb 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -30,7 +30,7 @@
#undef SC_DLLIMPLEMENTATION
#include vcl/msgbox.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include svtools/collatorres.hxx
#include unotools/collatorwrapper.hxx
#include unotools/localedatawrapper.hxx
@@ -682,7 +682,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet /*
rArgSet */ )
aBtnHeader.SetText( aStrRowLabel );
}
-LanguageType eLang = MsLangId::convertLocaleToLanguage(
aSortData.aCollatorLocale );
+LanguageType eLang = LanguageTag( aSortData.aCollatorLocale
).getLanguageType( false);
if ( eLang == LANGUAGE_DONTKNOW )
eLang = LANGUAGE_SYSTEM;
aLbLanguage.SelectLanguage( eLang );
@@ -749,7 +749,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet(
[Libreoffice-commits] .: bin/lo-pack-sources
bin/lo-pack-sources | 133 ++--
1 file changed, 68 insertions(+), 65 deletions(-)
New commits:
commit 39afe720fe2c0ccaa9a806d842de0cc1f34bc106
Author: Petr Mladek pmla...@suse.cz
Date: Mon Nov 19 18:13:02 2012 +0100
lo-pack-sources: use module instead of piece
we use git submodules, so it makes more sense (hopefully)
Replaced options:
--no-lo-pieces with --no-submodule
--piece=piece with --module=module
Removed hopefully unused option:
--no-lo-core
Change-Id: Icbf742991ccda2f7833a5b50d51cb1421885383d
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 1c452e8..5341af5 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -7,7 +7,7 @@ use strict;
use File::Copy;
use File::Temp qw/ tempfile tempdir /;
-my %piece_dirname = (
+my %module_dirname = (
core = ,
dictionaries = dictionaries,
help = helpcontent2,
@@ -94,48 +94,48 @@ sub remove_empty_submodules($)
{
my ($target_topdir) = @_;
-foreach my $submodule (sort values %piece_dirname) {
+foreach my $submodule (sort values %module_dirname) {
next unless ($submodule);
print Removing empty submodule: $submodule...\n;
rmdir $target_topdir/$submodule || die Error: Can't remove
submodule directory: $target_topdir/$submodule;
}
}
-# copy the piece lo source directory into a tmp directory
+# copy the source directory into a tmp directory
# omit the .git subdirectories
-sub copy_lo_piece_to_tempdir($$$)
+sub copy_lo_module_to_tempdir($$$)
{
-my ($source_dir, $piece, $lo_topdir_name) = @_;
+my ($source_dir, $module, $lo_topdir_name) = @_;
my $tempdir = tempdir( 'libreoffice-XX', DIR = File::Spec-tmpdir );
mkdir $tempdir/$lo_topdir_name || die Can't create directory
\$tempdir/$lo_topdir_name\: $!\n;
-mkdir $tempdir/$lo_topdir_name/$piece_dirname{$piece} || die Can't
create directory \$tempdir/$lo_topdir_name/$piece_dirname{$piece}\: $!\n if
($piece_dirname{$piece});
+mkdir $tempdir/$lo_topdir_name/$module_dirname{$module} || die Can't
create directory \$tempdir/$lo_topdir_name/$module_dirname{$module}\: $!\n
if ($module_dirname{$module});
-copy_dir_filter_and_show_progress($source_dir/$piece_dirname{$piece},
$tempdir/$lo_topdir_name/$piece_dirname{$piece});
-remove_empty_submodules($tempdir/$lo_topdir_name/) if ($piece eq core);
+copy_dir_filter_and_show_progress($source_dir/$module_dirname{$module},
$tempdir/$lo_topdir_name/$module_dirname{$module});
+remove_empty_submodules($tempdir/$lo_topdir_name/) if ($module eq
core);
return $tempdir;
}
-sub generate_lo_piece_changelog($$$)
+sub generate_lo_module_changelog($$$)
{
-my ($source_dir, $lo_piece_release_topdir, $piece) = @_;
+my ($source_dir, $lo_module_release_topdir, $module) = @_;
my $log_name = ChangeLog;
-$log_name .= -$piece_dirname{$piece} if ($piece_dirname{$piece});
-print Generating changelog for $piece...\n;
-#print 1:$lo_piece_clone, 2:$lo_piece_release_dir, 3:$piece\n;
-system (cd $source_dir/$piece_dirname{$piece} .
+$log_name .= -$module_dirname{$module} if ($module_dirname{$module});
+print Generating changelog for $module...\n;
+#print 1:$lo_module_clone, 2:$lo_module_release_dir, 3:$module\n;
+system (cd $source_dir/$module_dirname{$module} .
git log --date=short --pretty='format:@%cd %an %ae
[%H]%n%n%s%n%n%e%b' | .
- sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||'
$lo_piece_release_topdir/$log_name )
+ sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||'
$lo_module_release_topdir/$log_name )
die Error: generating failed: $!\n;
}
sub run_autoreconf($$)
{
-my ($dir, $piece) = @_;
+my ($dir, $module) = @_;
-print Running autoreconf for $piece...\n;
+print Running autoreconf for $module...\n;
system (cd $dir .
autoreconf -f -i .
rm -rf autom4te.cache .
@@ -251,28 +251,28 @@ sub check_if_file_exists($$)
sub check_if_already_released($$)
{
-my ($p_piece_tarball_name, $force, $bzip2, $xz, $pack_lo_core,
$pack_lo_pieces) = @_;
+my ($p_module_tarball_name, $force, $bzip2, $xz, $pack_lo_core,
$pack_lo_modules) = @_;
-foreach my $tarball_name ( sort values %{$p_piece_tarball_name} ) {
+foreach my $tarball_name ( sort values %{$p_module_tarball_name} ) {
check_if_file_exists($tarball_name.tar.bz2, $force) if (defined
$bzip2);
check_if_file_exists($tarball_name.tar.xz, $force) if (defined $xz);
}
}
-sub prepare_piece_sources()
+sub prepare_module_sources()
{
-my ($source_dir, $release_version, $piece, $lo_topdir_name) = @_;
+my ($source_dir, $release_version, $module, $lo_topdir_name) = @_;
# prepare sources
-my $temp_dir = copy_lo_piece_to_tempdir($source_dir, $piece,
[Libreoffice-commits] .: 2 commits - oox/inc oox/source
oox/inc/oox/export/drawingml.hxx |5 -
oox/inc/oox/export/shapes.hxx|3
oox/source/export/drawingml.cxx | 55 +++--
oox/source/export/shapes.cxx | 162 +--
4 files changed, 177 insertions(+), 48 deletions(-)
New commits:
commit f3221085e3b84e0c84c1adca3d76ab4c293678ee
Author: Radek Doulik r...@novell.com
Date: Mon Nov 19 18:20:24 2012 +0100
export embedded spreadsheet(s), fixes n#780830
Change-Id: Iee8328a695b554d97f6805b64b98706b9e3d7ab9
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index 5da2d6a..37d579b 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -81,6 +81,9 @@ protected:
rtl::OUString WriteImage( const rtl::OUString rURL );
+const char* GetComponentDir();
+const char* GetRelationCompPrefix();
+
public:
DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase*
pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX ) : meDocumentType(
eDocumentType ), mpFS( pFS ), mpFB( pFB ) {}
void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; }
@@ -104,7 +107,7 @@ public:
void WriteStretch();
void WriteLinespacing( ::com::sun::star::style::LineSpacing rLineSpacing
);
-::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet, ::rtl::OUString rURL );
+::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet, ::rtl::OUString rURL,
Graphic *pGraphic=NULL );
void WriteBlipMode( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet );
void WriteShapeTransformation( ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape rXShape,
diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx
index b75db63..5f83326 100644
--- a/oox/inc/oox/export/shapes.hxx
+++ b/oox/inc/oox/export/shapes.hxx
@@ -42,6 +42,7 @@ namespace oox { namespace drawingml {
class OOX_DLLPUBLIC ShapeExport : public DrawingML {
private:
+static int mnSpreadsheetCounter;
struct ShapeCheck
{
bool operator()( const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape s1, const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape s2 ) const
@@ -61,6 +62,8 @@ public:
protected:
sal_Int32 mnShapeIdMax, mnPictureIdMax;
+void WriteGraphicObjectShapePart( ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape xShape, Graphic *pGraphic=NULL );
+
private:
sal_Int32 mnXmlNamespace;
FractionmaFraction;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 11c5c0d..efbb1de 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -421,6 +421,30 @@ OUString DrawingML::WriteImage( const OUString rURL )
return OUString();
}
+const char* DrawingML::GetComponentDir()
+{
+switch ( meDocumentType )
+{
+case DOCUMENT_DOCX: return word;
+case DOCUMENT_PPTX: return ppt;
+case DOCUMENT_XLSX: return xl;
+}
+
+return unknown;
+}
+
+const char* DrawingML::GetRelationCompPrefix()
+{
+switch ( meDocumentType )
+{
+case DOCUMENT_DOCX: return ;
+case DOCUMENT_PPTX:
+case DOCUMENT_XLSX: return ../;
+}
+
+return unknown;
+}
+
OUString DrawingML::WriteImage( const Graphic rGraphic )
{
GfxLink aLink = rGraphic.GetLink ();
@@ -482,16 +506,8 @@ OUString DrawingML::WriteImage( const Graphic rGraphic )
}
}
-const char *pComponent = ;
-switch ( meDocumentType )
-{
-case DOCUMENT_DOCX: pComponent = word; break;
-case DOCUMENT_PPTX: pComponent = ppt; break;
-case DOCUMENT_XLSX: pComponent = xl; break;
-}
-
Reference XOutputStream xOutStream = mpFB-openFragmentStream(
OUStringBuffer()
-
.appendAscii( pComponent )
+
.appendAscii( GetComponentDir() )
.appendAscii( /media/image )
.append(
(sal_Int32) mnImageCounter )
.appendAscii( pExtension )
@@ -500,22 +516,11 @@ OUString DrawingML::WriteImage( const Graphic rGraphic )
xOutStream-writeBytes( Sequence sal_Int8 ( (const sal_Int8*) aData,
nDataSize ) );
xOutStream-closeOutput();
-const char *pImagePrefix = ;
-switch ( meDocumentType )
-{
-case DOCUMENT_DOCX:
-pImagePrefix = media/image;
-break;
-case DOCUMENT_PPTX:
-case DOCUMENT_XLSX:
-pImagePrefix = ../media/image;
-
[Libreoffice-commits] .: sd/source
sd/source/core/drawdoc.cxx |3 ++- sd/source/filter/eppt/epptso.cxx |4 ++-- sd/source/ui/unoidl/unopool.cxx |4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) New commits: commit fe985aaa8ef3931bef5507806e8f3b795a107487 Author: Eike Rathke er...@redhat.com Date: Mon Nov 19 18:26:43 2012 +0100 use LanguageTag Change-Id: I4c55e30ec64f4e4d0217f226bc99ff693d054093 diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index efe0adb..6b5603c 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -65,6 +65,7 @@ #include unotools/saveopt.hxx #include comphelper/extract.hxx #include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include unotools/charclass.hxx #include comphelper/processfactory.hxx #include unotools/pathoptions.hxx @@ -231,7 +232,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) } LanguageType eRealLanguage = MsLangId::getRealLanguage( meLanguage ); -mpLocale = new ::com::sun::star::lang::Locale( MsLangId::convertLanguageToLocale( eRealLanguage )); +mpLocale = new ::com::sun::star::lang::Locale( LanguageTag( eRealLanguage ).getLocale()); mpCharClass = new CharClass( *mpLocale ); // If the current application language is a language that uses right-to-left text... diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index d4632c6..67a444f 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -85,7 +85,7 @@ #include com/sun/star/table/BorderLine.hpp #include set #include oox/ole/olehelper.hxx -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx using namespace ::com::sun::star; @@ -3862,7 +3862,7 @@ void TextObjBinary::WriteTextSpecInfo( SvStream* pStrm ) *pStrm static_cast sal_uInt32 ( nPortionSize ) nFlags static_cast sal_Int16 ( 1 )// spellinfo - needs rechecking - static_cast sal_Int16 ( MsLangId::convertLocaleToLanguageWithFallback( pPortion-meCharLocale ) ) + static_cast sal_Int16 ( LanguageTag( pPortion-meCharLocale ).makeFallback().getLanguageType() ) static_cast sal_Int16 ( 0 ); // alt language } } diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index 907fd31..c441a4d 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include comphelper/propertysetinfo.hxx #include editeng/eeitem.hxx #include svx/unopool.hxx @@ -35,7 +35,7 @@ LanguageType SdUnoGetLanguage( const lang::Locale rLocale ) if ( rLocale.Language.getLength() == 0 ) return LANGUAGE_SYSTEM; -LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale ); +LanguageType eRet = LanguageTag( rLocale ).getLanguageType( false); if ( eRet == LANGUAGE_NONE ) eRet = LANGUAGE_SYSTEM; //! or throw an exception? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/Executable_cfgex.mk l10ntools/Executable_helpex.mk l10ntools/Executable_localize.mk l10ntools/Executable_propex.mk l10ntools/Executable_re
l10ntools/Executable_cfgex.mk|6 ++- l10ntools/Executable_helpex.mk |3 + l10ntools/Executable_localize.mk |6 ++- l10ntools/Executable_propex.mk |6 ++- l10ntools/Executable_renewpo.mk |6 ++- l10ntools/Executable_transex3.mk |6 ++- l10ntools/Executable_treex.mk|3 + l10ntools/Executable_uiex.mk |3 + l10ntools/Executable_ulfex.mk|6 ++- l10ntools/Executable_xrmex.mk|3 + l10ntools/prj/build.lst |2 - l10ntools/source/po.cxx | 77 +-- 12 files changed, 65 insertions(+), 62 deletions(-) New commits: commit 7429ab2e2caa49466a455ad3e2e04057524225d0 Author: Zolnai Tamás zolnaitamas20...@gmail.com Date: Mon Nov 19 18:19:52 2012 +0100 Use icu regex in l10ntools instead of i18nregexp Change-Id: I9062aafa2fefa26b7b1edf0440f4675b2f469e5d diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk index 7804470..60b3166 100644 --- a/l10ntools/Executable_cfgex.mk +++ b/l10ntools/Executable_cfgex.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,cfgex,\ $(eval $(call gb_Executable_use_libraries,cfgex,\ sal \ -i18nregexp \ )) $(eval $(call gb_Executable_use_unpacked,cfgex,boost)) @@ -50,4 +49,9 @@ $(eval $(call gb_Executable_add_exception_objects,cfgex,\ l10ntools/source/cfgmerge \ )) +$(eval $(call gb_Executable_use_externals,cfgex,\ +icuuc \ +$(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk index b7e6310..cd2469d 100644 --- a/l10ntools/Executable_helpex.mk +++ b/l10ntools/Executable_helpex.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,helpex,\ $(eval $(call gb_Executable_use_libraries,helpex,\ sal \ -i18nregexp \ )) $(eval $(call gb_Executable_use_external,helpex,expat_utf8)) @@ -51,6 +50,8 @@ $(eval $(call gb_Executable_add_exception_objects,helpex,\ $(eval $(call gb_Executable_use_externals,helpex,\ libxml2 \ +icuuc \ +$(if $(filter MSC,$(COM)),icuin,icui18n) \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk index e6e7f1f..a810b6c 100644 --- a/l10ntools/Executable_localize.mk +++ b/l10ntools/Executable_localize.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,localize,\ $(eval $(call gb_Executable_use_libraries,localize,\ sal \ -i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,localize,\ @@ -44,4 +43,9 @@ $(eval $(call gb_Executable_add_exception_objects,localize,\ l10ntools/source/localize \ )) +$(eval $(call gb_Executable_use_externals,localize,\ +icuuc \ +$(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_propex.mk b/l10ntools/Executable_propex.mk index d8dc16d..06080c6 100644 --- a/l10ntools/Executable_propex.mk +++ b/l10ntools/Executable_propex.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Executable_set_include,propex,\ $(eval $(call gb_Executable_use_libraries,propex,\ sal \ -i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,propex,\ @@ -29,4 +28,9 @@ $(eval $(call gb_Executable_add_exception_objects,propex,\ l10ntools/source/propex \ )) +$(eval $(call gb_Executable_use_externals,propex,\ +icuuc \ +$(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk index 5aa036a..db84a41 100644 --- a/l10ntools/Executable_renewpo.mk +++ b/l10ntools/Executable_renewpo.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Executable_set_include,renewpo,\ $(eval $(call gb_Executable_use_libraries,renewpo,\ sal \ -i18nregexp \ )) $(eval $(call gb_Executable_use_static_libraries,renewpo,\ @@ -29,4 +28,9 @@ $(eval $(call gb_Executable_add_exception_objects,renewpo,\ l10ntools/source/renewpo \ )) +$(eval $(call gb_Executable_use_externals,renewpo,\ +icuuc \ +$(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk index 2d95906..d2b7952 100644 --- a/l10ntools/Executable_transex3.mk +++ b/l10ntools/Executable_transex3.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Executable_set_include,transex3,\ $(eval $(call gb_Executable_use_libraries,transex3,\ sal \ -i18nregexp \ )) $(eval $(call gb_Executable_add_scanners,transex3,\ @@ -50,4 +49,9 @@ $(eval $(call gb_Executable_add_exception_objects,transex3,\ l10ntools/source/export \ )) +$(eval $(call gb_Executable_use_externals,transex3,\ +icuuc \ +$(if $(filter MSC,$(COM)),icuin,icui18n) \ +)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_treex.mk
master: LibreOffice logo is black in About dialog ?
Hi, Is there something wrong in my build (Ubuntu 12.04 x86_64) or is it expected that the LibreOffice logo is black in the About dialog ? Best regards JBF -- View this message in context: http://nabble.documentfoundation.org/master-LibreOffice-logo-is-black-in-About-dialog-tp4019555.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: master: LibreOffice logo is black in About dialog ?
On 19/11/12 19:04, Jean-Baptiste Faure wrote: Hi, Is there something wrong in my build (Ubuntu 12.04 x86_64) or is it expected that the LibreOffice logo is black in the About dialog ? hmm... i don't seem to have any graphics at all in the about dialog on master, there used to be some logo or something? perhaps that broke with the recent import of SVG code from Apache? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/source
desktop/source/app/app.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 01e9e5672fe808a7e8a8a772e0660bd40f915645 Author: Tor Lillqvist t...@iki.fi Date: Mon Nov 19 20:10:19 2012 +0200 Xcode says 'hash_set' file not found, and it seems unnecessary? Change-Id: I95ee1f5c04571c692e8e7ef7faa75fcae76eef93 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 35ff47a..bc6667b 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -99,7 +99,6 @@ #include com/sun/star/deployment/XExtensionManager.hpp #include com/sun/star/task/XInteractionApprove.hpp #include cppuhelper/compbase3.hxx -#include hash_set #ifdef ENABLE_TELEPATHY #include tubes/manager.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build environment for official win32 builds
On 16/11/12 20:30, Enrico Weigelt wrote: The real question is - what is the deliverable here ? building on windows under cygwin is -horribly- slow - if we can use the same compiler to cross-compile from Linux (as we can) and build around 50x faster - why would we want to do work maintenance to keep that going ? :-) Oh! Do you know where that slowdown is coming from ? evidently local file system (NTFS) is rather slow, and process creation is very slow (which is important for any make-based build system). but the slowness of building locally on Windows is nothing compared to the glacial pace at which a Windows build proceeds over network file systems like SMB; fortunately nobody has been doing that for years... Hopefully (when fully finished) the move to gnumake will at least strip out one layer of (dmake) grief that makes such things more painful than they really need to be. Does this also mean kicking out autotools ? LO doesn't use autotools, only autoconf. but of course many bundled external libraries use full autotools. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
hash_set, hash_map after rebase
Those files are from stlport that we got rid off almost 2 years ago. If you find them included, just bin them. It should be boost::unordered_* containers that replace them. Ping me on irc if there is some problem with this stuff. I still remember what was the difference of behaviour between hash_* and unordered_* alternatives. F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On 15/11/12 12:16, Enrico Weigelt wrote: On Thu, 2012-11-15 at 01:47 -0800, Olivier R. wrote: Michael Meeks-2 wrote + upgrade bundled python to 3.0 3.0 ? I assume there is a typo here. Yes - certainly a typo :-) We'll go for the best 3.x based python we By the way: will pyton-3.2/3.3 be an requirement or will 2.x still work ? i don't think we want to support shipping a bundled Python 2. but for system python, we probably should support Python 2 for a couple more releases; it's already possible to override the default by setting PYTHON/PYTHON_CFLAGS/PYTHON_LIBS vars. the pyuno bridge can be built to run with both Python 2 and 3, but that is a compile time setting. the important question is of course if we can get all the Python code we ship converted so it runs on both Python 2 and 3. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build environment for official win32 builds
evidently local file system (NTFS) is rather slow, and process creation is very slow (which is important for any make-based build system). This when seen through the Cygwin POSIX emulation layer, presumably? And when using a build mechanism that has been developed on Unix systems in general and lately Linux in particular. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac
configure.ac |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 96682a78cfe076714616a880f214248b4498ebf3 Author: Tor Lillqvist tlillqv...@suse.com Date: Sun Nov 18 11:18:18 2012 +0200 Fix misleading comment Change-Id: I70155825cb591b9ef60d82d81e2a51e9e25b96e4 diff --git a/configure.ac b/configure.ac index 101ea03..18d4277 100644 --- a/configure.ac +++ b/configure.ac @@ -568,8 +568,9 @@ AC_ARG_ENABLE(scripting, [Disable BASIC, Java and Python. Work in progress, use only if you are hacking on it.]) ) -# This is mainly for iOS, but could potentially be used in some +# This is mainly for Android and iOS, but could potentially be used in some # special case otherwise, too, so factored out as a separate setting + AC_ARG_ENABLE(dynamic-loading, AS_HELP_STRING([--disable-dynamic-loading], [Disable any use of dynamic loading of code. Work in progress, use only if you are hacking on it.]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: master: LibreOffice logo is black in About dialog ?
Hi, Michael Stahl-2 wrote On 19/11/12 19:04, Jean-Baptiste Faure wrote: Hi, Is there something wrong in my build (Ubuntu 12.04 x86_64) or is it expected that the LibreOffice logo is black in the About dialog ? hmm... i don't seem to have any graphics at all in the about dialog on master, there used to be some logo or something? perhaps that broke with the recent import of SVG code from Apache? I found this bug report : https://bugs.freedesktop.org/show_bug.cgi?id=56402 Best regards. JBF -- View this message in context: http://nabble.documentfoundation.org/master-LibreOffice-logo-is-black-in-About-dialog-tp4019555p4019581.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - basic/source oox/source sfx2/source svl/inc svl/source svx/source tools/inc tools/source
basic/source/sbx/sbxvalue.cxx|6 +++---
oox/source/export/drawingml.cxx |2 +-
sfx2/source/control/bindings.cxx |2 +-
sfx2/source/control/dispatch.cxx |4 ++--
sfx2/source/control/shell.cxx|2 +-
svl/inc/svl/itemset.hxx |2 +-
svl/source/items/itempool.cxx|4 ++--
svl/source/items/rngitem_inc.cxx |2 +-
svx/source/tbxctrls/tbcontrl.cxx |2 +-
tools/inc/tools/solar.h |6 --
tools/source/fsys/dirent.cxx |2 +-
tools/source/fsys/wntmsc.cxx |2 +-
12 files changed, 15 insertions(+), 21 deletions(-)
New commits:
commit 160cfb5e5e4ab6c9e6062c74ba6ed1c610a4981a
Author: Tor Lillqvist t...@iki.fi
Date: Mon Nov 19 21:14:55 2012 +0200
Bin the HACK() sillyness
Change-Id: Ieeebc4098404fa006d66bb8b656172a4348b1dc1
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 1bd875b..b14735c 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -187,7 +187,7 @@ void SbxValue::Clear()
{
if( aData.pObj != this )
{
-HACK(nicht bei Parent-Prop - sonst CyclicRef)
+SAL_WARN(basic.sbx, nicht bei Parent-Prop - sonst
CyclicRef);
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
sal_Bool bParentProp = pThisVar 5345 ==
( (sal_Int16) ( pThisVar-GetUserData() 0x ) );
@@ -538,7 +538,7 @@ sal_Bool SbxValue::Put( const SbxValues rVal )
{
OSL_FAIL( TheRealValue );
}
-HACK(nicht bei Parent-Prop - sonst CyclicRef)
+SAL_WARN(basic.sbx, nicht bei Parent-Prop -
sonst CyclicRef);
SbxVariable *pThisVar = PTR_CAST(SbxVariable,
this);
sal_Bool bParentProp = pThisVar 5345 ==
( (sal_Int16) ( pThisVar-GetUserData()
0x ) );
@@ -802,7 +802,7 @@ sal_Bool SbxValue::SetType( SbxDataType t )
case SbxOBJECT:
if( aData.pObj aData.pObj != this )
{
-HACK(nicht bei Parent-Prop - sonst CyclicRef)
+SAL_WARN(basic.sbx, nicht bei Parent-Prop - sonst
CyclicRef);
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
sal_uInt16 nSlotId = pThisVar
? ( (sal_Int16) ( pThisVar-GetUserData()
0x ) )
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 963c169..09d7c5f 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1534,7 +1534,7 @@ void SfxBindings::UpdateControllers_Impl
{
pEnumCache-Invalidate(sal_False);
-HACK(CONTROL/SELECT Kram)
+// HACK(CONTROL/SELECT Kram) ???
if ( eState == SFX_ITEM_DONTCARE pFound-nWhichId == 10144 )
{
SfxVoidItem aVoid(0);
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 935077c..975b834 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1220,7 +1220,7 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*,
pReq )
{
Flush();
SfxSlotServer aSvr;
-if ( _FindServer(pReq-GetSlot(), aSvr, HACK(x) sal_True ) )
+if ( _FindServer(pReq-GetSlot(), aSvr, sal_True ) ) // HACK(x),
whatever that was supposed to mean
{
const SfxSlot *pSlot = aSvr.GetSlot();
SfxShell *pSh = GetShell(aSvr.GetShellLevel());
@@ -1676,7 +1676,7 @@ void SfxDispatcher::FlushImpl()
//
void SfxDispatcher::SetSlotFilter
(
-HACK(hier muss mal ein enum rein)
+// HACK(hier muss mal ein enum rein) ???
sal_Bool bEnable, /* sal_True:
only enable specified slots,
disable all other
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index fe034f0..db940f0 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1002,7 +1002,7 @@ void SfxShell::SetVerbs(const
com::sun::star::uno::Sequence com::sun::star::em
pNewSlot-nValue = 0;
pNewSlot-fnExec = SFX_STUB_PTR(SfxShell,VerbExec);
pNewSlot-fnState = SFX_STUB_PTR(SfxShell,VerbState);
-pNewSlot-pType = 0; HACK(SFX_TYPE(SfxVoidItem))
+pNewSlot-pType = 0; // HACK(SFX_TYPE(SfxVoidItem)) ???
pNewSlot-pName = U2S(aVerbs[n].VerbName).getStr();
pNewSlot-pLinkedSlot = 0;
pNewSlot-nArgDefCount = 0;
diff --git a/svl/inc/svl/itemset.hxx
Re: master: LibreOffice logo is black in About dialog ?
On Mon, 2012-11-19 at 19:09 +0100, Michael Stahl wrote: hmm... i don't seem to have any graphics at all in the about dialog on master, there used to be some logo or something? Yes - that's right; sorry pardon - I broke it :-) perhaps that broke with the recent import of SVG code from Apache? Correct; it needs adapting to the new svg import code, which works in a different way; there are a few places like this that need some fixup. Help with nailing that particular one much appreciated. 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: GTK theming: oxygen-gtk support broken
Hi Ivan, OK, it appears that these commits have made LibO work more correctly in GTK handling, and now oxygen-gtk's old hacks to work around previous LibO incorrectness overcompensate the margins and need to be removed. To get this all work more or less as expected (i.e. to fix oxygen-gtk at correct time), I'd need to know, which LibO releases will contain these commits. Any pointers to this? Thanks, Ruslan On Fri, Nov 2, 2012 at 1:26 PM, Ivan Timofeev timofeev@gmail.com wrote: Hi Ruslan, On 01.11.2012 23:48, Ruslan Kabatsayev wrote: Some time after my commits, which enabled almost fully correct oxygen-gtk support (latest commit was on Jul 8 2012), this support was broken. See screenshots at [1], [2], [3] and [4] for details. The problem at [1] is due to the following commits https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=50a20f94 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=681e894b which take logic from _gtk_entry_get_borders http://git.gnome.org/browse/gtk+/tree/gtk/gtkentry.c?h=gtk-2-24#n2874 I have no idea of what is wrong with those commits. Regards, Ivan [1] Edit field and combo button sizes mismatch: http://i.imgur.com/lnvfS.png [2] Background gradient not rendered: http://i.imgur.com/lRPLY.png [3] Text line entry clips text to the left too much http://i.imgur.com/sV10D.png [4] Menu expansion arrows are clipped at top: http://i.imgur.com/Gn67Z.png ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svl/source
svl/source/numbers/zformat.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9b24ce6da284505aed2bbaf4ad2790c161fbc232
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 15:57:22 2012 +0100
use LanguageTag
Change-Id: I28aff5533ec6cc31a3d6f3de3198452bd716ba62
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 52ae19c..8a171ea 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -5206,7 +5206,7 @@ String SvNumberformat::ImpGetNatNumString( const
SvNumberNatNum rNum,
OUString SvNumberformat::impTransliterateImpl(const OUString rStr,
const SvNumberNatNum rNum )
const
{
-com::sun::star::lang::Locale aLocale( MsLangId::convertLanguageToLocale(
rNum.GetLang() ) );
+com::sun::star::lang::Locale aLocale( LanguageTag( rNum.GetLang()
).getLocale() );
return GetFormatter().GetNatNum()-getNativeNumberString( rStr,
aLocale,
rNum.GetNatNum() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] Better handling of well-know prerequisites under windows
Le Mon, 19 Nov 2012 10:29:53 +0100, Andras Timar (via Code Review) ger...@gerrit.libreoffice.org a écrit: Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1100 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1100 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I335c25904c16db534a4878ff6a17db202eaef4f5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr Gerrit-Reviewer: Andras Timar ati...@suse.com Hello As it is a fix for fdo#42974 that was an easy hack shown on head page [1], should I clean it also ? [1] : http://wiki.documentfoundation.org/Development/Easy_Hacks Regards -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Better handling of well-know prerequisites under windows
On Mon, Nov 19, 2012 at 9:02 PM, Mat M m...@gmx.fr wrote: As it is a fix for fdo#42974 that was an easy hack shown on head page [1], should I clean it also ? [1] : http://wiki.documentfoundation.org/Development/Easy_Hacks It will disappear automatically. Cheers, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source
sc/source/filter/orcus/orcusfiltersimpl.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit d4035c5bc8435ebd1a41544cb78fc8d7eddfbe63
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Nov 19 15:47:10 2012 -0500
Get it to build after updating liborcus from latest master.
Change-Id: Ie9cace11bf869777ff0986d38e856e68ad8fdb57
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 2584770..3fa23e1 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -311,8 +311,9 @@ bool ScOrcusFiltersImpl::loadXMLStructure(
if (aStrm.empty())
return false;
-orcus::xmlns_repository aNsRepo; // xml namespace repository.
-orcus::xml_structure_tree aXmlTree(aNsRepo);
+orcus::xmlns_repository repo; // xml namespace repository.
+orcus::xmlns_context cxt = repo.create_context();
+orcus::xml_structure_tree aXmlTree(cxt);
try
{
aXmlTree.parse(aStrm[0], aStrm.size());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Mathias De Maré mathias.demare+libreoff...@gmail.com changed: What|Removed |Added Depends on||34555 --- Comment #32 from Mathias De Maré mathias.demare+libreoff...@gmail.com --- I added Bug 34555. I'm afraid it's also a bit of an enhancement, but a very much needed one. Cropping in LibreOffice Writer is pretty much impossible the way it's currently implemented, and someone actually showed this issue to me as the reason they don't use LibreOffice. -- 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] .: Branch 'feature/calc-xml-source' - sc/inc sc/Library_scfilt.mk sc/source
sc/Library_scfilt.mk|2
sc/inc/orcusfilters.hxx | 15 -
sc/source/filter/inc/orcusfiltersimpl.hxx | 19 +
sc/source/filter/inc/orcusinterface.hxx | 63
sc/source/filter/orcus/interface.cxx| 121 +
sc/source/filter/orcus/orcusfiltersimpl.cxx | 359
sc/source/filter/orcus/xmlcontext.cxx | 221 +
sc/source/ui/inc/xmlsourcedlg.hxx |3
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 14 -
9 files changed, 449 insertions(+), 368 deletions(-)
New commits:
commit 08f35a4c7df2cba0ad56e2ccc225ca65cd9550e3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Nov 19 16:45:55 2012 -0500
Separate the XML part of orcus filters into own class.
Along with other reorganization of the orcus interface code...
This XML context object will be used to store data specific to each
loaded XML file, such as XML stream, namespace repository and so on.
Change-Id: I21c43ab0026954c5d52f4985a169934f8fb9f704
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 7a5256e..8d3d22b 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -218,7 +218,9 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/oox/worksheetfragment \
sc/source/filter/oox/worksheethelper \
sc/source/filter/oox/worksheetsettings \
+sc/source/filter/orcus/interface \
sc/source/filter/orcus/orcusfiltersimpl \
+sc/source/filter/orcus/xmlcontext \
))
# vim: set noet sw=4 ts=4:
diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index 1b94f67..dd9778d 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -17,6 +17,7 @@ class SvTreeListBox;
class Image;
struct ScOrcusXMLTreeParam;
struct ScOrcusImportXMLParam;
+class ScOrcusXMLContext;
/**
* Collection of orcus filter wrappers.
@@ -28,11 +29,17 @@ public:
virtual bool importCSV(ScDocument rDoc, const rtl::OUString rPath) const
= 0;
-virtual bool loadXMLStructure(
- const rtl::OUString rPath, SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) const = 0;
+virtual ScOrcusXMLContext* createXMLContext(ScDocument rDoc, const
rtl::OUString rPath) const = 0;
+};
+
+class ScOrcusXMLContext
+{
+public:
+virtual ~ScOrcusXMLContext() {}
+
+virtual bool loadXMLStructure(SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) const = 0;
-virtual bool importXML(
-ScDocument rDoc, const rtl::OUString rPath, const
ScOrcusImportXMLParam rParam) const = 0;
+virtual bool importXML(const ScOrcusImportXMLParam rParam) const = 0;
};
#endif
diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx
b/sc/source/filter/inc/orcusfiltersimpl.hxx
index f2d2703..0b6ffa6 100644
--- a/sc/source/filter/inc/orcusfiltersimpl.hxx
+++ b/sc/source/filter/inc/orcusfiltersimpl.hxx
@@ -15,13 +15,24 @@
class ScOrcusFiltersImpl : public ScOrcusFilters
{
public:
+static rtl::OString toSystemPath(const rtl::OUString rPath);
+
virtual bool importCSV(ScDocument rDoc, const rtl::OUString rPath) const;
-virtual bool loadXMLStructure(
-const rtl::OUString rPath, SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) const;
+virtual ScOrcusXMLContext* createXMLContext(ScDocument rDoc, const
rtl::OUString rPath) const;
+};
+
+class ScOrcusXMLContextImpl : public ScOrcusXMLContext
+{
+ScDocument mrDoc;
+rtl::OUString maPath;
+public:
+ScOrcusXMLContextImpl(ScDocument rDoc, const rtl::OUString rPath);
+virtual ~ScOrcusXMLContextImpl();
+
+virtual bool loadXMLStructure(SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) const;
-virtual bool importXML(
-ScDocument rDoc, const rtl::OUString rPath, const
ScOrcusImportXMLParam rParam) const;
+virtual bool importXML(const ScOrcusImportXMLParam rParam) const;
};
#endif
diff --git a/sc/source/filter/inc/orcusinterface.hxx
b/sc/source/filter/inc/orcusinterface.hxx
new file mode 100644
index 000..e2c9c08
--- /dev/null
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef __SC_ORCUSINTERFACE_HXX__
+#define __SC_ORCUSINTERFACE_HXX__
+
+#include address.hxx
+
+#define __ORCUS_STATIC_LIB
+#include orcus/spreadsheet/import_interface.hpp
+
+#include boost/ptr_container/ptr_vector.hpp
+
+class ScDocument;
+class ScOrcusSheet;
+
+class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory
+{
+ScDocument mrDoc;
+boost::ptr_vectorScOrcusSheet maSheets;
+
+public:
+ScOrcusFactory(ScDocument rDoc);
+
+
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/inc
sc/inc/orcusfilters.hxx |9 + 1 file changed, 9 insertions(+) New commits: commit bb09627230584b6f4847f54ac431bfd4d328018b Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Nov 19 16:56:24 2012 -0500 Method description. Change-Id: I754ef846c3bc2d032a818dce6c223da89b3f8ccd diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx index dd9778d..ee8d3f8 100644 --- a/sc/inc/orcusfilters.hxx +++ b/sc/inc/orcusfilters.hxx @@ -29,6 +29,15 @@ public: virtual bool importCSV(ScDocument rDoc, const rtl::OUString rPath) const = 0; +/** + * Create a context for XML file. The context object stores session + * information for each unique XML file. You must create a new context + * for each XML file, and never to re-use the same context for multiple + * XML files. + * + * The caller is responsible for deleting the instance returned from this + * method when it's done. + */ virtual ScOrcusXMLContext* createXMLContext(ScDocument rDoc, const rtl::OUString rPath) const = 0; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/inc sc/source
sc/inc/orcusfilters.hxx |4 ++--
sc/source/filter/inc/orcusfiltersimpl.hxx |9 +++--
sc/source/filter/orcus/xmlcontext.cxx |7 +++
3 files changed, 12 insertions(+), 8 deletions(-)
New commits:
commit 552e40269b8a8c6b3621303f0aa9a71cf44583e3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Nov 19 17:14:43 2012 -0500
Store the xml namespace repository with the context.
We need persistent xml namespaces between loading the structure and
importing the content.
Change-Id: I4b56a7e952ab89b93ea2590c8f0d6b5cb141f039
diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index ee8d3f8..bcf8881 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -46,9 +46,9 @@ class ScOrcusXMLContext
public:
virtual ~ScOrcusXMLContext() {}
-virtual bool loadXMLStructure(SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) const = 0;
+virtual bool loadXMLStructure(SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) = 0;
-virtual bool importXML(const ScOrcusImportXMLParam rParam) const = 0;
+virtual bool importXML(const ScOrcusImportXMLParam rParam) = 0;
};
#endif
diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx
b/sc/source/filter/inc/orcusfiltersimpl.hxx
index 0b6ffa6..673da91 100644
--- a/sc/source/filter/inc/orcusfiltersimpl.hxx
+++ b/sc/source/filter/inc/orcusfiltersimpl.hxx
@@ -12,6 +12,8 @@
#include orcusfilters.hxx
+#include orcus/xml_namespace.hpp
+
class ScOrcusFiltersImpl : public ScOrcusFilters
{
public:
@@ -26,13 +28,16 @@ class ScOrcusXMLContextImpl : public ScOrcusXMLContext
{
ScDocument mrDoc;
rtl::OUString maPath;
+
+orcus::xmlns_repository maNsRepo; /// XML namespace repository for this
context.
+
public:
ScOrcusXMLContextImpl(ScDocument rDoc, const rtl::OUString rPath);
virtual ~ScOrcusXMLContextImpl();
-virtual bool loadXMLStructure(SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) const;
+virtual bool loadXMLStructure(SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam);
-virtual bool importXML(const ScOrcusImportXMLParam rParam) const;
+virtual bool importXML(const ScOrcusImportXMLParam rParam);
};
#endif
diff --git a/sc/source/filter/orcus/xmlcontext.cxx
b/sc/source/filter/orcus/xmlcontext.cxx
index d32a55c..9e0dbba 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -124,7 +124,7 @@ ScOrcusXMLContextImpl::ScOrcusXMLContextImpl(ScDocument
rDoc, const OUString r
ScOrcusXMLContextImpl::~ScOrcusXMLContextImpl() {}
-bool ScOrcusXMLContextImpl::loadXMLStructure(SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) const
+bool ScOrcusXMLContextImpl::loadXMLStructure(SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam)
{
rParam.maUserDataStore.clear();
@@ -138,8 +138,7 @@ bool ScOrcusXMLContextImpl::loadXMLStructure(SvTreeListBox
rTreeCtrl, ScOrcusXM
if (aStrm.empty())
return false;
-orcus::xmlns_repository repo; // xml namespace repository.
-orcus::xmlns_context cxt = repo.create_context();
+orcus::xmlns_context cxt = maNsRepo.create_context();
orcus::xml_structure_tree aXmlTree(cxt);
try
{
@@ -165,7 +164,7 @@ bool ScOrcusXMLContextImpl::loadXMLStructure(SvTreeListBox
rTreeCtrl, ScOrcusXM
return true;
}
-bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam rParam)
const
+bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam rParam)
{
ScOrcusFactory aFactory(mrDoc);
OString aSysPath = ScOrcusFiltersImpl::toSystemPath(maPath);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: GTK theming: oxygen-gtk support broken
Hi, Some time after my commits, which enabled almost fully correct oxygen-gtk support (latest commit was on Jul 8 2012), this support was broken. See screenshots at [1], [2], [3] and [4] for details. Those who hacked on GTK theming support since Jul 8 2012, please have a look at this. If you think it's oxygen-gtk which should be fixed, not libreoffice, please report the particular problems to https://bugs.kde.org (product=Oxygen, component=gtk2-engine). I'll be happy to improve things on oxygen-gtk side. IIRC, this provides KDE look+feel using Gtk, right ? That, IMHO, could count as argument for dropping Qt/KDE vcl. (see my other postings about vcl's/widget toolkits) cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build environment for official win32 builds
evidently local file system (NTFS) is rather slow, and process creation is very slow (which is important for any make-based build system). Okay, but this cant explain why cygwin/gcc is so horribly slow compared to msvc (would make both of them slow). Does this also mean kicking out autotools ? LO doesn't use autotools, only autoconf. but of course many bundled external libraries use full autotools. autoconf alone already is evil enough ;-) cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GTK theming: oxygen-gtk support broken
On Tue, Nov 20, 2012 at 2:45 AM, Enrico Weigelt enrico.weig...@vnc.biz wrote: IIRC, this provides KDE look+feel using Gtk, right ? That, IMHO, could count as argument for dropping Qt/KDE vcl. (see my other postings about vcl's/widget toolkits) Not quite KDE lookfeel in general, rather only Oxygen widget style (not any other Qt style like Plastique). But still, KDE is indeed mostly used with oxygen, so I do agree with you about dropping Qt/KDE support in VCL (especially since it's much poorer than gtk support). One thing which might be not so good here is KDE file open, file save, print etc. dialogs. They appear much more usable than GTK ones, so this is what I'd like to have left in (maybe even provide them for GTK users if possible in principle available at run time). cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: RFC: Generic wrapper for external helpr applications
So there is that xdg-open wrapper which we try to use for sending E-mail / opening composers or opening URLs - at least when we can find it etc. almost what i had in mind. yet missing: * separate action types (eg for differenciating between view and edit) * application-specific settings (eg when mail client should call different helpers than lo) cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Cleanup unusercode.easy
José Guilherme Vanz has abandoned this change. Change subject: Cleanup unusercode.easy .. Patch Set 1: Abandoned Maybe the functions will be required in future. -- To view, visit https://gerrit.libreoffice.org/1083 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Icbadeeb5445e6b90e6c3e97cfbf86f2be103ea82 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
liblangtag issue on master
Hello Following is the issue i am facing: configure: creating ./config.status config.status: creating Makefile config.status: creating data/Makefile config.status: creating docs/Makefile config.status: creating docs/version.xml config.status: creating extensions/Makefile config.status: creating liblangtag/Makefile config.status: creating liblangtag-gobject/Makefile config.status: creating liblangtag.pc config.status: creating liblangtag-uninstalled.pc config.status: creating liblangtag-gobject.pc config.status: creating liblangtag-gobject-uninstalled.pc config.status: creating tests/Makefile config.status: creating config.h config.status: config.h is unchanged config.status: executing depfiles commands config.status: executing libtool commands == Build Information == CFLAGS: LDFLAGS: make[3]: Entering directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag' /opt/lo/bin/make all-recursive make[4]: Entering directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag' Making all in liblangtag make[5]: Entering directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag/liblangtag' /opt/lo/bin/make all-recursive make[6]: Entering directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag/liblangtag' make[7]: Entering directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag/liblangtag' CC liblangtag_la-lt-database.lo CC liblangtag_la-lt-ext-module.lo CC liblangtag_la-lt-extlang-db.lo CC liblangtag_la-lt-extension.lo lt-database.c D:/src/libo/solver/wntmsci12.pro/inc\liblangtag/lt-error.h(25) : fatal error C1083: Cannot open include file: 'glib.h': No such file or directory make[7]: *** [liblangtag_la-lt-database.lo] Error 1 make[7]: *** Waiting for unfinished jobs lt-ext-module.c D:/src/libo/solver/wntmsci12.pro/inc\liblangtag/lt-error.h(25) : fatal error C1083: Cannot open include file: 'glib.h': No such file or directory make[7]: *** [liblangtag_la-lt-ext-module.lo] Error 1 lt-extension.c D:/src/libo/solver/wntmsci12.pro/inc\liblangtag/lt-ext-module-data.h(31) : fatal error C1083: Cannot open include file: 'glib.h': No such file or directory lt-extlang.tmp.FAUCON.5964.pre.c lt-extlang-db.c make[7]: *** [liblangtag_la-lt-extension.lo] Error 1 make[7]: Leaving directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag/liblangtag' make[6]: *** [all-recursive] Error 1 make[6]: Leaving directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag/liblangtag' make[5]: *** [all] Error 2 make[5]: Leaving directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag/liblangtag' make[4]: *** [all-recursive] Error 1 make[4]: Leaving directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag' make[3]: *** [all] Error 2 make[3]: Leaving directory `/cygdrive/d/src/libo/workdir/wntmsci12.pro/UnpackedTarball/langtag' make[2]: *** [D:/src/libo/workdir/wntmsci12.pro/ExternalProject/langtag/build] Error 2 make[2]: Leaving directory `/cygdrive/d/src/libo/liblangtag' make[1]: *** [liblangtag] Error 2 make[1]: Leaving directory `/cygdrive/d/src/libo' make: *** [liblangtag] Error 2 I searched for glib.h and have found some. So I wanted to check for includes... Nice maze ! All is scattered between many makefiles. The previous output is make verbose=t liblangtag from repo root. It does not display the compile commands that are executed. I hoped it would. Could someone either: - fix the issue - explain me how to display the commandline (so I can get all arguments) when $CC or $CXX is invoked - drive me on another way to fix the issue. Thank you Regards -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/killsdf' - 2 commits - l10ntools/source readlicense_oo/CustomTarget_readme.mk solenv/gbuild
l10ntools/source/propmerge.cxx|3 ++-
readlicense_oo/CustomTarget_readme.mk |2 +-
solenv/gbuild/ExtensionTarget.mk | 21 -
3 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 073ff5518f2e341dde7d7ce732cfecb029c85ce6
Author: Zolnai Tamás zolnaitamas20...@gmail.com
Date: Tue Nov 20 00:24:20 2012 +0100
Generate qtz properties
Qtz has no own po files so use one of
configured langauge's po files (en-US excludex)
Plus copy all properties files independently of
localization
Change-Id: Ica7ccb7d3111f2fc2b3bbde4b839cb564967130a
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index a858f44..689e931 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -182,7 +182,8 @@ void PropParser::Merge( const OString rMergeSrc, const
OString rDestinationFil
MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false );
-if( aMergeDataFile.GetLanguages()[0] != m_sLang )
+const std::vectorOString aLanguages = aMergeDataFile.GetLanguages();
+if( m_sLang != qtz !aLanguages.empty() aLanguages[0] != m_sLang )
{
std::cerr
Propex error: given language conflicts with
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 63dbc4d..472b50d 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -234,6 +234,9 @@ endef
# localize .properties file
# source file is copied to $(WORKDIR)
define gb_ExtensionTarget_localize_properties
+ifneq ($(filter-out en-US,$(gb_ExtensionTarget_ALL_LANGS)),)
+$(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst
en_US,qtz,$(2)),$(3),qtz,$(firstword $(filter-out
en-US,$(gb_ExtensionTarget_ALL_LANGS
+endif
$(foreach lang,$(gb_ExtensionTarget_ALL_LANGS),\
$(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst
en_US,$(subst -,_,$(lang)),$(2)),$(3),$(lang)))
endef
@@ -242,9 +245,9 @@ define gb_ExtensionTarget_localize_properties_onelang
$(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2)
ifneq ($(filter-out en-US,$(4)),)
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
- POFILE := $(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst
$(SRCDIR),,$(dir $(3.po
+ POFILE := $(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst
$(SRCDIR),,$(dir $(3.po
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
- $(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir
$(3.po
+ $(gb_POLOCATION)/$(or $(5),$(4))/$(patsubst /%/,%,$(subst
$(SRCDIR),,$(dir $(3.po
endif
$(call gb_ExtensionTarget_get_target,$(1)) : $(call
gb_ExtensionTarget_get_rootdir,$(1))/$(2)
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) \
@@ -253,13 +256,13 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \
$(gb_ExtensionTarget_PROPMERGETARGET)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
$$(call gb_Helper_abbreviate_dirs, \
- $(if $(filter-out en-US,$(4)), \
- MERGEINPUT=`$(gb_MKTEMP)` \
- echo $$(POFILE) {MERGEINPUT} \
- mkdir -p $$(dir $$@) \
- $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$ -o $$@ -m
{MERGEINPUT} -l $(4) \
- rm -rf {MERGEINPUT}, \
- cp $$ $$@))
+ mkdir -p $$(dir $$@) \
+ cp -f $$ $$@ )
+ $(if $(filter-out en-US,$(4)), \
+ MERGEINPUT=`$(gb_MKTEMP)` \
+ echo $$(POFILE) {MERGEINPUT} \
+ $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$ -o $$@ -m
{MERGEINPUT} -l $(4) \
+ rm -rf {MERGEINPUT})
endef
commit 23ffae787b9b052748f7f3a6f67c4e2f8f2c9cbb
Author: Zolnai Tamás zolnaitamas20...@gmail.com
Date: Tue Nov 20 00:21:57 2012 +0100
Reardme.xrm move up one directory
just as the po file belong to it
Change-Id: Ia5deea8816cbb5fc29669d6aa8c3c81472b0ed3f
diff --git a/readlicense_oo/CustomTarget_readme.mk
b/readlicense_oo/CustomTarget_readme.mk
index 2871631..248e495 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -41,7 +41,7 @@ $(readlicense_oo_DIR)/readme.xrm : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1)
$(call gb_Helper_abbreviate_dirs, \
MERGEINPUT=`$(gb_MKTEMP)` \
-echo $(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po)
$${MERGEINPUT} \
+echo $(foreach lang,$(filter-out
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po)
$${MERGEINPUT} \
$(readlicense_XRMEXCOMMAND) \
-p readlicense_oo \
-i $ \
___
Libreoffice-commits mailing
[PATCH] fdo#51304: Remove @author annotation
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1122 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/1122/1 fdo#51304: Remove @author annotation This commit removes some @author annotations and some cleanup. Change-Id: Iaf2c4465825dc73af6c1d7377ae847262721c22b Signed-off-by: José Guilherme Vanz guilherme@gmail.com --- M reportbuilder/java/com/sun/star/report/DataRow.java M reportbuilder/java/com/sun/star/report/DataSource.java M reportbuilder/java/com/sun/star/report/DataSourceException.java M reportbuilder/java/com/sun/star/report/DataSourceFactory.java M reportbuilder/java/com/sun/star/report/ImageService.java M reportbuilder/java/com/sun/star/report/InputRepository.java M reportbuilder/java/com/sun/star/report/JobDefinitionException.java M reportbuilder/java/com/sun/star/report/JobProgressIndicator.java M reportbuilder/java/com/sun/star/report/OfficeToken.java M reportbuilder/java/com/sun/star/report/OutputRepository.java M reportbuilder/java/com/sun/star/report/ReportEngine.java M reportbuilder/java/com/sun/star/report/ReportJob.java M reportbuilder/java/com/sun/star/report/ReportJobDefinition.java M reportbuilder/java/com/sun/star/report/ReportJobFactory.java M reportbuilder/java/com/sun/star/report/SOImageService.java M reportbuilder/java/com/sun/star/report/StorageRepository.java M reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java M reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java M reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java M reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java M reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java M reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java M reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java M reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java M reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java M reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java M reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java M reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java M reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupInstanceSection.java M reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java M
[PATCH] Cleanup unusedcode.easy
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1121 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/1121/1 Cleanup unusedcode.easy This commit removes some unused code from unusedcode.easy Change-Id: I4c09b8c15c983e3dff8a2d58daa949df75a8df74 Signed-off-by: José Guilherme Vanz guilherme@gmail.com --- M comphelper/inc/comphelper/configuration.hxx M comphelper/source/misc/configuration.cxx 2 files changed, 0 insertions(+), 39 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1121 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c09b8c15c983e3dff8a2d58daa949df75a8df74 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/killsdf' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7261b424716463a7bb157f0d79084c868e10015 Author: Zolnai zolnaitamas20...@gmail.com Date: Tue Nov 20 00:38:47 2012 +0100 Updated core Project: help a6e68151d44f357d5828d3a75193d67863226b12 Fix dependacies in help diff --git a/helpcontent2 b/helpcontent2 index 5574201..a6e6815 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 55742016f74d1ec3a8f6f146457b34db675dac15 +Subproject commit a6e68151d44f357d5828d3a75193d67863226b12 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/killsdf' - prj/build.lst
prj/build.lst | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit a6e68151d44f357d5828d3a75193d67863226b12 Author: Zolnai zolnaitamas20...@gmail.com Date: Tue Nov 20 00:38:47 2012 +0100 Fix dependacies in help Change-Id: I37bfd70884864b43e1bf71c4971cfb85e85baa66 diff --git a/prj/build.lst b/prj/build.lst index e07f324..767425f 100644 --- a/prj/build.lst +++ b/prj/build.lst @@ -52,14 +52,14 @@ h2 helpcontent2\source\text\swriter\01 nmake - all helpconten h2 helpcontent2\source\text\swriter\02nmake - all helpcontent2_swri_02 helpcontent2_aux NULL h2 helpcontent2\source\text\swriter\04nmake - all helpcontent2_swri_04 helpcontent2_aux NULL h2 helpcontent2\source\text\swriter\guide nmake - all helpcontent2_swri_guid helpcontent2_aux NULL -h2 helpcontent2\util\sbasic nmake - all helpcontent2_ut_sbas helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL -h2 helpcontent2\util\schart nmake - all helpcontent2_ut_scha helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL -h2 helpcontent2\util\scalcnmake - all helpcontent2_ut_scal helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL -h2 helpcontent2\util\sdrawnmake - all helpcontent2_ut_sdra helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00
[PATCH] docx fine dashed table border import test case.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1125 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/1125/1 docx fine dashed table border import test case. Change-Id: I27ee8e360b8fd530f8cfefc58c8a0f96d706b979 --- A sw/qa/extras/ooxmlimport/data/tableborder-finedash.docx M sw/qa/extras/ooxmlimport/ooxmlimport.cxx 2 files changed, 16 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1125 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27ee8e360b8fd530f8cfefc58c8a0f96d706b979 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Export finely dashed borders to docx.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1124 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/1124/1 Export finely dashed borders to docx. Change-Id: I4a65f8e874abe406a9cd2d3a088ea52f0850088f --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 3 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1124 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a65f8e874abe406a9cd2d3a088ea52f0850088f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build environment for official win32 builds
Okay, but this cant explain why cygwin/gcc is so horribly slow compared to msvc (would make both of them slow). Cygwin is a POSIX emulation. Some POSIX concepts are *very* different from Windows. Emulating them takes time and effort. autoconf alone already is evil enough ;-) Feel free to waste your time coming up with an equivalent alternative. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#51304: Remove @author annotation
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1122 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1122 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf2c4465825dc73af6c1d7377ae847262721c22b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: shell/CustomTarget_shlxthdl_res.mk
shell/CustomTarget_shlxthdl_res.mk |1 + 1 file changed, 1 insertion(+) New commits: commit d42500f1f0a980273e919d1c61ce32e97757daaf Author: David Tardon dtar...@redhat.com Date: Tue Nov 20 07:05:56 2012 +0100 lngconvex needs liblangtag data Change-Id: I788437db6a4031ee6ff406fcf56c5765158285dc diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk index 67e27a6..78f6d32 100644 --- a/shell/CustomTarget_shlxthdl_res.mk +++ b/shell/CustomTarget_shlxthdl_res.mk @@ -42,6 +42,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1) $(call gb_Helper_abbreviate_dirs,\ cd $(SRCDIR)/shell/source/win32/shlxthandler/res \ + LIBLANGTAG_SHARE=$(call gb_Helper_make_url,$(OUTDIR)) \ $(call gb_Executable_get_target_for_build,lngconvex) \ -ulf shlxthdl.ulf \ -rc $@ \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] OUStringBuffer indexOf familly of function do not actually t...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1138 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/1138/1 OUStringBuffer indexOf familly of function do not actually throw. Change-Id: Ia5ebc99bf9a2b1e29694f8093036ff2745287175 --- M sal/inc/rtl/ustrbuf.hxx 1 file changed, 8 insertions(+), 8 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1138 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5ebc99bf9a2b1e29694f8093036ff2745287175 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
