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

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/ChartTypeDialogController.cxx  |1 
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx  |8 +++--
 chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx  |4 +-
 chart2/source/controller/dialogs/DataBrowser.hxx|6 ++-
 chart2/source/controller/dialogs/DataBrowserModel.hxx   |6 ++-
 chart2/source/controller/dialogs/DialogModel.cxx|3 +
 chart2/source/controller/dialogs/DialogModel.hxx|   13 +---
 chart2/source/controller/dialogs/dlg_CreationWizard.cxx |1 
 chart2/source/controller/dialogs/dlg_DataSource.cxx |1 
 chart2/source/controller/dialogs/res_BarGeometry.cxx|1 
 chart2/source/controller/dialogs/res_DataLabel.cxx  |1 
 chart2/source/controller/dialogs/res_DataLabel.hxx  |7 +---
 chart2/source/controller/dialogs/res_Trendline.hxx  |4 +-
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx  |2 +
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx  |6 +--
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx|1 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx|6 +--
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx|6 +--
 chart2/source/controller/dialogs/tp_AxisLabel.cxx   |1 
 chart2/source/controller/dialogs/tp_AxisLabel.hxx   |   13 ++--
 chart2/source/controller/dialogs/tp_AxisPositions.hxx   |2 -
 chart2/source/controller/dialogs/tp_ChartType.cxx   |3 +
 chart2/source/controller/dialogs/tp_ChartType.hxx   |   12 +++
 chart2/source/controller/dialogs/tp_DataSource.cxx  |3 +
 chart2/source/controller/dialogs/tp_DataSource.hxx  |   16 
+-
 chart2/source/controller/dialogs/tp_DataSourceControls.hxx  |8 +
 chart2/source/controller/dialogs/tp_LegendPosition.cxx  |1 
 chart2/source/controller/dialogs/tp_LegendPosition.hxx  |5 +--
 chart2/source/controller/dialogs/tp_PolarOptions.hxx|9 -
 chart2/source/controller/dialogs/tp_RangeChooser.cxx|2 +
 chart2/source/controller/dialogs/tp_RangeChooser.hxx|   10 +-
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx|9 +
 chart2/source/controller/dialogs/tp_TitleRotation.cxx   |1 
 chart2/source/controller/dialogs/tp_TitleRotation.hxx   |   12 +--
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx |8 ++---
 35 files changed, 111 insertions(+), 81 deletions(-)

New commits:
commit 8cac3565f9d556dc8515fb9d747be7d2975d51d4
Author: Gabor Kelemen 
AuthorDate: Mon Oct 8 02:29:37 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Nov 9 08:49:24 2018 +0100

tdf#42949 Fix IWYU warnings in chart2/source/controller/dialogs/*hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx 
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index db42744007aa..459dc29e27ad 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx 
b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 9946845e16ee..2985d31b10db 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -28,11 +28,13 @@
 #include 
 
 #include 
-#include 
-#include 
-#include 
 #include 
 
+namespace com { namespace sun { namespace star { namespace beans { class 
XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class 
XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class 
XChartTypeTemplate; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class 
XMultiServiceFactory; } } } }
+
 class SvtValueSet;
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx 
b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
index 963952807b86..bc04dbbe3cae 100644
--- a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_CHARTTYPETEMPLATEPROVIDER_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_CHARTTYPETEMPLA

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source

[Libreoffice Gerrit user]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |  148 
 1 file changed, 124 insertions(+), 24 deletions(-)

New commits:
commit c0da7d8509516ba6f1fc8781c042fd6f1bd92297
Author: ekuiitr 
AuthorDate: Mon May 21 01:07:19 2018 +0530
Commit: Miklos Vajna 
CommitDate: Fri Nov 9 08:42:33 2018 +0100

tdf#117761 Corrected Snake Algorithm

This is a combination of 5 commits. It brings libreoffice-6-1 up to date
with master when it comes to SmartArt fixes which were not backported so
far.

1st commit:

Now it displays correct position of child layout nodes along a
linear path in two dimensions, with the correct number of rows and
columns and aspect ratio, this algorithm is for smartarts
like Basic Block List - grouped blocks of information.
It also specifies the behaviour of the direction that
additional nodes are added to new rows or columns
in the snake algorithm.

Added Reverse Algorithm and SameDirection Algorithm in this patch,
rather than commiting new Patch.

(cherry picked from commit 8d43de9a88dc7c7fec0e7c794cef14953fb34b6e)

Commit #2:

(cherry picked from commit f1368d6a45456b5682d588371cfa2efa5571d798)

Commit #3:

Support autoTxRot parameter in Text algorithm

Specifies how text is oriented relative to the shape, according to values:
none, upright(default) and gravity.

(cherry picked from commit cf7b97d1328ec2f2c8254abb9ce67d63d9c54c80)

Commit #4:

coverity#1436015 UNUSED_VALUE

I got to know that, earlier the code I've submitted about line algorithm
creates error. I've fixed that in this patch. Moreover, child width and
height doesn't depend of nIncX and nIncY, so I've removed that code, it
relates only to the position of the child.

(cherry picked from commit 3f8fdfced059bdec7f28164eb3c0e99974c6780a)

Commit #5:

Support txAnchorVert parameter

Specifies the y-axis anchoring of the text area in a shape according to:
t(top), mid(middle, default), b(bottom).

(cherry picked from commit 1f66bd9cbd961d1923c260b2d74249e363a0c217)

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

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 3c8993bd687d..e0fd7d246c60 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -356,10 +356,9 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 double fSpace = 0.3;
 
 awt::Size aChildSize = rShape->getSize();
-if (nIncX)
-aChildSize.Width /= (nCount + (nCount-1)*fSpace);
-if (nIncY)
-aChildSize.Height /= (nCount + (nCount-1)*fSpace);
+
+aChildSize.Width /= (nCount + (nCount-1)*fSpace);
+aChildSize.Height /= (nCount + (nCount-1)*fSpace);
 
 awt::Point aCurrPos(0, 0);
 if (nIncX == -1)
@@ -402,18 +401,19 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 // TODO: get values from constraints
 sal_Int32 nCount = rShape->getChildren().size();
 double fSpace = 0.3;
-double fAspectRatio = 0.6;
+double fAspectRatio = 0.54; // diagram should not spill outside, 
earlier it was 0.6
 
 sal_Int32 nCol = 1;
 sal_Int32 nRow = 1;
-for ( ; nColgetSize().Height;
 const double fShapeWidth = rShape->getSize().Width;
-if ((fShapeHeight / nRow) / (fShapeWidth / nCol) >= 
fAspectRatio)
+if ((fShapeHeight / nCol) / (fShapeWidth / nRow) >= 
fAspectRatio)
 break;
 }
+
 SAL_INFO("oox.drawingml", "Snake layout grid: " << nCol << "x" << 
nRow);
 
 sal_Int32 nWidth = rShape->getSize().Width / (nCol + 
(nCol-1)*fSpace);
@@ -426,20 +426,89 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 aCurrPos.Y = rShape->getSize().Height - aChildSize.Height;
 
 sal_Int32 nStartX = aCurrPos.X;
-sal_Int32 nColIdx = 0;
+sal_Int32 nColIdx = 0,index = 0;
 
-for (auto & aCurrShape : rShape->getChildren())
+sal_Int32 num = rShape->getChildren().size();
+
+const sal_Int32 aContDir = maMap.count(XML_contDir) ? 
maMap.find(XML_contDir)->second : XML_sameDir;
+
+switch(aContDir)
 {
-aCurrShape->setPosition(aCurrPos);
-aCurrShape->setSize(aChildSize);
-aCurrShape->setChildSize(aChildSize);
-aCurrPos.X += nIncX * (aChildSize.Width + 
fSpace*aChildSize.Width);
-if (++nColIdx == nCol)
+case X

[Libreoffice-commits] core.git: solenv/bin starmath/source starmath/util

[Libreoffice Gerrit user]

 solenv/bin/native-code.py|1 +
 starmath/source/mathmlimport.cxx |   20 +---
 starmath/source/register.cxx |9 +
 starmath/source/register.hxx |8 
 starmath/util/sm.component   |3 ++-
 5 files changed, 9 insertions(+), 32 deletions(-)

New commits:
commit d8cca1c3720e3c3d352e68ecd0dbe8bfbbaf1e4e
Author: Miklos Vajna 
AuthorDate: Thu Nov 8 21:12:34 2018 +0100
Commit: Miklos Vajna 
CommitDate: Fri Nov 9 08:42:02 2018 +0100

starmath: create XMLImporter instances with an uno constructor

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

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 899baa5ff979..ebdba44a6aba 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -278,6 +278,7 @@ edit_constructor_list = [
 # starmath/util/sm.component
 "Math_XMLOasisMetaExporter_get_implementation",
 "Math_XMLOasisSettingsExporter_get_implementation",
+"Math_XMLImporter_get_implementation",
 # sw/util/sw.component
 "com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation",
 "com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation",
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 4cf6eb321f00..d9f764344dc1 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -434,24 +434,14 @@ const uno::Sequence< sal_Int8 > & 
SmXMLImport::getUnoTunnelId() throw()
 return theSmXMLImportUnoTunnelId::get().getSeq();
 }
 
-OUString SmXMLImport_getImplementationName() throw()
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+Math_XMLImporter_get_implementation(uno::XComponentContext* pCtx,
+uno::Sequence const& /*rSeq*/)
 {
-return OUString( "com.sun.star.comp.Math.XMLImporter" );
+return cppu::acquire(
+new SmXMLImport(pCtx, "com.sun.star.comp.Math.XMLImporter", 
SvXMLImportFlags::ALL));
 }
 
-uno::Sequence< OUString > SmXMLImport_getSupportedServiceNames()
-throw()
-{
-return uno::Sequence{ IMPORT_SVC_NAME };
-}
-
-uno::Reference< uno::XInterface > SmXMLImport_createInstance(
-const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-{
-return static_cast(new 
SmXMLImport(comphelper::getComponentContext(rSMgr), 
SmXMLImport_getImplementationName(), SvXMLImportFlags::ALL));
-}
-
-
 OUString SmXMLImportMeta_getImplementationName() throw()
 {
 return OUString( "com.sun.star.comp.Math.XMLOasisMetaImporter" );
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index e99038c3acb6..683f5c589fa8 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -46,14 +46,7 @@ SAL_DLLPUBLIC_EXPORT void* sm_component_getFactory( const 
sal_Char* pImplementat
 Reference< XSingleServiceFactory >   xFactory  
  ;
 Reference< XMultiServiceFactory >xServiceManager( static_cast< 
XMultiServiceFactory* >( pServiceManager ) ) ;
 
-if( SmXMLImport_getImplementationName().equalsAscii( 
pImplementationName ))
-{
-xFactory = ::cppu::createSingleFactory( xServiceManager,
-SmXMLImport_getImplementationName(),
-SmXMLImport_createInstance,
-SmXMLImport_getSupportedServiceNames() );
-}
-else if( SmXMLImportMeta_getImplementationName().equalsAscii( 
pImplementationName ))
+if( SmXMLImportMeta_getImplementationName().equalsAscii( 
pImplementationName ))
 {
 xFactory = ::cppu::createSingleFactory( xServiceManager,
 SmXMLImportMeta_getImplementationName(),
diff --git a/starmath/source/register.hxx b/starmath/source/register.hxx
index cf6bac038eb7..04dea0bd0da0 100644
--- a/starmath/source/register.hxx
+++ b/starmath/source/register.hxx
@@ -32,14 +32,6 @@ OUString
 css::uno::Reference< css::uno::XInterface >
 SmDocument_createInstance(const css::uno::Reference< 
css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags);
 
-//MathML import
-css::uno::Sequence< OUString >
-SmXMLImport_getSupportedServiceNames() throw();
-OUString
-SmXMLImport_getImplementationName() throw();
-/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface >
-SmXMLImport_createInstance(const css::uno::Reference< 
css::lang::XMultiServiceFactory > & rSMgr);
 css::uno::Sequence< OUString >
 SmXMLImportMeta_getSupportedServiceNames() throw();
 OUString
diff --git a/starmath/util/sm.component b/starmath/util/sm.component
index 0c2af2021672..9215aebaef3b 100644
--- a/starmath/util/sm.component
+++ b/starmath/util/sm.component
@@ -30,7 +30,8 @@
   constructor="Math_XMLExporter_get_implementation">
 
   
-  
+  
 
   
   https:

[Libreoffice-commits] online.git: kit/ChildSession.cpp kit/ChildSession.hpp

[Libreoffice Gerrit user]

 kit/ChildSession.cpp |   10 +-
 kit/ChildSession.hpp |   28 +++-
 2 files changed, 32 insertions(+), 6 deletions(-)

New commits:
commit 83bd75476e53f98e75691c8ad07d8d2a5f488fbf
Author: Miklos Vajna 
AuthorDate: Fri Nov 9 08:41:28 2018 +0100
Commit: Miklos Vajna 
CommitDate: Fri Nov 9 08:41:35 2018 +0100

StateRecorder: make members private

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index af56584d5..3e6a904ce 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -119,13 +119,13 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 // Invalidate if we have to
 // TODO instead just a "_invalidate" flag, we should remember / grow
 // the rectangle to invalidate; invalidating everything is sub-optimal
-if (_stateRecorder._invalidate)
+if (_stateRecorder.isInvalidate())
 {
 std::string payload = "0, 0, " + std::to_string(INT_MAX) + ", " + 
std::to_string(INT_MAX) + ", " + std::to_string(curPart);
 loKitCallback(LOK_CALLBACK_INVALIDATE_TILES, payload);
 }
 
-for (const auto& viewPair : _stateRecorder._recordedViewEvents)
+for (const auto& viewPair : _stateRecorder.getRecordedViewEvents())
 {
 for (const auto& eventPair : viewPair.second)
 {
@@ -136,20 +136,20 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 }
 }
 
-for (const auto& eventPair : _stateRecorder._recordedEvents)
+for (const auto& eventPair : _stateRecorder.getRecordedEvents())
 {
 const RecordedEvent& event = eventPair.second;
 LOG_TRC("Replaying missed event: " << 
LOKitHelper::kitCallbackTypeToString(event._type) << ": " << event._payload);
 loKitCallback(event._type, event._payload);
 }
 
-for (const auto& pair : _stateRecorder._recordedStates)
+for (const auto& pair : _stateRecorder.getRecordedStates())
 {
 LOG_TRC("Replaying missed state-change: " << pair.second);
 loKitCallback(LOK_CALLBACK_STATE_CHANGED, pair.second);
 }
 
-for (const auto& event : _stateRecorder._recordedEventsVector)
+for (const auto& event : _stateRecorder.getRecordedEventsVector())
 {
 LOG_TRC("Replaying missed event (part of sequence): " << 
LOKitHelper::kitCallbackTypeToString(event._type) << ": " << event._payload);
 loKitCallback(event._type, event._payload);
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index b23edd8c4..b67a18980 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -85,13 +85,14 @@ struct RecordedEvent
 /// When the session is inactive, we need to record its state for a replay.
 class StateRecorder
 {
-public:
+private:
 bool _invalidate;
 std::unordered_map _recordedStates;
 std::unordered_map> 
_recordedViewEvents;
 std::unordered_map _recordedEvents;
 std::vector _recordedEventsVector;
 
+public:
 StateRecorder() : _invalidate(false) {}
 
 // TODO Remember the maximal area we need to invalidate - grow it step by 
step.
@@ -100,6 +101,31 @@ public:
 _invalidate = true;
 }
 
+bool isInvalidate() const
+{
+return _invalidate;
+}
+
+const std::unordered_map& getRecordedStates() 
const
+{
+return _recordedStates;
+}
+
+const std::unordered_map>& 
getRecordedViewEvents() const
+{
+return _recordedViewEvents;
+}
+
+const std::unordered_map& getRecordedEvents() const
+{
+return _recordedEvents;
+}
+
+const std::vector& getRecordedEventsVector() const
+{
+return _recordedEventsVector;
+}
+
 void recordEvent(const int type, const std::string& payload)
 {
 _recordedEvents[type] = {type, payload};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/svdraw/svdedtv1.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 9d93e030288aaa721761cb7991d1afdde6335777
Author: Mike Kaganski 
AuthorDate: Thu Nov 8 12:20:08 2018 +0300
Commit: Mike Kaganski 
CommitDate: Fri Nov 9 08:24:18 2018 +0100

tdf#121116: don't adapt start/end widths if they are set explicitly

after commit b8fe3f84a60ea73aed9748844aee80441eb0fc7d
Related: #i122121# moved automatic StartEnd adaption to svx

Change-Id: Ic4639834ffa55d110f232fbad5f140a8e76df3e9
Reviewed-on: https://gerrit.libreoffice.org/63071
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 433fbef97928..c7b8bf1de5c8 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1016,12 +1016,16 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& 
rAttr, bool bReplaceAll)
 // #i38135#
 bool bResetAnimationTimer(false);
 
+const bool bLineStartWidthExplicitChange(SfxItemState::SET
+ == 
aAttr.GetItemState(XATTR_LINESTARTWIDTH));
+const bool bLineEndWidthExplicitChange(SfxItemState::SET
+   == 
aAttr.GetItemState(XATTR_LINEENDWIDTH));
 // check if LineWidth is part of the change
-const bool bLineWidthChange(SfxItemState::SET == 
aAttr.GetItemState(XATTR_LINEWIDTH));
+const bool bAdaptStartEndWidths(!(bLineStartWidthExplicitChange && 
bLineEndWidthExplicitChange)
+ && SfxItemState::SET == 
aAttr.GetItemState(XATTR_LINEWIDTH));
 sal_Int32 nNewLineWidth(0);
-sal_Int32 nOldLineWidth(0);
 
-if(bLineWidthChange)
+if(bAdaptStartEndWidths)
 {
 nNewLineWidth = aAttr.Get(XATTR_LINEWIDTH).GetValue();
 }
@@ -1067,7 +1071,8 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& 
rAttr, bool bReplaceAll)
 aUpdaters.push_back(new E3DModifySceneSnapRectUpdater(pObj));
 }
 
-if(bLineWidthChange)
+sal_Int32 nOldLineWidth(0);
+if (bAdaptStartEndWidths)
 {
 nOldLineWidth = pObj->GetMergedItem(XATTR_LINEWIDTH).GetValue();
 }
@@ -1075,7 +1080,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& 
rAttr, bool bReplaceAll)
 // set attributes at object
 pObj->SetMergedItemSetAndBroadcast(aAttr, bReplaceAll);
 
-if(bLineWidthChange)
+if(bAdaptStartEndWidths)
 {
 const SfxItemSet& rSet = pObj->GetMergedItemSet();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/popupmenu/cell.xml  |1 +
 sc/uiconfig/scalc/popupmenu/pagebreak.xml |1 +
 sw/uiconfig/sglobal/popupmenu/table.xml   |7 ---
 sw/uiconfig/sglobal/popupmenu/text.xml|1 +
 sw/uiconfig/sweb/popupmenu/table.xml  |7 ---
 sw/uiconfig/sweb/popupmenu/text.xml   |1 +
 sw/uiconfig/swriter/popupmenu/table.xml   |7 ---
 sw/uiconfig/swriter/popupmenu/text.xml|1 +
 sw/uiconfig/swxform/popupmenu/table.xml   |7 ---
 sw/uiconfig/swxform/popupmenu/text.xml|1 +
 10 files changed, 22 insertions(+), 12 deletions(-)

New commits:
commit 74708d3d06075c0f5e67e627cad348df28e3e9d1
Author: andreas kainz 
AuthorDate: Thu Nov 8 20:33:54 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Nov 9 08:23:33 2018 +0100

tdf#119581 add FormatPaintbrush to text and table popupmenu

Change-Id: Ic88248078cb34a590396a84dd733818108d9dce4
Reviewed-on: https://gerrit.libreoffice.org/63124
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml 
b/sc/uiconfig/scalc/popupmenu/cell.xml
index e3bb3a73fe28..b4570626b809 100644
--- a/sc/uiconfig/scalc/popupmenu/cell.xml
+++ b/sc/uiconfig/scalc/popupmenu/cell.xml
@@ -33,6 +33,7 @@
   
   
   
+  
   
   
 
diff --git a/sc/uiconfig/scalc/popupmenu/pagebreak.xml 
b/sc/uiconfig/scalc/popupmenu/pagebreak.xml
index 1d6979028554..dc9501d33afc 100644
--- a/sc/uiconfig/scalc/popupmenu/pagebreak.xml
+++ b/sc/uiconfig/scalc/popupmenu/pagebreak.xml
@@ -33,6 +33,7 @@
   
   
   
+  
   
   
 
diff --git a/sw/uiconfig/sglobal/popupmenu/table.xml 
b/sw/uiconfig/sglobal/popupmenu/table.xml
index a65a3f6d43b4..1adfdccd075b 100644
--- a/sw/uiconfig/sglobal/popupmenu/table.xml
+++ b/sw/uiconfig/sglobal/popupmenu/table.xml
@@ -52,9 +52,7 @@
   
 
   
-  
-  
-  
+  
 
   
   
@@ -71,6 +69,9 @@
   
 
   
+  
+  
+  
   
 
   
diff --git a/sw/uiconfig/sglobal/popupmenu/text.xml 
b/sw/uiconfig/sglobal/popupmenu/text.xml
index 72d35b58c37d..c244d4724e35 100644
--- a/sw/uiconfig/sglobal/popupmenu/text.xml
+++ b/sw/uiconfig/sglobal/popupmenu/text.xml
@@ -27,6 +27,7 @@
   
   
   
+  
   
   
 
diff --git a/sw/uiconfig/sweb/popupmenu/table.xml 
b/sw/uiconfig/sweb/popupmenu/table.xml
index a65a3f6d43b4..1adfdccd075b 100644
--- a/sw/uiconfig/sweb/popupmenu/table.xml
+++ b/sw/uiconfig/sweb/popupmenu/table.xml
@@ -52,9 +52,7 @@
   
 
   
-  
-  
-  
+  
 
   
   
@@ -71,6 +69,9 @@
   
 
   
+  
+  
+  
   
 
   
diff --git a/sw/uiconfig/sweb/popupmenu/text.xml 
b/sw/uiconfig/sweb/popupmenu/text.xml
index 72d35b58c37d..c244d4724e35 100644
--- a/sw/uiconfig/sweb/popupmenu/text.xml
+++ b/sw/uiconfig/sweb/popupmenu/text.xml
@@ -27,6 +27,7 @@
   
   
   
+  
   
   
 
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml 
b/sw/uiconfig/swriter/popupmenu/table.xml
index a65a3f6d43b4..1adfdccd075b 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -52,9 +52,7 @@
   
 
   
-  
-  
-  
+  
 
   
   
@@ -71,6 +69,9 @@
   
 
   
+  
+  
+  
   
 
   
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml 
b/sw/uiconfig/swriter/popupmenu/text.xml
index 72d35b58c37d..c244d4724e35 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -27,6 +27,7 @@
   
   
   
+  
   
   
 
diff --git a/sw/uiconfig/swxform/popupmenu/table.xml 
b/sw/uiconfig/swxform/popupmenu/table.xml
index a65a3f6d43b4..1adfdccd075b 100644
--- a/sw/uiconfig/swxform/popupmenu/table.xml
+++ b/sw/uiconfig/swxform/popupmenu/table.xml
@@ -52,9 +52,7 @@
   
 
   
-  
-  
-  
+  
 
   
   
@@ -71,6 +69,9 @@
   
 
   
+  
+  
+  
   
 
   
diff --git a/sw/uiconfig/swxform/popupmenu/text.xml 
b/sw/uiconfig/swxform/popupmenu/text.xml
index 72d35b58c37d..c244d4724e35 100644
--- a/sw/uiconfig/swxform/popupmenu/text.xml
+++ b/sw/uiconfig/swxform/popupmenu/text.xml
@@ -27,6 +27,7 @@
   
   
   
+  
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/JunitTest_comphelper_complex.mk connectivity/JunitTest_complex.mk dbaccess/JunitTest_dbaccess_complex.mk filter/JunitTest_filter_complex.mk forms/JunitTest_f

[Libreoffice Gerrit user]

 comphelper/JunitTest_comphelper_complex.mk |   10 ++
 connectivity/JunitTest_complex.mk  |3 ++-
 dbaccess/JunitTest_dbaccess_complex.mk |8 ++--
 filter/JunitTest_filter_complex.mk |8 +---
 forms/JunitTest_forms_complex.mk   |8 +---
 framework/JunitTest_framework_complex.mk   |8 +---
 jurt/JunitTest_java_remote.mk  |2 +-
 reportdesign/JunitTest_reportdesign_complex.mk |8 +---
 sc/JunitTest_sc_complex.mk |8 +---
 sfx2/JunitTest_sfx2_complex.mk |7 ++-
 solenv/gbuild/JunitTest.mk |8 ++--
 sot/JunitTest_sot_complex.mk   |8 +---
 svl/JunitTest_svl_complex.mk   |8 ++--
 sw/JunitTest_sw_complex.mk |   11 +--
 toolkit/JunitTest_toolkit_complex.mk   |1 +
 ucb/JunitTest_ucb_complex.mk   |8 +---
 unotools/JunitTest_unotools_complex.mk |7 ++-
 unoxml/JunitTest_unordf_complex.mk |8 +---
 unoxml/JunitTest_unoxml_complex.mk |8 +---
 19 files changed, 30 insertions(+), 107 deletions(-)

New commits:
commit 33e47b44914a20ec657a4f4f69b052eb612cd7f8
Author: Jan-Marek Glogowski 
AuthorDate: Thu Nov 8 03:03:16 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Fri Nov 9 07:37:50 2018 +0100

Fix many Java subsequentcheck test by using JUH

Splits gb_JunitTest_set_unoapi_test_class_and_jars into two
separate defines as:
- gb_JunitTest_use_unoapi_jars
- gb_JunitTest_use_unoapi_test_class

Then replaces many of the gb_JunitTest_use_jars lists with the
new gb_JunitTest_use_unoapi_jars to fix the JUH dependencies.
This probably adds some unneeded JUH dependencies to some Java
tests, but that shouldn't be a problem.

Change-Id: I0c4fce6b50f7c6eb8d62bfb2c50f056b97584794
Reviewed-on: https://gerrit.libreoffice.org/63119
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/comphelper/JunitTest_comphelper_complex.mk 
b/comphelper/JunitTest_comphelper_complex.mk
index af9c3dba88d4..1171eb1cd232 100644
--- a/comphelper/JunitTest_comphelper_complex.mk
+++ b/comphelper/JunitTest_comphelper_complex.mk
@@ -19,19 +19,13 @@
 
 $(eval $(call gb_JunitTest_JunitTest,comphelper_complex))
 
+$(eval $(call gb_JunitTest_use_unoapi_jars,comphelper_complex))
+
 $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
 comphelper/qa/complex/comphelper/Map \
 comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest \
 ))
 
-$(eval $(call gb_JunitTest_use_jars,comphelper_complex,\
-OOoRunner \
-ridl \
-test \
-unoil \
-jurt \
-))
-
 $(eval $(call gb_JunitTest_add_classes,comphelper_complex,\
 complex.comphelper.SequenceOutputStreamUnitTest \
 complex.comphelper.Map \
diff --git a/connectivity/JunitTest_complex.mk 
b/connectivity/JunitTest_complex.mk
index 40c2882f3c54..9b257d4c1711 100644
--- a/connectivity/JunitTest_complex.mk
+++ b/connectivity/JunitTest_complex.mk
@@ -9,7 +9,8 @@
 
 $(eval $(call gb_JunitTest_JunitTest,connectivity_complex))
 
-$(eval $(call 
gb_JunitTest_set_unoapi_test_class_and_jars,connectivity_complex))
+$(eval $(call gb_JunitTest_use_unoapi_jars,connectivity_complex))
+$(eval $(call gb_JunitTest_use_unoapi_test_class,connectivity_complex))
 
 $(eval $(call gb_JunitTest_set_defs,connectivity_complex,\
$$(DEFS) \
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk 
b/dbaccess/JunitTest_dbaccess_complex.mk
index 7a0b17baa0e8..947d9c3ab3c0 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -9,14 +9,10 @@
 
 $(eval $(call gb_JunitTest_JunitTest,dbaccess_complex))
 
+$(eval $(call gb_JunitTest_use_unoapi_jars,dbaccess_complex))
+
 $(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\
 ConnectivityTools \
-OOoRunner \
-   juh \
-jurt \
-ridl \
-test \
-unoil \
 ))
 
 $(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
diff --git a/filter/JunitTest_filter_complex.mk 
b/filter/JunitTest_filter_complex.mk
index b0c590a1be8c..c8f22e1bc1f4 100644
--- a/filter/JunitTest_filter_complex.mk
+++ b/filter/JunitTest_filter_complex.mk
@@ -18,13 +18,7 @@
 
 $(eval $(call gb_JunitTest_JunitTest,filter_complex))
 
-$(eval $(call gb_JunitTest_use_jars,filter_complex,\
-   OOoRunner \
-   ridl \
-   test \
-   unoil \
-   jurt \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,filter_complex))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,filter_complex,\
filter/qa/complex/filter/misc/FinalizedMandatoryTest \
diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk
index ed4a00af74df..6f95409a8fde 100644
--- a/forms/JunitTest_forms_complex.mk
+++ b/forms/JunitTest_forms_complex.mk
@@ -9,13 +9,7 @@
 
 $(eval $(call gb_Juni

[Libreoffice-commits] core.git: chart2/JunitTest_chart2_unoapi.mk configmgr/JunitTest_configmgr_unoapi.mk connectivity/JunitTest_complex.mk dbaccess/JunitTest_dbaccess_unoapi.mk extensions/JunitTest_e

[Libreoffice Gerrit user]

 chart2/JunitTest_chart2_unoapi.mk |   19 --
 configmgr/JunitTest_configmgr_unoapi.mk   |   19 --
 connectivity/JunitTest_complex.mk |   14 +-
 dbaccess/JunitTest_dbaccess_unoapi.mk |   19 --
 extensions/JunitTest_extensions_unoapi.mk |   19 --
 forms/JunitTest_forms_unoapi_1.mk |   19 --
 forms/JunitTest_forms_unoapi_2.mk |   19 --
 forms/JunitTest_forms_unoapi_3.mk |   19 --
 forms/JunitTest_forms_unoapi_4.mk |   19 --
 framework/JunitTest_framework_unoapi.mk   |   19 --
 linguistic/JunitTest_linguistic_unoapi.mk |   19 --
 sc/JunitTest_sc_unoapi_1.mk   |   19 --
 sc/JunitTest_sc_unoapi_2.mk   |   19 --
 sc/JunitTest_sc_unoapi_3.mk   |   19 --
 sc/JunitTest_sc_unoapi_4.mk   |   19 --
 sc/JunitTest_sc_unoapi_5.mk   |   19 --
 sc/JunitTest_sc_unoapi_6.mk   |   19 --
 sc/JunitTest_sc_unoapi_7.mk   |   19 --
 sd/JunitTest_sd_unoapi.mk |   19 --
 sfx2/JunitTest_sfx2_unoapi.mk |   19 --
 solenv/gbuild/JunitTest.mk|   39 ++
 starmath/JunitTest_starmath_unoapi.mk |   19 --
 svtools/JunitTest_svtools_unoapi.mk   |   19 --
 svx/JunitTest_svx_unoapi.mk   |   19 --
 sw/JunitTest_sw_unoapi_1.mk   |   19 --
 sw/JunitTest_sw_unoapi_2.mk   |   19 --
 sw/JunitTest_sw_unoapi_3.mk   |   19 --
 sw/JunitTest_sw_unoapi_4.mk   |   19 --
 toolkit/JunitTest_toolkit_unoapi_1.mk |   19 --
 toolkit/JunitTest_toolkit_unoapi_2.mk |   19 --
 toolkit/JunitTest_toolkit_unoapi_3.mk |   19 --
 toolkit/JunitTest_toolkit_unoapi_4.mk |   19 --
 ucb/JunitTest_ucb_unoapi.mk   |   19 --
 xmloff/JunitTest_xmloff_unoapi.mk |   19 --
 34 files changed, 73 insertions(+), 588 deletions(-)

New commits:
commit 84286ac443ea8978743d281efeaa7ddb46199558
Author: Jan-Marek Glogowski 
AuthorDate: Thu Nov 8 00:48:14 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Fri Nov 9 07:37:00 2018 +0100

Simplify and fix Java UNO API test makefiles

Originally I just wanted to add the juh.jar to the list of jars
of the UNO API tests, but this became tedious work, so after the
first few files I decided to replace the similiar makefiles with
a common define for the *_unoapi* tests.

This patch adds two new make defines to be used used by Java UNO
and UNO API tests:
- gb_JunitTest_set_unoapi_test_defaults
- gb_JunitTest_set_unoapi_test_class_and_jars

The first one will deduce most defaults from the test name, but
still allows to optionally override most settings.

If a test doesn't match the default at all, the 2nd define still
shares the common jar files and the main Java UNO class, so the
second define adds these to your makefile.

The real fix is to add juh.jar to gb_JunitTest_use_jars.

Change-Id: I4342fdac5e31f85ea18fb4268e13c287a7adc2b7
Reviewed-on: https://gerrit.libreoffice.org/63118
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/chart2/JunitTest_chart2_unoapi.mk 
b/chart2/JunitTest_chart2_unoapi.mk
index d91c6fae3bba..7607c4648200 100644
--- a/chart2/JunitTest_chart2_unoapi.mk
+++ b/chart2/JunitTest_chart2_unoapi.mk
@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,chart2_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
-$$(DEFS) \
--Dorg.openoffice.test.arg.sce=$(SRCDIR)/chart2/qa/unoapi/sch.sce \
--Dorg.openoffice.test.arg.xcl=$(SRCDIR)/chart2/qa/unoapi/knownissues.xcl \
--Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/chart2/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,chart2_unoapi,\
-OOoRunner \
-ridl \
-test \
-unoil \
-jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,chart2_unoapi,\
-org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,chart2_unoapi,,sch.sce))
 
 # vim: set noet sw=4 ts=4:
diff --git a/configmgr/JunitTest_configmgr_unoapi.mk 
b/configmgr/JunitTest_configmgr_unoapi.mk
index b3b6e49e90ae..51dcc8a07eb5 100644
--- a/configmgr/JunitTest_configmgr_unoapi.mk
+++ b/configmgr/JunitTest_configmgr_unoapi.mk
@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\
-$$(DEFS) \
--Dorg.openoffice.test.arg.sce=$(SRCDIR)/configmgr/qa/unoapi/module.sce \
-
-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/configmgr/qa/unoapi/knownissues.xcl

[Libreoffice-commits] core.git: icon-themes/colibre officecfg/registry

[Libreoffice Gerrit user]

 icon-themes/colibre/cmd/sc_renameobject.png  
|binary
 icon-themes/colibre/links.txt|
2 ++
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
6 ++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |
3 +++
 4 files changed, 11 insertions(+)

New commits:
commit 5063e7fc09b38b77a3ff4c200b68cf2c8947462d
Author: andreas kainz 
AuthorDate: Thu Nov 8 23:00:18 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Nov 9 07:06:25 2018 +0100

Colibre icons: add icons for context menues

Change-Id: I22cbbafb0ed4fe361d88aa791adfdc9c7fe0fca4
Reviewed-on: https://gerrit.libreoffice.org/63140
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/colibre/cmd/sc_renameobject.png 
b/icon-themes/colibre/cmd/sc_renameobject.png
new file mode 100644
index ..53e10f2c5fb9
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_renameobject.png differ
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index b6c8e2a224b2..6e5b2f6b5576 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1775,6 +1775,8 @@ cmd/lc_deleteshapehyperlink.png cmd/lc_removehyperlink.png
 cmd/lc_openhyperlinkoncursor.png cmd/lc_inserthyperlink.png
 
 cmd/sc_rotateflipmenu.png cmd/sc_rotateleft.png
+cmd/sc_mirrormenu.png cmd/sc_rotateleft.png
+cmd/sc_convertmenu.png cmd/sc_bezierconvert.png
 
 # calc menubar icons
 # ===
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 195b04201b43..4d6462137417 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1680,6 +1680,9 @@
 
   ~Flip
 
+
+  1
+
   
   
 
@@ -1695,6 +1698,9 @@
 
   ~Convert
 
+
+  1
+
   
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index be0fa0e2213f..b0387cfefee1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6492,6 +6492,9 @@
 
   Rot~ate or Flip
 
+
+  1
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 UnoControls/source/base/basecontainercontrol.cxx |4 ++--
 sc/source/ui/view/gridwin4.cxx   |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 93a14053ad81a296c4542607f4a4e4acbda2fa38
Author: Andrea Gelmini 
AuthorDate: Thu Nov 8 23:30:24 2018 +0100
Commit: Julien Nabet 
CommitDate: Fri Nov 9 07:05:30 2018 +0100

Fix typos

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

diff --git a/UnoControls/source/base/basecontainercontrol.cxx 
b/UnoControls/source/base/basecontainercontrol.cxx
index 9c6bef517e53..40bb1dc98166 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -208,10 +208,10 @@ void SAL_CALL BaseContainerControl::addControl ( const 
OUString& rName, const Re
 pNewControl->xControl->setContext   ( static_cast(this)  
  );
 pNewControl->xControl->addEventListener ( static_cast< XEventListener* >( 
static_cast< XWindowListener* >( this ) ) );
 
-// when container has a peer ...
+// when container has a peer...
 if (getPeer().is())
 {
-// .. then create a peer on child
+// ... then create a peer on child
 pNewControl->xControl->createPeer ( getPeer()->getToolkit(), getPeer() 
);
 }
 
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 542a4c6283c6..1ed36c4ed414 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1118,7 +1118,7 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
 // integer multiples of pixels.
 //
 // See also desktop/source/lib/init.cxx for details, where we have to set
-// the stuff accorndingly for the VirtualDevice creation.
+// the stuff accordingly for the VirtualDevice creation.
 
 // page break zoom, and aLogicMode in ScViewData - hardcode that to what
 // we mean as 100% (256px tiles meaning 3840 twips)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |2 +-
 sc/source/ui/view/gridwin.cxx   |7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e3ff84aed5be8e0d2780d80b178fa8fc0e388859
Author: Marco Cecchetti 
AuthorDate: Sat Oct 27 17:25:06 2018 +
Commit: Jan Holesovsky 
CommitDate: Fri Nov 9 07:01:41 2018 +0100

lok: sc: make hi-dpi/zoom compatible with retrieving cell cursor

A bit different approach than trying to handle different zoom levels
at the samet time: instead, always handle the spreadsheet at 100%, but
use cairo to scale to the actual zoom level.

Change-Id: I318aec8fa4baaab2ee1f271223b2e10e26d41fcf
Reviewed-on: https://gerrit.libreoffice.org/63040
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 728af9163222..855bb398a570 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -784,7 +784,7 @@ void DesktopLOKTest::testCellCursor()
 
 OString aRectangle(aTree.get("commandValues").c_str());
 // cell cursor geometry + col + row
-CPPUNIT_ASSERT_EQUAL(OString("0, 0, 1279, 255, 0, 0"), aRectangle);
+CPPUNIT_ASSERT_EQUAL(OString("0, 0, 1274, 254, 0, 0"), aRectangle);
 
 comphelper::LibreOfficeKit::setActive(false);
 }
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ba4d08dc874a..914640ce392e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5658,7 +5658,7 @@ OString ScGridWindow::getCellCursor( int nOutputWidth, 
int nOutputHeight,
 return getCellCursor(zoomX, zoomY);
 }
 
-OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& 
rZoomY) const
+OString ScGridWindow::getCellCursor(const Fraction& /*rZoomX*/, const 
Fraction& /*rZoomY*/) const
 {
 // GridWindow stores a shown cell cursor in mpOOCursors, hence
 // we can use that to determine whether we would want to be showing
@@ -5674,7 +5674,10 @@ OString ScGridWindow::getCellCursor(const Fraction& 
rZoomX, const Fraction& rZoo
 Fraction defaultZoomX = pViewData->GetZoomX();
 Fraction defaultZoomY = pViewData->GetZoomY();
 
-pViewData->SetZoom(rZoomX, rZoomY, true);
+// hardcode to what we mean as 100% (256px tiles meaning 3840 twips)
+Fraction aFracX(long(256 * TWIPS_PER_PIXEL), 3840);
+Fraction aFracY(long(256 * TWIPS_PER_PIXEL), 3840);
+pViewData->SetZoom(aFracX, aFracY, true);
 
 Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, true );
 long nSizeXPix;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/kendy/widgets'

[Libreoffice Gerrit user]

New branch 'private/kendy/widgets' available with the following commits:
commit 66c1891abb374459bf615276d0190bb7bb17e62c
Author: Ashod Nakashian 
Date:   Sun Nov 4 11:45:45 2018 -0500

LOK: custom widgets: simplify and correct colors

Also remove macroni.

Change-Id: I0b2914e9f0e2aba9d8ca10338b515b598126e315

commit f31a6c26d458567db18e2263ef38149bac6ec299
Author: Ashod Nakashian 
Date:   Sun Nov 4 11:01:00 2018 -0500

LOK: custom widgets: reduce theme plugin API surface

Change-Id: I89dcf5a102be19fd1bc314a89538a121522f4a43

commit 50c06c6ea7548dc65ca1604d7462025659a077a0
Author: Ashod Nakashian 
Date:   Sat Nov 3 17:57:44 2018 -0400

LOK: custom widgets: reduce Color into an int to reduce API surface

Change-Id: Ib1afbb0b5647048f24d4ea6f9859b76328568dac

commit cf1892135bac55b57a9e1a0b3f306ed1859b0b26
Author: Ashod Nakashian 
Date:   Fri Nov 2 09:24:19 2018 -0400

LOK: custom widgets: check size of API structures

Change-Id: Iff50f7aeb471870230e9e822657deed6aefad268

commit ea8f4abcb8f0251e0877d93abd17d8a1088403eb
Author: Jan Holesovsky 
Date:   Fri Nov 2 13:28:52 2018 +0100

LOK: custom widgets: No need for SAL_DLLPUBLIC_RTTI here any more.

Change-Id: I7cae61e1fa9cf74b98627d557890fd41047421df

commit 4e20e8ef5f05bb4d93cfcd24adfd4515d2d0f066
Author: Ashod Nakashian 
Date:   Thu Nov 1 23:33:32 2018 -0400

LOK: custom widgets: convert WidgetThemeLibrary to POD for ABI compatibility

Change-Id: Ibc425d8e630460547d66723ccabeaf4ac29d2719

commit e03f988fc02cab1b8b3f608e1b48c1052d2afc29
Author: Ashod Nakashian 
Date:   Thu Nov 1 23:04:12 2018 -0400

LOK: custom themes: isolate LO internals headers from theme plugin

Change-Id: Ic189aecf092b9cffd800e410d2d6e88016c43052

commit 8c6bc1d9b600188cfeb4c69c0ab221360eb851c4
Author: Ashod Nakashian 
Date:   Tue Oct 30 18:46:07 2018 -0400

lok: custom widgets: render editbox borders

Change-Id: I1962a4a1397363b1c15e49d57b0bbcc9c232ce30

commit 3ec34b3f7ae3ef569fe12e071c10d53fcc014882
Author: Ashod Nakashian 
Date:   Sat Oct 27 13:23:46 2018 -0400

custom widgets: rework colors and cleanup

Use ColorData for custom widget themes to
make it more readable and consistent.

Renamed and split out colors to be more accurately
named and representative of how they are used.

Fixed a number of inconsistencies in how colors
were used across widgets.

Change-Id: I1cbb5f19223bd55107379b049beccaf1de4e26b2

commit 512da26cd1b8f1451580025ec2e0eeb9ba7c2210
Author: Ashod Nakashian 
Date:   Sat Oct 27 10:53:43 2018 -0400

LOK: custom widgets: don't clobber the custom colors

The old logic threw away the result of updateSettings
by applying the styles saved and modified after calling
it, which lost all the custom colors thereby breaking
custom-widgets and themeing altogether.

Change-Id: Ic3750f145b67cd6a379f3b628a10c213a31656e7

commit 798a123f42fba9b0839f9b6e708f285c27fe56f1
Author: Ashod Nakashian 
Date:   Sat Oct 27 10:50:44 2018 -0400

LOK: custom widgets: support custom menu colors

Change-Id: Icd6367fa40f9655cd58816461f0d2fca6f6932e2

commit 321638ba2bf7d24ab41004aed5f0f90010e15e43
Author: Ashod Nakashian 
Date:   Sun Oct 14 20:06:13 2018 -0400

custom widgets: correct focus colors and render button-up in listboxes

Change-Id: I70f46f94747f468a2bb79f8baa4576e4460bef31

commit 9b9c086995d43c6908b45e8894645e18fa5dac5c
Author: Tomaž Vajngerl 
Date:   Thu Sep 20 00:12:25 2018 +0200

custom widgets: comment unused params. to avoid compile warnings

Change-Id: I45b7ffdce2d470ed2f30b5408d8d861deb00514a

commit 0b5e8eaa91d7b6bd3b14541705ed02c334eb981d
Author: Tomaž Vajngerl 
Date:   Thu Sep 20 00:06:52 2018 +0200

custom widgets: setup style setting in the widget library

Some theme colors are set using the style settings, which are
implemented by each backend to correspond to the system theme.
For custom widgets these need to also be set by the library
itself. This commit adds the ground work and sets some of the
colors for windows backgrounds.

Change-Id: Ia65b1605b2b7bef7f01ff1feff2e7470479e626a

commit 5eb3ba33db59510f5dd1d4a074246e4c9fed1a7d
Author: Tomaž Vajngerl 
Date:   Tue Sep 11 22:35:12 2018 +0200

custom widgets: draw fixed line widget

Change-Id: Icb8cfbe09caf5cbfcf1d3f461c297c052056250d

commit af96f56642d7219f09e59e6789bd09bddd1ce1e4
Author: Tomaž Vajngerl 
Date:   Tue Sep 11 17:35:08 2018 +0200

custom widgets: differentiate stock and non-stock buttons

Change-Id: I05f01058d7886dacec3b00dcf31313aea3939164

commit 0d5245ca70f1867038ff451f1b32c1d534b99698
Author: Tomaž Vajngerl 
Date:   Tue Sep 11 17:29:20 2018 +0200

vcl: mark stock buttons and transfer this to NWF on drawing

Stock buttons like OK/Cancel/Help need sometimes to be drawn
differently than just another button. For this we

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

[Libreoffice Gerrit user]

 compilerplugins/clang/test/useuniqueptr.cxx |   16 
 compilerplugins/clang/useuniqueptr.cxx  |  496 
 2 files changed, 307 insertions(+), 205 deletions(-)

New commits:
commit 0b11ce9dd26c93d53f19dab23ef48a8587e72fc3
Author: Noel Grandin 
AuthorDate: Thu Nov 8 13:32:22 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 9 06:43:34 2018 +0100

loplugin:useuniqueptr extend to checking more local var deletes

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

diff --git a/compilerplugins/clang/test/useuniqueptr.cxx 
b/compilerplugins/clang/test/useuniqueptr.cxx
index c8f67b46fa85..4cf6c96521ab 100644
--- a/compilerplugins/clang/test/useuniqueptr.cxx
+++ b/compilerplugins/clang/test/useuniqueptr.cxx
@@ -60,19 +60,19 @@ class Class5 {
 int* m_pbar[10]; // expected-note {{member is here 
[loplugin:useuniqueptr]}}
 ~Class5()
 {
-for (auto p : m_pbar)
-delete p; // expected-error {{rather manage this with 
std::some_container> [loplugin:useuniqueptr]}}
+for (auto p : m_pbar) // expected-note {{var is here 
[loplugin:useuniqueptr]}}
+delete p; // expected-error {{rather manage this with 
std::some_container> [loplugin:useuniqueptr]}} 
expected-error {{call to delete on a var, should be using std::unique_ptr 
[loplugin:useuniqueptr]}}
 }
 };
 class Class5a {
 int* m_pbar[10]; // expected-note {{member is here 
[loplugin:useuniqueptr]}}
 ~Class5a()
 {
-for (auto p : m_pbar)
+for (auto p : m_pbar) // expected-note {{var is here 
[loplugin:useuniqueptr]}}
 {
 int x = 1;
 x = x + 2;
-delete p; // expected-error {{rather manage this with 
std::some_container> [loplugin:useuniqueptr]}}
+delete p; // expected-error {{rather manage this with 
std::some_container> [loplugin:useuniqueptr]}} 
expected-error {{call to delete on a var, should be using std::unique_ptr 
[loplugin:useuniqueptr]}}
 }
 }
 };
