date:20170807

[Libreoffice-commits] core.git: officecfg/files.mk officecfg/registry postprocess/CustomTarget_registry.mk

2017-08-07 Thread Gabor Kelemen

 officecfg/files.mk  |  
  1 
 officecfg/registry/schema/org/openoffice/Office/Logging.xcs |  
 26 --
 officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs |  
115 --
 postprocess/CustomTarget_registry.mk|  
  1 
 4 files changed, 143 deletions(-)

New commits:
commit 05aa784ed9891a1299f8c2328faee9c62050851a
Author: Gabor Kelemen 
Date:   Mon Aug 7 22:44:03 2017 +0200

Drop configuration remains of oooimprovement

It was dropped in 2011:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=bd7f8380113b0cbe706d131b33e7551b2c484205

Change-Id: Ibb9a0860ca9c256177987683ee33828c2c0bad1d
Reviewed-on: https://gerrit.libreoffice.org/40858
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/officecfg/files.mk b/officecfg/files.mk
index ef53818c427a..1e364ade8c98 100644
--- a/officecfg/files.mk
+++ b/officecfg/files.mk
@@ -37,7 +37,6 @@ officecfg_XCSFILES := \
 Office/Linguistic \
 Office/Logging \
 Office/Math \
-Office/OOoImprovement/Settings \
 Office/OptionsDialog \
 Office/Paths \
 Office/PresentationMinimizer \
diff --git a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
index 580135909f80..a5ec755ea256 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
@@ -81,32 +81,6 @@
 
   
   
-
-  
-specifies settings for the logging of userinterface 
events.
-  
-  
-
-  only if this is true, usage tracking is allowed and its 
options will be shown
-  
-
-false
-  
-  
-
-  directory where the logs will get saved
-  
-
-$(user)/temp/Feedback
-  
-  
-
-  idle time in minutes. If two log event are separated by a 
longer
-  time, the log will be rotated.
-
-180
-  
-
 
   
 contains the settings for all known loggers in 
OpenOffice.org.
diff --git 
a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs 
b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
deleted file mode 100644
index e328cada2ddd..
--- 
a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="Settings" 
oor:package="org.openoffice.Office.OOoImprovement" xml:lang="en-US">
-  
-Contains preferences for the OpenOffice.org Improvement Program 
components.
-  
-  
-  
-
-  
-invitations to usage tracking etc.
-  
-  
-
-  the number of starts that will be skipped before the user will 
get invited to the
-OpenOffice.org Improvement Program. If this is zero the user 
will get asked.
-
-
-1
-  
-  
-
-  true, if the user accepted the invitation.
-
-false
-  
-  
-
-  true, if the user was already invited.
-
-false
-  
-  
-
-  true, if the extension is prebundled - is set by an 
onFirstRunInitialization job.
-(currently not implemented)
-
-false
-  
-  
-
-  the url where additional information can be found.
-
-
http://wiki.documentfoundation.org/UX/LibreOffice_User_Feedback_Program
-  
-
-
-  
-counts of recorded events, uploaded reports etc.
-  
-  
-
-  the number of reports uploaded.
-
-0
-  
-  
-
-  the number of events in zipped or already uploaded 
report.
-
-0
-  
-  
-
-  the number of failed upload tries.
-
-0
-  
-
-
-  
-settings on destination for uploading reports
-  
-  
-
-  the url where reports get send to.
-
-http://report.libreoffice.org:80/soap/servlet/rpcrouter
-  
-  
-
-  Additions to the SoapId for automated testing
-DO NOT SET THIS VALUE UNLESS YOU KNOW WHAT YOU ARE DOING!
-  
-
-
-  
-  
-
-  The Emailaddress to fill out in the reportmail.xml file.
-DO NOT SET THIS VALUE UNLESS YOU KNOW WHAT YOU ARE DOING!
-Its only purpose is testing and quality assurance.
-  
-
-
-  
-
-  
-
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 9ddb084a6ae7..125c

[Libreoffice-commits] core.git: chart2/qa oox/inc oox/source

2017-08-07 Thread Dennis Francis

 chart2/qa/extras/chart2import.cxx|   15 +++
 chart2/qa/extras/data/xlsx/piechart_outside.xlsx |binary
 oox/inc/drawingml/chart/seriesconverter.hxx  |2 +-
 oox/source/drawingml/chart/seriesconverter.cxx   |   20 ++--
 4 files changed, 30 insertions(+), 7 deletions(-)

New commits:
commit 70944a849dc59fa686e3f316a3983dbc8a47017f
Author: Dennis Francis 
Date:   Fri Aug 4 13:21:24 2017 +0530

tdf#109858: Override default point label placement setting...

with series label placement setting if available while
importing xlsx chart.

Adds unit test in chart2import.cxx that asserts one of
the point label setting in the bugzilla xlsx document.

Change-Id: I8bc04fd569f94a19633666ffdc51b61ac719e8a9
Reviewed-on: https://gerrit.libreoffice.org/40860
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index e81a6e4d347d..7cb69a3398ce 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -94,6 +94,7 @@ public:
 void testAxisTitleRotationXLSX();
 
 void testTdf90510(); // Pie chart label placement settings(XLS)
+void testTdf109858(); // Pie chart label placement settings(XLSX)
 
 void testInternalDataProvider();
 
@@ -150,6 +151,7 @@ public:
 CPPUNIT_TEST(testSecondaryAxisTitleDefaultRotationXLSX);
 CPPUNIT_TEST(testAxisTitleRotationXLSX);
 CPPUNIT_TEST(testTdf90510);
+CPPUNIT_TEST(testTdf109858);
 
 CPPUNIT_TEST(testInternalDataProvider);
 
@@ -1262,6 +1264,19 @@ void Chart2ImportTest::testTdf90510()
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Data labels should be placed outside", 
chart::DataLabelPlacement::OUTSIDE, nLabelPlacement );
 }
 
+void Chart2ImportTest::testTdf109858()
+{
+load("/chart2/qa/extras/data/xlsx/", "piechart_outside.xlsx");
+uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 
0, mxComponent ), UNO_QUERY_THROW );
+CPPUNIT_ASSERT_MESSAGE( "failed to load chart", xChart1Doc.is() );
+Reference xPropSet( 
xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_QUERY_THROW 
);
+uno::Any aAny = xPropSet->getPropertyValue( "LabelPlacement" );
+CPPUNIT_ASSERT( aAny.hasValue() );
+sal_Int32 nLabelPlacement = 0;
+CPPUNIT_ASSERT( aAny >>= nLabelPlacement );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Data labels should be placed outside", 
chart::DataLabelPlacement::OUTSIDE, nLabelPlacement );
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/piechart_outside.xlsx 
b/chart2/qa/extras/data/xlsx/piechart_outside.xlsx
new file mode 100644
index ..e90eab1e904c
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/piechart_outside.xlsx 
differ
diff --git a/oox/inc/drawingml/chart/seriesconverter.hxx 
b/oox/inc/drawingml/chart/seriesconverter.hxx
index 6ee20c59f147..e381cdbc2148 100644
--- a/oox/inc/drawingml/chart/seriesconverter.hxx
+++ b/oox/inc/drawingml/chart/seriesconverter.hxx
@@ -47,7 +47,7 @@ public:
 /** Converts OOXML data label settings for the passed data point. */
 voidconvertFromModel(
 const css::uno::Reference< 
css::chart2::XDataSeries >& rxDataSeries,
-const TypeGroupConverter& rTypeGroup );
+const TypeGroupConverter& rTypeGroup, const 
PropertySet& rSeriesPropSet );
 };
 
 
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx 
b/oox/source/drawingml/chart/seriesconverter.cxx
index 7233d67f009b..a1f2cb737c7f 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -99,7 +99,8 @@ Reference< XLabeledDataSequence > 
lclCreateLabeledDataSequence(
 }
 
 void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& 
rFormatter,
-const DataLabelModelBase& rDataLabel, const TypeGroupConverter& 
rTypeGroup, bool bDataSeriesLabel, bool bMSO2007Doc )
+const DataLabelModelBase& rDataLabel, const 
TypeGroupConverter& rTypeGroup,
+bool bDataSeriesLabel, bool bMSO2007Doc, const 
PropertySet* pSeriesPropSet )
 {
 const TypeGroupInfo& rTypeInfo = rTypeGroup.getTypeInfo();
 
@@ -170,6 +171,12 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, 
ObjectFormatter& rFormatt
 case XML_r: nPlacement = csscd::RIGHT;  break;
 case XML_bestFit:   nPlacement = csscd::AVOID_OVERLAP;  break;
 }
