LibreOffice Gerrit News for core on 2015-04-05
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + New test for sw in https://gerrit.libreoffice.org/15158 from Austin Chen about module .git-hooks, build, sc, svx, sw + tdf#80758:empty values in button name not respected in https://gerrit.libreoffice.org/14498 from Rishabh Kumar about module cui + Breeeze: updated Icons in https://gerrit.libreoffice.org/15157 from Andreas Kainz about module icon-themes + Breeze: update recomandations from Philips in https://gerrit.libreoffice.org/15156 from Andreas Kainz about module icon-themes + Add KDE5 plugin for vcl in https://gerrit.libreoffice.org/13078 from Jonathan Riddell about module build, icon-themes, vcl + tdf#89790 - DOCX: saving LO version number in correct tag in app.xml in https://gerrit.libreoffice.org/15151 from Ioan Radu about module include, oox, unotools + tdf#88710 Kill svx dbtoolsclient in https://gerrit.libreoffice.org/15147 from Matthew James Nicholls about module connectivity, include, sc, svx, sw End of freshness + tdf#56467: copy text of meta actions with correct text length in https://gerrit.libreoffice.org/15144 from Christina Roßmanith about module filter + tdf#56467 / tdf#88117: SVG export further improved in https://gerrit.libreoffice.org/15155 from Christina Roßmanith about module filter + tdf#90258 Toggle Thousand Separator with Engineering Notation in https://gerrit.libreoffice.org/15152 from Laurent BP about module cui, svl + Create new FACTORYNAME_DATABASEFORM and use it in https://gerrit.libreoffice.org/15150 from Julien Nabet about module unotools * Merged changes on master for project core changed in the last 25 hours: + tdf#90404 OOXML chart legend import improvement in https://gerrit.libreoffice.org/15149 from Andras Timar + sw: prefix members of SwRootFrm in https://gerrit.libreoffice.org/15148 from Miklos Vajna + Use std::make_shared<> in https://gerrit.libreoffice.org/15146 from Miklos Vajna + Breeze: Page property icons in https://gerrit.libreoffice.org/15145 from Andreas Kainz * 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: + WIP fdo#72987 Use firebird backup format for .odb no need for rebuild ind in https://gerrit.libreoffice.org/14968 from Popa Adrian Marius + Upgrade firebird to 2.5.3 , a few patches are already applied upstream in https://gerrit.libreoffice.org/15026 from Popa Adrian Marius + more breeze icons in https://gerrit.libreoffice.org/13058 from Jonathan Riddell + tdf#90222: replace ScaList in scaddins with a std container in https://gerrit.libreoffice.org/15012 from Pieter Adriaensen + Removed unnecessary variables which occupy space in https://gerrit.libreoffice.org/14951 from Karthick Prasad + Fixed all postfix operator++ and operator-- in https://gerrit.libreoffice.org/14975 from Ahmad Samir + tdf#39468 Translate German Comments - sc/source/core/data/ in https://gerrit.libreoffice.org/14866 from Christian M. Heller + tdf#49893: final fix for blank rectangle problem in https://gerrit.libreoffice.org/14584 from Vasily Melenchuk + xmloff: convert xof.component to use constructor syntax in https://gerrit.libreoffice.org/14820 from Chris Sherlock + xmloff: use constructor syntax in xo.component in https://gerrit.libreoffice.org/14803 from Chris Sherlock + sd: use constructor syntax for rest of sd.component in https://gerrit.libreoffice.org/14689 from Chris Sherlock + embeddedobj: convert emboleobj.*.component to constructor syntax in https://gerrit.libreoffice.org/14687 from Chris Sherlock + sc: use constructor syntax in sc.component in https://gerrit.libreoffice.org/14750 from Chris Sherlock + Convert ScDocument to constructor syntax, remove sc_component_getFactory( in https://gerrit.libreoffice.org/14751 from Chris Sherlock + scaddins: use constructor syntax for date.component in https://gerrit.libreoffice.org/14707 from Chris Sherlock + scaddins: use constructor syntax for pricing.component in https://gerrit.libreoffice.org/14706 from Chris Sherlock + scaddins: use constructor syntax for analysis.component in https://gerrit.libreoffice.org/14708 from Chris Sherlock + package: use constructor syntax in xstor.component in https://gerrit.libreoffice.org/14757 from Chris Sherlock + xmlsecurity: use constructor syntax in xsec_xmlsec.component in https://gerrit.libreoffice.org/14758 from Chris Sherlock + BUG - tdf#38835 strip out non-trivial globals before main in https://gerrit.libreoffice.org/14830 from Karthick Prasad + Convert OS = LINUX conditionals to GUIBASE = unx. in https://gerrit.libreoffice.org/14790 from Ryo ONODERA + fdo#83672 , fdo#67776 : Fixed shape rotation angle in xlsx import. in https://gerrit.libreoffice.org/13090 from Sushil Shinde + tdf#85491 : break parameter incorrectly set in .XLSX im
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2015-05-04_02:08:36 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5cfee95f4e611911a862788370402e861531e9c1 Author: Andras Timar Date: Sun Apr 5 00:41:48 2015 +0200 Updated core Project: help c592de412ac16d74febb97d5d522f0a32f36cb87 diff --git a/helpcontent2 b/helpcontent2 index 08790ed..c592de4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 08790edcf50d4281d55e5c28c0c07f88a99241f3 +Subproject commit c592de412ac16d74febb97d5d522f0a32f36cb87 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: to-wiki/wikiconv2.py
to-wiki/wikiconv2.py | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit c592de412ac16d74febb97d5d522f0a32f36cb87
Author: Andras Timar
Date: Sun Apr 5 00:41:48 2015 +0200
fix AttributeError: TableRow instance has no attribute 'isTableHeader'
Change-Id: I1c758acbf2cee846cf350568fbfb1fd341139ac2
diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 6de42b8..b7397f2 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -578,6 +578,7 @@ class TableRow(ElementBase):
ElementBase.__init__(self, 'tablerow', parent)
def start_element(self, parser, name, attrs):
+self.isTableHeader = False
if name == 'tablecell':
self.parse_child(TableCell(attrs, self))
else:
@@ -1367,7 +1368,7 @@ def write_redirects():
redirect = redir[1]
target = redir[2]
authoritative = redir[3]
-
+
if app != '':
r = '%s/%s'% (app, redirect)
if authoritative:
@@ -1378,13 +1379,13 @@ def write_redirects():
written[r]
except:
written[r] = False
-
+
# in the second pass, output the wiki links
for redir in redirects:
app = redir[0]
redirect = redir[1]
target = redir[2]
-
+
if app == '':
for i in ['swriter', 'scalc', 'simpress', 'sdraw', 'smath', \
'schart', 'sbasic', 'sdatabase']:
@@ -1416,7 +1417,7 @@ def convert(generate_redirects, lang, po_root):
for title in titles:
while threading.active_count() > max_threads:
time.sleep(0.001)
-
+
infile = title[0].strip()
wikiname = title[1].strip()
articledir = 'wiki/' + wikiname
@@ -1444,7 +1445,7 @@ def convert(generate_redirects, lang, po_root):
(infile, outfile)
sys.stderr.write('Warning: Skipping: %s > %s\n'% (infile, outfile))
file.close()
-
+
# wait for everyone to finish
while threading.active_count() > 1:
time.sleep(0.001)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/usereventqueue.cxx | 20
1 file changed, 20 deletions(-)
New commits:
commit 13fa5bb755ef90bbea1edb200ad0575570c42c6a
Author: Tor Lillqvist
Date: Sun Apr 5 00:55:47 2015 +0300
WaE: Unreferenced function definition
Change-Id: I3190e994b7b63b258436ef5d35542722fa91fa46
diff --git a/slideshow/source/engine/usereventqueue.cxx
b/slideshow/source/engine/usereventqueue.cxx
index 33b0f62..8404dc4 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -286,26 +286,6 @@ private:
bool mbSkipTriggersNextEffect;
};
-class RewindEffectEventHandler : public MouseEventHandler_,
- public EventContainer
-{
-public:
-RewindEffectEventHandler( EventQueue & rEventQueue )
-: EventContainer(), mrEventQueue(rEventQueue) {}
-
-private:
-virtual bool handleMouseReleased( awt::MouseEvent const& evt ) SAL_OVERRIDE
-{
-if(evt.Buttons != awt::MouseButton::RIGHT)
-return false;
-
-return fireAllEvents( maEvents, mrEventQueue );
-}
-
-private:
-EventQueue & mrEventQueue;
-};
-
/** Base class to share some common code between
ShapeClickEventHandler and MouseMoveHandler
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source filter/source include/connectivity qadevOOo/tests sal/qa sc/inc stoc/source unotools/qa
avmedia/source/opengl/oglmanager.cxx |2 -
filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl |4 +--
filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |2 -
include/connectivity/TColumnsHelper.hxx |2 -
qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java |2 -
sal/qa/osl/file/osl_File.cxx |2 -
sal/qa/osl/socket/osl_Socket.cxx |8 +++---
sal/qa/osl/socket/osl_StreamSocket.cxx| 12 +-
sc/inc/dpsave.hxx |2 -
stoc/source/javavm/javavm.cxx |2 -
unotools/qa/complex/tempfile/TestHelper.java |2 -
11 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit f25cae2e18fda91c47c57b799c45bc074119b211
Author: Julien Nabet
Date: Sat Apr 4 23:08:02 2015 +0200
Typo: creat->create
Change-Id: I5e57e6d506504933096f4c8e371b0ddc93c04cbd
diff --git a/avmedia/source/opengl/oglmanager.cxx
b/avmedia/source/opengl/oglmanager.cxx
index ed290a8..1c329eb 100644
--- a/avmedia/source/opengl/oglmanager.cxx
+++ b/avmedia/source/opengl/oglmanager.cxx
@@ -36,7 +36,7 @@ uno::Reference< media::XPlayer > SAL_CALL
OGLManager::createPlayer( const OUStri
else
{
delete pPlayer;
-SAL_WARN("avmedia.opengl", "Can't creat player for OpenGL model: " +
rURL);
+SAL_WARN("avmedia.opengl", "Can't create player for OpenGL model: " +
rURL);
return uno::Reference< media::XPlayer >();
}
}
diff --git a/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
b/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
index d7dabaa..88ba9a5 100644
--- a/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
+++ b/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
@@ -379,7 +379,7 @@
s0026
<表:æ ç¾åæ¯è²
uof:locID="s0027">#00
<表:æ ç¾èæ¯è²
uof:locID="s0028">#ff
-
+
@@ -5186,7 +5186,7 @@
-
+
diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index a5875c2..fa09a05 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -1134,7 +1134,7 @@
-
+
diff --git a/include/connectivity/TColumnsHelper.hxx
b/include/connectivity/TColumnsHelper.hxx
index 50b8b14..ac281c3 100644
--- a/include/connectivity/TColumnsHelper.hxx
+++ b/include/connectivity/TColumnsHelper.hxx
@@ -29,7 +29,7 @@ namespace connectivity
{
class OTableHelper;
class OColumnsHelperImpl;
-/** contains generell column handling to creat default columns and default
sql statements.
+/** contains generell column handling to create default columns and
default sql statements.
*/
class OOO_DLLPUBLIC_DBTOOLS OColumnsHelper : public sdbcx::OCollection
{
diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
index 8ecbb47..6f8bf8e 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
@@ -142,7 +142,7 @@ public class XMLStylesExporter extends TestCase {
//obtain style family with name[0]
Object objectStyle = StyleFamilies.getByName(styleFamilyName);
XNameContainer xStyleFamilyName =
UnoRuntime.queryInterface(XNameContainer.class, objectStyle);
-//creat new style
+//create new style
Object SC = SOF.createInstance(xDrawDoc,
"com.sun.star.style.Style");
XStyle Style = UnoRuntime.queryInterface(XStyle.class,SC);
//add new style to style familiy with name[0]
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index b5c5cc2..cec250d 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -2077,7 +2077,7 @@ namespace osl_FileStatus
fd = remove( strLinkFileName.getStr() );
CPPUNIT_ASSERT_MESSAGE( "in deleting link file", fd == 0 );
-
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 744525c84849ce6ba45348a052bc3ec3cd0d0b55 Author: Andras Timar Date: Sat Apr 4 22:37:36 2015 +0200 Updated core Project: help 08790edcf50d4281d55e5c28c0c07f88a99241f3 diff --git a/helpcontent2 b/helpcontent2 index 02143d1..08790ed 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 02143d13f587b3ce40834d709ca9c872ac907e13 +Subproject commit 08790edcf50d4281d55e5c28c0c07f88a99241f3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/mm_seltab.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 08790edcf50d4281d55e5c28c0c07f88a99241f3 Author: Andras Timar Date: Sat Apr 4 22:37:36 2015 +0200 should not be child of Change-Id: I7204a2aafaaa435936f2fcc43d27fc0173426888 diff --git a/source/text/swriter/01/mm_seltab.xhp b/source/text/swriter/01/mm_seltab.xhp index 77c0755..6c0016b 100644 --- a/source/text/swriter/01/mm_seltab.xhp +++ b/source/text/swriter/01/mm_seltab.xhp @@ -24,12 +24,12 @@ - Select Table /text/swriter/01/mm_seltab.xhp + Select Table Select the table that you want to use for mail merge addresses. Preview ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - chart2/source connectivity/Library_dbase.mk connectivity/source oox/source unusedcode.easy
chart2/source/controller/main/ShapeToolbarController.cxx |5
chart2/source/controller/main/ShapeToolbarController.hxx |2
connectivity/Library_dbase.mk|1
connectivity/source/drivers/dbase/DCode.cxx | 122 ---
connectivity/source/drivers/dbase/DResultSet.cxx |6
connectivity/source/inc/dbase/DCode.hxx | 62 ---
connectivity/source/inc/dbase/DResultSet.hxx |1
oox/source/drawingml/table/tableproperties.cxx | 14 -
unusedcode.easy |2
9 files changed, 6 insertions(+), 209 deletions(-)
New commits:
commit a7cfc17991ce528eb5ceb80cfab82bfe76a73609
Author: Caolán McNamara
Date: Sat Apr 4 21:09:58 2015 +0100
and no user of OFILEOperandAttr left now either
Change-Id: Ice43b710b16eed79870d561e6dcf14f4a07cad9f
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 7e592a0..e383de8 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,dbase,\
))
$(eval $(call gb_Library_add_exception_objects,dbase,\
- connectivity/source/drivers/dbase/DCode \
connectivity/source/drivers/dbase/DResultSet \
connectivity/source/drivers/dbase/DStatement \
connectivity/source/drivers/dbase/DPreparedStatement \
diff --git a/connectivity/source/drivers/dbase/DCode.cxx
b/connectivity/source/drivers/dbase/DCode.cxx
deleted file mode 100644
index 3052faa..000
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ /dev/null
@@ -1,114 +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 .
- */
-
-#include "dbase/DCode.hxx"
-#include
-#include "dbase/DIndex.hxx"
-#include "dbase/DIndexIter.hxx"
-
-
-using namespace connectivity::dbase;
-using namespace connectivity::file;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-
-TYPEINIT1(OFILEOperandAttr, OOperandAttr);
-
-OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos,
- const Reference< XPropertySet>& _xColumn,
- const Reference< XNameAccess>& _xIndexes)
-: OOperandAttr(_nPos,_xColumn)
-{
-if(_xIndexes.is())
-{
-OUString sName;
-Reference xColInfo = _xColumn->getPropertySetInfo();
-Reference xIndex;
-
-Sequence< OUString> aSeq = _xIndexes->getElementNames();
-const OUString* pBegin = aSeq.getConstArray();
-const OUString* pEnd = pBegin + aSeq.getLength();
-for(;pBegin != pEnd;++pBegin)
-{
-_xIndexes->getByName(*pBegin) >>= xIndex;
-if(xIndex.is())
-{
-Reference xColsSup(xIndex,UNO_QUERY);
-Reference xNameAccess = xColsSup->getColumns();
-
_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))
>>= sName;
-if(xNameAccess->hasByName(sName))
-{
-m_xIndex = xIndex;
-break;
-}
-else
if(xColInfo->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME)))
-{
-
_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME))
>>= sName;
-if(xNameAccess->hasByName(sName))
-{
-m_xIndex = xIndex;
-break;
-}
-}
-}
-}
-}
-
-}
-
-bool OFILEOperandAttr::isIndexed() const
-{
-return m_xIndex.is();
-}
-
-OEvaluateSet* OFILEOperandAttr::preProcess(OBoolOperator* pOp, OOperand*
pRight)
-{
-OEvaluateSet* pEvaluateSet = NULL;
-if (isIndexed())
-{
-Reference xTunnel(m_xIndex,UNO_QUERY);
-if(xTunnel.is())
-{
-ODbaseIn
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9e/ff5cbb6763104f7e272b46ed6875de2e51fea0
9e/ff5cbb6763104f7e272b46ed6875de2e51fea0 |1 + 1 file changed, 1 insertion(+) New commits: commit 92f48bc03d3bd5627b4b661237cb33397f3844da Author: Caolán McNamara Date: Sat Apr 4 21:20:58 2015 +0100 Notes added by 'git notes add' diff --git a/9e/ff5cbb6763104f7e272b46ed6875de2e51fea0 b/9e/ff5cbb6763104f7e272b46ed6875de2e51fea0 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/9e/ff5cbb6763104f7e272b46ed6875de2e51fea0 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/drwlayer.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 071ad23d8f09c46a6e5b20eab9e49c6dea8ccc6a
Author: Caolán McNamara
Date: Sat Apr 4 20:49:52 2015 +0100
coverity#1292910 Dereference after null check
Change-Id: I5c6b2e603cfada736fcca21d5124c01bfab77831
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index e70254a..3b4e110 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -144,7 +144,7 @@ ScUndoAnchorData::~ScUndoAnchorData()
void ScUndoAnchorData::Undo()
{
// Trigger Object Change
-if(pObj && pObj->IsInserted() && pObj->GetPage() && pObj->GetModel())
+if (pObj->IsInserted() && pObj->GetPage() && pObj->GetModel())
{
SdrHint aHint(*pObj);
pObj->GetModel()->Broadcast(aHint);
@@ -164,14 +164,13 @@ void ScUndoAnchorData::Redo()
ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *mpDoc, mnTab);
// Trigger Object Change
-if(pObj && pObj->IsInserted() && pObj->GetPage() && pObj->GetModel())
+if (pObj->IsInserted() && pObj->GetPage() && pObj->GetModel())
{
SdrHint aHint(*pObj);
pObj->GetModel()->Broadcast(aHint);
}
}
-
ScTabDeletedHint::ScTabDeletedHint( SCTAB nTabNo ) :
nTab( nTabNo )
{
___
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' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8e4b3e4d85fa914f20f45b90ed1bd09573b1b09b Author: Andras Timar Date: Sat Apr 4 12:48:33 2015 -0700 Bump version to 4.2-29 Change-Id: Ibfa2c1923c47080a44f2b95c82355c6a06901531 diff --git a/configure.ac b/configure.ac index f934297..fac5eb4 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.28],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.29],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ 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' - 2 commits - sal/textenc svtools/source
sal/textenc/handleundefinedunicodetotextchar.cxx |2 +-
svtools/source/contnr/treelist.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 15487c3f0fde61012ea69f88c64cdcd2017733b3
Author: Caolán McNamara
Date: Sat Jan 31 21:11:57 2015 +
coverity#1267678 this is surely backwards (gold)
surely we clone from the source and return the newly created
entry. Presumably this doesn't break all the time because
aCloneLink is generally set ?
coverity#1267678 Resource leak
Change-Id: I3e02dfaef371e006f1510b186cdd881c991ef2cf
(cherry picked from commit 9f1ecd3ac35f06746fe2a12ca52899f664679de5)
Reviewed-on: https://gerrit.libreoffice.org/15023
Tested-by: David Tardon
Reviewed-by: David Tardon
diff --git a/svtools/source/contnr/treelist.cxx
b/svtools/source/contnr/treelist.cxx
index cbd011a..2029931 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -355,8 +355,8 @@ SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry*
pSource ) const
if( aCloneLink.IsSet() )
return (SvTreeListEntry*)aCloneLink.Call( pSource );
SvTreeListEntry* pEntry = CreateEntry();
-pSource->Clone( pEntry );
-return pSource;
+pEntry->Clone(pSource);
+return pEntry;
}
SvTreeListEntry* SvTreeList::CreateEntry() const
commit b1bede525c68e628456bf8cbe9ecc855d2307612
Author: Caolán McNamara
Date: Fri May 9 10:20:03 2014 +0100
coverity#1209362 coverity gold, wrong mask
Change-Id: I039563908a391103cc478e1148cc517fc677
diff --git a/sal/textenc/handleundefinedunicodetotextchar.cxx
b/sal/textenc/handleundefinedunicodetotextchar.cxx
index b92a9811..5a8ceef 100644
--- a/sal/textenc/handleundefinedunicodetotextchar.cxx
+++ b/sal/textenc/handleundefinedunicodetotextchar.cxx
@@ -58,7 +58,7 @@ bool ImplGetInvalidAsciiMultiByte(sal_uInt32 nFlags,
{
if (nMaxLen == 0)
return false;
-switch (nFlags & RTL_UNICODETOTEXT_FLAGS_UNDEFINED_MASK)
+switch (nFlags & RTL_UNICODETOTEXT_FLAGS_INVALID_MASK)
{
case RTL_UNICODETOTEXT_FLAGS_INVALID_0:
*pBuf = 0x00;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
2 new defect(s) introduced to LibreOffice found with Coverity Scan.
5 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 2 of 2 defect(s)
** CID 1292911:(PASS_BY_VALUE)
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
*** CID 1292911:(PASS_BY_VALUE)
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
2413}
2414 }
2415
2416 template
2417 template
2418 function<_Res(_ArgTypes...)>::
>>> CID 1292911:(PASS_BY_VALUE)
>>> Passing parameter __f of type
>>> "SwTableProperties_Impl::ApplyTblAttr(SwTable const &, SwDoc &)::[lambda()
>>> (instance 4)]" (size 168 bytes) by value.
2419 function(_Functor __f)
2420 : _Function_base()
2421 {
2422typedef _Function_handler<_Signature_type, _Functor>
_My_handler;
2423
2424if (_My_handler::_M_not_empty_function(__f))
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
2413}
2414 }
2415
2416 template
2417 template
2418 function<_Res(_ArgTypes...)>::
>>> CID 1292911:(PASS_BY_VALUE)
>>> Passing parameter __f of type
>>> "SwTableProperties_Impl::ApplyTblAttr(SwTable const &, SwDoc &)::[lambda()
>>> (instance 5)]" (size 168 bytes) by value.
2419 function(_Functor __f)
2420 : _Function_base()
2421 {
2422typedef _Function_handler<_Signature_type, _Functor>
_My_handler;
2423
2424if (_My_handler::_M_not_empty_function(__f))
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
2413}
2414 }
2415
2416 template
2417 template
2418 function<_Res(_ArgTypes...)>::
>>> CID 1292911:(PASS_BY_VALUE)
>>> Passing parameter __f of type
>>> "SwTableProperties_Impl::ApplyTblAttr(SwTable const &, SwDoc &)::[lambda()
>>> (instance 2)]" (size 168 bytes) by value.
2419 function(_Functor __f)
2420 : _Function_base()
2421 {
2422typedef _Function_handler<_Signature_type, _Functor>
_My_handler;
2423
2424if (_My_handler::_M_not_empty_function(__f))
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
2413}
2414 }
2415
2416 template
2417 template
2418 function<_Res(_ArgTypes...)>::
>>> CID 1292911:(PASS_BY_VALUE)
>>> Passing parameter __f of type
>>> "SwTableProperties_Impl::ApplyTblAttr(SwTable const &, SwDoc &)::[lambda()
>>> (instance 1)]" (size 168 bytes) by value.
2419 function(_Functor __f)
2420 : _Function_base()
2421 {
2422typedef _Function_handler<_Signature_type, _Functor>
_My_handler;
2423
2424if (_My_handler::_M_not_empty_function(__f))
/usr/include/c++/4.9.2/functional: 2419 in std::function::function(T1)()
2413}
2414 }
2415
2416 template
2417 template
2418 function<_Res(_ArgTypes...)>::
>>> CID 1292911:(PASS_BY_VALUE)
>>> Passing parameter __f of type
>>> "SwTableProperties_Impl::ApplyTblAttr(SwTable const &, SwDoc &)::[lambda()
>>> (instance 3)]" (size 168 bytes) by value.
2419 function(_Functor __f)
2420 : _Function_base()
2421 {
2422typedef _Function_handler<_Signature_type, _Functor>
_My_handler;
2423
2424if (_My_handler::_M_not_empty_function(__f))
** CID 1292910: Null pointer dereferences (FORWARD_NULL)
/sc/source/core/data/drwlayer.cxx: 147 in ScUndoAnchorData::Undo()()
*** CID 1292910: Null pointer dereferences (FORWARD_NULL)
/sc/source/core/data/drwlayer.cxx: 147 in ScUndoAnchorData::Undo()()
141 {
142 }
143
144 void ScUndoAnchorData::Undo()
145 {
146 // Trigger Object Change
>>> CID 1292910: Null pointer dereferences (FORWARD_NULL)
>>> Comparing "this->pObj" to null implies that "this->pObj" might be null.
147 if(pObj && pObj->IsInserted() && pObj->GetPage() &&
pObj->GetModel())
148 {
149 SdrHint aHint(*pObj);
150 pObj->GetModel()->Broadcast(aHint);
151 }
152
___
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/VLegend.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6220362e844ad0e50a38c1627ddd05a082882009
Author: Andras Timar
Date: Sat Apr 4 14:13:18 2015 +0200
tdf#90404 OOXML chart legend import improvement
In the bugdoc, the chart legend had 6 entries in PowerPoint, but
only 5 in Impress. I played a lot with padding and offset parameters
in layout algorithm without success. Finally I introduced this 1mm
tolerance, so the fixed legend frame can expand up to 1mm, if necessary.
Change-Id: Id1ad1df67aab41d942133cea8d16fccf0f215167
Reviewed-on: https://gerrit.libreoffice.org/15149
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/chart2/source/view/main/VLegend.cxx
b/chart2/source/view/main/VLegend.cxx
index a5a3b72..d293165 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -390,7 +390,7 @@ awt::Size lcl_placeLegendEntries(
nSumHeight += aRowHeights[nR];
sal_Int32 nRemainingSpace = rAvailableSpace.Height - nSumHeight;
-if( nRemainingSpace<0 )
+if( nRemainingSpace < -100 ) // 1mm tolerance for OOXML interop
tdf#90404
{
//remove entries that are too big
for( sal_Int32 nR=nNumberOfRows; nR--; )
@@ -418,7 +418,7 @@ awt::Size lcl_placeLegendEntries(
}
nNumberOfRows = static_cast(aRowHeights.size());
}
-if( nRemainingSpace > 0 )
+if( nRemainingSpace >= -100 ) // 1mm tolerance for OOXML interop
tdf#90404
{
sal_Int32 nNormalSpacingHeight =
2*nYPadding+(nNumberOfRows-1)*nYOffset;
if( nRemainingSpace < nNormalSpacingHeight )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 include/svx include/vcl sfx2/source slideshow/source svx/source unusedcode.easy vcl/source
include/sfx2/dispatch.hxx |4 --
include/svx/svdobj.hxx |5 ---
include/vcl/menu.hxx |8 +
include/vcl/toolbox.hxx|3 -
sfx2/source/control/dispatch.cxx | 35 --
slideshow/source/engine/usereventqueue.cxx | 14
slideshow/source/inc/usereventqueue.hxx|8 -
svx/source/svdraw/svdobj.cxx | 46 -
unusedcode.easy| 29 +-
vcl/source/gdi/impvect.cxx | 36 +-
vcl/source/gdi/impvect.hxx | 28 +++--
vcl/source/window/menu.cxx | 11 ++
vcl/source/window/toolbox2.cxx | 12 ---
13 files changed, 50 insertions(+), 189 deletions(-)
New commits:
commit 1a3c99f2c31dbc4dd6b3b5788ea0b49a34bea2c6
Author: Caolán McNamara
Date: Sat Apr 4 15:33:20 2015 +0100
callcatcher: update unusedcode
mostly changed due to loplugin:constantfunction
Change-Id: Ib677c78db256f8032a99b3f02a3e363fee68ebcc
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index c32ec1f..274c0c2 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -92,9 +92,7 @@ friend class SfxBindings;
friend class SfxStateCache;
friend class SfxPopupMenuManager;
friend class SfxHelp;
-// For bindings: Finding the Message;
-// level for re-access
-SAL_DLLPRIVATE bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer
&rServer, bool bModal );
+
bool_FindServer( sal_uInt16 nId, SfxSlotServer &rServer,
bool bModal );
bool_FillState( const SfxSlotServer &rServer,
SfxItemSet &rState, const SfxSlot
*pRealSlot );
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 82e1952..971c5b2 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -208,11 +208,6 @@ public:
virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039#
NULL -> 0
sal_uInt32 GetInventor() const { return nInventor;}
sal_uInt16 GetId() const { return nIdentifier;}
-
-SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject*
pObj) const;
-Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject*
pObj) const;
-void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const
SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
-OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const
SdrObject* pObj) const;
};
// all geometrical data of an arbitrary object for use in undo/redo
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 4fd81d2..cd058db 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -381,12 +381,10 @@ public:
namespace vcl
{
-class VCL_DLLPUBLIC MenuInvalidator
+namespace MenuInvalidator
{
-public:
-MenuInvalidator();
-static VclEventListeners2* GetMenuInvalidateListeners();
-static void Invalidated();
+VCL_DLLPUBLIC VclEventListeners2* GetMenuInvalidateListeners();
+VCL_DLLPUBLIC void Invalidated();
};
}
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index e2bb2b5..d723e6e 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -378,9 +378,6 @@ public:
Rectangle GetItemRect( sal_uInt16 nItemId ) const;
Rectangle GetItemPosRect( sal_uInt16 nPos ) const;
-/// Returns size of the bitmap / text that is inside this toolbox item.
-SizeGetItemContentSize( sal_uInt16 nItemId ) const;
-
/// Retrieves the optimal position to place a popup window for this item
(subtoolbar or dropdown)
Point GetItemPopupPosition( sal_uInt16 nItemId, const Size&
rSize ) const;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index f7b2961..081d1a6 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1642,41 +1642,6 @@ SfxSlotFilterState
SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID )
return bFound ? SFX_SLOT_FILTER_DISABLED : SFX_SLOT_FILTER_ENABLED;
}
-bool SfxDispatcher::_TryIntercept_Impl
-(
-sal_uInt16 nSlot,// Slot-Id to search for
-SfxSlotServer& rServer, // -Instance to fill
-boolbSelf
-)
-{
-// Maybe the parent is also belongs to a component
-SfxDispatcher *pParent = xImp->pParent;
-sal_uInt16 nLevels = xImp->aStack.size();
-while ( pParent && pParent->xImp->pFrame )
-{
-nLevels = nLevels + pParent->xImp->aStack.size();
-pParent = pParent->xImp->pParent;
-}
-
-if ( bSelf )
-{
-// Query the ComponentViewShell
-Flush();
-SfxShell *pObjShell = GetShell
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst
extensions.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9eff5cbb6763104f7e272b46ed6875de2e51fea0 Author: Ariel Constenla-Haile Date: Sat Apr 4 15:20:25 2015 + i126223 - Update English dictionary diff --git a/extensions.lst b/extensions.lst index d49d3b3..7330aaf 100644 --- a/extensions.lst +++ b/extensions.lst @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -8f3c344aca0fc3c0e44988f34dbc327c http://sourceforge.net/projects/aoo-extensions/files/17102/10/dict-en.oxt/download "dict-en.oxt" +5ddb509520382d0f2cb897b072904e25 http://sourceforge.net/projects/aoo-extensions/files/17102/14/dict-en.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=79641 Matthew Francis changed: What|Removed |Added CC||fdb...@neosheffield.co.uk Depends on||89245 --- Comment #52 from Matthew Francis --- Adding bug 89245 - FORMATTING, FILESAVE: Header and footer background images are not saved There have been multiple duplicates of this, so clearly it's causing some pain -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/filter/excel/xelink.cxx | 39 +++-
sc/source/ui/condformat/condformatdlgentry.cxx | 47 +
2 files changed, 70 insertions(+), 16 deletions(-)
New commits:
commit 9f1be6c65210e600baee5c63480df58e8b8ce7b1
Author: Markus Mohrhard
Date: Sat Apr 4 15:54:44 2015 +0200
save at least some of the external range name stuff to XLSX
Change-Id: If08968487f62d0bc4c827bb69be25db6f9d5a0ee
diff --git a/sc/source/filter/excel/xelink.cxx
b/sc/source/filter/excel/xelink.cxx
index ace55e4..9ea0822 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -63,7 +63,7 @@ private:
@descr Derived classes should overwrite this function to write their
data. */
virtual voidWriteAddData( XclExpStream& rStrm );
-private:
+protected:
OUStringmaName; /// Calc name (title) of the external
name.
XclExpStringRef mxName; /// Excel name (title) of the external
name.
sal_uInt16 mnFlags;/// Flags for record export.
@@ -104,6 +104,8 @@ public:
explicitXclExpExtName( const XclExpRoot& rRoot, const
XclExpSupbook& rSupbook, const OUString& rName,
const
ScExternalRefCache::TokenArrayRef& rArray );
+virtual void SaveXml(XclExpXmlStream& rStrm) SAL_OVERRIDE;
+
private:
/** Writes additional record contents. */
virtual voidWriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE;
@@ -135,6 +137,8 @@ public:
/** Writes the EXTERNNAME record list. */
virtual voidSave( XclExpStream& rStrm ) SAL_OVERRIDE;
+virtual void SaveXml(XclExpXmlStream& rStrm) SAL_OVERRIDE;
+
private:
typedef XclExpRecordList< XclExpExtNameBase > XclExpExtNameList;
typedef XclExpExtNameList::RecordRefTypeXclExpExtNameRef;
@@ -1045,6 +1049,19 @@ void XclExpExtName::WriteAddData( XclExpStream& rStrm )
rStrm << static_cast(2) << EXC_TOKID_ERR << EXC_ERR_REF;
}
+void XclExpExtName::SaveXml(XclExpXmlStream& rStrm)
+{
+sax_fastparser::FSHelperPtr pExternalLink = rStrm.GetCurrentStream();
+
+pExternalLink->startElement(XML_definedName,
+XML_name, XclXmlUtils::ToOString(maName).getStr(),
+XML_refersTo, NULL,
+XML_sheetId, NULL,
+FSEND);
+
+pExternalLink->endElement(XML_definedName);
+}
+
// List of external names =
XclExpExtNameBuffer::XclExpExtNameBuffer( const XclExpRoot& rRoot ) :
@@ -1098,6 +1115,11 @@ void XclExpExtNameBuffer::Save( XclExpStream& rStrm )
maNameList.Save( rStrm );
}
+void XclExpExtNameBuffer::SaveXml(XclExpXmlStream& rStrm)
+{
+maNameList.SaveXml(rStrm);
+}
+
sal_uInt16 XclExpExtNameBuffer::GetIndex( const OUString& rName ) const
{
for( size_t nPos = 0, nSize = maNameList.GetSize(); nPos < nSize; ++nPos )
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index a7ea722..b89b3b0 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -272,6 +272,26 @@ ScFormatEntry*
ScConditionFrmtEntry::createConditionEntry() const
return pEntry;
}
+namespace {
+
+bool containsOnlyColumnLabel(Edit* pEdit, ScTokenArray* pArr)
+{
+formula::FormulaToken* token = pArr->First();
+formula::StackVar t = token->GetType();
+OpCode op = token->GetOpCode();
+if( ( op == ocColRowName ) ||
+( ( op == ocBad ) && ( t == formula::svString ) )
+ )
+{
+pEdit->SetControlBackground(COL_YELLOW);
+return true;
+}
+
+return false;
+}
+
+}
+
IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit)
{
OUString aFormula = pEdit->GetText();
@@ -295,14 +315,27 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit)
}
// Recognized col/row name or string token, warn the user
-formula::FormulaToken* token = ta->First();
-formula::StackVar t = token->GetType();
-OpCode op = token->GetOpCode();
-if( ( op == ocColRowName ) ||
-( ( op == ocBad ) && ( t == formula::svString ) )
- )
+bool bContainsColumnLabel = containsOnlyColumnLabel(pEdit, ta.get());;
+if (!bContainsColumnLabel)
+{
+ScCompiler aComp2( mpDoc, maPos );
+aComp2.SetGrammar( mpDoc->GetGrammar() );
+if (&maEdVal1 == pEdit)
+{
+OUString aFormula2 = maEdVal2.GetText();
+boost::scoped_ptr
pArr2(aComp2.CompileString(aFormula2));
+bContainsColumnLabel = containsOnlyColumnLabel(&maEdVal2,
pArr2.get());
+}
+else
+{
+OUString aFormula1 = maEdVal1.GetText();
+boost::scoped_ptr
pArr1(aComp2.CompileString(aFormula1));
+bContainsColumnLabel = containsOnlyColumnLabel(&maEdVal1,
pArr1.get());
+}
+}
+
+if (bContains
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/rootfrm.hxx | 160 ++--- sw/source/core/layout/newfrm.cxx | 118 +-- sw/source/core/layout/pagechg.cxx | 20 ++-- sw/source/core/layout/paintfrm.cxx | 14 +-- sw/source/core/layout/sectfrm.cxx | 20 ++-- sw/source/core/layout/virtoutp.cxx |8 - 6 files changed, 170 insertions(+), 170 deletions(-) New commits: commit 64b326811e26e6e3fa6a129e5e03341d044521c9 Author: Miklos Vajna Date: Sat Apr 4 13:59:36 2015 +0200 sw: prefix members of SwRootFrm Change-Id: I146fa693e89b00c77df33547971fb3a49c7e1b34 Reviewed-on: https://gerrit.libreoffice.org/15148 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 8d91b2c..b5dc726 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -56,12 +56,12 @@ class SwRootFrm: public SwLayoutFrm // Needs to disable the Superfluous temporarily friend void AdjustSizeChgNotify( SwRootFrm *pRoot ); -// Maintains the pLastPage (Cut() and Paste() of SwPageFrm +// Maintains the mpLastPage (Cut() and Paste() of SwPageFrm friend inline void SetLastPage( SwPageFrm* ); // For creating and destroying of the virtual output device manager -friend void _FrmInit(); // Creates pVout -friend void _FrmFinit(); // Destroys pVout +friend void _FrmInit(); // Creates mpVout +friend void _FrmFinit(); // Destroys mpVout std::vector maPageRects;// returns the current rectangle for each page frame // the rectangle is extended to the top/bottom/left/right @@ -74,70 +74,70 @@ class SwRootFrm: public SwLayoutFrm boolmbNeedGrammarCheck; // true when sth needs to be checked (not necessarily started yet!) -static SwLayVout *pVout; -static bool bInPaint; // Protection against double Paints -static bool bNoVirDev;// No virt. Device for SystemPaints - -boolbCheckSuperfluous :1; // Search for empty Pages? -boolbIdleFormat :1; // Trigger Idle Formatter? -boolbBrowseWidthValid :1; // Is nBrowseWidth valid? -boolbTurboAllowed :1; -boolbAssertFlyPages :1; // Insert more Pages for Flys if needed? -boolbIsVirtPageNum :1; // Do we have a virtual pagenumber? -boolbIsNewLayout:1; // Layout loaded or newly created -boolbCallbackActionEnabled:1; // No Action in Notification desired +static SwLayVout *mpVout; +static bool mbInPaint; // Protection against double Paints +static bool mbNoVirDev;// No virt. Device for SystemPaints + +boolmbCheckSuperfluous :1; // Search for empty Pages? +boolmbIdleFormat :1; // Trigger Idle Formatter? +boolmbBrowseWidthValid :1; // Is mnBrowseWidth valid? +boolmbTurboAllowed :1; +boolmbAssertFlyPages :1; // Insert more Pages for Flys if needed? +boolmbIsVirtPageNum :1; // Do we have a virtual pagenumber? +boolmbIsNewLayout:1; // Layout loaded or newly created +boolmbCallbackActionEnabled:1; // No Action in Notification desired // @see dcontact.cxx, ::Changed() -boolbLayoutFreezed; +boolmbLayoutFreezed; /** * For BrowseMode - * nBrowseWidth is the outer margin of the object most to the right. + * mnBrowseWidth is the outer margin of the object most to the right. * The page's right edge should not be smaller than this value. */ -longnBrowseWidth; +longmnBrowseWidth; -/// If we only have to format one CntntFrm, its in pTurbo -const SwCntntFrm *pTurbo; +/// If we only have to format one CntntFrm, its in mpTurbo +const SwCntntFrm *mpTurbo; /// We should not need to always struggle to find the last page, so store it here -SwPageFrm *pLastPage; +SwPageFrm *mpLastPage; /** [ Comment from the original StarOffice checkin ]: * The root takes care of the shell access. Via the document * it should be possible to get at the root frame, and thus always * have access to the shell. - * the pointer pCurrShell is the pointer to any of the shells for + * the pointer mpCurrShell is the pointer to any of the shells for * the document. * Because sometimes it matters which shell is used, it is necessary to * know the active shell. - * this is approximated by setting the pointer pCurrShell when a + * this is approximated by setting the pointer mpCurrShell when a * shell gets the focus (FEShell). Acditionally the pointer will be * set temporarily by SwCurrShell typically via SET_CURR_SHELL * The macro and class can be found in the SwViewShell. These object can * be created nested (also for different kinds
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/filter/oox/stylesbuffer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 79156011a5fb4383a6b61aa0590d52c24ad6b154
Author: Markus Mohrhard
Date: Fri Mar 27 19:11:35 2015 +0100
we need to use the edit engine attibute id for rich text, tdf#89170
Conflicts:
sc/source/filter/oox/stylesbuffer.cxx
Change-Id: I8489b0341709d44bc62e5ddef49fe232998f3c80
Reviewed-on: https://gerrit.libreoffice.org/15032
Tested-by: Katarina Behrens
Reviewed-by: Katarina Behrens
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index 498241f..affed90 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -982,7 +982,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet,
FontPropertyType ePropType, bool
// strike out style
if( maUsedFlags.mbStrikeoutUsed )
{
-ScfTools::PutItem( rItemSet, SvxCrossedOutItem( maModel.mbStrikeout ?
STRIKEOUT_SINGLE : STRIKEOUT_NONE, bEdit ? EE_CHAR_STRIKEOUT :
ATTR_FONT_CROSSEDOUT ), ATTR_FONT_CROSSEDOUT, bSkipPoolDefs );
+ScfTools::PutItem( rItemSet, SvxCrossedOutItem( maModel.mbStrikeout ?
STRIKEOUT_SINGLE : STRIKEOUT_NONE, bEdit ? EE_CHAR_STRIKEOUT :
ATTR_FONT_CROSSEDOUT ), bEdit ? EE_CHAR_STRIKEOUT : ATTR_FONT_CROSSEDOUT,
bSkipPoolDefs );
}
// outline style
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/dp_persmap.cxx | 104 -
desktop/source/deployment/inc/dp_persmap.h |5 -
2 files changed, 109 deletions(-)
New commits:
commit 372f9bce4e28ffcc89f92dc9982ab9a5c4922994
Author: Tor Lillqvist
Date: Sat Apr 4 14:19:11 2015 +0300
Presumably at least the #ifndef DISABLE_BDB2PMAP thing can be killed
Not sure if the comment in desktop/source/deployment/inc/dp_persmap.h:
"should
be removed for LibreOffice 4.0" refers to just the DISABLE_BDB2PMAP parts or
the class and functionality as a whole.
Change-Id: Ie701576efc4076ab8be02a89145b5ecfcaaebc53
diff --git a/desktop/source/deployment/dp_persmap.cxx
b/desktop/source/deployment/dp_persmap.cxx
index a8acf90..7606da6 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -46,9 +46,6 @@ PersistentMap::PersistentMap( OUString const & url_, bool
readOnly )
,m_bToBeCreated( !readOnly )
,m_bIsDirty( false )
{
-#ifndef DISABLE_BDB2PMAP
-m_MapFileName = expandUnoRcUrl( url_ );
-#endif
open();
}
@@ -158,11 +155,6 @@ bool PersistentMap::open()
// or create later if needed
m_bToBeCreated &= (rcOpen == osl::File::E_NOENT) && !m_bIsOpen;
-#ifndef DISABLE_BDB2PMAP
-if( m_bToBeCreated )
-importFromBDB();
-#endif
-
if( !m_bIsOpen)
return m_bToBeCreated;
@@ -316,102 +308,6 @@ bool PersistentMap::erase( OString const & key, bool
flush_immediately )
return true;
}
-#ifndef DISABLE_BDB2PMAP
-bool PersistentMap::importFromBDB()
-{
-if( m_bReadOnly)
-return false;
-
-// get the name of its BDB counterpart
-OUString aDBName = m_MapFileName;
-if( !aDBName.endsWith( ".pmap" ))
-return false;
-aDBName = aDBName.replaceAt( aDBName.getLength()-5, 5, ".db");
-
-// open the corresponding BDB file for reading
-osl::File aDBFile( aDBName);
-osl::File::RC rc = aDBFile.open( osl_File_OpenFlag_Read);
-if( rc != osl::File::E_None)
-return false;
-sal_uInt64 nFileSize = 0;
-if( aDBFile.getSize( nFileSize) != osl::File::E_None)
-return false;
-
-// read the BDB file
-std::vector aRawBDB( nFileSize);
-for( sal_uInt64 nOfs = 0; nOfs < nFileSize;) {
-sal_uInt64 nBytesRead = 0;
-rc = aDBFile.read( (void*)&aRawBDB[nOfs], nFileSize - nOfs,
nBytesRead);
-if( (rc != osl::File::E_None) || !nBytesRead)
-return false;
-nOfs += nBytesRead;
-}
-
-// check BDB file header for non_encrypted Hash format v4..9
-if( nFileSize < 0x0100)
-return false;
-if( aRawBDB[24] != 0) // only not-encrypted migration
-return false;
-if( aRawBDB[25] != 8) // we expect a P_HASHMETA page
-return false;
-const bool bLE = (aRawBDB[12]==0x61 && aRawBDB[13]==0x15 &&
aRawBDB[14]==0x06);
-const bool bBE = (aRawBDB[15]==0x61 && aRawBDB[14]==0x15 &&
aRawBDB[13]==0x06);
-if( bBE == bLE)
-return false;
-if( (aRawBDB[16] < 4) || (9 < aRawBDB[16])) // version
-return false;
-const sal_uInt64 nPgSize = bLE
-?(aRawBDB[20] + (aRawBDB[21]<<8) + (aRawBDB[22]<<16) +
(aRawBDB[23]<<24))
-:(aRawBDB[23] + (aRawBDB[22]<<8) + (aRawBDB[21]<<16) +
(aRawBDB[20]<<24));
-const int nPgCount = nFileSize / nPgSize;
-if( nPgCount * nPgSize != nFileSize)
-return false;
-
-// find PackageManager's new_style entries
-// using a simple heuristic for BDB_Hash pages
-int nEntryCount = 0;
-for( int nPgNo = 1; nPgNo < nPgCount; ++nPgNo) {
-// parse the next _db_page
-const sal_uInt8* const pPage = &aRawBDB[ nPgNo * nPgSize];
-const sal_uInt8* const pEnd = pPage + nPgSize;
-const int nHfOffset = bLE ? (pPage[22] + (pPage[23]<<8)) : (pPage[23]
+ (pPage[22]<<8));
-if( nHfOffset <= 0)
-continue;
-const sal_uInt8* pCur = pPage + nHfOffset;
-// iterate through the entries
-for(; pCur < pEnd; ++pCur) {
-if( pCur[0] != 0x01)
-continue;
-// get the value-candidate
-const sal_uInt8* pVal = pCur + 1;
-while( ++pCur < pEnd)
-if( (*pCur < ' ') || ((*pCur > 0x7F) && (*pCur != 0xFF)))
-break;
-if( pCur >= pEnd)
-break;
-if( (pCur[0] != 0x01) || (pCur[1] != 0xFF))
-continue;
-const OString aVal( reinterpret_cast(pVal), pCur -
pVal);
-// get the key-candidate
-const sal_uInt8* pKey = pCur + 1;
-while( ++pCur < pEnd)
-if( (*pCur < ' ') || ((*pCur > 0x7F) && (*pCur != 0xFF)))
-break;
-if( (pCur < pEnd) && (*pCur > 0x01))
-continue;
-const OString aKey( reinterpret_cast(pKey), pCur -
pKey);
---pCur; // prepare for next round by rewinding to end of key-stri
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/2ec69c6fea4594f3f00c22ac9bb31a888483b318/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/fontmanager/fontcache.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 648655994e8d839d9ab645f5084c906ae2cc1e75
Author: Tor Lillqvist
Date: Fri Apr 3 13:02:35 2015 +0300
Pointless to have a macro that is used just once
Change-Id: Ieead62bcbfab5a96b5350bf30fbbb712f981f10c
diff --git a/vcl/generic/fontmanager/fontcache.cxx
b/vcl/generic/fontmanager/fontcache.cxx
index 3dcba18..7448570 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -37,7 +37,6 @@
#include
#endif
-#define FONTCACHEFILE "/user/psprint/pspfontcache"
#define CACHE_MAGIC "LibreOffice PspFontCacheFile format 6"
using namespace std;
@@ -54,7 +53,7 @@ FontCache::FontCache()
m_aCacheFile = getOfficePath( UserPath );
if( !m_aCacheFile.isEmpty() )
{
-m_aCacheFile += FONTCACHEFILE;
+m_aCacheFile += "/user/psprint/pspfontcache";
read();
}
}
___
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/rtftok/rtfvalue.cxx | 76
1 file changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 7f4405faf74eb7294921fc20c0acd18f11d03ef3
Author: Miklos Vajna
Date: Sat Apr 4 11:05:51 2015 +0200
Use std::make_shared<>
Change-Id: Ifc728dc0b42d713a5eaa2fc22d3e71c6aa4f196d
Reviewed-on: https://gerrit.libreoffice.org/15146
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx
b/writerfilter/source/rtftok/rtfvalue.cxx
index 72b1207..e0bc59a 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -27,131 +27,131 @@ RTFValue::RTFValue(int nValue, const OUString& sValue,
const RTFShape& aShape)
: m_nValue(nValue),
m_sValue(sValue),
+ m_pAttributes(std::make_shared(rAttributes)),
+ m_pSprms(std::make_shared(rSprms)),
m_xShape(xShape),
m_xStream(xStream),
m_xObject(xObject),
- m_bForceString(bForceString)
+ m_bForceString(bForceString),
+ m_pShape(std::make_shared(aShape))
{
-m_pAttributes.reset(new RTFSprms(rAttributes));
-m_pSprms.reset(new RTFSprms(rSprms));
-m_pShape.reset(new RTFShape(aShape));
}
RTFValue::RTFValue()
: m_nValue(0),
m_sValue(),
+ m_pAttributes(std::make_shared()),
+ m_pSprms(std::make_shared()),
m_xShape(),
m_xStream(),
m_xObject(),
- m_bForceString(false)
+ m_bForceString(false),
+ m_pShape(std::make_shared())
{
-m_pAttributes.reset(new RTFSprms());
-m_pSprms.reset(new RTFSprms());
-m_pShape.reset(new RTFShape());
}
RTFValue::RTFValue(int nValue)
: m_nValue(nValue),
m_sValue(),
+ m_pAttributes(std::make_shared()),
+ m_pSprms(std::make_shared()),
m_xShape(),
m_xStream(),
m_xObject(),
m_bForceString(false)
{
-m_pAttributes.reset(new RTFSprms());
-m_pSprms.reset(new RTFSprms());
m_pShape.reset(new RTFShape());
}
RTFValue::RTFValue(const OUString& sValue, bool bForce)
: m_nValue(),
m_sValue(sValue),
+ m_pAttributes(std::make_shared()),
+ m_pSprms(std::make_shared()),
m_xShape(),
m_xStream(),
m_xObject(),
- m_bForceString(bForce)
+ m_bForceString(bForce),
+ m_pShape(std::make_shared())
{
-m_pAttributes.reset(new RTFSprms());
-m_pSprms.reset(new RTFSprms());
-m_pShape.reset(new RTFShape());
}
RTFValue::RTFValue(RTFSprms rAttributes)
: m_nValue(),
m_sValue(),
+ m_pAttributes(std::make_shared(rAttributes)),
+ m_pSprms(std::make_shared()),
m_xShape(),
m_xStream(),
m_xObject(),
- m_bForceString(false)
+ m_bForceString(false),
+ m_pShape(std::make_shared())
{
-m_pAttributes.reset(new RTFSprms(rAttributes));
-m_pSprms.reset(new RTFSprms());
-m_pShape.reset(new RTFShape());
}
RTFValue::RTFValue(RTFSprms rAttributes, RTFSprms rSprms)
: m_nValue(),
m_sValue(),
+ m_pAttributes(std::make_shared(rAttributes)),
+ m_pSprms(std::make_shared(rSprms)),
m_xShape(),
m_xStream(),
m_xObject(),
- m_bForceString(false)
+ m_bForceString(false),
+ m_pShape(std::make_shared())
{
-m_pAttributes.reset(new RTFSprms(rAttributes));
-m_pSprms.reset(new RTFSprms(rSprms));
-m_pShape.reset(new RTFShape());
}
RTFValue::RTFValue(uno::Reference const& xShape)
: m_nValue(),
m_sValue(),
+ m_pAttributes(std::make_shared()),
+ m_pSprms(std::make_shared()),
m_xShape(xShape),
m_xStream(),
m_xObject(),
- m_bForceString(false)
+ m_bForceString(false),
+ m_pShape(std::make_shared())
{
-m_pAttributes.reset(new RTFSprms());
-m_pSprms.reset(new RTFSprms());
-m_pShape.reset(new RTFShape());
}
RTFValue::RTFValue(uno::Reference const& xStream)
: m_nValue(),
m_sValue(),
+ m_pAttributes(std::make_shared()),
+ m_pSprms(std::make_shared()),
m_xShape(),
m_xStream(xStream),
m_xObject(),
- m_bForceString(false)
+ m_bForceString(false),
+ m_pShape(std::make_shared())
{
-m_pAttributes.reset(new RTFSprms());
-m_pSprms.reset(new RTFSprms());
-m_pShape.reset(new RTFShape());
}
RTFValue::RTFValue(uno::Reference const& xObject)
: m_nValue(),
m_sValue(),
+ m_pAttributes(std::make_shared()),
+ m_pSprms(std::make_shared()),
m_xShape(),
m_xStream(),
m_xObject(xObject),
- m_bForceString(false)
+ m_bForceString(false),
+ m_pShape(std::make_shared())
{
-m_pAttributes.reset(new RTFSprms());
-m_pSprms.reset(new RTFSprms());
-m_pShape.reset(new RTFShape());
}
RTFValue::RTFValue(const RTFShape& aShape)
: m_nValue(),
m_sValue(),
+ m_pAttributes(std::make_shared()),
+ m_pSprms(std::make_shared()),
m_
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/txtftn.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit ce1365ec147a33a07df5bdc53796180d84b9d9e5 Author: Julien Nabet Date: Sat Apr 4 12:00:02 2015 +0200 cppcheck: Identical code for different branches Using a similar fix as Caolan's one: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8f9bc93ba3299efbd8ad181481e6e2e87df7c066 Change-Id: Ib33f9585bf1e1c2cf6dd367bfe4eb0604794decc diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 88ad8aa..8e7c23c 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -527,8 +527,7 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) else pFtnBoss->RemoveFtn( this, pFtn ); bRemove = bRemove || !bEndDoc; -OSL_ENSURE( bEndn ? !SwFtnBossFrm::FindFtn( this, pFtn ) : -!SwFtnBossFrm::FindFtn( this, pFtn ), +OSL_ENSURE( !SwFtnBossFrm::FindFtn( this, pFtn ), "SwTxtFrm::RemoveFtn: can't get off that footnote" ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/shape.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 32c63e9a312b591dd36471bef9003975a37ae05a
Author: Julien Nabet
Date: Sat Apr 4 11:51:59 2015 +0200
cppcheck: Prefer prefix ++/-- operators for non-primitive types
Change-Id: I17dfb0a818838b00d9148ee1c6328ef094eab99b
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 20d68e4..68e25fc 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -412,13 +412,13 @@ Reference< XShape > Shape::createAndInsert(
{
maSize.Width = 0;
for( std::vector< sal_Int32 >::const_iterator
aTableColIter(mpTablePropertiesPtr->getTableGrid().begin());
- aTableColIter != mpTablePropertiesPtr->getTableGrid().end();
aTableColIter++ )
+ aTableColIter != mpTablePropertiesPtr->getTableGrid().end();
++aTableColIter )
{
maSize.Width += *aTableColIter;
}
maSize.Height = 0;
for( std::vector< ::oox::drawingml::table::TableRow >::const_iterator
aTableRowIter(mpTablePropertiesPtr->getTableRows().begin());
- aTableRowIter != mpTablePropertiesPtr->getTableRows().end();
aTableRowIter++ )
+ aTableRowIter != mpTablePropertiesPtr->getTableRows().end();
++aTableRowIter )
{
maSize.Height += (*aTableRowIter).getHeight();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - starmath/source
starmath/source/node.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5bf597385aa76e6c66ad2a7000fc61781a5c2514
Author: Takeshi Abe
Date: Sat Apr 4 18:35:45 2015 +0900
Mark it as static and const
Change-Id: Ide66aecd5bd9beda298da189c3564908c5756cdd
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 50638c2..7880913 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2296,7 +2296,7 @@ void SmRootSymbolNode::AdaptToY(const OutputDevice &rDev,
sal_uLong nHeight)
void SmDynIntegralSymbolNode::AdaptToY(const OutputDevice &rDev, sal_uLong
nHeight)
{
-long nFactor = 12L;
+static const long nFactor = 12L;
// The new height equals (1 + nFactor) * oldHeight
// nFactor was chosen for keeping the integral sign from becoming too
"fat".
commit 8ac30e7c450acf3147454e6cb2a86978f1359c54
Author: Takeshi Abe
Date: Sat Apr 4 18:32:03 2015 +0900
put local functions into an unnamed namespace
Change-Id: I2eb14bfb9a8f634a7fc56f581f5dca7529c5e85d
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 9f413ee..50638c2 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1199,8 +1199,7 @@ SmNode * SmBinVerNode::GetLeftMost()
}
-/**/
-
+namespace {
/// @return value of the determinant formed by the two points
double Det(const Point &rHeading1, const Point &rHeading2)
@@ -1266,6 +1265,7 @@ sal_uInt16 GetLineIntersectionPoint(Point &rResult,
return nRes;
}
+}
SmBinDiagonalNode::SmBinDiagonalNode(const SmToken &rNodeToken)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 53559] Confirm a bug
https://bugs.documentfoundation.org/show_bug.cgi?id=53559 --- Comment #4 from Björn Michaelsen --- (In reply to A (Andy) from comment #3) > @Björn: Do we want to keep this bug report? I understand the rationale > behind (thank you very much for your call), but I am not sure if new users > will look for this bug report? This bug is marked as an EasyHack an thus listed on our wiki pages about that. -- 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: Information about our work on Libreoffice
Thanks for your email Juergen or i will try to fix this. regards Tobi On Fri, Apr 3, 2015 at 11:00 AM, Caolán McNamara wrote: > On Wed, 2015-03-11 at 17:54 +0100, Tobias Madl wrote: > > That is all I can think of atm. One last request of mine would be, > > that if someone discovers some weird behavior or some windows, that > > are not loading or flicker, please contact me and I will look over it > > and try to fix it. > > writer: insert->index and tables->index and tables. The button area > isn't drawn correctly for some reason. > > C. > > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 53559] Confirm a bug
https://bugs.documentfoundation.org/show_bug.cgi?id=53559 --- Comment #3 from A (Andy) --- @Björn: Do we want to keep this bug report? I understand the rationale behind (thank you very much for your call), but I am not sure if new users will look for this bug report? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 21 commits - config_host.mk.in configure.ac editeng/source external/liborcus formula/source include/oox oox/source sc/source sd/qa so
config_host.mk.in |1
configure.ac| 51
editeng/source/misc/svxacorr.cxx| 108
external/liborcus/UnpackedTarball_liborcus.mk |2
external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 | 1750
formula/source/ui/dlg/FormulaHelper.cxx |4
include/oox/drawingml/textbodyproperties.hxx|2
oox/source/core/xmlfilterbase.cxx |3
oox/source/drawingml/shape.cxx |7
oox/source/drawingml/table/tablecell.cxx| 11
oox/source/drawingml/textbodyproperties.cxx |8
oox/source/drawingml/textbodypropertiescontext.cxx | 11
oox/source/drawingml/transform2dcontext.cxx |2
sc/source/core/data/table3.cxx | 10
sc/source/core/tool/interpr1.cxx|1
sc/source/core/tool/interpr5.cxx| 21
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx |2
sd/qa/unit/data/n902652.pptx|binary
sd/qa/unit/data/pptx/bnc910045.pptx |binary
sd/qa/unit/data/xml/n902652_0.xml | 309 ++
sd/qa/unit/import-tests.cxx | 24
solenv/gbuild/JunitTest.mk |3
svtools/source/contnr/treelist.cxx |4
sw/qa/extras/ooxmlimport/data/fdo87488.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 25
sw/source/core/unocore/unotbl.cxx |2
sw/source/filter/ww1/fltshell.cxx |2
sw/source/filter/ww8/ww8par5.cxx| 34
vcl/generic/glyphs/gcach_layout.cxx |4
vcl/source/gdi/bitmap3.cxx | 13
vcl/source/outdev/text.cxx |3
xmloff/source/style/undlihdl.cxx|2
32 files changed, 2313 insertions(+), 106 deletions(-)
New commits:
commit a610afa616af61a7d390b7ded7de1ab9a69c9c50
Author: Eike Rathke
Date: Wed Apr 1 18:43:41 2015 +0200
Resolves: tdf#88672 add missing return if error to not crash
Change-Id: Iae73c46d6ae5b141c3f5680b2623ee06205c22d2
(cherry picked from commit 3cae8ee10f297e42adf9f3b33809b4e7e3af2840)
Reviewed-on: https://gerrit.libreoffice.org/15112
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 06cc58d..c77b72a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5568,6 +5568,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs
eFunc )
if (!pMainMatrix)
{
SetError( errIllegalParameter);
+return 0;
}
nMainCol1 = 0;
nMainRow1 = 0;
commit ce7308f8b0bd6aa5844e9bab614047a07a4c1231
Author: Caolán McNamara
Date: Thu Apr 2 09:30:44 2015 +0100
fix hang with ooo71962-1.odt
script run ends after chunk we are rendering
(cherry picked from commit 00bf3a4259c1f960eff05b17649cc734c275950f)
Change-Id: Idbfe11c385db72a80d3d204f8638d67395580d1b
Reviewed-on: https://gerrit.libreoffice.org/15116
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index bf2eab2..1194e70 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -399,7 +399,9 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout,
ImplLayoutArgs& rArgs)
aScriptSubRuns.push_back(aRun);
nCurrentPos = nEndRunPos;
-aScriptRun.next();
+bool bHasMore = aScriptRun.next();
+if (!bHasMore)
+break;
}
// RTL subruns should be reversed to ensure that final glyph order is
commit 9bce571c2edd15dfa6c8e04f223b974cebdfc638
Author: Eike Rathke
Date: Mon Mar 30 19:48:45 2015 +0200
Resolves: tdf#42481 propagate errors as errors in matrix calculations
... instead of setting an error string with an unwanted side effect that
may lead to wrong results instead of error.
Change-Id: I42ade52e86520535c879e9bd68156873d706f33c
(cherry picked from commit 836d05d32e36aafc00de59ca51878f47f7ce816a)
Reviewed-on: https://gerrit.libreoffice.org/15073
Tested-by: David Tardon
Reviewed-by: David Tardon
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
ind
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 28 commits - configure.ac cui/source editeng/source formula/source framework/source oox/inc oox/source sc/inc sc/source sd/qa setup_n
configure.ac |2
cui/source/tabpages/tpshadow.cxx |9
editeng/source/editeng/editobj.cxx| 11
formula/source/ui/dlg/FormulaHelper.cxx |4
framework/source/layoutmanager/layoutmanager.cxx |9
oox/inc/drawingml/textbodyproperties.hxx |2
oox/source/drawingml/shape.cxx|7
oox/source/drawingml/table/tablecell.cxx | 11
oox/source/drawingml/textbodyproperties.cxx |8
oox/source/drawingml/textbodypropertiescontext.cxx| 11
oox/source/drawingml/transform2dcontext.cxx |2
sc/inc/queryentry.hxx |3
sc/inc/queryparam.hxx |5
sc/source/core/data/dociter.cxx | 20
sc/source/core/data/document.cxx | 56 +-
sc/source/core/data/table3.cxx|2
sc/source/core/tool/doubleref.cxx |2
sc/source/core/tool/interpr1.cxx | 21
sc/source/core/tool/interpr5.cxx | 21
sc/source/core/tool/queryentry.cxx|2
sc/source/core/tool/queryparam.cxx| 17
sc/source/core/tool/scmatrix.cxx | 32 +
sc/source/filter/inc/workbookhelper.hxx |1
sc/source/filter/inc/worksheetbuffer.hxx |3
sc/source/filter/oox/pivotcachefragment.cxx |6
sc/source/filter/oox/workbookhelper.cxx |5
sc/source/filter/oox/worksheetbuffer.cxx |6
sd/qa/unit/data/n902652.pptx |binary
sd/qa/unit/data/pptx/bnc910045.pptx |binary
sd/qa/unit/data/xml/n902652_0.xml | 309 ++
sd/qa/unit/import-tests.cxx | 24 +
setup_native/scripts/osx_install_languagepack.applescript |3
sfx2/source/appl/appbaslib.cxx| 14
sfx2/source/doc/docfile.cxx | 15
sfx2/source/inc/appbaslib.hxx |4
sw/qa/extras/ooxmlimport/data/fdo87488.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 25 +
sw/source/core/bastyp/index.cxx |1
sw/source/core/docnode/ndtbl.cxx |9
sw/source/core/edit/eddel.cxx | 15
sw/source/ui/index/cnttab.cxx | 11
sw/source/uibase/uno/unotxdoc.cxx | 19
sw/source/uibase/utlui/content.cxx| 15
vcl/generic/glyphs/gcach_layout.cxx |4
vcl/source/control/ilstbox.cxx| 22
45 files changed, 637 insertions(+), 131 deletions(-)
New commits:
commit a577c2a48cab4acf8564d26da996d9da6990a2a0
Author: Eike Rathke
Date: Tue Mar 31 14:01:42 2015 +0200
Resolves: tdf#35636 implement match on empty cells
This implements search criteria "" and "=" to match empty cells in
spreadsheet functions SUMIF, AVERAGEIF, COUNTIF, SUMIFS, AVERAGEIFS and
COUNTIFS.
Change-Id: I1b4a4c14bac7b974428bf64afb549707a0d75a90
(cherry picked from commit 01b615687fe0f39c65e0e8290db434db2f1ef8ac)
Reviewed-on: https://gerrit.libreoffice.org/15091
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index f024e6d..cac1170 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -43,8 +43,9 @@ struct SC_DLLPUBLIC ScQueryEntry
QueryType meType;
doublemfVal;
svl::SharedString maString;
+bool mbMatchEmpty;
-Item() : meType(ByValue), mfVal(0.0) {}
+Item() : meType(ByValue), mfVal(0.0), mbMatchEmpty(false) {}
bool operator== (const Item& r) const;
};
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 90105cc..867b15d 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -25,6 +25,8 @@
#include
+class SvNumberFormatter;
+
struct ScDBQueryParamInternal;
struct ScQueryEntry;
@@ -55,7 +57,8 @@ struct ScQueryParamBase
ScQueryEntry* FindEntryByField(SCCOLROW nField, bool bNew);
SC_DLLPUBLIC void RemoveEntryByField(SCCOLROW nField);
void Resize(size_t nNew);
-void FillInExcelSyntax(svl::SharedStringPool& rPool, const OUString&
aCellStr, SCSIZE nIndex);
+void FillInExcelSyntax( svl::SharedStringPool& rPool, const OUString&
aCellStr, SCSIZE nIndex,
+SvNumberFormatter* pFormatter );
protected:
typedef boost::ptr_vector EntriesType;
diff --git a
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - oox/source
oox/source/drawingml/chart/seriescontext.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 735053ec17e042a5d635eb002261aebae3f687f3
Author: Markus Mohrhard
Date: Sat Apr 4 02:25:00 2015 +0200
fix OOXML vs MSO2007 in chart import in one more place
Change-Id: I96bafad0cc73b27c2a08b5205a35b10b4901afb9
(cherry picked from commit 547c58a6173535c679027c83fb3ed77f6060fd09)
diff --git a/oox/source/drawingml/chart/seriescontext.cxx
b/oox/source/drawingml/chart/seriescontext.cxx
index e9002f4..82cb3bf 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -36,13 +36,12 @@ using ::oox::core::ContextHandlerRef;
namespace {
ContextHandlerRef lclDataLabelSharedCreateContext( ContextHandler2& rContext,
-sal_Int32 nElement, const AttributeList& rAttribs, DataLabelModelBase&
orModel )
+sal_Int32 nElement, const AttributeList& rAttribs, DataLabelModelBase&
orModel, bool bMSO2007 )
{
if( rContext.isRootElement() ) switch( nElement )
{
case C_TOKEN( delete ):
-// default is 'false', not 'true' as specified
-orModel.mbDeleted = rAttribs.getBool( XML_val, false );
+orModel.mbDeleted = rAttribs.getBool( XML_val, bMSO2007 ? false :
true );
return 0;
case C_TOKEN( dLblPos ):
orModel.monLabelPos = rAttribs.getToken( XML_val,
XML_TOKEN_INVALID );
@@ -108,7 +107,8 @@ ContextHandlerRef DataLabelContext::onCreateContext(
sal_Int32 nElement, const A
case C_TOKEN( tx ):
return new TextContext( *this, mrModel.mxText.create() );
}
-return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel
);
+bool bMSO2007 = getFilter().isMSO2007Document();
+return lclDataLabelSharedCreateContext( *this, nElement, rAttribs,
mrModel, bMSO2007 );
}
void DataLabelContext::onCharacters( const OUString& rChars )
@@ -138,7 +138,8 @@ ContextHandlerRef DataLabelsContext::onCreateContext(
sal_Int32 nElement, const
mrModel.mbShowLeaderLines = rAttribs.getBool( XML_val, false );
return 0;
}
-return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel
);
+bool bMSO2007 = getFilter().isMSO2007Document();
+return lclDataLabelSharedCreateContext( *this, nElement, rAttribs,
mrModel, bMSO2007 );
}
void DataLabelsContext::onCharacters( const OUString& rChars )
___
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.3' - oox/source
oox/source/drawingml/chart/seriescontext.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 25180bde7df62b8fdb1c1b45e8f9837eb95e0cc9
Author: Markus Mohrhard
Date: Sat Apr 4 02:25:00 2015 +0200
fix OOXML vs MSO2007 in chart import in one more place
Change-Id: I96bafad0cc73b27c2a08b5205a35b10b4901afb9
(cherry picked from commit 547c58a6173535c679027c83fb3ed77f6060fd09)
diff --git a/oox/source/drawingml/chart/seriescontext.cxx
b/oox/source/drawingml/chart/seriescontext.cxx
index fde2952..d0d6e46 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -40,13 +40,12 @@ using ::oox::core::ContextHandlerRef;
namespace {
ContextHandlerRef lclDataLabelSharedCreateContext( ContextHandler2& rContext,
-sal_Int32 nElement, const AttributeList& rAttribs, DataLabelModelBase&
orModel )
+sal_Int32 nElement, const AttributeList& rAttribs, DataLabelModelBase&
orModel, bool bMSO2007 )
{
if( rContext.isRootElement() ) switch( nElement )
{
case C_TOKEN( delete ):
-// default is 'false', not 'true' as specified
-orModel.mbDeleted = rAttribs.getBool( XML_val, false );
+orModel.mbDeleted = rAttribs.getBool( XML_val, bMSO2007 ? false :
true );
return 0;
case C_TOKEN( dLblPos ):
orModel.monLabelPos = rAttribs.getToken( XML_val,
XML_TOKEN_INVALID );
@@ -114,7 +113,8 @@ ContextHandlerRef DataLabelContext::onCreateContext(
sal_Int32 nElement, const A
case C_TOKEN( tx ):
return new TextContext( *this, mrModel.mxText.create() );
}
-return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel
);
+bool bMSO2007 = getFilter().isMSO2007Document();
+return lclDataLabelSharedCreateContext( *this, nElement, rAttribs,
mrModel, bMSO2007 );
}
void DataLabelContext::onCharacters( const OUString& rChars )
@@ -146,7 +146,8 @@ ContextHandlerRef DataLabelsContext::onCreateContext(
sal_Int32 nElement, const
mrModel.mbShowLeaderLines = rAttribs.getBool( XML_val, false );
return 0;
}
-return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel
);
+bool bMSO2007 = getFilter().isMSO2007Document();
+return lclDataLabelSharedCreateContext( *this, nElement, rAttribs,
mrModel, bMSO2007 );
}
void DataLabelsContext::onCharacters( const OUString& rChars )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
