[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - odk/pack
odk/pack/gendocu/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 97751d8ae088763e7d997bdc1de9c89b3ee6c36b Author: Rene Engelhard r...@debian.org Date: Wed Feb 13 20:20:05 2013 +0100 link to java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ in the odk java docs ... as /1.4.1/ redirects to the generic Oracle Java page. 1.5 works. Change-Id: I4f721840bc0bb8146b42a4d91dac8b3621b4bf7e Reviewed-on: https://gerrit.libreoffice.org/2141 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 7345e72..0e51d1c 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -59,7 +59,7 @@ JAVA_BEAN_SRC_FILES=\ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java -JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle Java UNO Runtime Reference -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES) +JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle Java UNO Runtime Reference -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES) JAVADOCLOG = $(MISC)$/javadoc_log.txt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac Module_cross_tail_build.mk solenv/gbuild
Module_cross_tail_build.mk | 25 - configure.ac |4 solenv/gbuild/Helper.mk|4 3 files changed, 24 insertions(+), 9 deletions(-) New commits: commit f9890873d448865a268126f8001c25317c3d3bfc Author: Tor Lillqvist t...@iki.fi Date: Thu Feb 14 10:17:56 2013 +0200 Build DESKTOP stuff for BUILD only if HOST is of type DESKTOP The helplinker library has grown a dependency on the svt and tl libraries. But the helpcompiler module is needed to be built for the BUILD platform only if the HOST platform's BUILD_TYPE includes DESKTOP (or only if its BUILD_TYPE includes HELP?). We used to build helpcompiler and some other things for the BUILD platform depending on whether the BUILD platform's BUILD_TYPE included DESKTOP. Also, codemaker should surely be built for BUILD unconditionally, ant xmlhelp presumably not at all. Change-Id: I3df995ce6b92da4ce9eb35115cf3e8560e06f292 diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index 2e15516..b7a077a 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -31,16 +31,13 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ autodoc \ basegfx \ binaryurp \ - $(call gb_Helper_optional,BOOST,boost) \ bridges \ cli_ure \ - $(call gb_Helper_optional,CLUCENE,clucene) \ - $(call gb_Helper_optional,DESKTOP,codemaker) \ + codemaker \ comphelper \ cosv \ cppu \ cppuhelper \ - $(call gb_Helper_optional,DESKTOP,helpcompiler) \ i18npool \ i18nutil \ idl \ @@ -50,13 +47,10 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ jurt \ jvmaccess \ jvmfwk \ - $(call gb_Helper_optional,DESKTOP,l10ntools) \ - $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ o3tl \ offapi \ officecfg \ oovbaapi \ - $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ registry \ remotebridges \ ridljar \ @@ -69,15 +63,28 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ store \ tools \ ucbhelper \ - $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ udm \ unoil \ unotest \ unotools \ ure \ - xmlhelp \ xmlreader \ + $(call gb_Helper_optional,BOOST,boost) \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional_for_host,DESKTOP, \ + helpcompiler \ + i18nisolang1 \ + l10ntools \ + sot \ + svtools \ + toolkit \ + tools \ + unotools \ + vcl) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ + $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ + $(call gb_Helper_optional,UCPP,ucpp) \ $(call gb_Helper_optional,ZLIB,zlib) \ )) diff --git a/configure.ac b/configure.ac index 1355f3c..1436110 100644 --- a/configure.ac +++ b/configure.ac @@ -12445,6 +12445,10 @@ AC_CONFIG_HEADERS([config_host/config_vclplug.h]) AC_CONFIG_HEADERS([config_host/config_version.h]) AC_OUTPUT +if test $CROSS_COMPILING = YES; then +(echo; echo export BUILD_TYPE_FOR_HOST=$BUILD_TYPE) config_build.mk +fi + # touch the config timestamp file if test ! -f config_host.mk.stamp; then echo config_host.mk.stamp diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 15bf965..d013d14 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -216,4 +216,8 @@ define gb_Helper_optional $(if $(filter $(1),$(BUILD_TYPE)),$(2)) endef +define gb_Helper_optional_for_host +$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)) +endef + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 528467cc4d921fe8995ca950e5987bb30fd7ae1a Author: Andras Timar ati...@suse.com Date: Thu Feb 14 09:32:32 2013 +0100 Updated core Project: help 0142ad19adb30534ba07908356f9139f0257c808 diff --git a/helpcontent2 b/helpcontent2 index cfb8445..0142ad1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cfb84454cfafb8a06957230bc3ead85816ca624c +Subproject commit 0142ad19adb30534ba07908356f9139f0257c808 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - config_host.mk.in configure.ac odk/pack
config_host.mk.in|1 + configure.ac |5 + odk/pack/gendocu/makefile.mk |5 - 3 files changed, 10 insertions(+), 1 deletion(-) New commits: commit 3a2d996b374be25af3cf8d33ed553c33b39cb96f Author: Rene Engelhard r...@debian.org Date: Wed Feb 13 20:21:44 2013 +0100 don't use -notimestanp when using gjdoc as javadoc Conflicts: config_host.mk.in Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187 Reviewed-on: https://gerrit.libreoffice.org/2142 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/config_host.mk.in b/config_host.mk.in index 7b9834d..73aecf8 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -263,6 +263,7 @@ export JAVACISGCJ=@JAVACISGCJ@ export JAVACISKAFFE=@JAVACISKAFFE@ export JAVACOMPILER=@JAVACOMPILER@ export JAVADOC=@JAVADOC@ +export JAVADOCISGJDOC=@JAVADOCISGJDOC@ @x_JAVALIB@ export JAVALIB=@JAVALIB@ export JAVA_HOME=@JAVA_HOME@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index bb3f96c..ce85229 100644 --- a/configure.ac +++ b/configure.ac @@ -6021,7 +6021,12 @@ if test $SOLAR_JAVA != ; then JAVADOC=`cygpath -d $JAVADOC` JAVADOC=`cygpath -u $JAVADOC` fi + +if test `$JAVADOC --version 21 | $GREP -c gjdoc` -gt 0; then + JAVADOCISGJDOC=yes +fi fi +AC_SUBST(JAVADOCISGJDOC) if test $SOLAR_JAVA != ; then # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 0e51d1c..f3e5b08 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -59,7 +59,10 @@ JAVA_BEAN_SRC_FILES=\ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java -JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle Java UNO Runtime Reference -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES) +JAVADOCPARAMS= -use -splitindex -windowtitle Java UNO Runtime Reference -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES) +.IF $(JAVADOCISGJDOC) != yes +JAVADOCPARAMS+= -notimestamp +.ENDIF JAVADOCLOG = $(MISC)$/javadoc_log.txt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/auxiliary source/text util/swriter
source/auxiliary/swriter.tree|1 source/text/shared/01/06040100.xhp |1 source/text/shared/guide/line_intext.xhp |1 source/text/swriter/01/0421.xhp | 48 source/text/swriter/01/makefile.mk |1 source/text/swriter/guide/insert_beforetable.xhp |2 source/text/swriter/guide/insert_line.xhp| 87 --- source/text/swriter/guide/main.xhp |2 source/text/swriter/guide/makefile.mk|1 source/text/swriter/main0104.xhp |2 util/swriter/makefile.mk |2 11 files changed, 148 deletions(-) New commits: commit 0142ad19adb30534ba07908356f9139f0257c808 Author: Andras Timar ati...@suse.com Date: Thu Feb 14 09:32:32 2013 +0100 remove help of Insert - Horizontal line (removed feature in 4.0) Change-Id: Ie5847804f0a7c85a3b8b9c95b5ab28409759fcbd diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree index 3791bbd..5afecb0 100644 --- a/source/auxiliary/swriter.tree +++ b/source/auxiliary/swriter.tree @@ -75,7 +75,6 @@ topic id=swriter/text/swriter/guide/insert_graphic_scan.xhpInserting a Scanned Image/topic topic id=swriter/text/swriter/guide/insert_graphic_fromchart.xhpInserting a Calc Chart into a Text Document/topic topic id=swriter/text/swriter/guide/insert_graphic_fromdraw.xhpInserting Graphics From %PRODUCTNAME Draw or Impress/topic -topic id=swriter/text/swriter/guide/insert_line.xhpInserting a Horizontal Line/topic /node node id=0205 title=Tables in Text Documents topic id=swriter/text/swriter/guide/number_date_conv.xhpTurning Number Recognition On or Off in Tables/topic diff --git a/source/text/shared/01/06040100.xhp b/source/text/shared/01/06040100.xhp index 3fd3634..70e5c86 100644 --- a/source/text/shared/01/06040100.xhp +++ b/source/text/shared/01/06040100.xhp @@ -230,7 +230,6 @@ /tablerow /table embed href=text/shared/guide/line_intext.xhp#line_intext/ - embed href=text/swriter/guide/insert_line.xhp#insert_line/ /case /switch paragraph xml-lang=en-US id=hd_id3149064 role=heading level=3 l10n=U diff --git a/source/text/shared/guide/line_intext.xhp b/source/text/shared/guide/line_intext.xhp index 68b4f7d..237e0c8 100644 --- a/source/text/shared/guide/line_intext.xhp +++ b/source/text/shared/guide/line_intext.xhp @@ -119,7 +119,6 @@ paragraph role=tip id=par_id641804 xml-lang=en-US l10n=NEWWhen you enter a line width, you can append a measurement unit. A zero line width results in a hairline with a width of one pixel of the output medium./paragraph embed href=text/shared/00/0004.xhp#related/ paragraph role=paragraph id=par_id3154188 xml-lang=en-US l10n=U oldref=65link href=text/shared/01/05030500.xhp name=Format - Paragraph - BordersFormat - Paragraph - Borders/link/paragraph -embed href=text/swriter/guide/insert_line.xhp#insert_line/ embed href=text/shared/guide/linestyles.xhp#linestyles/ /body /helpdocument diff --git a/source/text/swriter/01/0421.xhp b/source/text/swriter/01/0421.xhp deleted file mode 100644 index 4c9d372..000 --- a/source/text/swriter/01/0421.xhp +++ /dev/null @@ -1,48 +0,0 @@ -?xml version=1.0 encoding=UTF-8? - - - -!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - -- - - - helpdocument version=1.0 -meta -topic id=textswriter010421xml indexer=include status=PUBLISH -title id=tit xml-lang=en-USInsert Horizontal Rule/title -filename/text/swriter/01/0421.xhp/filename -/topic -/meta -body -bookmark xml-lang=en-US branch=hid/.uno:InsertGraphicRuler id=bm_id7123888 localize=false/ -bookmark xml-lang=en-US branch=hid/modules/swriter/ui/horizontalrule/HorizontalRuleDialog id=bm_id3148768 localize=false/paragraph role=heading id=hd_id3145249 xml-lang=en-US level=1 l10n=CHG oldref=1Insert Horizontal Rule/paragraph -paragraph role=paragraph id=par_id3150758 xml-lang=en-US l10n=U oldref=2variable id=horizontaltextahelp hid=.uno:InsertGraphicRulerInserts a horizontal line at the current cursor position./ahelp -/variable/paragraph -section id=howtoget
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/filter/ww8/ww8par6.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit d2c2bd5508f331f82bb77b40587d12040752eabf
Author: Luke Deller l...@deller.id.au
Date: Thu Feb 14 00:04:52 2013 +1100
minimal change to fix fdo#57908 for backport
wwSectionManager::GetPageULData adjusts margins and header/footer
heights according to whether there is a header/footer or not.
It could be confused into thinking there was no header/footer when
indeed there was, in the case where a first page header/footer was
inherited from a previous section which contained but did not actually
show that header.
Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4
Reviewed-on: https://gerrit.libreoffice.org/2137
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 761a68a..691b8f7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1115,10 +1115,14 @@ void wwSectionManager::CreateSep(const long nTxtPos,
bool /*bMustHaveBreak*/)
aNewSection.maSep.grpfIhdt = ReadBSprm(pSep, eVer = ww::eWW2 ? 128 :
153, 0);
else if (mrReader.pHdFt)
{
-aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD;
-
-if (aNewSection.HasTitlePage())
-aNewSection.maSep.grpfIhdt |= WW8_HEADER_FIRST | WW8_FOOTER_FIRST;
+aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD
+| WW8_HEADER_FIRST | WW8_FOOTER_FIRST;
+
+// It is possible for a first page header to be provided
+// for this section, but not actually shown in this section. In this
+// case (aNewSection.maSep.grpfIhdt WW8_HEADER_FIRST) will be nonzero
+// but aNewSection.HasTitlePage() will be false.
+// Likewise for first page footer.
if (mrReader.pWDop-fFacingPages)
aNewSection.maSep.grpfIhdt |= WW8_HEADER_EVEN | WW8_FOOTER_EVEN;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - embeddedobj/source
embeddedobj/source/msole/oleembed.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit b0bee59347aefe41b4c48919c8b4177572d2d348
Author: Michael Stahl mst...@redhat.com
Date: Sun Feb 10 00:18:46 2013 +0100
fdo#60491: embeddedobj: catch exception in fallback path
This allows the OLE object to at least be passed to the OS for
opening...
Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
(cherry picked from commit 5a65ca67d9acefed399ed8706efa402c543bed87)
Reviewed-on: https://gerrit.libreoffice.org/2097
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/embeddedobj/source/msole/oleembed.cxx
b/embeddedobj/source/msole/oleembed.cxx
index b44d789..5c5b063 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -716,7 +716,14 @@ namespace
aArgs ), uno::UNO_QUERY_THROW );
uno::Reference io::XStream xCONTENTS;
-
xNameContainer-getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CONTENTS)))
= xCONTENTS;
+try
+{
+xNameContainer-getByName(CONTENTS) = xCONTENTS;
+}
+catch (container::NoSuchElementException const)
+{
+// ignore
+}
sal_Bool bCopied = xCONTENTS.is()
lcl_CopyStream(xCONTENTS-getInputStream(), xStream-getOutputStream());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - postprocess/packcomponents scp2/source
postprocess/packcomponents/makefile.mk |4 ++-- scp2/source/ooo/file_library_ooo.scp |3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 59e5098128cd445ed70de418cb787cfa94a65249 Author: Michael Stahl mst...@redhat.com Date: Sat Feb 9 22:39:42 2013 +0100 fdo#60491: scp2: always package emboleobj library on non-WNT platforms (regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined DISABLE_ATL on all platforms in configure) (cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40) Conflicts: postprocess/Rdb_services.mk Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda Reviewed-on: https://gerrit.libreoffice.org/2098 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 09e296b..eb073b5 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -223,12 +223,12 @@ my_components += \ .ENDIF -.IF $(DISABLE_ATL) == .IF $(OS) == WNT +.IF $(DISABLE_ATL) == my_components += component/embeddedobj/source/msole/emboleobj.windows +.ENDIF .ELSE my_components += component/embeddedobj/source/msole/emboleobj -.ENDIF .END .IF $(DISABLE_NEON) != TRUE diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 66c50e2..d56c071 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -413,7 +413,8 @@ STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer) SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj) -#ifndef DISABLE_ATL +/* fdo#60491 always need emboleobj library on non-WNT platforms */ +#if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: convert setup_native to gbuild and add to tail_build
Niko, I just pushed a fix. Can you see if it works now? Thanks, Peter -Original Message- From: Niko Rönkkö Sent: Wednesday, February 13, 2013 10:14 AM To: libreoffice-dev Cc: pefol...@verizon.net Subject: Re: convert setup_native to gbuild and add to tail_build Hi! This commit breaks my Mac build with error message: Unrecognized option: -p Usage: ulfconv [-o output file] [-t encoding table] [ulf file] Problem seems to be on line 22 in CustomTarget_mac.mk: http://opengrok.libreoffice.org/xref/core/setup_native/CustomTarget_mac.mk#22 -- RN ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#60471: svgio, sax: enable internal entity declarations f...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2138
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/2138/1
fdo#60471: svgio, sax: enable internal entity declarations for SVG
Change-Id: I147acac61dfe0b626268fe1e600dcf641ca63a0c
(cherry picked from commit fcb1e4d8433b49686cd8e53c699dd5d6503ea314)
---
M sax/source/expatwrap/sax_expat.cxx
M svgio/source/svguno/xsvgparser.cxx
2 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index db17402..6dd88ed 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -24,7 +24,7 @@
#include osl/diagnose.h
#include com/sun/star/lang/XServiceInfo.hpp
-#include com/sun/star/util/XCloneable.hpp
+#include com/sun/star/lang/XInitialization.hpp
#include com/sun/star/xml/sax/XExtendedDocumentHandler.hpp
#include com/sun/star/xml/sax/XParser.hpp
#include com/sun/star/xml/sax/SAXParseException.hpp
@@ -32,8 +32,7 @@
#include cppuhelper/factory.hxx
#include cppuhelper/weak.hxx
-#include cppuhelper/implbase1.hxx
-#include cppuhelper/implbase2.hxx
+#include cppuhelper/implbase3.hxx
#include expat.h
@@ -45,7 +44,6 @@
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::util;
using namespace ::com::sun::star::io;
#include factory.hxx
@@ -136,11 +134,10 @@
// This class implements the external Parser interface
-class SaxExpatParser :
-public WeakImplHelper2
-XParser,
-XServiceInfo
-
+class SaxExpatParser
+: public WeakImplHelper3 XInitialization
+, XServiceInfo
+, XParser
{
public:
@@ -153,6 +150,10 @@
static Sequence OUString getSupportedServiceNames_Static(void)
throw ();
public:
+// ::com::sun::star::lang::XInitialization:
+virtual void SAL_CALL initialize(SequenceAny const rArguments)
+throw (RuntimeException, Exception);
+
// The SAX-Parser-Interface
virtual void SAL_CALL parseStream( const InputSource structSource)
throw ( SAXException,
@@ -222,6 +223,7 @@
public: // module scope
Mutex aMutex;
OUStringsCDATA;
+bool m_bEnableDoS; // fdo#60471 thank you Adobe Illustrator
Reference XDocumentHandlerrDocumentHandler;
Reference XExtendedDocumentHandler rExtendedDocumentHandler;
@@ -257,6 +259,7 @@
public:
SaxExpatParser_Impl()
: sCDATA(CDATA)
+, m_bEnableDoS(false)
{
}
@@ -452,6 +455,22 @@
delete m_pImpl;
}
+// ::com::sun::star::lang::XInitialization:
+void SAL_CALL
+SaxExpatParser::initialize(Sequence Any const rArguments)
+throw (RuntimeException, Exception)
+{
+// possible arguments: a string DoSmeplease
+if (rArguments.getLength())
+{
+OUString str;
+if ((rArguments[0] = str) DoSmeplease == str)
+{
+MutexGuard guard( m_pImpl-aMutex );
+m_pImpl-m_bEnableDoS = true;
+}
+}
+}
/***
*
@@ -500,7 +519,10 @@
XML_SetCharacterDataHandler( entity.pParser , call_callbackCharacters );
XML_SetProcessingInstructionHandler(entity.pParser ,
call_callbackProcessingInstruction );
-XML_SetEntityDeclHandler(entity.pParser, call_callbackEntityDecl);
+if (!m_pImpl-m_bEnableDoS)
+{
+XML_SetEntityDeclHandler(entity.pParser, call_callbackEntityDecl);
+}
XML_SetNotationDeclHandler( entity.pParser, call_callbackNotationDecl );
XML_SetExternalEntityRefHandler(entity.pParser,
call_callbackExternalEntityRef);
diff --git a/svgio/source/svguno/xsvgparser.cxx
b/svgio/source/svguno/xsvgparser.cxx
index 26a81c0..1b12d9ad 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -21,6 +21,7 @@
#include com/sun/star/graphic/XSvgParser.hpp
#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/lang/XInitialization.hpp
#include cppuhelper/implbase2.hxx
#include svgio/svgreader/svgdocumenthandler.hxx
#include com/sun/star/xml/sax/XParser.hpp
@@ -131,6 +132,14 @@
// get parser
uno::Reference xml::sax::XParser xParser(
xml::sax::Parser::create(context_));
+// fdo#60471 need to enable internal entities because
+// certain ... popular proprietary products write SVG files
+// that use entities to define XML namespaces.
+uno::Referencelang::XInitialization const xInit(xParser,
+uno::UNO_QUERY_THROW);
+uno::Sequenceuno::Any args(1);
+
[PATCH libreoffice-4-0] filter: svg: optimizeGradientStops: fix STL assertion
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2139
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/2139/1
filter: svg: optimizeGradientStops: fix STL assertion
Check that there is actually more than one element in maStops before
tweaking its first 2 elements (can be reproduced with fdo#60471 Tux.svg)
Change-Id: I7e6ffdf510bb590a9ea9e3782b30247b8fb46ed5
(cherry picked from commit 2f4bd9d44f8bc9e50cd4b1205fa53e0a15ce0954)
---
M filter/source/svg/svgreader.cxx
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index c76f117..4d064c7 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -377,7 +377,7 @@
bool hasGradientOpacity( const Gradient rGradient )
{
return
-!rGradient.maStops.empty()
+(rGradient.maStops.size() 1)
(maGradientStopVector[
rGradient.maStops[0]].maStopColor.a != 1.0 ||
maGradientStopVector[
@@ -417,6 +417,10 @@
}
rGradient.maStops = aNewStops;
+if (rGradient.maStops.size() 2)
+{
+return; // can't optimize further...
+}
// axial gradient, maybe?
if( rGradient.meType == Gradient::LINEAR
--
To view, visit https://gerrit.libreoffice.org/2139
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e6ffdf510bb590a9ea9e3782b30247b8fb46ed5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] calc : multiple tabs can be hidden at once
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2053 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2053 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I445eccc188f1817006cb425dc9a0e92a25350ec8 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Laurent Godard lgodard.li...@laposte.net Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english - redo of writer.cxx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2140
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/2140/1
Comment translation german - english - redo of writer.cxx
Change-Id: Idf885dc8d47077800bdc648072aa45eb46c9a286
---
M sw/source/filter/writer/writer.cxx
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/sw/source/filter/writer/writer.cxx
b/sw/source/filter/writer/writer.cxx
index 21dd1bc..bd1de3f 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -37,7 +37,7 @@
using namespace ::com::sun::star;
-// Stringbuffer fuer die umgewandelten Zahlen
+// Stringbuffer for the converted numbers
static sal_Char aNToABuf[] = 0;
#define NTOABUFLEN (sizeof(aNToABuf))
@@ -91,16 +91,16 @@
}
/*
- * Dieses Modul ist die Zentrale-Sammelstelle fuer alle Write-Filter
- * und ist eine DLL !
+ * This module is the central collection point for all writer-filters
+ * and is a DLL !
*
- * Damit der Writer mit den unterschiedlichen Writern arbeiten kann,
- * muessen fuer diese die Ausgabe-Funktionen der Inhalts tragenden
- * Objecte auf die verschiedenen Ausgabe-Funktionen gemappt werden.
+ * So that the Writer can work with different writers, the output-functions
+ * of the content carrying objects have to be mapped to the various
+ * output-functions.
*
- * Dazu kann fuer jedes Object ueber den Which-Wert in einen Tabelle ge-
- * griffen werden, um seine Ausgabe-Funktion zu erfragen.
- * Diese Funktionen stehen in den entsprechenden Writer-DLL's.
+ * For that, to inquire its output function, every object can be gripped
+ * via the which-value in a table.
+ * These functions are available in the corresponding Writer-DLL's.
*/
Writer::Writer()
@@ -151,11 +151,11 @@
{
if( (*ppPam)-GetNext() == pOrigPam )
{
-*ppPam = pOrigPam; // wieder auf den Anfangs-Pam setzen
-return sal_False; // Ende vom Ring
+*ppPam = pOrigPam; // set back to the beginning pam
+return sal_False; // end of the ring
}
-// ansonsten kopiere den die Werte aus dem naechsten Pam
+// otherwise copy the next value from the next Pam
*ppPam = ((SwPaM*)(*ppPam)-GetNext() );
*pCurPam-GetPoint() = *(*ppPam)-Start();
@@ -164,7 +164,7 @@
return sal_True;
}
-// suche die naechste Bookmark-Position aus der Bookmark-Tabelle
+// search the next Bookmark-Position from the Bookmark-Table
sal_Int32 Writer::FindPos_Bkmk(const SwPosition rPos) const
{
@@ -189,7 +189,7 @@
SwCntntNode* pCNode = aStt.GetNode().GetCntntNode();
if( !pCNode 0 == ( pCNode = pNds-GoNext( aStt )) )
{
-OSL_FAIL( An StartPos kein ContentNode mehr );
+OSL_FAIL( No more ContentNode at StartPos );
}
SwPaM* pNew = new SwPaM( aStt );
@@ -198,7 +198,7 @@
if( 0 == (pCNode = aStt.GetNode().GetCntntNode())
0 == (pCNode = pNds-GoPrevious( aStt )) )
{
-OSL_FAIL( An StartPos kein ContentNode mehr );
+OSL_FAIL( No more ContentNode at StartPos );
}
pCNode-MakeEndIndex( pNew-GetPoint()-nContent );
pNew-GetPoint()-nNode = aStt;
@@ -207,7 +207,7 @@
/
-// Stream-spezifisches
+// Stream-specific
SvStream Writer::Strm()
{
OSL_ENSURE( m_pImpl-m_pStream, Oh-oh. Writer with no Stream! );
@@ -219,7 +219,7 @@
SvStream Writer::OutLong( SvStream rStrm, long nVal )
{
-// Pointer an das Bufferende setzen
+// Set the Pointer at the end of the buffer
sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
int bNeg = nVal 0;
@@ -231,7 +231,7 @@
nVal /= 10;
} while( nVal );
-// Ist Zahl negativ, dann noch -
+// is the number negative, then in addition -
if( bNeg )
*(--pStr) = '-';
@@ -240,7 +240,7 @@
SvStream Writer::OutULong( SvStream rStrm, sal_uLong nVal )
{
-// Pointer an das Bufferende setzen
+// Set the Pointer at the end of the buffer
sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
do {
@@ -266,9 +266,9 @@
pOrigFileName = pFName;
m_pImpl-m_pStream = rStrm;
-// PaM kopieren, damit er veraendert werden kann
+// Copy PaM, so that it can be modified
pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-// zum Vergleich auf den akt. Pam sichern
+// for comparison secure to the current Pam
pOrigPam = rPaM;
sal_uLong nRet = WriteStream();
@@ -287,13 +287,13 @@
sal_uLong Writer::Write( SwPaM /*rPam*/, SvStorage, const String* )
{
-OSL_ENSURE( !this, Schreiben in Storages auf einem Stream? );
+OSL_ENSURE( !this, Write in Storages on a stream? );
return ERR_SWG_WRITE_ERROR;
}
sal_uLong Writer::Write( SwPaM, const uno::Reference embed::XStorage ,
const String*, SfxMedium* )
{
-OSL_ENSURE( !this, Schreiben in Storages
[PATCH libreoffice-4-0] link to java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ in...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2141 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/2141/1 link to java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ in the odk java docs ... as /1.4.1/ redirects to the generic Oracle Java page. 1.5 works. Change-Id: I4f721840bc0bb8146b42a4d91dac8b3621b4bf7e --- M odk/pack/gendocu/makefile.mk 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 7345e72..0e51d1c 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -59,7 +59,7 @@ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java -JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle Java UNO Runtime Reference -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES) +JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle Java UNO Runtime Reference -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES) JAVADOCLOG = $(MISC)$/javadoc_log.txt -- To view, visit https://gerrit.libreoffice.org/2141 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f721840bc0bb8146b42a4d91dac8b3621b4bf7e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Rene Engelhard r...@debian.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] don't use -notimestanp when using gjdoc as javadoc
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2142 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/2142/1 don't use -notimestanp when using gjdoc as javadoc Conflicts: config_host.mk.in Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187 --- M config_host.mk.in M configure.ac M odk/pack/gendocu/makefile.mk 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config_host.mk.in b/config_host.mk.in index 7b9834d..73aecf8 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -263,6 +263,7 @@ export JAVACISKAFFE=@JAVACISKAFFE@ export JAVACOMPILER=@JAVACOMPILER@ export JAVADOC=@JAVADOC@ +export JAVADOCISGJDOC=@JAVADOCISGJDOC@ @x_JAVALIB@ export JAVALIB=@JAVALIB@ export JAVA_HOME=@JAVA_HOME@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index bb3f96c..ce85229 100644 --- a/configure.ac +++ b/configure.ac @@ -6021,7 +6021,12 @@ JAVADOC=`cygpath -d $JAVADOC` JAVADOC=`cygpath -u $JAVADOC` fi + +if test `$JAVADOC --version 21 | $GREP -c gjdoc` -gt 0; then + JAVADOCISGJDOC=yes +fi fi +AC_SUBST(JAVADOCISGJDOC) if test $SOLAR_JAVA != ; then # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 0e51d1c..f3e5b08 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -59,7 +59,10 @@ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java -JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle Java UNO Runtime Reference -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES) +JAVADOCPARAMS= -use -splitindex -windowtitle Java UNO Runtime Reference -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES) +.IF $(JAVADOCISGJDOC) != yes +JAVADOCPARAMS+= -notimestamp +.ENDIF JAVADOCLOG = $(MISC)$/javadoc_log.txt -- To view, visit https://gerrit.libreoffice.org/2142 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Rene Engelhard r...@debian.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Comment translation german - english - redo of 5 files
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2143
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/2143/1
Comment translation german - english - redo of 5 files
I have send it again and abandon the old changes. Hope this is correct?
:-D
Change-Id: Ib7668f30d4c813ce656e9d8d5fcc0060d1a6aff5
---
M sw/source/core/docnode/ndnum.cxx
M sw/source/core/docnode/ndsect.cxx
M sw/source/core/draw/dcontact.cxx
M sw/source/core/draw/dpage.cxx
M sw/source/core/draw/drawdoc.cxx
5 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index 86d3e44..91b861ec 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -21,7 +21,7 @@
#include doc.hxx
#include pam.hxx
#include ndtxt.hxx
-#include fldbas.hxx // UpdateFlds der KapitelNummerierung
+#include fldbas.hxx // UpdateFlds of the chapter numbering
#include docary.hxx
bool CompareSwOutlineNodes::operator()( SwNode* const lhs, SwNode* const
rhs) const
@@ -67,20 +67,20 @@
pTxtNd-UpdateOutlineState();
-// die Gliederungs-Felder Updaten
+// update the structure fields
GetDoc()-GetSysFldType( RES_CHAPTERFLD )-UpdateFlds();
}
}
void SwNodes::UpdtOutlineIdx( const SwNode rNd )
{
-if( pOutlineNds-empty() ) // keine OutlineNodes vorhanden ?
+if( pOutlineNds-empty() ) // no OutlineNodes present ?
return;
const SwNodePtr pSrch = (SwNodePtr)rNd;
sal_uInt16 nPos;
pOutlineNds-Seek_Entry( pSrch, nPos );
-if( nPos == pOutlineNds-size() ) // keine zum Updaten vorhanden ?
+if( nPos == pOutlineNds-size() ) // none present for updating ?
return;
if( nPos )
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index 42983c9..d798fa1 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1227,7 +1227,7 @@
// In which array am I: Nodes, UndoNodes?
const SwNodes rNds = GetNodes();
-// Copy the das SectionFrmFmt
+// Copy the SectionFrmFmt
SwSectionFmt* pSectFmt = pDoc-MakeSectionFmt( 0 );
pSectFmt-CopyAttrs( *GetSection().GetFmt() );
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 3449521..ed69adb 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -89,11 +89,11 @@
}
-//Der Umgekehrte Weg: Sucht das Format zum angegebenen Objekt.
-//Wenn das Object ein SwVirtFlyDrawObj ist so wird das Format von
-//selbigem besorgt.
-//Anderfalls ist es eben ein einfaches Zeichenobjekt. Diese hat einen
-//UserCall und der ist Client vom gesuchten Format.
+// The Get reverse way: seeks the format to the specified object.
+// If the object is a SwVirtFlyDrawObj then the format of this
+// will be acquired.
+// Otherwise it is just a simple drawing object. This has a
+// UserCall and is the client of the searched format.
SwFrmFmt *FindFrmFmt( SdrObject *pObj )
{
@@ -130,7 +130,7 @@
/*
*
- * GetBoundRect liefert das BoundRect _inklusive_ Abstand des Objekts.
+ * GetBoundRect returns the BoundRect _inclusive_ distance of the object.
*
*/
@@ -151,7 +151,7 @@
return aRet;
}
-//Liefert den UserCall ggf. vom Gruppenobjekt
+// Returns the UserCall if applicable from the group object
// OD 2004-03-31 #i26791# - change return type
SwContact* GetUserCall( const SdrObject* pObj )
{
@@ -163,7 +163,7 @@
return static_castSwContact*(pObj-GetUserCall());
}
-// liefert sal_True falls das SrdObject ein Marquee-Object (Lauftext) ist
+// Returns sal_True if the SrdObject is a Marquee-Object (scrolling text)
sal_Bool IsMarqueeTextObj( const SdrObject rObj )
{
SdrTextAniKind eTKind;
@@ -175,7 +175,7 @@
/*
|*
-|* SwContact, Ctor und Dtor
+|* SwContact, Ctor and Dtor
|*
|*/
@@ -643,8 +643,8 @@
InsertObject( pObj, pObj-GetOrdNumDirect() );
}
-//Controls muessen immer im Control-Layer liegen. Das gilt auch fuer
-//Gruppenobjekte, wenn diese Controls enthalten.
+//Controls have to be always in the Control-Layer. This is also true for
+//group objects, if they contain controls.
if ( ::CheckControlLayer( pObj ) )
{
// set layer of object to corresponding invisible layer.
@@ -1105,7 +1105,7 @@
return;
}
-//Action aufsetzen, aber nicht wenn gerade irgendwo eine Action laeuft.
+//Put on Action, but not if presently anywhere an action runs.
ViewShell *pSh = 0, *pOrg;
SwRootFrm *pTmpRoot =
[PATCH] WiP: Remove the need to manually register libs in scp2
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2144 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/2144/1 WiP: Remove the need to manually register libs in scp2 - we have all the needed information in gbuild - reduce the amount of double and triple bookkeeping - hopefully the generated files for scp2 are only a intermediate step and we can do whatever perl voodoo scp2 does directly in gbuild - currently using basctl as an example - this also means we have to me more strict in Repository.mk with what we register: - if we dont build a libs, it shouldnt be registered (otherwise scp2 will want the nonexisting lib) - in the end, this is a Good Thing(tm): we dont want anyone trying to e.g. link against a lib we dont build - TODO: the OOOLIBSINSTALLED group is currently only added on unxgcc, needs to be done for other platforms too (and probably be renamed) - TODO: the same can likely be done for other stuff: executables, other files ... Change-Id: I241ca67edbfabae83859274f9aa35d2d26165ef6 --- M Repository.mk A scp2/AutoInstallLibs_ooolibs.mk M scp2/Module_scp2.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp A solenv/gbuild/AutoInstallLibs.mk M solenv/gbuild/Helper.mk M solenv/gbuild/InstallModuleTarget.mk M solenv/gbuild/TargetLocations.mk M solenv/gbuild/gbuild.mk M solenv/gbuild/platform/unxgcc.mk 11 files changed, 71 insertions(+), 4 deletions(-) diff --git a/Repository.mk b/Repository.mk index 6f62ae2..3f15847 100755 --- a/Repository.mk +++ b/Repository.mk @@ -218,6 +218,12 @@ endif +ifeq ($(DISABLE_SCRIPTING),) +$(eval $(call gb_Helper_register_libraries,OOOLIBSINSTALLED, \ +basctl \ +)) +endif + $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ abp \ acc \ @@ -227,7 +233,6 @@ agg \ analysis \ animcore \ -basctl \ $(if $(filter $(OS),ANDROID),, \ basebmp \ ) \ diff --git a/scp2/AutoInstallLibs_ooolibs.mk b/scp2/AutoInstallLibs_ooolibs.mk new file mode 100644 index 000..6dd6372 --- /dev/null +++ b/scp2/AutoInstallLibs_ooolibs.mk @@ -0,0 +1,12 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ooolibs,OOOLIBSINSTALLED,STD_LIB_FILE(gid_File_Lib_$$(1),$$(1 + +# vim: set noet sw=4 ts=4: diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index c4f8145..62dcc14 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ + AutoInstallLibs_ooolibs \ CustomTarget_langmacros \ InstallModule_accessories \ InstallModule_base \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a804041..39e6ebf 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -25,6 +25,7 @@ * / #include macros.inc +#include AutoInstallLibs/ooolibs #if defined SOLAR_JAVA defined WNT File gid_File_Lib_Accessbridge diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 13bb7b7..6cab9a4 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -204,6 +204,7 @@ gid_File_Filter_Ira, gid_File_Filter_Itg, gid_File_Filter_Iti, + gid_File_Lib_basctl, gid_File_Lib_Bib, gid_File_Lib_Chartcore, gid_File_Lib_Chartcontroller, @@ -284,7 +285,6 @@ gid_File_Lib_Vclplug_Kde, gid_File_Lib_Vclplug_Kde4, gid_File_Lib_Vclplug_Svp, - gid_File_Lib_Basctl, gid_File_Lib_CanvasTools, gid_File_Lib_CppCanvas, gid_File_Lib_Agg, diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk new file mode 100644 index 000..02b54ca --- /dev/null +++ b/solenv/gbuild/AutoInstallLibs.mk @@ -0,0 +1,38 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ + +# AutoInstallLibs class + +$(dir $(call gb_AutoInstallLibs_get_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(call gb_AutoInstallLibs_get_target,%) : + $(call gb_Output_announce,$*,$(true),AIL,3) + echo /* autogenerated library
Re: [PATCH] convert setup_native to gbuild and add to tail_build
Andras, I'm not sure exactly why it changed or what the problem is. Do you know how I would force msvcrt to be linked staticly? Thanks, Peter -Original Message- From: Andras Timar Sent: Wednesday, February 13, 2013 6:13 AM To: Peter Foley Cc: libreoffice Subject: Re: [PATCH] convert setup_native to gbuild and add to tail_build Hi Peter, Thanks, it was a good fix, I did the same for all CustomActions. Just one more problem: now MSVCRT is linked dinamically. It is not good, because MSVCRT is not part of the default Windows installation. We need to link it statically like we did that before. Thanks, Andras On Mon, Feb 11, 2013 at 11:03 PM, Peter Foley pefol...@verizon.net wrote: Andras, I just pushed a patch that should fix it. Could you test it? Thanks, Peter -Original Message- From: Andras Timar Sent: Monday, February 11, 2013 7:37 AM To: Peter Foley Cc: libreoffice Subject: Re: [PATCH] convert setup_native to gbuild and add to tail_build Hi Peter, On Sat, Feb 9, 2013 at 3:54 PM, Peter Foley (via Code Review) ger...@gerrit.libreoffice.org wrote: Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2063 I tested you patch and it does not work for me. Windows Installer cannot execure any of the CustomActions. E.g.: MSI (c) (9C:B0) [13:23:41:427]: Invoking remote custom action. DLL: C:\Users\timar\AppData\Local\Temp\MSIAF36.tmp, Entrypoint: SelectLanguage CustomAction SelectLanguage returned actual error code 1154 but will be translated to success due to continue marking The problem is that in newly built DLLs the names are mangled, I see _SelectLanguage@4 instead of SelectLanguage in Dependency Walker. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#46808, Adapt UNO services to the new style, Part 1
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2145
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/2145/1
fdo#46808, Adapt UNO services to the new style, Part 1
Found two in offapi/com/sun/star/awt/grid : DefaultGridColumnModel.idl and
GridColumn.idl
Change-Id: Ic44fc44d3c52ccc8db5d0b0917cb98ebae061eae
---
M offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
M offapi/com/sun/star/awt/grid/GridColumn.idl
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index faf8143..ba37c3b 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -28,10 +28,7 @@
/** If you do not want to implement the typeXGridColumnModel/type
yourself, use this service.
@since OOo 3.3
*/
-service DefaultGridColumnModel
-{
-interface com::sun::star::awt::grid::XGridColumnModel;
-};
+service DefaultGridColumnModel : com::sun::star::awt::grid::XGridColumnModel;
}; }; }; };};
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl
b/offapi/com/sun/star/awt/grid/GridColumn.idl
index 5ec80bb..cad9926 100644
--- a/offapi/com/sun/star/awt/grid/GridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -29,10 +29,7 @@
@since OOo 3.3
*/
-service GridColumn
-{
-interface com::sun::star::awt::grid::XGridColumn;
-};
+service GridColumn : com::sun::star::awt::grid::XGridColumn;
}; }; }; };};
--
To view, visit https://gerrit.libreoffice.org/2145
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic44fc44d3c52ccc8db5d0b0917cb98ebae061eae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] link to java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ in...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2141 Approvals: Miklos Vajna: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2141 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f721840bc0bb8146b42a4d91dac8b3621b4bf7e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Rene Engelhard r...@debian.org Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] don't use -notimestanp when using gjdoc as javadoc
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2142 Approvals: Miklos Vajna: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2142 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Rene Engelhard r...@debian.org Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] minimal change to fix fdo#57908 for backport
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2137 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2137 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#60491: embeddedobj: catch exception in fallback path
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2097 Approvals: Miklos Vajna: Verified Eike Rathke: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2097 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#60491: scp2: always package emboleobj library on non-WNT...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2098 Approvals: Miklos Vajna: Verified Eike Rathke: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2098 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sw/source
sw/source/core/txtnode/ndtxt.cxx | 45 ++-
1 file changed, 31 insertions(+), 14 deletions(-)
New commits:
commit 1c6f5a16d83a87d7f2233e5c7e60ab5f39546225
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 12 19:43:16 2013 +0100
fdo#60668: filter out fieldmark chars from Index entries:
SwTxtNode::GetExpandTxt must filter out all dummy characters used to
represent fields, footnotes, field marks, etc.
(cherry picked from commit e31807c83009655c342c929a118f0d28a8f63ddc)
Conflicts:
sw/source/core/txtnode/ndtxt.cxx
Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
Reviewed-on: https://gerrit.libreoffice.org/2134
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index e9e30a7..46ef849 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2965,9 +2965,8 @@ sal_Bool SwTxtNode::GetExpandTxt( SwTxtNode rDestNd,
const SwIndex* pDestIdx,
sTmpText.SearchAndReplaceAll('\t', ' ');
// mask hidden characters
-const xub_Unicode cChar = CH_TXTATR_BREAKWORD;
-sal_uInt16 nHiddenChrs =
-SwScriptInfo::MaskHiddenRanges( *this, sTmpText, 0, sTmpText.Len(),
cChar );
+const sal_Unicode cChar = CH_TXTATR_BREAKWORD;
+SwScriptInfo::MaskHiddenRanges(*this, sTmpText, 0, sTmpText.Len(), cChar);
sTmpText = sTmpText.Copy( nIdx, nLen );
rDestNd.InsertText( sTmpText, aDestIdx );
@@ -3070,22 +3069,40 @@ sal_Bool SwTxtNode::GetExpandTxt( SwTxtNode rDestNd,
const SwIndex* pDestIdx,
rDestNd.InsertText( GetNumString(), aDestIdx );
}
-if ( nHiddenChrs 0 )
+aDestIdx = 0;
+sal_Int32 nStartDelete(-1);
+while (aDestIdx rDestNd.GetTxt().Len())
{
-aDestIdx = 0;
-while ( aDestIdx rDestNd.GetTxt().Len() )
+sal_Unicode const cur(rDestNd.GetTxt().GetChar(aDestIdx.GetIndex()));
+if ( (cChar == cur) // filter substituted hidden text
+|| (CH_TXT_ATR_FIELDSTART == cur) // filter all fieldmarks
+|| (CH_TXT_ATR_FIELDEND== cur)
+|| (CH_TXT_ATR_FORMELEMENT == cur))
{
-if ( cChar == rDestNd.GetTxt().GetChar( aDestIdx.GetIndex() ) )
+if (-1 == nStartDelete)
{
-xub_StrLen nIndex = aDestIdx.GetIndex();
-while ( nIndex rDestNd.GetTxt().Len()
-cChar == rDestNd.GetTxt().GetChar( ++nIndex ) )
-;
-rDestNd.EraseText( aDestIdx, nIndex - aDestIdx.GetIndex() );
+nStartDelete = aDestIdx.GetIndex(); // start deletion range
}
-else
-++aDestIdx;
+++aDestIdx;
+if (aDestIdx rDestNd.GetTxt().Len())
+{
+continue;
+} // else: end of paragraph = delete, see below
}
+else
+{
+if (-1 == nStartDelete)
+{
+++aDestIdx;
+continue;
+} // else: delete, see below
+}
+assert(-1 != nStartDelete); // without delete range, would have
contined
+rDestNd.EraseText(
+SwIndex(rDestNd, static_castxub_StrLen(nStartDelete)),
+aDestIdx.GetIndex() - nStartDelete);
+assert(aDestIdx.GetIndex() == nStartDelete);
+nStartDelete = -1; // reset
}
return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: make accessibility failed
On 10 February 2013 09:54, Nadav Vinik nadav...@gmail.com wrote: On 9 February 2013 22:45, Michael Stahl mst...@redhat.com wrote: On 09/02/13 20:13, Nadav Vinik wrote: ubuntu 12.10 $ make accessibility Makefile:76: [WARN ] !!![WARN ] !!! The following modules claim to be both dmake and gbuild: *[WARN ] !!! = (1/1) Building module accessibility = Entering /home/nadav/projects/lo-core/accessibility/prj --- force_dmake_to_error Error: No makefile.mk http://makefile.mk found! this problem should be fixed since some weeks ago with commit 11199dd01b909d75e97df9617cc5bbb71c43fe3c are you building an older master revision? No. fresh checkout from master. rm -rf build/ git pull remote: Counting objects: 909, done. remote: Compressing objects: 100% (395/395), done. remote: Total 410 (delta 323), reused 0 (delta 0) Receiving objects: 100% (410/410), 56.59 KiB, done. Resolving deltas: 100% (323/323), completed with 201 local objects. From git://anongit.freedesktop.org/libreoffice/core 03b941e..528467c master - origin/master d13a9d5..1c6f5a1 libreoffice-3-6 - origin/libreoffice-3-6 185e1be..d2c2bd5 libreoffice-4-0 - origin/libreoffice-4-0 Updating 03b941e..528467c ... mkdir build cd build ../autogen.sh --prefix=... ... make ERROR: error 65280 occurred while making /media/debian-home/nadav/projects/lo-core/accessibility/prj it seems that the error is inside 'accessibility', please re-run build inside this module to isolate the error and/or test your fix. --- To rebuild a specific module: make accessibility.clean # optional make accessibility when the problem is isolated and fixed, re-run 'make' make: *** [Makefile] Error 1 -- הבלוג שלי: http://nadavvin.com -- הבלוג שלי: http://nadavvin.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Module_cross_tail_build.mk
Module_cross_tail_build.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 8cefe14f428ab5521f10962ff68b02151d1207ad Author: Tor Lillqvist t...@iki.fi Date: Thu Feb 14 11:28:26 2013 +0200 i18nisolang1 is not a module;) Change-Id: I3e239258e9f5d20c57a46f8c70b0558dfb7813ff diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index b7a077a..c976703 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -74,7 +74,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional_for_host,DESKTOP, \ helpcompiler \ - i18nisolang1 \ l10ntools \ sot \ svtools \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] patch removing Labels.xcu out of configuration
Hi Matus, On Wed, 2013-02-13 at 21:04 +0100, Matúš Kukan wrote: I've finished my first patch on reducing configuration data There were a few corner-case packaging pieces of interest that needed fixing on a from-clean build but it's pushed now :-) Good work, 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] core.git: svx/source
svx/source/svdraw/svdview.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 4fb73c5442d57732abcbba3cec3aeb31f7d65d45 Author: Julien Nabet serval2...@yahoo.fr Date: Tue Feb 12 22:42:45 2013 +0100 MODKEY_BigOrtho is never defined Change-Id: Ifd7c7f634860ced0021bf6c6b99d1e0ea0615a7c Reviewed-on: https://gerrit.libreoffice.org/2126 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 39b0e99..b9c9f99 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -770,9 +770,6 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent rVEvt) #ifdef MODKEY_Ortho SetOrtho(MODKEY_Ortho!=IsOrthoDesired()); #endif -#ifdef MODKEY_BigOrtho -SetBigOrtho(MODKEY_BigOrtho); -#endif #ifdef MODKEY_AngleSnap SetAngleSnapEnabled(MODKEY_AngleSnap); #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cb4b27a7f8ad7db7a31c95db6d71f871e89bac7f Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 14 09:49:30 2013 + Updated core Project: help f7693017b6f2faa411a75a1827b2dcbcd8c9ca17 diff --git a/helpcontent2 b/helpcontent2 index 0142ad1..f769301 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0142ad19adb30534ba07908356f9139f0257c808 +Subproject commit f7693017b6f2faa411a75a1827b2dcbcd8c9ca17 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/shared/optionen/macrosecurity_sl.xhp | 11 ++- 2 files changed, 6 insertions(+), 10 deletions(-) New commits: commit f7693017b6f2faa411a75a1827b2dcbcd8c9ca17 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 14 09:49:30 2013 + update help ids for macro security page .ui conversion Change-Id: I7a7c19ca2a2f25ec93975e48b2914dcd56417434 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index c0792ac..bb1cb5f 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -4061,7 +4061,6 @@ HID_XMLSEC_TP_CERTPATH,43074, HID_XMLSEC_TP_DETAILS,43073, HID_XMLSEC_TP_GENERAL,43072, HID_XMLSEC_TP_MACROSEC,43068, -HID_XMLSEC_TP_SECLEVEL,43069, HID_XMLSEC_TP_TRUSTSOURCES,43070, HID_XML_FILTER_APPLICATION,64064, HID_XML_FILTER_DESCRIPTION,64067, @@ -9361,10 +9360,6 @@ xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_FL_REMOVE_TRUSTFILELOC,55339060 xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_PB_ADD_TRUSTCERT,553390595, xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_PB_REMOVE_TRUSTCERT,553390597, xmlsecurity_PushButton_RID_XMLSECTP_TRUSTSOURCES_PB_VIEW_TRUSTCERT,553390596, -xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_HIGH,553370115, -xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_LOW,553370117, -xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_MEDIUM,553370116, -xmlsecurity_RadioButton_RID_XMLSECTP_SECLEVEL_RB_VERYHIGH,553370114, FID_PASTE_CONTENTS,,.uno:PasteSpecial FN_INSERT_FIELD_DATA_ONLY(),,.uno:InsertFieldDataOnly FN_NAME_GROUP,,.uno:NameGroup diff --git a/source/text/shared/optionen/macrosecurity_sl.xhp b/source/text/shared/optionen/macrosecurity_sl.xhp index a00a176..21e4e2a 100644 --- a/source/text/shared/optionen/macrosecurity_sl.xhp +++ b/source/text/shared/optionen/macrosecurity_sl.xhp @@ -30,23 +30,24 @@ bookmark xml-lang=en-US branch=index id=bm_id1203039bookmark_valuesecurity;security levels for macros/bookmark_value bookmark_valuemacros;security levels/bookmark_value bookmark_valuelevels;macro security/bookmark_value -/bookmarkcommentMW added 3 index entries/comment +/bookmark +bookmark xml-lang=en-US branch=hid/xmlsec/ui/securitylevelpage/SecurityLevelPage id=bm_id7283548 localize=false/ paragraph role=heading id=par_idN10549 xml-lang=en-US level=1 l10n=NEWvariable id=macrosecurity_sllink href=text/shared/optionen/macrosecurity_sl.xhpSecurity Level/link /variable/paragraph paragraph role=paragraph id=par_idN10567 xml-lang=en-US l10n=NEWSelect the link href=text/shared/optionen/macrosecurity.xhpmacro security/link level from one of four options. The options differ according to the security level. Macros that are allowed to run on a higher security level are also allowed to run in all lower levels./paragraph -bookmark xml-lang=en-US branch=hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH id=bm_id7283547 localize=false/ +bookmark xml-lang=en-US branch=hid/xmlsec/ui/securitylevelpage/vhigh id=bm_id7283547 localize=false/ paragraph role=heading id=par_idN10578 xml-lang=en-US level=2 l10n=NEWVery high/paragraph paragraph role=paragraph id=par_idN1057C xml-lang=en-US l10n=NEWOnly macros from trusted file locations are allowed to run. All other macros, regardless of whether they are signed or not, are disabled.commentUFI: for each option, the first para is copied from the string table./comment/paragraph paragraph role=paragraph id=par_idN10591 xml-lang=en-US l10n=NEWahelp hid=.Trusted file locations can be set on the Trusted Sources tab page. Any macro from a trusted file location is allowed to run./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH id=bm_id2273934 localize=false/ +bookmark xml-lang=en-US branch=hid/xmlsec/ui/securitylevelpage/high id=bm_id2273934 localize=false/ paragraph role=heading id=par_idN105A2 xml-lang=en-US level=2 l10n=NEWHigh/paragraph paragraph role=paragraph id=par_idN105A6 xml-lang=en-US l10n=NEWOnly signed macros from trusted sources are allowed to run. Unsigned macros are disabled./paragraph paragraph role=paragraph id=par_idN105A9 xml-lang=en-US l10n=NEWahelp hid=.Trusted sources can be set on the Trusted Sources tab page. Only signed macros from a trusted source are allowed to run. In addition, any macro from a trusted file location is allowed to run./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM id=bm_id7128818 localize=false/ +bookmark xml-lang=en-US branch=hid/xmlsec/ui/securitylevelpage/med id=bm_id7128818 localize=false/ paragraph role=heading id=par_idN105BA xml-lang=en-US level=2 l10n=NEWMedium/paragraph paragraph role=paragraph id=par_idN105BE xml-lang=en-US l10n=NEWConfirmation required before executing macros from unknown sources./paragraph paragraph role=paragraph id=par_idN105C1 xml-lang=en-US l10n=NEWahelp hid=.Trusted sources can be set
RE: [PUSHED] patch removing Labels.xcu out of configuration
Hi Matus, I've finished my first patch on reducing configuration data There were a few corner-case packaging pieces of interest that needed fixing on a from-clean build but it's pushed now :-) A great improvement! If there are any leftovers (like perhaps the not being able to save modified labels, as I read somewhere in your mails) for which you don't have time or interest to look into yourself, I'm willing to assist. (That is on the C++ part, makefile changes look a bit difficult to me.) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Fwd: Re: [Libreoffice-qa] minutes of ESC call ...]
This offer probably better fits to the developers mailing list. Do we have any preferred way to handle sponsoring request for a particular feature, please? Best Regards, Petr Přeposlaná zpráva Od: Fernand Vanrie s...@pmgroup.be Komu: libreoffice...@lists.freedesktop.org Předmět: Re: [Libreoffice-qa] minutes of ESC call ... Datum: Thu, 07 Feb 2013 17:46:29 +0100 On 7/02/2013 17:04, Michael Meeks wrote: + MySQL connector - can/will/where to ship it (Lionel) + just needs to be re-compiled vs. not having stlport + needs a volunteer to do that. do not know what knowledge is needed, bur our Campagny is willing to sponsoring this exentsion also for future releases so a volunteer can contact us ! greetz Fernand ___ List Name: Libreoffice-qa mailing list Mail address: libreoffice...@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk sd/source
configure.ac |2 sd/CppunitTest_sd_uimpress.mk | 11 ++ sd/Library_sd.mk | 20 sd/source/ui/remotecontrol/BluetoothServer.cxx | 116 +++-- 4 files changed, 143 insertions(+), 6 deletions(-) New commits: commit 100ac0876f1038aea7e7ef56f95d008ecc6aea3d Author: Tor Lillqvist t...@iki.fi Date: Thu Feb 14 12:00:11 2013 +0200 Start on Bluetooth code for the Impress Remote for OS X Work in progress. It sets up the SDP service record and registers it, and that seems to work. Does not do anything with it yet. I wonder if the current approach to use the standard SerialPort service class will work for Macs, as they by default have one SerialPort service running, Bluetooth-PDA-Sync, whatever that is. There is no code in the Android app to handle the case of there being several Serial Port services on the computer it wants to connect to, so what happens then when there are two will be interesting to see. (I can't find in the Android API any way to enumerate services that use the same service class. If there was, the app could choose the correct one based on its name.) So probably we should pretty soon switch to using a dedicated service class UUID instead of using the standard serial port one. As we already have the app out in the wild it will probably have to be modified to look for both Serial Port and our own service then? Sigh. Change-Id: I1bee6403642e9b8953b5a8fa8fb5fe6a9dc76a09 diff --git a/configure.ac b/configure.ac index 1436110..a23e8d4 100644 --- a/configure.ac +++ b/configure.ac @@ -9654,7 +9654,7 @@ if test -n $enable_sdremote -a $enable_sdremote != no; then # If not explicitly enabled or disabled, default if test -z $enable_sdremote_bluetooth; then case $OS in -LINUX|WNT) +LINUX|MACOSX|WNT) # Default to yes for these enable_sdremote_bluetooth=yes ;; diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index f41a4fb..64e21cc 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -81,6 +81,17 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\ )) endif +ifeq ($(OS),MACOSX) +$(eval $(call gb_CppunitTest_add_libs,sd_uimpress,\ + -lobjc \ +)) + +$(eval $(call gb_CppunitTest_use_system_darwin_frameworks,sd_uimpress,\ + Foundation \ + IOBluetooth \ +)) +endif + $(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\ boost_headers \ gtk \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index e2640dd..679c836 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -532,10 +532,30 @@ $(eval $(call gb_Library_add_defs,sd,\ )) ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) + +ifeq (,$(filter IOS MACOSX,$(OS))) + $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ )) +else + +$(eval $(call gb_Library_add_objcxxobjects,sd,\ +sd/source/ui/remotecontrol/BluetoothServer \ +)) + +$(eval $(call gb_Library_add_libs,sd,\ +-lobjc \ +)) + +$(eval $(call gb_Library_use_system_darwin_frameworks,sd,\ + Foundation \ + IOBluetooth \ +)) + +endif + $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 735777f..7677e64 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -8,7 +8,7 @@ */ #include BluetoothServer.hxx -#include BluetoothServiceRecord.hxx + #include stdio.h #include sal/log.hxx @@ -28,6 +28,7 @@ #ifndef DBusGObjectPath #define DBusGObjectPath char // DBusGObjectPath is only present in newer version of dbus-glib #endif + #include BluetoothServiceRecord.hxx #endif #ifdef WIN32 @@ -38,6 +39,12 @@ #include ws2bth.h #endif +#ifdef MACOSX + #include premac.h + #include IOBluetooth/IOBluetooth.h + #include postmac.h +#endif + #ifdef __MINGW32__ // Value taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms738518%28v=vs.85%29.aspx #define NS_BTH 16 @@ -243,7 +250,6 @@ void BluetoothServer::setDiscoverable( bool aDiscoverable ) dbus_g_connection_unref( aConnection ); #else // defined(LINUX) defined(ENABLE_DBUS) (void) aDiscoverable; // avoid warnings -return; #endif } @@ -337,7 +343,6 @@ void SAL_CALL BluetoothServer::run() } } -// LINUX ENABLE_DBUS #elif defined(WIN32) WORD wVersionRequested; WSADATA wsaData; @@ -430,8 +435,109 @@ void SAL_CALL BluetoothServer::run() } } -// WIN32 -#else // !((defined(LINUX) !defined(__FreeBSD_kernel__)) defined(ENABLE_DBUS)) !defined(WIN32) +#elif defined(MACOSX) +// Build up dictionary at run-time
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cbc96131fd1cf57ee4da6cdad5306d4f30841005 Author: Andras Timar ati...@suse.com Date: Thu Feb 14 11:12:53 2013 +0100 Updated core Project: help ee22530d05859a866bb47700dbd885e0c94e diff --git a/helpcontent2 b/helpcontent2 index f769301..ee22530 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f7693017b6f2faa411a75a1827b2dcbcd8c9ca17 +Subproject commit ee22530d05859a866bb47700dbd885e0c94e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05030600.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee22530d05859a866bb47700dbd885e0c94e Author: Andras Timar ati...@suse.com Date: Thu Feb 14 11:12:53 2013 +0100 fix duplicated id in help Change-Id: I6b18352025549c4b1d3440abe236c1b7c4a60799 diff --git a/source/text/shared/01/05030600.xhp b/source/text/shared/01/05030600.xhp index 2385a5c..47a9998 100644 --- a/source/text/shared/01/05030600.xhp +++ b/source/text/shared/01/05030600.xhp @@ -85,7 +85,7 @@ case select=WRITER paragraph xml-lang=en-US id=hd_id3151246 role=heading level=2 l10n=UUsing a Gradient as a Background/paragraph paragraph xml-lang=en-US id=hd_id3153525 role=heading level=3 l10n=UBackground gradient/paragraph -paragraph xml-lang=en-US id=par_id3152361 role=paragraph l10n=Uahelp hid=cui/ui/backgroundpage/gradientslbClick the gradient that you want to use as a background. To remove a background gradient, set emphAs/emph to emphColor/emph, then click emphNo Fill/emph./ahelp/paragraph +paragraph xml-lang=en-US id=par_id3152364 role=paragraph l10n=Uahelp hid=cui/ui/backgroundpage/gradientslbClick the gradient that you want to use as a background. To remove a background gradient, set emphAs/emph to emphColor/emph, then click emphNo Fill/emph./ahelp/paragraph paragraph xml-lang=en-US id=hd_id3153526 role=heading level=3 l10n=UPreview field/paragraph paragraph xml-lang=en-US id=par_id3152362 role=paragraph l10n=Uahelp hid=cui/ui/backgroundpage/previewctlDisplays a preview of the currently selected gradient./ahelp/paragraph /case ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/config/cache/filtercache.cxx | 98 +++
filter/source/config/cache/filterfactory.cxx |6 -
filter/source/svg/svgwriter.cxx | 14 ---
3 files changed, 31 insertions(+), 87 deletions(-)
New commits:
commit 76254d6c01cdf240aa9058949a2fccbd3ac48818
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Tue Feb 12 07:37:51 2013 -0200
fdo#57950: Remove some chained appends in filter
Change-Id: I2386eb47ad7190d626966020e96c1a7ddc07ab4a
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index 7ae9377..4b197c2 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -412,11 +412,9 @@ CacheItem FilterCache::getItem( EItemType
eType,
if ( !bIsHelpFilter !impl_isModuleInstalled(sDocService) )
{
-::rtl::OUStringBuffer sMsg(256);
-sMsg.appendAscii(The requested filter '
);
-sMsg.append (sItem
);
-sMsg.appendAscii(' exists ... but it shouldnt; because the
corresponding OOo module was not installed.);
-throw
css::container::NoSuchElementException(sMsg.makeStringAndClear(),
css::uno::Reference css::uno::XInterface ());
+OUString sMsg(The requested filter ' + sItem +
+ ' exists ... but it shouldnt; because the
corresponding LibreOffice module was not installed.);
+throw css::container::NoSuchElementException(sMsg,
css::uno::Reference css::uno::XInterface ());
}
}
@@ -1039,7 +1037,7 @@ void FilterCache::impl_validateAndOptimize()
// If there are some real errors throw a RuntimException!
// If there are some warnings only, show an assertion.
sal_Int32 nErrors = 0;
-::rtl::OUStringBuffer sLog(256);
+OUStringBuffer sLog(256);
CacheItemList::iterator pIt;
@@ -1074,19 +1072,13 @@ void FilterCache::impl_validateAndOptimize()
aType[PROPNAME_NAME] = sInternalTypeNameCheck;
if (!sInternalTypeNameCheck.equals(sType))
{
-sLog.appendAscii(Warning\t:\t);
-sLog.appendAscii(The type \ );
-sLog.append (sType );
-sLog.appendAscii(\ does support the property \Name\
correctly.\n);
+sLog.append(Warning\t:\t The type \ + sType + \ does
support the property \Name\ correctly.\n);
++nWarnings;
}
if (!ce !cu)
{
-sLog.appendAscii(Warning\t:\t);
-sLog.appendAscii(The type \ );
-sLog.append (sType );
-sLog.appendAscii(\ does not contain any URL pattern nor any
extensions.\n);
+sLog.append(Warning\t:\t The type \ + sType + \ does not
contain any URL pattern nor any extensions.\n);
++nWarnings;
}
#endif
@@ -1162,10 +1154,7 @@ void FilterCache::impl_validateAndOptimize()
(!bReferencedByHandler)
)
{
-sLog.appendAscii(Warning\t:\t
);
-sLog.appendAscii(The type \
);
-sLog.append (sType
);
-sLog.appendAscii(\ isnt used by any filter, loader or
content handler.\n);
+sLog.append(Warning\t:\t The type \ + sType + \ isnt
used by any filter, loader or content handler.\n);
++nWarnings;
}
}
@@ -1178,20 +1167,15 @@ void FilterCache::impl_validateAndOptimize()
if (bAllFiltersShouldExist)
{
++nWarnings; // preferred filters can point to a
non-installed office module ! no error ... it's a warning only .-(
-sLog.appendAscii(error\t:\t);
+sLog.append(error\t:\t);
}
else
{
++nWarnings;
-sLog.appendAscii(warning\t:\t);
+sLog.append(warning\t:\t);
}
-sLog.appendAscii(The type \ );
-sLog.append (sType );
-sLog.appendAscii(\ points to an invalid filter \);
-sLog.append (sPrefFilter);
-sLog.appendAscii(\.\n);
-
+sLog.append(The type \ + sType + \ points to an invalid
filter \ + sPrefFilter + \.\n);
continue;
}
@@ -1200,14 +1184,8 @@ void FilterCache::impl_validateAndOptimize()
aPrefFilter[PROPNAME_TYPE] = sFilterTypeReg;
RE: [PUSHED] patch removing Labels.xcu out of configuration
On Thu, 2013-02-14 at 11:00 +0100, Winfried Donkers wrote: A great improvement! Hey - glad you're watching :-) If there are any leftovers (like perhaps the not being able to save modified labels, as I read somewhere in your mails) for which you don't have time or interest to look into yourself, I'm willing to assist. So - at least for me adding an entirely new label worked perfectly and was serialised nicely. I didn't try modifying an existing label - it'd be great to double-check that I suppose (or better write a unit test for it ;-). (That is on the C++ part, makefile changes look a bit difficult to me.) Heh, luckily Matus is a gnumake expert, so that's good. Thanks for helping out ! 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] core.git: 3 commits - cui/source cui/uiconfig
cui/source/tabpages/backgrnd.cxx | 64 +-
cui/uiconfig/ui/backgroundpage.ui | 30 ++---
2 files changed, 73 insertions(+), 21 deletions(-)
New commits:
commit 8a1f3b582d7e8ce46e310bf3e0fdbf3ee26c1712
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Feb 14 12:13:16 2013 +0100
SvxBackgroundTabPage: use XFillStyle enum
Change-Id: I8fb8765ed6ee2f879a170f4f9c51ee05b695304a
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 8309d1b..9c139e3 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -117,6 +117,23 @@ static void lcl_SetTransparency(SvxBrushItem rBrush, long
nTransparency)
aTransparency = (sal_Int8)nTransparency;
rBrush.PutValue(aTransparency, MID_GRAPHIC_TRANSPARENCY);
}
+
+/// Returns the fill style of the currently selected entry.
+static XFillStyle lcl_getFillStyle(ListBox* pLbSelect)
+{
+return
(XFillStyle)(sal_uLong)pLbSelect-GetEntryData(pLbSelect-GetSelectEntryPos());
+}
+
+// Selects the entry matching the specified fill style.
+static void lcl_setFillStyle(ListBox* pLbSelect, XFillStyle eStyle)
+{
+for (int i = 0; i pLbSelect-GetEntryCount(); ++i)
+if ((XFillStyle)(sal_uLong)pLbSelect-GetEntryData(i) == eStyle)
+{
+pLbSelect-SelectEntryPos(i);
+return;
+}
+}
//-
sal_uInt16 GetItemId_Impl( ValueSet rValueSet, const Color rCol )
@@ -537,7 +554,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet rSet )
{
m_pSelectTxt-Hide();
m_pLbSelect-Hide();
-m_pLbSelect-SelectEntryPos( 0 );
+lcl_setFillStyle(m_pLbSelect, XFILL_SOLID);
ShowColorUI_Impl();
const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_BRUSH );
@@ -664,7 +681,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const
SfxItemSet rSet )
}
else
{
-m_pLbSelect-SelectEntryPos( 0 );
+lcl_setFillStyle(m_pLbSelect, XFILL_SOLID);
ShowColorUI_Impl();
const SfxPoolItem* pOld = GetOldItem( rSet, SID_VIEW_FLD_PIC );
@@ -758,8 +775,8 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet
rCoreSet )
{
const SvxBrushItem rOldItem= (const SvxBrushItem)*pOld;
SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos();
-const sal_Bool bIsBrush= ( 0 ==
m_pLbSelect-GetSelectEntryPos() );
-const bool bIsGradient = ( 2 == m_pLbSelect-GetSelectEntryPos() );
+const sal_Bool bIsBrush= ( XFILL_SOLID ==
lcl_getFillStyle(m_pLbSelect) );
+const bool bIsGradient = ( XFILL_GRADIENT ==
lcl_getFillStyle(m_pLbSelect) );
// transparency has to be set if enabled, the color not already set to
No fill and
if( bColTransparency
@@ -990,7 +1007,7 @@ sal_Bool
SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet rCoreSe
SvxBrushItemrOldItem( (const CntWallpaperItem)*pOld, nWhich );
SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos();
-const sal_Bool bIsBrush= ( 0 ==
m_pLbSelect-GetSelectEntryPos() );
+const sal_Bool bIsBrush= ( XFILL_SOLID ==
lcl_getFillStyle(m_pLbSelect) );
sal_BoolbModified = sal_False;
if ( ( (GPOS_NONE == eOldPos) bIsBrush )
@@ -1395,12 +1412,12 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage,
BackgroundColorHdl_Impl)
IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl)
{
-if ( 0 == m_pLbSelect-GetSelectEntryPos() )
+if ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) )
{
ShowColorUI_Impl();
m_pParaLBox-Enable(); // drawing background can't be a bitmap
}
-else if ( 1 == m_pLbSelect-GetSelectEntryPos() )
+else if ( XFILL_BITMAP == lcl_getFillStyle(m_pLbSelect) )
{
ShowBitmapUI_Impl();
m_pParaLBox-Enable(sal_False); // drawing background can't be a bitmap
@@ -1649,7 +1666,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl,
ListBox*, pBox )
pTableBck_Impl-nActPos = nSelPos;
if(!*pActItem)
*pActItem = new SvxBrushItem(nWhich);
-if(0 == m_pLbSelect-GetSelectEntryPos()) // brush selected
+if(XFILL_SOLID == lcl_getFillStyle(m_pLbSelect)) // brush selected
{
**pActItem = SvxBrushItem( aBgdColor, nWhich );
}
@@ -1719,7 +1736,7 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl,
ListBox*, pBox )
break;
}
pParaBck_Impl-nActPos = nSelPos;
-if(0 == m_pLbSelect-GetSelectEntryPos()) // brush selected
+if(XFILL_SOLID == lcl_getFillStyle(m_pLbSelect)) // brush selected
{
sal_uInt16 nWhich = (*pActItem)-Which();
**pActItem = SvxBrushItem( aBgdColor, nWhich );
@@ -1786,7 +1803,7 @@ void
[Libreoffice-commits] core.git: Module_cross_tail_build.mk
Module_cross_tail_build.mk |2 -- 1 file changed, 2 deletions(-) New commits: commit f0bfc7d860548f60650cf543bbf886f7f7419b6d Author: Tor Lillqvist t...@iki.fi Date: Thu Feb 14 13:54:04 2013 +0200 tools and unotools are already mentioned Change-Id: I5600730c9f655cd2ee0cf59beca9f8d1247c5e34 diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index c976703..adcdfa8 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -78,8 +78,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ sot \ svtools \ toolkit \ - tools \ - unotools \ vcl) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] patch removing Labels.xcu out of configuration
On 14 February 2013 11:00, Winfried Donkers w.donk...@dci-electronics.nl wrote: A great improvement! If there are any leftovers (like perhaps the not being able to save modified labels, as I read somewhere in your mails) for which you don't have time or interest to look into yourself, I'm willing to assist. (That is on the C++ part, makefile changes look a bit difficult to me.) Well, overwriting existing labels does not work I think, but it did not before either, so.. I think that's fine. If you would like to fix this, poke IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) in sw/source/ui/envelp/labfmt.cxx Maybe if(RET_YES != eRet) makes it return before saving ? Really no idea what's going on. I did not try to debug. Anyhow, always good to test changes, so if you want, please do. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - libcmis/libcmis-0.3.0-lotus-live-fix.patch libcmis/UnpackedTarball_cmis.mk sfx2/source ucb/source
libcmis/UnpackedTarball_cmis.mk|1
libcmis/libcmis-0.3.0-lotus-live-fix.patch | 122 +
sfx2/source/view/sfxbasecontroller.cxx |2
ucb/source/ucp/cmis/cmis_content.cxx | 138 +++--
ucb/source/ucp/cmis/cmis_content.hxx |2
ucb/source/ucp/cmis/cmis_url.cxx | 35 +--
6 files changed, 262 insertions(+), 38 deletions(-)
New commits:
commit d242d9e1efc7ecd4f9980190bbc53af9630baac7
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Feb 14 10:27:21 2013 +0100
CMIS: made it work with Lotus Live
Making libcmis and LibreOffice work with Lotus Live service needed a few
hacks to either better implement CMIS or workaround some bad
implementations.
As a general improvement, the CheckOut InfoBar isn't shown if the
document can't be checked out.
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk
index a25c316..0a9f9f8 100644
--- a/libcmis/UnpackedTarball_cmis.mk
+++ b/libcmis/UnpackedTarball_cmis.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
libcmis/libcmis-0.3.0-win.patch \
libcmis/libcmis-0.3.0.patch \
libcmis/libcmis-0.3.0-proxy.patch \
+ libcmis/libcmis-0.3.0-lotus-live-fix.patch \
))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/libcmis/libcmis-0.3.0-lotus-live-fix.patch
b/libcmis/libcmis-0.3.0-lotus-live-fix.patch
new file mode 100644
index 000..2aca934
--- /dev/null
+++ b/libcmis/libcmis-0.3.0-lotus-live-fix.patch
@@ -0,0 +1,122 @@
+diff --git src/libcmis/atom-folder.cxx src/libcmis/atom-folder.cxx
+index 68fb124..2756a5d 100644
+--- src/libcmis/atom-folder.cxx
src/libcmis/atom-folder.cxx
+@@ -57,8 +57,11 @@ vector libcmis::ObjectPtr AtomFolder::getChildren( )
throw ( libcmis::Excepti
+ {
+ AtomLink* childrenLink = getLink( down,
application/atom+xml;type=feed );
+
++// Some servers aren't giving the GetChildren properly... if not defined,
we need to try
++// as we may have the right to proceed.
+ if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get()
+-!getAllowableActions()-isAllowed(
libcmis::ObjectAction::GetChildren ) ) )
++( !getAllowableActions()-isAllowed(
libcmis::ObjectAction::GetChildren )
++ getAllowableActions()-isDefined(
libcmis::ObjectAction::GetChildren ) ) ) )
+ throw libcmis::Exception( string( GetChildren not allowed on node
) + getId() );
+
+ vector libcmis::ObjectPtr children;
+@@ -182,7 +185,8 @@ libcmis::DocumentPtr AtomFolder::createDocument( const
map string, libcmis::Pro
+ AtomLink* childrenLink = getLink( down,
application/atom+xml;type=feed );
+
+ if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get()
+-!getAllowableActions()-isAllowed(
libcmis::ObjectAction::CreateDocument ) ) )
++!getAllowableActions()-isAllowed(
libcmis::ObjectAction::CreateDocument )
++getAllowableActions()-isDefined(
libcmis::ObjectAction::CreateDocument ) ) )
+ throw libcmis::Exception( string( CreateDocument not allowed on
folder ) + getId() );
+
+ xmlBufferPtr buf = xmlBufferCreate( );
+@@ -210,9 +214,37 @@ libcmis::DocumentPtr AtomFolder::createDocument( const
map string, libcmis::Pro
+ }
+
+ string respBuf = response-getStream( )-str( );
+-xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, 0 );
++xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, XML_PARSE_NOERROR );
+ if ( NULL == doc )
+-throw libcmis::Exception( Failed to parse object infos );
++{
++// We may not have the created document entry in the response body:
this is
++// the behaviour of some servers, but the standard says we need to
look for
++// the Location header.
++map string, string headers = response-getHeaders( );
++map string, string ::iterator it = headers.find( Location );
++
++// Some servers like Lotus Live aren't sending Location header, but
Content-Location
++if ( it == headers.end( ) )
++it = headers.find( Content-Location );
++
++if ( it != headers.end() )
++{
++try
++{
++response = getSession( )-httpGetRequest( it-second );
++respBuf = response-getStream( )-str( );
++doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, XML_PARSE_NOERROR );
++}
++catch ( const CurlException e )
++{
++throw e.getCmisException( );
++}
++}
++
++// if doc is still NULL after that, then throw an exception
++if ( NULL == doc )
++throw libcmis::Exception( Missing expected response from server
);
++}
+
+
Re: patch removing Labels.xcu out of configuration
On 13 February 2013 22:05, Michael Meeks michael.me...@suse.com wrote:
Wrt. the saving issue - it'd be interesting to see what happens in
SwLabelConfig::SaveLabel as you step through that when clicking 'Ok' in
the relevant dialog. Are we failing to add the node ? are we somehow not
committing it or something ?
Committing reminds me of
-voidSwLabelConfig::Commit()
-{
-// the config item is not writable yet
-}
But if you can't write config items, how would creating new labels work ?
Anyhow thanks for cleanups, testing and pushing.
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UI_cui.mk
cui/UI_cui.mk |1
cui/source/inc/helpid.hrc |1
cui/source/inc/paragrph.hxx| 10 +---
cui/source/tabpages/paragrph.cxx | 40 -
cui/source/tabpages/paragrph.hrc |8 ---
cui/source/tabpages/paragrph.src | 37
cui/uiconfig/ui/asiantypography.ui | 85 +
7 files changed, 109 insertions(+), 73 deletions(-)
New commits:
commit 6f1a99392a4c12bd17aa844726c528f773261047
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 14 12:42:34 2013 +
TriState boxes created via the builder default to STATE_DONTKNOW
while classic ones default to false, easiest thing to do here
is to simply only query for their value if enabled
Change-Id: I5b01d344a5310b9bbd8d59e9c53bef1a6bfee1ce
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index e67692a..f041f41 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -273,7 +273,6 @@
#define HID_MEASURE_CTL_PREVIEW CUI_HID_MEASURE_CTL_PREVIEW
#define HID_FORMAT_PARAGRAPH_EXT CUI_HID_FORMAT_PARAGRAPH_EXT
#define HID_FORMAT_PARAGRAPH_ALIGN CUI_HID_FORMAT_PARAGRAPH_ALIGN
-#define HID_SVXPAGE_PARA_ASIAN CUI_HID_SVXPAGE_PARA_ASIAN
#define HID_SVXPAGE_SWPOSSIZE CUI_HID_SVXPAGE_SWPOSSIZE
#define HID_AREA_TRANSPARENCE CUI_HID_AREA_TRANSPARENCE
#define HID_AREA_AREA CUI_HID_AREA_AREA
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 96753dd..cf8ded0 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2253,12 +2253,12 @@ sal_uInt16* SvxAsianTabPage::GetRanges()
};
return pRanges;
}
-//FIXME: This crash in Calc, but works in Writer/Draw/Impress
-sal_BoolSvxAsianTabPage::FillItemSet( SfxItemSet rSet )
+
+sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet rSet )
{
sal_Bool bRet = sal_False;
SfxItemPool* pPool = rSet.GetPool();
-if(m_pScriptSpaceCB-IsChecked() != m_pScriptSpaceCB-GetSavedValue())
+if (m_pScriptSpaceCB-IsEnabled() m_pScriptSpaceCB-IsChecked() !=
m_pScriptSpaceCB-GetSavedValue())
{
SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
pPool-GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone();
@@ -2267,7 +2267,7 @@ sal_BoolSvxAsianTabPage::FillItemSet( SfxItemSet
rSet )
delete pNewItem;
bRet = sal_True;
}
-if(m_pHangingPunctCB-IsChecked() != m_pHangingPunctCB-GetSavedValue())
+if (m_pHangingPunctCB-IsEnabled() m_pHangingPunctCB-IsChecked() !=
m_pHangingPunctCB-GetSavedValue())
{
SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
pPool-GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone();
@@ -2276,7 +2276,7 @@ sal_BoolSvxAsianTabPage::FillItemSet( SfxItemSet
rSet )
delete pNewItem;
bRet = sal_True;
}
-if(m_pForbiddenRulesCB-IsChecked() !=
m_pForbiddenRulesCB-GetSavedValue())
+if (m_pForbiddenRulesCB-IsEnabled() m_pForbiddenRulesCB-IsChecked()
!= m_pForbiddenRulesCB-GetSavedValue())
{
SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
pPool-GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone();
diff --git a/cui/uiconfig/ui/asiantypography.ui
b/cui/uiconfig/ui/asiantypography.ui
index eeeb7a4..012ad37 100644
--- a/cui/uiconfig/ui/asiantypography.ui
+++ b/cui/uiconfig/ui/asiantypography.ui
@@ -11,12 +11,14 @@
object class=GtkAlignment id=alignment1
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=top_padding6/property
property name=left_padding12/property
child
object class=GtkBox id=box1
property name=visibleTrue/property
property name=can_focusFalse/property
property name=orientationvertical/property
+property name=spacing6/property
child
object class=GtkCheckButton id=checkForbidList
property name=label translatable=yesApply list of
forbidden characters to the beginning and end of lines/property
commit 4b21195e883472d020e18332976c35ad01393da9
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Mon Feb 11 21:41:19 2013 -0200
Widget for asian typography
Change-Id: I70535593c3e06caca48ae8bc8b9476ae09210df8
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index f4af231..5799a87 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UI_UI,cui))
$(eval $(call gb_UI_add_uifiles,cui,\
+ cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/charnamepage \
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index ae9904f..045a29d 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -278,17 +278,15 @@ private:
RE: [PUSHED] patch removing Labels.xcu out of configuration
Hi Matus, Well, overwriting existing labels does not work I think, but it did not before either, so.. I think that's fine. If you would like to fix this, poke IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) in sw/source/ui/envelp/labfmt.cxx Maybe if(RET_YES != eRet) makes it return before saving ? Really no idea what's going on. I did not try to debug. Anyhow, always good to test changes, so if you want, please do. I will look into it. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-3-6' - dictionaries/en dictionaries/hu_HU dictionaries/ru_RU
dictionaries/en/Lightproof.py |6 +++--- dictionaries/en/Linguistic.xcu|2 +- dictionaries/en/description.xml |2 +- dictionaries/en/dialog/OptionsDialog.xcu |2 +- dictionaries/en/pythonpath/lightproof_handler_en.py |2 +- dictionaries/hu_HU/Lightproof.py |6 +++--- dictionaries/hu_HU/Linguistic.xcu |2 +- dictionaries/hu_HU/description.xml|2 +- dictionaries/hu_HU/dialog/OptionsDialog.xcu |2 +- dictionaries/hu_HU/pythonpath/lightproof_handler_hu_HU.py |2 +- dictionaries/ru_RU/Lightproof.py |6 +++--- dictionaries/ru_RU/Linguistic.xcu |2 +- dictionaries/ru_RU/description.xml|2 +- dictionaries/ru_RU/dialog/OptionsDialog.xcu |2 +- dictionaries/ru_RU/pythonpath/lightproof_handler_ru_RU.py |2 +- 15 files changed, 21 insertions(+), 21 deletions(-) New commits: commit dcb0157e37ca1746c6ada9cb0cbcadbfdfe6251e Author: Stephan Bergmann sberg...@redhat.com Date: Fri Feb 8 09:12:31 2013 +0100 fdo#60139: Rename bundled extensions's Lightproof service implementation names ... from org.openoffice.comp.pyuno.Lightproof... to org.libreoffice.comp.pyuno.Lightproof... (and increment the corresponding extensions' version numbers) to avoid clashes with any freestanding Lightproof extension. (cherry picked from commit 350dc590b04041f15d6c570075ade425e4db93ad) Conflicts: en/Lightproof.py en/Linguistic.xcu en/description.xml en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu en/pythonpath/lightproof_handler_en.py hu_HU/Lightproof.py hu_HU/Linguistic.xcu hu_HU/description.xml hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu hu_HU/pythonpath/lightproof_handler_hu_HU.py pt_BR/Lightproof.py pt_BR/Linguistic.xcu pt_BR/description.xml pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu pt_BR/pythonpath/lightproof_handler_pt_BR.py ru_RU/Lightproof.py ru_RU/Linguistic.xcu ru_RU/description.xml ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu ru_RU/pythonpath/lightproof_handler_ru_RU.py Change-Id: I6754cd6d4aa0aad6147bc9e404a29ef1075a2548 Reviewed-on: https://gerrit.libreoffice.org/2033 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Miklos Vajna vmik...@suse.cz Reviewed-by: Miklos Vajna vmik...@suse.cz diff --git a/dictionaries/en/Lightproof.py b/dictionaries/en/Lightproof.py index 38a7360..825adcf 100644 --- a/dictionaries/en/Lightproof.py +++ b/dictionaries/en/Lightproof.py @@ -232,7 +232,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer global SMGR self.ctx = ctx self.ServiceName = com.sun.star.linguistic2.Proofreader -self.ImplementationName = org.openoffice.comp.pyuno.Lightproof. + pkg +self.ImplementationName = org.libreoffice.comp.pyuno.Lightproof. + pkg self.SupportedServiceNames = (self.ServiceName, ) self.locales = [] for i in locales: @@ -314,11 +314,11 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer g_ImplementationHelper = unohelper.ImplementationHelper() g_ImplementationHelper.addImplementation( Lightproof, \ -org.openoffice.comp.pyuno.Lightproof. + pkg, +org.libreoffice.comp.pyuno.Lightproof. + pkg, (com.sun.star.linguistic2.Proofreader,),) g_ImplementationHelper.addImplementation( lightproof_handler_en.LightproofOptionsEventHandler, \ -org.openoffice.comp.pyuno.LightproofOptionsEventHandler. + pkg, +org.libreoffice.comp.pyuno.LightproofOptionsEventHandler. + pkg, (com.sun.star.awt.XContainerWindowEventHandler,),) # pattern matching for common English abbreviations abbrev = re.compile((?i)\\b([a-z]|acct|approx|appt|apr|apt|assoc|asst|aug|ave|avg|co(nt|rp)?|ct|dec|defn|dept|dr|eg|equip|esp|est|etc|excl|ext|feb|fri|ft|govt?|hrs?|ib(id)?|ie|in(c|t)?|jan|jr|jul|lit|ln|mar|max|mi(n|sc)?|mon|Mrs?|mun|natl?|neg?|no(rm|s|v)?|nw|obj|oct|org|orig|pl|pos|prev|proj|psi|qty|rd|rec|rel|reqd?|resp|rev|sat|sci|se(p|pt)?|spec(if)?|sq|sr|st|subj|sun|sw|temp|thurs|tot|tues|univ|var|vs)\\.) diff --git a/dictionaries/en/Linguistic.xcu b/dictionaries/en/Linguistic.xcu index 78fdd21..99011a7 100644 --- a/dictionaries/en/Linguistic.xcu +++ b/dictionaries/en/Linguistic.xcu @@ -5,7 +5,7 @@ node oor:name=ServiceManager node oor:name=GrammarCheckers -node oor:name=org.openoffice.comp.pyuno.Lightproof.en +node
[RESOLVED] Re: Help on widgets UI
On Mon, 2013-02-11 at 18:13 -0200, Olivier Hallot wrote: Hi I am converting Asian Typography tab page to the new widgets I have modified the files acording to the tutorial given by Caolán but I am experiencing a crash on a piece of code (after clicking OK in Calc) So, these TriStateBoxes are a bit of a pain. They are rare, but you ran into one. For the inconsistent state of the gtkbuilder checkboxes we default to an UNKNOWN state in our builder while the classic format defaulted to false. The cui code wasn't actually setup to handle an UNKNOWN state and fell over and died. The reason only calc is affected is because its the app that doesn't have support for the two disabled features and left them at their defaults. Easiest fix is to only ask for their value if they are enabled. I merged your typography patches together and added the test for being enabled and pushed the lot now. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5502501a8848c771aff5a77448a02451e22398a4 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 14 12:51:56 2013 + Updated core Project: help 3675e295d2fcd60b2cb62a45dc94ab3d9a16c745 diff --git a/helpcontent2 b/helpcontent2 index ee22530..3675e29 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ee22530d05859a866bb47700dbd885e0c94e +Subproject commit 3675e295d2fcd60b2cb62a45dc94ab3d9a16c745 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |4 source/text/shared/01/05020700.xhp | 16 +--- 2 files changed, 9 insertions(+), 11 deletions(-) New commits: commit 3675e295d2fcd60b2cb62a45dc94ab3d9a16c745 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 14 12:51:56 2013 + update help ids for asian typography page .ui conversion Change-Id: Ia972fc2670bf5ea8d9d3617b0007d73312c5b85f diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index bb1cb5f..e490785 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3868,7 +3868,6 @@ HID_STYLIST_NEW,33176, HID_SVXDLG_FILTER_WARNING,34195, HID_SVXPAGE_GRFCROP,34143, HID_SVXPAGE_JSEARCH_OPTIONS,34188, -HID_SVXPAGE_PARA_ASIAN,34174, HID_SVXPAGE_SWPOSSIZE,39977, HID_SVXTBX_UNDO_REDO_CTRL,34189, HID_SVX_CHINESE_DICTIONARY_CB_REVERSE,40022, @@ -8551,9 +8550,6 @@ svx_TriStateBox_RID_SVXPAGE_MEASURE_TSB_AUTOPOSV,703350275, svx_TriStateBox_RID_SVXPAGE_MEASURE_TSB_BELOW_REF_EDGE,703350273, svx_TriStateBox_RID_SVXPAGE_MEASURE_TSB_PARALLEL,703350277, svx_TriStateBox_RID_SVXPAGE_MEASURE_TSB_SHOW_UNIT,703350274, -svx_TriStateBox_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN,704726532, -svx_TriStateBox_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNC,704726530, -svx_TriStateBox_RID_SVXPAGE_PARA_ASIAN_CB_AS_SCRIPT_SPACE,704726535, svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_HEIGHT,702137868, svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_WIDTH,702137869, svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_POSPROTECT,702137901, diff --git a/source/text/shared/01/05020700.xhp b/source/text/shared/01/05020700.xhp index 12a7e56..ae3c604 100644 --- a/source/text/shared/01/05020700.xhp +++ b/source/text/shared/01/05020700.xhp @@ -34,7 +34,9 @@ bookmark_valueformatting; Asian typography/bookmark_value bookmark_valueparagraphs; Asian typography/bookmark_value bookmark_valuetypography; Asian/bookmark_value -/bookmarkcommentMW changed formats; to formatting;/commentparagraph role=heading id=hd_id3155620 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/01/05020700.xhp name=Asian TypographyAsian Typography/link/paragraph +/bookmark +bookmark xml-lang=en-US branch=hid/cui/ui/asiantypography/AsianTypography id=bm_id3155356 localize=false/ +paragraph role=heading id=hd_id3155620 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/01/05020700.xhp name=Asian TypographyAsian Typography/link/paragraph paragraph role=paragraph id=par_id3153124 xml-lang=en-US l10n=CHG oldref=2ahelp hid=.Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose emphLanguage Settings - Languages/emph in the Options dialog box, and then select the emphEnabled/emph box in the emphAsian language support/emph area./ahelp The Asian typography options are ignored in HTML documents./paragraph /section section id=howtoget @@ -42,14 +44,14 @@ /section paragraph role=heading id=hd_id3147571 xml-lang=en-US level=2 l10n=U oldref=3Line change/paragraph paragraph role=paragraph id=par_id3147834 xml-lang=en-US l10n=U oldref=4Set the options for line breaks in Asian language documents./paragraph -bookmark xml-lang=en-US branch=hid/cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN id=bm_id3155355 localize=false/paragraph role=heading id=hd_id3145072 xml-lang=en-US level=3 l10n=U oldref=9Apply list of forbidden characters to the beginning and end of line/paragraph -paragraph role=paragraph id=par_id3153683 xml-lang=en-US l10n=U oldref=10ahelp hid=SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDENPrevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line./ahelp To edit the list of restricted characters, choose emphswitchinline select=syscaseinline select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - Options/defaultinline/switchinline - Language Settings - link href=text/shared/optionen/01150100.xhp name=Asian LayoutAsian Layout/link/emph./paragraph -bookmark xml-lang=en-US branch=hid/cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC id=bm_id3156410 localize=false/paragraph role=heading id=hd_id3149751 xml-lang=en-US level=3 l10n=U oldref=5Allow hanging punctuation/paragraph -paragraph role=paragraph id=par_id3149096 xml-lang=en-US l10n=U oldref=6ahelp hid=SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNCPrevents commas and periods from breaking the line. Instead, these characters are added to the end of the line, even in the page margin./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE id=bm_id3149811 localize=false/paragraph role=heading id=par_id3147275 xml-lang=en-US level=3 l10n=U oldref=7 +bookmark xml-lang=en-US branch=hid/cui/ui/asiantypography/checkForbidList id=bm_id3155355 localize=false/paragraph role=heading id=hd_id3145072 xml-lang=en-US level=3 l10n=U
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 58275, which changed state. Bug 58275 Summary: Install fails if .NET Framework 4.0 (Client) is not present https://bugs.freedesktop.org/show_bug.cgi?id=58275 What|Removed |Added Status|NEEDINFO|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
Need help for BUg 42893- Improve 'Capitalize first letter of sentence'
Hey! i have been working on this bug since few days,got a logic but the problem is that it doesnt fit in right as for that to work i had to invoke acorrect.hxx which isnt possible as it is private. So can someone help me out with the concept on working this bug out so that i can contribute asap. Eagerly waiting for a prompt reply. Regards, Janit ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
generated UNO code for service constructors
Hi
I just ran into a weird bug where I could see that the service was being
correctly instantiated, but then as a traced it back up the call tree,
the reference was suddenly empty!
(https://bugs.freedesktop.org/show_bug.cgi?id=60804)
That was because of the generated UNO code for the service constructor
in FilePicker.hpp:
(note that I've simplified it a little)
static Reference XFilePicker3 createDefault(Reference
XComponentContext const the_context) {
assert(the_context.is());
Reference XFilePicker3 the_instance;
try {
the_instance = Reference XFilePicker3 (
the_context-getServiceManager()-createInstanceWithArgumentsAndContext(
com.sun.star.ui.dialogs.FilePicker ,
SequenceAny(),
the_context),
UNO_QUERY);
} catch (RuntimeException ) {
throw;
} catch (Exception the_exception) {
throw DeploymentException( component context fails to supply
service FilePicker of type XFilePicker3:
+ the_exception.Message, the_context);
}
if (!the_instance.is()) {
throw DeploymentException( component context fails to supply
service FilePicker of type XFilePicker3 ), the_context);
}
return the_instance;
}
Perhaps we should be making it use the constructor form ReferenceX(..,
UNO_QUERY_THROW) ?
Or perhaps we can change the error message in the last block to:
throw DeploymentException( component context supplied a service
FilePicker, but the service does not implement interface XFilePicker3
), the_context);
Which would be less confusing to my rather tired brain.
Thanks, Noel Grandin
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#60668: filter out fieldmark chars from Index entries:
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2134 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2134 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] MODKEY_BigOrtho is never defined
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2126 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2126 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd7c7f634860ced0021bf6c6b99d1e0ea0615a7c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Add findbar close icons to other icon-themes as well
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2127 -- To view, visit https://gerrit.libreoffice.org/2127 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id852d1adb87c31ee45187a0a7b4bfead56c7b19f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#57950: Remove some chained appends in filter
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2117 -- To view, visit https://gerrit.libreoffice.org/2117 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2386eb47ad7190d626966020e96c1a7ddc07ab4a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Mathias M m...@gmx.fr Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#46808, Adapt UNO services to the new style, Part 1-2
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2146
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/2146/1
fdo#46808, Adapt UNO services to the new style, Part 1-2
Written constructor for opffapi/com/sun/star/accessibility/AccessBridge.idl and
rewritten to new style in offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
Change-Id: I88dc745cddf9956c930c1216c697dd142e33c846
---
M offapi/com/sun/star/accessibility/AccessBridge.idl
M offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/offapi/com/sun/star/accessibility/AccessBridge.idl
b/offapi/com/sun/star/accessibility/AccessBridge.idl
index 7d28f9c..f9205c0 100644
--- a/offapi/com/sun/star/accessibility/AccessBridge.idl
+++ b/offapi/com/sun/star/accessibility/AccessBridge.idl
@@ -19,9 +19,9 @@
#ifndef __com_sun_star_accessibility_AccessBridge_idl__
#define __com_sun_star_accessibility_AccessBridge_idl__
-module com { module sun { module star { module lang {
- published interface XInitialization;
-}; }; }; };
+#include com/sun/star/lang/XComponent.idl
+#include com/sun/star/awt/XExtendedToolkit.idl
+
module com { module sun { module star { module accessibility {
@@ -35,7 +35,10 @@
@since OOo 1.1.2
*/
-service AccessBridge : com::sun::star::lang::XInitialization;
+service AccessBridge : com::sun::star::lang::XComponent
+{
+createWithToolkit([in] com::sun::star::awt::XExtendedToolkit toolkit);
+};
}; }; }; };
diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
index e4efdc6..4494748 100644
--- a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
+++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
@@ -27,10 +27,7 @@
/** specifies the standard model of a XTabPageModel.
@since OOo 3.4
*/
-published service UnoControlTabPageModel
-{
-interface XTabPageModel;
-};
+published service UnoControlTabPageModel : XTabPageModel;
}; }; }; }; };
--
To view, visit https://gerrit.libreoffice.org/2146
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88dc745cddf9956c930c1216c697dd142e33c846
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] CMIS: URL-decode username or it won't be shown properly in d...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2147 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/2147/1 CMIS: URL-decode username or it won't be shown properly in dialog Change-Id: Icb8eaf5d841cba0d0d7efc4146b33995cdbf46f3 --- M ucb/source/ucp/cmis/cmis_url.cxx 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index eb779d8..40d7a25 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -52,12 +52,12 @@ m_sBindingUrl = aHostUrl.GetURLNoMark( ); m_sRepositoryId = aHostUrl.GetMark( ); -m_sUser = aUrl.GetUser( ); -m_sPass = aUrl.GetPass( ); +m_sUser = aUrl.GetUser( INetURLObject::DECODE_WITH_CHARSET ); +m_sPass = aUrl.GetPass( INetURLObject::DECODE_WITH_CHARSET ); // Store the path to the object m_sPath = aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); -m_sId = aUrl.GetMark( ); +m_sId = aUrl.GetMark( INetURLObject::DECODE_WITH_CHARSET ); if ( !m_sId.isEmpty( ) ) m_sPath = rtl::OUString( ); -- To view, visit https://gerrit.libreoffice.org/2147 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb8eaf5d841cba0d0d7efc4146b33995cdbf46f3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] CMIS: made it work with Lotus Live
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2148
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/2148/1
CMIS: made it work with Lotus Live
Making libcmis and LibreOffice work with Lotus Live service needed a few
hacks to either better implement CMIS or workaround some bad
implementations.
As a general improvement, the CheckOut InfoBar isn't shown if the
document can't be checked out.
Change-Id: I7bb4211db0506998cef40ac1fb6375e647234085
---
M libcmis/UnpackedTarball_cmis.mk
A libcmis/libcmis-0.3.0-lotus-live-fix.patch
M sfx2/source/view/sfxbasecontroller.cxx
M ucb/source/ucp/cmis/cmis_content.cxx
M ucb/source/ucp/cmis/cmis_content.hxx
M ucb/source/ucp/cmis/cmis_url.cxx
6 files changed, 259 insertions(+), 35 deletions(-)
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk
index a25c316..0a9f9f8 100644
--- a/libcmis/UnpackedTarball_cmis.mk
+++ b/libcmis/UnpackedTarball_cmis.mk
@@ -18,6 +18,7 @@
libcmis/libcmis-0.3.0-win.patch \
libcmis/libcmis-0.3.0.patch \
libcmis/libcmis-0.3.0-proxy.patch \
+ libcmis/libcmis-0.3.0-lotus-live-fix.patch \
))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/libcmis/libcmis-0.3.0-lotus-live-fix.patch
b/libcmis/libcmis-0.3.0-lotus-live-fix.patch
new file mode 100644
index 000..2aca934
--- /dev/null
+++ b/libcmis/libcmis-0.3.0-lotus-live-fix.patch
@@ -0,0 +1,122 @@
+diff --git src/libcmis/atom-folder.cxx src/libcmis/atom-folder.cxx
+index 68fb124..2756a5d 100644
+--- src/libcmis/atom-folder.cxx
src/libcmis/atom-folder.cxx
+@@ -57,8 +57,11 @@ vector libcmis::ObjectPtr AtomFolder::getChildren( )
throw ( libcmis::Excepti
+ {
+ AtomLink* childrenLink = getLink( down,
application/atom+xml;type=feed );
+
++// Some servers aren't giving the GetChildren properly... if not defined,
we need to try
++// as we may have the right to proceed.
+ if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get()
+-!getAllowableActions()-isAllowed(
libcmis::ObjectAction::GetChildren ) ) )
++( !getAllowableActions()-isAllowed(
libcmis::ObjectAction::GetChildren )
++ getAllowableActions()-isDefined(
libcmis::ObjectAction::GetChildren ) ) ) )
+ throw libcmis::Exception( string( GetChildren not allowed on node
) + getId() );
+
+ vector libcmis::ObjectPtr children;
+@@ -182,7 +185,8 @@ libcmis::DocumentPtr AtomFolder::createDocument( const
map string, libcmis::Pro
+ AtomLink* childrenLink = getLink( down,
application/atom+xml;type=feed );
+
+ if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get()
+-!getAllowableActions()-isAllowed(
libcmis::ObjectAction::CreateDocument ) ) )
++!getAllowableActions()-isAllowed(
libcmis::ObjectAction::CreateDocument )
++getAllowableActions()-isDefined(
libcmis::ObjectAction::CreateDocument ) ) )
+ throw libcmis::Exception( string( CreateDocument not allowed on
folder ) + getId() );
+
+ xmlBufferPtr buf = xmlBufferCreate( );
+@@ -210,9 +214,37 @@ libcmis::DocumentPtr AtomFolder::createDocument( const
map string, libcmis::Pro
+ }
+
+ string respBuf = response-getStream( )-str( );
+-xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, 0 );
++xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, XML_PARSE_NOERROR );
+ if ( NULL == doc )
+-throw libcmis::Exception( Failed to parse object infos );
++{
++// We may not have the created document entry in the response body:
this is
++// the behaviour of some servers, but the standard says we need to
look for
++// the Location header.
++map string, string headers = response-getHeaders( );
++map string, string ::iterator it = headers.find( Location );
++
++// Some servers like Lotus Live aren't sending Location header, but
Content-Location
++if ( it == headers.end( ) )
++it = headers.find( Content-Location );
++
++if ( it != headers.end() )
++{
++try
++{
++response = getSession( )-httpGetRequest( it-second );
++respBuf = response-getStream( )-str( );
++doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, XML_PARSE_NOERROR );
++}
++catch ( const CurlException e )
++{
++throw e.getCmisException( );
++}
++}
++
++// if doc is still NULL after that, then throw an exception
++if ( NULL == doc )
++throw libcmis::Exception( Missing expected response from server
);
++}
+
+ libcmis::ObjectPtr created = getSession( )-createObjectFromEntryDoc( doc
);
+ xmlFreeDoc( doc );
+diff --git src/libcmis/atom-object.cxx
[PUSHED libreoffice-3-6] fdo#60139: Rename bundled extensions's Lightproof service im...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2033 Approvals: Tor Lillqvist: Looks good to me, but someone else must approve Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2033 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6754cd6d4aa0aad6147bc9e404a29ef1075a2548 Gerrit-PatchSet: 3 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Removed several useless macros: UNISTRING, USTR, USTR_ASCII, ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1954 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1954 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96d690bf9f9b319e9eeafcf218ec5ce87f21215f Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jean-Noël Rouvignac jn.rouvig...@gmail.com Gerrit-Reviewer: Jean-Noël Rouvignac jn.rouvig...@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/insertsheet.ui | 387 1 file changed, 387 insertions(+) New commits: commit 695a0c8bd94f127f55c0bc6f915243bf7bc3f30f Author: Abdulelah Alarifi asalar...@kacst.edu.sa Date: Sun Feb 10 12:38:12 2013 +0300 Converted Insert - Sheet widget. Change-Id: I575c4257fcff1349243cbe54c4558839e6629e81 Reviewed-on: https://gerrit.libreoffice.org/2082 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/ui/insertsheet.ui b/sc/uiconfig/scalc/ui/insertsheet.ui new file mode 100644 index 000..545d3e9 --- /dev/null +++ b/sc/uiconfig/scalc/ui/insertsheet.ui @@ -0,0 +1,387 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkAction id=action1/ + object class=GtkDialog id=Insert Sheet +property name=can_focusFalse/property +property name=border_width5/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkBox id=box2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkRadioButton id=radiobutton1 +property name=label translatable=yesB_efore current sheet/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_underlineTrue/property
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3ae314a9bf3f2ff79ad4f2acefc511bc0001132f Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 14 14:19:56 2013 + Updated core Project: help 46d9ef662c4e2825b3da02a9949ab19862df7422 diff --git a/helpcontent2 b/helpcontent2 index 3675e29..46d9ef6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3675e295d2fcd60b2cb62a45dc94ab3d9a16c745 +Subproject commit 46d9ef662c4e2825b3da02a9949ab19862df7422 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 10 - source/text/scalc/01/0405.xhp | 39 ++ 2 files changed, 19 insertions(+), 30 deletions(-) New commits: commit 46d9ef662c4e2825b3da02a9949ab19862df7422 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 14 14:19:56 2013 + update help ids for insert sheet .ui conversion Change-Id: Ifc59051ab02c83837f611e960760e85393c4a252 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e490785..b8b48bc 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6561,7 +6561,6 @@ sc_CheckBox_RID_SCDLG_INSCONT_BTN_INSSTRINGS,1493435413, sc_CheckBox_RID_SCDLG_INSCONT_BTN_LINK,1493435427, sc_CheckBox_RID_SCDLG_INSCONT_BTN_SKIP_EMPTY,1493435425, sc_CheckBox_RID_SCDLG_INSCONT_BTN_TRANSPOSE,1493435426, -sc_CheckBox_RID_SCDLG_INSERT_TABLE_CB_LINK,1493894173, sc_CheckBox_RID_SCDLG_LINKAREA_BTN_RELOAD,1495368714, sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781, sc_CheckBox_RID_SCDLG_NAMES_BTN_COLHEADER,2567308321, @@ -6692,7 +6691,6 @@ sc_Edit_RID_SCDLG_FILLSERIES_ED_INCREMENT,1493518375, sc_Edit_RID_SCDLG_FILLSERIES_ED_START_VALUES,1493518388, sc_Edit_RID_SCDLG_FILTER_ED_COPY_AREA,2567079943, sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111, -sc_Edit_RID_SCDLG_INSERT_TABLE_ED_TABNAME,1493895193, sc_Edit_RID_SCDLG_NAMES_ED_ASSIGN,2567309327, sc_Edit_RID_SCDLG_NEWSCENARIO_ED_NAME,1493846027, sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT1,2569209860, @@ -6872,7 +6870,6 @@ sc_ModalDialog_RID_SCDLG_ASCII,1494695936, sc_ModalDialog_RID_SCDLG_CHARTCOLROW,1494515712, sc_ModalDialog_RID_SCDLG_COLORROW,1494368256, sc_ModalDialog_RID_SCDLG_GROUP,1493549056, -sc_ModalDialog_RID_SCDLG_INSERT_TABLE,1493893120, sc_ModalDialog_RID_SCDLG_LINKAREA,1495367680, sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968, sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592, @@ -6897,14 +6894,12 @@ sc_MultiLineEdit_TP_VALIDATION_INPUTHELP_EDT_INPUTHELP,548293135, sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765, sc_MultiListBox_RID_SCDLG_CONSOLIDATE_LB_CONSAREAS,2567523350, sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137, -sc_MultiListBox_RID_SCDLG_INSERT_TABLE_LB_TABLES,1493896219, sc_MultiListBox_RID_SCDLG_LINKAREA_LB_RANGES,1495370761, sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657, sc_MultiListBox_RID_SCDLG_SHOW_TAB_LB_ENTRYLIST,1494993931, sc_NumericField_RID_SCDLG_ASCII_NF_AT_ROW,1494702140, sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364, sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593, -sc_NumericField_RID_SCDLG_INSERT_TABLE_NF_COUNT,1493899287, sc_NumericField_RID_SCDLG_LINKAREA_NF_DELAY,1495373835, sc_NumericField_RID_SCDLG_SOLVER_INTEGER_NF_VALUE,1495504897, sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735, @@ -6928,7 +6923,6 @@ sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_ADD,2567524869, sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_REMOVE,2567524870, sc_PushButton_RID_SCDLG_DBNAMES_BTN_ADD,2567328259, sc_PushButton_RID_SCDLG_DBNAMES_BTN_REMOVE,2567328260, -sc_PushButton_RID_SCDLG_INSERT_TABLE_BTN_BROWSE,1493897756, sc_PushButton_RID_SCDLG_LINKAREA_BTN_BROWSE,1495372294, sc_PushButton_RID_SCDLG_NAMES_BTN_ADD,2567311875, sc_PushButton_RID_SCDLG_NAMES_BTN_REMOVE,2567311876, @@ -7001,10 +6995,6 @@ sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_DIV,1493434911, sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_MUL,1493434910, sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_NOOP,1493434907, sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_SUB,1493434909, -sc_RadioButton_RID_SCDLG_INSERT_TABLE_RB_BEFORE,1493893643, -sc_RadioButton_RID_SCDLG_INSERT_TABLE_RB_BEHIND,1493893644, -sc_RadioButton_RID_SCDLG_INSERT_TABLE_RB_FROMFILE,1493893658, -sc_RadioButton_RID_SCDLG_INSERT_TABLE_RB_NEW,1493893653, sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_MAX,2569208321, sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_MIN,2569208322, sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_VALUE,2569208323, diff --git a/source/text/scalc/01/0405.xhp b/source/text/scalc/01/0405.xhp index 46c6098..b352849 100644 --- a/source/text/scalc/01/0405.xhp +++ b/source/text/scalc/01/0405.xhp @@ -29,9 +29,8 @@ body bookmark xml-lang=en-US branch=index id=bm_id4522232bookmark_valuesheets;creating/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/sc:ModalDialog:RID_SCDLG_INSERT_TABLE id=bm_id3151384 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/insertsheet/InsertSheetDialog id=bm_id3151384 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:Insert id=bm_id1669896 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:Insert id=bm_id3153896 localize=false/ paragraph role=heading id=hd_id3155629 xml-lang=en-US level=1 l10n=U oldref=1Insert Sheet/paragraph paragraph role=paragraph id=par_id3147264 xml-lang=en-US l10n=U oldref=2variable id=tabelleeinfuegentextahelp hid=.uno:InsertDefines the options to be used to insert a new sheet./ahelp You can create a new sheet, or insert
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/insertsheet.ui |2 ++ 1 file changed, 2 insertions(+) New commits: commit 22b20e8b5ac29bf02b137d48c34c94edb2e1d628 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 14 14:21:38 2013 + forgotten mnemonic widgets Change-Id: I5494b3f99f3e1145898dcfb5b17bc62861faa5f9 diff --git a/sc/uiconfig/scalc/ui/insertsheet.ui b/sc/uiconfig/scalc/ui/insertsheet.ui index c3d8b7d..8b9b282 100644 --- a/sc/uiconfig/scalc/ui/insertsheet.ui +++ b/sc/uiconfig/scalc/ui/insertsheet.ui @@ -224,6 +224,7 @@ property name=xalign0/property property name=label translatable=yesN_o. of sheets:/property property name=use_underlineTrue/property +property name=mnemonic_widgetcountnf/property /object packing property name=left_attach0/property @@ -239,6 +240,7 @@ property name=xalign0/property property name=label translatable=yesNa_me:/property property name=use_underlineTrue/property +property name=mnemonic_widgetnameed/property /object packing property name=left_attach0/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Need help for BUg 42893- Improve 'Capitalize first letter of sentence'
On Thu, 2013-02-14 at 19:04 +0530, Janit Anjaria wrote: Hey! i have been working on this bug since few days,got a logic but the problem is that it doesnt fit in right as for that to work i had to invoke acorrect.hxx which isnt possible as it is private. Can you attach your code-in-progress so we have an idea of what you're trying to do and where you're stuck C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/colorscale.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4dc71bcf6e6a757a8369c46db1c24e98679d1506
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Feb 14 15:26:27 2013 +0100
use = as mentioned in the UI, fdo#60798
Change-Id: Iac6737e98eb0961de22036f42634ebad7d42dfcc
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index bef5aca..0d17fa6 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -910,13 +910,13 @@ ScIconSetInfo* ScIconSetFormat::GetIconSetInfo(const
ScAddress rAddr) const
double nValMax = CalcValue(nMin, nMax, itr);
++itr;
-while(itr != end() nVal nValMax)
+while(itr != end() nVal = nValMax)
{
++nIndex;
nValMax = CalcValue(nMin, nMax, itr);
++itr;
}
-if(nVal nValMax)
+if(nVal = nValMax)
++nIndex;
if(mpFormatData-mbReverse)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: useless definition of _SV_RULER_CXX ?
On Wed, 2013-02-13 at 12:16 -0200, Rodolfo wrote: While working on a patch, I saw this #define inside a .cxx file... [1] Some (private) methods of class Ruler are declared inside an #ifdef of it [2]. But that can be only triggered inside ruler.cxx file [1] : a trick by defining _SV_RULER_CXX right before including the header file. Is it really necessary? Shouldn't SVT_DLLPRIVATE do this completely-private-thing? Those hacky defines precede by a very long time all the visibility markup. Anyway the ifdef hackery is orthogonal to the actual visibility of those symbols (surely anyway). I don't know why that sort of stuff exists, but it only exists in the oldest of code and it's as if there was no public/private support in someones compiler :-) My best theory is that it was intended to speed up builds by having less stuff in the headers for compilers to parse by having the preprocessor strip out the stuff includers didn't need to see. Which would suggest that it will only be found around private methods, i.e. not protected/public methods or anything that takes up space. So, IMO it's not necessary and feel free to remove it. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Converted Insert - Sheet widget.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2082 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2082 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I575c4257fcff1349243cbe54c4558839e6629e81 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulelah Alarifi asalar...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit bc96a84370fb167ab2c63582c10535992f31768c Author: Tor Lillqvist t...@iki.fi Date: Thu Feb 14 16:52:07 2013 +0200 Fix build against Mac OS X SDK 10.4 Change-Id: I077afe48e0d375f75a8c35bc87c6c177b68512f7 diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 7677e64..e877cca 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -41,7 +41,14 @@ #ifdef MACOSX #include premac.h - #include IOBluetooth/IOBluetooth.h + #if MACOSX_SDK_VERSION = 1070 +#import IOBluetooth/IOBluetooth.h + #else +#import CoreFoundation/CoreFoundation.h +#import IOBluetooth/IOBluetoothUtilities.h +#import IOBluetooth/objc/IOBluetoothSDPUUID.h +#import IOBluetooth/objc/IOBluetoothSDPServiceRecord.h + #endif #include postmac.h #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host/config_global.h.in configure.ac sal/inc
config_host/config_global.h.in |1 +
configure.ac | 23 +++
sal/inc/rtl/allocator.hxx | 12
3 files changed, 36 insertions(+)
New commits:
commit c91d353872b7d4e1a39192bff1444b46cab6e5eb
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 14 15:21:46 2013 +0100
rhbz#908674: Adapt rtl::Allocator::construct to C++11
...otherwise, at least with some --with-system-boost versions and C++11
compilers, like with Fedora's boost-1.50.0-4.fc18.x86_64 and
gcc-c++-4.7.2-8.fc18.x86_64, using this to copy-construct an instance of
boost::unordered::detail::ptr_nodestd::pairrtl::OUString,Bootstrap_Impl* in
the call to p_bootstrap_map-insert(...) in rtl_bootstrap_args_open
(sal/rtl/source/bootstrap.cxx) would memcopy the ptr_node and fail to call
rtl_uString_acquire, leading to memory corruption later on when
rtl_uString_release is called one time too often.
It is not entirely clear to me whether this is a shortcoming of the given
Boost
version, but this patch solves the problem and brings
rtl::Allocator::construct
in line with the (changed) Allocator requirements of C++11 anyway.
The problem potentially lurks with every use of rtl::Allocator, but only
showed
now begining with LO 4.0 where e5111574fd904b38a3980ca4ea3d21cfcb22dea6
Revert
'sb140: sb140: #i116981# clean up memory upon exit' re-introduced code into
rtl_bootstrap_args_open that inserts into a boost::unordered_map that uses
rtl::Allocator.
Change-Id: I3be22f59a8eb49d31458480c27f3ce15803c7fd4
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 0f85b59..5e7150b 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -14,6 +14,7 @@ Any change in this header will cause a rebuild of almost
everything.
#undef HAVE_CXX11_DELETE
#undef HAVE_CXX11_OVERRIDE
+#undef HAVE_CXX11_PERFECT_FORWARDING
#undef HAVE_GCC_BUILTIN_ATOMIC
#undef HAVE_SFINAE_ANONYMOUS_BROKEN
#undef HAVE_THREADSAFE_STATICS
diff --git a/configure.ac b/configure.ac
index a23e8d4..1061507 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5786,6 +5786,29 @@ else
fi
dnl ===
+dnl Check for C++11 perfect forwarding support
+dnl ===
+HAVE_CXX11_PERFECT_FORWARDING=
+AC_MSG_CHECKING([whether $CXX supports C++11 perfect forwarding])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include utility
+templatetypename T, typename... Args T * f(Args ... v) {
+return new T(std::forwardArgs(v)...);
+}
+]], [[
+fint(0);
+]])], [perfect_forwarding=yes], [perfect_forwarding=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([$perfect_forwarding])
+if test $perfect_forwarding = yes; then
+AC_DEFINE([HAVE_CXX11_PERFECT_FORWARDING])
+fi
+
+dnl ===
dnl system stl sanity tests
dnl ===
HAVE_GCC_VISIBILITY_BROKEN=
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index 4900d97..a70abff 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -23,6 +23,10 @@
#include rtl/alloc.h
#include cstddef
+#if defined LIBO_INTERNAL_ONLY
+#include config_global.h
+#endif
+
/// @cond INTERNAL
//##
@@ -125,10 +129,18 @@ public:
}
//-
+#if defined HAVE_CXX11_PERFECT_FORWARDING
+template typename... Args
+void construct (pointer p, Args ... value)
+{
+new ((void*)p)T(std::forward Args (value)...);
+}
+#else
void construct (pointer p, const T value)
{
new ((void*)p)T(value);
}
+#endif
//-
void destroy (pointer p)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/update/check/updatecheckconfig.cxx |2 +-
extensions/source/update/check/updatecheckjob.cxx|2 +-
extensions/source/update/ui/updatecheckui.cxx|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9d67b621c5c3247d8b7c983a81248d7dbde582fb
Author: Tor Lillqvist t...@iki.fi
Date: Thu Feb 14 17:25:55 2013 +0200
Fix compilation error with older GCC
The GCC 4.0 we still use for the official Mac OS X build says:
error: conversion from âconst char*â to non-scalar type
ârtl::OUStringâ requested. Sigh, I guess there might be lots more of
these elsewhere in the code.
Change-Id: Ifad5722bbadd465ebfca1ac3f0b55f07a6895e12
diff --git a/extensions/source/update/check/updatecheckconfig.cxx
b/extensions/source/update/check/updatecheckconfig.cxx
index 554cf0d..344fc87 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -505,7 +505,7 @@ UpdateCheckConfig::getServiceNames()
rtl::OUString
UpdateCheckConfig::getImplName()
{
-return vnd.sun.UpdateCheckConfig;
+return rtl::OUString(vnd.sun.UpdateCheckConfig);
}
//--
diff --git a/extensions/source/update/check/updatecheckjob.cxx
b/extensions/source/update/check/updatecheckjob.cxx
index 8b30e4d..e4ff941 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -175,7 +175,7 @@ UpdateCheckJob::getServiceNames()
rtl::OUString
UpdateCheckJob::getImplName()
{
-return vnd.sun.UpdateCheck;
+return rtl::OUString(vnd.sun.UpdateCheck);
}
diff --git a/extensions/source/update/ui/updatecheckui.cxx
b/extensions/source/update/ui/updatecheckui.cxx
index f5565f3..4176cab 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -75,7 +75,7 @@ static uno::Sequence rtl::OUString getServiceNames()
static rtl::OUString getImplementationName()
{
-return vnd.sun.UpdateCheckUI;
+return rtl::OUString(vnd.sun.UpdateCheckUI);
}
//--
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: setup_native/Package_scripts_generated.mk
setup_native/Package_scripts_generated.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit acdaed35a7e79b6eca4918e53f761dc08ce9a52c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Feb 14 16:39:11 2013 +0100 Missing dependency Change-Id: I73c77ea8f38794bf3d05ee247bdab5e4ddc57646 diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk index 0b2a301..898b4cb 100644 --- a/setup_native/Package_scripts_generated.mk +++ b/setup_native/Package_scripts_generated.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,scripts_generated,$(call gb_CustomTarget_get_workdir,setup_native/scripts))) +$(eval $(call gb_Package_use_custom_target,scripts_generated,setup_native/scripts)) + ifeq ($(OS),SOLARIS) $(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install)) $(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Module_cross_tail_build.mk
Module_cross_tail_build.mk |1 + 1 file changed, 1 insertion(+) New commits: commit c9d2518656ce0fc5e96bb4bf06c0e78a575c2597 Author: Tor Lillqvist t...@iki.fi Date: Thu Feb 14 17:47:39 2013 +0200 svl, too Change-Id: Ib7ad7a1045aad03b0e176d5267b4e942521ba023 diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index adcdfa8..49a5c2a 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ helpcompiler \ l10ntools \ sot \ + svl \ svtools \ toolkit \ vcl) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cppuhelper/source registry/tools vcl/inc vcl/source
cppuhelper/source/typedescriptionprovider.cxx |8 ++--
registry/tools/reg2bin.cxx|9 +++--
vcl/inc/vcl/msgbox.hxx|2 +-
vcl/source/window/msgbox.cxx |2 +-
4 files changed, 7 insertions(+), 14 deletions(-)
New commits:
commit e2c343df8ca0a344d6e9c789c60c5b8dc7416b51
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 14 16:51:29 2013 +0100
Avoid ambiguities after string clean-up of InfoBox users
Change-Id: Icbce1220df0a08b32f78b863a15daf34522d1671
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 8f0336d..594d248 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -106,7 +106,7 @@ private:
SAL_DLLPRIVATE void ImplInitInfoBoxData();
public:
-InfoBox( Window* pParent, const XubString rMessage );
+InfoBox( Window* pParent, const OUString rMessage );
InfoBox( Window* pParent, const ResId rResId );
static ImageGetStandardImage();
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index c7d0e36..baf8370 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -445,7 +445,7 @@ void InfoBox::ImplInitInfoBoxData()
// ---
-InfoBox::InfoBox( Window* pParent, const XubString rMessage ) :
+InfoBox::InfoBox( Window* pParent, const OUString rMessage ) :
MessBox( pParent, WB_OK | WB_DEF_OK, ImplGetSVEmptyStr(), rMessage )
{
ImplInitInfoBoxData();
commit 973160bb4853f2913024c7ef4bf9f5e638e93c5a
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 13 10:09:05 2013 +0100
Comment clean-up
Change-Id: I7696dde7337531629d29cce7eb3f882cb4bfad0d
diff --git a/cppuhelper/source/typedescriptionprovider.cxx
b/cppuhelper/source/typedescriptionprovider.cxx
index e0d51a1..97a1788 100644
--- a/cppuhelper/source/typedescriptionprovider.cxx
+++ b/cppuhelper/source/typedescriptionprovider.cxx
@@ -259,10 +259,9 @@ struct Memory32 {
}
float getIso60599Binary32() const {
-// Create a copy in either case, for alignment:
union {
unsigned char buf[4];
-float f;
+float f; // assuming float is ISO 60599 binary32
} sa;
#if defined OSL_LITENDIAN
sa.buf[0] = byte[0];
@@ -276,7 +275,6 @@ struct Memory32 {
sa.buf[3] = byte[0];
#endif
return sa.f;
-// assuming float is ISO 60599 binary32
}
};
@@ -296,10 +294,9 @@ struct Memory64 {
}
double getIso60599Binary64() const {
-// Create a copy in either case, for alignment:
union {
unsigned char buf[8];
-double d;
+double d; // assuming double is ISO 60599 binary64
} sa;
#if defined OSL_LITENDIAN
sa.buf[0] = byte[0];
@@ -321,7 +318,6 @@ struct Memory64 {
sa.buf[7] = byte[0];
#endif
return sa.d;
-// assuming double is ISO 60599 binary64
}
};
diff --git a/registry/tools/reg2bin.cxx b/registry/tools/reg2bin.cxx
index 3f42f28..18976a0 100644
--- a/registry/tools/reg2bin.cxx
+++ b/registry/tools/reg2bin.cxx
@@ -958,10 +958,9 @@ void write64(osl::File file, sal_uInt64 value) {
void writeIso60599Binary32(osl::File file, float value) {
union {
unsigned char buf[4];
-float f;
+float f; // assuming float is ISO 60599 binary32
} sa;
sa.f = value;
-// assuming float is ISO 60599 binary32
#if defined OSL_BIGENDIAN
std::swap(sa.buf[0], sa.buf[3]);
std::swap(sa.buf[1], sa.buf[2]);
@@ -970,13 +969,11 @@ void writeIso60599Binary32(osl::File file, float value)
{
}
void writeIso60599Binary64(osl::File file, double value) {
-union
-{
+union {
unsigned char buf[8];
-float d;
+float d; // assuming double is ISO 60599 binary64
} sa;
sa.d = value;
-// assuming double is ISO 60599 binary64
#if defined OSL_BIGENDIAN
std::swap(sa.buf[0], sa.buf[7]);
std::swap(sa.buf[1], sa.buf[6]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/data/conditio.cxx | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 71ed03b9ad45e7da8ac454377701d265ce11cca1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Feb 14 15:49:40 2013 +0100
assert if there is a wrong index, a warning is not enough
Change-Id: I5fe16f24fab0b0c29cb9acb279e13db499bd3d1c
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 907fbda..93127c4 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1271,6 +1271,7 @@ rtl::OUString ScConditionEntry::GetExpression( const
ScAddress rCursor, sal_uIn
sal_uLong nNumFmt,
const FormulaGrammar::Grammar eGrammar
) const
{
+assert( nIndex = 1);
rtl::OUString aRet;
if ( FormulaGrammar::isEnglish( eGrammar) nNumFmt == 0 )
@@ -1314,16 +1315,13 @@ rtl::OUString ScConditionEntry::GetExpression( const
ScAddress rCursor, sal_uIn
else
mpDoc-GetFormatTable()-GetInputLineString(nVal2, nNumFmt, aRet);
}
-else
-{
-SAL_WARN(sc, GetExpression: falscher Index);
-}
return aRet;
}
ScTokenArray* ScConditionEntry::CreateTokenArry( sal_uInt16 nIndex ) const
{
+assert(nIndex = 1);
ScTokenArray* pRet = NULL;
ScAddress aAddr;
@@ -1353,10 +1351,6 @@ ScTokenArray* ScConditionEntry::CreateTokenArry(
sal_uInt16 nIndex ) const
pRet-AddDouble( nVal2 );
}
}
-else
-{
-SAL_WARN(sc, GetExpression: falscher Index);
-}
return pRet;
}
commit 4eb7d128b0379d64b083ca5d27dcb25d3d38d97f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Feb 14 15:47:13 2013 +0100
another case of wrong escaping for
Change-Id: Id302f224346e2e3db3480a3a3aed97e7f25a7280
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 9bb6977..907fbda 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1307,9 +1307,9 @@ rtl::OUString ScConditionEntry::GetExpression( const
ScAddress rCursor, sal_uIn
}
else if (bIsStr2)
{
-aRet = ;
+aRet = \;
aRet += aStrVal2;
-aRet += ;
+aRet += \;
}
else
mpDoc-GetFormatTable()-GetInputLineString(nVal2, nNumFmt, aRet);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/source
sc/inc/dptabdat.hxx |2
sc/inc/dptabres.hxx | 129 ++---
sc/source/core/data/dptabdat.cxx | 22 +++---
sc/source/core/data/dptabres.cxx | 133 +++
sc/source/core/data/dptabsrc.cxx |4 -
5 files changed, 144 insertions(+), 146 deletions(-)
New commits:
commit b801a56de6d34f8d7d42a91400482a88801380f4
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Feb 14 11:04:58 2013 -0500
Massive sal_Bool to bool conversion.
Change-Id: I9fa22b4c5a85b0ddf83a1d7b0e8be0a1134ea19a
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 4321651..a2df857 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -170,11 +170,11 @@ public:
voidUpdate( const ScDPValue rNext, ScSubTotalFunc eFunc, const
ScDPSubTotalState rSubState );
voidCalculate( ScSubTotalFunc eFunc, const ScDPSubTotalState
rSubState );
-sal_BoolIsCalculated() const;
+bool IsCalculated() const;
double GetResult() const;
-sal_BoolHasError() const;
-sal_BoolHasData() const;
+bool HasError() const;
+bool HasData() const;
voidSetResult( double fNew );
voidSetEmpty( sal_Bool bSet );
@@ -197,7 +197,7 @@ class ScDPRowTotals
{
ScDPAggData aRowTotal;
ScDPAggData aGrandTotal;
-sal_BoolbIsInColRoot;
+bool bIsInColRoot;
public:
ScDPRowTotals();
@@ -206,8 +206,8 @@ public:
ScDPAggData*GetRowTotal( long nMeasure );
ScDPAggData*GetGrandTotal( long nMeasure );
-sal_BoolIsInColRoot() const { return bIsInColRoot; }
-voidSetInColRoot(sal_Bool bSet) { bIsInColRoot = bSet; }
+bool IsInColRoot() const { return bIsInColRoot; }
+void SetInColRoot(bool bSet) { bIsInColRoot = bSet; }
};
//
@@ -245,12 +245,12 @@ typedef boost::unordered_map SCROW, ScDPParentDimData
*, MemberHashIndexFunc
class ResultMembers
{
DimMemberHash maMemberHash;
-sal_BoolmbHasHideDetailsMember;
+bool mbHasHideDetailsMember;
public:
ScDPParentDimData* FindMember( const SCROW nIndex ) const;
void InsertMember( ScDPParentDimData* pNew );
-sal_BoolIsHasHideDetailsMembers() const { return
mbHasHideDetailsMember; }
-voidSetHasHideDetailsMembers( sal_Bool b ) {
mbHasHideDetailsMember=b; }
+bool IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; }
+void SetHasHideDetailsMembers( bool b ) { mbHasHideDetailsMember = b; }
ResultMembers();
virtual ~ResultMembers();
};
@@ -261,24 +261,24 @@ private:
const ::std::vectorScDPDimension* mppDim;
const ::std::vectorScDPLevel* mppLev;
-sal_Bool mbRow;
-sal_Bool mbInitChild;
-sal_Bool mbAllChildren;
+bool mbRow:1;
+bool mbInitChild:1;
+bool mbAllChildren:1;
public:
LateInitParams( const ::std::vectorScDPDimension* ppDim, const
::std::vectorScDPLevel* ppLev,
-sal_Bool bRow, sal_Bool bInitChild = sal_True , sal_Bool bAllChildren
= false);
+bool bRow, bool bInitChild = true, bool bAllChildren = false);
~LateInitParams();
-void SetInitChild( sal_Bool b ) { mbInitChild = b; }
-void SetInitAllChildren( sal_Bool b ) { mbAllChildren = b; }
+void SetInitChild( bool b ) { mbInitChild = b; }
+void SetInitAllChildren( bool b ) { mbAllChildren = b; }
inline ScDPDimension* GetDim( size_t nPos ) const { return mppDim[nPos];}
inline ScDPLevel* GetLevel( size_t nPos ) const { return
mppLev[nPos];}
-inline sal_Bool GetInitChild() const {return mbInitChild; }
-inline sal_Bool GetInitAllChild() const { return mbAllChildren; }
-inline sal_Bool IsRow() const { return mbRow; }
-sal_Bool IsEnd( size_t nPos ) const ;
+bool GetInitChild() const {return mbInitChild; }
+bool GetInitAllChild() const { return mbAllChildren; }
+bool IsRow() const { return mbRow; }
+bool IsEnd( size_t nPos ) const ;
};
class ScDPResultData
@@ -346,46 +346,46 @@ private:
ScDPParentDimDataaParentDimData;
ScDPResultDimension*pChildDimension;
ScDPDataMember* pDataRoot;
-sal_BoolbHasElements;
-sal_BoolbForceSubTotal;
-sal_BoolbHasHiddenDetails;
-sal_BoolbInitialized;
-sal_BoolbAutoHidden;
+boolbHasElements:1;
+boolbForceSubTotal:1;
+boolbHasHiddenDetails:1;
+boolbInitialized:1;
+boolbAutoHidden:1;
ScDPAggData aColTotal; // to store column totals
sal_uInt16 nMemberStep;// step to show details
public:
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/dptabres.hxx | 33 +++---
sc/source/core/data/dptabres.cxx | 57 +++
2 files changed, 45 insertions(+), 45 deletions(-)
New commits:
commit 2301bf6f5b88cb0230836a70e94854ee7d9a29eb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Feb 14 11:23:08 2013 -0500
String to OUString.
Change-Id: I04abefbb43f65406a01690e62ab7b8ea6c4f9eb9
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index a2df857..9b89320 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -371,7 +371,7 @@ public:
size_t nPos,
ScDPInitState rInitState);
void CheckShowEmpty( bool bShow = false );
-String GetName() const;
+OUString GetName() const;
voidFillItemData( ScDPItemData rData ) const;
bool IsValid() const;
bool IsVisible() const;
@@ -391,11 +391,10 @@ public:
const ScDPResultDimension* pDataDim,
const ::std::vectorSCROW
aDataMembers,
const ::std::vectorScDPValue
aValues );
-voidFillMemberResults( com::sun::star::uno::Sequence
-
com::sun::star::sheet::MemberResult* pSequences,
-long rPos, long nMeasure, bool
bRoot,
-const String* pMemberName,
-const String* pMemberCaption );
+void FillMemberResults(
+com::sun::star::uno::Sequence
+com::sun::star::sheet::MemberResult* pSequences,
+long rPos, long nMeasure, bool bRoot, const OUString* pMemberName,
const OUString* pMemberCaption );
voidFillDataResults( const ScDPResultMember* pRefMember,
com::sun::star::uno::Sequence
@@ -447,7 +446,7 @@ public:
voidInitFrom( const ScDPResultDimension* pDim );
-String GetName() const;
+OUString GetName() const;
bool IsVisible() const;
bool HasData( long nMeasure, const ScDPSubTotalState rSubState ) const;
@@ -561,13 +560,15 @@ public:
voidResetResults();
-// called for the reference dimension
-ScDPDataMember* GetRowReferenceMember( const ScDPRelativePos*
pMemberPos, const String* pName,
-const long* pRowIndexes, const long*
pColIndexes ) const;
+// called for the reference dimension
+ScDPDataMember* GetRowReferenceMember(
+const ScDPRelativePos* pMemberPos, const OUString* pName,
+const long* pRowIndexes, const long* pColIndexes ) const;
-// uses row root member from ScDPRunningTotalState
-static ScDPDataMember* GetColReferenceMember( const ScDPRelativePos*
pMemberPos, const String* pName,
-long nRefDimPos, const
ScDPRunningTotalState rRunning );
+// uses row root member from ScDPRunningTotalState
+static ScDPDataMember* GetColReferenceMember(
+const ScDPRelativePos* pMemberPos, const OUString* pName,
+long nRefDimPos, const ScDPRunningTotalState rRunning );
voidDumpState( const ScDPResultMember* pRefMember,
ScDocument* pDoc, ScAddress rPos ) const;
@@ -580,7 +581,7 @@ public:
ScMemberSortOrder GetMemberOrder(){ return aMemberOrder;
}
bool IsDataLayout() const { return bIsDataLayout; }
-String GetName() const { return aDimensionName; }
+const OUString GetName() const { return aDimensionName; }
bool IsSortByData() const { return bSortByData; }
bool IsSortAscending() const { return bSortAscending; }
@@ -648,7 +649,7 @@ public:
ScDPResultVisibilityData( ScDPSource* pSource);
~ScDPResultVisibilityData();
-void addVisibleMember(const String rDimName, const ScDPItemData
rMemberItem);
+void addVisibleMember(const OUString rDimName, const ScDPItemData
rMemberItem);
void fillFieldFilters(::std::vectorScDPFilteredCache::Criterion
rFilters) const;
private:
@@ -657,7 +658,7 @@ private:
size_t operator()(const ScDPItemData r) const;
};
typedef ::boost::unordered_setScDPItemData, MemberHash VisibleMemberType;
-typedef ::boost::unordered_mapString, VisibleMemberType,
ScStringHashCode DimMemberType;
+typedef ::boost::unordered_mapOUString, VisibleMemberType,
ScStringHashCode DimMemberType;
DimMemberType maDimensions;
ScDPSource* mpSource;
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index d832831..b0b29bc 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -966,9 +966,9 @@ ScDPResultMember::~ScDPResultMember()
[Libreoffice-commits] core.git: 2 commits - svx/source sw/source
svx/source/tbxctrls/tbcontrl.cxx | 32 +++
sw/source/filter/ww8/docxattributeoutput.cxx |4 +--
2 files changed, 16 insertions(+), 20 deletions(-)
New commits:
commit a12286cf81b2483e1585b2c45c40fa507fdd3136
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Feb 14 17:12:54 2013 +0100
more reliable detecting of changes in the combobox lineedit
Change-Id: I3563a961c54e235fffe0c2ab1809f51882ba3831
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 89d73d1..021e8a9 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -191,7 +191,7 @@ private:
voidReleaseFocus_Impl();
voidEnableControls_Impl();
-voidCheckAndMarkUnknownFont( const OUString fontname );
+DECL_DLLPRIVATE_LINK( CheckAndMarkUnknownFont, VclWindowEvent* );
protected:
virtual voidSelect();
@@ -201,6 +201,7 @@ public:
SvxFontNameBox_Impl( Window* pParent, const Reference XDispatchProvider
rDispatchProvider,const Reference XFrame _xFrame
, WinBits nStyle = WB_SORT
);
+virtual ~SvxFontNameBox_Impl();
voidFillList();
voidUpdate( const SvxFontItem* pFontItem );
@@ -209,8 +210,6 @@ public:
voidFill( const FontList* pList )
{ FontNameBox::Fill( pList );
nFtCount = pList-GetFontNameCount(); }
-virtual voidSetText( const OUString rStr ) SAL_OVERRIDE;
-virtual voidSetText( const OUString rStr, const Selection
rNewSelection ) SAL_OVERRIDE;
virtual longPreNotify( NotifyEvent rNEvt );
virtual longNotify( NotifyEvent rNEvt );
virtual Reference ::com::sun::star::accessibility::XAccessible
CreateAccessible();
@@ -771,7 +770,14 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent,
const Reference XDis
{
SetSizePixel(LogicToPixel( aLogicalSize, MAP_APPFONT ));
EnableControls_Impl();
+GetSubEdit()-AddEventListener( LINK( this, SvxFontNameBox_Impl,
CheckAndMarkUnknownFont ));
}
+
+SvxFontNameBox_Impl::~SvxFontNameBox_Impl()
+{
+GetSubEdit()-RemoveEventListener( LINK( this, SvxFontNameBox_Impl,
CheckAndMarkUnknownFont ));
+}
+
// ---
void SvxFontNameBox_Impl::FillList()
@@ -784,22 +790,11 @@ void SvxFontNameBox_Impl::FillList()
SetSelection( aOldSel );
}
-void SvxFontNameBox_Impl::SetText( const OUString rStr )
-{
-CheckAndMarkUnknownFont( rStr );
-return FontNameBox::SetText( rStr );
-}
-
-void SvxFontNameBox_Impl::SetText( const OUString rStr, const Selection
rNewSelection )
-{
-CheckAndMarkUnknownFont( rStr );
-return FontNameBox::SetText( rStr, rNewSelection );
-}
-
-void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const OUString fontname )
+IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent*,
event )
{
-if( fontname == GetText())
-return;
+if( event-GetId() != VCLEVENT_EDIT_MODIFY )
+return 0;
+OUString fontname = GetSubEdit()-GetText();
GetDocFontList_Impl( pFontList, this );
// If the font is unknown, show it in italic.
Font font = GetControlFont();
@@ -821,6 +816,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const
OUString fontname )
SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE
));
}
}
+return 0;
}
// ---
commit fe8bfb201e79c31de1b692931a0e9ee6c7ff1d25
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Feb 12 19:06:54 2013 +0100
mso saves obfuscated fonts as .odttf in .docx, so use the extension as well
Change-Id: I5d4cb579c042f03137188f3e0293015bea723dce
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0732979..9ff630a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3059,7 +3059,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString
name, int tag, const c
if( file.open( osl_File_OpenFlag_Read ) != osl::File::E_None )
return;
uno::Reference com::sun::star::io::XOutputStream xOutStream =
m_rExport.GetFilter().openFragmentStream(
-OUString( word/fonts/font ) + OUString::number(m_nextFontId) +
.ttf,
+OUString( word/fonts/font ) + OUString::number(m_nextFontId) +
.odttf,
application/vnd.openxmlformats-officedocument.obfuscatedFont );
// Not much point in trying hard with the obfuscation key, whoever reads
the spec can read the font anyway,
// so just alter the first and last part of the key.
@@ -3110,7 +3110,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString
name, int tag, const c
xOutStream-closeOutput();
OString relId = OUStringToOString(
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/tree/writertreevisiting.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1976b017c3f23a50fc4533c94ae4eb151ee591a1
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 14 17:23:39 2013 +0100
Disambiguation for MSC
Change-Id: I356af9cebf4779bd5bc4721b0e0e20d7ae4e307e
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx
b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 6f7fe57..7eaabe8 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -120,8 +120,8 @@ void WriterXmlEmitter::fillFrameProps( DrawElement
rElem,
{
if( dynamic_castParagraphElement*(pAnchor) )
{
-rProps[ text:anchor-type ] =
-rElem.isCharacter ? character : paragraph;
+rProps[ text:anchor-type ] = rElem.isCharacter
+? OUString(character) : OUString(paragraph);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/dptabres.hxx |2
sc/source/core/data/dptabres.cxx | 129 +++
2 files changed, 65 insertions(+), 66 deletions(-)
New commits:
commit 2f955d5f12184072c8f327f15018556f2f75
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Feb 14 11:31:27 2013 -0500
More boolean cleanups.
Change-Id: I27dc69f92a196137cb218fa5254e40dbe920f7c0
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 9b89320..b905b45 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -177,7 +177,7 @@ public:
bool HasData() const;
voidSetResult( double fNew );
-voidSetEmpty( sal_Bool bSet );
+void SetEmpty( bool bSet );
voidSetError();
double GetAuxiliary() const;
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index b0b29bc..7810ba5 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -73,10 +73,10 @@ static sal_uInt16 nFuncStrIds[12] = // passend zum enum
ScSubTotalFunc
};
namespace {
-sal_Bool lcl_SearchMember( const std::vector ScDPResultMember * list,
SCROW nOrder, SCROW rIndex)
+bool lcl_SearchMember( const std::vector ScDPResultMember * list, SCROW
nOrder, SCROW rIndex)
{
rIndex = list.size();
-sal_Bool bFound = false;
+bool bFound = false;
SCROW nLo = 0;
SCROW nHi = list.size() - 1;
SCROW nIndex;
@@ -90,7 +90,7 @@ namespace {
nHi = nIndex - 1;
if ( list[nIndex]-GetOrder() == nOrder )
{
-bFound = sal_True;
+bFound = true;
nLo = nIndex;
}
}
@@ -109,37 +109,37 @@ class ScDPRowMembersOrder
{
ScDPResultDimension rDimension;
long nMeasure;
-sal_Bool bAscending;
+bool bAscending;
public:
-ScDPRowMembersOrder( ScDPResultDimension rDim, long nM, sal_Bool
bAsc ) :
+ScDPRowMembersOrder( ScDPResultDimension rDim, long nM, bool bAsc
) :
rDimension(rDim),
nMeasure(nM),
bAscending(bAsc)
{}
~ScDPRowMembersOrder() {}
-sal_Bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
+bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
};
class ScDPColMembersOrder
{
ScDPDataDimension rDimension;
long nMeasure;
-sal_Bool bAscending;
+bool bAscending;
public:
-ScDPColMembersOrder( ScDPDataDimension rDim, long nM, sal_Bool
bAsc ) :
+ScDPColMembersOrder( ScDPDataDimension rDim, long nM, bool bAsc )
:
rDimension(rDim),
nMeasure(nM),
bAscending(bAsc)
{}
~ScDPColMembersOrder() {}
-sal_Bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
+bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
};
-static sal_Bool lcl_IsLess( const ScDPDataMember* pDataMember1, const
ScDPDataMember* pDataMember2, long nMeasure, sal_Bool bAscending )
+static bool lcl_IsLess( const ScDPDataMember* pDataMember1, const
ScDPDataMember* pDataMember2, long nMeasure, bool bAscending )
{
// members can be NULL if used for rows
@@ -147,12 +147,12 @@ static sal_Bool lcl_IsLess( const ScDPDataMember*
pDataMember1, const ScDPDataMe
const ScDPAggData* pAgg1 = pDataMember1 ? pDataMember1-GetConstAggData(
nMeasure, aEmptyState ) : NULL;
const ScDPAggData* pAgg2 = pDataMember2 ? pDataMember2-GetConstAggData(
nMeasure, aEmptyState ) : NULL;
-sal_Bool bError1 = pAgg1 pAgg1-HasError();
-sal_Bool bError2 = pAgg2 pAgg2-HasError();
+bool bError1 = pAgg1 pAgg1-HasError();
+bool bError2 = pAgg2 pAgg2-HasError();
if ( bError1 )
-return sal_False; // errors are always sorted at the end
+return false; // errors are always sorted at the end
else if ( bError2 )
-return sal_True;// errors are always sorted at the end
+return true;// errors are always sorted at the end
else
{
double fVal1 = ( pAgg1 pAgg1-HasData() ) ? pAgg1-GetResult() :
0.0;// no data is sorted as 0
@@ -165,7 +165,7 @@ static sal_Bool lcl_IsLess( const ScDPDataMember*
pDataMember1, const ScDPDataMe
}
}
-static sal_Bool lcl_IsEqual( const ScDPDataMember* pDataMember1, const
ScDPDataMember* pDataMember2, long nMeasure )
+static bool lcl_IsEqual( const ScDPDataMember* pDataMember1, const
ScDPDataMember* pDataMember2, long nMeasure )
{
// members can be NULL if used for rows
@@ -173,12 +173,12 @@ static sal_Bool lcl_IsEqual( const ScDPDataMember*
pDataMember1, const ScDPDataM
const ScDPAggData* pAgg1 = pDataMember1 ? pDataMember1-GetConstAggData(
nMeasure,
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/writerwordglue.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit b88fe998ce8c80d7629fe70118311096615d959d Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Feb 14 17:43:25 2013 +0100 use 'default character set' as the windows charset for unicode This is based on 2.8.2.2 from ECMA OOXML Part 4 and is a bit of a guess. I do not see why JIS should be the charset for everything that is unicode, and MSO2013 fails to read embedded fonts with w:charset set to this value. It seems to handle them when w:charset is set to this 'default character set', whatever that actually is. Without embedded fonts involved it moreover looks like w:charset does not actually matter. Change-Id: I7c083a0e39076313cd2687b1712420c92f691f5b diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 2af44cd..f8c3eef 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -682,8 +682,7 @@ namespace sw case RTL_TEXTENCODING_UTF7: case RTL_TEXTENCODING_UTF8: case RTL_TEXTENCODING_JAVA_UTF8: -OSL_ENSURE(nRet != 0x80, This method may be redundant); -nRet = 0x80; +nRet = 0x01; break; default: break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/propctrlr/formmetadata.cxx | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit ca0600f0c9022d631317423ab5a59493b41906ab
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 14 17:53:05 2013 +0100
multiple unsequenced modifications to 'nPos' [-Werror,-Wunsequenced]
...solved by removing the nPos member and instead calculating the index on
the
fly. The difference is that old indices were before calling std::sort in
OPropertyInfoService::getPropertyInfo() while new ones are after, but that
should probably be OK per the documentation of
com.sun.star.inspection.XObjectInspectionModel.getPropertyOrderIndex (which
appears to be the only client of that functionality).
Change-Id: Id346bb219acbdad88ec43cf46feca8c37f2c7cf4
diff --git a/extensions/source/propctrlr/formmetadata.cxx
b/extensions/source/propctrlr/formmetadata.cxx
index e342e31..2757a27 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -44,26 +44,23 @@ namespace pcr
String sTranslation;
rtl::OStringsHelpId;
sal_Int32 nId;
-sal_uInt16 nPos;
sal_uInt32 nUIFlags;
OPropertyInfoImpl(
const ::rtl::OUString rName,
sal_Int32 _nId,
const String aTranslation,
-sal_uInt16 nPosId,
const rtl::OString,
sal_uInt32 _nUIFlags);
};
//
OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString _rName,
sal_Int32 _nId,
- const String aString, sal_uInt16 nP, const
rtl::OString sHid, sal_uInt32 _nUIFlags)
+ const String aString, const rtl::OString
sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
,sHelpId(sHid)
,nId(_nId)
- ,nPos(nP)
,nUIFlags(_nUIFlags)
{
}
@@ -83,7 +80,7 @@ namespace pcr
//
#define DEF_INFO( ident, uinameres, helpid, flags ) \
OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
-String( PcrRes( RID_STR_##uinameres ) ), nPos++,
HID_PROP_##helpid, flags )
+String( PcrRes( RID_STR_##uinameres ) ), HID_PROP_##helpid, flags )
#define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 )
@@ -111,8 +108,6 @@ namespace pcr
PcrClient aResourceAccess;
// this ensures that we have our resource file loaded
-sal_uInt16 nPos = 1;
-
static OPropertyInfoImpl aPropertyInfos[] =
{
/*
@@ -399,7 +394,7 @@ namespace pcr
sal_Int16 OPropertyInfoService::getPropertyPos(sal_Int32 _nId) const
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
-return (pInfo) ? pInfo-nPos : 0x;
+return (pInfo) ? pInfo - s_pPropertyInfos : 0x;
}
//
@@ -550,7 +545,7 @@ namespace pcr
// Initialization
if(!s_pPropertyInfos)
getPropertyInfo();
-OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, , 0);
+OPropertyInfoImpl aSearch(_rName, 0L, String(), , 0);
const OPropertyInfoImpl* pInfo = ::std::lower_bound(
s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch,
PropertyInfoLessByName() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/source xmlsecurity/inc xmlsecurity/source xmlsecurity/uiconfig xmlsecurity/UI_xmlsec.mk
vcl/source/window/builder.cxx |6
xmlsecurity/UI_xmlsec.mk |1
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 25 -
xmlsecurity/source/dialogs/dialogs.hrc | 37 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |4
xmlsecurity/source/dialogs/helpids.hrc |1
xmlsecurity/source/dialogs/macrosecurity.cxx | 136 +++---
xmlsecurity/source/dialogs/macrosecurity.src | 95
xmlsecurity/uiconfig/ui/macrosecuritydialog.ui | 268 -
xmlsecurity/uiconfig/ui/securitytrustpage.ui | 348 +
10 files changed, 447 insertions(+), 474 deletions(-)
New commits:
commit 772e231a92044b5613b4ae3545b2110a5e13ed99
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 14 15:16:13 2013 +
split out trust page and adapt code
Change-Id: I79067df7174f5ae9bff51d997128cb033477aa6f
diff --git a/xmlsecurity/UI_xmlsec.mk b/xmlsecurity/UI_xmlsec.mk
index 69f1b2b..e07a558 100644
--- a/xmlsecurity/UI_xmlsec.mk
+++ b/xmlsecurity/UI_xmlsec.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,xmlsec))
$(eval $(call gb_UI_add_uifiles,xmlsec,\
xmlsecurity/uiconfig/ui/digitalsignaturesdialog \
xmlsecurity/uiconfig/ui/securitylevelpage \
+ xmlsecurity/uiconfig/ui/securitytrustpage \
xmlsecurity/uiconfig/ui/selectcertificatedialog \
xmlsecurity/uiconfig/ui/macrosecuritydialog \
))
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 4611f05..a61b9a1 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -124,19 +124,15 @@ public:
class MacroSecurityTrustedSourcesTP : public MacroSecurityTP
{
private:
-FixedLine maTrustCertFL;
-ReadOnlyImage maTrustCertROFI;
-SvxSimpleTableContainer m_aTrustCertLBContainer;
-SvxSimpleTable maTrustCertLB;
-PushButton maAddCertPB;
-PushButton maViewCertPB;
-PushButton maRemoveCertPB;
-FixedLine maTrustFileLocFL;
-ReadOnlyImage maTrustFileROFI;
-FixedInfo maTrustFileLocFI;
-ListBox maTrustFileLocLB;
-PushButton maAddLocPB;
-PushButton maRemoveLocPB;
+FixedImage* m_pTrustCertROFI;
+SvxSimpleTable* m_pTrustCertLB;
+PushButton* m_pAddCertPB;
+PushButton* m_pViewCertPB;
+PushButton* m_pRemoveCertPB;
+FixedImage* m_pTrustFileROFI;
+ListBox*m_pTrustFileLocLB;
+PushButton* m_pAddLocPB;
+PushButton* m_pRemoveLocPB;
cssu::Sequence SvtSecurityOptions::Certificate maTrustedAuthors;
@@ -154,7 +150,8 @@ private:
voidImplCheckButtons();
public:
-MacroSecurityTrustedSourcesTP( Window* pParent,
MacroSecurity* _pDlg );
+MacroSecurityTrustedSourcesTP(Window* pParent, MacroSecurity* _pDlg);
+~MacroSecurityTrustedSourcesTP();
virtual voidActivatePage();
virtual voidClosePage( void );
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc
b/xmlsecurity/source/dialogs/dialogs.hrc
index cfc4acd..e2224f29 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -175,43 +175,6 @@
#define MS_COL_G(MS_COL_F-RSC_SP_CTRL_X)
#define MS_COL_H(MS_COL_G-RSC_CD_PUSHBUTTON_WIDTH)
-// - tab page trusted sources -
-
-#define FL_TRUSTCERT1
-#define LB_TRUSTCERT2
-#define PB_ADD_TRUSTCERT3
-#define PB_VIEW_TRUSTCERT 4
-#define PB_REMOVE_TRUSTCERT 5
-#define FL_TRUSTFILELOC 6
-#define FI_TRUSTFILELOC 7
-#define LB_TRUSTFILELOC 8
-#define FL_ADD_TRUSTFILELOC 9
-#define FL_REMOVE_TRUSTFILELOC 10
-#define FI_TRUSTCERT_RO 11
-#define FI_TRUSTFILE_RO 12
-
-#define TS_COL_0RSC_SP_TBPG_INNERBORDER_LEFT
-#define TS_COL_1(TS_COL_0+RSC_SP_FLGR_SPACE_X)
-#define TS_COL_8
(TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
-#define TS_COL_7(TS_COL_8-RSC_SP_FLGR_SPACE_X)
-#define TS_COL_6(TS_COL_7-RSC_CD_PUSHBUTTON_WIDTH)
-#define TS_COL_5(TS_COL_6-RSC_SP_CTRL_GROUP_X)
-#define TS_COL_4(TS_COL_5-RSC_CD_PUSHBUTTON_WIDTH)
-#define TS_COL_3(TS_COL_4-RSC_SP_CTRL_GROUP_X)
-#define TS_COL_2(TS_COL_3-RSC_CD_PUSHBUTTON_WIDTH)
-
-#define RSC_CD_TABLISTBOX_HEIGHT6*RSC_BS_CHARHEIGHT
-#define TS_ROW_0RSC_SP_TBPG_INNERBORDER_TOP
-#define
minutes of ESC call ...
* Present + Stephan, Andras, Thorsten, Norbert, Eike, Joel, Caolan, Markus, Michael M, Lionel, Mirek, Tibby, Cedric, Bjoern, Petr, Michael S * Completed Action Items + migrate 3.5 MAB's to 3.6 (Joel / QA guys) + review / back-port Mac signing foo for 4.0.1 (Tor) + RHEL5 base for tinderbox running (Caolan) + 64bit builds running locally, pending migration to new build hardware, if 64bit works turn on 32bit + Investigate native build/env scripts for SDK (Bjoern) + use gnumake instead perhaps ? try harder ? + punted for now. * Pending Action Items + find person who can write and add off-line help for impress-remote (Thorsten) ** + Update gsoc ideas page https://wiki.documentfoundation.org/Development/Gsoc/Ideas (all) + everybody should update their their tasks and add new ones + create/request mail alias for certification (Bjoern) + Bugzilla attachments not set to autodetect (Bjoern) + sent to Tollef, pending reply + full-word selection / editing ergonomics cf. UX-advise https://bugs.freedesktop.org/show_bug.cgi?id=46517 + pending input from Caolan / Cedric / Michael S + minimal triage for good mentors for proposed easy hacks (Bjoern) + disable Rhino / Beanshell unless in experimental mode (Michael M) + Ubuntu font licensing questions, clarify at Canonical (Bjoern) + helping out with code-pointers for UI bugs (Kendy) + reviewed them with Mirek in person, pointers pending + http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-February/001817.html * UX input (Mirek) + 4.0/4.x branding + E-mail voting results: https://docs.google.com/spreadsheet/ccc?key=0AsGS28t6YMF3dHFrTm9hMzZVNk9hNEZMN0NSbV9ZbXc#gid=0 + two winners, Alex's and Maxim's + going for Maxim's proposal AI: + push updated branding for 4.0.1 RC1; send TDF branded versions out to ESC list (Astron) + Mirek to propose a talk at LibreGraphics + a great opportunity, may see Fridrich too. * GSOC 2013 (Cedric) + announced last-week + we'll know if we will participate by April 8th + it is -really- important to have a great ideas page at that date: + https://wiki.documentfoundation.org/Development/Gsoc/Ideas + this year final evaluations would happen during the LibreOffice conf. * Release Engineering update (Petr) + 4.0.1 rc1 commit deadline 1.5 weeks out: Monday Feb 18 AI: + check RHEL5 dbus-glib / bluez bits for bluetooth (Caolan) + enable bluetooth remote control for windows AI: + get LotusLive / CMIS fixes in (need review) (Michael) + 3.6.6 rc1 commit deadline 1 month out: Monday Mar 18 * Official discontinuation of 3.5 release (Petr) + all 3.5 MAB's are migrated to 3.6 AI: + poke marketing - do we want an official announcement of this (Petr) + no further 3.5 bugfix releases are planned + but no need to update bug versions on your bugs. + 3.6 is stable, 4.0.0 is out looking good. * on-line update strategy for 3.5.x all of it to 3.6.5 (Kendy) + 3.x-1.n - 3.x.n works well - except for now = upgrade everything to 3.6.5 = upgrade all 3.*.0 - 4.0.0 + potential ideal: + first-ever-start to check for updates and warn (Bjoern) + add to the recovery dialog your version is horribly old and crashy * 4.0.0 retrospective + branding changes were done much too late + bluetooth shipped in a horrible state: + different developer / distribution builds + more targetted testing communication (Moztrap ?) + still some incomplete upgrade / profile issues + improved / fixed for 4.0.1 + more time to fix regressions before release (Michael S) + do we want to branch -x-0-0 at all ? + it is to avoiding breaking the last RC (Petr) + should we lower the review barrier from -4-0 to -4-0-0 ? (Bjoern) + moral hazard of sticking more stuff into .0 release (Thorsten) + better marketing / QA team co-ordination (Joel) + getting more people using pre-releases would be useful improving communication key. * scp2 re-work (Bjoern) + starting proposal in gerrit + significantly reducing complexity + stepping stone to ridding ourselves of more perl magic + https://gerrit.libreoffice.org/#/c/2144/ + comments so far encouraging + how to get module info into
[PATCH] translation of german comment in file dtrans/source/win32/clipb/WinClipbImpl.cxx
Hi,
translation of the (only) german comment in the file
dtrans/source/win32/clipb/WinClipbImpl.cxx
Rgeards
Urs
From 3baf9a8197f09246a3beb9f14a9a0e57696ef3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urs=20F=C3=A4ssler?= u...@bitzgi.ch
Date: Thu, 14 Feb 2013 16:36:06 +0100
Subject: [PATCH] Translation of german comment
Change-Id: I2876e33ccfd5dd7b33747d77a4cdaaa03bd01de9
---
dtrans/source/win32/clipb/WinClipbImpl.cxx | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 167e889..76e4c64 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -180,16 +180,15 @@ sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities( ) throw( RuntimeExce
void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
{
-// sollte eigentlich hier stehen: ClearableMutexGuard aGuard( m_ClipContentMutex );
-// geht aber nicht, da FlushClipboard zurückruft und das DataObject
-// freigibt und damit würde es einen Deadlock in onReleaseDataObject geben
-// FlushClipboard muß synchron sein, damit das runterfahren ggf. erst weitergeht,
-// wenn alle Clipboard-Formate gerendert wurden
-// die Abfrage ist nötig, damit nur geflusht wird, wenn wir wirklich Clipboardowner
-// sind (ich weiss nicht genau was passiert, wenn man flusht und nicht Clipboard
-// owner ist).
-// eventuell kann man aber die Abfrage in den Clipboard STA Thread verlagern, indem
-// man sich dort das DataObject merkt und vor dem flushen OleIsCurrentClipboard ruft
+// actually it should be ClearableMutexGuard aGuard( m_ClipContentMutex );
+// but it does not work since FlushClipboard does a callback and frees DataObject
+// which results in a deadlock in onReleaseDataObject.
+// FlushClipboard had to be synchron in order to prevent shutdown until all
+// clipboard-formats are redered.
+// The request is needed to prevent flushing if we are not clipboard owner (it is
+// not known what happens if we flush but aren't clipoard owner).
+// It may be possible to move the request to the clipboard STA thread by saving the
+// DataObject and call OleIsCurrentClipboard bevore flushing.
if ( NULL != m_pCurrentClipContent )
m_MtaOleClipboard.flushClipboard( );
--
1.7.10.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/ui/inspection/metadata.cxx | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 5cd036c0742f8be8d6fc34f7e3a983cae557d94b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 14 18:29:58 2013 +0100
multiple unsequenced modifications to 'nPos' [-Werror,-Wunsequenced]
...where the nPos wasn't actually used, anyway.
Change-Id: Id5e2e37acd2a7cc191030a1ec959894d3ec1943f
diff --git a/reportdesign/source/ui/inspection/metadata.cxx
b/reportdesign/source/ui/inspection/metadata.cxx
index 40ba8a9..b80d19f 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -44,26 +44,23 @@ namespace rptui
String sTranslation;
rtl::OStringsHelpId;
sal_Int32 nId;
-sal_uInt16 nPos;
sal_uInt32 nUIFlags;
OPropertyInfoImpl(
const ::rtl::OUString rName,
sal_Int32 _nId,
const String aTranslation,
-sal_uInt16 nPosId,
const rtl::OString _sHelpId,
sal_uInt32 _nUIFlags);
};
//
OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString _rName,
sal_Int32 _nId,
- const String aString, sal_uInt16 nP, const
rtl::OString sHid, sal_uInt32 _nUIFlags)
+ const String aString, const rtl::OString
sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
,sHelpId(sHid)
,nId(_nId)
- ,nPos(nP)
,nUIFlags(_nUIFlags)
{
}
@@ -83,7 +80,7 @@ namespace rptui
//
#define DEF_INFO( ident, uinameres, helpid, flags ) \
OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
-String( ModuleRes( RID_STR_##uinameres ) ), nPos++,
HID_RPT_PROP_##helpid, flags )
+String( ModuleRes( RID_STR_##uinameres ) ), HID_RPT_PROP_##helpid,
flags )
#define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 )
@@ -111,7 +108,6 @@ namespace rptui
OModuleClient aResourceAccess;
// this ensures that we have our resource file loaded
-sal_uInt16 nPos = 1;
static OPropertyInfoImpl aPropertyInfos[] =
{
/*
@@ -202,7 +198,7 @@ namespace rptui
// intialisierung
if(!s_pPropertyInfos)
getPropertyInfo();
-OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, , 0);
+OPropertyInfoImpl aSearch(_rName, 0L, String(), , 0);
const OPropertyInfoImpl* pPropInfo = ::std::lower_bound(
s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch,
PropertyInfoLessByName() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - ucb/source
ucb/source/ucp/cmis/cmis_url.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit f7aed938a56616ddf22448ccc080c581f230e737 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Wed Feb 13 07:17:29 2013 +0100 CMIS: URL-decode username or it won't be shown properly in dialog Change-Id: Icb8eaf5d841cba0d0d7efc4146b33995cdbf46f3 Reviewed-on: https://gerrit.libreoffice.org/2147 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index eb779d8..40d7a25 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -52,12 +52,12 @@ namespace cmis m_sBindingUrl = aHostUrl.GetURLNoMark( ); m_sRepositoryId = aHostUrl.GetMark( ); -m_sUser = aUrl.GetUser( ); -m_sPass = aUrl.GetPass( ); +m_sUser = aUrl.GetUser( INetURLObject::DECODE_WITH_CHARSET ); +m_sPass = aUrl.GetPass( INetURLObject::DECODE_WITH_CHARSET ); // Store the path to the object m_sPath = aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); -m_sId = aUrl.GetMark( ); +m_sId = aUrl.GetMark( INetURLObject::DECODE_WITH_CHARSET ); if ( !m_sId.isEmpty( ) ) m_sPath = rtl::OUString( ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/inc
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit b6ff380b9378ecbcceadf717dcf1623bc52d4825 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Feb 14 18:36:28 2013 +0100 -Werror,-Wunused-private-field Change-Id: I6c12d295372e847226adc61b2c9496f052cc2fdf diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index a61b9a1..4b500dc 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -126,7 +126,6 @@ class MacroSecurityTrustedSourcesTP : public MacroSecurityTP private: FixedImage* m_pTrustCertROFI; SvxSimpleTable* m_pTrustCertLB; -PushButton* m_pAddCertPB; PushButton* m_pViewCertPB; PushButton* m_pRemoveCertPB; FixedImage* m_pTrustFileROFI; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - libcmis/libcmis-0.3.0-lotus-live-fix.patch libcmis/UnpackedTarball_cmis.mk sfx2/source sw/inc sw/source ucb/source
libcmis/UnpackedTarball_cmis.mk|1
libcmis/libcmis-0.3.0-lotus-live-fix.patch | 122 +++
sfx2/source/view/sfxbasecontroller.cxx |2
sw/inc/IDocumentStatistics.hxx | 17 ++
sw/inc/doc.hxx | 16 ++
sw/inc/ndtxt.hxx |4
sw/source/core/doc/doc.cxx | 184 -
sw/source/core/doc/docnew.cxx |4
sw/source/core/txtnode/txtedt.cxx | 18 +-
sw/source/ui/dialog/wordcountdialog.cxx|2
sw/source/ui/inc/view.hxx |6
sw/source/ui/uiview/view.cxx |1
sw/source/ui/uiview/view2.cxx |9 +
ucb/source/ucp/cmis/cmis_content.cxx | 138 +
ucb/source/ucp/cmis/cmis_content.hxx |2
ucb/source/ucp/cmis/cmis_url.cxx | 29 +++-
16 files changed, 425 insertions(+), 130 deletions(-)
New commits:
commit 57d87496d0ac8c35597acc3cf81609eb4aaa55df
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Feb 14 10:27:21 2013 +0100
CMIS: made it work with Lotus Live
Making libcmis and LibreOffice work with Lotus Live service needed a few
hacks to either better implement CMIS or workaround some bad
implementations.
As a general improvement, the CheckOut InfoBar isn't shown if the
document can't be checked out.
Change-Id: I7bb4211db0506998cef40ac1fb6375e647234085
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk
index a25c316..0a9f9f8 100644
--- a/libcmis/UnpackedTarball_cmis.mk
+++ b/libcmis/UnpackedTarball_cmis.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
libcmis/libcmis-0.3.0-win.patch \
libcmis/libcmis-0.3.0.patch \
libcmis/libcmis-0.3.0-proxy.patch \
+ libcmis/libcmis-0.3.0-lotus-live-fix.patch \
))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/libcmis/libcmis-0.3.0-lotus-live-fix.patch
b/libcmis/libcmis-0.3.0-lotus-live-fix.patch
new file mode 100644
index 000..2aca934
--- /dev/null
+++ b/libcmis/libcmis-0.3.0-lotus-live-fix.patch
@@ -0,0 +1,122 @@
+diff --git src/libcmis/atom-folder.cxx src/libcmis/atom-folder.cxx
+index 68fb124..2756a5d 100644
+--- src/libcmis/atom-folder.cxx
src/libcmis/atom-folder.cxx
+@@ -57,8 +57,11 @@ vector libcmis::ObjectPtr AtomFolder::getChildren( )
throw ( libcmis::Excepti
+ {
+ AtomLink* childrenLink = getLink( down,
application/atom+xml;type=feed );
+
++// Some servers aren't giving the GetChildren properly... if not defined,
we need to try
++// as we may have the right to proceed.
+ if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get()
+-!getAllowableActions()-isAllowed(
libcmis::ObjectAction::GetChildren ) ) )
++( !getAllowableActions()-isAllowed(
libcmis::ObjectAction::GetChildren )
++ getAllowableActions()-isDefined(
libcmis::ObjectAction::GetChildren ) ) ) )
+ throw libcmis::Exception( string( GetChildren not allowed on node
) + getId() );
+
+ vector libcmis::ObjectPtr children;
+@@ -182,7 +185,8 @@ libcmis::DocumentPtr AtomFolder::createDocument( const
map string, libcmis::Pro
+ AtomLink* childrenLink = getLink( down,
application/atom+xml;type=feed );
+
+ if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get()
+-!getAllowableActions()-isAllowed(
libcmis::ObjectAction::CreateDocument ) ) )
++!getAllowableActions()-isAllowed(
libcmis::ObjectAction::CreateDocument )
++getAllowableActions()-isDefined(
libcmis::ObjectAction::CreateDocument ) ) )
+ throw libcmis::Exception( string( CreateDocument not allowed on
folder ) + getId() );
+
+ xmlBufferPtr buf = xmlBufferCreate( );
+@@ -210,9 +214,37 @@ libcmis::DocumentPtr AtomFolder::createDocument( const
map string, libcmis::Pro
+ }
+
+ string respBuf = response-getStream( )-str( );
+-xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, 0 );
++xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(),
getInfosUrl().c_str(), NULL, XML_PARSE_NOERROR );
+ if ( NULL == doc )
+-throw libcmis::Exception( Failed to parse object infos );
++{
++// We may not have the created document entry in the response body:
this is
++// the behaviour of some servers, but the standard says we need to
look for
++// the Location header.
++map string, string headers = response-getHeaders( );
++map string, string ::iterator it = headers.find( Location );
++
++// Some servers like Lotus Live aren't sending Location header, but
Content-Location
++if ( it == headers.end( ) )
++it = headers.find( Content-Location );
++
++if ( it != headers.end() )
++{
++try
++{
++
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |8 1 file changed, 8 insertions(+) New commits: commit ecfe412f7758c1ab3d3f2a784c7d0356585529e5 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Feb 14 18:23:49 2013 +0100 fix build Caused by 185e1be6cd1954b8cc5a302c879384f2549cd060, fix is more or less d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5. Change-Id: Ia7d228139126b3e60370b85c106bc970f4e68cce Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 9912614..0a5e1d0 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -34,7 +34,15 @@ #undef WB_LEFT #undef WB_RIGHT #include winsock2.h + // HACK: ws2bth.h defines a struct with a field named MSC, which is + // a #define set by gbuild. Plain #undef MSC here fails with MSVC + // used together with ccache (bug, presumably), so #define it to some + // other usable value. + #undef MSC + #define MSC mscfield #include ws2bth.h + #undef MSC + #define MSC #endif #ifdef __MINGW32__ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/crsrsh.hxx|2 +-
sw/inc/pam.hxx |2 +-
sw/source/core/crsr/crsrsh.cxx |4 ++--
sw/source/core/crsr/pam.cxx |6 +++---
sw/source/ui/docvw/PostItMgr.cxx |2 ++
sw/source/ui/inc/view.hxx|5 -
sw/source/ui/uiview/view.cxx |5 +++--
sw/source/ui/uiview/view2.cxx|5 +
8 files changed, 21 insertions(+), 10 deletions(-)
New commits:
commit 9104d5e8905c2ec2b576b5ca452d3e23de49
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Feb 14 18:42:52 2013 +0100
fdo#60738 SwPostItMgr: let the cursor know if we're in annotation mode
This solves the conflicting requirements:
If the annotation has focus (in annotation mode), then we want to
be read-only only in case the comment anchor is inside a protected
section, or so. Ignoring the fact that in the main document, the cursor
is right before the annotation anchor, which is a read-only position.
OTOH, if the annotation has no focus and the cursor position is before
the annotation anchor position, then we do want to be read-only.
With this commit, the first case passes around a boolean flag, so the
annotation frame won't be read-only without a reason.
Change-Id: I25781a4501f752f7c4d024795d57b884cb800547
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index a7f7d7d..8dff3ca 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -476,7 +476,7 @@ public:
// Cursor is placed in something that is protected or selection contains
// something that is protected.
-sal_Bool HasReadonlySel() const;
+sal_Bool HasReadonlySel(bool bAnnotationMode = false) const;
// Can the cursor be set to read only ranges?
sal_Bool IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; }
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 384fbb9..73a33f7 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -289,7 +289,7 @@ public:
/** Is in something protected (readonly) or selection contains
something protected. */
-bool HasReadonlySel( bool bFormView ) const;
+bool HasReadonlySel( bool bFormView, bool bAnnotationMode = false ) const;
sal_Bool ContainsPosition(const SwPosition rPos)
{ return *Start() = rPos rPos = *End(); }
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index e417c92..e8048b2 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2879,7 +2879,7 @@ void SwCrsrShell::SetReadOnlyAvailable( sal_Bool bFlag )
}
}
-sal_Bool SwCrsrShell::HasReadonlySel() const
+sal_Bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
{
sal_Bool bRet = sal_False;
if( IsReadOnlyAvailable() || GetViewOptions()-IsFormView() )
@@ -2892,7 +2892,7 @@ sal_Bool SwCrsrShell::HasReadonlySel() const
const SwPaM* pCrsr = pCurCrsr;
do {
-if( pCrsr-HasReadonlySel( GetViewOptions()-IsFormView() ) )
+if( pCrsr-HasReadonlySel( GetViewOptions()-IsFormView(),
bAnnotationMode ) )
bRet = sal_True;
} while( !bRet pCurCrsr != ( pCrsr = (SwPaM*)pCrsr-GetNext()
));
}
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 85aedf0..c4bf33c 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -590,7 +590,7 @@ static const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm
rFrm )
}
/// is in protected section or selection surrounds something protected
-bool SwPaM::HasReadonlySel( bool bFormView ) const
+bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
{
bool bRet = sal_False;
Point aTmpPt;
@@ -732,8 +732,8 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
}
// Don't allow inserting characters between the 'field mark end' and
-// the 'comment anchor'.
-if (!bRet)
+// the 'comment anchor', unless the cursor is inside the annotation.
+if (!bRet !bAnnotationMode)
{
if (!pA GetPoint() GetPoint()-nNode.GetNode().IsTxtNode()
GetPoint()-nContent.GetIndex() 0)
{
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 768827d..b8acb5f 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -1624,7 +1624,9 @@ void SwPostItMgr::SetActiveSidebarWin( SwSidebarWin* p)
if (mpActivePostIt)
{
mpActivePostIt-GotoPos();
+mpView-SetAnnotationMode(true);
mpView-AttrChangedNotify(0);
+mpView-SetAnnotationMode(false);
mpActivePostIt-ActivatePostIt();
}
}
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index d0a542b..70c0f08 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -267,7 +267,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
bInDtor : 1, //detect destructor
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/module_helppack.ulf |4 ++-- scp2/source/ooo/module_langpack.ulf |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 4ebcc5b72f49eb3919ca82931572d97347ba2de4 Author: Andras Timar ati...@suse.com Date: Thu Feb 14 19:24:57 2013 +0100 fdo#60483 English - English (United States) in language selector of installer Change-Id: I0a0534bf4a8d7f61b255f36de96a2918ddec5422 diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf index fd0e144..011e442 100644 --- a/scp2/source/ooo/module_helppack.ulf +++ b/scp2/source/ooo/module_helppack.ulf @@ -32,10 +32,10 @@ en-US = Additional help packs en-US = Additional help packs [STR_NAME_MODULE_HELPPACK_EN_US] -en-US = English +en-US = English (United States) [STR_DESC_MODULE_HELPPACK_EN_US] -en-US = Installs English help in %PRODUCTNAME %PRODUCTVERSION +en-US = Installs English (United States) help in %PRODUCTNAME %PRODUCTVERSION [STR_NAME_MODULE_HELPPACK_DE] en-US = German diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index e8f25e6a..4dd3006 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -32,10 +32,10 @@ en-US = Additional user interface languages en-US = Additional user interface languages [STR_NAME_MODULE_LANGPACK_EN_US] -en-US = English +en-US = English (United States) [STR_DESC_MODULE_LANGPACK_EN_US] -en-US = Installs the English user interface +en-US = Installs the English (United States) user interface [STR_NAME_MODULE_LANGPACK_DE] en-US = German ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |8 1 file changed, 8 insertions(+) New commits: commit b60ccd4d4ddf4076085890938bcc08aca2737e15 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Feb 14 18:23:49 2013 +0100 fix build Caused by 185e1be6cd1954b8cc5a302c879384f2549cd060, fix is more or less d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5. Change-Id: Ia7d228139126b3e60370b85c106bc970f4e68cce Reviewed-on: https://gerrit.libreoffice.org/2154 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index e877cca..7fa75ff 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -36,7 +36,15 @@ #undef WB_LEFT #undef WB_RIGHT #include winsock2.h + // HACK: ws2bth.h defines a struct with a field named MSC, which is + // a #define set by gbuild. Plain #undef MSC here fails with MSVC + // used together with ccache (bug, presumably), so #define it to some + // other usable value. + #undef MSC + #define MSC mscfield #include ws2bth.h + #undef MSC + #define MSC #endif #ifdef MACOSX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dtrans/source
dtrans/source/win32/clipb/WinClipbImpl.cxx | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 1e95602e5d566468ed075b1813e21ba08039b2db
Author: Urs Fässler u...@bitzgi.ch
Date: Thu Feb 14 16:36:06 2013 +0100
Translation of german comment
Change-Id: I2876e33ccfd5dd7b33747d77a4cdaaa03bd01de9
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx
b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 167e889..76e4c64 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -180,16 +180,15 @@ sal_Int8 SAL_CALL
CWinClipbImpl::getRenderingCapabilities( ) throw( RuntimeExce
void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
{
-// sollte eigentlich hier stehen: ClearableMutexGuard aGuard(
m_ClipContentMutex );
-// geht aber nicht, da FlushClipboard zurückruft und das DataObject
-// freigibt und damit würde es einen Deadlock in onReleaseDataObject geben
-// FlushClipboard muà synchron sein, damit das runterfahren ggf. erst
weitergeht,
-// wenn alle Clipboard-Formate gerendert wurden
-// die Abfrage ist nötig, damit nur geflusht wird, wenn wir wirklich
Clipboardowner
-// sind (ich weiss nicht genau was passiert, wenn man flusht und nicht
Clipboard
-// owner ist).
-// eventuell kann man aber die Abfrage in den Clipboard STA Thread
verlagern, indem
-// man sich dort das DataObject merkt und vor dem flushen
OleIsCurrentClipboard ruft
+// actually it should be ClearableMutexGuard aGuard( m_ClipContentMutex );
+// but it does not work since FlushClipboard does a callback and frees
DataObject
+// which results in a deadlock in onReleaseDataObject.
+// FlushClipboard had to be synchron in order to prevent shutdown until all
+// clipboard-formats are redered.
+// The request is needed to prevent flushing if we are not clipboard owner
(it is
+// not known what happens if we flush but aren't clipoard owner).
+// It may be possible to move the request to the clipboard STA thread by
saving the
+// DataObject and call OleIsCurrentClipboard bevore flushing.
if ( NULL != m_pCurrentClipContent )
m_MtaOleClipboard.flushClipboard( );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] translation of german comment in file dtrans/source/win32/clipb/WinClipbImpl.cxx
Hey, 2013/2/14 Urs Fässler u...@bitzgi.ch: Hi, translation of the (only) german comment in the file dtrans/source/win32/clipb/WinClipbImpl.cxx Looks nice and pushed to master. It seems we have no license statement from you. Could you please send one to the mailing list? Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appdde.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 120d3fe123e9567f2a488575b5afd48dae1cab5d
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 14 20:13:18 2013 +0100
appdde.cxx: try to fix MSVC build
Change-Id: I14baa8bc0a462492ada6e4aeb8d8f90a0de2a51d
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 060ecf5..801a8a0 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -233,7 +233,7 @@ class SfxDdeDocTopics_Impl : public
std::vectorSfxDdeDocTopic_Impl* {};
//
sal_Bool SfxAppEvent_Impl( ApplicationEvent rAppEvent,
- const String rCmd, const String rEvent,
+ const OUString rCmd, const OUString rEvent,
ApplicationEvent::Type eType )
/* [Description]
@@ -250,12 +250,12 @@ sal_Bool SfxAppEvent_Impl( ApplicationEvent rAppEvent,
*/
{
-String aEvent( rEvent );
-aEvent += '(';
-if ( rCmd.CompareIgnoreCaseToAscii( aEvent, aEvent.Len() ) ==
COMPARE_EQUAL )
+OUString sEvent(rEvent);
+sEvent += (;
+if (rCmd.startsWithIgnoreAsciiCase(sEvent))
{
::rtl::OUStringBuffer aData( rCmd );
-aData.remove( 0, aEvent.Len() );
+aData.remove(0, sEvent.getLength());
if ( aData.getLength() 2 )
{
// Transform into the ApplicationEvent Format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svtools/source
svtools/source/config/colorcfg.cxx | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit f10bb02eb3083a089e3ca28c45983e616ef84d58
Author: Benjamin Drung bdr...@debian.org
Date: Fri Jun 8 00:19:25 2012 +0200
fdo#35365 Set the default font color to black and the document color to
white.
The font and document color of a Writer document or an Impress presentation
should not be derived from a desktop theme. A Writer documents needs to look
good on paper. An Impress presentation may have it's own theme. The
appearance
of a document should not change by changing the desktop theme.
With this change a document looks the same on any computer if the user do
not
change the default colors.
Change-Id: Ia42ca7882f0d2dd1f2a304db5e4b5aaba23244fc
Reviewed-on: https://gerrit.libreoffice.org/2156
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index abdb852..4f899af 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -412,12 +412,12 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry
eEntry)
{
static const sal_Int32 aAutoColors[] =
{
-0, // DOCCOLOR
+COL_WHITE, // DOCCOLOR
0xc0c0c0, // DOCBOUNDARIES
0x808080, // APPBACKGROUND
0xc0c0c0, // OBJECTBOUNDARIES
0xc0c0c0, // TABLEBOUNDARIES
-0, // FONTCOLOR
+COL_BLACK, // FONTCOLOR
0xcc, // LINKS
0x80, // LINKSVISITED
0xff, // SPELL
@@ -462,18 +462,10 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry
eEntry)
Color aRet;
switch(eEntry)
{
-case DOCCOLOR :
-aRet =
Application::GetSettings().GetStyleSettings().GetWindowColor();
-break;
-
case APPBACKGROUND :
aRet =
Application::GetSettings().GetStyleSettings().GetWorkspaceColor();
break;
-case FONTCOLOR :
-aRet =
Application::GetSettings().GetStyleSettings().GetWindowTextColor();
-break;
-
case LINKS :
aRet =
Application::GetSettings().GetStyleSettings().GetLinkColor();
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Subject: [PATCH] better usability of Import CSV dialog
Hi there,
import CSV dialog window has two list boxes - language and charset. Both show
just 6
options which seems to me quite uncomfortable to use. Could you please increase
a bit
their height? My patch does that, but maybe too much - both show 28 items now,
but still
fit into main dialog window (might have problems on some small resolutions),
but making them
even a bit higher would be nice.
PS: Not sure if this is not waiting for rewriting
https://wiki.documentfoundation.org/Development/WidgetLayout#ListBoxes_and_ComboBoxes
Regards,
Petr
From 41b8a9d6c6735b9d9adfae2ed90ddba2ea0e8706 Mon Sep 17 00:00:00 2001
From: Petr Vorel petr.vo...@gmail.com
Date: Thu, 14 Feb 2013 19:06:46 +0100
Subject: [PATCH] better usability of Import CSV dialog
display more items in import CSV dialog window in list boxes Character
set and Language (from current 6 to 28)
Change-Id: Ibbc554c6574ff635f8284914b948827453375062
---
sc/source/ui/dbgui/asciiopt.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src
index f03c1ce..410bb26 100644
--- a/sc/source/ui/dbgui/asciiopt.src
+++ b/sc/source/ui/dbgui/asciiopt.src
@@ -65,7 +65,7 @@ ModalDialog RID_SCDLG_ASCII
{
HelpID = sc:ListBox:RID_SCDLG_ASCII:LB_CHARSET;
Pos = MAP_APPFONT ( 76 , 14 ) ;
-Size = MAP_APPFONT ( 130 , 61 ) ;
+Size = MAP_APPFONT ( 130 , 250 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
Sort = TRUE;
@@ -82,7 +82,7 @@ ModalDialog RID_SCDLG_ASCII
{
HelpID = sc:ListBox:RID_SCDLG_ASCII:LB_CUSTOMLANG;
Pos = MAP_APPFONT ( 76 , 30 ) ;
-Size = MAP_APPFONT ( 130 , 61 ) ;
+Size = MAP_APPFONT ( 130 , 250 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
Sort = TRUE;
--
1.7.10.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Module_cross_tail_build.mk
Module_cross_tail_build.mk |1 + 1 file changed, 1 insertion(+) New commits: commit c60470f921b019fbe0bef269ca576333b7de6f70 Author: Tor Lillqvist t...@iki.fi Date: Thu Feb 14 22:02:07 2013 +0200 nss, too, this is ridiculous Change-Id: Ib84a91f25d8a2f3572d8308eb0dfd5bb87f6deba diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index 49a5c2a..c239821 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -75,6 +75,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ $(call gb_Helper_optional_for_host,DESKTOP, \ helpcompiler \ l10ntools \ + nss \ sot \ svl \ svtools \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