@@ -80,8 +80,8 @@ class Class6 {
 std::array m_pbar; // expected-note {{member is here 
[loplugin:useuniqueptr]}}
 ~Class6()
 {
-for (auto p : m_pbar)
-delete p; // expected-error {{rather manage this with 
std::some_container> [loplugin:useuniqueptr]}}
+for (auto p : m_pbar) // expected-note {{var is here 
[loplugin:useuniqueptr]}}
+delete p; // expected-error {{rather manage this with 
std::some_container> [loplugin:useuniqueptr]}} 
expected-error {{call to delete on a var, should be using std::unique_ptr 
[loplugin:useuniqueptr]}}
 }
 };
 class Class7 {
@@ -150,9 +150,9 @@ class Foo11 {
 std::vector m_pbar1; // expected-note {{member is here 
[loplugin:useuniqueptr]}}
 ~Foo11()
 {
-for (const auto & p : m_pbar1)
+for (const auto & p : m_pbar1) // expected-note {{var is here 
[loplugin:useuniqueptr]}}
 {
-delete p; // expected-error {{rather manage this with 
std::some_container> [loplugin:useuniqueptr]}}
+delete p; // expected-error {{rather manage this with 
std::some_container> [loplugin:useuniqueptr]}} 
expected-error {{call to delete on a var, should be using std::unique_ptr 
[loplugin:useuniqueptr]}}
 }
 }
 };
diff --git a/compilerplugins/clang/useuniqueptr.cxx 
b/compilerplugins/clang/useuniqueptr.cxx
index fb8363974612..72cf39aa049a 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -149,6 +149,8 @@ private:
 void CheckLoopDelete(const FunctionDecl*, const Stmt* );
 void CheckLoopDelete(const FunctionDecl*, const CXXDeleteExpr* );
 void CheckDeleteExpr(const FunctionDecl*, const CXXDeleteExpr*);
+void CheckDeleteLocalVar(const FunctionDecl*, const CXXDeleteExpr*, const 
VarDecl*);
+void CheckDeleteParmVar(const CXXDeleteExpr*, const ParmVarDecl*);
 void CheckParenExpr(const FunctionDecl*, const ParenExpr*);
 void CheckMemberDeleteExpr(const FunctionDecl*, const CXXDeleteExpr*,
 const MemberExpr*, StringRef message);
@@ -280,162 +282,254 @@ void UseUniquePtr::CheckDeleteExpr(const FunctionDecl* 
functionDecl, const CXXDe
 // complicated
 if (fn == SRCDIR "/sc/source/filter/html/htmlpars.cxx")
 return;
+// complicated pimpl stuff in SalLayoutGlyphs
+if (fn == SRCDIR "/vcl/source/gdi/impglyphitem.cxx")
+return;
 
 CheckMemberDeleteExpr(functionDecl, deleteExpr, memberExpr,
 "unconditional call to delete on a member, should be using 
std::unique_ptr");
 return;
 }
 
-if (auto declRefExpr = dyn_cast(deleteExprArg))
+const ArraySubscriptExpr* arrayExpr = 
dyn_cast(deleteExprArg);
+if (arrayExpr)
+{
+   auto baseMemberExpr = 
dyn_cast(arrayExpr->getBase()->IgnoreParenImpCasts());
+   if (baseMembe

[Libreoffice-commits] core.git: 3 commits - desktop/source sc/inc sc/source xmlhelp/source

[Libreoffice Gerrit user]

 desktop/source/deployment/gui/dp_gui_extlistbox.cxx   |9 +++-
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx   |1 
 sc/inc/fielduno.hxx   |4 +--
 sc/source/ui/unoobj/fielduno.cxx  |   19 ++
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx |   11 +++---
 5 files changed, 17 insertions(+), 27 deletions(-)

New commits:
commit 22d36649a3087b9f8eec74c05fa33f87423619a4
Author: Noel Grandin 
AuthorDate: Tue Nov 6 09:26:05 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 9 06:42:47 2018 +0100

loplugin:useuniqueptr in ScHeaderFieldsObj

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

diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 70b3aa31639b..a1678d68ee8e 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -63,7 +63,7 @@ private:
 ScAddress const   aCellPos;
 std::unique_ptr mpEditSource;
 /// List of refresh listeners.
-comphelper::OInterfaceContainerHelper2* mpRefreshListeners;
+std::unique_ptr mpRefreshListeners;
 /// mutex to lock the InterfaceContainerHelper
 osl::Mutex  aMutex;
 
@@ -117,7 +117,7 @@ private:
 std::unique_ptr mpEditSource;
 
 /// List of refresh listeners.
-comphelper::OInterfaceContainerHelper2* mpRefreshListeners;
+std::unique_ptr mpRefreshListeners;
 /// mutex to lock the InterfaceContainerHelper
 osl::Mutex  aMutex;
 
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 666eb8c7c88e..7c53309b1082 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -272,8 +272,7 @@ ScCellFieldsObj::ScCellFieldsObj(
 ScDocShell* pDocSh, const ScAddress& rPos) :
 mxContent(xContent),
 pDocShell( pDocSh ),
-aCellPos( rPos ),
-mpRefreshListeners( nullptr )
+aCellPos( rPos )
 {
 pDocShell->GetDocument().AddUnoObject(*this);
 
@@ -296,11 +295,8 @@ ScCellFieldsObj::~ScCellFieldsObj()
 {
 lang::EventObject aEvent;
 aEvent.Source.set(static_cast(this));
-if (mpRefreshListeners)
-{
-mpRefreshListeners->disposeAndClear(aEvent);
-DELETEZ( mpRefreshListeners );
-}
+mpRefreshListeners->disposeAndClear(aEvent);
+mpRefreshListeners.reset();
 }
 }
 
@@ -408,7 +404,7 @@ void SAL_CALL ScCellFieldsObj::addRefreshListener( const 
uno::Reference< util::X
 {
 SolarMutexGuard aGuard;
 if (!mpRefreshListeners)
-mpRefreshListeners = new 
comphelper::OInterfaceContainerHelper2(aMutex);
+mpRefreshListeners.reset( new 
comphelper::OInterfaceContainerHelper2(aMutex) );
 mpRefreshListeners->addInterface(xListener);
 }
 }
@@ -424,8 +420,7 @@ void SAL_CALL ScCellFieldsObj::removeRefreshListener( const 
uno::Reference(this);
 mpRefreshListeners->disposeAndClear(aEvent);
-DELETEZ(mpRefreshListeners);
+mpRefreshListeners.reset();
 }
 }
 
@@ -561,7 +556,7 @@ void SAL_CALL ScHeaderFieldsObj::addRefreshListener( const 
uno::Reference< util:
 {
 SolarMutexGuard aGuard;
 if (!mpRefreshListeners)
-mpRefreshListeners = new 
comphelper::OInterfaceContainerHelper2(aMutex);
+mpRefreshListeners.reset(new 
comphelper::OInterfaceContainerHelper2(aMutex));
 mpRefreshListeners->addInterface(xListener);
 }
 }
commit 224837289cb6c6753026173b35142b10e7e1538e
Author: Noel Grandin 
AuthorDate: Thu Nov 8 16:05:32 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 9 06:42:20 2018 +0100

fix bug in listbox height calc in ExtensionBox_Impl

found by loplugin:singlevalfields

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

diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx 
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index e8442a20f8a1..b09ce623127f 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -183,7 +183,6 @@ ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) :
 m_nActive( 0 ),
 m_nTopIndex( 0 ),
 m_nActiveHeight( 0 ),
-m_nExtraHeight( 2 ),
 m_aSharedImage(BitmapEx(RID_BMP_SHARED)),
 m_aLockedImage(BitmapEx(RID_BMP_LOCKED)),
 m_aWarningImage(BitmapEx(RID_BMP_WARNING)),
@@ -314,10 +313,10 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos 
)
 if ( aTextHeight < m_nStdHeight )
 aTextHeight = m_nStdHeight;
 
+m_nActiveHeight = aTextHeight;
+
 if ( m_vEntries[ nPos ]->m_bHasButtons )
-m_nActiveHeight = aTextHeight + m_nExtraHeight;
-else
-m_nActiveHeight = aTextHeight + 

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

[Libreoffice Gerrit user]

 sw/inc/doc.hxx  |4 -
 sw/inc/fesh.hxx |4 -
 sw/source/core/doc/tblafmt.cxx  |6 --
 sw/source/core/docnode/ndtbl1.cxx   |   78 +++-
 sw/source/core/frmedt/fetab.cxx |   10 +--
 sw/source/ui/table/rowht.cxx|5 -
 sw/source/uibase/shells/tabsh.cxx   |   22 ++-
 sw/source/uibase/uiview/formatclipboard.cxx |3 -
 8 files changed, 52 insertions(+), 80 deletions(-)

New commits:
commit ee204f8f54de5bef526f2ad7fc78a425b196bb63
Author: Noel Grandin 
AuthorDate: Wed Oct 31 09:23:15 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 9 06:41:05 2018 +0100

loplugin:useuniqueptr in SwDoc::GetRowHeight and GetRowSplit

fixing a memory leak in the process

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

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 6688f19ae77e..1ab0b0775f4c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1431,9 +1431,9 @@ public:
 const bool _bPosCorr );
 
 void SetRowHeight( const SwCursor& rCursor, const SwFormatFrameSize &rNew 
);
-static void GetRowHeight( const SwCursor& rCursor, SwFormatFrameSize *& 
rpSz );
+static std::unique_ptr GetRowHeight( const SwCursor& 
rCursor );
 void SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew );
-static void GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz 
);
+static std::unique_ptr GetRowSplit( const SwCursor& 
rCursor );
 
 /// Adjustment of Rowheights. Determine via bTstOnly if more than one row 
is selected.
 /// bOptimize: distribute current table height, instead of using the 
largest row.
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 6bf34ba62f2c..5d45fa3e6621 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -647,10 +647,10 @@ public:
 void SetRowHeight( const SwFormatFrameSize &rSz );
 
 /// Pointer must be destroyed by caller != 0.
-void GetRowHeight( SwFormatFrameSize *&rpSz ) const;
+std::unique_ptr GetRowHeight() const;
 
 void SetRowSplit( const SwFormatRowSplit &rSz );
-void GetRowSplit( SwFormatRowSplit *&rpSz ) const;
+std::unique_ptr GetRowSplit() const;
 
 void   SetBoxAlign( sal_uInt16 nOrient );
 sal_uInt16 GetBoxAlign() const; ///< USHRT_MAX if ambiguous.
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index cacd3b268f71..b018a468a793 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -930,11 +930,9 @@ void SwTableAutoFormat::StoreTableProperties(const SwTable 
&table)
 return;
 
 SwEditShell *pShell = pDoc->GetEditShell();
-SwFormatRowSplit *pRowSplit = nullptr;
-SwDoc::GetRowSplit(*pShell->getShellCursor(false), pRowSplit);
+std::unique_ptr pRowSplit = 
SwDoc::GetRowSplit(*pShell->getShellCursor(false));
 m_bRowSplit = pRowSplit && pRowSplit->GetValue();
-delete pRowSplit;
-pRowSplit = nullptr;
+pRowSplit.reset();
 
 const SfxItemSet &rSet = pFormat->GetAttrSet();
 
diff --git a/sw/source/core/docnode/ndtbl1.cxx 
b/sw/source/core/docnode/ndtbl1.cxx
index fcec43de7db4..fc9d328335f8 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -336,35 +336,28 @@ void SwDoc::SetRowSplit( const SwCursor& rCursor, const 
SwFormatRowSplit &rNew )
 }
 }
 