+
+sal_Int32 nGlobalPlacement = 0;
+if ( !bDataSeriesLabel && nPlacement == rTypeInfo.mnDefLabelPos && 
pSeriesPropSet &&
+ pSeriesPropSet->getProperty( nGlobalPlacement, 
PROP_LabelPlacement ) )
+nPlacement = nGlobalPlacement;
+
 rPropSet.setProperty( PROP_La

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang connectivity/source dbaccess/source desktop/source editeng/source filter/source framework/inc framework/source include/editeng include

2017-08-07 Thread Noel Grandin

 compilerplugins/clang/constantparam.bitmask.results  |9 
 compilerplugins/clang/constantparam.booleans.results |  822 ++-
 compilerplugins/clang/constantparam.constructors.results |  186 +-
 compilerplugins/clang/constantparam.numbers.results  |  784 --
 connectivity/source/drivers/writer/WTable.cxx|   16 
 connectivity/source/inc/writer/WTable.hxx|6 
 dbaccess/source/ui/app/AppController.cxx |2 
 dbaccess/source/ui/app/AppControllerGen.cxx  |2 
 desktop/source/deployment/manager/dp_commandenvironments.cxx |   21 
 desktop/source/deployment/manager/dp_commandenvironments.hxx |2 
 editeng/source/editeng/editobj.cxx   |4 
 filter/source/msfilter/msdffimp.cxx  |8 
 filter/source/msfilter/svdfppt.cxx   |3 
 framework/inc/dispatch/closedispatcher.hxx   |   10 
 framework/source/dispatch/closedispatcher.cxx|   13 
 include/editeng/editobj.hxx  |7 
 include/filter/msfilter/msdffimp.hxx |3 
 include/filter/msfilter/svdfppt.hxx  |3 
 include/sfx2/mailmodelapi.hxx|5 
 include/svtools/imapobj.hxx  |8 
 include/svtools/table/tablerenderer.hxx  |5 
 include/xmloff/txtparae.hxx  |1 
 l10ntools/inc/export.hxx |2 
 l10ntools/source/cfgmerge.cxx|2 
 l10ntools/source/helpmerge.cxx   |2 
 l10ntools/source/lngmerge.cxx|4 
 l10ntools/source/merge.cxx   |   30 
 l10ntools/source/propmerge.cxx   |2 
 l10ntools/source/treemerge.cxx   |2 
 l10ntools/source/xrmmerge.cxx|6 
 package/inc/ZipPackageStream.hxx |3 
 package/source/zippackage/ZipPackageStream.cxx   |8 
 sc/inc/scabstdlg.hxx |1 
 sc/source/core/data/column.cxx   |   12 
 sc/source/core/data/global.cxx   |2 
 sc/source/filter/xml/xmlimprt.cxx|   54 
 sc/source/filter/xml/xmlimprt.hxx|   27 
 sc/source/ui/attrdlg/scdlgfact.cxx   |3 
 sc/source/ui/attrdlg/scdlgfact.hxx   |1 
 sc/source/ui/inc/undodat.hxx |2 
 sc/source/ui/undo/undodat.cxx|   16 
 sc/source/ui/unoobj/filtuno.cxx  |2 
 sc/source/ui/view/viewfun3.cxx   |8 
 sd/inc/drawdoc.hxx   |2 
 sd/source/core/drawdoc3.cxx  |3 
 sd/source/ui/view/sdview2.cxx|2 
 sfx2/source/dialog/mailmodel.cxx |3 
 svtools/inc/table/gridtablerenderer.hxx  |2 
 svtools/source/misc/imap.cxx |   16 
 svtools/source/misc/imap2.cxx|   20 
 svtools/source/table/gridtablerenderer.cxx   |1 
 svtools/source/table/tablecontrol_impl.cxx   |2 
 sw/inc/htmltbl.hxx   |3 
 sw/source/core/doc/htmltbl.cxx   |8 
 sw/source/filter/html/htmltab.cxx|3 
 sw/source/filter/ww8/ww8par.cxx  |6 
 sw/source/filter/ww8/ww8par.hxx  |3 
 vcl/android/androidinst.cxx  |8 
 vcl/headless/headlessinst.cxx|5 
 vcl/headless/svpdummies.cxx  |2 
 vcl/inc/headless/svpdummies.hxx  |3 
 vcl/inc/unx/gensys.h |3 
 vcl/inc/unx/gtk/gtkprn.hxx   |2 
 vcl/inc/unx/gtk/gtksys.hxx   |3 
 vcl/inc/unx/x11/x11sys.hxx   |3 
 vcl/ios/iosinst.cxx  |7 
 vcl/unx/generic/app/gensys.cxx   |2 
 vcl/unx/gtk/gtksys.cxx   |5 
 vcl/unx/gtk/salprn-gtk.cxx   |5 
 vcl/unx/x11/x11sys.cxx   |6 
 xmloff/source/text/txtparae.cxx  |   49 
 71 fi

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

2017-08-07 Thread Caolán McNamara

 sw/source/filter/ww8/ww8scan.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19925f85fd3f9cf0cf82e8bcb0a4e90922879dc7
Author: CaolÃ¡n McNamara 
Date:   Mon Aug 7 19:24:37 2017 +0100

ofz#2877: crash in SVTB16Short

sal_uInt16 wraparound

Change-Id: Ifd791bdd5f1b96576fdd4ca6665bb972fb8b1e4c
Reviewed-on: https://gerrit.libreoffice.org/40853
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index ec3dc11da85c..0026ade52132 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3509,7 +3509,7 @@ bool WW8PLCFx_SEPX::Find4Sprms(sal_uInt16 nId1,sal_uInt16 
nId2,sal_uInt16 nId3,s
 p4 = nullptr;
 
 sal_uInt8* pSp = pSprms;
-sal_uInt16 i=0;
+size_t i = 0;
 while (i + maSprmParser.MinSprmLen() <= nSprmSiz)
 {
 // Sprm found?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source

2017-08-07 Thread Caolán McNamara

 sw/source/filter/ww8/ww8scan.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9be384b6c4c2ce242140b3a1cfe0c2dfbf405eaa
Author: CaolÃ¡n McNamara 
Date:   Mon Aug 7 19:24:37 2017 +0100

ofz#2877: crash in SVTB16Short

sal_uInt16 wraparound

Change-Id: Ifd791bdd5f1b96576fdd4ca6665bb972fb8b1e4c
Reviewed-on: https://gerrit.libreoffice.org/40852
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6ce951b8a529..897fccb5ea90 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3501,7 +3501,7 @@ bool WW8PLCFx_SEPX::Find4Sprms(sal_uInt16 nId1,sal_uInt16 
nId2,sal_uInt16 nId3,s
 bool bFound = false;
 
 sal_uInt8* pSp = pSprms;
-sal_uInt16 i=0;
+size_t i = 0;
 while (i + maSprmParser.MinSprmLen() <= nSprmSiz)
 {
 // Sprm found?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

2017-08-07 Thread Dennis Francis

 sc/source/ui/view/viewfun2.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5b121b12b50c0db8f5b68616cd8ad95baf91b4f4
Author: Dennis Francis 
Date:   Thu Aug 3 14:27:46 2017 +0530

tdf#109859: Update the view data of new document when...

...a set of sheets are copied to a new spreadsheet document.

Change-Id: I47642b4aa2543c193328d9515564bfbacf044bbc
Reviewed-on: https://gerrit.libreoffice.org/40764
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 
(cherry picked from commit bc6f56e4bb27f802e90303073ba5e2a676baa39b)
Reviewed-on: https://gerrit.libreoffice.org/40828
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index b51dbbe1acda..55332765bb96 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2775,7 +2775,12 @@ void ScViewFunc::MoveTable(
 if ( pDestDoc->IsChartListenerCollectionNeedsUpdate() )
 pDestDoc->UpdateChartListenerCollection();
 
-pDestDoc->DeleteTab(static_cast(TheTabs.size()));   // old 
first table
+SCTAB nNumTabsInserted = static_cast(TheTabs.size());
+pDestShell->Broadcast( ScTablesHint( SC_TABS_INSERTED, 0, 
nNumTabsInserted ) );
+
+pDestDoc->DeleteTab( nNumTabsInserted );   // old first table
+pDestShell->Broadcast( ScTablesHint( SC_TAB_DELETED, 
nNumTabsInserted ) );
+
 if (pDestViewSh)
 {
 // Make sure to clear the cached page view after sheet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

2017-08-07 Thread Jens Carl

 include/test/sheet/xusedareacursor.hxx  |   36 ++
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |2 
 qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java |  126 
--
 sc/qa/extras/sccellcursorobj.cxx|   16 -
 sc/qa/extras/testdocuments/ScCellCursorObj.ods  |binary
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/xcellseries.cxx   |7 
 test/source/sheet/xusedareacursor.cxx   |   97 +++
 9 files changed, 150 insertions(+), 136 deletions(-)

New commits:
commit 27cbca2c8dccbbb299621b49e5ffd836188202f0
Author: Jens Carl 
Date:   Mon Aug 7 00:23:25 2017 +

tdf#45904 Move Java _XUsedAreaCursor tests to C++

Change-Id: I6a288fa333d6805540156f63040468f07967c0c6
Reviewed-on: https://gerrit.libreoffice.org/40817
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/include/test/sheet/xusedareacursor.hxx 
b/include/test/sheet/xusedareacursor.hxx
new file mode 100644
index ..9e98aa3ae25b
--- /dev/null
+++ b/include/test/sheet/xusedareacursor.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XUSEDAREACURSOR_HXX
+#define INCLUDED_TEST_SHEET_XUSEDAREACURSOR_HXX
+
+#include 
+#include 
+#include 
+
+using namespace css;
+using namespace css::uno;
+
+namespace apitest {
+
+class OOO_DLLPUBLIC_TEST XUsedAreaCursor
+{
+public:
+virtual uno::Reference< uno::XInterface > init() = 0;
+virtual ~XUsedAreaCursor(){}
+
+void testGotoStartOfUsedArea();
+void testGotoEndOfUsedArea();
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_XUSEDAREACURSOR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index dfb164ffa102..f52618514bcd 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -651,7 +651,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor \
 qadevOOo/tests/java/ifc/sheet/_XSubTotalField \
 qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier \
-qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor \
 qadevOOo/tests/java/ifc/sheet/_XViewFreezable \
 qadevOOo/tests/java/ifc/style/_CharacterProperties \
 qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index 475086fddb03..b8a24da282db 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -55,8 +55,6 @@
 
"ScCellCursorObj";"com::sun::star::chart::XChartData";"removeChartDataChangeEventListener()"
 "ScCellCursorObj";"com::sun::star::chart::XChartData";"getNotANumber()"
 "ScCellCursorObj";"com::sun::star::chart::XChartData";"isNotANumber()"
-"ScCellCursorObj";"com::sun::star::sheet::XUsedAreaCursor";"gotoStartOfUsedArea()"
-"ScCellCursorObj";"com::sun::star::sheet::XUsedAreaCursor";"gotoEndOfUsedArea()"
 "ScCellCursorObj";"com::sun::star::style::ParagraphProperties";"ParaAdjust"
 
"ScCellCursorObj";"com::sun::star::style::ParagraphProperties";"ParaLineSpacing#optional"
 
"ScCellCursorObj";"com::sun::star::style::ParagraphProperties";"ParaBackColor#optional"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java 
b/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java
deleted file mode 100644
index 19079b7507df..
--- a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_tabviewobj.mk sc/Module_sc.mk sc/qa test/Library_subsequenttest.mk test/source

2017-08-07 Thread Jens Carl

 include/test/sheet/xviewsplitable.hxx|   36 +++
 qadevOOo/Jar_OOoRunner.mk|1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv |6 
 qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java   |  127 ---
 sc/CppunitTest_sc_tabviewobj.mk  |  105 +
 sc/Module_sc.mk  |1 
 sc/qa/extras/sctabviewobj.cxx|   92 +++
 test/Library_subsequenttest.mk   |1 
 test/source/sheet/xviewsplitable.cxx |   43 +++
 9 files changed, 278 insertions(+), 134 deletions(-)

New commits:
commit 0bd57d62d0f15eced0e99097d9f46a86f177e9a1
Author: Jens Carl 
Date:   Sun Aug 6 07:10:36 2017 +

tdf#45904 Move Java _XViewSplitable tests to C++

Change-Id: Ib9cf1c53947d10260673e1e1088bbfbaa30efbc9
Reviewed-on: https://gerrit.libreoffice.org/40801
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/include/test/sheet/xviewsplitable.hxx 
b/include/test/sheet/xviewsplitable.hxx
new file mode 100644
index ..3ead42a919a9
--- /dev/null
+++ b/include/test/sheet/xviewsplitable.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XVIEWSPLITABLE_HXX
+#define INCLUDED_TEST_SHEET_XVIEWSPLITABLE_HXX
+
+#include 
+#include 
+#include 
+
+using namespace css;
+using namespace css::uno;
+
+namespace apitest {
+
+class OOO_DLLPUBLIC_TEST XViewSplitable
+{
+
+public:
+virtual uno::Reference< uno::XInterface > init() = 0;
+virtual ~XViewSplitable(){}
+
+void testSplit();
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_XVIEWSPLITABLE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 553e5cb521ff..dfb164ffa102 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -653,7 +653,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XUniqueCellFormatRangesSupplier \
 qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor \
 qadevOOo/tests/java/ifc/sheet/_XViewFreezable \
-qadevOOo/tests/java/ifc/sheet/_XViewSplitable \
 qadevOOo/tests/java/ifc/style/_CharacterProperties \
 qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \
 qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
index 7119ec7ffe98..3f082cec3a73 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
@@ -39,12 +39,6 @@
 "ScTabViewObj";"com::sun::star::sheet::XViewFreezable";"freezeAtPosition()"
 
"ScTabViewObj";"com::sun::star::sheet::XActivationBroadcaster#optional";"addActivationEventListener()"
 
"ScTabViewObj";"com::sun::star::sheet::XActivationBroadcaster#optional";"removeActivationEventListener()"
-"ScTabViewObj";"com::sun::star::sheet::XViewSplitable";"getIsWindowSplit()"
-"ScTabViewObj";"com::sun::star::sheet::XViewSplitable";"getSplitHorizontal()"
-"ScTabViewObj";"com::sun::star::sheet::XViewSplitable";"getSplitVertical()"
-"ScTabViewObj";"com::sun::star::sheet::XViewSplitable";"getSplitColumn()"
-"ScTabViewObj";"com::sun::star::sheet::XViewSplitable";"getSplitRow()"
-"ScTabViewObj";"com::sun::star::sheet::XViewSplitable";"splitAtPosition()"
 "ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"startRangeSelection()"
 "ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"abortRangeSelection()"
 
"ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"addRangeSelectionListener()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java 
b/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java
deleted file mode 100644
index c70719babe53..
--- a/qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *

[Libreoffice-commits] core.git: 2 commits - include/sax sc/source

2017-08-07 Thread Mohammed Abdul Azeem

 include/sax/fastattribs.hxx|5 
 sc/source/filter/xml/XMLCalculationSettingsContext.cxx |4 
 sc/source/filter/xml/XMLDDELinksContext.cxx|2 
 sc/source/filter/xml/XMLTrackedChangesContext.cxx  |2 
 sc/source/filter/xml/xmlcelli.cxx  |4 
 sc/source/filter/xml/xmldpimp.cxx  |6 
 sc/source/filter/xml/xmlexternaltabi.cxx   |2 
 sc/source/filter/xml/xmlfilti.cxx  |  366 +++--
 sc/source/filter/xml/xmlfilti.hxx  |   93 +---
 sc/source/filter/xml/xmlsorti.cxx  |   73 +--
 sc/source/filter/xml/xmlsorti.hxx  |   16 
 11 files changed, 241 insertions(+), 332 deletions(-)

New commits:
commit 855af7f3260705faf7c33be36efc1610354336f0
Author: Mohammed Abdul Azeem 
Date:   Sun Aug 6 16:40:55 2017 +0530

Avoiding unnecessary memory allocation:

Added a method to directly convert fast attribute values
to double.

Change-Id: Ia0c415530d6d7c7f767a2e0c88983429bc966210
Reviewed-on: https://gerrit.libreoffice.org/40846
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 9c1db656e36c..8b669fe26a17 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -150,6 +150,11 @@ public:
 assert(mnIdx < mrList.maAttributeTokens.size());
 return rtl_str_toInt32(mrList.getFastAttributeValue(mnIdx), 10);
 }
+double toDouble() const
+{
+assert(mnIdx < mrList.maAttributeTokens.size());
+return rtl_str_toDouble(mrList.getFastAttributeValue(mnIdx));
+}
 OUString toString() const
 {
 assert(mnIdx < mrList.maAttributeTokens.size());
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx 
b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 0617d2654b14..81fc1744ab4c 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -200,9 +200,7 @@ ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& 
rImport,
 pCalcSet->SetIterationCount(aIter.toInt32());
 break;
 case XML_ELEMENT( TABLE, XML_MAXIMUM_DIFFERENCE ):
-double fDif;
-::sax::Converter::convertDouble(fDif, aIter.toString());
-pCalcSet->SetIterationEpsilon(fDif);
+pCalcSet->SetIterationEpsilon( aIter.toDouble() );
 break;
 }
 }
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx 
b/sc/source/filter/xml/XMLDDELinksContext.cxx
index 59b9fbb5df66..faaab9888728 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -370,7 +370,7 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& 
rImport,
 bString2 = true;
 break;
 case XML_ELEMENT( OFFICE, XML_VALUE ):
-::sax::Converter::convertDouble(fValue, aIter.toString());
+fValue = aIter.toDouble();
 bEmpty = false;
 bString2 = false;
 break;
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx 
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 1657ea40687f..ff843fa7df51 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -887,7 +887,7 @@ ScXMLChangeCellContext::ScXMLChangeCellContext( 
ScXMLImport& rImport,
 }
 break;
 case XML_ELEMENT( OFFICE, XML_VALUE ):
-::sax::Converter::convertDouble(fValue, aIter.toString());
+fValue = aIter.toDouble();
 bEmpty = false;
 break;
 case XML_ELEMENT( OFFICE, XML_DATE_VALUE ):
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 043190f41bbf..c3edfdbeac03 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -211,7 +211,7 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( 
ScXMLImport& rImport,
 {
 if (!it.isEmpty())
 {
-::sax::Converter::convertDouble(fValue, it.toString());
+fValue = it.toDouble();
 bIsEmpty = false;
 
 //if office:value="0", let's get the text:p in case 
this is
@@ -259,7 +259,7 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( 
ScXMLImport& rImport,
 else if ( IsXMLToken( it, XML_FALSE ) )
 fValue = 0.0;
 else
-::sax::Converter::convertDouble(fValue, 
it.toString()

[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests

2017-08-07 Thread Jens Carl

 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv |   16 
 qadevOOo/tests/java/ifc/sheet/_DataPilotField.java  |  164 
--
 3 files changed, 181 deletions(-)

New commits:
commit 28ada7805b87758b20ded9807b57f780570e08a7
Author: Jens Carl 
Date:   Mon Aug 7 19:59:59 2017 +

tdf#45905 Remove/disable obsolete _DataPilotField Java tests

The _DataPilotField tests are already written in C++ since commit
95780ec73990f96dc16fc677c895d00fa1360008.

Change-Id: Ia147acd4d42894c9de373bbe93ae5759095e8ac6
Reviewed-on: https://gerrit.libreoffice.org/40856
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 89a0f231264a..553e5cb521ff 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -566,7 +566,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_CellAreaLink \
 qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor \
 qadevOOo/tests/java/ifc/sheet/_DatabaseRange \
-qadevOOo/tests/java/ifc/sheet/_DataPilotField \
 qadevOOo/tests/java/ifc/sheet/_DataPilotItem \
 qadevOOo/tests/java/ifc/sheet/_DocumentSettings \
 qadevOOo/tests/java/ifc/sheet/_FunctionDescription \
diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv
index 3cab66e718f4..7c930e8cfc75 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv
@@ -1,21 +1,5 @@
 
"ScDataPilotFieldObj";"com::sun::star::sheet::XDataPilotFieldGrouping#optional";"createNameGroup()"
 
"ScDataPilotFieldObj";"com::sun::star::sheet::XDataPilotFieldGrouping#optional";"createDateGroup()"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"Orientation"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"Function"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"SelectedPage#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"UseSelectedPage#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"UsedHierarchy#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"HasSortInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"SortInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"HasLayoutInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"LayoutInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"HasAutoShowInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"AutoShowInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"HasReference#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"Reference#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"IsGroupField#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"GroupInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"ShowEmpty#optional"
 "ScDataPilotFieldObj";"com::sun::star::container::XNamed";"getName()"
 "ScDataPilotFieldObj";"com::sun::star::container::XNamed";"setName()"
 
"ScDataPilotFieldObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java 
b/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java
deleted file mode 100644
index 13debc4a32cd..
--- a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.sheet;
-
-import com.sun.star.sheet.DataPilotFieldAutoShowInfo;
-import com.sun.star.sheet.DataPilotFieldLayoutInfo;
-import com.sun.star.sheet.DataPilotFieldReference;
-import com.sun.star.sheet.DataPilotFieldSortInfo;
-import lib.MultiPropertyTest;
-
-/**
-* Testing com.sun.star.sheet.DataPilotField
-* service properties :
-* 
-*   Orientation
-*

[Libreoffice-commits] core.git: comphelper/Module_comphelper.mk comphelper/source comphelper/StaticLibrary_windows_process.mk include/comphelper onlineupdate/Executable_updater.mk onlineupdate/inc onl

2017-08-07 Thread Markus Mohrhard

 comphelper/Module_comphelper.mk|2 ++
 comphelper/StaticLibrary_windows_process.mk|   14 --
 include/comphelper/windowsStart.hxx|4 ++--
 onlineupdate/Executable_updater.mk |2 +-
 onlineupdate/Module_onlineupdate.mk|3 +--
 onlineupdate/source/update/updater/updater.cxx |2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

New commits:
commit 5875fd0313cb0aeb7e63d5ea9455f83ea18787b5
Author: Markus Mohrhard 
Date:   Mon Aug 7 15:35:30 2017 +0200

updater: move the windows process starting code to comphelper

Change-Id: I1a499f57d01ee28afdb2c4f85dc976f2e6837dfd
Reviewed-on: https://gerrit.libreoffice.org/40837
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk
index e04d230d2069..30ac708a927d 100644
--- a/comphelper/Module_comphelper.mk
+++ b/comphelper/Module_comphelper.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_Module_Module,comphelper))
 
 $(eval $(call gb_Module_add_targets,comphelper,\
 Library_comphelper \
+   $(if $(filter WNT,$(OS)),\
+   StaticLibrary_windows_process )\
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\
diff --git a/onlineupdate/StaticLibrary_winhelper.mk 
b/comphelper/StaticLibrary_windows_process.mk
similarity index 55%
rename from onlineupdate/StaticLibrary_winhelper.mk
rename to comphelper/StaticLibrary_windows_process.mk
index e6058c3f51e7..1b086eac952b 100644
--- a/onlineupdate/StaticLibrary_winhelper.mk
+++ b/comphelper/StaticLibrary_windows_process.mk
@@ -7,16 +7,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_StaticLibrary_StaticLibrary,winhelper))
+$(eval $(call gb_StaticLibrary_StaticLibrary,windows_process))
 
-$(eval $(call gb_StaticLibrary_set_include,winhelper,\
-   -I$(SRCDIR)/onlineupdate/inc/ \
-   -I$(SRCDIR)/onlineupdate/source/winhelper/ \
+$(eval $(call gb_StaticLibrary_set_include,windows_process,\
$$(INCLUDE) \
 ))
 
-$(eval $(call gb_StaticLibrary_add_exception_objects,winhelper,\
-   onlineupdate/source/winhelper/windowsStart \
+$(eval $(call gb_StaticLibrary_add_defs,windows_process,\
+   -DUNICODE \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,windows_process,\
+   comphelper/source/windows/windows_process \
 ))
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab: */
diff --git a/onlineupdate/source/winhelper/windowsStart.cxx 
b/comphelper/source/windows/windows_process.cxx
similarity index 100%
rename from onlineupdate/source/winhelper/windowsStart.cxx
rename to comphelper/source/windows/windows_process.cxx
diff --git a/onlineupdate/inc/winhelper/windowsStart.hxx 
b/include/comphelper/windowsStart.hxx
similarity index 88%
rename from onlineupdate/inc/winhelper/windowsStart.hxx
rename to include/comphelper/windowsStart.hxx
index 7a9d54a506f2..ce66ef933b68 100644
--- a/onlineupdate/inc/winhelper/windowsStart.hxx
+++ b/include/comphelper/windowsStart.hxx
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
-#define INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
+#ifndef INCLUDED_COMPHELPER_WINSTART_HXX
+#define INCLUDED_COMPHELPER_WINSTART_HXX
 
 #ifdef _WIN32
 #include 
diff --git a/onlineupdate/Executable_updater.mk 
b/onlineupdate/Executable_updater.mk
index 6071ae54837a..754fc9e898d5 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Executable_use_static_libraries,updater,\
 libmarverify \
 updatehelper \
$(if $(filter WNT,$(OS)), \
-   winhelper )\
+   windows_process )\
 ))
 
 $(eval $(call gb_Executable_use_externals,updater,\
diff --git a/onlineupdate/Module_onlineupdate.mk 
b/onlineupdate/Module_onlineupdate.mk
index 2f3817182e03..a900e631a877 100644
--- a/onlineupdate/Module_onlineupdate.mk
+++ b/onlineupdate/Module_onlineupdate.mk
@@ -17,8 +17,7 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\
StaticLibrary_updatehelper \
$(if $(filter WNT,$(OS)),\
Executable_update_service \
-   WinResTarget_updater \
-   StaticLibrary_winhelper )\
+   WinResTarget_updater )\
Executable_mar \
Executable_updater \
Executable_mbsdiff \
diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 8a1ef8bf5b24..1509d570ba23 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -63,7 +63,7 @@
 #include 
 
 #ifdef _WIN32
-#include 
+#include 
 #include "uachelper.h"
 #include "pathhash.h"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesk

[Libreoffice-commits] core.git: 2 commits - onlineupdate/inc

2017-08-07 Thread Markus Mohrhard

 onlineupdate/inc/winhelper/windowsStart.hxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 9d184e2cc9a9a78a61ae9b91a66e1153f778d9a4
Author: Markus Mohrhard 
Date:   Mon Aug 7 10:53:45 2017 +0200

updater: add include guard for windows process start code

Change-Id: If021a92163381f2221faa1c7121f6c4af2d51dcf
Reviewed-on: https://gerrit.libreoffice.org/40836
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/onlineupdate/inc/winhelper/windowsStart.hxx 
b/onlineupdate/inc/winhelper/windowsStart.hxx
index e34e7d15ca22..7a9d54a506f2 100644
--- a/onlineupdate/inc/winhelper/windowsStart.hxx
+++ b/onlineupdate/inc/winhelper/windowsStart.hxx
@@ -3,6 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
+#define INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
+
 #ifdef _WIN32
 #include 
 #endif
@@ -19,3 +22,5 @@ WinLaunchChild(const wchar_t *exePath, int argc,
HANDLE *hProcess = nullptr);
 
 wchar_t* MakeCommandLine(int argc, WCHAR **argv);
+
+#endif
commit a5cda5603c3f71851a987c24d36433ce269c66f8
Author: Markus Mohrhard 
Date:   Mon Aug 7 09:34:21 2017 +0200

updater: use the correct define check

Change-Id: I79f47da401732e39bbce778d5b3971d6024a7935
Reviewed-on: https://gerrit.libreoffice.org/40835
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/onlineupdate/inc/winhelper/windowsStart.hxx 
b/onlineupdate/inc/winhelper/windowsStart.hxx
index 5baedc840416..e34e7d15ca22 100644
--- a/onlineupdate/inc/winhelper/windowsStart.hxx
+++ b/onlineupdate/inc/winhelper/windowsStart.hxx
@@ -3,10 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifdef XP_WIN
+#ifdef _WIN32
 #include 
-#else
-#include 
 #endif
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl

2017-08-07 Thread Caolán McNamara

 include/vcl/layout.hxx  |   18 --
 include/vcl/vclenum.hxx |   19 +++
 2 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit aa084cc1dcb518ffc1984e122abbf4401c4d0ce0
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 6 15:38:41 2017 +0100

move these non-layout enums to vclenum

Change-Id: Ie6dad53d1b8511b03c953d49b7a9f5d6f66ed56a
Reviewed-on: https://gerrit.libreoffice.org/40850
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index e9475b3d4630..2c0f00fe7a4b 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -610,24 +610,6 @@ public:
 bool set_property(const OString &rKey, const OUString &rValue);
 };
 
-enum class VclButtonsType
-{
-NONE,
-Ok,
-Close,
-Cancel,
-YesNo,
-OkCancel
-};
-
-enum class VclMessageType
-{
-Info,
-Warning,
-Question,
-Error
-};
-
 class VCL_DLLPUBLIC MessageDialog : public Dialog
 {
 private:
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 95e977c696dd..15711cb9ea04 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -237,6 +237,25 @@ enum VclResponseType
 RET_HELP= 10
 };
 
+enum class VclButtonsType
+{
+NONE,
+Ok,
+Close,
+Cancel,
+YesNo,
+OkCancel
+};
+
+enum class VclMessageType
+{
+Info,
+Warning,
+Question,
+Error
+};
+
+
 #endif // INCLUDED_VCL_VCLENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerfilter/source

2017-08-07 Thread Justin Luth

 writerfilter/source/rtftok/rtftokenizer.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0342c5e8086c8200ecadbe9d52dd4ef6a093effb
Author: Justin Luth 
Date:   Mon Aug 7 15:33:52 2017 -0400

wrong word in comment: should be signal instead of single.

...confirmed by the similar comment immediately before it.

Change-Id: Id334a81bb9078a761d233631639c007b7bf2c17f
Reviewed-on: https://gerrit.libreoffice.org/40855
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx 
b/writerfilter/source/rtftok/rtftokenizer.hxx
index 343e597720d0..19c26d8d196b 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -39,7 +39,7 @@ public:
 }
 /// To be invoked by the pushState() callback to signal when the importer 
enters a group.
 void pushGroup();
-/// To be invoked by the popState() callback to single when the importer 
leaves a group.
+/// To be invoked by the popState() callback to signal when the importer 
leaves a group.
 void popGroup();
 OUString getPosition();
 std::size_t getGroupStart()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source include/editeng

2017-08-07 Thread Varun Dhall

 editeng/source/editeng/editdoc.cxx   |   20 -
 editeng/source/editeng/editdoc.hxx   |2 
 editeng/source/editeng/editobj.cxx   |  172 
 editeng/source/editeng/editobj2.hxx  |1 
 editeng/source/items/bulitem.cxx |  118 ---
 editeng/source/items/flditem.cxx |   36 ---
 editeng/source/items/frmitems.cxx|  308 -
 editeng/source/items/justifyitem.cxx |8 
 editeng/source/items/numitem.cxx |   12 -
 editeng/source/items/optitems.cxx|   19 -
 editeng/source/items/paraitem.cxx|  221 -
 editeng/source/items/textitem.cxx|  325 ---
 editeng/source/items/writingmodeitem.cxx |   12 -
 include/editeng/autokernitem.hxx |2 
 include/editeng/blinkitem.hxx|2 
 include/editeng/boxitem.hxx  |2 
 include/editeng/bulletitem.hxx   |3 
 include/editeng/charreliefitem.hxx   |2 
 include/editeng/charrotateitem.hxx   |4 
 include/editeng/charscaleitem.hxx|2 
 include/editeng/charsetcoloritem.hxx |2 
 include/editeng/cmapitem.hxx |2 
 include/editeng/colritem.hxx |2 
 include/editeng/emphasismarkitem.hxx |2 
 include/editeng/escapementitem.hxx   |2 
 include/editeng/flditem.hxx  |2 
 include/editeng/forbiddenruleitem.hxx|1 
 include/editeng/fwdtitem.hxx |2 
 include/editeng/hngpnctitem.hxx  |1 
 include/editeng/hyphenzoneitem.hxx   |2 
 include/editeng/justifyitem.hxx  |1 
 include/editeng/kernitem.hxx |2 
 include/editeng/langitem.hxx |2 
 include/editeng/lrspitem.hxx |2 
 include/editeng/lspcitem.hxx |2 
 include/editeng/nhypitem.hxx |2 
 include/editeng/nlbkitem.hxx |2 
 include/editeng/numitem.hxx  |2 
 include/editeng/opaqitem.hxx |2 
 include/editeng/optitems.hxx |2 
 include/editeng/orphitem.hxx |2 
 include/editeng/paravertalignitem.hxx|2 
 include/editeng/pbinitem.hxx |2 
 include/editeng/pgrditem.hxx |1 
 include/editeng/prntitem.hxx |2 
 include/editeng/protitem.hxx |2 
 include/editeng/prszitem.hxx |2 
 include/editeng/rsiditem.hxx |1 
 include/editeng/scriptspaceitem.hxx  |1 
 include/editeng/sizeitem.hxx |2 
 include/editeng/spltitem.hxx |2 
 include/editeng/tstpitem.hxx |2 
 include/editeng/twolinesitem.hxx |2 
 include/editeng/ulspitem.hxx |2 
 include/editeng/widwitem.hxx |2 
 include/editeng/writingmodeitem.hxx  |2 
 include/editeng/wrlmitem.hxx |2 
 57 files changed, 1339 deletions(-)

New commits:
commit 1e4b1e4a1aca3b333820b0a865997e6f62e80064
Author: Varun Dhall 
Date:   Wed Jul 26 01:13:31 2017 +0530

Removing unused SfxItemPool serialisation from editeng

Change-Id: I051201c272b7acdd48d54cc0c230f8b432196188
Reviewed-on: https://gerrit.libreoffice.org/40429
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index c324c8c35708..e443e81f53d1 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -3084,24 +3084,4 @@ EditEngineItemPool::~EditEngineItemPool()
 ClearDefaults();
 }
 
-SvStream& EditEngineItemPool::Store( SvStream& rStream ) const
-{
-// for a 3.1 export a hack has to be installed, as in there is a BUG in
-// SfxItemSet::Load, but not subsequently after 3.1.
-
-// The selected range must be kept after Store, because itemsets are not
-// stored until then...
-
-long nVersion = rStream.GetVersion();
-bool b31Format = nVersion && ( nVersion <= SOFFICE_FILEFORMAT_31 );
-
-EditEngineItemPool* pThis = const_cast(this);
-if ( b31Format )
-pThis->SetStoringRange( 3997, 4022 );
-else
-pThis->SetStoringRange( EE_ITEMS_START, EE_ITEMS_END );
-
-return SfxItemPool::Store( rStream );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index a2a8549ec632..40cbcd1ea720 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -839,8 +839,6 @@ public:
 EditEngineItemPool(bool bPersistenRefCounts);
 protected:
 virtual ~EditEngineItemPool() override;
-public:
-virtual SvStream&   Store(SvStream& rStream) const override;
 };
 
 #endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITDOC_HXX
diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index 50e516351503..0148fb280624 100644
--- a/e

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/qa svl/source

2017-08-07 Thread Caolán McNamara

 sc/qa/unit/data/slk/pass/numfmt-2.slk |1 +
 svl/source/numbers/zforscan.cxx   |   19 +++
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 12569ca783263be8797ff19b532a9f03c34b4c2a
Author: CaolÃ¡n McNamara 
Date:   Sat Aug 5 19:15:36 2017 +0100

ofz#2867 null deref

Reviewed-on: https://gerrit.libreoffice.org/40792
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 42b894f80a6d0c39bb0f7092eb204a15c22c4f38)

Change-Id: If856473683685d79d88b024f7fafa2920b403bb7
Reviewed-on: https://gerrit.libreoffice.org/40794
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/sc/qa/unit/data/slk/pass/numfmt-2.slk 
b/sc/qa/unit/data/slk/pass/numfmt-2.slk
new file mode 100644
index ..5989cdc3e64e
--- /dev/null
+++ b/sc/qa/unit/data/slk/pass/numfmt-2.slk
@@ -0,0 +1 @@
+P;Pÿ   ÿ  ÿ
ÿ  ÿ  dÿ Sÿ0
\ No newline at end of file
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 2f08c600730d..4098fc9e85b3 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -2503,17 +2503,20 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
 OUString& rStr = sStrArray[i];
 i++;
-nPos = nPos + sStrArray[i].getLength();
-nCounter++;
-while (i < nAnzStrings &&
-   sStrArray[i][0] == '0')
+if (i < nAnzStrings)
 {
-rStr += sStrArray[i];
 nPos = nPos + sStrArray[i].getLength();
-nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
-nAnzResStrings--;
 nCounter++;
-i++;
+while (i < nAnzStrings &&
+   sStrArray[i][0] == '0')
+{
+rStr += sStrArray[i];
+nPos = nPos + sStrArray[i].getLength();
+nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
+nAnzResStrings--;
+nCounter++;
+i++;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/auxiliary source/text

2017-08-07 Thread Olivier Hallot

 source/auxiliary/simpress.tree|2 
 source/text/sdraw/main0103.xhp|6 +-
 source/text/shared/optionen/01070500.xhp  |2 
 source/text/simpress/00/0403.xhp  |6 +-
 source/text/simpress/01/0308.xhp  |   68 +++---
 source/text/simpress/01/03150100.xhp  |   18 +++
 source/text/simpress/01/03150300.xhp  |6 +-
 source/text/simpress/01/03151000.xhp  |6 +-
 source/text/simpress/01/03151100.xhp  |   16 +++
 source/text/simpress/01/03151200.xhp  |6 +-
 source/text/simpress/01/0401.xhp  |8 +--
 source/text/simpress/01/0510.xhp  |2 
 source/text/simpress/guide/footer.xhp |   29 ++--
 source/text/simpress/guide/layers.xhp |2 
 source/text/simpress/guide/masterpage.xhp |   19 
 source/text/simpress/guide/printing.xhp   |4 -
 16 files changed, 100 insertions(+), 100 deletions(-)

New commits:
commit d08dda71a035dbaa6812e2f30dc18ec772fc5471
Author: Olivier Hallot 
Date:   Sun Aug 6 19:52:51 2017 -0300

tdf#111413 Terminology change: "Slide Master"

... and Master Pages are renamed to Master Slide(s)

Change-Id: I68c7d4f6e5196836ad4ce0e2411fcf8bc4ff0f69
Reviewed-on: https://gerrit.libreoffice.org/40816
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree
index 491920fa0..e2fc40d50 100644
--- a/source/auxiliary/simpress.tree
+++ b/source/auxiliary/simpress.tree
@@ -106,7 +106,7 @@
 Arranging, Aligning and 
Distributing Objects
 Changing the Slide 
Background Fill
 Adding a Header or a 
Footer to All Slides
-Applying a Slide 
Design to a Slide Master 
+Applying a Slide 
Design to a Master Slide
 Moving Objects


diff --git a/source/text/sdraw/main0103.xhp b/source/text/sdraw/main0103.xhp
index 0560fcb3a..b098cc85f 100644
--- a/source/text/sdraw/main0103.xhp
+++ b/source/text/sdraw/main0103.xhp
@@ -37,8 +37,8 @@
 Normal
 Switch to 
normal view of the page.
 
-Master
-Switch to the 
master page view.
+Master 
Slide
+Switch to the 
master slide view.
 
 
 
@@ -52,4 +52,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/shared/optionen/01070500.xhp 
b/source/text/shared/optionen/01070500.xhp
index 7ecb8c5c0..04191f5c7 100644
--- a/source/text/shared/optionen/01070500.xhp
+++ b/source/text/shared/optionen/01070500.xhp
@@ -72,7 +72,7 @@
 Settings
 
 Use 
background cache
-Specifies 
whether to use the cache for displaying objects on the master page. 
This speeds up the display. Unmark the Use background cache option 
if you want to display changing contents on the master page.
+Specifies 
whether to use the cache for displaying objects on the master slide. 
This speeds up the display. Unmark the Use background cache option 
if you want to display changing contents on the master slide.
 
 Copy 
when moving
 If enabled, a copy is created when you move an object while holding 
down the CommandCtrl
 key. The same will apply for rotating and resizing the object. The 
original object will remain in its current position and size.
diff --git a/source/text/simpress/00/0403.xhp 
b/source/text/simpress/00/0403.xhp
index 380d08326..7318a6fd8 100644
--- a/source/text/simpress/00/0403.xhp
+++ b/source/text/simpress/00/0403.xhp
@@ -54,7 +54,7 @@
 
 
 
-Choose 
View - Handout Master
+Choose 
View - Master Handout
 
 
 
@@ -86,8 +86,8 @@
 Choose 
View - Master
 
 Choose View - Slide Master 

-Choose View - Notes Master 
-Choose View - Master Elements 
+Choose View - Master Notes 
+Choose Slide - Master Elements 
 
 
 Choose 
Insert - Header and Footer
diff --git a/source/text/simpress/01/0308.xhp 
b/source/text/simpress/01/0308.xhp
index 960c6e2d8..b8f0e20da 100644
--- a/source/text/simpress/01/0308.xhp
+++ b/source/text/simpress/01/0308.xhp
@@ -18,40 +18,40 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-
-  
-Normal View
-/text/simpress/01/0308.xhp
-  
-
-
-
-
-
-
-
-  normal view;presentations
-
-
-
-
-
-
-Normal
-Switches to normal view, where you can create and edit 
your slides.
-
-
-
-
-some context menu commands in Normal 
viewSlide command in context menu
-
-Opens a submenu with commands for the current 
slide.Display Background of Master
-
-When enabled, the current slide shows the background of the 
slide master.Display Objects from Master
-
-When enabled, the current slide shows the objects of the 
slide master.Set Background Picture for 
Slidei83563
-
-Opens a file dialog to select a picture. The picture will 
be scaled and inserted on the background of the current slide master. Use 
Format - Slide/Page - Background to remove the picture.
+ 
+ 
+ Normal View
+ /text/simpress/01/0308.xhp
+ 
+ 
+
+ 
+
+
+ 
+ 
+ normal view;presentations
+ 
+
+ 
+ 
+ 
+
+ Normal
+ Switches

[Libreoffice-commits] core.git: helpcontent2

2017-08-07 Thread Olivier Hallot

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e177ed2468e535a943dd271f242eca412346f3a
Author: Olivier Hallot 
Date:   Sun Aug 6 19:52:51 2017 -0300

Updated core
Project: help  d08dda71a035dbaa6812e2f30dc18ec772fc5471

tdf#111413 Terminology change: "Slide Master"

... and Master Pages are renamed to Master Slide(s)

Change-Id: I68c7d4f6e5196836ad4ce0e2411fcf8bc4ff0f69
Reviewed-on: https://gerrit.libreoffice.org/40816
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 4d8687d90b58..d08dda71a035 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4d8687d90b58f8bf00bd31c913bc47970e975ca4
+Subproject commit d08dda71a035dbaa6812e2f30dc18ec772fc5471
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About tdf#111432 leaks memory with CFString and other MacOs stuff

2017-08-07 Thread julien2412

Reading more, "CFArrayGuard arrGuard(subs);" line 85 (see
https://opengrok.libreoffice.org/xref/core/sal/osl/unx/osxlocale.cxx#85)
allows to release automatically the variable when leaving the scope.

So only the "static" question remains.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-tdf-111432-leaks-memory-with-CFString-and-other-MacOs-stuff-tp4220037p4220038.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/qa svl/source

2017-08-07 Thread Caolán McNamara

 sc/qa/unit/data/slk/pass/numfmt-2.slk |1 +
 svl/source/numbers/zforscan.cxx   |   19 +++
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit bd0c6fb52bd7af947936f736c7357200e2d17fc2
Author: CaolÃ¡n McNamara 
Date:   Sat Aug 5 19:15:36 2017 +0100

ofz#2867 null deref

Reviewed-on: https://gerrit.libreoffice.org/40792
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 42b894f80a6d0c39bb0f7092eb204a15c22c4f38)

Change-Id: If856473683685d79d88b024f7fafa2920b403bb7
Reviewed-on: https://gerrit.libreoffice.org/40793
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sc/qa/unit/data/slk/pass/numfmt-2.slk 
b/sc/qa/unit/data/slk/pass/numfmt-2.slk
new file mode 100644
index ..5989cdc3e64e
--- /dev/null
+++ b/sc/qa/unit/data/slk/pass/numfmt-2.slk
@@ -0,0 +1 @@
+P;Pÿ   ÿ  ÿ
ÿ  ÿ  dÿ Sÿ0
\ No newline at end of file
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index e1187ffae7dd..5a5019d12e7c 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -2562,17 +2562,20 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
 OUString& rStr = sStrArray[i];
 i++;
-nPos = nPos + sStrArray[i].getLength();
-nCounter++;
-while (i < nAnzStrings &&
-   sStrArray[i][0] == '0')
+if (i < nAnzStrings)
 {
-rStr += sStrArray[i];
 nPos = nPos + sStrArray[i].getLength();
-nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
-nAnzResStrings--;
 nCounter++;
-i++;
+while (i < nAnzStrings &&
+   sStrArray[i][0] == '0')
+{
+rStr += sStrArray[i];
+nPos = nPos + sStrArray[i].getLength();
+nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
+nAnzResStrings--;
+nCounter++;
+i++;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

About tdf#111432 leaks memory with CFString and other MacOs stuff

2017-08-07 Thread julien2412

Hi,

Following tdf#111432 (AddTempDevFont(const OUString& rFontFileURL) leaks
memory on invocation
https://bugs.documentfoundation.org/show_bug.cgi?id=111432, I'm searching
some similar cases.
First one I noticed is "subs" in "macosx_getLocale" method (see
https://opengrok.libreoffice.org/xref/core/sal/osl/unx/osxlocale.cxx#82)
which should be CFReleased before returning.

But in this same method, I wonder if it'd be ok to make "sref" (see
https://opengrok.libreoffice.org/xref/core/sal/osl/unx/osxlocale.cxx#77)
static in order to avoid calling n times "getProcessLocale" method (defined
some lines above).

Any thoughts?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-tdf-111432-leaks-memory-with-CFString-and-other-MacOs-stuff-tp4220037.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sal/textenc

2017-08-07 Thread Caolán McNamara

 sal/textenc/tcvtkr6.tab |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 80e66a46e45daa9a2842f501195018541873275d
Author: CaolÃ¡n McNamara 
Date:   Fri Aug 4 09:45:40 2017 +0100

ofz#2852 korean table entries start at 0xF not 0x7

Change-Id: Iaf3ed48d0eb0e5a57770af057c565a7310bb96d4
Reviewed-on: https://gerrit.libreoffice.org/40762
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index de68d624f8b2..e03f3405e811 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -388,7 +388,7 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] =
 { 0x07, 0xFE, aImplUniToDBCSTab_KSC5601_5D },   /* 0x5D */
 { 0x02, 0xFB, aImplUniToDBCSTab_KSC5601_5E },   /* 0x5E */
 { 0x01, 0xFF, aImplUniToDBCSTab_KSC5601_5F },   /* 0x5F */
-{ 0x07, 0xFB, aImplUniToDBCSTab_KSC5601_60 },   /* 0x60 */
+{ 0x0F, 0xFB, aImplUniToDBCSTab_KSC5601_60 },   /* 0x60 */
 { 0x01, 0xFF, aImplUniToDBCSTab_KSC5601_61 },   /* 0x61 */
 { 0x00, 0xFF, aImplUniToDBCSTab_KSC5601_62 },   /* 0x62 */
 { 0x01, 0xF7, aImplUniToDBCSTab_KSC5601_63 },   /* 0x63 */
@@ -1020,7 +1020,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] =
 { 0x07, 0xFE, aImplUniToDBCSTab_JOHAB_5D }, /* 0x5D */
 { 0x02, 0xFB, aImplUniToDBCSTab_JOHAB_5E }, /* 0x5E */
 { 0x01, 0xFF, aImplUniToDBCSTab_JOHAB_5F }, /* 0x5F */
-{ 0x07, 0xFB, aImplUniToDBCSTab_JOHAB_60 }, /* 0x60 */
+{ 0x0F, 0xFB, aImplUniToDBCSTab_JOHAB_60 }, /* 0x60 */
 { 0x01, 0xFF, aImplUniToDBCSTab_JOHAB_61 }, /* 0x61 */
 { 0x00, 0xFF, aImplUniToDBCSTab_JOHAB_62 }, /* 0x62 */
 { 0x01, 0xF7, aImplUniToDBCSTab_JOHAB_63 }, /* 0x63 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sal/textenc

2017-08-07 Thread Caolán McNamara

 sal/textenc/tcvtkr6.tab |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c28ceacf6a1aedb4c965a513c72f7570244fbb6f
Author: CaolÃ¡n McNamara 
Date:   Fri Aug 4 09:45:40 2017 +0100

ofz#2852 korean table entries start at 0xF not 0x7

Change-Id: Iaf3ed48d0eb0e5a57770af057c565a7310bb96d4
Reviewed-on: https://gerrit.libreoffice.org/40763
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index de68d624f8b2..e03f3405e811 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -388,7 +388,7 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] =
 { 0x07, 0xFE, aImplUniToDBCSTab_KSC5601_5D },   /* 0x5D */
 { 0x02, 0xFB, aImplUniToDBCSTab_KSC5601_5E },   /* 0x5E */
 { 0x01, 0xFF, aImplUniToDBCSTab_KSC5601_5F },   /* 0x5F */
-{ 0x07, 0xFB, aImplUniToDBCSTab_KSC5601_60 },   /* 0x60 */
+{ 0x0F, 0xFB, aImplUniToDBCSTab_KSC5601_60 },   /* 0x60 */
 { 0x01, 0xFF, aImplUniToDBCSTab_KSC5601_61 },   /* 0x61 */
 { 0x00, 0xFF, aImplUniToDBCSTab_KSC5601_62 },   /* 0x62 */
 { 0x01, 0xF7, aImplUniToDBCSTab_KSC5601_63 },   /* 0x63 */
@@ -1020,7 +1020,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] =
 { 0x07, 0xFE, aImplUniToDBCSTab_JOHAB_5D }, /* 0x5D */
 { 0x02, 0xFB, aImplUniToDBCSTab_JOHAB_5E }, /* 0x5E */
 { 0x01, 0xFF, aImplUniToDBCSTab_JOHAB_5F }, /* 0x5F */
-{ 0x07, 0xFB, aImplUniToDBCSTab_JOHAB_60 }, /* 0x60 */
+{ 0x0F, 0xFB, aImplUniToDBCSTab_JOHAB_60 }, /* 0x60 */
 { 0x01, 0xFF, aImplUniToDBCSTab_JOHAB_61 }, /* 0x61 */
 { 0x00, 0xFF, aImplUniToDBCSTab_JOHAB_62 }, /* 0x62 */
 { 0x01, 0xF7, aImplUniToDBCSTab_JOHAB_63 }, /* 0x63 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/qa svl/source

2017-08-07 Thread Caolán McNamara

 sc/qa/unit/data/slk/pass/numfmt.slk |2 ++
 svl/source/numbers/zforscan.cxx |   19 +++
 2 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 40ca8f569c9c7f24e94af3688ff32f5679c2f8f8
Author: CaolÃ¡n McNamara 
Date:   Wed Aug 2 09:39:43 2017 +0100

Resolves: ofz#2833 null deref

Change-Id: I021a716aa76d430a1d3c6fac2dddec4daa01e563
Reviewed-on: https://gerrit.libreoffice.org/40669
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sc/qa/unit/data/slk/pass/numfmt.slk 
b/sc/qa/unit/data/slk/pass/numfmt.slk
new file mode 100644
index ..85ea7b65c8f2
--- /dev/null
+++ b/sc/qa/unit/data/slk/pass/numfmt.slk
@@ -0,0 +1,2 @@
+
+P;Pÿ   s  ÿ0   
   0
\ No newline at end of file
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 363a6219137e..2f08c600730d 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -2350,17 +2350,20 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
 OUString& rStr = sStrArray[i];
 i++;
-nPos = nPos + sStrArray[i].getLength();
-nCounter++;
-while (i < nAnzStrings &&
-   sStrArray[i][0] == '0')
+if (i < nAnzStrings)
 {
-rStr += sStrArray[i];
 nPos = nPos + sStrArray[i].getLength();
-nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
-nAnzResStrings--;
 nCounter++;
-i++;
+while (i < nAnzStrings &&
+   sStrArray[i][0] == '0')
+{
+rStr += sStrArray[i];
+nPos = nPos + sStrArray[i].getLength();
+nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
+nAnzResStrings--;
+nCounter++;
+i++;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/qa svl/source

2017-08-07 Thread Caolán McNamara

 sc/qa/unit/data/slk/pass/numfmt.slk |2 ++
 svl/source/numbers/zforscan.cxx |   19 +++
 2 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 05413fb2eace3264a1777e95c44aab3f40ca651e
Author: CaolÃ¡n McNamara 
Date:   Wed Aug 2 09:39:43 2017 +0100

Resolves: ofz#2833 null deref

Change-Id: I021a716aa76d430a1d3c6fac2dddec4daa01e563
Reviewed-on: https://gerrit.libreoffice.org/40668
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sc/qa/unit/data/slk/pass/numfmt.slk 
b/sc/qa/unit/data/slk/pass/numfmt.slk
new file mode 100644
index ..85ea7b65c8f2
--- /dev/null
+++ b/sc/qa/unit/data/slk/pass/numfmt.slk
@@ -0,0 +1,2 @@
+
+P;Pÿ   s  ÿ0   
   0
\ No newline at end of file
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 16d5f31bd65b..e1187ffae7dd 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -2409,17 +2409,20 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
 OUString& rStr = sStrArray[i];
 i++;
-nPos = nPos + sStrArray[i].getLength();
-nCounter++;
-while (i < nAnzStrings &&
-   sStrArray[i][0] == '0')
+if (i < nAnzStrings)
 {
-rStr += sStrArray[i];
 nPos = nPos + sStrArray[i].getLength();
-nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
-nAnzResStrings--;
 nCounter++;
-i++;
+while (i < nAnzStrings &&
+   sStrArray[i][0] == '0')
+{
+rStr += sStrArray[i];
+nPos = nPos + sStrArray[i].getLength();
+nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
+nAnzResStrings--;
+nCounter++;
+i++;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - hwpfilter/source

2017-08-07 Thread Caolán McNamara

 hwpfilter/source/hwpread.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit d269f530cc834507f205374727c20cc5992e2213
Author: CaolÃ¡n McNamara 
Date:   Thu Aug 3 14:37:30 2017 +0100

ofz#2846 null deref

Change-Id: I88b61d7a4faaed118db8df6f99cef08310c1f2eb
Reviewed-on: https://gerrit.libreoffice.org/40725
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 90564df487b9..74edfda45845 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -428,6 +428,13 @@ bool Picture::Read(HWPFile & hwpf)
 UpdateBBox(this);
 if( pictype != PICTYPE_DRAW )
 style.cell = reserved3;
+else
+{
+//picinfo.picun read above is unioned with
+//picinfo.picdraw and so wrote to the hdo pointer
+//value, which is definitely not useful to us
+picinfo.picdraw.hdo = nullptr;
+}
 
 if (follow_block_size != 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - hwpfilter/source

2017-08-07 Thread Caolán McNamara

 hwpfilter/source/hwpread.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit c349ea47a72c92d39aed4649afe493dc7911229e
Author: CaolÃ¡n McNamara 
Date:   Thu Aug 3 14:37:30 2017 +0100

ofz#2846 null deref

Change-Id: I88b61d7a4faaed118db8df6f99cef08310c1f2eb
Reviewed-on: https://gerrit.libreoffice.org/40726
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 608fd0371da2..72aee0f3974a 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -431,6 +431,13 @@ bool Picture::Read(HWPFile & hwpf)
 UpdateBBox(this);
 if( pictype != PICTYPE_DRAW )
 style.cell = reserved3;
+else
+{
+//picinfo.picun read above is unioned with
+//picinfo.picdraw and so wrote to the hdo pointer
+//value, which is definitely not useful to us
+picinfo.picdraw.hdo = nullptr;
+}
 
 if (follow_block_size != 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/uiconfig

2017-08-07 Thread Caolán McNamara

 sw/uiconfig/swriter/ui/insertbreak.ui |2 +-
 sw/uiconfig/swriter/ui/inserttable.ui |   28 +++-
 2 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit 19da5bcd620f94bc709cff87a6872a9bd53bee8f
Author: CaolÃ¡n McNamara 
Date:   Mon Aug 7 19:21:45 2017 +0100

tweak insert table dialog to load the same with native gtk builder

we can't share adjustments between widgets where we just wanted
to share initial settings and not subsequent changed adjustment
settings

and set default responses

Change-Id: I9c15f97a87b0a631e414cc0d3b76f7447fc9ecd3
Reviewed-on: https://gerrit.libreoffice.org/40849
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui 
b/sw/uiconfig/swriter/ui/insertbreak.ui
index 12e2f94907b7..2cd012930905 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -236,7 +236,7 @@
   
 
 
-  ok
+  ok
   cancel
   help
 
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui 
b/sw/uiconfig/swriter/ui/inserttable.ui
index f02c02f1d992..207b8e77 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -9,10 +9,25 @@
 1
 10
   
+  
+1
+99
+2
+1
+10
+  
+  
+1
+99
+1
+1
+10
+  
   
 False
 6
 Insert Table
+True
 dialog
 
   
@@ -153,6 +168,7 @@
 1
 adjustment1
 1
+2
   
   
 1
@@ -180,8 +196,9 @@
 â¢
 out
 1
-adjustment1
+adjustment2
 1
+2
   
   
 3
@@ -304,9 +321,10 @@
 True
 â¢
 1
-adjustment1
+adjustment3
 1
 if-valid
+1
   
   
 1
@@ -380,8 +398,8 @@
 
 
   ok
-  cancel
-  help
+  cancel
+  help
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: drawinglayer/source include/svx offapi/com sw/inc sw/source

2017-08-07 Thread Andrea Gelmini

 drawinglayer/source/tools/emfpstringformat.cxx |2 +-
 include/svx/framelink.hxx  |4 ++--
 offapi/com/sun/star/text/TimeDisplayFormat.idl |4 ++--
 sw/inc/strings.hrc |2 +-
 sw/source/uibase/uno/unotxdoc.cxx  |2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c81d7eb7cd5ee6082a0252cec558c59d242b07ea
Author: Andrea Gelmini 
Date:   Mon Aug 7 16:47:41 2017 +0200

Fix typos

Change-Id: I4969e9e66de602a8c79774460a0215ef9d150372
Reviewed-on: https://gerrit.libreoffice.org/40795
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/drawinglayer/source/tools/emfpstringformat.cxx 
b/drawinglayer/source/tools/emfpstringformat.cxx
index 3415365cbe0e..0f0958da5e1d 100644
--- a/drawinglayer/source/tools/emfpstringformat.cxx
+++ b/drawinglayer/source/tools/emfpstringformat.cxx
@@ -48,7 +48,7 @@ namespace emfplushelper
 
s.ReadUInt32(stringAlignment).ReadUInt32(lineAlign).ReadUInt32(digitSubstitution).ReadUInt32(digitLanguage);
 
s.ReadFloat(firstTabOffset).ReadInt32(hotkeyPrefix).ReadFloat(leadingMargin).ReadFloat(trailingMargin).ReadFloat(tracking);
 s.ReadInt32(trimming).ReadInt32(tabStopCount).ReadInt32(rangeCount);
-// keep olny the last 16 Bits of language
+// keep only the last 16 bits of language
 language >>= 16;
 digitLanguage >>= 16;
 SAL_WARN_IF((header >> 12) != 0xdbc01, "cppcanvas.emf", "Invalid 
header - not 0xdbc01");
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index b0c11e2b5f8c..f79b5ed84301 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -298,7 +298,7 @@ SVX_DLLPUBLIC long GetTLDiagOffset( long nVerOffs, long 
nDiagOffs, double fAngle
 frame borders). Of course this function can be used for vertical frame
 borders as well.
 
-The follong picture shows the meaning of all passed parameters:
+The following picture shows the meaning of all passed parameters:
 
   \  rTFromT  /
 \   |   /
@@ -354,7 +354,7 @@ SVX_DLLPUBLIC bool CheckFrameBorderConnectable(
 border coming from top-right, connected to the left end of rBorder (and
 therefore a diagonal frame border).
 
-The follong picture shows the meaning of all passed parameters:
+The following picture shows the meaning of all passed parameters:
 
  rLFromT  /   \  rRFromT
 |   /   \   |
diff --git a/offapi/com/sun/star/text/TimeDisplayFormat.idl 
b/offapi/com/sun/star/text/TimeDisplayFormat.idl
index 986ed35421de..adbf16ea2818 100644
--- a/offapi/com/sun/star/text/TimeDisplayFormat.idl
+++ b/offapi/com/sun/star/text/TimeDisplayFormat.idl
@@ -24,8 +24,8 @@
  module com {  module sun {  module star {  module text {
 
 
-/** This constants define how a time field is formatted before it is displayed.
-The formate may also depend on the system or document locale.
+/** These constants define how a time field is formatted before it is 
displayed.
+The format may also depend on the system or document locale.
 
 @deprecated
  */
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 2ecbf8eeb119..18b0dadd0c72 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -937,7 +937,7 @@
 /*
 Description: path name
  */
-// Formate FileName
+// Format FileName
 #define FMT_FF_NAME NC_("FMT_FF_NAME", "File name")
 #define FMT_FF_NAME_NOEXT   NC_("FMT_FF_NAME_NOEXT", "File 
name without extension")
 #define FMT_FF_PATHNAME NC_("FMT_FF_PATHNAME", 
"Path/File name")
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 29f8582365e4..7c4162a9a2f1 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3170,7 +3170,7 @@ void SwXTextDocument::setClientZoom(int nTilePixelWidth_, 
int /*nTilePixelHeight
 {
 // Here we set the zoom value as it has been set by the user in the client.
 // This value is used in postMouseEvent and setGraphicSelection methods
-// for in place chart editing. We assume that x and y scale is rougly
+// for in place chart editing. We assume that x and y scale is roughly
 // the same.
 // Indeed we could set mnTilePixelWidth, mnTilePixelHeight, 
mnTileTwipWidth,
 // mnTileTwipHeight data members of this class but they are not very useful
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests sd/source test/source

2017-08-07 Thread Andrea Gelmini

 qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java |2 +-
 sd/source/ui/inc/DrawViewShell.hxx|4 ++--
 test/source/sheet/xspreadsheets.cxx   |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1dddfbbdce43203284bdf874c2ef5662d9cacb51
Author: Andrea Gelmini 
Date:   Mon Aug 7 17:17:08 2017 +0200

Fix typos

Change-Id: I1ba1886b47f89916be387603d5cb959ddd5f9e84
Reviewed-on: https://gerrit.libreoffice.org/40844
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java 
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
index bc0de990ced7..9150a3ac0a39 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
@@ -27,7 +27,7 @@ public class _XAccessibleAction extends lib.MultiMethodTest {
 
 /**
  * calls the method and stores the result in the 
- * variable count. Is OK if no excpetion occurs
+ * variable count. It is OK if no exception occurs
  */
 
 public void _getAccessibleActionCount() {
diff --git a/sd/source/ui/inc/DrawViewShell.hxx 
b/sd/source/ui/inc/DrawViewShell.hxx
index cc71ee554cbf..b4e7ddeb0207 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -327,8 +327,8 @@ public:
 @param nId
 The id is expected to be a number between zero (inclusive) and
 the number of layers as returned by the
-GetTabLayerCount method (exclusive).  Note that
-Invalid values are ignored.  No excpetion is thrown in that case.
+GetTabLayerCount method (exclusive). Note that
+Invalid values are ignored. No exception is thrown in that case.
 */
 void SetActiveTabLayerIndex (int nId);
 
diff --git a/test/source/sheet/xspreadsheets.cxx 
b/test/source/sheet/xspreadsheets.cxx
index 8c59258c1711..17e1a372ce9a 100644
--- a/test/source/sheet/xspreadsheets.cxx
+++ b/test/source/sheet/xspreadsheets.cxx
@@ -37,7 +37,7 @@ void XSpreadsheets::testInsertNewByNameBadName()
 {
 uno::Reference< sheet::XSpreadsheets > xSpreadsheets(init(), 
UNO_QUERY_THROW);
 
-CPPUNIT_ASSERT_THROW_MESSAGE("No excpetion thrown",
+CPPUNIT_ASSERT_THROW_MESSAGE("No exception thrown",
  xSpreadsheets->insertNewByName("$%#/?\\", 0),
  uno::RuntimeException);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/quartz

2017-08-07 Thread Julien Nabet

 vcl/quartz/salgdi.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bc5bd201609ae197f320823880e66187ae94c98a
Author: Julien Nabet 
Date:   Mon Aug 7 19:31:58 2017 +0200

tdf#111432: fix leaks in AddTempDevFont with CFRelease

Change-Id: I11183b7fd21d2398de9e5f5854763cef96963caa
Reviewed-on: https://gerrit.libreoffice.org/40845
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index b1d393876e16..edd38fa4559b 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -300,6 +300,8 @@ static bool AddTempDevFont(const OUString& rFontFileURL)
 {
 CFRelease(error);
 }
+CFRelease(rFontPath);
+CFRelease(rFontURL);
 
 return success;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/2.1.3-rc1'

2017-08-07 Thread Andras Timar

Tag '2.1.3-rc1' created by Andras Timar  at 
2017-08-07 17:08 +

2.1.3-rc1

Changes since 2.1.2-71:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - 2 commits - debian/changelog debian/control loolwsd.spec.in

2017-08-07 Thread Andras Timar

 debian/changelog |6 ++
 debian/control   |2 +-
 loolwsd.spec.in  |4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 160197f70710c6c24b34a7dc8d7d13c83f5c7db1
Author: Andras Timar 
Date:   Mon Aug 7 19:07:59 2017 +0200

Bump version for packages 2.1.3-2

Change-Id: I492e51edbbaaae9c9022fa90c684be486727e9f0

diff --git a/debian/changelog b/debian/changelog
index 561781b7..6926c517 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.3-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool21
+
+ -- Andras Timar   Tue, 07 Aug 2017 18:00:00 +0100
+
 loolwsd (2.1.3-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool21
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 1ef3fbfa..8544465b 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:2%{?dist}
 Vendor: Collabora
 Summary:LibreOffice On-Line WebSocket Daemon
 License:MPL
commit 0a01372e9fdbe4bdb72bf9ab4b4bd981cc3879bc
Author: Andras Timar 
Date:   Mon Aug 7 19:05:55 2017 +0200

Requires: Collabora Office 5.3-22

Change-Id: I4182d840a3caca85a08c033d24877e34227a229d

diff --git a/debian/control b/debian/control
index c5927ebb..37b94dde 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, 
libdbus-glib-1-2, cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 
5.3.10.21), collaboraofficebasis5.3-core (>= 5.3.10.21), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.21), 
collaboraofficebasis5.3-images (>= 5.3.10.21), collaboraofficebasis5.3-impress 
(>= 5.3.10.21), collaboraofficebasis5.3-ooofonts (>= 5.3.10.21), 
collaboraofficebasis5.3-writer (>= 5.3.10.21), collaboraoffice5.3 (>= 
5.3.10.21), collaboraoffice5.3-ure (>= 5.3.10.21), 
collaboraofficebasis5.3-en-us (>= 5.3.10.21), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.21), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.21), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.21), collaboraofficebasis5.3-draw 
(>= 5.3.10.21), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.21)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, 
libdbus-glib-1-2, cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 
5.3.10.22), collaboraofficebasis5.3-core (>= 5.3.10.22), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.22), 
collaboraofficebasis5.3-images (>= 5.3.10.22), collaboraofficebasis5.3-impress 
(>= 5.3.10.22), collaboraofficebasis5.3-ooofonts (>= 5.3.10.22), 
collaboraofficebasis5.3-writer (>= 5.3.10.22), collaboraoffice5.3 (>= 
5.3.10.22), collaboraoffice5.3-ure (>= 5.3.10.22), 
collaboraofficebasis5.3-en-us (>= 5.3.10.22), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.22), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.22), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.22), collaboraofficebasis5.3-draw 
(>= 5.3.10.22), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.22)
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 1df1c5aa..1ef3fbfa 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -26,7 +26,7 @@ BuildRequires:  libcap-progs systemd-rpm-macros
 %endif
 %endif
 
-Requires:   collaboraoffice5.3 >= 5.3.10.21 collaboraoffice5.3-ure >= 
5.3.10.21 collaboraofficebasis5.3-core >= 5.3.10.21 
collaboraofficebasis5.3-writer >= 5.3.10.21 collaboraofficebasis5.3-impress >= 
5.3.10.21 collaboraofficebasis5.3-graphicfilter >= 5.3.10.21 
collaboraofficebasis5.3-en-US >= 5.3.10.21 collaboraofficebasis5.3-calc >= 
5.3.10.21 collaboraofficebasis5.3-en-US-res >= 5.3.10.21 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.21 
collaboraofficebasis5.3-ooofonts >= 5.3.10.21 collaboraofficebasis5.3-images >= 
5.3.10.21 collaboraofficebasis5.3-noto-fonts >= 5.3.10.21 
collaboraofficebasis5.3-draw >= 5.3.10.21 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.21
+Requires:   collaboraoffice5.3 >= 5.3.10.22 collaboraoffice5.3-ure >= 
5.3.10.22 collaboraofficebasis5.3-core >= 5.3.10.22 
collaboraofficebasis5.3-writer >= 5.3.10.22 collaboraofficebasis5.3-impress >= 
5.3.10.22 collaboraofficebasis5.3-graphicfilter >= 5.3.10.22 
collaboraofficebasis5.3-en-US >= 5.3.10.22 collaboraofficebasis5.3-calc >= 
5.3.10.22 collaboraofficebasis5.3-en-US-res >= 5.3.10.22 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.22 
collaboraofficebasis5.3-ooofonts >= 5.3.10.22 collaboraofficebasis5.3-images >= 
5.3.10.22 collaboraofficebasis

[Libreoffice-commits] core.git: offapi/com sc/inc sc/qa sc/source

2017-08-07 Thread Tamas Bunth

 offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl |4 ++
 sc/inc/document.hxx   |7 ++--
 sc/qa/unit/subsequent_filters-test.cxx|1 
 sc/qa/unit/ucalc.cxx  |2 -
 sc/source/core/data/documen2.cxx  |2 -
 sc/source/core/data/document.cxx  |7 
 sc/source/core/data/table1.cxx|4 +-
 sc/source/filter/excel/read.cxx   |2 -
 sc/source/filter/oox/workbookhelper.cxx   |4 +-
 sc/source/ui/docshell/docfunc.cxx |2 -
 sc/source/ui/docshell/docsh.cxx   |4 +-
 sc/source/ui/docshell/externalrefmgr.cxx  |2 -
 sc/source/ui/unoobj/docuno.cxx|   10 +++
 sc/source/ui/vba/vbaapplication.cxx   |   20 ++
 sc/source/ui/vba/vbaapplication.hxx   |1 
 15 files changed, 52 insertions(+), 20 deletions(-)

New commits:
commit 4aca927040f67c2b68f412234e37ec740346a005
Author: Tamas Bunth 
Date:   Wed Jul 26 13:03:03 2017 +0200

oovbaapi: screenUpdating, do not adjust height

Do not adjust row height if screenUpdating false, because it consumes
significant time.

Also change IsAdjustHeightEnabled boolean to a counter so it can be used
several times in an overlapping manner too.

Change-Id: Ie5c894481f3c1b4e07175164aac8303e504779ce
Reviewed-on: https://gerrit.libreoffice.org/40443
Tested-by: Jenkins 
Reviewed-by: TamÃ¡s Bunth 

diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl 
b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
index 7487f6a5bb03..5f8d4fa89858 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
@@ -179,6 +179,10 @@ published service SpreadsheetDocumentSettings
 /** specifies whether the automatic adjustment of the row height is
 enabled.
 
+This boolean is actually a counter internally, of the number of 
times
+something has locked the height, so setting it to false will only 
perform one
+unlock operation, and might leave it still locked
+
 @since OOo 3.0
  */
 [optional, property] boolean IsAdjustHeightEnabled;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 2cc5f02ed70e..6071fe642c45 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -471,12 +471,12 @@ private:
 
 boolbInUnoBroadcast;
 boolbInUnoListenerCall;
+sal_uInt32  nAdjustHeightLock;
 formula::FormulaGrammar::Grammar  eGrammar;
 
 mutable boolbStyleSheetUsageInvalid;
 
 boolmbUndoEnabled:1;
-boolmbAdjustHeightEnabled:1;
 boolmbExecuteLinkEnabled:1;
 boolmbChangeReadOnlyEnabled:1;// allow changes in 
read-only document (for API import filters)
 boolmbStreamValidLocked:1;
@@ -1377,8 +1377,9 @@ public:
 bool   IsUndoEnabled() const   { return 
mbUndoEnabled; }
 SC_DLLPUBLIC void  EnableUndo( bool bVal );
 
-bool IsAdjustHeightEnabled() const   { 
return mbAdjustHeightEnabled; }
-void EnableAdjustHeight( bool bVal ) { 
mbAdjustHeightEnabled = bVal; }
+bool IsAdjustHeightLocked() const   { 
return nAdjustHeightLock != 0; }
+void LockAdjustHeight()  { 
++nAdjustHeightLock; }
+SC_DLLPUBLIC voidUnlockAdjustHeight();
 bool IsExecuteLinkEnabled() const{ 
return mbExecuteLinkEnabled; }
 void EnableExecuteLink( bool bVal )  { 
mbExecuteLinkEnabled = bVal; }
 bool IsChangeReadOnlyEnabled() const { 
return mbChangeReadOnlyEnabled; }
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index f8f6548984b5..1e136675b2e5 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -3135,7 +3135,6 @@ void ScFiltersTest::testOptimalHeightReset()
 SCTAB nTab = 0;
 SCROW nRow = 0;
 ScDocument& rDoc = xDocSh->GetDocument();
-rDoc.EnableAdjustHeight( true );
 // open document in read/write mode ( otherwise optimal height stuff won't
 // be triggered ) *and* you can't delete cell contents.
 int nHeight = sc::TwipsToHMM ( rDoc.GetRowHeight(nRow, nTab, false) );
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 89e90d00f8cc..41b6c32038d4 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6539,7 +6539,7 @

[Libreoffice-commits] core.git: writerperfect/source

2017-08-07 Thread Miklos Vajna

 writerperfect/source/writer/EPUBPackage.cxx |   37 
 writerperfect/source/writer/EPUBPackage.hxx |5 ++-
 2 files changed, 35 insertions(+), 7 deletions(-)

New commits:
commit 98a7251b24c9f42bdb333bacbe06a2821e6942f2
Author: Miklos Vajna 
Date:   Mon Aug 7 16:29:45 2017 +0200

EPUB export: start creating XML and CSS files

Though at the moment all of them are empty.

Change-Id: I4e53c81df2d709f06eb2a1df814b887181ae84c9
Reviewed-on: https://gerrit.libreoffice.org/40840
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/writerperfect/source/writer/EPUBPackage.cxx 
b/writerperfect/source/writer/EPUBPackage.cxx
index 54300c2fbf0a..060c3828a4de 100644
--- a/writerperfect/source/writer/EPUBPackage.cxx
+++ b/writerperfect/source/writer/EPUBPackage.cxx
@@ -9,23 +9,39 @@
 
 #include "EPUBPackage.hxx"
 
+#include 
+#include 
+
+#include 
+#include 
+
 using namespace com::sun::star;
 
 namespace writerperfect
 {
 
-EPUBPackage::EPUBPackage(const uno::Reference 
&xContext, const uno::Sequence &/*rDescriptor*/)
+EPUBPackage::EPUBPackage(const uno::Reference 
&xContext, const uno::Sequence &rDescriptor)
 : mxContext(xContext)
 {
+// Extract the output stream from the descriptor.
+utl::MediaDescriptor aMediaDesc(rDescriptor);
+auto xStream = 
aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STREAMFOROUTPUT(),
 uno::Reference());
+const sal_Int32 nOpenMode = embed::ElementModes::READWRITE | 
embed::ElementModes::TRUNCATE;
+
mxStorage.set(comphelper::OStorageHelper::GetStorageOfFormatFromStream(ZIP_STORAGE_FORMAT_STRING,
 xStream, nOpenMode, mxContext), uno::UNO_QUERY);
 }
 
 EPUBPackage::~EPUBPackage()
 {
+uno::Reference xTransactedObject(mxStorage, 
uno::UNO_QUERY);
+xTransactedObject->commit();
 }
 
 void EPUBPackage::openXMLFile(const char *pName)
 {
-SAL_WARN("writerperfect", "EPUBPackage::openXMLFile, " << pName << ": 
implement me");
+assert(pName);
+assert(!mxOutputStream.is());
+
+
mxOutputStream.set(mxStorage->openStreamElementByHierarchicalName(OUString::fromUtf8(pName),
 embed::ElementModes::READWRITE), uno::UNO_QUERY);
 }
 
 void EPUBPackage::openElement(const char *pName, const 
librevenge::RVNGPropertyList &/*rAttributes*/)
@@ -45,12 +61,19 @@ void EPUBPackage::insertCharacters(const 
librevenge::RVNGString &rCharacters)
 
 void EPUBPackage::closeXMLFile()
 {
-SAL_WARN("writerperfect", "EPUBPackage::closeXMLFile: implement me");
+assert(mxOutputStream.is());
+
+uno::Reference xTransactedObject(mxOutputStream, 
uno::UNO_QUERY);
+xTransactedObject->commit();
+mxOutputStream.clear();
 }
 
 void EPUBPackage::openCSSFile(const char *pName)
 {
-SAL_WARN("writerperfect", "EPUBPackage::openCSSFile, " << pName << ": 
implement me");
+assert(pName);
+assert(!mxOutputStream.is());
+
+
mxOutputStream.set(mxStorage->openStreamElementByHierarchicalName(OUString::fromUtf8(pName),
 embed::ElementModes::READWRITE), uno::UNO_QUERY);
 }
 
 void EPUBPackage::insertRule(const librevenge::RVNGString &/*rSelector*/, 
const librevenge::RVNGPropertyList &/*rProperties*/)
@@ -60,7 +83,11 @@ void EPUBPackage::insertRule(const librevenge::RVNGString 
&/*rSelector*/, const
 
 void EPUBPackage::closeCSSFile()
 {
-SAL_WARN("writerperfect", "EPUBPackage::closeCSSFile: implement me");
+assert(mxOutputStream.is());
+
+uno::Reference xTransactedObject(mxOutputStream, 
uno::UNO_QUERY);
+xTransactedObject->commit();
+mxOutputStream.clear();
 }
 
 void EPUBPackage::openBinaryFile(const char *pName)
diff --git a/writerperfect/source/writer/EPUBPackage.hxx 
b/writerperfect/source/writer/EPUBPackage.hxx
index 48c1f8a035e0..9d8ff8eef543 100644
--- a/writerperfect/source/writer/EPUBPackage.hxx
+++ b/writerperfect/source/writer/EPUBPackage.hxx
@@ -13,7 +13,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -24,7 +24,8 @@ namespace writerperfect
 class EPUBPackage : public libepubgen::EPUBPackage
 {
 css::uno::Reference mxContext;
-css::uno::Reference mxStorage;
+css::uno::Reference mxStorage;
+css::uno::Reference mxOutputStream;
 
 public:
 explicit EPUBPackage(const 
css::uno::Reference &xContext, const 
css::uno::Sequence &rDescriptor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sfx2/source

2017-08-07 Thread Varun Dhall

 include/sfx2/evntconf.hxx   |2 --
 include/sfx2/zoomitem.hxx   |2 --
 sfx2/source/config/evntconf.cxx |   12 
 sfx2/source/doc/zoomitem.cxx|   21 -
 4 files changed, 37 deletions(-)

New commits:
commit d10a61fe36760336842cbfa7f8f77e1fb9a475a5
Author: Varun Dhall 
Date:   Mon Aug 7 02:50:35 2017 +0530

Removing unused SfxItemPool serialisation from sfx2

Change-Id: Ibb14fcd656f401cb9d2ad57ab63f6cfecf49807d
Reviewed-on: https://gerrit.libreoffice.org/40814
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index ec6a0604f569..8a4d004c075d 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -81,8 +81,6 @@ public:
   OUString &rText,
   const IntlWrapper& ) const override;
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
-virtual SfxPoolItem*Create(SvStream &, sal_uInt16) const override;
-virtual SvStream&   Store(SvStream &, sal_uInt16 nItemVersion ) const 
override;
 virtual sal_uInt16  GetVersion( sal_uInt16 nFileFormatVersion ) const 
override;
 
 const SfxEventNamesList& GetEvents() const { return aEventsList;}
diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index b846079a3dfd..6329c3157277 100644
--- a/include/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.hxx
@@ -72,8 +72,6 @@ public:
 voidSetType( SvxZoomType eNewType ) { eType = 
eNewType; }
 
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
-virtual SfxPoolItem*Create( SvStream& rStrm, sal_uInt16 nVersion ) 
const override;
-virtual SvStream&   Store( SvStream& rStrm , sal_uInt16 nItemVersion ) 
const override;
 virtual booloperator==( const SfxPoolItem& ) const override;
 virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const override;
 virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8 
nMemberId ) override;
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 77a0a823b882..35d42f08ef2a 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -108,18 +108,6 @@ SfxPoolItem* SfxEventNamesItem::Clone( SfxItemPool *) const
 return new SfxEventNamesItem(*this);
 }
 
-SfxPoolItem* SfxEventNamesItem::Create(SvStream &, sal_uInt16) const
-{
-OSL_FAIL("not streamable!");
-return new SfxEventNamesItem(Which());
-}
-
-SvStream& SfxEventNamesItem::Store(SvStream &rStream, sal_uInt16 ) const
-{
-OSL_FAIL("not streamable!");
-return rStream;
-}
-
 sal_uInt16 SfxEventNamesItem::GetVersion( sal_uInt16 ) const
 {
 OSL_FAIL("not streamable!");
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index 117d1a7c4635..e528175a3187 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -66,27 +66,6 @@ SfxPoolItem* SvxZoomItem::Clone( SfxItemPool * /*pPool*/ ) 
const
 }
 
 
-SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) 
const
-{
-sal_uInt16 nValue;
-sal_uInt16 nValSet;
-sal_Int8 nType;
-rStrm.ReadUInt16( nValue ).ReadUInt16( nValSet ).ReadSChar( nType );
-SvxZoomItem* pNew = new SvxZoomItem( (SvxZoomType)nType, nValue, Which() );
-pNew->SetValueSet( static_cast(nValSet) );
-return pNew;
-}
-
-
-SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) 
const
-{
-rStrm.WriteUInt16( GetValue() )
- .WriteUInt16( static_cast(nValueSet) )
- .WriteSChar( static_cast(eType) );
-return rStrm;
-}
-
-
 bool SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const
 {
 assert(SfxPoolItem::operator==(rAttr));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sot sot/source

2017-08-07 Thread Varun Dhall

 include/sot/formats.hxx  |5 ++---
 sot/source/base/exchange.cxx |5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 544a978132dd8f9d44756f62f160a0883193d54a
Author: Varun Dhall 
Date:   Sun Jul 23 22:43:03 2017 +0530

EditEngine: Removing BIN format from sot

Change-Id: I495e2749b961dfca63bb1e27239ac6a09b80fd19
Reviewed-on: https://gerrit.libreoffice.org/40333
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx
index 17a9adb5d11a..260f43b8ea09 100644
--- a/include/sot/formats.hxx
+++ b/include/sot/formats.hxx
@@ -42,7 +42,7 @@ enum class SotClipboardFormatId : sal_uLong
 SVXB   = 12,
 SVIM   = 13,
 XFA= 14,
-EDITENGINE = 15,
+EDITENGINE_ODF_TEXT_FLAT = 15,
 INTERNALLINK_STATE = 16,
 SOLK   = 17,
 NETSCAPE_BOOKMARK  = 18,
@@ -173,9 +173,8 @@ enum class SotClipboardFormatId : sal_uLong
 MATHML = 143,
 JPEG   = 144,
 RICHTEXT   = 145,
-EDITENGINE_ODF_TEXT_FLAT = 146,
 // the point at which we start allocating "runtime" format IDs
-USER_END  = EDITENGINE_ODF_TEXT_FLAT
+USER_END  = RICHTEXT
 };
 
 /** Make it easier to iterate over format IDs */
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index f4a51bff5121..1d230a43fccf 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -72,7 +72,7 @@ namespace
 /* 12 SotClipboardFormatId::SVXB*/   { 
"application/x-openoffice-svxb;windows_formatname=\"SVXB (StarView 
Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)", 
&cppu::UnoType>::get() },
 /* 13 SotClipboardFormatId::SVIM*/   { 
"application/x-openoffice-svim;windows_formatname=\"SVIM (StarView 
ImageMap)\"", "SVIM (StarView ImageMap)", 
&cppu::UnoType>::get() },
 /* 14 SotClipboardFormatId::XFA*/{ 
"application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"", 
"XFA (XOutDev FillAttr)", &cppu::UnoType>::get() },
-/* 15 SotClipboardFormatId::EDITENGINE*/ { 
"application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", 
"EditEngineFormat", &cppu::UnoType>::get() },
+/* 15 SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT*/ { 
"application/vnd.oasis.opendocument.text-flat-xml", "EditEngine ODF", 
&cppu::UnoType>::get() },
 /* 16 SotClipboardFormatId::INTERNALLINK_STATE*/ { 
"application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo 
vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", 
&cppu::UnoType>::get() },
 /* 17 SotClipboardFormatId::SOLK*/   { 
"application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", 
"SOLK (StarOffice Link)", &cppu::UnoType>::get() },
 /* 18 SotClipboardFormatId::NETSCAPE_BOOKMARK*/  { 
"application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape 
Bookmark\"", "Netscape Bookmark", &cppu::UnoType>::get() },
@@ -202,8 +202,7 @@ namespace
 /*142 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE*/  { 
MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 
Template", &cppu::UnoType>::get() },
 /*143 SotClipboardFormatId::MATHML*/   { "application/mathml+xml", 
"MathML", &::cppu::UnoType>::get() },
 /*144 SotClipboardFormatId::JPEG*/ { "image/jpeg", "JPEG Bitmap", 
&cppu::UnoType>::get() },
-/*145 SotClipboardFormatId::RICHTEXT*/ { "text/richtext", 
"Richtext Format", &cppu::UnoType>::get() },
-/*146 SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT*/ { 
"application/vnd.oasis.opendocument.text-flat-xml", "EditEngine ODF", 
&cppu::UnoType>::get() }
+/*145 SotClipboardFormatId::RICHTEXT*/ { "text/richtext", 
"Richtext Format", &cppu::UnoType>::get() }
 };
 return &aInstance[0];
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source include/editeng

2017-08-07 Thread Varun Dhall

 editeng/source/editeng/editobj.cxx  |   22 --
 editeng/source/editeng/eeobj.cxx|   11 +++
 editeng/source/editeng/eeobj.hxx|3 -
 editeng/source/editeng/impedit.hxx  |2 -
 editeng/source/editeng/impedit2.cxx |   55 +++-
 editeng/source/editeng/impedit4.cxx |   24 ---
 include/editeng/editobj.hxx |2 -
 7 files changed, 16 insertions(+), 103 deletions(-)

New commits:
commit 4aef9f5e330a4228b2355fa97900dcede3e375c4
Author: Varun Dhall 
Date:   Mon Jul 24 19:46:37 2017 +0530

EditEngine: Removing BIN format

Change-Id: I2752af754316e1402aa51b97895bcf0bf915676f
Reviewed-on: https://gerrit.libreoffice.org/40372
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index c3ac63cd6d61..50e516351503 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -393,28 +393,6 @@ SvtScriptType EditTextObject::GetScriptType() const
 }
 
 
