Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libwps for openSUSE:Factory checked
in at 2023-06-30 19:58:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libwps (Old)
and /work/SRC/openSUSE:Factory/.libwps.new.13546 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwps"
Fri Jun 30 19:58:05 2023 rev:49 rq:1095986 version:0.4.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/libwps/libwps.changes 2022-12-07
17:33:51.992178248 +0100
+++ /work/SRC/openSUSE:Factory/.libwps.new.13546/libwps.changes 2023-06-30
19:58:13.577412948 +0200
@@ -1,0 +2,7 @@
+Thu Jun 29 09:11:18 UTC 2023 - Danilo Spinella <danilo.spine...@suse.com>
+
+- Update to 0.4.14:
+ * autoupdate configure.ac
+ * correct various warnings
+
+-------------------------------------------------------------------
Old:
----
libwps-0.4.13.tar.xz
New:
----
libwps-0.4.14.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libwps.spec ++++++
--- /var/tmp/diff_new_pack.4IY8KY/_old 2023-06-30 19:58:14.313417326 +0200
+++ /var/tmp/diff_new_pack.4IY8KY/_new 2023-06-30 19:58:14.329417421 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libwps
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%{!?make_build:%global make_build make %{?_smp_mflags}}
%define libname libwps-0_4-4
Name: libwps
-Version: 0.4.13
+Version: 0.4.14
Release: 0
Summary: Library for the Microsoft Works text and spreadsheet formats
License: LGPL-2.1-or-later AND MPL-2.0
++++++ libwps-0.4.13.tar.xz -> libwps-0.4.14.tar.xz ++++++
++++ 7712 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/ChangeLog new/libwps-0.4.14/ChangeLog
--- old/libwps-0.4.13/ChangeLog 2022-11-21 15:03:05.000000000 +0100
+++ new/libwps-0.4.14/ChangeLog 2023-05-05 11:29:06.000000000 +0200
@@ -1,3 +1,18 @@
+2023-05-03 ALONSO Laurent <laurent.alo...@inria.fr>
[c0392a9cefde3aa0f6495eed451c838bdc9f7f98]
+
+ clang --analyze: correct some warnings
+
+
+2023-05-03 ALONSO Laurent <laurent.alo...@inria.fr>
[f351b8be66cd102bf926f6472644317b25dfbee6]
+
+ cppcheck: correct some warnings
+
+
+2022-11-22 ALONSO Laurent <laurent.alo...@inria.fr>
[05de4b29f1ff82a0ef5b324f3f02f3ce200baa79]
+
+ update configure.ac to be compatible with autoconf 2.71 (to try to
generate package compatible with arch linux)
+
+
2021-12-07 ALONSO Laurent <laurent.alo...@inria.fr>
[674ed9e955773b32cd8fa02fed6b6355c5dd6a78]
Quattro Dos: try to retrieve correctly the spreadsheet's name when
creating some charts, Quattro: try to avoid potential spreadsheet names
clashes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/NEWS new/libwps-0.4.14/NEWS
--- old/libwps-0.4.13/NEWS 2020-09-04 14:02:32.000000000 +0200
+++ new/libwps-0.4.14/NEWS 2023-05-05 10:57:05.000000000 +0200
@@ -1,3 +1,6 @@
+0.4.12 -> 0.4.14
+- autoupdate configure.ac + correct various warnings
+
0.4.11 -> 0.4.12
- add a minimalist parser for Pocket Word .psw and .pwi files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/ar-lib new/libwps-0.4.14/ar-lib
--- old/libwps-0.4.13/ar-lib 2014-02-04 09:33:52.000000000 +0100
+++ new/libwps-0.4.14/ar-lib 2023-05-03 14:29:19.000000000 +0200
@@ -2,9 +2,9 @@
# Wrapper for Microsoft lib.exe
me=ar-lib
-scriptversion=2012-03-01.08; # UTC
+scriptversion=2019-07-04.01; # UTC
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 Free Software Foundation, Inc.
# Written by Peter Rosin <p...@lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -65,7 +65,7 @@
mingw)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin)
+ cygwin | msys)
file=`cygpath -m "$file" || echo "$file"`
;;
wine)
@@ -224,10 +224,11 @@
esac
done
else
- $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
- do
- $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
- done
+ $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \
+ | while read member
+ do
+ $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+ done
fi
elif test -n "$quick$replace"; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/compile new/libwps-0.4.14/compile
--- old/libwps-0.4.13/compile 2020-09-03 10:28:26.000000000 +0200
+++ new/libwps-0.4.14/compile 2023-05-03 14:29:19.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/configure.ac new/libwps-0.4.14/configure.ac
--- old/libwps-0.4.13/configure.ac 2022-11-21 15:00:32.000000000 +0100
+++ new/libwps-0.4.14/configure.ac 2023-05-05 10:54:05.000000000 +0200
@@ -7,7 +7,7 @@
# ====================
m4_define([libwps_version_major],[0])
m4_define([libwps_version_minor],[4])
-m4_define([libwps_version_micro],[13])
+m4_define([libwps_version_micro],[14])
m4_define([libwps_version],[libwps_version_major.libwps_version_minor.libwps_version_micro])
# =============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/m4/libtool.m4 new/libwps-0.4.14/m4/libtool.m4
--- old/libwps-0.4.13/m4/libtool.m4 2020-09-03 10:28:22.000000000 +0200
+++ new/libwps-0.4.14/m4/libtool.m4 2023-05-03 14:29:15.000000000 +0200
@@ -1068,8 +1068,8 @@
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress'
;;
darwin*)
- case ${MACOSX_DEPLOYMENT_TARGET},$host in
- 10.[[012]],*|,*powerpc*)
+ case $MACOSX_DEPLOYMENT_TARGET,$host in
+ 10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined
${wl}suppress' ;;
*)
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/missing new/libwps-0.4.14/missing
--- old/libwps-0.4.13/missing 2020-09-03 10:28:26.000000000 +0200
+++ new/libwps-0.4.14/missing 2023-05-03 14:29:19.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/Lotus.cpp new/libwps-0.4.14/src/lib/Lotus.cpp
--- old/libwps-0.4.13/src/lib/Lotus.cpp 2019-02-12 13:30:11.000000000 +0100
+++ new/libwps-0.4.14/src/lib/Lotus.cpp 2023-05-04 14:21:48.000000000 +0200
@@ -145,7 +145,7 @@
for (size_t i=0; i<m_sheetZoneIdList.size(); ++i)
zoneIdToSheetMap[m_sheetZoneIdList[i]]=int(i);
std::map<int,int> res;
- for (auto it : m_dataZoneIdToSheetZoneIdMap)
+ for (auto const &it : m_dataZoneIdToSheetZoneIdMap)
{
if
(zoneIdToSheetMap.find(it.second)==zoneIdToSheetMap.end())
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/LotusChart.cpp
new/libwps-0.4.14/src/lib/LotusChart.cpp
--- old/libwps-0.4.13/src/lib/LotusChart.cpp 2020-09-01 15:31:21.000000000
+0200
+++ new/libwps-0.4.14/src/lib/LotusChart.cpp 2023-05-04 12:30:54.000000000
+0200
@@ -185,7 +185,7 @@
std::map<std::string,int> LotusChart::getNameToChartIdMap() const
{
std::map<std::string,int> res;
- for (auto it : m_state->m_idChartMap)
+ for (auto const &it : m_state->m_idChartMap)
{
auto const &chart = it.second;
if (chart || !chart->m_name.empty())
@@ -205,7 +205,7 @@
In mac's wk3 files, all used files are named, so this must be ok
*/
bool removeNoName=version()==1 && m_state->m_idChartMap.size()>1;
- for (auto &it : m_state->m_idChartMap)
+ for (auto const &it : m_state->m_idChartMap)
{
auto id=it.first;
auto chart=it.second;
@@ -797,12 +797,12 @@
}
auto chart=m_state->getChart(m_state->m_chartId,*this,stream);
auto id=int(libwps::readU8(input));
- if (id<0||id>=3)
+ if (id>=3)
{
WPS_DEBUG_MSG(("LotusChart::readMacAxis: the id seems bad\n"));
f << "###";
}
- auto &axis=chart->getAxis((id<0||id>=3) ? 4 : id);
+ auto &axis=chart->getAxis(id>=3 ? 4 : id);
f << "id[axis]=" << id << ",";
auto format=int(libwps::readU8(input));
if ((format&0x20)==0)
@@ -1019,7 +1019,7 @@
f << "title,";
if ((val&0x10)==0)
{
- WKSChart::TextZone::Type allTypes[]=
{WKSChart::TextZone::T_Title, WKSChart::TextZone::T_SubTitle};
+ WKSChart::TextZone::Type const allTypes[]=
{WKSChart::TextZone::T_Title, WKSChart::TextZone::T_SubTitle};
for (auto type : allTypes)
chart->getTextZone(type,true)->m_show=false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/LotusGraph.cpp
new/libwps-0.4.14/src/lib/LotusGraph.cpp
--- old/libwps-0.4.13/src/lib/LotusGraph.cpp 2019-02-12 13:30:11.000000000
+0100
+++ new/libwps-0.4.14/src/lib/LotusGraph.cpp 2023-05-02 09:28:46.000000000
+0200
@@ -2124,7 +2124,7 @@
}
}
-void LotusGraph::sendZone(LotusGraphInternal::ZonePcList const &zoneList,
size_t id, WPSTransformation &transf)
+void LotusGraph::sendZone(LotusGraphInternal::ZonePcList const &zoneList,
size_t id, WPSTransformation const &transf)
{
if (!m_listener)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/LotusGraph.h new/libwps-0.4.14/src/lib/LotusGraph.h
--- old/libwps-0.4.13/src/lib/LotusGraph.h 2017-10-24 12:24:42.000000000
+0200
+++ new/libwps-0.4.14/src/lib/LotusGraph.h 2023-05-02 09:29:01.000000000
+0200
@@ -86,7 +86,7 @@
//! send the graphics corresponding to a sheetId
void sendGraphics(int sheetId);
//! try to send a shape: 123 pc
- void sendZone(LotusGraphInternal::ZonePcList const &zoneList, size_t
id, WPSTransformation &transf);
+ void sendZone(LotusGraphInternal::ZonePcList const &zoneList, size_t
id, WPSTransformation const &transf);
//! try to send a picture: 123 mac
void sendPicture(LotusGraphInternal::ZoneMac const &zone);
//! try to send a textbox content's
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/LotusSpreadsheet.cpp
new/libwps-0.4.14/src/lib/LotusSpreadsheet.cpp
--- old/libwps-0.4.13/src/lib/LotusSpreadsheet.cpp 2020-09-01
15:31:21.000000000 +0200
+++ new/libwps-0.4.14/src/lib/LotusSpreadsheet.cpp 2023-05-04
14:21:07.000000000 +0200
@@ -179,7 +179,7 @@
//! returns true if all style are empty
bool empty() const
{
- for (auto it : m_colsToStyleMap)
+ for (auto const &it : m_colsToStyleMap)
{
if (!it.second.empty()) return false;
}
@@ -840,7 +840,7 @@
{
std::set<Vec2i> seens;
std::stack<Vec2i> toDo;
- for (auto it : m_state->m_rowSheetIdToStyleIdMap)
+ for (auto const &it : m_state->m_rowSheetIdToStyleIdMap)
toDo.push(it.first);
while (!toDo.empty())
{
@@ -995,7 +995,7 @@
}
f << "row" << n << "[bound]=" << Vec2i(rowPos[0], rowPos[1]) <<
",";
}
- if (sheetId<0||sheetId>=m_state->getNumSheet())
+ if (sheetId>=m_state->getNumSheet())
{
WPS_DEBUG_MSG(("LotusSpreadsheet::readColumnDefinition the zone
id seems bad\n"));
f << "##id";
@@ -1043,7 +1043,7 @@
auto sheetId=int(libwps::readU8(input));
f << "id[sheet]=" << sheetId << ",";
LotusSpreadsheetInternal::Spreadsheet empty, *sheet=nullptr;
- if (sheetId<0||sheetId>=int(m_state->m_spreadsheetList.size()))
+ if (sheetId>=int(m_state->m_spreadsheetList.size()))
{
WPS_DEBUG_MSG(("LotusSpreadsheet::readColumnSizes: can find
spreadsheet %d\n", sheetId));
sheet=∅
@@ -1419,7 +1419,7 @@
}
auto sz = long(libwps::readU16(input));
long endPos = pos+4+sz;
- if (sz<0 || !stream->checkFilePosition(endPos))
+ if (!stream->checkFilePosition(endPos))
{
input->seek(pos, librevenge::RVNG_SEEK_SET);
return false;
@@ -1778,7 +1778,7 @@
auto sheetId=int(libwps::readU8(input));
f << "id[sheet]=" << sheetId << ",";
LotusSpreadsheetInternal::Spreadsheet empty, *sheet=nullptr;
- if (sheetId<0||sheetId>=int(m_state->m_spreadsheetList.size()))
+ if (sheetId>=int(m_state->m_spreadsheetList.size()))
{
WPS_DEBUG_MSG(("LotusSpreadsheet::readRowSizes: can find
spreadsheet %d\n", sheetId));
sheet=∅
@@ -1864,7 +1864,7 @@
f << "##";
ascFile.addDelimiter(input->tell(), '|');
}
- if (sheetId<0||sheetId>=m_state->getNumSheet())
+ if (sheetId>=m_state->getNumSheet())
{
WPS_DEBUG_MSG(("LotusSpreadsheet::readSheetName: the zone id
seems bad\n"));
f << "##id";
@@ -2156,7 +2156,7 @@
if (sheetId) f << "sheet[id]=" << sheetId << ",";
LotusSpreadsheetInternal::Spreadsheet empty, *sheet=nullptr;
- if (sheetId<0||sheetId>=int(m_state->m_spreadsheetList.size()))
+ if (sheetId>=int(m_state->m_spreadsheetList.size()))
{
WPS_DEBUG_MSG(("LotusSpreadsheet::readCell: can find
spreadsheet %d\n", sheetId));
sheet=∅
@@ -2437,7 +2437,7 @@
newRowSet.insert(prevRow+1);
}
size_t numRowStyle=m_state->m_rowStylesList.size();
- for (auto rIt : sheet.m_rowToStyleIdMap)
+ for (auto const &rIt : sheet.m_rowToStyleIdMap)
{
Vec2i const &rows=rIt.first;
size_t listId=rIt.second;
@@ -2449,13 +2449,13 @@
newRowSet.insert(rows[0]);
newRowSet.insert(rows[1]+1);
}
- for (auto rIt : sheet.m_rowHeightMap)
+ for (auto const &rIt : sheet.m_rowHeightMap)
{
Vec2i const &rows=rIt.first;
newRowSet.insert(rows[0]);
newRowSet.insert(rows[1]+1);
}
- for (auto rIt : sheet.m_rowToExtraStyleMap)
+ for (auto const &rIt : sheet.m_rowToExtraStyleMap)
{
if (rIt.second.empty()) continue;
newRowSet.insert(rIt.first);
@@ -2465,19 +2465,19 @@
LotusSpreadsheetInternal::Table123Styles const
*table123Styles=m_state->getTableStyle(sheetId);
if (table123Styles)
{
- for (auto rIt : table123Styles->m_rowsToColsToCellIdMap)
+ for (auto const &rIt : table123Styles->m_rowsToColsToCellIdMap)
{
Vec2i const &rows=rIt.first;
newRowSet.insert(rows[0]);
newRowSet.insert(rows[1]+1);
}
- for (auto rIt : table123Styles->m_rowsToColsToExtraStyleMap)
+ for (auto const &rIt :
table123Styles->m_rowsToColsToExtraStyleMap)
{
Vec2i const &rows=rIt.first;
newRowSet.insert(rows[0]);
newRowSet.insert(rows[1]+1);
}
- for (auto rIt : table123Styles->m_rowsToColsToFormatStyleMap)
+ for (auto const &rIt :
table123Styles->m_rowsToColsToFormatStyleMap)
{
Vec2i const &rows = rIt.first;
newRowSet.insert(rows[0]);
@@ -2576,10 +2576,10 @@
std::map<int,int> potentialMergeMap;
if (table123Styles)
{
- for (auto rIt : table123Styles->m_rowsToColsToCellIdMap)
+ for (auto const &rIt : table123Styles->m_rowsToColsToCellIdMap)
{
if (rIt.first[0]>row || rIt.first[1]<row) continue;
- for (auto colIt : rIt.second)
+ for (auto const &colIt : rIt.second)
{
LotusSpreadsheetInternal::Style
style(defFontType);
WPSFont font;
@@ -2591,20 +2591,20 @@
newColSet.insert(colIt.first[1]+1);
}
}
- for (auto rIt : table123Styles->m_rowsToColsToExtraStyleMap)
+ for (auto const &rIt :
table123Styles->m_rowsToColsToExtraStyleMap)
{
if (rIt.first[0]>row || rIt.first[1]<row) continue;
- for (auto colIt : rIt.second)
+ for (auto const &colIt : rIt.second)
{
colToExtraStyleMap.insert(std::map<Vec2i,
LotusSpreadsheetInternal::Extra123Style>::value_type(colIt.first,colIt.second));
newColSet.insert(colIt.first[0]);
newColSet.insert(colIt.first[1]+1);
}
}
- for (auto rIt : table123Styles->m_rowsToColsToFormatStyleMap)
+ for (auto const &rIt :
table123Styles->m_rowsToColsToFormatStyleMap)
{
if (rIt.first[0]>row || rIt.first[1]<row) continue;
- for (auto colIt : rIt.second)
+ for (auto const &colIt : rIt.second)
{
colToFormatStyleMap.insert(std::map<Vec2i,
LotusSpreadsheetInternal::Format123Style>::value_type(colIt.first,colIt.second));
newColSet.insert(colIt.first[0]);
@@ -2722,10 +2722,7 @@
{
int newEndCol=potentialMergeMap.find(col)->second;
while (colIt!=newColSet.end() && *colIt<newEndCol)
- {
++colIt;
- continue;
- }
auto cell=cIt->second;
cell.setNumSpannedCells(Vec2i(newEndCol-col,1));
sendCellContent(cell, style, 1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/LotusStyleManager.h
new/libwps-0.4.14/src/lib/LotusStyleManager.h
--- old/libwps-0.4.13/src/lib/LotusStyleManager.h 2020-04-01
08:57:58.000000000 +0200
+++ new/libwps-0.4.14/src/lib/LotusStyleManager.h 2023-05-03
12:45:17.000000000 +0200
@@ -29,9 +29,12 @@
#include <librevenge-stream/librevenge-stream.h>
#include "libwps_internal.h"
+#include "libwps_tools_win.h"
#include "WPSDebug.h"
+class WPSGraphicStyle;
+
namespace LotusStyleManagerInternal
{
struct CellStyleEntry;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/MSWrite.cpp new/libwps-0.4.14/src/lib/MSWrite.cpp
--- old/libwps-0.4.13/src/lib/MSWrite.cpp 2020-04-01 08:57:58.000000000
+0200
+++ new/libwps-0.4.14/src/lib/MSWrite.cpp 2023-05-02 10:33:42.000000000
+0200
@@ -1714,7 +1714,7 @@
}
}
-void MSWriteParser::insertNote(bool annotation, uint32_t fcPos,
librevenge::RVNGString &label)
+void MSWriteParser::insertNote(bool annotation, uint32_t fcPos,
librevenge::RVNGString const &label)
{
std::vector<MSWriteParserInternal::Footnote>::iterator iter;
@@ -1751,7 +1751,7 @@
WPS_DEBUG_MSG(("MSWriteParser::insertNote note not found!\n"));
}
-void MSWriteParser::startSection(MSWriteParserInternal::Section §ion)
+void MSWriteParser::startSection(MSWriteParserInternal::Section const §ion)
{
std::vector<int> widths;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/MSWrite.h new/libwps-0.4.14/src/lib/MSWrite.h
--- old/libwps-0.4.13/src/lib/MSWrite.h 2019-02-12 13:29:53.000000000 +0100
+++ new/libwps-0.4.14/src/lib/MSWrite.h 2023-05-02 10:33:36.000000000 +0200
@@ -169,11 +169,11 @@
bool readString(std::string &res, unsigned long lastPos);
virtual void insertSpecial(uint8_t val, uint32_t fc,
MSWriteParserInternal::Paragraph::Location location);
virtual void insertControl(uint8_t val, uint32_t fc);
- void insertNote(bool annotation, uint32_t fcPos, librevenge::RVNGString
&label);
+ void insertNote(bool annotation, uint32_t fcPos, librevenge::RVNGString
const &label);
unsigned insertString(const unsigned char *str, unsigned size,
libwps_tools_win::Font::Type type);
static void getPageStyle(MSWriteParserInternal::Section &sep,
WPSPageSpan &pageSpan);
void getHeaderFooters(uint32_t first, MSWriteParserInternal::Section
&sep, WPSPageSpan &pageSpan);
- void startSection(MSWriteParserInternal::Section §ion);
+ void startSection(MSWriteParserInternal::Section const §ion);
//! check if the file position is correct or not
bool checkFilePosition(uint32_t pos) const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/Multiplan.cpp new/libwps-0.4.14/src/lib/Multiplan.cpp
--- old/libwps-0.4.13/src/lib/Multiplan.cpp 2020-04-01 08:57:58.000000000
+0200
+++ new/libwps-0.4.14/src/lib/Multiplan.cpp 2023-05-04 14:22:11.000000000
+0200
@@ -1285,9 +1285,9 @@
stack.back().push_back(instr);
continue;
}
- std::vector<WKSContentListener::FormulaInstruction> child;
if
(instr.m_type!=WKSContentListener::FormulaInstruction::F_Function)
{
+ std::vector<WKSContentListener::FormulaInstruction>
child;
child.push_back(instr);
stack.push_back(child);
continue;
@@ -1424,9 +1424,9 @@
}
std::vector<std::vector<WKSContentListener::FormulaInstruction> > stack;
auto const &listOperators=MultiplanParserInternal::s_listOperatorsV2;
- int const numOperators=int(WPS_N_ELEMENTS(listOperators));
+ int const
numOperators=int(WPS_N_ELEMENTS(MultiplanParserInternal::s_listOperatorsV2));
auto const &listFunctions=MultiplanParserInternal::s_listFunctionsV2;
- int const numFunctions=int(WPS_N_ELEMENTS(listFunctions));
+ int const
numFunctions=int(WPS_N_ELEMENTS(MultiplanParserInternal::s_listFunctionsV2));
bool ok=true;
input->seek(pos+1, librevenge::RVNG_SEEK_SET);
while (input->tell()<endPos)
@@ -1751,9 +1751,9 @@
break;
}
if (noneInstr) continue;
- std::vector<WKSContentListener::FormulaInstruction> child;
if
(instr.m_type!=WKSContentListener::FormulaInstruction::F_Function)
{
+ std::vector<WKSContentListener::FormulaInstruction>
child;
child.push_back(instr);
stack.push_back(child);
continue;
@@ -2670,7 +2670,7 @@
WPSRowFormat rowFormat(16);
rowFormat.m_isMinimalHeight=true;
int lastRow=0;
- for (auto it : m_state->m_cellPositionsMap)
+ for (auto const &it : m_state->m_cellPositionsMap)
{
int r=it.first;
auto const &row = it.second;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/PocketWord.cpp
new/libwps-0.4.14/src/lib/PocketWord.cpp
--- old/libwps-0.4.13/src/lib/PocketWord.cpp 2021-12-06 13:35:58.000000000
+0100
+++ new/libwps-0.4.14/src/lib/PocketWord.cpp 2023-05-04 14:19:27.000000000
+0200
@@ -84,7 +84,7 @@
//! try to retrieve a color
bool getColor(int id, WPSColor &col) const
{
- static WPSColor colors[16]=
+ static WPSColor const colors[16]=
{
WPSColor(0,0,0), WPSColor(128,128,128),
WPSColor(192,192,192), WPSColor(255,255,255),
WPSColor(255,0,0), WPSColor(0,255,0),
WPSColor(0,0,255), WPSColor(0,255,255),
@@ -614,8 +614,6 @@
{
switch (val)
{
- case 0:
- break;
case 1:
para.m_justify=libwps::JustificationRight;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/Quattro.cpp new/libwps-0.4.14/src/lib/Quattro.cpp
--- old/libwps-0.4.13/src/lib/Quattro.cpp 2020-09-01 15:31:21.000000000
+0200
+++ new/libwps-0.4.14/src/lib/Quattro.cpp 2023-05-03 12:51:09.000000000
+0200
@@ -239,7 +239,7 @@
0x808000, 0x008000, 0x800000, 0x008080
};
for (uint32_t i : quattroColorMap)
-
THIS->m_colorsList.push_back(WPSColor(quattroColorMap[i]));
+ THIS->m_colorsList.push_back(WPSColor(i));
}
if (id < 0 || id >= int(m_colorsList.size()))
{
@@ -690,11 +690,17 @@
bool QuattroParser::checkHeader(std::shared_ptr<WPSStream> stream, bool strict)
{
+ if (!stream)
+ {
+ WPS_DEBUG_MSG(("QuattroParser::checkHeader: called without
stream\n"));
+ return false;
+ }
+
RVNGInputStreamPtr input = stream->m_input;
libwps::DebugFile &ascFile=stream->m_ascii;
libwps::DebugStream f;
- if (!stream || !stream->checkFilePosition(12))
+ if (!input || !stream->checkFilePosition(12))
{
WPS_DEBUG_MSG(("QuattroParser::checkHeader: file is too
short\n"));
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/Quattro9.h new/libwps-0.4.14/src/lib/Quattro9.h
--- old/libwps-0.4.13/src/lib/Quattro9.h 2020-04-01 08:57:58.000000000
+0200
+++ new/libwps-0.4.14/src/lib/Quattro9.h 2023-05-03 12:56:09.000000000
+0200
@@ -31,6 +31,7 @@
#include "libwps_internal.h"
#include "libwps_tools_win.h"
+#include "WPSEntry.h"
#include "WKSParser.h"
#include "WPSGraphicStyle.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/Quattro9Graph.cpp
new/libwps-0.4.14/src/lib/Quattro9Graph.cpp
--- old/libwps-0.4.13/src/lib/Quattro9Graph.cpp 2020-04-01 08:57:58.000000000
+0200
+++ new/libwps-0.4.14/src/lib/Quattro9Graph.cpp 2023-05-02 13:27:06.000000000
+0200
@@ -779,7 +779,7 @@
// we must update the style here
if (patId==0)
style.setSurfaceColor(surfColor[0]);
- else if (patId>0)
+ else
{
WPSGraphicStyle::Pattern pattern;
if (m_state->getPattern32(patId,
pattern))
@@ -1717,7 +1717,7 @@
{
for (auto it=m_state->m_sheetIdToGraphMap.lower_bound(sheetId);
it!=m_state->m_sheetIdToGraphMap.upper_bound(sheetId); ++it)
{
- auto &graph=it->second;
+ auto const &graph=it->second;
if (!graph) continue;
if (graph->m_type==graph->OLE)
sendOLE(*graph, sheetId);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/Quattro9Spreadsheet.cpp
new/libwps-0.4.14/src/lib/Quattro9Spreadsheet.cpp
--- old/libwps-0.4.13/src/lib/Quattro9Spreadsheet.cpp 2020-09-01
15:31:21.000000000 +0200
+++ new/libwps-0.4.14/src/lib/Quattro9Spreadsheet.cpp 2023-05-02
13:32:44.000000000 +0200
@@ -101,7 +101,7 @@
if (m_fileFormat!=st.m_fileFormat) return false;
int diff = WPSCellFormat::compare(st);
if (diff) return false;
- return m_fileFormat==st.m_fileFormat &&
m_alignAcrossColumn==st.m_alignAcrossColumn && m_extra==st.m_extra;
+ return m_alignAcrossColumn==st.m_alignAcrossColumn &&
m_extra==st.m_extra;
}
//! a cellule of a Quattro spreadsheet
@@ -532,7 +532,6 @@
// we need to split the last data
auto rows=rIt->first;
auto cell=rIt->second;
- ++rIt;
column.m_rowsToCellMap.erase(rows);
cell.m_rows[0]=maxRow+1;
listCellToAdd.push_back(cell);
@@ -554,7 +553,7 @@
{
std::vector<WPSColumnFormat> widths;
// g++-mp-7 does not like float(m_defaultSizes[0])/20.f), but
this->m_default is ok...
- WPSColumnFormat defWidth(float(this->m_defaultSizes[0])/20.f),
actWidth;
+ WPSColumnFormat defWidth(float(this->m_defaultSizes[0])/20.f);
defWidth.m_useOptimalWidth=true;
int prevRow=-1;
for (auto const &it : m_sizesMap[0])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/QuattroDos.cpp
new/libwps-0.4.14/src/lib/QuattroDos.cpp
--- old/libwps-0.4.13/src/lib/QuattroDos.cpp 2021-12-06 15:06:32.000000000
+0100
+++ new/libwps-0.4.14/src/lib/QuattroDos.cpp 2023-05-02 13:33:38.000000000
+0200
@@ -665,7 +665,7 @@
f << "_";
}
else if (val==0xFF) f << "protected,";
- else if (val) f << "#protected=" << val << ",";
+ else f << "#protected=" << val << ",";
isParsed=needWriteInAscii=true;
break;
case 0x25: // footer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/QuattroDosSpreadsheet.cpp
new/libwps-0.4.14/src/lib/QuattroDosSpreadsheet.cpp
--- old/libwps-0.4.13/src/lib/QuattroDosSpreadsheet.cpp 2021-12-06
15:00:57.000000000 +0100
+++ new/libwps-0.4.14/src/lib/QuattroDosSpreadsheet.cpp 2023-05-04
12:32:49.000000000 +0200
@@ -301,7 +301,7 @@
enum Type { T_Spreadsheet, T_Filter, T_Report };
//! a constructor
- Spreadsheet(Type type=T_Spreadsheet, int id=0)
+ explicit Spreadsheet(Type type=T_Spreadsheet, int id=0)
: m_type(type)
, m_id(id)
, m_numCols(0)
@@ -334,7 +334,7 @@
void insertChartPositions(std::map<Vec2i,Vec2i> const &chartPosMap,
libwps_tools_win::Font::Type type)
{
int maxCol=-1;
- for (auto it : chartPosMap)
+ for (auto const &it : chartPosMap)
{
if (it.second[0]>maxCol) maxCol=it.second[0];
if
(m_positionToCellMap.find(it.first)!=m_positionToCellMap.end())
@@ -450,7 +450,7 @@
m_rowHeightMap.clear();
int actHeight=-1;
Vec2i actPos(0,-1);
- for (auto rIt : oldMap)
+ for (auto const &rIt : oldMap)
{
// first check for not filled row
if (rIt.first[0]!=actPos[1]+1)
@@ -525,7 +525,7 @@
int getMaximalSheet(Spreadsheet::Type type=Spreadsheet::T_Spreadsheet)
const
{
int max=-1;
- for (auto sheet : m_spreadsheetList)
+ for (auto const &sheet : m_spreadsheetList)
{
if (!sheet || sheet->m_type != type || sheet->m_id<=max
|| sheet->empty()) continue;
max=sheet->m_id;
@@ -535,7 +535,7 @@
//! returns the ith real spreadsheet
std::shared_ptr<Spreadsheet> getSheet(Spreadsheet::Type type, int id)
{
- for (auto sheet : m_spreadsheetList)
+ for (auto const &sheet : m_spreadsheetList)
{
if (!sheet || sheet->m_type!=type || sheet->m_id!=id)
continue;
@@ -1534,7 +1534,6 @@
{
cell.m_content.m_contentType=WKSContentListener::CellContent::C_TEXT;
long begText=m_input->tell()+2, endText=begText+dataSz-2;
- std::string s("");
// pascal string
auto align=char(libwps::readU8(m_input));
if (align=='\'')
cell.setHAlignment(WPSCellFormat::HALIGN_DEFAULT);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/QuattroFormula.cpp
new/libwps-0.4.14/src/lib/QuattroFormula.cpp
--- old/libwps-0.4.13/src/lib/QuattroFormula.cpp 2018-07-30
20:35:18.000000000 +0200
+++ new/libwps-0.4.14/src/lib/QuattroFormula.cpp 2023-05-02
13:37:58.000000000 +0200
@@ -227,7 +227,6 @@
}
else
listCellsPos.push_back(cell);
- continue;
}
if (input->tell() !=endPos)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/QuattroGraph.cpp
new/libwps-0.4.14/src/lib/QuattroGraph.cpp
--- old/libwps-0.4.13/src/lib/QuattroGraph.cpp 2020-04-01 08:57:58.000000000
+0200
+++ new/libwps-0.4.14/src/lib/QuattroGraph.cpp 2023-05-02 13:40:58.000000000
+0200
@@ -1929,7 +1929,7 @@
bool find=false;
while (it!=m_state->m_sheetIdToGraphMap.end() && it->first==sheetId)
{
- auto &graph=it++->second;
+ auto const &graph=it++->second;
if (!graph || graph->m_cellBox[0]!=cell) continue;
sendGraphic(*graph);
find=true;
@@ -1945,7 +1945,7 @@
{
for (auto it=m_state->m_sheetIdToGraphMap.lower_bound(sheetId);
it!=m_state->m_sheetIdToGraphMap.upper_bound(sheetId); ++it)
{
- auto &graph=it->second;
+ auto const &graph=it->second;
if (!graph) continue;
if (graph->m_type==graph->Shape)
sendShape(*graph, sheetId);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/QuattroSpreadsheet.cpp
new/libwps-0.4.14/src/lib/QuattroSpreadsheet.cpp
--- old/libwps-0.4.13/src/lib/QuattroSpreadsheet.cpp 2021-12-06
14:39:32.000000000 +0100
+++ new/libwps-0.4.14/src/lib/QuattroSpreadsheet.cpp 2023-05-04
14:20:38.000000000 +0200
@@ -105,7 +105,7 @@
if (m_fontType!=st.m_fontType || m_fileFormat!=st.m_fileFormat) return
false;
int diff = WPSCellFormat::compare(st);
if (diff) return false;
- return m_fileFormat==st.m_fileFormat &&
m_alignAcrossColumn==st.m_alignAcrossColumn && m_extra==st.m_extra;
+ return m_alignAcrossColumn==st.m_alignAcrossColumn &&
m_extra==st.m_extra;
}
//! a cellule of a Quattro spreadsheet
@@ -393,7 +393,7 @@
m_rowHeightMap.clear();
int actHeight=-1;
Vec2i actPos(0,-1);
- for (auto rIt : oldMap)
+ for (auto const &rIt : oldMap)
{
// first check for not filled row
if (rIt.first[0]!=actPos[1]+1)
@@ -439,7 +439,7 @@
c+=float(w)/20.f;
}
int r=0, prevR=0;
- for (auto it : m_rowHeightMap)
+ for (auto const &it : m_rowHeightMap)
{
int maxR=std::min(it.first[1],cell[1]-1);
if (prevR<it.first[0])
@@ -757,7 +757,6 @@
case 0x33: // formula res
{
long begText=input->tell()+1;
- std::string s("");
// align + c string
auto align=char(libwps::readU8(input));
if (align=='\'')
cell.setHAlignment(WPSCellFormat::HALIGN_DEFAULT);
@@ -1477,7 +1476,6 @@
instr=WKSContentListener::FormulaInstruction();
instr.m_type=WKSContentListener::FormulaInstruction::F_Cell;
instr.m_fileName=fName;
- bool ok = true;
int pos[3]; // col, sheet, fl|row
bool relative[3] = { false, false, false};
for (int d=0; d<2; ++d) pos[d]=int(libwps::readU8(input));
@@ -1501,10 +1499,7 @@
pos[2] &= 0x1fff;
if (pos[0] < 0 || pos[0] > 255 || pos[2] < 0)
{
- if (ok)
- {
- WPS_DEBUG_MSG(("QuattroSpreadsheet::readCell: can not
read cell position\n"));
- }
+ WPS_DEBUG_MSG(("QuattroSpreadsheet::readCell: can not read cell
position\n"));
return false;
}
instr.m_position[0]=Vec2i(pos[0],pos[2]);
@@ -1517,7 +1512,7 @@
}
else
instr.m_sheetId[0]=pos[1];
- return ok;
+ return true;
}
bool QuattroSpreadsheet::readCellReference(std::shared_ptr<WPSStream> const
&stream, long endPos,
@@ -1620,7 +1615,7 @@
}
auto defFontType=m_mainParser.getDefaultFontType();
auto sheet = m_state->getSheet(sId, defFontType);
- for (auto c: listGraphicCells)
+ for (auto const &c: listGraphicCells)
sheet->getCell(c, defFontType).m_hasGraphic=true;
m_listener->openSheet(sheet->getWidths(), m_state->getSheetName(sId));
m_mainParser.sendPageGraphics(sId);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WKS4.cpp new/libwps-0.4.14/src/lib/WKS4.cpp
--- old/libwps-0.4.13/src/lib/WKS4.cpp 2019-10-31 10:47:17.000000000 +0100
+++ new/libwps-0.4.14/src/lib/WKS4.cpp 2023-05-02 13:45:05.000000000 +0200
@@ -805,7 +805,7 @@
f << "_";
}
else if (val==0xFF) f << "protected,";
- else if (val) f << "#protected=" << val << ",";
+ else f << "#protected=" << val << ",";
isParsed=needWriteInAscii=true;
break;
case 0x25: // footer
@@ -1164,7 +1164,7 @@
f << "_";
}
else if (val==0xFF) f << "protected,";
- else if (val) f << "#protected=" << val << ",";
+ else f << "#protected=" << val << ",";
isParsed=needWriteInAscii=true;
break;
case 0x40:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WKS4Chart.cpp new/libwps-0.4.14/src/lib/WKS4Chart.cpp
--- old/libwps-0.4.13/src/lib/WKS4Chart.cpp 2020-04-01 08:57:58.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WKS4Chart.cpp 2023-05-04 14:22:49.000000000
+0200
@@ -236,7 +236,7 @@
int WKS4Chart::getNumCharts() const
{
int num=0;
- for (auto chart : m_state->m_chartList)
+ for (auto const &chart : m_state->m_chartList)
{
if (chart && !chart->empty())
++num;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WKS4Spreadsheet.cpp
new/libwps-0.4.14/src/lib/WKS4Spreadsheet.cpp
--- old/libwps-0.4.13/src/lib/WKS4Spreadsheet.cpp 2020-04-01
08:57:58.000000000 +0200
+++ new/libwps-0.4.14/src/lib/WKS4Spreadsheet.cpp 2023-05-04
14:15:10.000000000 +0200
@@ -259,7 +259,7 @@
enum Type { T_Spreadsheet, T_Filter, T_Report };
//! a constructor
- Spreadsheet(Type type=T_Spreadsheet, int id=0)
+ explicit Spreadsheet(Type type=T_Spreadsheet, int id=0)
: m_type(type)
, m_id(id)
, m_numCols(0)
@@ -335,7 +335,7 @@
int actHeight=-1;
Vec2i actPos(0,-1);
int const defHeight=m_heightDefault*20; // conversion from
point to TWIP
- for (auto rIt : oldMap)
+ for (auto const &rIt : oldMap)
{
// first check for not filled row
if (rIt.first[0]!=actPos[1]+1)
@@ -439,7 +439,7 @@
int getMaximalSheet(Spreadsheet::Type type=Spreadsheet::T_Spreadsheet)
const
{
int max=-1;
- for (auto sheet : m_spreadsheetList)
+ for (auto const &sheet : m_spreadsheetList)
{
if (!sheet || sheet->m_type != type || sheet->m_id<=max
|| sheet->empty()) continue;
max=sheet->m_id;
@@ -449,7 +449,7 @@
//! returns the ith real spreadsheet
std::shared_ptr<Spreadsheet> getSheet(Spreadsheet::Type type, int id)
{
- for (auto sheet : m_spreadsheetList)
+ for (auto const &sheet : m_spreadsheetList)
{
if (!sheet || sheet->m_type!=type || sheet->m_id!=id)
continue;
@@ -1792,7 +1792,6 @@
{
instr=WKSContentListener::FormulaInstruction();
instr.m_type=WKSContentListener::FormulaInstruction::F_Cell;
- bool ok = true;
int pos[2];
bool absolute[2] = { true, true};
for (int dim = 0; dim < 2; dim++)
@@ -1832,15 +1831,12 @@
{
std::stringstream f;
f << "###[" << pos[1] << "," << pos[0] << "]";
- if (ok)
- {
- WPS_DEBUG_MSG(("WKS4Spreadsheet::readCell: can not read
cell position\n"));
- }
+ WPS_DEBUG_MSG(("WKS4Spreadsheet::readCell: can not read cell
position\n"));
return false;
}
instr.m_position[0]=Vec2i(pos[0],pos[1]);
instr.m_positionRelative[0]=Vec2b(!absolute[0],!absolute[1]);
- return ok;
+ return true;
}
namespace WKS4SpreadsheetInternal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WKSChart.cpp new/libwps-0.4.14/src/lib/WKSChart.cpp
--- old/libwps-0.4.13/src/lib/WKSChart.cpp 2018-07-30 17:00:47.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WKSChart.cpp 2023-05-04 12:22:55.000000000
+0200
@@ -329,7 +329,7 @@
interface->insertChartAxis(axis);
}
// series
- for (auto it : m_serieMap)
+ for (auto const &it : m_serieMap)
{
auto const &serie = it.second;
if (!serie.valid()) continue;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WKSChart.h new/libwps-0.4.14/src/lib/WKSChart.h
--- old/libwps-0.4.13/src/lib/WKSChart.h 2021-12-07 09:57:45.000000000
+0100
+++ new/libwps-0.4.14/src/lib/WKSChart.h 2023-05-02 09:24:34.000000000
+0200
@@ -257,7 +257,7 @@
return m_cell.valid();
if (m_contentType!=C_Text)
return false;
- for (auto &e : m_textEntryList)
+ for (auto const &e : m_textEntryList)
{
if (e.valid()) return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WKSContentListener.cpp
new/libwps-0.4.14/src/lib/WKSContentListener.cpp
--- old/libwps-0.4.13/src/lib/WKSContentListener.cpp 2020-04-01
08:57:58.000000000 +0200
+++ new/libwps-0.4.14/src/lib/WKSContentListener.cpp 2023-05-04
12:31:52.000000000 +0200
@@ -617,7 +617,7 @@
}
void WKSContentListener::insertPicture
-(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData,
std::string type,
+(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData,
std::string const &type,
WPSGraphicStyle const &style)
{
if (!_openFrame(pos, style)) return;
@@ -939,7 +939,7 @@
// Check whether the document is calling itself
bool sendDoc = true;
- for (auto subDoc : m_ds->m_subDocuments)
+ for (auto const &subDoc : m_ds->m_subDocuments)
{
if (!subDocument)
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WKSContentListener.h
new/libwps-0.4.14/src/lib/WKSContentListener.h
--- old/libwps-0.4.13/src/lib/WKSContentListener.h 2018-07-30
16:45:21.000000000 +0200
+++ new/libwps-0.4.14/src/lib/WKSContentListener.h 2023-05-03
09:23:29.000000000 +0200
@@ -203,7 +203,7 @@
void insertComment(WPSSubDocumentPtr &subDocument);
/** adds a picture in given position */
void insertPicture(WPSPosition const &pos, const
librevenge::RVNGBinaryData &binaryData,
- std::string type="image/pict", WPSGraphicStyle const
&style=WPSGraphicStyle::emptyStyle());
+ std::string const &type="image/pict",
WPSGraphicStyle const &style=WPSGraphicStyle::emptyStyle());
/** adds an object with replacement picture in given position */
void insertObject(WPSPosition const &pos, const WPSEmbeddedObject &obj,
WPSGraphicStyle const
&style=WPSGraphicStyle::emptyStyle());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPS4.cpp new/libwps-0.4.14/src/lib/WPS4.cpp
--- old/libwps-0.4.13/src/lib/WPS4.cpp 2019-02-12 13:30:11.000000000 +0100
+++ new/libwps-0.4.14/src/lib/WPS4.cpp 2023-05-03 09:38:12.000000000 +0200
@@ -371,7 +371,7 @@
m_listener->insertLabelNote(WPSContentListener::FOOTNOTE, label,
subdoc);
}
-void WPS4Parser::createTextBox(WPSEntry const &entry, WPSPosition const &pos,
librevenge::RVNGPropertyList &extras)
+void WPS4Parser::createTextBox(WPSEntry const &entry, WPSPosition const &pos,
librevenge::RVNGPropertyList const &extras)
{
if (m_listener.get() == nullptr) return;
WPSSubDocumentPtr subdoc(new WPS4ParserInternal::SubDocument
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPS4.h new/libwps-0.4.14/src/lib/WPS4.h
--- old/libwps-0.4.13/src/lib/WPS4.h 2019-02-12 13:29:53.000000000 +0100
+++ new/libwps-0.4.14/src/lib/WPS4.h 2023-05-03 09:38:21.000000000 +0200
@@ -104,7 +104,7 @@
/** creates a document for a footnote entry with label and then send
the data*/
void createNote(WPSEntry const &entry, librevenge::RVNGString const
&label);
//! creates a textbox and then send the data
- void createTextBox(WPSEntry const &entry, WPSPosition const &pos,
librevenge::RVNGPropertyList &extras);
+ void createTextBox(WPSEntry const &entry, WPSPosition const &pos,
librevenge::RVNGPropertyList const &extras);
//! sends text corresponding to the entry to the listener (via WPS4Text)
void send(WPSEntry const &entry, libwps::SubDocumentType type);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPS4Graph.cpp new/libwps-0.4.14/src/lib/WPS4Graph.cpp
--- old/libwps-0.4.13/src/lib/WPS4Graph.cpp 2017-11-14 11:01:33.000000000
+0100
+++ new/libwps-0.4.14/src/lib/WPS4Graph.cpp 2023-05-04 14:17:36.000000000
+0200
@@ -96,7 +96,7 @@
// update the positions and send data to the listener
void WPS4Graph::storeObjects(std::map<int,WPSEmbeddedObject> const &objectsMap)
{
- for (auto it : objectsMap)
+ for (auto const &it : objectsMap)
{
if
(m_state->m_idToObjectMap.find(it.first)!=m_state->m_idToObjectMap.end())
continue;
@@ -138,7 +138,7 @@
#ifdef DEBUG
bool firstSend = false;
#endif
- for (auto it : m_state->m_idToObjectMap)
+ for (auto const &it : m_state->m_idToObjectMap)
{
if (it.second.m_sent) continue;
#ifdef DEBUG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPS4Text.cpp new/libwps-0.4.14/src/lib/WPS4Text.cpp
--- old/libwps-0.4.13/src/lib/WPS4Text.cpp 2018-08-01 20:06:00.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPS4Text.cpp 2023-05-04 12:37:30.000000000
+0200
@@ -550,7 +550,7 @@
{
if (libwps::readU8(m_input.get()) == 0x0C) numPage++;
}
- for (auto it : m_state->m_objectMap)
+ for (auto const &it : m_state->m_objectMap)
{
if (it.second.m_page<=numPage) continue;
if (it.second.m_page<=numPage+10)
@@ -566,7 +566,7 @@
// page object
void WPS4Text::sendObjects(int page)
{
- for (auto it : m_state->m_objectMap)
+ for (auto const &it : m_state->m_objectMap)
{
auto const &obj=it.second;
if (obj.m_page<=0 || obj.m_id<0) continue;
@@ -1262,7 +1262,7 @@
char const *indexName = which ? "BTEC" : "BTEP";
char const *sIndexName = which ? "FDPC" : "FDPP";
- auto &nameMultiMap =getNameEntryMap();
+ auto const &nameMultiMap =getNameEntryMap();
auto pos = nameMultiMap.find(indexName);
if (pos == nameMultiMap.end()) return false;
@@ -2342,7 +2342,7 @@
auto pos = long(libwps::readU32(m_input));
actPos = m_input->tell();
- if (pos >= 0 && size > 0 && mainParser().checkFilePosition(pos+size))
+ if (pos >= 0 && size > 0 && (long)((unsigned long) pos+(unsigned long)
size)>pos && mainParser().checkFilePosition(pos+size))
{
obj.m_pos.setBegin(pos);
obj.m_pos.setLength(size);
@@ -2454,7 +2454,7 @@
typedef enum { T_CST=0, T_COMPLEX, T_UNKNOWN} Type;
//! constructor
- PLC(PLCType w= WPS4TextInternal::Unknown, Position p=P_UNKNOWN, Type
t=T_UNKNOWN, unsigned char tChar='\0', int f=1) :
+ explicit PLC(PLCType w= WPS4TextInternal::Unknown, Position
p=P_UNKNOWN, Type t=T_UNKNOWN, unsigned char tChar='\0', int f=1) :
m_type(w), m_pos(p), m_contentType(t), m_textChar(tChar),
m_cstFactor(f) {}
PLC(PLC const &orig)=default;
PLC(PLC &&orig)=default;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPS8.cpp new/libwps-0.4.14/src/lib/WPS8.cpp
--- old/libwps-0.4.13/src/lib/WPS8.cpp 2020-09-01 15:31:21.000000000 +0200
+++ new/libwps-0.4.14/src/lib/WPS8.cpp 2023-05-04 12:28:42.000000000 +0200
@@ -2097,7 +2097,7 @@
f << "SPELLING:";
if (vers != 6) f << "version = " << vers << ", ";
f << "list=[";
- for (auto it : listIds)
+ for (auto const &it : listIds)
{
uint32_t val = it.first;
f << "SP" << std::dec << it.second << "(" << (val&0xFF) << ":"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPS8Graph.cpp new/libwps-0.4.14/src/lib/WPS8Graph.cpp
--- old/libwps-0.4.13/src/lib/WPS8Graph.cpp 2020-09-01 15:31:21.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPS8Graph.cpp 2023-05-04 14:16:43.000000000
+0200
@@ -150,7 +150,7 @@
////////////////////////////////////////////////////////////
bool WPS8Graph::readStructures(RVNGInputStreamPtr const &input)
{
- auto &nameTable = m_mainParser.getNameEntryMap();
+ auto const &nameTable = m_mainParser.getNameEntryMap();
// contains a text and 8 borders cells?
auto pos = nameTable.lower_bound("BDR ");
@@ -293,7 +293,7 @@
#ifdef DEBUG
// check the border
- for (auto pos : m_state->m_borderMap)
+ for (auto const &pos : m_state->m_borderMap)
{
int id = pos.first;
bool parsed = pos.second.m_parsed;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPS8Table.cpp new/libwps-0.4.14/src/lib/WPS8Table.cpp
--- old/libwps-0.4.13/src/lib/WPS8Table.cpp 2018-07-31 12:42:12.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPS8Table.cpp 2023-05-03 09:56:09.000000000
+0200
@@ -318,7 +318,7 @@
{
m_state->m_tableMap.clear();
- auto &nameTable = m_mainParser.getNameEntryMap();
+ auto const &nameTable = m_mainParser.getNameEntryMap();
auto pos = nameTable.lower_bound("MCLD");
while (pos != nameTable.end())
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPS8Text.cpp new/libwps-0.4.14/src/lib/WPS8Text.cpp
--- old/libwps-0.4.13/src/lib/WPS8Text.cpp 2020-04-01 10:23:19.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPS8Text.cpp 2023-05-04 14:14:09.000000000
+0200
@@ -951,7 +951,7 @@
*/
bool WPS8Text::readStructures()
{
- auto &nameTable = getNameEntryMap();
+ auto const &nameTable = getNameEntryMap();
/* What is the total length of the text? */
auto pos = nameTable.lower_bound("TEXT");
if (nameTable.end() == pos)
@@ -1299,7 +1299,7 @@
nMap[¬e] = nSameNote;
}
- for (auto it : nMap)
+ for (auto const &it : nMap)
{
auto ¬es = const_cast<Notes &>(*it.first);
if (it.second != 0)
@@ -1946,7 +1946,7 @@
typedef enum { T_CST=0, T_STRUCT, T_COMPLEX, T_UNKNOWN} Type;
//! constructor
- PLC(PLCType w= WPS8TextInternal::Unknown, Position p=P_UNKNOWN, Type
t=T_UNKNOWN)
+ explicit PLC(PLCType w= WPS8TextInternal::Unknown, Position
p=P_UNKNOWN, Type t=T_UNKNOWN)
: m_type(w)
, m_pos(p)
, m_contentType(t) {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPS8TextStyle.cpp
new/libwps-0.4.14/src/lib/WPS8TextStyle.cpp
--- old/libwps-0.4.13/src/lib/WPS8TextStyle.cpp 2020-04-01 08:57:58.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPS8TextStyle.cpp 2023-05-03 09:59:51.000000000
+0200
@@ -177,7 +177,7 @@
////////////////////////////////////////////////////////////
bool WPS8TextStyle::readStructures()
{
- auto &nameTable = m_mainParser.getNameEntryMap();
+ auto const &nameTable = m_mainParser.getNameEntryMap();
/* read fonts table */
auto pos = nameTable.find("FONT");
@@ -896,8 +896,7 @@
if (nChild == 1) break;
auto numTabs = int(data.m_recursData[0].m_value);
- if (numTabs == 0 || nChild < 2 ||
- data.m_recursData[1].isBad() ||
data.m_recursData[1].id() != 0x28)
+ if (numTabs == 0 || data.m_recursData[1].isBad() ||
data.m_recursData[1].id() != 0x28)
{
WPS_DEBUG_MSG(("WPS8TextStyle::readParagraph
can not find second child\n"));
ok = false;
@@ -1163,7 +1162,6 @@
}
case 0:
{
- WPS8Struct::FileData mainData;
auto dataSz = int(libwps::readU16(m_input));
if (dataSz+2 != 2*size)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSContentListener.cpp
new/libwps-0.4.14/src/lib/WPSContentListener.cpp
--- old/libwps-0.4.13/src/lib/WPSContentListener.cpp 2020-04-01
08:57:58.000000000 +0200
+++ new/libwps-0.4.14/src/lib/WPSContentListener.cpp 2023-05-03
10:00:37.000000000 +0200
@@ -1141,7 +1141,7 @@
}
void WPSContentListener::insertPicture
-(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData,
std::string type,
+(WPSPosition const &pos, const librevenge::RVNGBinaryData &binaryData,
std::string const &type,
librevenge::RVNGPropertyList frameExtras)
{
if (!_openFrame(pos, frameExtras)) return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSContentListener.h
new/libwps-0.4.14/src/lib/WPSContentListener.h
--- old/libwps-0.4.13/src/lib/WPSContentListener.h 2017-08-08
09:36:24.000000000 +0200
+++ new/libwps-0.4.14/src/lib/WPSContentListener.h 2023-05-03
10:00:51.000000000 +0200
@@ -106,7 +106,7 @@
/** adds a picture in given position */
void insertPicture(WPSPosition const &pos, const
librevenge::RVNGBinaryData &binaryData,
- std::string type="image/pict",
+ std::string const &type="image/pict",
librevenge::RVNGPropertyList
frameExtras=librevenge::RVNGPropertyList());
/** adds an object with replacement picture in given position */
void insertObject(WPSPosition const &pos, const WPSEmbeddedObject &obj,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSDebug.cpp new/libwps-0.4.14/src/lib/WPSDebug.cpp
--- old/libwps-0.4.13/src/lib/WPSDebug.cpp 2018-07-30 16:19:00.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSDebug.cpp 2023-05-04 13:06:28.000000000
+0200
@@ -89,15 +89,15 @@
for (auto const ¬e : m_notes) map[note] = 0;
size_t i = 0;
- for (auto it : map)
+ for (auto const &it : map)
m_notes[i++] = it.first;
if (i != numNotes) m_notes.resize(i);
std::map<Vec2<long>,int,Vec2<long>::PosSizeLtX> sMap;
- for (auto s : m_skipZones) sMap[s] = 0;
+ for (auto const &s : m_skipZones) sMap[s] = 0;
i = 0;
- for (auto it : sMap)
+ for (auto const &it : sMap)
m_skipZones[i++] = it.first;
if (i < m_skipZones.size()) m_skipZones.resize(i);
}
@@ -188,7 +188,7 @@
////////////////////////////////////////////////////////////
namespace Debug
{
-bool dumpFile(librevenge::RVNGBinaryData &data, char const *fileName)
+bool dumpFile(librevenge::RVNGBinaryData const &data, char const *fileName)
{
if (!fileName) return false;
if (!data.size() || !data.getDataBuffer())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSDebug.h new/libwps-0.4.14/src/lib/WPSDebug.h
--- old/libwps-0.4.13/src/lib/WPSDebug.h 2017-11-14 11:56:11.000000000
+0100
+++ new/libwps-0.4.14/src/lib/WPSDebug.h 2023-05-03 10:01:46.000000000
+0200
@@ -45,7 +45,7 @@
//! a debug function to store in a datafile in the current directory
//! WARNING: this function erase the file fileName if it exists
//! (if debug_with_files is not defined, does nothing)
-bool dumpFile(librevenge::RVNGBinaryData &data, char const *fileName);
+bool dumpFile(librevenge::RVNGBinaryData const &data, char const *fileName);
//! returns a file name from an ole/... name
std::string flattenFileName(std::string const &name);
@@ -177,7 +177,7 @@
{
namespace Debug
{
-inline bool dumpFile(librevenge::RVNGBinaryData &, char const *)
+inline bool dumpFile(librevenge::RVNGBinaryData const &, char const *)
{
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSGraphicShape.h
new/libwps-0.4.14/src/lib/WPSGraphicShape.h
--- old/libwps-0.4.13/src/lib/WPSGraphicShape.h 2018-01-21 12:16:28.000000000
+0100
+++ new/libwps-0.4.14/src/lib/WPSGraphicShape.h 2023-05-02 09:28:04.000000000
+0200
@@ -42,7 +42,7 @@
struct PathData
{
//! constructor
- PathData(char type, Vec2f const &x=Vec2f(), Vec2f const
&x1=Vec2f(), Vec2f const &x2=Vec2f())
+ explicit PathData(char type, Vec2f const &x=Vec2f(), Vec2f
const &x1=Vec2f(), Vec2f const &x2=Vec2f())
: m_type(type)
, m_x(x)
, m_x1(x1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSGraphicStyle.cpp
new/libwps-0.4.14/src/lib/WPSGraphicStyle.cpp
--- old/libwps-0.4.13/src/lib/WPSGraphicStyle.cpp 2020-04-01
08:57:58.000000000 +0200
+++ new/libwps-0.4.14/src/lib/WPSGraphicStyle.cpp 2023-05-04
13:05:50.000000000 +0200
@@ -306,7 +306,7 @@
else
{
librevenge::RVNGPropertyListVector gradient;
- for (auto s : m_gradientStopList)
+ for (auto const &s : m_gradientStopList)
{
librevenge::RVNGPropertyList grad;
grad.insert("svg:offset", double(s.m_offset),
librevenge::RVNG_PERCENT);
@@ -469,7 +469,7 @@
if (m_gradientAngle > a.m_gradientAngle) return 1;
if (m_gradientStopList.size() < a.m_gradientStopList.size()) return 1;
if (m_gradientStopList.size() > a.m_gradientStopList.size()) return -1;
- for (auto c : m_gradientStopList)
+ for (auto const &c : m_gradientStopList)
{
diff = c.cmp(c);
if (diff) return diff;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSGraphicStyle.h
new/libwps-0.4.14/src/lib/WPSGraphicStyle.h
--- old/libwps-0.4.13/src/lib/WPSGraphicStyle.h 2020-09-01 15:31:21.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSGraphicStyle.h 2023-05-02 09:23:11.000000000
+0200
@@ -48,7 +48,7 @@
struct GradientStop
{
//! constructor
- GradientStop(float offset=0.0, WPSColor const
&col=WPSColor::black(), float opacity=1.0)
+ explicit GradientStop(float offset=0.0, WPSColor const
&col=WPSColor::black(), float opacity=1.0)
: m_offset(offset)
, m_color(col)
, m_opacity(opacity)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSList.cpp new/libwps-0.4.14/src/lib/WPSList.cpp
--- old/libwps-0.4.13/src/lib/WPSList.cpp 2017-08-08 10:56:32.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSList.cpp 2023-05-03 10:03:36.000000000
+0200
@@ -136,7 +136,7 @@
if (m_id == newId) return;
m_previousId = m_id;
m_id = newId;
- for (auto &level : m_levels)
+ for (auto const &level : m_levels)
level.resetSendToInterface();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSOLE1Parser.cpp
new/libwps-0.4.14/src/lib/WPSOLE1Parser.cpp
--- old/libwps-0.4.13/src/lib/WPSOLE1Parser.cpp 2018-08-02 10:19:11.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSOLE1Parser.cpp 2023-05-04 14:18:01.000000000
+0200
@@ -108,7 +108,7 @@
{
if (m_pictureIdToZoneIdListCreated) return;
m_pictureIdToZoneIdListCreated=true;
- for (auto it : m_idToZoneMap)
+ for (auto const &it : m_idToZoneMap)
{
if (it.second.m_names[1]=="Lotus:TOOLS:OEMString")
m_pictureIdToZoneIdList.push_back(it.first);
@@ -127,7 +127,7 @@
WPSOLE1Parser::~WPSOLE1Parser()
{
#ifdef DEBUG
- for (auto oIt : m_state->m_idToZoneMap)
+ for (auto const &oIt : m_state->m_idToZoneMap)
{
if (oIt.first>=0) checkIfParsed(oIt.second);
}
@@ -268,7 +268,7 @@
auto dSz=long(libwps::readU32(input));
if (dSz>0)
{
- if (dPtr<0 || dSz<0 || dPtr+dSz<0 ||
!stream.checkFilePosition(dPtr+dSz))
+ if (dPtr<0 || (long)((unsigned
long)dPtr+(unsigned long)dSz)<dPtr || !stream.checkFilePosition(dPtr+dSz))
{
WPS_DEBUG_MSG(("WPSOLE1Parser::createZones: oops some zone seems bad\n"));
f << "###";
@@ -346,7 +346,7 @@
std::shared_ptr<WPSStream> WPSOLE1Parser::getStreamForName(std::string const
&name) const
{
if (name.empty()) return std::shared_ptr<WPSStream>();
- for (auto oIt : m_state->m_idToZoneMap)
+ for (auto const &oIt : m_state->m_idToZoneMap)
{
if (oIt.second.m_names[1]==name)
return getStream(oIt.second);
@@ -481,7 +481,7 @@
bool WPSOLE1Parser::updateMetaData(librevenge::RVNGPropertyList &metadata,
libwps_tools_win::Font::Type encoding) const
{
- for (auto oIt : m_state->m_idToZoneMap)
+ for (auto const &oIt : m_state->m_idToZoneMap)
{
WPSOLE1ParserInternal::OLEZone const &zone=oIt.second;
if (zone.m_names[1]!="Doc Info Object")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSOLEObject.cpp
new/libwps-0.4.14/src/lib/WPSOLEObject.cpp
--- old/libwps-0.4.13/src/lib/WPSOLEObject.cpp 2018-07-31 13:19:25.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSOLEObject.cpp 2023-05-03 10:36:40.000000000
+0200
@@ -140,7 +140,6 @@
{
if (!stream) return false;
RVNGInputStreamPtr &input=stream->m_input;
- libwps::DebugFile &ascFile=stream->m_ascii;
libwps::DebugStream f;
if (endPos<=0) endPos=stream->m_eof;
@@ -179,6 +178,7 @@
}
if (!ok)
{
+ libwps::DebugFile &ascFile=stream->m_ascii;
f << "###";
input->seek(pos, librevenge::RVNG_SEEK_SET);
ascFile.addPos(pos);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSOLEStream.cpp
new/libwps-0.4.14/src/lib/WPSOLEStream.cpp
--- old/libwps-0.4.13/src/lib/WPSOLEStream.cpp 2020-04-01 08:57:58.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSOLEStream.cpp 2023-05-03 10:41:54.000000000
+0200
@@ -1290,7 +1290,7 @@
// read block one by one, seems fast enough
unsigned long bytes = 0;
- for (unsigned long i=0; (i < blocks.size()) & (bytes<maxlen); i++)
+ for (unsigned long i=0; (i < blocks.size()) && (bytes<maxlen); i++)
{
unsigned long block = blocks[i];
unsigned long pos = m_bbat.m_blockSize * (block+1);
@@ -1333,7 +1333,7 @@
// read small block one by one
unsigned long bytes = 0;
- for (unsigned long i=0; (i<blocks.size()) & (bytes<maxlen); i++)
+ for (unsigned long i=0; (i<blocks.size()) && (bytes<maxlen); i++)
{
unsigned long block = blocks[i];
@@ -1881,7 +1881,7 @@
RVNGInputStreamPtr getOLEInputStream(RVNGInputStreamPtr input)
{
RVNGInputStreamPtr ole=std::make_shared<WPSOLEStream>(input);
- if (!ole || !ole->isStructured())
+ if (!ole->isStructured())
return RVNGInputStreamPtr();
return ole;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSOLEStream.h
new/libwps-0.4.14/src/lib/WPSOLEStream.h
--- old/libwps-0.4.13/src/lib/WPSOLEStream.h 2017-10-12 21:20:08.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSOLEStream.h 2023-05-03 12:47:24.000000000
+0200
@@ -30,10 +30,7 @@
#include <string>
#include <vector>
-namespace librevenge
-{
-class RVNGInputStream;
-}
+#include "libwps_internal.h"
namespace libwps_OLE
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSParagraph.h
new/libwps-0.4.14/src/lib/WPSParagraph.h
--- old/libwps-0.4.13/src/lib/WPSParagraph.h 2018-07-30 21:27:32.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSParagraph.h 2023-05-02 09:21:26.000000000
+0200
@@ -37,7 +37,7 @@
struct WPSTabStop
{
enum Alignment { LEFT, RIGHT, CENTER, DECIMAL, BAR };
- WPSTabStop(double position = 0.0, Alignment alignment = LEFT, uint16_t
leaderCharacter='\0', uint8_t leaderNumSpaces = 0)
+ explicit WPSTabStop(double position = 0.0, Alignment alignment = LEFT,
uint16_t leaderCharacter='\0', uint8_t leaderNumSpaces = 0)
: m_position(position)
, m_alignment(alignment)
, m_leaderCharacter(leaderCharacter)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSPosition.h new/libwps-0.4.14/src/lib/WPSPosition.h
--- old/libwps-0.4.13/src/lib/WPSPosition.h 2020-09-01 15:31:21.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSPosition.h 2023-05-02 09:25:20.000000000
+0200
@@ -50,7 +50,7 @@
public:
//! constructor
- WPSPosition(Vec2f const &orig=Vec2f(), Vec2f const &sz=Vec2f(),
librevenge::RVNGUnit unt=librevenge::RVNG_INCH)
+ explicit WPSPosition(Vec2f const &orig=Vec2f(), Vec2f const
&sz=Vec2f(), librevenge::RVNGUnit unt=librevenge::RVNG_INCH)
: m_anchorTo(Char)
, m_anchorCellName()
, m_xPos(XLeft)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSSubDocument.h
new/libwps-0.4.14/src/lib/WPSSubDocument.h
--- old/libwps-0.4.13/src/lib/WPSSubDocument.h 2017-11-14 11:58:37.000000000
+0100
+++ new/libwps-0.4.14/src/lib/WPSSubDocument.h 2023-05-02 09:27:46.000000000
+0200
@@ -34,7 +34,7 @@
{
public:
/// constructor
- WPSSubDocument(RVNGInputStreamPtr const &input, int id=0);
+ explicit WPSSubDocument(RVNGInputStreamPtr const &input, int id=0);
/// destructor
virtual ~WPSSubDocument();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/WPSTable.cpp new/libwps-0.4.14/src/lib/WPSTable.cpp
--- old/libwps-0.4.13/src/lib/WPSTable.cpp 2018-07-30 15:43:13.000000000
+0200
+++ new/libwps-0.4.14/src/lib/WPSTable.cpp 2023-05-04 14:20:11.000000000
+0200
@@ -140,7 +140,7 @@
std::vector<float> positions;
float maxPosiblePos=0;
int actCell = -1;
- for (auto it : set)
+ for (auto const &it : set)
{
float pos = it.getPos(dim);
if (actCell < 0 || pos > maxPosiblePos)
@@ -156,15 +156,15 @@
}
std::vector<int> numYSet(listPositions[1].size(), 0);
std::vector<int> numYUnset(listPositions[1].size(), 0);
- for (auto &cell : m_cellsList)
+ for (auto const &cell : m_cellsList)
{
int cellPos[2], spanCell[2];
for (int dim = 0; dim < 2; dim++)
{
- float pt[2] = { cell->box().min()[dim],
- cell->box().max()[dim]
- };
- std::vector<float> &pos = listPositions[dim];
+ float const pt[2] = { cell->box().min()[dim],
+ cell->box().max()[dim]
+ };
+ std::vector<float> const &pos = listPositions[dim];
size_t numPos = pos.size();
size_t i = 0;
while (i+1 < numPos && pos[i+1] < pt[0])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libwps-0.4.13/src/lib/libwps_internal.h
new/libwps-0.4.14/src/lib/libwps_internal.h
--- old/libwps-0.4.13/src/lib/libwps_internal.h 2018-07-30 16:15:54.000000000
+0200
+++ new/libwps-0.4.14/src/lib/libwps_internal.h 2023-05-02 09:21:04.000000000
+0200
@@ -1084,8 +1084,8 @@
WPSEmbeddedObject(WPSEmbeddedObject &&) = default;
WPSEmbeddedObject &operator=(WPSEmbeddedObject &&) = default;
//! constructor
- WPSEmbeddedObject(librevenge::RVNGBinaryData const &binaryData,
- std::string const &type="image/pict") : m_size(),
m_dataList(), m_typeList(), m_sent(false)
+ explicit WPSEmbeddedObject(librevenge::RVNGBinaryData const
&binaryData, std::string const &type="image/pict") :
+ m_size(), m_dataList(), m_typeList(), m_sent(false)
{
add(binaryData, type);
}
