[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fuformatpaintbrush.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 140aa3e7db0a4731f02ab078a1326b2f4523a4c5
Author: Mark Hung
Date: Mon Dec 18 23:02:34 2017 +0800
tdf#114045 do not add undo action for table attributes
CreateUndoAttrObject() create extra undo steps when using
table paint brush on table cells. Undo action for each selected
cell is processed individually in
SvxTableController::ApplyFormatPaintBrush().
Change-Id: I65034a2b510898db26a7a8ddc4b5f3b742fd9b88
Reviewed-on: https://gerrit.libreoffice.org/46729
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index 88b12b4d4188..1d19e9cc9ebc 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -251,7 +251,8 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats,
bool bNoParagraphForma
{
OUString sLabel(
mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush"
) );
mpDoc->BegUndo( sLabel );
-mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(
*pObj, false, true ) );
+if (dynamic_cast< sdr::table::SdrTableObj* >( pObj ) == nullptr)
+mpDoc->AddUndo(
mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, false, true ) );
}
mpView->ApplyFormatPaintBrush( *mxItemSet.get(), bNoCharacterFormats,
bNoParagraphFormats );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdoedge.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 4173798ef73d3fc7da8c5b8fa575a36f05cd6f83
Author: Mark Hung
Date: Fri Dec 15 22:21:27 2017 +0800
tdf#51188: allow connector gluepoint undo
It should had overwritten the connector data when the
connector attach to a different glue point of the same
object. Letâs always overwrite it, though it waste a
little bit time.
Change-Id: Ib4cc4bf105e5ef17289e027dcddd0110f7297190
Reviewed-on: https://gerrit.libreoffice.org/46559
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 02ef84946b31..150fbc2b8811 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2449,11 +2449,17 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo)
aCon1=rEGeo.aCon1;
if (aCon1.pObj!=nullptr) aCon1.pObj->AddListener(*this);
}
+else
+aCon1=rEGeo.aCon1;
+
if (aCon2.pObj!=rEGeo.aCon2.pObj) {
if (aCon2.pObj!=nullptr) aCon2.pObj->RemoveListener(*this);
aCon2=rEGeo.aCon2;
if (aCon2.pObj!=nullptr) aCon2.pObj->AddListener(*this);
}
+else
+aCon2=rEGeo.aCon2;
+
*pEdgeTrack=*rEGeo.pEdgeTrack;
bEdgeTrackDirty=rEGeo.bEdgeTrackDirty;
bEdgeTrackUserDefined=rEGeo.bEdgeTrackUserDefined;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/tango
icon-themes/tango/res/lx03137.svg | 521 - icon-themes/tango/res/lx03140.svg | 659 - icon-themes/tango/res/odb_16_8.svg |1 icon-themes/tango/res/odb_32_8.svg |1 icon-themes/tango/res/odb_48_8.svg |1 icon-themes/tango/res/odf_16_8.png |binary icon-themes/tango/res/odf_16_8.svg |1 icon-themes/tango/res/odf_32_8.svg |1 icon-themes/tango/res/odf_48_8.svg |1 icon-themes/tango/res/odg_16_8.svg |1 icon-themes/tango/res/odg_32_8.svg |1 icon-themes/tango/res/odg_48_8.svg |1 icon-themes/tango/res/odm_16_8.svg |1 icon-themes/tango/res/odm_32_8.svg |1 icon-themes/tango/res/odm_48_8.svg |1 icon-themes/tango/res/odp_16_8.svg |1 icon-themes/tango/res/odp_32_8.svg |1 icon-themes/tango/res/odp_48_8.svg |1 icon-themes/tango/res/ods_16_8.svg |1 icon-themes/tango/res/ods_32_8.svg |1 icon-themes/tango/res/ods_48_8.svg |1 icon-themes/tango/res/odt_16_8.svg |1 icon-themes/tango/res/odt_32_8.svg |1 icon-themes/tango/res/odt_48_8.svg |1 24 files changed, 23 insertions(+), 1178 deletions(-) New commits: commit 66b8ed9709210fdf72934cc914cf9be054df41ad Author: andreas kainz Date: Sat Dec 30 01:46:02 2017 +0100 Tango icons: add svg files for the app icons in res Change-Id: I1fc91911844f86572b102fe0dfb8ccdcd42fce0d Reviewed-on: https://gerrit.libreoffice.org/47186 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/tango/res/lx03137.svg b/icon-themes/tango/res/lx03137.svg index 35c1f13f4904..cebf678910a6 100644 --- a/icon-themes/tango/res/lx03137.svg +++ b/icon-themes/tango/res/lx03137.svg @@ -1,520 +1 @@ - - -http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://web.resource.org/cc/"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="32" - height="32" - id="svg1306" - sodipodi:version="0.32" - inkscape:version="0.43+devel" - sodipodi:docbase="/home/jimmac/src/cvs/ooo/ooo_custom_images/industrial/res" - sodipodi:docname="lx03137.svg" - version="1.0" - inkscape:export-filename="/home/jimmac/src/cvs/ooo/ooo_custom_images/industrial/res/lx03137.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -image/svg+xml -http://purl.org/dc/dcmitype/StillImage"; /> -Generic Image - - -Jakub Steiner, Andreas Nilsson - - -http://www.gnome.org - - - - - -http://creativecommons.org/licenses/GPL/2.0/"; /> - - http://creativecommons.org/licenses/GPL/2.0/";> -http://web.resource.org/cc/Reproduction"; /> -http://web.resource.org/cc/Distribution"; /> -http://web.resource.org/cc/Notice"; /> -http://web.resource.org/cc/DerivativeWorks"; /> -http://web.resource.org/cc/ShareAlike"; /> -http://web.resource.org/cc/SourceCode"; /> - - - - - - - - - - - - - - - - - - - - - - - - +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/tango/res/lx03140.svg b/icon-themes/tango/res/lx03140.svg index 17518f0afe6c..bfa8d4f0bc67 100644 --- a/icon-themes/tango/res/lx03140.svg +++ b/icon-themes/tango/res/lx03140.svg @@ -1,658 +1 @@ - - -http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://web.resource.org/cc/"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="32" - height="32" - id="svg1306" - sodipodi:version="0.32" - inkscape:version="0.43+devel" - sodipodi:docbase="/home/jimmac/src/cvs/ooo/ooo_custom_images/industrial/res" - sodipodi:docname="lx03140.svg" - version="1.0" - inkscape:export-filename="/home/jimmac/src/cvs/ooo/ooo_custom_images/industrial/res/lx03140.png" - inkscape:export-xdpi="90" -
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/galaxy
icon-themes/galaxy/sfx2/res/logo.png |binary 1 file changed New commits: commit 7450ca17d956972650b09c0ec0e55d30b325b0c4 Author: Adolfo Jayme Barrientos Date: Sat Dec 23 12:11:23 2017 -0600 tdf#114665 Replace Start Center image Change-Id: Id0eadcbbaec9d189e92710f6bd4ed21d7da2870c Reviewed-on: https://gerrit.libreoffice.org/47023 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos (cherry picked from commit 253913f7fd6088617657e8fae6fa2274c08f0563) Reviewed-on: https://gerrit.libreoffice.org/47024 Reviewed-by: V Stuart Foote diff --git a/icon-themes/galaxy/sfx2/res/logo.png b/icon-themes/galaxy/sfx2/res/logo.png index 0678afb370b4..9ba6ac0d 100644 Binary files a/icon-themes/galaxy/sfx2/res/logo.png and b/icon-themes/galaxy/sfx2/res/logo.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
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 : 2017-31-12_02:17:41 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 https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: onlineupdate/source
onlineupdate/source/update/updater/updater.png |binary onlineupdate/source/update/updater/updater.svg | 650 - 2 files changed, 1 insertion(+), 649 deletions(-) New commits: commit 4ead201c578ce4cc17f65d2a97a591e112307a1a Author: andreas kainz Date: Sat Dec 30 23:56:13 2017 +0100 Updater Icon: Shrink svg file Change-Id: I8a45d4e620b1865dda28eb56a89207226eeac9b2 Reviewed-on: https://gerrit.libreoffice.org/47202 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/onlineupdate/source/update/updater/updater.png b/onlineupdate/source/update/updater/updater.png index 030dd60afc37..9d8c6df7789a 100644 Binary files a/onlineupdate/source/update/updater/updater.png and b/onlineupdate/source/update/updater/updater.png differ diff --git a/onlineupdate/source/update/updater/updater.svg b/onlineupdate/source/update/updater/updater.svg index 700294ab9621..6a3e88563283 100644 --- a/onlineupdate/source/update/updater/updater.svg +++ b/onlineupdate/source/update/updater/updater.svg @@ -1,649 +1 @@ - - - -http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="32" - height="32" - viewBox="0 0 32 32.01" - id="svg6548" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="updater.svg" - inkscape:export-filename="./updater.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -image/svg+xml -http://purl.org/dc/dcmitype/StillImage"; /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmltab.cxx | 29 +++--
sw/source/filter/html/swhtml.hxx | 13 +
2 files changed, 32 insertions(+), 10 deletions(-)
New commits:
commit 80fc91db239869b513f47866f45d8a43fb98fe16
Author: Caolán McNamara
Date: Sat Dec 30 16:46:47 2017 +
ofz#4753 Bad-cast, check all open tables
Change-Id: Ie6e2fb9f2e16e021a4719c418f52ce074c359904
Reviewed-on: https://gerrit.libreoffice.org/47199
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index dba4c5242f6c..50bcffa1554a 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1043,10 +1043,14 @@ HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable
*pTopTab,
for( sal_uInt16 i=0; ipush_back(o3tl::make_unique());
+
+m_pParser->RegisterHTMLTable(this);
}
HTMLTable::~HTMLTable()
{
+m_pParser->DeregisterHTMLTable(this);
+
delete m_pResizeDrawObjects;
delete m_pDrawObjectPrcWidths;
@@ -5256,16 +5260,21 @@ std::shared_ptr
SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
bool SwHTMLParser::CurrentTableInPaM(SwPaM& rPam) const
{
-if (!m_xTable)
-return false;
-const SwTable *pTable = m_xTable->GetSwTable();
-if (!pTable)
-return false;
-const SwTableNode* pTableNode = pTable->GetTableNode();
-if (!pTableNode)
-return false;
-SwNodeIndex aTableNodeIndex(*pTableNode);
-return (aTableNodeIndex >= rPam.Start()->nNode && aTableNodeIndex <=
rPam.End()->nNode);
+bool bRet = false;
+for (const auto& a : m_aTables)
+{
+const SwTable *pTable = a->GetSwTable();
+if (!pTable)
+continue;
+const SwTableNode* pTableNode = pTable->GetTableNode();
+if (!pTableNode)
+continue;
+SwNodeIndex aTableNodeIndex(*pTableNode);
+bRet = (aTableNodeIndex >= rPam.Start()->nNode && aTableNodeIndex <=
rPam.End()->nNode);
+if (bRet)
+break;
+}
+return bRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 7ba0e42ace00..0048278e0756 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -413,6 +413,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
SwNodeIndex *m_pSttNdIdx;
std::shared_ptr m_xTable; // current "outermost" table
+std::vector m_aTables;
SwHTMLForm_Impl *m_pFormImpl; // current form
SdrObject *m_pMarquee;// current marquee
SwField *m_pField; // current field
@@ -908,6 +909,18 @@ public:
virtual bool ParseMetaOptions( const
css::uno::Reference&,
SvKeyValueIterator* ) override;
+
+
+void RegisterHTMLTable(HTMLTable* pNew)
+{
+m_aTables.push_back(pNew);
+}
+
+void DeregisterHTMLTable(HTMLTable* pOld)
+{
+m_aTables.erase(std::remove(m_aTables.begin(), m_aTables.end(), pOld));
+}
+
};
struct SwPendingStackData
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/casttovoid.cxx |3 +++
compilerplugins/clang/test/casttovoid.cxx |1 +
2 files changed, 4 insertions(+)
New commits:
commit aab0322580c87864a4f0c0af1fed07282c8dccbb
Author: Stephan Bergmann
Date: Sat Dec 30 17:50:49 2017 +0100
Disable loplugin:casttovoid when --disable-assert-always-abort
...as finding uses of variables in arguments to expand-to-nothing assert
macros
is just not implemented not implemented.
Change-Id: Iacb3bd25d03eca13ac8ff3942f98e46dee3286b9
Reviewed-on: https://gerrit.libreoffice.org/47200
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/casttovoid.cxx
b/compilerplugins/clang/casttovoid.cxx
index e98388c8de7b..c67d7ca10870 100644
--- a/compilerplugins/clang/casttovoid.cxx
+++ b/compilerplugins/clang/casttovoid.cxx
@@ -336,6 +336,9 @@ private:
std::stack returnTypes_;
void run() override {
+if
(compiler.getPreprocessor().getIdentifierInfo("NDEBUG")->hasMacroDefinition()) {
+return;
+}
if (!TraverseDecl(compiler.getASTContext().getTranslationUnitDecl())) {
return;
}
diff --git a/compilerplugins/clang/test/casttovoid.cxx
b/compilerplugins/clang/test/casttovoid.cxx
index edd538690224..e82118259df9 100644
--- a/compilerplugins/clang/test/casttovoid.cxx
+++ b/compilerplugins/clang/test/casttovoid.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#undef NDEBUG
#include
#define CAST_N3 (void) n3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: 3 commits - src/lib
src/lib/MSPUBCollector.cpp|4 ++--
src/lib/ShapeGroupElement.cpp |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7f990c439d981dc280faac3db4c9f5805250bc2d
Author: David Tardon
Date: Sat Dec 30 21:07:59 2017 +0100
cid#1427014 pointer to local outside scope
Change-Id: Ifaa3eae63b2b2bebbd5337090426253bce26d600
diff --git a/src/lib/ShapeGroupElement.cpp b/src/lib/ShapeGroupElement.cpp
index 6dcead8..098b958 100644
--- a/src/lib/ShapeGroupElement.cpp
+++ b/src/lib/ShapeGroupElement.cpp
@@ -52,7 +52,7 @@ void ShapeGroupElement::visit(std::function<
(const ShapeInfo &info, const Coordinate
&relativeTo, const VectorTransformation2D &foldedTransform, bool isGroup, const
VectorTransformation2D &thisTransform)
> visitor, const Coordinate &relativeTo, const
VectorTransformation2D &parentFoldedTransform) const
{
- const ShapeInfo &info = m_shapeInfo.get_value_or(ShapeInfo());
+ const ShapeInfo info = m_shapeInfo.get_value_or(ShapeInfo());
Coordinate coord = info.m_coordinates.get_value_or(Coordinate());
double centerX = ((double)coord.m_xs + (double)coord.m_xe) / (2 *
EMUS_IN_INCH);
double centerY = ((double)coord.m_ys + (double)coord.m_ye) / (2 *
EMUS_IN_INCH);
commit f7833801bf3945262e26b110af50910ff0c1748d
Author: David Tardon
Date: Sat Dec 30 21:06:43 2017 +0100
cid#1267884 pointer to local outside scope
Change-Id: I67d4a55ecc4ee34da97807788191f05a20f195d1
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index b3f7664..723955a 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -720,7 +720,7 @@ std::function MSPUBCollector::paintShape(const
ShapeInfo &info, cons
{
if (info.m_clipPath.size() > 0)
{
- const Coordinate &coord = info.m_coordinates.get_value_or(Coordinate());
+ const Coordinate coord = info.m_coordinates.get_value_or(Coordinate());
double x, y, height, width;
x = coord.getXIn(m_width);
y = coord.getYIn(m_height);
commit 9b59da0d160353173d8fb7d15787974ae24eafa0
Author: David Tardon
Date: Sat Dec 30 21:04:11 2017 +0100
cid#1267883 pointer to local outside scope
Change-Id: I0e6f11b1071950d97080de26d8bc59ccf86606b1
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 95a463b..b3f7664 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -1341,7 +1341,7 @@ double MSPUBCollector::getSpecialValue(const ShapeInfo
&info, const CustomShape
}
if (arg == ASPECT_RATIO)
{
-const Coordinate &coord = info.m_coordinates.get_value_or(Coordinate());
+const Coordinate coord = info.m_coordinates.get_value_or(Coordinate());
return (double)coord.getWidthIn() / coord.getHeightIn();
}
if (arg & OTHER_CALC_VAL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source dbaccess/source include/dbaccess
cui/source/dialogs/screenshotannotationdlg.cxx |2 +-
dbaccess/source/core/dataaccess/ModelImpl.cxx |4 ++--
dbaccess/source/core/inc/ModelImpl.hxx |6 +++---
dbaccess/source/ui/control/RelationControl.cxx |2 +-
dbaccess/source/ui/dlg/TablesSingleDlg.cxx |2 +-
dbaccess/source/ui/inc/QueryViewSwitch.hxx |2 +-
dbaccess/source/ui/inc/RelationControl.hxx |2 +-
dbaccess/source/ui/inc/TableController.hxx |2 +-
dbaccess/source/ui/inc/TableWindow.hxx |6 +++---
dbaccess/source/ui/inc/TablesSingleDlg.hxx |2 +-
dbaccess/source/ui/inc/WCopyTable.hxx |2 +-
dbaccess/source/ui/inc/charsets.hxx |2 +-
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx|2 +-
dbaccess/source/ui/querydesign/QTableConnectionData.cxx |2 +-
dbaccess/source/ui/querydesign/QTableConnectionData.hxx |2 +-
dbaccess/source/ui/querydesign/QTableWindow.hxx |2 +-
dbaccess/source/ui/querydesign/QTableWindowData.hxx |2 +-
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx |2 +-
include/dbaccess/dbsubcomponentcontroller.hxx |2 +-
19 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit b7cb509d38fc7183bc6f695f3f6390a10dfd70c7
Author: Noel Grandin
Date: Sat Dec 30 14:36:04 2017 +0200
loplugin:passstuffbyref improved return in cui,dbaccess
Change-Id: I1193ff91ccd548acf9492d9701b6411a24d6763e
Reviewed-on: https://gerrit.libreoffice.org/47194
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx
b/cui/source/dialogs/screenshotannotationdlg.cxx
index f8f0377bd00b..b8010a8ef1be 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -116,7 +116,7 @@ public:
return maB2IRange;
}
-const OString GetHelpId() const { return mrControl.GetHelpId(); }
+OString const & GetHelpId() const { return mrControl.GetHelpId(); }
private:
const vcl::Window& mrControl;
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index ce9a76b6f5e9..ac9dadd77f9d 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -774,7 +774,7 @@ void ODatabaseModelImpl::commitRootStorage()
"ODatabaseModelImpl::commitRootStorage: could not commit the
storage!");
}
-Reference< XStorage > ODatabaseModelImpl::getOrCreateRootStorage()
+Reference< XStorage > const & ODatabaseModelImpl::getOrCreateRootStorage()
{
if ( !m_xDocumentStorage.is() )
{
@@ -1171,7 +1171,7 @@ namespace
}
}
-Reference< XStorage > ODatabaseModelImpl::impl_switchToStorage_throw( const
Reference< XStorage >& _rxNewRootStorage )
+Reference< XStorage > const & ODatabaseModelImpl::impl_switchToStorage_throw(
const Reference< XStorage >& _rxNewRootStorage )
{
// stop listening for modifications at the old storage
lcl_modifyListening( *this, m_xDocumentStorage.getTyped(),
m_pStorageModifyListener, Application::GetSolarMutex(), false );
diff --git a/dbaccess/source/core/inc/ModelImpl.hxx
b/dbaccess/source/core/inc/ModelImpl.hxx
index 880c11f81bb7..93c25b1c77b3 100644
--- a/dbaccess/source/core/inc/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -305,8 +305,8 @@ public:
void clearConnections();
-css::uno::Reference< css::embed::XStorage >
getOrCreateRootStorage();
-css::uno::Reference< css::embed::XStorage > getRootStorage() const {
return m_xDocumentStorage.getTyped(); }
+css::uno::Reference< css::embed::XStorage > const &
getOrCreateRootStorage();
+css::uno::Reference< css::embed::XStorage > const & getRootStorage() const
{ return m_xDocumentStorage.getTyped(); }
void resetRootStorage() { impl_switchToStorage_throw( nullptr ); }
/** returns the data source. If it doesn't exist it will be created
@@ -452,7 +452,7 @@ public:
private:
voidimpl_construct_nothrow();
-css::uno::Reference< css::embed::XStorage >
+css::uno::Reference< css::embed::XStorage > const &
impl_switchToStorage_throw( const css::uno::Reference<
css::embed::XStorage >& _rxNewRootStorage );
/** switches to the given document URL, which denotes the logical URL of
the document, not necessarily the
diff --git a/dbaccess/source/ui/control/RelationControl.cxx
b/dbaccess/source/ui/control/RelationControl.cxx
index 1129015ac905..6f0465d45410 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -682,7 +682,7 @@ namespace dbaui
m_pRC_Tables->SaveModified();
}
-TTableWindowData::value_type OTableListBoxControl::getReferencingTable()
const
+TTableWindowData::value_t
[Libreoffice-commits] core.git: ios/LibreOfficeLight
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit e33dbe2c8383cb55748753c68d551050a5c424ff Author: jan Iversen Date: Sat Dec 30 19:43:23 2017 +0100 iOS, make LIBRARY path relative. Patch based on suggestion from jon Nermut. Change-Id: I91244ad839b2a7f532b45c0ca8b37228c2ff27b1 diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index 5f7b1797d843..2aec9e56f8a1 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -357,7 +357,7 @@ HEADER_SEARCH_PATHS = "$(inherited)"; IPHONEOS_DEPLOYMENT_TARGET = 11.1; LD_MAP_FILE_PATH = ""; - LIBRARY_SEARCH_PATHS = /Users/jani/LO/core/ios/generated/; + LIBRARY_SEARCH_PATHS = $PROJECT_DIR/../generated/; MACH_O_TYPE = mh_execute; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -420,7 +420,7 @@ HEADER_SEARCH_PATHS = "$(inherited)"; IPHONEOS_DEPLOYMENT_TARGET = 11.1; LD_MAP_FILE_PATH = ""; - LIBRARY_SEARCH_PATHS = /Users/jani/LO/core/ios/generated/; + LIBRARY_SEARCH_PATHS = $PROJECT_DIR/../generated/; MACH_O_TYPE = mh_execute; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; @@ -547,7 +547,7 @@ HEADER_SEARCH_PATHS = "$(inherited)"; IPHONEOS_DEPLOYMENT_TARGET = 11.1; LD_MAP_FILE_PATH = ""; - LIBRARY_SEARCH_PATHS = /Users/jani/LO/core/ios/generated/; + LIBRARY_SEARCH_PATHS = $PROJECT_DIR/../generated/; MACH_O_TYPE = mh_execute; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/conv
src/conv/svg/Makefile.am |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 530c84c1d8bd8cdc9238c23a0c4e68cee7eac53d Author: David Tardon Date: Sat Dec 30 19:37:31 2017 +0100 fix copypasta Change-Id: Ibdcda4d3bce06239eeaa22f240081707b17c18d3 diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am index 2127256..bfd2121 100644 --- a/src/conv/svg/Makefile.am +++ b/src/conv/svg/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = pub2xhtml AM_CXXFLAGS = -I$(top_srcdir)/inc \ $(REVENGE_CFLAGS) \ - $(REVENGE_STREAM_LIBS) \ + $(REVENGE_STREAM_CFLAGS) \ $(DEBUG_CXXFLAGS) pub2xhtml_DEPENDENCIES = @PUB2XHTML_WIN32_RESOURCE@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/conv
src/conv/raw/Makefile.am |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9f28d5f585cc03bc1dcdffad978dd7ce903f3ff1 Author: David Tardon Date: Sat Dec 30 19:36:20 2017 +0100 fix copypasta Change-Id: Ibada0e5c6d4ba0825b5e9b66cc1391073b01df51 diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am index 5fbafa6..5f2a7f5 100644 --- a/src/conv/raw/Makefile.am +++ b/src/conv/raw/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = pub2raw AM_CXXFLAGS = -I$(top_srcdir)/inc \ $(REVENGE_GENERATORS_CFLAGS) \ $(REVENGE_CFLAGS) \ - $(REVENGE_STREAM_LIBS) \ + $(REVENGE_STREAM_CFLAGS) \ $(DEBUG_CXXFLAGS) pub2raw_DEPENDENCIES = @PUB2RAW_WIN32_RESOURCE@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: configure.ac NEWS
NEWS | 16 configure.ac |2 +- 2 files changed, 17 insertions(+), 1 deletion(-) New commits: commit 5cf1de8dd9894922023798ecf735ed9c90d4fe68 Author: David Tardon Date: Sat Dec 30 18:24:57 2017 +0100 prepare for a release Change-Id: If5a278612971ea0926355edf85aac76b625e8396 diff --git a/NEWS b/NEWS index 2202ba2..2d7e214 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,19 @@ +libmspub 0.1.3 + +- Workaround a build error on some 32-bit systems. +- Parse table row and column sizes. (tdf#89061) +- Fix various problems when parsing broken files, found with the help of + american-fuzzy-lop and oss-fuzz. +- Make the output of pub2foo --help more compatible with help2man. +- Extract more metadata from documents. +- Require C++11 for build. +- Drop outdated MSVC project files. +- Handle table cells containing multiple paragraphs correctly. (tdf#89393) +- Parse more text formatting attributes: all underline types, small + caps, all caps, outline, emboss, engrave, shadow. +- Parse text language. +- Various minor changes and improvements. + libmspub 0.1.2 - Check arguments of public functions. Passing NULL no longer causes diff --git a/configure.ac b/configure.ac index 6c5a2be..af20a5e 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.65]) # m4_define([libmspub_version_major],[0]) m4_define([libmspub_version_minor],[1]) -m4_define([libmspub_version_micro],[2]) +m4_define([libmspub_version_micro],[3]) m4_define([libmspub_version],[libmspub_version_major.libmspub_version_minor.libmspub_version_micro]) # = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/89bd93fc1a5277f4e7ffcea74d4087b63736ae97/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 26/81561d8789c51a1e1aeb10d1c607d63558566e
26/81561d8789c51a1e1aeb10d1c607d63558566e |1 + 1 file changed, 1 insertion(+) New commits: commit 0979c44d19a38b2c59ab38f9e57ae8fb8fd52f61 Author: Caolán McNamara Date: Sat Dec 30 16:47:52 2017 + Notes added by 'git notes add' diff --git a/26/81561d8789c51a1e1aeb10d1c607d63558566e b/26/81561d8789c51a1e1aeb10d1c607d63558566e new file mode 100644 index ..8e5c182e7789 --- /dev/null +++ b/26/81561d8789c51a1e1aeb10d1c607d63558566e @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/export/drawingml.cxx| 35 +++
sd/qa/unit/export-tests-ooxml2.cxx |4 ++--
2 files changed, 33 insertions(+), 6 deletions(-)
New commits:
commit 87e353874a1c52f8e42946a59d2e2079eb28f7fe
Author: Paul Trojahn
Date: Thu Dec 21 22:17:22 2017 +0100
tdf#90626 PPTX: Fix image bullet position in PPT
Scaled bullet points aren't centered in PPT, so padding needs to be added
to get them to the correct position.
Change-Id: I61509dd43ef9cd697dcbc3cabbf58a21d625ddec
Reviewed-on: https://gerrit.libreoffice.org/46994
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f0f9bee96125..62688e9b8d42 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1978,15 +1978,42 @@ void DrawingML::WriteParagraphNumbering(const
Reference< XPropertySet >& rXPropS
if( !aGraphicURL.isEmpty() )
{
-OUString sRelId = WriteImage( aGraphicURL );
-
long nFirstCharHeightMm = TransformMetric(fFirstCharHeight * 100.f,
FUNIT_POINT, FUNIT_MM);
float fBulletSizeRel = aGraphicSize.Height /
static_cast(nFirstCharHeightMm) / OOX_BULLET_LIST_SCALE_FACTOR;
+OUString sRelationId;
+
+if(fBulletSizeRel < 1.f)
+{
+// Add padding to get the bullet point centered in PPT
+Graphic aGraphic;
+if (lcl_URLToGraphic(aGraphicURL, aGraphic))
+{
+Size aDestSize(64, 64);
+float fBulletSizeRelX = fBulletSizeRel / aGraphicSize.Height *
aGraphicSize.Width;
+long nPaddingX = std::max(static_cast(0),
std::lround((aDestSize.Width() - fBulletSizeRelX * aDestSize.Width()) / 2.f));
+long nPaddingY = std::lround((aDestSize.Height() -
fBulletSizeRel * aDestSize.Height()) / 2.f);
+tools::Rectangle aDestRect(nPaddingX, nPaddingY,
aDestSize.Width() - nPaddingX, aDestSize.Height() - nPaddingY);
+
+AlphaMask aMask(aDestSize);
+aMask.Erase(255);
+BitmapEx aSourceBitmap(aGraphic.GetBitmapEx());
+aSourceBitmap.Scale(aDestRect.GetSize());
+tools::Rectangle aSourceRect(Point(0, 0), aDestRect.GetSize());
+BitmapEx aDestBitmap(Bitmap(aDestSize, 24), aMask);
+aDestBitmap.CopyPixel(aDestRect, aSourceRect, &aSourceBitmap);
+Graphic aDestGraphic(aDestBitmap);
+sRelationId = WriteImage(aDestGraphic);
+fBulletSizeRel = 1.f;
+}
+}
+else
+sRelationId = WriteImage(aGraphicURL);
+
mpFS->singleElementNS( XML_a, XML_buSzPct,
- XML_val, IS( std::max(
static_cast(25000), std::min( static_cast(40),
static_cast( std::lround( 10.f * fBulletSizeRel ) ) ) ) ), FSEND
);
+ XML_val, IS(
std::min(static_cast(std::lround(10.f * fBulletSizeRel)),
static_cast(40))), FSEND);
mpFS->startElementNS( XML_a, XML_buBlip, FSEND );
-mpFS->singleElementNS( XML_a, XML_blip, FSNS( XML_r, XML_embed ), USS(
sRelId ), FSEND );
+mpFS->singleElementNS( XML_a, XML_blip, FSNS( XML_r, XML_embed ), USS(
sRelationId ), FSEND );
mpFS->endElementNS( XML_a, XML_buBlip );
}
else
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index a3d477d2d1f6..1a6d3b1e4adc 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1332,9 +1332,9 @@ void SdOOXMLExportTest2::testTdf90626()
xDocShRef->DoClose();
xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
-assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[1]/a:pPr/a:buSzPct", "val",
"46986");
+assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[1]/a:pPr/a:buSzPct", "val",
"10");
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[2]/a:pPr/a:buSzPct", "val",
"150568");
-assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[3]/a:pPr/a:buSzPct", "val",
"46986");
+assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[3]/a:pPr/a:buSzPct", "val",
"10");
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[4]/a:pPr/a:buSzPct", "val",
"150568");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 6246d44680ec9b4cc132614e664c4cb88095b09e Author: Tamás Zolnai Date: Sat Dec 30 13:49:18 2017 +0100 Enable test for exporting text color of activeX checkbox control It's fixed in: 05f72a2a39fccb58f59b99ebfd3e7d0d8ff354e9 Change-Id: I5f82b1bd5dc0b2155398e4fc74da21f1a96e1d56 Reviewed-on: https://gerrit.libreoffice.org/47193 Tested-by: Jenkins Reviewed-by: Tamás Zolnai diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 86785a00bff0..50e1a47d6beb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -933,8 +933,7 @@ DECLARE_OOXMLEXPORT_TEST( testActiveXCheckbox, "activex_checkbox.docx" ) CPPUNIT_ASSERT_EQUAL( sal_Int32( 0x316AC5 ), getProperty(xPropertySet, "BackgroundColor") ); // Check Text color (active border system color) -if(!mbExported) // Bug: text color is not exported -CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD4D0C8), getProperty(xPropertySet, "TextColor")); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD4D0C8), getProperty(xPropertySet, "TextColor")); // Check state of the checkbox CPPUNIT_ASSERT_EQUAL(sal_Int16(1), getProperty(xPropertySet, "State")); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/search/textsearch.cxx |8
i18npool/source/search/textsearch.hxx |1 +
2 files changed, 9 insertions(+)
New commits:
commit 07a2d583ae5d7b6f983c4401eef92a052b15af02
Author: Caolán McNamara
Date: Wed Dec 13 11:52:39 2017 +
crash in sc, make TextSearch thread safe
with tdf95460-1.odt
Change-Id: Ic4e643b8e6ae6235fb79ed458f891afd4a4b73fc
Reviewed-on: https://gerrit.libreoffice.org/46380
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/i18npool/source/search/textsearch.cxx
b/i18npool/source/search/textsearch.cxx
index 67eded1643ab..6f51d3b2cbf0 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -133,6 +133,8 @@ TextSearch::~TextSearch()
void TextSearch::setOptions2( const SearchOptions2& rOptions )
{
+osl::MutexGuard g(m_aMutex);
+
aSrchPara = rOptions;
delete pRegexMatcher;
@@ -263,6 +265,8 @@ void TextSearch::setOptions2( const SearchOptions2&
rOptions )
void TextSearch::setOptions( const SearchOptions& rOptions )
{
+osl::MutexGuard g(m_aMutex);
+
sal_Int16 nAlgorithmType2;
switch (rOptions.algorithmType)
{
@@ -313,6 +317,8 @@ bool TextSearch::isCellStart(const OUString& searchStr,
sal_Int32 nPos)
SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32
startPos, sal_Int32 endPos )
{
+osl::MutexGuard g(m_aMutex);
+
SearchResult sres;
OUString in_str(searchStr);
@@ -428,6 +434,8 @@ SearchResult TextSearch::searchForward( const OUString&
searchStr, sal_Int32 sta
SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32
startPos, sal_Int32 endPos )
{
+osl::MutexGuard g(m_aMutex);
+
SearchResult sres;
OUString in_str(searchStr);
diff --git a/i18npool/source/search/textsearch.hxx
b/i18npool/source/search/textsearch.hxx
index 6f9c3d189cf4..05c158d302a1 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -43,6 +43,7 @@ class TextSearch: public cppu::WeakImplHelper
css::lang::XServiceInfo
>
{
+osl::Mutex m_aMutex;
css::uno::Reference < css::uno::XComponentContext > m_xContext;
css::util::SearchOptions2 aSrchPara;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8graf.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 9f8dd17b1e6ab5d5d07b61e0f85edea233f03d71
Author: Caolán McNamara
Date: Sat Dec 30 13:57:38 2017 +
ofz#4837 Null-dereference READ
Change-Id: I7e4cb934aeac32fa1170beb116e4600b5eb9389a
Reviewed-on: https://gerrit.libreoffice.org/47197
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 90110354b647..34298b2cbfeb 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -559,6 +559,15 @@ public:
}
};
+namespace
+{
+bool IsValidSel(const EditEngine& rEngine, const ESelection& rSel)
+{
+const auto nParaCount = rEngine.GetParagraphCount();
+return rSel.nStartPara < nParaCount && rSel.nEndPara < nParaCount;
+}
+}
+
// InsertAttrsAsDrawingAttrs() sets attributes between StartCp and EndCp.
// Style attributes are set as hard, paragraph and character attributes.
void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp,
@@ -733,6 +742,8 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP
nStartCp, WW8_CP nEndCp,
{
ESelection aSel(GetESelection(*m_pDrawEditEngine,
aIter->GetStartPos()-nStartCp,
aIter->GetEndPos()-nStartCp));
+if (!IsValidSel(*m_pDrawEditEngine, aSel))
+continue;
OUString aString(m_pDrawEditEngine->GetText(aSel));
const sal_Int32 nOrigLen = aString.getLength();
WW8_CP nDummy(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBBlockID.h |1 +
src/lib/MSPUBCollector.cpp | 24
src/lib/MSPUBParser.cpp|3 +++
src/lib/MSPUBTypes.h |2 ++
4 files changed, 30 insertions(+)
New commits:
commit 99e33fec6e9372840dc0c2e6d29a2b08a311e00a
Author: David Tardon
Date: Sat Dec 30 16:39:25 2017 +0100
parse locale information
Change-Id: If47fadac1a24c6bebb73f530d9623e6b950d7a3f
diff --git a/src/lib/MSPUBBlockID.h b/src/lib/MSPUBBlockID.h
index bf92664..38f6139 100644
--- a/src/lib/MSPUBBlockID.h
+++ b/src/lib/MSPUBBlockID.h
@@ -37,6 +37,7 @@ enum MSPUBBlockID // Don't be alarmed by multiple elements
with the same value;
UNDERLINE_ID = 0x1E,
OUTLINE_ID = 0x4,
SHADOW_ID = 0x5,
+ LOCALE_ID = 0x12,
SMALL_CAPS_ID = 0x13,
ALL_CAPS_ID = 0x14,
EMBOSS_ID = 0x16,
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 24c8d08..95a463b 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -14,6 +14,7 @@
#include
#include
+#include
#include "Coordinate.h"
#include "MSPUBConstants.h"
@@ -314,6 +315,25 @@ void fillUnderline(librevenge::RVNGPropertyList &props,
const Underline underlin
}
}
+void fillLocale(librevenge::RVNGPropertyList &props, const unsigned lcid)
+{
+ char locale[ULOC_FULLNAME_CAPACITY];
+ UErrorCode status = U_ZERO_ERROR;
+ uloc_getLocaleForLCID(lcid, locale, ULOC_FULLNAME_CAPACITY, &status);
+ if (!U_SUCCESS(status))
+return;
+ char component[ULOC_FULLNAME_CAPACITY];
+ int32_t len = uloc_getLanguage(locale, component, ULOC_FULLNAME_CAPACITY,
&status);
+ if (U_SUCCESS(status) && len > 0)
+props.insert("fo:language", component);
+ len = uloc_getCountry(locale, component, ULOC_FULLNAME_CAPACITY, &status);
+ if (U_SUCCESS(status) && len > 0)
+props.insert("fo:country", component);
+ len = uloc_getScript(locale, component, ULOC_FULLNAME_CAPACITY, &status);
+ if (U_SUCCESS(status) && len > 0)
+props.insert("fo:script", component);
+}
+
} // anonymous namespace
void MSPUBCollector::collectMetaData(const librevenge::RVNGPropertyList
&metaData)
@@ -1680,6 +1700,10 @@ librevenge::RVNGPropertyList
MSPUBCollector::getCharStyleProps(const CharacterSt
default:
break;
}
+ if (style.lcid)
+fillLocale(ret, get(style.lcid));
+ else if (defaultCharStyle.lcid)
+fillLocale(ret, get(defaultCharStyle.lcid));
return ret;
}
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index b6d6bbb..8a307eb 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1465,6 +1465,9 @@ CharacterStyle
MSPUBParser::getCharacterStyle(librevenge::RVNGInputStream *input
case SCALING_ID:
style.textScale = double(info.data) / 10;
break;
+case LOCALE_ID:
+ style.lcid = info.data;
+ break;
default:
break;
}
diff --git a/src/lib/MSPUBTypes.h b/src/lib/MSPUBTypes.h
index ec1aa5c..04219d0 100644
--- a/src/lib/MSPUBTypes.h
+++ b/src/lib/MSPUBTypes.h
@@ -121,6 +121,7 @@ struct CharacterStyle
, emboss(false)
, engrave(false)
, textScale()
+, lcid()
{
}
boost::optional underline;
@@ -137,6 +138,7 @@ struct CharacterStyle
bool emboss;
bool engrave;
boost::optional textScale;
+ boost::optional lcid;
};
enum LineSpacingType
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/framework
default_images/framework/res/backing.png |binary default_images/framework/res/backing_hc.png |binary default_images/framework/res/backing_right.png|binary default_images/framework/res/backing_right_hc.png |binary default_images/framework/res/backing_rtl_left.png |binary default_images/framework/res/backing_rtl_left_hc.png |binary default_images/framework/res/backing_rtl_right.png|binary default_images/framework/res/backing_rtl_right_hc.png |binary default_images/framework/res/backing_space.png|binary default_images/framework/res/backing_space_hc.png |binary default_images/framework/res/beta/backing.png |binary default_images/framework/res/beta/backing_hc.png |binary default_images/framework/res/beta/backing_rtl_left.png|binary default_images/framework/res/beta/backing_rtl_left_hc.png |binary 14 files changed New commits: commit 2681561d8789c51a1e1aeb10d1c607d63558566e Author: Matthias Seidel Date: Sat Dec 30 14:53:03 2017 + #i127158# - AOO logo repositioned to align with the icons (suggested by mroe) - Added ASF logo on the right side - Moved all graphics up a bit - Added a horizontal line to separate the logos from the icons (Includes versions for "High Contrast", "Right to Left" and "Beta Builds") diff --git a/default_images/framework/res/backing.png b/default_images/framework/res/backing.png old mode 100755 new mode 100644 index 8a7499d0e932..47825a6279f9 Binary files a/default_images/framework/res/backing.png and b/default_images/framework/res/backing.png differ diff --git a/default_images/framework/res/backing_hc.png b/default_images/framework/res/backing_hc.png old mode 100755 new mode 100644 index f109b817f33c..ca00d3dc978d Binary files a/default_images/framework/res/backing_hc.png and b/default_images/framework/res/backing_hc.png differ diff --git a/default_images/framework/res/backing_right.png b/default_images/framework/res/backing_right.png old mode 100755 new mode 100644 index 245645d4bdd5..ec79fc65a2d7 Binary files a/default_images/framework/res/backing_right.png and b/default_images/framework/res/backing_right.png differ diff --git a/default_images/framework/res/backing_right_hc.png b/default_images/framework/res/backing_right_hc.png old mode 100755 new mode 100644 index 8f0300f0bd5d..5a78fc6f0bb2 Binary files a/default_images/framework/res/backing_right_hc.png and b/default_images/framework/res/backing_right_hc.png differ diff --git a/default_images/framework/res/backing_rtl_left.png b/default_images/framework/res/backing_rtl_left.png old mode 100755 new mode 100644 index 1441fef5e901..cfc501b00af0 Binary files a/default_images/framework/res/backing_rtl_left.png and b/default_images/framework/res/backing_rtl_left.png differ diff --git a/default_images/framework/res/backing_rtl_left_hc.png b/default_images/framework/res/backing_rtl_left_hc.png old mode 100755 new mode 100644 index 7387f3851d7a..5cbcbd3cfc6b Binary files a/default_images/framework/res/backing_rtl_left_hc.png and b/default_images/framework/res/backing_rtl_left_hc.png differ diff --git a/default_images/framework/res/backing_rtl_right.png b/default_images/framework/res/backing_rtl_right.png old mode 100755 new mode 100644 index 245645d4bdd5..d4cd4834f1a2 Binary files a/default_images/framework/res/backing_rtl_right.png and b/default_images/framework/res/backing_rtl_right.png differ diff --git a/default_images/framework/res/backing_rtl_right_hc.png b/default_images/framework/res/backing_rtl_right_hc.png old mode 100755 new mode 100644 index 8f0300f0bd5d..93206351cc58 Binary files a/default_images/framework/res/backing_rtl_right_hc.png and b/default_images/framework/res/backing_rtl_right_hc.png differ diff --git a/default_images/framework/res/backing_space.png b/default_images/framework/res/backing_space.png index 119b4c1cc896..3f9cd0c1d0d9 100644 Binary files a/default_images/framework/res/backing_space.png and b/default_images/framework/res/backing_space.png differ diff --git a/default_images/framework/res/backing_space_hc.png b/default_images/framework/res/backing_space_hc.png index 4127b5485eac..1df054dd00a1 100644 Binary files a/default_images/framework/res/backing_space_hc.png and b/default_images/framework/res/backing_space_hc.png differ diff --git a/default_images/framework/res/beta/backing.png b/default_images/framework/res/beta/backing.png index 069dacebeacd..20f219e0fc64 100755 Binary files a/default_images/framework/res/beta/backing.png and b/default_images/framework/res/beta/backing.png differ diff --git a/default_images/framework/res/beta/backing_hc.png b/default_images/framework/res/beta/backing_hc.png index f9c2561084cd..b733ab306e98 100755 Binary files a/default_images/framework/res/beta/backing_hc.png and b/default_images/framework/res/beta/backing_hc.png differ diff --git a/default_images/framework/res/beta/backi
[Libreoffice-commits] core.git: external/cairo
external/cairo/cairo/cairo.GL_RGBA.patch | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 13763bda39bb267382c4824eb29e9575d6a4b811
Author: Caolán McNamara
Date: Sat Dec 30 14:11:12 2017 +
update android rgba cairo patch to apply again
Change-Id: Iaee918439f8472bab7fab2cf545ac2e420d614ab
diff --git a/external/cairo/cairo/cairo.GL_RGBA.patch
b/external/cairo/cairo/cairo.GL_RGBA.patch
index 15850d244166..be5a96389e67 100644
--- a/external/cairo/cairo/cairo.GL_RGBA.patch
+++ b/external/cairo/cairo/cairo.GL_RGBA.patch
@@ -1,6 +1,6 @@
--- misc/cairo-1.10.2/src/cairo-image-surface.c
+++ misc/cairo-1.10.2/src/cairo-image-surface.c
-@@ -99,11 +99,11 @@
+@@ -92,11 +92,11 @@
_cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
{
switch (pixman_format) {
@@ -14,16 +14,16 @@
return CAIRO_FORMAT_RGB24;
case PIXMAN_a8:
return CAIRO_FORMAT_A8;
-@@ -109,7 +109,7 @@
+@@ -112,7 +112,7 @@
#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,27,2)
case PIXMAN_a8r8g8b8_sRGB:
#endif
--case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: case PIXMAN_r8g8b8:
-+case PIXMAN_a8r8g8b8: case PIXMAN_x8r8g8b8: case PIXMAN_r8g8b8: //tweaked
+- case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8:
++case PIXMAN_a8r8g8b8: case PIXMAN_x8r8g8b8: //tweaked
case PIXMAN_b8g8r8: case PIXMAN_b5g6r5:
case PIXMAN_a1r5g5b5: case PIXMAN_x1r5g5b5: case PIXMAN_a1b5g5r5:
case PIXMAN_x1b5g5r5: case PIXMAN_a4r4g4b4: case PIXMAN_x4r4g4b4:
-@@ -297,7 +297,7 @@
+@@ -314,7 +314,7 @@
ret = PIXMAN_a8;
break;
case CAIRO_FORMAT_RGB24:
@@ -32,7 +32,7 @@
break;
case CAIRO_FORMAT_RGB30:
ret = PIXMAN_x2r10g10b10;
-@@ -305,7 +305,7 @@
+@@ -328,7 +328,7 @@
case CAIRO_FORMAT_ARGB32:
case CAIRO_FORMAT_INVALID:
default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: 2 commits - src/lib
src/lib/MSPUBBlockID.h |7 +++
src/lib/MSPUBCollector.cpp | 102 ++---
src/lib/MSPUBParser.cpp| 93 ++---
src/lib/MSPUBParser97.cpp | 24 +-
src/lib/MSPUBTypes.h | 44 ---
5 files changed, 241 insertions(+), 29 deletions(-)
New commits:
commit df9a3b0cc2d2af14f2816477f2ca2e65320234a4
Author: David Tardon
Date: Sat Dec 30 14:26:06 2017 +0100
fix parsing of bold and italic in mspub 2002 docs
Change-Id: I3945cdf240cd23c593d413d7d964d33e288d873b
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 40cb694..b6d6bbb 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1476,8 +1476,12 @@ CharacterStyle
MSPUBParser::getCharacterStyle(librevenge::RVNGInputStream *input
{
dTextSize = textSize1 * (double(POINTS_IN_INCH) / EMUS_IN_INCH);
}
- style.italic = seenItalic1 && seenItalic2;
- style.bold = seenBold1 && seenBold2;
+ // FIXME: What's this with foo1 && foo2? I've only seen foo1 in 2k2
+ // files and either just foo1 or foo1+foo2 in 2k7 files...
+ style.italic = seenItalic1; // && seenItalic2;
+ style.bold = seenBold1; // && seenBold2;
+ (void) seenItalic2;
+ (void) seenBold2;
style.textSizeInPt = dTextSize;
style.colorIndex = getColorIndexByQuillEntry(colorIndex);
style.fontIndex = fontIndex;
commit 45832739afa9280d180d50b34041c4930eb7fd24
Author: David Tardon
Date: Sat Dec 30 13:31:52 2017 +0100
parse more text formatting properties
Change-Id: I25aef81ba5b3beaa57726d85b57c7acab79198d1
diff --git a/src/lib/MSPUBBlockID.h b/src/lib/MSPUBBlockID.h
index 4420e05..bf92664 100644
--- a/src/lib/MSPUBBlockID.h
+++ b/src/lib/MSPUBBlockID.h
@@ -35,6 +35,13 @@ enum MSPUBBlockID // Don't be alarmed by multiple elements
with the same value;
ITALIC_1_ID = 0x03,
ITALIC_2_ID = 0x38,
UNDERLINE_ID = 0x1E,
+ OUTLINE_ID = 0x4,
+ SHADOW_ID = 0x5,
+ SMALL_CAPS_ID = 0x13,
+ ALL_CAPS_ID = 0x14,
+ EMBOSS_ID = 0x16,
+ ENGRAVE_ID = 0x17,
+ SCALING_ID = 0x20,
TEXT_SIZE_1_ID = 0x0C,
TEXT_SIZE_2_ID = 0x39,
COLOR_INDEX_CONTAINER_ID = 0x44,
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index dafe561..24c8d08 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -238,6 +238,82 @@ void mapTableTextToCells(
assert(paraToCellMap.size() <= tableCellTextEnds.size());
}
+void fillUnderline(librevenge::RVNGPropertyList &props, const Underline
underline)
+{
+ switch (underline)
+ {
+ case Underline::None:
+return;
+ case Underline::Single:
+ case Underline::WordsOnly:
+ case Underline::Double:
+ case Underline::Thick:
+props.insert("style:text-underline-style", "solid");
+break;
+ case Underline::Dotted:
+ case Underline::ThickDot:
+props.insert("style:text-underline-style", "dotted");
+break;
+ case Underline::Dash:
+ case Underline::ThickDash:
+props.insert("style:text-underline-style", "dash");
+break;
+ case Underline::DotDash:
+ case Underline::ThickDotDash:
+props.insert("style:text-underline-style", "dot-dash");
+break;
+ case Underline::DotDotDash:
+ case Underline::ThickDotDotDash:
+props.insert("style:text-underline-style", "dot-dot-dash");
+break;
+ case Underline::Wave:
+ case Underline::ThickWave:
+ case Underline::DoubleWave:
+props.insert("style:text-underline-style", "wave");
+break;
+ case Underline::LongDash:
+ case Underline::ThickLongDash:
+props.insert("style:text-underline-style", "long-dash");
+break;
+ }
+
+ switch (underline)
+ {
+ case Underline::Double:
+ case Underline::DoubleWave:
+props.insert("style:text-underline-type", "double");
+break;
+ default:
+props.insert("style:text-underline-type", "single");
+break;
+ }
+
+ switch (underline)
+ {
+ case Underline::Thick:
+ case Underline::ThickWave:
+ case Underline::ThickDot:
+ case Underline::ThickDash:
+ case Underline::ThickDotDash:
+ case Underline::ThickDotDotDash:
+props.insert("style:text-underline-width", "bold");
+break;
+ default:
+props.insert("style:text-underline-width", "auto");
+break;
+ }
+
+ switch (underline)
+ {
+ case Underline::WordsOnly:
+props.insert("style:text-underline-mode", "skip-white-space");
+break;
+ default:
+props.insert("style:text-underline-mode", "continuous");
+break;
+ }
+}
+
} // anonymous namespace
void MSPUBCollector::collectMetaData(const librevenge::RVNGPropertyList
&metaData)
@@ -1514,7 +1590,7 @@ librevenge::RVNGPropertyList
MSPUBCollector::getParaStyleProps(const ParagraphSt
librevenge::RVNGPropertyList MSPUBCollector::getCharStyleProps(const
CharacterStyle &style, boost::optional defaultCharStyleIndex) const
{
- CharacterStyle _nothing = CharacterStyle(false, false, false);
+ CharacterStyle _nothing;
if (!defaultCharStyleIndex)
{
defaultCharStyleIndex = 0;
@
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/svxcss1.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ffa19a95c44f15049bcc1133c98ef2b4d18f7638
Author: Caolán McNamara
Date: Sat Dec 30 13:44:03 2017 +
coverity#1427008 Result is not floating-point
Change-Id: I3066bf4d7161a2606d0f2f7dd33deefe2ed2f421
diff --git a/sw/source/filter/html/svxcss1.cxx
b/sw/source/filter/html/svxcss1.cxx
index 881a059c8854..2c6b9933d6ea 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -2296,8 +2296,8 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
break;
case CSS1_PIXLENGTH:
{
-auto fMargin = pExpr->GetNumber();
-if (fMargin < SAL_MAX_INT32/2 && fMargin > SAL_MIN_INT32/2)
+double fMargin = pExpr->GetNumber();
+if (fMargin < SAL_MAX_INT32/2.0 && fMargin > SAL_MIN_INT32/2.0)
{
nMargin = (long)fMargin;
long nPWidth = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/Blob.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit b030768b73ac0529b308b22549afca4e4d57a8d3
Author: Caolán McNamara
Date: Sat Dec 30 13:41:40 2017 +
coverity#1427009 Uninitialized scalar field
Change-Id: I372e9f7e286e2c563533c88205b7eb5ada1c02b4
diff --git a/connectivity/source/drivers/firebird/Blob.cxx
b/connectivity/source/drivers/firebird/Blob.cxx
index 96e350d7a89b..d8d26c1042c1 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -43,6 +43,7 @@ Blob::Blob(isc_db_handle* pDatabaseHandle,
#endif
m_bBlobOpened(false),
m_nBlobLength(0),
+m_nMaxSegmentSize(0),
m_nBlobPosition(0)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/ole/axcontrol.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit 05f72a2a39fccb58f59b99ebfd3e7d0d8ff354e9 Author: Bán Róbert Date: Fri Dec 29 23:49:00 2017 +0100 tdf#113788 ActiveX controls' text color is not exported to DOCX The convertFromProperties function does not set the text color. Background color is a similar property and it is handled similarly. Change-Id: I2c1bff6198640b9a30f70d9db641425166ced992 Reviewed-on: https://gerrit.libreoffice.org/47185 Tested-by: Jenkins Reviewed-by: Tamás Zolnai diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 7ab805691c82..a697fddfe33c 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -1585,6 +1585,7 @@ void AxToggleButtonModel::convertFromProperties( PropertySet& rPropSet, const Co setFlag( mnFlags, AX_FLAGS_WORDWRAP, bRes ); ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); +ControlConverter::convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); // need to process the image if one exists ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); @@ -1660,6 +1661,7 @@ void AxCheckBoxModel::convertFromProperties( PropertySet& rPropSet, const Contro ControlConverter::convertToAxVisualEffect( rPropSet, mnSpecialEffect ); ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); +ControlConverter::convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); // need to process the image if one exists ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); @@ -1722,6 +1724,7 @@ void AxOptionButtonModel::convertFromProperties( PropertySet& rPropSet, const Co ControlConverter::convertToAxVisualEffect( rPropSet, mnSpecialEffect ); ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); +ControlConverter::convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); // need to process the image if one exists ControlConverter::convertToAxState( rPropSet, maValue, mnMultiSelect, API_DEFAULTSTATE_BOOLEAN ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); @@ -1800,6 +1803,7 @@ void AxTextBoxModel::convertFromProperties( PropertySet& rPropSet, const Control setFlag( mnScrollBars, AX_SCROLLBAR_VERTICAL, bRes ); ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor, 0x8005L ); +ControlConverter::convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); ControlConverter::convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); @@ -1862,6 +1866,7 @@ void AxNumericFieldModel::convertFromProperties( PropertySet& rPropSet, const Co setFlag( mnScrollBars, AX_SCROLLBAR_VERTICAL, bRes ); ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); +ControlConverter::convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); ControlConverter::convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); @@ -1919,6 +1924,7 @@ void AxListBoxModel::convertFromProperties( PropertySet& rPropSet, const Control ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); ControlConverter::convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); +ControlConverter::convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); } @@ -2004,6 +2010,7 @@ void AxComboBoxModel::convertFromProperties( PropertySet& rPropSet, const Contro mnListRows = 1; } ControlConverter::convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); +ControlConverter::convertToMSColor( rPropSet, PROP_TextColor, mnTextColor ); ControlConverter::convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac README.md
README.md|4 ++-- configure.ac |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 9e7073e822d5f4d18e34df9b5a92bbc51493937e Author: jan Iversen Date: Sat Dec 30 09:48:31 2017 +0100 iOS, bump version to 11.2 Change-Id: Ia24e872f138a78d3d585150e3cde78858de60b77 diff --git a/README.md b/README.md index 9721813c23f1..1a91674665e7 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds: * Runtime: RHEL 6 or CentOS 6 * Build: GCC 4.8.1 or Clang * iOS (only for LibreOfficeKit): -* Runtime: 11.0 (only support for newer i devices == 64 bit) -* Build: Xcode 9.0 and iPhone SDK 11.1 +* Runtime: 11.2 (only support for newer i devices == 64 bit) +* Build: Xcode 9.0 and iPhone SDK 11.2 At least Clang 3.4.2 is known to be too old to pass the configure.ac check "whether $CXX supports C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic ignored "-Wpragmas" diff --git a/configure.ac b/configure.ac index b5a7b2b378d2..f125bd980be9 100644 --- a/configure.ac +++ b/configure.ac @@ -2858,7 +2858,7 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=11.1 +current_sdk_ver=11.2 if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=$current_sdk_ver ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg
icon-themes/sifr/cmd/32/deletetable.png |binary icon-themes/sifr/cmd/lc_deletetable.png |binary icon-themes/sifr/cmd/sc_deletetable.png |binary icon-themes/sifr_dark/cmd/32/deletetable.png |binary icon-themes/sifr_dark/cmd/lc_deletetable.png |binary icon-themes/sifr_dark/cmd/sc_deletetable.png |binary icon-themes/sifr_svg/cmd/32/deletetable.svg | 296 +++ icon-themes/sifr_svg/cmd/lc_deletetable.svg | 279 + icon-themes/sifr_svg/cmd/sc_deletetable.svg | 123 +++ 9 files changed, 698 insertions(+) New commits: commit 58329573e6d58b2f9b9d049b2bdc79e6a3c089f0 Author: Matthias Freund Date: Fri Dec 29 12:22:18 2017 +0100 tdf#75256 New sifr icon for deletetable Change-Id: Id03229cf9229880f570cacba61ae2e563c05559e Reviewed-on: https://gerrit.libreoffice.org/47172 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/icon-themes/sifr/cmd/32/deletetable.png b/icon-themes/sifr/cmd/32/deletetable.png new file mode 100644 index ..7ecaeab3cbf0 Binary files /dev/null and b/icon-themes/sifr/cmd/32/deletetable.png differ diff --git a/icon-themes/sifr/cmd/lc_deletetable.png b/icon-themes/sifr/cmd/lc_deletetable.png new file mode 100644 index ..eaf3601147d8 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_deletetable.png differ diff --git a/icon-themes/sifr/cmd/sc_deletetable.png b/icon-themes/sifr/cmd/sc_deletetable.png new file mode 100644 index ..c12b0b70ae78 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_deletetable.png differ diff --git a/icon-themes/sifr_dark/cmd/32/deletetable.png b/icon-themes/sifr_dark/cmd/32/deletetable.png new file mode 100644 index ..f253c73d4c6c Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/deletetable.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_deletetable.png b/icon-themes/sifr_dark/cmd/lc_deletetable.png new file mode 100644 index ..8203f6e97d01 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_deletetable.png differ diff --git a/icon-themes/sifr_dark/cmd/sc_deletetable.png b/icon-themes/sifr_dark/cmd/sc_deletetable.png new file mode 100644 index ..7930a9cc02c9 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_deletetable.png differ diff --git a/icon-themes/sifr_svg/cmd/32/deletetable.svg b/icon-themes/sifr_svg/cmd/32/deletetable.svg new file mode 100644 index ..4cbe2e05330f --- /dev/null +++ b/icon-themes/sifr_svg/cmd/32/deletetable.svg @@ -0,0 +1,296 @@ + +http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + viewBox="0 0 32 32" + version="1.1" + id="svg5" + sodipodi:docname="deletetable.svg" + inkscape:version="0.92.2 (unknown)" + inkscape:export-filename="/home/matthias/git/icons/sifr_svg/deletetable.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + width="32" + height="32"> + + + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"; /> + +http://creativecommons.org/licenses/by-sa/4.0/"; /> + + +The Document Foundation + + + + +Matthias Freund + + + + http://creativecommons.org/licenses/by-sa/4.0/";> +http://creativecommons.org/ns#Reproduction"; /> +http://creativecommons.org/ns#Distribution"; /> +http://creativecommons.org/ns#Notice"; /> +http://creativecommons.org/ns#Attribution"; /> +http://creativecommons.org/ns#DerivativeWorks"; /> +http://creativecommons.org/ns#ShareAlike"; /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icon-themes/sifr_svg/cmd/lc_deletetable.svg b/icon-themes/sifr_svg/cmd/lc_deletetable.svg new file mode 100644 index ..75af13ba8e4d --- /dev/null +++ b/icon-themes/sifr_svg/cmd/lc_deletetable.svg @@ -0,0 +1,279 @@ + +http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + viewBox="0 0 24 24" + version="1.1" + id="svg5" + sodipodi:docname="lc_deletetable.svg" + inkscape:version="0.92.2 (unknown)" + inkscape:export-filename="/home/matthias/git/icons/sifr_svg/lc_deletetable.png" + inkscape:export-xdpi="96" + inkscape:exp
[Libreoffice-commits] core.git: configure.ac sal/Library_sal.mk
configure.ac | 26 +-
sal/Library_sal.mk |2 +-
2 files changed, 2 insertions(+), 26 deletions(-)
New commits:
commit 494bdd3dc32287cc01ea4e0d81438a9266425726
Author: Stephan Bergmann
Date: Fri Dec 29 17:26:39 2017 +0100
Support for tcmalloc and jemalloc is long dead
When it was originally added to --with-alloc (tcmalloc:
f63ffaf3667e218be3538e84e6becc18d5de4334,
54efc5ed83890f0a1166ece3b1e4942bb7922ff7,
0abd71b44144220d2aeec58601929fd0cd1914d6
708b6d4246de915ac960c7b90ee8bb2d966c7d17 "INTEGRATION: CWS configure14:
#i59160#
allow usage of tcmalloc and system-malloc"; jemalloc:
826a90d68a4dc458585c6d2e647bec17971e9193 "configure25: #i111045#
jemalloc"), the
old build system's solenv/inc/unxlng*.mk added corresponding -l switches to
linker command lines, but it appears that was never carried over into the
new
build system.
And even if the AC_CHECL_LIB calls in configure.ac prior to
e612f026de6ca1153c57fb10f0fa75725425a301 "Ensure
AC_CHECK_LIB/AC_SEARCH_LIBS do
not poison LIBS" would have extended LIBS with the correpsonding -l
switches,
there appears to be no mechanism in the new build system that would have
depended on letting that have any effect on which alloc lib to link against.
So the only remaining effect of --with-alloc={tcmalloc,jemalloc} is to set
FORCE_SYSALLOC in Library_sal.mk, same as --with-alloc=system does. So
whoever
still uses the former configure switches should just switch to the latter.
(Also adapt the documentation of --with-alloc to reality, "internal"
instead of
"oo".)
Change-Id: Iac0e302c5f9602daf5f8452a0fc1887dc55ee27b
Reviewed-on: https://gerrit.libreoffice.org/47178
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/configure.ac b/configure.ac
index f0eb940fbae2..b5a7b2b378d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2103,8 +2103,7 @@ with_build_version=$withval,
AC_ARG_WITH(alloc,
AS_HELP_STRING([--with-alloc],
-[Define which allocator to build with (choices are oo, system,
tcmalloc, jemalloc).
- Note that on FreeBSD/NetBSD system==jemalloc]),
+[Define which allocator to build with (choices are internal,
system).]),
,)
AC_ARG_WITH(parallelism,
@@ -6476,29 +6475,6 @@ if test "$with_alloc" = "system"; then
AC_MSG_RESULT([system])
ALLOC="SYS_ALLOC"
fi
-if test "$with_alloc" = "tcmalloc"; then
-AC_MSG_RESULT(tcmalloc)
-if ! echo $host_cpu | $GREP -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
-AC_MSG_ERROR([tcmalloc only available/usable on ix86])
-fi
-AC_CHECK_LIB([tcmalloc], [malloc], [:],
-[AC_MSG_ERROR(tcmalloc not found or functional. Install the Google
Profiling Tools)], [])
-ALLOC="TCMALLOC"
-fi
-if test "$with_alloc" = "jemalloc"; then
-if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then
-AC_MSG_RESULT(jemalloc)
-save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -pthread"
-AC_CHECK_LIB([jemalloc], [malloc], [:],
-[AC_MSG_ERROR(jemalloc not found or functional. Install the
jemalloc allocator.)], [])
-ALLOC="JEMALLOC"
-CFLAGS=$save_CFLAGS
-else
-AC_MSG_RESULT([system])
-ALLOC="SYS_ALLOC"
-fi
-fi
if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
AC_MSG_RESULT([internal])
fi
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 17d89ae79e4a..01948f4c4465 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_defs,sal,\
$(if $(filter $(BUILD_TYPE),FUZZERS), \
-DFORCE_DEFAULT_SIGNAL \
) \
- $(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC)$(filter-out
X$(ENABLE_RUNTIME_OPTIMIZATIONS),XTRUE), \
+ $(if $(filter $(ALLOC),SYS_ALLOC)$(filter-out
X$(ENABLE_RUNTIME_OPTIMIZATIONS),XTRUE), \
-DFORCE_SYSALLOC \
) \
$(if $(filter $(OS),IOS), \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/CacheSet.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 84466e76a9a23a07227fa1da132b4bef83edec6e
Author: Julien Nabet
Date: Sat Dec 30 08:42:26 2017 +0100
Incrementing end iterator has undefined behavior (dbaccess/cacheset)
Change-Id: I9f4cdacd87cc4802b13c99c15e1d24d11285a375
Reviewed-on: https://gerrit.libreoffice.org/47188
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/core/api/CacheSet.cxx
b/dbaccess/source/core/api/CacheSet.cxx
index 785cba2a69cc..46eb35cefce4 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -233,7 +233,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
OUString sIsNull(" IS NULL");
OUString sParam(" = ?");
ORowVector< ORowSetValue >::Vector::const_iterator aIter =
_rRow->get().begin()+1;
-ORowVector< ORowSetValue >::Vector::const_iterator aEnd =
_rRow->get().end()+1;
+ORowVector< ORowSetValue >::Vector::const_iterator aEnd =
_rRow->get().end();
for(; aIter != aEnd;++aIter,++nCheckCount,++i)
{
aColumnName = m_xSetMetaData->getColumnName(i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