-void EditTextObject::Store( SvStream& rOStream ) const
-{
-if ( rOStream.GetError() )
-return;
-
-sal_uInt64 const nStartPos = rOStream.Tell();
-
-sal_uInt16 nWhich = static_cast(EE_FORMAT_BIN);
-rOStream.WriteUInt16( nWhich );
-
-sal_uInt32 nStructSz = 0;
-rOStream.WriteUInt32( nStructSz );
-
-mpImpl->StoreData(rOStream);
-
-sal_uInt64 const nEndPos = rOStream.Tell();
-nStructSz = nEndPos - nStartPos - sizeof( nWhich ) - sizeof( nStructSz );
-rOStream.Seek( nStartPos + sizeof( nWhich ) );
-rOStream.WriteUInt32( nStructSz );
-rOStream.Seek( nEndPos );
-}
-
 EditTextObject* EditTextObject::Create( SvStream& rIStream )
 {
 sal_uInt64 const nStartPos = rIStream.Tell();
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 83055dd4b2fc..e498b7f4332b 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -52,13 +52,13 @@ uno::Any EditDataObject::getTransferData( const 
datatransfer::DataFlavor& rFlavo
 {
 aAny <<= GetString();
 }
-else if ( ( nT == SotClipboardFormatId::EDITENGINE ) || ( nT == 
SotClipboardFormatId::RTF ) || ( nT == SotClipboardFormatId::RICHTEXT ) || ( nT 
== SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) )
+else if ( ( nT == SotClipboardFormatId::RTF ) || ( nT == 
SotClipboardFormatId::RICHTEXT ) || ( nT == 
SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) )
 {
 // No RTF on demand any more:
 // 1) Was not working, because I had to flush() the clipboard 
immediately anyway
 // 2) Don't have the old pool defaults and the StyleSheetPool here.
 
-SvMemoryStream* pStream = ( nT == SotClipboardFormatId::EDITENGINE ) ? 
&GetStream() : ( (nT == SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) ? 
&GetODFStream() : &GetRTFStream() );
+SvMemoryStream* pStream = (nT == 
SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) ? &GetODFStream() : 
&GetRTFStream();
 pStream->Seek( STREAM_SEEK_TO_END );
 sal_Int32 nLen = pStream->Tell();
 if (nLen < 0) { abort(); }
@@ -79,12 +79,11 @@ uno::Any EditDataObject::getTransferData( const 
datatransfer::DataFlavor& rFlavo
 
 uno::Sequence< datatransfer::DataFlavor > 
EditDataObject::getTransferDataFlavors(  )
 {
-uno::Sequence< datatransfer::DataFlavor > aDataFlavors(5);
-SotExchange::GetFormatDataFlavor( SotClipboardFormatId::EDITENGINE, 
aDataFlavors.getArray()[0] );
+uno::Sequence< datatransfer::DataFlavor > aDataFlavors(4);
+SotExchange::GetFormatDataFlavor( 
SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT, aDataFlavors.getArray()[0] );
 SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, 
aDataFlavors.getArray()[1] );
 SotExchange::GetFormatDataFlavor( SotClipboardFormatId::RTF, 
aDataFlavors.getArray()[2] );
 SotExchange::GetFormatDataFlavor( SotClipboardFormatId::RICHTEXT, 
aDataFlavors.getArray()[3] );
-SotExchange::GetFormatDataFlavor( 
SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT, aDataFlavors.getArray()[4] );
 
 return aDataFlavors;
 }
@@ -95,7 +94,7 @@ sal_Bool EditDataObject::isDataFlavorSupported( const 
datatransfer::DataFlavor&
 
 SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor );
 if ( ( nT == SotClipboardFormatId::STRING ) || ( nT == 
SotClipboardFormatId::RTF ) || ( nT == SotClipboardFormatId::RICHTEXT )
-|| ( nT == SotClipboardFormatId::EDITENGINE ) || ( nT == 
SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) )
+|| ( nT == SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) )
 bSupported = true;
 
 return bSupported;
diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index f515aa938715..bc7fd6669a33 100644
--- a/editeng/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
@@ -28,18 +28,15 @@
 class EditDataObject :  public 
::cppu::WeakImplHelper
 {
 private:
-

[Libreoffice-commits] core.git: dtrans/source

2017-08-07 Thread Varun Dhall

 dtrans/source/win32/ftransl/ftransl.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit c0998d9481cd57560a4d549d760f0be9da510306
Author: Varun Dhall 
Date:   Sun Jul 23 22:31:49 2017 +0530

EditEngine: Removing BIN format for Windows

Change-Id: I2caf2323220c076374e89294c26e4976bf1ddbea
Reviewed-on: https://gerrit.libreoffice.org/40332
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/dtrans/source/win32/ftransl/ftransl.cxx 
b/dtrans/source/win32/ftransl/ftransl.cxx
index 40df081759a5..64962aecf05a 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -145,8 +145,6 @@ static const std::vector< FormatEntry > g_TranslTable {
 FormatEntry("application/x-openoffice-svim;windows_formatname=\"SVIM 
(StarView ImageMap)\"", "SVIM (StarView ImageMap)", nullptr, CF_INVALID, 
CPPUTYPE_DEFAULT),
 // SotClipboardFormatId::XFA
 FormatEntry("application/x-openoffice-xfa;windows_formatname=\"XFA 
(XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", nullptr, CF_INVALID, 
CPPUTYPE_DEFAULT),
-// SotClipboardFormatId::EDITENGINE
-
FormatEntry("application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"",
 "EditEngineFormat", nullptr, CF_INVALID, CPPUTYPE_DEFAULT),
 // SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT
 FormatEntry("application/vnd.oasis.opendocument.text-flat-xml", 
"EditEngine ODF", nullptr, CF_INVALID, CPPUTYPE_DEFAULT),
 // SotClipboardFormatId::INTERNALLINK_STATE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/source sd/source

2017-08-07 Thread Varun Dhall

 sc/source/ui/app/seltrans.cxx  |1 -
 sc/source/ui/app/transobj.cxx  |4 +---
 sc/source/ui/view/viewfun4.cxx |3 +--
 sc/source/ui/view/viewfun5.cxx |3 +--
 sd/source/ui/func/fuinsert.cxx |1 -
 sd/source/ui/view/drviews7.cxx |1 -
 sd/source/ui/view/sdview2.cxx  |3 +--
 sd/source/ui/view/sdview3.cxx  |   32 +---
 8 files changed, 5 insertions(+), 43 deletions(-)

New commits:
commit 8a8bcd65e8a0e177904f06fcd8a775456ff02eab
Author: Varun Dhall 
Date:   Sun Jul 23 22:20:17 2017 +0530

EditEngine: Removing BIN format from sd

Change-Id: Iafd88cdb0d0a84b611deda3bd276fb4b16604b92
Reviewed-on: https://gerrit.libreoffice.org/40331
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e672179bb474..e1e4c1e42e8f 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -253,7 +253,6 @@ void FuInsertClipboard::DoExecute( SfxRequest&  )
 pDlg->Insert( SotClipboardFormatId::HTML, OUString() );
 pDlg->Insert( SotClipboardFormatId::RTF, OUString() );
 pDlg->Insert( SotClipboardFormatId::RICHTEXT, OUString() );
-pDlg->Insert( SotClipboardFormatId::EDITENGINE, OUString() );
 pDlg->Insert( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT, 
OUString() );
 
 //TODO/MBA: testing
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 99f5bd398c48..ab318a97f436 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -167,7 +167,6 @@ using namespace ::com::sun::star::linguistic2;
 case SotClipboardFormatId::HTML:
 case SotClipboardFormatId::RTF:
 case SotClipboardFormatId::RICHTEXT:
-case SotClipboardFormatId::EDITENGINE:
 case SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT:
 pResult->AddClipbrdFormat(nTestFormat);
 break;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index ad13321ba146..22f248c3cef6 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -572,7 +572,6 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, 
DropTargetHelper& rTarge
 if( !nRet )
 {
 const bool  bSBAFormat = 
rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::SVX_FORMFIELDEXCH );
-const bool  bEditEngine = 
rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::EDITENGINE );
 const bool  bEditEngineODF = 
rTargetHelper.IsDropFormatSupported( 
SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT );
 const bool  bString = rTargetHelper.IsDropFormatSupported( 
SotClipboardFormatId::STRING );
 const bool  bRTF = rTargetHelper.IsDropFormatSupported( 
SotClipboardFormatId::RTF );
@@ -588,7 +587,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, 
DropTargetHelper& rTarge
 if( bBookmark && bFile && ( nDropAction & DND_ACTION_MOVE 
) && mpViewSh && SlideShow::IsRunning(mpViewSh->GetViewShellBase()) )
 bBookmark = false;
 
-if( bDrawing || bGraphic || bMtf || bBitmap || bBookmark 
|| bFile || bFileList || bXFillExchange || bSBAFormat || bEditEngine || 
bEditEngineODF || bString || bRTF )
+if( bDrawing || bGraphic || bMtf || bBitmap || bBookmark 
|| bFile || bFileList || bXFillExchange || bSBAFormat || bEditEngineODF || 
bString || bRTF )
 nRet = nDropAction;
 
 // For entries from the navigator, change action copy.
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 5f5d9f5f7c3c..de471ddca611 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1392,9 +1392,7 @@ bool View::InsertData( const TransferableDataHelper& 
rDataHelper,
 }
 }
 
-char* ODF_XML_Env = getenv ("ODF_TEXT_FLAT_XML_ENV");
-
-if(!bReturn && !bLink && 
CHECK_FORMAT_TRANS(SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT) && 
ODF_XML_Env == nullptr)
+if(!bReturn && !bLink && 
CHECK_FORMAT_TRANS(SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT))
 {
 ::tools::SvRef xStm;
 if( aDataHelper.GetSotStorageStream( 
SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT, xStm ) )
@@ -1422,34 +1420,6 @@ bool View::InsertData( const TransferableDataHelper& 
rDataHelper,
 }
 }
 
-if(!bReturn && !bLink && 
CHECK_FORMAT_TRANS(SotClipboardFormatId::EDITENGINE) )
-{
-::tools::SvRef xStm;
-if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::EDITENGINE, 
xStm ) )
-{
-OutlinerView* pOLV = GetTextEditOutlinerView();
-
-xStm->Seek( 0 );
-
-if( pOLV )
-{
-::tools::Rectangle   aRect( pOLV-

[Libreoffice-commits] core.git: compilerplugins/clang sw/source

2017-08-07 Thread Noel Grandin

 compilerplugins/clang/constparams.cxx |   22 +-
 sw/source/ui/dbui/addresslistdialog.cxx   |2 +-
 sw/source/ui/dbui/createaddresslistdialog.cxx |2 +-
 sw/source/ui/dbui/createaddresslistdialog.hxx |2 +-
 sw/source/ui/dbui/dbtablepreviewdialog.cxx|2 +-
 sw/source/ui/dbui/dbtablepreviewdialog.hxx|2 +-
 sw/source/ui/dbui/mailmergewizard.cxx |2 +-
 sw/source/ui/dbui/mmgreetingspage.cxx |8 
 sw/source/ui/dbui/mmlayoutpage.cxx|6 +++---
 sw/source/ui/dbui/mmlayoutpage.hxx|6 +++---
 sw/source/ui/dbui/mmoutputtypepage.cxx|6 +++---
 sw/source/ui/dbui/mmresultdialogs.cxx |2 +-
 sw/source/ui/frmdlg/frmpage.cxx   |6 +++---
 sw/source/ui/inc/mmresultdialogs.hxx  |2 +-
 sw/source/ui/index/cntex.cxx  |   12 ++--
 sw/source/ui/index/cnttab.cxx |   12 ++--
 sw/source/ui/index/swuiidxmrk.cxx |   10 +-
 sw/source/ui/misc/glossary.cxx|2 +-
 sw/source/ui/misc/linenum.cxx |2 +-
 sw/source/ui/misc/srtdlg.cxx  |4 ++--
 sw/source/ui/misc/titlepage.cxx   |2 +-
 sw/source/ui/table/tabledlg.cxx   |2 +-
 sw/source/ui/table/tautofmt.cxx   |4 ++--
 sw/source/ui/vba/vbaborders.cxx   |8 
 sw/source/ui/vba/vbaborders.hxx   |2 +-
 sw/source/ui/vba/vbadocumentproperties.cxx|4 ++--
 sw/source/ui/vba/vbadocuments.cxx |2 +-
 sw/source/ui/vba/vbalisttemplate.cxx  |2 +-
 sw/source/ui/vba/vbalisttemplate.hxx  |2 +-
 sw/source/ui/vba/vbaoptions.cxx   |2 +-
 sw/source/ui/vba/vbaoptions.hxx   |2 +-
 sw/source/ui/vba/vbaparagraphformat.cxx   |2 +-
 sw/source/ui/vba/vbaparagraphformat.hxx   |2 +-
 sw/source/ui/vba/vbarangehelper.cxx   |2 +-
 sw/source/ui/vba/vbarangehelper.hxx   |2 +-
 sw/source/ui/vba/vbasystem.cxx|2 +-
 sw/source/ui/vba/vbasystem.hxx|2 +-
 sw/source/ui/vba/vbatablehelper.cxx   |4 ++--
 sw/source/ui/vba/vbatablehelper.hxx   |4 ++--
 sw/source/uibase/inc/frmpage.hxx  |6 +++---
 sw/source/uibase/inc/glossary.hxx |2 +-
 sw/source/uibase/inc/linenum.hxx  |2 +-
 sw/source/uibase/inc/mailmergewizard.hxx  |2 +-
 sw/source/uibase/inc/srtdlg.hxx   |2 +-
 sw/source/uibase/inc/swuicnttab.hxx   |8 
 sw/source/uibase/inc/swuiidxmrk.hxx   |   10 +-
 sw/source/uibase/table/tablepg.hxx|2 +-
 47 files changed, 101 insertions(+), 97 deletions(-)

New commits:
commit 959ace5861ca8dbb5fbec7a1954eeeb3b93ae4f3
Author: Noel Grandin 
Date:   Mon Aug 7 14:40:39 2017 +0200

loplugin:constparams in sw part10

Change-Id: I7d708c3e6157d0b8690b433d3363d2c0745b2410
Reviewed-on: https://gerrit.libreoffice.org/40832
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/constparams.cxx 
b/compilerplugins/clang/constparams.cxx
index 052e370c507d..a294e45d58c4 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -313,6 +313,7 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const 
ParmVarDecl* parmVar
 return 
isPointerOrReferenceToConst(constructorDecl->getParamDecl(i)->getType());
 }
 }
+return false; // TODO ??
 } else if (auto operatorCallExpr = dyn_cast(parent)) {
 const CXXMethodDecl* calleeMethodDecl = 
dyn_cast_or_null(operatorCallExpr->getDirectCallee());
 if (calleeMethodDecl) {
@@ -343,6 +344,7 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const 
ParmVarDecl* parmVar
 }
 }
 }
+return false; // TODO ???
 } else if (auto callExpr = dyn_cast(parent)) {
 QualType functionType = callExpr->getCallee()->getType();
 if (functionType->isFunctionPointerType()) {
@@ -382,12 +384,13 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, 
const ParmVarDecl* parmVar
 }
 for (unsigned i = 0; i < callExpr->getNumArgs(); ++i) {
 if (i >= calleeFunctionDecl->getNumParams()) // can happen in 
template code
-break;
+return false;
 if (callExpr->getArg(i) == stmt) {
 return 
isPointerOrReferenceToConst(calleeFunctionDecl->getParamDecl(i)->getType());
 }
 }
 }