-void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz )
+std::unique_ptr SwDoc::GetRowSplit( const SwCursor& rCursor )
 {
-rpSz = nullptr;
-
 SwTableNode* pTableNd = 
rCursor.GetPoint()->nNode.GetNode().FindTableNode();
-if( pTableNd )
-{
-std::vector aRowArr; // For Lines collecting
-::lcl_CollectLines( aRowArr, rCursor, false );
+if( !pTableNd )
+return nullptr;
 
-if( !aRowArr.empty() )
-{
-rpSz = 
&const_cast(aRowArr[0]->GetFrameFormat()->GetRowSplit());
+std::vector aRowArr; // For Lines collecting
+::lcl_CollectLines( aRowArr, rCursor, false );
 
-if (rpSz)
-{
-for ( auto pLn : aRowArr )
-{
-if ( (*rpSz).GetValue() != 
pLn->GetFrameFormat()->GetRowSplit().GetValue() )
-{
-rpSz = nullptr;
-break;
-}
-}
-}
-if ( rpSz )
-rpSz = new SwFormatRowSplit( *rpSz );
+if( aRowArr.empty() )
+return nullptr;
+
+SwFormatRowSplit* pSz = 
&const_cast(aRowArr[0]->GetFrameFormat()->GetRowSplit());
+
+for ( auto pLn : aRowArr )
+{
+if ( pSz->GetValue() != 
pLn->GetFrameFormat()->GetRowSplit().GetValue() )
+{
+return nullptr;
 }
 }
+return o3tl:

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Menubar.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit cce163822c79373c12c154ed53ad066c73b61a84
Author: Andras Timar 
AuthorDate: Fri Nov 9 00:16:15 2018 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 9 00:32:06 2018 +0100

loleaflet: add 'insertgraphicremote' to Impress and Calc menu, too

Change-Id: I4c0104b19cd1d54684ce69f0cf4eb21fdb49f5e3
(cherry picked from commit bfce0038ae66982a854a33f276997209c4ba9fc4)
Signed-off-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index b9f59ff61..f7900012d 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -255,7 +255,8 @@ L.Control.Menubar = L.Control.extend({
{name: _('Reset zoom'), id: 'zoomreset', type: 
'action'}]
},
{name: _UNO('.uno:InsertMenu', 'presentation'), type: 
'menu', menu: [
-   {name: _UNO('.uno:InsertGraphic', 
'presentation'), id: 'insertgraphic', type: 'action'},
+   {name: _('Local Image...'), id: 
'insertgraphic', type: 'action'},
+   {name: _UNO('.uno:InsertGraphic', 
'presentation'), id: 'insertgraphicremote', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 
'presentation'), id: 'insertcomment', type: 'action'},
{uno: '.uno:InsertObjectChart'},
{type: 'separator'},
@@ -329,7 +330,8 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:FullScreen', 'spreadsheet'), 
id: 'fullscreen', type: 'action'}
]},
{name: _UNO('.uno:InsertMenu', 'spreadsheet'), type: 
'menu', menu: [
-   {name: _UNO('.uno:InsertGraphic', 
'spreadsheet'), id: 'insertgraphic', type: 'action'},
+   {name: _('Local Image...'), id: 
'insertgraphic', type: 'action'},
+   {name: _UNO('.uno:InsertGraphic', 
'spreadsheet'), id: 'insertgraphicremote', type: 'action'},
{uno: '.uno:InsertObjectChart'},
{name: _UNO('.uno:InsertAnnotation', 
'spreadsheet'), id: 'insertcomment', type: 'action'},
{type: 'separator'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Menubar.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bfce0038ae66982a854a33f276997209c4ba9fc4
Author: Andras Timar 
AuthorDate: Fri Nov 9 00:16:15 2018 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 9 00:16:15 2018 +0100

loleaflet: add 'insertgraphicremote' to Impress and Calc menu, too

Change-Id: I4c0104b19cd1d54684ce69f0cf4eb21fdb49f5e3

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 1ecf9f695..04f00c6d4 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -260,7 +260,8 @@ L.Control.Menubar = L.Control.extend({
{name: _('Reset zoom'), id: 'zoomreset', type: 
'action'}]
},
{name: _UNO('.uno:InsertMenu', 'presentation'), type: 
'menu', menu: [
-   {name: _UNO('.uno:InsertGraphic', 
'presentation'), id: 'insertgraphic', type: 'action'},
+   {name: _('Local Image...'), id: 
'insertgraphic', type: 'action'},
+   {name: _UNO('.uno:InsertGraphic', 
'presentation'), id: 'insertgraphicremote', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 
'presentation'), id: 'insertcomment', type: 'action'},
{uno: '.uno:InsertObjectChart'},
{type: 'separator'},
@@ -336,7 +337,8 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:FullScreen', 'spreadsheet'), 
id: 'fullscreen', type: 'action'}
]},
{name: _UNO('.uno:InsertMenu', 'spreadsheet'), type: 
'menu', menu: [
-   {name: _UNO('.uno:InsertGraphic', 
'spreadsheet'), id: 'insertgraphic', type: 'action'},
+   {name: _('Local Image...'), id: 
'insertgraphic', type: 'action'},
+   {name: _UNO('.uno:InsertGraphic', 
'spreadsheet'), id: 'insertgraphicremote', type: 'action'},
{uno: '.uno:InsertObjectChart'},
{name: _UNO('.uno:InsertAnnotation', 
'spreadsheet'), id: 'insertcomment', type: 'action'},
{type: 'separator'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/source

[Libreoffice Gerrit user]

 wizards/source/importwizard/ImportDialog.xdl |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 58a04e692ad903a9a16e258afc7f80a37fa188cf
Author: Matthias Seidel 
AuthorDate: Thu Nov 8 21:36:47 2018 +
Commit: Matthias Seidel 
CommitDate: Thu Nov 8 21:36:47 2018 +

Center graphic

diff --git a/wizards/source/importwizard/ImportDialog.xdl 
b/wizards/source/importwizard/ImportDialog.xdl
index 72a7df258807..9a6cd02f9e0f 100644
--- a/wizards/source/importwizard/ImportDialog.xdl
+++ b/wizards/source/importwizard/ImportDialog.xdl
@@ -1,7 +1,7 @@
 
 
 
 http://openoffice.org/2000/dialog"; 
xmlns:script="http://openoffice.org/2000/script"; dlg:id="ImportDialog" 
dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="4" 
dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_DIALOG" dlg:closeable="true" 
dlg:moveable="true" dlg:title="ImportDialog">
  
@@ -44,7 +44,7 @@
   
   
   
-  
+  
   

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

[Libreoffice-commits] core.git: icon-themes/karasa_jaga

[Libreoffice Gerrit user]

 icon-themes/karasa_jaga/cmd/32/commentchangetracking.png |binary
 icon-themes/karasa_jaga/cmd/32/deleteallbreaks.png   |binary
 icon-themes/karasa_jaga/cmd/lc_avmediaplayer.png |binary
 icon-themes/karasa_jaga/cmd/lc_commentchangetracking.png |binary
 icon-themes/karasa_jaga/cmd/lc_deleteallbreaks.png   |binary
 icon-themes/karasa_jaga/cmd/lc_insertdoc.png |binary
 icon-themes/karasa_jaga/cmd/lc_timefield.png |binary
 icon-themes/karasa_jaga/cmd/sc_deleteallbreaks.png   |binary
 icon-themes/karasa_jaga/links.txt|   18 ++-
 icon-themes/karasa_jaga/svx/res/fr010.png|binary
 icon-themes/karasa_jaga/svx/res/fr011.png|binary
 icon-themes/karasa_jaga/svx/res/fr02.png |binary
 icon-themes/karasa_jaga/svx/res/fr03.png |binary
 icon-themes/karasa_jaga/svx/res/fr04.png |binary
 icon-themes/karasa_jaga/svx/res/fr05.png |binary
 icon-themes/karasa_jaga/svx/res/fr06.png |binary
 icon-themes/karasa_jaga/svx/res/fr07.png |binary
 icon-themes/karasa_jaga/svx/res/fr08.png |binary
 icon-themes/karasa_jaga/svx/res/fr09.png |binary
 19 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 939de6a6a262b354a291981f62f00310776d63e7
Author: Rizal Muttaqin 
AuthorDate: Thu Nov 8 18:32:00 2018 +0700
Commit: Rizal Muttaqin 
CommitDate: Fri Nov 9 00:01:21 2018 +0100

KJ: Yet another improvement

Change-Id: If524e701ab295c83b485376fd4139540d3f28d7c
Reviewed-on: https://gerrit.libreoffice.org/63085
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/karasa_jaga/cmd/32/commentchangetracking.png 
b/icon-themes/karasa_jaga/cmd/32/commentchangetracking.png
index 7f15d3de7be5..06dff0ee886f 100644
Binary files a/icon-themes/karasa_jaga/cmd/32/commentchangetracking.png and 
b/icon-themes/karasa_jaga/cmd/32/commentchangetracking.png differ
diff --git a/icon-themes/karasa_jaga/cmd/32/deleteallbreaks.png 
b/icon-themes/karasa_jaga/cmd/32/deleteallbreaks.png
new file mode 100644
index ..039642048001
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/deleteallbreaks.png 
differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_avmediaplayer.png 
b/icon-themes/karasa_jaga/cmd/lc_avmediaplayer.png
index 46c3faedb14b..ee0994cc6ef0 100644
Binary files a/icon-themes/karasa_jaga/cmd/lc_avmediaplayer.png and 
b/icon-themes/karasa_jaga/cmd/lc_avmediaplayer.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_commentchangetracking.png 
b/icon-themes/karasa_jaga/cmd/lc_commentchangetracking.png
index 8ab68384dd26..a57634cbae68 100644
Binary files a/icon-themes/karasa_jaga/cmd/lc_commentchangetracking.png and 
b/icon-themes/karasa_jaga/cmd/lc_commentchangetracking.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_deleteallbreaks.png 
b/icon-themes/karasa_jaga/cmd/lc_deleteallbreaks.png
new file mode 100644
index ..2de3f8e70a5d
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/lc_deleteallbreaks.png 
differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_insertdoc.png 
b/icon-themes/karasa_jaga/cmd/lc_insertdoc.png
index a85a8e09b1a3..8b7c3224d6c4 100644
Binary files a/icon-themes/karasa_jaga/cmd/lc_insertdoc.png and 
b/icon-themes/karasa_jaga/cmd/lc_insertdoc.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_timefield.png 
b/icon-themes/karasa_jaga/cmd/lc_timefield.png
index 73dd0d7f078b..97949ff9aab3 100644
Binary files a/icon-themes/karasa_jaga/cmd/lc_timefield.png and 
b/icon-themes/karasa_jaga/cmd/lc_timefield.png differ
diff --git a/icon-themes/karasa_jaga/cmd/sc_deleteallbreaks.png 
b/icon-themes/karasa_jaga/cmd/sc_deleteallbreaks.png
new file mode 100644
index ..d4341a2c849b
Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/sc_deleteallbreaks.png 
differ
diff --git a/icon-themes/karasa_jaga/links.txt 
b/icon-themes/karasa_jaga/links.txt
index afefb875c7dd..8dd0c04c2d23 100644
--- a/icon-themes/karasa_jaga/links.txt
+++ b/icon-themes/karasa_jaga/links.txt
@@ -12,7 +12,7 @@ avmedia/res/avl02051.png cmd/lc_datastreamsstop.png
 avmedia/res/avl02052.png cmd/lc_mediarepeat.png
 avmedia/res/avl02053.png cmd/lc_ok.png
 avmedia/res/avl02054.png cmd/lc_mediamute.png
-cmd/32/acceptchanges.png cmd/32/accepttrackedchange.png
+cmd/32/acceptchanges.png cmd/32/accepttrackedchanges.png
 cmd/32/accepttracedchange.png cmd/32/accepttrackedchange.png 
 cmd/32/adddatefield.png cmd/32/datefield.png
 cmd/32/adjust.png cmd/32/zoomoptimal.png
@@ -72,6 +72,7 @@ cmd/32/ellipse.png cmd/32/basicshapes.ellipse.png
 cmd/32/ellipsetoolbox.png cmd/32/basicshapes.ellipse.png
 cmd/32/es/underlinesimple.png cmd/32/es/underline.png
 cmd/32/exitsearch.png cmd/32/closepreview.png
+cmd/32/exportasgraphic.png cmd/32/graphic.png
 cmd/32/fieldmenu.png cmd/32/insertfield.png
 cmd/32/fieldnames.png cmd/32/fields.png
 cmd/32/fillcolo

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

[Libreoffice Gerrit user]

 sc/source/core/data/drawpage.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dcfe0095ed41893808db11aee07dce2257513f19
Author: Stephan Bergmann 
AuthorDate: Thu Nov 8 17:35:45 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 8 23:27:28 2018 +0100

Don't set too-large size for SdrPage

...(from which ScDrawPage is derived).  SdrPage::mnWidth/Height have been 
signed
32-bit ever since at least b97a3f93c3794174b22b25181dd858ab75e4c28e
"INTEGRATION: CWS hedaburemove01" (INT32 nWdt/nHgt back then).

With (new-in-Clang) -fsanitize=implicit-signed-integer-truncation, this 
cause
failure during CppunitTest_desktop_lib:

> svx/source/svdraw/svdpage.cxx:1215:19: runtime error: implicit conversion 
from type 'long' of value 9223372036854775807 (64-bit, signed) to type 
'sal_Int32' (aka 'int') changed the value to -1 (32-bit, signed)
>  #0 in SdrPage::SetSize(Size const&) at 
svx/source/svdraw/svdpage.cxx:1215:19 (instdir/program/libsvxcorelo.so 
+0x4aede6f)
>  #1 in ScDrawPage::ScDrawPage(ScDrawLayer&, bool) at 
sc/source/core/data/drawpage.cxx:30:5 (instdir/program/libsclo.so +0x9addca3)
>  #2 in ScDrawLayer::AllocPage(bool) at 
sc/source/core/data/drwlayer.cxx:369:16 (instdir/program/libsclo.so +0x9aee60d)
>  #3 in ScDrawLayer::ScAddPage(short) at 
sc/source/core/data/drwlayer.cxx:397:50 (instdir/program/libsclo.so +0x9aeeea7)
>  #4 in ScDocument::InitDrawLayer(SfxObjectShell*) at 
sc/source/core/data/documen9.cxx:155:26 (instdir/program/libsclo.so +0x91fd6d0)
>  #5 in ScDocShell::MakeDrawLayer() at 
sc/source/ui/docshell/docsh2.cxx:175:21 (instdir/program/libsclo.so +0xcd0d25e)
>  #6 in ScTabView::MakeDrawLayer() at 
sc/source/ui/view/tabview2.cxx:1400:34 (instdir/program/libsclo.so +0xed70dda)
>  #7 in ScTabViewShell::ScTabViewShell(SfxViewFrame*, SfxViewShell*) at 
sc/source/ui/view/tabvwsh4.cxx:1702:5 (instdir/program/libsclo.so +0xee61296)
>  #8 in ScTabViewShell::CreateInstance(SfxViewFrame*, SfxViewShell*) at 
sc/source/ui/view/tabvwsh.cxx:106:1 (instdir/program/libsclo.so +0xee060a0)
>  #9 in SfxViewFactory::CreateInstance(SfxViewFrame*, SfxViewShell*) at 
sfx2/source/view/viewfac.cxx:28:12 (instdir/program/libsfxlo.so +0x419481e)
>  #10 in SfxBaseModel::createViewController(rtl::OUString const&, 
com::sun::star::uno::Sequence const&, 
com::sun::star::uno::Reference const&) at 
sfx2/source/doc/sfxbasemodel.cxx:4089:46 (instdir/program/libsfxlo.so 
+0x3a9244c)
>  #11 in non-virtual thunk to 
SfxBaseModel::createViewController(rtl::OUString const&, 
com::sun::star::uno::Sequence const&, 
com::sun::star::uno::Reference const&) at 
sfx2/source/doc/sfxbasemodel.cxx (instdir/program/libsfxlo.so +0x3a94895)
>  #12 in (anonymous 
namespace)::SfxFrameLoader_Impl::impl_createDocumentView(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference const&, 
comphelper::NamedValueCollection const&, rtl::OUString const&) at 
sfx2/source/view/frmload.cxx:584:60 (instdir/program/libsfxlo.so +0x40ca60a)
>  #13 in (anonymous 
namespace)::SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence
 const&, com::sun::star::uno::Reference const&) 
at sfx2/source/view/frmload.cxx:711:13 (instdir/program/libsfxlo.so +0x40c3f25)
>  #14 in framework::LoadEnv::impl_loadContent() at 
framework/source/loadenv/loadenv.cxx:1149:37 (instdir/program/libfwklo.so 
+0x1520131)
>  #15 in framework::LoadEnv::startLoading() at 
framework/source/loadenv/loadenv.cxx:383:20 (instdir/program/libfwklo.so 
+0x1510b16)
>  #16 in 
framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference 
const&, rtl::OUString const&, rtl::OUString const&, int, 
com::sun::star::uno::Sequence const&) at 
framework/source/loadenv/loadenv.cxx:169:14 (instdir/program/libfwklo.so 
+0x150c7c8)
>  #17 in framework::Desktop::loadComponentFromURL(rtl::OUString const&, 
rtl::OUString const&, int, 
com::sun::star::uno::Sequence const&) at 
framework/source/services/desktop.cxx:619:12 (instdir/program/libfwklo.so 
+0x166f1ce)
>  #18 in non-virtual thunk to 
framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString 
const&, int, 
com::sun::star::uno::Sequence const&) at 
framework/source/services/desktop.cxx (instdir/program/libfwklo.so +0x166f3da)
>  #19 in unotest::MacrosTest::loadFromDesktop(rtl::OUString const&, 
rtl::OUString const&, 
com::sun::star::uno::Sequence const&) at 
unotest/source/cpp/macros_test.cxx:50:60 
(workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0x8f176)
>  #20 in DesktopLOKTest::loadDoc(char const*, LibreOfficeKitDocumentType) 
at desktop/qa/desktop_lib/test_desktop_lib.cxx:215:19 
(workdir/LinkTarget/CppunitTest/libtest_desktop_lib.so +0xf2ca0)
>  #21 in DesktopLOKTest::testSearchCalc() at 
desktop/qa/desktop_lib/test_desktop_lib.cxx:423:37 
(workdir/LinkTarget/CppunitTest/libtest_desktop_li

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/po

[Libreoffice Gerrit user]

 loleaflet/po/ui-de.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e6050acfc3b8521e318511b6b7df3c125217b6f
Author: Andras Timar 
AuthorDate: Thu Nov 8 23:15:40 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 8 23:15:40 2018 +0100

typo

Change-Id: I393f7282009b5d32f5c262e1c06338d2521fd8db

diff --git a/loleaflet/po/ui-de.po b/loleaflet/po/ui-de.po
index 5647de28a..dfcea81d9 100644
--- a/loleaflet/po/ui-de.po
+++ b/loleaflet/po/ui-de.po
@@ -588,7 +588,7 @@ msgstr "Reparieren"
 
 #: src/control/Control.Menubar.js:65
 msgid "Local Image..."
-msgstr "Locales Bild..."
+msgstr "Lokales Bild..."
 
 #: src/control/Control.Menubar.js:81 src/control/Control.Menubar.js:83
 msgid "All"
___
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-3' - loleaflet/dist loleaflet/po

[Libreoffice Gerrit user]

 loleaflet/dist/l10n/uno/hu.json |2 +
 loleaflet/po/templates/loleaflet-ui.pot |   24 ++-
 loleaflet/po/ui-ab.po   |   28 -
 loleaflet/po/ui-af.po   |   28 -
 loleaflet/po/ui-am.po   |   28 -
 loleaflet/po/ui-an.po   |   28 -
 loleaflet/po/ui-anp.po  |   28 -
 loleaflet/po/ui-ar.po   |   28 -
 loleaflet/po/ui-as.po   |   28 -
 loleaflet/po/ui-ast.po  |   28 -
 loleaflet/po/ui-az.po   |   28 -
 loleaflet/po/ui-bar.po  |   28 -
 loleaflet/po/ui-be.po   |   28 -
 loleaflet/po/ui-bg.po   |   28 -
 loleaflet/po/ui-bm.po   |   28 -
 loleaflet/po/ui-bn.po   |   28 -
 loleaflet/po/ui-bn_IN.po|   28 -
 loleaflet/po/ui-bo.po   |   28 -
 loleaflet/po/ui-br.po   |   28 -
 loleaflet/po/ui-brx.po  |   28 -
 loleaflet/po/ui-bs.po   |   28 -
 loleaflet/po/ui-ca-valencia.po  |   28 -
 loleaflet/po/ui-ca.po   |   28 -
 loleaflet/po/ui-ce.po   |   28 -
 loleaflet/po/ui-cs.po   |   28 -
 loleaflet/po/ui-cy.po   |   28 -
 loleaflet/po/ui-da.po   |   28 -
 loleaflet/po/ui-de.po   |   32 ++--
 loleaflet/po/ui-dgo.po  |   28 -
 loleaflet/po/ui-dsb.po  |   28 -
 loleaflet/po/ui-dz.po   |   28 -
 loleaflet/po/ui-el.po   |   28 -
 loleaflet/po/ui-en_AU.po|   28 -
 loleaflet/po/ui-en_GB.po|   28 -
 loleaflet/po/ui-en_ZA.po|   28 -
 loleaflet/po/ui-eo.po   |   28 -
 loleaflet/po/ui-es.po   |   30 +--
 loleaflet/po/ui-et.po   |   28 -
 loleaflet/po/ui-eu.po   |   28 -
 loleaflet/po/ui-fa.po   |   28 -
 loleaflet/po/ui-fi.po   |   28 -
 loleaflet/po/ui-fr.po   |   28 -
 loleaflet/po/ui-fur.po  |   28 -
 loleaflet/po/ui-fy.po   |   28 -
 loleaflet/po/ui-ga.po   |   28 -
 loleaflet/po/ui-gbm.po  |   28 -
 loleaflet/po/ui-gd.po   |   28 -
 loleaflet/po/ui-gl.po   |   28 -
 loleaflet/po/ui-gu.po   |   28 -
 loleaflet/po/ui-gug.po  |   28 -
 loleaflet/po/ui-he.po   |   28 -
 loleaflet/po/ui-hi.po   |   28 -
 loleaflet/po/ui-hr.po   |   28 -
 loleaflet/po/ui-hsb.po  |   28 -
 loleaflet/po/ui-hu.po   |   50 
 loleaflet/po/ui-hy.po   |   28 -
 loleaflet/po/ui-id.po   |   28 -
 loleaflet/po/ui-is.po   |   28 -
 loleaflet/po/ui-it.po   |   28 -
 loleaflet/po/ui-ja.po   |   28 -
 loleaflet/po/ui-jv.po   |   28 -
 loleaflet/po/ui-ka.po   |   28 -
 loleaflet/po/ui-kab.po  |   28 -
 loleaflet/po/ui-kk.po   |   28 -
 loleaflet/po/ui-kl.po   |   28 -
 loleaflet/po/ui-km.po   |   28 -
 loleaflet/po/ui-kmr-Latn.po |   28 -
 loleaflet/po/ui-kn.po   |   28 -
 loleaflet/po/ui-ko.po   |   28 -
 loleaflet/po/ui-kok.po  |   28 -
 loleaflet/po/ui-ks.po   |   28 -
 loleaflet/po/ui-ky.po   |   28 -
 loleaflet/po/ui-lb.po   |   28 -
 loleaflet/po/ui-lo.po   |   28 -
 loleaflet/po/ui-lt.po   |   28 -
 loleaflet/po/ui-lv.po   |   28

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

[Libreoffice Gerrit user]

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

New commits:
commit fc58ffcabe22b016157ba137f086c2df164e73c9
Author: Andras Timar 
AuthorDate: Thu Nov 8 22:32:55 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 8 22:32:55 2018 +0100

Bump package version to 3.4.1-1

Change-Id: I10162bd09d9464ff3448338d2094b216bdd5d7c4

diff --git a/configure.ac b/configure.ac
index 30be98b70..c213ed383 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [3.4.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [3.4.1], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index 6d64297ed..9f2e76230 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.1-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool3
+
+ -- Andras Timar   Thu, 08 Nov 2018 22:30:00 +0100
+
 loolwsd (3.4.0-8) unstable; urgency=medium
 
   * see the git log: http://col.la/cool3
diff --git a/debian/control b/debian/control
index ae1c16936..4a3ad193f 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, 
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, 
libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.57), 
collaboraofficebasis5.3-core (>= 5.3.10.57), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.57), 
collaboraofficebasis5.3-images (>= 5.3.10.57), collaboraofficebasis5.3-impress 
(>= 5.3.10.57), collaboraofficebasis5.3-ooofonts (>= 5.3.10.57), 
collaboraofficebasis5.3-writer (>= 5.3.10.57), collaboraoffice5.3 (>= 
5.3.10.57), collaboraoffice5.3-ure (>= 5.3.10.57), 
collaboraofficebasis5.3-en-us (>= 5.3.10.57), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.57), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.57), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.57), collaboraofficebasis5.3-draw 
(>= 5.3.10.57), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.57), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.57), 
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.57)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, 
libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.60), 
collaboraofficebasis5.3-core (>= 5.3.10.60), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.60), 
collaboraofficebasis5.3-images (>= 5.3.10.60), collaboraofficebasis5.3-impress 
(>= 5.3.10.60), collaboraofficebasis5.3-ooofonts (>= 5.3.10.60), 
collaboraofficebasis5.3-writer (>= 5.3.10.60), collaboraoffice5.3 (>= 
5.3.10.60), collaboraoffice5.3-ure (>= 5.3.10.60), 
collaboraofficebasis5.3-en-us (>= 5.3.10.60), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.60), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.60), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.60), collaboraofficebasis5.3-draw 
(>= 5.3.10.60), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.60), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.60), 
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.60)
 Conflicts: collaboraofficebasis5.3-gnome-integration, 
collaboraofficebasis5.3-kde-integration
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 78e56c1ca..8bbc5325c 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:8%{?dist}
+Release:1%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires:  libcap-progs linux-glibc-devel 
systemd-rpm-macros
 BuildRequires:  libcap-progs
 %endif
 
-Requires:   collaboraoffice5.3 >= 5.3.10.57 collaboraoffice5.3-ure >= 
5.3.10.57 collaboraofficebasis5.3-core >= 5.3.10.57 
collaboraofficebasis5.3-writer >= 5.3.10.57 collaboraofficebasis5.3-impress >= 
5.3.10.57 collaboraofficebasis5.3-graphicfilter >= 5.3.10.57 
collaboraofficebasis5.3-en-US >= 5.3.10.57 collaboraofficebasis5.3-calc >= 
5.3.10.57 collaboraofficebasis5.3-en-US-res >= 5.3.10.57 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.57 
collaboraofficebasis5.3-ooofonts >= 5.3.10.57 collaboraofficebasis5.3-images >= 
5.3.10.57 collaboraofficebasis5.3-noto-fonts >= 5.3.10.57 
collaboraofficebasis5.3-draw >= 5.3.10.57 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.57 
collaboraofficebasis5.3-filter-data >= 5.3.10.57

[Libreoffice-commits] core.git: Branch 'refs/tags/6.0-14' - 0 commits -

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.0-14'

[Libreoffice Gerrit user]

Tag 'cp-6.0-14' created by Andras Timar  at 
2018-11-08 21:26 +

cp-6.0-14

Changes since cp-6.0-13-91:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.0-14'

[Libreoffice Gerrit user]

Tag 'cp-6.0-14' created by Andras Timar  at 
2018-11-08 21:26 +

cp-6.0-14

Changes since cp-6.0-6:
Olivier R (1):
  French dictionary update (v6.3)

---
 fr_FR/README_fr.txt   |2 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |7 
 fr_FR/fr.dic  | 1032 --
 fr_FR/package-description.txt |2 
 5 files changed, 1003 insertions(+), 42 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source editeng/source filter/qa sd/source vcl/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx   |2 +-
 editeng/source/editeng/impedit2.cxx  |2 +-
 filter/qa/complex/filter/detection/typeDetection/Helper.java |2 +-
 filter/qa/complex/filter/misc/FinalizedMandatoryTest.java|8 
 sd/source/ui/view/ViewShellBase.cxx  |4 ++--
 vcl/source/window/menu.cxx   |2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 88c6b454c8b6f08c74fb54ab9469801dd6860be5
Author: Andrea Gelmini 
AuthorDate: Wed Nov 7 14:00:49 2018 +0100
Commit: Julien Nabet 
CommitDate: Thu Nov 8 22:25:25 2018 +0100

Fix typos

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

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index ba7fb22d0946..8be9777c3311 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2405,7 +2405,7 @@ namespace
 }
 }
 
-// end of anonymouse namespace
+// end of anonymous namespace
 
 OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent,
 OQueryController& _rController,
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index a0381437b29c..2ddf104fdb46 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2226,7 +2226,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* 
pLeft, ContentNode* pR
 // caller.
 if(aEditDoc.GetPos( pLeft ) > aEditDoc.GetPos( pRight ))
 {
-OSL_ENSURE(false, "ImpConnectParagraphs wit wrong order of 
pLeft/pRight nodes (!)");
+OSL_ENSURE(false, "ImpConnectParagraphs with wrong order of 
pLeft/pRight nodes (!)");
 std::swap(pLeft, pRight);
 }
 
diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java 
b/filter/qa/complex/filter/detection/typeDetection/Helper.java
index 4cb767e0c2b9..91fb39f2dca6 100644
--- a/filter/qa/complex/filter/detection/typeDetection/Helper.java
+++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java
@@ -352,7 +352,7 @@ public class Helper  {
 /** Returns the file type for the given file name containing in files.csv
  * @param fileAlias the alias name of the file
  * @return file type
- * @throws FileAliasNotFoundException was thrown if not alias was thorwn
+ * @throws FileAliasNotFoundException was thrown if not alias was thrown
  */
 public String getTypeforfileAlias(String fileAlias)
 throws FileAliasNotFoundException{
diff --git a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java 
b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
index 0a2266685995..e7100bebf5c9 100644
--- a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
+++ b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
@@ -196,9 +196,9 @@ public class FinalizedMandatoryTest
 catch (WrappedTargetRuntimeException e)
 {
 flushError = true;
-assertTrue("Unexpected exception wihle flushing changed filter 
'" + filterName + "'", isFinalized);
+assertTrue("Unexpected exception while flushing changed filter 
'" + filterName + "'", isFinalized);
 }
-assertTrue("Expected exception was not thorwn while flushing 
changed filter '" + filterName + "' Finalized:" + isFinalized,
+assertTrue("Expected exception was not thrown while flushing 
changed filter '" + filterName + "' Finalized:" + isFinalized,
 !(flushError ^ isFinalized));
 
 
@@ -215,9 +215,9 @@ public class FinalizedMandatoryTest
 catch (WrappedTargetRuntimeException e)
 {
 flushError = true;
-assertTrue("Unexpected exception wihle flushing removed filter 
'" + filterName + "'", isMandatory);
+assertTrue("Unexpected exception while flushing removed filter 
'" + filterName + "'", isMandatory);
 }
-assertTrue("Expected exception was not thorwn while flushing 
removed filter '" + filterName + "' Mandatory:" + isMandatory,
+assertTrue("Expected exception was not thrown while flushing 
removed filter '" + filterName + "' Mandatory:" + isMandatory,
 !(flushError ^ isMandatory));
 }
 String preMsg = "Could not find filter with state ";
diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index 680bf5c16dd3..417a3f65fb3f 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1410,7 +1410,7 @@ void CurrentPageSetter::operator() (bool)
 }
 }
 
-} // end of a

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.0-14'

[Libreoffice Gerrit user]

Tag 'cp-6.0-14' created by Andras Timar  at 
2018-11-08 21:27 +

cp-6.0-14

Changes since cp-6.0-12-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'refs/tags/6.0-14' - 0 commits -

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.0-14'

[Libreoffice Gerrit user]

Tag 'cp-6.0-14' created by Andras Timar  at 
2018-11-08 21:26 +

cp-6.0-14

Changes since cp-6.0-7:
Adolfo Jayme Barrientos (1):
  .howtoget, now more Collabora-y

---
 help3xsl/default.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'refs/tags/6.0-14' - 0 commits -

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'refs/tags/6.0-14' - 0 commits -

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-60'

[Libreoffice Gerrit user]

Tag 'cp-5.3-60' created by Andras Timar  at 
2018-11-08 21:22 +

cp-5.3-60

Changes since cp-5.3-59-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/qa/cppunit/FontFeatureTest.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d843d7727fd80fb094c1331d6f289bfb6e5818d1
Author: Andrea Gelmini 
AuthorDate: Wed Nov 7 17:25:03 2018 +0100
Commit: Julien Nabet 
CommitDate: Thu Nov 8 22:23:17 2018 +0100

Fix typo

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

diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx 
b/vcl/qa/cppunit/FontFeatureTest.cxx
index 297ccc991121..6a66eb1c70b5 100644
--- a/vcl/qa/cppunit/FontFeatureTest.cxx
+++ b/vcl/qa/cppunit/FontFeatureTest.cxx
@@ -87,7 +87,7 @@ void FontFeatureTest::testGetFontFeatures()
 
 // Check C2SC feature
 {
-// periodically fails on the Windows tb72 tinderboxen with
+// periodically fails on the Windows tb72 tinderbox with
 // equality assertion failed
 //- Expected: 1664250723
 //- Actual  : 1684826471
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.3-60'

[Libreoffice Gerrit user]

Tag 'cp-5.3-60' created by Andras Timar  at 
2018-11-08 21:22 +

cp-5.3-60

Changes since libreoffice-5-3-branch-point-28:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.3-60'

[Libreoffice Gerrit user]

Tag 'cp-5.3-60' created by Andras Timar  at 
2018-11-08 21:22 +

cp-5.3-60

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.3-60'

[Libreoffice Gerrit user]

Tag 'cp-5.3-60' created by Andras Timar  at 
2018-11-08 21:22 +

cp-5.3-60

Changes since cp-5.3-53-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - configure.ac

[Libreoffice Gerrit user]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25ec65bf4b77a5cdb2544527f3d1a262fcb78fe6
Author: Andras Timar 
AuthorDate: Thu Nov 8 22:21:48 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 8 22:21:48 2018 +0100

Bump version to 5.3-60

Change-Id: I7f5a4a30802c9348e8fef0d7a11b7efec47e1d88

diff --git a/configure.ac b/configure.ac
index 6731b69aae53..b56a355826f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.3.10.59],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.60],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
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-3' - loolwsd.xml.in wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 loolwsd.xml.in  |1 +
 wsd/LOOLWSD.cpp |8 
 2 files changed, 9 insertions(+)

New commits:
commit 2ff64d81ed3188994b755c0533526cc776f5c8c4
Author: Michael Meeks 
AuthorDate: Thu Nov 8 21:02:57 2018 +
Commit: Jan Holesovsky 
CommitDate: Thu Nov 8 22:21:44 2018 +0100

Nasty hack to disable red-lining via config setting and the environment.

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

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index b951846e4..1bb19a63c 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -17,6 +17,7 @@
 1
 
 4
+   true
 3600
 
 30
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b46ac2232..19fd798ae 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -717,6 +717,7 @@ void LOOLWSD::initialize(Application& self)
 { "per_document.limit_stack_mem_kb", "8000" },
 { "per_document.limit_virt_mem_mb", "0" },
 { "per_document.max_concurrency", "4" },
+{ "per_document.redlining_as_comments", "true" },
 { "per_view.idle_timeout_secs", "900" },
 { "per_view.out_of_focus_timeout_secs", "60" },
 { "security.capabilities", "true" },
@@ -942,6 +943,13 @@ void LOOLWSD::initialize(Application& self)
 setenv("MAX_CONCURRENCY", std::to_string(maxConcurrency).c_str(), 1);
 }
 
+const auto redlining = getConfigValue(conf, 
"per_document.redlining_as_comments", true);
+if (!redlining)
+{
+setenv("DISABLE_REDLINE", "1", 1);
+LOG_INF("DISABLE_REDLINE set");
+}
+
 // Otherwise we profile the soft-device at jail creation time.
 setenv("SAL_DISABLE_OPENCL", "true", 1);
 
___
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-3' - test/integration-http-server.cpp wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 test/integration-http-server.cpp |  117 +++
 wsd/LOOLWSD.cpp  |   53 -
 2 files changed, 165 insertions(+), 5 deletions(-)

New commits:
commit 503fb39e50a83ecd10e7b742bd32632bb56fb777
Author: Tamás Zolnai 
AuthorDate: Thu Nov 8 21:16:57 2018 +
Commit: Michael Meeks 
CommitDate: Thu Nov 8 21:20:12 2018 +

Handle X-Forwarded-For header for convert-to feature

Extract the client IP from the X-Forwarded-For value
and use that one to allow / deny the usage of convert-to
feature.

(cherry picked from commit 318f0629bbf94c38bce42589937f46a1f8fd79ee)

Change-Id: I363c0931df5a0538236cae12f943fffd65086ee6

Need to use clientHost here

Change-Id: I170e1d24e1a71749c3262c01a83251c6c157f6eb
(cherry picked from commit 18eb13438487290a7d4928381d6ed073134d0ea8)

Handle X-Forwarded-For with more secure

Check all pariticipating IPs to be allowed to use convert-to
functionality. In a simple use case it means the reverse-proxy's
and the actual client's IP.

Change-Id: I4ef9cb14a1c3003cba6c66f6e99d5b54b2c3b2b8
(cherry picked from commit b4b0e9c6d4d649e010e7742efae670ed541f78a2)

Have a better log for convert-to denial

(cherry picked from commit bf2dcdc01f04a440c8a12d5f5e212d9bdd39c1f6)

Change-Id: I5c8d367b3f82d47a45df8c298e39515bc89f7b0d
Signed-off-by: Michael Meeks 

diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp
index 4a1c425ad..1d6ca742a 100644
--- a/test/integration-http-server.cpp
+++ b/test/integration-http-server.cpp
@@ -51,6 +51,7 @@ class HTTPServerTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testScriptsAndLinksGet);
 CPPUNIT_TEST(testScriptsAndLinksPost);
 // FIXME CPPUNIT_TEST(testConvertTo);
+CPPUNIT_TEST(testConvertToWithForwardedClientIP);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -61,6 +62,7 @@ class HTTPServerTest : public CPPUNIT_NS::TestFixture
 void testScriptsAndLinksGet();
 void testScriptsAndLinksPost();
 void testConvertTo();
+void testConvertToWithForwardedClientIP();
 
 public:
 HTTPServerTest()
@@ -92,8 +94,25 @@ public:
 {
 testNoExtraLoolKitsLeft();
 }
+
+// A server URI which was not added to loolwsd.xml as post_allow IP or a 
wopi storage host
+Poco::URI getNotAllowedTestServerURI()
+{
+static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
+
+static std::string serverURI(
+#if ENABLE_SSL
+"https://165.227.162.232:";
+#else
+"http://165.227.162.232:";
+#endif
++ (clientPort? std::string(clientPort) : 
std::to_string(DEFAULT_CLIENT_PORT_NUMBER)));
+
+return Poco::URI(serverURI);
+}
 };
 
+
 void HTTPServerTest::testDiscovery()
 {
 std::unique_ptr 
session(helpers::createSession(_uri));
@@ -341,6 +360,104 @@ void HTTPServerTest::testConvertTo()
 CPPUNIT_ASSERT_EQUAL(expectedStream.str(), actualString);
 }
 
+
+void HTTPServerTest::testConvertToWithForwardedClientIP()
+{
+// Test a forwarded IP which is not allowed to use convert-to feature
+{
+const std::string srcPath = FileUtil::getTempFilePath(TDOC, 
"hello.odt", "testConvertToWithForwardedClientIP_");
+std::unique_ptr 
session(helpers::createSession(_uri));
+session->setTimeout(Poco::Timespan(2, 0)); // 2 seconds.
+
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
"/lool/convert-to");
+CPPUNIT_ASSERT(!request.has("X-Forwarded-For"));
+request.add("X-Forwarded-For", getNotAllowedTestServerURI().getHost() 
+ ", " + _uri.getHost());
+Poco::Net::HTMLForm form;
+form.setEncoding(Poco::Net::HTMLForm::ENCODING_MULTIPART);
+form.set("format", "txt");
+form.addPart("data", new Poco::Net::FilePartSource(srcPath));
+form.prepareSubmit(request);
+form.write(session->sendRequest(request));
+
+Poco::Net::HTTPResponse response;
+std::stringstream actualStream;
+std::istream& responseStream = session->receiveResponse(response);
+Poco::StreamCopier::copyStream(responseStream, actualStream);
+
+// Remove the temp files.
+FileUtil::removeFile(srcPath);
+
+std::string actualString = actualStream.str();
+CPPUNIT_ASSERT(actualString.empty()); // <- we did not get the 
converted file
+}
+
+// Test a forwarded IP which is allowed to use convert-to feature
+{
+const std::string srcPath = FileUtil::getTempFilePath(TDOC, 
"hello.odt", "testConvertToWithForwardedClientIP_");
+std::unique_ptr 
session(helpers::createSession(_uri));
+session->setTimeout(Poco::Timespan(2, 0)); // 2 seconds.
+
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
"/lool/convert-to");
+CPPUNIT_ASSERT(!request.has("X-Forwarded-For"));
+request.add("X-Forwarde

Re: About tdf#121074

[Julien Nabet]

On 06/11/2018 10:19, Caolán McNamara wrote:

On Mon, 2018-11-05 at 20:46 +0100, Julien Nabet wrote:

Looking at git history from
vcl/qa/cppunit/graphicfilter/data/svm/fail/mapmode-1.svm, I got
d776eeab752fd313226a7570c3ed4d8e964b4406

"ofz#937 sanity check claimed record length"

Documents like that are generated from the oss-fuzz fuzzing thing, and
what matters generally is that we don't crash/busy-loop on loading
them, not that they are in any way sane documents.

No pb, the oss-fuzz revealed a lot of bugs.

1) Do you think these asserts are ok?

I have my doubts that a negative width/height is something that is
guaranteed to indicate a bug, though it might indeed be suspicious.


I'm not completely sure too but there's no doc about this and putting an 
height or a width to a negative value (except -1 to tell it's 
uninitialized) seems really weird.



2) If yes, any thoughts how to fix this specific test with the svm
(hoping there won't be more but I'm a bit pessimistic about this)?
Well, for the purposes of continuing your experiment I imagine you
could just consider negative nTmp32 for width/height as failures and
return early.


As you may have seen, I pushed 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=6aa6cb6347575828a9d6955b98f459c7446eca05


Then I fixed a second assert with:

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

Now I'm stuck with a third assert (see bt + gdb). I thought I'd stumble 
about the same bt as https://ci.libreoffice.org/job/gerrit_master/18918/ 
gerrit Linux clang dbgutil, I suppose it's rendering dependent (in my 
case gtk3).


