LibreOffice Gerrit News for core on 2014-06-05
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#79256 Line Style with Long Dashes and dots is getting corrupt after R in https://gerrit.libreoffice.org/9559 from Dinesh Patil about module oox, sw End of freshness + Partial fix for bug 45071 - Remove NPAPI support in https://gerrit.libreoffice.org/9644 from Bryan Quigley about module build, extensions, external, postprocess, scp2 + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/9635 from Christina Roßmanith about module include, sw, tools * Merged changes on master for project core changed in the last 25 hours: + Fix comments in https://gerrit.libreoffice.org/9563 from Isamu Mogi + new loplugin: inlinesimpleaccessmethods in https://gerrit.libreoffice.org/9527 from Noel Grandin + Build default user AutoText file MyTexts.bau in https://gerrit.libreoffice.org/9639 from Laurent BP + Move AutoCorrection files to extras/source/autocorr in https://gerrit.libreoffice.org/9599 from Laurent BP + Be more sensible about checking buffers of VML points we write. in https://gerrit.libreoffice.org/9638 from Michael Meeks + fdo#79597 Password UI: correct typo for 1 character in https://gerrit.libreoffice.org/9631 from Laurent BP + fdo#78907 : File crashed while saving. in https://gerrit.libreoffice.org/9568 from Priyanka Gaikwad * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Upgrade public api of OfficeKit to use OfficeKit instead of LO/LibLO. in https://gerrit.libreoffice.org/9475 from Andrzej Hunt + Rename officekit-OfficeKit. in https://gerrit.libreoffice.org/9474 from Andrzej Hunt + Move liblibreoffice into officekit. in https://gerrit.libreoffice.org/9473 from Andrzej Hunt + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#78590: Fix for Corruption of para with framePr drawing object into in https://gerrit.libreoffice.org/9389 from Rohit Deshmukh + 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 + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + 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: include/sal
include/sal/types.h | 18 -- 1 file changed, 18 deletions(-) New commits: commit 06b63d3d83616e2abbd6f5ec93e1596988e455c2 Author: Noel Grandin n...@peralex.com Date: Thu Jun 5 08:34:46 2014 +0200 remove the definition of SAL_THROW macro Change-Id: I3d389174684cdc86ddb098629da57ebf142424c9 diff --git a/include/sal/types.h b/include/sal/types.h index c19673a..86c31c2 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -347,21 +347,6 @@ typedef struct _sal_Sequence #if defined __cplusplus -/** Exception specification documentation. - -The original intent of this macro was to control whether or not actual -exception specifications are emitted, based on how much they impact code -size etc. in a specific scenario. But it ended up always being disabled -(except for MSVC, which effectively ignored it even though being enabled), -and used in ways that would make enabling it illegal (e.g., in the -cppu::ComponentFactoryFunc typedef, or with necessarily incomplete -com::sun::star::uno::RuntimeException in com/sun/star/uno/Reference.h), so -has officially been demoted to pure documentation now. - -@deprecated do not use in new code. -*/ -#define SAL_THROW(x) - /** Nothrow specification for C functions. This is a macro so it can expand to nothing in C code. @@ -370,9 +355,6 @@ typedef struct _sal_Sequence #else -/* SAL_THROW() must not be used in C code, only SAL_THROW_EXTERN_C() is defined - there: -*/ #define SAL_THROW_EXTERN_C() #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/ui/misc/pgfnote.cxx|8 +--
sw/source/ui/misc/srtdlg.cxx |7 +--
sw/source/ui/table/convert.cxx |4 -
sw/source/ui/table/instable.cxx |4 -
sw/source/ui/table/tautofmt.cxx | 17 +++
sw/source/uibase/app/docsh2.cxx | 13 ++---
sw/source/uibase/app/docshini.cxx| 13 +++--
sw/source/uibase/dialog/regionsw.cxx | 14 ++
sw/source/uibase/dochdl/gloshdl.cxx | 12 ++---
sw/source/uibase/dochdl/swdtflvr.cxx | 59 +++
sw/source/uibase/docvw/DashedLine.cxx|6 +-
sw/source/uibase/docvw/HeaderFooterWin.cxx |6 +-
sw/source/uibase/docvw/PageBreakWin.cxx |6 +-
sw/source/uibase/docvw/PostItMgr.cxx |5 +-
sw/source/uibase/docvw/SidebarTxtControl.cxx |4 -
sw/source/uibase/docvw/SidebarWin.cxx|7 +--
sw/source/uibase/docvw/edtwin.cxx| 10 ++--
17 files changed, 91 insertions(+), 104 deletions(-)
New commits:
commit e0057072817ccad2a54eca45ffdb84d1c99ee7a7
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Jun 5 14:10:15 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: Ia8bc0e24a76dd953000b73806ac21f21db4c4ca3
diff --git a/sw/source/uibase/dialog/regionsw.cxx
b/sw/source/uibase/dialog/regionsw.cxx
index 299c26c..938c552 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -83,12 +83,11 @@ void SwBaseShell::InsertRegionDialog(SfxRequest rReq)
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, Dialogdiet fail!);
-AbstractInsertSectionTabDialog* aTabDlg =
pFact-CreateInsertSectionTabDialog(
-GetView().GetViewFrame()-GetWindow(), aSet , rSh);
+boost::scoped_ptrAbstractInsertSectionTabDialog
aTabDlg(pFact-CreateInsertSectionTabDialog(
+GetView().GetViewFrame()-GetWindow(), aSet , rSh));
OSL_ENSURE(aTabDlg, Dialogdiet fail!);
aTabDlg-Execute();
rReq.Ignore();
-delete aTabDlg;
}
else
{
@@ -194,13 +193,11 @@ IMPL_STATIC_LINK( SwWrtShell, InsertRegionDialog,
SwSectionData*, pSect )
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, Dialogdiet fail!);
-AbstractInsertSectionTabDialog* aTabDlg =
pFact-CreateInsertSectionTabDialog(
-pThis-GetView().GetViewFrame()-GetWindow(),aSet , *pThis);
+boost::scoped_ptrAbstractInsertSectionTabDialog
aTabDlg(pFact-CreateInsertSectionTabDialog(
+pThis-GetView().GetViewFrame()-GetWindow(),aSet , *pThis));
OSL_ENSURE(aTabDlg, Dialogdiet fail!);
aTabDlg-SetSectionData(*xSectionData);
aTabDlg-Execute();
-
-delete aTabDlg;
}
return 0;
}
@@ -222,14 +219,13 @@ void SwBaseShell::EditRegionDialog(SfxRequest rReq)
{
SwAbstractDialogFactory* pFact =
SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, Dialogdiet fail!);
-AbstractEditRegionDlg* pEditRegionDlg =
pFact-CreateEditRegionDlg(pParentWin, rWrtShell);
+boost::scoped_ptrAbstractEditRegionDlg
pEditRegionDlg(pFact-CreateEditRegionDlg(pParentWin, rWrtShell));
OSL_ENSURE(pEditRegionDlg, Dialogdiet fail!);
if(pItem pItem-ISA(SfxStringItem))
{
pEditRegionDlg-SelectSection(((const
SfxStringItem*)pItem)-GetValue());
}
pEditRegionDlg-Execute();
-delete pEditRegionDlg;
}
}
break;
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 572f51a..f34c1fa 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -124,6 +124,7 @@
#include vcl/GraphicNativeTransform.hxx
#include vcl/GraphicNativeMetadata.hxx
+#include boost/scoped_array.hpp
#include boost/scoped_ptr.hpp
extern bool bFrmDrag;
@@ -2632,14 +2633,14 @@ bool SwTransferable::_PasteDBData(
TransferableDataHelper rData,
}
else if( nWh )
{
-SfxUsrAnyItem* pConnectionItem = 0;
-SfxUsrAnyItem* pCursorItem = 0;
-SfxUsrAnyItem* pColumnItem = 0;
-SfxUsrAnyItem* pSourceItem = 0;
-SfxUsrAnyItem* pCommandItem = 0;
-SfxUsrAnyItem* pCommandTypeItem = 0;
-SfxUsrAnyItem* pColumnNameItem = 0;
-SfxUsrAnyItem* pSelectionItem = 0;
+boost::scoped_ptrSfxUsrAnyItem pConnectionItem;
+boost::scoped_ptrSfxUsrAnyItem pCursorItem;
+boost::scoped_ptrSfxUsrAnyItem
[Libreoffice-commits] core.git: writerfilter/CustomTarget_source.mk writerfilter/source
writerfilter/CustomTarget_source.mk |9 ++--- writerfilter/source/ooxml/tokens-to-xml.sed | 19 +++ writerfilter/source/ooxml/tokenxmlfooter|1 - writerfilter/source/ooxml/tokenxmlheader|1 - 4 files changed, 21 insertions(+), 9 deletions(-) New commits: commit d595e5ec4e092344460f53d287b970c147913e99 Author: Jan Holesovsky ke...@collabora.com Date: Thu Jun 5 08:56:48 2014 +0200 writerfilter: Avoid a temporary file, sed can handle this by itself. Change-Id: I7fde1b44809b1886730145f16878e0f1045b2555 diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 249ebca..98da398 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -70,7 +70,6 @@ writerfilter_GEN_ooxml_Namespacesmap_xsl=$(writerfilter_WORK)/namespacesmap.xsl writerfilter_GEN_ooxml_Preprocess_xsl=$(writerfilter_WORK)/modelpreprocess.xsl writerfilter_GEN_ooxml_QNameToStr_cxx=$(writerfilter_WORK)/ooxml/qnametostr.cxx writerfilter_GEN_ooxml_ResourceIds_hxx=$(writerfilter_WORK)/ooxml/resourceids.hxx -writerfilter_GEN_ooxml_Token_tmp=$(writerfilter_WORK)/token.tmp 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 @@ -134,15 +133,11 @@ $(writerfilter_GEN_ooxml_ResourceIds_hxx) : $(writerfilter_SRC_ooxml_ResourceIds $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_ResourceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed)) $@ -$(writerfilter_GEN_ooxml_Token_tmp) : $(SRCDIR)/oox/source/token/tokens.txt | $(writerfilter_WORK)/.dir +$(writerfilter_GEN_ooxml_Token_xml) : $(SRCDIR)/oox/source/token/tokens.txt $(writerfilter_SRC)/ooxml/tokens-to-xml.sed | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1) - sed s/\(.*\)/fasttoken\1\/fasttoken/ \ + sed -f $(writerfilter_SRC)/ooxml/tokens-to-xml.sed \ $(SRCDIR)/oox/source/token/tokens.txt $@ -$(writerfilter_GEN_ooxml_Token_xml) : $(writerfilter_SRC)/ooxml/tokenxmlheader $(writerfilter_GEN_ooxml_Token_tmp) $(writerfilter_SRC)/ooxml/tokenxmlfooter - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1) - cat $(writerfilter_SRC)/ooxml/tokenxmlheader $(writerfilter_GEN_ooxml_Token_tmp) $(writerfilter_SRC)/ooxml/tokenxmlfooter $@ - $(writerfilter_WORK)/OOXMLFactory%.cxx : $(writerfilter_SRC)/ooxml/factoryimpl_ns.xsl $(writerfilter_GEN_ooxml_Model_processed) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) --stringparam file $@ $ $(writerfilter_GEN_ooxml_Model_processed)) $@ diff --git a/writerfilter/source/ooxml/tokens-to-xml.sed b/writerfilter/source/ooxml/tokens-to-xml.sed new file mode 100755 index 000..a45bc6a --- /dev/null +++ b/writerfilter/source/ooxml/tokens-to-xml.sed @@ -0,0 +1,19 @@ +#! /usr/bin/sed -f +# +# 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/. +# + +# first line - insert model +1,1i\ +model + +# last line - append /model +$,$a\ +/model + +# everywhere - replace the input line with fasttoken.../fasttoken +s/\(.*\)/fasttoken\1\/fasttoken/ diff --git a/writerfilter/source/ooxml/tokenxmlfooter b/writerfilter/source/ooxml/tokenxmlfooter deleted file mode 100644 index 6f66407..000 --- a/writerfilter/source/ooxml/tokenxmlfooter +++ /dev/null @@ -1 +0,0 @@ -/model diff --git a/writerfilter/source/ooxml/tokenxmlheader b/writerfilter/source/ooxml/tokenxmlheader deleted file mode 100644 index 25a9243..000 --- a/writerfilter/source/ooxml/tokenxmlheader +++ /dev/null @@ -1 +0,0 @@ -model ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: ciabot/run-libreoffice-ciabot.pl
ciabot/run-libreoffice-ciabot.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddc585a27941134fc0618e3f94e0a1d2fea1bf84
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 5 09:23:56 2014 +0200
ciabot: ignore distro branches on IRC, as requested by the ESC
Change-Id: I970eba737c2982bc5c28188e74c89f0021df1d4c
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index 9a102fb..c095b26 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -90,7 +90,7 @@ sub report($$$) {
foreach my $key ( keys %new ) {
my $branch_name = $key;
$branch_name = '' if ( $branch_name eq 'master' );
-if ($branch_name =~ /aoo\//) {
+if ($branch_name =~ /aoo\/|distro\//) {
next;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
NPAPI-based features in LO
LO has two features that make use of NPAPI (http://en.wikipedia.org/wiki/NPAPI): (1) LO as a browser plugin, displaying LO documents directly in a browser window (enabled via LO's Tools - Options... - Internet - Browser Plug-in). (configure.ac uses the term ENABLE_NPAPI_INTO_BROWSER for this.) (2) Plugging browser plugins into LO. One known use-case was (is?) to display .swf content via the Adobe flash player plugin, at least on Mac OS X and Windows. This feature was previously discussed in the mail thread starting at http://lists.freedesktop.org/archives/libreoffice/2012-November/041259.html LO as an NPAPI browser plugin host?, and retained in particular for http://lists.freedesktop.org/archives/libreoffice/2012-November/041439.html. (configure.ac uses the term ENABLE_NPAPI_FROM_BROWSER for this.) There is long-standing issue https://bugs.freedesktop.org/show_bug.cgi?id=45071 Browser plugin option not working that claims that feature (1) is not working in certain (Windows) scenarios (while it is known to work in certain Linux scenarios at least). Some comments in that issue suggest to remove feature (1), and there is now patch https://gerrit.libreoffice.org/#/c/9644/ Partial fix for bug 45071 - Remove NPAPI support attempting to remove both features (1) and (2). What is our rough consensus on these features? For (1), is it a feature worthy enough to keep---at least in the known-good scenarios, potentially removing it from the known-bad ones or even investing into fixing it there? For (2), is the evaluation from late 2012 still relevant? I at least see no pressing need to tie the fate of feature (2) to that of feature (1), but overall code reduction of course isn't bad, either. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: NPAPI-based features in LO
What is our rough consensus on these features? Kill them both. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Hi, On Thu, May 22, 2014 at 04:57:34PM +0100, Michael Meeks michael.me...@collabora.com wrote: * Distro branches commits (Michael) ... AI: + can we teach the IRC bot. to not show distro commits (Miklos) Done as http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/commit/?id=ddc585a27941134fc0618e3f94e0a1d2fea1bf84 Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - include/sfx2 sfx2/source
include/sfx2/passwd.hxx |1 +
include/sfx2/sfx.hrc |1 +
sfx2/source/appl/sfx.src |5 +
sfx2/source/dialog/passwd.cxx | 12 +---
4 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 1fc5d5fc5174d768869c84adfbda6367057e8577
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Tue Jun 3 19:11:54 2014 +0200
fdo#79597 Password UI: correct typo for 1 character
Display a different string in case of 1 character for minimum length
Change-Id: Iba2fbbb7d4101718def7c79ce5354debf5d97041
Reviewed-on: https://gerrit.libreoffice.org/9631
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit a4440671a9de18ebf944ed09c432a98908d79f5e)
Reviewed-on: https://gerrit.libreoffice.org/9646
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index 789e444..ed96e33 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -61,6 +61,7 @@ private:
OKButton* mpOKBtn;
OUStringmaMinLenPwdStr;
+OUStringmaMinLenPwdStr1;
OUStringmaEmptyPwdStr;
OUStringmaMainPwdStr;
sal_uInt16 mnMinLen;
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 4c52994..0497f52 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -155,6 +155,7 @@
#define STR_PASSWD_MIN_LEN (RID_SFX_START+124)
#define STR_NONCHECKEDOUT_DOCUMENT (RID_SFX_START+125)
#define BT_CHECKOUT (RID_SFX_START+126)
+#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+127)
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
#define SFX_THUMBNAIL_TEXT (RID_SFX_START+158)
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 08e6f1f..16f3044 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -29,6 +29,11 @@ String STR_PASSWD_MIN_LEN
Text [ en-US ] = (Minimum $(MINLEN) characters) ;
};
+String STR_PASSWD_MIN_LEN1
+{
+Text [ en-US ] = (Minimum 1 character) ;
+};
+
String STR_PASSWD_EMPTY
{
Text [ en-US ] = (The password can be empty) ;
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index c1d47d5..d55700f 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -86,6 +86,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const OUString*
pGroupText)
: ModalDialog(pParent, PasswordDialog, sfx/ui/password.ui)
, maMinLenPwdStr(SFX2_RESSTR(STR_PASSWD_MIN_LEN))
+, maMinLenPwdStr1(SFX2_RESSTR(STR_PASSWD_MIN_LEN1))
, maEmptyPwdStr(SFX2_RESSTR(STR_PASSWD_EMPTY))
, mnMinLen(5)
, mnExtras(0)
@@ -133,9 +134,14 @@ void SfxPasswordDialog::SetPasswdText( )
mpMinLengthFT-SetText(maEmptyPwdStr);
else
{
-maMainPwdStr = maMinLenPwdStr;
-maMainPwdStr = maMainPwdStr.replaceAll( $(MINLEN),
OUString::number((sal_Int32) mnMinLen ) );
-mpMinLengthFT-SetText(maMainPwdStr);
+if( mnMinLen == 1 )
+mpMinLengthFT-SetText(maMinLenPwdStr1);
+else
+{
+maMainPwdStr = maMinLenPwdStr;
+maMainPwdStr = maMainPwdStr.replaceAll( $(MINLEN),
OUString::number((sal_Int32) mnMinLen ) );
+mpMinLengthFT-SetText(maMainPwdStr);
+}
}
}
___
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' - 2 commits - mysqlc/source sc/source
mysqlc/source/mysqlc_connection.cxx |4 ++--
sc/source/core/tool/interpr1.cxx|4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a198bd4789eaf40e8c042ab16fe93ea2d04dcb97
Author: Noel Grandin n...@peralex.com
Date: Fri May 30 13:02:20 2014 +0200
deb#749592 mysql-connector doesn't work with remote connections
and also
fdo#77584 mysql-connector doesn't work over SSH tunnel
Not sure exactly how this got broken, I suspect that the UI code
has started unconditionally passing down the properties, just filling
them with empty spaces for the unused ones.
Anyhow, this appears to fix the problem.
Cherry-picked from 6b50e21473e7d2b24b5c609d8a1c31f27644d842
Change-Id: I7ac2a0d6bae610f47d2a28daa9beb3ef0e2dbb52
Reviewed-on: https://gerrit.libreoffice.org/9565
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/9643
diff --git a/mysqlc/source/mysqlc_connection.cxx
b/mysqlc/source/mysqlc_connection.cxx
index 8816cb2..4a178b3 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -158,10 +158,10 @@ void OConnection::construct(const OUString url, const
Sequence PropertyValue
OSL_VERIFY( pIter-Value = aPass );
} else if (pIter-Name.equalsAscii(LocalSocket)) {
OSL_VERIFY( pIter-Value = sUnixSocket );
-unixSocketPassed = true;
+unixSocketPassed = !sUnixSocket.isEmpty();
} else if (pIter-Name.equalsAscii(NamedPipe)) {
OSL_VERIFY( pIter-Value = sNamedPipe );
-namedPipePassed = true;
+namedPipePassed = !sNamedPipe.isEmpty();
} else if ( pIter-Name.equalsAscii(PublicConnectionURL)) {
OSL_VERIFY( pIter-Value = m_settings.connectionURL );
} else if ( pIter-Name.equalsAscii(NewURL)) {// legacy name for
PublicConnectionURL
commit a9adf83582069308f7f98c5049256ea5e81c7c68
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Jun 5 07:28:32 2014 +0200
Resolves fdo#75971 Crash when invoking Insert Names Create
Cherry-pick 37d7d115dd346ba7a713a5a18d90fc48a0d35072
+ 4f24e3d480bb88a568de10b4d81116766b136c91
Change-Id: Ieb3af12e120cd8f17ee659406d7d0e46f05fba7d
Reviewed-on: https://gerrit.libreoffice.org/9645
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index b5510f6..c4e6c56 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7801,7 +7801,7 @@ void ScInterpreter::ScLeft()
if (nParamCount == 2)
{
double nVal = ::rtl::math::approxFloor(GetDouble());
-if ( nVal 0.0 || nVal STRING_MAXLEN )
+if ( rtl::math::isNan(nVal) || nVal 0.0 || nVal STRING_MAXLEN )
{
PushIllegalArgument();
return ;
@@ -7909,7 +7909,7 @@ void ScInterpreter::ScRightB()
if (nParamCount == 2)
{
double nVal = ::rtl::math::approxFloor(GetDouble());
-if ( nVal 0.0 || nVal STRING_MAXLEN )
+if ( rtl::math::isNan(nVal) || nVal 0.0 || nVal STRING_MAXLEN )
{
PushIllegalArgument();
return ;
___
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' - mysqlc/source
mysqlc/source/mysqlc_connection.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 563da4d20d4dfb35bc45e5714b73994dda80802a
Author: Noel Grandin n...@peralex.com
Date: Fri May 30 13:02:20 2014 +0200
deb#749592 mysql-connector doesn't work with remote connections
and also
fdo#77584 mysql-connector doesn't work over SSH tunnel
Not sure exactly how this got broken, I suspect that the UI code
has started unconditionally passing down the properties, just filling
them with empty spaces for the unused ones.
Anyhow, this appears to fix the problem.
Cherry-picked from 6b50e21473e7d2b24b5c609d8a1c31f27644d842
Change-Id: I7ac2a0d6bae610f47d2a28daa9beb3ef0e2dbb52
Reviewed-on: https://gerrit.libreoffice.org/9565
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/9642
diff --git a/mysqlc/source/mysqlc_connection.cxx
b/mysqlc/source/mysqlc_connection.cxx
index 65bfd2e..b09f322 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -158,10 +158,10 @@ void OConnection::construct(const OUString url, const
Sequence PropertyValue
OSL_VERIFY( pIter-Value = aPass );
} else if (pIter-Name.equalsAscii(LocalSocket)) {
OSL_VERIFY( pIter-Value = sUnixSocket );
-unixSocketPassed = true;
+unixSocketPassed = !sUnixSocket.isEmpty();
} else if (pIter-Name.equalsAscii(NamedPipe)) {
OSL_VERIFY( pIter-Value = sNamedPipe );
-namedPipePassed = true;
+namedPipePassed = !sNamedPipe.isEmpty();
} else if ( pIter-Name.equalsAscii(PublicConnectionURL)) {
OSL_VERIFY( pIter-Value = m_settings.connectionURL );
} else if ( pIter-Name.equalsAscii(NewURL)) {// legacy name for
PublicConnectionURL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlimport/data/fdo79535.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 11 +++
sw/source/core/doc/docredln.cxx |3 ++-
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 8fcd4bf323bc3390e366229d549641444b5a3e9a
Author: Tushar Bende tushar.be...@synerzip.com
Date: Wed Jun 4 15:04:18 2014 +0530
fdo#79535 :LO writer crash while Opening some document.
Problem Description : While setting ExtraData for Redline LO calls
SwRangeRedline::SetExtraData() with
argument of type SwRedlineExtraData_FormattingChanges* which contains
SfxItemSet*
In function SwRedlineExtraData_FormattingChanges() without Null checking
SfxItemSet*,
LO was trying to get rCpy.pSet-Count() which was the reason for
segmentation fault
while opening some documents in LO.
Added Null check before accessing a pointer.
Change-Id: I33299d2be2777ab6a8af0621595c9453145f1069
Reviewed-on: https://gerrit.libreoffice.org/9647
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ooxmlimport/data/fdo79535.docx
b/sw/qa/extras/ooxmlimport/data/fdo79535.docx
new file mode 100644
index 000..64aab18
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo79535.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 14aa543..f003f33 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2153,6 +2153,17 @@ DECLARE_OOXMLIMPORT_TEST(testFdo78883, fdo78883.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage());
}
+DECLARE_OOXMLIMPORT_TEST(testFdo79535, fdo79535.docx)
+{
+// fdo#79535 : LO was crashing while opening document
+// Checking there is a single page after loading a doc successfully in LO.
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage());
+}
+
DECLARE_OOXMLIMPORT_TEST(testBnc875718, bnc875718.docx)
{
// The frame in the footer must not accidentally end up in the document
body.
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 64887a1..cb1520a 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -3204,7 +3204,8 @@
SwRedlineExtraData_FormattingChanges::SwRedlineExtraData_FormattingChanges( cons
SwRedlineExtraData_FormattingChanges::SwRedlineExtraData_FormattingChanges(
const SwRedlineExtraData_FormattingChanges rCpy )
: SwRedlineExtraData()
{
-if( rCpy.pSet-Count() )
+// Checking pointer pSet before accessing it for Count
+if( rCpy.pSet rCpy.pSet-Count() )
{
pSet = new SfxItemSet( *(rCpy.pSet) );
}
___
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' - vcl/source
vcl/source/filter/graphicfilter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 99b7ff506d148ca7d0ef9def56f4e0024e0e43ac
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Jun 3 21:57:54 2014 +0100
Avoid uninitialized memory read/compare on short reads.
Change-Id: I7537f6d22780bace6ab6da06e087a3d27da8de05
(cherry picked from commit 53db456c04ca5a1684395b60fbd6f1bed4c9c114)
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 1f132f3..2274e83 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -704,7 +704,7 @@ static bool ImpPeekGraphicFormat( SvStream rStream,
OUString rFormatExtension,
{
nCheckSize = nStreamLen 2048 ? nStreamLen : 2048;
rStream.Seek(nStreamPos);
-rStream.Read(sExtendedOrDecompressedFirstBytes, nCheckSize);
+nCheckSize = rStream.Read(sExtendedOrDecompressedFirstBytes,
nCheckSize);
}
if(ImplSearchEntry(pCheckArray, (sal_uInt8*)svg, nCheckSize,
4)) // 'svg'
___
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' - oox/source
oox/source/export/vmlexport.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 591e10c106d9672559672f43346cf000f3a734b3
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Jun 3 22:55:05 2014 +0100
Be more sensible about checking buffers of VML points we write.
Change-Id: Id3811dbe0cf2510ef6a851804b3886c14eca01b6
(cherry picked from commit a2d2c7f707838511ede017ed920205b9165a35a2)
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 0f3038b..f315766 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -519,6 +519,14 @@ void VMLExport::Commit( EscherPropertyContainer rProps,
const Rectangle rRect
break;
default:
// See
EscherPropertyContainer::CreateCustomShapeProperties, by default nSeg is simply
the number of points.
+// FIXME: we miss out a significant amount
of complexity from
+// the above method here, and do some
rather odd things to match.
+int nElems = aVertices.nPropSize / (
nPointSize * 2);
+if (nSeg nElems)
+{
+SAL_WARN(oox, Busted escher export
nSeg vs . nElems truncating point stream);
+nSeg = nElems;
+}
for (int i = 0; i nSeg; ++i)
{
sal_Int32 nX =
impl_GetPointComponent(pVerticesIt, nPointSize);
___
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' - framework/source vcl/source
framework/source/uielement/toolbarmanager.cxx | 16 ++--
vcl/source/window/toolbox2.cxx|8 +++-
2 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit dfa23c4170a4a5a567fe48bac6682d1a556e77ba
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Sun Jun 1 08:40:43 2014 +0100
fdo79368 Don't process overflow menu items twice.
We reuse the toolbox overflow menu for toolbarmanager's context
menu -- toolbarmanger previously added its menu listener to the
toolboxes menu permanently, meaning that it would try to handle
overflow menu items (in addition to the context menu items which
it should handle), instead we should only add the listener when
we are actually using the menu as a context menu.
Perhaps it would be better in the long run to actually use fully separate
menus instead, and ask toolbox to specifically add its items to that
rather than trying to hack the context menu on top of the overflow menu?
Change-Id: Iecface2c6eae9ab79dbcdb25ffdbaf446e2885ea
(cherry picked from commit 1ae89d189200c1e351a396a3f02612b84a69985f)
Reviewed-on: https://gerrit.libreoffice.org/9602
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 4137de3..98e0446 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -233,8 +233,6 @@ ToolBarManager::ToolBarManager( const Reference
XComponentContext rxContext,
m_pToolBar-SetCommandHdl( LINK( this, ToolBarManager, Command ) );
m_pToolBar-SetMenuType( nMenuType );
m_pToolBar-SetMenuButtonHdl( LINK( this, ToolBarManager, MenuButton ) );
-m_pToolBar-GetMenu()-SetSelectHdl( LINK( this, ToolBarManager,
MenuSelect ) );
-m_pToolBar-GetMenu()-SetDeactivateHdl( LINK( this, ToolBarManager,
MenuDeactivate ) );
// set name for testtool, the useful part is after the last '/'
sal_Int32 idx = rResourceName.lastIndexOf('/');
@@ -1795,10 +1793,24 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*,
pCmdEvt )
::PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar);
if (pMenu)
{
+// We only want to handle events for the context menu, but not events
+// on the toolbars overflow menu, hence we should only receive events
+// from the toolbox menu when we are actually showing it as our context
+// menu (the same menu retrieved with GetMenu() is reused for both the
+// overflow and context menus). If we set these Hdls permanently rather
+// than just when the context menu is showing, then events are
duplicated
+// when the menu is being used as an overflow menu.
+m_pToolBar-GetMenu()-SetSelectHdl( LINK( this, ToolBarManager,
MenuSelect ) );
+m_pToolBar-GetMenu()-SetDeactivateHdl( LINK( this, ToolBarManager,
MenuDeactivate ) );
+
// make sure all disabled entries will be shown
pMenu-SetMenuFlags( pMenu-GetMenuFlags() |
MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
::Point aPoint( pCmdEvt-GetMousePosPixel() );
pMenu-Execute( m_pToolBar, aPoint );
+
+// Unlink our listeners again -- see above for why.
+m_pToolBar-GetMenu()-SetSelectHdl( Link() );
+m_pToolBar-GetMenu()-SetDeactivateHdl( Link() );
}
return 0;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 608b27c..2fc6b4b 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -2184,7 +2184,13 @@ void ToolBox::ImplExecuteCustomMenu()
// call button handler to allow for menu customization
mpData-maMenuButtonHdl.Call( this );
-// register handler
+// We specifically only register this event listener when executing our
+// overflow menu (and remove it directly afterwards), as the same menu
+// is reused for both the overflow menu (as managed here in ToolBox),
+// but also by ToolBarManager for its context menu. If we leave event
+// listeners alive beyond when the menu is showing in the desired mode
+// then duplicate events can happen as the context menu duplicates
+// items from the overflow menu, which both listeners would then act
on.
GetMenu()-AddEventListener( LINK( this, ToolBox,
ImplCustomMenuListener ) );
// make sure all disabled entries will be shown
___
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' - framework/source vcl/source
framework/source/uielement/toolbarmanager.cxx | 16 ++--
vcl/source/window/toolbox2.cxx|8 +++-
2 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 50cfa89fe32e9c920cce58221a9ef970149c780c
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Sun Jun 1 08:40:43 2014 +0100
fdo79368 Don't process overflow menu items twice.
We reuse the toolbox overflow menu for toolbarmanagers context
menu -- toolbarmanager previously added its menu listener to the
toolboxes menu permanently, meaning that it would try to handle
overflow menu items (in addition to the context menu items which
it should handle), instead we should only add the listener when
we are actually using the menu as a context menu.
Perhaps it would be better in the long run to actually use fully separate
menus instead, and ask toolbox to specifically add its items to that
rather than trying to hack the context menu on top of the overflow menu?
Change-Id: Iecface2c6eae9ab79dbcdb25ffdbaf446e2885ea
(cherry picked from commit 1ae89d189200c1e351a396a3f02612b84a69985f)
Reviewed-on: https://gerrit.libreoffice.org/9604
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index fba6752..4f11ff3 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -226,8 +226,6 @@ ToolBarManager::ToolBarManager( const Reference
XComponentContext rxContext,
m_pToolBar-SetCommandHdl( LINK( this, ToolBarManager, Command ) );
m_pToolBar-SetMenuType( nMenuType );
m_pToolBar-SetMenuButtonHdl( LINK( this, ToolBarManager, MenuButton ) );
-m_pToolBar-GetMenu()-SetSelectHdl( LINK( this, ToolBarManager,
MenuSelect ) );
-m_pToolBar-GetMenu()-SetDeactivateHdl( LINK( this, ToolBarManager,
MenuDeactivate ) );
// set name for testtool, the useful part is after the last '/'
sal_Int32 idx = rResourceName.lastIndexOf('/');
@@ -1786,10 +1784,24 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*,
pCmdEvt )
::PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar);
if (pMenu)
{
+// We only want to handle events for the context menu, but not events
+// on the toolbars overflow menu, hence we should only receive events
+// from the toolbox menu when we are actually showing it as our context
+// menu (the same menu retrieved with GetMenu() is reused for both the
+// overflow and context menus). If we set these Hdls permanently rather
+// than just when the context menu is showing, then events are
duplicated
+// when the menu is being used as an overflow menu.
+m_pToolBar-GetMenu()-SetSelectHdl( LINK( this, ToolBarManager,
MenuSelect ) );
+m_pToolBar-GetMenu()-SetDeactivateHdl( LINK( this, ToolBarManager,
MenuDeactivate ) );
+
// make sure all disabled entries will be shown
pMenu-SetMenuFlags( pMenu-GetMenuFlags() |
MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
::Point aPoint( pCmdEvt-GetMousePosPixel() );
pMenu-Execute( m_pToolBar, aPoint );
+
+// Unlink our listeners again -- see above for why.
+m_pToolBar-GetMenu()-SetSelectHdl( Link() );
+m_pToolBar-GetMenu()-SetDeactivateHdl( Link() );
}
return 0;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index ba4e866..83b69f8 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1992,7 +1992,13 @@ void ToolBox::ImplExecuteCustomMenu()
// call button handler to allow for menu customization
mpData-maMenuButtonHdl.Call( this );
-// register handler
+// We specifically only register this event listener when executing our
+// overflow menu (and remove it directly afterwards), as the same menu
+// is reused for both the overflow menu (as managed here in ToolBox),
+// but also by ToolBarManager for its context menu. If we leave event
+// listeners alive beyond when the menu is showing in the desired mode
+// then duplicate events can happen as the context menu duplicates
+// items from the overflow menu, which both listeners would then act
on.
GetMenu()-AddEventListener( LINK( this, ToolBox,
ImplCustomMenuListener ) );
// make sure all disabled entries will be shown
___
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/items/frmitems.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b24739c98f3b5025e3dd5d86fadeae9983ccd5bc Author: Caolán McNamara caol...@redhat.com Date: Wed Jun 4 15:21:14 2014 +0100 coverity#705153 Missing break in switch, surely this is not intentional since the initial commit of c04e60275f273dacf8796e957e1ebadc08b497a1 Change-Id: I9d3c3c2870c145b2fdb5c4f6c6ed17a14d1162c2 diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index a621837..798ae03 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -896,7 +896,7 @@ bool SvxULSpaceItem::PutValue( const uno::Any rVal, sal_uInt8 nMemberId ) nPropUpper = aUpperLowerMarginScale.ScaleLower; } } - +break; case MID_UP_MARGIN : if(!(rVal = nVal) || nVal 0) return false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source include/vcl vcl/source vcl/unx
framework/source/uielement/menubarmanager.cxx |7 +++-
include/vcl/helper.hxx|3 +
include/vcl/menu.hxx | 11 ++
vcl/source/window/menu.cxx| 17 ++
vcl/unx/gtk/window/gtksalmenu.cxx | 43 ++
5 files changed, 80 insertions(+), 1 deletion(-)
New commits:
commit eda624641b34a7d4315388c8ec1aebe44f63982e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Sun May 18 14:28:39 2014 +0200
lp#1296715: refresh invalidated menus
- so we need to be a StatusListener in framework after all
- we ware updating all menus for now, instead of just one
- this would have a hugh performance hit when there is much change to the
menu
- thus we just invalidate the menu and update with all changes after 100ms
once
Change-Id: I48cda968cf0ae1eae0421b3424bb3e5830817e84
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index de31c3c..3412251 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -67,6 +67,7 @@
#include toolkit/helper/vclunohelper.hxx
#include vcl/svapp.hxx
#include vcl/window.hxx
+#include vcl/menu.hxx
#include vcl/settings.hxx
#include osl/mutex.hxx
#include osl/file.hxx
@@ -430,6 +431,10 @@ throw ( RuntimeException, std::exception )
SolarMutexGuard aSolarGuard;
{
+vcl::MenuInvalidator aInvalidator;
+aInvalidator.Invalidated();
+}
+{
if ( m_bDisposed )
return;
@@ -914,9 +919,9 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
if ( !bPopupMenu )
{
-// We need only an update to reflect the
current state
xMenuItemDispatch-addStatusListener(
static_cast XStatusListener* ( this ), aTargetURL );
xMenuItemDispatch-removeStatusListener(
static_cast XStatusListener* ( this ), aTargetURL );
+xMenuItemDispatch-addStatusListener(
static_cast XStatusListener* ( this ), aTargetURL );
}
}
else if ( !bPopupMenu )
diff --git a/include/vcl/helper.hxx b/include/vcl/helper.hxx
index cc368dd..49c4197 100644
--- a/include/vcl/helper.hxx
+++ b/include/vcl/helper.hxx
@@ -23,6 +23,7 @@
#include list
#include vcl/dllapi.h
+#include vcl/vclevent.hxx
#include rtl/ustring.hxx
@@ -54,6 +55,8 @@ enum whichOfficePath { InstallationRootPath, UserPath,
ConfigPath };
OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath );
} // namespace
+
+bool VCL_DLLPUBLIC GetMenuInvalidateListeners();
#endif // INCLUDED_VCL_HELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 9f31b20..ac3c84b 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -359,6 +359,17 @@ public:
};
+namespace vcl
+{
+class VCL_DLLPUBLIC MenuInvalidator
+{
+public:
+MenuInvalidator();
+VclEventListeners2* GetMenuInvalidateListeners();
+void Invalidated();
+};
+}
+
// - MenuBar -
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 9a7e73b..73e5668 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -6130,4 +6130,21 @@ ImplMenuDelData::~ImplMenuDelData()
const_cast Menu* ( mpMenu )-ImplRemoveDel( *this );
}
+namespace vcl
+{
+MenuInvalidator::MenuInvalidator() {};
+
+static VclEventListeners2* pMenuInvalidateListeners = NULL;
+VclEventListeners2* MenuInvalidator::GetMenuInvalidateListeners()
+{
+if(!pMenuInvalidateListeners)
+pMenuInvalidateListeners = new VclEventListeners2();
+return pMenuInvalidateListeners;
+}
+void MenuInvalidator::Invalidated()
+{
+VclSimpleEvent aEvent(0);
+GetMenuInvalidateListeners()-callListeners(aEvent);
+};
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 6143e6c..dcbcd78 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -11,6 +11,8 @@
#ifdef ENABLE_GMENU_INTEGRATION
+#include generic/gendata.hxx
+#include unx/saldisp.hxx
#include unx/gtk/glomenu.h
#include unx/gtk/gloactiongroup.h
#include vcl/menu.hxx
@@ -448,9 +450,50 @@ void GtkSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem,
SalMenu* pSubMenu, unsig
pItem-mpSubMenu = pGtkSubMenu;
}
+static bool bInvalidMenus = false;
+static gboolean RefreshMenusUnity(gpointer)
+{
+SalDisplay* pSalDisplay = GetGenericData()-GetSalDisplay();
+std::list SalFrame* ::const_iterator pSalFrame =
[Libreoffice-commits] core.git: sw/qa vcl/generic
sw/qa/core/data/ooxml/pass/fdo78906.docx |binary
vcl/generic/glyphs/scrptrun.cxx |9 -
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 14ce4b337232f8fb21cc67e7a2844a7de81dfc4c
Author: Umesh Kadam umesh.ka...@synerzip.com
Date: Thu May 29 12:59:13 2014 +0530
fdo#78906 : File crashes while opening.
Handled a memory corruption.
Change-Id: I195d17bcd0a9a86bcc96cc7ad14f1d5f2908cf8c
Reviewed-on: https://gerrit.libreoffice.org/9545
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/core/data/ooxml/pass/fdo78906.docx
b/sw/qa/core/data/ooxml/pass/fdo78906.docx
new file mode 100644
index 000..1a6c6ea
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo78906.docx differ
diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index 9e8eef0..f72d296 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -207,7 +207,14 @@ UBool ScriptRun::next()
// pop it from the stack
if (pairIndex = 0 (pairIndex 1) != 0 parenSP = 0) {
parenSP -= 1;
-startSP -= 1;
+/* decrement startSP only if it is = 0,
+ decrementing it unnecessarily will lead to memory corruption
+ while processing the above while block.
+ e.g. startSP = -4 , parenSP = -1
+*/
+if (startSP = 0) {
+startSP -= 1;
+}
}
} else {
// if the run broke on a surrogate pair,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |7 -
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |5
writerfilter/source/ooxml/RefAndPointer.hxx | 102 --
writerfilter/source/ooxml/tokens-to-xml.sed |4
4 files changed, 6 insertions(+), 112 deletions(-)
New commits:
commit 72d1af02a503d17a7563ab70f3c519e38d1862a6
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Jun 5 10:30:01 2014 +0200
writerfilter: Posix sed needs just one parameter.
Change-Id: I8685136fcd43cb0ae445a8f19cbd9021737c42d4
diff --git a/writerfilter/source/ooxml/tokens-to-xml.sed
b/writerfilter/source/ooxml/tokens-to-xml.sed
index a45bc6a..e1e6545 100755
--- a/writerfilter/source/ooxml/tokens-to-xml.sed
+++ b/writerfilter/source/ooxml/tokens-to-xml.sed
@@ -8,11 +8,11 @@
#
# first line - insert model
-1,1i\
+1i\
model
# last line - append /model
-$,$a\
+$a\
/model
# everywhere - replace the input line with fasttoken.../fasttoken
commit 8f7827d4cdeef779adbb76f1957dffc7fc7318d6
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Jun 5 09:23:58 2014 +0200
writerfilter: Kill RefAndPointer, all it does is one dynamic_cast.
Change-Id: Ie383f7e4ee89770f722d963e09efda9063a68c16
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 1a436ce..73c76b3 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1730,8 +1730,7 @@ OOXMLFastContextHandlerTable::createFastChildContext
{
addCurrentChild();
-mCurrentChild.set
-(OOXMLFastContextHandler::createFastChildContext(Element, Attribs));
+mCurrentChild.set(OOXMLFastContextHandler::createFastChildContext(Element,
Attribs));
return mCurrentChild;
}
@@ -1758,8 +1757,8 @@ void OOXMLFastContextHandlerTable::lcl_endFastElement
void OOXMLFastContextHandlerTable::addCurrentChild()
{
-OOXMLFastContextHandler * pHandler = mCurrentChild.getPointer();
-if ( pHandler != NULL)
+OOXMLFastContextHandler * pHandler =
dynamic_castOOXMLFastContextHandler*(mCurrentChild.get());
+if (pHandler != NULL)
{
OOXMLValue::Pointer_t pValue(pHandler-getValue());
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index f8f2638..bb9d378 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -31,7 +31,6 @@
#include OOXMLParserState.hxx
#include OOXMLPropertySetImpl.hxx
#include OOXMLDocumentImpl.hxx
-#include RefAndPointer.hxx
#include ooxml/OOXMLFastTokens.hxx
#include svtools/embedhlp.hxx
@@ -61,8 +60,6 @@ class OOXMLFastContextHandler:
xml::sax::XFastContextHandler
{
public:
-typedef RefAndPointerXFastContextHandler, OOXMLFastContextHandler
-RefAndPointer_t;
typedef boost::shared_ptrOOXMLFastContextHandler Pointer_t;
enum ResourceEnum_t { UNKNOWN, STREAM, PROPERTIES, TABLE, SHAPE };
@@ -423,7 +420,7 @@ public:
protected:
OOXMLTableImpl mTable;
-RefAndPointer_t mCurrentChild;
+uno::ReferenceXFastContextHandler mCurrentChild;
virtual void lcl_endFastElement(Token_t Element)
throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE;
diff --git a/writerfilter/source/ooxml/RefAndPointer.hxx
b/writerfilter/source/ooxml/RefAndPointer.hxx
deleted file mode 100644
index 4f45eda..000
--- a/writerfilter/source/ooxml/RefAndPointer.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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 .
- */
-
-#ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_REFANDPOINTER_HXX
-#define INCLUDED_WRITERFILTER_SOURCE_OOXML_REFANDPOINTER_HXX
-
-#include iostream
-#include com/sun/star/lang/XUnoTunnel.hpp
-
-namespace writerfilter {
-namespace ooxml
-{
-
-template class Interface, class ChildClass
-class RefAndPointer
-{
-mutable ChildClass * mpHandler;
-mutable css::uno::ReferenceInterface mRef;
-
-public:
-RefAndPointer()
-:
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/data/writer/libmwaw/pass/Acta_1.0.hqx | 24 + writerperfect/qa/unit/data/writer/libmwaw/pass/LightWayText_4.0.hqx | 16 +++ writerperfect/qa/unit/data/writer/libmwaw/pass/MacDoc_1.0.hqx | 41 ++ writerperfect/qa/unit/data/writer/libmwaw/pass/SimpleText_1.0.hqx | 11 ++ writerperfect/qa/unit/data/writer/libmwaw/pass/TextEdit_2.0.hqx | 14 +++ writerperfect/qa/unit/data/writer/libmwaw/pass/eDoc_2.0.hqx | 29 +++ 6 files changed, 135 insertions(+) New commits: commit 028bd3f5f59897af4553dc3ee73c431569b51a0d Author: David Tardon dtar...@redhat.com Date: Thu Jun 5 10:17:35 2014 +0200 add more test documents for libmwaw Change-Id: Id31953720634cbfd838869ac2470b088da09caae diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/Acta_1.0.hqx b/writerperfect/qa/unit/data/writer/libmwaw/pass/Acta_1.0.hqx new file mode 100644 index 000..af338e6 --- /dev/null +++ b/writerperfect/qa/unit/data/writer/libmwaw/pass/Acta_1.0.hqx @@ -0,0 +1,24 @@ +(This file must be converted with BinHex 4.0) +:#R4PH(3a,QMG'%!Eh4XEN$9%%!N!3#V3!!!SZ@J`!$!!%!!3-!*! +*%@%JFfeKE'`J3@0dB5QD@aPJ!!*!$J!+!!-!*!*J#3`%!!3! +!3!-!*!*@*[E'3JDA4KE'PM)(9ZC'9bE'PZC3!!!'B!3#33i!#J!3!3! +!$!#3#33!$J!+!!-!*!*3!1!!S!%!)!!!`!N!N,!!i!#J!3$!#3#3` +!$J!+!!%!!!-!*!*J#3`%!!35!*!*%c%i)([D@jdFb!a-L`EfP +ZG(-U!!)!N!88!!m!%)!N!N+!!i!#J!3$!#3#3B!N!F!!% +@$!%!N!823fpeFQPPFL$D'PMB@G[+J!#!*!$!!+!B-!*! +*#!!3!!`!N!8-!*!*J#3`)!!3%!N!B-!*!*fZ)'PdC@d@!!%!N!83!!` +!N!8-!*!*J#3#3%F!!%TD@Pe`!!R!!J1j)!'PG1!!!S#-!BK)!'*V!%#!!*! +'A6@!!%!D3!!!(@*k!eF%3!kSf!*!'(X`!#!#-!'N!N!N#!'*Z`!LEaJ!D8R +U!!(qNJ!!!'*V(V`!!l-!!Kqd!!)!'P'VJT4VB!D8Dq!YB'!#34YB'!# +3#@P+6J!rMJ!#!!%BJ#3$Zd!!1642$5X!!!%e3!!!08!!!#f!!! +!!JCdCA0dE(ID!J!#!4@4-9e4!3!!R!#+G'9iG$%ZB@0dB3!#!!)!Eh4 +XEN$9%%!N!J#!'pdE'j3e4!*!Bcl8aRJ#3J+,!*!%%3#3!),G'9cG%aA4h* +KF'J#!!)!9%9B9%aA9%8!!(!!F!!N!3#G!#3!'m!!!)!*!!e3!!!J!cP8Urmj +9+a)!NB$k3!!*!)!qd!!3#3$!`!N!3#!J#33)8(3!%!!-!*!(%!! +-!*!035PTDAAH!!25!)!*!%![!#32rarqi$#3*5B`)+!2m!3 +S!@J!N!31X!Y!!!%!!N!!%!!)*`m!!3#3$K!!N!N3!2qerkB2,3Z +D!!J!*!0'3%)!$B!%J'U!FSB!3#!!*!%%%MG'%J3faKFh0TBb!a,M! +!!!%e3!!!08!!!#f!'*[9S8(!#f!!C-38*-1P283!!!'88K +%8J!!!*69)J!!%!AP6493!!!f9e0*@J!!!)*fCA*cMJ!!rrm!N!9LD`! +!!2rrJLEaJ!!2rr$!LDX!!!2rr*!LDLJ!!Irr+!LDKJ +!!2rr-3LDI`!!2rrV3LDM3!![rr)!!!Z3LDL4LL!: diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/LightWayText_4.0.hqx b/writerperfect/qa/unit/data/writer/libmwaw/pass/LightWayText_4.0.hqx new file mode 100644 index 000..a1b9c1e --- /dev/null +++ b/writerperfect/qa/unit/data/writer/libmwaw/pass/LightWayText_4.0.hqx @@ -0,0 +1,16 @@ +(This file must be converted with BinHex 4.0) +:#(4PH(3d,Qah!4@4-9e4!*!i`!!!XMFSd%JFfeKE'`J6'PRD(4ABANJ9'9 +iG#!d,M80BQpXC#TG'XD@-JG@jNCA*XD@jP$6%i)([D@jdFb`J-6)JF'pTER4 +c$80SD@0KCfmX)%0[GA*TCA)0$5m[)#!YN#S0,bmJ)4SDA-JC'pMG@ePER3JGf +c)'eKC'8JGfPdD#-D@GSGGKH94PH(3Z$5m[)#!YN#S0MTi!!!%#EJ!!!@i +!!!D!!!S[3C'D@jNCA)!N8)G'9iG$3ZE(F!!J!!!4@4-9e4!*!-9%9B9%a +A9%8!NM2Y6Ki`!!!XJ!N!`'e58S[3Y0FeG[FQYc8(*PCJ#3i`P!!! +!+,d26hdD@pZFbN*d9iBf9X!*!5XdP+,d,8(*PCQ9bC@jMCA-!N(b!!` +!N!8,!!N!!N!N!ND!!X!#3!%!3!!#3#3#4i!#`!*!!3*!*!*(`!,!!N +!!)!!!N!N!NP!!X!#3!%#3#3#5B!#`!*!!3%!!!*!*!*,`!,!!N!!N +!N!N`!J!%J!%%J#3#6X!%!!-!!3-!*!*43!3!!`!N!8-!*!*6J!-!!S +!J`!N!P@!!`!#J!$#GeV#-)'SJ!!!%J!$%GPEQ9fB3#3'`3!!!q!!- +h!*m!$i!!`(F!N(2Y6K0'3!!!N!N!NS!*!'!3%!!3-B!Q3!)J!L![B#3J# +3!-B!Q3!!3-!!`$5Qi!!!Z@J!Hr83D`!@J!#Fh4 +jET0805*NaA8e)b!)$rr`#3#!2Yrrm!!!$f!*!%!qMrr`!!!8) +!N!65SJ: diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/MacDoc_1.0.hqx b/writerperfect/qa/unit/data/writer/libmwaw/pass/MacDoc_1.0.hqx new file mode 100644 index 000..b60c596 --- /dev/null +++ b/writerperfect/qa/unit/data/writer/libmwaw/pass/MacDoc_1.0.hqx @@ -0,0 +1,41 @@ +(This file must be converted with BinHex 4.0) +:#R4PH(3a,QeNEf-!684NBde%GR)!N!J(r$Q!*!%!3H#!!!'JJ!!!(TKG'0 +[68*-6Im!NF+G'9iG$%ZE@4[B`!#684NBde%GR)!N!T04'4M684fFJ#3'-q +e0)3!N!B(r!#3$6BP!@dBfp8B@*Xr`#3(K)P!@dBfpA8d98r`#3(UmP!@dBfp +PC(4dr`#3'%!-)!#!!!'GM%Z-bi`-M%Z-b`JU6%j16FJE@MEQ9dD@-JFfpQG(G +KFQ8Z)%XE#5D@GSG(-J8Q9cCA*fC@3Z,!%`J!)!!!Cf-5ic,M!H3h*PBA4 +PC#hDA4S)(4SC50B@0%Ef-J9h*TG'9br[e8D'Pc)'4[Bh9YC@jd)(GKFb +MFQ9KG'9N)(GTG'JJG'KP)%eKBd4[BbAFQPdCA)JB@jN)'0KELLC5bC@N)' +ZC#`FQPZG'9N)(GTG'JJG'KP)%eKBd4[Bb@D@9hCA)Z$3e'Eh)JCR9bG'KPFL +TEQC[FQeKG'P[ELKBQpeG#0B@0%Ef-X)(XC@cC5fDA0TG#[GA)JGf9L)(0 +TG'8k)(GhGbjYB@0ZCA4TBbjNC5[FLMEfjdB@0d1L!0$8PZG'9bEQ9d1LTEQC +[3'eKBfjPG'PM,Q4P$80[EAe8f9bGQ8k)'eKBfjPG'PMAh0[CR4hBA*P!!!%N!3 +!N!3$'!*N!%#r``!rri!!!)5!#3J-B!Q3!N!8b!$Z!!J,Iri!-J!lJ!) +!5Arq!#`!#`!3#KE'dD@j[!!!$!!!$3!-!#i!!#35Y%459K)(0YB@aX)% +MG'%JCQPXC5!SFffC@3JGfPdD#0B@0%Ef-T!!%!#J#3!-B$k!!F3!D!$m!0`
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastHelper.hxx | 75 --
1 file changed, 75 deletions(-)
New commits:
commit dc9cc46f3223aff3f85d3ce9696178a5f4d3d087
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Jun 5 11:53:58 2014 +0200
writerfilter: Kill createAndSetParent and createAndSetParentRef.
Change-Id: Id212984b7f525e9aea2c390f181e68b5725aa20d
diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
index 2f10ff7..93281dc 100644
--- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
@@ -32,16 +32,9 @@ template class T
class OOXMLFastHelper
{
public:
-static css::uno::Referencecss::xml::sax::XFastContextHandler
createAndSetParent
-(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId);
-
static css::uno::Referencecss::xml::sax::XFastContextHandler
createAndSetParentAndDefine
(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId, Id
nDefine);
-static css::uno::Referencecss::xml::sax::XFastContextHandler
createAndSetParentRef
-(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken,
- const css::uno::Reference css::xml::sax::XFastAttributeList
Attribs);
-
static void newProperty(OOXMLFastContextHandler * pHandler,
Id nId,
const OUString rValue);
@@ -56,39 +49,6 @@ public:
template class T
uno::Referencecss::xml::sax::XFastContextHandler
-OOXMLFastHelperT::createAndSetParent
-(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId)
-{
-#ifdef DEBUG_HELPER
-debug_logger-startElement(helper.createAndSetParent);
-debug_logger-attribute(context, pHandler-getType());
-debug_logger-attribute(id, (*QNameToString::Instance())(nId));
-#endif
-
-OOXMLFastContextHandler * pTmp = new T(pHandler);
-
-pTmp-setToken(nToken);
-pTmp-setId(nId);
-
-#ifdef DEBUG_CREATE
-debug_logger-startElement(createAndSetParent);
-debug_logger-attribute(context, pHandler-getType());
-debug_logger-attribute(token, fastTokenToId(pTmp-getToken()));
-debug_logger-attribute(id, (*QNameToString::Instance())(nId));
-
-debug_logger-startElement(created);
-debug_logger-addTag(pTmp-toTag());
-debug_logger-endElement(created);
-debug_logger-endElement(helper.createAndSetParent);
-#endif
-
-css::uno::Referencecss::xml::sax::XFastContextHandler aResult(pTmp);
-
-return aResult;
-}
-
-template class T
-uno::Referencecss::xml::sax::XFastContextHandler
OOXMLFastHelperT::createAndSetParentAndDefine
(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken, Id nId, Id nDefine)
{
@@ -123,41 +83,6 @@ OOXMLFastHelperT::createAndSetParentAndDefine
}
template class T
-uno::Referencecss::xml::sax::XFastContextHandler
-OOXMLFastHelperT::createAndSetParentRef
-(OOXMLFastContextHandler * pHandler, sal_uInt32 nToken,
- const css::uno::Reference css::xml::sax::XFastAttributeList Attribs)
-{
-#ifdef DEBUG_HELPER
-debug_logger-startElement(helper.createAndSetParentRef);
-debug_logger-attribute(context, pHandler-getType());
-debug_logger-attribute(type, fastTokenToId(nToken));
-#endif
-
-boost::shared_ptrOOXMLFastContextHandler pTmp(new T(pHandler));
-
-css::uno::Referencecss::xml::sax::XFastContextHandler xChild =
-pTmp-createFastChildContext(nToken, Attribs);
-
-if (xChild.is())
-{
-OOXMLFastContextHandler* pResult =
dynamic_castOOXMLFastContextHandler *(xChild.get());
-pResult-setToken(nToken);
-pResult-setParent(pHandler);
-}
-
-
-#ifdef DEBUG_HELPER
-debug_logger-startElement(created);
-debug_logger-addTag(pTmp-toTag());
-debug_logger-endElement(created);
-debug_logger-endElement(helper.createAndSetParentRef);
-#endif
-
-return xChild;
-}
-
-template class T
void OOXMLFastHelperT::newProperty(OOXMLFastContextHandler * pHandler,
Id nId,
const OUString rValue)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: NPAPI-based features in LO
On Thu, 2014-06-05 at 09:29 +0200, Stephan Bergmann wrote: What is our rough consensus on these features? I wonders what happens under wayland with these NPAPI things and firefox ? Are they still going to work. re, the features themselves I still see people using the LibreOffice plugin for Firefox, not no much the (rather odd) arbitrary mozilla plugins inside LibreOffice C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] Tag libreoffice-4.3.0.0.beta2-buildfix1 created (on branch libreoffice-4-3)
Hi all, The tag libreoffice-4.3.0.0.beta2-buildfix1 (AKA 4.3.0 Beta2) has been created on the libreoffice-4-3 brannch. The branch will be used for fine tuning of the 4.3 codeline. See https://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.0_release for the detailed schedule of the 4.3.0 release. Master will be used for development of LibreOffice 4.4.x The following rules apply: + 4.3.0 beta phase: + any bug fixes are allowed without review + late features need approval by 3 people with different affiliation + 4.3.0 rc phase and later: + fixes need approval by one reviewer + late features need approval by 3 more people with different affiliation IMPORTANT: Every developer is responsible for pushing the fixes into all appropriate branches. Note that we do not plan any merge from this branch to master or vice versa. Please, help use to make stable and usable release. If you want to build something cool, unstable, and risky, use master. The 'libreoffice-4-2' branch is still active and will be used for the 4.2.5 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.5_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-3 origin/libreoffice-4-3 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.3.0.0.beta2-buildfix1 libreoffice-4.3.0.0.beta2-buildfix1 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-3 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.3.0 Beta1 The -buildfix1 tag fixes a buildproblem with a failing check on windows and replaces the (not-announced and not used otherwise) tag libreoffice-4.3.0.0.beta2 Happy hacking, Christian bnc#467278 introduce a warning that changes to VBA macros cannot be saved. [Luboš Luňák, Jan Holesovsky] bnc#822625 related Cache minimum height for table cells. [Matúš Kukan] bnc#823675 (related: RTF import: get rid of hacks for \f in LISTLEVEL [Michael Stahl] bnc#863018 WW8 import: fix upper margin of multi-page floating table [Miklos Vajna] bnc#870237 wrong text position in grouped list [Zolnai Tamás] bnc#875717 handle direct formatting for numbering in .docx [Luboš Luňák] bnc#875718 discard more header/footer stuff when discarding headers/footers [Luboš Luňák] bnc#878854 MSWord uses \xb for linebreaks in DB fields [Luboš Luňák] coverity#1078626 missing break in switch [Caolán McNamara] coverity#736074 missing break in switch [Caolán McNamara] cp#172 populate cache tables when updating all external links. [Kohei Yoshida] cp#177 set 'modified' document property more consistently. [Matúš Kukan] cp#178 replace \r\n with \n when pasting from X11 clipboard. [Matúš Kukan] fdo#42899 basic: if the library is not loaded fully, copy source storage [Michael Stahl] fdo#48017 WIN32 long path support in Hyphen and MyThes [László Németh] fdo#52547 paste preference is image, then html, then text. [Andrzej Hunt] fdo#56392 fix hyphenation (remove fix, except hard hyphen part) [László Németh] fdo#59882 oops, this reference can't be const. [Matúš Kukan] fdo#62719 set more relaxed clipping region. [Jan Holesovsky] fdo#64956 editeng: fix RTF color table export [Michael Stahl] fdo#65583 elements Dock window needs scroll bar [Thomas Arnhold] fdo#67685 basic: if the library is not loaded fully, copy source storage [Michael Stahl] fdo#67935 print on group change acted as print in first group instance [Lionel Elie Mamane] fdo#67937 print on group change defaults to TRUE [Lionel Elie Mamane] fdo#68983 revert remove #if 0 block (from ... [Michael Stahl] fdo#70455 B1:SOMENAME is not a valid singleton reference [Eike Rathke] fdo#71616 related Set correct BaseSize [Thomas Arnhold] fdo#73352 don't crash if clearWarnings throws an SQLException [Lionel Elie Mamane] fdo#75971 related Crash when invoking Insert Names Create [Julien Nabet] fdo#76324 use one static SvXMLTokenMap object, it's faster. [Matúš Kukan] fdo#76752 don't add the changes toolbar to the forms window, [Markus Mohrhard] fdo#76824 proper way to parse cell address strings. [Kohei Yoshida] fdo#76953 cannot start show at selected slide [Zolnai Tamás] fdo#77206 CRASH printing with all applications on windows [Caolán McNamara] fdo#77282 replace Edit Group with Enter Group in Writer as in Draw [Laurent Balland-Poirier] fdo#77313 coinmp: error: format
coverity tips
a) MISSING_BREAK
if the missing break is intentional coverity only warns if there is
content in the case statement and the last line is not a comment, i.e.g
case foo:
case bar:
...code...
break;
doesn't warn
case foo:
... code ...
case bar:
...code...
break;
does warn and can be silenced by...
case foo:
... code ...
//a comment, e.g. fall-through
case bar:
...code...
break;
b) multiple copies of an issue
Some of the coverity warnings like uninit_ctor will have an instance
count, e.g. two ctors, both don't init a member and there is *1*
coverity bug with (2) in the count column. I found a pile of fixed bugs
that hadn't disappeared automatically where we had only fixed one of the
instances. Watch out for that when fixing those warnings.
c) UNHANDLED_EXCEPTION
coverity is only looking at what the exception specification is and what
throw statements exist in the method. i.e. its not examining the logic
so...
void bar(bool bThrow) throw (foo)
{
if (bThrow)
throw foo();
}
int foo throw()
{
bar(false);
}
will generate a warning, even though bar is only called with false and
the exception cannot be thrown. Generally I've been reworking those to
keep coverity happy by having two different methods, a throwing one and
a non-throwing one instead of a combined one with a throw/no-throw flag.
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on||79673 -- 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
QA Meeting Minutes -- 2014-06-04
Hi all, Thanks for the great QA Meeting. Meeting minutes are available here: https://wiki.documentfoundation.org/QA/Meetings/2014/June_04 Our next meeting will be in two weeks on June 18th (17:30 UTC). Please feel free to add new items to the agenda here: https://wiki.documentfoundation.org/QA/Meetings/2014/June_18 Cheers, --R -- Robinson Tryon LibreOffice Community Outreach Herald Senior QA Bug Wrangler The Document Foundation qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: coverity tips
On 06/05/2014 12:02 PM, Caolán McNamara wrote:
c) UNHANDLED_EXCEPTION
coverity is only looking at what the exception specification is and what
throw statements exist in the method. i.e. its not examining the logic
so...
void bar(bool bThrow) throw (foo)
{
if (bThrow)
throw foo();
}
int foo throw()
{
bar(false);
}
will generate a warning
...even in such a simple scenario? Isn't that a serious bug in coverity
then?
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/ndcopy.cxx | 35 ++-
1 file changed, 34 insertions(+), 1 deletion(-)
New commits:
commit 00a007be5ad88bac9905b373bc5e02d02acab11a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 5 10:46:16 2014 +0200
SwDoc::CopyFlyInFlyImpl: handle textboxes
When the RES_CNTNT of a fly format (used as a textbox) changes, we also
have to update the draw format as well.
CppunitTest_sw_ooxmlimport's testMissingPath is a reproducer for this
problem: the shape (having a textbox) is anchored inside a table, and
the table gets converted into a TextFrame. Without this fix then the
shape still refers to the content before moving, leading to a crash on
loading the document.
Change-Id: I16e2e49dc718f2a4cb00d02513af3dca37b2a65a
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 624bbc2..270e2c9 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -46,6 +46,7 @@
#include SwNodeNum.hxx
#include set
#include vector
+#include textboxhelper.hxx
#include boost/foreach.hpp
#ifdef DBG_UTIL
@@ -1414,9 +1415,21 @@ void SwDoc::CopyFlyInFlyImpl(
::std::set _ZSortFly aSet;
sal_uInt16 nArrLen = GetSpzFrmFmts()-size();
+// Old textbox - old shape map.
+std::mapconst SwFrmFmt*, const SwFrmFmt* aOldTextBoxes;
+
+for (size_t i = 0; i GetSpzFrmFmts()-size(); ++i)
+{
+SwFrmFmt* pFmt = (*GetSpzFrmFmts())[i];
+if (pFmt-Which() != RES_DRAWFRMFMT)
+continue;
+if (SwFrmFmt* pTextBox = SwTextBoxHelper::findTextBox(pFmt))
+aOldTextBoxes[pTextBox] = pFmt;
+}
+
for ( sal_uInt16 n = 0; n nArrLen; ++n )
{
-SwFrmFmt const*const pFmt = (*GetSpzFrmFmts())[n];
+SwFrmFmt* pFmt = (*GetSpzFrmFmts())[n];
SwFmtAnchor const*const pAnchor = pFmt-GetAnchor();
SwPosition const*const pAPos = pAnchor-GetCntntAnchor();
bool bAtCntnt = (pAnchor-GetAnchorId() == FLY_AT_PARA);
@@ -1475,7 +1488,13 @@ void SwDoc::CopyFlyInFlyImpl(
}
}
if( bAdd )
+{
+// Make sure draw formats don't refer to content, so that such
+// content can be removed without problems.
+if (pFmt-Which() == RES_DRAWFRMFMT)
+pFmt-ResetFmtAttr(RES_CNTNT);
aSet.insert( _ZSortFly( pFmt, pAnchor, nArrLen + aSet.size()
));
+}
}
}
@@ -1626,6 +1645,20 @@ void SwDoc::CopyFlyInFlyImpl(
}
}
}
+
+// Re-create content property of draw formats, knowing how old shapes
+// were paired with old fly formats (aOldTextBoxes) and that aSet is
+// parallel with aVecSwFrmFmt.
+size_t i = 0;
+for (std::set_ZSortFly::iterator aSetIt = aSet.begin(); aSetIt !=
aSet.end(); ++aSetIt, ++i)
+{
+std::mapconst SwFrmFmt*, const SwFrmFmt*::iterator aDrawIt =
aOldTextBoxes.find(aSetIt-GetFmt());
+if (aDrawIt != aOldTextBoxes.end())
+{
+size_t nDrawIndex = std::distance(aOldTextBoxes.begin(),
aDrawIt);
+
aVecSwFrmFmt[nDrawIndex]-SetFmtAttr(aVecSwFrmFmt[i]-GetCntnt());
+}
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 47800] Most of the predefined autotexts are missing in czech language
https://bugs.freedesktop.org/show_bug.cgi?id=47800 David Tardon dtar...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED CC||dtar...@redhat.com -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: NPAPI-based features in LO
On 05/06/14 11:55, Caolán McNamara wrote: On Thu, 2014-06-05 at 09:29 +0200, Stephan Bergmann wrote: What is our rough consensus on these features? I wonders what happens under wayland with these NPAPI things and firefox ? Are they still going to work. the NPAPI exposes an X Display connection... so if this is going to work in Wayland then Mozilla needs to extend the NPAPI interface for it and: for (1), browsers need to actually ship an NPAPI implementation with Wayland support. given postings such as this from a senior Mozilla developer maybe that will not happen: http://robert.ocallahan.org/2011/11/end-of-plugins.html Chromium has already removed support for NPAPI: http://blog.chromium.org/2013/09/saying-goodbye-to-our-old-friend-npapi.html for (2) browser *plug-ins* (i.e. Flash, surely nobody embeds anything other than that?) need to actually ship with Wayland support; iirc NPAPI Flash on Linux is already currently not supported any more and you have to use Google Chrome to get a (non-NPAPI based) Flash on Linux. so even if (1) is solved, (2) is not going to happen. ah this says NPAPI Flash on Linux is only getting security updates until 2017: http://blogs.adobe.com/flashplayer/2012/02/adobe-and-google-partnering-for-flash-player-on-linux.html re, the features themselves I still see people using the LibreOffice plugin for Firefox, not no much the (rather odd) arbitrary mozilla plugins inside LibreOffice regarding (1) the feature appears somewhat questionable to me from a security point of view; since we don't automatically update LO installations in the way that browser vendors do, so users are likely to have an outdated LO exposed via the browser; do browsers nowadays sand-box plug-ins appropriately? can the LO plug-in even be sand-boxed? at least nowadays the user actually has to click something before the plug-in gets loaded: https://blog.mozilla.org/security/2013/01/29/putting-users-in-control-of-plugins/ (fortunately (1) is not enabled by default by LO installation and requires explicit user action to turn on) regarding (2) the problem is that users could have created documents that contain embedded plug-ins, and if the feature is removed then those documents are effectively broken. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ucb/Library_ucpdav1.mk
ucb/Library_ucpdav1.mk |1 + 1 file changed, 1 insertion(+) New commits: commit acaf8eb33b40564a498167ef338f5e7dfcd2f453 Author: Tor Lillqvist t...@collabora.com Date: Thu Jun 5 11:57:49 2014 +0300 apr uses iconv Change-Id: Ic92ab1c2b5298cd1611bc9786647fe30ad0847a9 diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 51225d2..0dae22f 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ $(eval $(call gb_Library_add_libs,ucpdav1,\ $(if $(filter $(OS),LINUX),-lpthread) \ + $(if $(filter $(OS),MACOSX),-liconv) \ )) $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryExternal.mk ucb/Library_ucpdav1.mk
RepositoryExternal.mk |2 ++ ucb/Library_ucpdav1.mk |5 - 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 5cf2205387a8df61329196241397dfde42d85f7c Author: Michael Stahl mst...@redhat.com Date: Thu Jun 5 13:35:14 2014 +0200 ucb: move APR dependencies to gb_LinkTarget__use_apr Change-Id: I6768e5f2400f3020d85c48b80d58e13a3f6f07e9 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9e20991..640452d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ $(APR_LIBS) \ + $(if $(filter $(OS),LINUX),-lpthread) \ + $(if $(filter $(OS),MACOSX),-liconv) \ ) ifeq ($(SYSTEM_APR),) diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 0dae22f..f6e8a62 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -67,11 +67,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ zlib \ )) -$(eval $(call gb_Library_add_libs,ucpdav1,\ - $(if $(filter $(OS),LINUX),-lpthread) \ - $(if $(filter $(OS),MACOSX),-liconv) \ -)) - $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ ucb/source/ucp/webdav/AprEnv \ ucb/source/ucp/webdav/ContentProperties \ ___ 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' - 2 commits - RepositoryExternal.mk ucb/Library_ucpdav1.mk
RepositoryExternal.mk |2 ++ ucb/Library_ucpdav1.mk |4 2 files changed, 2 insertions(+), 4 deletions(-) New commits: commit d1820ecefc5f28e854f9ff8ae1045732bbe23503 Author: Michael Stahl mst...@redhat.com Date: Thu Jun 5 13:35:14 2014 +0200 ucb: move APR dependencies to gb_LinkTarget__use_apr Change-Id: I6768e5f2400f3020d85c48b80d58e13a3f6f07e9 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9e20991..640452d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ $(APR_LIBS) \ + $(if $(filter $(OS),LINUX),-lpthread) \ + $(if $(filter $(OS),MACOSX),-liconv) \ ) ifeq ($(SYSTEM_APR),) diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 0dae22f..f6e8a62 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -67,11 +67,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ zlib \ )) -$(eval $(call gb_Library_add_libs,ucpdav1,\ - $(if $(filter $(OS),LINUX),-lpthread) \ - $(if $(filter $(OS),MACOSX),-liconv) \ -)) - $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ ucb/source/ucp/webdav/AprEnv \ ucb/source/ucp/webdav/ContentProperties \ commit 1b09c2439087cbe827c8470cb6fd7a045e5e4a76 Author: Tor Lillqvist t...@collabora.com Date: Thu Jun 5 11:57:49 2014 +0300 apr uses iconv Change-Id: Ic92ab1c2b5298cd1611bc9786647fe30ad0847a9 diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 51225d2..0dae22f 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ $(eval $(call gb_Library_add_libs,ucpdav1,\ $(if $(filter $(OS),LINUX),-lpthread) \ + $(if $(filter $(OS),MACOSX),-liconv) \ )) $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ ___ 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' - distro-configs/CPOSX.conf instsetoo_native/CustomTarget_install.mk
distro-configs/CPOSX.conf|5 +++-- instsetoo_native/CustomTarget_install.mk |4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) New commits: commit 72c366ec2031d7de09428d38361c417008ee5a45 Author: Andras Timar andras.ti...@collabora.com Date: Tue Jun 3 11:29:52 2014 +0200 LibreOffice from Collabora OS X CPOSX.conf: --with-package-format=dmg CPOSX.conf: re-add 'el' CPOSX.conf: re-add 'sr-Latn' and myspell dicts Multilingual Mac OS X DMG for Collabora Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2 diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf index 2e31ca8..3413d6c 100644 --- a/distro-configs/CPOSX.conf +++ b/distro-configs/CPOSX.conf @@ -3,6 +3,7 @@ --without-junit --with-help --with-helppack-integration +--with-myspell-dicts --enable-extension-integration --disable-online-update --disable-odk @@ -14,7 +15,7 @@ --enable-ext-nlpsolver --enable-ext-numbertext --enable-ext-ct2n ---enable-ext-google-docs --enable-ext-languagetool --enable-release-build ---with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sv ta te tr uk vi zh-CN zh-TW +--with-package-format=dmg +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index ea03413..3febfad 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -110,7 +110,7 @@ ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk endif else # LIBO_TEST_INSTALL - $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT)) + $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT MACOSX,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT)) ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT)) endif @@ -118,7 +118,7 @@ ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS))) $(foreach lang,$(gb_HELP_LANGS),\ $(call instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT))) endif -ifneq (WNT,$(OS)) +ifeq (,$(filter WNT MACOSX,$(OS))) $(foreach lang,$(instsetoo_native_WITH_LANG),\ $(call instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT))) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sw/source
sw/source/core/crsr/viscrs.cxx| 16
sw/source/core/inc/rootfrm.hxx|4
sw/source/core/layout/trvlfrm.cxx | 892 ++
sw/source/ui/wrtsh/wrtsh2.cxx |5
4 files changed, 453 insertions(+), 464 deletions(-)
New commits:
commit ec7fc735e031f643e324b0924a1f2ca753cb314d
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Jun 5 10:49:57 2014 +
125050: correct text range for comment/annotation at a table cell selection
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 77d16e5..207e553 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -100,7 +100,10 @@ void SwWrtShell::Insert( SwField rFld )
GetTblCrs()-Normalize( sal_False );
const SwPosition rStartPos(
*(GetTblCrs()-GetMark()-nNode.GetNode().GetCntntNode()), 0 );
KillPams();
-EndPara();
+if ( !IsEndOfPara() )
+{
+EndPara();
+}
const SwPosition rEndPos( *GetCurrentShellCursor().GetPoint()
);
pAnnotationTextRange = new SwPaM( rStartPos, rEndPos );
}
commit d74e7cd245a570b9bf223424146afc58ce6811ca
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Jun 5 10:37:14 2014 +
125024: minor follow-up to the fix - remove (German) comment
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 998136d..117bc21 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1982,9 +1982,6 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor rTblCrsr )
* Ende nach links erweitern, bis Frame-Start Rect berechnen
* und bei mehr als 2 Frames von allen dazwischen liegenden
* Frames die PrtArea dazu.
- * 4. Wenn es sich um eine Tabellenselektion handelt wird fuer jeden
- * PaM im Ring der CellFrm besorgt, dessen PrtArea wird zu den
- * Rechtecken addiert.
*
* Grosser Umbau wg. der FlyFrm; denn diese muessen ausgespart werden.
* Ausnahmen: - Der Fly in dem die Selektion stattfindet (wenn sie in einem Fly
commit 65f39887f41e701b699fd2e51da803d116766eb8
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Jun 5 10:06:45 2014 +
125024: SwRootFrm::CalcFrmRects(..) - remove code regarding table selection
as it is not used any more.
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 62f2072..ac396dd 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -815,13 +815,15 @@ void SwShellCrsr::SetMark()
void SwShellCrsr::FillRects()
{
// die neuen Rechtecke berechnen
-if( HasMark()
-GetPoint()-nNode.GetNode().IsCntntNode()
-GetPoint()-nNode.GetNode().GetCntntNode()-getLayoutFrm(
GetShell()-GetLayout() )
-(GetMark()-nNode == GetPoint()-nNode ||
-(GetMark()-nNode.GetNode().IsCntntNode()
-GetMark()-nNode.GetNode().GetCntntNode()-getLayoutFrm(
GetShell()-GetLayout() ) )))
-GetShell()-GetLayout()-CalcFrmRects( *this,
GetShell()-IsTableMode() ); //swmod 071107//swmod 071225
+if ( HasMark()
+ GetPoint()-nNode.GetNode().IsCntntNode()
+ GetPoint()-nNode.GetNode().GetCntntNode()-getLayoutFrm(
GetShell()-GetLayout() )
+ ( GetMark()-nNode == GetPoint()-nNode
+ || ( GetMark()-nNode.GetNode().IsCntntNode()
+GetMark()-nNode.GetNode().GetCntntNode()-getLayoutFrm(
GetShell()-GetLayout() ) ) ) )
+{
+GetShell()-GetLayout()-CalcFrmRects( *this );
+}
}
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 073bc99..07bddbd 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -268,9 +268,7 @@ public:
// next page border
const SwPageFrm* GetPageAtPos( const Point rPt, const Size* pSize = 0,
bool bExtend = false ) const;
-void CalcFrmRects(
-SwShellCrsr,
-const sal_Bool bIsTblSel );
+void CalcFrmRects( SwShellCrsr );
// Calculates the cells included from the current selection
// false: There was no result because of an invalid layout
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 945dec2..998136d 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2006,8 +2006,7 @@ inline void Sub( SwRegionRects rRegion, const SwRect
rRect )
}
void SwRootFrm::CalcFrmRects(
-SwShellCrsr rCrsr,
-const sal_Bool bIsTblMode )
+SwShellCrsr rCrsr )
{
SwPosition *pStartPos = rCrsr.Start(),
*pEndPos = rCrsr.GetPoint() == pStartPos ? rCrsr.GetMark() :
rCrsr.GetPoint();
@@ -2051,523 +2050,513 @@ void SwRootFrm::CalcFrmRects(
}
}
-//Fall 4: Tabellenselection
-if( bIsTblMode )
-{
-const SwFrm *pCell =
[Libreoffice-commits] core.git: 20 commits - connectivity/source dbaccess/source filter/source hwpfilter/source sc/source sd/source sfx2/source svtools/source svx/source sw/source toolkit/source
connectivity/source/parse/sqlnode.cxx |1 +
dbaccess/source/ui/misc/HtmlReader.cxx|1 +
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |1 +
dbaccess/source/ui/tabledesign/TableDesignControl.cxx |1 +
filter/source/graphicfilter/ios2met/ios2met.cxx |2 ++
filter/source/graphicfilter/ipbm/ipbm.cxx |3 +++
filter/source/msfilter/svdfppt.cxx|2 ++
hwpfilter/source/formula.cxx |2 ++
hwpfilter/source/hwpreader.cxx|2 ++
sc/source/filter/dif/difimp.cxx |1 +
sc/source/filter/excel/excform.cxx|4
sc/source/ui/formdlg/dwfunctr.cxx |2 +-
sd/source/core/drawdoc4.cxx |1 +
sfx2/source/control/thumbnailview.cxx |1 +
svtools/source/svhtml/parhtml.cxx |1 +
svx/source/fmcomp/gridctrl.cxx|1 +
sw/source/filter/html/swhtml.cxx |1 +
toolkit/source/awt/vclxwindows.cxx|2 +-
18 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit 231ae9c77c67197bba23efd2a7fd1c8b79926765
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 10:36:22 2014 +0100
coverity#1158175 Missing break in switch, assuming its intentional
Change-Id: Ia0f1951f1e3edcd858a37ea091550feb2b9fd451
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index 739..af21509 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -502,6 +502,7 @@ void
OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer rString, const
}
bHandled = true;
}
+//fall-through
case odbc_call_spec:
case subquery:
case term:
commit 32c37a7ae0b369356af0036fd22fd9c56d1a4a6f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 10:33:49 2014 +0100
coverity#1103693 Missing break in switch, assuming its intentional
Change-Id: Ie61305f367e2a07a61599433bd83e1ea13bffd71
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx
b/dbaccess/source/ui/misc/HtmlReader.cxx
index c57a852..67556a3 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -148,6 +148,7 @@ void OHTMLReader::NextToken( int nToken )
}
}
}
+//fall-through
case HTML_THEAD_ON:
case HTML_TBODY_ON:
{
commit c2ddb22da9aaa208d7e4226c21ea16b2ad3b07a9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 10:24:30 2014 +0100
coverity#1103692 Missing break in switch, assuming its intentional
Change-Id: I32450546541b15a974f28a78604a136cebb71c3c
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 9521a19..1319faa 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1229,6 +1229,7 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_UNKNOWNCONTROL_OFF:
if( aUnknownToken != sSaveToken )
return;
+//fall-through
case HTML_FRAMESET_ON:
case HTML_HEAD_OFF:
case HTML_BODY_ON:
commit a2d2c6d6bdc328683d959573404e6d0d405c75f0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 10:23:27 2014 +0100
coverity#1103688 Missing break in switch, assuming its intentional
Change-Id: I9b619e4896d811c2fbb20e229f65bfa01bd05731
diff --git a/svtools/source/svhtml/parhtml.cxx
b/svtools/source/svhtml/parhtml.cxx
index c9d70c9..7b04001 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1599,6 +1599,7 @@ int HTMLParser::FilterPRE( int nToken )
// in Netscape they only have impact in not empty paragraphs
case HTML_PARABREAK_ON:
nToken = HTML_LINEBREAK;
+//fall-through
case HTML_LINEBREAK:
case HTML_NEWPARA:
nPre_LinePos = 0;
commit 2484cda486334841fdfe92c82a8a7bf026e28768
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 10:19:11 2014 +0100
coverity#1000658 Missing break in switch, assuming its intentional
Change-Id: Id208942e98c8b8fc685aa77c3c11468ed2af832d
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index a392075..c34e2b6 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -621,6 +621,7 @@ void ThumbnailView::KeyInput( const KeyEvent rKEvt )
if ( bFoundLast )
OnItemDblClicked( mFilteredItemList[nLastPos] );
}
+//fall-through
default:
Control::KeyInput( rKEvt );
}
commit abf842e4b125b9f863ea4c2af17ad6ac7d82b15e
[Libreoffice-commits] core.git: sw/source
sw/source/ui/fmtui/tmpdlg.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 655377e90c57bb68e5000f06f76531baf9eeaa37
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 13:49:14 2014 +0100
Resolves: rhbz#1096747 crash/hang on format-page on html document
Change-Id: I9a989620375eb210e553b84b7a642a0360c8f03f
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 0d346b2..b411bb2 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -296,6 +296,13 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
if(!aCJKOptions.IsAsianTypographyEnabled())
RemoveTabPage(textgrid);
}
+else
+{
+RemoveTabPage(borders);
+RemoveTabPage(columns);
+RemoveTabPage(footnotes);
+RemoveTabPage(textgrid);
+}
}
break;
// numbering styles
___
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/ui/fmtui/tmpdlg.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 829aa9e03ae570e15af1f754b292709f38f643ea
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 13:49:14 2014 +0100
Resolves: rhbz#1096747 crash/hang on format-page on html document
Change-Id: I9a989620375eb210e553b84b7a642a0360c8f03f
(cherry picked from commit 655377e90c57bb68e5000f06f76531baf9eeaa37)
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index a6bed35..823c376 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -299,6 +299,13 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
if(!aCJKOptions.IsAsianTypographyEnabled())
RemoveTabPage(textgrid);
}
+else
+{
+RemoveTabPage(borders);
+RemoveTabPage(columns);
+RemoveTabPage(footnotes);
+RemoveTabPage(textgrid);
+}
}
break;
// numbering styles
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANNOUNCE] Tag sdremote-2.1.1 (in repository impress_remote) created
Hi all, The tag sdremote-2.1.1 (aka v11) has been created in the impress_remote repository. https://gerrit.libreoffice.org/gitweb?p=impress_remote.git;a=summary It is a minor update to the previous version that includes updated translations and action-bar buttons to turn on/off the pointer-feature. you can install the binary using playstore https://play.google.com/store/apps/details?id=org.libreoffice.impressremote or sideload it from http://downloadarchive.documentfoundation.org/libreoffice/old/sdremote-2.1.1/playstore/ A sourcetarball is available here: http://downloadarchive.documentfoundation.org/libreoffice/old/sdremote-2.1.1/src/ Happy hacking, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Impress Remote for Android version 2.1.1 available
Hi *, A new version of the LibreOffice Impress Remote for Android has been uploaded to Google play https://play.google.com/store/apps/details?id=org.libreoffice.impressremote If you don't want to use google play (or cannot), you can sidelode the remote via http://downloadarchive.documentfoundation.org/libreoffice/old/sdremote-2.1.1/playstore/ImpressRemote.apk Besides updated translations, version 2.1.1 adds actionbar buttons to turn on/off the pointer feature of the remote. Thanks to Ahmad H. Al Harthi and all translators ( https://translations.documentfoundation.org/about/contributors/ ) for their contributions to this update. Information on participating in pre-release tests: If you are a member of the LibreOffice community on google+ ( https://plus.google.com/communities/105920160642200595669 ) you can opt-in as a tester (via https://play.google.com/apps/testing/org.libreoffice.impressremote ), in order to automatically get the updates for alpha and beta versions via google play. You can opt-out using the same URL. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sfx2/source xmloff/source
sfx2/source/sidebar/SidebarDockingWindow.cxx |5 ++
xmloff/source/draw/sdpropls.cxx |9 ++--
xmloff/source/text/txtprmap.cxx | 53 +++
3 files changed, 38 insertions(+), 29 deletions(-)
New commits:
commit 35f3ceaf60f109f45aa7fef7077aead398bed53f
Author: Armin Le Grand a...@apache.org
Date: Thu Jun 5 12:24:35 2014 +
i125045 For XMLPropertyMapper using TEXT_PROP_MAP_SHAPE_PARA hide the
DrawingLayer FillStyle entries by moving them to the front of aXMLParaPropMap
and using a higher index for construction
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 3bb2b72..bcad202 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -123,12 +123,11 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
GMAP( FillHatchName, XML_NAMESPACE_DRAW,
XML_FILL_HATCH_NAME,XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT,
CTF_FILLHATCHNAME ),
GMAP( FillBackground, XML_NAMESPACE_DRAW,
XML_FILL_HATCH_SOLID, XML_TYPE_BOOL, 0 ),
GMAP( FillBitmapName, XML_NAMESPACE_DRAW,
XML_FILL_IMAGE_NAME,XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT,
CTF_FILLBITMAPNAME ),
-GMAP( FillTransparence, XML_NAMESPACE_DRAW, XML_OPACITY,
XML_TYPE_NEG_PERCENT16|MID_FLAG_MULTI_PROPERTY, 0 ),// exists in
SW, too
-GMAP( FillTransparenceGradientName, XML_NAMESPACE_DRAW,
XML_OPACITY_NAME, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT,
CTF_FILLTRANSNAME ),
-
-GMAP( FillBitmapSizeX,XML_NAMESPACE_DRAW,
XML_FILL_IMAGE_WIDTH, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY,
0 ),
+GMAP( FillTransparence, XML_NAMESPACE_DRAW, XML_OPACITY,
XML_TYPE_NEG_PERCENT16|MID_FLAG_MULTI_PROPERTY, 0 ),// exists
in SW, too
+GMAP( FillTransparenceGradientName, XML_NAMESPACE_DRAW,
XML_OPACITY_NAME, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT,
CTF_FILLTRANSNAME ),
+GMAP( FillBitmapSizeX,XML_NAMESPACE_DRAW,
XML_FILL_IMAGE_WIDTH, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY,
0 ),
GMAP( FillBitmapLogicalSize, XML_NAMESPACE_DRAW,
XML_FILL_IMAGE_WIDTH, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0
),
-GMAP( FillBitmapSizeY,XML_NAMESPACE_DRAW,
XML_FILL_IMAGE_HEIGHT, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY,
0 ),
+GMAP( FillBitmapSizeY,XML_NAMESPACE_DRAW,
XML_FILL_IMAGE_HEIGHT, XML_SD_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY,
0 ),
GMAP( FillBitmapLogicalSize, XML_NAMESPACE_DRAW,
XML_FILL_IMAGE_HEIGHT, XML_SD_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0
),
GMAP( FillBitmapMode, XML_NAMESPACE_STYLE,XML_REPEAT,
XML_SD_TYPE_BITMAP_MODE|MID_FLAG_MULTI_PROPERTY, 0 ),
GMAP( FillBitmapPositionOffsetX, XML_NAMESPACE_DRAW,
XML_FILL_IMAGE_REF_POINT_X, XML_TYPE_PERCENT, 0 ),
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index e1d2205..3604f89 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -87,6 +87,31 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
{
// RES_UNKNOWNATR_CONTAINER
MP_E( ParaUserDefinedAttributes, TEXT, XMLNS,
XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
+
+// fill attributes for paragraph backgrounds
+// #125045# moved to the front to be able to exclude these in
lcl_txtprmap_getMap
+// for TEXT_PROP_MAP_SHAPE_PARA to not have these double for Shapes (which
already have these)
+GMAP( FillStyle, XML_NAMESPACE_DRAW, XML_FILL,
XML_SW_TYPE_FILLSTYLE, 0 ),
+GMAP( FillColor, XML_NAMESPACE_DRAW,
XML_FILL_COLOR, XML_TYPE_COLOR, 0 ),
+GMAP( FillColor2, XML_NAMESPACE_DRAW,
XML_SECONDARY_FILL_COLOR, XML_TYPE_COLOR, 0 ),
+GMAP( FillGradientName, XML_NAMESPACE_DRAW,
XML_FILL_GRADIENT_NAME, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT,
CTF_FILLGRADIENTNAME ),
+GMAP( FillGradientStepCount, XML_NAMESPACE_DRAW,
XML_GRADIENT_STEP_COUNT,XML_TYPE_NUMBER16, 0 ),
+GMAP( FillHatchName, XML_NAMESPACE_DRAW,
XML_FILL_HATCH_NAME,XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT,
CTF_FILLHATCHNAME ),
+GMAP( FillBackground, XML_NAMESPACE_DRAW,
XML_FILL_HATCH_SOLID, XML_TYPE_BOOL, 0 ),
+GMAP( FillBitmapName, XML_NAMESPACE_DRAW,
XML_FILL_IMAGE_NAME,XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT,
CTF_FILLBITMAPNAME ),
+GMAP( FillTransparence, XML_NAMESPACE_DRAW, XML_OPACITY,
XML_TYPE_NEG_PERCENT16|MID_FLAG_MULTI_PROPERTY, 0 ),// exists
in SW, too
+GMAP(
[Libreoffice-commits] core.git: sw/inc sw/Library_sw.mk sw/source
sw/Library_sw.mk|1
sw/inc/ToxTextGenerator.hxx | 59
sw/inc/tox.hxx |5
sw/source/core/doc/doctxm.cxx | 362 +-
sw/source/core/tox/ToxTextGenerator.cxx | 379
sw/source/core/tox/tox.cxx |6
6 files changed, 462 insertions(+), 350 deletions(-)
New commits:
commit 4ed0c3dd4e71275b7018d86bc71f8a935219aeae
Author: Tobias Lippert d...@fastmail.fm
Date: Sun Jun 1 14:13:28 2014 +0200
Extract TOX text generation to its own source file
The separate source file will make it easier to unit test the functionality
Also: move some constants to tox.hxx to have them available in the new
source file
Conflicts:
sw/source/core/doc/doctxm.cxx
Change-Id: Ib0369cc4875043829f55d30a549997560a38cc35
Reviewed-on: https://gerrit.libreoffice.org/9607
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index d9eecf0..c9804a0 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -388,6 +388,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/tox/tox \
sw/source/core/tox/toxhlp \
sw/source/core/tox/txmsrt \
+sw/source/core/tox/ToxTextGenerator \
sw/source/core/txtnode/SwGrammarContact \
sw/source/core/txtnode/atrfld \
sw/source/core/txtnode/atrflyin \
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
new file mode 100644
index 000..6a5dbd9
--- /dev/null
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * 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 .
+ */
+
+#ifndef SW_TOXTEXTGENERATOR_HXX_
+#define SW_TOXTEXTGENERATOR_HXX_
+
+#include sal/types.h
+#include swdllapi.h
+#include vector
+
+class SwDoc;
+class SwForm;
+class SwPageDesc;
+class SwTOXSortTabBase;
+
+namespace sw {
+
+class SW_DLLPUBLIC ToxTextGenerator
+{
+public:
+ToxTextGenerator(const SwForm toxForm)
+: mToxForm(toxForm)
+{}
+/** Generate the text for an entry of a table of X (X is, e.g., content).
+ *
+ * This method will process the entries in @p entries, starting at @p
indexOfEntryToProcess and
+ * process @p numberOfEntriesToProcess entries.
+ */
+void
+GenerateText(SwDoc *doc, const std::vectorSwTOXSortTabBase* entries,
+ sal_uInt16 indexOfEntryToProcess, sal_uInt16
numberOfEntriesToProcess,
+ sal_uInt32 _nTOXSectNdIdx, const SwPageDesc*
_pDefaultPageDesc);
+
+
+private:
+const SwForm mToxForm;
+};
+
+}
+
+#endif /* SW_TOXTEXTGENERATOR_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 86565af..375a27b 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -43,6 +43,11 @@ class SwDoc;
class SwTOXMarks : public std::vectorSwTOXMark* {};
// Entry of content index, alphabetical index or user defined index
+
+extern const sal_Unicode C_NUM_REPL;
+extern const sal_Unicode C_END_PAGE_NUM;
+extern const OUString S_PAGE_DELI;
+
class SW_DLLPUBLIC SwTOXMark
: public SfxPoolItem
, public SwModify
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index bf5081f..6ea9279 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -64,28 +64,12 @@
#include editsh.hxx
#include scriptinfo.hxx
#include switerator.hxx
+#include ToxTextGenerator.hxx
using namespace ::com::sun::star;
-const sal_Unicode cNumRepl = '@';
-const sal_Unicode cEndPageNum = '~';
-const sal_Char sPageDeli[] = , ;
-
TYPEINIT2( SwTOXBaseSection, SwTOXBase, SwSection );// for RTTI
-struct LinkStruct
-{
-SwFmtINetFmtaINetFmt;
-sal_Int32 nStartTextPos, nEndTextPos;
-
-LinkStruct( const OUString rURL, sal_Int32 nStart, sal_Int32 nEnd )
-: aINetFmt( rURL, OUString()),
-nStartTextPos( nStart),
-nEndTextPos(nEnd) {}
-};
-
-typedef std::vectorLinkStruct* LinkStructArr;
-
sal_uInt16 SwDoc::GetTOIKeys(
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/docnode/nodedump.cxx |5 +
sw/source/core/layout/anchoreddrawobject.cxx |4
2 files changed, 9 insertions(+)
New commits:
commit 199eb08be994ef968eb38f4966bc27ef1756d382
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 5 16:25:01 2014 +0200
SwAnchoredDrawObject::GetObjBoundRect: avoid SwDoc::SetModified()
This is a const method, but it does a const_cast to still resize an
object... if that's so, then we should ensure that the is modified
flag of SwDoc is untouched.
CppunitTest_sw_ooxmlimport's testChartSize is a reproducer for this,
when shape text is imported as textbox.
Change-Id: I6dedb31520a14127ca91782874c285f6e0f93c65
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx
b/sw/source/core/layout/anchoreddrawobject.cxx
index 72f947e..1e011aa 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -655,9 +655,13 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
if ( nTargetWidth != aCurrObjRect.GetWidth( ) || nTargetHeight !=
aCurrObjRect.GetHeight( ) )
{
+SwDoc* pDoc = const_castSwDoc*(GetPageFrm()-GetFmt()-GetDoc());
+bool bModified = pDoc-IsModified();
const_cast SdrObject* ( GetDrawObj() )-Resize(
aCurrObjRect.TopLeft(),
Fraction( nTargetWidth, aCurrObjRect.GetWidth() ),
Fraction( nTargetHeight, aCurrObjRect.GetHeight() ), false
);
+if (!bModified)
+pDoc-ResetModified();
}
}
return GetDrawObj()-GetCurrentBoundRect();
commit 383cc9deee599a59ee2c8fcb15ab3ab6e1d9bee7
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 5 15:33:32 2014 +0200
SwDoc::dumpAsXml: show mbModified
Change-Id: I491d4af104453bb5ff3b55b28e3e1775d8aab8f7
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index fde49d7..0c40a8a 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -191,6 +191,11 @@ void SwDoc::dumpAsXml( xmlTextWriterPtr w )
mpRedlineTbl-dumpAsXml( writer );
mpExtraRedlineTbl-dumpAsXml( writer );
lcl_dumpSdrModel( writer, getIDocumentDrawModelAccess().GetDrawModel() );
+
+writer.startElement(mbModified);
+writer.writeFormatAttribute(value, TMP_FORMAT, mbModified);
+writer.endElement();
+
writer.endElement();
}
___
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/inc/interpre.hxx | 48
sc/source/core/tool/interpr1.cxx | 52 +--
2 files changed, 77 insertions(+), 23 deletions(-)
New commits:
commit 14ce27cc045bd9bcbbfa3eac56cd99f2be08de1f
Author: Eike Rathke er...@redhat.com
Date: Thu Jun 5 16:34:08 2014 +0200
unify the handling of string position arguments, fdo#75971 related
Only two text functions had the full set of checks as introduced by the
fix for fdo#75971. Let all text functions check their arguments in the
same way. Additionally this will ease a transition to accept string
lengths 64k in spreadsheet functions as now we have only one place that
checks for SAL_MAX_UINT16 instead of having that scattered all over the
place.
Change-Id: I454e617a59d0b3c2ca725047e7f8c7370bc0bb1f
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 6022c8e..642699a 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -368,6 +368,24 @@ void ScTableOp(); //
repeated operations
void SetMaxIterationCount(sal_uInt16 n);
inline void CurFmtToFuncFmt()
{ nFuncFmtType = nCurFmtType; nFuncFmtIndex = nCurFmtIndex; }
+
+/** Check if a double is suitable as string position or length argument.
+
+If fVal is Inf or NaN it is changed to -1, if it is less than 0 it is
+sanitized to 0, if it is greater than some implementation defined max
+string length it is sanitized to that max.
+
+@return TRUE if double value fVal is suitable as string argument and was
+not sanitized.
+FALSE if not and fVal was adapted.
+ */
+inline bool CheckStringPositionArgument( double fVal );
+
+/** Obtain a double suitable as string position or length argument.
+Returns -1 if the number is Inf or NaN or less than 0 or greater than some
+implementation defined max string length. */
+inline double GetStringPositionArgument();
+
// Check for String overflow of rResult+rAdd and set error and erase rResult
// if so. Return true if ok, false if overflow
inline bool CheckStringResultLen( OUString rResult, const OUString rAdd );
@@ -921,6 +939,36 @@ inline bool ScInterpreter::MustHaveParamCountMin( short
nAct, short nMin )
return false;
}
+inline bool ScInterpreter::CheckStringPositionArgument( double fVal )
+{
+if (!rtl::math::isFinite( fVal))
+{
+fVal = -1.0;
+return false;
+}
+else if (fVal 0.0)
+{
+fVal = 0.0;
+return false;
+}
+else if (fVal SAL_MAX_UINT16)
+{
+fVal = static_castdouble(SAL_MAX_UINT16);
+return false;
+}
+return true;
+}
+
+inline double ScInterpreter::GetStringPositionArgument()
+{
+double fVal = rtl::math::approxFloor( GetDouble());
+if (!CheckStringPositionArgument( fVal))
+{
+fVal = -1.0;
+}
+return fVal;
+}
+
inline bool ScInterpreter::CheckStringResultLen( OUString rResult, const
OUString rAdd )
{
if ( rResult.getLength() + rAdd.getLength() SAL_MAX_UINT16 )
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index bae7962..83393ca 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7761,11 +7761,10 @@ void ScInterpreter::ScReplace()
if ( MustHaveParamCount( GetByte(), 4 ) )
{
OUString aNewStr = GetString().getString();
-double fCount = ::rtl::math::approxFloor( GetDouble());
-double fPos = ::rtl::math::approxFloor( GetDouble());
+double fCount = GetStringPositionArgument();
+double fPos = GetStringPositionArgument();
OUString aOldStr = GetString().getString();
-if (fPos 1.0 || fPos static_castdouble(SAL_MAX_UINT16)
-|| fCount 0.0 || fCount
static_castdouble(SAL_MAX_UINT16))
+if (fPos 1.0 || fCount 0.0)
PushIllegalArgument();
else
{
@@ -7888,8 +7887,8 @@ void ScInterpreter::ScLeft()
sal_Int32 n;
if (nParamCount == 2)
{
-double nVal = ::rtl::math::approxFloor(GetDouble());
-if (rtl::math::isNan(nVal) || nVal 0.0 || nVal SAL_MAX_UINT16)
+double nVal = GetStringPositionArgument();
+if (nVal 0.0)
{
PushIllegalArgument();
return ;
@@ -7996,8 +7995,8 @@ void ScInterpreter::ScRightB()
sal_Int32 n;
if (nParamCount == 2)
{
-double nVal = ::rtl::math::approxFloor(GetDouble());
-if ( nVal 0.0 || nVal SAL_MAX_UINT16 )
+double nVal = GetStringPositionArgument();
+if ( nVal 0.0 )
{
PushIllegalArgument();
return ;
@@ -8047,8 +8046,8 @@ void ScInterpreter::ScLeftB()
sal_Int32 n;
if (nParamCount == 2)
{
-
[Libreoffice-commits] core.git: download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 94ec76a1061db6c2068e190e26035cf0c59e0f79 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 5 15:25:00 2014 +0100 update to openssl 1.0.1h Change-Id: Ie20c190e36e89a1b3b2ac9a0efaa50af2df77523 diff --git a/download.lst b/download.lst index 9b37e1b..1ac844c 100644 --- a/download.lst +++ b/download.lst @@ -108,7 +108,7 @@ export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz -export OPENSSL_TARBALL := de62b43dfcd858e66a74bee1c834e959-openssl-1.0.1g.tar.gz +export OPENSSL_TARBALL := 8d6d684a9430d5cc98a62a5d8fbda8cf-openssl-1.0.1h.tar.gz export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present + Cloph, David, Eike, Fridrich, Michael M, Stephan, Thorsten, Ptyl, Miklos Kendy, Markus, Bjoern, Robinson, Michael S, Caolan, Andras, floeff, Jacobo * Completed Action Items + talk to distro vendors wrt. commit access setup (Michael) + crashtest box - more research (Moggi/Cloph) [ new control script in pure python working nicely ]. + create / promote a 4.3 MAB for WinXP/Java issues (Cloph) [ was related to python init. now fixed ] + add link on Credits page (Cloph) https://translations.documentfoundation.org/about/contributors/ + create easy hack to find an auto-abandon config/setting for a gerrit (Bjoern) https://bugs.freedesktop.org/show_bug.cgi?id=79123 + fix the Java bridge for MSVC2012 for 4.3 (Michael S.) [ done committed to -4-3 ] + teach the IRC bot. to not show distro commits (Miklos) + Tinderbox Admins: please add LibreOffice 4.3 (Thorsten co.) [ tinderboxes for all platforms rolling ]. + encourage icon authors to put icons into git (Astron) [ no response from KACST guys ... ] * Pending Action Items: * GSOC Update (Fridrich) + students should be hacking. + If there are problems with contacting, should report absence + mail reports sound positive, ~all at work. + no concerns yet. + mid-term evaluations: 23rd-27th June. + remind to ask the student to blog about what they do (Cedric) AI: + ask students to blog about it (GSOC Mentors) + steady work and progress is appreciated. * Release Engineering update (Christian) + 4.2.5 RC2 deadline is next Monday + 7x patches queued in gerrit. + 4.3.0 Beta 2 status + delays around translation, lots of problems with context, not strings themselves: now fixed. + builds currently being pushed to mirrors; for public this evening / tomorrow. + 4.3.0 UI and string freeze: week after next - branch for first RC. + Android / iOS remote + will build a new version with buttons to start/exit remote ptr. feature. + builds pushed just now for the new version; and available. + Late features ? + libreofficekit bits / rename etc. (blocking on Michael) + OpenGL pieces / status + impress work as well ? + pending GL capabilities check to avoid crashes. + experimentalising 3D chart bits. + at risk. + some changes in language listbox (Eike) + switching to a combo-box, so can enter an arbitrary lang_tag [ in: https://gerrit.libreoffice.org/9447 ] + preserving rendering OOXML Artistic Effects (Jacobo) [ in: https://gerrit.libreoffice.org/9495 ] + Calc performanc fixes (?) * Another OpenSSL issue: + https://securityblog.redhat.com/2014/06/05/openssl-mitm-ccs-injection-attack-cve-2014-0224/ + http://www.openssl.org/news/secadv_20140605.txt + awaiting patch, lower priority - release on normal 4.2.5 cadence + should we disable heartbeat completely ? (Bjoern) + we don't really need it. AI: + merge existing Fedora patches (Caolan) * allow upgrade of access2base (Lionel?) * no - Lionel, no discussion / decision. + access2base now included in LibreOffice 4.2 and later + technical structure: one Basic library (and that's it) + for other branches (other forks of OO.org LibreOffice 4.1 and earlier), available as extension + competitive disadvantage: users of other branches can have newer access2base faster (install extension) + not possible for LibO 4.2 later because extension not allowed to override part of LibreOffice (only other extension) + policy exception for access2base can have new features within stable line? + I don't like that + allow extensions to override any part of LibreOffice? + no, significant resistance + allow extensions to override any *script* or *dialog* library from LibreOffice? + allow extensions to override any *Basic* or *dialog* library from LibreOffice? + allow extensions to override any *Basic* (not *dialog*) library from LibreOffice? + rationale: AFAIK, we don't ship any wizard / conversion / ... code as Basic, only examples + needs to be validated by domain expert + allow extensions to override only access2base? + demote access2base to bundled extension? + makes Acces2Base much less official in LibreOffice :-( (also more work) * UX Update (Astron) + a few UX advise bugs getting discussed. + colour of non-printing characters ... + customizable or not ? * Crashtest update (Markus) + new result including writer/impress/draw http://dev-builds.libreoffice.org/crashtest/7c8b2f10310f0f64b111afb3012e82e9c4a690ac/ +
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/inc/interpre.hxx | 48
sc/source/core/tool/interpr1.cxx | 52 +--
2 files changed, 77 insertions(+), 23 deletions(-)
New commits:
commit 95d9e0641197164fedd2e89d40f5eb9607f87fc3
Author: Eike Rathke er...@redhat.com
Date: Thu Jun 5 16:34:08 2014 +0200
unify the handling of string position arguments, fdo#75971 related
Only two text functions had the full set of checks as introduced by the
fix for fdo#75971. Let all text functions check their arguments in the
same way. Additionally this will ease a transition to accept string
lengths 64k in spreadsheet functions as now we have only one place that
checks for SAL_MAX_UINT16 instead of having that scattered all over the
place.
Change-Id: I454e617a59d0b3c2ca725047e7f8c7370bc0bb1f
(cherry picked from commit 14ce27cc045bd9bcbbfa3eac56cd99f2be08de1f)
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 6022c8e..642699a 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -368,6 +368,24 @@ void ScTableOp(); //
repeated operations
void SetMaxIterationCount(sal_uInt16 n);
inline void CurFmtToFuncFmt()
{ nFuncFmtType = nCurFmtType; nFuncFmtIndex = nCurFmtIndex; }
+
+/** Check if a double is suitable as string position or length argument.
+
+If fVal is Inf or NaN it is changed to -1, if it is less than 0 it is
+sanitized to 0, if it is greater than some implementation defined max
+string length it is sanitized to that max.
+
+@return TRUE if double value fVal is suitable as string argument and was
+not sanitized.
+FALSE if not and fVal was adapted.
+ */
+inline bool CheckStringPositionArgument( double fVal );
+
+/** Obtain a double suitable as string position or length argument.
+Returns -1 if the number is Inf or NaN or less than 0 or greater than some
+implementation defined max string length. */
+inline double GetStringPositionArgument();
+
// Check for String overflow of rResult+rAdd and set error and erase rResult
// if so. Return true if ok, false if overflow
inline bool CheckStringResultLen( OUString rResult, const OUString rAdd );
@@ -921,6 +939,36 @@ inline bool ScInterpreter::MustHaveParamCountMin( short
nAct, short nMin )
return false;
}
+inline bool ScInterpreter::CheckStringPositionArgument( double fVal )
+{
+if (!rtl::math::isFinite( fVal))
+{
+fVal = -1.0;
+return false;
+}
+else if (fVal 0.0)
+{
+fVal = 0.0;
+return false;
+}
+else if (fVal SAL_MAX_UINT16)
+{
+fVal = static_castdouble(SAL_MAX_UINT16);
+return false;
+}
+return true;
+}
+
+inline double ScInterpreter::GetStringPositionArgument()
+{
+double fVal = rtl::math::approxFloor( GetDouble());
+if (!CheckStringPositionArgument( fVal))
+{
+fVal = -1.0;
+}
+return fVal;
+}
+
inline bool ScInterpreter::CheckStringResultLen( OUString rResult, const
OUString rAdd )
{
if ( rResult.getLength() + rAdd.getLength() SAL_MAX_UINT16 )
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index bae7962..83393ca 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7761,11 +7761,10 @@ void ScInterpreter::ScReplace()
if ( MustHaveParamCount( GetByte(), 4 ) )
{
OUString aNewStr = GetString().getString();
-double fCount = ::rtl::math::approxFloor( GetDouble());
-double fPos = ::rtl::math::approxFloor( GetDouble());
+double fCount = GetStringPositionArgument();
+double fPos = GetStringPositionArgument();
OUString aOldStr = GetString().getString();
-if (fPos 1.0 || fPos static_castdouble(SAL_MAX_UINT16)
-|| fCount 0.0 || fCount
static_castdouble(SAL_MAX_UINT16))
+if (fPos 1.0 || fCount 0.0)
PushIllegalArgument();
else
{
@@ -7888,8 +7887,8 @@ void ScInterpreter::ScLeft()
sal_Int32 n;
if (nParamCount == 2)
{
-double nVal = ::rtl::math::approxFloor(GetDouble());
-if (rtl::math::isNan(nVal) || nVal 0.0 || nVal SAL_MAX_UINT16)
+double nVal = GetStringPositionArgument();
+if (nVal 0.0)
{
PushIllegalArgument();
return ;
@@ -7996,8 +7995,8 @@ void ScInterpreter::ScRightB()
sal_Int32 n;
if (nParamCount == 2)
{
-double nVal = ::rtl::math::approxFloor(GetDouble());
-if ( nVal 0.0 || nVal SAL_MAX_UINT16 )
+double nVal = GetStringPositionArgument();
+if ( nVal 0.0 )
{
PushIllegalArgument();
return ;
@@ -8047,8 +8046,8 @@ void ScInterpreter::ScLeftB()
[Libreoffice-commits] core.git: vcl/qa vcl/source
dev/null |binary
vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2007-1238-1.wmf |binary
vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2007-1245-1.wmf |binary
vcl/source/filter/wmf/winwmf.cxx | 18
++
4 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 90f0af7a9cabcfe9006608b3444a54ef6ff340f5
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 5 17:36:52 2014 +0200
WMF record size 3 is clearly broken
...so we should not attempt to (mis-)interpret such broken input.
Change-Id: I97f4f46fdfc0dfe6f9aff42917d23634b844c7f0
diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2007-1238-1.wmf
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2007-1238-1.wmf
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2007-1238-1.wmf
rename to vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2007-1238-1.wmf
diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2007-1245-1.wmf
b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2007-1245-1.wmf
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2007-1245-1.wmf
rename to vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2007-1245-1.wmf
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 4c2c95c..8079263 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1377,13 +1377,19 @@ bool WMFReader::GetPlaceableBound( Rectangle
rPlaceableBound, SvStream* pStm )
{
pStm-ReadUInt32( nRSize ).ReadUInt16( nFunction );
-if( pStm-GetError() || ( nRSize 3 ) || ( nRSize==3
nFunction==0 ) || pStm-IsEof() )
+if( pStm-GetError() )
{
-if( pStm-IsEof() )
-{
-pStm-SetError( SVSTREAM_FILEFORMAT_ERROR );
-bRet = false;
-}
+bRet = false;
+break;
+}
+else if ( nRSize==3 nFunction==0 )
+{
+break;
+}
+else if ( nRSize 3 || pStm-IsEof() )
+{
+pStm-SetError( SVSTREAM_FILEFORMAT_ERROR );
+bRet = false;
break;
}
switch( nFunction )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/ToxTextGenerator.hxx |2
sw/source/core/crsr/viscrs.cxx|2
sw/source/core/inc/rootfrm.hxx|4
sw/source/core/layout/trvlfrm.cxx | 871 ++
4 files changed, 430 insertions(+), 449 deletions(-)
New commits:
commit 1268a6f8752dd0f1cb78557244b324aaed6461eb
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 16:39:11 2014 +0100
WaE: -Werror,-Wmismatched-tags
Change-Id: Ie0ca0c8c8e404642bbe9a918a1cb125b596ef4fc
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 6a5dbd9..e64c8b6 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -27,7 +27,7 @@
class SwDoc;
class SwForm;
class SwPageDesc;
-class SwTOXSortTabBase;
+struct SwTOXSortTabBase;
namespace sw {
commit 690c6787b4a2ab0118690fb8d00be871faa0db76
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Jun 5 10:06:45 2014 +
Resolves: #i125024# remove code regarding table selection...
as it is not used any more.
(cherry picked from commit 65f39887f41e701b699fd2e51da803d116766eb8)
Conflicts:
sw/source/core/crsr/viscrs.cxx
sw/source/core/inc/rootfrm.hxx
sw/source/core/layout/trvlfrm.cxx
Change-Id: Ia37e73a515a8f5d0218e4e4144e75f18449599c9
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 62d87e4..8dfc312 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -533,7 +533,7 @@ void SwShellCrsr::FillRects()
(GetMark()-nNode == GetPoint()-nNode ||
(GetMark()-nNode.GetNode().IsCntntNode()
GetMark()-nNode.GetNode().GetCntntNode()-getLayoutFrm(
GetShell()-GetLayout() ) ) ))
-GetShell()-GetLayout()-CalcFrmRects( *this,
GetShell()-IsTableMode() );
+GetShell()-GetLayout()-CalcFrmRects( *this );
}
void SwShellCrsr::Show()
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index f1c6ea2..78a95e5 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -275,9 +275,7 @@ public:
// next page border
const SwPageFrm* GetPageAtPos( const Point rPt, const Size* pSize = 0,
bool bExtend = false ) const;
-void CalcFrmRects(
-SwShellCrsr,
-const bool bIsTblSel );
+void CalcFrmRects( SwShellCrsr );
// Calculates the cells included from the current selection
// false: There was no result because of an invalid layout
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 5e0bd5b..34c0901 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1988,9 +1988,7 @@ inline void Sub( SwRegionRects rRegion, const SwRect
rRect )
* inverted rectangles are available.
* In the end the Flys are cut out of the section.
*/
-void SwRootFrm::CalcFrmRects(
-SwShellCrsr rCrsr,
-const bool bIsTblMode)
+void SwRootFrm::CalcFrmRects(SwShellCrsr rCrsr)
{
SwPosition *pStartPos = rCrsr.Start(),
*pEndPos = rCrsr.GetPoint() == pStartPos ? rCrsr.GetMark() :
rCrsr.GetPoint();
@@ -2035,45 +2033,49 @@ void SwRootFrm::CalcFrmRects(
}
}
-//Case 4: Table selection
-if( bIsTblMode )
-{
-const SwFrm *pCell = pStartFrm-GetUpper();
-while ( !pCell-IsCellFrm() )
-pCell = pCell-GetUpper();
-SwRect aTmp( pCell-Prt() );
-aTmp.Pos() += pCell-Frm().Pos();
-aRegion.ChangeOrigin( aTmp );
-aRegion.clear();
-aRegion.push_back( aTmp);
-}
-else
-{
-// if a selection which is not allowed exists, we correct what is not
-// allowed (header/footer/table-headline) for two pages.
-do {// middle check loop
-const SwLayoutFrm* pSttLFrm = pStartFrm-GetUpper();
-const sal_uInt16 cHdFtTblHd = FRM_HEADER | FRM_FOOTER | FRM_TAB;
-while( pSttLFrm
-! (cHdFtTblHd pSttLFrm-GetType() ))
-pSttLFrm = pSttLFrm-GetUpper();
-if( !pSttLFrm )
-break;
-const SwLayoutFrm* pEndLFrm = pEndFrm-GetUpper();
-while( pEndLFrm
-! (cHdFtTblHd pEndLFrm-GetType() ))
-pEndLFrm = pEndLFrm-GetUpper();
-if( !pEndLFrm )
-break;
+// if a selection which is not allowed exists, we correct what is not
+// allowed (header/footer/table-headline) for two pages.
+do {// middle check loop
+const SwLayoutFrm* pSttLFrm = pStartFrm-GetUpper();
+const sal_uInt16 cHdFtTblHd = FRM_HEADER | FRM_FOOTER | FRM_TAB;
+while( pSttLFrm
+! (cHdFtTblHd pSttLFrm-GetType() ))
+pSttLFrm = pSttLFrm-GetUpper();
+if( !pSttLFrm )
+break;
+const SwLayoutFrm* pEndLFrm = pEndFrm-GetUpper();
+while( pEndLFrm
+!
[Libreoffice-commits] core.git: sc/source
sc/source/ui/condformat/condformatdlg.cxx | 10 ++
sc/source/ui/inc/condformatdlg.hxx|1 +
2 files changed, 11 insertions(+)
New commits:
commit b0a9f33a9b3018dcfb471641bde7c29a6e62f394
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 16:41:02 2014 +0100
Resolves: fdo#79021 cannot delete ListBox from inside its own Select handler
Change-Id: I884e617b112397697a702216b62d0c1e17aae536
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 4f12df3..9c0a6d9 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -266,6 +266,16 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*,
pBox)
IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox)
{
+//Resolves: fdo#79021 At this point we are still inside the ListBox Select.
+//If we call maEntries.replace here then the pBox will be deleted before it
+//has finished Select and will crash on accessing its deleted this. So Post
+//to do the real work after the Select has completed
+Application::PostUserEvent(LINK(this, ScCondFormatList, AfterTypeListHdl),
pBox);
+return 0;
+}
+
+IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox)
+{
EntryContainer::iterator itr = maEntries.begin();
for(; itr != maEntries.end(); ++itr)
{
diff --git a/sc/source/ui/inc/condformatdlg.hxx
b/sc/source/ui/inc/condformatdlg.hxx
index 60c7763..12b522f 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -85,6 +85,7 @@ public:
DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* );
DECL_LINK( TypeListHdl, ListBox*);
+DECL_LINK( AfterTypeListHdl, ListBox*);
DECL_LINK( ColFormatTypeHdl, ListBox*);
};
___
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' - 65/f39887f41e701b699fd2e51da803d116766eb8
65/f39887f41e701b699fd2e51da803d116766eb8 |1 + 1 file changed, 1 insertion(+) New commits: commit 11ba737d2c820ad8e154063727b421af2428e2e1 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 5 16:41:41 2014 +0100 Notes added by 'git notes add' diff --git a/65/f39887f41e701b699fd2e51da803d116766eb8 b/65/f39887f41e701b699fd2e51da803d116766eb8 new file mode 100644 index 000..b40d875 --- /dev/null +++ b/65/f39887f41e701b699fd2e51da803d116766eb8 @@ -0,0 +1 @@ +merged as: 690c6787b4a2ab0118690fb8d00be871faa0db76 ___ 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/core/layout/trvlfrm.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 2d86d82aa28f460972c2670e9880948397e80827 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 5 16:42:34 2014 +0100 drop comment about removed step 4 now Change-Id: I955a716621d4d566797ca39c008ff183d0656b4f diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 34c0901..60327e5 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1975,8 +1975,6 @@ inline void Sub( SwRegionRects rRegion, const SwRect rRect ) *expand end to the left until frame-start, calculate Rect *and if more than two frames are involved add the PrtArea of all *frames which lie in between - * 4. If it's about a table-selection we have to obtain the CellFrm for every - * PaM in the ring - its PrtArea will be added to the Rect. * * Big reorganization because of the FlyFrm - those need to be locked out. * Exceptions: - The Fly in which the selection took place (if it took place ___ 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/source
sc/source/ui/condformat/condformatdlg.cxx | 10 ++
sc/source/ui/inc/condformatdlg.hxx|1 +
2 files changed, 11 insertions(+)
New commits:
commit 268c4907a04959ca546c5e2ecf469d4d297293b9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 16:41:02 2014 +0100
Resolves: fdo#79021 cannot delete ListBox from inside its own Select handler
Change-Id: I884e617b112397697a702216b62d0c1e17aae536
(cherry picked from commit b0a9f33a9b3018dcfb471641bde7c29a6e62f394)
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 4f12df3..9c0a6d9 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -266,6 +266,16 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*,
pBox)
IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox)
{
+//Resolves: fdo#79021 At this point we are still inside the ListBox Select.
+//If we call maEntries.replace here then the pBox will be deleted before it
+//has finished Select and will crash on accessing its deleted this. So Post
+//to do the real work after the Select has completed
+Application::PostUserEvent(LINK(this, ScCondFormatList, AfterTypeListHdl),
pBox);
+return 0;
+}
+
+IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox)
+{
EntryContainer::iterator itr = maEntries.begin();
for(; itr != maEntries.end(); ++itr)
{
diff --git a/sc/source/ui/inc/condformatdlg.hxx
b/sc/source/ui/inc/condformatdlg.hxx
index 60c7763..12b522f 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -85,6 +85,7 @@ public:
DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* );
DECL_LINK( TypeListHdl, ListBox*);
+DECL_LINK( AfterTypeListHdl, ListBox*);
DECL_LINK( ColFormatTypeHdl, ListBox*);
};
___
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' - d7/4e7cd245a570b9bf223424146afc58ce6811ca
d7/4e7cd245a570b9bf223424146afc58ce6811ca |1 + 1 file changed, 1 insertion(+) New commits: commit 9127dd45019f671b8aed6b9469cc76d06022e65a Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 5 16:43:44 2014 +0100 Notes added by 'git notes add' diff --git a/d7/4e7cd245a570b9bf223424146afc58ce6811ca b/d7/4e7cd245a570b9bf223424146afc58ce6811ca new file mode 100644 index 000..7b227c6 --- /dev/null +++ b/d7/4e7cd245a570b9bf223424146afc58ce6811ca @@ -0,0 +1 @@ +prefer: 2d86d82aa28f460972c2670e9880948397e80827 ___ 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/ooxmlimport/ooxmlimport.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit c7aed931dd3d3f51c1d5d6ef17650f31528fb04b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 5 17:18:45 2014 +0200
CppunitTest_sw_ooxmlimport's testFdo69636: use getShape()
getShape() doesn't case if the object is on a drawinglayer one or a
Writer TextFrame, and that's exactly what we want. (Currently is a
TextFrame, but will be a drawinglayer object when shape with text will
be imported as shape with textbox.)
Change-Id: I6ae981700d214447f326e6a0fb550b98380bc10c
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f003f33..0d7b6b7 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1483,9 +1483,7 @@ DECLARE_OOXMLIMPORT_TEST(testDefaultSectBreakCols,
default-sect-break-cols.docx
DECLARE_OOXMLIMPORT_TEST(testFdo69636, fdo69636.docx)
{
// The problem was that the mso-layout-flow-alt:bottom-to-top VML shape
property wasn't handled for sw text frames.
-uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
-uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
-uno::Referencetext::XTextRange xFrame(xIndexAccess-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetext::XTextRange xFrame(getShape(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(900),
getPropertysal_Int32(getRun(getParagraphOfText(1, xFrame-getText()), 1),
CharRotation));
}
___
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' - 69/050096b8c855e153c6fe9e441067b42df7fa4a
69/050096b8c855e153c6fe9e441067b42df7fa4a |1 + 1 file changed, 1 insertion(+) New commits: commit 68b37c0554de677ee24da170934f194c9b6eefd1 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 5 16:47:19 2014 +0100 Notes added by 'git notes add' diff --git a/69/050096b8c855e153c6fe9e441067b42df7fa4a b/69/050096b8c855e153c6fe9e441067b42df7fa4a new file mode 100644 index 000..7a736d6 --- /dev/null +++ b/69/050096b8c855e153c6fe9e441067b42df7fa4a @@ -0,0 +1 @@ +prefer: f3c9e8471a83e6ceb9258d3a4ab7d3354adcfb3a ___ 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/wrtsh/wrtsh2.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 136cd0f3a55284c28279870369392ad80dffb0f9
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Jun 5 10:49:57 2014 +
Resolves: #i125050# correct text range for comment/annotation...
at a table cell selection
(cherry picked from commit ec7fc735e031f643e324b0924a1f2ca753cb314d)
Change-Id: I51fa9ab0a77ab06e295452216865d0fae44bc263
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index e0cf20b..1abb581 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -91,7 +91,10 @@ void SwWrtShell::Insert(SwField rFld)
GetTblCrs()-Normalize( false );
const SwPosition rStartPos(
*(GetTblCrs()-GetMark()-nNode.GetNode().GetCntntNode()), 0 );
KillPams();
-EndPara();
+if ( !IsEndOfPara() )
+{
+EndPara();
+}
const SwPosition rEndPos( *GetCurrentShellCursor().GetPoint()
);
pAnnotationTextRange = new SwPaM( rStartPos, rEndPos );
}
___
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' - ec/7fc735e031f643e324b0924a1f2ca753cb314d
ec/7fc735e031f643e324b0924a1f2ca753cb314d |1 + 1 file changed, 1 insertion(+) New commits: commit 40bbe7fbd60d93707c1f2ea5da642c9023b0013e Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 5 16:50:09 2014 +0100 Notes added by 'git notes add' diff --git a/ec/7fc735e031f643e324b0924a1f2ca753cb314d b/ec/7fc735e031f643e324b0924a1f2ca753cb314d new file mode 100644 index 000..46580b5 --- /dev/null +++ b/ec/7fc735e031f643e324b0924a1f2ca753cb314d @@ -0,0 +1 @@ +merged as: 136cd0f3a55284c28279870369392ad80dffb0f9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: coverity tips
On Thu, 2014-06-05 at 12:18 +0200, Stephan Bergmann wrote: ...even in such a simple scenario? Yeah, the example is effectively the case I've seen two or three times where a simple boolean controls the throw/not-throw behaviour Isn't that a serious bug in coverity then? It's definitely a quirk to watch out for. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - scp2/source solenv/bin sysui/desktop
scp2/source/ooo/directory_ooo_macosx.scp |2 +-
solenv/bin/modules/installer/simplepackage.pm |6 +++---
sysui/desktop/macosx/Info.plist.in|2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit d223659093f487ffc44e2fd00f3efa69d39a6c55
Author: Tor Lillqvist t...@collabora.com
Date: Thu Jun 5 19:23:47 2014 +0300
Revert Collabora branding
Nah, this breaks a --with-package-format=dmg build. Will have to think
harder.
This reverts commit e8d629dc06ef79d5db1c80af1b1047f4fcb216b7.
Change-Id: I6b0e1c9a460acfe0304e9bafa5f2114e177bbe50
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp
b/scp2/source/ooo/directory_ooo_macosx.scp
index 7d697ec..0bc7bfd 100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -21,7 +21,7 @@
#ifdef MACOSX
Directory gid_Dir_Bundle
ParentID = PD_PROGDIR;
-HostName = LibreOffice from Collabora.app;
+HostName = %PRODUCTNAME.app;
End
Directory gid_Dir_Bundle_Contents
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 35793a3..9c61d66 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -270,7 +270,7 @@ sub create_package
my $volume_name = $allvariables-{'PRODUCTNAME'};
my $volume_name_classic = $allvariables-{'PRODUCTNAME'} . ' ' .
$allvariables-{'PRODUCTVERSION'};
-my $volume_name_classic_app = 'LibreOffice from Collabora'; # app
should not contain version number
+my $volume_name_classic_app = $volume_name; # app should not
contain version number
if ( $allvariables-{'DMG_VOLUMEEXTENSION'} ) {
$volume_name = $volume_name . ' ' .
$allvariables-{'DMG_VOLUMEEXTENSION'};
$volume_name_classic = $volume_name_classic . ' ' .
$allvariables-{'DMG_VOLUMEEXTENSION'};
@@ -411,10 +411,10 @@ sub create_package
}
else
{
-if (($volume_name_classic_app eq 'LibreOffice from Collabora' ||
$volume_name_classic_app eq 'LibreOfficeDev')
+if (($volume_name_classic_app eq 'LibreOffice' ||
$volume_name_classic_app eq 'LibreOfficeDev')
defined($ENV{'MACOSX_CODESIGNING_IDENTITY'})
$ENV{'MACOSX_CODESIGNING_IDENTITY'} ne )
{
-$systemcall =
$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle
\$localtempdir/$folder/$volume_name_classic_app.app\;
+$systemcall =
$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle
$localtempdir/$folder/$volume_name_classic_app.app;
print ... $systemcall ...\n;
my $returnvalue = system($systemcall);
$infoline = Systemcall: $systemcall\n;
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 2d2..16f9eae 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1411,7 +1411,7 @@
keyCFBundleInfoDictionaryVersion/key
string6.0/string
keyCFBundleName/key
- stringLibreOffice from Collabora/string
+ string@PRODUCTNAME@/string
keyCFBundlePackageType/key
stringAPPL/string
keyCFBundleSignature/key
commit a2fde7c953e5f085e2b696cea1e243c649cf6a86
Author: Tor Lillqvist t...@collabora.com
Date: Thu Jun 5 19:23:13 2014 +0300
Revert This one, too
Nah, this breaks a --with-package-format=dmg build. Will have to think
harder.
This reverts commit e20640b9592c873169d25869076982a4d5628116.
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 49b3631..2d2 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1401,7 +1401,7 @@
keyCFBundleExecutable/key
stringsoffice/string
keyCFBundleGetInfoString/key
- stringLibreOffice from Collabora
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@/string
+ string@PRODUCTNAME@
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@/string
keyCFBundleIconFile/key
stringmain.icns/string
keyCFBundleShortVersionString/key
commit ff23056752efd99e79d7b328c3df83116e7d81d0
Author: Tor Lillqvist t...@collabora.com
Date: Thu Jun 5 00:21:59 2014 +0300
This one, too
Change-Id: Ic2c724f39bd71ab181b33532d1ed2f0bcf8f82bd
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 2d2..49b3631 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1401,7 +1401,7 @@
keyCFBundleExecutable/key
stringsoffice/string
keyCFBundleGetInfoString/key
- string@PRODUCTNAME@
[Libreoffice-commits] core.git: sw/CppunitTest_sw_tox.mk sw/inc sw/Library_sw.mk sw/Module_sw.mk sw/qa sw/source
sw/CppunitTest_sw_tox.mk | 50 +++
sw/Library_sw.mk |1
sw/Module_sw.mk |4
sw/inc/ToxWhitespaceStripper.hxx | 52 +++
sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx | 150 +++
sw/source/core/tox/ToxTextGenerator.cxx | 36 -
sw/source/core/tox/ToxWhitespaceStripper.cxx | 62 +
7 files changed, 324 insertions(+), 31 deletions(-)
New commits:
commit e5345f62bf525b6258736f1ce11a61b5e638e0ff
Author: Tobias Lippert d...@fastmail.fm
Date: Sun Jun 1 14:15:35 2014 +0200
Unittest the whitespace stripping logic for tox text generation
The separate class allows to unittest this functionality in isoloation.
Change-Id: I1e5eddfb455ca85a662ea38c03302883decc5d58
Reviewed-on: https://gerrit.libreoffice.org/9608
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/CppunitTest_sw_tox.mk b/sw/CppunitTest_sw_tox.mk
new file mode 100644
index 000..f372442
--- /dev/null
+++ b/sw/CppunitTest_sw_tox.mk
@@ -0,0 +1,50 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains the unit test definition for class in the
sources/core/tox subfolder
+# The macro which defines the main method is contained in
test_ToxWhitespaceStripper.cxx
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_tox_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_tox_test, \
+ sw/qa/cppunit/tox/test_ToxWhitespaceStripper \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_tox_test, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ svt \
+ sw \
+ test \
+ unotest \
+ vcl \
+ tl \
+ utl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_tox_test, \
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_tox_test,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_tox_test,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+$$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index c9804a0..a7500ad 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -389,6 +389,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/tox/toxhlp \
sw/source/core/tox/txmsrt \
sw/source/core/tox/ToxTextGenerator \
+sw/source/core/tox/ToxWhitespaceStripper \
sw/source/core/txtnode/SwGrammarContact \
sw/source/core/txtnode/atrfld \
sw/source/core/txtnode/atrflyin \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 53a19bb..7e71e2c 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -46,6 +46,10 @@ $(eval $(call gb_Module_add_targets,sw,\
endif
+$(eval $(call gb_Module_add_check_targets,sw,\
+CppunitTest_sw_tox \
+))
+
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uwriter \
CppunitTest_sw_htmlexport \
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
new file mode 100644
index 000..96b254b
--- /dev/null
+++ b/sw/inc/ToxWhitespaceStripper.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+
+#ifndef TOXWHITESPACESTRIPPER_HXX_
+#define TOXWHITESPACESTRIPPER_HXX_
+
+#include rtl/ustring.hxx
+
+#include vector
+
+namespace sw {
+
+/** This class helps to remove unwanted whitespaces from a string to use in a
Tox.
+ *
+ * The new string will have
+ * - Newlines changed to spaces
+ * - Consecutive spaces merged
+ * - Trailing spaces removed
+ *
+ * It also allows to find the corresponding new positions of the input string
in the stripped string.
+ * This is important for attributes which might have to be imported, e.g., it
helps to answer the question:
+ * The 3rd character of the input string is subscript, which character in the
output string is that?
+ *
+ * @note One leading whitespace is preserved.
+ */
+class SAL_DLLPUBLIC ToxWhitespaceStripper {
+public:
+ToxWhitespaceStripper(const OUString);
+
+sal_Int32
+GetPositionInStrippedString(sal_Int32 pos) const;
+
+OUString
+GetStrippedString() const;
+
+private:
+OUString mStripped;
+std::vectorsal_Int32 mNewPositions;
+};
+
+} // end namespace sw
+
+
+
[Libreoffice-commits] core.git: sw/CppunitTest_sw_tox.mk sw/inc sw/Library_sw.mk sw/qa sw/source
sw/CppunitTest_sw_tox.mk|1
sw/Library_sw.mk|1
sw/inc/ToxLinkProcessor.hxx | 86 ++
sw/inc/ToxTextGenerator.hxx | 12 +-
sw/qa/cppunit/tox/test_ToxLinkProcessor.cxx | 133
sw/source/core/tox/ToxLinkProcessor.cxx | 70 ++
sw/source/core/tox/ToxTextGenerator.cxx | 66 ++---
7 files changed, 312 insertions(+), 57 deletions(-)
New commits:
commit 94b296d5416dd71d721ad16216b50bce79e3dc04
Author: Tobias Lippert d...@fastmail.fm
Date: Sun Jun 1 14:18:39 2014 +0200
Unittest link generation for table of contents.
The logic was moved to a separate class and unittested.
Conflicts:
sw/inc/ToxTextGenerator.hxx
Change-Id: I0e4475f5e2950cdfdfb07b89128c4ce1d6af3f22
Reviewed-on: https://gerrit.libreoffice.org/9609
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/CppunitTest_sw_tox.mk b/sw/CppunitTest_sw_tox.mk
index f372442..7911de3 100644
--- a/sw/CppunitTest_sw_tox.mk
+++ b/sw/CppunitTest_sw_tox.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_tox_test))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_tox_test, \
sw/qa/cppunit/tox/test_ToxWhitespaceStripper \
+ sw/qa/cppunit/tox/test_ToxLinkProcessor \
))
$(eval $(call gb_CppunitTest_use_libraries,sw_tox_test, \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index a7500ad..c073564 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -388,6 +388,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/tox/tox \
sw/source/core/tox/toxhlp \
sw/source/core/tox/txmsrt \
+sw/source/core/tox/ToxLinkProcessor \
sw/source/core/tox/ToxTextGenerator \
sw/source/core/tox/ToxWhitespaceStripper \
sw/source/core/txtnode/SwGrammarContact \
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
new file mode 100644
index 000..5a45465
--- /dev/null
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SW_TOXLINKPROCESSOR_HXX_
+#define SW_TOXLINKPROCESSOR_HXX_
+
+#include fmtinfmt.hxx
+#include rtl/ustring.hxx
+
+#include vector
+
+class SwTxtNode;
+
+class ToxLinkProcessorTest;
+
+namespace sw {
+
+/** A helper class for ToxTextGenerator.
+ * It collects information about encountered link tokens and allows access in
a processed form.
+ */
+class SW_DLLPUBLIC ToxLinkProcessor {
+public:
+ToxLinkProcessor() {;}
+virtual ~ToxLinkProcessor() {;}
+
+void
+StartNewLink(sal_Int32 startPosition, const OUString characterStyle);
+
+/** Close a link which has been found during processing.
+ *
+ * @throw std::runtime_error If there are no open links.
+ */
+void
+CloseLink(sal_Int32 endPosition, const OUString url);
+
+/** Insert the found links as attributes to a text node */
+void
+InsertLinkAttributes(SwTxtNode node);
+
+private:
+/** Obtain the pool id which belongs to a character style.
+ *
+ * @internal
+ * This method is overridden in the unittests. You should not override it
yourself.
+ */
+virtual sal_uInt16
+ObtainPoolId(const OUString characterStyle) const;
+
+/** Information about a started link */
+struct StartedLink {
+StartedLink(sal_Int32 startPosition, OUString characterStyle) :
+mStartPosition(startPosition), mCharacterStyle(characterStyle)
{
+;
+}
+sal_Int32 mStartPosition;
+OUString mCharacterStyle;
+};
+
+/** A link that has been encountered while parsing a tox.
+ * A link is closed if it has both a start and an end token.
+ */
+struct ClosedLink {
+ClosedLink(const OUString url, sal_Int32 startPosition, sal_Int32
endPosition) :
+mINetFmt(url, OUString()), mStartTextPos(endPosition),
mEndTextPos(startPosition) {
+}
+SwFmtINetFmt mINetFmt;
+sal_Int32 mStartTextPos;
+sal_Int32 mEndTextPos;
+};
+
+std::vectorClosedLink mClosedLinks;
+
+std::vectorStartedLink mStartedLinks;
+
+friend class ::ToxLinkProcessorTest;
+};
+
+}
+
+#endif /* SW_TOXLINKPROCESSOR_HXX_ */
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index e64c8b6..d83736b 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -22,6 +22,7 @@
#include sal/types.h
#include swdllapi.h
+#include boost/shared_ptr.hpp
#include vector
class SwDoc;
@@ -31,12 +32,15 @@ struct
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 60272bb37d52b02f4b424d1f9e6adbb935fefc75
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 5 17:32:42 2014 +0200
CppunitTest_sw_ooxmlimport: remaining textbox porting
These are the remaining changes: with these, if we import drawingML
shape with text in DOCX as shape with textbox, no testcase in this
suite fails.
Change-Id: Ic39cc204e3cfb662f14db1810f7138df0829eb27
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0d7b6b7..c7995f0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1635,15 +1635,13 @@ DECLARE_OOXMLIMPORT_TEST(lineRotation,
line-rotation.docx)
DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly, textbox-wps-only.docx)
{
-uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
-uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
-uno::Referencetext::XTextRange xFrame(xIndexAccess-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetext::XTextRange xFrame(getShape(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(Hello world!), xFrame-getString());
// Position wasn't horizontally centered.
CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::CENTER,
getPropertysal_Int16(xFrame, HoriOrient));
// Position was the default (hori center, vert top) for the textbox.
-xFrame.set(xIndexAccess-getByIndex(1), uno::UNO_QUERY);
+xFrame.set(getShape(2), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2173), getPropertysal_Int32(xFrame,
HoriOrientPosition));
CPPUNIT_ASSERT_EQUAL(sal_Int32(2805), getPropertysal_Int32(xFrame,
VertOrientPosition));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/source writerperfect/source
include/vcl/salbtype.hxx| 29 --
vcl/source/filter/wmf/winwmf.cxx| 38 ++--
writerperfect/source/common/DirectoryStream.cxx |3 +
3 files changed, 38 insertions(+), 32 deletions(-)
New commits:
commit ea2537d5ea64f4f238fa434dbc7cf53263afe78c
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 5 18:31:54 2014 +0200
Fix memory leak
Change-Id: I74001eb033abd7ceb10da60ea707f876d9f22c08
diff --git a/writerperfect/source/common/DirectoryStream.cxx
b/writerperfect/source/common/DirectoryStream.cxx
index a352290..cfc423b 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -129,7 +129,10 @@ DirectoryStream *DirectoryStream::createForParent(const
com::sun::star::uno::Ref
{
pDir = new writerperfect::DirectoryStream(xDirContent);
if (!pDir-isStructured())
+{
+delete pDir;
pDir = 0;
+}
}
}
commit a1d7ed235738609ce8c0ecedff075f9d0e531034
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 5 18:31:22 2014 +0200
Avoid undefined mis-aligned memory access
Change-Id: Ie79a0810cf00217fe2b9ffd34e21aeb7b2299c0d
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 7829c11..ccdbfbe 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -22,7 +22,6 @@
#include stdio.h
#include string.h
#include stdlib.h
-#include osl/endian.h
#include tools/debug.hxx
#include vcl/salgtype.hxx
#include tools/color.hxx
@@ -782,11 +781,7 @@ inline void ColorMask::SetColorFor8Bit( const BitmapColor
rColor, HPBYTE pPixel
inline void ColorMask::GetColorFor16BitMSB( BitmapColor rColor, ConstHPBYTE
pPixel ) const
{
-#ifdef OSL_BIGENDIAN
-const sal_uInt32 nVal = *(sal_uInt16*) pPixel;
-#else
const sal_uInt32 nVal = pPixel[ 1 ] | ( (sal_uInt32) pPixel[ 0 ] 8UL );
-#endif
MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift,
mnBShift, rColor );
}
@@ -797,23 +792,15 @@ inline void ColorMask::SetColorFor16BitMSB( const
BitmapColor rColor, HPBYTE pP
{
const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, mnRMask,
mnGMask, mnBMask, mnRShift, mnGShift, mnBShift );
-#ifdef OSL_BIGENDIAN
-*(sal_uInt16*) pPixel = nVal;
-#else
pPixel[ 0 ] = (sal_uInt8)(nVal 8U);
pPixel[ 1 ] = (sal_uInt8) nVal;
-#endif
}
inline void ColorMask::GetColorFor16BitLSB( BitmapColor rColor, ConstHPBYTE
pPixel ) const
{
-#ifdef OSL_BIGENDIAN
const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] 8UL );
-#else
-const sal_uInt32 nVal = *(sal_uInt16*) pPixel;
-#endif
MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift,
mnBShift, rColor );
}
@@ -824,12 +811,8 @@ inline void ColorMask::SetColorFor16BitLSB( const
BitmapColor rColor, HPBYTE pP
{
const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, mnRMask,
mnGMask, mnBMask, mnRShift, mnGShift, mnBShift );
-#ifdef OSL_BIGENDIAN
pPixel[ 0 ] = (sal_uInt8) nVal;
pPixel[ 1 ] = (sal_uInt8)(nVal 8U);
-#else
-*(sal_uInt16*) pPixel = nVal;
-#endif
}
@@ -853,12 +836,8 @@ inline void ColorMask::SetColorFor24Bit( const
BitmapColor rColor, HPBYTE pPixe
inline void ColorMask::GetColorFor32Bit( BitmapColor rColor, ConstHPBYTE
pPixel ) const
{
-#ifdef OSL_BIGENDIAN
const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[
1 ] 8UL ) |
( (sal_uInt32) pPixel[ 2 ] 16UL ) | ( (sal_uInt32)
pPixel[ 3 ] 24UL );
-#else
-const sal_uInt32 nVal = *(sal_uInt32*) pPixel;
-#endif
MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift,
mnBShift, rColor );
}
@@ -867,12 +846,8 @@ inline void ColorMask::GetColorFor32Bit( BitmapColor
rColor, ConstHPBYTE pPixel
inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor rColor,
sal_uInt8 rAlpha, ConstHPBYTE pPixel ) const
{
-#ifdef OSL_BIGENDIAN
const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[
1 ] 8UL ) |
( (sal_uInt32) pPixel[ 2 ] 16UL ) | ( (sal_uInt32)
pPixel[ 3 ] 24UL );
-#else
-const sal_uInt32 nVal = *(sal_uInt32*) pPixel;
-#endif
rAlpha = (sal_uInt8)(nVal 24);
MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift,
mnBShift, rColor );
@@ -882,13 +857,9 @@ inline void ColorMask::GetColorAndAlphaFor32Bit(
BitmapColor rColor, sal_uInt8
inline void ColorMask::SetColorFor32Bit( const BitmapColor rColor, HPBYTE
pPixel ) const
{
-#ifdef OSL_BIGENDIAN
const sal_uInt32 nVal = COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask,
mnRShift, mnGShift, mnBShift );
pPixel[ 0 ] = (sal_uInt8) nVal; pPixel[ 1 ] = (sal_uInt8) ( nVal 8UL );
pPixel[ 2 ] = (sal_uInt8) ( nVal 16UL ); pPixel[ 3 ] = (sal_uInt8) (
nVal 24UL );
-#else
-*(sal_uInt32*)
Sort and copy results
In Calc, you can go to Data - Sort, and choose to copy the sorted results to someplace else, rather than the default option of sorting in place. I'm just wondering if anyone would miss this feature if it got removed. The UI is a bit awkward, and not clear what the associated two fields (left drop-down and right input fields) are supposed to take. Also, handling this option internally would require quite some extra effort, which, when one is trying to fix issues associted with this, would pose a greater risk of breaking things. Any objections for removing this? Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/qa
dev/null |binary
sc/qa/unit/data/ods/opencl/financial/XIRR.ods |binary
sc/qa/unit/opencl-test.cxx| 27 --
3 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 4eecf0cdf2e2e0c4c94ee4b3d15d4084bca516b9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Mar 17 18:19:07 2014 -0400
fdo#76140: Reimplement XIRR OpenCL test.
1) Use ods format and store the expected formula results as numeric cells,
to avoid having to load the same file twice (which is slower).
2) Use rtl::math::approxEqual to evaluate two numbers that may be subject
to numerical instability especially when the expected values are very
small.
Change-Id: Ie08e91f797065f4593f996df3541da84019cc53c
(cherry picked from commit ca25cdcb398f200ce5d53286eea02d49d8d1c5f4)
diff --git a/sc/qa/unit/data/ods/opencl/financial/XIRR.ods
b/sc/qa/unit/data/ods/opencl/financial/XIRR.ods
new file mode 100644
index 000..a9d2476
Binary files /dev/null and b/sc/qa/unit/data/ods/opencl/financial/XIRR.ods
differ
diff --git a/sc/qa/unit/data/xls/opencl/financial/XIRR.xls
b/sc/qa/unit/data/xls/opencl/financial/XIRR.xls
deleted file mode 100644
index b9a87ef..000
Binary files a/sc/qa/unit/data/xls/opencl/financial/XIRR.xls and /dev/null
differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 843c9a9..9def7e8 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -3405,28 +3405,27 @@ void ScOpenclTest:: testFinancialXirrFormula()
{
if (!detectOpenCLDevice())
return;
-ScDocShellRef xDocSh = loadDoc(opencl/financial/XIRR., XLS);
+
+ScDocShellRef xDocSh = loadDoc(opencl/financial/XIRR., ODS);
+CPPUNIT_ASSERT(xDocSh.Is());
ScDocument *pDoc = xDocSh-GetDocument();
-CPPUNIT_ASSERT(pDoc);
enableOpenCL();
pDoc-CalcAll();
-ScDocShellRef xDocShRes = loadDoc(opencl/financial/XIRR., XLS);
-ScDocument *pDocRes = xDocShRes-GetDocument();
-CPPUNIT_ASSERT(pDocRes);
-for (SCROW i = 0; i = 9; ++i)
+
+for (SCROW i = 1; i = 10; ++i)
{
-double fLibre = pDoc-GetValue(ScAddress(2, i, 0));
-double fExcel = pDocRes-GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+double fFormula = pDoc-GetValue(ScAddress(2, i, 0));
+double fExpected = pDoc-GetValue(ScAddress(3, i, 0));
+CPPUNIT_ASSERT(rtl::math::approxEqual(fExpected, fFormula));
}
-for (SCROW i = 18; i = 26; ++i)
+for (SCROW i = 18; i = 27; ++i)
{
-double fLibre = pDoc-GetValue(ScAddress(2, i, 0));
-double fExcel = pDocRes-GetValue(ScAddress(2, i, 0));
-CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+double fFormula = pDoc-GetValue(ScAddress(2, i, 0));
+double fExpected = pDoc-GetValue(ScAddress(3, i, 0));
+CPPUNIT_ASSERT(rtl::math::approxEqual(fExpected, fFormula));
}
+
xDocSh-DoClose();
-xDocShRes-DoClose();
}
//[AMLOEXT-139]
void ScOpenclTest::testStatisticalFormulaChiSqDist()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 91ca3a92c54a08ad13497d7e8ac1916e7b68bbfd
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jun 5 15:02:48 2014 -0400
fdo#72727: Revert fdo#68663 don't blindly force categories when there are
none
This reverts commit b090cbdf82e0827234caf5969124f6631311ef35.
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index e072ded..48936b3 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -942,6 +942,16 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
}
}
+// there exist files with own data without a categories element but with
row
+// descriptions. The row descriptions were used as categories even without
+// the categories element
+if( ! bCategoriesApplied )
+{
+SchXMLTools::CreateCategories(
+xDataProv, xChartDoc, OUString(categories),
+0 /* nCooSysIndex */, 0 /* nDimension */ );
+}
+
//i91578 display of hidden values (copy paste scenario; use hidden flag
during migration to locale table upon paste )
//remove series that consist only of hidden columns
Reference chart2::XInternalDataProvider xInternalDataProvider(
xDataProv, uno::UNO_QUERY );
___
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' - xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 9f025f22e8dfd7fe03527604e0edee8a8a818cca
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jun 5 15:02:48 2014 -0400
fdo#72727: Revert fdo#68663 don't blindly force categories when there are
none
This reverts commit b090cbdf82e0827234caf5969124f6631311ef35.
(cherry picked from commit 91ca3a92c54a08ad13497d7e8ac1916e7b68bbfd)
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index e072ded..48936b3 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -942,6 +942,16 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
}
}
+// there exist files with own data without a categories element but with
row
+// descriptions. The row descriptions were used as categories even without
+// the categories element
+if( ! bCategoriesApplied )
+{
+SchXMLTools::CreateCategories(
+xDataProv, xChartDoc, OUString(categories),
+0 /* nCooSysIndex */, 0 /* nDimension */ );
+}
+
//i91578 display of hidden values (copy paste scenario; use hidden flag
during migration to locale table upon paste )
//remove series that consist only of hidden columns
Reference chart2::XInternalDataProvider xInternalDataProvider(
xDataProv, uno::UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
loperf: performance regressions
Hi there, I was checking loperf results [1] and found one huge performance regression (21 - 102 bn pseudo cycles), for a .doc document [2] between commits 947feaa896168430c78dd08dabee1447133f2740..8dd624128bf12e013c17b3b24c0b24135296bb8e so I suspect it has something to do with SwTextBoxHelper. Callgrind data: http://dev-builds.libreoffice.org/callgrind_report/traces/onload-012_fdo %2338513.doc-convert.log.gz In that commit range, there are also smaller regressions for - 061_fdo#68750.doc-convert - probably the same issue, only not so much visible - 004_empty.odp-convert - unfortunately we don't have any non empty .odp files there, there might be some regression in saving .odp files but probably not so important to check and we can wait for bug report? Btw, loperf already helped me once to notice regression caused by my commit [3], fixed later [4], so it's quite useful I'd say. Do you think it makes sense to let you know if I notice any regressions as in this e-mail? Presumably yes, hopefully people are interested in fixing them, so I will try to help with that. Best, Matus [1] http://dev-builds.libreoffice.org/callgrind_report [2] https://gerrit.libreoffice.org/gitweb?p=test-files.git;a=blob;f=loperf/012_fdo%2338513.doc;h=302e9173938cccd1da378bf3d45baa16bece94d0;hb=HEAD [3] http://cgit.freedesktop.org/libreoffice/core/commit/?id=a6b00d16eb27a5e7e31c721671001a909ecef960 [4] http://cgit.freedesktop.org/libreoffice/core/commit/?id=16a62079018aea0e72636bdb00576487b4e830b9 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 61d958f37ed2aad6be2eab7bb507e0fb77716eec
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jun 5 15:17:00 2014 -0400
fdo#72727: Revert -Werror=unused-but-set-variable second try
This reverts commit ccf7b15c0a5776c6431fdcb0c0e2b0f3935ae3dc.
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index 48936b3..a443522 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -855,6 +855,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
const OUString lcl_aCategoriesRange(aCategoriesRange);
+bool bCategoriesApplied = false;
// translate ranges (using the map created before)
for( tSchXMLLSequencesPerIndex::const_iterator aLSeqIt(
rLSequencesPerIndex.begin());
aLSeqIt != rLSequencesPerIndex.end(); ++aLSeqIt )
@@ -883,7 +884,12 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
}
else
{
-if( !lcl_tableOfRangeMatches( aRange,
rTable.aTableNameOfFile ))
+if( lcl_tableOfRangeMatches( aRange,
rTable.aTableNameOfFile ))
+{
+if( aLSeqIt-first.first == SCH_XML_CATEGORIES_INDEX )
+bCategoriesApplied = true;
+}
+else
{
if( aLSeqIt-first.first == SCH_XML_CATEGORIES_INDEX )
{
@@ -894,6 +900,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
SchXMLTools::copyProperties(
xOldSequenceProp, Reference
beans::XPropertySet ( xNewSequence, uno::UNO_QUERY ));
aLSeqIt-second-setValues( xNewSequence );
+bCategoriesApplied = true;
}
else
{
___
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' - xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 84c8157b46e5b2feff48f8a9e8d5df2879c5a740
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jun 5 15:17:00 2014 -0400
fdo#72727: Revert -Werror=unused-but-set-variable second try
This reverts commit ccf7b15c0a5776c6431fdcb0c0e2b0f3935ae3dc.
(cherry picked from commit 61d958f37ed2aad6be2eab7bb507e0fb77716eec)
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index 48936b3..a443522 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -855,6 +855,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
const OUString lcl_aCategoriesRange(aCategoriesRange);
+bool bCategoriesApplied = false;
// translate ranges (using the map created before)
for( tSchXMLLSequencesPerIndex::const_iterator aLSeqIt(
rLSequencesPerIndex.begin());
aLSeqIt != rLSequencesPerIndex.end(); ++aLSeqIt )
@@ -883,7 +884,12 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
}
else
{
-if( !lcl_tableOfRangeMatches( aRange,
rTable.aTableNameOfFile ))
+if( lcl_tableOfRangeMatches( aRange,
rTable.aTableNameOfFile ))
+{
+if( aLSeqIt-first.first == SCH_XML_CATEGORIES_INDEX )
+bCategoriesApplied = true;
+}
+else
{
if( aLSeqIt-first.first == SCH_XML_CATEGORIES_INDEX )
{
@@ -894,6 +900,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
SchXMLTools::copyProperties(
xOldSequenceProp, Reference
beans::XPropertySet ( xNewSequence, uno::UNO_QUERY ));
aLSeqIt-second-setValues( xNewSequence );
+bCategoriesApplied = true;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/ToxLinkProcessor.hxx |6 +++---
sw/source/core/tox/ToxLinkProcessor.cxx |8
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit eb1b6b8f52444a622a2913dc6c435df30e50ddab
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 20:30:30 2014 +0100
they're not copyable, deploy boost::ptr_vector instead
Change-Id: I2e44b9e60622981141eb7af9753898b9f98b238a
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 5a45465..fb56ec2 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -13,7 +13,7 @@
#include fmtinfmt.hxx
#include rtl/ustring.hxx
-#include vector
+#include boost/ptr_container/ptr_vector.hpp
class SwTxtNode;
@@ -74,9 +74,9 @@ private:
sal_Int32 mEndTextPos;
};
-std::vectorClosedLink mClosedLinks;
+boost::ptr_vectorClosedLink mClosedLinks;
-std::vectorStartedLink mStartedLinks;
+boost::ptr_vectorStartedLink mStartedLinks;
friend class ::ToxLinkProcessorTest;
};
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx
b/sw/source/core/tox/ToxLinkProcessor.cxx
index e236f00..23ab44a 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -20,7 +20,7 @@ namespace sw {
void
ToxLinkProcessor::StartNewLink(sal_Int32 startPosition, const OUString
characterStyle)
{
-mStartedLinks.push_back(StartedLink(startPosition, characterStyle));
+mStartedLinks.push_back(new StartedLink(startPosition, characterStyle));
}
void
@@ -36,12 +36,12 @@ ToxLinkProcessor::CloseLink(sal_Int32 endPosition, const
OUString url)
return;
}
-ClosedLink closedLink(url, startedLink.mStartPosition, endPosition);
+ClosedLink* closedLink = new ClosedLink(url, startedLink.mStartPosition,
endPosition);
const OUString characterStyle = startedLink.mCharacterStyle;
sal_uInt16 poolId = ObtainPoolId(characterStyle);
-closedLink.mINetFmt.SetVisitedFmtAndId(characterStyle, poolId);
-closedLink.mINetFmt.SetINetFmtAndId(characterStyle, poolId);
+closedLink-mINetFmt.SetVisitedFmtAndId(characterStyle, poolId);
+closedLink-mINetFmt.SetINetFmtAndId(characterStyle, poolId);
mClosedLinks.push_back(closedLink);
}
___
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/cppunit/tox/test_ToxWhitespaceStripper.cxx | 52 +++
1 file changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 13268c75b5c8d792f5e5388e729b7dfce0165a5c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 20:35:37 2014 +0100
C2782: we hate you sal_Int32 as long on 32bit
Change-Id: I2c8d57f36be15fb4410b11f657e7621022eafa67
diff --git a/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx
b/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx
index fdbd47c..adaffd9 100644
--- a/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx
+++ b/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx
@@ -48,30 +48,30 @@
ToxWhitespaceStripperTest::MappingCharactersToVariousStrippedStringsWorks()
{
OUString test(abc\n);
ToxWhitespaceStripper sut(test);
-CPPUNIT_ASSERT_EQUAL(0, sut.GetPositionInStrippedString(0));
-CPPUNIT_ASSERT_EQUAL(1, sut.GetPositionInStrippedString(1));
-CPPUNIT_ASSERT_EQUAL(2, sut.GetPositionInStrippedString(2));
-CPPUNIT_ASSERT_EQUAL(3, sut.GetPositionInStrippedString(3));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0),
sut.GetPositionInStrippedString(0));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(1),
sut.GetPositionInStrippedString(1));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(2),
sut.GetPositionInStrippedString(2));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(3),
sut.GetPositionInStrippedString(3));
}
{
OUString test(abc\n\n);
ToxWhitespaceStripper sut(test);
-CPPUNIT_ASSERT_EQUAL(0, sut.GetPositionInStrippedString(0));
-CPPUNIT_ASSERT_EQUAL(1, sut.GetPositionInStrippedString(1));
-CPPUNIT_ASSERT_EQUAL(2, sut.GetPositionInStrippedString(2));
-CPPUNIT_ASSERT_EQUAL(3, sut.GetPositionInStrippedString(3));
-CPPUNIT_ASSERT_EQUAL(3, sut.GetPositionInStrippedString(4));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0),
sut.GetPositionInStrippedString(0));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(1),
sut.GetPositionInStrippedString(1));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(2),
sut.GetPositionInStrippedString(2));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(3),
sut.GetPositionInStrippedString(3));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(3),
sut.GetPositionInStrippedString(4));
}
{
OUString test(abc\ndef);
ToxWhitespaceStripper sut(test);
-CPPUNIT_ASSERT_EQUAL(0, sut.GetPositionInStrippedString(0));
-CPPUNIT_ASSERT_EQUAL(1, sut.GetPositionInStrippedString(1));
-CPPUNIT_ASSERT_EQUAL(2, sut.GetPositionInStrippedString(2));
-CPPUNIT_ASSERT_EQUAL(3, sut.GetPositionInStrippedString(3));
-CPPUNIT_ASSERT_EQUAL(4, sut.GetPositionInStrippedString(4));
-CPPUNIT_ASSERT_EQUAL(5, sut.GetPositionInStrippedString(5));
-CPPUNIT_ASSERT_EQUAL(6, sut.GetPositionInStrippedString(6));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0),
sut.GetPositionInStrippedString(0));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(1),
sut.GetPositionInStrippedString(1));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(2),
sut.GetPositionInStrippedString(2));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(3),
sut.GetPositionInStrippedString(3));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(4),
sut.GetPositionInStrippedString(4));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(5),
sut.GetPositionInStrippedString(5));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(6),
sut.GetPositionInStrippedString(6));
}
{
// 012345 6789
@@ -79,16 +79,16 @@
ToxWhitespaceStripperTest::MappingCharactersToVariousStrippedStringsWorks()
// 01234567
// abc def
ToxWhitespaceStripper sut(test);
-CPPUNIT_ASSERT_EQUAL(0, sut.GetPositionInStrippedString(0));
-CPPUNIT_ASSERT_EQUAL(0, sut.GetPositionInStrippedString(1));
-CPPUNIT_ASSERT_EQUAL(1, sut.GetPositionInStrippedString(2));
-CPPUNIT_ASSERT_EQUAL(2, sut.GetPositionInStrippedString(3));
-CPPUNIT_ASSERT_EQUAL(3, sut.GetPositionInStrippedString(4));
-CPPUNIT_ASSERT_EQUAL(4, sut.GetPositionInStrippedString(5));
-CPPUNIT_ASSERT_EQUAL(4, sut.GetPositionInStrippedString(6));
-CPPUNIT_ASSERT_EQUAL(5, sut.GetPositionInStrippedString(7));
-CPPUNIT_ASSERT_EQUAL(6, sut.GetPositionInStrippedString(8));
-CPPUNIT_ASSERT_EQUAL(7, sut.GetPositionInStrippedString(9));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0),
sut.GetPositionInStrippedString(0));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0),
sut.GetPositionInStrippedString(1));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(1),
sut.GetPositionInStrippedString(2));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(2),
sut.GetPositionInStrippedString(3));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(3),
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 503aaf5374039af42a9c413546816a655f26f353 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 5 15:25:00 2014 +0100 update to openssl 1.0.1h Change-Id: Ie20c190e36e89a1b3b2ac9a0efaa50af2df77523 (cherry picked from commit 94ec76a1061db6c2068e190e26035cf0c59e0f79) diff --git a/download.lst b/download.lst index aeda567..c4adb8e 100644 --- a/download.lst +++ b/download.lst @@ -109,7 +109,7 @@ export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz -export OPENSSL_TARBALL := de62b43dfcd858e66a74bee1c834e959-openssl-1.0.1g.tar.gz +export OPENSSL_TARBALL := 8d6d684a9430d5cc98a62a5d8fbda8cf-openssl-1.0.1h.tar.gz export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 ___ 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/core/docnode/nodedump.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c18f300ce82da528afb111fa335fd74176771634 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Jun 5 21:40:59 2014 +0200 loplugin:implicitboolconversion Change-Id: I8fac41d74ada3e85c09bcbeba4856dfe03966ed4 diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 0c40a8a..7eeb80a 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -193,7 +193,7 @@ void SwDoc::dumpAsXml( xmlTextWriterPtr w ) lcl_dumpSdrModel( writer, getIDocumentDrawModelAccess().GetDrawModel() ); writer.startElement(mbModified); -writer.writeFormatAttribute(value, TMP_FORMAT, mbModified); +writer.writeFormatAttribute(value, TMP_FORMAT, static_castint(mbModified)); writer.endElement(); writer.endElement(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/doc/docruby.cxx |2 +-
sw/source/uibase/utlui/uiitems.cxx |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit bf01bb6e80a999bf13f45cf22421b54ab6779bcc
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 17:14:45 2014 +0100
coverity#736056 Missing break in switch, assuming intentional
Change-Id: I4f729d26bae2f2e371e0f2c7aabd5cabd7bf5a62
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 1a4994c..1f71269 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -282,7 +282,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM rPam,
SwRubyListEntry rEntry, sal_uInt
case UnicodeType::OTHER_LETTER:
bChkNxtWrd = true;
-
+//fall-through
default:
bIsAlphaNum = false;
break;
commit dce5aea971d322f20e1e84254ccb4106bebce699
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 17:10:03 2014 +0100
coverity#736075 Missing break in switch, assuming its unintentional
Change-Id: Id00c93eb5b43b8dfb38ecfe4c40076b8b1a18465
diff --git a/sw/source/uibase/utlui/uiitems.cxx
b/sw/source/uibase/utlui/uiitems.cxx
index a819ffc..1a7e347 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -182,6 +182,7 @@ bool SwPageFtnInfoItem::PutValue(const Any rVal, sal_uInt8
nMemberId)
else
bRet = false;
}
+break;
case MID_FTN_LINE_STYLE:
{
::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::NONE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/ToxLinkProcessor.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 462303c3f11c3d04639232c953a9de7f9cac6e6b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 5 21:45:26 2014 +0200
loplugin:passstuffbyref
Change-Id: Ia1fb74ec77b34449df49843271e87546ee68a96d
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index fb56ec2..4200a1f 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -54,7 +54,7 @@ private:
/** Information about a started link */
struct StartedLink {
-StartedLink(sal_Int32 startPosition, OUString characterStyle) :
+StartedLink(sal_Int32 startPosition, const OUString characterStyle) :
mStartPosition(startPosition), mCharacterStyle(characterStyle)
{
;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Sort and copy results
Kohei Yoshida wrote: I'm just wondering if anyone would miss this feature if it got removed. Especially with Calc Writer, it is a relatively safe bet that every obscure feature is absolutely necessary for someone's workflow. Just sayin, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Sort and copy results
On Thu, 2014-06-05 at 21:57 +0200, Thorsten Behrens wrote: Kohei Yoshida wrote: I'm just wondering if anyone would miss this feature if it got removed. Especially with Calc Writer, it is a relatively safe bet that every obscure feature is absolutely necessary for someone's workflow. Sure. But I'm in the mood for breaking someone's workflow. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc
sw/inc/ToxWhitespaceStripper.hxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 47e907ac914b06cc219e624035055c6ad26e14f2
Author: Michael Stahl mst...@redhat.com
Date: Thu Jun 5 22:00:08 2014 +0200
sw: SAL_DLLPUBLIC breaks windows build
Change-Id: I42934ff9ff2c046c82ac2fbb03c944efaeeb4b95
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
index 96b254b..b06f378 100644
--- a/sw/inc/ToxWhitespaceStripper.hxx
+++ b/sw/inc/ToxWhitespaceStripper.hxx
@@ -30,7 +30,8 @@ namespace sw {
*
* @note One leading whitespace is preserved.
*/
-class SAL_DLLPUBLIC ToxWhitespaceStripper {
+class SW_DLLPUBLIC ToxWhitespaceStripper
+{
public:
ToxWhitespaceStripper(const OUString);
___
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/cppunit/tox/test_ToxLinkProcessor.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 371b80e1a52ea0bb29eff6290531482cf45a4d8f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 5 22:01:24 2014 +0200
loplugin:saloverride
Change-Id: Iff296171e373bae256c7bf182de44e8fc8d7e60d
diff --git a/sw/qa/cppunit/tox/test_ToxLinkProcessor.cxx
b/sw/qa/cppunit/tox/test_ToxLinkProcessor.cxx
index 9dc621f..1873bb1 100644
--- a/sw/qa/cppunit/tox/test_ToxLinkProcessor.cxx
+++ b/sw/qa/cppunit/tox/test_ToxLinkProcessor.cxx
@@ -74,8 +74,8 @@
ToxLinkProcessorTest::AddingAndClosingTwoLinksResultsInTwoClosedLinks()
class ToxLinkProcessorWithOverriddenObtainPoolId : public ToxLinkProcessor {
public:
-/*virtual*/ sal_uInt16
-ObtainPoolId(const OUString characterStyle) const {
+virtual sal_uInt16
+ObtainPoolId(const OUString characterStyle) const SAL_OVERRIDE {
if (characterStyle == ToxLinkProcessorTest::STYLE_NAME_1) {
return ToxLinkProcessorTest::POOL_ID_1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/factory.xsl | 73 --
1 file changed, 73 deletions(-)
New commits:
commit 70156ba3c7b1327de3a22c9352c13cc436243ebc
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jun 5 21:51:29 2014 +0200
writerfilter: remove unused factory.xsl
Change-Id: Ib86598c20edd64035766ffb4fe572789f8a4335a
diff --git a/writerfilter/source/ooxml/factory.xsl
b/writerfilter/source/ooxml/factory.xsl
deleted file mode 100644
index e441048..000
--- a/writerfilter/source/ooxml/factory.xsl
+++ /dev/null
@@ -1,73 +0,0 @@
-!--
- * 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:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0
-xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0
-xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0
-xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0
-xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0
-xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0
-xmlns:xlink=http://www.w3.org/1999/xlink;
-xmlns:dc=http://purl.org/dc/elements/1.1/;
-xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0
-xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0
-xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0
-xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0
-xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0
-xmlns:math=http://www.w3.org/1998/Math/MathML;
-xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0
-xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0
-xmlns:config=urn:oasis:names:tc:opendocument:xmlns:config:1.0
-xmlns:ooo=http://openoffice.org/2004/office;
-xmlns:ooow=http://openoffice.org/2004/writer;
-xmlns:oooc=http://openoffice.org/2004/calc;
-xmlns:dom=http://www.w3.org/2001/xml-events;
-xmlns:xforms=http://www.w3.org/2002/xforms;
-xmlns:xsd=http://www.w3.org/2001/XMLSchema;
-xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
-xmlns:rng=http://relaxng.org/ns/structure/1.0;
-xmlns:rdfs=http://www.w3.org/2000/01/rdf-schema#;
-xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space=default
- xsl:output method=text /
- xsl:param name=prefix/
-
- xsl:include href=factorytools.xsl/
-
- xsl:template match=/
-xsl:text
-#include ooxml/OOXMLFactory.hxx/xsl:text
-xsl:call-template name=factoryincludes/
-xsl:text
-namespace writerfilter {
-namespace ooxml {
-using namespace ::std;
-using namespace ::com::sun::star;
-
-/// @cond GENERATED
-/xsl:text
-xsl:call-template name=factoryfornamespace/
-xsl:text
-/// @endcond
-}}
-/xsl:text
-/xsl:template
-
-/xsl:stylesheet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/ToxWhitespaceStripper.hxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c21b7ebf68527a2a5a7b4803f96ace82e9b14e63
Author: Michael Stahl mst...@redhat.com
Date: Thu Jun 5 22:02:47 2014 +0200
sw: oops, forgot to commit that
Change-Id: I66c50300a797fd096b34ecb5eda16cf783fe4195
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
index b06f378..12bc99f 100644
--- a/sw/inc/ToxWhitespaceStripper.hxx
+++ b/sw/inc/ToxWhitespaceStripper.hxx
@@ -15,6 +15,8 @@
#include vector
+#include swdllapi.h
+
namespace sw {
/** This class helps to remove unwanted whitespaces from a string to use in a
Tox.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/ToxWhitespaceStripper.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0b685348d3ba04aada7464b3674a8e6cc3716500 Author: Caolán McNamara caol...@redhat.com Date: Thu Jun 5 21:05:03 2014 +0100 SAL_DLLPUBLIC-SW_DLLPUBLIC Change-Id: I608f190de7c8cac50c84fa9f4eaa0d838ceca21b diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx index 12bc99f..21dbdeb 100644 --- a/sw/inc/ToxWhitespaceStripper.hxx +++ b/sw/inc/ToxWhitespaceStripper.hxx @@ -12,7 +12,7 @@ #define TOXWHITESPACESTRIPPER_HXX_ #include rtl/ustring.hxx - +#include swdllapi.h #include vector #include swdllapi.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/ToxWhitespaceStripper.hxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 1fee42536acaa76f14c2bd1bbb363d0ef6489b5c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 21:09:19 2014 +0100
standing on eachothers toes
Change-Id: I66a395b3af11a191215538bc8033b41facf558b7
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
index 21dbdeb..4e10619 100644
--- a/sw/inc/ToxWhitespaceStripper.hxx
+++ b/sw/inc/ToxWhitespaceStripper.hxx
@@ -12,10 +12,8 @@
#define TOXWHITESPACESTRIPPER_HXX_
#include rtl/ustring.hxx
-#include swdllapi.h
-#include vector
-
#include swdllapi.h
+#include vector
namespace sw {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - sc/source sd/source svtools/source sw/source
sc/source/ui/view/formatsh.cxx|1 +
sd/source/ui/view/drviews2.cxx|1 +
svtools/source/brwbox/ebbcontrols.cxx |2 ++
sw/source/core/crsr/trvltbl.cxx |3 +++
sw/source/uibase/shells/basesh.cxx|1 +
5 files changed, 8 insertions(+)
New commits:
commit 44202fed1fcb6b8d3523fd9e7bebf47f02fcd6d2
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 21:02:41 2014 +0100
coverity#1213246 Dereference null return value
Change-Id: I682a1e912728d6e52df258c7528e358f2883b323
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index e581c7a..5d7a647 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -63,6 +63,9 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
{
if ( !pTblNd )
pTblNd = IsCrsrInTbl();
+assert (pTblNd);
+if (!pTblNd)
+return false;
pTableBox = pTableBox-FindEndOfRowSpan( pTblNd-GetTable(),
(sal_uInt16)(pTableBox-getRowSpan() + pCrsr-GetCrsrRowSpanOffset() ) );
pTableBoxStartNode = pTableBox-GetSttNd();
commit 64df417cdb20466c823de0251ad2aa3a80833f28
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 20:58:58 2014 +0100
coverity#1019354 Missing break in switch, assuming intentional
Change-Id: I4dd2f68e8712a2c76797a33c54d1baf69975830f
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 3959c11..bd7c4bf 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1265,6 +1265,7 @@ void DrawViewShell::FuTemporary(SfxRequest rReq)
case SID_CAPTUREPOINT:
// negative value to signal call from menu
maMousePos = Point(-1,-1);
+// fall-through
case SID_SET_SNAPITEM:
{
SetCurrentFunction( FuSnapLine::Create(this, GetActiveWindow(),
mpDrawView, GetDoc(), rReq) );
commit b787ed773493b01f34e8dfb66f74da17147d82a3
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 20:56:34 2014 +0100
coverity#705317 Missing break in switch, assuming intentional
Change-Id: I9bd2ffc1ebf22f6f5ea61a448b7c9e83e724fa4d
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index e9aa004..0bd7d8f 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1955,6 +1955,7 @@ void SwBaseShell::ExecTxtCtrl( SfxRequest rReq )
nScripts =
SvtLanguageOptions::GetScriptTypeOfLanguage( nInputLang );
}
}
+// fall-through
case SID_ATTR_CHAR_POSTURE:
case SID_ATTR_CHAR_WEIGHT:
{
commit 94e2459cd89320cc55119fbd3ce1651ccd376c3e
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 20:48:13 2014 +0100
coverity#705245 Missing break in switch, assuming intentional
Change-Id: I2ac6acde603c89c5b7736ec7f1a1b42b28726827
diff --git a/svtools/source/brwbox/ebbcontrols.cxx
b/svtools/source/brwbox/ebbcontrols.cxx
index 9587207..13988ce 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -116,6 +116,7 @@ namespace svt
// drop down the list box
else if (rEvt.GetKeyCode().IsMod2()
rEvt.GetKeyCode().GetCode() == KEY_DOWN)
return false;
+// fall-through
case KEY_PAGEUP:
case KEY_PAGEDOWN:
case KEY_RETURN:
@@ -213,7 +214,7 @@ namespace svt
else
if (rEvt.GetKeyCode().IsMod2()
rEvt.GetKeyCode().GetCode() == KEY_DOWN)
return false;
-//fall-through
+// fall-through
case KEY_PAGEUP:
case KEY_PAGEDOWN:
if (rBox.IsTravelSelect())
commit 0017cafc9d6c778a404fd71d5d1dccb1a02e7de9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 20:47:38 2014 +0100
coverity#705243 Missing break in switch, assuming intentional
Change-Id: I4882ba5028e45528cafc1170bc4de6c3a2ea7a12
diff --git a/svtools/source/brwbox/ebbcontrols.cxx
b/svtools/source/brwbox/ebbcontrols.cxx
index c1b865c..9587207 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -213,6 +213,7 @@ namespace svt
else
if (rEvt.GetKeyCode().IsMod2()
rEvt.GetKeyCode().GetCode() == KEY_DOWN)
return false;
+//fall-through
case KEY_PAGEUP:
case KEY_PAGEDOWN:
if (rBox.IsTravelSelect())
commit 9009dfb67bd0c6f184cb89c251618427a0b655ca
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 20:45:22 2014 +0100
coverity#705214 Missing break in switch,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/fontsubset/sft.cxx | 23 +--
1 file changed, 17 insertions(+), 6 deletions(-)
New commits:
commit 2dd048b2613a8309ba7673ef2cefae6dee56b235
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jun 4 16:17:28 2014 +0100
Resolves: fdo#78477 ensure offset + sizeof(value) is in bounds
a) ptr is just added to offset, so move addition into 2nd arg
Change-Id: Ia3e8145c69324f19aeec8b0dd97284ec382d20d7
(cherry picked from commit 57ef375bed4480bbedc799aca274a6bd26745008)
b) sort in order of increasing offset
Change-Id: I0d2c880438f47f4527037d7ffaf77cf142d24751
(cherry picked from commit 95e92889d3fb0e8a85cefdeb07a02e57130a9799)
c) fdo#78477 ensure offset + sizeof(value) is in bounds
check that largest offset + value to read is inside available space
Change-Id: I4feac37bdfbae5061b3b75ddf44bb20fc5904656
(cherry picked from commit c888c211072f23cfb4cc488c641d8d822f930a33)
(cherry picked from commit 891e0f76350890a4dd4331820bde8c118ac06ab0)
Reviewed-on: https://gerrit.libreoffice.org/9641
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 868e970..76f8abf 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -45,6 +45,7 @@
#ifndef NO_TYPE3 /* include CreateT3FromTTGlyphs() */
#include rtl/crc.h
#endif
+#include rtl/ustring.hxx
#include osl/endian.h
#include algorithm
@@ -2649,12 +2650,22 @@ int GetTTNameRecords(TrueTypeFont *ttf, NameRecord **nr)
NameRecord* rec = (NameRecord*)calloc(n, sizeof(NameRecord));
for (i = 0; i n; i++) {
-int nStrOffset = GetUInt16(table + 6, 10 + 12 * i, 1);
-rec[i].platformID = GetUInt16(table + 6, 12 * i, 1);
-rec[i].encodingID = GetUInt16(table + 6, 2 + 12 * i, 1);
-rec[i].languageID = GetUInt16(table + 6, 4 + 12 * i, 1);
-rec[i].nameID = GetUInt16(table + 6, 6 + 12 * i, 1);
-rec[i].slen = GetUInt16(table + 6, 8 + 12 * i, 1);
+int nLargestFixedOffsetPos = 6 + 10 + 12 * i;
+int nMinSize = nLargestFixedOffsetPos + sizeof(sal_uInt16);
+if (nMinSize nTableSize)
+{
+SAL_WARN( vcl.fonts, Font
OUString::createFromAscii(ttf-fname) claimed to have
+ n name records, but only space for i);
+n = i;
+break;
+}
+
+rec[i].platformID = GetUInt16(table, 6 + 0 + 12 * i, 1);
+rec[i].encodingID = GetUInt16(table, 6 + 2 + 12 * i, 1);
+rec[i].languageID = GetUInt16(table, 6 + 4 + 12 * i, 1);
+rec[i].nameID = GetUInt16(table, 6 + 6 + 12 * i, 1);
+rec[i].slen = GetUInt16(table, 6 + 8 + 12 * i, 1);
+int nStrOffset = GetUInt16(table, nLargestFixedOffsetPos, 1);
if (rec[i].slen) {
if( nStrBase+nStrOffset+rec[i].slen = nTableSize ) {
rec[i].sptr = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Sort and copy results
Hello, Le Thu, 05 Jun 2014 19:33:13 +0200, Kohei Yoshida kohei.yosh...@collabora.com a écrit: In Calc, you can go to Data - Sort, and choose to copy the sorted results to someplace else, rather than the default option of sorting in place. I'm just wondering if anyone would miss this feature if it got removed. The UI is a bit awkward, and not clear what the associated two fields (left drop-down and right input fields) are supposed to take. Also, handling this option internally would require quite some extra effort, which, when one is trying to fix issues associted with this, would pose a greater risk of breaking things. Any objections for removing this? Kohei Could we (well, huh, you ?) just copy the data first, then sort them in-place ? It will preserve the feature without causing effort to maintain. And we may even soften the UI by adding some labels to boxes. My 2 cents Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Sort and copy results
On Thu, 2014-06-05 at 22:52 +0200, Mat M wrote: Hello, Le Thu, 05 Jun 2014 19:33:13 +0200, Kohei Yoshida kohei.yosh...@collabora.com a écrit: In Calc, you can go to Data - Sort, and choose to copy the sorted results to someplace else, rather than the default option of sorting in place. I'm just wondering if anyone would miss this feature if it got removed. The UI is a bit awkward, and not clear what the associated two fields (left drop-down and right input fields) are supposed to take. Also, handling this option internally would require quite some extra effort, which, when one is trying to fix issues associted with this, would pose a greater risk of breaking things. Any objections for removing this? Kohei Could we (well, huh, you ?) just copy the data first, then sort them in-place ? It will preserve the feature without causing effort to maintain. And we may even soften the UI by adding some labels to boxes. That's what we do today. However, that would be a pain (really pain) to support when you think of undo and redo, plus supporting reference update that's been requested for so many years. So, no. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Sort and copy results
On Thu, 2014-06-05 at 17:20 -0400, Kohei Yoshida wrote: On Thu, 2014-06-05 at 22:52 +0200, Mat M wrote: Hello, Le Thu, 05 Jun 2014 19:33:13 +0200, Kohei Yoshida kohei.yosh...@collabora.com a écrit: In Calc, you can go to Data - Sort, and choose to copy the sorted results to someplace else, rather than the default option of sorting in place. I'm just wondering if anyone would miss this feature if it got removed. The UI is a bit awkward, and not clear what the associated two fields (left drop-down and right input fields) are supposed to take. Also, handling this option internally would require quite some extra effort, which, when one is trying to fix issues associted with this, would pose a greater risk of breaking things. Any objections for removing this? Kohei Could we (well, huh, you ?) just copy the data first, then sort them in-place ? It will preserve the feature without causing effort to maintain. And we may even soften the UI by adding some labels to boxes. What I would be more interested to know is: would *you* (or anyone you know) personally miss this? Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source
sd/source/ui/view/drviews1.cxx | 14 --
sd/source/ui/view/drviews2.cxx | 18 --
sd/source/ui/view/drviews3.cxx | 29 +++--
sd/source/ui/view/drviews4.cxx |6 ++
sd/source/ui/view/drviews7.cxx | 29 ++---
sd/source/ui/view/drviewsb.cxx |6 ++
6 files changed, 81 insertions(+), 21 deletions(-)
New commits:
commit b4c090d8e6ad7727fc5a0399349b9ed0b5ff75f2
Author: Armin Le Grand a...@apache.org
Date: Fri Feb 28 02:15:29 2014 +
Resolves: fdo#78953 secured usage of LayerTabBar in Draw...
was #i87182# secured usage of LayerTabBar in Draw...
ensured initialization when used as OLE
(cherry picked from commit 903afaa8ea0766e01ba41a227d2794c2c40b129a)
Conflicts:
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
sd/source/ui/view/drviews3.cxx
sd/source/ui/view/drviews7.cxx
sd/source/ui/view/drviewsb.cxx
(cherry picked from commit b1cf64fe51fd0bb1e9bc8c3bb38d5cc7254d8d5f)
Conflicts:
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
sd/source/ui/view/drviews3.cxx
sd/source/ui/view/drviews7.cxx
Change-Id: I86bb17bf422356247a319f89e54d1ead97b368b8
Reviewed-on: https://gerrit.libreoffice.org/9654
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 2df556d..bffde5d 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -352,7 +352,13 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
GetViewShellBase().GetDrawController().BroadcastContextChange();
meEditMode = eEMode;
-mbIsLayerModeActive = bIsLayerModeActive;
+
+if(pLayerBar)
+{
+// #i87182# only switch activation mode of LayerTabBar when there
is one,
+// else it will not get initialized with the current set of Layers
as needed
+mbIsLayerModeActive = bIsLayerModeActive;
+}
// Determine whether to show the master view toolbar. The master
// page mode has to be active and the shell must not be a handout
@@ -601,7 +607,11 @@ IMPL_LINK( DrawViewShell, TabSplitHdl, TabBar *, pTab )
aTabSize.Width() = std::min(pTab-GetSplitSize(), (long)(nMax-1));
maTabControl.SetSizePixel(aTabSize);
-GetLayerTabControl()-SetSizePixel(aTabSize);
+
+if(GetLayerTabControl()) // #i87182#
+{
+GetLayerTabControl()-SetSizePixel(aTabSize);
+}
Point aPos = maTabControl.GetPosPixel();
aPos.X() += aTabSize.Width();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 003835e..a81e2ff 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1538,6 +1538,14 @@ void DrawViewShell::FuTemporary(SfxRequest rReq)
case SID_MODIFYLAYER:
{
+if(!GetLayerTabControl()) // #i87182#
+{
+OSL_ENSURE(false, No LayerTabBar (!));
+Cancel();
+rReq.Ignore();
+break;
+}
+
if ( mpDrawView-IsTextEdit() )
{
mpDrawView-SdrEndTextEdit();
@@ -1694,8 +1702,14 @@ void DrawViewShell::FuTemporary(SfxRequest rReq)
mpDrawView-SdrEndTextEdit();
}
-GetLayerTabControl()-StartEditMode(
-GetLayerTabControl()-GetCurPageId() );
+if(GetLayerTabControl()) // #i87182#
+{
+
GetLayerTabControl()-StartEditMode(GetLayerTabControl()-GetCurPageId());
+}
+else
+{
+OSL_ENSURE(false, No LayerTabBar (!));
+}
Cancel();
rReq.Ignore ();
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 31e89a4..f292942 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -199,17 +199,34 @@ void DrawViewShell::ExecCtrl(SfxRequest rReq)
case SID_SWITCHLAYER: // BASIC
{
const SfxItemSet *pArgs = rReq.GetArgs ();
-sal_uInt16 nCurPage = GetLayerTabControl()-GetCurPageId ();
-if( pArgs pArgs-Count () == 1)
+// #i87182#
+bool bCurPageValid(false);
+sal_uInt16 nCurPage(0);
+
+if(GetLayerTabControl())
+{
+nCurPage = GetLayerTabControl()-GetCurPageId();
+bCurPageValid = true;
+}
+
+if(pArgs 1 == pArgs-Count())
{
SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item,
ID_VAL_WHATLAYER, sal_False);
-if( pWhatLayer )
-nCurPage = (short) pWhatLayer-GetValue ();
+
+if(pWhatLayer)
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/ui/uno/SwXDocumentSettings.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit ece49b68c408edea1ebcb8149c41051d5bdac279
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 30 13:09:28 2014 +0100
coverity#736074 Missing break in switch
(cherry picked from commit 87574542fc953a60bc2bafe8ed725500f9322521)
(cherry picked from commit 035c802fa170af9fec84b2d9a6621043915accb2)
Conflicts:
sw/source/core/uibase/uno/SwXDocumentSettings.cxx
Change-Id: Ie60f70e992323b9841c854edc083f686bbeda1f5
Reviewed-on: https://gerrit.libreoffice.org/9652
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx
b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 8a218a1..cf47b1c 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -781,6 +781,7 @@ void SwXDocumentSettings::_setSingleValue( const
comphelper::PropertyInfo rInf
sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
mpDoc-set(IDocumentSettingAccess::EMBED_FONTS, bTmp);
}
+break;
case HANDLE_EMBED_SYSTEM_FONTS:
{
sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
___
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/svdraw/svdograf.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ec98e41a4ad88ce7c9a76f1e0a35157e10a48213
Author: Caolán McNamara caol...@redhat.com
Date: Sat Mar 15 13:49:20 2014 +
Resolves: rhbz#1104068 crash converting fontwork to curve
via metafile, i.e. take fontwork example 11, convert
to metafile and convert that to curve
was coverity#1019335 Dereference after null check
(cherry picked from commit d77cc9d2cdc702f2b2016498df107f4120d27690)
Change-Id: I309e0c3f8a0630991e2aad64f995567e0920be3b
Reviewed-on: https://gerrit.libreoffice.org/9649
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 0a672d3..0446977 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1011,7 +1011,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage )
ImpLinkAbmeldung();
}
-if(!pModel !GetStyleSheet() pNewPage-GetModel())
+if(!pModel !GetStyleSheet() pNewPage pNewPage-GetModel())
{
// #i119287# Set default StyleSheet for SdrGrafObj here, it is
different from 'Default'. This
// needs to be done before the style 'Default' is set from the
:SetModel() call which is triggered
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/ui/fmtui/tmpdlg.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 90ea159e62bc6c884906220d9a0a97f70ae9c7ad
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 5 13:49:14 2014 +0100
Resolves: rhbz#1096747 crash/hang on format-page on html document
Change-Id: I9a989620375eb210e553b84b7a642a0360c8f03f
(cherry picked from commit 655377e90c57bb68e5000f06f76531baf9eeaa37)
(cherry picked from commit 829aa9e03ae570e15af1f754b292709f38f643ea)
Reviewed-on: https://gerrit.libreoffice.org/9650
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index bc224b7..7645249 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -290,6 +290,13 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
if(!aCJKOptions.IsAsianTypographyEnabled())
RemoveTabPage(textgrid);
}
+else
+{
+RemoveTabPage(borders);
+RemoveTabPage(columns);
+RemoveTabPage(footnotes);
+RemoveTabPage(textgrid);
+}
}
break;
// numbering styles
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 8 commits - filter/Library_filterconfig.mk filter/source
filter/Library_filterconfig.mk |2
filter/source/config/cache/basecontainer.cxx|4
filter/source/config/cache/filtercache.cxx | 47
filter/source/config/cache/filtercache.hxx | 37 +--
filter/source/config/cache/lateinitlistener.cxx | 126
filter/source/config/cache/lateinitlistener.hxx | 111 -
filter/source/config/cache/lateinitthread.cxx | 49 -
filter/source/config/cache/lateinitthread.hxx | 53 --
8 files changed, 7 insertions(+), 422 deletions(-)
New commits:
commit f7fac105102c6df21242dc30ee7174aee6507bb3
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jun 5 22:15:23 2014 +0200
...which empirically shows that LateInitThread is useless
Change-Id: Ic2946eef616eae39576d162ca534831753bd3c89
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index ce4475b..602d2b1 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -55,8 +55,6 @@ $(eval $(call gb_Library_add_exception_objects,filterconfig,\
filter/source/config/cache/filtercache \
filter/source/config/cache/filterfactory \
filter/source/config/cache/frameloaderfactory \
- filter/source/config/cache/lateinitlistener \
- filter/source/config/cache/lateinitthread \
filter/source/config/cache/querytokenizer \
filter/source/config/cache/registration \
filter/source/config/cache/typedetection \
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index 92fced4..e9ac3ed 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -19,7 +19,6 @@
#include filtercache.hxx
-#include lateinitlistener.hxx
#include macros.hxx
#include constant.hxx
#include cacheupdatelistener.hxx
@@ -156,18 +155,12 @@ void FilterCache::takeOver(const FilterCache rClone)
-void FilterCache::load(EFillState eRequired,
-sal_Bool bByThread
-)
+void FilterCache::load(EFillState eRequired)
throw(css::uno::Exception)
{
// SAFE - --
::osl::ResettableMutexGuard aLock(m_aLock);
-SAL_WARN_IF(
-bByThread (eRequired ~m_eFillState) == 0, filter.config,
-useless LateInitThread);
-
// check if required fill state is already reached ...
// There is nothing to do then.
if ((m_eFillState eRequired) == eRequired)
@@ -193,13 +186,6 @@ void FilterCache::load(EFillState eRequired,
// Support the old configuration support. Read it only one times
during office runtime!
impl_readOldFormat();
-
-// enable loadOnDemand feature ...
-// Create uno listener, which waits for finishing the office startup
-// and starts a thread, which calls loadAll() at this filter cache.
-// Note: Its not a leak to create this listener with new here.
-// It kills itself after working!
-/* LateInitListener* pLateInit = */ new
LateInitListener(comphelper::getProcessComponentContext());
}
diff --git a/filter/source/config/cache/filtercache.hxx
b/filter/source/config/cache/filtercache.hxx
index 2e82ccf..33efef1 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -314,32 +314,13 @@ class FilterCache : public BaseLock
This method must be called from every user of this
cache
every time it needs a filled cache. Normally we load
only standard information into this cache on startup.
-After a few seconds we start a special thread, which
-may fill this cache completely. But if someone outside
-needs a filled cache before ... it can run into
trouble,
-if this load-on-demand thread does not finished its
work before.
-This method load(xxx) synchronize such
load-on-demand requests.
-
-Of course it would be possible to supress this special
load thread
-in general and start it manually inside this load()
request.
-The outside code decide then, if and when this cache
will be filled
-with all available information ...
-
-@param bByThread
-indicates using of this method by our global
load-on-demand-thread.
-Its an implementation detail! We use it to check, if
this load()
-request was forced e.g. by one of our derived service
container (which need
-it to full fill its own operations) or if it was
forced by our own
-load-on-demand-thread, which tries to optimize our
startup performance
-and start this
Re: Sort and copy results
Hi Kohei, On Thursday, 2014-06-05 13:33:13 -0400, Kohei Yoshida wrote: In Calc, you can go to Data - Sort, and choose to copy the sorted results to someplace else, rather than the default option of sorting in place. I'm just wondering if anyone would miss this feature if it got removed. It is even defined in ODF, table:sort attribute table:target-range-address=..., it is part of a table:database-range element, and if the source range is modified choosing menu Data - Refresh Range will update the target range with the current sorted data. The UI is a bit awkward, and not clear what the associated two fields (left drop-down and right input fields) are supposed to take. Left drop-down list has defined (DB) range names, right input field takes the top-left cell address of the output range. Also, handling this option internally would require quite some extra effort, which, when one is trying to fix issues associted with this, would pose a greater risk of breaking things. Any objections for removing this? Yes. I'm almost certain that some enterprise users actually use this feature. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp7O96MOiuji.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Sort and copy results
On Fri, 2014-06-06 at 00:23 +0200, Eike Rathke wrote: Hi Kohei, On Thursday, 2014-06-05 13:33:13 -0400, Kohei Yoshida wrote: In Calc, you can go to Data - Sort, and choose to copy the sorted results to someplace else, rather than the default option of sorting in place. I'm just wondering if anyone would miss this feature if it got removed. It is even defined in ODF, table:sort attribute table:target-range-address=..., it is part of a table:database-range element, and if the source range is modified choosing menu Data - Refresh Range will update the target range with the current sorted data. Well, having it in ODF doesn't mean we need to implement it in the UI, if it's not good. The UI is a bit awkward, and not clear what the associated two fields (left drop-down and right input fields) are supposed to take. Left drop-down list has defined (DB) range names, right input field takes the top-left cell address of the output range. Ok. Then this is probably one of the only fields that doesn't have a address picker button. That makes it more awkward. Also, handling this option internally would require quite some extra effort, which, when one is trying to fix issues associted with this, would pose a greater risk of breaking things. Any objections for removing this? Yes. I'm almost certain that some enterprise users actually use this feature. I'd like to know they still exist though, rather than speculating that they still do. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Sort and copy results
On Thu, Jun 5, 2014 at 1:33 PM, Kohei Yoshida kohei.yosh...@collabora.com wrote: In Calc, you can go to Data - Sort, and choose to copy the sorted results to someplace else, rather than the default option of sorting in place. When we've deprecated/removed other features, how did we handle that that in the Release Notes? Did we just make a note about the removal and provide an alternate workflow? I'm just wondering if anyone would miss this feature if it got removed. ... I'd like to know they still exist though, rather than speculating that they still do. Aside from clearly flagging this option as DEPRECATED in the UI and then waiting a couple of versions before completely removing it, I'm not sure of a great way for us to query our userbase. The enterprise users might be even harder to query, as they might not see any changes we make in 4.3 for quite some time. Cheers, --R -- Robinson Tryon LibreOffice Community Outreach Herald Senior QA Bug Wrangler The Document Foundation qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Sort and copy results
On Thu, 2014-06-05 at 19:54 -0400, Robinson Tryon wrote: On Thu, Jun 5, 2014 at 1:33 PM, Kohei Yoshida kohei.yosh...@collabora.com wrote: In Calc, you can go to Data - Sort, and choose to copy the sorted results to someplace else, rather than the default option of sorting in place. When we've deprecated/removed other features, how did we handle that that in the Release Notes? Did we just make a note about the removal and provide an alternate workflow? Good question. We really don't have a clear guideline on feature deprecation, but when we did, we did normally say it in the release notes, I think. Though in earlier days we may have skipped it since it was pretty much wild west back then. But if we did that today, we would include that in the release notes. I'm just wondering if anyone would miss this feature if it got removed. ... I'd like to know they still exist though, rather than speculating that they still do. Aside from clearly flagging this option as DEPRECATED in the UI and then waiting a couple of versions before completely removing it, I'm not sure of a great way for us to query our userbase. The enterprise users might be even harder to query, as they might not see any changes we make in 4.3 for quite some time. What *I* normally resort to is to either disable the UI or hide it, and see if someone reports it as a regression. I did that once for something else in the past (which it was argued that was still used in the enterprise). So far I haven't come across a bug report claiming it was gone. It was done several major versions ago IIRC. Either way, I really believe that we do have to be brave enough to deprecate some less than useful features if it makes sense, else we'd end up filled with tons of esoteric old-school features that nobody could ever maintain, or hinders our growth. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