+return false; // TODO 
 } else if (isa(parent)) {
 return false;
 } else if (isa(parent)) {
@@ -459,15 +462,16 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, 
const ParmVarDecl* parmVar
 return true;

Re: Lost images in Impress

2017-08-07 Thread Paul Menzel


Dear Miklos, and dear private responders,


On 08/07/17 13:54, Miklos Vajna wrote:


I believe  is
the tracker of those bugs.


Somebody else privately pointed me to #104998 [1].

This seems to be new code, or should it be linked to #47148 [2]?

Any suggestions on what to do regarding #104998 is welcome. I tried to 
reproduce it with LibreOffice 5.4.0.3 by changing the memory settings, 
but in contrast to the problem reports and the problem of the scientist, 
I get *Read Error* written in the image frame. Saving the file, and 
opening it again, the image frames seem to be gone too.



Kind regards,

Paul


[1] https://bugs.documentfoundation.org/show_bug.cgi?id=104998
PDF images disappear after a while in LO 5.3
[2] https://bugs.documentfoundation.org/show_bug.cgi?id=47148
(Image-Caching) - [meta] image caching / management is utterly 
shambolic

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: flatpak/build.sh flatpak/manifest.json

2017-08-07 Thread Stephan Bergmann

 flatpak/build.sh  |   74 +++---
 flatpak/manifest.json |   43 -
 2 files changed, 64 insertions(+), 53 deletions(-)

New commits:
commit af59595cc805f33ea4619d44862b1173d20fe057
Author: Stephan Bergmann 
Date:   Mon Aug 7 15:05:00 2017 +0200

Generate manifest.json during flatpak/build.sh

...filling in my_{git,flatpak}branch values.  Also, set disable-fsckobjects 
as
needed when cloning the LO repo.

diff --git a/flatpak/build.sh b/flatpak/build.sh
index ba9d33b..62b9ce0 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -4,22 +4,20 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# This shell script creates a LibreOffice.flatpak bundle from a given
-# flatpak-builder manifest.json.
+# This shell script creates a LibreOffice.flatpak bundle from a given git
+# branch/tag.
 #
 # It expects five command line arguments, in the following order:
 # * An absolute pathname for a directory where the script does all its work.
-# * The absolute pathname of the manifest.json file.
-# * The flatpak branch name (which must match the "branch" value in the
-#   manifest.json file).
+# * The requested git branch/tag (i.e., the --branch argument to "git clone").
+# * The flatpak branch name.
 # * The absolute pathname of the GPG home directory (i.e., the --homedir=
 #   argument to gpg)
 # * The GPG key ID for signing.
 #
 # The script expects an installation of flatpak and availability of the
-# org.gnome.Platform 3.24 runtime (and SDK) from 
-# (or whatever is specified in the manifest.json file).  To obtain the latter,
-# do something like:
+# org.gnome.Platform 3.24 runtime (and SDK) from .
+# To obtain the latter, do something like:
 #
 #  $ flatpak remote-add --user --from gnome-sdk \
 # https://sdk.gnome.org/gnome.flatpakrepo
@@ -28,23 +26,79 @@
 #  ...
 #  $ flatpak update --user
 #
+# Setting disable-fsckobjects is needed to avoid "error: object
+# 8dbc86aa82fb73668816f228779b2094de546aa0: missingSpaceBeforeEmail: invalid
+# author/committer line - missing space before email", which has "Author: Andre
+# Fischer ".
+#
 # TODO:
 #
 # * Explicitly specify the --arch to build?
+# * Properly encode my_{flatpak,git}branch in manifest.json
 
 set -e
 
 my_dir="${1?}"
-my_manifest="${2?}"
+my_gitbranch="${2?}"
 my_flatpakbranch="${3?}"
 my_gpghomedir="${4?}"
 my_gpgkeyid="${5?}"
 
 mkdir -p "${my_dir?}"
 
+rm -f "${my_dir?}"/manifest.json
+cat > "${my_dir?}"/manifest.json

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - chart2/source

2017-08-07 Thread Dennis Francis

 chart2/source/model/main/ChartModel.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit c9f07d72b6e40ca70ee11f0350fd6e5acfefba89
Author: Dennis Francis 
Date:   Wed Aug 2 10:38:12 2017 +0530

tdf#109523: Do not forget to remove the chart model from...

data-provider's listener set when the chart model is
getting disposed.

Change-Id: Iafbe1426cdb42059cbb4e2955a257a09aa42ec8e
Reviewed-on: https://gerrit.libreoffice.org/40663
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 
(cherry picked from commit 9561e0f392de3b99d8a0374486d4c0575b23180b)
Reviewed-on: https://gerrit.libreoffice.org/40705
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/chart2/source/model/main/ChartModel.cxx 
b/chart2/source/model/main/ChartModel.cxx
index 48d38e832850..07bf1ccf4c6b 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -547,6 +547,13 @@ void SAL_CALL ChartModel::dispose()
 if ( m_xDiagram.is() )
 ModifyListenerHelper::removeListener( m_xDiagram, this );
 
+if ( m_xDataProvider.is() )
+{
+Reference xModifyBroadcaster( 
m_xDataProvider, uno::UNO_QUERY );
+if ( xModifyBroadcaster.is() )
+xModifyBroadcaster->removeModifyListener( this );
+}
+
 m_xDataProvider.clear();
 m_xInternalDataProvider.clear();
 m_xNumberFormatsSupplier.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

2017-08-07 Thread heiko tietze

 sd/source/core/drawdoc2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22d5927000a32c54b0ba0355ca9c0999d3b00fb7
Author: heiko tietze 
Date:   Thu Aug 3 18:59:31 2017 +0200

tdf#93244 Widescreen format

By default the slide format is now 16:9 in Impress

Change-Id: Ia3dd48da772c53b04f7fa833e1667acc78b8bdad
Reviewed-on: https://gerrit.libreoffice.org/40733
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 
Reviewed-by: Heiko Tietze 

diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index ea68d0694a08..647443663085 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -610,7 +610,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument const 
* pRefDocument /* =
 else
 {
 // Impress: always use screen format, landscape.
-Size aSz( SvxPaperInfo::GetPaperSize(PAPER_SCREEN_4_3, 
MapUnit::Map100thMM) );
+Size aSz( SvxPaperInfo::GetPaperSize(PAPER_SCREEN_16_9, 
MapUnit::Map100thMM) );
 pPage->SetSize( Size( aSz.Height(), aSz.Width() ) );
 pPage->SetBorder(0, 0, 0, 0);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/source

2017-08-07 Thread Ximeng Zu

 android/source/res/layout/calc_header_popup.xml|   
90 
 android/source/res/values/strings.xml  |   
17 
 android/source/src/java/org/libreoffice/InvalidationHandler.java   |   
10 
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java   |   
 5 
 android/source/src/java/org/libreoffice/canvas/AdjustLengthLine.java   |  
105 +
 android/source/src/java/org/libreoffice/overlay/CalcHeadersController.java |  
113 ++
 android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java   |  
181 +++---
 android/source/src/java/org/libreoffice/overlay/DocumentOverlay.java   |   
 8 
 android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java   |   
32 +
 9 files changed, 521 insertions(+), 40 deletions(-)

New commits:
commit f45cdbc9f3dd877a2ebda1e2718c59e83faf3c6a
Author: Ximeng Zu 
Date:   Wed Jul 12 09:20:56 2017 -0500

[Android Viewer] Add header funcs to Calc

Added insert/delete/hide/show/optimal width or height
/adjust width or heigth  to Calc. These options
show in a floating menu near the headers when the
user taps on the headers. Also added selection on
headers, i.e., user can drag on headers to select
multiple columns/rows.

Change-Id: I7e1994d1fa81d80c110def035c2c065e838b49ac
Reviewed-on: https://gerrit.libreoffice.org/40684
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/android/source/res/layout/calc_header_popup.xml 
b/android/source/res/layout/calc_header_popup.xml
new file mode 100644
index ..8e563af27d0a
--- /dev/null
+++ b/android/source/res/layout/calc_header_popup.xml
@@ -0,0 +1,90 @@
+
+http://schemas.android.com/apk/res/android";
+android:orientation="vertical" android:layout_width="match_parent"
+android:layout_height="match_parent"
+android:background="@color/doorhanger_background_dark">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/source/res/values/strings.xml 
b/android/source/res/values/strings.xml
index ad4d2699684a..04f1be3cc029 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -130,9 +130,26 @@
 
 Enter file name
 CREATE
+
+
 Slide show
 Your Android device 
doesn\'t support in-app svg slideshow. We copied the slideshow link to 
clipboard. Please press home button, open a modern web browser, paste in the 
address bar, and go.
 OK
 Back
 
+
+Insert
+Delete
+Hide
+Show
+Optimal Length
+Adjust Length
+Adjust Height
+Adjust Width
+Optimal Height
+Optimal Width
+OK
+Enter Extra Length in 
100th/mm
+Hint: Double tap on 
a header sets optimal width/height.
+
 
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index e5fdf05b120f..92769bcd619c 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -94,11 +94,18 @@ public class InvalidationHandler implements 
Document.MessageCallback {
 case Document.CALLBACK_CELL_CURSOR:
 invalidateCellCursor(payload);
 break;
+case Document.CALLBACK_INVALIDATE_HEADER:
+invalidateHeader();
+break;
 default:
 Log.d(LOGTAG, "LOK_CALLBACK uncaught: " + messageID + " : " + 
payload);
 }
 }
 
+private void invalidateHeader() {
+LOKitShell.sendEvent(new LOEvent(LOEvent.UPDATE_CALC_HEADERS));
+}
+
 private void invalidateCellCursor(String payload) {
 RectF cellCursorRect = convertPayloadToRectangle(payload);
 
@@ -378,6 +385,9 @@ public class InvalidationHandler implements 
Document.MessageCallback {
 changeStateTo(OverlayState.TRANSITION);
 }
 mDocumentOverlay.changeSelections(Collections.EMPTY_LIST);
+if (mContext.isSpreadsheet()) {
+mDocumentOverlay.showHeaderSelection(null);
+}
 } else {
 List rectangles = convertPayloadToRectangles(payload);
 if (mState != OverlayState.SELECTION) {
diff --git 
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java 
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index b16812f0bc97..6ae49935a5c2 100755
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -694,6 +694,7 @@ public class LibreOfficeMainActivity extends 
AppCompatActivity implements Settin
 
 pub

[Libreoffice-commits] core.git: officecfg/registry sfx2/source

2017-08-07 Thread Tomaž Vajngerl

 officecfg/registry/data/org/openoffice/Office/Common.xcu   |5 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   11 
 sfx2/source/view/classificationcontroller.cxx  |  206 -
 3 files changed, 95 insertions(+), 127 deletions(-)

New commits:
commit 3e493d337819204ca9c7302efbd7b34c282956a2
Author: TomaÅ¾ Vajngerl 
Date:   Fri Aug 4 16:10:43 2017 +0200

TSCP: simplify toolbar to only one combo box + configuration

Previously we had 3 comboboxes each for different classification
policies. This simplifies it to just use one classification policy
and which policy it will be used can be set in LO configuration.
By default this is the "IntellectualProperty" policy, which is the
one most users will probably be interested in.

Change-Id: I1fc69c2123b04ecf58a6775e5bcda3b5316414a3
Reviewed-on: https://gerrit.libreoffice.org/40768
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index f84bd1a8eeb6..746553f17dd7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -542,4 +542,9 @@
 true
   
   
+  
+  
+3
+  
+  
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index bbf4f4eea7d1..0793ee4e6ad9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6729,5 +6729,16 @@
 true
   
 
+
+  
+TSCP Classification
+  
+  
+
+   The policy type used at classification
+
+3
+  
+
   
 
diff --git a/sfx2/source/view/classificationcontroller.cxx 
b/sfx2/source/view/classificationcontroller.cxx
index b122fb669d92..93cbee5e8193 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -29,6 +29,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace com::sun::star;
 
 namespace sfx2
@@ -58,7 +60,7 @@ class ClassificationCategoriesController : public 
ClassificationCategoriesContro
 rtl::Reference m_xListener;
 ClassificationPropertyListener m_aPropertyListener;
 
-DECL_LINK(SelectHdl, ListBox&, void);
+DECL_STATIC_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, 
void);
 
 public:
 explicit ClassificationCategoriesController(const 
uno::Reference& rContext);
@@ -83,8 +85,8 @@ public:
 /// Classification control is the parent of all widgets that belongs to 
ClassificationCategoriesController.
 class SAL_WARN_UNUSED ClassificationControl : public vcl::Window
 {
-std::map> m_pLabels;
-std::map> m_pCategories;
+VclPtr m_pLabel;
+VclPtr m_pCategory;
 void SetOptimalSize();
 void DataChanged(const DataChangedEvent& rEvent) override;
 
@@ -93,11 +95,29 @@ public:
 ~ClassificationControl() override;
 void dispose() override;
 void Resize() override;
-const VclPtr& getCategories(SfxClassificationPolicyType eType);
-std::size_t getLabelsSize();
-OUString getCategoryType(ListBox& rCategory);
+const VclPtr& getCategory()
+{
+return m_pCategory;
+}
 };
 
+namespace
+{
+
+SfxClassificationPolicyType getPolicyType()
+{
+sal_Int32 nPolicyTypeNumber = 
officecfg::Office::Common::Classification::Policy::get();
+auto eType = static_cast(nPolicyTypeNumber);
+return eType;
+}
+
+OUString getCategoryType()
+{
+return SfxClassificationHelper::policyTypeToString(getPolicyType());
+}
+
+} // end anonymous namespace
+
 ClassificationPropertyListener::ClassificationPropertyListener(const 
rtl::Reference& xListener, 
ClassificationCategoriesController& rController)
 : ClassificationPropertyListenerBase(xListener, "WritePath")
 , m_rController(rController)
@@ -131,11 +151,7 @@ sal_Bool 
ClassificationCategoriesController::supportsService(const OUString& rSe
 
 uno::Sequence 
ClassificationCategoriesController::getSupportedServiceNames()
 {
-uno::Sequence aServices
-{
-"com.sun.star.frame.ToolbarController"
-};
-return aServices;
+return { "com.sun.star.frame.ToolbarController" };
 }
 
 void ClassificationCategoriesController::dispose()
@@ -155,23 +171,18 @@ uno::Reference 
ClassificationCategoriesController::createItemWindo
 if (pToolbar)
 {
 m_pClassification = VclPtr::Create(pToolbar);
-for (size_t i = m_pClassification->getLabelsSize(); i > 0; --i)
-{
-auto eType = static_cast(i);
-m_pClassification->getCategories(eType)->SetSelectHdl(LINK(this, 
ClassificationCategoriesController, SelectHdl));
-}
+m_pClassification->getCategory()->SetSelectHdl(LINK(this, 
ClassificationCategoriesController, SelectHdl));

Re: Lost images in Impress

2017-08-07 Thread Miklos Vajna

Hi,

I believe  is
the tracker of those bugs.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: source/auxiliary source/text

2017-08-07 Thread Adolfo Jayme Barrientos

 source/auxiliary/shared.tree |2 +-
 source/text/shared/00/0406.xhp   |2 +-
 source/text/shared/optionen/BasicIDE.xhp |   16 
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 4d8687d90b58f8bf00bd31c913bc47970e975ca4
Author: Adolfo Jayme Barrientos 
Date:   Mon Aug 7 06:52:09 2017 -0500

tdf#111434 Rename âBasic IDE Optionsâ to âBasic IDEâ

Follow-up to core commit 43f159dafa3fe61c09cafc8467cdd67233a02401;
see a rationale for this change there.

Change-Id: I2e560b50e76637c135e536423223798e92914bf0

diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree
index f05963d5c..5ebd38002 100644
--- a/source/auxiliary/shared.tree
+++ b/source/auxiliary/shared.tree
@@ -53,7 +53,7 @@
 Advanced
 Expert 
Configuration
 Personalization
-Basic IDE Options
+Basic IDE
 OpenCL
 Load/Save options
 Internet options
diff --git a/source/text/shared/00/0406.xhp 
b/source/text/shared/00/0406.xhp
index 4ab5879f0..720d1851c 100644
--- a/source/text/shared/00/0406.xhp
+++ b/source/text/shared/00/0406.xhp
@@ -197,7 +197,7 @@
 
   Choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Open 
CL
 
-  Choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Basic IDE 
Options
+  Choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Basic 
IDE
 
   Choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Online 
Update 
 
diff --git a/source/text/shared/optionen/BasicIDE.xhp 
b/source/text/shared/optionen/BasicIDE.xhp
index bc7013712..4b39cd561 100644
--- a/source/text/shared/optionen/BasicIDE.xhp
+++ b/source/text/shared/optionen/BasicIDE.xhp
@@ -20,7 +20,7 @@
 
 
   
-Basic IDE Options
+Basic IDE
 /text/shared/optionen/BasicIDE.xhp
   
 
@@ -29,15 +29,15 @@
 
 
 
-  Basic IDE options;Autocorrection
-  Basic IDE options;Autocompletion
-  Basic IDE options;Autoclose quotes
-  Basic IDE options;Basic UNO extended types
-  Basic IDE options;Autoclose parenthesis
+  Basic IDE;Autocorrection
+  Basic IDE;Autocompletion
+  Basic IDE;Autoclose quotes
+  Basic IDE;Basic UNO extended types
+  Basic IDE;Autoclose parenthesis
   Basic IDE;options
   options;Basic IDE
 
-Basic IDE Options
+Basic IDE
 Defines the 
settings for the Basic IDE (Integrated Development Environment) to help edit 
macros in Basic.
 
 
@@ -90,4 +90,4 @@
 
 
 
-
\ 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: helpcontent2

2017-08-07 Thread Adolfo Jayme Barrientos

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ebd60e7d912704ff9e2936e673ffaa6f39a9a2f
Author: Adolfo Jayme Barrientos 
Date:   Mon Aug 7 06:52:09 2017 -0500

Updated core
Project: help  4d8687d90b58f8bf00bd31c913bc47970e975ca4

tdf#111434 Rename âBasic IDE Optionsâ to âBasic IDEâ

Follow-up to core commit 43f159dafa3fe61c09cafc8467cdd67233a02401;
see a rationale for this change there.

Change-Id: I2e560b50e76637c135e536423223798e92914bf0

diff --git a/helpcontent2 b/helpcontent2
index 9f7edddfe613..4d8687d90b58 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9f7edddfe613a3e61a1160028c853d9fc569876a
+Subproject commit 4d8687d90b58f8bf00bd31c913bc47970e975ca4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Lost images in Impress

2017-08-07 Thread Paul Menzel


Dear LibreOffice folks,


One of our scientists reported that images get randomly lost in a 
presentation.


This did not happen in version 5.1.3.2, but is present in at least 
5.3.4.1, 5.3.5.1, and 5.4.0.3.


The included images are PDF files, and it happens randomly, and, 
therefore, no steps can be provided to reproduce the issue.


The image suddenly disappears. The frame for the image is still there 
though, and the handles appear, if you click on the white area, where is 
the image is supposed to be.


Before creating an issue in the bug tracker [1], could you please 
suggest, what debugging options can be turned on, to create a more 
meaningful bug report? Maybe you already know of such an issue. 
Unfortunately, I couldn’t find one.



Kind regards,

Paul


[1] https://bugs.documentfoundation.org/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: svtools/source sw/inc sw/source vcl/inc vcl/source

2017-08-07 Thread Jens Carl

 svtools/source/control/fmtfield.cxx |2 +-
 svtools/source/inc/svimpbox.hxx |2 +-
 sw/inc/fesh.hxx |2 +-
 sw/inc/view.hxx |2 +-
 sw/source/core/doc/docfmt.cxx   |2 +-
 sw/source/core/fields/cellfml.cxx   |2 +-
 sw/source/core/frmedt/fefly1.cxx|2 +-
 sw/source/core/layout/tabfrm.cxx|2 +-
 sw/source/filter/html/htmlfldw.cxx  |8 
 sw/source/filter/ww8/wrtw8nds.cxx   |2 +-
 sw/source/filter/ww8/wrtww8.hxx |2 +-
 sw/source/filter/ww8/ww8par5.cxx|2 +-
 sw/source/uibase/uiview/pview.cxx   |2 +-
 vcl/inc/svdata.hxx  |   12 ++--
 vcl/inc/win/wincomp.hxx |2 +-
 vcl/source/edit/textdat2.hxx|2 +-
 vcl/source/window/window.cxx|2 +-
 17 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 7d6b7bda802c8800e908dd5c23f60e35ba6c465a
Author: Jens Carl 
Date:   Sun Aug 6 04:05:56 2017 +

tdf#39468: Translate some random German comments and terms

Change-Id: I05912b89d059256b20233a0fac244630544d5b0a
Reviewed-on: https://gerrit.libreoffice.org/40800
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/svtools/source/control/fmtfield.cxx 
b/svtools/source/control/fmtfield.cxx
index d22ce0631eeb..5d4c93171028 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -782,7 +782,7 @@ bool FormattedField::EventNotify(NotifyEvent& rNEvt)
 
 if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS)
 {
-// Sonderbehandlung fuer leere Texte
+// special treatment for empty texts
 if (GetText().isEmpty())
 {
 if (!IsEmptyFieldEnabled())
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 8213f3ebf207..26e9794f6648 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -59,7 +59,7 @@ public:
 voidDeselectAll() override;
 };
 
-// Flags fuer nFlag
+// Flags for nFlag
 enum class LBoxFlags {
 NONE= 0x,
 InScrolling = 0x0001,
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index a196e46b7fc0..0775d14cd852 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -421,7 +421,7 @@ public:
 /// If a fly is selected, it draws cursor into the first ContentFrame.
 const SwFrameFormat* SelFlyGrabCursor();
 
-/// Get FlyFrameFormat; fuer UI Macro Anbindung an Flys
+/// Get FlyFrameFormat; for UI macro linkage at Flys
 const SwFrameFormat* GetFlyFrameFormat() const;
   SwFrameFormat* GetFlyFrameFormat();
 
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index c6783bb3c5cb..9ff608b135ac 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -612,7 +612,7 @@ public:
 void ExecFormatPaintbrush(SfxRequest const &);
 void StateFormatPaintbrush(SfxItemSet &);
 
-//public fuer D&D
+// public for D&D
 ErrCode InsertGraphic( const OUString &rPath, const OUString &rFilter,
 bool bLink, GraphicFilter *pFlt );
 
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 4af2f5a069bc..37930e4932f7 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -964,7 +964,7 @@ SwGrfFormatColl* SwDoc::MakeGrfFormatColl( const OUString 
&rFormatName,
 
 void SwDoc::DelTextFormatColl(size_t nFormatColl, bool bBroadcast)
 {
-OSL_ENSURE( nFormatColl, "Remove fuer Coll 0." );
+OSL_ENSURE( nFormatColl, "Remove of Coll 0." );
 
 // Who has the to-be-deleted as their Next?
 SwTextFormatColl *pDel = (*mpTextFormatCollTable)[nFormatColl];
diff --git a/sw/source/core/fields/cellfml.cxx 
b/sw/source/core/fields/cellfml.cxx
index 7d7e4cf840fb..0a8e8f3d9cc0 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -978,7 +978,7 @@ void SwTableFormula::HasValidBoxes_( const SwTable& rTable, 
OUString& ,
 if( *pBValid )  // wrong is wrong
 {
 SwTableBox* pSttBox = nullptr, *pEndBox = nullptr;
-rFirstBox = rFirstBox.copy(1);   // Kennung fuer Box loeschen
+rFirstBox = rFirstBox.copy(1);   // delete identifier of box
 
 // area in this parenthesis?
 if( pLastBox )
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 6f012705c491..4850b76cf6e3 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -189,7 +189,7 @@ static bool lcl_FindAnchorPos(
 break;
 
 default:
-OSL_ENSURE( false, "Falsche ID fuer neuen Anker." );
+OSL_ENSURE( false, "Wrong Id for new anchor." );
 }
 
 rSet.Put( aNewAnch );
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index fb31aae370ce..42faedfb2e81 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2913,7 +2913,7 @@ void SwTabF

LibreOffice 5.3.5 hangup in themes selection option without an internet connection

2017-08-07 Thread Enrique Gonzalez

LibreOffice Community

En LibreOffice 5.3.5, al seleccionar Personalización e intentar 
seleccionar un tema propio, sin tener conexión a Internet, el programa 
se cuelga en Windows 7 x64. Además, los menús parpadean al desplazar el 
cursor sobre ellos. Si activo OpenGL el menu se comporta correctamente, 
pero al mismo tiempo inhabilita la opción de aceleración de hardware en 
la ficha Ver. Comparando OpenOffice y LibreOffice siempre he observado 
que LibreOffice muestra peor comportamiento en el interfaz de ususario 
(es más lento y menos fiable en los menus y barras de selección). La 
versión de LibreOffice anterior (5.2.7) funcionaba bien en Windows 7 x64 
en cuanto a menús y barras de tareas, pero ésta presenta el incómodo 
fenómeno del "parpadeo" (redibujado) de los menús al pasar el ratón 
sobre ellos y, en algunos casos, tarda algo de tiempo en aparecer cada 
submenú una vez marcado en la barra de tareas superior. Espero que estos 
problemas se mejoren porque es una pena que el interface de usuario no 
ofrezca un uso apropiado. Si algo funcionaba bien, porqué rediseñarlo? 
Tengo que mantener una versión antigua del conmtrolador de Nvidia para 
preservar el uso de las librerias de compresión de CUDA (nvcuvenc.dll) 
ya que Nvidia las suprimió a partir de cierta versión. Ello impone 
problemas para el soporte GL, siendo preciso habilitar la opción de 
operar con la "lista negra" si se quiere que OpenGL se habilite.

Por otra parte, el foro Ask LibreOffice se queda en un bucle sin fin 
pidiendo la entrada de una ETIQUETA y NO PERMITE SALIR DE AHI!, 
al margen de que el sistema de captchas es un DESASTRE (hace peticiones 
en Chino, cambian las imágenes una vez marcadas, etc.). Disculpas por el 
enfado pero es que no he podido dejar un simple post después de 20 
minutos intentándolo.

Gracias.

Enrique Gonzalez


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: compilerplugins/clang

2017-08-07 Thread Stephan Bergmann

 compilerplugins/clang/constparams.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 1ac8d90d84ac69c3617228fbfcb8789f295451d3
Author: Stephan Bergmann 
Date:   Mon Aug 7 13:12:59 2017 +0200

-Werror=unused-function

Change-Id: Ia98b64a5500b99c5a6f20c723d96d9c4686f3271

diff --git a/compilerplugins/clang/constparams.cxx 
b/compilerplugins/clang/constparams.cxx
index b5256401890c..052e370c507d 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -83,7 +83,6 @@ public:
 private:
 bool checkIfCanBeConst(const Stmt*, const ParmVarDecl*);
 bool isPointerOrReferenceToConst(const QualType& qt);
-StringRef getFilename(const SourceLocation& loc);
 
 std::unordered_set interestingSet;
 std::unordered_map parmToFunction;
@@ -488,13 +487,6 @@ bool ConstParams::isPointerOrReferenceToConst(const 
QualType& qt) {
 return false;
 }
 
-StringRef ConstParams::getFilename(const SourceLocation& loc)
-{
-SourceLocation spellingLocation = 
compiler.getSourceManager().getSpellingLoc(loc);
-StringRef name { compiler.getSourceManager().getFilename(spellingLocation) 
};
-return name;
-}
-
 loplugin::Plugin::Registration< ConstParams > X("constparams", false);
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang sw/inc sw/source

2017-08-07 Thread Noel Grandin

 compilerplugins/clang/constparams.cxx|2 
 sw/inc/swabstdlg.hxx |2 
 sw/source/filter/inc/msfilter.hxx|2 
 sw/source/filter/ww8/attributeoutputbase.hxx |2 
 sw/source/filter/ww8/wrtw8esh.cxx|2 
 sw/source/filter/ww8/wrtww8.cxx  |2 
 sw/source/filter/ww8/wrtww8.hxx  |2 
 sw/source/filter/ww8/wrtww8gr.cxx|2 
 sw/source/filter/ww8/ww8atr.cxx  |2 
 sw/source/filter/ww8/ww8glsy.cxx |2 
 sw/source/filter/ww8/ww8glsy.hxx |2 
 sw/source/filter/ww8/ww8graf.cxx |   34 +++
 sw/source/filter/ww8/ww8graf.hxx |2 
 sw/source/filter/ww8/ww8graf2.cxx|   10 ++--
 sw/source/filter/ww8/ww8par.cxx  |   26 +--
 sw/source/filter/ww8/ww8par.hxx  |   60 +--
 sw/source/filter/ww8/ww8par2.cxx |8 +--
 sw/source/filter/ww8/ww8par3.cxx |6 +-
 sw/source/filter/ww8/ww8par4.cxx |6 +-
 sw/source/filter/ww8/ww8par5.cxx |   12 ++---
 sw/source/filter/ww8/ww8par6.cxx |6 +-
 sw/source/filter/ww8/ww8scan.cxx |2 
 sw/source/filter/ww8/ww8scan.hxx |2 
 sw/source/ui/chrdlg/drpcps.cxx   |2 
 sw/source/ui/chrdlg/swuiccoll.cxx|6 +-
 sw/source/ui/config/optload.cxx  |2 
 sw/source/ui/config/optpage.cxx  |2 
 sw/source/ui/dialog/uiregionsw.cxx   |2 
 sw/source/ui/dialog/wordcountdialog.cxx  |2 
 sw/source/ui/envelp/envfmt.cxx   |2 
 sw/source/ui/envelp/envfmt.hxx   |2 
 sw/source/ui/envelp/labelexp.cxx |2 
 sw/source/ui/envelp/mailmrge.cxx |2 
 sw/source/ui/fldui/changedb.cxx  |2 
 sw/source/ui/fldui/flddb.cxx |2 
 sw/source/ui/fldui/flddb.hxx |2 
 sw/source/ui/fldui/fldedt.cxx|2 
 sw/source/ui/fldui/fldfunc.cxx   |2 
 sw/source/ui/fldui/fldfunc.hxx   |2 
 sw/source/ui/fldui/fldvar.cxx|2 
 sw/source/ui/fldui/fldvar.hxx|2 
 sw/source/ui/frmdlg/column.cxx   |8 +--
 sw/source/ui/frmdlg/frmdlg.cxx   |2 
 sw/source/uibase/inc/changedb.hxx|2 
 sw/source/uibase/inc/column.hxx  |6 +-
 sw/source/uibase/inc/fldedt.hxx  |2 
 sw/source/uibase/inc/frmdlg.hxx  |2 
 sw/source/uibase/inc/label.hxx   |4 -
 sw/source/uibase/inc/mailmrge.hxx|2 
 sw/source/uibase/inc/optload.hxx |2 
 sw/source/uibase/inc/regionsw.hxx|2 
 sw/source/uibase/inc/swrenamexnameddlg.hxx   |4 -
 sw/source/uibase/inc/swuiccoll.hxx   |4 -
 sw/source/uibase/inc/wordcountdialog.hxx |2 
 54 files changed, 140 insertions(+), 138 deletions(-)

New commits:
commit 06e2246f1683fc862f40155ea4d68800c0fcfd9e
Author: Noel Grandin 
Date:   Mon Aug 7 12:15:34 2017 +0200

loplugin:constparams in sw part9

Change-Id: I2edba9cde5a5efd06815a55632703b706ca523c7
Reviewed-on: https://gerrit.libreoffice.org/40830
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/constparams.cxx 
b/compilerplugins/clang/constparams.cxx
index f0f4baf761b4..b5256401890c 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -173,6 +173,8 @@ bool ConstParams::VisitFunctionDecl(const FunctionDecl * 
functionDecl)
 || name == "GetFormulaBoxes"
 || name == "HasValidBoxes_"
 || name == "SplitMergeBoxNm_"
+|| name.startswith("Read_F_")
+|| name == "UpdateFieldInformation"
  // #ifdef win32
 || name == "convert_slashes"
 // UNO component entry points
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index cd6759dfe8b6..a0b572ae0006 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -91,7 +91,7 @@ namespace com{namespace sun{namespace star{
 }
 }}}
 
-typedef   void (*SwLabDlgMethod) (css::uno::Reference< css::frame::XModel>& 
xModel,   const SwLabItem& rItem);
+typedef   void (*SwLabDlgMethod) (css::uno::Reference< css::frame::XModel> 
const & xModel, const SwLabItem& rItem);
 
 typedef OUString(*GlossaryGetCurrGroup)();
 typedef void(*GlossarySetActGroup)(const OUString& rNewGroup);
diff --git a/sw/source/filter/inc/msfilter.hxx 
b/sw/source/filter/inc/msfilter.hxx
index f430ec9f9763..d3b7e6dd0a83 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -89,7 +89,7 @@ namespace sw
 @param rXE
 the arguments of the original word XE field
 */
-void ImportXE(SwDoc &rDoc, SwPaM &rPaM, const

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - filter/source

2017-08-07 Thread Caolán McNamara

 filter/source/graphicfilter/itiff/itiff.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 133010a0efc8715f95e0ea0f66c22352dd55654a
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 28 10:07:50 2017 +0100

ofz#2766 ensure palette is large enough for all colors

Change-Id: I4669b473f5975ac74a37025f7c936f13bcfea420
Reviewed-on: https://gerrit.libreoffice.org/40513
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index db1ddccd1e64..7031d7daee30 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -,7 +,7 @@ void TIFFReader::MakePalCol()
 {
 if ( nDstBitsPerPixel <= 8 )
 {
-sal_uLong i, nVal, n0RGB;
+sal_uLong nVal, n0RGB;
 if  ( pColorMap == nullptr )
 pColorMap = new sal_uLong[ 256 ];
 if ( nPhotometricInterpretation <= 1 )
@@ -1124,8 +1124,8 @@ void TIFFReader::MakePalCol()
 SAL_WARN("filter.tiff", "palette has less entries that largest 
index used. Expanding palette to match");
 nNumColors = nLargestPixelIndex + 1;
 }
-pAcc->SetPaletteEntryCount( (sal_uInt16)nNumColors );
-for ( i = 0; i < nNumColors; i++ )
+
+for (sal_uLong i = 0; i < nNumColors; ++i)
 {
 nVal = ( i * 255 / ( nNumColors - 1 ) ) & 0xff;
 n0RGB = nVal | ( nVal << 8 ) | ( nVal << 16 );
@@ -1135,7 +1135,8 @@ void TIFFReader::MakePalCol()
 pColorMap[ nNumColors - i - 1 ] = n0RGB;
 }
 }
-for ( i = 0; i < nNumColors; i++ )
+pAcc->SetPaletteEntryCount(std::max(nNumColors, 
pAcc->GetPaletteEntryCount()));
+for (sal_uLong i = 0; i < nNumColors; ++i)
 {
 pAcc->SetPaletteColor( (sal_uInt16)i, BitmapColor( (sal_uInt8)( 
pColorMap[ i ] >> 16 ),
 (sal_uInt8)( pColorMap[ i ] >> 8 ), (sal_uInt8)pColorMap[ i ] 
) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Beginner

2017-08-07 Thread Shinnok

Hi,

LibreOffice is mostly built using C++ but there's many more things you could do 
to contribute. Assuming you are interested in development first, you could 
start by setting up a build on your system and proceed using the information 
bellow.

Getting involved:
https://wiki.documentfoundation.org/Development/GetInvolved 

Instructions on how to setup a build as well as other useful starter info can 
be found on the Wiki:
https://wiki.documentfoundation.org/Development 

The next step would be to pick one of the many issues open in bugzilla that 
have been tagged with easy-hack, which is described here:
https://wiki.documentfoundation.org/Development/EasyHacks 

Also in the upper link you have an outline of the process for submitting 
patches for review. Gerrit is available at:
https://gerrit.libreoffice.org 

This is just a quick primer, if you get stuck, need help or anything in between 
please e-mail this list or hop on to irc at freenode.net  
on channel #libreoffice-dev.

Regards,
Shinnok

> On Aug 6, 2017, at 6:36 PM, Rakshit Tiwari  wrote:
> 
> Hello Sir / Ma`am
>I am a 2nd year bachelor of technology student at IIT Guwahati India. 
> Added to it, I am a highly enthusiastic programmer and I want to get into the 
> world of open source. I really don`t know how to start or from where to 
> start? Please guide me so that I can also be a part of the this amazing 
> community.
> 
> Thank you
> 
> Regards
> Rakshit Tiwari
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/inc

2017-08-07 Thread Adolfo Jayme Barrientos

 cui/inc/treeopt.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 43f159dafa3fe61c09cafc8467cdd67233a02401
Author: Adolfo Jayme Barrientos 
Date:   Mon Aug 7 04:52:45 2017 -0500

Rename âBasic IDE Optionsâ to just âBasic IDEâ

None of the other Options/Preferences pages have the word âOptionsâ
in their names, because: a) itâs obvious that theyâre options, and b)
having that word repeated there contravenes the macOS convention of
calling the options âpreferencesâ.

Change-Id: I7349d20eefc50d5a92d6442a256249f64db688e7

diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
index 8d009da4cca5..9f7b71c6f2ae 100644
--- a/cui/inc/treeopt.hrc
+++ b/cui/inc/treeopt.hrc
@@ -39,7 +39,7 @@ const std::pair 
SID_GENERAL_OPTIONS_RES[] =
 { NC_("SID_GENERAL_OPTIONS_RES", "Application Colors"), 
RID_SVXPAGE_COLORCONFIG  },
 { NC_("SID_GENERAL_OPTIONS_RES", "Accessibility"), 
RID_SVXPAGE_ACCESSIBILITYCONFIG  },
 { NC_("SID_GENERAL_OPTIONS_RES", "Advanced"), RID_SVXPAGE_OPTIONS_JAVA  },
-{ NC_("SID_GENERAL_OPTIONS_RES", "Basic IDE Options"), 
RID_SVXPAGE_BASICIDE_OPTIONS  },
+{ NC_("SID_GENERAL_OPTIONS_RES", "Basic IDE"), 
RID_SVXPAGE_BASICIDE_OPTIONS  },
 { NC_("SID_GENERAL_OPTIONS_RES", "Online Update"), 
RID_SVXPAGE_ONLINEUPDATE  },
 { NC_("SID_GENERAL_OPTIONS_RES", "OpenCL"), RID_SVXPAGE_OPENCL  }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build failure with current master on MacOS

2017-08-07 Thread Stephan Bergmann


On 08/02/2017 03:12 PM, Christian Lohmaier wrote:

On Tue, Jul 25, 2017 at 1:18 PM, Tor Lillqvist  wrote:

But we have traditionally strongly advised against polluting one's build
environment on macOS with Homebrew and similar. Has this changed?


No, has not changed.
Homebrew, Fink, darwinports of whatever they are called  pollute the
environment, can cause broken builds.
If you use homebrew or other systems like that you're on your own.


What I use is a from-source installation of MacPorts, configured with 
--prefix=... and --with-no-root-privileges so that it doesn't pollute 
the system, and then explicitly pointing LO to whatever is needed from 
that MacPorts installation, e.g. by setting MSGFMT=... and MSGUNIQ=... 
in autogen.input.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: 2 commits - wsd/ClientSession.cpp wsd/LOOLWSD.cpp wsd/reference.txt wsd/Storage.cpp

2017-08-07 Thread Jan Holesovsky

 wsd/ClientSession.cpp |5 +
 wsd/LOOLWSD.cpp   |   34 +++---
 wsd/Storage.cpp   |   15 +++
 wsd/reference.txt |   24 +---
 4 files changed, 68 insertions(+), 10 deletions(-)

New commits:
commit a59598050d378f599c989bee34e79b2bf8cb1c8f
Author: Jan Holesovsky 
Date:   Wed Aug 2 18:55:43 2017 +0200

convert-to: Set the mimetype in the responses.

Change-Id: Ib8dcad5f81499aec0ba147a3a4ef0b7a30995bcc

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 5cdcaaf3..d4793e96 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -638,7 +638,12 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 std::string encodedFilePath;
 Poco::URI::encode(resultURL.getPath(), "", encodedFilePath);
 LOG_TRC("Sending file: " << encodedFilePath);
+
+const std::string fileName = 
Poco::Path(resultURL.getPath()).getFileName();
 Poco::Net::HTTPResponse response;
+if (!fileName.empty())
+response.set("Content-Disposition", "attachment; 
filename=\"" + fileName + "\"");
+
 HttpHelper::sendFile(_saveAsSocket, encodedFilePath, mimeType, 
response);
 }
 
commit beffd4967acf760dccdaf7e1a0e6ebbea9932b6a
Author: Jan Holesovsky 
Date:   Wed Aug 2 18:55:43 2017 +0200

convert-to: New features in the convert-to functionality.

* Add possibility to omit the 'format' parameter
* Allow it even when the 'file' storage is disabled

Change-Id: Ib8dcad5f81499aec0ba147a3a4ef0b7a30995bcc

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 2852fb7a..d38918fd 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -449,9 +449,14 @@ std::shared_ptr getNewChild_Blocks()
 class ConvertToPartHandler : public PartHandler
 {
 std::string& _filename;
+
+/// Is it really a convert-to, ie. use an especially formed path?
+bool _convertTo;
+
 public:
-ConvertToPartHandler(std::string& filename)
+ConvertToPartHandler(std::string& filename, bool convertTo = false)
 : _filename(filename)
+, _convertTo(convertTo)
 {
 }
 
@@ -469,7 +474,8 @@ public:
 if (!params.has("filename"))
 return;
 
-Path tempPath = Path::forDirectory(Poco::TemporaryFile::tempName() + 
"/");
+Path tempPath = _convertTo? 
Path::forDirectory(Poco::TemporaryFile::tempName("/tmp/convert-to") + "/") :
+
Path::forDirectory(Poco::TemporaryFile::tempName() + "/");
 File(tempPath).createDirectories();
 // Prevent user inputting anything funny here.
 // A "filename" should always be a filename, not a path
@@ -1737,9 +1743,18 @@ private:
 }
 catch (const std::exception& exc)
 {
-// TODO: Send back failure.
+// Bad request.
+std::ostringstream oss;
+oss << "HTTP/1.1 400\r\n"
+<< "Date: " << 
Poco::DateTimeFormatter::format(Poco::Timestamp(), 
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "User-Agent: LOOLWSD WOPI Agent\r\n"
+<< "Content-Length: 0\r\n"
+<< "\r\n";
+socket->send(oss.str());
+socket->shutdown();
+
 // NOTE: Check _wsState to choose between HTTP response or 
WebSocket (app-level) error.
-LOG_ERR("#" << socket->getFD() << " Exception while processing 
incoming request: [" <<
+LOG_INF("#" << socket->getFD() << " Exception while processing 
incoming request: [" <<
 LOOLProtocol::getAbbreviatedMessage(in) << "]: " << 
exc.what());
 }
 
@@ -1866,12 +1881,17 @@ private:
 auto socket = _socket.lock();
 
 StringTokenizer tokens(request.getURI(), "/?");
-if (tokens.count() >= 3 && tokens[2] == "convert-to")
+if (tokens.count() > 2 && tokens[2] == "convert-to")
 {
 std::string fromPath;
-ConvertToPartHandler handler(fromPath);
+ConvertToPartHandler handler(fromPath, /*convertTo =*/ true);
 HTMLForm form(request, message, handler);
-const std::string format = (form.has("format") ? 
form.get("format") : "");
+
+std::string format = (form.has("format") ? form.get("format") : 
"");
+
+// prefer what is in the URI
+if (tokens.count() > 3)
+format = tokens[3];
 
 bool sent = false;
 if (!fromPath.empty())
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index b64b6431..47c81748 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -195,6 +195,21 @@ std::unique_ptr StorageBase::create(const 
Poco::URI& uri, const std
 {
 return std::unique_ptr(new LocalStorage(uri, 
jailRoot, jailPath));
 }
+else
+{
+// guard agains

[Libreoffice-commits] core.git: writerperfect/source

2017-08-07 Thread Miklos Vajna

 writerperfect/source/writer/EPUBExportFilter.cxx |   14 ++--
 writerperfect/source/writer/EPUBPackage.cxx  |4 +--
 writerperfect/source/writer/exp/xmlimp.cxx   |   26 +++
 writerperfect/source/writer/exp/xmlimp.hxx   |7 +-
 4 files changed, 37 insertions(+), 14 deletions(-)

New commits:
commit 7915f35d7fca5d0720d96954beaa97c00a2c3821
Author: Miklos Vajna 
Date:   Mon Aug 7 10:09:19 2017 +0200

EPUB export: implement doc/para open/close and text in doc handler

This should be enough for plain text of multiple paragraphs, but the
package part is still missing.

Change-Id: I05fe87fd01e078262a1be9ce76eaaa016de484bf
Reviewed-on: https://gerrit.libreoffice.org/40822
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx 
b/writerperfect/source/writer/EPUBExportFilter.cxx
index 75032cae6ada..2bfe9b8b0824 100644
--- a/writerperfect/source/writer/EPUBExportFilter.cxx
+++ b/writerperfect/source/writer/EPUBExportFilter.cxx
@@ -9,6 +9,8 @@
 
 #include "EPUBExportFilter.hxx"
 
+#include 
+
 #include 
 #include 
 #include 
@@ -30,16 +32,14 @@ EPUBExportFilter::EPUBExportFilter(const 
uno::Reference
 
 sal_Bool EPUBExportFilter::filter(const uno::Sequence 
&rDescriptor)
 {
-// The package writes to the output file.
+// Build the export filter chain: the package has direct access to the ZIP
+// file, the flat ODF filter has access to the doc model, everything else
+// is in-between.
 EPUBPackage aPackage(mxContext, rDescriptor);
+libepubgen::EPUBTextGenerator aGenerator(&aPackage);
+uno::Reference xExportHandler(new 
exp::XMLImport(aGenerator));
 
-// Create ODT exporter, this will feed our document handler.
 uno::Reference 
xInitialization(mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.comp.Writer.XMLOasisExporter",
 mxContext), uno::UNO_QUERY);
-
-// The document handler will make the calls on the text interface provided 
by the EPUB export.
-uno::Reference xExportHandler(new 
exp::XMLImport);
-
-// Let the ODT exporter read the doc model and invoke the doc handler.
 xInitialization->initialize({uno::makeAny(xExportHandler)});
 uno::Reference xExporter(xInitialization, 
uno::UNO_QUERY);
 xExporter->setSourceDocument(mxSourceDocument);
diff --git a/writerperfect/source/writer/EPUBPackage.cxx 
b/writerperfect/source/writer/EPUBPackage.cxx
index 0296b183327c..54300c2fbf0a 100644
--- a/writerperfect/source/writer/EPUBPackage.cxx
+++ b/writerperfect/source/writer/EPUBPackage.cxx
@@ -38,9 +38,9 @@ void EPUBPackage::closeElement(const char *pName)
 SAL_WARN("writerperfect", "EPUBPackage::closeElement, " << pName << ": 
implement me");
 }
 
-void EPUBPackage::insertCharacters(const librevenge::RVNGString 
&/*rCharacters*/)
+void EPUBPackage::insertCharacters(const librevenge::RVNGString &rCharacters)
 {
-SAL_WARN("writerperfect", "EPUBPackage::insertCharacters: implement me");
+SAL_WARN("writerperfect", "EPUBPackage::insertCharacters, " << 
rCharacters.cstr() << ": implement me");
 }
 
 void EPUBPackage::closeXMLFile()
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx 
b/writerperfect/source/writer/exp/xmlimp.cxx
index 1c915857413e..21c4809ffc57 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -16,28 +16,46 @@ namespace writerperfect
 namespace exp
 {
 
-XMLImport::XMLImport()
+XMLImport::XMLImport(librevenge::RVNGTextInterface &rGenerator)
+: mrGenerator(rGenerator)
 {
 }
 
 void XMLImport::startDocument()
 {
+mrGenerator.startDocument(librevenge::RVNGPropertyList());
 }
 
 void XMLImport::endDocument()
 {
+mrGenerator.endDocument();
 }
 
-void XMLImport::startElement(const OUString &/*rName*/, const 
css::uno::Reference &/*xAttribs*/)
+void XMLImport::startElement(const OUString &rName, const 
css::uno::Reference &/*xAttribs*/)
 {
+if (rName == "text:p")
+{
+mrGenerator.openParagraph(librevenge::RVNGPropertyList());
+mbParagraphOpened = true;
+}
 }
 
-void XMLImport::endElement(const OUString &/*rName*/)
+void XMLImport::endElement(const OUString &rName)
 {
+if (rName == "text:p")
+{
+mrGenerator.closeParagraph();
+mbParagraphOpened = false;
+}
 }
 
-void XMLImport::characters(const OUString &/*rChars*/)
+void XMLImport::characters(const OUString &rChars)
 {
+if (mbParagraphOpened)
+{
+OString sCharU8 = OUStringToOString(rChars, RTL_TEXTENCODING_UTF8);
+mrGenerator.insertText(librevenge::RVNGString(sCharU8.getStr()));
+}
 }
 
 void XMLImport::ignorableWhitespace(const OUString &/*rWhitespaces*/)
diff --git a/writerperfect/source/writer/exp/xmlimp.hxx 
b/writerperfect/source/writer/exp/xmlimp.hxx
index 9d6d1eb4c0c6..2b1c743fcf03 100644
--- a/writerperfect/source/writer/exp/xmlimp.hxx
+++ b/writerperfect/source/writer/exp/xmlimp.hxx

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - loleaflet/src

2017-08-07 Thread Marco Cecchetti

 loleaflet/src/map/handler/Map.Mouse.js |   34 +
 1 file changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 0c948fa62890cb68537008e2a4e3a60ffc594559
Author: Marco Cecchetti 
Date:   Tue Aug 1 17:51:27 2017 +0200

loleaflet: graphic selection can get misplaced if mouse is moved fast

Change-Id: I2c1893110ce76bed2c822c8d1ddd293c8f627307
Reviewed-on: https://gerrit.libreoffice.org/40644
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 67de89cbbc238b12b1064a2107967caecd9f126c)
Reviewed-on: https://gerrit.libreoffice.org/40826

diff --git a/loleaflet/src/map/handler/Map.Mouse.js 
b/loleaflet/src/map/handler/Map.Mouse.js
index b5861ff1..78229005 100644
--- a/loleaflet/src/map/handler/Map.Mouse.js
+++ b/loleaflet/src/map/handler/Map.Mouse.js
@@ -45,25 +45,27 @@ L.Map.Mouse = L.Handler.extend({
if (docLayer._graphicMarker.isDragged) {
return;
}
-   if 
(!docLayer._isEmptyRectangle(docLayer._graphicSelection) &&
-   
docLayer._graphicMarker.getBounds().contains(e.latlng)) {
+   if 
(!docLayer._isEmptyRectangle(docLayer._graphicSelection)) {
// if we have a graphic selection and the user 
clicks inside the rectangle
-   if (e.type === 'mousedown') {
+   var isInside = 
docLayer._graphicMarker.getBounds().contains(e.latlng);
+   if (e.type === 'mousedown' && isInside) {
this._prevMousePos = e.latlng;
}
-   else if (e.type === 'mousemove' && 
this._mouseDown && !this._prevMousePos) {
-   // if the user started to drag the 
shape before the selection
-   // has been drawn
-   this._prevMousePos = e.latlng;
-   }
-   else if (e.type === 'mousemove' && 
this._prevMousePos) {
-   // we have a graphic selection and the 
user started to drag it
-   var delta = L.latLng(e.latlng.lat - 
this._prevMousePos.lat, e.latlng.lng - this._prevMousePos.lng);
-   this._prevMousePos = e.latlng;
-   var oldSelectionCenter = 
docLayer._graphicMarker.getBounds().getCenter();
-   var newSelectionCenter = 
L.latLng(oldSelectionCenter.lat + delta.lat, oldSelectionCenter.lng + 
delta.lng);
-   if (docLayer._graphicMarker.editing) {
-   
docLayer._graphicMarker.editing._move(newSelectionCenter);
+   else if (e.type === 'mousemove' && 
this._mouseDown) {
+   if (!this._prevMousePos && isInside) {
+   // if the user started to drag 
the shape before the selection
+   // has been drawn
+   this._prevMousePos = e.latlng;
+   }
+   else {
+   // we have a graphic selection 
and the user started to drag it
+   var delta = 
L.latLng(e.latlng.lat - this._prevMousePos.lat, e.latlng.lng - 
this._prevMousePos.lng);
+   this._prevMousePos = e.latlng;
+   var oldSelectionCenter = 
docLayer._graphicMarker.getBounds().getCenter();
+   var newSelectionCenter = 
L.latLng(oldSelectionCenter.lat + delta.lat, oldSelectionCenter.lng + 
delta.lng);
+   if 
(docLayer._graphicMarker.editing) {
+   
docLayer._graphicMarker.editing._move(newSelectionCenter);
+   }
}
}
else if (e.type === 'mouseup') {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Weekly QA Report (W31-2017)

2017-08-07 Thread Xisco Fauli

Hello,

What have happened in QA in the last 7 days?

  * 156 have been created, of which, 46 are still unconfirmed ( Total
Unconfirmed bugs: 473 )
Link: http://tinyurl.com/y93xtfjk

  * 1028 comments have been written.

== STATUS CHANGED ==
  * 19 bugs have been changed to 'ASSIGNED'.
Link: http://tinyurl.com/y6vnpv83
Done by: Xisco Faulí ( 5 ), Tamás Zolnai ( 3 ), Heiko Tietze ( 2 ),
Dennis Francis ( 2 ), Miklos Vajna ( 1 ), Thorsten Behrens (CIB) ( 1 ),
Julien Nabet ( 1 ), Samuel Mehrbrodt (CIB) ( 1 ), Paul Trojahn ( 1 ),
rama ( 1 ), Aron Budea ( 1 )

  * 2 bugs have been changed to 'CLOSED'.
Link: http://tinyurl.com/ybhkhdop
Done by: Regina Henschel ( 1 ), Adolfo Jayme ( 1 )

  * 47 bugs have been changed to 'NEEDINFO'.
Link: http://tinyurl.com/yauyfj4g
Done by: Xisco Faulí ( 26 ), Jean-Baptiste Faure ( 8 ), Julien Nabet
( 5 ), raal ( 3 ), Alex Thurgood ( 2 ), Miklos Vajna ( 1 ), Buovjaga ( 1
), Heiko Tietze ( 1 )

  * 61 bugs have been changed to 'NEW'.
Link: http://tinyurl.com/yct6qtj6
Done by: Xisco Faulí ( 9 ), Aron Budea ( 6 ), V Stuart Foote ( 5 ),
Yousuf Philips (jay) ( 4 ), Timur ( 4 ), Buovjaga ( 3 ), raal ( 3 ),
Jacques Guilleron ( 3 ), tommy27 ( 3 ), Olivier Hallot ( 2 ), m.a.riosv
( 2 ), Jean-Baptiste Faure ( 2 ), Alex ARNAUD ( 2 ), Thomas Krumbein ( 1
), Heiko Tietze ( 1 ), Telesto ( 1 ), Julien Nabet ( 1 ), Rosemary
Sebastian ( 1 ), Regina Henschel ( 1 ), MM ( 1 ), ape-2 ( 1 ), Oliver
Brinzing ( 1 ), Jérôme ( 1 ), Alex Thurgood ( 1 ), Arnaud Versini ( 1 ),
Andrzej Hunt ( 1 )

  * 1 bug has been changed to 'REOPENED'.
Link: http://tinyurl.com/ybxflcoc
Done by: Ramon Tavarez ( 1 )

  * 27 bugs have been changed to 'RESOLVED DUPLICATE'.
Link: http://tinyurl.com/ycoubcrb
Done by: Alex Thurgood ( 5 ), Xisco Faulí ( 4 ), Martin Spacek ( 4
), Julien Nabet ( 2 ), V Stuart Foote ( 1 ), Heiko Tietze ( 1 ), Telesto
( 1 ), robert ( 1 ), Regina Henschel ( 1 ), raal ( 1 ), m.a.riosv ( 1 ),
Luke ( 1 ), Jean-Baptiste Faure ( 1 ), Jacques Guilleron ( 1 ), Timur (
1 ), Jan-Marek Glogowski ( 1 )

  * 21 bugs have been changed to 'RESOLVED FIXED'.
Link: http://tinyurl.com/y86xjuam
Done by: Caolán McNamara ( 3 ), Julien Nabet ( 2 ), Noel Grandin ( 2
), Markus Mohrhard ( 2 ), Dennis Francis ( 2 ), Tamás Zolnai ( 1 ), V
Stuart Foote ( 1 ), Buovjaga ( 1 ), Szymon Kłos ( 1 ), Pranav Kant ( 1
), Yousuf Philips (jay) ( 1 ), Mike Kaganski ( 1 ), Lionel Elie Mamane (
1 ), bureautiquelibre ( 1 ), Aron Budea ( 1 )

  * 2 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'.
Link: http://tinyurl.com/y7zez2nd
Done by: Julien Nabet ( 1 ), Jean-Baptiste Faure ( 1 )

  * 10 bugs have been changed to 'RESOLVED INVALID'.
Link: http://tinyurl.com/ycekqwxn
Done by: raal ( 8 ), Olivier Hallot ( 1 ), Alex Thurgood ( 1 )

  * 9 bugs have been changed to 'RESOLVED NOTABUG'.
Link: http://tinyurl.com/y9aohpvb
Done by: Xisco Faulí ( 2 ), Buovjaga ( 1 ), Telesto ( 1 ), Szymon
Kłos ( 1 ), Nartagnan ( 1 ), m.a.riosv ( 1 ), GZU ( 1 ), Andreas ( 1 )

  * 5 bugs have been changed to 'RESOLVED NOTOURBUG'.
Link: http://tinyurl.com/y925jpel
Done by: Jean-Baptiste Faure ( 3 ), Xisco Faulí ( 2 )

  * 5 bugs have been changed to 'RESOLVED WONTFIX'.
Link: http://tinyurl.com/ycjpj5uh
Done by: Heiko Tietze ( 3 ), V Stuart Foote ( 1 ), Andrzej Hunt ( 1 )

  * 26 bugs have been changed to 'RESOLVED WORKSFORME'.
Link: http://tinyurl.com/ydapqr4m
Done by: Alex Thurgood ( 9 ), Heiko Tietze ( 4 ), Xisco Faulí ( 2 ),
Jean-Baptiste Faure ( 2 ), Buovjaga ( 1 ), Leandro Martín Drudi ( 1 ),
raal ( 1 ), Paul Menzel ( 1 ), Mikhail Novosyolov ( 1 ), m.a.riosv ( 1
), Keith Curtis ( 1 ), Timur ( 1 ), Aron Budea ( 1 )

  * 14 bugs have been changed to 'UNCONFIRMED'.
Link: http://tinyurl.com/yb2kcl3q
Done by: Ignacio Graffione ( 2 ), Xisco Faulí ( 1 ), Buovjaga ( 1 ),
Torsten ( 1 ), Telesto ( 1 ), sergio.callegari ( 1 ), rbeilby ( 1 ),
Kiyotaka Nishibori ( 1 ), Massimiliano Loprieno ( 1 ), f.masson ( 1 ),
bellgardt ( 1 ), Thomas S. ( 1 ), Adalbert Hanßen ( 1 )

  * 26 bugs have been changed to 'VERIFIED FIXED'.
Link: http://tinyurl.com/y7vo3fye
Done by: Xisco Faulí ( 22 ), Julien Nabet ( 1 ), Terrence Enger ( 1
), Timur ( 1 ), Aron Budea ( 1 )

== KEYWORDS ADDED ==
  * 'accessibility' has been added to 3 bugs.
Link: http://tinyurl.com/y7s9ulez
Done by: Alex ARNAUD ( 2 ), V Stuart Foote ( 1 )

  * 'bibisectRequest' has been added to 6 bugs.
Link: http://tinyurl.com/yaw66rgu
Done by: Xisco Faulí ( 2 ), Telesto ( 1 ), Yousuf Philips (jay) ( 1
), Alex Thurgood ( 1 ), tommy27 ( 1 )

  * 'bibisected' has been added to 22 bugs.
Link: http://tinyurl.com/yank8rx7
Done by: Xisco Faulí ( 11 ), raal ( 9 ), Aron Budea ( 2 )

  * 'bisected' has been added to 23 bugs.
Link: http://tinyurl.com/yagou6qf
Done by: Xisco Faulí ( 10 ), raal ( 9 ), Aron Budea ( 3 ), Luke ( 1 )

  * 'easyHack' has been added to 2 bugs.
Link: http:/

[Libreoffice-commits] core.git: helpcontent2

2017-08-07 Thread Olivier Hallot

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 147e20fc1bedfc9e9fc695a06d56445134f88021
Author: Olivier Hallot 
Date:   Tue Jun 6 17:00:08 2017 -0300

Updated core
Project: help  9f7edddfe613a3e61a1160028c853d9fc569876a

Make xml-lang optional in help DTD

Change DTD to make xml-lang optional, as requested by patch
https://gerrit.libreoffice.org/#/c/32296/

Change-Id: I5ef02dddb8486b75e16f3b141aa792b1dfb43f86
Reviewed-on: https://gerrit.libreoffice.org/38465
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
Reviewed-by: Jan Holesovsky 

diff --git a/helpcontent2 b/helpcontent2
index ae4b238aec89..9f7edddfe613 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ae4b238aec8977510b63b5a30c71e0aa933c279a
+Subproject commit 9f7edddfe613a3e61a1160028c853d9fc569876a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/xmlhelp.dtd

2017-08-07 Thread Olivier Hallot

 helpers/xmlhelp.dtd |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 9f7edddfe613a3e61a1160028c853d9fc569876a
Author: Olivier Hallot 
Date:   Tue Jun 6 17:00:08 2017 -0300

Make xml-lang optional in help DTD

Change DTD to make xml-lang optional, as requested by patch
https://gerrit.libreoffice.org/#/c/32296/

Change-Id: I5ef02dddb8486b75e16f3b141aa792b1dfb43f86
Reviewed-on: https://gerrit.libreoffice.org/38465
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
Reviewed-by: Jan Holesovsky 

diff --git a/helpers/xmlhelp.dtd b/helpers/xmlhelp.dtd
index 2c789604e..d6564f5f4 100644
--- a/helpers/xmlhelp.dtd
+++ b/helpers/xmlhelp.dtd
@@ -18,6 +18,9 @@
 
 
 
@@ -28,7 +31,7 @@ Version 03-Feb-2006
 
 
 
@@ -40,7 +43,7 @@ Version 03-Feb-2006
 
 
@@ -51,7 +54,7 @@ Version 03-Feb-2006
 
 
 
@@ -160,7 +163,7 @@ Version 03-Feb-2006
   level CDATA #IMPLIED
   id CDATA #REQUIRED
   l10n CDATA #IMPLIED
-  xml-lang CDATA #REQUIRED
+  xml-lang CDATA #IMPLIED
   oldref CDATA #IMPLIED
   localize CDATA #IMPLIED
 >
@@ -213,7 +216,7 @@ Version 03-Feb-2006
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/source

2017-08-07 Thread Noel Grandin

 sw/inc/hhcwrp.hxx  |2 +-
 sw/inc/view.hxx|   20 ++--
 sw/source/filter/inc/msfilter.hxx  |6 +++---
 sw/source/filter/ww8/WW8Sttbf.cxx  |2 +-
 sw/source/filter/ww8/WW8Sttbf.hxx  |2 +-
 sw/source/filter/ww8/WW8TableInfo.cxx  |   10 +-
 sw/source/filter/ww8/WW8TableInfo.hxx  |8 
 sw/source/filter/ww8/docxattributeoutput.cxx   |6 +++---
 sw/source/filter/ww8/docxattributeoutput.hxx   |4 ++--
 sw/source/filter/ww8/docxexport.cxx|4 ++--
 sw/source/filter/ww8/docxexport.hxx|4 ++--
 sw/source/filter/ww8/rtfattributeoutput.cxx|4 ++--
 sw/source/filter/ww8/writerhelper.cxx  |2 +-
 sw/source/filter/ww8/writerhelper.hxx  |2 +-
 sw/source/filter/ww8/writerwordglue.cxx|6 +++---
 sw/source/filter/ww8/wrtw8esh.cxx  |8 
 sw/source/filter/ww8/wrtw8nds.cxx  |2 +-
 sw/source/filter/ww8/wrtww8.hxx|4 ++--
 sw/source/filter/ww8/ww8par.hxx|4 ++--
 sw/source/uibase/inc/conttree.hxx  |2 +-
 sw/source/uibase/inc/pview.hxx |2 +-
 sw/source/uibase/inc/tablemgr.hxx  |2 +-
 sw/source/uibase/inc/uiitems.hxx   |2 +-
 sw/source/uibase/inc/uitool.hxx|4 ++--
 sw/source/uibase/inc/uivwimp.hxx   |2 +-
 sw/source/uibase/inc/wrtsh.hxx |4 ++--
 sw/source/uibase/lingu/hhcwrp.cxx  |2 +-
 sw/source/uibase/sidebar/StylePresetsPanel.cxx |2 +-
 sw/source/uibase/sidebar/ThemePanel.cxx|6 +++---
 sw/source/uibase/table/tablemgr.cxx|2 +-
 sw/source/uibase/uiview/pview.cxx  |2 +-
 sw/source/uibase/uiview/view0.cxx  |4 ++--
 sw/source/uibase/uiview/view1.cxx  |2 +-
 sw/source/uibase/uiview/viewcoll.cxx   |2 +-
 sw/source/uibase/uiview/viewdlg.cxx|2 +-
 sw/source/uibase/uiview/viewdlg2.cxx   |2 +-
 sw/source/uibase/uiview/viewdraw.cxx   |6 +++---
 sw/source/uibase/uiview/viewfunc.hxx   |2 +-
 sw/source/uibase/uiview/viewling.cxx   |2 +-
 sw/source/uibase/uiview/viewport.cxx   |6 +++---
 sw/source/uibase/uiview/viewprt.cxx|2 +-
 sw/source/uibase/uiview/viewsrch.cxx   |6 +++---
 sw/source/uibase/uiview/viewtab.cxx|2 +-
 sw/source/uibase/uno/unomailmerge.cxx  |2 +-
 sw/source/uibase/uno/unotxdoc.cxx  |2 +-
 sw/source/uibase/utlui/content.cxx |6 +++---
 sw/source/uibase/utlui/uiitems.cxx |2 +-
 sw/source/uibase/utlui/uitool.cxx  |4 ++--
 sw/source/uibase/wrtsh/wrtsh1.cxx  |2 +-
 sw/source/uibase/wrtsh/wrtsh2.cxx  |2 +-
 50 files changed, 95 insertions(+), 95 deletions(-)

New commits:
commit 0582346a1ab5ec8d1b81ea3fef1e40db60c90823
Author: Noel Grandin 
Date:   Mon Aug 7 09:42:02 2017 +0200

loplugin:constparams in sw part8

Change-Id: I0fb51270da4b8f3049f1af2c2c788e516b3641e8
Reviewed-on: https://gerrit.libreoffice.org/40821
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index ca9c9d6877e9..1401abdc10a9 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -56,7 +56,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public 
editeng::HangulHanjaConversion
 boolFindConvText_impl();///< former FindSpellError
 
 voidConvStart_impl( SwConversionArgs *pConvArgs, SvxSpellArea 
eSpell );   ///< former SpellStart
-voidConvEnd_impl( SwConversionArgs *pConvArgs );   
   ///< former SpellEnd
+voidConvEnd_impl( SwConversionArgs const *pConvArgs ); 
 ///< former SpellEnd
 boolConvContinue_impl( SwConversionArgs *pConvArgs );  
   ///< former SpellContinue
 
 voidSelectNewUnit_impl( const sal_Int32 nUnitStart,
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 7181997dd24c..c6783bb3c5cb 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -305,7 +305,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
 // used for spell checking and text conversion
 SAL_DLLPRIVATE void  SpellStart( SvxSpellArea eSpell, bool 
bStartDone,
 bool bEndDone, SwConversionArgs 
*pConvArgs );
-SAL_DLLPRIVATE void  SpellEnd( SwConversionArgs *pConvArgs );
+SAL_DLLPRIVATE void  SpellEnd( SwConversionArgs const *pConvArgs );
 
 SAL_DLLPRIVATE void  HyphStart( SvxSpellArea eSpell );
 SAL_DLLPRIVATE void  SpellContext(bool bOn = true)
@@ -490,12 +490,12 @@ public:
 // Handler
 voidExecute(SfxRequest&);
 v

[Libreoffice-commits] online.git: discovery.xml

2017-08-07 Thread Jan Holesovsky

 discovery.xml |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit b12649d8595904bf1a0cb23fef0fa0da44769430
Author: Jan Holesovsky 
Date:   Mon Aug 7 10:18:28 2017 +0200

discovery: Add the binary MS filetypes.

Change-Id: I745471cc2c1febf6de70c7063197eee7b1672f2e
Reviewed-on: https://gerrit.libreoffice.org/40825
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/discovery.xml b/discovery.xml
index a86b7cab..0a9ca48c 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -128,11 +128,24 @@
 
 
 
-   
-   
+
+
+
+
+
 
 
 
+
+
+
+
+
+
+
+
+
+


 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/source

2017-08-07 Thread Miklos Vajna

 sw/inc/ndnotxt.hxx |   18 +-
 sw/source/core/docnode/ndnotxt.cxx |   66 ++---
 2 files changed, 42 insertions(+), 42 deletions(-)

New commits:
commit 57ea9f81ed3553ad71207db9e433774b165732a2
Author: Miklos Vajna 
Date:   Mon Aug 7 09:16:40 2017 +0200

sw: prefix members of SwNoTextNode

Change-Id: I6a272d1c83c58e1b6ef610eed7964309d1622a7e
Reviewed-on: https://gerrit.libreoffice.org/40820
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 0e1a094e5764..e302123e2f0c 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -31,12 +31,12 @@ class SW_DLLPUBLIC SwNoTextNode : public SwContentNode
 friend class SwNodes;
 friend class SwNoTextFrame;
 
-std::unique_ptr pContour;
-bool bAutomaticContour : 1; // automatic contour polygon, not manipulated
-bool bContourMapModeValid : 1; // contour map mode is not the graphics's
+std::unique_ptr m_pContour;
+bool m_bAutomaticContour : 1; // automatic contour polygon, not manipulated
+bool m_bContourMapModeValid : 1; // contour map mode is not the graphics's
// preferred map mode, but either
   // MM100 or pixel
-bool bPixelContour : 1; // contour map mode is invalid and pixel.
+bool m_bPixelContour : 1; // contour map mode is invalid and pixel.
 
 // Creates for all derivations an AttrSet with ranges for frame- and
 // graphics-attributes (only called by SwContentNode).
@@ -69,12 +69,12 @@ public:
 void   SetContour( const tools::PolyPolygon *pPoly,
bool bAutomatic = false );
 const tools::PolyPolygon *HasContour() const;
-bool   HasContour_() const { return pContour!=nullptr; };
+bool   HasContour_() const { return m_pContour!=nullptr; };
 void   GetContour( tools::PolyPolygon &rPoly ) const;
 void   CreateContour();
 
-void   SetAutomaticContour( bool bSet ) { bAutomaticContour = 
bSet; }
-bool   HasAutomaticContour() const { return bAutomaticContour; 
}
+void   SetAutomaticContour( bool bSet ) { m_bAutomaticContour 
= bSet; }
+bool   HasAutomaticContour() const { return 
m_bAutomaticContour; }
 
 // set either a MM100 or pixel contour
 void   SetContourAPI( const tools::PolyPolygon *pPoly );
@@ -82,10 +82,10 @@ public:
 // get either a MM100 or pixel contour, return false if no contour is set.
 bool   GetContourAPI( tools::PolyPolygon &rPoly ) const;
 
-void   SetPixelContour( bool bSet ) { bPixelContour = bSet; }
+void   SetPixelContour( bool bSet ) { m_bPixelContour = bSet; }
 bool   IsPixelContour() const;
 
-bool   IsContourMapModeValid() const { return 
bContourMapModeValid; }
+bool   IsContourMapModeValid() const { return 
m_bContourMapModeValid; }
 
 // Obtains the graphic with SwapIn for GrfNode via GetData for OLE.
 Graphic GetGraphic() const;
diff --git a/sw/source/core/docnode/ndnotxt.cxx 
b/sw/source/core/docnode/ndnotxt.cxx
index ccb1533cf59e..3d33fda5cd5d 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -41,10 +41,10 @@ SwNoTextNode::SwNoTextNode( const SwNodeIndex & rWhere,
   SwGrfFormatColl *pGrfColl,
   SwAttrSet const * pAutoAttr ) :
 SwContentNode( rWhere, nNdType, pGrfColl ),
-pContour( nullptr ),
-bAutomaticContour( false ),
-bContourMapModeValid( true ),
-bPixelContour( false )
+m_pContour( nullptr ),
+m_bAutomaticContour( false ),
+m_bContourMapModeValid( true ),
+m_bPixelContour( false )
 {
 // Should this set a hard attribute?
 if( pAutoAttr )
@@ -88,36 +88,36 @@ bool SwNoTextNode::SavePersistentData()
 void SwNoTextNode::SetContour( const tools::PolyPolygon *pPoly, bool 
bAutomatic )
 {
 if ( pPoly )
-pContour.reset( new tools::PolyPolygon( *pPoly ) );
+m_pContour.reset( new tools::PolyPolygon( *pPoly ) );
 else
-pContour.reset();
-bAutomaticContour = bAutomatic;
-bContourMapModeValid = true;
-bPixelContour = false;
+m_pContour.reset();
+m_bAutomaticContour = bAutomatic;
+m_bContourMapModeValid = true;
+m_bPixelContour = false;
 }
 
 void SwNoTextNode::CreateContour()
 {
-OSL_ENSURE( !pContour, "Contour available." );
-pContour.reset( new 
tools::PolyPolygon(SvxContourDlg::CreateAutoContour(GetGraphic())) );
-bAutomaticContour = true;
-bContourMapModeValid = true;
-bPixelContour = false;
+OSL_ENSURE( !m_pContour, "Contour available." );
+m_pContour.reset( new 
tools::PolyPolygon(SvxContourDlg::CreateAutoContour(GetGraphic())) );
+m_bAutomaticContour = true;
+

[Libreoffice-commits] core.git: sc/source

2017-08-07 Thread Dennis Francis

 sc/source/ui/view/viewfun2.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit bc6f56e4bb27f802e90303073ba5e2a676baa39b
Author: Dennis Francis 
Date:   Thu Aug 3 14:27:46 2017 +0530

tdf#109859: Update the view data of new document when...

...a set of sheets are copied to a new spreadsheet document.

Change-Id: I47642b4aa2543c193328d9515564bfbacf044bbc
Reviewed-on: https://gerrit.libreoffice.org/40764
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 8c173c4194a9..cf01cb183b02 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2773,7 +2773,12 @@ void ScViewFunc::MoveTable(
 if ( pDestDoc->IsChartListenerCollectionNeedsUpdate() )
 pDestDoc->UpdateChartListenerCollection();
 
-pDestDoc->DeleteTab(static_cast(TheTabs.size()));   // old 
first table
+SCTAB nNumTabsInserted = static_cast(TheTabs.size());
+pDestShell->Broadcast( ScTablesHint( SC_TABS_INSERTED, 0, 
nNumTabsInserted ) );
+
+pDestDoc->DeleteTab( nNumTabsInserted );   // old first table
+pDestShell->Broadcast( ScTablesHint( SC_TAB_DELETED, 
nNumTabsInserted ) );
+
 if (pDestViewSh)
 {
 // Make sure to clear the cached page view after sheet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2017-08-07 Thread Dennis Francis

 sc/source/ui/app/inputwin.cxx |   55 +++---
 1 file changed, 36 insertions(+), 19 deletions(-)

New commits:
commit 561cae8e81913940e4af86901ec46a484669c597
Author: Dennis Francis 
Date:   Tue Jul 25 17:11:47 2017 +0530

tdf#71409: Pre-create sum/equal and ok/cancel buttons...

in the sc formula bar at the start instead of adding/
removing them to/from vcl ToolBox when required.
To maintain the functionality, do hide/show and
enable/disable the button pairs (sum/equal, ok/cancel)
during mode switch. This solves the excess a11y events
problem of tdf#71409 because this patch get rid of
the usages of vcl's Toolbox::Remove() and its accessibility
module dependencies which seems to be the root cause.

Change-Id: Ib953fb64d25a4b83018eca6a88223c7236c2f72e
Reviewed-on: https://gerrit.libreoffice.org/40479
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index eade695e1c20..7d0b7fa036fd 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -190,8 +190,10 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, 
SfxBindings* pBind ) :
 InsertItem  (SID_INPUT_FUNCTION, 
Image(BitmapEx(RID_BMP_INPUT_FUNCTION)), ToolBoxItemBits::NONE, 2);
 InsertItem  (SID_INPUT_SUM,  Image(BitmapEx(RID_BMP_INPUT_SUM)), 
ToolBoxItemBits::NONE, 3);
 InsertItem  (SID_INPUT_EQUAL,Image(BitmapEx(RID_BMP_INPUT_EQUAL)), 
ToolBoxItemBits::NONE, 4);
-InsertSeparator (5);
-InsertWindow(7, &aTextWindow, ToolBoxItemBits::NONE, 6);
+InsertItem  (SID_INPUT_CANCEL,   
Image(BitmapEx(RID_BMP_INPUT_CANCEL)), ToolBoxItemBits::NONE, 5);
+InsertItem  (SID_INPUT_OK,   Image(BitmapEx(RID_BMP_INPUT_OK)), 
ToolBoxItemBits::NONE, 6);
+InsertSeparator (7);
+InsertWindow(7, &aTextWindow, ToolBoxItemBits::NONE, 8);
 
 aWndPos   ->SetQuickHelpText(ScResId(SCSTR_QHELP_POSWND));
 aWndPos   ->SetHelpId   (HID_INSWIN_POS);
@@ -208,6 +210,18 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, 
SfxBindings* pBind ) :
 SetItemText (SID_INPUT_EQUAL, aTextEqual);
 SetHelpId   (SID_INPUT_EQUAL, HID_INSWIN_FUNC);
 
+SetItemText ( SID_INPUT_CANCEL, aTextCancel );
+SetHelpId   ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
+
+SetItemText ( SID_INPUT_OK, aTextOk );
+SetHelpId   ( SID_INPUT_OK, HID_INSWIN_OK );
+
+EnableItem( SID_INPUT_CANCEL, false );
+EnableItem( SID_INPUT_OK, false );
+
+HideItem( SID_INPUT_CANCEL );
+HideItem( SID_INPUT_OK );
+
 SetHelpId( HID_SC_INPUTWIN ); // For the whole input row
 
 aWndPos   ->Show();
@@ -504,14 +518,16 @@ void ScInputWindow::SetOkCancelMode()
 
 if (!bIsOkCancelMode)
 {
-RemoveItem( 3 ); // Remove SID_INPUT_SUM and SID_INPUT_EQUAL
-RemoveItem( 3 );
-InsertItem( SID_INPUT_CANCEL, Image(BitmapEx(RID_BMP_INPUT_CANCEL)), 
ToolBoxItemBits::NONE, 3 );
-InsertItem( SID_INPUT_OK, Image(BitmapEx(RID_BMP_INPUT_OK)), 
ToolBoxItemBits::NONE, 4 );
-SetItemText ( SID_INPUT_CANCEL, aTextCancel );
-SetHelpId   ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
-SetItemText ( SID_INPUT_OK, aTextOk );
-SetHelpId   ( SID_INPUT_OK, HID_INSWIN_OK );
+EnableItem  ( SID_INPUT_SUM,   false );
+EnableItem  ( SID_INPUT_EQUAL, false );
+HideItem( SID_INPUT_SUM );
+HideItem( SID_INPUT_EQUAL );
+
+ShowItem( SID_INPUT_CANCEL, true );
+ShowItem( SID_INPUT_OK, true );
+EnableItem  ( SID_INPUT_CANCEL, true );
+EnableItem  ( SID_INPUT_OK, true );
+
 bIsOkCancelMode = true;
 }
 }
@@ -524,15 +540,16 @@ void ScInputWindow::SetSumAssignMode()
 
 if (bIsOkCancelMode)
 {
-// Remove SID_INPUT_CANCEL, and SID_INPUT_OK
-RemoveItem( 3 );
-RemoveItem( 3 );
-InsertItem( SID_INPUT_SUM,   Image(BitmapEx(RID_BMP_INPUT_SUM)),   
ToolBoxItemBits::NONE, 3 );
-InsertItem( SID_INPUT_EQUAL, Image(BitmapEx(RID_BMP_INPUT_EQUAL)), 
ToolBoxItemBits::NONE, 4 );
-SetItemText ( SID_INPUT_SUM,   aTextSum );
-SetHelpId   ( SID_INPUT_SUM,   HID_INSWIN_SUMME );
-SetItemText ( SID_INPUT_EQUAL, aTextEqual );
-SetHelpId   ( SID_INPUT_EQUAL, HID_INSWIN_FUNC );
+EnableItem  ( SID_INPUT_CANCEL, false );
+EnableItem  ( SID_INPUT_OK, false );
+HideItem( SID_INPUT_CANCEL );
+HideItem( SID_INPUT_OK );
+
+ShowItem( SID_INPUT_SUM,true );
+ShowItem( SID_INPUT_EQUAL,  true );
+EnableItem  ( SID_INPUT_SUM,true );
+EnableItem  ( SID_INPUT_EQUAL,  true );
+
 bIsOkCancelMode = false;
 
 SetFormulaMode(false); // No editing -> no formula
___
Libreoffice-commits mailing list
libreoffice-com

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

2017-08-07 Thread Caolán McNamara

 sc/source/ui/view/drawvie4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e191b82881a1bc06aee73de85452eaf867d1041
Author: CaolÃ¡n McNamara 
Date:   Fri Aug 4 16:53:23 2017 +0100

coverity#1416135 Dereference after null check

and

coverity#1416137 Dereference after null check

since...

commit 04461743d75f8cffb5906ab52d772089c44a7780
Date:   Fri Jul 21 13:12:20 2017 +0530

tdf#108887 : Move the code of ScDrawView::CheckOle()...

maybe this check is simply reversed seeing as

bool bCalcSourceRanges = pRanges && pDoc;

and after this line pRanges and pDoc are unconditionally
dereferenced

Change-Id: Ie3ed3054d2f31ddbc70895a4e6997395ca7de8b5
Reviewed-on: https://gerrit.libreoffice.org/40772
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 30f384b5bd2d8ec7f50ad0c85c43611313044f8c)
Reviewed-on: https://gerrit.libreoffice.org/40818

diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index cc7c59c621f0..ed192aaee1d6 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -245,7 +245,7 @@ void getOleSourceRanges(const SdrMarkList& rMarkList, bool& 
rAnyOle, bool& rOneO
 }
 }
 
-if( bCalcSourceRanges )
+if (!bCalcSourceRanges)
 return;
 
 // Compile all range representation strings into ranges.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source sw/inc sw/source writerfilter/inc writerfilter/source

2017-08-07 Thread Miklos Vajna

 oox/source/shape/LockedCanvasContext.cxx|2 +-
 oox/source/shape/LockedCanvasContext.hxx|2 +-
 oox/source/shape/WpgContext.cxx |2 +-
 oox/source/shape/WpgContext.hxx |2 +-
 oox/source/shape/WpsContext.cxx |2 +-
 oox/source/shape/WpsContext.hxx |2 +-
 sw/inc/textboxhelper.hxx|8 
 sw/source/core/doc/textboxhelper.cxx|8 
 writerfilter/inc/dmapper/DomainMapperFactory.hxx|2 +-
 writerfilter/source/dmapper/SdtHelper.cxx   |4 ++--
 writerfilter/source/dmapper/SdtHelper.hxx   |2 +-
 writerfilter/source/dmapper/domainmapperfactory.cxx |2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |6 +++---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx  |4 ++--
 writerfilter/source/rtftok/rtfsdrimport.cxx |2 +-
 writerfilter/source/rtftok/rtfsdrimport.hxx |2 +-
 writerfilter/source/rtftok/rtftokenizer.cxx |2 +-
 writerfilter/source/rtftok/rtftokenizer.hxx |2 +-
 18 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 609619de8b218e5c10b708c37cd58218b7c9251c
Author: Miklos Vajna 
Date:   Mon Aug 7 09:07:39 2017 +0200

Indentation fixes

These files had a consistent style before, let's keep them that way.

Change-Id: If64773d8c29dee23638e4fb9b7e5b69b34d47e49

diff --git a/oox/source/shape/LockedCanvasContext.cxx 
b/oox/source/shape/LockedCanvasContext.cxx
index 661227086431..0b2e06ccbb3f 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -20,7 +20,7 @@ namespace oox
 namespace shape
 {
 
-LockedCanvasContext::LockedCanvasContext(ContextHandler2Helper const & rParent)
+LockedCanvasContext::LockedCanvasContext(ContextHandler2Helper const& rParent)
 : ContextHandler2(rParent)
 {
 }
diff --git a/oox/source/shape/LockedCanvasContext.hxx 
b/oox/source/shape/LockedCanvasContext.hxx
index 4c26809a9669..63bd6eac1570 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -22,7 +22,7 @@ namespace shape
 class LockedCanvasContext : public oox::core::ContextHandler2
 {
 public:
-explicit LockedCanvasContext(oox::core::ContextHandler2Helper const & 
rParent);
+explicit LockedCanvasContext(oox::core::ContextHandler2Helper const& 
rParent);
 ~LockedCanvasContext() override;
 
 oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, 
const ::oox::AttributeList& rAttribs) override;
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index e7f67dd52cd3..ead163738d74 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -21,7 +21,7 @@ namespace oox
 namespace shape
 {
 
-WpgContext::WpgContext(ContextHandler2Helper const & rParent)
+WpgContext::WpgContext(ContextHandler2Helper const& rParent)
 : ContextHandler2(rParent)
 {
 mpShape.reset(new 
oox::drawingml::Shape("com.sun.star.drawing.GroupShape"));
diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx
index 1280d537f9a4..3faa56f5f5e0 100644
--- a/oox/source/shape/WpgContext.hxx
+++ b/oox/source/shape/WpgContext.hxx
@@ -22,7 +22,7 @@ namespace shape
 class WpgContext : public oox::core::ContextHandler2
 {
 public:
-explicit WpgContext(oox::core::ContextHandler2Helper const & rParent);
+explicit WpgContext(oox::core::ContextHandler2Helper const& rParent);
 ~WpgContext() override;
 
 oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, 
const oox::AttributeList& rAttribs) override;
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 7aa5c169f3f0..23e9af6fb8f2 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -33,7 +33,7 @@ namespace oox
 namespace shape
 {
 
-WpsContext::WpsContext(ContextHandler2Helper const & rParent, 
uno::Reference xShape)
+WpsContext::WpsContext(ContextHandler2Helper const& rParent, 
uno::Reference xShape)
 : ContextHandler2(rParent),
   mxShape(std::move(xShape))
 {
diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx
index c2e53765669f..b0b22a305524 100644
--- a/oox/source/shape/WpsContext.hxx
+++ b/oox/source/shape/WpsContext.hxx
@@ -22,7 +22,7 @@ namespace shape
 class WpsContext : public oox::core::ContextHandler2
 {
 public:
-WpsContext(oox::core::ContextHandler2Helper const & rParent, 
css::uno::Reference xShape);
+WpsContext(oox::core::ContextHandler2Helper const& rParent, 
css::uno::Reference xShape);
 ~WpsContext() override;
 
 oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, 
const oox::AttributeList& rAttribs) override;
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index eba513190fcf..d8ed926c1bc0 100644
--- a/sw/inc/textb

72 matches

Mail list logo