Putting some break, I found that it was coming from

   2707 else if ( (nType==ControlType::Listbox) &&
   2708   ((nPart==ControlPart::ButtonDown) || 
(nPart==ControlPart::SubEdit)) )

   2709 {
   2710 aEditRect = NWGetComboBoxButtonRect( nPart, 
rControlRegion );

   2711 }

#0  0x7fffeb8d4c75 in 
GtkSalGraphics::getNativeControlRegion(ControlType, ControlPart, 
tools::Rectangle const&, ControlState, ImplControlValue const&, 
rtl::OUString const&, tools::Rectangle&, tools::Rectangle&) 
(this=0x56825800, nType=ControlType::Listbox, 
nPart=ControlPart::ButtonDown, rControlRegion=..., rValue=..., 
rNativeBoundingRegion=..., rNativeContentRegion=...) at 
/home/julien/lo/libreoffice/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx:2770
#1  0x70ee5891 in 
SalGraphics::GetNativeControlRegion(ControlType, ControlPart, 
tools::Rectangle const&, ControlState, ImplControlValue const&, 
tools::Rectangle&, tools::Rectangle&, OutputDevice const*) 
(this=0x56825800, nType=ControlType::Listbox, 
nPart=ControlPart::ButtonDown, rControlRegion=..., 
nState=ControlState::NONE, aValue=..., rNativeBoundingRegion=..., 
rNativeContentRegion=..., pOutDev=0x56e10b20) at 
/home/julien/lo/libreoffice/vcl/source/gdi/salgdilayout.cxx:837
#2  0x70c3c66c in 
OutputDevice::GetNativeControlRegion(ControlType, ControlPart, 
tools::Rectangle const&, ControlState, ImplControlValue const&, 
tools::Rectangle&, tools::Rectangle&) const (this=0x56e10b20, 
nType=ControlType::Listbox, nPart=ControlPart::ButtonDown, 
rControlRegion=..., nState=ControlState::NONE, aValue=..., 
rNativeBoundingRegion=..., rNativeContentRegion=...) at 
/home/julien/lo/libreoffice/vcl/source/outdev/nativecontrols.cxx:337
#3  0x70b47897 in ListBox::Resize() (this=0x56e10b20) at 
/home/julien/lo/libreoffice/vcl/source/control/listbox.cxx:586


This seems to help:

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx

