LibreOffice Gerrit News for core on 2014-06-12
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + 'NSNoUnderlineStyle' ‘NSSingleUnderlineStyle’: Deprecated in OS X 10.9 in https://gerrit.libreoffice.org/9740 from Robert Antoni Buj i Gelonch about module vcl + fdo#75757: Remove inheritance from std::vector in https://gerrit.libreoffice.org/9725 from Shreyansh Gandhi about module sw + Complete LibreOfficeKit C++ renaming. in https://gerrit.libreoffice.org/9738 from Andrzej Hunt about module include, smoketest + fdo#79915:Text Data Lost after exporting through LO in https://gerrit.libreoffice.org/9737 from Ravindra Vidhate about module sw + Convert GRID_DIALOG to .ui in https://gerrit.libreoffice.org/9734 from Mihály Palenik about module extensions + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate about module sw End of freshness + fdo#77985 make calc function NETWORKDAYS comply with ODFF1.2 in https://gerrit.libreoffice.org/9327 from Winfried Donkers about module formula, include, sc, scaddins + fdo#73148 add options to Calc function AGGREGATE in https://gerrit.libreoffice.org/9449 from Winfried Donkers about module formula, sc + fdo#78590: Fix for Corruption of para with framePr drawing object into in https://gerrit.libreoffice.org/9389 from Rohit Deshmukh about module sw, writerfilter + API remove image : change document state #i74651# in https://gerrit.libreoffice.org/7286 from Maxime de Roucy about module svx + Define DINDEX_PAGE_SIZE to PAGE_SIZE on FreeBSD in https://gerrit.libreoffice.org/9731 from Baptiste Daroussin about module connectivity * Merged changes on master for project core changed in the last 25 hours: + Fix to be able to edit seconds in Japanese date/datetime cells in https://gerrit.libreoffice.org/9703 from Isamu Mogi + Do not hard code /usr in https://gerrit.libreoffice.org/9730 from Baptiste Daroussin + Convert RID_SANE_DIALOG to .ui in https://gerrit.libreoffice.org/9696 from Mihály Palenik + Upgrade LibreOfficeKit C++ API. in https://gerrit.libreoffice.org/9709 from Andrzej Hunt + the BSD family also uses gio in https://gerrit.libreoffice.org/9733 from Baptiste Daroussin + fdo#79668 :File getting corrupt after RT in https://gerrit.libreoffice.org/9712 from Tushar Bende + fdo#78885 : File crashed while opening in LO in https://gerrit.libreoffice.org/9697 from Sushil Shinde + fdo#79817:Fix for corruption having databinding have duplicates attribute in https://gerrit.libreoffice.org/9693 from Rohit Deshmukh + fdo#79540 : DOCX: Lo exports Drawing inside Drawing in https://gerrit.libreoffice.org/9653 from Pallavi Jadhav + Fix build on FreeBSD with libc++ in https://gerrit.libreoffice.org/9722 from Baptiste Daroussin * Abandoned changes on master for project core changed in the last 25 hours: + Do not hard code sed but use $(SED) in https://gerrit.libreoffice.org/9732 from Baptiste Daroussin * Open changes needing tweaks, but being untouched for more than a week: + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bmpfast.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9885c35ddb9188e5b1549edf8697f6946232f7d3
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 08:31:01 2014 +0200
Avoid undefined left shift of negative value
Change-Id: I6496a16c4d6791af43a67dae57b9ee218c3444fe
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index dc907e5..b81a6c0 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -273,7 +273,7 @@ inline void ImplBlendPixels( const
TrueColorPixelPtrDSTFMT rDst,
{
if( !nAlphaVal )
ImplConvertPixel( rDst, rSrc );
-else if( nAlphaVal != ~(~0 ALPHABITS) )
+else if( nAlphaVal != ~(~0U ALPHABITS) )
{
static const unsigned nAlphaShift = (ALPHABITS 8) ? 8 : ALPHABITS;
if( ALPHABITS nAlphaShift )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Quantifying the time overhead of Cygwin make
I am not trying to hijack this thread, but I am part of another project where we build for windows on linux boxes. Have you guys considered looking into building for windows on Linux? On Wed, Jun 11, 2014 at 1:37 PM, Norbert Thiebaud nthieb...@gmail.com wrote: On Tue, Jun 10, 2014 at 4:43 AM, Tor Lillqvist t...@iki.fi wrote: Are you sure GnuWin32 actually is something even worth considering? Cygwin at least has a semi-decent package management even if it is a bit slower. If I understand correctly the exercise is about replacing gmake itself from a cygwin-running version to a native-running version of gmake the need for cygwin in general is still there... That being said,, reading the patch it seems there is no need for a 'flag day' most of the change in configure.ac are -u + -d = -sm and the need for -m or not in same case It should be possible to make that an autogen option, to allow a non-distruptive migration I'll test the native gmake on my windows tb, and if that works, I'll have a stab at the patch to make it support both mode Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[calc] merge cells borders
Hi, i am working on this Bug 34837https://bugs.freedesktop.org/show_bug.cgi?id=34837 could anyone help me to get the code that responsible for merge cells in calc Regards, Faisal M. Al-Otaibi. Programmer, KACST Warning: This message and its attachment, if any, are confidential and may contain information protected by law. If you are not the intended recipient, please contact the sender immediately and delete the message and its attachment, if any. You should not copy the message and its attachment, if any, or disclose its contents to any other person or use it for any purpose. Statements and opinions expressed in this e-mail and its attachment, if any, are those of the sender, and do not necessarily reflect those of King Abdulaziz city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST accepts no liability for any damage caused by this email. تحذير: هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي على معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب عليك تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا يجوز لك نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو البوح بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة ومرفقاتها (ان وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك عبدالعزيز للعلوم والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي مسئولية عن الأضرار الناتجة عن ما قد يحتويه هذا البريد. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Quantifying the time overhead of Cygwin make
On 06/12/2014 08:30 AM, Jonathan Aquilina wrote: I am not trying to hijack this thread, but I am part of another project where we build for windows on linux boxes. Have you guys considered looking into building for windows on Linux? We have support for mingw cross-compilation in the build system, but that effort never really went anywhere fully fruitful AFAICT (and would imply a different ABI, i.e., incompatibility of---native code, at least---extensions). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Quantifying the time overhead of Cygwin make
What would be interesting to see is a bench mark in terms of compilation times and evaluate if its really worth changing the ABI and breaking compatability. On Thu, Jun 12, 2014 at 8:50 AM, Stephan Bergmann sberg...@redhat.com wrote: On 06/12/2014 08:30 AM, Jonathan Aquilina wrote: I am not trying to hijack this thread, but I am part of another project where we build for windows on linux boxes. Have you guys considered looking into building for windows on Linux? We have support for mingw cross-compilation in the build system, but that effort never really went anywhere fully fruitful AFAICT (and would imply a different ABI, i.e., incompatibility of---native code, at least---extensions). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/CustomTarget_source.mk writerfilter/source
writerfilter/CustomTarget_source.mk|6 - writerfilter/source/ooxml/analyzemodel.xsl | 121 - 2 files changed, 127 deletions(-) New commits: commit 0e8c06660b3d651900a0f20abd2b1429c854a1c8 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Jun 12 08:50:38 2014 +0200 writerfilter: remove unused analyzemodel.xsl Change-Id: Ic9e44d0050413c9225b030a4be6f71f5adc654fc diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index e9cc479..4452c54 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -64,7 +64,6 @@ writerfilter_GEN_ooxml_Factory_cxx=$(writerfilter_WORK)/OOXMLFactory_generated.c writerfilter_GEN_ooxml_Factory_hxx=$(writerfilter_WORK)/OOXMLFactory_generated.hxx writerfilter_GEN_ooxml_FastTokens_hxx=$(writerfilter_WORK)/ooxml/OOXMLFastTokens.hxx writerfilter_GEN_ooxml_GperfFastToken_hxx=$(writerfilter_WORK)/gperffasttoken.hxx -writerfilter_GEN_ooxml_Model_analyzed=$(writerfilter_WORK)/ooxml/model_analyzed.xml writerfilter_GEN_ooxml_Model_processed=$(writerfilter_WORK)/model_preprocessed.xml writerfilter_GEN_ooxml_NamespaceIds_hxx=$(writerfilter_WORK)/ooxml/OOXMLnamespaceids.hxx writerfilter_GEN_ooxml_Namespacesmap_xsl=$(writerfilter_WORK)/namespacesmap.xsl @@ -73,7 +72,6 @@ writerfilter_GEN_ooxml_QNameToStr_cxx=$(writerfilter_WORK)/ooxml/qnametostr.cxx writerfilter_GEN_ooxml_ResourceIds_hxx=$(writerfilter_WORK)/ooxml/resourceids.hxx writerfilter_GEN_ooxml_Token_xml=$(writerfilter_WORK)/token.xml writerfilter_SRC_model_NamespacePreprocess=$(writerfilter_SRC)/resourcemodel/namespace_preprocess.pl -writerfilter_SRC_ooxml_Analyze_model_xsl=$(writerfilter_SRC)/ooxml/analyzemodel.xsl writerfilter_SRC_ooxml_FactoryTools_xsl=$(writerfilter_SRC)/ooxml/factorytools.xsl writerfilter_SRC_ooxml_FactoryValues_xsl=$(writerfilter_SRC)/ooxml/factory_values.xsl writerfilter_SRC_ooxml_FastTokens_py=$(writerfilter_SRC)/ooxml/fasttokens.py @@ -105,10 +103,6 @@ $(writerfilter_GEN_ooxml_GperfFastToken_hxx) : $(writerfilter_SRC_ooxml_GperfFas $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $(writerfilter_SRC_ooxml_GperfFastTokenHandler_py) $(writerfilter_GEN_ooxml_Token_xml)) \ | tr -d '\r' | $(GPERF) -c -E -G -I -LC++ -S1 -t $@ -$(writerfilter_GEN_ooxml_Model_analyzed) : $(writerfilter_SRC_ooxml_Analyze_model_xsl) $(writerfilter_SRC_ooxml_Model) | $(writerfilter_WORK)/ooxml/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) - $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $^) $@ - $(writerfilter_GEN_ooxml_Model_processed) : $(writerfilter_GEN_ooxml_Namespacesmap_xsl) $(writerfilter_GEN_ooxml_Preprocess_xsl) $(writerfilter_SRC_ooxml_Model) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_GEN_ooxml_Namespacesmap_xsl) $(writerfilter_SRC_ooxml_Model)) $@ diff --git a/writerfilter/source/ooxml/analyzemodel.xsl b/writerfilter/source/ooxml/analyzemodel.xsl deleted file mode 100644 index 63ad772..000 --- a/writerfilter/source/ooxml/analyzemodel.xsl +++ /dev/null @@ -1,121 +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 . --- - -xsl:stylesheet version=1.0 - xmlns:xsl=http://www.w3.org/1999/XSL/Transform; - xmlns:rng=http://relaxng.org/ns/structure/1.0; - -xsl:include href=factorytools.xsl/ -xsl:output method=xml/ - -xsl:template match=/ - analyze - xsl:for-each select=/model/namespace[not(@todo='ignore')] - xsl:call-template name=analyzegrammar/ - /xsl:for-each - /analyze -/xsl:template - -xsl:template name=analyzegrammar - xsl:variable name=nsname select=@name/ - xsl:for-each select=rng:grammar/rng:define - xsl:variable name=defname select=@name/ - xsl:for-each select=.//rng:attribute|.//rng:element - xsl:choose - xsl:when test=local-name()='element' -
Re: Quantifying the time overhead of Cygwin make
What would be interesting to see is a bench mark in terms of compilation times and evaluate if its really worth changing the ABI and breaking compatability. Of course it isn't. Imagine telling a customer yes, we know the binary extensions that are business critical to you and which you probably can't re-create don't work any more, but it is much more convenient for us to be able to build a few hours faster!. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 36 +++
1 file changed, 27 insertions(+), 9 deletions(-)
New commits:
commit 32d6d27eb61490b4c29320e65b3c9d2b6960acd5
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 12 09:32:19 2014 +0200
CppunitTest_sw_ooxmlexport: port testPageRelSize to textboxes
Change-Id: I08e112b3816797a848ae9d16fa7002a67c12fc3d
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 812216b..900c865 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2373,15 +2373,33 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73550, fdo73550.docx)
DECLARE_OOXMLEXPORT_TEST(testPageRelSize, pagerelsize.docx)
{
-// First textframe: width is relative from page, but not height.
-uno::Referencedrawing::XShape xTextFrame = getTextFrameByName(Frame1);
-CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xTextFrame, RelativeWidthRelation));
-CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getPropertysal_Int16(xTextFrame, RelativeHeightRelation));
-
-// Second textframe: height is relative from page, but not height.
-xTextFrame = getTextFrameByName(Text Box 2);
-CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xTextFrame, RelativeHeightRelation));
-CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getPropertysal_Int16(xTextFrame, RelativeWidthRelation));
+uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+if (xIndexAccess-getCount())
+{
+// TODO TextBox: remove this when TextBox is enabled by default
+// First textframe: width is relative from page, but not height.
+uno::Referencedrawing::XShape xTextFrame =
getTextFrameByName(Frame1);
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xTextFrame, RelativeWidthRelation));
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getPropertysal_Int16(xTextFrame, RelativeHeightRelation));
+
+// Second textframe: height is relative from page, but not height.
+xTextFrame = getTextFrameByName(Text Box 2);
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xTextFrame, RelativeHeightRelation));
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getPropertysal_Int16(xTextFrame, RelativeWidthRelation));
+}
+else
+{
+// First shape: width is relative from page, but not height.
+uno::Referencedrawing::XShape xShape = getShape(1);
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xShape, RelativeWidthRelation));
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getPropertysal_Int16(xShape, RelativeHeightRelation));
+
+// Second shape: height is relative from page, but not height.
+xShape = getShape(2);
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xShape, RelativeHeightRelation));
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getPropertysal_Int16(xShape, RelativeWidthRelation));
+}
}
DECLARE_OOXMLEXPORT_TEST(testRelSizeRound, rel-size-round.docx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 22 +-
1 file changed, 17 insertions(+), 5 deletions(-)
New commits:
commit 25526046e7edad50924e93dffe7dbc9f9c99a5fd
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 12 09:55:22 2014 +0200
CppunitTest_sw_ooxmlexport: port testFloatingTablePosition to textboxes
Change-Id: I200520a28335fb62cecb91175fc6cefc2cfb51ec
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 900c865..27752df 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2661,11 +2661,23 @@ DECLARE_OOXMLEXPORT_TEST(testFloatingTablePosition,
floating-table-position.doc
// Position of text frame was wrong, because some conversion was missing.
uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
-uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0),
uno::UNO_QUERY);
-// This was 3295.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(5964), getPropertysal_Int32(xFrame,
HoriOrientPosition));
-// This was 4611.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(8133), getPropertysal_Int32(xFrame,
VertOrientPosition));
+if (xIndexAccess-getCount())
+{
+// TODO TextBox: remove this when TextBox is enabled by default
+uno::Referencebeans::XPropertySet
xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY);
+// This was 3295.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5964), getPropertysal_Int32(xFrame,
HoriOrientPosition));
+// This was 4611.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(8133), getPropertysal_Int32(xFrame,
VertOrientPosition));
+}
+else
+{
+uno::Referencebeans::XPropertySet xShape(getShape(1),
uno::UNO_QUERY);
+// This was 3295.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5964), getPropertysal_Int32(xShape,
HoriOrientPosition));
+// This was 4611.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(8133), getPropertysal_Int32(xShape,
VertOrientPosition));
+}
}
DECLARE_OOXMLEXPORT_TEST(testAbi11739, abi11739.docx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/source editeng/source framework/source include/svtools include/vcl sc/source starmath/source svtools/source svx/source sw/source vcl/sour
cui/source/options/fontsubs.cxx |2
cui/source/tabpages/chardlg.cxx | 18 ++---
cui/source/tabpages/numpages.cxx |2
editeng/source/editeng/editview.cxx |2
framework/source/uielement/fontsizemenucontroller.cxx |2
include/svtools/ctrlbox.hxx |6 -
include/svtools/ctrltool.hxx | 24 +++
include/svtools/stdmenu.hxx |6 +
include/vcl/metric.hxx| 13 +---
include/vcl/outdev.hxx|7 +-
sc/source/filter/excel/xehelper.cxx |2
sc/source/filter/excel/xistyle.cxx|2
starmath/source/dialog.cxx|2
svtools/source/control/ctrlbox.cxx| 12 +--
svtools/source/control/ctrltool.cxx | 58 +-
svtools/source/control/stdmenu.cxx|4 -
svx/source/mnuctrls/fntszctl.cxx |2
svx/source/sidebar/nbdtmg.cxx | 44 ++---
svx/source/sidebar/text/SvxSBFontNameBox.cxx |2
svx/source/sidebar/text/TextPropertyPanel.cxx |2
svx/source/tbxctrls/tbcontrl.cxx |4 -
svx/source/tbxctrls/tbunocontroller.cxx |2
sw/source/core/unocore/unocrsrhelper.cxx |2
sw/source/core/unocore/unosett.cxx|2
sw/source/core/unocore/unostyle.cxx |2
sw/source/filter/html/svxcss1.cxx |2
sw/source/filter/html/swhtml.cxx |2
sw/source/ui/config/optpage.cxx |6 -
sw/source/ui/dialog/ascfldlg.cxx |2
sw/source/ui/docvw/srcedtw.cxx|2
vcl/source/gdi/metric.cxx | 12 ++-
vcl/workben/svptest.cxx |2
32 files changed, 115 insertions(+), 137 deletions(-)
New commits:
commit 1665c84d5416175e5761ff48fdd7e2212bd2b11c
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Jun 4 07:48:15 2014 +0200
avoid problems with poppler's and vcl's FontInfo during runtime
Conflicts:
include/vcl/metric.hxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/stdmenu.cxx
svx/source/sidebar/nbdtmg.cxx
Conflicts:
include/svtools/ctrltool.hxx
include/vcl/metric.hxx
include/vcl/outdev.hxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/stdmenu.cxx
svx/source/sidebar/nbdtmg.cxx
sw/source/core/uibase/docvw/srcedtw.cxx
vcl/source/gdi/metric.cxx
vcl/source/outdev/font.cxx
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8
Reviewed-on: https://gerrit.libreoffice.org/9720
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 06afeb5..00a84b3 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -326,7 +326,7 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*,
pBox)
sal_uInt16 nFontCount = aFntLst.GetFontNameCount();
for(sal_uInt16 nFont = 0; nFont nFontCount; nFont++)
{
-const FontInfo rInfo = aFntLst.GetFontName( nFont );
+const vcl::FontInfo rInfo = aFntLst.GetFontName( nFont );
if(!bNonPropOnly || rInfo.GetPitch() == PITCH_FIXED)
m_pFontNameLB-InsertEntry(rInfo.GetName());
}
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 28222fa..9d82ad0 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -435,7 +435,7 @@ const FontList* SvxCharNamePage::GetFontList() const
//
-
namespace
{
-FontInfo calcFontInfo( SvxFont _rFont,
+vcl::FontInfo calcFontInfo( SvxFont _rFont,
SvxCharNamePage* _pPage,
const FontNameBox* _pFontNameLB,
const FontStyleBox* _pFontStyleLB,
@@ -447,7 +447,7 @@ namespace
{
Size aSize = _rFont.GetSize();
aSize.Width() = 0;
-FontInfo aFontInfo;
+vcl::FontInfo aFontInfo;
OUString sFontName(_pFontNameLB-GetText());
sal_Bool bFontAvailable = _pFontList-IsAvailable( sFontName );
if (bFontAvailable || _pFontNameLB-GetSavedValue() != sFontName)
@@ -520,19 +520,19 @@ void SvxCharNamePage::UpdatePreview_Impl()
// Font
const FontList* pFontList = GetFontList();
-FontInfo aWestFontInfo =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - 3 commits - include/oox oox/source sc/source sd/qa
include/oox/drawingml/shape.hxx |4
include/oox/drawingml/textliststyle.hxx |3
include/oox/ppt/pptshapegroupcontext.hxx|3
oox/source/drawingml/diagram/diagram.cxx| 39 ++--
oox/source/drawingml/diagram/diagramfragmenthandler.cxx | 49 ++---
oox/source/drawingml/textliststyle.cxx | 28 +++
oox/source/ppt/pptshapegroupcontext.cxx | 13 +
sc/source/core/tool/address.cxx | 21 +-
sd/qa/unit/data/pptx/bnc870233_1.pptx |binary
sd/qa/unit/data/pptx/bnc870233_2.pptx |binary
sd/qa/unit/import-tests.cxx | 144
11 files changed, 257 insertions(+), 47 deletions(-)
New commits:
commit 0a2ce4a24fadd2fa6358a83e7f6107c2f95a7260
Author: Eike Rathke er...@redhat.com
Date: Tue May 27 23:19:36 2014 +0200
resolved fdo#70455 B1:SOMENAME is not a valid singleton reference
(cherry picked from commit ac8532ce26e79453b3a969b956ebb7823c455131)
Conflicts:
sc/source/core/tool/address.cxx
Change-Id: Iac80d74a9ec6382a232fdc2f4b798e57dc643ad3
(cherry picked from commit e5931aa5aa2180e0587b93cb94ba1405cfe96f83)
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 3ed6213..23bca38 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -876,6 +876,14 @@ lcl_a1_get_row( const sal_Unicode* p, ScAddress* pAddr,
sal_uInt16* nFlags )
return pEnd;
}
+/// B:B or 2:2, but not B:2 or 2:B or B2:B or B:B2 or ...
+static bool isValidSingleton( sal_uInt16 nFlags, sal_uInt16 nFlags2 )
+{
+bool bCols = (nFlags SCA_VALID_COL) ((nFlags SCA_VALID_COL2) ||
(nFlags2 SCA_VALID_COL));
+bool bRows = (nFlags SCA_VALID_ROW) ((nFlags SCA_VALID_ROW2) ||
(nFlags2 SCA_VALID_ROW));
+return (bCols !bRows) || (!bCols bRows);
+}
+
static sal_uInt16
lcl_ScRange_Parse_XL_A1( ScRange r,
const sal_Unicode* p,
@@ -982,7 +990,7 @@ lcl_ScRange_Parse_XL_A1( ScRange r,
}
p = tmp2;
-p = lcl_eatWhiteSpace( p+1 );
+p = lcl_eatWhiteSpace( p+1 ); // after ':'
tmp1 = lcl_a1_get_col( p, r.aEnd, nFlags2 );
if( !tmp1 aEndTabName.isEmpty() ) // Probably the aEndTabName was
specified after the first range
{
@@ -995,16 +1003,17 @@ lcl_ScRange_Parse_XL_A1( ScRange r,
r.aEnd.SetTab( nTab );
nFlags |= SCA_VALID_TAB2 | SCA_TAB2_3D | SCA_TAB2_ABSOLUTE;
}
-p = lcl_eatWhiteSpace( p+1 );
+if (*p == '!' || *p == ':')
+p = lcl_eatWhiteSpace( p+1 );
tmp1 = lcl_a1_get_col( p, r.aEnd, nFlags2 );
}
}
-if( !tmp1 ) // strange, but valid singleton
-return nFlags;
+if( !tmp1 ) // strange, but maybe valid singleton
+return isValidSingleton( nFlags, nFlags2) ? nFlags : (nFlags
~SCA_VALID);
tmp2 = lcl_a1_get_row( tmp1, r.aEnd, nFlags2 );
-if( !tmp2 ) // strange, but valid singleton
-return nFlags;
+if( !tmp2 ) // strange, but maybe valid singleton
+return isValidSingleton( nFlags, nFlags2) ? nFlags : (nFlags
~SCA_VALID);
if ( *tmp2 != 0 )
{
commit 16101e748e353520a5a08c3736bad6a1599a1a19
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Jun 6 10:16:39 2014 +0200
2nd part of bnc#870233: import font color from color fragment for SmartArts
SmartArt import ignores some fragments during import if
drawing fragment exists, which seems to be not complete.
In this case font style is blank (white) in data (and drawing)
fragment and the real value is defined in the ignored color fragment.
So first make color fragment parsing work, then apply font
color of node0 style on nodes of the SmartArt.
Actually, it's a workaround, because node0 style label
is hardcoded, for a proper solution layout fragment should
be parsed too to get the right style label, but
it interferes with the drawing fragment by now.
(cherry picked from commit 639571d52b1b7e4cf912803642ca245c5dd86839)
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
oox/source/drawingml/diagram/diagram.cxx
oox/source/drawingml/diagram/diagramfragmenthandler.cxx
Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8
Reviewed-on: https://gerrit.libreoffice.org/9662
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit bef657e6e2a545eea54d3288a2cd7df9c1a126fa)
Signed-off-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit e5a0ca1e12674a6da47a93ea29ea2d764eade5e3)
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 9c8faa9c..dd0daa9 100644
---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - connectivity/source
connectivity/source/drivers/firebird/StatementCommonBase.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 939c5b7c2421b226e555cfd14d35d699be787b32 Author: Julien Nabet serval2...@yahoo.fr Date: Wed Jun 11 19:24:03 2014 +0200 Related fdo#79714 OSX-crash opening query or table in embedded Firebird ODB See https://bugs.freedesktop.org/attachment.cgi?id=100839 and other comments Cherry-picked from 0acd0ed3a58698a34e11dd82f3368a983f8530df Change-Id: I1187b171caf54997f5e8850ade4a3fb35ad9ec29 Reviewed-on: https://gerrit.libreoffice.org/9741 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index 381b14b..49415fa 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -194,6 +194,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString sql, free(pOutSqlda); pOutSqlda = (XSQLDA*) malloc(XSQLDA_LENGTH(n)); pOutSqlda-version = SQLDA_VERSION1; +pOutSqlda-sqln = n; aErr = isc_dsql_describe(m_statusVector, m_aStatementHandle, 1, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source
connectivity/source/drivers/firebird/StatementCommonBase.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 8c46e9ddf071b6fa5db83276d82ca23d459e8193 Author: Julien Nabet serval2...@yahoo.fr Date: Wed Jun 11 19:24:03 2014 +0200 Related fdo#79714 OSX-crash opening query or table in embedded Firebird ODB See https://bugs.freedesktop.org/attachment.cgi?id=100839 and other comments Change-Id: I1187b171caf54997f5e8850ade4a3fb35ad9ec29 Reviewed-on: https://gerrit.libreoffice.org/9742 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index dfff5d7..4820da4 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -194,6 +194,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString sql, free(pOutSqlda); pOutSqlda = (XSQLDA*) malloc(XSQLDA_LENGTH(n)); pOutSqlda-version = SQLDA_VERSION1; +pOutSqlda-sqln = n; aErr = isc_dsql_describe(m_statusVector, m_aStatementHandle, 1, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.5.2'
Tag 'libreoffice-4.2.5.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-06-12 09:26 -0700 Tag libreoffice-4.2.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJTmWRTAAoJEPQ0oe+v7q6jPLsQAMNtPpFwb5iSoMIqf8bOjE3A lFrk8zTwNSHs1S3XmYjMIM63IHLVOpDi7qzY0RlI0ci4KOvEDBWPb+5vs7g83U5H rMjHxZDy+6JalzNEawPCGYKb0Dl4MUeFLzAoVXCRk/trSIxPCpuDCEkJPs4o1FIz OFTxm6JFF3cLDrSibSjQxxVgIkEItgDpddjAwEv3+MluHdvN3C9MVUsK/Jv6gF5p v4V18k3vWEjpJUNO8JD1o+U3KWZya4BT54DQti1eLTRPnnqQc2njQ7waKYI7oQJE kL7Omq/XNf4H/ogR3ViWCWt0gyYBiKlLUosEQo0DQIl1FgoYn2ecL1FpwM4VUqdq GYr8PPFC+gAP8LN1KDSBK/aKpRtPTK+mDBqcW4uxmvL9uNWtfVKZExEN0zZk6SiI m3XBN7Qsy/OONBTNA4AKoZS/eoWzwKlfS0ricBeWXzp248zbVVXMby82pxY+p2f/ P1wvaYu3KhWPSyANXrcP+clthF0stiSH+ncemrqucV0NT+4zmcigiI7nJXR0F+DA KggsCQ/XsKEg1ROUFkYLt3lwI54nevWIo1vT/L5iqFYdSr3V75sJMtNYJjOvMUYz qILWG2wmopSuSkszCIrDGocIR8NqEAvir95uu4tc7uS9N1k1hpjJK7vTTJNe2ZDe l1wwOyUJkfJkVz/NCha3 =ot60 -END PGP SIGNATURE- Changes since cp-4.2-5-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8011c5c5b7947d7f1436167e1c0023414068b0c1 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Jun 12 10:27:47 2014 +0200 bump product version to 4.2.5.2.0+ Change-Id: I4e07b6a8adda92c60b3aa3626e45475524a29709 diff --git a/configure.ac b/configure.ac index bb011dd..c812cdf 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.5.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.5.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.5.2'
Tag 'libreoffice-4.2.5.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-06-12 09:27 -0700 Tag libreoffice-4.2.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJTmWRXAAoJEPQ0oe+v7q6jp1UP/j+779HvyYZJPfs1x0DsxElA s2Cf5KyO91Dh9IEE5vH1dG3S3emrT62bsx7eR1vEnkyr7uCT6cI7TxTPqfOuN89J 1qzIFGaqOvq9CEHTvG0b7LL/lG4fwQrjjGzV8IFO0wJMYceaCJN4kSV4YsqapxPw YQ7uqOFIi+WBbLPki7UanDo/jS8h81O8ruD319Tdg6LJ3UMjullEYcHIxwZCLUX4 SPKzIDPtw95sVr2M8ByAJHSfGO3dLpaUsf3s5NGA0pKglrADqzJOxuZ5N/G83GNe uXDyOOWLKd8GIx+war1KbtMNwaI0MHnZou8zDCa4dFRdEBpt1FX0+LVSMXfUbSB6 IjwVPXbm/i9u7U/qFEtrR0MXXmjqxHwoQ7wxPhPtX6hyskcUXSBb7ZjEztRT8ISV YsVrsGv/vBYV1RnrDCGCollaEJZF4gjvzhvyDtiADHR/QEBIODO7ibGZwDc+Pf/j 5yUNpnZsRGcUdwxpEpkFrQsAehRgxDvxxQZfLkZ5mUgPXe57fxHczY0PCTr+IHW7 4BkjAEztFHfZ203vVruqS7+biBhcMdKRhWbLxoVUvTOgSvx0I4MrUW885xCml0Dr FF8/SiQROXRV816PKfX+p1aj0V5V1wN+RmRf3ewie5dNzesHK3hvMWOq8H53ItCh WTDE/lzDSdH9XRnwxbk1 =+iq7 -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-21: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.5.2'
Tag 'libreoffice-4.2.5.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-06-12 09:26 -0700 Tag libreoffice-4.2.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJTmWRPAAoJEPQ0oe+v7q6jsTAQALCPQYiq7/dHTsYBC95J3hRJ ezGbwILa+eacH5EYVJZBspPe1WGLiklE7ERxYxmMXVmKmtFLHRt4a3EcesMemCr5 /ZGokLd7sjplbfgQj+tdzQ9M7DupPlOYxdKOzWD3ggmkkeWzd3U1fworr34xD5Kx ZF0OHqocpMLvpVsbsF5q/JWgkxkgXKE02YsEaR4dwu3K7ADv4OFV0dNpJqBlYFGd VcdmMCMZmbFxDdDUmroQCjByLDPLV6ss30/4ZhbVPipTpne14HewtD1EBjanDSr8 QnSnXDyJHKRWjJmY6O1iVEp4a+6Sy/rZcSrrfV3R+1IPFfPmfMxSWn56AAk3vNpg RlYP9S7cf28YR293q6/21KIbUd5M9c28+88I4F09Mkpeu05yWfPWjFDJB1wl3Y0I gzGXHYFPPEkQjl3cHkZXwvPwuOVWLhcUCr42FN69k4/HnvJYmN8sw1yJmso6PR9T 3oZX2Pq1Bsa1JY/7ZUFgx0XRkiSsCWXX4LkqIXhgyli4Hnc+uplhEYB7MTA1vHNu FMt6ZMn9yr18kBnDbc0uGmFG1k/4KAfGQDhP48vSbKts+MDLu6TYY6cFycbA3yYq TcUtSiCKBT/8Lkmvg9theZPKI0fpBtwlViBWOa3xPGMFx7yr/81eLSsFqmW/xivj cfQqKt1UA/NNzEMvEYSn =Kqgj -END PGP SIGNATURE- Changes since cp-4.2-2-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.5.2'
Tag 'libreoffice-4.2.5.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-06-12 09:27 -0700 Tag libreoffice-4.2.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJTmWRbAAoJEPQ0oe+v7q6jrwoP/3gZrfrjrjh4VFke7lsT0vLg IevIexGLMncoyerI+I/u0PgH/rdbtlGSJS03+EgkKM5MVIAG/t95JSSFSm4F7sly MGZsqaSyAuaagEjwCyrC6lNG5xYBrpJaotH2tEfJVQ1kl85c8wJYxxXpMkTt5Ft+ 4mhR7bfw5KTJa981KX5dZE9qLR6N9no0biyJJSl9ARO1iAKiqWlKHc0yaycMp8KD up2Rdxrs6nwhKef5f7TE5c6axcOjQbzvyWYBmRIi21ZhhKafKJMVHnvr3RCisRk7 Ic1xRCIjs45s1YMhpffoHl1tAi1KELUQ/COIE9IVeWVuRJK+FwRZxpQm/0U6KOOA m4ILO98h+hJQeNVAKBHy7hJ6JtydJsfEfpU9TEHsLbu1XknqhmJciDeC+oUc7qcI KTDdWilV13uFxpUi3S4GtWyfYN3Yp0bo+z0yOkojZyT4vhK9cmxAlVyUJRnI/t9t 2OEZlMuMl54VY2411vtSEPYvvvYHbGY17Kn1lYeix2Jqwv9IW/W7kt8gA1SBZjYG uOpiEQfwTbmj2GIL/vphwyACOtUzCfsjh/5yiF+cTU4dO6XfzmMuFjTT+qT6n9+X /lR9CidE0STA7yFQLLXNDLMs+QXTMKcLr3llFyhfXfqpvjZ+cNyU14ZPITsILVjV o4xmxPrKJ6GSSFeRND4f =vixC -END PGP SIGNATURE- Changes since cp-4.2-branch-point-433: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
extras/source/glade/libreoffice-catalog.xml.in |3
sw/UIConfig_swriter.mk |1
sw/inc/dbui.hrc|2
sw/source/ui/app/app.src |5
sw/source/ui/config/optload.cxx|2
sw/source/ui/dbui/mmaddressblockpage.cxx | 154 +
sw/source/ui/dbui/mmaddressblockpage.hrc | 13 --
sw/source/ui/dbui/mmaddressblockpage.hxx | 14 --
sw/source/ui/dbui/mmaddressblockpage.src | 139 --
sw/source/uibase/inc/app.hrc |3
sw/uiconfig/swriter/ui/assignfieldsdialog.ui | 146 +++
11 files changed, 292 insertions(+), 190 deletions(-)
New commits:
commit 8e6eb6fb219a20383f79df71883feabfdc8fa899
Author: sk94 eszka...@gmail.com
Date: Tue Jun 10 20:29:02 2014 +0200
DLG_MM_ASSIGNFIELDS conversion to .ui
Change-Id: Ia625de9edd46c185c2712c0c5a7154ba1abb2894
Reviewed-on: https://gerrit.libreoffice.org/9726
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index d005444..a39e779 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -432,6 +432,9 @@
glade-widget-class title=Address Preview name=swlo-SwAddressPreview
generic-name=Address Preview parent=GtkDrawingArea
icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Assign Fields Control
name=swuilo-SwAssignFieldsControl
+generic-name=Assign Fields Control
parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
glade-widget-class title=Rectangle Control name=svxlo-SvxRectCtl
generic-name=Rectangle Control
parent=GtkDrawingArea
icon-name=widget-gtk-drawingarea/
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 6a45ead..f9763e1 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/addressblockdialog \
sw/uiconfig/swriter/ui/alreadyexistsdialog \
sw/uiconfig/swriter/ui/asciifilterdialog \
+ sw/uiconfig/swriter/ui/assignfieldsdialog \
sw/uiconfig/swriter/ui/assignstylesdialog \
sw/uiconfig/swriter/ui/attachnamedialog \
sw/uiconfig/swriter/ui/authenticationsettingsdialog \
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index e7c6a73..f22bb76 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -28,8 +28,6 @@
#define DLG_MM_SELECTDBTABLEDDIALOG (RC_DBUI_BEGIN + 12)
#define DLG_MM_DBTABLEPREVIEWDIALOG (RC_DBUI_BEGIN + 13)
-#define DLG_MM_ASSIGNFIELDS (RC_DBUI_BEGIN + 20)
-
#define DLG_MM_MAILBODY (RC_DBUI_BEGIN + 24)
#define DLG_MM_SENDMAILS (RC_DBUI_BEGIN + 25)
#define DLG_MAILMERGECHILD(RC_DBUI_BEGIN + 26)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 1ff3070..2b19c9f 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -722,9 +722,4 @@ String STR_CAPTION_OLE
Text [ en-US ] = Other OLE Objects;
};
-String STR_CATEGORY_NONE
-{
-Text [ en-US ] = None ;
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index d3067ca..d886841 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -420,7 +420,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const
SfxItemSet rSet )
, m_sEnd(SW_RESSTR(STR_CAPTION_END))
, m_sAbove(SW_RESSTR(STR_CAPTION_ABOVE))
, m_sBelow(SW_RESSTR(STR_CAPTION_BELOW))
-, m_sNone(SW_RESSTR(STR_CATEGORY_NONE))
+, m_sNone(SW_RESSTR(SW_STR_NONE))
, pMgr(new SwFldMgr())
, bHTMLMode(false)
{
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 27eddc9..e7935ed 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -65,14 +65,14 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(
SwMailMergeWizard* _pP
get(m_pSettingsFI, settingsft);
get(m_pAddressCB, address);
get(m_pSettingsWIN, settingspreview);
-Size aSize(LogicToPixel(Size(164 , 45), MapMode(MAP_APPFONT)));
+Size aSize(LogicToPixel(Size(164 , 45), MAP_APPFONT));
m_pSettingsWIN-set_width_request(aSize.Width());
m_pSettingsWIN-set_height_request(aSize.Height());
get(m_pSettingsPB, settings);
get(m_pHideEmptyParagraphsCB, hideempty);
get(m_pAssignPB, assign);
get(m_pPreviewWIN, addresspreview);
-aSize = LogicToPixel(Size(176, 46), MapMode(MAP_APPFONT));
+aSize = LogicToPixel(Size(176,
Re: [Libreoffice-commits] Do not hard code /usr
The below breaks e. g. Linux --with-package-format=rpm builds (cf.
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERfull-log=140255.29267),
because e. g. sysui/desktop/freedesktop/freedesktop-menus.spec still
assumes *.desktop files at /usr/share/applications while
sysui/desktop/share/create_tree.sh now assumes them at
${PREFIXDIR}/share/applications, where configure.ac gives
PREFIXDIR=/usr/local at least for me.
No idea what the right fix is, whether the sysui/desktop/ *.specs need
to be adapted to PREFIXDIR or whether those /usr/share paths should be
left hardcoded.
Stephan
On 06/11/2014 03:42 PM, Baptiste Daroussin wrote:
bin/distro-install-desktop-integration |1 +
sysui/desktop/share/create_tree.sh | 20 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit d2cc121e0798a007a6e0409b09c16ce747ab959f
Author: Baptiste Daroussin b...@freebsd.org
Date: Wed Jun 11 11:04:07 2014 +0200
Do not hard code /usr
Not all operation system install packages into /usr, make sure
create-tree.sh do respect the PREFIX variable
Change-Id: Iff358c9e22fb8969afaef2bb96e1f91eb7e91123
Reviewed-on: https://gerrit.libreoffice.org/9730
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/bin/distro-install-desktop-integration
b/bin/distro-install-desktop-integration
index 40ad98c..4cf652d 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -113,6 +113,7 @@ sed -i \
export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons
export PRODUCTVERSION=
export KDEMAINDIR=$PREFIXDIR
+export PREFIXDIR=${PREFIXDIR}
export GNOMEDIR=$PREFIXDIR
export GNOME_MIME_THEME=hicolor
bash ./create_tree.sh
diff --git a/sysui/desktop/share/create_tree.sh
b/sysui/desktop/share/create_tree.sh
index 2221a46..c6be0bb 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -57,33 +57,33 @@ if [ ${GNOMEDIR} ]; then
chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.*
fi
-mkdir -p ${DESTDIR}/usr/bin
+mkdir -p ${DESTDIR}/${PREFIXDIR}/bin
test -n ${OFFICE_PREFIX} office_prefix=${OFFICE_PREFIX} ||
office_prefix=/opt
office_root=${office_prefix}/${PREFIX}
#this symlink is needed to have the API boostrap functions running right
-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/${PREFIX}
+ln -sf ${office_root}/program/soffice ${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}
if test ${PREFIX} != libreoffice${PRODUCTVERSION} -a ${PREFIX} !=
libreofficedev${PRODUCTVERSION} ; then
# compat symlinks
mkdir -p ${DESTDIR}${office_prefix}
ln -sf libreoffice${PRODUCTVERSION} ${DESTDIR}${office_root}
-ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}
+ln -sf /${PREFIXDIR}/bin/${PREFIX}
${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}
fi
test ${PREFIX} = libreofficedev${PRODUCTVERSION}
mime_def_file=libreofficedev${PRODUCTVERSION}.xml ||
mime_def_file=libreoffice${PRODUCTVERSION}.xml
-mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/$mime_def_file
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/$mime_def_file
+mkdir -p ${DESTDIR}/${PREFIXDIR}/share/mime/packages
+cp openoffice.org.xml
${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file
+chmod 0644 ${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file
-mkdir -p ${DESTDIR}/usr/share/applications
+mkdir -p ${DESTDIR}/${PREFIXDIR}/share/applications
for i in `cat launcherlist`; do
- ln -sf ${office_root}/share/xdg/${i}
${DESTDIR}/usr/share/applications/${PREFIX}-${i}
+ ln -sf ${office_root}/share/xdg/${i}
${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}
done
-mkdir -p ${DESTDIR}/usr/share/appdata
+mkdir -p ${DESTDIR}/${PREFIXDIR}/share/appdata
for i in base calc draw impress writer; do
-cp ${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml
${DESTDIR}/usr/share/appdata/${PREFIX}-${i}.appdata.xml
+cp ${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml
${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml
done
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/ipict/ipict.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 5037dc7c465e1b159ca69fbf2db1acc9989ec17a Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 12 10:18:45 2014 +0200 Unnecessary #include Change-Id: Ib6048bb694c84a1386d70a72c6e6e942b246a80d diff --git a/filter/source/graphicfilter/ipict/ipict.hxx b/filter/source/graphicfilter/ipict/ipict.hxx index 5b2de27..5e87a4a 100644 --- a/filter/source/graphicfilter/ipict/ipict.hxx +++ b/filter/source/graphicfilter/ipict/ipict.hxx @@ -11,7 +11,6 @@ #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IPICT_HXX #include sal/config.h -#include sal/types.h class GDIMetaFile; class SvStream; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/mmaddressblockpage.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 171a14c0c3405766cc5d64886b176005f5616594 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 12 10:58:00 2014 +0200 -Werror,-Wunused-private-field Change-Id: Ic4da6180e4457309211ed26ba7d2b8382eec76f3 diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index fe222a3..0563d5a 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -260,7 +260,6 @@ class SwAssignFieldsDialog : public SfxModalDialog OKButton*m_pOK; -CancelButton*m_pCancel; OUStringm_sNone; OUStringm_rPreviewString; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/languagetag/languagetag.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit 9476bd39ad30eea46ff146f46d6c996450710b3c
Author: Eike Rathke er...@redhat.com
Date: Thu Jun 12 10:57:15 2014 +0200
disallow 'qlt' privateuse code
... to prevent confusion with our internal usage.
Change-Id: I273b80882cbe5029d04ad754c8b0636f5c59a4f6
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index b7b8aa1..c81197a 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2720,6 +2720,20 @@ bool LanguageTag::isValidBcp47( const OUString rString,
OUString* o_pCanonicali
const lt_string_t* pPrivate = lt_tag_get_privateuse(
aVar.mpLangtag);
if (pPrivate lt_string_length( pPrivate) 0)
bValid = false;
+else
+{
+const lt_lang_t* pLangT = lt_tag_get_language(
aVar.mpLangtag);
+if (pLangT)
+{
+const char* pLang = lt_lang_get_tag( pLangT);
+if (pLang strcmp( pLang, I18NLANGTAG_QLT) == 0)
+{
+// Disallow 'qlt' privateuse code to prevent
+// confusion with our internal usage.
+bValid = false;
+}
+}
+}
}
if (o_pCanonicalized)
*o_pCanonicalized = OUString::createFromAscii( pTag);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Robert Buj license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - i18nlangtag/source
i18nlangtag/source/languagetag/languagetag.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit e3115814f4f82f0eeddb4d591d0e66e6a2fd9196
Author: Eike Rathke er...@redhat.com
Date: Thu Jun 12 10:57:15 2014 +0200
disallow 'qlt' privateuse code
... to prevent confusion with our internal usage.
Change-Id: I273b80882cbe5029d04ad754c8b0636f5c59a4f6
(cherry picked from commit 9476bd39ad30eea46ff146f46d6c996450710b3c)
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index b9fcd72..f0241bc 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2720,6 +2720,20 @@ bool LanguageTag::isValidBcp47( const OUString rString,
OUString* o_pCanonicali
const lt_string_t* pPrivate = lt_tag_get_privateuse(
aVar.mpLangtag);
if (pPrivate lt_string_length( pPrivate) 0)
bValid = false;
+else
+{
+const lt_lang_t* pLangT = lt_tag_get_language(
aVar.mpLangtag);
+if (pLangT)
+{
+const char* pLang = lt_lang_get_tag( pLangT);
+if (pLang strcmp( pLang, I18NLANGTAG_QLT) == 0)
+{
+// Disallow 'qlt' privateuse code to prevent
+// confusion with our internal usage.
+bValid = false;
+}
+}
+}
}
if (o_pCanonicalized)
*o_pCanonicalized = OUString::createFromAscii( pTag);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/vcl
include/vcl/metric.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fab363401c0fc8c527cfad6a884b73391773077a
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Jun 4 23:37:40 2014 +0200
make that variable protected again
Change-Id: I17235397e490458c250165c36bec97bf1ce326d7
Reviewed-on: https://gerrit.libreoffice.org/9721
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 1836cce..e746e57 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -33,9 +33,10 @@ namespace vcl {
class VCL_DLLPUBLIC FontInfo : public Font
{
-friend class OutputDevice;
+friend class ::OutputDevice;
protected:
+ImplFontMetric* mpImplMetric;// Implementation
public:
FontInfo();
@@ -48,7 +49,6 @@ public:
sal_Booloperator==( const FontInfo ) const;
sal_Booloperator!=( const FontInfo rInfo ) const
{ return !operator==( rInfo ); }
-ImplFontMetric* mpImplMetric;// Implementation
};
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] Do not hard code /usr
On Thu, Jun 12, 2014 at 10:52:54AM +0200, Stephan Bergmann wrote:
The below breaks e. g. Linux --with-package-format=rpm builds (cf.
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERfull-log=140255.29267),
because e. g. sysui/desktop/freedesktop/freedesktop-menus.spec still
assumes *.desktop files at /usr/share/applications while
sysui/desktop/share/create_tree.sh now assumes them at
${PREFIXDIR}/share/applications, where configure.ac gives
PREFIXDIR=/usr/local at least for me.
No idea what the right fix is, whether the sysui/desktop/ *.specs need
to be adapted to PREFIXDIR or whether those /usr/share paths should be
left hardcoded.
Won't a patch like this just do the trick ?
http://people.freebsd.org/~bapt/attempt-to-fix-rpm.diff
imho this is important to have the less possible hardcoded path not only for non
linux targets but also for linux distributions that does not install everything
in /usr
regards,
Bapt
pgpDfZmtR36ft.pgp
Description: PGP signature
___
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 c165b1d54c4289eb029813a331ff963b17d1de2a Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 12 10:11:54 2014 +0100 Updated core Project: help 179e4d655622b1926a2de0e8bc93627961fcc3c7 diff --git a/helpcontent2 b/helpcontent2 index c1d60a5..179e4d6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c1d60a56eb3b6e117cfdfb43b2d9248c7ea56f96 +Subproject commit 179e4d655622b1926a2de0e8bc93627961fcc3c7 ___ 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 | 17 - source/text/swriter/01/mm_matfie.xhp |1 + 2 files changed, 1 insertion(+), 17 deletions(-) New commits: commit 179e4d655622b1926a2de0e8bc93627961fcc3c7 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 12 10:11:54 2014 +0100 connect match fields help to dialog Change-Id: I7bef5bb5f7d25d1c4bf403fd44664002f45f4704 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 7571dcc..e520bfa 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2040,8 +2040,6 @@ HID_MEMO_PAGE3,53291, HID_MEMO_PAGE4,53292, HID_MEMO_PAGE5,53293, HID_MERGE_PRINTMONITOR,52773, -HID_MM_ASSIGNFIELDS,54972, -HID_MM_ASSIGN_FIELDS,55034, HID_MM_BODY_CB_FEMALEFIELD,55032, HID_MM_BODY_CB_NEUTRAL,55033, HID_MM_BODY_CB_PERSONALIZED,55026, @@ -2052,20 +2050,6 @@ HID_MM_BODY_PB_FEMALE,55028, HID_MM_BODY_PB_MALE,55030, HID_MM_CUSTOMFIELDS,54986, HID_MM_DBTABLEPREVIEWDIALOG,54965, -HID_MM_HEADER_0,55035, -HID_MM_HEADER_1,55036, -HID_MM_HEADER_10,55045, -HID_MM_HEADER_11,55046, -HID_MM_HEADER_12,55047, -HID_MM_HEADER_13,55048, -HID_MM_HEADER_2,55037, -HID_MM_HEADER_3,55038, -HID_MM_HEADER_4,55039, -HID_MM_HEADER_5,55040, -HID_MM_HEADER_6,55041, -HID_MM_HEADER_7,55042, -HID_MM_HEADER_8,55043, -HID_MM_HEADER_9,55044, HID_MM_MAILBODY,54982, HID_MM_MAILSTATUS_TLB,54988, HID_MM_NEXT_PAGE,55016, @@ -5906,7 +5890,6 @@ sw_ListBox_DLG_FLD_DROPDOWN_LB_LISTITEMS,1419644418, sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494, sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510, sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524, -sw_ListBox_DLG_MM_ASSIGNFIELDS_CT_FIELDS_LB_FIELDS,1074908678, sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631, sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629, sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796, diff --git a/source/text/swriter/01/mm_matfie.xhp b/source/text/swriter/01/mm_matfie.xhp index 8b28ea5..960f409 100644 --- a/source/text/swriter/01/mm_matfie.xhp +++ b/source/text/swriter/01/mm_matfie.xhp @@ -31,6 +31,7 @@ /history /meta body +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/assignfieldsdialog/AssignFieldsDialog id=bm_id8489027 localize=false/ paragraph role=heading id=par_idN10539 xml-lang=en-US level=1 l10n=NEWMatch Fields/paragraph paragraph role=paragraph id=par_idN1053D xml-lang=en-US l10n=NEWMatches the logical field names of the layout dialog to the field names in your database when you create new link href=text/swriter/01/mailmerge03.xhpaddress blocks/link or link href=text/swriter/01/mailmerge04.xhpsalutations/link./paragraph paragraph role=heading id=par_idN1054E xml-lang=en-US level=2 l10n=NEWMatches to:/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d0/2054a68cb37e3b3d3485116ef835e875928763
d0/2054a68cb37e3b3d3485116ef835e875928763 |1 + 1 file changed, 1 insertion(+) New commits: commit a5d96e9a853a3af630bc15dfe61b5382695e77a1 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 12 10:24:30 2014 +0100 Notes added by 'git notes add' diff --git a/d0/2054a68cb37e3b3d3485116ef835e875928763 b/d0/2054a68cb37e3b3d3485116ef835e875928763 new file mode 100644 index 000..25cc96f --- /dev/null +++ b/d0/2054a68cb37e3b3d3485116ef835e875928763 @@ -0,0 +1 @@ +ignore: ooxml module ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - dbaccess/source sal/osl sw/inc sw/source
dbaccess/source/core/misc/services.cxx |8 +
sal/osl/unx/pipe.c | 18 +++-
sw/inc/helpid.h | 16 ---
sw/source/ui/dbui/mmaddressblockpage.cxx | 43 ---
4 files changed, 31 insertions(+), 54 deletions(-)
New commits:
commit 111cec826beefffb25f5efa73c7e5004f46a3cd8
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 12 10:23:06 2014 +0100
coverity#982455 Dereference after null check
Change-Id: If4ad2fe763bffdb64119f7f2a5797aae588fbbf8
diff --git a/dbaccess/source/core/misc/services.cxx
b/dbaccess/source/core/misc/services.cxx
index 4b0665d..232bd54 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -75,12 +75,8 @@ extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL
dba_component_getFactory(
{
createRegistryInfo_DBA();
-Reference XInterface xRet;
-if (pServiceManager pImplementationName)
-{
-xRet = ::dba::DbaModule::getInstance().getComponentFactory(
-OUString::createFromAscii( pImplementationName ) );
-}
+ReferenceXInterface
xRet(::dba::DbaModule::getInstance().getComponentFactory(
+OUString::createFromAscii(pImplementationName)));
if (xRet.is())
xRet-acquire();
commit 6ad13d3591304df9957e9c50caf06fb342e3dba7
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 12 10:14:54 2014 +0100
drop helpids that go nowhere
Change-Id: Ie487d86b95f49812cd2f4620d6d652b7422e6139
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index d66cc8ed..0639edf 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -367,7 +367,6 @@
#define HID_MM_SELECTDBTABLEDDIALOG
SW_HID_MM_SELECTDBTABLEDDIALOG
#define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX
SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX
#define HID_MM_DBTABLEPREVIEWDIALOG
SW_HID_MM_DBTABLEPREVIEWDIALOG
-#define HID_MM_ASSIGNFIELDS
SW_HID_MM_ASSIGNFIELDS
#define HID_MM_ADDRESSLIST_HB
SW_HID_MM_ADDRESSLIST_HB
#define HID_MM_MAILBODY
SW_HID_MM_MAILBODY
#define HID_MM_SENDMAILS
SW_HID_MM_SENDMAILS
@@ -406,21 +405,6 @@
#define HID_MM_BODY_LB_FEMALECOLUMN
SW_HID_MM_BODY_LB_FEMALECOLUMN
#define HID_MM_BODY_CB_FEMALEFIELD
SW_HID_MM_BODY_CB_FEMALEFIELD
#define HID_MM_BODY_CB_NEUTRAL
SW_HID_MM_BODY_CB_NEUTRAL
-#define HID_MM_ASSIGN_FIELDS
SW_HID_MM_ASSIGN_FIELDS
-#define HID_MM_HEADER_0
SW_HID_MM_HEADER_0
-#define HID_MM_HEADER_1
SW_HID_MM_HEADER_1
-#define HID_MM_HEADER_2
SW_HID_MM_HEADER_2
-#define HID_MM_HEADER_3
SW_HID_MM_HEADER_3
-#define HID_MM_HEADER_4
SW_HID_MM_HEADER_4
-#define HID_MM_HEADER_5
SW_HID_MM_HEADER_5
-#define HID_MM_HEADER_6
SW_HID_MM_HEADER_6
-#define HID_MM_HEADER_7
SW_HID_MM_HEADER_7
-#define HID_MM_HEADER_8
SW_HID_MM_HEADER_8
-#define HID_MM_HEADER_9
SW_HID_MM_HEADER_9
-#define HID_MM_HEADER_10
SW_HID_MM_HEADER_10
-#define HID_MM_HEADER_11
SW_HID_MM_HEADER_11
-#define HID_MM_HEADER_12
SW_HID_MM_HEADER_12
-#define HID_MM_HEADER_13
SW_HID_MM_HEADER_13
#define HID_TBX_FORMULA_CALC
SW_HID_TBX_FORMULA_CALC
#define HID_TBX_FORMULA_CANCEL
SW_HID_TBX_FORMULA_CANCEL
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index ed8de3e..00f610a 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -845,7 +845,6 @@ SwAssignFieldsControl::SwAssignFieldsControl(Window*
pParent, WinBits nBits) :
m_nYOffset(0),
m_nFirstYPos(0)
{
-SetHelpId(HID_MM_ASSIGN_FIELDS);
long nHBHeight = m_aHeaderHB.CalcWindowSizePixel().Height();
Size aOutputSize(GetOutputSize());
m_aVScroll.Show();
@@ -886,24 +885,6 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem
rConfigItem)
Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl);
Link aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl);
-static const char* aHIDs[] =
-{
- HID_MM_HEADER_0,
- HID_MM_HEADER_1,
-
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/ChartView.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit fc4f5d2f8576097953b83d7fecfe5eb5184811b1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Jun 12 11:58:45 2014 +0200
another lifecycle issue fixed
Change-Id: Id8acd1bda30156da8cf5f61537f76f778e1b9c74
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index da62d13..f04433b 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -167,17 +167,19 @@ public:
virtual void contextDestroyed() SAL_OVERRIDE;
private:
ChartView* mpView;
+bool mbContextDestroyed;
};
GL2DRenderer::GL2DRenderer(ChartView* pView):
-mpView(pView)
+mpView(pView),
+mbContextDestroyed(false)
{
}
GL2DRenderer::~GL2DRenderer()
{
OpenGLWindow* pWindow = mpView-mrChartModel.getOpenGLWindow();
-if(pWindow)
+if(!mbContextDestroyed pWindow)
pWindow-setRenderer(NULL);
}
@@ -200,6 +202,7 @@ void GL2DRenderer::scroll(long )
void GL2DRenderer::contextDestroyed()
{
+mbContextDestroyed = true;
}
const uno::Sequencesal_Int8 ExplicitValueProvider::getUnoTunnelId()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/attr/format.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 7d096ff2e25e422f55c821ecce99cecac6ee4b95 Author: Herbert Dürr h...@apache.org Date: Thu Jun 12 08:55:46 2014 + #i125071# check SwFmt::GetItemState()'s ppItem parameter for NULL before assigning something into it. The ppItem default value is NULL so it is allowed. The method should be prepared to handle that. diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 92f81e4..2a8e6a7 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -471,14 +471,16 @@ SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent, con static SvxBrushItem aSvxBrushItem(RES_BACKGROUND); aSvxBrushItem = getSvxBrushItemFromSourceSet(aSet, RES_BACKGROUND, bSrchInParent); -*ppItem = aSvxBrushItem; +if( ppItem ) +*ppItem = aSvxBrushItem; return SFX_ITEM_SET; } // if not, reset pointer and return SFX_ITEM_DEFAULT to signal that // the item is not set -*ppItem = 0; +if( ppItem ) +*ppItem = NULL; return SFX_ITEM_DEFAULT; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/sdr/contact/viewcontactofunocontrol.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 551c915dcbf3e1d6bfd799c6e13e5700e2c3e535
Author: David Tardon dtar...@redhat.com
Date: Thu Jun 12 12:10:33 2014 +0200
fdo#79883 the page view object contact must exist
Change-Id: I5c6bd3ea267f1ea84b46e46aa508a27d00903347
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index edc551b..617b053 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -101,10 +101,13 @@ namespace sdr { namespace contact {
{
// print or print preview requires special handling
const OutputDevice* pDevice = _rObjectContact.TryToGetOutputDevice();
-bool bPrintOrPreview = ( pDevice != NULL ) (
pDevice-GetOutDevType() == OUTDEV_PRINTER );
+ObjectContactOfPageView* const pPageViewContact = dynamic_cast
ObjectContactOfPageView* ( _rObjectContact );
-ObjectContactOfPageView* pPageViewContact = dynamic_cast
ObjectContactOfPageView* ( _rObjectContact );
-bPrintOrPreview |= ( pPageViewContact != NULL )
pPageViewContact-GetPageWindow().GetPageView().GetView().IsPrintPreview();
+const bool bPrintOrPreview = pPageViewContact
+ ( ( ( pDevice != NULL ) ( pDevice-GetOutDevType() ==
OUTDEV_PRINTER ) )
+||
pPageViewContact-GetPageWindow().GetPageView().GetView().IsPrintPreview()
+ )
+;
if ( bPrintOrPreview )
return *new UnoControlPrintOrPreviewContact( *pPageViewContact,
*this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Reminder] hard (English) string and UI-freeze for 4.3.0 next Monday (2014-06-16)
Hi *, this is a reminder that next Monday (i.e. June 16th) marks hard English string and UI freeze for 4.3.0 (that means that from that point on patches need 1 Review, but branch to commit to is still libreoffice-4-3) See https://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.0_release for the detailed schedule and https://wiki.documentfoundation.org/Development/Branches for the review rules ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svx/source
svx/source/sdr/contact/viewcontactofunocontrol.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit b9d6da2f3d135cc314bf14829b2a85ce0ca6319d
Author: David Tardon dtar...@redhat.com
Date: Thu Jun 12 12:10:33 2014 +0200
fdo#79883 the page view object contact must exist
Change-Id: I5c6bd3ea267f1ea84b46e46aa508a27d00903347
(cherry picked from commit 551c915dcbf3e1d6bfd799c6e13e5700e2c3e535)
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index edc551b..617b053 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -101,10 +101,13 @@ namespace sdr { namespace contact {
{
// print or print preview requires special handling
const OutputDevice* pDevice = _rObjectContact.TryToGetOutputDevice();
-bool bPrintOrPreview = ( pDevice != NULL ) (
pDevice-GetOutDevType() == OUTDEV_PRINTER );
+ObjectContactOfPageView* const pPageViewContact = dynamic_cast
ObjectContactOfPageView* ( _rObjectContact );
-ObjectContactOfPageView* pPageViewContact = dynamic_cast
ObjectContactOfPageView* ( _rObjectContact );
-bPrintOrPreview |= ( pPageViewContact != NULL )
pPageViewContact-GetPageWindow().GetPageView().GetView().IsPrintPreview();
+const bool bPrintOrPreview = pPageViewContact
+ ( ( ( pDevice != NULL ) ( pDevice-GetOutDevType() ==
OUTDEV_PRINTER ) )
+||
pPageViewContact-GetPageWindow().GetPageView().GetView().IsPrintPreview()
+ )
+;
if ( bPrintOrPreview )
return *new UnoControlPrintOrPreviewContact( *pPageViewContact,
*this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - postprocess/CppunitTest_services.mk postprocess/Module_postprocess.mk postprocess/qa
postprocess/CppunitTest_services.mk |1 +
postprocess/Module_postprocess.mk |3 +--
postprocess/qa/services.cxx | 27 +++
3 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit 0b5568b9ddc2f89a58a76daef0b52bbfadcd6280
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 12:28:51 2014 +0200
Fix CppunitTest_services on Windows
...by blacklisting the problematic service
Change-Id: I524a7c7af2cb374911db7b204021c3d2bcd1fdd6
diff --git a/postprocess/Module_postprocess.mk
b/postprocess/Module_postprocess.mk
index cf42913..5775cfa 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -28,9 +28,8 @@ $(eval $(call gb_Module_add_targets,postprocess,\
))
endif
-$(if $(filter-out $(OS),WNT), \
$(eval $(call gb_Module_add_check_targets,postprocess,\
CppunitTest_services \
-)))
+))
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index a7052c1..706010d 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -9,6 +9,7 @@
#include sal/config.h
+#include algorithm
#include vector
#include com/sun/star/container/XHierarchicalNameAccess.hpp
@@ -36,6 +37,25 @@ public:
void ServicesTest::test()
{
+std::vectorOUString blacklist;
+#if defined WNT
+// On Windows, blacklist the com.sun.star.report.ReportDefinition service,
+// as its reportdesign::OReportDefinition implementation (in
+// reportdesign/source/core/api/ReportDefinition.cxx) spawns a thread that
+// forever blocks in SendMessageW when no VCL event loop is running
+// (reportdesign::anon::FactoryLoader::execute -
+// framework::Desktop::findFrame - framework::TaskCreator::createTask -
+// anon::TaskCreatorService::createInstanceWithArguments -
+// anon::TaskCreatorService::impls_createContainerWindow -
+// anon::VCLXToolkit::createWindow -
+// anon::VCLXToolkit::ImplCreateWindow -
+// anon::VCLXToolkit::ImplCreateWindow - WorkWindow::WorkWindow -
+// WorkWindow::ImplInit - ImplBorderWindow::ImplBorderWindow -
+// ImplBorderWindow::ImplInit - Window::ImplInit -
+// WinSalInstance::CreateFrame - ImplSendMessage - SendMessageW):
+blacklist.push_back(com.sun.star.report.ReportDefinition);
+#endif
+
Reference XHierarchicalNameAccess xTypeManager(
m_xContext-getValueByName(
/singletons/com.sun.star.reflection.theTypeDescriptionManager),
@@ -44,6 +64,11 @@ void ServicesTest::test()
std::vector css::uno::Referencecss::lang::XComponent comps;
for (sal_Int32 i = 0; i s.getLength(); i++)
{
+if (std::find(blacklist.begin(), blacklist.end(), s[i])
+!= blacklist.end())
+{
+continue;
+}
if (!xTypeManager-hasByHierarchicalName(s[i]))
{
SAL_WARN(
commit cea0c412d580a9ff0423bd9fa4d8b535490b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 12:18:59 2014 +0200
Avoid Solar Mutex deadlocks when disposing services
...as test code using gb_CppunitTest_use_vcl is implicitly run with Solar
Mutex locked
Change-Id: I480b4bcce7c6a94922019679099b0883b3ee1030
diff --git a/postprocess/CppunitTest_services.mk
b/postprocess/CppunitTest_services.mk
index bdcae7b..08c860e 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,services, \
cppu \
sal \
test \
+ vcl \
$(gb_UWINAPI) \
))
diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 2d29e91..a7052c1 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -16,6 +16,7 @@
#include com/sun/star/reflection/XServiceConstructorDescription.hpp
#include com/sun/star/reflection/XServiceTypeDescription2.hpp
#include test/bootstrapfixture.hxx
+#include vcl/svapp.hxx
using namespace css::container;
using namespace css::reflection;
@@ -87,6 +88,7 @@ void ServicesTest::test()
}
}
}
+SolarMutexReleaser rel;
for (std::vector css::uno::Referencecss::lang::XComponent ::iterator i(
comps.begin());
i != comps.end(); ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/tags/suse-4.0-24' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'refs/tags/suse-4.0-24' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'refs/tags/suse-4.0-24' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'refs/tags/suse-4.0-24' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - openssl/makefile.mk openssl/openssl-asm-fix.patch openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/
openssl/makefile.mk |4 ++--
openssl/openssl-asm-fix.patch |4 ++--
openssl/openssl.patch | 24
openssl/opensslios.patch |4 ++--
openssl/openssllnx.patch | 20 ++--
openssl/opensslmacosx.patch |8
openssl/opensslmingw.patch| 16
openssl/opensslsol.patch | 20 ++--
openssl/version.mk|4 ++--
9 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 93260d8a53abf4e55920c0722f7438a58f2b5565
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Jun 12 03:31:07 2014 -0700
openssl-0.9.8za -- fixes multiple CVEs
Change-Id: I99595b4de670b42497cb2bf7a19f6a53237c8168
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 286e424..255432e 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -46,10 +46,10 @@ TARGET=openssl
@echo openssl disabled
.ENDIF
-OPENSSL_NAME=openssl-0.9.8v
+OPENSSL_NAME=openssl-0.9.8za
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce
+TARFILE_MD5=2f989915f8fea49aa1bc37aa58500cce
PATCH_FILES=openssl-asm-fix.patch
CONFIGURE_DIR=.
diff --git a/openssl/openssl-asm-fix.patch b/openssl/openssl-asm-fix.patch
index 76013eb..23da4e7 100644
--- a/openssl/openssl-asm-fix.patch
+++ b/openssl/openssl-asm-fix.patch
@@ -1,5 +1,5 @@
misc/build/openssl-0.9.8v/crypto/md32_common.h.sav 2010-03-29
13:23:11.0 +0200
-+++ misc/build/openssl-0.9.8v/crypto/md32_common.h 2012-03-16
12:39:14.986941958 +0100
+--- misc/build/openssl-0.9.8za/crypto/md32_common.h.sav2010-03-29
13:23:11.0 +0200
misc/build/openssl-0.9.8za/crypto/md32_common.h2012-03-16
12:39:14.986941958 +0100
@@ -165,7 +165,7 @@
asm ( \
roll %1,%0\
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 4bf7761..5dd94a1 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,5 +1,5 @@
misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0
+0100
-+++ misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2010-03-26
12:04:20.961547300 +0100
+--- misc/openssl-0.9.8za/crypto/x509v3/v3_pci.c2007-03-05
01:06:47.0 +0100
misc/build/openssl-0.9.8za/crypto/x509v3/v3_pci.c 2010-03-26
12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (rich...@levitte.org)
@@ -9,8 +9,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28
01:21:33.0 +0100
-+++ misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26
12:04:20.961547300 +0100
+--- misc/openssl-0.9.8za/crypto/x509v3/v3_pcia.c 2004-12-28
01:21:33.0 +0100
misc/build/openssl-0.9.8za/crypto/x509v3/v3_pcia.c 2010-03-26
12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (rich...@levitte.org)
@@ -20,8 +20,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
misc/openssl-0.9.8v/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200
-+++ misc/build/openssl-0.9.8v/ms/do_ms.bat 2010-03-26 12:19:19.399047300
+0100
+--- misc/openssl-0.9.8za/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200
misc/build/openssl-0.9.8za/ms/do_ms.bat2010-03-26 12:19:19.399047300
+0100
@@ -1,11 +1,11 @@
-perl util\mkfiles.pl MINFO
@@ -43,8 +43,8 @@
-perl util\mkdef.pl 32 ssleay ms\ssleay32.def
+%1 util\mkdef.pl 32 libeay ms\libeay32.def
+%1 util\mkdef.pl 32 ssleay ms\ssleay32.def
misc/openssl-0.9.8v/util/mk1mf.pl 2009-09-20 14:46:42.0 +0200
-+++ misc/build/openssl-0.9.8v/util/mk1mf.pl2010-03-26 12:04:20.977172300
+0100
+--- misc/openssl-0.9.8za/util/mk1mf.pl 2009-09-20 14:46:42.0 +0200
misc/build/openssl-0.9.8za/util/mk1mf.pl 2010-03-26 12:04:20.977172300
+0100
@@ -128,7 +128,7 @@
$inc_def=outinc;
$tmp_def=tmp;
@@ -75,8 +75,8 @@
#define PLATFORM $platform
EOF
printf OUT #define DATE \%s\\n, scalar gmtime();
misc/openssl-0.9.8v/util/pl/VC-32.pl 2010-02-04 02:10:24.0
+0100
-+++ misc/build/openssl-0.9.8v/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300
+0100
+--- misc/openssl-0.9.8za/util/pl/VC-32.pl 2010-02-04 02:10:24.0
+0100
misc/build/openssl-0.9.8za/util/pl/VC-32.pl2010-03-26
12:04:20.977172300 +0100
@@ -32,7 +32,7 @@
$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
@@ -134,8 +134,8 @@
sub do_lib_rule
{
misc/build/openssl-0.9.8v/ms/uplink.c
-+++ misc/build/openssl-0.9.8v/ms/uplink.c
+--- misc/build/openssl-0.9.8za/ms/uplink.c
misc/build/openssl-0.9.8za/ms/uplink.c
@@ -1,5 +1,6 @@
#if (defined(_WIN64) || defined(_WIN32_WCE)) !defined(UNICODE)
#define UNICODE
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/rtfexport/rtfexport.cxx |7 +++
sw/source/filter/inc/msfilter.hxx | 12 +-
sw/source/filter/ww8/rtfattributeoutput.cxx| 19 -
sw/source/filter/ww8/writerwordglue.cxx| 49 +
sw/source/filter/ww8/wrtw8sty.cxx |3 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 ++--
6 files changed, 89 insertions(+), 9 deletions(-)
New commits:
commit e47a02b1524061143d8e77a54eb95c77f2e6dae2
Author: Michael Stahl mst...@redhat.com
Date: Thu Jun 12 12:16:28 2014 +0200
fdo#77979: sw: RTF export: write non-ASCII font names encoded
Currently font names like 微软é
é» (Microsoft YaHei) are
written as in the RTF export; to avoid that, set the \fcharset
of the font entry to something that at least is able to encode
the font name and alternate name.
This requires a new function since the existing
rtl_TextEncodingToWinCharset was changed in
b88fe998ce8c80d7629fe70118311096615d959d to return default 0x01
(for OOXML) which is quite unhelpful for RTF.
This is not entirely satisfactory, as of course that is no guarantee
that the encoding can represent all of the actual text that has the
font applied; hence there are some \'3f in the fall-back encoded text
of the heading of the bugdoc, which indicates that the detected
Shift-JIS is insufficient and GB-2132 would be required; but it's not
obvious how to do better here without iterating over all the text
twice, and that still leaves the possibility that all text that has a
particular font applied cannot be represented by a single non-Unicode
encoding.
But since we always write text as the \u Unicode + legacy fall-back,
this should not be a big problem since modern RTF readers will simply
read the Unicode.
Change-Id: Ie6a42294c501d014dd9f0df82638519412ca19bb
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 9a38b49..ce91526 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -317,6 +317,13 @@ DECLARE_RTFEXPORT_TEST(testMathRuns, math-runs.rtf)
CPPUNIT_ASSERT_EQUAL(OUString(\\{ left [ right ] left ( right ) \\}),
getFormula(getRun(getParagraph(1), 1)));
}
+DECLARE_RTFEXPORT_TEST(testFdo77979, fdo77979.odt)
+{
+// font name is encoded with \fcharset of font
+CPPUNIT_ASSERT_EQUAL(OUString(微软é
é», 12, RTL_TEXTENCODING_UTF8),
+getPropertyOUString(getRun(getParagraph(1), 1), CharFontName));
+}
+
DECLARE_RTFEXPORT_TEST(testFdo53113, fdo53113.odt)
{
/*
diff --git a/sw/source/filter/inc/msfilter.hxx
b/sw/source/filter/inc/msfilter.hxx
index babfc7e..8ff19a0 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -59,8 +59,7 @@ namespace sw
{
/** MSOffice appears to set the charset of unicode fonts to MS 932
-Arial Unicode MS for example is a unicode font, but word sets
-exported uses of it to the MS 932 charset
+But we do default, whatever that means.
@param eTextEncoding
the OOo encoding to convert from
@@ -73,6 +72,15 @@ namespace sw
*/
sal_uInt8 rtl_TextEncodingToWinCharset(rtl_TextEncoding eTextEncoding);
+/** MSOffice appears to set the charset of unicode fonts to MS 932
+
+Arial Unicode MS for example is a unicode font, but word sets
+exported uses of it to the MS 932 charset
+
+*/
+sal_uInt8 rtl_TextEncodingToWinCharsetRTF(OUString const rFontName,
+OUString const rAltName, rtl_TextEncoding eTextEncoding);
+
/** Import a MSWord XE field. Suitable for .doc and .rtf
@param rDoc
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 41e06be..162b6cc 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2073,7 +2073,12 @@ void RtfAttributeOutput::CharFont(const SvxFontItem
rFont)
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LOCH);
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F);
m_aStylesEnd.append((sal_Int32)m_rExport.maFontHelper.GetId(rFont));
-m_rExport.eCurrentEncoding =
rtl_getTextEncodingFromWindowsCharset(rtl_getBestWindowsCharsetFromTextEncoding(rFont.GetCharSet()));
+// FIXME: this may be a tad expensive... but the charset needs to be
+// consistent with what wwFont::WriteRtf() does
+FontMapExport aTmp(rFont.GetFamilyName());
+m_rExport.eCurrentEncoding = rtl_getTextEncodingFromWindowsCharset(
+sw::ms::rtl_TextEncodingToWinCharsetRTF(
+aTmp.msPrimary, aTmp.msSecondary, rFont.GetCharSet()));
if (m_rExport.eCurrentEncoding == RTL_TEXTENCODING_DONTKNOW)
m_rExport.eCurrentEncoding = m_rExport.eDefaultEncoding;
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - openssl/makefile.mk openssl/openssl-asm-fix.patch openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmacosx.patch opens
openssl/makefile.mk |4 ++--
openssl/openssl-asm-fix.patch |4 ++--
openssl/openssl.patch | 24
openssl/opensslios.patch |4 ++--
openssl/openssllnx.patch | 20 ++--
openssl/opensslmacosx.patch |8
openssl/opensslmingw.patch| 16
openssl/opensslsol.patch | 20 ++--
openssl/version.mk|4 ++--
9 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit d4ada70fd7fde805b852c6ba50d841a31da2c21b
Author: Andras Timar andras.ti...@collabora.com
Date: Thu Jun 12 03:31:07 2014 -0700
openssl-0.9.8za -- fixes multiple CVEs
Change-Id: I99595b4de670b42497cb2bf7a19f6a53237c8168
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 286e424..255432e 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -46,10 +46,10 @@ TARGET=openssl
@echo openssl disabled
.ENDIF
-OPENSSL_NAME=openssl-0.9.8v
+OPENSSL_NAME=openssl-0.9.8za
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce
+TARFILE_MD5=2f989915f8fea49aa1bc37aa58500cce
PATCH_FILES=openssl-asm-fix.patch
CONFIGURE_DIR=.
diff --git a/openssl/openssl-asm-fix.patch b/openssl/openssl-asm-fix.patch
index 76013eb..23da4e7 100644
--- a/openssl/openssl-asm-fix.patch
+++ b/openssl/openssl-asm-fix.patch
@@ -1,5 +1,5 @@
misc/build/openssl-0.9.8v/crypto/md32_common.h.sav 2010-03-29
13:23:11.0 +0200
-+++ misc/build/openssl-0.9.8v/crypto/md32_common.h 2012-03-16
12:39:14.986941958 +0100
+--- misc/build/openssl-0.9.8za/crypto/md32_common.h.sav2010-03-29
13:23:11.0 +0200
misc/build/openssl-0.9.8za/crypto/md32_common.h2012-03-16
12:39:14.986941958 +0100
@@ -165,7 +165,7 @@
asm ( \
roll %1,%0\
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 4bf7761..5dd94a1 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,5 +1,5 @@
misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0
+0100
-+++ misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2010-03-26
12:04:20.961547300 +0100
+--- misc/openssl-0.9.8za/crypto/x509v3/v3_pci.c2007-03-05
01:06:47.0 +0100
misc/build/openssl-0.9.8za/crypto/x509v3/v3_pci.c 2010-03-26
12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (rich...@levitte.org)
@@ -9,8 +9,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28
01:21:33.0 +0100
-+++ misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26
12:04:20.961547300 +0100
+--- misc/openssl-0.9.8za/crypto/x509v3/v3_pcia.c 2004-12-28
01:21:33.0 +0100
misc/build/openssl-0.9.8za/crypto/x509v3/v3_pcia.c 2010-03-26
12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (rich...@levitte.org)
@@ -20,8 +20,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
misc/openssl-0.9.8v/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200
-+++ misc/build/openssl-0.9.8v/ms/do_ms.bat 2010-03-26 12:19:19.399047300
+0100
+--- misc/openssl-0.9.8za/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200
misc/build/openssl-0.9.8za/ms/do_ms.bat2010-03-26 12:19:19.399047300
+0100
@@ -1,11 +1,11 @@
-perl util\mkfiles.pl MINFO
@@ -43,8 +43,8 @@
-perl util\mkdef.pl 32 ssleay ms\ssleay32.def
+%1 util\mkdef.pl 32 libeay ms\libeay32.def
+%1 util\mkdef.pl 32 ssleay ms\ssleay32.def
misc/openssl-0.9.8v/util/mk1mf.pl 2009-09-20 14:46:42.0 +0200
-+++ misc/build/openssl-0.9.8v/util/mk1mf.pl2010-03-26 12:04:20.977172300
+0100
+--- misc/openssl-0.9.8za/util/mk1mf.pl 2009-09-20 14:46:42.0 +0200
misc/build/openssl-0.9.8za/util/mk1mf.pl 2010-03-26 12:04:20.977172300
+0100
@@ -128,7 +128,7 @@
$inc_def=outinc;
$tmp_def=tmp;
@@ -75,8 +75,8 @@
#define PLATFORM $platform
EOF
printf OUT #define DATE \%s\\n, scalar gmtime();
misc/openssl-0.9.8v/util/pl/VC-32.pl 2010-02-04 02:10:24.0
+0100
-+++ misc/build/openssl-0.9.8v/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300
+0100
+--- misc/openssl-0.9.8za/util/pl/VC-32.pl 2010-02-04 02:10:24.0
+0100
misc/build/openssl-0.9.8za/util/pl/VC-32.pl2010-03-26
12:04:20.977172300 +0100
@@ -32,7 +32,7 @@
$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
@@ -134,8 +134,8 @@
sub do_lib_rule
{
misc/build/openssl-0.9.8v/ms/uplink.c
-+++ misc/build/openssl-0.9.8v/ms/uplink.c
+--- misc/build/openssl-0.9.8za/ms/uplink.c
misc/build/openssl-0.9.8za/ms/uplink.c
@@ -1,5 +1,6 @@
#if (defined(_WIN64) || defined(_WIN32_WCE)) !defined(UNICODE)
#define UNICODE
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfexport/data/fdo77979.odt |binary 1 file changed New commits: commit 90b2b378aecfa1914be0ce9aa7aa4e006e225e96 Author: Michael Stahl mst...@redhat.com Date: Thu Jun 12 12:52:03 2014 +0200 fdo#77979: argh forgot to add the test document Change-Id: I64cf70cf7f1f77c38a8a4804b705ce8a0441e487 diff --git a/sw/qa/extras/rtfexport/data/fdo77979.odt b/sw/qa/extras/rtfexport/data/fdo77979.odt new file mode 100644 index 000..532724c Binary files /dev/null and b/sw/qa/extras/rtfexport/data/fdo77979.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/CppunitTest_cppcanvas_test.mk
cppcanvas/CppunitTest_cppcanvas_test.mk |2 -- 1 file changed, 2 deletions(-) New commits: commit eaf7e4f1b2486f95d9223576ebdf529c17e1861a Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 12 12:55:55 2014 +0200 Lets assume gb_CppunitTest_unset_headless was cargo cult here Change-Id: I9d4255f0ddcaf375706556d0c0baf2a5a0762bbf diff --git a/cppcanvas/CppunitTest_cppcanvas_test.mk b/cppcanvas/CppunitTest_cppcanvas_test.mk index b39c226..64f222c 100644 --- a/cppcanvas/CppunitTest_cppcanvas_test.mk +++ b/cppcanvas/CppunitTest_cppcanvas_test.mk @@ -15,8 +15,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppcanvas_test, \ cppcanvas/qa/unit/test \ )) -$(eval $(call gb_CppunitTest_unset_headless,cppcanvas_test)) - $(eval $(call gb_CppunitTest_use_external,cppcanvas_test,boost_headers)) $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_test, \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 3 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/rtfexport/data/fdo77979.odt |binary
sw/qa/extras/rtfexport/rtfexport.cxx |7 +++
sw/source/filter/inc/msfilter.hxx | 12 +-
sw/source/filter/ww8/rtfattributeoutput.cxx| 21 +-
sw/source/filter/ww8/writerwordglue.cxx| 49 +
sw/source/filter/ww8/wrtw8sty.cxx |3 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 ++--
7 files changed, 91 insertions(+), 10 deletions(-)
New commits:
commit 276fb59ee66806709382d0eeef20f62a094a5995
Author: Michael Stahl mst...@redhat.com
Date: Thu Jun 12 12:16:28 2014 +0200
fdo#77979: sw: RTF export: write non-ASCII font names encoded
Currently font names like 微软é
é» (Microsoft YaHei) are
written as in the RTF export; to avoid that, set the \fcharset
of the font entry to something that at least is able to encode
the font name and alternate name.
This requires a new function since the existing
rtl_TextEncodingToWinCharset was changed in
b88fe998ce8c80d7629fe70118311096615d959d to return default 0x01
(for OOXML) which is quite unhelpful for RTF.
This is not entirely satisfactory, as of course that is no guarantee
that the encoding can represent all of the actual text that has the
font applied; hence there are some \'3f in the fall-back encoded text
of the heading of the bugdoc, which indicates that the detected
Shift-JIS is insufficient and GB-2132 would be required; but it's not
obvious how to do better here without iterating over all the text
twice, and that still leaves the possibility that all text that has a
particular font applied cannot be represented by a single non-Unicode
encoding.
But since we always write text as the \u Unicode + legacy fall-back,
this should not be a big problem since modern RTF readers will simply
read the Unicode.
Change-Id: Ie6a42294c501d014dd9f0df82638519412ca19bb
(cherry picked from commit e47a02b1524061143d8e77a54eb95c77f2e6dae2)
fdo#77979: argh forgot to add the test document
(cherry picked from commit 90b2b378aecfa1914be0ce9aa7aa4e006e225e96)
diff --git a/sw/qa/extras/rtfexport/data/fdo77979.odt
b/sw/qa/extras/rtfexport/data/fdo77979.odt
new file mode 100644
index 000..532724c
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/fdo77979.odt differ
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 9a38b49..ce91526 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -317,6 +317,13 @@ DECLARE_RTFEXPORT_TEST(testMathRuns, math-runs.rtf)
CPPUNIT_ASSERT_EQUAL(OUString(\\{ left [ right ] left ( right ) \\}),
getFormula(getRun(getParagraph(1), 1)));
}
+DECLARE_RTFEXPORT_TEST(testFdo77979, fdo77979.odt)
+{
+// font name is encoded with \fcharset of font
+CPPUNIT_ASSERT_EQUAL(OUString(微软é
é», 12, RTL_TEXTENCODING_UTF8),
+getPropertyOUString(getRun(getParagraph(1), 1), CharFontName));
+}
+
DECLARE_RTFEXPORT_TEST(testFdo53113, fdo53113.odt)
{
/*
diff --git a/sw/source/filter/inc/msfilter.hxx
b/sw/source/filter/inc/msfilter.hxx
index babfc7e..8ff19a0 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -59,8 +59,7 @@ namespace sw
{
/** MSOffice appears to set the charset of unicode fonts to MS 932
-Arial Unicode MS for example is a unicode font, but word sets
-exported uses of it to the MS 932 charset
+But we do default, whatever that means.
@param eTextEncoding
the OOo encoding to convert from
@@ -73,6 +72,15 @@ namespace sw
*/
sal_uInt8 rtl_TextEncodingToWinCharset(rtl_TextEncoding eTextEncoding);
+/** MSOffice appears to set the charset of unicode fonts to MS 932
+
+Arial Unicode MS for example is a unicode font, but word sets
+exported uses of it to the MS 932 charset
+
+*/
+sal_uInt8 rtl_TextEncodingToWinCharsetRTF(OUString const rFontName,
+OUString const rAltName, rtl_TextEncoding eTextEncoding);
+
/** Import a MSWord XE field. Suitable for .doc and .rtf
@param rDoc
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 2fef787..f528776 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2071,7 +2071,12 @@ void RtfAttributeOutput::CharFont(const SvxFontItem
rFont)
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LOCH);
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F);
m_aStylesEnd.append((sal_Int32)m_rExport.maFontHelper.GetId(rFont));
-m_rExport.eCurrentEncoding =
rtl_getTextEncodingFromWindowsCharset(rtl_getBestWindowsCharsetFromTextEncoding(rFont.GetCharSet()));
+// FIXME: this may be a
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source
cui/source/options/personalization.cxx | 221 ++---
cui/source/options/personalization.hxx | 10 +
2 files changed, 130 insertions(+), 101 deletions(-)
New commits:
commit cdd2b7aa6ed57e0e1090cc65c292ffe943f5457e
Author: Rachit Gupta rachitgupta1...@gmail.com
Date: Thu Jun 12 17:13:33 2014 +0530
The theme is download and applied in a separate thread.
Changed the SearchAndPersonaThread to include an instance of
SvxPersonalizationTabPage along with an instance of
SelectPersonaDialog. The constructor sets one of the instance and
the other one as null. In the execute() method, whichever instance
is null, the other one's process is done in the thread.
Change-Id: Iabfbdba63ce532ab794d3697977b6fab3fdaa832
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 3e04336..f428230 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -85,9 +85,9 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*,
/*pButton*/ )
if( searchTerm.isEmpty( ) )
return 0;
-OUString rSearchURL =
https://addons.allizom.org/en-US/firefox/api/1.5/search/; + searchTerm +
/9/9;
-m_aSearchThread = new SearchAndParseThread( this, rSearchURL );
-m_aSearchThread-launch();
+OUString rSearchURL =
https://addons.allizom.org/en-US/firefox/api/1.5/search/; + searchTerm +
/9/1;
+m_rSearchThread = new SearchAndParseThread( this, rSearchURL );
+m_rSearchThread-launch();
return 0;
}
@@ -261,11 +261,9 @@ IMPL_LINK( SvxPersonalizationTabPage, SelectPersona,
PushButton*, /*pButton*/ )
OUString aURL( aDialog.GetSelectedPersona() );
if ( !aURL.isEmpty() )
{
-if ( CopyPersonaToGallery( aURL ) )
-m_pOwnPersona-Check();
+CopyPersonaToGallery( aURL );
break;
}
-// else TODO msgbox that the URL did not match
}
return 0;
@@ -336,67 +334,32 @@ static bool parsePersonaInfo( const OString rBuffer,
OUString *pHeaderURL, OUSt
return true;
}
-bool SvxPersonalizationTabPage::CopyPersonaToGallery( const OUString rURL )
+void SvxPersonalizationTabPage::CopyPersonaToGallery( const OUString rURL )
{
-// init the input stream
-uno::Reference ucb::XSimpleFileAccess3 xFileAccess(
ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ),
uno::UNO_QUERY );
-if ( !xFileAccess.is() )
-return false;
-
-OUString aName, aHeaderURL, aFooterURL, aTextColor, aAccentColor;
-
-// get the required fields from rURL
-sal_Int32 nOldIndex = 0;
-sal_Int32 nNewIndex = rURL.indexOf( ';', nOldIndex );
-aName = rURL.copy( nOldIndex, ( nNewIndex - nOldIndex ) );
-
-nOldIndex = nNewIndex + 1;
-nNewIndex = rURL.indexOf( ';', nOldIndex );
-aHeaderURL = rURL.copy(nOldIndex , ( nNewIndex - nOldIndex ) );
-
-nOldIndex = nNewIndex + 1;
-nNewIndex = rURL.indexOf( ';', nOldIndex );
-aFooterURL = rURL.copy( nOldIndex, ( nNewIndex - nOldIndex ) );
-
-nOldIndex = nNewIndex + 1;
-nNewIndex = rURL.indexOf( ';', nOldIndex );
-aTextColor = rURL.copy( nOldIndex, ( nNewIndex - nOldIndex ) );
-
-nOldIndex = nNewIndex + 1;
-nNewIndex = rURL.getLength();
-aAccentColor = rURL.copy( nOldIndex, ( nNewIndex - nOldIndex ) );
-
-// copy the images to the user's gallery
-OUString gallery = ${$BRAND_BASE_DIR/ LIBO_ETC_FOLDER /
SAL_CONFIGFILE( bootstrap) ::UserInstallation};
-rtl::Bootstrap::expandMacros( gallery );
-gallery += /user/gallery/personas/;
-osl::Directory::createPath( gallery );
-
-OUString aHeaderFile( INetURLObject( aHeaderURL ).getName() );
-OUString aFooterFile( INetURLObject( aFooterURL ).getName() );
-
-aHeaderFile = aName + / + aHeaderFile;
-aFooterFile = aName + / + aFooterFile;
-
-try {
-xFileAccess-copy( aHeaderURL, gallery + aHeaderFile );
-xFileAccess-copy( aFooterURL, gallery + aFooterFile );
-}
-catch ( const uno::Exception )
-{
-return false;
-}
-
-m_aPersonaSettings = aHeaderFile + ; + aFooterFile + ; + aTextColor +
; + aAccentColor;
-
-return true;
+m_rApplyThread = new SearchAndParseThread( this, rURL );
+m_rApplyThread-launch();
}
+void SvxPersonalizationTabPage::setPersonaSettings( const OUString
aPersonaSettings )
+{
+m_aPersonaSettings = aPersonaSettings;
+m_pOwnPersona-Check();
+}
SearchAndParseThread::SearchAndParseThread( SelectPersonaDialog* pDialog,
const OUString rURL ) :
Thread( cuiPersonasSearchThread ),
m_pPersonaDialog( pDialog ),
+m_pPersonalizationTabPage( NULL ),
+m_aURL( rURL )
+{
+}
+
+SearchAndParseThread::SearchAndParseThread( SvxPersonalizationTabPage* pDialog,
+ const OUString rURL ) :
+Thread(
[Libreoffice-commits] core.git: cppcanvas/CppunitTest_cppcanvas_emfplus.mk solenv/gbuild test/Library_subsequenttest.mk test/Library_test.mk
cppcanvas/CppunitTest_cppcanvas_emfplus.mk |4 --- solenv/gbuild/CppunitTest.mk | 30 +++-- test/Library_subsequenttest.mk |7 -- test/Library_test.mk |7 -- 4 files changed, 25 insertions(+), 23 deletions(-) New commits: commit 798f410a94fb6b59610def117199c9d3e8e87d90 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 12 13:49:45 2014 +0200 Fix vclplug_* dependencies for gb_CppunitTest_use_vcl ...and replace gb_CppunitTest_unset_headless with gb_CppunitTest_use_vcl_non_headless. Change-Id: Ibd859f98ed8df09988ca26ffcee26e06e25d8313 diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk index 8cd1506..951c37c 100644 --- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk +++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk @@ -26,8 +26,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \ vcl \ )) -$(eval $(call gb_CppunitTest_unset_headless,cppcanvas_emfplus)) - $(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers)) $(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\ @@ -36,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\ )) $(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus)) -$(eval $(call gb_CppunitTest_use_vcl,cppcanvas_emfplus)) +$(eval $(call gb_CppunitTest_use_vcl_non_headless,cppcanvas_emfplus)) $(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\ canvas/source/cairo/cairocanvas \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index c442601..622e16d 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -147,9 +147,32 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unoexcepti endef -define gb_CppunitTest_use_vcl +# $(2) == $(true) if headless: +define gb_CppunitTest__use_vcl $(call gb_CppunitTest_get_target,$(1)) : VCL := $(true) $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,vclbootstrapprotector) +ifeq ($(GUIBASE),unx) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,desktop_detector) +$(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \ +$(call gb_Library_get_target,vclplug_svp), \ +$(call gb_Library_get_target,vclplug_gen) \ +$(if $(ENABLE_GTK),$(call gb_Library_get_target,vclplug_gtk)) \ +$(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \ +$(if $(ENABLE_KDE),$(call gb_Library_get_target,vclplug_kde)) \ +$(if $(ENABLE_KDE4),$(call gb_Library_get_target,vclplug_kde4)) \ +$(if $(ENABLE_TDE),$(call gb_Library_get_target,vclplug_tde))) +endif + +endef + +define gb_CppunitTest_use_vcl +$(call gb_CppunitTest__use_vcl,$(1),$(true)) + +endef + +define gb_CppunitTest_use_vcl_non_headless +$(call gb_CppunitTest_get_target,$(1)) : HEADLESS := +$(call gb_CppunitTest__use_vcl,$(1),$(false)) endef @@ -225,11 +248,6 @@ $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTROOT)/$(LIBO_SHARE_FO endef -define gb_CppunitTest_unset_headless -$(call gb_CppunitTest_get_target,$(1)) : HEADLESS= - -endef - # Use configuration in $(WORKDIR)/unittest/registry. define gb_CppunitTest_use_unittest_configuration $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 80a855d..09f6c3e 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -29,13 +29,6 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ $(gb_UWINAPI) \ )) -ifeq ($(GUIBASE),unx) -$(call gb_Library_get_target,subsequenttest) : \ -$(call gb_Library_get_target,desktop_detector) \ -$(call gb_Library_get_target,vclplug_svp) \ - -endif - $(eval $(call gb_Library_use_externals,subsequenttest,\ boost_headers \ cppunit \ diff --git a/test/Library_test.mk b/test/Library_test.mk index a9f91c9..585c7eb 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -35,13 +35,6 @@ $(eval $(call gb_Library_use_libraries,test,\ $(gb_UWINAPI) \ )) -ifeq ($(GUIBASE),unx) -$(call gb_Library_get_target,test) : \ -$(call gb_Library_get_target,desktop_detector) \ -$(call gb_Library_get_target,vclplug_svp) \ - -endif - $(eval $(call gb_Library_add_exception_objects,test,\ test/source/bootstrapfixture \ test/source/diff/diff \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - solenv/gbuild
solenv/gbuild/LinkTarget.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 2804c1d71fe8134c855d65daf1d7f9b0ea501e4b Author: Michael Stahl mst...@redhat.com Date: Mon Jun 9 12:15:36 2014 +0200 gbuild: avoid leaving invalid .d files behind if build interrupted The LinkTarget command builds the LinkTarget's dep-file as well as an optimization so the next make does not restart; in this case the dep-file is not the target so it will not be deleted by make in case the build is interrupted, and the next make can choke on the partially written .d file. Change-Id: I13b1884f1a974b7ce10b00e1df1d0f30222f4790 (cherry picked from commit 7ea6e5412d067001da4ab5a45aeb0ce8d58cdbad) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 773aa3f..6f51b42 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -457,7 +457,8 @@ endef define gb_LinkTarget__command_impl $(if $(gb_FULLDEPS),\ $(if $(findstring concat-deps,$(2)),,\ - $(call gb_LinkTarget__command_dep,$(call gb_LinkTarget_get_dep_target,$(2)),$(2 + $(call gb_LinkTarget__command_dep,$(call gb_LinkTarget_get_dep_target,$(2)).tmp,$(2)) \ + mv $(call gb_LinkTarget_get_dep_target,$(2)).tmp $(call gb_LinkTarget_get_dep_target,$(2 $(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call gb_Library__get_workdir_linktargetname,$(lib,\ $(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$(2))),\ $(call gb_LinkTarget__command,$(1),$(2)),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ooxml/source
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionDescriptor.java
| 93 +++
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionIterator.java
| 97 +++
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionManager.java
| 142
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionTrigger.java
| 10
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/AttributeManager.java
|8
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/AttributeValues.java
| 49 +
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ElementContext.java
| 65 ++
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/IAction.java
| 27
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/NameMap.java
| 17
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/OOXMLParser.java
| 287 +++---
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/Parser.java
| 203 +++
ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/StateMachine.java
| 138 +++-
12 files changed, 905 insertions(+), 231 deletions(-)
New commits:
commit 038e3ce8001ba3dc821f921fda731c8d49e68858
Author: Andre Fischer a...@apache.org
Date: Thu Jun 12 11:01:20 2014 +
125035: Added support for actions to the experimental Java parser.
diff --git
a/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionDescriptor.java
b/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionDescriptor.java
new file mode 100644
index 000..fe3bae7
--- /dev/null
+++
b/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionDescriptor.java
@@ -0,0 +1,93 @@
+package org.apache.openoffice.ooxml.parser;
+
+import java.util.Vector;
+
+/** Container of all actions that are associated with a single state.
+ */
+public class ActionDescriptor
+{
+public ActionDescriptor (
+final int nStateId,
+final String sName)
+{
+msStateName = sName;
+
+maElementStartActions = null;
+maElementEndActions = null;
+maTextActions = null;
+}
+
+
+
+
+public void AddAction (
+final IAction aAction,
+final ActionTrigger eTrigger)
+{
+GetActionsForTrigger(eTrigger, true).add(aAction);
+}
+
+
+
+
+public IterableIAction GetActions (
+final ActionTrigger eTrigger)
+{
+return GetActionsForTrigger(eTrigger, false);
+}
+
+
+
+
+@Override
+public String toString ()
+{
+return actions for state +msStateName;
+}
+
+
+
+
+private VectorIAction GetActionsForTrigger (
+final ActionTrigger eTrigger,
+final boolean bCreateWhenMissing)
+{
+VectorIAction aActions = null;
+switch(eTrigger)
+{
+case ElementStart:
+aActions = maElementStartActions;
+if (bCreateWhenMissing aActions==null)
+{
+aActions = new Vector();
+maElementStartActions = aActions;
+}
+break;
+case ElementEnd:
+aActions = maElementEndActions;
+if (bCreateWhenMissing aActions==null)
+{
+aActions = new Vector();
+maElementEndActions = aActions;
+}
+break;
+case Text:
+aActions = maTextActions;
+if (bCreateWhenMissing aActions==null)
+{
+aActions = new Vector();
+maTextActions = aActions;
+}
+break;
+}
+return aActions;
+}
+
+
+
+
+private final String msStateName;
+private VectorIAction maElementStartActions;
+private VectorIAction maElementEndActions;
+private VectorIAction maTextActions;
+}
diff --git
a/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionIterator.java
b/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionIterator.java
new file mode 100644
index 000..0b6307f
--- /dev/null
+++
b/ooxml/source/framework/JavaOOXMLParser/src/org/apache/openoffice/ooxml/parser/ActionIterator.java
@@ -0,0 +1,97 @@
+package org.apache.openoffice.ooxml.parser;
+
+import java.util.Iterator;
+
+/** Iterate over two sources of actions, both given as an IterableIAction
+ * object that can be null.
+*/
+public class ActionIterator implements IterableIAction
+{
+public ActionIterator (
+final IterableIAction aOneStateActions,
+final
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82dead2103ef9d42abc2c54542a8f63899ebf4ec Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 12 13:13:11 2014 +0100 Updated core Project: help 23e837dd59c455baeae5f8d691fad3e3b9db52d6 diff --git a/helpcontent2 b/helpcontent2 index 179e4d6..23e837d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 179e4d655622b1926a2de0e8bc93627961fcc3c7 +Subproject commit 23e837dd59c455baeae5f8d691fad3e3b9db52d6 ___ 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
helpers/help_hid.lst |3 --- 1 file changed, 3 deletions(-) New commits: commit 23e837dd59c455baeae5f8d691fad3e3b9db52d6 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 12 13:13:11 2014 +0100 drop unused helpids Change-Id: Ib09da2add41270a0e6a08eb77f68b2fe48187323 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e520bfa..fe07541 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5154,7 +5154,6 @@ extensions_Edit_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS,859670529, extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836, extensions_Edit_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT,859736067, extensions_Edit_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE,859703298, -extensions_ListBox_GRID_DIALOG_GRID_DIALOG_TYPE_BOX,1091767812, extensions_ListBox_RID_DLG_MAPPING_LB_ADDRESS,1330990603, extensions_ListBox_RID_DLG_MAPPING_LB_ANNOTE,1330990605, extensions_ListBox_RID_DLG_MAPPING_LB_AUTHOR,1330990607, @@ -5195,7 +5194,6 @@ extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374, extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE,859753989, extensions_ListBox_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS,859704835, extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220, -extensions_ModalDialog_GRID_DIALOG,1091764224, extensions_ModalDialog_RID_DLG_FORMLINKS,1090158592, extensions_ModalDialog_RID_DLG_GRIDWIZARD,1396555776, extensions_ModalDialog_RID_DLG_GROUPBOXWIZARD,1396523008, @@ -5204,7 +5202,6 @@ extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040, extensions_ModalDialog_RID_DLG_SELECTION,1090174976, extensions_ModalDialog_RID_DLG_SELECTLABELCONTROL,1090125824, extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083, -extensions_PushButton_GRID_DIALOG_GRID_DIALOG_RESET_BTN,1091768835, extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204, extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650, extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #159 from Marina Latini mar...@studiostorti.com --- Nominate bug 63483 (UI: FILESAVE with 'Open file read-only' not offered in Draw and Impress). This is a missing feature for Draw and Impress already implemented in Writer and Calc. A user can't share a document with an edit password. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/writerwordglue.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit f3695bbc17a547b547876dd1175c0b74e5b3e90e
Author: Michael Stahl mst...@redhat.com
Date: Thu Jun 12 14:19:34 2014 +0200
error C2361: initialization of 's_fallbacks' is skipped by 'default'
Change-Id: I63f7914b52af51b55a51d39953a1ee58636243a3
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index fe95384..d609345 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -725,6 +725,13 @@ namespace sw
OUString const rFontName, OUString const rAltName,
rtl_TextEncoding eTextEncoding)
{
+static struct { rtl_TextEncoding enc; sal_uInt8 charset; }
+const s_fallbacks [] = {
+{ RTL_TEXTENCODING_MS_932, 0x80 }, // Shift-JIS
+{ RTL_TEXTENCODING_MS_936, 0x86 }, // GB-2312
+{ RTL_TEXTENCODING_MS_950, 0x88 }, // Big5
+{ RTL_TEXTENCODING_MS_949, 0x81 }, // EUC-KR
+};
sal_uInt8 nRet =
rtl_getBestWindowsCharsetFromTextEncoding(eTextEncoding);
switch (eTextEncoding)
@@ -734,13 +741,6 @@ namespace sw
case RTL_TEXTENCODING_UTF7:
case RTL_TEXTENCODING_UTF8:
case RTL_TEXTENCODING_JAVA_UTF8:
-static struct { rtl_TextEncoding enc; sal_uInt8 charset; }
-const s_fallbacks [] = {
-{ RTL_TEXTENCODING_MS_932, 0x80 }, // Shift-JIS
-{ RTL_TEXTENCODING_MS_936, 0x86 }, // GB-2312
-{ RTL_TEXTENCODING_MS_950, 0x88 }, // Big5
-{ RTL_TEXTENCODING_MS_949, 0x81 }, // EUC-KR
-};
for (size_t i = 0; i SAL_N_ELEMENTS(s_fallbacks); ++i)
{
// fall back to a charset that can at least encode
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/filter/ww8/writerwordglue.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit a6780affaf6a472e995dd3dca1f2bd45f4cc1db8
Author: Michael Stahl mst...@redhat.com
Date: Thu Jun 12 14:19:34 2014 +0200
error C2361: initialization of 's_fallbacks' is skipped by 'default'
Change-Id: I63f7914b52af51b55a51d39953a1ee58636243a3
(cherry picked from commit f3695bbc17a547b547876dd1175c0b74e5b3e90e)
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index fe95384..d609345 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -725,6 +725,13 @@ namespace sw
OUString const rFontName, OUString const rAltName,
rtl_TextEncoding eTextEncoding)
{
+static struct { rtl_TextEncoding enc; sal_uInt8 charset; }
+const s_fallbacks [] = {
+{ RTL_TEXTENCODING_MS_932, 0x80 }, // Shift-JIS
+{ RTL_TEXTENCODING_MS_936, 0x86 }, // GB-2312
+{ RTL_TEXTENCODING_MS_950, 0x88 }, // Big5
+{ RTL_TEXTENCODING_MS_949, 0x81 }, // EUC-KR
+};
sal_uInt8 nRet =
rtl_getBestWindowsCharsetFromTextEncoding(eTextEncoding);
switch (eTextEncoding)
@@ -734,13 +741,6 @@ namespace sw
case RTL_TEXTENCODING_UTF7:
case RTL_TEXTENCODING_UTF8:
case RTL_TEXTENCODING_JAVA_UTF8:
-static struct { rtl_TextEncoding enc; sal_uInt8 charset; }
-const s_fallbacks [] = {
-{ RTL_TEXTENCODING_MS_932, 0x80 }, // Shift-JIS
-{ RTL_TEXTENCODING_MS_936, 0x86 }, // GB-2312
-{ RTL_TEXTENCODING_MS_950, 0x88 }, // Big5
-{ RTL_TEXTENCODING_MS_949, 0x81 }, // EUC-KR
-};
for (size_t i = 0; i SAL_N_ELEMENTS(s_fallbacks); ++i)
{
// fall back to a charset that can at least encode
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3c446cd05f5d959d2b7dd5030b5a587e655deccf
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 14:30:49 2014 +0200
false warning C4701: potentially uninitialized local variable
Change-Id: Idd127d949837a4b327a77217abe70f50e3633d78
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index f72c99e..744b64d1 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1699,7 +1699,7 @@ void ScColumn::CopyCellNotesToDocument(
SCROW nRow1, SCROW nRow2, ScColumn rDestCol, bool bCloneCaption, SCROW
nRowOffsetDest ) const
{
ScDrawLayer *pDrawLayer = rDestCol.GetDoc().GetDrawLayer();
-bool bWasLocked;
+bool bWasLocked = bool();
if (pDrawLayer)
{
// Avoid O(n^2) by temporary locking SdrModel which disables
broadcasting.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/AllLangResTarget_scn.mk extensions/source extensions/uiconfig extensions/UIConfig_scanner.mk
extensions/AllLangResTarget_scn.mk |4 -
extensions/UIConfig_scanner.mk |1
extensions/source/scanner/grid.cxx | 48 ++---
extensions/source/scanner/grid.hrc | 36 --
extensions/source/scanner/grid.hxx | 18 +++--
extensions/source/scanner/grid.src | 79 --
extensions/uiconfig/scanner/ui/griddialog.ui | 95 +++
7 files changed, 132 insertions(+), 149 deletions(-)
New commits:
commit 3137acbe78d7c61cb9d8e58cf44312943857f5f7
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Tue Jun 10 14:35:08 2014 +0200
Convert GRID_DIALOG to .ui
Change-Id: I4476559cc2e6a90b65d5bdc8169b256929f07f7e
Reviewed-on: https://gerrit.libreoffice.org/9734
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/extensions/AllLangResTarget_scn.mk
b/extensions/AllLangResTarget_scn.mk
index 56dbe69..10ee455 100644
--- a/extensions/AllLangResTarget_scn.mk
+++ b/extensions/AllLangResTarget_scn.mk
@@ -24,8 +24,4 @@ $(eval $(call gb_SrsTarget_set_include,scn/res,\
-I$(SRCDIR)/extensions/source/scanner \
))
-$(eval $(call gb_SrsTarget_add_files,scn/res,\
- extensions/source/scanner/grid.src \
-))
-
# vim:set noet sw=4 ts=4:
diff --git a/extensions/UIConfig_scanner.mk b/extensions/UIConfig_scanner.mk
index 21d14c4..15ce9a4 100644
--- a/extensions/UIConfig_scanner.mk
+++ b/extensions/UIConfig_scanner.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,modules/scanner))
$(eval $(call gb_UIConfig_add_uifiles,modules/scanner,\
extensions/uiconfig/scanner/ui/sanedialog \
+ extensions/uiconfig/scanner/ui/griddialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/extensions/source/scanner/grid.cxx
b/extensions/source/scanner/grid.cxx
index c3f02d3..5266919 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -19,7 +19,6 @@
#include sal/config.h
#include osl/thread.h
-#include grid.hrc
#include cstdio
#include math.h
@@ -49,7 +48,7 @@ ResId SaneResId( sal_uInt32 nID )
GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues,
Window* pParent, bool bCutValues )
-: ModalDialog( pParent, SaneResId( GRID_DIALOG ) ),
+: ModalDialog( pParent, GridDialog, modules/scanner/ui/griddialog.ui ),
m_aGridArea( 50, 15, 100, 100 ),
m_pXValues( pXValues ),
m_pOrigYValues( pYValues ),
@@ -58,31 +57,30 @@ GridWindow::GridWindow(double* pXValues, double* pYValues,
int nValues, Window*
m_bCutValues( bCutValues ),
m_aHandles(),
m_nDragIndex( 0x ),
-m_aMarkerBitmap( Bitmap( SaneResId( GRID_DIALOG_HANDLE_BMP ) ), Color(
255, 255, 255 ) ),
-m_aOKButton( this, SaneResId( GRID_DIALOG_OK_BTN ) ),
-m_aCancelButton( this, SaneResId( GRID_DIALOG_CANCEL_BTN ) ),
-m_aResetTypeBox( this, SaneResId( GRID_DIALOG_TYPE_BOX ) ),
-m_aResetButton( this, SaneResId( GRID_DIALOG_RESET_BTN ) )
+m_aMarkerBitmap(
FixedImage::loadThemeImage(extensions/source/scanner/handle.png).GetBitmapEx()
)
{
-sal_uInt16 nPos = m_aResetTypeBox.InsertEntry( SaneResId(
RESET_TYPE_LINEAR_ASCENDING ).toString() );
-m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_LINEAR_ASCENDING );
+get(m_pOKButton, ok);
+get(m_pResetTypeBox, resetTypeCombobox);
+get(m_pResetButton, resetButton);
+sal_uInt16 nPos = m_pResetTypeBox-InsertEntry( Linear ascending );
+m_pResetTypeBox-SetEntryData( nPos, (void *)LINEAR_ASCENDING );
-nPos = m_aResetTypeBox.InsertEntry( SaneResId(
RESET_TYPE_LINEAR_DESCENDING ).toString() );
-m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_LINEAR_DESCENDING );
+nPos = m_pResetTypeBox-InsertEntry( Linear descending );
+m_pResetTypeBox-SetEntryData( nPos, (void *)LINEAR_DESCENDING );
-nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_RESET
).toString() );
-m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_RESET );
+nPos = m_pResetTypeBox-InsertEntry( Original values );
+m_pResetTypeBox-SetEntryData( nPos, (void *)RESET );
-nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_EXPONENTIAL
).toString() );
-m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_EXPONENTIAL );
+nPos = m_pResetTypeBox-InsertEntry( Exponential increasing );
+m_pResetTypeBox-SetEntryData( nPos, (void *)EXPONENTIAL );
-m_aResetTypeBox.SelectEntryPos( 0 );
+m_pResetTypeBox-SelectEntryPos( 0 );
-m_aResetButton.SetClickHdl( LINK( this, GridWindow, ClickButtonHdl ) );
+m_pResetButton-SetClickHdl( LINK( this, GridWindow, ClickButtonHdl ) );
SetMapMode( MapMode( MAP_PIXEL ) );
Size aSize = GetOutputSizePixel();
-Size aBtnSize = m_aOKButton.GetOutputSizePixel();
+Size aBtnSize = m_pOKButton-GetOutputSizePixel();
m_aGridArea.setWidth( aSize.Width() - aBtnSize.Width() - 80 );
[Libreoffice-commits] core.git: 8 commits - extensions/AllLangResTarget_scn.mk extensions/Module_extensions.mk extensions/source extensions/uiconfig extras/source oox/source scp2/source svx/source sw/
extensions/AllLangResTarget_scn.mk | 27 -
extensions/Module_extensions.mk|1
extensions/source/scanner/grid.cxx | 363 +++--
extensions/source/scanner/grid.hxx | 122 +---
extensions/source/scanner/sanedlg.cxx |2
extensions/uiconfig/scanner/ui/griddialog.ui | 43 ++
extras/source/glade/libreoffice-catalog.xml.in |4
oox/source/ppt/pptshape.cxx| 15 -
scp2/source/ooo/file_resource_ooo.scp |6
scp2/source/ooo/module_lang_template.scp |1
svx/source/svdraw/svdedxv.cxx | 12
sw/source/filter/ww8/wrtww8gr.cxx | 111 +++
12 files changed, 365 insertions(+), 342 deletions(-)
New commits:
commit 264d3746ca79bbbe4b1b4373dbeb8b5908b760bb
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 12 13:40:56 2014 +0100
coverity#704831 Dereference after null check
Change-Id: Ia1466b6215c2189395285ba377a18ac27e67b93a
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index a0bbfa1..6278595 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1275,13 +1275,19 @@ bool SdrObjEditView::MouseMove(const MouseEvent rMEvt,
Window* pWin)
bool bPostIt=bSelMode;
if (!bPostIt) {
Point aPt(rMEvt.GetPosPixel());
-if (pWin!=NULL) aPt=pWin-PixelToLogic(aPt);
-else if (pTextEditWin!=NULL) aPt=pTextEditWin-PixelToLogic(aPt);
+if (pWin)
+aPt=pWin-PixelToLogic(aPt);
+else if (pTextEditWin)
+aPt=pTextEditWin-PixelToLogic(aPt);
bPostIt=IsTextEditHit(aPt,nHitTolLog);
}
if (bPostIt) {
Point aPixPos(rMEvt.GetPosPixel());
-Rectangle
aR(pWin-LogicToPixel(pTextEditOutlinerView-GetOutputArea()));
+Rectangle aR(pTextEditOutlinerView-GetOutputArea());
+if (pWin)
+aR = pWin-LogicToPixel(aR);
+else if (pTextEditWin)
+aR = pTextEditWin-LogicToPixel(aR);
if (aPixPos.X()aR.Left ()) aPixPos.X()=aR.Left ();
if (aPixPos.X()aR.Right ()) aPixPos.X()=aR.Right ();
if (aPixPos.Y()aR.Top ()) aPixPos.Y()=aR.Top ();
commit 1bd5e8bc058c2e67aa2f5f99e326819f3d33b067
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 12 13:33:34 2014 +0100
coverity#735762 Unchecked dynamic_cast
Change-Id: If5ce403d9a216847532d5a2898e95c9bbde71570
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index a2dd728..c5a2d06 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -378,6 +378,15 @@ void PPTShape::applyShapeReference( const
oox::drawingml::Shape rReferencedShap
Shape::applyShapeReference( rReferencedShape, bUseText );
}
+namespace
+{
+bool ShapeLocationIsMaster(oox::drawingml::Shape *pInShape)
+{
+PPTShape* pShape = dynamic_castPPTShape*(pInShape);
+return pShape pShape-getShapeLocation() == Master;
+}
+}
+
oox::drawingml::ShapePtr PPTShape::findPlaceholder( const sal_Int32
nMasterPlaceholder, std::vector oox::drawingml::ShapePtr rShapes, bool
bMasterOnly )
{
oox::drawingml::ShapePtr aShapePtr;
@@ -385,8 +394,7 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder( const
sal_Int32 nMasterPlace
while( aRevIter != rShapes.rend() )
{
if ( (*aRevIter)-getSubType() == nMasterPlaceholder
- ( !bMasterOnly ||
- ( dynamic_cast PPTShape* ( (*aRevIter).get() )
dynamic_cast PPTShape* ( (*aRevIter).get() )-getShapeLocation() == Master )
) )
+ ( !bMasterOnly || ShapeLocationIsMaster((*aRevIter).get()) ) )
{
aShapePtr = *aRevIter;
break;
@@ -400,15 +408,6 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder( const
sal_Int32 nMasterPlace
return aShapePtr;
}
-namespace
-{
-bool ShapeLocationIsMaster(oox::drawingml::Shape *pInShape)
-{
-PPTShape* pShape = dynamic_castPPTShape*(pInShape);
-return pShape pShape-getShapeLocation() == Master;
-}
-}
-
oox::drawingml::ShapePtr PPTShape::findPlaceholderByIndex( const sal_Int32
nIdx, std::vector oox::drawingml::ShapePtr rShapes, bool bMasterOnly )
{
oox::drawingml::ShapePtr aShapePtr;
commit c0cb909ba7f01e3d644e8555289be3ab0785d15d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 12 13:31:49 2014 +0100
coverity#735763 Unchecked dynamic_cast
Change-Id: I4b8a0ebc846ee91530d28821643b3d2f98c0d4f2
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 0c5ebe0..a2dd728 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -400,6 +400,15 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder( const
sal_Int32 nMasterPlace
return aShapePtr;
}
+namespace
+{
+bool
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 03/8e3ce8001ba3dc821f921fda731c8d49e68858
03/8e3ce8001ba3dc821f921fda731c8d49e68858 |1 + 1 file changed, 1 insertion(+) New commits: commit af87852405b3afdea11d7e64e22135e37ac389c9 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 12 13:58:18 2014 +0100 Notes added by 'git notes add' diff --git a/03/8e3ce8001ba3dc821f921fda731c8d49e68858 b/03/8e3ce8001ba3dc821f921fda731c8d49e68858 new file mode 100644 index 000..25cc96f --- /dev/null +++ b/03/8e3ce8001ba3dc821f921fda731c8d49e68858 @@ -0,0 +1 @@ +ignore: ooxml module ___ 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/scanner/grid.cxx | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 8b8311a8670945c423b5d0eb419613e2a171cc23
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 15:05:37 2014 +0200
loplugin:unreffun
Change-Id: Ia4eda7adc7685809b69a248f664b6a38dc3ea0e6
diff --git a/extensions/source/scanner/grid.cxx
b/extensions/source/scanner/grid.cxx
index 4de38de..51c25c4 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -98,8 +98,6 @@ class GridWindow : public Window
double findMaxX();
double findMaxY();
-void updateRectSize();
-
void drawGrid();
void drawOriginal();
void drawNew();
@@ -123,14 +121,7 @@ public:
virtual ~GridWindow();
void setBoundings( double fMinX, double fMinY, double fMaxX, double fMaxY
);
-double getMinX() { return m_fMinX; }
-double getMinY() { return m_fMinY; }
-double getMaxX() { return m_fMaxX; }
-double getMaxY() { return m_fMaxY; }
-
-int countValues() { return m_nValues; }
-double* getXValues() { return m_pXValues; }
-double* getOrigYValues() { return m_pOrigYValues; }
+
double* getNewYValues() { return m_pNewYValues; }
void ChangeMode(int nType);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 3 commits - desktop/source include/LibreOfficeKit smoketest/libtest.cxx
desktop/source/lib/init.cxx |4 ++--
include/LibreOfficeKit/LibreOfficeKit.h |9 +
include/LibreOfficeKit/LibreOfficeKit.hxx |8
smoketest/libtest.cxx | 12 +++-
4 files changed, 26 insertions(+), 7 deletions(-)
New commits:
commit 540eb29d08729a853d7405b3eb826e02c42c65b9
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Jun 12 13:28:26 2014 +0100
liblok: check new methods via macros on nSize, not by de-referencing.
We can't check for NULL from beyond the end of a smaller structure.
Change-Id: Id3754bf747c402cf0d767eda5fd4b5ad6b5789e9
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index 97acbab..657c16c 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -18,6 +18,13 @@ extern C
typedef struct _LibreOfficeKit LibreOfficeKit;
typedef struct _LibreOfficeKitDocument LibreOfficeKitDocument;
+// Do we have an extended member in this struct ?
+#define LIBREOFFICEKIT_HAS_MEMBER(strct,member,nSize) \
+int)((unsigned char *)((strct *) 0)-member) + \
+ (int)sizeof ((strct *) 0)-member)) = (nSize))
+
+#define LIBREOFFICEKIT_HAS(pKit,member)
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKit,member,(pKit)-nSize)
+
struct _LibreOfficeKit
{
int nSize;
@@ -28,6 +35,8 @@ struct _LibreOfficeKit
char* (*getError) (LibreOfficeKit *pThis);
};
+#define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member)
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocument,member,(pDoc)-nSize)
+
struct _LibreOfficeKitDocument
{
int nSize;
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 956e3cb..ec11313 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -45,11 +45,12 @@ public:
inline bool saveAsWithOptions(const char* pUrl, const char* pFormat =
NULL, const char* pFilterOptions = NULL)
{
// available since LibreOffice 4.3
-if (!mpDoc-saveAsWithOptions)
+if (!LIBREOFFICEKIT_DOCUMENT_HAS(mpDoc, saveAsWithOptions))
return false;
return mpDoc-saveAsWithOptions(mpDoc, pUrl, pFormat, pFilterOptions);
}
+inline LibreOfficeKitDocument *get() { return mpDoc; }
};
class Office
diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
index 07a13ec..2316b8c 100644
--- a/smoketest/libtest.cxx
+++ b/smoketest/libtest.cxx
@@ -75,6 +75,16 @@ int main (int argc, char **argv)
return -1;
}
+if (!LIBREOFFICEKIT_DOCUMENT_HAS(pDocument-get(), saveAsWithOptions))
+{
+fprintf( stderr, using obsolete LibreOffice %d + %d vs. %d\n,
+ (int)((unsigned char *)((LibreOfficeKitDocument *)
0)-saveAsWithOptions),
+ (int)sizeof ((LibreOfficeKitDocument *) 0)-saveAsWithOptions,
+ pDocument-get()-nSize );
+return -1;
+}
+
+
end = getTimeMS();
fprintf( stderr, load time: %ld ms\n, (end-start) );
start = end;
commit 7de8049a17a0d2e11a2e298060bb5495d34d357d
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Jun 12 13:27:27 2014 +0100
liblok: set the size for the correct structure.
Change-Id: Id79d76893bfc931334afd59b05ab96a31e441e02
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 512cfb3..af812c6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -155,7 +155,7 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument
LibLODocument_Impl(const uno::Reference css::lang::XComponent
xComponent) :
mxComponent( xComponent )
{
-nSize = sizeof(LibreOfficeKit);
+nSize = sizeof(LibreOfficeKitDocument);
destroy = doc_destroy;
saveAs = doc_saveAs;
@@ -185,7 +185,7 @@ struct LibLibreOffice_Impl : public _LibreOfficeKit
LibLibreOffice_Impl()
{
-nSize = sizeof(LibreOfficeKitDocument);
+nSize = sizeof(LibreOfficeKit);
destroy = lo_destroy;
initialize = lo_initialize;
commit 09e5df3991eeba4f6f4280514d466dc52e21bd29
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Jun 11 15:37:17 2014 +0100
Complete LibreOfficeKit C++ renaming.
Change-Id: Ice611cf5913051346a3a0c0b00ed35a35a0dfe3c
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index c3da497..956e3cb 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -87,9 +87,7 @@ public:
}
};
-}
-
-inline ::lok::Office* lo_cpp_init(const char* pInstallPath)
+inline Office* lok_cpp_init(const char* pInstallPath)
{
LibreOfficeKit* pThis = lok_init(pInstallPath);
if (pThis == NULL || pThis-nSize == 0)
@@ -97,5 +95,6 @@ inline ::lok::Office* lo_cpp_init(const char* pInstallPath)
return new
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/a11ytextattributeswrapper.mm | 12
1 file changed, 12 insertions(+)
New commits:
commit 7b832d545acb91cc343d26e8bf26e6a844040183
Author: rbuj robert@gmail.com
Date: Wed Jun 11 21:44:52 2014 +0200
'NSNoUnderlineStyle' âNSSingleUnderlineStyleâ: Deprecated in OS X 10.9
Change-Id: If18df0c06a1bdec5ea54307f9c452a1edf533e15
Reviewed-on: https://gerrit.libreoffice.org/9740
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/osx/a11ytextattributeswrapper.mm
b/vcl/osx/a11ytextattributeswrapper.mm
index e129ac92..12497bb 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -107,12 +107,20 @@ using namespace ::rtl;
@implementation AquaA11yTextAttributesWrapper : NSObject
+(int)convertUnderlineStyle:(PropertyValue)property {
+#if MACOSX_SDK_VERSION = 1090
+int underlineStyle = NSUnderlineStyleNone;
+#else
int underlineStyle = NSNoUnderlineStyle;
+#endif
sal_Int16 value = 0;
property.Value = value;
if ( value != ::css_awt::FontUnderline::NONE
value != ::css_awt::FontUnderline::DONTKNOW) {
+#if MACOSX_SDK_VERSION = 1090
+underlineStyle = NSUnderlineStyleSingle;
+#else
underlineStyle = NSSingleUnderlineStyle;
+#endif
}
return underlineStyle;
}
@@ -218,7 +226,11 @@ using namespace ::rtl;
if ( property.Value.hasValue() ) {
if ( property.Name.equals ( attrUnderline ) ) {
int style = [ AquaA11yTextAttributesWrapper
convertUnderlineStyle: property ];
+#if MACOSX_SDK_VERSION = 1090
+if ( style != NSUnderlineStyleNone ) {
+#else
if ( style != NSNoUnderlineStyle ) {
+#endif
[ string addAttribute:
NSAccessibilityUnderlineTextAttribute value: [ NSNumber numberWithInt: style ]
range: range ];
}
} else if ( property.Name.equals ( attrFontname ) ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - desktop/source include/LibreOfficeKit smoketest/libtest.cxx
desktop/source/lib/init.cxx |4 ++--
include/LibreOfficeKit/LibreOfficeKit.h |9 +
include/LibreOfficeKit/LibreOfficeKit.hxx |8
smoketest/libtest.cxx | 12 +++-
4 files changed, 26 insertions(+), 7 deletions(-)
New commits:
commit 202dac6e20f75e87edab3368bb0882d59494d864
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Jun 12 13:28:26 2014 +0100
liblok: check new methods via macros on nSize, not by de-referencing.
We can't check for NULL from beyond the end of a smaller structure.
Change-Id: Id3754bf747c402cf0d767eda5fd4b5ad6b5789e9
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index 97acbab..657c16c 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -18,6 +18,13 @@ extern C
typedef struct _LibreOfficeKit LibreOfficeKit;
typedef struct _LibreOfficeKitDocument LibreOfficeKitDocument;
+// Do we have an extended member in this struct ?
+#define LIBREOFFICEKIT_HAS_MEMBER(strct,member,nSize) \
+int)((unsigned char *)((strct *) 0)-member) + \
+ (int)sizeof ((strct *) 0)-member)) = (nSize))
+
+#define LIBREOFFICEKIT_HAS(pKit,member)
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKit,member,(pKit)-nSize)
+
struct _LibreOfficeKit
{
int nSize;
@@ -28,6 +35,8 @@ struct _LibreOfficeKit
char* (*getError) (LibreOfficeKit *pThis);
};
+#define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member)
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocument,member,(pDoc)-nSize)
+
struct _LibreOfficeKitDocument
{
int nSize;
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 956e3cb..ec11313 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -45,11 +45,12 @@ public:
inline bool saveAsWithOptions(const char* pUrl, const char* pFormat =
NULL, const char* pFilterOptions = NULL)
{
// available since LibreOffice 4.3
-if (!mpDoc-saveAsWithOptions)
+if (!LIBREOFFICEKIT_DOCUMENT_HAS(mpDoc, saveAsWithOptions))
return false;
return mpDoc-saveAsWithOptions(mpDoc, pUrl, pFormat, pFilterOptions);
}
+inline LibreOfficeKitDocument *get() { return mpDoc; }
};
class Office
diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
index 07a13ec..2316b8c 100644
--- a/smoketest/libtest.cxx
+++ b/smoketest/libtest.cxx
@@ -75,6 +75,16 @@ int main (int argc, char **argv)
return -1;
}
+if (!LIBREOFFICEKIT_DOCUMENT_HAS(pDocument-get(), saveAsWithOptions))
+{
+fprintf( stderr, using obsolete LibreOffice %d + %d vs. %d\n,
+ (int)((unsigned char *)((LibreOfficeKitDocument *)
0)-saveAsWithOptions),
+ (int)sizeof ((LibreOfficeKitDocument *) 0)-saveAsWithOptions,
+ pDocument-get()-nSize );
+return -1;
+}
+
+
end = getTimeMS();
fprintf( stderr, load time: %ld ms\n, (end-start) );
start = end;
commit 4ed5bacc86e0137d9ace5a2ceda09c2393716793
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Jun 12 13:27:27 2014 +0100
liblok: set the size for the correct structure.
Change-Id: Id79d76893bfc931334afd59b05ab96a31e441e02
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 512cfb3..af812c6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -155,7 +155,7 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument
LibLODocument_Impl(const uno::Reference css::lang::XComponent
xComponent) :
mxComponent( xComponent )
{
-nSize = sizeof(LibreOfficeKit);
+nSize = sizeof(LibreOfficeKitDocument);
destroy = doc_destroy;
saveAs = doc_saveAs;
@@ -185,7 +185,7 @@ struct LibLibreOffice_Impl : public _LibreOfficeKit
LibLibreOffice_Impl()
{
-nSize = sizeof(LibreOfficeKitDocument);
+nSize = sizeof(LibreOfficeKit);
destroy = lo_destroy;
initialize = lo_initialize;
commit f24f4f92ee37401abf117f5cf3a8a224f39214aa
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Jun 11 15:37:17 2014 +0100
Complete LibreOfficeKit C++ renaming.
Change-Id: Ice611cf5913051346a3a0c0b00ed35a35a0dfe3c
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index c3da497..956e3cb 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -87,9 +87,7 @@ public:
}
};
-}
-
-inline ::lok::Office* lo_cpp_init(const char* pInstallPath)
+inline Office* lok_cpp_init(const char* pInstallPath)
{
LibreOfficeKit* pThis = lok_init(pInstallPath);
if (pThis == NULL || pThis-nSize == 0)
@@ -97,5 +95,6 @@ inline ::lok::Office* lo_cpp_init(const char* pInstallPath)
return new
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/osx
vcl/osx/a11ytextattributeswrapper.mm | 12
1 file changed, 12 insertions(+)
New commits:
commit f3c81c8352185079670e90f85094bdbcce069b5f
Author: rbuj robert@gmail.com
Date: Wed Jun 11 19:56:21 2014 +0200
'NSNoUnderlineStyle' âNSSingleUnderlineStyleâ: Deprecated in OS X 10.9
Change-Id: Id25d27f77c43c5fa11ff03aa38edcaec762caf61
Reviewed-on: https://gerrit.libreoffice.org/9739
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/osx/a11ytextattributeswrapper.mm
b/vcl/osx/a11ytextattributeswrapper.mm
index e129ac92..12497bb 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -107,12 +107,20 @@ using namespace ::rtl;
@implementation AquaA11yTextAttributesWrapper : NSObject
+(int)convertUnderlineStyle:(PropertyValue)property {
+#if MACOSX_SDK_VERSION = 1090
+int underlineStyle = NSUnderlineStyleNone;
+#else
int underlineStyle = NSNoUnderlineStyle;
+#endif
sal_Int16 value = 0;
property.Value = value;
if ( value != ::css_awt::FontUnderline::NONE
value != ::css_awt::FontUnderline::DONTKNOW) {
+#if MACOSX_SDK_VERSION = 1090
+underlineStyle = NSUnderlineStyleSingle;
+#else
underlineStyle = NSSingleUnderlineStyle;
+#endif
}
return underlineStyle;
}
@@ -218,7 +226,11 @@ using namespace ::rtl;
if ( property.Value.hasValue() ) {
if ( property.Name.equals ( attrUnderline ) ) {
int style = [ AquaA11yTextAttributesWrapper
convertUnderlineStyle: property ];
+#if MACOSX_SDK_VERSION = 1090
+if ( style != NSUnderlineStyleNone ) {
+#else
if ( style != NSNoUnderlineStyle ) {
+#endif
[ string addAttribute:
NSAccessibilityUnderlineTextAttribute value: [ NSNumber numberWithInt: style ]
range: range ];
}
} else if ( property.Name.equals ( attrFontname ) ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-24'
Tag 'suse-4.0-24' created by Andras Timar andras.ti...@collabora.com at 2014-06-12 14:08 -0700 suse-4.0-24 Changes since suse-4.0-23-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-24'
Tag 'suse-4.0-24' created by Andras Timar andras.ti...@collabora.com at 2014-06-12 14:08 -0700 suse-4.0-24 Changes since suse-4.0-22-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-24'
Tag 'suse-4.0-24' created by Andras Timar andras.ti...@collabora.com at 2014-06-12 14:08 -0700 suse-4.0-24 Changes since suse-4.0-22-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-24'
Tag 'suse-4.0-24' created by Andras Timar andras.ti...@collabora.com at 2014-06-12 14:08 -0700 suse-4.0-24 Changes since suse-4.0-22-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Marina Latini mar...@studiostorti.com changed: What|Removed |Added Depends on||63483 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/drawdoc.hxx |7 +--
sd/source/core/drawdoc.cxx |7 ++-
sd/source/ui/slidesorter/controller/SlsClipboard.cxx |5 ++---
3 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit b9daf7cacdcabff937d06f0f45c3daf2380bd888
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 12 13:59:07 2014 +0100
coverity#735840 Unchecked dynamic_cast
Change-Id: I3c772ec30360103f569b34e7c83f65b469eb5be8
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 6310fe3..f27df32 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -212,9 +212,12 @@ public:
SdDrawDocument(DocumentType eType, SfxObjectShell*
pDocSh);
virtual ~SdDrawDocument();
-virtual SdrModel* AllocModel() const SAL_OVERRIDE;
-virtual SdrPage*AllocPage(bool bMasterPage) SAL_OVERRIDE;
+SdDrawDocument* AllocSdDrawDocument() const;
+virtual SdrModel* AllocModel() const SAL_OVERRIDE; //forwards to
AllocSdDrawDocument
+
SdPage* AllocSdPage(bool bMasterPage);
+virtual SdrPage*AllocPage(bool bMasterPage) SAL_OVERRIDE; //forwards
to AllocSdPage
+
virtual boolIsReadOnly() const SAL_OVERRIDE;
virtual voidSetChanged(bool bFlag = true) SAL_OVERRIDE;
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 957f946..3a08a8d 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -434,10 +434,15 @@ SdDrawDocument::~SdDrawDocument()
mpCharClass = NULL;
}
+SdrModel* SdDrawDocument::AllocModel() const
+{
+return AllocSdDrawDocument();
+}
+
// This method creates a new document (SdDrawDocument) and returns a pointer to
// said document. The drawing engine uses this method to put the document (or
// parts of it) into the clipboard/DragServer.
-SdrModel* SdDrawDocument::AllocModel() const
+SdDrawDocument* SdDrawDocument::AllocSdDrawDocument() const
{
SdDrawDocument* pNewModel = NULL;
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index e2cde15..d323817 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -467,7 +467,7 @@ void Clipboard::CreateSlideTransferable (
SD_MOD()-pTransferClip = pTransferable;
pDocument-CreatingDataObj (pTransferable);
-pTransferable-SetWorkDocument(
dynamic_castSdDrawDocument*(pDocument-AllocModel()) );
+pTransferable-SetWorkDocument(pDocument-AllocSdDrawDocument());
pDocument-CreatingDataObj (NULL);
TransferableObjectDescriptor aObjDesc;
pTransferable-GetWorkDocument()-GetDocSh()
@@ -573,8 +573,7 @@ void Clipboard::CreateSlideTransferable (
new TransferableData(
pSlideSorterViewShell,
aRepresentatives));
-pTransferable-SetWorkDocument( dynamic_castSdDrawDocument*(
-pTreeListBoxTransferable-GetSourceDoc()-AllocModel()));
+
pTransferable-SetWorkDocument(pTreeListBoxTransferable-GetSourceDoc()-AllocSdDrawDocument());
//pTransferable-SetView(mrSlideSorter.GetView());
// Set page bookmark list.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/sdr/contact/viewcontactofunocontrol.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 15a4ad716c169f8502a4156238a3e79a9d7b7319
Author: David Tardon dtar...@redhat.com
Date: Thu Jun 12 12:10:33 2014 +0200
fdo#79883 the page view object contact must exist
Change-Id: I5c6bd3ea267f1ea84b46e46aa508a27d00903347
(cherry picked from commit 551c915dcbf3e1d6bfd799c6e13e5700e2c3e535)
Reviewed-on: https://gerrit.libreoffice.org/9747
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 08f1100..98b4243 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -106,10 +106,13 @@ namespace sdr { namespace contact {
{
// print or print preview requires special handling
const OutputDevice* pDevice = _rObjectContact.TryToGetOutputDevice();
-bool bPrintOrPreview = ( pDevice != NULL ) (
pDevice-GetOutDevType() == OUTDEV_PRINTER );
+ObjectContactOfPageView* const pPageViewContact = dynamic_cast
ObjectContactOfPageView* ( _rObjectContact );
-ObjectContactOfPageView* pPageViewContact = dynamic_cast
ObjectContactOfPageView* ( _rObjectContact );
-bPrintOrPreview |= ( pPageViewContact != NULL )
pPageViewContact-GetPageWindow().GetPageView().GetView().IsPrintPreview();
+const bool bPrintOrPreview = pPageViewContact
+ ( ( ( pDevice != NULL ) ( pDevice-GetOutDevType() ==
OUTDEV_PRINTER ) )
+||
pPageViewContact-GetPageWindow().GetPageView().GetView().IsPrintPreview()
+ )
+;
if ( bPrintOrPreview )
return *new UnoControlPrintOrPreviewContact( *pPageViewContact,
*this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dochdl/swdtflvr.cxx |2 +-
sw/source/uibase/inc/uitool.hxx |2 +-
sw/source/uibase/uiview/view.cxx |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 3c19e4a3b29b044ed01c9d4b64cd0def883f83d1
Author: Jan Kantert jan...@kantert.net
Date: Thu Jun 12 10:13:22 2014 +0200
translate comments in uibase
Change-Id: I1a187426ae41b9398c062f3c4998363b073e80f1
Reviewed-on: https://gerrit.libreoffice.org/9744
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 1ada150..2b7124f 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -416,7 +416,7 @@ bool SwTransferable::GetData( const DataFlavor rFlavor )
// the fallback and just try to get a graphic
const bool bPending(pWrtShell-BasicActionPend());
-// SEL_GRF kommt vom ContentType der editsh
+// SEL_GRF is from ContentType of editsh
if(bPending || ((nsSelectionType::SEL_GRF |
nsSelectionType::SEL_DRW_FORM) nSelectionType))
{
pClpGraphic = new Graphic;
diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx
index 3680cb0..1bfc6c8 100644
--- a/sw/source/uibase/inc/uitool.hxx
+++ b/sw/source/uibase/inc/uitool.hxx
@@ -88,7 +88,7 @@ voidSetDfltMetric(FieldUnit eMetric, bool bWeb);
SW_DLLPUBLIC bool HasCharUnit( bool bWeb );
void SetApplyCharUnit(bool bApplyChar, bool bWeb);
-// ListBox mit allen Zeichenvorlagen fuellen - ausser Standard!
+// fill ListBox with all char style templates, except the standard ones
SW_DLLPUBLIC void FillCharStyleListBox(ListBox rToFill, SwDocShell* pDocSh,
bool bSorted = false, bool bWithDefault = false);
//inserts a string sorted into a ListBox,
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 7ab26cf..37060cc 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1033,9 +1033,9 @@ SwView::~SwView()
m_pPostItMgr = 0;
m_bInDtor = true;
-m_pEditWin-Hide(); // damit kein Paint Aerger machen kann!
-// An der SwDocShell den Pointer auf die View ruecksetzen
+m_pEditWin-Hide(); // prevent problems with painting
+// Set pointer in SwDocShell to the view again
SwDocShell* pDocSh = GetDocShell();
if( pDocSh pDocSh-GetView() == this )
pDocSh-SetView( 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db67702eb3ae2b353da0a2bc144be77c997039c8 Author: Baptiste Daroussin b...@freebsd.org Date: Thu Jun 12 15:09:02 2014 +0200 redland = 1.0.16 is required not 1.16 Change-Id: I92e7e6a1b871c3cefc5aca39d32b6837e624c157 Reviewed-on: https://gerrit.libreoffice.org/9752 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/configure.ac b/configure.ac index 7b73434..298aa3c 100644 --- a/configure.ac +++ b/configure.ac @@ -9452,7 +9452,7 @@ libo_CHECK_SYSTEM_MODULE([redland],[REDLAND],[redland = 1.0.8 raptor2 = 2.0.7] if test $with_system_redland = yes; then libo_MINGW_CHECK_DLL([librdf]) AC_CHECK_LIB([rdf], [librdf_world_set_raptor_init_handler], [:], -[AC_MSG_ERROR(librdf too old. Need = 1.16)], []) +[AC_MSG_ERROR(librdf too old. Need = 1.0.16)], []) libo_MINGW_TRY_DLL([libraptor]) libo_MINGW_TRY_DLL([librasqal]) libo_MINGW_TRY_DLL([libsqlite3]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source sd/qa
oox/source/drawingml/textbodyproperties.cxx |6 +--
oox/source/drawingml/transform2dcontext.cxx | 56 +++-
sd/qa/unit/data/pptx/bnc862510_5.pptx |binary
sd/qa/unit/import-tests.cxx | 23 +++
4 files changed, 57 insertions(+), 28 deletions(-)
New commits:
commit b56c4afb219c3ad2507af9d4eadf0c765c3bc0e0
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Jun 10 18:19:30 2014 +0200
Related bnc#862510: extend handling of txXfrm
We don't actually need to check mbAnchorCtr to change
text spacing. This txXfrm workaround works only with rectangles,
because other shapes' text area can be smaller then the shape
size. So add some condition to avoid using it for
other shapes.
Plus fix typos cause regression introduced in:
53c376d35b7223d53e8c9403390afe53d1f69089
(cherry picked from commit 98dd0f2bb5801f974374ef341037e094e4275cbb)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I87917b8e0b2bb97ae1bba773e7dda7f81682736f
Reviewed-on: https://gerrit.libreoffice.org/9728
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/oox/source/drawingml/textbodyproperties.cxx
b/oox/source/drawingml/textbodyproperties.cxx
index 3861ebe..93a2f5f 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -80,9 +80,9 @@ void TextBodyProperties::pushRotationAdjustments( sal_Int32
nRotation )
// Hack for n#760986
// TODO: Preferred method would be to have a textbox on top
// of the shape and the place it according to the (off,ext)
-if( nOff == 0 moTextOffLeft mbAnchorCtr ) nVal = *moTextOffLeft;
-if( nOff == 1 moTextOffUpper ) nVal = *moTextOffLeft;
-if( nOff == 2 moTextOffRight mbAnchorCtr ) nVal =
*moTextOffRight;
+if( nOff == 0 moTextOffLeft ) nVal = *moTextOffLeft;
+if( nOff == 1 moTextOffUpper ) nVal = *moTextOffUpper;
+if( nOff == 2 moTextOffRight ) nVal = *moTextOffRight;
if( nOff == 3 moTextOffLower ) nVal = *moTextOffLower;
if( nVal 0 ) nVal = 0;
diff --git a/oox/source/drawingml/transform2dcontext.cxx
b/oox/source/drawingml/transform2dcontext.cxx
index 92166c4..0064780 100644
--- a/oox/source/drawingml/transform2dcontext.cxx
+++ b/oox/source/drawingml/transform2dcontext.cxx
@@ -55,37 +55,43 @@ ContextHandlerRef Transform2DContext::onCreateContext(
sal_Int32 aElementToken,
{
if( mbtxXfrm )
{
-switch( aElementToken )
+// Workaround: only for rectangles
+const sal_Int32 nType =
mrShape.getCustomShapeProperties()-getShapePresetType();
+if( nType == XML_rect || nType == XML_roundRect )
{
-case A_TOKEN( off ):
-{
-OUString sXValue = rAttribs.getString( XML_x ).get();
-OUString sYValue = rAttribs.getString( XML_y ).get();
-if( !sXValue.isEmpty() )
-
mrShape.getTextBody()-getTextProperties().moTextOffUpper = GetCoordinate(
sXValue.toInt32() - mrShape.getPosition().X );
-if( !sYValue.isEmpty() )
-
mrShape.getTextBody()-getTextProperties().moTextOffLeft = GetCoordinate(
sYValue.toInt32() - mrShape.getPosition().Y );
-}
-break;
-case A_TOKEN( ext ):
-{
-const OUString sXValue = rAttribs.getString( XML_cx
).get();
-const OUString sYValue = rAttribs.getString( XML_cy
).get();
-if( !sXValue.isEmpty() )
+switch( aElementToken )
+{
+case A_TOKEN( off ):
{
-
mrShape.getTextBody()-getTextProperties().moTextOffRight =
GetCoordinate(mrShape.getSize().Width - sXValue.toInt32());
-if(
mrShape.getTextBody()-getTextProperties().moTextOffLeft )
-
*mrShape.getTextBody()-getTextProperties().moTextOffRight -=
*mrShape.getTextBody()-getTextProperties().moTextOffLeft;
+const OUString sXValue = rAttribs.getString( XML_x
).get();
+const OUString sYValue = rAttribs.getString( XML_y
).get();
+if( !sXValue.isEmpty() nType == XML_rect )
+
mrShape.getTextBody()-getTextProperties().moTextOffLeft = GetCoordinate(
sXValue.toInt32() - mrShape.getPosition().X );
+if( !sYValue.isEmpty() )
+
mrShape.getTextBody()-getTextProperties().moTextOffUpper = GetCoordinate(
sYValue.toInt32() - mrShape.getPosition().Y );
}
-if( !sYValue.isEmpty() )
+break;
+case A_TOKEN( ext ):
{
-
[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/unolingu.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 5c961fa9ea771572c262fe06ced8e6bda42f60e8
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 15:19:41 2014 +0200
Missing SolarMutexGuard
...the non-mutex'ed access to the static LinguMgr members from other
functions
makes it look like those are all assumed to be called with SolarMutex
locked;
but that does not hold for calls to LinguMgrAppExitLstnr::disposing.
Change-Id: I225a9f7ace65774460502a4aa510abddd48d12ca
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index c98718b..e9c087b 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -45,6 +45,7 @@
#include ucbhelper/commandenvironment.hxx
#include ucbhelper/content.hxx
#include vcl/msgbox.hxx
+#include vcl/svapp.hxx
#include tools/shl.hxx
#include linguistic/misc.hxx
#include editeng/eerdll.hxx
@@ -490,6 +491,8 @@ public:
void LinguMgrExitLstnr::AtExit()
{
+SolarMutexGuard g;
+
// release references
LinguMgr::xLngSvcMgr= 0;
LinguMgr::xSpell= 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - filter/source
filter/source/graphicfilter/ipict/ipict.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 921c9e1a269cc2b34cfd230f73f3c2350204fde8 Author: Jan Holesovsky ke...@collabora.com Date: Tue Jun 10 17:13:38 2014 +0200 pct import: Reset clip region before closing the metafile. Otherwise parts of the image are missing. Change-Id: If9018c32807359862a9be825b0ebdaacce2d3490 diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 3cbf4a2..64f998e 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1860,6 +1860,7 @@ void PictReader::ReadPict( SvStream rStreamPict, GDIMetaFile rGDIMetaFile ) pPict-Seek(nPos); } +pVirDev-SetClipRegion(); rGDIMetaFile.Stop(); delete pVirDev; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - filter/source
filter/source/graphicfilter/ipict/ipict.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ec2b9de03d25ed8a3e2cbf4fbbc21c5ff81f0b27 Author: Jan Holesovsky ke...@collabora.com Date: Tue Jun 10 17:13:38 2014 +0200 pct import: Reset clip region before closing the metafile. Otherwise parts of the image are missing. Change-Id: If9018c32807359862a9be825b0ebdaacce2d3490 diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index f1903e9..a78f9bc 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1852,6 +1852,7 @@ void PictReader::ReadPict( SvStream rStreamPict, GDIMetaFile rGDIMetaFile ) pPict-Seek(nPos); } +pVirDev-SetClipRegion(); rGDIMetaFile.Stop(); delete pVirDev; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/unolingu.cxx | 25 +
1 file changed, 9 insertions(+), 16 deletions(-)
New commits:
commit 4e2cc748f5ec00ef6ed326ec03aff8f0cd8c9654
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 15:26:06 2014 +0200
Clean up
Change-Id: I3fc017fb5ef1fe704d273d667405eee588fa35cb
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index e9c087b..049e71d 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -432,26 +432,25 @@ uno::Reference linguistic2::XPossibleHyphens SAL_CALL
}
-typedef cppu::WeakImplHelper1 XEventListener LinguMgrAppExitLstnrBaseClass;
+typedef cppu::WeakImplHelper1 XEventListener LinguMgrExitLstnrBaseClass;
-class LinguMgrAppExitLstnr : public LinguMgrAppExitLstnrBaseClass
+class LinguMgrExitLstnr : public LinguMgrExitLstnrBaseClass
{
uno::Reference XDesktop2 xDesktop;
-public:
-LinguMgrAppExitLstnr();
-virtual ~LinguMgrAppExitLstnr();
-
-virtual voidAtExit() = 0;
+void AtExit();
+public:
+LinguMgrExitLstnr();
+virtual ~LinguMgrExitLstnr();
// lang::XEventListener
virtual voidSAL_CALL disposing(const EventObject rSource)
throw( RuntimeException, std::exception ) SAL_OVERRIDE;
};
-LinguMgrAppExitLstnr::LinguMgrAppExitLstnr()
+LinguMgrExitLstnr::LinguMgrExitLstnr()
{
// add object to frame::Desktop EventListeners in order to properly call
// the AtExit function at appliction exit.
@@ -461,7 +460,7 @@ LinguMgrAppExitLstnr::LinguMgrAppExitLstnr()
xDesktop-addEventListener( this );
}
-LinguMgrAppExitLstnr::~LinguMgrAppExitLstnr()
+LinguMgrExitLstnr::~LinguMgrExitLstnr()
{
if (xDesktop.is())
{
@@ -471,7 +470,7 @@ LinguMgrAppExitLstnr::~LinguMgrAppExitLstnr()
OSL_ENSURE(!xDesktop.is(), reference to desktop should be realeased);
}
-void LinguMgrAppExitLstnr::disposing(const EventObject rSource)
+void LinguMgrExitLstnr::disposing(const EventObject rSource)
throw( RuntimeException, std::exception )
{
if (xDesktop.is()rSource.Source == xDesktop)
@@ -483,12 +482,6 @@ void LinguMgrAppExitLstnr::disposing(const EventObject
rSource)
}
}
-class LinguMgrExitLstnr : public LinguMgrAppExitLstnr
-{
-public:
-virtual voidAtExit() SAL_OVERRIDE;
-};
-
void LinguMgrExitLstnr::AtExit()
{
SolarMutexGuard g;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'refs/tags/cp-4.0-24' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'refs/tags/cp-4.0-24' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.0-24'
Tag 'cp-4.0-24' created by Andras Timar andras.ti...@collabora.com at 2014-06-12 14:31 -0700 cp-4.0-24 Changes since suse-4.0-22-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.0-24'
Tag 'cp-4.0-24' created by Andras Timar andras.ti...@collabora.com at 2014-06-12 14:31 -0700 cp-4.0-24 Changes since suse-4.0-22-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 80b6b175f438dd56f6c107d956e6c00876ff3dba
Author: Michael Stahl mst...@redhat.com
Date: Thu Jun 12 12:04:01 2014 +0200
related: fdo#77979: writerfilter RTF import: read encoded font name
The font name is encoded in the font's charset given by \fcharset.
(cherry picked from commit 04d5a280beeeb6e056df68395dc9c3b3a674361b)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
(cherry picked from commit 790df682574eb4b3da9a973c3116b54d7666837c)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: Id9520649a1eb3b55f4314e140abda7399f23d925
Reviewed-on: https://gerrit.libreoffice.org/9749
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 920b19f..67285b0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -967,10 +967,6 @@ int RTFDocumentImpl::resolveChars(char ch)
if (RTL_TEXTENCODING_MS_932 == m_aStates.top().nCurrentEncoding)
{
-// fdo#79384: Word will reject Shift-JIS following \loch
-// but apparently OOo could read and (worse) write such documents
-SAL_INFO_IF(m_aStates.top().eRunType != RTFParserState::DBCH,
-writerfilter.rtftok, invalid Shift-JIS without DBCH);
unsigned char uch = ch;
if ((uch = 0x80 uch = 0x9F) || uch = 0xE0)
{
@@ -978,6 +974,9 @@ int RTFDocumentImpl::resolveChars(char ch)
Strm() ch;
if (m_aStates.top().nCharsToSkip == 0)
{
+// fdo#79384: Word will reject Shift-JIS following \loch
+// but apparently OOo could read and (worse) write such
documents
+SAL_INFO_IF(m_aStates.top().eRunType !=
RTFParserState::DBCH, writerfilter.rtf, invalid Shift-JIS without DBCH);
assert(bUnicodeChecked);
aBuf.append(ch);
}
@@ -3254,6 +3253,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
return 0;
m_aFontEncodings[m_nCurrentFontIndex] =
rtl_getTextEncodingFromWindowsCodePage(aRTFEncodings[i].codepage);
+m_aStates.top().nCurrentEncoding =
m_aFontEncodings[m_nCurrentFontIndex];
}
break;
case RTF_ANSICPG:
@@ -3264,6 +3264,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
break;
case RTF_CPG:
m_aFontEncodings[m_nCurrentFontIndex] =
rtl_getTextEncodingFromWindowsCodePage(nParam);
+m_aStates.top().nCurrentEncoding =
m_aFontEncodings[m_nCurrentFontIndex];
break;
case RTF_CF:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 809c8d4c990e77cd8ba52672be7c5e77aae4e90e
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 15:34:49 2014 +0200
Spell out UTF-8
Change-Id: Iea5f79fb12ac86d4348f46f8ad93a13aaf0f7eb6
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index ce91526..0c78227 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -320,7 +320,7 @@ DECLARE_RTFEXPORT_TEST(testMathRuns, math-runs.rtf)
DECLARE_RTFEXPORT_TEST(testFdo77979, fdo77979.odt)
{
// font name is encoded with \fcharset of font
-CPPUNIT_ASSERT_EQUAL(OUString(微软é
é», 12, RTL_TEXTENCODING_UTF8),
+
CPPUNIT_ASSERT_EQUAL(OUString(\xE5\xBE\xAE\xE8\xBD\xAF\xE9\x9B\x85\xE9\xBB\x91,
12, RTL_TEXTENCODING_UTF8),
getPropertyOUString(getRun(getParagraph(1), 1), CharFontName));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'refs/tags/cp-4.0-24' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/tags/cp-4.0-24' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/unolingu.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 4348dfbd4ab73c151fbd45c7066886530498ec0b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 15:28:00 2014 +0200
Clean up
Change-Id: I14ababd3adb39cbde0ae3b5622b21fe72eb06ad9
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 049e71d..516d9ca 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -431,11 +431,7 @@ uno::Reference linguistic2::XPossibleHyphens SAL_CALL
return xRes;
}
-
-typedef cppu::WeakImplHelper1 XEventListener LinguMgrExitLstnrBaseClass;
-
-
-class LinguMgrExitLstnr : public LinguMgrExitLstnrBaseClass
+class LinguMgrExitLstnr : public cppu::WeakImplHelper1XEventListener
{
uno::Reference XDesktop2 xDesktop;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.0-24'
Tag 'cp-4.0-24' created by Andras Timar andras.ti...@collabora.com at 2014-06-12 14:31 -0700 cp-4.0-24 Changes since cp-4.0-23-16: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/chrdlg/swuiccoll.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 53dae3d919651fa07e5b84dbf8c069bd87fea741
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 15:45:46 2014 +0200
warning C4138: '*/' found outside of comment
Change-Id: I5209538e50ca92a2993520fa68446f5287771d93
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx
b/sw/source/ui/chrdlg/swuiccoll.cxx
index 7822bc8..fba4336 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -155,7 +155,7 @@ bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
return bModified;
}
-void SwCondCollPage::Reset(const SfxItemSet */*rSet*/)
+void SwCondCollPage::Reset(const SfxItemSet *)
{
if(bNewTemplate)
m_pConditionCB-Enable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/rtfexport/data/fdo77979.odt|binary
sw/qa/extras/rtfexport/rtfexport.cxx|7
sw/source/filter/inc/msfilter.hxx | 12 +-
sw/source/filter/ww8/rtfattributeoutput.cxx | 20 +--
sw/source/filter/ww8/writerwordglue.cxx | 49
sw/source/filter/ww8/wrtw8sty.cxx |3 +
6 files changed, 85 insertions(+), 6 deletions(-)
New commits:
commit 8f80cde668b50c939aeff0d98a3e67c362df1fd4
Author: Michael Stahl mst...@redhat.com
Date: Thu Jun 12 12:16:28 2014 +0200
fdo#77979: sw: RTF export: write non-ASCII font names encoded
Currently font names like 微软é
é» (Microsoft YaHei) are
written as in the RTF export; to avoid that, set the \fcharset
of the font entry to something that at least is able to encode
the font name and alternate name.
This requires a new function since the existing
rtl_TextEncodingToWinCharset was changed in
b88fe998ce8c80d7629fe70118311096615d959d to return default 0x01
(for OOXML) which is quite unhelpful for RTF.
This is not entirely satisfactory, as of course that is no guarantee
that the encoding can represent all of the actual text that has the
font applied; hence there are some \'3f in the fall-back encoded text
of the heading of the bugdoc, which indicates that the detected
Shift-JIS is insufficient and GB-2132 would be required; but it's not
obvious how to do better here without iterating over all the text
twice, and that still leaves the possibility that all text that has a
particular font applied cannot be represented by a single non-Unicode
encoding.
But since we always write text as the \u Unicode + legacy fall-back,
this should not be a big problem since modern RTF readers will simply
read the Unicode.
(cherry picked from commit e47a02b1524061143d8e77a54eb95c77f2e6dae2)
fdo#77979: argh forgot to add the test document
(cherry picked from commit 90b2b378aecfa1914be0ce9aa7aa4e006e225e96)
(cherry picked from commit 276fb59ee66806709382d0eeef20f62a094a5995)
error C2361: initialization of 's_fallbacks' is skipped by 'default'
(cherry picked from commit f3695bbc17a547b547876dd1175c0b74e5b3e90e)
Conflicts:
sw/source/filter/ww8/rtfattributeoutput.cxx
Spell out UTF-8
(cherry picked from commit 809c8d4c990e77cd8ba52672be7c5e77aae4e90e)
Change-Id: Ie6a42294c501d014dd9f0df82638519412ca19bb
Reviewed-on: https://gerrit.libreoffice.org/9750
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/rtfexport/data/fdo77979.odt
b/sw/qa/extras/rtfexport/data/fdo77979.odt
new file mode 100644
index 000..532724c
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/fdo77979.odt differ
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index d58e200..a3fb2cb 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -306,6 +306,13 @@ DECLARE_RTFEXPORT_TEST(testMathRuns, math-runs.rtf)
CPPUNIT_ASSERT_EQUAL(OUString(\\{ left [ right ] left ( right ) \\}),
getFormula(getRun(getParagraph(1), 1)));
}
+DECLARE_RTFEXPORT_TEST(testFdo77979, fdo77979.odt)
+{
+// font name is encoded with \fcharset of font
+
CPPUNIT_ASSERT_EQUAL(OUString(\xE5\xBE\xAE\xE8\xBD\xAF\xE9\x9B\x85\xE9\xBB\x91,
12, RTL_TEXTENCODING_UTF8),
+getPropertyOUString(getRun(getParagraph(1), 1), CharFontName));
+}
+
DECLARE_RTFEXPORT_TEST(testFdo53113, fdo53113.odt)
{
/*
diff --git a/sw/source/filter/inc/msfilter.hxx
b/sw/source/filter/inc/msfilter.hxx
index 30a5997..0575252 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -59,8 +59,7 @@ namespace sw
{
/** MSOffice appears to set the charset of unicode fonts to MS 932
-Arial Unicode MS for example is a unicode font, but word sets
-exported uses of it to the MS 932 charset
+But we do default, whatever that means.
@param eTextEncoding
the OOo encoding to convert from
@@ -73,6 +72,15 @@ namespace sw
*/
sal_uInt8 rtl_TextEncodingToWinCharset(rtl_TextEncoding eTextEncoding);
+/** MSOffice appears to set the charset of unicode fonts to MS 932
+
+Arial Unicode MS for example is a unicode font, but word sets
+exported uses of it to the MS 932 charset
+
+*/
+sal_uInt8 rtl_TextEncodingToWinCharsetRTF(OUString const rFontName,
+OUString const rAltName, rtl_TextEncoding eTextEncoding);
+
/** Import a MSWord XE field. Suitable for .doc and .rtf
@param rDoc
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 3cf3b69..5844c0d 100644
---
[Libreoffice-commits] core.git: include/LibreOfficeKit smoketest/libtest.cxx
include/LibreOfficeKit/LibreOfficeKit.h |8
smoketest/libtest.cxx |7 ---
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 18c786cbcd45ee314bed6303c62e23ecf4022a8b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 12 14:28:17 2014 +0100
cast loses precision
Change-Id: Ic688f08cada4ae70ea1dfb1e29e249a166456452
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index 657c16c..43eb212 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -20,14 +20,14 @@ typedef struct _LibreOfficeKitDocument
LibreOfficeKitDocument;
// Do we have an extended member in this struct ?
#define LIBREOFFICEKIT_HAS_MEMBER(strct,member,nSize) \
-int)((unsigned char *)((strct *) 0)-member) + \
- (int)sizeof ((strct *) 0)-member)) = (nSize))
+size_t)((unsigned char *)((strct *) 0)-member) + \
+ sizeof ((strct *) 0)-member)) = (nSize))
#define LIBREOFFICEKIT_HAS(pKit,member)
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKit,member,(pKit)-nSize)
struct _LibreOfficeKit
{
- int nSize;
+ size_t nSize;
void(*destroy) (LibreOfficeKit *pThis);
int (*initialize)(LibreOfficeKit *pThis, const char
*pInstallPath);
@@ -39,7 +39,7 @@ struct _LibreOfficeKit
struct _LibreOfficeKitDocument
{
- int nSize;
+ size_t nSize;
void (*destroy) (LibreOfficeKitDocument* pThis);
int (*saveAs) (LibreOfficeKitDocument* pThis,
diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
index 2316b8c..51c184b 100644
--- a/smoketest/libtest.cxx
+++ b/smoketest/libtest.cxx
@@ -13,6 +13,7 @@
#include assert.h
#include math.h
#include sys/time.h
+#include sal/types.h
#include LibreOfficeKit/LibreOfficeKit.hxx
using namespace ::lok;
@@ -77,9 +78,9 @@ int main (int argc, char **argv)
if (!LIBREOFFICEKIT_DOCUMENT_HAS(pDocument-get(), saveAsWithOptions))
{
-fprintf( stderr, using obsolete LibreOffice %d + %d vs. %d\n,
- (int)((unsigned char *)((LibreOfficeKitDocument *)
0)-saveAsWithOptions),
- (int)sizeof ((LibreOfficeKitDocument *) 0)-saveAsWithOptions,
+fprintf( stderr, using obsolete LibreOffice % SAL_PRI_SIZET d + %
SAL_PRI_SIZET d vs. % SAL_PRI_SIZET d\n,
+ (size_t)((unsigned char *)((LibreOfficeKitDocument *)
0)-saveAsWithOptions),
+ sizeof ((LibreOfficeKitDocument *) 0)-saveAsWithOptions,
pDocument-get()-nSize );
return -1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.0-24'
Tag 'cp-4.0-24' created by Andras Timar andras.ti...@collabora.com at 2014-06-12 14:31 -0700 cp-4.0-24 Changes since suse-4.0-22-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source sfx2/inc sfx2/source
cui/source/options/optsave.cxx | 11 +++
cui/source/options/optsave.hrc |1 +
cui/source/options/optsave.hxx |1 +
cui/source/options/optsave.src | 25 -
cui/source/options/treeopt.cxx |1 +
sfx2/inc/sfx2/sfxsids.hrc |1 +
sfx2/source/appl/appcfg.cxx| 20
7 files changed, 51 insertions(+), 9 deletions(-)
New commits:
commit f5d074090c8cf24a27e610d1dc70e8d6af68cc88
Author: Jürgen Schmidt j...@apache.org
Date: Thu Jun 12 12:46:11 2014 +
#125083# add new checkbox in options dialog load/save-general to enable ODF
1.2 encryption AES-256
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 99d58e6..c71a1ee 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -178,6 +178,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const
SfxItemSet rCoreSet ) :
aDefaultFormatFL( this, CUI_RES( FL_FILTER ) ),
aODFVersionFT ( this, CUI_RES( FT_ODF_VERSION ) ),
aODFVersionLB ( this, CUI_RES( LB_ODF_VERSION ) ),
+aODFEncryptionCB( this, CUI_RES( BTN_ODFENCRYPTION ) ),
aSizeOptimizationCB ( this, CUI_RES( BTN_NOPRETTYPRINTING ) ),
aWarnAlienFormatCB ( this, CUI_RES( BTN_WARNALIENFORMAT ) ),
aDocTypeFT ( this, CUI_RES( FT_APP ) ),
@@ -384,6 +385,12 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet rSet )
bModified |= sal_True;
}
+if ( aODFEncryptionCB.IsChecked() != aODFEncryptionCB.GetSavedValue() )
+{
+rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_ODFENCRYPTION ),
aODFEncryptionCB.IsChecked() ) );
+bModified |= sal_True;
+}
+
if ( aSizeOptimizationCB.IsChecked() !=
aSizeOptimizationCB.GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PRETTYPRINTING ),
!aSizeOptimizationCB.IsChecked() ) );
@@ -596,6 +603,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet )
aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
//aAutoSaveCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE));
+// ODF encryption
+aODFEncryptionCB.Check( !aSaveOpt.IsUseSHA1InODF12());
+
// the pretty printing
aSizeOptimizationCB.Check( !aSaveOpt.IsPrettyPrinting());
//
aSizeOptimizationCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING
));
@@ -620,6 +630,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet )
aDocInfoCB.SaveValue();
aBackupCB.SaveValue();
aWarnAlienFormatCB.SaveValue();
+aODFEncryptionCB.SaveValue();
aSizeOptimizationCB.SaveValue();
aAutoSaveCB.SaveValue();
aAutoSaveEdit.SaveValue();
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
index a637f4a..e705793 100644
--- a/cui/source/options/optsave.hrc
+++ b/cui/source/options/optsave.hrc
@@ -40,6 +40,7 @@
#define BTN_WARNALIENFORMAT 22
#define FT_ODF_VERSION 23
#define LB_ODF_VERSION 24
+#define BTN_ODFENCRYPTION 25
#define GB_RELATIVE 40
#define BTN_RELATIVE_FSYS 41
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index a2e2c5d..cf5d7e4 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -66,6 +66,7 @@ private:
FixedLine aDefaultFormatFL;
FixedText aODFVersionFT;
ListBox aODFVersionLB;
+CheckBoxaODFEncryptionCB;
CheckBoxaSizeOptimizationCB;
CheckBoxaWarnAlienFormatCB;
FixedText aDocTypeFT;
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 4ab58c7..892cf7b 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -156,36 +156,43 @@ TabPage RID_SFXPAGE_SAVE
1.2 Extended (recommended); 0x7fff ; ;
};
};
+CheckBox BTN_ODFENCRYPTION
+{
+HelpID = cui:CheckBox:RID_SFXPAGE_SAVE:BTN_ODFENCRYPTION;
+Pos = MAP_APPFONT ( 12 , 120 ) ;
+Size = MAP_APPFONT ( 248 , 10 ) ;
+Text [ en-US ] = Enable AES-256 encryption (ODF 1.2) ;
+};
CheckBox BTN_NOPRETTYPRINTING
{
HelpID = cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING;
-Pos = MAP_APPFONT ( 12 , 120 ) ;
+Pos = MAP_APPFONT ( 12 , 131 ) ;
Size = MAP_APPFONT ( 248 , 10 ) ;
Text [ en-US ] = Size optimization for ODF format ;
};
CheckBox BTN_WARNALIENFORMAT
{
HelpID = cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT;
-Pos = MAP_APPFONT ( 12 , 131 ) ;
+Pos = MAP_APPFONT ( 12 , 142 ) ;
Size = MAP_APPFONT ( 248 , 10 ) ;
Text [ en-US ] = Warn when not saving in ODF or default format ;
};
FixedText FT_APP
{
-Pos = MAP_APPFONT ( 12 , 142 ) ;
+Pos = MAP_APPFONT ( 12 , 153 ) ;
Size = MAP_APPFONT ( 120 , 8 )
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/crossrefbookmark.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 7e88182f673900f214b855f1c9563e63ba43eaca
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 16:20:01 2014 +0200
Avoid must return a value warnings
Change-Id: I2b8ac2204ec4f47dcce033da18e31b8bb5285552
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx
b/sw/source/core/crsr/crossrefbookmark.cxx
index 6154e1c..89c5471 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+
+#include cstdlib
+
#include IDocumentMarkAccess.hxx
#include crossrefbookmark.hxx
#include ndtxt.hxx
@@ -59,7 +63,7 @@ namespace sw { namespace mark
OSL_PRECOND(false,
sw::mark::CrossRefBookmark::GetOtherMarkPos(..)
- this should never be called!);
-abort();
+for (;;) { std::abort(); } // avoid must return a value warnings
}
CrossRefHeadingBookmark::CrossRefHeadingBookmark(const SwPaM rPaM,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/vba/vbalistformat.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 0b36794425a559355362911ec79a3bd04d5598dd
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 12 11:15:55 2014 +0100
coverity#735985 Unchecked dynamic_cast
Change-Id: I1bb293567cf6e6437d1ac1f257b25d7de1d0ac75
diff --git a/sw/source/ui/vba/vbalistformat.cxx
b/sw/source/ui/vba/vbalistformat.cxx
index 9740758..78a498b 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -57,12 +57,15 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const
css::uno::Reference wor
if( nDefaultListBehavior !=
word::WdDefaultListBehavior::wdWord8ListBehavior )
throw uno::RuntimeException();
-SwVbaListTemplate* pListTemplate = dynamic_cast SwVbaListTemplate* (
ListTemplate.get() );
-
uno::Reference container::XEnumerationAccess xEnumAccess( mxTextRange,
uno::UNO_QUERY_THROW );
uno::Reference container::XEnumeration xEnum =
xEnumAccess-createEnumeration();
+if (!xEnum-hasMoreElements())
+return;
+
+SwVbaListTemplate rListTemplate =
dynamic_castSwVbaListTemplate(*ListTemplate.get());
+
bool isFirstElement = true;
-while( xEnum-hasMoreElements() )
+do
{
uno::Reference beans::XPropertySet xProps( xEnum-nextElement(),
uno::UNO_QUERY_THROW );
if( isFirstElement )
@@ -80,8 +83,9 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const
css::uno::Reference wor
{
xProps-setPropertyValue(ParaIsNumberingRestart, uno::makeAny(
sal_False ) );
}
-pListTemplate-applyListTemplate( xProps );
+rListTemplate.applyListTemplate( xProps );
}
+while( xEnum-hasMoreElements() );
}
void SAL_CALL SwVbaListFormat::ConvertNumbersToText( ) throw
(css::uno::RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dialog/docstdlg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c353153898c691dcd24b6f66153e9f8ec2d37eb0
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 12 16:49:38 2014 +0200
warning C4138: '*/' found outside of comment
Change-Id: I1485d646171b08f709767debfe583f90426d5dfd
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index e2154bf..1a70b77 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -82,7 +82,7 @@ bool SwDocStatPage::FillItemSet(SfxItemSet * /*rSet*/)
return false;
}
-void SwDocStatPage::Reset(const SfxItemSet */*rSet*/)
+void SwDocStatPage::Reset(const SfxItemSet *)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/conditionalformatdialog.ui | 38 1 file changed, 19 insertions(+), 19 deletions(-) New commits: commit 18518b994cd8fef7c46687167c8f26af18e49a15 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 12 15:56:57 2014 +0100 Put conditional add/remove buttons above the range selector... and left align them instead of centering. Change-Id: I3cbe25d8ba1c5a96ac12b4afd34b7db42837718f diff --git a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui index e4f4a21..41f6380 100644 --- a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui +++ b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=UTF-8? -!-- Generated with glade 3.16.0 on Mon Jan 13 14:42:10 2014 -- +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ !-- interface-requires LibreOffice 1.0 -- object class=GtkDialog id=ConditionalFormatDialog property name=can_focusFalse/property @@ -123,7 +123,21 @@ /object packing property name=left_attach0/property -property name=top_attach1/property +property name=top_attach2/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=sclo-ScCondFormatList id=list:border +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property + /object + packing +property name=left_attach0/property +property name=top_attach0/property property name=width1/property property name=height1/property /packing @@ -134,7 +148,7 @@ property name=can_focusFalse/property property name=hexpandTrue/property property name=spacing12/property -property name=layout_stylecenter/property +property name=layout_stylestart/property child object class=GtkButton id=add property name=labelgtk-add/property @@ -166,21 +180,7 @@ /object packing property name=left_attach0/property -property name=top_attach2/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=sclo-ScCondFormatList id=list:border -property name=visibleTrue/property -property name=can_focusTrue/property -property name=hexpandTrue/property -property name=vexpandTrue/property - /object - packing -property name=left_attach0/property -property name=top_attach0/property +property name=top_attach1/property property name=width1/property property name=height1/property /packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/uiconfig
sc/uiconfig/scalc/ui/conditionalformatdialog.ui | 38 1 file changed, 19 insertions(+), 19 deletions(-) New commits: commit 06842d1ce53a272e7a62aaad953fc9945e1f2dc2 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 12 15:56:57 2014 +0100 Put conditional add/remove buttons above the range selector... and left align them instead of centering. Change-Id: I3cbe25d8ba1c5a96ac12b4afd34b7db42837718f (cherry picked from commit 18518b994cd8fef7c46687167c8f26af18e49a15) diff --git a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui index e4f4a21..41f6380 100644 --- a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui +++ b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=UTF-8? -!-- Generated with glade 3.16.0 on Mon Jan 13 14:42:10 2014 -- +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ !-- interface-requires LibreOffice 1.0 -- object class=GtkDialog id=ConditionalFormatDialog property name=can_focusFalse/property @@ -123,7 +123,21 @@ /object packing property name=left_attach0/property -property name=top_attach1/property +property name=top_attach2/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=sclo-ScCondFormatList id=list:border +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property + /object + packing +property name=left_attach0/property +property name=top_attach0/property property name=width1/property property name=height1/property /packing @@ -134,7 +148,7 @@ property name=can_focusFalse/property property name=hexpandTrue/property property name=spacing12/property -property name=layout_stylecenter/property +property name=layout_stylestart/property child object class=GtkButton id=add property name=labelgtk-add/property @@ -166,21 +180,7 @@ /object packing property name=left_attach0/property -property name=top_attach2/property -property name=width1/property -property name=height1/property - /packing -/child -child - object class=sclo-ScCondFormatList id=list:border -property name=visibleTrue/property -property name=can_focusTrue/property -property name=hexpandTrue/property -property name=vexpandTrue/property - /object - packing -property name=left_attach0/property -property name=top_attach0/property +property name=top_attach1/property property name=width1/property property name=height1/property /packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