index 9f2cf0ea08ba..06fc4f3b0aaf 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2707,7 +2707,8 @@ bool GtkSalGraphics::getNativeControlRegion( 
ControlType nType, ControlPart nPar

 else if ( (nType==ControlType::Listbox) &&
   ((nPart==ControlPart::ButtonDown) || 
(nPart==ControlPart::SubEdit)) )

 {
-    aEditRect = NWGetComboBoxButtonRect( nPart, rControlRegion );
+    tools::Rectangle aControlRegion(GetWidgetSize(rControlRegion, 
gListBox));

+    aEditRect = NWGetComboBoxButtonRect( nPart, aControlRegion );
 }
 else if (nType == ControlType::Editbox && nPart == 
ControlPart::Entire)

 {

I tried to mimic Spinbox mechanism some lines above but perhaps I'm 
completely wrong.


Any thoughts?

Julien


cppunittester: /home/julien/lo/libreoffice/include/tools/gen.hxx:200: void 
Size::setWidth(long int): Assertion `(nWidth >= 0 || nWidth == -1) && "Wrong 
value for width"' failed.

---Type  to continue, or q  to quit---q
Quit
(gdb) bt
#0  0x778faf3b in __GI_raise (sig=sig@entry=6) at 
../sysdeps/unix/sysv/linux/raise.c:51
#1  0x778fc2f1 in __GI_abort () at abort.c:79
#2  0x778f3a8a in __assert_fail_base (fmt=0x77a47ec8 "%s%s%s:%u: 
%s%sAssertion `%s' failed.\n%n", assertion=assertion@entry=

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist

[Libreoffice Gerrit user]

 loleaflet/dist/loleaflet.css |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7feef9a197e399e1263a188eb8057ad71f65066b
Author: Henry Castro 
AuthorDate: Tue Oct 16 21:06:34 2018 -0400
Commit: Jan Holesovsky 
CommitDate: Thu Nov 8 22:18:58 2018 +0100

loleaflet: mobile: ensure to hide the document name

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

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 3ce760548..5e7b5a41d 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -114,6 +114,9 @@ body {
 #closebutton {
display: none;
 }
+#document-name-input {
+   display: none;
+}
 }
 
 .loleaflet-font {
___
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-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Menubar.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6ba3744409db504a27ba9b19ed5451a911b29057
Author: Henry Castro 
AuthorDate: Tue Oct 16 20:03:40 2018 -0400
Commit: Jan Holesovsky 
CommitDate: Thu Nov 8 22:15:51 2018 +0100

loleaflet: mobile: do not focus the map after the menu item click

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

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 60a6b9140..b9f59ff61 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -769,8 +769,8 @@ L.Control.Menubar = L.Control.extend({
self._executeAction(item);
}
 
-   if ($(item).data('id') !== 'insertcomment')
-   map.focus();
+   if (!L.Browser.mobile && $(item).data('id') !== 'insertcomment')
+   self._map.focus();
},
 
_createMenu: function(menu) {
___
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-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/map/handler/Map.Drag.js |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 06930ce40953e0d52df19d8ad7a670091a5049a4
Author: Henry Castro 
AuthorDate: Fri Oct 5 20:56:18 2018 -0400
Commit: Jan Holesovsky 
CommitDate: Thu Nov 8 22:12:31 2018 +0100

loleaflet: mobile: fix the dragging of the map when the size ...

fits with the maximum bounds

Change-Id: Ib30afed8f8a8538a438b70e3983fb1c55baf9d42
Reviewed-on: https://gerrit.libreoffice.org/61456
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/map/handler/Map.Drag.js 
b/loleaflet/src/map/handler/Map.Drag.js
index bb177a3b9..07395e236 100644
--- a/loleaflet/src/map/handler/Map.Drag.js
+++ b/loleaflet/src/map/handler/Map.Drag.js
@@ -84,9 +84,15 @@ L.Map.Drag = L.Handler.extend({
 
_onPreDrag: function () {
var org = this._map.getPixelOrigin();
+   var pos = this._map._getMapPanePos();
var size = 
this._map.getLayerMaxBounds().getSize().subtract(this._map.getSize());
-   this._draggable._newPos.x = Math.max(Math.min(org.x, 
this._draggable._newPos.x), org.x - size.x);
-   this._draggable._newPos.y = Math.max(Math.min(org.y, 
this._draggable._newPos.y), org.y - size.y);
+   if (this._draggable._newPos.x !== pos.x) {
+   this._draggable._newPos.x = Math.max(Math.min(org.x, 
this._draggable._newPos.x), org.x - Math.max(size.x, 0));
+   }
+
+   if (this._draggable._newPos.y !== pos.y) {
+   this._draggable._newPos.y = Math.max(Math.min(org.y, 
this._draggable._newPos.y), org.y - Math.max(size.y, 0));
+   }
},
 
_onDragEnd: function (e) {
___
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-3' - test/integration-http-server.cpp wsd/LOOLWSD.cpp wsd/Storage.cpp wsd/Storage.hpp

[Libreoffice Gerrit user]

 test/integration-http-server.cpp |1 +
 wsd/LOOLWSD.cpp  |8 
 wsd/Storage.cpp  |5 +
 wsd/Storage.hpp  |2 ++
 4 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 01a43feafbbb6ca3b5ad06e82705e90aea556458
Author: Tamás Zolnai 
AuthorDate: Sat Oct 20 12:57:53 2018 +0200
Commit: Michael Meeks 
CommitDate: Thu Nov 8 22:09:06 2018 +0100

Enable convert-to features for wopi hosts

Change-Id: I994be7087247215b09d117df18b661906d941266
(cherry picked from commit bb50c9e0cdcf68b010c9d312593b6dfcd4a9c93a)
Reviewed-on: https://gerrit.libreoffice.org/62401
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp
index 16d002de6..4a1c425ad 100644
--- a/test/integration-http-server.cpp
+++ b/test/integration-http-server.cpp
@@ -169,6 +169,7 @@ void HTTPServerTest::testCapabilities()
 
 Poco::JSON::Object::Ptr convert_to = 
features->get("convert-to").extract();
 CPPUNIT_ASSERT(convert_to->has("available"));
+CPPUNIT_ASSERT(convert_to->get("available"));
 }
 }
 
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 68472329d..7d0e0eb33 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2053,7 +2053,7 @@ private:
 {
 LOG_DBG("Wopi capabilities request: " << request.getURI());
 
-std::string capabilities = getCapabilitiesJson();
+std::string capabilities = getCapabilitiesJson(request.getHost());
 
 std::ostringstream oss;
 oss << "HTTP/1.1 200 OK\r\n"
@@ -2139,7 +2139,7 @@ private:
 
 std::string format = (form.has("format") ? form.get("format") : 
"");
 
-if (!allowPostFrom(socket->clientAddress()))
+if (!allowPostFrom(socket->clientAddress()) && 
!StorageBase::allowedWopiHost(request.getHost()) )
 {
 LOG_ERR("client address DENY: " << 
socket->clientAddress().c_str());
 std::ostringstream oss;
@@ -2567,7 +2567,7 @@ private:
 }
 
 /// Process the capabilities.json file and return as string.
-std::string getCapabilitiesJson()
+std::string getCapabilitiesJson(const std::string& host)
 {
 std::shared_ptr socket = _socket.lock();
 
@@ -2591,7 +2591,7 @@ private:
 Poco::JSON::Object::Ptr features = 
jsonFile.extract();
 Poco::JSON::Object::Ptr convert_to = 
features->get("convert-to").extract();
 
-Poco::Dynamic::Var available = allowPostFrom(socket->clientAddress());
+Poco::Dynamic::Var available = allowPostFrom(socket->clientAddress()) 
|| StorageBase::allowedWopiHost(host);
 convert_to->set("available", available);
 
 std::ostringstream ostrJSON;
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 3e2e23ad6..05403dd46 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -131,6 +131,11 @@ void StorageBase::initialize()
 #endif
 }
 
+bool StorageBase::allowedWopiHost(const std::string& host)
+{
+return WopiEnabled && WopiHosts.match(host);
+}
+
 bool isLocalhost(const std::string& targetHost)
 {
 std::string targetAddress;
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index f061f818b..cbb6f9c42 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -174,6 +174,8 @@ public:
 static std::unique_ptr create(const Poco::URI& uri,
const std::string& jailRoot,
const std::string& jailPath);
+
+static bool allowedWopiHost(const std::string& host);
 protected:
 
 /// Returns the root path of the jail directory of docs.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/window/builder.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7df7e69db0b70b552db3a62d3301e0ba46e299be
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 11:52:43 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 22:06:45 2018 +0100

Resolves: tdf#121238 format welded metricspinbuttons the same as 
historically

i.e. not with the UI Language, but with the Locale setting.

Change-Id: I5146ece3356fdb67c3c715c6d17e608ec92e739a
Reviewed-on: https://gerrit.libreoffice.org/63088
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 63da9929989c..8c0e98154a37 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -222,7 +222,7 @@ namespace weld
 {
 OUString aStr;
 
-const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetLocaleDataWrapper();
 
 unsigned int nDecimalDigits = m_xSpinButton->get_digits();
 //pawn percent off to icu to decide whether percent is separated from 
its number for this locale
@@ -251,7 +251,7 @@ namespace weld
 
 IMPL_LINK(MetricSpinButton, spin_button_input, int*, result, bool)
 {
-const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetLocaleDataWrapper();
 double fResult(0.0);
 bool bRet = MetricFormatter::TextToValue(get_text(), fResult, 0, 
m_xSpinButton->get_digits(), rLocaleData, m_eSrcUnit);
 if (bRet)
@@ -264,7 +264,7 @@ namespace weld
 int nStartPos, nEndPos;
 m_xSpinButton->get_selection_bounds(nStartPos, nEndPos);
 
-const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetLocaleDataWrapper();
 const int nTimeArea = TimeFormatter::GetTimeArea(m_eFormat, 
m_xSpinButton->get_text(), nEndPos,
  rLocaleData);
 
@@ -298,7 +298,7 @@ namespace weld
 int nStartPos, nEndPos;
 m_xSpinButton->get_selection_bounds(nStartPos, nEndPos);
 
-const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetLocaleDataWrapper();
 tools::Time aResult(0);
 bool bRet = TimeFormatter::TextToTime(m_xSpinButton->get_text(), 
aResult, m_eFormat, true, rLocaleData);
 if (bRet)
@@ -330,7 +330,7 @@ namespace weld
 
 OUString TimeSpinButton::format_number(int nValue) const
 {
-const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetLocaleDataWrapper();
 return TimeFormatter::FormatTime(ConvertValue(nValue), m_eFormat, 
TimeFormat::Hour24, true, rLocaleData);
 }
 
___
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-3' - loleaflet/dist loleaflet/po loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/dist/toolbar/toolbar.js|4 ++--
 loleaflet/po/templates/loleaflet-ui.pot  |   10 +++---
 loleaflet/src/control/Control.Menubar.js |4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 315758db22d7dc2272cbf8f1c76bdd12a4cdce5b
Author: Andras Timar 
AuthorDate: Thu Nov 8 15:48:33 2018 +0100
Commit: Michael Meeks 
CommitDate: Thu Nov 8 22:06:05 2018 +0100

loleaflet: rename menu/toolbar items for Insert Image

Change-Id: I8cd04da84ab63e67353291acc5f9c9782cd7ea9d
(cherry picked from commit ea9515ccf6d7a5a215566aa98531136aee33a404)
Reviewed-on: https://gerrit.libreoffice.org/63106
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 9833cfc91..48157a8f8 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -472,8 +472,8 @@ $(function () {
{type: 'button',  id: 'insertgraphic',  img: 
'insertgraphic', hint: _UNO('.uno:InsertGraphic', '', true)},
{type: 'menu', id: 'menugraphic', img: 'insertgraphic', 
hint: _UNO('.uno:InsertGraphic', '', true), hidden: true,
items: [
-   {id: 'localgraphic', text: 
_UNO('.uno:InsertGraphic', '', true), icon: 'insertgraphic'},
-   {id: 'remotegraphic', text: _('Remote 
Image...'), icon: 'insertgraphic'}
+   {id: 'localgraphic', text: _('Insert 
Local Image'), icon: 'insertgraphic'},
+   {id: 'remotegraphic', text: 
_UNO('.uno:InsertGraphic', '', true), icon: 'insertgraphic'},
]},
{type: 'button',  id: 'specialcharacter', img: 
'specialcharacter', hint: _UNO('.uno:InsertSymbol', '', true), uno: 
'.uno:InsertSymbol'}
],
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 207713c37..fa7c8a819 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-11 21:36+0200\n"
+"POT-Creation-Date: 2018-11-06 22:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -290,8 +290,8 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: dist/toolbar/toolbar.js:476 src/control/Control.Menubar.js:66
-msgid "Remote Image..."
+#: js/toolbar.js:683 src/control/Control.Menubar.js:69
+msgid "Insert Local Image"
 msgstr ""
 
 #: dist/toolbar/toolbar.js:521 dist/toolbar/toolbar.js:1010
@@ -621,6 +621,10 @@ msgstr ""
 msgid "Repair"
 msgstr ""
 
+#: src/control/Control.Menubar.js:68
+msgid "Local Image..."
+msgstr ""
+
 #: src/control/Control.Menubar.js:81 src/control/Control.Menubar.js:83
 msgid "All"
 msgstr ""
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 2b33c4e4f..60a6b9140 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -62,8 +62,8 @@ L.Control.Menubar = L.Control.extend({
]
},
{name: _UNO('.uno:InsertMenu', 'text'), type: 'menu', 
menu: [
-   {name: _UNO('.uno:InsertGraphic', 'text'), id: 
'insertgraphic', type: 'action'},
-   {name: _('Remote Image...'), id: 
'insertgraphicremote', type: 'action'},
+   {name: _('Local Image...'), id: 
'insertgraphic', type: 'action'},
+   {name: _UNO('.uno:InsertGraphic', 'text'), id: 
'insertgraphicremote', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 'text'), 
id: 'insertcomment', type: 'action'},
{uno: '.uno:InsertObjectChart'},
{type: 'separator'},
___
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-3' - etc/apache2 etc/nginx loolwsd.spec.in Makefile.am

[Libreoffice Gerrit user]

 Makefile.am  |   10 ++
 etc/apache2/loolwsd.conf |   31 +++
 etc/nginx/loolwsd.conf   |   35 +++
 loolwsd.spec.in  |   13 +
 4 files changed, 89 insertions(+)

New commits:
commit 9e9ebceb62c6a07c841e529bca98a37fe5462d71
Author: Andras Timar 
AuthorDate: Thu Sep 20 10:18:57 2018 +0200
Commit: Michael Meeks 
CommitDate: Thu Nov 8 22:05:33 2018 +0100

nginx and apache2 reverse proxy sample config snippets

Change-Id: I0bb5a1b1e9ef8a72c2c100c6cbf9acb7e62e591a
Reviewed-on: https://gerrit.libreoffice.org/62973
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/Makefile.am b/Makefile.am
index 42e3839cb..291fd07b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,14 @@ loolwsdconfigdir = @LOOLWSD_CONFIGDIR@
 loolwsdconfig_DATA = loolwsd.xml \
 loolkitconfig.xcu
 
+apache2configdir = ${sysconfdir}/apache2/conf-available
+
+apache2config_DATA = etc/apache2/loolwsd.conf
+
+nginxconfigdir = ${sysconfdir}/nginx/snippets
+
+nginxconfig_DATA = etc/nginx/loolwsd.conf
+
 ACLOCAL_AMFLAGS = -I m4
 
 # quick and easy for now.
@@ -234,6 +242,8 @@ EXTRA_DIST = discovery.xml \
  etc/key.pem \
  etc/cert.pem \
  etc/ca-chain.cert.pem \
+ etc/apache2/loolwsd.conf \
+ etc/nginx/loolwsd.conf \
  scripts/unocommands.py \
  $(man_MANS)
 
diff --git a/etc/apache2/loolwsd.conf b/etc/apache2/loolwsd.conf
new file mode 100644
index 0..10b66b47f
--- /dev/null
+++ b/etc/apache2/loolwsd.conf
@@ -0,0 +1,31 @@
+# Apache2 reverse proxy configuration for Collabora Online / LibreOffice Online
+# Internet <-- SSL --> Reverse Proxy <-- No SSL --> loolwsd
+# Make sure that you enable the following Apache2 modules: proxy, 
proxy_wstunnel, and proxy_http.
+# Create a virtual host for Collabora Online / LibreOffice Online and include 
this configuration file.
+
+  Options -Indexes
+
+  # Encoded slashes need to be allowed
+  AllowEncodedSlashes NoDecode
+
+  # keep the host
+  ProxyPreserveHost On
+
+  # static html, js, images, etc. served from loolwsd
+  # loleaflet is the client part of LibreOffice Online
+  ProxyPass   /loleaflet http://127.0.0.1:9980/loleaflet retry=0
+  ProxyPassReverse/loleaflet http://127.0.0.1:9980/loleaflet
+
+  # WOPI discovery URL
+  ProxyPass   /hosting/discovery 
http://127.0.0.1:9980/hosting/discovery retry=0
+  ProxyPassReverse/hosting/discovery 
http://127.0.0.1:9980/hosting/discovery
+
+  # Main websocket
+  ProxyPassMatch "/lool/(.*)/ws$" ws://127.0.0.1:9980/lool/$1/ws nocanon
+
+  # Admin Console websocket
+  ProxyPass   /lool/adminws ws://127.0.0.1:9980/lool/adminws
+
+  # Download as, Fullscreen presentation and Image upload operations
+  ProxyPass   /lool http://127.0.0.1:9980/lool
+  ProxyPassReverse/lool http://127.0.0.1:9980/lool
diff --git a/etc/nginx/loolwsd.conf b/etc/nginx/loolwsd.conf
new file mode 100644
index 0..f55f8829b
--- /dev/null
+++ b/etc/nginx/loolwsd.conf
@@ -0,0 +1,35 @@
+# static files
+location ^~ /loleaflet {
+proxy_pass http://localhost:9980;
+proxy_set_header Host $http_host;
+}
+
+# WOPI discovery URL
+location ^~ /hosting/discovery {
+proxy_pass http://localhost:9980;
+proxy_set_header Host $http_host;
+}
+
+# main websocket
+location ~ ^/lool/(.*)/ws$ {
+proxy_pass http://localhost:9980;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection "Upgrade";
+proxy_set_header Host $http_host;
+proxy_read_timeout 36000s;
+}
+
+# download, presentation and image upload
+location ~ ^/lool {
+proxy_pass http://localhost:9980;
+proxy_set_header Host $http_host;
+}
+
+# Admin Console websocket
+location ^~ /lool/adminws {
+proxy_pass http://localhost:9980;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection "Upgrade";
+proxy_set_header Host $http_host;
+proxy_read_timeout 36000s;
+}
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 531857bf4..78e56c1ca 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -126,6 +126,11 @@ install -D -m 644 sysconfig.loolwsd 
%{buildroot}/etc/sysconfig/loolwsd
 install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
 install -D -m 644 sysconfig.loolwsd %{buildroot}/var/adm/fillup-templates
 %endif
+%if 0%{?rhel} > 0
+install -d -m 755 %{buildroot}/etc/httpd/conf
+install -D -m 755 etc/apache2/loolwsd.conf %{buildroot}/etc/httpd/conf
+rm %{buildroot}/etc/apache2/conf-available/loolwsd.conf
+%endif
 mkdir -p %{buildroot}/etc/cron.d
 echo "#Remove old tiles once every 10 days at midnight" > 
%{buildroot}/etc/cron.d/loolwsd.cron
 echo "0 0 */1 * * root find /var/cache/loolwsd -type f -a -atime +10 -exec rm 
{} \;" >> %{buil

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

[Libreoffice Gerrit user]

 sw/source/core/doc/docredln.cxx   |4 +-
 sw/source/uibase/uno/unotxdoc.cxx |   69 ++
 2 files changed, 44 insertions(+), 29 deletions(-)

New commits:
commit c99e885565f9d741a659e7e18c22d092ed90b9de
Author: Ashod Nakashian 
AuthorDate: Thu Nov 8 11:02:26 2018 -0500
Commit: Michael Meeks 
CommitDate: Thu Nov 8 20:38:04 2018 +

LOK: don't emit redline comments

Change tracking can be quite numerous. Showing the
markers (and their comments" as comment-boxes is
sensible where there is limited change in a doc.

However with extensively modified doc, this becomes
overwhelming both in terms of browser load and
editing performance. As such, we disable them
as they don't add much value. The user can still
access them from the Track Changes > Manage menu.

Use a rather nasty env. var hack to propagate this
setting from WSD for now.

Change-Id: I3f964816b4a10f565012b273added8a8413cd309
Signed-off-by: Michael Meeks 

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 1b407f46e6d9..497ad1c2dc53 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -357,7 +357,9 @@ void lcl_LOKInvalidateStartEndFrames(SwShellCursor& rCursor)
 /// Emits LOK notification about one addition / removal of a redline item.
 void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, 
SwRangeRedline* pRedline)
 {
-if (!comphelper::LibreOfficeKit::isActive())
+// Disable since usability is very low beyond some small number of changes.
+static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+if (!comphelper::LibreOfficeKit::isActive() || bDisableRedlineComments)
 return;
 
 boost::property_tree::ptree aRedline;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 6f6ba735d753..2620335d2ee2 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3278,40 +3278,53 @@ Pointer SwXTextDocument::getPointer()
 
 OUString SwXTextDocument::getTrackedChanges()
 {
-const SwRedlineTable& rRedlineTable = 
pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
 boost::property_tree::ptree aTrackedChanges;
-for (SwRedlineTable::size_type i = 0; i < rRedlineTable.size(); ++i)
-{
-boost::property_tree::ptree aTrackedChange;
-aTrackedChange.put("index", rRedlineTable[i]->GetId());
-aTrackedChange.put("author", 
rRedlineTable[i]->GetAuthorString(1).toUtf8().getStr());
-aTrackedChange.put("type", 
nsRedlineType_t::SwRedlineTypeToOUString(rRedlineTable[i]->GetRedlineData().GetType()).toUtf8().getStr());
-aTrackedChange.put("comment", 
rRedlineTable[i]->GetRedlineData().GetComment().toUtf8().getStr());
-aTrackedChange.put("description", 
rRedlineTable[i]->GetDescr().toUtf8().getStr());
-OUString sDateTime = 
utl::toISO8601(rRedlineTable[i]->GetRedlineData().GetTimeStamp().GetUNODateTime());
-aTrackedChange.put("dateTime", sDateTime.toUtf8().getStr());
-
-SwContentNode* pContentNd = rRedlineTable[i]->GetContentNode();
-SwView* pView = dynamic_cast(SfxViewShell::Current());
-if (pView && pContentNd)
+
+// Disable since usability is very low beyond some small number of changes.
+static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+if (!bDisableRedlineComments)
+{
+const SwRedlineTable& rRedlineTable
+= 
pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+for (SwRedlineTable::size_type i = 0; i < rRedlineTable.size(); ++i)
 {
-SwShellCursor aCursor(pView->GetWrtShell(), 
*(rRedlineTable[i]->Start()));
-aCursor.SetMark();
-aCursor.GetMark()->nNode = *pContentNd;
-aCursor.GetMark()->nContent.Assign(pContentNd, 
rRedlineTable[i]->End()->nContent.GetIndex());
+boost::property_tree::ptree aTrackedChange;
+aTrackedChange.put("index", rRedlineTable[i]->GetId());
+aTrackedChange.put("author", 
rRedlineTable[i]->GetAuthorString(1).toUtf8().getStr());
+aTrackedChange.put("type", 
nsRedlineType_t::SwRedlineTypeToOUString(
+   
rRedlineTable[i]->GetRedlineData().GetType())
+   .toUtf8()
+   .getStr());
+aTrackedChange.put("comment",
+   
rRedlineTable[i]->GetRedlineData().GetComment().toUtf8().getStr());
+aTrackedChange.put("description", 
rRedlineTable[i]->GetDescr().toUtf8().getStr());
+OUString sDateTime = utl::toISO8601(
+
rRedlineTable[i]->GetRedlineData().GetTimeStamp().GetUNODateTime());
+aTrackedChange.put("dateTime", sDateTime.toUtf8().getStr());
+
+ 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

[Libreoffice Gerrit user]

 sw/source/core/doc/docredln.cxx   |4 +-
 sw/source/uibase/uno/unotxdoc.cxx |   69 ++
 2 files changed, 44 insertions(+), 29 deletions(-)

New commits:
commit d4f821b7a385953542e90b2749690b9f8f4cc782
Author: Ashod Nakashian 
AuthorDate: Thu Nov 8 11:02:26 2018 -0500
Commit: Michael Meeks 
CommitDate: Thu Nov 8 20:36:39 2018 +

LOK: don't emit redline comments

Change tracking can be quite numerous. Showing the
markers (and their comments" as comment-boxes is
sensible where there is limited change in a doc.

However with extensively modified doc, this becomes
overwhelming both in terms of browser load and
editing performance. As such, we disable them
as they don't add much value. The user can still
access them from the Track Changes > Manage menu.

Use a rather nasty env. var hack to propagate this
setting from WSD for now.

Change-Id: I3f964816b4a10f565012b273added8a8413cd309
Signed-off-by: Michael Meeks 

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index fc92fbcf6a68..1a429a83f8d9 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -357,7 +357,9 @@ void lcl_LOKInvalidateStartEndFrames(SwShellCursor& rCursor)
 /// Emits LOK notification about one addition / removal of a redline item.
 void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, 
SwRangeRedline* pRedline)
 {
-if (!comphelper::LibreOfficeKit::isActive())
+// Disable since usability is very low beyond some small number of changes.
+static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+if (!comphelper::LibreOfficeKit::isActive() || bDisableRedlineComments)
 return;
 
 boost::property_tree::ptree aRedline;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index f578c5480bb4..c5aafda8c191 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3278,40 +3278,53 @@ Pointer SwXTextDocument::getPointer()
 
 OUString SwXTextDocument::getTrackedChanges()
 {
-const SwRedlineTable& rRedlineTable = 
pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
 boost::property_tree::ptree aTrackedChanges;
-for (SwRedlineTable::size_type i = 0; i < rRedlineTable.size(); ++i)
-{
-boost::property_tree::ptree aTrackedChange;
-aTrackedChange.put("index", rRedlineTable[i]->GetId());
-aTrackedChange.put("author", 
rRedlineTable[i]->GetAuthorString(1).toUtf8().getStr());
-aTrackedChange.put("type", 
nsRedlineType_t::SwRedlineTypeToOUString(rRedlineTable[i]->GetRedlineData().GetType()).toUtf8().getStr());
-aTrackedChange.put("comment", 
rRedlineTable[i]->GetRedlineData().GetComment().toUtf8().getStr());
-aTrackedChange.put("description", 
rRedlineTable[i]->GetDescr().toUtf8().getStr());
-OUString sDateTime = 
utl::toISO8601(rRedlineTable[i]->GetRedlineData().GetTimeStamp().GetUNODateTime());
-aTrackedChange.put("dateTime", sDateTime.toUtf8().getStr());
-
-SwContentNode* pContentNd = rRedlineTable[i]->GetContentNode();
-SwView* pView = dynamic_cast(SfxViewShell::Current());
-if (pView && pContentNd)
+
+// Disable since usability is very low beyond some small number of changes.
+static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+if (!bDisableRedlineComments)
+{
+const SwRedlineTable& rRedlineTable
+= 
pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+for (SwRedlineTable::size_type i = 0; i < rRedlineTable.size(); ++i)
 {
-SwShellCursor aCursor(pView->GetWrtShell(), 
*(rRedlineTable[i]->Start()));
-aCursor.SetMark();
-aCursor.GetMark()->nNode = *pContentNd;
-aCursor.GetMark()->nContent.Assign(pContentNd, 
rRedlineTable[i]->End()->nContent.GetIndex());
+boost::property_tree::ptree aTrackedChange;
+aTrackedChange.put("index", rRedlineTable[i]->GetId());
+aTrackedChange.put("author", 
rRedlineTable[i]->GetAuthorString(1).toUtf8().getStr());
+aTrackedChange.put("type", 
nsRedlineType_t::SwRedlineTypeToOUString(
+   
rRedlineTable[i]->GetRedlineData().GetType())
+   .toUtf8()
+   .getStr());
+aTrackedChange.put("comment",
+   
rRedlineTable[i]->GetRedlineData().GetComment().toUtf8().getStr());
+aTrackedChange.put("description", 
rRedlineTable[i]->GetDescr().toUtf8().getStr());
+OUString sDateTime = utl::toISO8601(
+
rRedlineTable[i]->GetRedlineData().GetTimeStamp().GetUNODateTime());
+aTrackedChange.put("dateTime", sDateTime.toUtf8().getStr());
+
+ 

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

[Libreoffice Gerrit user]

 sw/qa/uitest/table/textToTable.py  |   79 +
 sw/qa/uitest/writer_tests/data/textToTable.odt |binary
 2 files changed, 79 insertions(+)

New commits:
commit 2c614b4b2537997aece7ba0aa7ecd38e55fcffaa
Author: Zdeněk Crhonek 
AuthorDate: Thu Nov 8 17:15:50 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Thu Nov 8 21:05:49 2018 +0100

uitest Writer Text to table dialog

Change-Id: I0c28174d24cc626ebdab647844c711fc2be51fe8
Reviewed-on: https://gerrit.libreoffice.org/63110
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sw/qa/uitest/writer_tests5/tableToText.py 
b/sw/qa/uitest/table/tableToText.py
similarity index 100%
rename from sw/qa/uitest/writer_tests5/tableToText.py
rename to sw/qa/uitest/table/tableToText.py
diff --git a/sw/qa/uitest/table/textToTable.py 
b/sw/qa/uitest/table/textToTable.py
new file mode 100644
index ..7d89a42d9051
--- /dev/null
+++ b/sw/qa/uitest/table/textToTable.py
@@ -0,0 +1,79 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+#Writer Text to table
+
+class textToTable(UITestCase):
+def test_text_to_table(self):
+writer_doc = self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+#Enter A;B ; select the text ; dialog Text to table - Semicolon; verify
+type_text(xWriterEdit, "A;B;C")
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS": 
"0", "END_POS": "5"}))
+self.ui_test.execute_dialog_through_command(".uno:ConvertTextToTable")
+xDialog = self.xUITest.getTopFocusWindow()
+semicolons = xDialog.getChild("semicolons")
+semicolons.executeAction("CLICK", tuple())
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+#verify
+self.assertEqual(document.TextTables.getCount(), 1)
+tables = document.getTextTables()
+self.assertEqual(len(tables[0].getRows()), 1)
+self.assertEqual(len(tables[0].getColumns()), 3)
+#undo
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(document.TextTables.getCount(), 0)
+self.assertEqual(document.Text.String[0:5], "A;B;C")
+
+self.ui_test.close_doc()
+
+def test_text_to_table_header(self):
+writer_doc = 
self.ui_test.load_file(get_url_for_data_file("textToTable.odt"))
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+#open file; select all text ; dialog Text to table - other ":"; verify
+self.xUITest.executeCommand(".uno:SelectAll")
+self.ui_test.execute_dialog_through_command(".uno:ConvertTextToTable")
+xDialog = self.xUITest.getTopFocusWindow()
+other = xDialog.getChild("other")
+other.executeAction("CLICK", tuple())
+othered = xDialog.getChild("othered")
+othered.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+othered.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+othered.executeAction("TYPE", mkPropertyValues({"TEXT":":"}))
+headingcb = xDialog.getChild("headingcb")
+headingcb.executeAction("CLICK", tuple())
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+#verify
+self.assertEqual(document.TextTables.getCount(), 1)
+tables = document.getTextTables()
+self.assertEqual(len(tables[0].getRows()), 4)
+self.assertEqual(len(tables[0].getColumns()), 3)
+#undo
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(document.TextTables.getCount(), 0)
+self.assertEqual(document.Text.String[0:5], "A:B:C")
+
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/uitest/writer_tests/data/textToTable.odt 
b/sw/qa/uitest/writer_tests/data/textToTable.odt
new file mode 100644
index ..088b6b4c1ac9
Binary fil

[Libreoffice-commits] core.git: drawinglayer/source emfio/qa svgio/qa test/source

[Libreoffice Gerrit user]

 drawinglayer/source/tools/emfphelperdata.cxx |5 -
 emfio/qa/cppunit/emf/EmfImportTest.cxx   |   19 ---
 svgio/qa/cppunit/SvgImportTest.cxx   |4 ++--
 test/source/primitive2dxmldump.cxx   |6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 1873ba08d82efdc228462d839e16c802ffb6cfa3
Author: Bartosz Kosiorek 
AuthorDate: Tue Nov 6 00:43:53 2018 +0100
Commit: Bartosz Kosiorek 
CommitDate: Thu Nov 8 20:59:41 2018 +0100

tdf#113624 EMF+ Fix shift of DrawString without StringFormat

While we are drawing DrawString record, in most cases optional
StringFormat information is available.
If StringFromat information is available then we should use default
values.
For LeadingMargin for String the default value is 1/6 inch.

Change-Id: I4a0a68df5ebe74e810f8b5864232b477b3aac255
Reviewed-on: https://gerrit.libreoffice.org/62927
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek 

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx 
b/drawinglayer/source/tools/emfphelperdata.cxx
index dd95f2fb6027..5f35ef931682 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1320,7 +1320,6 @@ namespace emfplushelper
 break;
 }
 
mrPropertyHolders.Current().setFont(vcl::Font(font->family, Size(font->emSize, 
font->emSize)));
-// done reading
 
 const OUString emptyString;
 drawinglayer::attribute::FontAttribute 
fontAttribute(
@@ -1359,6 +1358,10 @@ namespace emfplushelper
 }
 else
 {
+// By default LeadingMargin is 1/6 inch
+// TODO for typographic fonts set value to 0.
+stringAlignmentHorizontalOffset = 16.0;
+
 // use system default
 locale = 
Application::GetSettings().GetLanguageTag().getLocale();
 }
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx 
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 4eb34e308227..88cd0ea65925 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -125,17 +125,14 @@ void Test::TestDrawStringTransparent()
 xmlDocPtr pDocument = 
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
 CPPUNIT_ASSERT (pDocument);
 
-//TODO Strange that transparency is set to 0 even if it is not fully 
transparent
-// check correct import of the DrawString: transparency, height, position, 
text, color and font
-assertXPath(pDocument, 
"/primitive2D/metafile/transform/transform/unifiedtransparence", 
"transparence", "0");
-
-//TODO Where was textsimpleportion gone?
-//assertXPath(pDocument, 
"/primitive2D/metafile/transform/transform/textsimpleportion", "height", "276");
-//assertXPath(pDocument, 
"/primitive2D/metafile/transform/transform/textsimpleportion", "x", "25");
-//assertXPath(pDocument, 
"/primitive2D/metafile/transform/transform/textsimpleportion", "y", "323");
-//assertXPath(pDocument, 
"/primitive2D/metafile/transform/transform/textsimpleportion", "text", 
"Transparent Text");
-//assertXPath(pDocument, 
"/primitive2D/metafile/transform/transform/textsimpleportion", "fontcolor", 
"#00");
-//assertXPath(pDocument, 
"/primitive2D/metafile/transform/transform/textsimpleportion", "familyname", 
"CALIBRI");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence", 
"transparence", "0.498039215686275");
+
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion",
 "height", "24");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion",
 "x", "66");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion",
 "y", "74");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion",
 "text", "Transparent Text");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion",
 "fontcolor", "#ff");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence/textsimpleportion",
 "familyname", "ARIAL");
 }
 
 void Test::TestDrawLine()
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 6b71a0dfeb7a..8174c068d045 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -367,7 +367,7 @@ void Test::testTdf79163()
 
 CPPUNIT_ASSERT (pDocument);
 
-   

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

[Libreoffice Gerrit user]

 loleaflet/dist/toolbar/w2ui-1.5.rc1.js|2 +-
 loleaflet/src/core/LOUtil.js  |2 +-
 loleaflet/src/layer/marker/ProgressOverlay.js |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fc511aaf049c3e5fe5316018ba945cfaafd956d0
Author: Ashod Nakashian 
AuthorDate: Thu Nov 8 11:05:22 2018 -0500
Commit: Michael Meeks 
CommitDate: Thu Nov 8 20:15:07 2018 +0100

leaflet: reduce some animation timeouts to avoid hammering cpu/browser

Change-Id: I4194db181f1cc0f89c906cbb87846c89df47e4ee
Reviewed-on: https://gerrit.libreoffice.org/63108
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/dist/toolbar/w2ui-1.5.rc1.js 
b/loleaflet/dist/toolbar/w2ui-1.5.rc1.js
index 89f54de62..b9f7d778d 100644
--- a/loleaflet/dist/toolbar/w2ui-1.5.rc1.js
+++ b/loleaflet/dist/toolbar/w2ui-1.5.rc1.js
@@ -2093,7 +2093,7 @@ w2utils.event = {
 hideTag();
 return;
 }
-if (!instant) setTimeout(checkIfMoved, 100);
+if (!instant) setTimeout(checkIfMoved, 200);
 // monitor if moved
 var posClass = 'w2ui-tag-right';
 var posLeft  = parseInt(offset.left + el.offsetWidth + 
(options.left ? options.left : 0));
diff --git a/loleaflet/src/core/LOUtil.js b/loleaflet/src/core/LOUtil.js
index fad8ad527..42c513736 100644
--- a/loleaflet/src/core/LOUtil.js
+++ b/loleaflet/src/core/LOUtil.js
@@ -38,7 +38,7 @@ L.LOUtil = {
context.beginPath();
context.arc(x, y, radius, 0, Math.PI * 1.3);
context.stroke();
-   }, 1);
+   }, 30);
 
return spinnerInterval;
},
diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js 
b/loleaflet/src/layer/marker/ProgressOverlay.js
index a6f7e3532..4a60e89c5 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -5,7 +5,7 @@
 L.ProgressOverlay = L.Layer.extend({
 
options: {
-   spinnerSpeed: 1.5
+   spinnerSpeed: 15
},
 
initialize: function (latlng, size) {
___
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-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/dom/PosAnimation.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db048708007a901071ade5ef5b15de8927253005
Author: Ashod Nakashian 
AuthorDate: Thu Nov 8 11:04:48 2018 -0500
Commit: Michael Meeks 
CommitDate: Thu Nov 8 20:13:37 2018 +0100

leaflet: stop animating comment-box when reached dest

This reduces CPU significantly, as the constant step
checks are quite CPU intensive and we do them way too
often.

Change-Id: Ief573dcd5311974894be6a99f709db5f9a1a26d3
Reviewed-on: https://gerrit.libreoffice.org/63107
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/src/dom/PosAnimation.js 
b/loleaflet/src/dom/PosAnimation.js
index 5a2ef634e..eae9309b5 100644
--- a/loleaflet/src/dom/PosAnimation.js
+++ b/loleaflet/src/dom/PosAnimation.js
@@ -40,7 +40,7 @@ L.PosAnimation = L.Class.extend({
 
_onStep: function () {
var stepPos = this._getPos();
-   if (!stepPos) {
+   if (!stepPos || (this._el._leaflet_pos.x == stepPos.x && 
this._el._leaflet_pos.y == stepPos.y)) {
this._onTransitionEnd();
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/uiconfig/ui/searchformatdialog.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 97abda34fa0e3501f291cceb8b03ccc98e2b9845
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 14:14:43 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 19:57:52 2018 +0100

Resolves: tdf#121225 needs to be resizable

Change-Id: I978196d7b8cc5dada2ebb5d72f996780fbab80b8
Reviewed-on: https://gerrit.libreoffice.org/63102
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/uiconfig/ui/searchformatdialog.ui 
b/cui/uiconfig/ui/searchformatdialog.ui
index 3899a278546d..42a437a32661 100644
--- a/cui/uiconfig/ui/searchformatdialog.ui
+++ b/cui/uiconfig/ui/searchformatdialog.ui
@@ -6,7 +6,6 @@
 False
 6
 Text Format 
-False
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 9 commits - chart2/source editeng/source extensions/test extras/source forms/source LICENSE readlicense_oo/docs svtools/source vcl/source wizards/s

[Libreoffice Gerrit user]

 LICENSE  |4 -
 chart2/source/model/main/ChartModel.hxx  |2 
 dev/null |binary
 editeng/source/misc/hangulhanja.cxx  |2 
 extensions/test/ole/MfcControl/StdAfx.h  |8 +-
 extras/source/templates/wizard/bitmap/Import_1.png   |binary
 extras/source/templates/wizard/bitmap/Import_3.png   |binary
 extras/source/templates/wizard/bitmap/Import_4.png   |binary
 extras/source/templates/wizard/bitmap/MS-Import_2-1.png  |binary
 extras/source/templates/wizard/bitmap/MS-Import_2-2.png  |binary
 extras/source/templates/wizard/bitmap/MS-Import_2-3.png  |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-1.png |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-2.png |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-3.png |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-4.png |binary
 extras/source/templates/wizard/bitmap/euro_1.png |binary
 extras/source/templates/wizard/bitmap/euro_2.png |binary
 extras/source/templates/wizard/bitmap/euro_3.png |binary
 forms/source/component/Edit.cxx  |2 
 readlicense_oo/docs/readme.xsl   |   36 +--
 svtools/source/brwbox/datwin.hxx |2 
 vcl/source/window/brdwin.cxx |2 
 vcl/source/window/dockingarea.cxx|2 
 wizards/source/euro/AutoPilotRun.xba |   40 ++--
 wizards/source/euro/DlgConvert.xdl   |2 
 wizards/source/euro/Init.xba |   48 +++
 wizards/source/importwizard/Main.xba |   43 ++---
 27 files changed, 94 insertions(+), 99 deletions(-)

New commits:
commit ab017c683002df7f76a792e369c00fd10e1024f0
Author: Matthias Seidel 
AuthorDate: Thu Nov 8 15:58:53 2018 +
Commit: Matthias Seidel 
CommitDate: Thu Nov 8 15:58:53 2018 +

Cleaning up Document Converter wizard, moving graphics from bmp to png

diff --git a/extras/source/templates/wizard/bitmap/Import_1.bmp 
b/extras/source/templates/wizard/bitmap/Import_1.bmp
deleted file mode 100644
index 98457094b3fd..
Binary files a/extras/source/templates/wizard/bitmap/Import_1.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_1.png 
b/extras/source/templates/wizard/bitmap/Import_1.png
new file mode 100644
index ..ea0942103e6a
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_1.png 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_3.bmp 
b/extras/source/templates/wizard/bitmap/Import_3.bmp
deleted file mode 100644
index 37802a50d744..
Binary files a/extras/source/templates/wizard/bitmap/Import_3.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_3.png 
b/extras/source/templates/wizard/bitmap/Import_3.png
new file mode 100644
index ..abffeb3b9a1d
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_3.png 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_4.bmp 
b/extras/source/templates/wizard/bitmap/Import_4.bmp
deleted file mode 100644
index 591c5ded5065..
Binary files a/extras/source/templates/wizard/bitmap/Import_4.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_4.png 
b/extras/source/templates/wizard/bitmap/Import_4.png
new file mode 100644
index ..6529f8e84871
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_4.png 
differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp 
b/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp
deleted file mode 100644
index 085feeca5ab8..
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp and 
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-1.png 
b/extras/source/templates/wizard/bitmap/MS-Import_2-1.png
new file mode 100644
index ..51da77a51f7d
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/MS-Import_2-1.png differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp 
b/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp
deleted file mode 100644
index 64fc93f1a579..
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp and 
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-2.png 
b/extras/source/templates/wizard/bitmap/MS-Import_2-2.png
new file mode 100644
index ..ef03f14b8a3a
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/MS-Import_2-2.png differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-3.bmp 
b/extras/source/templates/wizard/bitmap/MS-Import_2-3.bmp
deleted file mode 100

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

[Libreoffice Gerrit user]

 vcl/headless/svpframe.cxx   |2 ++
 vcl/headless/svpgdi.cxx |2 ++
 vcl/headless/svpinst.cxx|3 ++-
 vcl/inc/headless/svpgdi.hxx |   12 
 vcl/inc/quartz/ctfonts.hxx  |3 ---
 vcl/ios/dummies.cxx |2 +-
 vcl/quartz/salvd.cxx|1 -
 7 files changed, 11 insertions(+), 14 deletions(-)

New commits:
commit 27ad8ca01c9691e539fea37d018d7892377f403f
Author: Tor Lillqvist 
AuthorDate: Thu Nov 8 15:05:57 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 8 19:40:01 2018 +0100

Bin some leftover and actually unnecessary iOS crack in vcl

We don't need the '#define SvpSalGraphics AquaSalGraphics' in
vcl/inc/headless/svpgdi.hxx. The actual AquaSalGraphics we use for iOS
is in vcl/inc/quartz/salgdi.h. I don't remember the details of the
convoluted history behind this.

Change-Id: Ie56c3c93acf7ad89e10a05e75aa4ca7fd596ba98
Reviewed-on: https://gerrit.libreoffice.org/63098
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 0888941b0687..0e7b1bed139c 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -25,7 +25,9 @@
 
 #include 
 #include 
+#ifndef IOS
 #include 
+#endif
 
 #include 
 
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 1921cde62cef..4e9c4d55e06e 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -18,7 +18,9 @@
  */
 
 #include 
+#ifndef IOS
 #include 
+#endif
 #include 
 #include 
 #include 
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index b7df88e2ce98..5f7176e748d1 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -38,9 +38,10 @@
 #include 
 #include 
 #include 
+#else
+#include 
 #endif
 #include 
-#include 
 
 #include 
 #include 
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 89fe682d3223..3ac06489ea73 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 
+#ifdef IOS
+#error This file is not for iOS
+#endif
+
 #include 
 #include 
 #include 
@@ -27,15 +31,9 @@
 
 #include 
 #include 
-#ifndef IOS
 #include "svpcairotextrender.hxx"
-#endif
 #include 
 
-#ifdef IOS
-#define SvpSalGraphics AquaSalGraphics
-#else
-
 #include 
 
 //Using formats that match cairo's formats. For android we patch cairo,
@@ -276,8 +274,6 @@ public:
 voidclipRegion(cairo_t* cr);
 };
 
-#endif
-
 #endif // INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/ctfonts.hxx b/vcl/inc/quartz/ctfonts.hxx
index 78f13242c62d..89cc554439ba 100644
--- a/vcl/inc/quartz/ctfonts.hxx
+++ b/vcl/inc/quartz/ctfonts.hxx
@@ -21,9 +21,6 @@
 #define INCLUDED_VCL_INC_QUARTZ_CTFONTS_HXX
 
 #include 
-#ifdef IOS
-#include "headless/svpgdi.hxx"
-#endif
 #include 
 
 SystemFontList* GetCoretextFontList();
diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx
index efb2d251078d..3572baa790ad 100644
--- a/vcl/ios/dummies.cxx
+++ b/vcl/ios/dummies.cxx
@@ -18,7 +18,7 @@
  */
 #include 
 #include "salprn.hxx"
-#include "headless/svpgdi.hxx"
+#include "quartz/salgdi.h"
 #include "headless/svpinst.hxx"
 #include "unx/fontmanager.hxx"
 #include "unx/gendata.hxx"
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 5f4c1337d9b8..f376fc4200e2 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -29,7 +29,6 @@
 #include 
 #else
 #include "headless/svpframe.hxx"
-#include "headless/svpgdi.hxx"
 #include "headless/svpinst.hxx"
 #include "headless/svpvd.hxx"
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_3' - 17 commits - sw/inc sw/qa sw/source

[Libreoffice Gerrit user]

 sw/inc/authfld.hxx |2 
 sw/inc/chpfld.hxx  |   38 +--
 sw/inc/dbfld.hxx   |   10 
 sw/inc/ddefld.hxx  |2 
 sw/inc/doc.hxx |3 
 sw/inc/docufld.hxx |   32 +-
 sw/inc/expfld.hxx  |   11 -
 sw/inc/fldbas.hxx  |9 
 sw/inc/flddat.hxx  |2 
 sw/inc/flddropdown.hxx |2 
 sw/inc/fmtftn.hxx  |2 
 sw/inc/modeltoviewhelper.hxx   |3 
 sw/inc/ndtxt.hxx   |6 
 sw/inc/reffld.hxx  |   13 -
 sw/inc/usrfld.hxx  |2 
 sw/qa/core/test_ToxTextGenerator.cxx   |   16 -
 sw/qa/core/uwriter.cxx |   38 ++-
 sw/source/core/crsr/crsrsh.cxx |3 
 sw/source/core/crsr/crstrvl.cxx|7 
 sw/source/core/crsr/findtxt.cxx|2 
 sw/source/core/doc/DocumentFieldsManager.cxx   |6 
 sw/source/core/doc/DocumentOutlineNodesManager.cxx |8 
 sw/source/core/doc/doc.cxx |6 
 sw/source/core/doc/doccomp.cxx |6 
 sw/source/core/doc/docedt.cxx  |3 
 sw/source/core/doc/docglbl.cxx |2 
 sw/source/core/doc/docnum.cxx  |   14 -
 sw/source/core/edit/edattr.cxx |4 
 sw/source/core/edit/edfld.cxx  |2 
 sw/source/core/edit/editsh.cxx |   10 
 sw/source/core/edit/edlingu.cxx|   12 -
 sw/source/core/fields/authfld.cxx  |2 
 sw/source/core/fields/cellfml.cxx  |2 
 sw/source/core/fields/chpfld.cxx   |  108 ++---
 sw/source/core/fields/dbfld.cxx|   10 
 sw/source/core/fields/ddefld.cxx   |2 
 sw/source/core/fields/docufld.cxx  |   30 +-
 sw/source/core/fields/expfld.cxx   |   11 -
 sw/source/core/fields/fldbas.cxx   |7 
 sw/source/core/fields/flddat.cxx   |2 
 sw/source/core/fields/flddropdown.cxx  |2 
 sw/source/core/fields/macrofld.cxx |2 
 sw/source/core/fields/reffld.cxx   |  230 +++--
 sw/source/core/fields/scrptfld.cxx |2 
 sw/source/core/fields/tblcalc.cxx  |4 
 sw/source/core/fields/usrfld.cxx   |2 
 sw/source/core/inc/fieldhint.hxx   |   14 -
 sw/source/core/text/itratr.cxx |4 
 sw/source/core/text/txtfld.cxx |   48 ++--
 sw/source/core/tox/ToxTextGenerator.cxx|4 
 sw/source/core/tox/tox.cxx |2 
 sw/source/core/tox/txmsrt.cxx  |   15 -
 sw/source/core/txtnode/atrfld.cxx  |   15 -
 sw/source/core/txtnode/atrftn.cxx  |   11 -
 sw/source/core/txtnode/modeltoviewhelper.cxx   |7 
 sw/source/core/txtnode/ndtxt.cxx   |   25 +-
 sw/source/core/txtnode/txtedt.cxx  |6 
 sw/source/core/undo/undobj.cxx |4 
 sw/source/core/undo/unredln.cxx|7 
 sw/source/core/unocore/unofield.cxx|2 
 sw/source/core/unocore/unoflatpara.cxx |6 
 sw/source/core/unocore/unoport.cxx |2 
 sw/source/core/unocore/unoportenum.cxx |2 
 sw/source/filter/ascii/ascatr.cxx  |2 
 sw/source/filter/html/htmlfldw.cxx |2 
 sw/source/filter/ww8/docxattributeoutput.cxx   |2 
 sw/source/filter/ww8/rtfattributeoutput.cxx|2 
 sw/source/filter/ww8/rtfexport.cxx |2 
 sw/source/filter/ww8/wrtw8esh.cxx  |2 
 sw/source/filter/ww8/wrtw8nds.cxx  |2 
 sw/source/filter/ww8/ww8atr.cxx|2 
 sw/source/ui/fldui/flddok.cxx  |2 
 sw/source/ui/fldui/fldref.cxx  |5 
 sw/source/ui/fldui/inpdlg.cxx  |2 
 sw/source/uibase/docvw/edtwin2.cxx |7 
 sw/source/uibase/uno/unotxdoc.cxx  |2 
 76 files changed, 539 insertions(+), 361 deletions(-)

New commits:
commit 9cdaa4bfd94a40d1e0bb91e12addf226761e54d1
Author: Michael Stahl 
AuthorDate: Thu Nov 8 18:51:20 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 8 18:59:58 2018 +0100

SwGetRefField too

Change-Id: I3b68a46f68fb4070d26b247a6701b510cc209d9b

diff --git a/sw/source/core/fields/reffld.

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit c863d437ecb6c609677871035c7c68fd7005b06f
Author: Olivier Hallot 
AuthorDate: Thu Nov 8 10:42:32 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Thu Nov 8 18:52:53 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Clarify caption element description

Change-Id: I03491b07a7c4b1da4441713c8f5bbff82ad164e1
Reviewed-on: https://gerrit.libreoffice.org/63096
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 10694883a078..9b58d0269638 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 10694883a078bc2edd7f8f6f74c2a75fce0e2080
+Subproject commit 9b58d0269638d2c487349508d7f19dc021fa3a28
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/optionen/01041100.xhp |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9b58d0269638d2c487349508d7f19dc021fa3a28
Author: Olivier Hallot 
AuthorDate: Thu Nov 8 10:42:32 2018 -0200
Commit: Olivier Hallot 
CommitDate: Thu Nov 8 18:52:53 2018 +0100

Clarify caption element description

Change-Id: I03491b07a7c4b1da4441713c8f5bbff82ad164e1
Reviewed-on: https://gerrit.libreoffice.org/63096
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/optionen/01041100.xhp 
b/source/text/shared/optionen/01041100.xhp
index 6474b..407944e0c 100644
--- a/source/text/shared/optionen/01041100.xhp
+++ b/source/text/shared/optionen/01041100.xhp
@@ -79,12 +79,14 @@
 
   Level
   Specifies the headings or chapter 
levels where you want the numbering to start.
+
+  Separator
   Defines the character to 
be displayed after the number of the heading or chapter 
level.
   Category and frame format
 
 
   Character style
-  Specifies the character style.
+  Specifies the character style of the caption 
paragraph.
 
 
   Apply 
border and shadow
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svtools/uiconfig/ui/inputbox.ui |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit e9c1bbb32d6cef06c875bb8cf05a00216ea59b2e
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 13:29:01 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 18:29:11 2018 +0100

Related: tdf#121181 basic input box used to have a very wide edit widget

so for a quiet life make it around that width again

Change-Id: I7ffc0dc6d989ada3f9bf483aa1f5c1ac1ac352fc
Reviewed-on: https://gerrit.libreoffice.org/63099
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svtools/uiconfig/ui/inputbox.ui b/svtools/uiconfig/ui/inputbox.ui
index 760e1e78fe9d..f17243ccb824 100644
--- a/svtools/uiconfig/ui/inputbox.ui
+++ b/svtools/uiconfig/ui/inputbox.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -9,6 +9,9 @@
 0
 0
 dialog
+
+  
+
 
   
 False
@@ -82,6 +85,7 @@
 True
 True
 True
+65
   
   
 1
@@ -101,8 +105,5 @@
   ok
   cancel
 
-
-  
-
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - 3 commits - configure.ac sw/qa sw/source

[Libreoffice Gerrit user]

 configure.ac   |9 +
 sw/qa/core/data/ww8/fail/forcepoint-44.doc |binary
 sw/source/core/layout/pagechg.cxx  |4 ++--
 sw/source/filter/xml/xmlbrsh.cxx   |4 
 4 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 6ed498a71482109fea731bb84f288f978bea12dc
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 12:50:33 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 18:01:05 2018 +0100

tdf#118820 fix table background fill

Change-Id: I50a65d56251f978785fa446515cb374167c604e8
Reviewed-on: https://gerrit.libreoffice.org/60682
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 
(cherry picked from commit 65d727548740afae7175fb04a12f50e119514497)
Reviewed-on: https://gerrit.libreoffice.org/62513
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index c9ed33c53dc7..aebefd159b8f 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -135,10 +135,14 @@ void SwXMLBrushItemImportContext::EndElement()
 m_xGraphic = GetImport().loadGraphicFromBase64(m_xBase64Stream);
 m_xBase64Stream = nullptr;
 }
+
 if (m_xGraphic.is())
 {
 Graphic aGraphic(m_xGraphic);
+SvxGraphicPosition eOldGraphicPos = pItem->GetGraphicPos();
 pItem->SetGraphic(aGraphic);
+if (GPOS_NONE == eOldGraphicPos && GPOS_NONE != pItem->GetGraphicPos())
+pItem->SetGraphicPos(GPOS_TILED);
 }
 
 if (!(pItem->GetGraphic()))
commit 8e5bbad9800eb9a2e2f1a17cc372d1a8bcc80498
Author: Caolán McNamara 
AuthorDate: Fri Nov 2 10:52:42 2018 +
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 17:58:57 2018 +0100

ENABLE_FIREBIRD_SDBC no defined in system-firebird case

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

diff --git a/configure.ac b/configure.ac
index df9441656bfe..dd0fd29c0753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8687,7 +8687,7 @@ AC_SUBST(POSTGRESQL_LIB)
 dnl ===
 dnl Check for Firebird stuff
 dnl ===
-ENABLE_FIREBIRD_SDBC=""
+ENABLE_FIREBIRD_SDBC=
 if test "$enable_firebird_sdbc" = "yes" ; then
 SCPDEFS="$SCPDEFS -DWITH_FIREBIRD_SDBC"
 
@@ -8735,7 +8735,8 @@ int fb_api_is_30(void) { return 0; }
 #endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 3.0.x is 
installed]))
 CFLAGS="${__save_CFLAGS}"
 fi
-ENABLE_FIREBIRD_SDBC="TRUE"
+ENABLE_FIREBIRD_SDBC=TRUE
+AC_DEFINE([ENABLE_FIREBIRD_SDBC],1)
 elif test "$enable_database_connectivity" != yes; then
 AC_MSG_RESULT([none])
 elif test "$cross_compiling" = "yes"; then
@@ -8781,8 +8782,8 @@ int fb_api_is_30(void) { return 0; }
 fi
 
 BUILD_TYPE="$BUILD_TYPE FIREBIRD"
-ENABLE_FIREBIRD_SDBC="TRUE"
-AC_DEFINE(ENABLE_FIREBIRD_SDBC)
+ENABLE_FIREBIRD_SDBC=TRUE
+AC_DEFINE([ENABLE_FIREBIRD_SDBC],1)
 fi
 fi
 AC_SUBST(ENABLE_FIREBIRD_SDBC)
commit ba4861a0dfdf97448925130995d69b4c516f0644
Author: Caolán McNamara 
AuthorDate: Tue Jun 5 21:37:00 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 17:58:26 2018 +0100

tdf#121005 forcepoint#44 merge into isDeleteForbidden

Reviewed-on: https://gerrit.libreoffice.org/55355
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit c6222fb6b8b429fa2e767c73ad616147f95ab1b9)

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

diff --git a/sw/qa/core/data/ww8/fail/forcepoint-44.doc 
b/sw/qa/core/data/ww8/fail/forcepoint-44.doc
new file mode 100644
index ..100422a2249c
Binary files /dev/null and b/sw/qa/core/data/ww8/fail/forcepoint-44.doc differ
diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index ac6c74f4fc57..f3b80311c52f 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1238,6 +1238,8 @@ namespace
 {
 bool isDeleteForbidden(const SwPageFrame *pDel)
 {
+if (pDel->IsDeleteForbidden())
+return true;
 const SwLayoutFrame* pBody = pDel->FindBodyCont();
 const SwFrame* pBodyContent = pBody ? pBody->Lower() : nullptr;
 return pBodyContent && pBodyContent->IsDeleteForbidden();
@@ -1265,8 +1267,6 @@ namespace
  !pSibling->FindFirstBodyContent() &&
  (!pRefPage || !isDeleteForbidden(pSibling)) )
 {
-if (pSibling->IsDeleteForbidden())
-throw uno::RuntimeException("bad layout");
 

[Libreoffice-commits] core.git: 3 commits - editeng/source sc/UIConfig_scalc.mk vcl/qt5

[Libreoffice Gerrit user]

 editeng/source/rtf/svxrtf.cxx |   18 +-
 sc/UIConfig_scalc.mk  |1 +
 vcl/qt5/Qt5Widget.cxx |1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 8f5de14bece7548f44aafc32d3bb3d9d2211a389
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 12:53:05 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 18:09:43 2018 +0100

Resolves: tdf#121200 better ofz#7802 infinite loop fix

Change-Id: I50163d6545782012b177a48a1aded0572499f9af
Reviewed-on: https://gerrit.libreoffice.org/63097
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 6f8299e0716e..eed91b25158f 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -352,18 +352,34 @@ void SvxRTFParser::ReadStyleTable()
 case RTF_CHRFMT:
 case RTF_BRDRDEF:
 case RTF_TABSTOPDEF:
-
+#ifndef NDEBUG
+auto nEnteringToken = nToken;
+#endif
+auto nEnteringIndex = m_nTokenIndex;
+int nSkippedTokens = 0;
 if( RTF_SWGDEFS & nToken)
 {
 if( RTF_IGNOREFLAG != GetStackPtr( -1 )->nTokenId )
 break;
 nToken = SkipToken();
+++nSkippedTokens;
 if( '{' == GetStackPtr( -1 )->nTokenId )
 {
 nToken = SkipToken();
+++nSkippedTokens;
 }
 }
 ReadAttr( nToken, &pStyle->aAttrSet );
+if (nSkippedTokens && m_nTokenIndex == nEnteringIndex - 
nSkippedTokens)
+{
+// we called SkipToken to go back one or two, but ReadAttrs
+// read nothing, so on next loop of the outer while we
+// would end up in the same state again (assert that)
+assert(nEnteringToken == GetNextToken());
+// and loop endlessly, skip format a token
+// instead to avoid that
+SkipToken(nSkippedTokens);
+}
 break;
 }
 break;
commit f0effa0e891d2bb64df6c5c70088938774db1f76
Author: Aleksei Nikiforov 
AuthorDate: Thu Nov 8 15:21:14 2018 +0300
Commit: Katarina Behrens 
CommitDate: Thu Nov 8 18:03:32 2018 +0100

tdf#120784 KDE5: Process "Enter" key from numpad like normal "Enter" key

Change-Id: Id4a721aa30e92a9396f93342cf42d5790207bb89
Reviewed-on: https://gerrit.libreoffice.org/63095
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 1055ccd9fb16..9edb7d15f89f 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -262,6 +262,7 @@ static sal_uInt16 GetKeyCode(int keyval)
 nCode = KEY_PAGEDOWN;
 break;
 case Qt::Key_Return:
+case Qt::Key_Enter:
 nCode = KEY_RETURN;
 break;
 case Qt::Key_Escape:
commit bc8d7b8087dad2a7a6c4ce768e532c4e2d56
Author: andreas kainz 
AuthorDate: Thu Nov 8 14:33:42 2018 +0100
Commit: andreas_kainz 
CommitDate: Thu Nov 8 17:58:42 2018 +0100

NB tabbed compact calc: copy files to install dir

Change-Id: Ibe2db53db5bffde38d24e105e87a6739dc6dbe8f
Reviewed-on: https://gerrit.libreoffice.org/63101
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index d6aabe949204..96fa2e3c42e0 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -149,6 +149,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \
sc/uiconfig/scalc/ui/notebookbar \
+   sw/uiconfig/swriter/ui/notebookbar_compact \
sc/uiconfig/scalc/ui/notebookbar_groups \
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full \
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/quartz/salgdicommon.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7e0bfbd763fec8640b4c6e34abf86d5bca12466b
Author: Armin Le Grand 
AuthorDate: Thu Nov 8 15:36:37 2018 +0100
Commit: Armin Le Grand 
CommitDate: Thu Nov 8 17:36:18 2018 +0100

tdf#120252 use the already transformed PolyPolygon

Change-Id: I38abc73116720b99364c3de9fa4378c730385dc2
Reviewed-on: https://gerrit.libreoffice.org/63104
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 
Reviewed-by: Armin Le Grand 

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 43714cbae3d3..6d66c7e7556c 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -981,7 +981,9 @@ bool AquaSalGraphics::drawPolyPolygon(
 // setup poly-polygon path
 CGMutablePathRef xPath = CGPathCreateMutable();
 SAL_INFO( "vcl.cg", "CGPathCreateMutable() = " << xPath );
-for(auto const& rPolygon : rPolyPolygon)
+// tdf#120252 Use the correct, already transformed PolyPolygon (as long as
+// the transformation is not used here...)
+for(auto const& rPolygon : aPolyPolygon)
 {
 AddPolygonToPath( xPath, rPolygon, true, !getAntiAliasB2DDraw(), 
IsPenVisible() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/headless

[Libreoffice Gerrit user]

 vcl/headless/svpframe.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 237042b8c34f44d78972c8ec01fb3c140a6ce0a6
Author: Tor Lillqvist 
AuthorDate: Thu Nov 8 17:38:34 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 8 17:33:49 2018 +0100

No updateSettings() in AquaSalGraphics

Just ifdef out the call of it for now. This is a temporary solution,
we presumably do want dialogs to be "themed" appropriately for the iOS
app.

Change-Id: I0b14bd59ecc13037c9ff2a286405a5020081f1d5
Reviewed-on: https://gerrit.libreoffice.org/63112
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index e9770392127f..623308d57303 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -438,8 +438,9 @@ void SvpSalFrame::UpdateSettings( AllSettings& rSettings )
 bFreeGraphics = true;
 }
 rSettings.SetStyleSettings(aStyleSettings);
+#ifndef IOS // For now...
 pGraphics->updateSettings(rSettings);
-
+#endif
 if (bFreeGraphics)
 ReleaseGraphics(pGraphics);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/Library_vcl.mk

[Libreoffice Gerrit user]

 vcl/Library_vcl.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5d74784f26c20673237261e64e14a52d522e1853
Author: Tor Lillqvist 
AuthorDate: Thu Nov 8 17:37:47 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 8 17:33:00 2018 +0100

Don't build the CustomWidgetDraw code for iOS for now

Change-Id: I91a263aa68b8f84d975d42b2b48f858137370986
Reviewed-on: https://gerrit.libreoffice.org/63111
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 8fb1e5ec0a6a..d51a3b3548f5 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -521,11 +521,11 @@ vcl_headless_code= \
 $(if $(filter-out IOS,$(OS)), \
vcl/headless/svpbmp \
vcl/headless/svpgdi \
-   vcl/headless/svpdata) \
+   vcl/headless/svpdata \
+   vcl/headless/CustomWidgetDraw) \
 vcl/headless/svpdummies \
 vcl/headless/svpinst \
 vcl/headless/svpvd \
-vcl/headless/CustomWidgetDraw \
 vcl/unx/generic/app/gendisp \
 vcl/unx/generic/app/geninst \
 vcl/unx/generic/app/gensys \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - desktop/qa external/xmlsec xmlsecurity/source

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx   |2 
 external/xmlsec/UnpackedTarball_xmlsec.mk |1 
 external/xmlsec/xmlsec1-customkeymanage.patch.1   | 4321 --
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   36 
 4 files changed, 4360 deletions(-)

New commits:
commit 0c6be604bf241d98ed06a15390580d93ebf1176f
Author: Miklos Vajna 
AuthorDate: Thu Nov 8 16:54:58 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 16:54:58 2018 +0100

Revert "CppunitTest_desktop_lib: disable failing test"

This reverts commit 6c7e262fa9f11e160e5854231421710eec0ddee3, now that I
found the missing backport.

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index ce4e04a3805f..57c89e134a97 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2303,7 +2303,6 @@ void DesktopLOKTest::testGetSignatureState_NonSigned()
 
 void DesktopLOKTest::testInsertCertificate()
 {
-#if 0
 comphelper::LibreOfficeKit::setActive();
 
 // Load the document, save it into a temp file and load that file again
@@ -2371,7 +2370,6 @@ void DesktopLOKTest::testInsertCertificate()
 }
 
 comphelper::LibreOfficeKit::setActive(false);
-#endif
 }
 
 namespace {
commit 5ff7ab890b3a4f633566c6d0900b9f9fd4d5
Author: Miklos Vajna 
AuthorDate: Mon Jun 4 21:25:38 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 16:54:40 2018 +0100

libxmlsec: drop not needed xmlsec1-customkeymanage.patch.1

This was added in commit ebd1b95bb5f9235d1dba1b840fd746c9b53320d2
(INTEGRATION: CWS xmlsec08 (1.1.2); FILE ADDED; 2005-03-10) without any
real commit message to explain why this is necessary.

system-xmlsec (not containing this patch) works fine for our XML signing
purposes with software certificates, and just recently I learned that
even hardware-based certificates work fine without this patch, so it can
go away.

I assume this was a refactor to allow some new feature as a next step,
but that feature was never implemented.

Reviewed-on: https://gerrit.libreoffice.org/55296
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit f06004c03bbd076767a570180b7fc239064713e6)

Conflicts:
external/xmlsec/UnpackedTarball_xmlsec.mk

Change-Id: I31639230483cd34b14b35fd41b4fcd8284476138

diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk 
b/external/xmlsec/UnpackedTarball_xmlsec.mk
index 808803d38a8f..ec543de3b04c 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -11,7 +11,6 @@ xmlsec_patches :=
 xmlsec_patches += xmlsec1-configure.patch.1
 xmlsec_patches += xmlsec1-vc.patch.1
 xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
-xmlsec_patches += xmlsec1-customkeymanage.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git a/external/xmlsec/xmlsec1-customkeymanage.patch.1 
b/external/xmlsec/xmlsec1-customkeymanage.patch.1
deleted file mode 100644
index 14595da6df16..
--- a/external/xmlsec/xmlsec1-customkeymanage.patch.1
+++ /dev/null
@@ -1,4321 +0,0 @@
-From 57f9146c45b1819afdd79a96a77ea55fb84ddb50 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna 
-Date: Fri, 4 Mar 2016 16:19:12 +0100
-Subject: [PATCH] xmlsec1-customkeymanage.patch
-
-Conflicts:
-   include/xmlsec/nss/app.h
-   include/xmlsec/nss/keysstore.h
-   src/nss/Makefile.in
-   src/nss/hmac.c
-   src/nss/keysstore.c
-   src/nss/pkikeys.c
-   src/nss/symkeys.c
-   src/nss/x509.c
-   src/nss/x509vfy.c

- include/xmlsec/nss/Makefile.am |   3 +
- include/xmlsec/nss/Makefile.in |   3 +
- include/xmlsec/nss/akmngr.h|  56 +++
- include/xmlsec/nss/app.h   |   5 +
- include/xmlsec/nss/ciphers.h   |  35 ++
- include/xmlsec/nss/keysstore.h |   4 +
- include/xmlsec/nss/tokens.h| 182 ++
- src/nss/Makefile.am|   2 +
- src/nss/Makefile.in|  20 ++
- src/nss/akmngr.c   | 384 
- src/nss/hmac.c |   6 +-
- src/nss/keysstore.c| 772 +
- src/nss/pkikeys.c  |  81 ++---
- src/nss/symkeys.c  | 705 +++--
- src/nss/tokens.c   | 544 +
- src/nss/x509.c | 491 ++
- src/nss/x509vfy.c  | 248 +
- 17 files changed, 2703 insertions(+), 838 deletions(-)
- create mode 100644 include/xmlsec/nss/akmngr.h
- create mode 100644 include/xmlsec/nss/ciphers.h
- create mode 100644 include/xmlsec/nss/tokens.h
- create mode 100644 src/nss/akmngr.c
- create mode 100644 src/nss/tokens.c
-
-diff --git a/include/xmlsec/nss/Makefile.am b/include/xmlsec/nss/Makefile.am
-index e3521622..997c

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

[Libreoffice Gerrit user]

 cui/uiconfig/ui/fontfeaturesdialog.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3d70b1253f964fb75cd4b5915b8dd031ee54d5c7
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 15:25:53 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 16:39:25 2018 +0100

Resolves: tdf#121270 use never scrollbar policy for gtk 3.18

Change-Id: I76df258c822b7811024f3bb6f96bafbc3298b15d
Reviewed-on: https://gerrit.libreoffice.org/63105
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/uiconfig/ui/fontfeaturesdialog.ui 
b/cui/uiconfig/ui/fontfeaturesdialog.ui
index b3db9831fbe8..cb619eabf659 100644
--- a/cui/uiconfig/ui/fontfeaturesdialog.ui
+++ b/cui/uiconfig/ui/fontfeaturesdialog.ui
@@ -86,6 +86,8 @@
   
 True
 True
+never
+never
 in
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Heiko, Caolan, Kendy, Olivier, Miklos, Xisco, Sophie, Stephan,
  Michael W, Michael M  

* Completed Action Items:
+ characterize perf. Impact of changing icon scaling algorithm (jmux)
[ tweaked the makefiles, takes a while to load PNG to SVG
  is cached, takes a few seconds – happens (Heiko)
 + PNGs were in ZIP files and sorted to improve I/O ? (Michael) ]
+ investigate missing crash report signatures in 6.1.2 (Cloph)
  [ fixed in 6.1.3 – missing up-loads (Markus) ]

* Pending Action Items:
+ run certification script (Kendy)
  [ not run yet ]
+ add screenshot builder to basic build stats (Cloph)
  [ build still fails ]

* Release Engineering update (Xisco)
+ 6.0.7.3 and 6.1.3.2 released this week.
+ 6.2 Beta 1 & feature freeze next week
  + Late Features ?
 + donation infobar (Heiko)
+ 6.1.4 RC1 week after
+ Remotes
+ Android viewer
  + exception handling issue in libstdc++ ?
+ Online

* Documentation (Olivier)
+ New Help
+ No news
+ Andres K is up-loading new icons for new help.
+ Help contents
+ Typos and fixes (SophiaS, ohallot)
+ Guides
+ Reformulating workflow with NextCloud + LooL
+ Working and templates for Calc Guide
+ support for newcomers.

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
254(254) (topicUI) bugs open, 286(286) (needsUXEval)
+ Updates:
BZ changes   1 week1 month3 months   12 months  
 added  5(-9) 23(-5) 40(-7)  82(-14)
 commented 28(-63)   166(-35)   327(-41)   1424(-77)
   removed  0(-1)  0(-1)  0(-1)   5(-1) 
  resolved  4(0)  12(0)  27(0)  126(-2) 
+ top 10 contributors:
  Thomas Lendo made 132 changes in 1 month, and 336 changes in 1 year
  Tietze, Heiko made 70 changes in 1 month, and 485 changes in 1 year
  Zolnai, Tamás made 60 changes in 1 month, and 175 changes in 1 year
  Kainz, Andreas made 33 changes in 1 month, and 128 changes in 1 year
  Xisco Faulí made 20 changes in 1 month, and 275 changes in 1 year
  Foote, V Stuart made 16 changes in 1 month, and 202 changes in 1 year
  和尚蟹 made 15 changes in 1 month, and 15 changes in 1 year
  Muhammet Kara made 13 changes in 1 month, and 15 changes in 1 year
  Cor Nouws made 12 changes in 1 month, and 75 changes in 1 year
  kompilainenn made 11 changes in 1 month, and 48 changes in 1 year
   + New tickets with flag needsUXEval between Nov/01-08

 + Change name (description) of 4th argument to VLOOKUP and HLOOKUP to
   "Sorted range lookup"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121090
 ++ TRACK CHANGES: linked files changes are not shown in the master document
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121166
 + Western acronyms not correctly formatted in RTL context
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121182
   => WFM
 + Single page not centered when in multiple-page view
   + https://bugs.documentfoundation.org/show_bug.cgi?id=95076
 + In CALC, the Data autofilter GUI does not have consistent controls
   + https://bugs.documentfoundation.org/show_bug.cgi?id=76882
   => WFM
 + [Feature request] Search on Options
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121160
   => DUP
 ++ LO Impress: Option Double Underline is disabled
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121233
 + LO Calc -> Format -> Text -> there is no checkbox for option Double
   Underline
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121239
 + personas different header/fooder files for different LibO apps
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121174

   + Bring Notebookbar out of experimental state for 6.2 (Heiiko)
  + META ticket https://bugs.documentfoundation.org/show_bug.cgi?id=102062
(missing customizable, extensions cannot register icons, 
 chart and other sections missing, resize issues, a11y, macOS glitches)
  + Patch https://gerrit.libreoffice.org/#/c/62959/
  + Agreement from marketing & QA
  + hope to attract more development when it is non-experimental
  + would like to see it by default (Xisco)
  + when people report issues – if no-one fixes them then what ?
  + should ensure we have a means of improving it quickly.
  + don’t see ~any development here – just minor changes.
  + Jim is looking at the a11y issues (Heiko)
  => put this option on for 6.2 betas / Rcs for now & re-visit later

* Crash Testing (Caolan)
+ 7 (+2) import failure, 2(-2) export failures
+ found webdav problem and fixed it
+ ?? 8 (+0) coverity issues
+ ?? Google / ossfuzz:
+ 15 issue

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - desktop/qa desktop/source include/LibreOfficeKit

[Libreoffice Gerrit user]

 desktop/qa/data/signed.odt   |binary
 desktop/qa/desktop_lib/test_desktop_lib.cxx  |   52 +--
 desktop/source/lib/init.cxx  |8 +++-
 include/LibreOfficeKit/LibreOfficeKitEnums.h |5 ++
 4 files changed, 60 insertions(+), 5 deletions(-)

New commits:
commit 6c7e262fa9f11e160e5854231421710eec0ddee3
Author: Miklos Vajna 
AuthorDate: Thu Nov 8 16:12:23 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 16:12:23 2018 +0100

CppunitTest_desktop_lib: disable failing test

Until I find out why that happens.

Change-Id: Ie10e402d29280b1a770dbc86cfa794645851fb05

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 57c89e134a97..ce4e04a3805f 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2303,6 +2303,7 @@ void DesktopLOKTest::testGetSignatureState_NonSigned()
 
 void DesktopLOKTest::testInsertCertificate()
 {
+#if 0
 comphelper::LibreOfficeKit::setActive();
 
 // Load the document, save it into a temp file and load that file again
@@ -2370,6 +2371,7 @@ void DesktopLOKTest::testInsertCertificate()
 }
 
 comphelper::LibreOfficeKit::setActive(false);
+#endif
 }
 
 namespace {
commit 779e530db0e5d5f37ad037596defe044f6d0db25
Author: Tomaž Vajngerl 
AuthorDate: Tue Oct 30 00:20:42 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 16:10:55 2018 +0100

lok: send signature status on document load

Change-Id: If164d0edc9343b1db5ee96a2da46c9436ddbc73f
Reviewed-on: https://gerrit.libreoffice.org/62776
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 30bb64dc2deb53409c72bc8d4c083bbc3fd99a7d)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c471b89a4381..2db450c19acf 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1522,8 +1522,10 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 return nullptr;
 }
 
-return new LibLODocument_Impl(xComponent);
-
+LibLODocument_Impl* pDocument = new LibLODocument_Impl(xComponent);
+int nState = doc_getSignatureState(pDocument);
+pLib->mpCallback(LOK_CALLBACK_SIGNATURE_STATUS, 
OString::number(nState).getStr(), pLib->mpCallbackData);
+return pDocument;
 }
 catch (const uno::Exception& exception)
 {
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index f91b33886195..bf987a81c2c3 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -603,6 +603,11 @@ typedef enum
  * Eg. com.sun.star.presentation.PresentationDocument TextObject
  */
 LOK_CALLBACK_CONTEXT_CHANGED = 39,
+
+/**
+ * On-load notification of the document signature status.
+ */
+LOK_CALLBACK_SIGNATURE_STATUS = 40,
 }
 LibreOfficeKitCallbackType;
 
commit b97f3988183dab39b2b0231d9fd0e55d078ac0b5
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 24 11:29:32 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 16:10:53 2018 +0100

lok: trigger sign. verification in getSignatureState + update test

As the certificate chain can be added after the document was
opened, we need to trigger signature verification every time the
LOK API method getSignatureState is called.

In addition update the tests so that they check the status of a
document that's not signed, a document that was signed but the
certificate chain is not available so the verification fails and
later adding the certificate chain and the verification returns
an OK status.

Change-Id: I44578d0cece5bfc4a2e43fbbcd68b5ea1ccbc38b
Reviewed-on: https://gerrit.libreoffice.org/62276
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 28a698db6f604137443053144dde94c9e553c0ef)

diff --git a/desktop/qa/data/signed.odt b/desktop/qa/data/signed.odt
new file mode 100644
index ..49bd9dd240fe
Binary files /dev/null and b/desktop/qa/data/signed.odt differ
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 802e1b7d2a71..57c89e134a97 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -118,7 +118,8 @@ public:
 void testCommentsCallbacksWriter();
 void testRunMacro();
 void testExtractParameter();
-void testGetSignatureState();
+void testGetSignatureState_NonSigned();
+void testGetSignatureState_Signed();
 void testInsertCertificate();
 void testABI();
 
@@ -163,7 +164,8 @@ public:
 CPPUNIT_TEST(testCommentsCallbacksWriter);
 CPPUNIT_TEST(testRunMacro);
 CPPUNIT_TEST(testExtractParameter);
-CPPUNIT_TEST(testGetSignatureState);
+CPPUNIT_TEST

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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Frame.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 97cba40765d3178fecd463879304bac7da0efa59
Author: Aleksei Nikiforov 
AuthorDate: Wed Nov 7 15:07:12 2018 +0300
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 8 15:57:50 2018 +0100

tdf#120777 KDE5: Remove initial painting of widgets

Widget will be painted later, after correct widget size is set.

If window is not resizeable and painted before setting correct size,
it saves clipping size in function 
vcl::Window::ImplIntersectWindowClipRegion
and never updates it when window is resized to correct size.

This initial painting call causes painting issues in
"File" -> "Wizard" -> "Letter" dialog:
"Cancel" button is painted only partially, as well as line above that 
button.

Other unresizeable windows with width over 640 pixels or height over 480 
pixels
may be affected too.

Change-Id: Ieccb58368670ebbbe6d17826fafc717101309ac4
Reviewed-on: https://gerrit.libreoffice.org/63017
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 70c3de1abcc9..f6428af8b91c 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -187,7 +187,6 @@ void Qt5Frame::InitSvpSalGraphics(SvpSalGraphics* 
pSvpSalGraphics)
 m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(width, 
height));
 cairo_surface_set_user_data(m_pSurface.get(), 
SvpSalGraphics::getDamageKey(), &m_aDamageHandler,
 nullptr);
-TriggerPaintEvent();
 }
 
 SalGraphics* Qt5Frame::AcquireGraphics()
@@ -213,7 +212,6 @@ SalGraphics* Qt5Frame::AcquireGraphics()
 m_pQt5Graphics.reset(new Qt5Graphics(this));
 m_pQImage.reset(new QImage(m_pQWidget->size(), 
Qt5_DefaultFormat32));
 m_pQt5Graphics->ChangeQImage(m_pQImage.get());
-TriggerPaintEvent();
 }
 return m_pQt5Graphics.get();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Frame.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit bb9ddf256452a3fe5aec2f638335453063449f5f
Author: Aleksei Nikiforov 
AuthorDate: Fri Nov 2 18:12:25 2018 +0300
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 8 15:56:43 2018 +0100

tdf#120777 KDE5: Prohibit resizing windows unless they're marked resizeable

Change-Id: I412c3d263881d24dea1bb61520c2291d8f0b9b20
Reviewed-on: https://gerrit.libreoffice.org/63016
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index b5680b654771..70c3de1abcc9 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -400,10 +400,12 @@ void Qt5Frame::SetPosSize(long nX, long nY, long nWidth, 
long nHeight, sal_uInt1
 m_bDefaultSize = false;
 if (isChild(false) || !m_pQWidget->isMaximized())
 {
-if (m_pTopLevel)
-m_pTopLevel->resize(nWidth, nHeight);
+QWidget* const pWidget = (m_pTopLevel) ? m_pTopLevel : m_pQWidget;
+
+if (m_nStyle & SalFrameStyleFlags::SIZEABLE)
+pWidget->resize(nWidth, nHeight);
 else
-m_pQWidget->resize(nWidth, nHeight);
+pWidget->setFixedSize(nWidth, nHeight);
 }
 }
 else if (m_bDefaultSize)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/js loleaflet/po loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js  |4 ++--
 loleaflet/po/templates/loleaflet-ui.pot  |   10 +++---
 loleaflet/src/control/Control.Menubar.js |4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit ea9515ccf6d7a5a215566aa98531136aee33a404
Author: Andras Timar 
AuthorDate: Thu Nov 8 15:48:33 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 8 15:48:33 2018 +0100

loleaflet: rename menu/toolbar items for Insert Image

Change-Id: I8cd04da84ab63e67353291acc5f9c9782cd7ea9d

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 4391c8472..07b11d2e7 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -679,8 +679,8 @@ function createToolbar() {
{type: 'button',  id: 'insertgraphic',  img: 
'insertgraphic', hint: _UNO('.uno:InsertGraphic', '', true)},
{type: 'menu', id: 'menugraphic', img: 'insertgraphic', 
hint: _UNO('.uno:InsertGraphic', '', true), hidden: true,
items: [
-   {id: 'localgraphic', text: 
_UNO('.uno:InsertGraphic', '', true), icon: 'insertgraphic'},
-   {id: 'remotegraphic', text: _('Remote 
Image...'), icon: 'insertgraphic'}
+   {id: 'localgraphic', text: _('Insert 
Local Image'), icon: 'insertgraphic'},
+   {id: 'remotegraphic', text: 
_UNO('.uno:InsertGraphic', '', true), icon: 'insertgraphic'},
]},
{type: 'button',  id: 'specialcharacter', img: 
'specialcharacter', hint: _UNO('.uno:InsertSymbol', '', true), uno: 
'.uno:InsertSymbol'}
],
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 02a4aec1a..126ae27ec 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-06 22:00+0100\n"
+"POT-Creation-Date: 2018-11-08 15:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -306,8 +306,8 @@ msgstr ""
 msgid "Insert shapes"
 msgstr ""
 
-#: js/toolbar.js:683 src/control/Control.Menubar.js:69
-msgid "Remote Image..."
+#: js/toolbar.js:682
+msgid "Insert Local Image"
 msgstr ""
 
 #: js/toolbar.js:730 js/toolbar.js:1209
@@ -628,6 +628,10 @@ msgstr ""
 msgid "Repair"
 msgstr ""
 
+#: src/control/Control.Menubar.js:68
+msgid "Local Image..."
+msgstr ""
+
 #: src/control/Control.Menubar.js:84 src/control/Control.Menubar.js:86
 msgid "All"
 msgstr ""
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 740d91378..1ecf9f695 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -65,8 +65,8 @@ L.Control.Menubar = L.Control.extend({
]
},
{name: _UNO('.uno:InsertMenu', 'text'), type: 'menu', 
menu: [
-   {name: _UNO('.uno:InsertGraphic', 'text'), id: 
'insertgraphic', type: 'action'},
-   {name: _('Remote Image...'), id: 
'insertgraphicremote', type: 'action'},
+   {name: _('Local Image...'), id: 
'insertgraphic', type: 'action'},
+   {name: _UNO('.uno:InsertGraphic', 'text'), id: 
'insertgraphicremote', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 'text'), 
id: 'insertcomment', type: 'action'},
{uno: '.uno:InsertObjectChart'},
{type: 'separator'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 4 commits - desktop/qa desktop/source include/LibreOfficeKit include/sfx2 offapi/com sfx2/source xmlsecurity/source

[Libreoffice Gerrit user]

 desktop/qa/data/certificate.der   |binary
 desktop/qa/data/certificatePrivateKey.der |binary
 desktop/qa/data/intermediateRootCA.der|binary
 desktop/qa/data/rootCA.der|binary
 desktop/qa/desktop_lib/test_desktop_lib.cxx   |   68 +++---
 desktop/source/lib/init.cxx   |   52 +++
 include/LibreOfficeKit/LibreOfficeKit.h   |5 
 include/LibreOfficeKit/LibreOfficeKit.hxx |   15 +-
 include/sfx2/objsh.hxx|1 
 offapi/com/sun/star/xml/crypto/XCertificateCreator.idl|9 +
 sfx2/source/doc/objserv.cxx   |   23 +--
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   13 +
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |4 
 13 files changed, 157 insertions(+), 33 deletions(-)

New commits:
commit e9b8daaa8a454453c55ae518c746eafb63fb26d4
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 24 11:22:50 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 15:20:35 2018 +0100

sfx2: add RecheckSignature to run signature verification again

This was extracted from AfterSigning method and is needed when
we add the certificate chain to the database after the document
was loaded already.

Reviewed-on: https://gerrit.libreoffice.org/62275
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit fcdc8178ee2907da231baafc2e1d6cf8ce0bf00b)

Conflicts:
include/sfx2/objsh.hxx

Change-Id: I3087386d0131ce962eb3b588c409542617eb7bfe

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index af60902f8f5c..64edfd781af3 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -359,6 +359,7 @@ public:
 
 /** Returns to if preparing was succesful, else false. */
 bool PrepareForSigning();
+void RecheckSignature(bool bAlsoRecheckScriptingSignature);
 void AfterSigning(bool bSignSuccess, bool bSignScriptingContent);
 bool HasValidSignatures();
 SignatureState  GetDocumentSignatureState();
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 8ac26b0f5623..585ea48f6397 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1463,6 +1463,18 @@ bool SfxObjectShell::PrepareForSigning()
 return false;
 }
 
+void SfxObjectShell::RecheckSignature(bool bAlsoRecheckScriptingSignature)
+{
+if (bAlsoRecheckScriptingSignature)
+pImpl->nScriptingSignatureState = SignatureState::UNKNOWN; // Re-Check
+
+pImpl->nDocumentSignatureState = SignatureState::UNKNOWN; // Re-Check
+
+Invalidate(SID_SIGNATURE);
+Invalidate(SID_MACRO_SIGNATURE);
+Broadcast(SfxHint(SfxHintId::TitleChanged));
+}
+
 void SfxObjectShell::AfterSigning(bool bSignSuccess, bool 
bSignScriptingContent)
 {
 pImpl->m_bSavingForSigning = true;
@@ -1470,16 +1482,7 @@ void SfxObjectShell::AfterSigning(bool bSignSuccess, 
bool bSignScriptingContent)
 pImpl->m_bSavingForSigning = false;
 
 if ( bSignSuccess )
-{
-if ( bSignScriptingContent )
-pImpl->nScriptingSignatureState = SignatureState::UNKNOWN; // 
Re-Check
-
-pImpl->nDocumentSignatureState = SignatureState::UNKNOWN; // Re-Check
-
-Invalidate( SID_SIGNATURE );
-Invalidate( SID_MACRO_SIGNATURE );
-Broadcast( SfxHint(SfxHintId::TitleChanged) );
-}
+RecheckSignature(bSignScriptingContent);
 
 if ( pImpl->m_bAllowModifiedBackAfterSigning )
 EnableSetModified();
commit ba4962fd9c7d6196350ab8b0cbbf560386004856
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 24 11:19:32 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 15:19:35 2018 +0100

lok: update the test for singing the document from LOK

Change-Id: Ie34d8c26bfbf4192cd2067c8315030903edb3fb3
Reviewed-on: https://gerrit.libreoffice.org/62274
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit ab7fabd8b116d16def53772720f19fad4dbd6366)

diff --git a/desktop/qa/data/certificate.der b/desktop/qa/data/certificate.der
index 2a750ab281af..10e3ade13e3e 100644
Binary files a/desktop/qa/data/certificate.der and 
b/desktop/qa/data/certificate.der differ
diff --git a/desktop/qa/data/certificatePrivateKey.der 
b/desktop/qa/data/certificatePrivateKey.der
new file mode 100644
index ..7a5599c82521
Binary files /dev/null and b/desktop/qa/data/certificatePrivateKey.der differ
diff --git a/desktop/qa/data/intermediateRootCA.der 
b/desktop/qa/data/intermediateRootCA.der
new file mode 100644
index ..9adf7f82e5f6
Binary files /dev/null and b/desktop/qa/data/intermediateRootCA.der differ
diff --git a/desktop/qa/data/rootCA.der b/desktop/qa/data/rootCA.der
new file mode 100644
index ..30fc66e26f79
B

[Libreoffice-commits] core.git: cui/source cui/uiconfig solenv/sanitizers

[Libreoffice Gerrit user]

 cui/source/dialogs/about.cxx   |   23 ++-
 cui/source/inc/about.hxx   |1 +
 cui/uiconfig/ui/aboutdialog.ui |   15 ++-
 solenv/sanitizers/ui/cui.suppr |1 +
 4 files changed, 30 insertions(+), 10 deletions(-)

New commits:
commit 396d29d9deccef6fa4ecf9ea8aa6a5d6f6065c53
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 11:24:15 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 15:40:59 2018 +0100

Related: tdf#121238 show ui language as well as locale

Change-Id: I350c71f50fdb8f0602badd7a7ad13b3a7c2c85e0
Reviewed-on: https://gerrit.libreoffice.org/63083
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 5a564389f590..648073c75f4c 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -81,6 +81,7 @@ AboutDialog::AboutDialog(vcl::Window* pParent)
 m_aBasedTextStr = get("libreoffice")->GetText();
 m_aBasedDerivedTextStr = get("derived")->GetText();
 m_aLocaleStr = get("locale")->GetText();
+m_aUILocaleStr = get("uilocale")->GetText();
 m_buildIdLinkString = m_pBuildIdLink->GetText();
 
 m_pVersion->SetText(GetVersionString());
@@ -307,6 +308,7 @@ OUString AboutDialog::GetVersionString()
 OUString sBuildId = GetBuildId();
 
 OUString aLocaleStr = 
Application::GetSettings().GetLanguageTag().getBcp47() + " (" + 
GetLocaleString() + ")";
+OUString aUILocaleStr = 
Application::GetSettings().GetUILanguageTag().getBcp47();
 
 if (!sBuildId.trim().isEmpty())
 {
@@ -328,16 +330,19 @@ OUString AboutDialog::GetVersionString()
 sVersion += "\n" EXTRA_BUILDID;
 }
 
-if (!aLocaleStr.trim().isEmpty())
+if (m_aLocaleStr.indexOf("$LOCALE") == -1)
 {
-sVersion += "\n";
-if (m_aLocaleStr.indexOf("$LOCALE") == -1)
-{
-SAL_WARN( "cui.dialogs", "translated locale string in translations 
doesn't contain $LOCALE placeholder" );
-m_aLocaleStr += " $LOCALE";
-}
-sVersion += m_aLocaleStr.replaceAll("$LOCALE", aLocaleStr);
+SAL_WARN( "cui.dialogs", "translated locale string in translations 
doesn't contain $LOCALE placeholder" );
+m_aLocaleStr += " $LOCALE";
+}
+sVersion += "\n" + m_aLocaleStr.replaceAll("$LOCALE", aLocaleStr);
+
+if (m_aUILocaleStr.indexOf("$LOCALE") == -1)
+{
+SAL_WARN( "cui.dialogs", "translated uilocale string in translations 
doesn't contain $LOCALE placeholder" );
+m_aUILocaleStr += " $LOCALE";
 }
+sVersion += "; " + m_aUILocaleStr.replaceAll("$LOCALE", aUILocaleStr);
 
 OUString aCalcMode = "Calc: "; // Calc calculation mode
 
@@ -359,7 +364,7 @@ OUString AboutDialog::GetVersionString()
 aCalcMode += "threaded";
 }
 
-sVersion += "; " + aCalcMode;
+sVersion += "\n" + aCalcMode;
 
 return sVersion;
 }
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 9ea511c4488b..9885cdec7d47 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -52,6 +52,7 @@ private:
 OUString m_aCreditsLinkStr;
 OUString m_sBuildStr;
 OUString m_aLocaleStr;
+OUString m_aUILocaleStr;
 OUString m_buildIdLinkString;
 
 void SetBuildIdLink();
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 2d279b14379b..ac2746111731 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -162,6 +162,19 @@
 0
   
 
+
+  
+False
+True
+True
+UI-Language: $LOCALE
+center
+  
+  
+0
+3
+  
+
   
   
 False
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index 827ff319ed1e..46597941bb8d 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -2,6 +2,7 @@ cui/uiconfig/ui/aboutdialog.ui://GtkImage[@id='logo'] 
no-labelled-by
 cui/uiconfig/ui/aboutdialog.ui://GtkLabel[@id='logoreplacement'] orphan-label
 cui/uiconfig/ui/aboutdialog.ui://GtkLabel[@id='buildid'] orphan-label
 cui/uiconfig/ui/aboutdialog.ui://GtkLabel[@id='locale'] orphan-label
+cui/uiconfig/ui/aboutdialog.ui://GtkLabel[@id='uilocale'] orphan-label
 cui/uiconfig/ui/aboutdialog.ui://GtkTextView[@id='version'] no-labelled-by
 cui/uiconfig/ui/aboutdialog.ui://GtkLabel[@id='description'] orphan-label
 cui/uiconfig/ui/aboutdialog.ui://GtkLabel[@id='copyright'] orphan-label
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.free

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

[Libreoffice Gerrit user]

 sfx2/source/view/viewfrm.cxx |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 9fb7c77e5cfc5add880aee18e36a851b8929137a
Author: heiko tietze 
AuthorDate: Tue Nov 6 11:34:10 2018 +0100
Commit: Heiko Tietze 
CommitDate: Thu Nov 8 15:35:00 2018 +0100

tdf#120642 - GetInvoled update

UNO command is used now and period set to 180 days

Change-Id: Ib9950e75a5288e242c5a9a5c5a6a0c1dbb277e2b
Reviewed-on: https://gerrit.libreoffice.org/62949
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index a5e2cb63a457..8463b2366fbb 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1219,7 +1219,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 // inform about the community involvement
 const sal_Int64 nLastShown = 
officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
 const sal_Int64 nNow = 
std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count();
-const sal_Int64 nPeriodSec(60 * 60 * 24 * 30); // 30 days in 
seconds
+const sal_Int64 nPeriodSec(60 * 60 * 24 * 180); // 180 days in 
seconds
 bool bUpdateLastTimeGetInvolvedShown = false;
 
 if (nLastShown == 0)
@@ -1370,14 +1370,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, 
const SfxHint& rHint )
 
 IMPL_LINK_NOARG(SfxViewFrame, GetInvolvedHandler, Button*, void)
 {
-try
-{
-OUString sURL("https://hub.libreoffice.org/joinus/?LOlocale="; + 
utl::ConfigManager::getUILocale());
-sfx2::openUriExternally(sURL, false);
-}
-catch (const Exception&)
-{
-}
+GetDispatcher()->Execute(SID_GETINVOLVED);
 }
 
 IMPL_LINK(SfxViewFrame, SwitchReadOnlyHandler, Button*, pButton, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/gdi/pdfwriter_impl.cxx |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 1fcc999a0cf530161de811fcb11177c61f59f44a
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 10:27:50 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 15:29:09 2018 +0100

crash on export to pdf with password set

mostly since...

commit 47a173edb603538521a035157efb6ef684238087
Date:   Sat Sep 15 18:36:08 2018 +0200

use std::vector in PDFWriterImpl for encryption buffer

instead of manual allocation and size field

though that nLen*2 cound was already wrong as it is actually nChars, which 
is (nLen*2)+2,
its just that the initial 0x4000 size was bigger than that so we got away 
with it

Change-Id: I445bef87b6ba45b2034a82fe457e4540258b92d5
Reviewed-on: https://gerrit.libreoffice.org/63078
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index a3b9db4908d0..e23bfdfb0ef9 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1750,10 +1750,6 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 
nWidth, sal_Int32 nY, sal
 /* prepare the cypher engine, can be done in CTOR, free in DTOR */
 m_aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
 
-/* the size of the Codec default maximum */
-/* is this 0x4000 required to be the same as MAX_SIGNATURE_CONTENT_LENGTH 
or just coincidentally the same at the moment? */
-m_vEncryptionBuffer.reserve(0x4000);
-
 if( xEnc.is() )
 prepareEncryption( xEnc );
 
@@ -1992,7 +1988,6 @@ inline void 
PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt
 const sal_Unicode* pStr = rInString.getStr();
 sal_Int32 nLen = rInString.getLength();
 //prepare a unicode string, encrypt it
-m_vEncryptionBuffer.reserve(nLen*2);
 enableStringEncryption( nInObjectNumber );
 sal_uInt8 *pCopy = m_vEncryptionBuffer.data();
 sal_Int32 nChars = 2;
@@ -2007,6 +2002,7 @@ inline void 
PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt
 nChars += 2;
 }
 //encrypt in place
+m_vEncryptionBuffer.resize(nChars);
 rtl_cipher_encodeARCFOUR( m_aCipher, m_vEncryptionBuffer.data(), 
nChars, m_vEncryptionBuffer.data(), nChars );
 //now append, hexadecimal (appendHex), the encrypted result
 for(int i = 0; i < nChars; i++)
@@ -2024,7 +2020,7 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( 
OStringBuffer const & rIn
 //check for encryption, if ok, encrypt the string, then convert with 
appndLiteralString
 if( m_aContext.Encryption.Encrypt() )
 {
-m_vEncryptionBuffer.reserve( nChars );
+m_vEncryptionBuffer.resize(nChars);
 //encrypt the string in a buffer, then append it
 enableStringEncryption( nInObjectNumber );
 rtl_cipher_encodeARCFOUR( m_aCipher, rInString.getStr(), nChars, 
m_vEncryptionBuffer.data(), nChars );
@@ -2147,7 +2143,7 @@ bool PDFWriterImpl::writeBuffer( const void* pBuffer, 
sal_uInt64 nBytes )
 if( m_bEncryptThisStream )
 {
 /* implement the encryption part of the PDF spec encryption 
algorithm 3.1 */
-m_vEncryptionBuffer.reserve( nBytes );
+m_vEncryptionBuffer.resize(nBytes);
 if( buffOK )
 rtl_cipher_encodeARCFOUR( m_aCipher,
   pBuffer, 
static_cast(nBytes),
@@ -9518,7 +9514,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& 
rObject, bool bMask )
 {
 enableStringEncryption( rObject.m_nObject );
 //check encryption buffer size
-m_vEncryptionBuffer.reserve( pAccess->GetPaletteEntryCount()*3 
);
+m_vEncryptionBuffer.resize(pAccess->GetPaletteEntryCount()*3);
 int nChar = 0;
 //fill the encryption buffer
 for( sal_uInt16 i = 0; i < pAccess->GetPaletteEntryCount(); 
i++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 4 commits - desktop/qa desktop/source include/LibreOfficeKit xmlsecurity/source

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx   |   35 ++
 desktop/source/lib/init.cxx   |   44 ++-
 include/LibreOfficeKit/LibreOfficeKit.h   |4 
 include/LibreOfficeKit/LibreOfficeKit.hxx |8 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |  120 +++---
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |   18 +
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |   26 ++
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx |6 
 8 files changed, 206 insertions(+), 55 deletions(-)

New commits:
commit 81400dcc0a062227021485dd994561dcfb454f9b
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 24 10:52:09 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 15:08:31 2018 +0100

lok: Get the object shell from the document

Change-Id: Id62c0db3c9f404aaab70de0a73a20b2bb57b0393
Reviewed-on: https://gerrit.libreoffice.org/62272
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 15018316bca863c9d7329572af906850d47e0c63)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 79ca5055db1f..56e2bcfec907 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3687,13 +3687,27 @@ static void doc_postWindow(LibreOfficeKitDocument* 
/*pThis*/, unsigned nLOKWindo
 }
 
 // CERTIFICATE AND DOCUMENT SIGNING
-static bool doc_insertCertificate(LibreOfficeKitDocument* /*pThis*/,
+static bool doc_insertCertificate(LibreOfficeKitDocument* pThis,
   const unsigned char* pCertificateBinary, 
const int nCertificateBinarySize,
   const unsigned char* pPrivateKeyBinary, 
const int nPrivateKeySize)
 {
 if (!xContext.is())
 return false;
 
+LibLODocument_Impl* pDocument = static_cast(pThis);
+
+if (!pDocument->mxComponent.is())
+return false;
+
+SfxBaseModel* pBaseModel = 
dynamic_cast(pDocument->mxComponent.get());
+if (!pBaseModel)
+return false;
+
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+
+if (!pObjectShell)
+return false;
+
 uno::Reference xSEInitializer = 
xml::crypto::SEInitializer::create(xContext);
 uno::Reference xSecurityContext;
 xSecurityContext = xSEInitializer->createSecurityContext(OUString());
@@ -3719,16 +3733,7 @@ static bool 
doc_insertCertificate(LibreOfficeKitDocument* /*pThis*/,
 if (!xCertificate.is())
 return false;
 
-printf("CERTIFICATE\n\tIssuerName: %s \n\tSubjectName: %s\n\tPK %s\n\n",
-xCertificate->getIssuerName().toUtf8().getStr(),
-xCertificate->getSubjectName().toUtf8().getStr(),
-xCertificate->getSubjectPublicKeyAlgorithm().toUtf8().getStr());
-
-SfxObjectShell* pDoc = SfxObjectShell::Current();
-if (!pDoc)
-return false;
-
-return pDoc->SignDocumentContentUsingCertificate(xCertificate);
+return pObjectShell->SignDocumentContentUsingCertificate(xCertificate);
 }
 
 static int doc_getSignatureState(LibreOfficeKitDocument* pThis)
commit 025d881e56cdd2bf085a4df8f9f0183817df768f
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 24 10:27:26 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 15:08:10 2018 +0100

fix importing the certificate and private key

If importing the certificate and private key is done separately,
they don't associate with each other, so with this you can add
the private key to the certificate that it belongs to. If the
private key is set in this way, then getPrivateKey() call doesn't
look into the database but just returns the private key stored
in the member variable.

Additionally use CERT_DecodeCertFromPackage to import the DER
certificate from the imput as CERT_DecodeDERCertificate doesn't
import a complete certificate and doesn't add it into the
certificate database.

Change-Id: I29876030f167cc5fa6b887f9bfeb0b84622c751e
Reviewed-on: https://gerrit.libreoffice.org/62271
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 2286137c40a2abb26d36beb906962baffd779312)

diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 035896932ed3..a6905b96079f 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -527,6 +527,30 @@ Sequence< Reference < XCertificate > > 
SecurityEnvironment_NssImpl::buildCertifi
 return Sequence< Reference < XCertificate > >();
 }
 
+X509Certificate_NssImpl* 
SecurityEnvironment_NssImpl::createAndAddCertificateFromPackage(
+const 
css::uno::Sequence& raDERCertificate,
+OUString const & 
r

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

[Libreoffice Gerrit user]

 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e3ca8385fed93e61efb8200149e06b822a84a47e
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 10:58:00 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 15:09:59 2018 +0100

Resolves: rhbz#1647507 try inputted password as both user and owner password

Change-Id: Ibe1fae39d3153238e85400c9645766c260c9290d
Reviewed-on: https://gerrit.libreoffice.org/63080
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index 28334dac56d8..0f4a35b77ac5 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -101,9 +101,11 @@ int main(int argc, char **argv)
  : (ownerPassword[0] != '\001'
 ? new GooString(ownerPassword)
 : nullptr ) );
-GooString* pUserPasswordStr(  userPassword[0] != '\001'
+GooString* pUserPasswordStr( aPwBuf[0] != 0
+? new GooString( aPwBuf )
+: (userPassword[0] != '\001'
   ? new GooString(userPassword)
-  : nullptr );
+  : nullptr ) );
 if( outputFile[0] != '\001' )
 g_binary_out = fopen(outputFile,"wb");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 4 commits - desktop/CppunitTest_desktop_lib.mk desktop/qa offapi/com offapi/UnoApi_offapi.mk xmlsecurity/source

[Libreoffice Gerrit user]

 desktop/CppunitTest_desktop_lib.mk|   32 --
 desktop/qa/data/certificate.der   |binary
 desktop/qa/desktop_lib/test_desktop_lib.cxx   |   43 
 offapi/UnoApi_offapi.mk   |1 
 offapi/com/sun/star/xml/crypto/XCertificateCreator.idl|   48 ++
 xmlsecurity/source/helper/xmlsignaturehelper.cxx  |   26 +
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   17 ++-
 7 files changed, 113 insertions(+), 54 deletions(-)

New commits:
commit 728718b0fe7c5697bd7e96b008f6d911d31c7279
Author: Tomaž Vajngerl 
AuthorDate: Thu Oct 18 10:29:45 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 14:56:49 2018 +0100

xmlsignaturehelper: fix comments, no change

Change-Id: Ibfdf92712264ad37aafed53db0fe8e8c4fea4699
Reviewed-on: https://gerrit.libreoffice.org/61913
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit a113aff7add62da5f2f8ffe0be453af4b1b79866)

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx 
b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 33406fe2a829..de2812a6fa21 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -244,32 +244,22 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const 
css::uno::Reference< css:
 
 SAL_WARN_IF(!xInputStream.is(), "xmlsecurity.helper", "input stream 
missing");
 
-/*
- * prepare ParserInputSrouce
- */
+// prepare ParserInputSrouce
 xml::sax::InputSource aParserInput;
 aParserInput.aInputStream = xInputStream;
 
-/*
- * get SAX parser component
- */
+// get SAX parser component
 uno::Reference< xml::sax::XParser > xParser = 
xml::sax::Parser::create(mxCtx);
 
-/*
- * create a signature reader
- */
+// create a signature reader
 uno::Reference< xml::sax::XDocumentHandler > xHandler
 = mpXSecController->createSignatureReader(*this);
 
-/*
- * setup the connection:
- * Parser -> SignatureReader
- */
+// setup the connection:
+// Parser -> SignatureReader
 xParser->setDocumentHandler( xHandler );
 
-/*
- * parser the stream
- */
+// parser the stream
 try
 {
 xParser->parseStream( aParserInput );
@@ -279,9 +269,7 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const 
css::uno::Reference< css:
 mbError = true;
 }
 
-/*
- * release the signature reader
- */
+// release the signature reader
 mpXSecController->releaseSignatureReader( );
 
 return !mbError;
commit db4b4bdfc9b5dd7c4110668897a5eeb1910fc31a
Author: Tomaž Vajngerl 
AuthorDate: Thu Oct 18 10:27:16 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 14:56:33 2018 +0100

xmlsecurity: UNO interface to create cert. and private key

new XCertificateCreator interface which can be used to create a
certificate and a associated private key, both in DER format

Change-Id: I24caf053f1f2b7357a836047b88b4ce418470eac
Reviewed-on: https://gerrit.libreoffice.org/61912
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit bdde44d5525caf2240a6ea900336ac973121f145)

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 135c8c7be120..d0d00b2204ea 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4226,6 +4226,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/crypto,\
CipherID \
DigestID \
SecurityOperationStatus \
+   XCertificateCreator \
XCipherContext \
XCipherContextSupplier \
XDigestContext \
diff --git a/offapi/com/sun/star/xml/crypto/XCertificateCreator.idl 
b/offapi/com/sun/star/xml/crypto/XCertificateCreator.idl
new file mode 100644
index ..6d920b37715c
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XCertificateCreator.idl
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __com_sun_star

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - wsd/ClientSession.cpp

[Libreoffice Gerrit user]

 wsd/ClientSession.cpp |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 9655ed9274c536defb185ff475233ef73de94fe8
Author: Michael Meeks 
AuthorDate: Thu Nov 8 02:35:44 2018 +
Commit: Tor Lillqvist 
CommitDate: Thu Nov 8 15:05:34 2018 +0100

Convert-to - cleanup after ourselves.

Change-Id: I85de9721ac1b33d053b59fc36fc7c307206a0888
Reviewed-on: https://gerrit.libreoffice.org/63056
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 4753db07c..864863288 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -846,6 +846,11 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 
 // Now terminate.
 docBroker->stop("Finished saveas handler.");
+
+// Remove file and directory
+Poco::Path path = docBroker->getDocKey();
+Poco::File(path).remove();
+Poco::File(path.makeParent()).remove();
 }
 
 return true;
___
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-3' - common/Unit.hpp kit/Kit.cpp loolwsd.xml.in test/Makefile.am test/UnitConvert.cpp test/UnitFuzz.cpp wsd/DocumentBroker.c

[Libreoffice Gerrit user]

 common/Unit.hpp|3 -
 kit/Kit.cpp|7 --
 loolwsd.xml.in |1 
 test/Makefile.am   |4 +
 test/UnitConvert.cpp   |  123 +
 test/UnitFuzz.cpp  |3 -
 wsd/DocumentBroker.cpp |   18 ++-
 wsd/DocumentBroker.hpp |3 -
 wsd/LOOLWSD.cpp|5 +
 9 files changed, 154 insertions(+), 13 deletions(-)

New commits:
commit de9a768416d9fa41d8a5b00939cf342ab718658b
Author: Michael Meeks 
AuthorDate: Wed Nov 7 23:00:32 2018 +
Commit: Tor Lillqvist 
CommitDate: Thu Nov 8 15:04:37 2018 +0100

Add a time limit for badly behaved / huge document load / conversions.

Also improve debug printing of load times in dumpstate.

Change-Id: Ib3fd70dffb57588cd90bd928c4be9890cee8bc65
Reviewed-on: https://gerrit.libreoffice.org/63054
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/common/Unit.hpp b/common/Unit.hpp
index 5844cc3bd..4d018b80b 100644
--- a/common/Unit.hpp
+++ b/common/Unit.hpp
@@ -275,8 +275,7 @@ public:
 virtual void postFork() {}
 
 /// Kit got a message
-virtual bool filterKitMessage(const std::shared_ptr& /* ws 
*/,
-  std::string& /* message */)
+virtual bool filterKitMessage(WebSocketHandler *, std::string &/* message 
*/ )
 {
 return false;
 }
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 50ed15435..ce1632318 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1989,12 +1989,8 @@ protected:
 {
 std::string message(data.data(), data.size());
 
-#if 0 // FIXME might be needed for unit tests #ifndef KIT_IN_PROCESS
-if (UnitKit::get().filterKitMessage(ws, message))
-{
+if (UnitKit::get().filterKitMessage(this, message))
 return;
-}
-#endif
 
 LOG_TRC(_socketName << ": recv [" << 
LOOLProtocol::getAbbreviatedMessage(message) << "].");
 std::vector tokens = LOOLProtocol::tokenize(message);
@@ -2135,6 +2131,7 @@ void lokit_main(const std::string& childRoot,
 jailPath = Path::forDirectory(childRoot + "/" + jailId);
 LOG_INF("Jail path: " << jailPath.toString());
 File(jailPath).createDirectories();
+chmod(jailPath.toString().c_str(), S_IXUSR | S_IWUSR | S_IRUSR);
 
 if (bRunInsideJail)
 {
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 26e5db7a8..b951846e4 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -26,6 +26,7 @@
 8000
 0
 0
+   100
 
 
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 575a78ca5..227ec56d8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -13,6 +13,7 @@ AM_CXXFLAGS = $(CPPUNIT_CFLAGS) 
-DTDOC=\"$(top_srcdir)/test/data\" \
-I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd 
-I${top_srcdir}/kit
 
 noinst_LTLIBRARIES = \
+   unit-convert.la \
unit-timeout.la unit-prefork.la \
unit-storage.la unit-client.la \
unit-admin.la unit-tilecache.la \
@@ -83,6 +84,7 @@ unit_admin_la_SOURCES = UnitAdmin.cpp
 unit_admin_la_LIBADD = $(CPPUNIT_LIBS)
 unit_client_la_SOURCES = UnitClient.cpp ${test_all_source}
 unit_client_la_LIBADD = $(CPPUNIT_LIBS)
+unit_convert_la_SOURCES = UnitConvert.cpp
 unit_timeout_la_SOURCES = UnitTimeout.cpp
 unit_prefork_la_SOURCES = UnitPrefork.cpp
 unit_storage_la_SOURCES = UnitStorage.cpp
@@ -112,7 +114,7 @@ check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME 2: unit-oob.la fails with symbol undefined:
 # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, 
UnitHTTPServerResponse&) ,
-TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la \
+TESTS = unit-convert.la unit-prefork.la unit-tilecache.la unit-timeout.la \
 unit-oauth.la unit-wopi.la unit-wopi-saveas.la \
 unit-wopi-ownertermination.la unit-wopi-versionrestore.la \
 unit-wopi-documentconflict.la
diff --git a/test/UnitConvert.cpp b/test/UnitConvert.cpp
new file mode 100644
index 0..2b30b00a8
--- /dev/null
+++ b/test/UnitConvert.cpp
@@ -0,0 +1,123 @@
+/* -*- 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/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+// Inside the WSD process
+class UnitConvert : public UnitWSD
+{
+bool _workerStarted;
+std::thread _worker;
+
+public:
+UnitConvert() :
+_workerStarted(false)
+{
+setHasKitHooks();
+setTimeout(3600 * 1000); /* one hour */
+}
+~UnitConvert

[Libreoffice-commits] core.git: dictionaries

[Libreoffice Gerrit user]

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

New commits:
commit c3aef7a8e389942183e90683923717724bf65f42
Author: Miklos Vajna 
AuthorDate: Thu Nov 8 14:44:22 2018 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 14:45:19 2018 +0100

Revert "lok: calc: fix needed when position caching is disabled"

This reverts commit 4cee8ccc2caff17b5cbecc5ae895dcc9fd974c2e partially,
which set the dictionaries submodule by accident.

Change-Id: I798daaf5bf7a494880a2cd07820bccc4e23117e5

diff --git a/dictionaries b/dictionaries
index 6c85a19c887b..86921a78c42f 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 6c85a19c887b6147ec7d3a600b51cb2a44284fa2
+Subproject commit 86921a78c42f4fd499d86a226e34ab97e8b85ed5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 5 commits - comphelper/source desktop/qa desktop/source include/comphelper include/LibreOfficeKit include/sfx2 offapi/com sfx2/source

[Libreoffice Gerrit user]

 comphelper/source/misc/storagehelper.cxx  |   13 
 desktop/qa/desktop_lib/test_desktop_lib.cxx   |4 
 desktop/source/lib/init.cxx   |   69 +++
 include/LibreOfficeKit/LibreOfficeKit.h   |   10 
 include/LibreOfficeKit/LibreOfficeKit.hxx |   19 
 include/comphelper/storagehelper.hxx  |3 
 include/sfx2/docfile.hxx  |   11 
 include/sfx2/objsh.hxx|   12 
 offapi/com/sun/star/security/XDocumentDigitalSignatures.idl   |   12 
 sfx2/source/doc/docfile.cxx   |  150 
+++
 sfx2/source/doc/objserv.cxx   |  201 
+++---
 sfx2/source/doc/objxtor.cxx   |1 
 sfx2/source/inc/objshimp.hxx  |1 
 xmlsecurity/inc/documentsignaturemanager.hxx  |3 
 xmlsecurity/inc/xmlsignaturehelper.hxx|1 
 xmlsecurity/inc/xsecctl.hxx   |1 
 xmlsecurity/source/component/documentdigitalsignatures.cxx|   47 ++
 xmlsecurity/source/component/documentdigitalsignatures.hxx|5 
 xmlsecurity/source/gpg/CertificateImpl.cxx|   16 
 xmlsecurity/source/gpg/CertificateImpl.hxx|9 
 xmlsecurity/source/helper/documentsignaturemanager.cxx|6 
 xmlsecurity/source/helper/ooxmlsecexporter.cxx|1 
 xmlsecurity/source/helper/xmlsignaturehelper.cxx  |5 
 xmlsecurity/source/helper/xsecctl.cxx |   22 +
 xmlsecurity/source/helper/xsecparser.cxx  |   15 
 xmlsecurity/source/helper/xsecparser.hxx  |2 
 xmlsecurity/source/helper/xsecsign.cxx|   17 
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |   19 
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |9 
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |   16 
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx |9 
 31 files changed, 642 insertions(+), 67 deletions(-)

New commits:
commit 11394fd76d4c5253afcb8e26ebd2de327111234d
Author: Tomaž Vajngerl 
AuthorDate: Mon Oct 15 10:09:15 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 14:10:00 2018 +0100

lokit: add funct. to insert, sign and verify signature

A lot of signing code paths trigger a GUI dialog (to select the
certificate for example) which aren't acceptable when triggering
through the LOKit. This code paths needed to be duplicated and
reworked to not trigger any GUI action.

Reviewed-on: https://gerrit.libreoffice.org/61780
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 23a2312344ac961ead9ee14140c0b3e879bb7a41)

Conflicts:
desktop/qa/desktop_lib/test_desktop_lib.cxx
include/LibreOfficeKit/LibreOfficeKit.hxx
include/sfx2/objsh.hxx
sfx2/source/doc/docfile.cxx
sfx2/source/doc/objserv.cxx

Change-Id: I2f0d6038fb1bcd00adcdf86e432f9df8858cc21c

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index b68073fd9a75..aea7dea4988f 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2300,10 +2300,12 @@ void DesktopLOKTest::testABI()
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(40), offsetof(struct 
_LibreOfficeKitDocumentClass, postWindowExtTextInputEvent));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(41), offsetof(struct 
_LibreOfficeKitDocumentClass, getPartInfo));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(42), offsetof(struct 
_LibreOfficeKitDocumentClass, paintWindowDPI));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(43), offsetof(struct 
_LibreOfficeKitDocumentClass, insertCertificate));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(44), offsetof(struct 
_LibreOfficeKitDocumentClass, getSignatureState));
 
 // Extending is fine, update this, and add new assert for the offsetof the
 // new method
-CPPUNIT_ASSERT_EQUAL(documentClassOffset(43), sizeof(struct 
_LibreOfficeKitDocumentClass));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(45), sizeof(struct 
_LibreOfficeKitDocumentClass));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a8d5e87eed08..cb248891e498 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -72,6 +72,13 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -687,6 +694,

[Libreoffice-commits] core.git: 3 commits - comphelper/source desktop/qa desktop/source dictionaries include/comphelper include/LibreOfficeKit sc/source vcl/headless

[Libreoffice Gerrit user]

 comphelper/source/misc/lok.cxx  |   13 +
 desktop/qa/desktop_lib/test_desktop_lib.cxx |9 +++---
 desktop/source/lib/init.cxx |   39 +---
 dictionaries|2 -
 include/LibreOfficeKit/LibreOfficeKit.h |9 ++
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   13 +++--
 include/comphelper/lok.hxx  |4 ++
 sc/source/ui/unoobj/docuno.cxx  |   10 +++
 sc/source/ui/view/gridwin4.cxx  |   32 --
 sc/source/ui/view/tabview.cxx   |8 ++---
 vcl/headless/svpvd.cxx  |   15 --
 11 files changed, 122 insertions(+), 32 deletions(-)

New commits:
commit 4cee8ccc2caff17b5cbecc5ae895dcc9fd974c2e
Author: Marco Cecchetti 
AuthorDate: Sat Oct 27 17:15:35 2018 +
Commit: Jan Holesovsky 
CommitDate: Thu Nov 8 14:39:14 2018 +0100

lok: calc: fix needed when position caching is disabled

In case it would be needed to disable position caching we can't
retrieve the nTotalPixels value from the LOKHeight/WidthHelper.

The new code works in both cases.

Change-Id: I65562dd4458eee40c5db958067fc91af6b3eb79e
Reviewed-on: https://gerrit.libreoffice.org/63039
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/dictionaries b/dictionaries
index 86921a78c42f..6c85a19c887b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 86921a78c42f4fd499d86a226e34ab97e8b85ed5
+Subproject commit 6c85a19c887b6147ec7d3a600b51cb2a44284fa2
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 8f7f7e37c836..3444a7e36fdc 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2479,8 +2479,10 @@ OUString ScTabView::getRowColumnHeaders(const 
tools::Rectangle& rRectangle)
 SCTAB nTab = aViewData.GetTabNo();
 SCROW nStartRow = -1;
 SCROW nEndRow = -1;
+long nStartHeightPx = 0;
 SCCOL nStartCol = -1;
 SCCOL nEndCol = -1;
+long nStartWidthPx = 0;
 
 tools::Rectangle aOldVisArea(
 mnLOKStartHeaderCol + 1, mnLOKStartHeaderRow + 1,
@@ -2493,7 +2495,6 @@ OUString ScTabView::getRowColumnHeaders(const 
tools::Rectangle& rRectangle)
 if (rRectangle.Top() < rRectangle.Bottom())
 {
 SAL_INFO("sc.lok.header", "Row Header: compute start/end rows.");
-long nStartHeightPx = 0;
 long nEndHeightPx = 0;
 long nRectTopPx = rRectangle.Top() / TWIPS_PER_PIXEL;
 long nRectBottomPx = rRectangle.Bottom() / TWIPS_PER_PIXEL;
@@ -2582,7 +2583,7 @@ OUString ScTabView::getRowColumnHeaders(const 
tools::Rectangle& rRectangle)
 
 aBuffer.append("\"rows\": [\n");
 
-long nTotalPixels = aViewData.GetLOKHeightHelper().getPosition(nStartRow);
+long nTotalPixels = nStartHeightPx;
 SAL_INFO("sc.lok.header", "Row Header: [create string data for rows]: 
start row: "
 << nStartRow << " start height: " << nTotalPixels);
 
@@ -2637,7 +2638,6 @@ OUString ScTabView::getRowColumnHeaders(const 
tools::Rectangle& rRectangle)
 if (rRectangle.Left() < rRectangle.Right())
 {
 SAL_INFO("sc.lok.header", "Column Header: compute start/end columns.");
-long nStartWidthPx = 0;
 long nEndWidthPx = 0;
 long nRectLeftPx = rRectangle.Left() / TWIPS_PER_PIXEL;
 long nRectRightPx = rRectangle.Right() / TWIPS_PER_PIXEL;
@@ -2723,7 +2723,7 @@ OUString ScTabView::getRowColumnHeaders(const 
tools::Rectangle& rRectangle)
 
 aBuffer.append("\"columns\": [\n");
 
-nTotalPixels = aViewData.GetLOKWidthHelper().getPosition(nStartCol);
+nTotalPixels = nStartWidthPx;
 SAL_INFO("sc.lok.header", "Col Header: [create string data for cols]: 
start col: "
 << nStartRow << " start width: " << nTotalPixels);
 
commit b0fb5acd045d116943645277a220abec5e8b6063
Author: Jan Holesovsky 
AuthorDate: Fri Oct 26 15:21:06 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Nov 8 14:38:49 2018 +0100

lokdialog: Implement hi-dpi support for the routed dialogs.

Change-Id: I770c605a049b7ac9c26c2773414eef8b6fc093a2
Reviewed-on: https://gerrit.libreoffice.org/63032
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 389d84a0cc31..728af9163222 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2431,12 +2431,13 @@ void DesktopLOKTest::testABI()
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(39), offsetof(struct 
_LibreOfficeKitDocumentClass, setViewLanguage));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(40), offsetof(struct 
_LibreOfficeKitDocumentClass, postWindowExtTextInputEvent));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(41), offsetof(struct 
_LibreOfficeKitDocumentClass, getPartInfo));
-CPPUNIT_ASSERT_EQU

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

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit d2c7b86be879fe33ce170727421a19370ba8884d
Author: Jan Holesovsky 
AuthorDate: Wed Oct 24 21:41:02 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Nov 8 14:38:10 2018 +0100

Revert "The debugging rectangles are not needed any more."

Still useful for debugging, particularly in combination with
gtktiledviewer.

This reverts commit dec025d4cb51f252ecd7e981fe36800cf2bedff5.

Change-Id: Id2174486c0427adf083be199ce2dbb453beb8f22
Reviewed-on: https://gerrit.libreoffice.org/63030
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index baa87e12ca97..202bf279f153 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2152,6 +2152,19 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 
 pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight,
 nTilePosX, nTilePosY, nTileWidth, nTileHeight);
+
+static bool bDebug = getenv("LOK_DEBUG_TILES") != nullptr;
+if (bDebug)
+{
+// Draw a small red rectangle in the top left corner so that it's easy 
to see where a new tile begins.
+tools::Rectangle aRect(0, 0, 5, 5);
+aRect = pDevice->PixelToLogic(aRect);
+pDevice->Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
+pDevice->SetFillColor(COL_LIGHTRED);
+pDevice->SetLineColor();
+pDevice->DrawRect(aRect);
+pDevice->Pop();
+}
 #endif
 
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 editeng/inc/editdoc.hxx |6 --
 editeng/source/editeng/editdbg.cxx  |2 ++
 editeng/source/editeng/editdoc.cxx  |   34 +-
 editeng/source/editeng/impedit2.cxx |2 +-
 editeng/source/editeng/impedit4.cxx |2 +-
 editeng/source/editeng/impedit5.cxx |2 +-
 starmath/source/accessibility.cxx   |4 ++--
 svx/source/dialog/charmap.cxx   |2 +-
 svx/source/form/formcontroller.cxx  |2 +-
 sw/source/core/access/accmap.cxx|2 +-
 sw/source/core/layout/atrfrm.cxx|2 +-
 sw/source/core/txtnode/ndtxt.cxx|2 +-
 12 files changed, 33 insertions(+), 29 deletions(-)

New commits:
commit 5feed3891782fc158209e04ab7d6c639266bcf6e
Author: Stephan Bergmann 
AuthorDate: Thu Nov 8 09:28:59 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 8 14:34:10 2018 +0100

More --enable-debug --disable-assert-always-abort fixes

...which 
occasionally stumbles across

Change-Id: I2f28fda7522b2f6b009fc2b64766ec9e43c1ab67
Reviewed-on: https://gerrit.libreoffice.org/63067
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 881fc474ae33..4e7efff897fa 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -229,7 +229,7 @@ public:
 void Remove(const EditCharAttrib* p);
 void Remove(sal_Int32 nPos);
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 static void DbgCheckAttribs(CharAttribList const& rAttribs);
 #endif
 };
@@ -668,7 +668,7 @@ public:
 void Append(std::unique_ptr p);
 sal_Int32 Count() const;
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 // temporary:
 static void DbgCheck(ParaPortionList const&, EditDoc const& rDoc);
 #endif
@@ -826,7 +826,9 @@ inline EditCharAttrib* 
GetAttrib(CharAttribList::AttribsType& rAttribs, sal_Int3
 return (nAttr < static_cast(rAttribs.size())) ? 
rAttribs[nAttr].get() : nullptr;
 }
 
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 void CheckOrderedList(const CharAttribList::AttribsType& rAttribs);
+#endif
 
 class EditEngineItemPool : public SfxItemPool
 {
diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index 7daf8b965bf7..732f788ef677 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -500,7 +500,9 @@ bool ParaPortion::DbgCheckTextPortions(ParaPortion const& 
rPara)
 }
 return nXLen == rPara.pNode->Len();
 }
+#endif
 
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 void CheckOrderedList(const CharAttribList::AttribsType& rAttribs)
 {
 sal_Int32 nPrev = 0;
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 9ed29b0a752a..5881868ab5b4 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -784,7 +784,7 @@ ParaPortion* ParaPortionList::SafeGetObject(sal_Int32 nPos)
 return 0 <= nPos && nPos < static_cast(maPortions.size()) ? 
maPortions[nPos].get() : nullptr;
 }
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 void
 ParaPortionList::DbgCheck(ParaPortionList const& rParas, EditDoc const& rDoc)
 {
@@ -1202,7 +1202,7 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex, 
sal_Int32 nNew, SfxItemPool&
 if ( !nNew )
 return;
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 CharAttribList::DbgCheckAttribs(aCharAttribList);
 #endif
 
@@ -1332,7 +1332,7 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex, 
sal_Int32 nNew, SfxItemPool&
 mpWrongList->TextInserted( nIndex, nNew, bSep );
 }
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 CharAttribList::DbgCheckAttribs(aCharAttribList);
 #endif
 }
@@ -1342,7 +1342,7 @@ void ContentNode::CollapseAttribs( sal_Int32 nIndex, 
sal_Int32 nDeleted, SfxItem
 if ( !nDeleted )
 return;
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 CharAttribList::DbgCheckAttribs(aCharAttribList);
 #endif
 
@@ -1426,7 +1426,7 @@ void ContentNode::CollapseAttribs( sal_Int32 nIndex, 
sal_Int32 nDeleted, SfxItem
 if (mpWrongList)
 mpWrongList->TextDeleted(nIndex, nDeleted);
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 CharAttribList::DbgCheckAttribs(aCharAttribList);
 #endif
 }
@@ -1435,7 +1435,7 @@ void ContentNode::CopyAndCutAttribs( ContentNode* 
pPrevNode, SfxItemPool& rPool,
 {
 assert(pPrevNode);
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
 CharAttribList::DbgCheckAttribs(aCharAttribList);
 CharAttribList::DbgCheckAttribs(pPrevNode->aCharAttribList);
 #endif
@@ -1484,7 +1484,7 @@ void ContentNode::CopyAndCutAttribs( ContentNode* 
pPrevNode, SfxItemPool& rPool,
 pAttrib = GetAttrib(rPrevAttribs, nAttr);
 }
 
-#if OSL_DEBUG_LEVEL > 0
+#

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/oox/chartsheetfragment.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit b6052b6f78a4486f129dbaef9db3106c4f289cae
Author: Markus Mohrhard 
AuthorDate: Tue Nov 6 21:42:43 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 14:21:06 2018 +0100

tdf#107586, import chart sheet color

Change-Id: Ie7d728cd36c93d5f398266ee65be0e1bf14a0c97
Reviewed-on: https://gerrit.libreoffice.org/62974
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 06e90234e402717e3ef04cf712d34c9165dbc08e)
Reviewed-on: https://gerrit.libreoffice.org/62980
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/filter/oox/chartsheetfragment.cxx 
b/sc/source/filter/oox/chartsheetfragment.cxx
index 70541ed4e620..00a90bb8eab0 100644
--- a/sc/source/filter/oox/chartsheetfragment.cxx
+++ b/sc/source/filter/oox/chartsheetfragment.cxx
@@ -50,7 +50,7 @@ ContextHandlerRef ChartsheetFragment::onCreateContext( 
sal_Int32 nElement, const
 {
 case XLS_TOKEN( sheetViews ):   return this;
 
-case XLS_TOKEN( sheetPr ):  
getWorksheetSettings().importChartSheetPr( rAttribs );  break;
+case XLS_TOKEN( sheetPr ):  
getWorksheetSettings().importChartSheetPr( rAttribs );  return this;
 case XLS_TOKEN( sheetProtection ):  
getWorksheetSettings().importChartProtection( rAttribs );   break;
 case XLS_TOKEN( pageMargins ):  
getPageSettings().importPageMargins( rAttribs );break;
 case XLS_TOKEN( pageSetup ):
getPageSettings().importChartPageSetup( getRelations(), rAttribs ); break;
@@ -75,6 +75,14 @@ ContextHandlerRef ChartsheetFragment::onCreateContext( 
sal_Int32 nElement, const
 case XLS_TOKEN( evenFooter ):   return this;// collect 
contents in onCharacters()
 }
 break;
+
+case XLS_TOKEN( sheetPr ):
+switch( nElement )
+{
+case XLS_TOKEN( tabColor ): 
getWorksheetSettings().importTabColor( rAttribs );  break;
+}
+break;
+
 }
 return nullptr;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - 2 commits - extras/source svx/source

[Libreoffice Gerrit user]

 extras/source/gallery/diagrams/Cycle01-Transparent.svg  |  149 +++-
 extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg |  108 
 svx/source/toolbars/fontworkbar.cxx |5 
 3 files changed, 259 insertions(+), 3 deletions(-)

New commits:
commit 640ae4bf97530882614796aed669be8c4fd91fe4
Author: Michael Meeks 
AuthorDate: Fri Nov 2 19:14:05 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 14:20:17 2018 +0100

tdf#119648 - even if we fail to import a fontwork, we shouldn't crash.

Change-Id: Id2dcfb69ad8440ea63564334a5a26a5f9b9bde14
Reviewed-on: https://gerrit.libreoffice.org/62789
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit f10b7e820844d94b4dbec3dcaf24392275940914)
Reviewed-on: https://gerrit.libreoffice.org/63061
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/toolbars/fontworkbar.cxx 
b/svx/source/toolbars/fontworkbar.cxx
index 338907dc1096..e374b0d3cb69 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -358,7 +358,10 @@ void GetGeometryForCustomShape( 
SdrCustomShapeGeometryItem& rGeometryItem, const
 rPool.FreezeIdRanges();
 if ( GalleryExplorer::GetSdrObj( GALLERY_THEME_POWERPOINT, 
i, &aFormModel ) )
 {
-const SdrObject* pSourceObj = aFormModel.GetPage( 0 
)->GetObj( 0 );
+const SdrObject* pSourceObj = nullptr;
+if (aFormModel.GetPageCount() > 0)
+pSourceObj = aFormModel.GetPage( 0 )->GetObj( 0 );
+SAL_WARN_IF(!pSourceObj, "svx.form", "No content in 
gallery custom shape '" << rCustomShape << "'" );
 if( pSourceObj )
 {
 PropertyValue aPropVal_;
commit 1b5e1ca38c1ebc374f25d50a7c551cbb4b8fa398
Author: andreas kainz 
AuthorDate: Fri Nov 2 08:02:50 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 14:19:36 2018 +0100

tdf#120038 Missing arrow for Gallery Cycle-Transparent icon update

Change-Id: I2eca0010f1c533d35212ecd2b9f3fb0e45b797e9
Reviewed-on: https://gerrit.libreoffice.org/62770
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit f8a493ae29a66d70d4672dbc105614075aad5a92)
Reviewed-on: https://gerrit.libreoffice.org/62826
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/gallery/diagrams/Cycle01-Transparent.svg 
b/extras/source/gallery/diagrams/Cycle01-Transparent.svg
index 065aabeac350..a9de89e98de9 100644
--- a/extras/source/gallery/diagrams/Cycle01-Transparent.svg
+++ b/extras/source/gallery/diagrams/Cycle01-Transparent.svg
@@ -1 +1,148 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   enable-background="new 0 0 401 390"
+   height="355"
+   viewBox="0 0 354 355"
+   width="354"
+   version="1.1"
+   id="svg50"
+   sodipodi:docname="Cycle01-Transparent.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+  
+
+  
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+  
+  
+
diff --git a/extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg 
b/extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg
index 686d4fdd23a8..6e3b5bd21757 100644
--- a/extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg
+++ b/extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg
@@ -1 +1,107 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   enable-background="new 0 0 401 390"
+   height="355"
+   viewBox="0 0 354 355"
+   width="354"
+   version="1.1"
+   id="svg50">
+
+  
+  
+
+
+
+  
+  
+
+
+
+  
+  
+
+
+  
+  
+  
+
___
Libreoffice-c

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

[Libreoffice Gerrit user]

 filter/source/graphicfilter/ipict/ipict.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1e8b61d3ab6919aaae0faf2d4db43e3ec0348350
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 10:09:36 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 14:19:04 2018 +0100

coverity#1441102 silence Copy-paste error

Change-Id: I389984fa56a8709416f9d525e4a879993b432bea
Reviewed-on: https://gerrit.libreoffice.org/63077
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/graphicfilter/ipict/ipict.cxx 
b/filter/source/graphicfilter/ipict/ipict.cxx
index 01e6fe296685..48e534b83132 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -923,7 +923,7 @@ sal_uLong PictReader::ReadPixMapEtc( BitmapEx &rBitmap, 
bool bBaseAddr, bool bCo
 
 if (nRowBytes < 8 || nPackType == 1)
 {
-if (nHeight > pPict->remainingSize() / (sizeof(sal_uInt16) * 
nWidth))
+if (nHeight > pPict->remainingSize() / (sizeof(sal_uInt8) * 
nRowBytes))
 return 0x;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 comphelper/source/misc/profilezone.cxx |6 +-
 include/comphelper/profilezone.hxx |6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 77b5129078906e52f15e2a5c0fdefe934ef13d0c
Author: Stephan Bergmann 
AuthorDate: Thu Nov 8 10:31:49 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 8 14:17:16 2018 +0100

coverity#1441101: Use std::atomic instead of volatile

ee9ccdf6ecd944c2f448a30d10700754d1f0cfa2 "reduce cost of ProfileZone when 
it is
not active" had changed g_bRecording from a bool guarded by g_aMutex to a
volatile bool.  But having been guarded by a mutex indicates that 
g_bRecording
is potentially accessed from multiple threads, and volatile does not avoid
races.

Change-Id: I933ff5d912cbc7acce52155c605d9c19049c66aa
Reviewed-on: https://gerrit.libreoffice.org/63073
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/comphelper/source/misc/profilezone.cxx 
b/comphelper/source/misc/profilezone.cxx
index dc2a713228b8..72d9bcde06b9 100644
--- a/comphelper/source/misc/profilezone.cxx
+++ b/comphelper/source/misc/profilezone.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -15,7 +19,7 @@
 namespace comphelper
 {
 
-volatile bool ProfileZone::g_bRecording(false);
+std::atomic ProfileZone::g_bRecording(false);
 
 namespace ProfileRecording
 {
diff --git a/include/comphelper/profilezone.hxx 
b/include/comphelper/profilezone.hxx
index 9def6f994fba..8cbc078f6621 100644
--- a/include/comphelper/profilezone.hxx
+++ b/include/comphelper/profilezone.hxx
@@ -10,6 +10,10 @@
 #ifndef INCLUDED_COMPHELPER_PROFILEZONE_HXX
 #define INCLUDED_COMPHELPER_PROFILEZONE_HXX
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -36,7 +40,7 @@ private:
 const char * m_sProfileId;
 long long const m_aCreateTime;
 public:
-static volatile bool g_bRecording; // true during recording
+static std::atomic g_bRecording; // true during recording
 
 // Note that the char pointer is stored as such in the ProfileZone object 
and used in the
 // destructor, so be sure to pass a pointer that stays valid for the 
duration of the object's
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source

[Libreoffice Gerrit user]

 sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86d6ef3371b425d8ec1347902c54597c2749cae7
Author: Xisco Fauli 
AuthorDate: Tue Nov 6 12:01:34 2018 +0100
Commit: Xisco Faulí 
CommitDate: Thu Nov 8 14:16:46 2018 +0100

tdf#121198: fix crash in SdrPage::GetPageNum()

Regression from 9348b322a5c230dfcc2231661b73e480b130fcd9

Change-Id: Ibf9d6b65f0dbcc3a751e3ac5f3dbc28d908d6c25
Reviewed-on: https://gerrit.libreoffice.org/62952
Tested-by: Jenkins
(cherry picked from commit ebd24b39eee5ac72d33ad731e31469cf8f330631)
Reviewed-on: https://gerrit.libreoffice.org/62965
Reviewed-by: Xisco Faulí 

diff --git 
a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx 
b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
index acd93d26aec1..4d468944 100644
--- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
@@ -220,7 +220,7 @@ bool InsertionIndicatorHandler::IsInsertionTrivial (
 // to check that the insertion position is not directly in front or
 // directly behind the selection and thus moving the selection there
 // would not change the model.
-return nInsertionIndex >= nFirstIndex && nInsertionIndex < nLastIndex;
+return nInsertionIndex >= nFirstIndex && nInsertionIndex <= (nLastIndex+1);
 }
 
 bool InsertionIndicatorHandler::IsInsertionTrivial (const sal_Int8 nDndAction)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/Kit.cpp

[Libreoffice Gerrit user]

 kit/Kit.cpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1521685c81b026cccbd0c6f9f20876838f2e6d4e
Author: Tor Lillqvist 
AuthorDate: Thu Nov 8 14:59:35 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 8 15:01:45 2018 +0200

Avoid assertion failure in the MOBILEAPP case

The dummy Unit thing is of type Wsd, not Kit, there. Just put this
into #ifndef.

Change-Id: Ic709472154fd17761a82df9814e5d3746f96f607

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 2c21155d7..bc3ebeba1 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2109,9 +2109,10 @@ protected:
 {
 std::string message(data.data(), data.size());
 
+#ifndef MOBILEAPP
 if (UnitKit::get().filterKitMessage(this, message))
 return;
-
+#endif
 std::vector tokens = LOOLProtocol::tokenize(message);
 Log::StreamLogger logger = Log::debug();
 if (logger.enabled())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 35b6f75bc14fe65c4700e199d82c958f715420ac
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 09:58:58 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 13:45:39 2018 +0100

Resolves: tdf#119790 for gtk3 save and restore typed name on changing filter

Change-Id: I17c3d154144b13ce401b0e4afe84c91a2fe98d8e
Reviewed-on: https://gerrit.libreoffice.org/63075
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index d5fd865747ba..b4603bb32a80 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -806,7 +806,16 @@ uno::Sequence SAL_CALL 
SalGtkFilePicker::getSelectedFiles()
 }
 }
 if( bChangeFilter && bExtensionTypedIn )
+{
+#if GTK_CHECK_VERSION(3,0,0)
+gchar* pCurrentName = 
gtk_file_chooser_get_current_name(GTK_FILE_CHOOSER(m_pDialog));
+setCurrentFilter( aNewFilter );
+
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_pDialog), pCurrentName);
+g_free(pCurrentName);
+#else
 setCurrentFilter( aNewFilter );
+#endif
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - helpcontent2 offapi/com xmlsecurity/source

[Libreoffice Gerrit user]

 helpcontent2|2 
 offapi/com/sun/star/security/XDocumentDigitalSignatures.idl |   10 ++-
 xmlsecurity/source/component/documentdigitalsignatures.cxx  |   38 
 xmlsecurity/source/component/documentdigitalsignatures.hxx  |5 +
 xmlsecurity/source/helper/documentsignaturemanager.cxx  |9 +-
 5 files changed, 57 insertions(+), 7 deletions(-)

New commits:
commit 1ed7d2fef309a8a71b837d355099732c49cde887
Author: Tomaž Vajngerl 
AuthorDate: Mon Oct 15 10:07:32 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 11:36:48 2018 +0100

use "range for" to iterate through certificates

Reviewed-on: https://gerrit.libreoffice.org/61779
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit f9acea526b9aeb3cf450cd7ee43bd969385865db)

Conflicts:
xmlsecurity/source/helper/documentsignaturemanager.cxx

Change-Id: Ife206ab29f2f8eaa2358f45e6bae2290d95fd4d6

diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx 
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index fd88d0a52e7e..45787b190311 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -341,14 +341,13 @@ bool DocumentSignatureManager::add(const 
uno::Reference&
 }
 
 uno::Sequence< uno::Reference< security::XCertificate > > aCertPath = 
xSecurityContext->getSecurityEnvironment()->buildCertificatePath(xCert);
-const uno::Reference< security::XCertificate >* pCertPath = 
aCertPath.getConstArray();
-sal_Int32 nCnt = aCertPath.getLength();
 
 OUStringBuffer aStrBuffer;
-for (int i = 0; i < nCnt; i++)
+for (uno::Reference const& rxCertificate : 
aCertPath)
 {
-sax::Converter::encodeBase64(aStrBuffer, pCertPath[i]->getEncoded());
-
maSignatureHelper.AddEncapsulatedX509Certificate(aStrBuffer.makeStringAndClear());
+sax::Converter::encodeBase64(aStrBuffer, rxCertificate->getEncoded());
+OUString aString = aStrBuffer.makeStringAndClear();
+maSignatureHelper.AddEncapsulatedX509Certificate(aString);
 }
 
 
commit cc145029e896b8e65443898f65807a8c5414e0d2
Author: Tomaž Vajngerl 
AuthorDate: Mon Oct 15 10:06:56 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Nov 8 11:02:23 2018 +0100

Support to sign a document with a specified signature

Reviewed-on: https://gerrit.libreoffice.org/61778
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 40810c43c48b25385b487c0b79c4c466dbf36be7)

Conflicts:
xmlsecurity/source/component/documentdigitalsignatures.cxx

Change-Id: I92e392b315c9217b63db830dea1b2e91387b56c2

diff --git a/helpcontent2 b/helpcontent2
index 4fcc8606724b..0233c4ebfd07 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4fcc8606724bcf6ec87b3ca741d4a00633e1b3c4
+Subproject commit 0233c4ebfd07878cd77454d1970fdf002c4e67b6
diff --git a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl 
b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
index 519f77cb62dd..4d51192c557f 100644
--- a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
@@ -157,7 +157,15 @@ interface XDocumentDigitalSignatures : 
com::sun::star::uno::XInterface
  */
 com::sun::star::security::XCertificate chooseCertificateWithProps( [out] 
sequence<::com::sun::star::beans::PropertyValue> Properties);
 
-} ;
+/** Signs the content of the document with the provided certificate.
+
+@since LibreOffice 6.2
+ */
+boolean signDocumentWithCertificate([in] 
::com::sun::star::security::XCertificate xCertificate,
+[in] ::com::sun::star::embed::XStorage 
xStorage,
+[in] ::com::sun::star::io::XStream 
xStream);
+
+};
 
 } ; } ; } ; } ;
 
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx 
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index dd7de2c3bafe..e49c11e0eef7 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -47,9 +47,11 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace css;
 using namespace css::uno;
+using namespace css::xml::crypto;
 
 DocumentDigitalSignatures::DocumentDigitalSignatures( const Reference< 
XComponentContext >& rxCtx ):
 mxCtx(rxCtx),
@@ -578,4 +580,40 @@ Reference< XInterface > 
DocumentDigitalSignatures_CreateInstance(
 return static_cast(new DocumentDigitalSignatures( rCtx 
));
 }
 
+sal_Bool DocumentDigitalSignatures::signDocumentWithCertificate(
+css::uno::Reference const & 
xCertificate,
+css::uno::Reference const & xStorage,
+css::uno::Reference const & xStream)
+{
+DocumentSigna

[Libreoffice-commits] core.git: configure.ac

[Libreoffice Gerrit user]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4613e105f98af6e3b65ce87432b1a2db45e71ae2
Author: Stephan Bergmann 
AuthorDate: Wed Nov 7 10:43:14 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 8 13:36:53 2018 +0100

tdf#121131: Default COMPILER_PLUGINS_CXX to g++ -std=c++11

ab8bf5533f8de9bb1aa9dc83e650e4eccf0fcac3 "Avoid error message from configure
about clang's header for compiler plugins" caused problems after
cd472d1d8489f30797f47d3f6dafede28c1feb90 "Compile as C++2a, where 
available",
when the compiler used to build LO (CXX) supports -std=gnu++2a but the 
compiler
used to build loplugin (COMPILER_PLUGINS_CXX) does not.  So solve that 
problem
instead by just adding -std=c++11 to the default for COMPILER_PLUGINS_CXX.

Change-Id: I95e86bc28f2a0dfb2b7bdce6b15955b870428b8c
Reviewed-on: https://gerrit.libreoffice.org/62997
Reviewed-by: Jan-Marek Glogowski 
Reviewed-by: Luboš Luňák 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index f6ba4a013d94..145505c6e390 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6723,9 +6723,9 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 save_CPPFLAGS=$CPPFLAGS
 save_CXX=$CXX
 # compiler plugins must be built with "native" compiler that was used 
to build Clang itself:
-: "${COMPILER_PLUGINS_CXX=g++}"
+: "${COMPILER_PLUGINS_CXX=g++ -std=c++11}"
 CXX=$COMPILER_PLUGINS_CXX
-CPPFLAGS="$CPPFLAGS $CXXFLAGS_CXX11 -I$CLANGDIR/include 
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
+CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include -D__STDC_CONSTANT_MACROS 
-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
 AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
 [COMPILER_PLUGINS=TRUE],
 [
___
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-3' - capabilities.json common/Common.hpp discovery.xml test/integration-http-server.cpp wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 capabilities.json|5 ++
 common/Common.hpp|2 +
 discovery.xml|4 ++
 test/integration-http-server.cpp |   73 +
 wsd/LOOLWSD.cpp  |   76 ---
 5 files changed, 156 insertions(+), 4 deletions(-)

New commits:
commit 17d4031a63fbf72a88a0a931e39adf725d75f2cb
Author: Tamás Zolnai 
AuthorDate: Fri Oct 19 18:14:48 2018 +0200
Commit: Michael Meeks 
CommitDate: Thu Nov 8 13:12:53 2018 +0100

Add /hosting/capabilities endpoint to advertise online features

Add an entry to discovery.xml with the urlsrc where capabilities end
point can be found. Use json format to send back the feature list.

(cherry picked from commit 0bb8b7c7a8a05ec95a7668c42b8b53c6f4da07c6)

Change-Id: I390a53d956d53ca79e5a8090aead7f4131ec4ca0
Reviewed-on: https://gerrit.libreoffice.org/62400
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/capabilities.json b/capabilities.json
new file mode 100644
index 0..32ed3801f
--- /dev/null
+++ b/capabilities.json
@@ -0,0 +1,5 @@
+{
+  "convert-to": {
+"available": false
+  }
+}
diff --git a/common/Common.hpp b/common/Common.hpp
index 29008fd24..e55333937 100644
--- a/common/Common.hpp
+++ b/common/Common.hpp
@@ -36,6 +36,8 @@ constexpr const char CHILD_URI[] = "/loolws/child?";
 constexpr const char NEW_CHILD_URI[] = "/loolws/newchild";
 constexpr const char LO_JAIL_SUBPATH[] = "lo";
 
+constexpr const char CAPABILITIES_END_POINT[] = "/hosting/capabilities";
+
 /// The HTTP response User-Agent.
 constexpr auto HTTP_AGENT_STRING = "LOOLWSD HTTP Agent " LOOLWSD_VERSION;
 
diff --git a/discovery.xml b/discovery.xml
index 0a9ca48c7..b2999b8cf 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -339,5 +339,9 @@
 
 
 
+
+
+
+
 
 
diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp
index f93874ffa..16d002de6 100644
--- a/test/integration-http-server.cpp
+++ b/test/integration-http-server.cpp
@@ -9,6 +9,11 @@
 
 #include "config.h"
 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -40,6 +45,7 @@ class HTTPServerTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST_SUITE(HTTPServerTest);
 
 CPPUNIT_TEST(testDiscovery);
+CPPUNIT_TEST(testCapabilities);
 CPPUNIT_TEST(testLoleafletGet);
 CPPUNIT_TEST(testLoleafletPost);
 CPPUNIT_TEST(testScriptsAndLinksGet);
@@ -49,6 +55,7 @@ class HTTPServerTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST_SUITE_END();
 
 void testDiscovery();
+void testCapabilities();
 void testLoleafletGet();
 void testLoleafletPost();
 void testScriptsAndLinksGet();
@@ -100,6 +107,72 @@ void HTTPServerTest::testDiscovery()
 CPPUNIT_ASSERT_EQUAL(std::string("text/xml"), response.getContentType());
 }
 
+
+void HTTPServerTest::testCapabilities()
+{
+std::unique_ptr 
session(helpers::createSession(_uri));
+
+// Get discovery first and extract the urlsrc of the capabilities end point
+std::string capabiltiesURI;
+{
+
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, 
"/hosting/discovery");
+session->sendRequest(request);
+
+Poco::Net::HTTPResponse response;
+std::istream& rs = session->receiveResponse(response);
+CPPUNIT_ASSERT_EQUAL(Poco::Net::HTTPResponse::HTTP_OK, 
response.getStatus());
+CPPUNIT_ASSERT_EQUAL(std::string("text/xml"), 
response.getContentType());
+
+std::string discoveryXML;
+Poco::StreamCopier::copyToString(rs, discoveryXML);
+
+Poco::XML::DOMParser parser;
+Poco::XML::AutoPtr docXML = 
parser.parseString(discoveryXML);
+Poco::XML::AutoPtr listNodes = 
docXML->getElementsByTagName("action");
+bool foundCapabilities = false;
+for (unsigned long index = 0; index < listNodes->length(); ++index)
+{
+Poco::XML::Element* elem = 
static_cast(listNodes->item(index));
+Poco::XML::Element* parent = elem->parentNode() ? 
static_cast(elem->parentNode()) : nullptr;
+if(parent && parent->getAttribute("name") == "Capabilities")
+{
+foundCapabilities = true;
+capabiltiesURI = elem->getAttribute("urlsrc");
+break;
+}
+}
+
+CPPUNIT_ASSERT(foundCapabilities);
+CPPUNIT_ASSERT_EQUAL(_uri.toString() + CAPABILITIES_END_POINT, 
capabiltiesURI);
+}
+
+// Then get the capabilities json
+{
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, 
CAPABILITIES_END_POINT);
+session->sendRequest(request);
+
+Poco::Net::HTTPResponse response;
+std::istream& rs = session->receiveResponse(response);
+CPPUNIT_ASSERT_EQUAL(Poco::Net::HTTPResponse::HTTP_OK, 
response.getStatus());

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/po

[Libreoffice Gerrit user]

 loleaflet/po/ui-es.po|4 ++--
 loleaflet/po/ui-pt_BR.po |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 627069e9ea56386346189ca80a955f4a83cac87d
Author: Andras Timar 
AuthorDate: Tue Oct 30 15:13:52 2018 +0100
Commit: Michael Meeks 
CommitDate: Thu Nov 8 13:06:46 2018 +0100

loleaflet: missing es and pt_BR UI translations

(cherry picked from commit 5799a20f37365eb108728c44dad8043936ff9880)

Change-Id: I32386f116acf6b110794c13ece0140f553848fe4
Reviewed-on: https://gerrit.libreoffice.org/62972
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/po/ui-es.po b/loleaflet/po/ui-es.po
index ab773376a..bca22472a 100644
--- a/loleaflet/po/ui-es.po
+++ b/loleaflet/po/ui-es.po
@@ -262,7 +262,7 @@ msgstr "Más..."
 
 #: dist/toolbar/toolbar.js:476 src/control/Control.Menubar.js:66
 msgid "Remote Image..."
-msgstr ""
+msgstr "Imagen remota..."
 
 #: dist/toolbar/toolbar.js:521 dist/toolbar/toolbar.js:1010
 msgid "Sum"
@@ -552,7 +552,7 @@ msgstr "Saltar al estado"
 
 #: src/control/Control.Menubar.js:20
 msgid "Share..."
-msgstr ""
+msgstr "Compartir..."
 
 #: src/control/Control.Menubar.js:22 src/control/Control.Menubar.js:231
 #: src/control/Control.Menubar.js:309
diff --git a/loleaflet/po/ui-pt_BR.po b/loleaflet/po/ui-pt_BR.po
index 0415e230d..90334f2bc 100644
--- a/loleaflet/po/ui-pt_BR.po
+++ b/loleaflet/po/ui-pt_BR.po
@@ -262,7 +262,7 @@ msgstr "Mais..."
 
 #: dist/toolbar/toolbar.js:476 src/control/Control.Menubar.js:66
 msgid "Remote Image..."
-msgstr ""
+msgstr "Imagem remota..."
 
 #: dist/toolbar/toolbar.js:521 dist/toolbar/toolbar.js:1010
 msgid "Sum"
@@ -552,7 +552,7 @@ msgstr "Saltar para o estado"
 
 #: src/control/Control.Menubar.js:20
 msgid "Share..."
-msgstr ""
+msgstr "Compartilhar..."
 
 #: src/control/Control.Menubar.js:22 src/control/Control.Menubar.js:231
 #: src/control/Control.Menubar.js:309
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/window/builder.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ac16fe01ad7bd0f48a398f6d5ca4475eff7e2068
Author: Caolán McNamara 
AuthorDate: Mon Nov 5 15:04:20 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 8 12:55:06 2018 +0100

select entire column, not just text-occupied portion

making this consistent with ListBox

Change-Id: Ifa2fd7070f95232fca8aa129e107ef5adf32e3df
Reviewed-on: https://gerrit.libreoffice.org/62907
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 71bfae795c0f..63da9929989c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1836,6 +1836,7 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 {
 VclPtrInstance xBox(pRealParent, nWinStyle);
 xBox->SetNoAutoCurEntry(true);
+xBox->SetHighlightRange(); // select over the whole width
 xWindow = xBox;
 }
 if (pRealParent != pParent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sd/source

[Libreoffice Gerrit user]

 sd/source/ui/slideshow/slideshowimpl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7c23a49a90ef6a16057cc8639c93bc451fca9fc3
Author: Caolán McNamara 
AuthorDate: Thu Jun 22 17:22:17 2017 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Nov 8 12:27:59 2018 +0100

Resolves: tdf#108475 swipe only if some reasonable movement was involved

Change-Id: I5ee2a60f80728a2cca1401e43c8e27f852bfc657
Reviewed-on: https://gerrit.libreoffice.org/39116
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 1adc3c76d773adc92d1c6d858358b7caa64e929a)
Reviewed-on: https://gerrit.libreoffice.org/62966
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 29b0201406c2..ff329ee79d08 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1187,8 +1187,10 @@ bool SlideshowImpl::swipe(const CommandSwipeData 
&rSwipeData)
 {
 if (mbUsePen || mnContextMenuEvent)
 return false;
-
 double nVelocityX = rSwipeData.getVelocityX();
+// tdf#108475 make it swipe only if some reasonable movement was involved
+if (fabs(nVelocityX) < 50)
+return false;
 if (nVelocityX > 0)
 {
 gotoPreviousSlide();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits