date:20190228

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/CustomTarget_qt5_moc.mk vcl/inc vcl/qt5

2019-02-28 Thread Libreoffice Gerrit user

 vcl/CustomTarget_qt5_moc.mk  |1 +
 vcl/inc/qt5/Qt5Clipboard.hxx |   12 +++-
 vcl/qt5/Qt5Clipboard.cxx |   20 
 3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 1cc66501179f2a396e221d6803f2e1f8019ada5c
Author: Michael Weghorn 
AuthorDate: Fri Feb 22 14:12:35 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 28 12:57:43 2019 +0100

tdf#122689 qt5: Consider external clipboard updates

Previously, once 'm_aContents' had been assigned in
'VclQt5Clipboard::setContents()', its value (or the one set
in a subsequent call to the same method) was always
returned in 'VclQt5Clipboard::getContents()', thus
ignoring all system clipboard updates done by any other
third-party applications, preventing copy-paste from other
applications.

In order to take external clipboard updates into account,
add a slot for the 'QClipboard::changed' signal and
drop the current own clipboard content if the clipboard
has been updated by another application.

In order to detect whether the clipboard update was made
by this 'VclQt5Clipboard' itself or elsewhere, a custom MIME type
"application/x-libreoffice-clipboard-uuid" is added, whose
value is set to the clipboard's (randomly generated) UUID.
If the entry is present and has the correct value, the clipboard
content was added by this clipboard and can be kept.

Otherwise, clear 'm_aContents', so that it's newly assigned
in 'VclQt5Clipboard::getContents()', taking into account
the external clipboard update.

[Side note: Testing showed that, on Wayland, more
'QClipboard::changed' events were emitted without the clipboard
content actually having changed (e.g. when switching focus between
windows), which is why an approach of simply setting a flag and
checking for that one is not enough, like "wrapping" the
'QClipboard::setMimeData()' call in 'VclQt5Clipboard::setContents()'
as follows

m_bIsFillingClipboard = true;
clipboard->setMimeData(pMimeData.release(), m_aClipboardMode);
m_bIsFillingClipboard = false;

and then evaluating the 'm_bIsfillingClipboard' flag in
'VclQt5Clipboard::handleClipboardChange' instead of using the UUID-based
approach. These additional 'QClipboard::changed' events did not
show up the same way while testing on X11.]

Change-Id: Ib3a6a4f9b7f5ca3573666fb9c072ae97cf2e0049
Reviewed-on: https://gerrit.libreoffice.org/68214
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 9c5dbbe4b0a62ff1af009beb00f1fc45318dad79)
Reviewed-on: https://gerrit.libreoffice.org/68460

diff --git a/vcl/CustomTarget_qt5_moc.mk b/vcl/CustomTarget_qt5_moc.mk
index 289fea74aa2e..6d85eeff637b 100644
--- a/vcl/CustomTarget_qt5_moc.mk
+++ b/vcl/CustomTarget_qt5_moc.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/qt5))
 
 $(call gb_CustomTarget_get_target,vcl/qt5) : \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5AccessibleWidget.moc \
+   $(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Clipboard.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5FilePicker.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Frame.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Instance.moc \
diff --git a/vcl/inc/qt5/Qt5Clipboard.hxx b/vcl/inc/qt5/Qt5Clipboard.hxx
index beff6b71a968..7539b748dc23 100644
--- a/vcl/inc/qt5/Qt5Clipboard.hxx
+++ b/vcl/inc/qt5/Qt5Clipboard.hxx
@@ -45,16 +45,26 @@ private:
 };
 
 class VclQt5Clipboard
-: public 
cppu::WeakComponentImplHelper
 {
+Q_OBJECT
+
+private Q_SLOTS:
+void handleClipboardChange(QClipboard::Mode mode);
+
+private:
 osl::Mutex m_aMutex;
 Reference m_aContents;
 Reference m_aOwner;
 std::vector> 
m_aListeners;
 OUString m_aClipboardName;
 QClipboard::Mode m_aClipboardMode;
+// custom MIME type to detect whether clipboard content was added by self 
or externally
+const QString m_sMimeTypeUuid = "application/x-libreoffice-clipboard-uuid";
+const QByteArray m_aUuid;
 
 public:
 explicit VclQt5Clipboard(const OUString& aModeString);
diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx
index 92bb3a89da3d..5fdbc47dfd2c 100644
--- a/vcl/qt5/Qt5Clipboard.cxx
+++ b/vcl/qt5/Qt5Clipboard.cxx
@@ -17,8 +17,10 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
+#include 
 #include 
 
 #include 
@@ -169,7 +171,10 @@ VclQt5Clipboard::VclQt5Clipboard(const OUString& 
aModeString)
   m_aMutex)
 , m_aClipboardName(aModeString)
 , m_aClipboardMode(getClipboardTypeFromName(aModeString))
+, m_aUuid(QUuid::createUuid().toByteArray())
 {
+connect(QApplication::clipboard(), ::changed, this,
+::handleClipboardChange, Qt::DirectConnection);
 }
 
 void VclQt5Clipboard::flushClipboard()
@@ -301,6 +306,9 @@ void

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

2019-02-28 Thread Libreoffice Gerrit user

 filter/source/svg/svgexport.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 740748d4470ce3f1db3fcbef729a5dc98c0b9569
Author: Gülşah Köse 
AuthorDate: Thu Feb 28 12:40:50 2019 +0300
Commit: Andras Timar 
CommitDate: Thu Feb 28 14:09:41 2019 +0100

tdf#115549 Check xPropset is exist.

Checks xPropset is exist for chart handling on LibreOffice Online.

Change-Id: I57947fd23e089ace4df011873613c2f886770b30
Reviewed-on: https://gerrit.libreoffice.org/68493
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index b872b842b36e..6f1c759a103d 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2025,16 +2025,19 @@ bool SVGFilter::implCreateObjects()
 // - tiled bitmap: an image element is exported for each tile,
 //   this is really too expensive!
 Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
-Reference< XPropertySet > xBackground;
-xPropSet->getPropertyValue( "Background" ) >>= xBackground;
-if( xBackground.is() )
+if( xPropSet.is() )
 {
-drawing::FillStyle aFillStyle;
-bool assigned = ( xBackground->getPropertyValue( "FillStyle" ) 
>>= aFillStyle );
-if( assigned && aFillStyle != drawing::FillStyle_NONE
- && aFillStyle != drawing::FillStyle_BITMAP )
+Reference< XPropertySet > xBackground;
+xPropSet->getPropertyValue( "Background" ) >>= xBackground;
+if( xBackground.is() )
 {
-implCreateObjectsFromBackground( xDrawPage );
+drawing::FillStyle aFillStyle;
+bool assigned = ( xBackground->getPropertyValue( 
"FillStyle" ) >>= aFillStyle );
+if( assigned && aFillStyle != drawing::FillStyle_NONE
+ && aFillStyle != drawing::FillStyle_BITMAP )
+{
+implCreateObjectsFromBackground( xDrawPage );
+}
 }
 }
 implCreateObjectsFromShapes( xDrawPage, xDrawPage );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/inc include/sfx2 include/svx sc/inc sd/inc sw/inc

2019-02-28 Thread Libreoffice Gerrit user

 basctl/inc/strings.hrc   |2 --
 include/sfx2/strings.hrc |1 -
 include/svx/dialogs.hrc  |3 ---
 sc/inc/scres.hrc |3 ---
 sc/inc/strings.hrc   |2 --
 sd/inc/app.hrc   |2 +-
 sw/inc/strings.hrc   |6 --
 7 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 07ba22e2953a91b61e770de2b4e3aefa9ea33dc6
Author: Noel Grandin 
AuthorDate: Thu Feb 28 12:09:18 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 28 14:58:24 2019 +0100

remove some unused defines

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

diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index a39ba9d76c04..6e93d8649f83 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -102,8 +102,6 @@
 #define RID_STR_PRINTDLG_PRINTPAGES NC_("RID_STR_PRINTDLG_PRINTPAGES", 
"Print pages")
 #define RID_STR_PRINTDLG_PRINTEVENPAGES 
NC_("RID_STR_PRINTDLG_PRINTEVENPAGES", "Print even pages")
 #define RID_STR_PRINTDLG_PRINTODDPAGES  
NC_("RID_STR_PRINTDLG_PRINTODDPAGES", "Print odd pages")
-#define RID_STR_BTNDEL  NC_("RID_STR_BTNDEL", "~Delete")
-#define RID_STR_BTNNEW  NC_("RID_STR_BTNNEW", "~New")
 #define RID_STR_CHOOSE  NC_("RID_STR_CHOOSE", "Choose")
 #define RID_STR_RUN NC_("RID_STR_RUN", "Run")
 #define RID_STR_RECORD  NC_("RID_STR_RECORD", "~Save")
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 6b21c26f5878..ca5f86f7d738 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -138,7 +138,6 @@
 #define STR_QUICKSTART_FILEOPEN NC_("STR_QUICKSTART_FILEOPEN", 
"Open Document...")
 #define STR_QUICKSTART_FROMTEMPLATE 
NC_("STR_QUICKSTART_FROMTEMPLATE", "From Template...")
 #define STR_QUICKSTART_PRELAUNCH
NC_("STR_QUICKSTART_PRELAUNCH", "Load %PRODUCTNAME During System Start-Up")
-#define STR_QUICKSTART_PRELAUNCH_UNX
NC_("STR_QUICKSTART_PRELAUNCH_UNX", "Disable systray Quickstarter")
 #define STR_QUICKSTART_LNKNAME  NC_("STR_QUICKSTART_LNKNAME", 
"%PRODUCTNAME %PRODUCTVERSION")
 #define STR_QUICKSTART_FILE NC_("STR_QUICKSTART_FILE", 
"File")
 #define STR_QUICKSTART_STARTCENTER  
NC_("STR_QUICKSTART_STARTCENTER", "Startcenter")
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 103a07073c93..78d00f86a2da 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -62,9 +62,6 @@
 // ID of tabpages implemented in SVX, but used in CUI
 #define RID_SVXPAGE_GRID(RID_SVX_START + 152)
 
-// factory IDs of dialogs implemented in CUI
-#define RID_SVXDLG_CHARMAP  ( RID_SVX_START +  10 )
-
 // IDs of options pages of applications
 #define RID_SW_TP_MAILCONFIG(RID_OFA_START + 102)
 #define RID_SW_TP_STD_FONT_CJK  (RID_OFA_START + 247)
diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc
index 3189dc9f27fe..57ac75843530 100644
--- a/sc/inc/scres.hrc
+++ b/sc/inc/scres.hrc
@@ -28,9 +28,6 @@
 
 #define SC_DIALOGS_START(STR_END + 100)
 
-#define RID_SCDLG_STYLES_PAR(SC_DIALOGS_START + 46)
-#define RID_SCDLG_STYLES_PAGE   (SC_DIALOGS_START + 48)
-
 #define RID_SCDLG_HFEDIT(SC_DIALOGS_START + 50)
 #define RID_SCDLG_HFEDIT_ALL(SC_DIALOGS_START + 51)
 #define RID_SCDLG_HFED_HEADER   (SC_DIALOGS_START + 52)
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 682d02376a67..f3fb5a6726e6 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -113,7 +113,6 @@
 #define SCSTR_PRINTOPT_PRINTEVENPAGES   
NC_("SCSTR_PRINTOPT_PRINTEVENPAGES", "Print even pages")
 #define SCSTR_PRINTOPT_PRINTODDPAGES
NC_("SCSTR_PRINTOPT_PRINTODDPAGES", "Print odd pages")
 #define SCSTR_PRINTOPT_PRODNAME 
NC_("SCSTR_PRINTOPT_PRODNAME", "%PRODUCTNAME %s")
-#define SCSTR_WARN_ME_IN_FUTURE_CHECK   
NC_("SCSTR_WARN_ME_IN_FUTURE_CHECK", "Warn me about this in the future.")
 #define SCSTR_DDEDOC_NOT_LOADED 
NC_("SCSTR_DDEDOC_NOT_LOADED", "The following DDE source could not be updated 
possibly because the source document was not open. Please launch the source 
document and try again." )
 #define SCSTR_EXTDOC_NOT_LOADED 
NC_("SCSTR_EXTDOC_NOT_LOADED", "The following external file could not be 
loaded. Data linked from this file did not get updated." )
 #define SCSTR_UPDATE_EXTDOCS
NC_("SCSTR_UPDATE_EXTDOCS", "Updating external links.")
@@ -326,7 +325,6 @@
 #define STR_LABEL_CONFIDENCE_LEVEL  
NC_("STR_LABEL_CONFIDENCE_LEVEL", "Confidence level")
 #define STR_LABEL_COEFFICIENTS  
NC_("STR_LABEL_COEFFICIENTS", "Coefficients")
 #define STR_LABEL_TSTATISTIC

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

2019-02-28 Thread Libreoffice Gerrit user

 filter/source/svg/svgexport.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 518234a83e357d6d60bcff4b5408adb12168fad6
Author: Gülşah Köse 
AuthorDate: Thu Feb 28 12:40:50 2019 +0300
Commit: Andras Timar 
CommitDate: Thu Feb 28 10:56:44 2019 +0100

tdf#115549 Check xPropset is exist.

Checks xPropset is exist for chart handling on LibreOffice Online.

Change-Id: I57947fd23e089ace4df011873613c2f886770b30
Reviewed-on: https://gerrit.libreoffice.org/68495
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ea9e6964590f..87fbbdee425d 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2029,16 +2029,19 @@ bool SVGFilter::implCreateObjects()
 // - tiled bitmap: an image element is exported for each tile,
 //   this is really too expensive!
 Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
-Reference< XPropertySet > xBackground;
-xPropSet->getPropertyValue( "Background" ) >>= xBackground;
-if( xBackground.is() )
+if( xPropSet.is() )
 {
-drawing::FillStyle aFillStyle;
-bool assigned = ( xBackground->getPropertyValue( "FillStyle" ) 
>>= aFillStyle );
-if( assigned && aFillStyle != drawing::FillStyle_NONE
- && aFillStyle != drawing::FillStyle_BITMAP )
+Reference< XPropertySet > xBackground;
+xPropSet->getPropertyValue( "Background" ) >>= xBackground;
+if( xBackground.is() )
 {
-implCreateObjectsFromBackground( xDrawPage );
+drawing::FillStyle aFillStyle;
+bool assigned = ( xBackground->getPropertyValue( 
"FillStyle" ) >>= aFillStyle );
+if( assigned && aFillStyle != drawing::FillStyle_NONE
+ && aFillStyle != drawing::FillStyle_BITMAP )
+{
+implCreateObjectsFromBackground( xDrawPage );
+}
 }
 }
 if( xDrawPage.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sfx2/source/doc/sfxbasemodel.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 559fa3d0d49ae53991626923d59f9c7f22858c58
Author: Samuel Mehrbrodt 
AuthorDate: Wed Feb 27 08:40:04 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 28 13:01:03 2019 +0100

tdf#123728 Always print on main thread to avoid deadlocks

Change-Id: Ia8c2600aee42c3063e18032d1e485ad417ec4639
Reviewed-on: https://gerrit.libreoffice.org/68421
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 110803068b75ffd895a9b1139aee2248d30f085b)
Reviewed-on: https://gerrit.libreoffice.org/68461
Reviewed-by: Thorsten Behrens 

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 72a4b7b00aed..27ba812a2449 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -91,6 +91,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1411,14 +1412,22 @@ void SAL_CALL SfxBaseModel::setPrinter(const Sequence< 
beans::PropertyValue >& r
 m_pData->m_xPrintable->setPrinter( rPrinter );
 }
 
+static bool ImplPrintStatic(const Reference& m_xPrintable,
+const Sequence& rOptions)
+{
+m_xPrintable->print(rOptions);
+return true;
+}
+
 void SAL_CALL SfxBaseModel::print(const Sequence< beans::PropertyValue >& 
rOptions)
 {
 SfxModelGuard aGuard( *this );
 
 impl_getPrintHelper();
-m_pData->m_xPrintable->print( rOptions );
-}
 
+// tdf#123728 Always print on main thread to avoid deadlocks
+vcl::solarthread::syncExecute(std::bind(, 
m_pData->m_xPrintable, rOptions));
+}
 
 //  XStorable
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Extending subsequent tests with dogtail tests?

2019-02-28 Thread Samuel Thibault

Noel Grandin, le jeu. 28 févr. 2019 15:38:25 +0200, a ecrit:
> On Sun, 24 Feb 2019 at 22:04, Samuel Thibault <[1]sthiba...@hypra.fr> wrote:
> 
> The fact that even the C UI strings may change is a concern indeed. We
> however don't really have another way to identify widgets, do we? (we
> don't want to identify them structurally, that'd be even less stable)
> 
> The LibreOffice python UI tests use IDs that are maintained in the .ui files
> (and are just strings), which are relatively stable.

Right. AIUI they are not exposed to the accessibility interfaces
however, we'll have to fix that.

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

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

2019-02-28 Thread Libreoffice Gerrit user

 sw/source/core/inc/txtfrm.hxx   |4 ++--
 sw/source/core/text/frmform.cxx |   32 
 sw/source/core/text/txtfrm.cxx  |2 +-
 sw/source/core/text/widorp.cxx  |   19 +--
 4 files changed, 28 insertions(+), 29 deletions(-)

New commits:
commit 2dfffccde81b887752968387ccbdd578b1c4eb78
Author: Michael Stahl 
AuthorDate: Tue Feb 26 18:43:10 2019 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 28 11:03:45 2019 +0100

sw: fix some borked comments

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

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 7700dae25e65..4cf13bbdf1c5 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -211,8 +211,8 @@ class SW_DLLPUBLIC SwTextFrame: public SwContentFrame
 void ChangeOffset( SwTextFrame* pFrame, TextFrameIndex nNew );
 
 bool mbLocked: 1;// In the Format?
-bool mbWidow : 1;// Are we a Widow?
-bool mbJustWidow : 1;// Did we just request to be a Widow?
+bool mbWidow : 1;// Is our follow a Widow?
+bool mbJustWidow : 1;// Did we just request Widow flag on 
master?
 bool mbEmpty : 1;// Are we an empty paragraph?
 bool mbInFootnoteConnect  : 1;// Is in Connect at the moment
 bool mbFootnote   : 1;// Has at least one footnote
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index da5ce0f8e036..db81c7aca3e7 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -202,7 +202,7 @@ bool SwTextFrame::CalcFollow(TextFrameIndex const nTextOfst)
 if ( !IsInFly() && GetNext() )
 {
 pPage = FindPageFrame();
-// Minimize = that is set back if needed - for invalidation see 
below
+// Minimize (reset if possible) invalidations: see below
 bOldInvaContent  = pPage->IsInvalidContent();
 }
 
@@ -291,8 +291,8 @@ bool SwTextFrame::CalcFollow(TextFrameIndex const nTextOfst)
 }
 
 pPara = GetPara();
-// As long as the Follow is requested due to orphan lines, it is 
passed these
-// and is reformatted if possible
+// As long as the Follow requests lines due to Orphans, it is
+// passed these and is formatted again if possible
 if( pPara && pPara->IsPrepWidows() )
 CalcPreps();
 else
@@ -893,7 +893,7 @@ bool SwTextFrame::CalcPreps()
 
 WidowsAndOrphans aFrameBreak( this );
 // Whatever the attributes say: we split the paragraph in
-// MustFit in any case
+// MustFit case if necessary
 if( bPrepMustFit )
 {
 aFrameBreak.SetKeep( false );
@@ -910,10 +910,10 @@ bool SwTextFrame::CalcPreps()
 }
 if( bBreak )
 {
-// We run into troubles: when TruncLines get called, the
+// We run into troubles: when TruncLines is called, the
 // conditions in IsInside change immediately such that
 // IsBreakNow can return different results.
-// For this reason, we make it clear to rFrameBreak, that 
the
+// For this reason, we tell rFrameBreak that the
 // end is reached at the location of rLine.
 // Let's see if it works ...
 aLine.TruncLines();
@@ -1328,19 +1328,19 @@ void SwTextFrame::Format_( SwTextFormatter , 
SwTextFormatInfo ,
 nOldBottom = 0;
 rLine.CharToLine( rReformat.Start() );
 
-// Words can be swapped-out when inserting a space into the
-// line that comes before the edited one. That's why we also
-// need to format that.
-// Optimization: If rReformat starts after the first word of the line
+// When inserting or removing a Space, words can be moved out of the edited
+// line and into the preceding line, hence the preceding line must be
+// formatted as well.
+// Optimization: If rReformat starts after the first word of the line,
 // this line cannot possibly influence the previous one.
-// Unfortunately it can: Text size changes + FlyFrames.
-// The backlash can affect multiple lines (Frame!)!
+// ...Turns out that unfortunately it can: Text size changes + FlyFrames;
+// the feedback can affect multiple lines (Frames!)!
 
 // i#46560
-// FME: Yes, consider this case: (word) has to go to the next line
-// because) is a forbidden character at the beginning of a line although
-// (word would still fit on the previous line. Adding text right in front
-// of) would

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

2019-02-28 Thread Libreoffice Gerrit user

 sw/source/core/text/xmldump.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 9ed367da9cf7ff283762cb79a97238defe85c30c
Author: Michael Stahl 
AuthorDate: Tue Feb 26 18:37:18 2019 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 28 11:03:32 2019 +0100

sw: dump SwCellFrame rowspan in layout.xml

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

diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 0b57bb1a5581..5a25baaeb264 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -360,6 +361,12 @@ void SwFrame::dumpAsXml( xmlTextWriterPtr writer ) const
 }
 }
 
+if (IsCellFrame())
+{
+SwCellFrame const* pCellFrame(static_cast(this));
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "rowspan" ), 
"%ld", pCellFrame->GetLayoutRowSpan() );
+}
+
 xmlTextWriterStartElement( writer, BAD_CAST( "infos" ) );
 dumpInfosAsXml( writer );
 xmlTextWriterEndElement( writer );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/starmath

2019-02-28 Thread Libreoffice Gerrit user

 default_images/starmath/res/alh21802.png  |binary
 default_images/starmath/res/alh21803.png  |binary
 default_images/starmath/res/alh21804.png  |binary
 default_images/starmath/res/alh21805.png  |binary
 default_images/starmath/res/alh21809.png  |binary
 default_images/starmath/res/alh21810.png  |binary
 default_images/starmath/res/alh21811.png  |binary
 default_images/starmath/res/alh21812.png  |binary
 default_images/starmath/res/alh21813.png  |binary
 default_images/starmath/res/alh21814.png  |binary
 default_images/starmath/res/alh21821.png  |binary
 default_images/starmath/res/alh21822.png  |binary
 default_images/starmath/res/alh21824.png  |binary
 default_images/starmath/res/alh21825.png  |binary
 default_images/starmath/res/alh21826.png  |binary
 default_images/starmath/res/ath21717.png  |binary
 default_images/starmath/res/ath21718.png  |binary
 default_images/starmath/res/ath21719.png  |binary
 default_images/starmath/res/ath21720.png  |binary
 default_images/starmath/res/bih21301.png  |binary
 default_images/starmath/res/bih21302.png  |binary
 default_images/starmath/res/bih21303.png  |binary
 default_images/starmath/res/bih21305.png  |binary
 default_images/starmath/res/bih21306.png  |binary
 default_images/starmath/res/coh21901.png  |binary
 default_images/starmath/res/dist101.png   |binary
 default_images/starmath/res/dist101_h.png |binary
 default_images/starmath/res/dist102.png   |binary
 default_images/starmath/res/dist102_h.png |binary
 default_images/starmath/res/dist103.png   |binary
 default_images/starmath/res/dist103_h.png |binary
 default_images/starmath/res/dist104.png   |binary
 default_images/starmath/res/dist104_h.png |binary
 default_images/starmath/res/dist11.png|binary
 default_images/starmath/res/dist11_h.png  |binary
 default_images/starmath/res/dist12.png|binary
 default_images/starmath/res/dist12_h.png  |binary
 default_images/starmath/res/dist13.png|binary
 default_images/starmath/res/dist13_h.png  |binary
 default_images/starmath/res/dist21.png|binary
 default_images/starmath/res/dist21_h.png  |binary
 default_images/starmath/res/dist22.png|binary
 default_images/starmath/res/dist22_h.png  |binary
 default_images/starmath/res/dist31.png|binary
 default_images/starmath/res/dist31_h.png  |binary
 default_images/starmath/res/dist32.png|binary
 default_images/starmath/res/dist32_h.png  |binary
 default_images/starmath/res/dist41.png|binary
 default_images/starmath/res/dist41_h.png  |binary
 default_images/starmath/res/dist42.png|binary
 default_images/starmath/res/dist42_h.png  |binary
 default_images/starmath/res/dist51.png|binary
 default_images/starmath/res/dist51_h.png  |binary
 default_images/starmath/res/dist52.png|binary
 default_images/starmath/res/dist52_h.png  |binary
 default_images/starmath/res/dist61.png|binary
 default_images/starmath/res/dist61_h.png  |binary
 default_images/starmath/res/dist62.png|binary
 default_images/starmath/res/dist62_h.png  |binary
 default_images/starmath/res/dist71.png|binary
 default_images/starmath/res/dist71_h.png  |binary
 default_images/starmath/res/dist72.png|binary
 default_images/starmath/res/dist72_h.png  |binary
 default_images/starmath/res/dist81.png|binary
 default_images/starmath/res/dist81_h.png  |binary
 default_images/starmath/res/dist82.png|binary
 default_images/starmath/res/dist82_h.png  |binary
 default_images/starmath/res/dist91.png|binary
 default_images/starmath/res/dist91_h.png  |binary
 default_images/starmath/res/dist92.png|binary
 default_images/starmath/res/dist92_h.png  |binary
 default_images/starmath/res/fuh21521.png  |binary
 default_images/starmath/res/fuh21522.png  |binary
 default_images/starmath/res/fuh21523.png  |binary
 default_images/starmath/res/fuh21524.png  |binary
 default_images/starmath/res/imh21107.png  |binary
 default_images/starmath/res/imh21108.png  |binary
 default_images/starmath/res/mi21608.png   |binary
 default_images/starmath/res/mi21612.png   |binary
 default_images/starmath/res/mi22003.png   |binary
 default_images/starmath/res/mi22004.png   |binary
 default_images/starmath/res/mi22005.png   |binary
 default_images/starmath/res/mi22006.png   |binary
 default_images/starmath/res/mi22007.png   |binary
 default_images/starmath/res/mi22008.png   |binary
 default_images/starmath/res/mi22009.png   |binary
 default_images/starmath/res/mi22010.png   |binary
 default_images/starmath/res/mi22011.png   |binary
 default_images/starmath/res/mi22012.png   |binary
 default_images/starmath/res/mi22013.png   |binary
 default_images/starmath/res/mi22014.png   |binary
 default_images/starmath/res/mi22015.png   |binary
 default_images/starmath/res/mi22016.png   |binary
 default_images/starmath/res/mi22017.png   |binary
 default_images/starmath/res/mi22018.png   |binary
 default_images/starmath/res/mi22019.png   |binary
 default_images/starmath/res/mih21608.png  |binary
 default_images/starmath/res/mih21612.png  |binary

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

2019-02-28 Thread Libreoffice Gerrit user

 uui/source/lockcorrupt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5af5b23c8f0dde000eb025a01b07881b8f4a71e9
Author: Noel Grandin 
AuthorDate: Thu Feb 28 10:55:01 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 28 13:41:08 2019 +0100

fix LockCorruptQueryBox title

regression from
commit 082e69fefb7439fd4f3d543f0c402039e94c1e9c
Date:   Mon Feb 26 16:53:37 2018 +
convert various MessBox to weld::MessageDialog

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

diff --git a/uui/source/lockcorrupt.cxx b/uui/source/lockcorrupt.cxx
index bba82db1db3f..008d4555a520 100644
--- a/uui/source/lockcorrupt.cxx
+++ b/uui/source/lockcorrupt.cxx
@@ -28,7 +28,7 @@ LockCorruptQueryBox::LockCorruptQueryBox(weld::Window* 
pParent, const std::local
 : m_xQueryBox(Application::CreateMessageDialog(pParent, 
VclMessageType::Question,
   VclButtonsType::NONE, Translate::get(STR_LOCKCORRUPT_MSG, 
rResLocale)))
 {
-m_xQueryBox->set_title(Translate::get(STR_LOCKCORRUPT_MSG, rResLocale));
+m_xQueryBox->set_title(Translate::get(STR_LOCKCORRUPT_TITLE, rResLocale));
 m_xQueryBox->add_button(Translate::get(STR_LOCKCORRUPT_OPENREADONLY_BTN, 
rResLocale), RET_OK);
 
m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), 
RET_CANCEL);
 m_xQueryBox->set_default_response(RET_OK);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

offline help

2019-02-28 Thread pnbs!

Dear Libre office

I can not find where to download offline Help. I really need it, I also wish it 
was easier to find and also I wished they would put a link in office program.

Thanks
S.

Sent from [ProtonMail](https://protonmail.com), a more secure e-mail.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Extending subsequent tests with dogtail tests?

2019-02-28 Thread Noel Grandin

On Sun, 24 Feb 2019 at 22:04, Samuel Thibault  wrote:

> The fact that even the C UI strings may change is a concern indeed. We
> however don't really have another way to identify widgets, do we? (we
> don't want to identify them structurally, that'd be even less stable)
>
>
The LibreOffice python UI tests use IDs that are maintained in the .ui
files (and are just strings), which are relatively stable.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: offline help

2019-02-28 Thread Kaganski Mike

Hi S.!

On 28.02.2019 6:51, pnbs! wrote:
> I can not find where to download offline Help. I really need it, I also 
> wish it was easier to find and also I wished they would put a link in 
> office program.

Unfortunately, you didn't mention what is your LibreOffice version and 
operating system are, but assuming you run Windows, please check if 
https://ask.libreoffice.org/en/question/168924/off-line-help-for-6062/ 
helps.

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: How to get a bitmap of page or shape in a unit test?

2019-02-28 Thread Michael Stahl


On 28.02.19 01:31, Regina Henschel wrote:
The shape members mXRenderedCustomShape and  mxCustomShapeEngine are 
empty. I have tried to generate them by calling 
GetSdrObjectFromCustomShape(). It sets 
"com.sun.star.drawing.EnhancedCustomShapeEngine" as engine. But in the 
given context the servicemanager has it neither in data_.services nor in 
data_.namedImplementations.


try this: git grep EnhancedCustomShapeEngine | grep component

the problem is that sd/CppunitTest_sd_import_tests lacks the component 
file "svx/util/svx" - it only has "svx/util/svxcore".


ceterum censeo that integration tests should just use the complete 
service.rdb instead of wasting everybody's time with tracking down 
missing components all the time.

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

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

2019-02-28 Thread Libreoffice Gerrit user

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

New commits:
commit e76203f45a4c645447f8379ee2123f518a8aca77
Author: Noel Grandin 
AuthorDate: Thu Feb 28 11:41:01 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 28 13:36:15 2019 +0100

fix "doc will be saved" dialog message

looks like a copy/paste error in
commit 942f05996bc287923cdbcae12c64e57adf8ec975
Author: Caolán McNamara 
convert remaining ErrorBox to weld::MessageDialog

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

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 222cbf62ca58..dd91eff637d9 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -974,7 +974,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
 {
 std::unique_ptr 
xQueryBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : 
nullptr,

VclMessageType::Question, VclButtonsType::YesNo,
-   
ScResId(STR_REIMPORT_AFTER_LOAD)));
+   
ScResId(STR_DOC_WILLBESAVED)));
 xQueryBox->set_default_response(RET_YES);
 if (xQueryBox->run() == RET_NO)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlimport2.mk sw/qa writerfilter/source

2019-02-28 Thread Libreoffice Gerrit user

 sw/CppunitTest_sw_ooxmlimport2.mk |1 +
 sw/qa/extras/ooxmlimport/data/tdf121440.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |   17 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 4 files changed, 24 insertions(+)

New commits:
commit 691ca4e1a3e510d54894a1e7df7fa4ad9f9cba11
Author: Vasily Melenchuk 
AuthorDate: Mon Feb 25 08:35:54 2019 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Feb 28 13:37:24 2019 +0100

tdf#121440 writerfilter: do not use imported style for foot/endnotes

Extra style is causing editing problem near footnote/endnote
references. This behavior is a side effect of
eaa9cf6a3069fba3d82c046f0041bfb537d9e648, allowing emission
of these "technical" styles.

Change-Id: I1885b92814746e7b5cd19f3ddd7bc22eb691615e
Reviewed-on: https://gerrit.libreoffice.org/68304
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk 
b/sw/CppunitTest_sw_ooxmlimport2.mk
index c269c7282028..1760b61e98b3 100644
--- a/sw/CppunitTest_sw_ooxmlimport2.mk
+++ b/sw/CppunitTest_sw_ooxmlimport2.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlimport2,\
 $(eval $(call gb_CppunitTest_set_include,sw_ooxmlimport2,\
 -I$(SRCDIR)/sw/inc \
 -I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
 -I$(SRCDIR)/sw/qa/extras/inc \
 $$(INCLUDE) \
 ))
diff --git a/sw/qa/extras/ooxmlimport/data/tdf121440.docx 
b/sw/qa/extras/ooxmlimport/data/tdf121440.docx
new file mode 100644
index ..023599aec3ff
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf121440.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index e29432694e9a..7a03744d46f2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -17,6 +17,7 @@
 #endif
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -306,6 +307,22 @@ DECLARE_OOXMLIMPORT_TEST(testTdf14, "tdf14.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("2000"), xCell->getString());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf121440, "tdf121440.docx")
+{
+// Insert some text in front of footnote
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+SwRootFrame* pLayout(pWrtShell->GetLayout());
+CPPUNIT_ASSERT(!pLayout->IsHideRedlines());
+pWrtShell->Insert("test");
+
+// Ensure that inserted text is not superscripted
+CPPUNIT_ASSERT_EQUAL_MESSAGE(
+"Inserted text should be not a superscript!", 
static_cast(0),
+getProperty(getRun(getParagraph(1), 1), "CharEscapement"));
+}
+
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in 
ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2a1be9d95cfc..cc8f1c555621 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2015,6 +2015,12 @@ void DomainMapper_Impl::PushFootOrEndnote( bool 
bIsFootnote )
 m_aRedlines.push(std::vector< RedlineParamsPtr >());
 
 PropertyMapPtr pTopContext = GetTopContext();
+
+// Remove style reference, if any. This reference did appear here as a 
side effect of tdf#43017
+// Seems it is not required by LO, but causes side effects during 
editing. So remove it
+// for footnotes/endnotes to restore original LO behavior here.
+pTopContext->Erase(PROP_CHAR_STYLE_NAME);
+
 uno::Reference< text::XText > xFootnoteText;
 if (GetTextFactory().is())
 xFootnoteText.set( GetTextFactory()->createInstance(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice ESC call, Thur - 16:00 central European (local) time

2019-02-28 Thread Michael Meeks

Hi everyone,

Prototype agenda below, sorry it's a bit late. Bug metrics also
at the link below; extra items appreciated as last-week:

https://demo.collaboracloudsuite.com/tdf/

Lets use the new TDF jitsi goodness this week at:

http://jitsi.documentfoundation.org/esc

ATB,

Michael.

* Present:
+ 

* Completed Action Items:

* Pending Action Items:
+ review/update GSOC ideas page! (Mentors)
  + https://wiki.documentfoundation.org/Development/GSoC/Ideas
  + deadline: early next week   
+ disable popups for development-build only in 6.2/.3 (Justin L)
https://bugs.documentfoundation.org/show_bug.cgi?id=123270
  [ sent some code pointers ]

* Release Engineering update (Christian)
+ 6.2.1 rc2 status
+ 6.1.6 rc1: April 9 
+ 6.3 alpha1: early May
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
254(254) (topicUI) bugs open, 257(257) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added  6(-1)17(0) 36(-1)  98(1)  
 commented 55(19)   135(-3)   428(17)1440(15) 
   removed  3(3)  3(3)  7(0)   18(4)  
  resolved  2(-2)14(-6)44(2)  124(2)  
+ top 10 contributors:
  Tietze, Heiko made 83 changes in 1 month, and 586 changes in 1 year
  Cor Nouws made 36 changes in 1 month, and 113 changes in 1 year
  Mehrbrodt, Samuel made 30 changes in 1 month, and 73 changes in 1 year
  Dieter Praas made 27 changes in 1 month, and 152 changes in 1 year
  Foote, V Stuart made 24 changes in 1 month, and 221 changes in 1 year
  Kainz, Andreas made 18 changes in 1 month, and 163 changes in 1 year
  Thomas Lendo made 18 changes in 1 month, and 348 changes in 1 year
  Xisco Faulí made 17 changes in 1 month, and 290 changes in 1 year
  Telesto made 15 changes in 1 month, and 63 changes in 1 year
  kompilainenn made 10 changes in 1 month, and 112 changes in 1 year
* Crash Testing (Caolan)
+ 1(+0) import failure, 4(+0) export failures
  - redline-related (?)
+ coverity issues
  - coverity is back up
  - but we now need c++17, which isn’t working yet
  - asked coverity, and “new version will be deployed in the coming few
months”
+ Google / ossfuzz:
  - 9 issues, 8 timeouts, 1 leak
  - some fixed, other appeared 
+ ForcePoint, round 9
+ had a run, but did not get any new ones; probably fixed
+ CVE issues
+ will be able to handle CVE’s ourselves (Caolán)
+ CNA process
+ have an appointment for on-boarding video: ~22nd.

* Crash Reporting (Xisco, Heiko)
  + http://crashreport.libreoffice.org/stats/version/6.1.3.2
+ 1058 1064 (+6)
  + http://crashreport.libreoffice.org/stats/version/6.1.4.2
+ 1392 1478 (+86)
  + http://crashreport.libreoffice.org/stats/version/6.1.5.2
+ 248 382 (+134)
  + http://crashreport.libreoffice.org/stats/version/6.2.0.3
+ 1107 1435 (+328)


* Hackfests & Events (Thorsten)
   + this year hackfests coming up:
+ Tirana perhaps in March/April
+ https://forum.openlabs.cc/t/libreoffice-hackfest-tirana-2019/1658
  + no definitive dates here; reply on the post perhaps (Xisco)
  + hope to have a date the next week   
+ Paris in summer – end of June
  + discuss timing – end of June or sometime July 
  + please let Sophie know your preferences if you like to attend
+ tentative Dresden: late autumn (past mid-October, for having students)
   + hope to have one each quarter.

* GSOC 2019 (Thorsten, Xisco)
   + Accepted …
   + mentors should accept their invites ...

* C++ lectures (Xisco)
+ https://wiki.documentfoundation.org/Events/C%2B%2BLectures
+ NEXT SESSION: 28th February

* mentoring/easyhack update
  committer...   1 week  1 month  3 months  12 months   
  open  138(83) 178(73)   182(73)   197(74) 
   reviews 1289(62)4714(-119)   13270(-262)   42394(643)
merged  260(-15)   1145(-26) 3508(-147)   14660(-39)
 abandoned   15(8)   57(-2)   148(2)828(-3) 
   own commits  257(-35)   1050(-1)  3240(-65)14726(-37)
review commits   94(25) 288(-18) 1071(41)  3885(30) 
contributor...   1 week1 month3 months   12 months
  open 14(-14)35(-10)36(-11)  37(-11) 
   reviews 57(-1)198(-14)   512(-30)   10817(-603)
merged 33(5) 126(2) 429(9)  1798(-4)  
 abandoned  2(-3) 23(-4) 73(-1)  313(-1)  
   own commits

Minutes from the UX/design meeting 2019-Feb-28

2019-02-28 Thread Heiko Tietze

Present: Heiko

Tickets 

* Thicker border line than 9 pt or 5 cm
   + https://bugs.documentfoundation.org/show_bug.cgi?id=122511
   + WFM (users who need larger frames could do that by rectangles) or have a 
larger maximum?
   + issue is about page > border (max 9pt) and shape | lines (5cm)
   + sidebar maximum for line width is 500pt
   + missing use case but also limiting to a non-sensible value is unclear
   + No objection to set wider limitation (Franklin)
   => accepted

 * Should be possible to customise menus or toolbars delivered with an extension
   + https://bugs.documentfoundation.org/show_bug.cgi?id=123590
   + faced the same problem (Franklin)
   + extensions are special solutions for a specific use case; 
 customization is needed for inbuilt options
   => keep ticket open

 * New wizard for filling bank checks
   + https://bugs.documentfoundation.org/show_bug.cgi?id=123599
   + some comments on BZ to handle it as extension
   => closed by OP as WF

 * Enable Find & Replace by format in Impress & Draw
 * Enable Find & Replace by Attribute in Impress & Draw
   + https://bugs.documentfoundation.org/show_bug.cgi?id=92584
   + https://bugs.documentfoundation.org/show_bug.cgi?id=92608
   + to find & replace objects (by any property) sounds weird; 
 better enhance the Navigator (and resolve as WF) (Heiko)
   + see also https://bugs.documentfoundation.org/show_bug.cgi?id=100698
   + see also https://bugs.documentfoundation.org/show_bug.cgi?id=92603
   => make 92584 a duplicate of 92608
   => no negative effect from enhancing the existing F dialog, so +1

 * Properties to save with drawings
   + grid settings https://bugs.documentfoundation.org/show_bug.cgi?id=78035
 + is saved and restored but global settings apply when changed (Regina)
   => treat as a bug
   + measure units: https://bugs.documentfoundation.org/show_bug.cgi?id=83325
   - measure units: https://bugs.documentfoundation.org/show_bug.cgi?id=98453
   => both dup of 59068
   + drawing scale per page: 
https://bugs.documentfoundation.org/show_bug.cgi?id=59068
   => as a general rule of thumb we define defaults in T>O and allow document 
specific 
 values to be changed in dialogs (e.g. View > Fields vs. T>O>Writer>View)





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

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

2019-02-28 Thread 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: sfx2/inc sfx2/Library_sfx.mk sfx2/source

2019-02-28 Thread Libreoffice Gerrit user

 sfx2/Library_sfx.mk|1 
 sfx2/inc/SfxRedactionHelper.hxx|   69 
 sfx2/source/doc/SfxRedactionHelper.cxx |  180 +
 sfx2/source/doc/objserv.cxx|  147 ++
 4 files changed, 261 insertions(+), 136 deletions(-)

New commits:
commit 34ab7b37709fbf889f90b30790573f5ab2521e94
Author: Muhammet Kara 
AuthorDate: Mon Feb 25 14:43:28 2019 +0300
Commit: Muhammet Kara 
CommitDate: Thu Feb 28 12:58:28 2019 +0100

Create the SfxRedactionHelper class

And move some code pieces, related to the redaction functionality,
from objserv.cxx to the new SfxRedactionHelper.cxx file.

Change-Id: I6491c9b581ea6d3a05a72117c5b72e1dc19025dc
Reviewed-on: https://gerrit.libreoffice.org/68338
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index aefc85202685..6b10dfa021ee 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -226,6 +226,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/doc/docundomanager \
 sfx2/source/doc/sfxbasemodel \
 sfx2/source/doc/sfxmodelfactory \
+sfx2/source/doc/SfxRedactionHelper \
 sfx2/source/doc/syspath \
 sfx2/source/doc/zoomitem \
 sfx2/source/doc/templatedlg \
diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
new file mode 100644
index ..d338143c608e
--- /dev/null
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_CUI_SOURCE_INC_SFXREDACTIONHELPER_HXX
+#define INCLUDED_CUI_SOURCE_INC_SFXREDACTIONHELPER_HXX
+
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
+class SfxRequest;
+class SfxStringItem;
+class GDIMetaFile;
+class DocumentToGraphicRenderer;
+class SfxViewFrame;
+
+/*
+ * Mostly a bunch of static methods to handle the redaction functionality at
+ * different points of the process.
+ **/
+class SfxRedactionHelper
+{
+public:
+/// Checks to see if the request has a parameter of IsRedactMode:bool=true
+static bool isRedactMode(const SfxRequest& rReq);
+/*
+ * Returns the value of the given string param as an OUString
+ * Returns empty OUString if no param
+ * */
+static OUString getStringParam(const SfxRequest& rReq, const sal_uInt16& 
nParamId);
+/*
+ * Creates metafiles from the pages of the given document,
+ * and pushes into the given vector.
+ * */
+static void getPageMetaFilesFromDoc(std::vector& aMetaFiles,
+const sal_Int32& nPages,
+DocumentToGraphicRenderer& aRenderer, 
bool bIsWriter,
+bool bIsCalc);
+/*
+ * Creates one shape and one draw page for each gdimetafile,
+ * and inserts the shapes into the newly created draw pages.
+ * */
+static void addPagesToDraw(uno::Reference& xComponent, const 
sal_Int32& nPages,
+   const std::vector& aMetaFiles, 
bool bIsCalc);
+/*
+ * Makes the Redaction toolbar visible to the user.
+ * Meant to be called after converting a document to a Draw doc
+ * for redaction purposes.
+ * */
+static void showRedactionToolbar(SfxViewFrame* pViewFrame);
+};
+
+#endif // INCLUDED_CUI_SOURCE_INC_SFXREDACTIONHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx 
b/sfx2/source/doc/SfxRedactionHelper.cxx
new file mode 100644
index ..b23ed271eb87
--- /dev/null
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -0,0 +1,180 @@
+/* -*- 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 
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
+bool SfxRedactionHelper::isRedactMode(const SfxRequest& rReq)
+{
+const SfxItemSet* pArgs = rReq.GetArgs();
+if (pArgs)
+{
+const

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

2019-02-28 Thread Libreoffice Gerrit user

 sc/source/core/data/column2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit beba45a5639bc32ca6893885ca3b1f07e3175c08
Author: Luboš Luňák 
AuthorDate: Mon Feb 25 14:37:48 2019 +0100
Commit: Michael Meeks 
CommitDate: Thu Feb 28 16:53:06 2019 +0100

avoid std::out_of_range thrown by mdds (tdf#122643)

Calling GetLastDataRow/Pos() with MAXROW as the last row is apparently
fine, but if that's an invalid row, but anything beyond that is not ok.
ScDependantsCalculator::trimLength() may use such larger "last" row
value because it works on a range of cells.

Change-Id: I819a4d20a4765e23af6208df5f2e208ac44b694c
Reviewed-on: https://gerrit.libreoffice.org/68349
Tested-by: Jenkins
Reviewed-by: Michael Meeks 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index b937bfaa1ded..7639ca7ddc26 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1299,7 +1299,7 @@ SCROW ScColumn::GetLastDataPos() const
 SCROW ScColumn::GetLastDataPos( SCROW nLastRow, bool bConsiderCellNotes,
 bool bConsiderCellDrawObjects ) const
 {
-sc::CellStoreType::const_position_type aPos = maCells.position(nLastRow);
+sc::CellStoreType::const_position_type aPos = 
maCells.position(std::min(nLastRow,MAXROW));
 
 if (bConsiderCellNotes && !IsNotesEmptyBlock(nLastRow, nLastRow))
 return nLastRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 vcl/source/filter/graphicfilter.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 5bd1ac0083bf6047fd1b977f24ae5ffb7018f2a8
Author: Tor Lillqvist 
AuthorDate: Wed Feb 27 14:28:55 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 28 17:16:49 2019 +0100

tdf#122537: Use "best speed" instead of default compression level on iOS

Speed is more important than size in the use case where this showed up
in a profile of the iOS app (inserting an image). This change causes
zlib's deflate_fast() being used instead of its deflate_slow(). For a
specific image I tested with the former takes 1.5 s, the latter 3.4 s.

This is just one aspect of the slowness of image insertio. The
resizing operations mentioned in the bug report is not yet
investigated.

Change-Id: Icf023522b965cb0265000c821a478610d098cd0a
Reviewed-on: https://gerrit.libreoffice.org/68434
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/68488
Tested-by: Jenkins

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 74bd19f35187..294fc93975cc 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2479,6 +2479,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, 
rData, bool )
 
 sal_uInt16  nFormat = GRFILTER_FORMAT_DONTKNOW;
 OString aShortName;
+css::uno::Sequence< css::beans::PropertyValue > aFilterData;
 switch( rData.mnFormat )
 {
 case ConvertDataFormat::BMP: aShortName = BMP_SHORTNAME; break;
@@ -2505,8 +2506,17 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, 
rData, bool )
 else if( !aShortName.isEmpty() )
 {
 // Export
+#ifdef IOS
+if (aShortName == PNG_SHORTNAME)
+{
+aFilterData.realloc(aFilterData.getLength() + 1);
+aFilterData[aFilterData.getLength() - 1].Name = "Compression";
+// We "know" that this gets passed to zlib's deflateInit2_(). 1 
means best speed.
+aFilterData[aFilterData.getLength() - 1].Value <<= 1;
+}
+#endif
 nFormat = GetExportFormatNumberForShortName( 
OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) );
-bRet = ExportGraphic( rData.maGraphic, OUString(), rData.mrStm, 
nFormat ) == ERRCODE_NONE;
+bRet = ExportGraphic( rData.maGraphic, OUString(), rData.mrStm, 
nFormat,  ) == ERRCODE_NONE;
 }
 
 return bRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sc/inc/table.hxx   |   13 +++--
 sc/source/core/data/table1.cxx |8 
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit f9845d1a2dd84e7bbc9975b3a301b5a9bd38fb4a
Author: Noel Grandin 
AuthorDate: Thu Feb 28 14:45:17 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 28 19:03:07 2019 +0100

simplify CreateColumnIfNotExists

if "if (aOldColSize==0)" check can never be hit since we pre-allocate
these columns to some size.

Also move the cold part of the function out-of-line, doesn't seem useful
to have all of it in a header

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

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index ee217ba50c82..a4dd113a0cd9 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -276,18 +276,11 @@ public:
 ScColumn& CreateColumnIfNotExists( const SCCOL nScCol )
 {
 if ( nScCol >= aCol.size() )
-{
-const SCCOL aOldColSize = aCol.size();
-bool bUseEmptyAttrArray = false;
-if ( aOldColSize == 0 )
-bUseEmptyAttrArray = true;
-aCol.resize( static_cast< size_t >( nScCol + 1 ) );
-for (SCCOL i = aOldColSize; i <= nScCol; i++)
-aCol[i].Init( i, nTab, pDocument, bUseEmptyAttrArray );
-
-}
+CreateColumnIfNotExistsImpl(nScCol);
 return aCol[nScCol];
 }
+// out-of-line the cold part of the function
+void CreateColumnIfNotExistsImpl( const SCCOL nScCol );
 sal_uLong   GetCellCount() const;
 sal_uLong   GetWeightedCount() const;
 sal_uLong   GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 7cc9f679..6fb453807604 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -2533,4 +2533,12 @@ ScColumnsRange ScTable::GetColumnsRange(SCCOL nColBegin, 
SCCOL nColEnd) const
ScColumnsRange::Iterator( aCol.begin() + nEffEnd));
 }
 
+// out-of-line the cold part of the CreateColumnIfNotExists function
+void ScTable::CreateColumnIfNotExistsImpl( const SCCOL nScCol )
+{
+const SCCOL aOldColSize = aCol.size();
+aCol.resize( static_cast< size_t >( nScCol + 1 ) );
+for (SCCOL i = aOldColSize; i <= nScCol; i++)
+aCol[i].Init( i, nTab, pDocument, false );
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 loleaflet/src/layer/tile/TileLayer.js |   17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 57b1876d67343431337e3600b9d4ec924c9866ff
Author: merttumer 
AuthorDate: Thu Feb 14 22:01:34 2019 +0300
Commit: Mert Tümer 
CommitDate: Thu Feb 28 16:31:41 2019 +0100

Fix Typing causes the other view to jump back to its cursor

This bug causes scrolling impossible when multiple users
working on the same document. When one view is typing
the others jump back to their cursors
Change-Id: I8e028fbfcecd2123db8abe57f0ffedd3d35f2b21
Signed-off-by: merttumer 
Reviewed-on: https://gerrit.libreoffice.org/67846
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
(cherry picked from commit d8ec4146ff4f365de21e733db07d679e91d9bd74)
Reviewed-on: https://gerrit.libreoffice.org/68487

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index cffd800bf..9c677a9f8 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -89,6 +89,8 @@ L.TileLayer = L.GridLayer.extend({
this._visibleCursor = new L.LatLngBounds(new L.LatLng(0, 0), 
new L.LatLng(0, 0));
// Do we have focus - ie. should we render a cursor
this._isFocused = true;
+   // Last cursor position for invalidation
+   this.lastCursorPos = this._visibleCursor.getNorthWest();
// Are we zooming currently ? - if so, no cursor.
this._isZooming = false;
// Cursor is visible or hidden (e.g. for graphic selection).
@@ -792,17 +794,27 @@ L.TileLayer = L.GridLayer.extend({
this._visibleCursor = new L.LatLngBounds(

this._twipsToLatLng(topLeftTwips, this._map.getZoom()),

this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
+   var cursorPos = this._visibleCursor.getNorthWest();
if ((docLayer._followEditor || docLayer._followUser) && 
this._map.lastActionByUser) {
this._map._setFollowing(false, null);
}
this._map.lastActionByUser = false;
-
if (!this._map._isFocused && this._map._permission === 'edit') {
// Regain cursor if we had been out of focus and now 
have input.
this._map.fire('editorgotfocus');
}
 
-   this._onUpdateCursor(this._viewId === modifierViewId);
+   //first time document open, set last cursor position
+   if (this.lastCursorPos.lat === 0 && this.lastCursorPos.lng === 
0)
+   this.lastCursorPos = cursorPos;
+   
+   var updateCursor = false;
+   if ((this.lastCursorPos.lat !== cursorPos.lat) || 
(this.lastCursorPos.lng !== cursorPos.lng)) {
+   updateCursor = true;
+   this.lastCursorPos = cursorPos;
+   }
+
+   this._onUpdateCursor(updateCursor && (modifierViewId === 
this._viewId));
},
 
_updateEditor: function(textMsg) {
@@ -1616,7 +1628,6 @@ L.TileLayer = L.GridLayer.extend({
center = 
center.subtract(this._map.getSize().divideBy(2));
center.x = Math.round(center.x < 0 ? 0 : center.x);
center.y = Math.round(center.y < 0 ? 0 : center.y);
-
if (!(this._selectionHandles.start && 
this._selectionHandles.start.isDragged) &&
!(this._selectionHandles.end && 
this._selectionHandles.end.isDragged) &&
!(docLayer._followEditor || docLayer._followUser)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sc/source/ui/app/scmod.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3e67a8f56b459844c6e7ab4f5cf8b4e70bd7c5b6
Author: Stephan Bergmann 
AuthorDate: Thu Feb 28 16:47:52 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 28 16:47:52 2019 +0100

missing include

Change-Id: Icaad7f774ecc973114d7e569327dae3dcb1bbcc5

diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 588307ce3fc0..e9edaffad9e1 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -86,6 +86,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define ShellClass_ScModule
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sw/source/ui/dbui/createaddresslistdialog.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 205e2d6c31b186b70a704516580761a75099
Author: Caolán McNamara 
AuthorDate: Thu Feb 28 10:19:32 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 28 17:22:52 2019 +0100

address list doesn't refresh on pressing 'delete'

m_nCurrentDataSet doesn't change, so it doesn't refill it, even
though m_nCurrentDataSet was deleted so it no refers to a new
entry

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

diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx 
b/sw/source/ui/dbui/createaddresslistdialog.cxx
index a05eba96f9d8..73cb33b9b68f 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -84,7 +84,8 @@ public:
 voidSetData(SwCSVData& rDBData);
 
 voidSetCurrentDataSet(sal_uInt32 nSet);
-sal_uInt32  GetCurrentDataSet() const { return m_nCurrentDataSet;}
+voidCurrentDataSetInvalidated() { m_nCurrentDataSet = 
std::numeric_limits::max(); }
+sal_uInt32  GetCurrentDataSet() const { return m_nCurrentDataSet; }
 voidSetCursorTo(std::size_t nElement);
 virtual void Resize() override;
 };
@@ -543,6 +544,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, DeleteHdl_Impl, 
Button*, void)
 m_pCSVData->aDBData[0].assign(m_pCSVData->aDBData[0].size(), 
OUString());
 m_pDeletePB->Enable(false);
 }
+m_pAddressControl->CurrentDataSetInvalidated();
 m_pAddressControl->SetCurrentDataSet(nCurrent);
 m_pSetNoNF->SetMax(m_pCSVData->aDBData.size());
 UpdateButtons();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sc/inc/postit.hxx   |  114 ++-
 sc/inc/scmod.hxx|2 
 sc/qa/unit/ucalc.cxx|   18 -
 sc/source/core/data/documen3.cxx|2 
 sc/source/core/data/document.cxx|8 
 sc/source/core/data/postit.cxx  |  568 
 sc/source/core/tool/detfunc.cxx |2 
 sc/source/filter/excel/xeescher.cxx |2 
 sc/source/filter/xml/xmlexprt.cxx   |   10 
 sc/source/ui/app/scmod.cxx  |   28 +
 sc/source/ui/docshell/docfunc.cxx   |4 
 sc/source/ui/docshell/docsh.cxx |   20 -
 sc/source/ui/drawfunc/futext3.cxx   |4 
 sc/source/ui/inc/docsh.hxx  |2 
 sc/source/ui/inc/notemark.hxx   |3 
 sc/source/ui/inc/undocell.hxx   |   45 --
 sc/source/ui/undo/undocell.cxx  |  184 ---
 sc/source/ui/unoobj/editsrc.cxx |2 
 sc/source/ui/unoobj/notesuno.cxx|2 
 sc/source/ui/view/drawview.cxx  |2 
 sc/source/ui/view/gridwin.cxx   |2 
 sc/source/ui/view/notemark.cxx  |2 
 sc/source/ui/view/tabview5.cxx  |2 
 sc/source/ui/view/viewfun6.cxx  |2 
 24 files changed, 638 insertions(+), 392 deletions(-)

New commits:
commit 05602710a047c58db0ceda88bedc291420990bc1
Author: Luboš Luňák 
AuthorDate: Tue Feb 12 13:48:53 2019 +0100
Commit: Michael Meeks 
CommitDate: Thu Feb 28 15:52:51 2019 +0100

reintroduce ScCaptionPtr

This basically reverts b6b1ded0a0539e7be1b5338de378a3276a6ff445, since it
introduces tdf#118707, and I cannot reproduce any of the original problems
when reverting.
The patch itself is technically correct, but the problem is in the Windows
implementation of clipboard handling, which uses delayed processing
of setting clipboard contents. This leads to previous clipboard contents
being deleted too late, and with shared_ptr instances of SdrCaptionObj may
get deleted after the related SdrModel has already been deleted.
A proper fix would be to remove the stupid delayed processing from
the clipboard code, but that's non-trivial. If that gets fixed, the change
removing ScCaptionPtr may most probably be applied again.

Change-Id: I29634847486aa955b20483c9eb38bba4fed87187
Reviewed-on: https://gerrit.libreoffice.org/67725
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 4700979cd04a..11c5d9b5f84b 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -36,6 +36,110 @@ class ScDocument;
 namespace tools { class Rectangle; }
 struct ScCaptionInitData;
 
+/** Some desperate attempt to fight against the caption object ownership mess,
+to which none of shared/weak/plain pointer is a cure.
+ */
+class ScCaptionPtr
+{
+public:
+ScCaptionPtr();
+explicit ScCaptionPtr( SdrCaptionObj* p );
+ScCaptionPtr( const ScCaptionPtr& r );
+ScCaptionPtr( ScCaptionPtr&& r );
+~ScCaptionPtr();
+
+ScCaptionPtr& operator=( const ScCaptionPtr& r );
+ScCaptionPtr& operator=( ScCaptionPtr&& r );
+explicit operator bool() const{ return mpCaption != nullptr; }
+const SdrCaptionObj* get() const{ return mpCaption; }
+SdrCaptionObj* get(){ return mpCaption; }
+const SdrCaptionObj* operator->() const { return mpCaption; }
+SdrCaptionObj* operator->() { return mpCaption; }
+const SdrCaptionObj& operator*() const  { return *mpCaption; }
+SdrCaptionObj& operator*()  { return *mpCaption; }
+
+// Does not default to nullptr to make it visually obvious where such is 
used.
+void reset( SdrCaptionObj* p );
+
+/** Insert to draw page. The caption object is owned by the draw page then.
+ */
+void insertToDrawPage( SdrPage& rDrawPage );
+
+/** Remove from draw page. The caption object is not owned anymore by the
+draw page then.
+ */
+void removeFromDrawPage( SdrPage& rDrawPage );
+
+/** Remove from draw page and free caption object if no Undo recording.
+ */
+void removeFromDrawPageAndFree( bool bIgnoreUndo = false );
+
+/** Release all management of the SdrCaptionObj* in all instances of this
+list and dissolve. The SdrCaptionObj pointer returned is ready to be
+managed elsewhere.
+ */
+SdrCaptionObj* release();
+
+/** Forget the SdrCaptionObj pointer in this one instance.
+Decrements a use count but does not destroy the object, it's up to the
+caller to manage this mess..
+ */
+void forget();
+
+/** Flag that this instance is in Undo, so drawing layer owns it. */
+void setNotOwner();
+
+oslInterlockedCount getRefs() const;
+
+private:
+
+struct Head
+{
+ScCaptionPtr*   mpFirst;///< first in list
+oslInterlockedCount mnRefs; ///< use count
+
+Head() = delete;
+explicit Head( ScCaptionPtr* );
+};
+
+Head* mpHead;   ///< points to the "master" entry
+

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

2019-02-28 Thread Libreoffice Gerrit user

 compilerplugins/clang/externandnotdefined.cxx |2 +-
 l10ntools/source/cfglex.l |9 -
 l10ntools/source/xrmlex.l |   12 
 3 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit b31e2b69607f80c1e2e9b20ce7e687387cd2db17
Author: Stephan Bergmann 
AuthorDate: Wed Feb 27 15:23:32 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 28 16:43:42 2019 +0100

Remove unused YYWarning functions (cargo cult?)

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

diff --git a/compilerplugins/clang/externandnotdefined.cxx 
b/compilerplugins/clang/externandnotdefined.cxx
index faf6bffb136c..afd77abe7bda 100644
--- a/compilerplugins/clang/externandnotdefined.cxx
+++ b/compilerplugins/clang/externandnotdefined.cxx
@@ -46,7 +46,7 @@ bool ExternAndNotDefined::VisitFunctionDecl(const 
FunctionDecl * functionDecl) {
 }
 // this is the bison/flex C API, it has to be defined this way
 std::string functionName = functionDecl->getNameAsString();
-if (functionName == "yyerror" || functionName == "YYWarning" || 
functionName == "yyparse" || functionName == "yylex") {
+if (functionName == "yyerror" || functionName == "yyparse" || functionName 
== "yylex") {
 return true;
 }
 // see vcl/unx/gtk/app/gtksys.cxx, typename conflicts prevent using the 
right include
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index f5fc2280dfe2..bea165204338 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -146,15 +146,6 @@ int yywrap(void)
 }
 
 /*/
-void YYWarning( const char *s )
-/*/
-{
-/* write warning to stderr */
-fprintf( stderr,
-"Warning: \"%s\" in line %d, column %d: \"%s\"\n", s, yylineno, 
yycolumn, yytext  );
-}
-
-/*/
 void yyerror ( const char *s )
 /*/
 {
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index c4d18337c5ad..41a19f279cf2 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -47,9 +47,6 @@
 
 #define YY_NO_UNISTD_H
 
-/* forwards */
-void YYWarning();
-
 static int bText=0;
 %}
 
@@ -177,15 +174,6 @@ int yywrap(void)
 }
 
 /*/
-void YYWarning( const char *s )
-/*/
-{
-/* write warning to stderr */
-fprintf( stderr,
-"Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext  );
-}
-
-/*/
 void yyerror ( const char *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-2' - uui/source

2019-02-28 Thread Libreoffice Gerrit user

 uui/source/lockcorrupt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23a78ef28cc781e08e3e5ffee3c72bfffbbd62d3
Author: Noel Grandin 
AuthorDate: Thu Feb 28 10:55:01 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Feb 28 17:35:30 2019 +0100

fix LockCorruptQueryBox title

regression from
commit 082e69fefb7439fd4f3d543f0c402039e94c1e9c
Date:   Mon Feb 26 16:53:37 2018 +
convert various MessBox to weld::MessageDialog

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

diff --git a/uui/source/lockcorrupt.cxx b/uui/source/lockcorrupt.cxx
index bba82db1db3f..008d4555a520 100644
--- a/uui/source/lockcorrupt.cxx
+++ b/uui/source/lockcorrupt.cxx
@@ -28,7 +28,7 @@ LockCorruptQueryBox::LockCorruptQueryBox(weld::Window* 
pParent, const std::local
 : m_xQueryBox(Application::CreateMessageDialog(pParent, 
VclMessageType::Question,
   VclButtonsType::NONE, Translate::get(STR_LOCKCORRUPT_MSG, 
rResLocale)))
 {
-m_xQueryBox->set_title(Translate::get(STR_LOCKCORRUPT_MSG, rResLocale));
+m_xQueryBox->set_title(Translate::get(STR_LOCKCORRUPT_TITLE, rResLocale));
 m_xQueryBox->add_button(Translate::get(STR_LOCKCORRUPT_OPENREADONLY_BTN, 
rResLocale), RET_OK);
 
m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), 
RET_CANCEL);
 m_xQueryBox->set_default_response(RET_OK);
___
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' - include/com

2019-02-28 Thread Libreoffice Gerrit user

 include/com/sun/star/uno/Sequence.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8dc108ba083d8e3303a936c090c3e3692c63150
Author: Michael Stahl 
AuthorDate: Wed Feb 13 14:17:46 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Feb 28 17:44:23 2019 +0100

fix Sequence ostream operator<< wrt. const

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

diff --git a/include/com/sun/star/uno/Sequence.hxx 
b/include/com/sun/star/uno/Sequence.hxx
index 64f84ffc7bc3..e9f5cf73db35 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.hxx
@@ -257,7 +257,7 @@ struct negation : std::integral_constant { };
@since LibreOffice 6.1
 */
 template< typename value_t, typename charT, typename traits >
-inline typename std::enable_if>::value, std::basic_ostream>::type 
<<(std::basic_ostream , css::uno::Sequence < value_t 
> )
+inline typename std::enable_if>::value, std::basic_ostream>::type 
<<(std::basic_ostream , css::uno::Sequence 
const& v)
 {
 const value_t *pAry = v.getConstArray();
 sal_Int32 nLen = v.getLength();
@@ -266,7 +266,7 @@ inline typename 
std::enable_if
-inline typename std::enable_if::value, 
std::basic_ostream>::type <<(std::basic_ostream , css::uno::Sequence < value_t > )
+inline typename std::enable_if::value, 
std::basic_ostream>::type <<(std::basic_ostream , css::uno::Sequence const& v)
 {
 // specialisation for signed bytes
 const sal_Int8 *pAry = v.getConstArray();
___
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' - download.lst

2019-02-28 Thread Libreoffice Gerrit user

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 405920c587c846ed39d8548ad094081cec0a59cc
Author: Michael Stahl 
AuthorDate: Wed Feb 27 12:18:01 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Feb 28 17:44:40 2019 +0100

openssl: upgrade to release 1.0.2r

Fixes CVE-2019-1559, plus a couple low-severity CVEs.

Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b
Reviewed-on: https://gerrit.libreoffice.org/68430
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd)
Reviewed-on: https://gerrit.libreoffice.org/68441
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index e2008d98..e9941ccc1725 100644
--- a/download.lst
+++ b/download.lst
@@ -192,8 +192,8 @@ export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
-export OPENSSL_SHA256SUM := 
50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
-export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
+export OPENSSL_SHA256SUM := 
ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6
+export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz
 export ORCUS_SHA256SUM := 
bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b
 export ORCUS_TARBALL := liborcus-0.13.4.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2019-02-28 Thread Michael Meeks

* Present:
+ Olivier,Sophie, Eike, Stephan, Michael W, Heiko, Michael S, Michael M
  Christian, Caolan, Miklos, Thorsten, 

* Completed Action Items:
+ disable popups for development-build only in 6.2/.3 (Justin L)
https://bugs.documentfoundation.org/show_bug.cgi?id=123270
  + not done → abandoning for now.

* Pending Action Items:
+ review/update GSOC ideas page! (Mentors)
  + https://wiki.documentfoundation.org/Development/GSoC/Ideas
  + deadline: early next week   

* Release Engineering update (Christian)
+ 6.2.1 rc2 status
   + delayed a little – some external library fixes 
   + on mirrors now and ready to be distributed.
+ 6.2.2 rc1
   + tagging it this weekend sometime.
+ 6.1.6 rc1: April 9 
+ 6.3 alpha1: early May
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)
+ New Help
 + pages CSS tweaks (fitoshido)
 + improvements in build robustness (sberg)
 + updates XLST

+ Helpcontent2
 + updates in contents (libreofficiant, ohallot, fitoshido, Mark
   Robbinson, Mike Kaganski, A Gelmini)
 + Most screenshot are currently useless (tdf#123765)
  + dialogs with tabs are collapsed – missing other tabs
  + can’t use the images.   

+ Help editor
 + Investigating the integration of editor with gerrit
 + lots of work to do here.

+ Guide books
+ Team is growing with arrival of US based volunteers
+ willing new contributors here - shifted meeting for them

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
254(254) (topicUI) bugs open, 257(257) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added  6(-1)17(0) 36(-1)  98(1)  
 commented 55(19)   135(-3)   428(17)1440(15) 
   removed  3(3)  3(3)  7(0)   18(4)  
  resolved  2(-2)14(-6)44(2)  124(2)  
+ top 10 contributors:
  Tietze, Heiko made 83 changes in 1 month, and 586 changes in 1 year
  Cor Nouws made 36 changes in 1 month, and 113 changes in 1 year
  Mehrbrodt, Samuel made 30 changes in 1 month, and 73 changes in 1 year
  Dieter Praas made 27 changes in 1 month, and 152 changes in 1 year
  Foote, V Stuart made 24 changes in 1 month, and 221 changes in 1 year
  Kainz, Andreas made 18 changes in 1 month, and 163 changes in 1 year
  Thomas Lendo made 18 changes in 1 month, and 348 changes in 1 year
  Xisco Faulí made 17 changes in 1 month, and 290 changes in 1 year
  Telesto made 15 changes in 1 month, and 63 changes in 1 year
  kompilainenn made 10 changes in 1 month, and 112 changes in 1 year

  + New needsUXEval between Feb/21-28

* Envelope dialog: Make dialog more a11y friendly
  + https://bugs.documentfoundation.org/show_bug.cgi?id=107625
=> New

* Proposal of Enhancement for Writer / Table of Contents, Index or
  Bibliography
  + https://bugs.documentfoundation.org/show_bug.cgi?id=123673
* Proposed Scale Tool feature
  + https://bugs.documentfoundation.org/show_bug.cgi?id=123713
=> WFM

  + New proposed easyhacks – help with code pointers appreciated. 

* Disable "Close Bezier" when multiple objects are selected
  + https://bugs.documentfoundation.org/show_bug.cgi?id=90373
* Cartesian System
  + https://bugs.documentfoundation.org/show_bug.cgi?id=120582
* Reorganizing “Border” tab on “Format Cells” window in Calc
  + https://bugs.documentfoundation.org/show_bug.cgi?id=100548
* add "coil" to draw basic shape menu
  + https://bugs.documentfoundation.org/show_bug.cgi?id=50998
* Add opportunity to open Autofilter window uses shortcut
  + https://bugs.documentfoundation.org/show_bug.cgi?id=123560


* Crash Testing (Caolan)
+ 1(+0) import failure, 4(+0) export failures
  - no change: redline-related (?)
+ coverity issues
  - coverity is back up
  - but we now need c++17, which isn’t working yet
  - asked coverity, and “new version will be deployed in the coming few
months”
+ Google / ossfuzz:
  - 8 issues, 7 timeouts, 1 OOM 
  - down one from last week
+ ForcePoint, round 9
+ had a run, but did not get any new ones; probably fixed
+ CVE issues
+ will be able to handle CVE’s ourselves (Caolán)
+ CNA process
+ asked in the meeting wrt. stupid stuff in the past
   + all not expected
+ positive progress.

* Crash Reporting (Xisco, Heiko)
  + http://crashreport.libreoffice.org/stats/version/6.1.3.2
+ 1064 1039 (-25)
  + http://crashreport.libreoffice.org/stats/version/6.1.4.2
+ 1478 1260 (-218)
  + http://crashreport.libreoffice.org/stats/version/6.1.5.2
+ 382 444 (+62)
  +

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

2019-02-28 Thread Libreoffice Gerrit user

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

New commits:
commit d9ccfe80c592d25cc12193474206f8998e317050
Author: Noel Grandin 
AuthorDate: Thu Feb 28 11:41:01 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Feb 28 17:35:07 2019 +0100

fix "doc will be saved" dialog message

looks like a copy/paste error in
commit 942f05996bc287923cdbcae12c64e57adf8ec975
Author: Caolán McNamara 
convert remaining ErrorBox to weld::MessageDialog

Change-Id: I52d38311b1e276fd799128e058ea0b9c902aef06
Reviewed-on: https://gerrit.libreoffice.org/68491
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit e76203f45a4c645447f8379ee2123f518a8aca77)
Reviewed-on: https://gerrit.libreoffice.org/68502
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index a4312467b4fe..e0214146bce9 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -984,7 +984,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
 {
 std::unique_ptr 
xQueryBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : 
nullptr,

VclMessageType::Question, VclButtonsType::YesNo,
-   
ScResId(STR_REIMPORT_AFTER_LOAD)));
+   
ScResId(STR_DOC_WILLBESAVED)));
 xQueryBox->set_default_response(RET_YES);
 if (xQueryBox->run() == RET_NO)
 {
___
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' - sc/source

2019-02-28 Thread Libreoffice Gerrit user

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

New commits:
commit f596b5f923907aae99977fc240a890f11affd386
Author: Noel Grandin 
AuthorDate: Thu Feb 28 11:41:01 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Feb 28 18:03:51 2019 +0100

fix "doc will be saved" dialog message

looks like a copy/paste error in
commit 942f05996bc287923cdbcae12c64e57adf8ec975
Author: Caolán McNamara 
convert remaining ErrorBox to weld::MessageDialog

Change-Id: I52d38311b1e276fd799128e058ea0b9c902aef06
Reviewed-on: https://gerrit.libreoffice.org/68491
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit e76203f45a4c645447f8379ee2123f518a8aca77)
Reviewed-on: https://gerrit.libreoffice.org/68503
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 47992f8ea28d..1d4ad1830372 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -985,7 +985,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
 vcl::Window* pWin = GetActiveDialogParent();
 std::unique_ptr 
xQueryBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : 
nullptr,

VclMessageType::Question, VclButtonsType::YesNo,
-   
ScResId(STR_REIMPORT_AFTER_LOAD)));
+   
ScResId(STR_DOC_WILLBESAVED)));
 xQueryBox->set_default_response(RET_YES);
 if (xQueryBox->run() == RET_NO)
 {
___
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-25'

2019-02-28 Thread Libreoffice Gerrit user

Tag 'cp-6.0-25' created by Andras Timar  at 
2019-02-28 10:00 +

cp-6.0-25

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

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

2019-02-28 Thread Libreoffice Gerrit user

 cui/source/inc/cuitabarea.hxx|2 +-
 cui/source/tabpages/backgrnd.cxx |2 +-
 cui/source/tabpages/tparea.cxx   |6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 65438bcda46bab4f2fe6fb555f44aace45e11e5e
Author: Caolán McNamara 
AuthorDate: Thu Feb 28 09:20:40 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 28 11:12:34 2019 +0100

GetDialogController not valid yet

Change-Id: I476744d8f351f4ab2afce5974355a066edc8a4a6
Reviewed-on: https://gerrit.libreoffice.org/68489
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 98289ab450e6..5344c69e73bf 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -249,7 +249,7 @@ protected:
 std::unique_ptr m_xBtnBitmap;
 std::unique_ptr m_xBtnPattern;
 
-void SetOptimalSize();
+void SetOptimalSize(weld::DialogController* pController);
 
 private:
 DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 8711e3a3ebc9..3bb47de0799f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1479,7 +1479,7 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
 VclPtr SvxBkgTabPage::Create(TabPageParent pWindow, const 
SfxItemSet* rAttrs)
 {
 auto xRet = VclPtr::Create(pWindow, *rAttrs);
-xRet->SetOptimalSize();
+xRet->SetOptimalSize(pWindow.pController);
 return xRet;
 }
 
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index ee48acd5f9a8..a311becb2fe1 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -119,9 +119,9 @@ SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, const 
SfxItemSet& rInAttrs
 SetExchangeSupport();
 }
 
-void SvxAreaTabPage::SetOptimalSize()
+void SvxAreaTabPage::SetOptimalSize(weld::DialogController* pController)
 {
-TabPageParent aFillTab(m_xFillTab.get(), GetDialogController());
+TabPageParent aFillTab(m_xFillTab.get(), pController);
 // TEMP
 if (!aFillTab.pController)
 aFillTab.pParent = GetParentDialog();
@@ -343,7 +343,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
 VclPtr SvxAreaTabPage::Create(TabPageParent pParent, const 
SfxItemSet* rAttrs)
 {
 auto xRet = VclPtr::Create(pParent, *rAttrs);
-xRet->SetOptimalSize();
+xRet->SetOptimalSize(pParent.pController);
 return xRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - download.lst

2019-02-28 Thread Libreoffice Gerrit user

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 041ee5be8aa4438b5d16930508c31c1c1e3a9626
Author: Michael Stahl 
AuthorDate: Wed Feb 27 12:18:01 2019 +0100
Commit: Michael Weghorn 
CommitDate: Thu Feb 28 22:02:03 2019 +0100

openssl: upgrade to release 1.0.2r

Fixes CVE-2019-1559, plus a couple low-severity CVEs.

Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b
Reviewed-on: https://gerrit.libreoffice.org/68430
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd)
Reviewed-on: https://gerrit.libreoffice.org/68440
Reviewed-by: Michael Weghorn 

diff --git a/download.lst b/download.lst
index ae623cb85204..ac0e2d3b1985 100644
--- a/download.lst
+++ b/download.lst
@@ -192,8 +192,8 @@ export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
-export OPENSSL_SHA256SUM := 
50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
-export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
+export OPENSSL_SHA256SUM := 
ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6
+export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz
 export ORCUS_SHA256SUM := 
3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f
 export ORCUS_TARBALL := liborcus-0.14.1.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 svx/source/dialog/hdft.cxx |2 -
 sw/source/uibase/docvw/HeaderFooterWin.cxx |   55 ++---
 2 files changed, 14 insertions(+), 43 deletions(-)

New commits:
commit 55042cb54fea5f7ad777c03af9bf8197127b6736
Author: Aditya 
AuthorDate: Sun Feb 24 21:17:14 2019 +0530
Commit: Jim Raykowski 
CommitDate: Thu Feb 28 22:04:28 2019 +0100

tdf#116382 Replace old dialog in header and footer drop-down menu

Remove the Background tabpage in "Border/Background" dialog accessed
from Border and Background menu item in Header/Footer drop-down list
and replace it with the tabpages "Area" and "Transparency" of the dialog
accessed from Page Style > Header > "More.." button.
 The old dialog does not have the tabpages "Area" and "Transparency".
In simpler words, the patch is to match both the dialogs
when accessed in two different ways.

Change-Id: Ib84435854389360eba41aecb8578a9a67a92ca1e
Reviewed-on: https://gerrit.libreoffice.org/67483
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 2a32ca807f44..9fe7f811d9eb 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -88,7 +88,7 @@ namespace svx {
 {
 bool bRes = false;
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-ScopedVclPtr 
pDlg(pFact->CreateSvxBorderBackgroundDlg(pParent, *pBBSet, false 
/*bEnableDrawingLayerFillStyles*/));
+ScopedVclPtr 
pDlg(pFact->CreateSvxBorderBackgroundDlg(pParent, *pBBSet, true 
/*bEnableDrawingLayerFillStyles*/));
 if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() )
 {
 SfxItemIter aIter( *pDlg->GetOutputItemSet() );
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx 
b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 2d1fca27f4f3..307704b99362 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -11,6 +11,8 @@
 #include 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -423,50 +425,19 @@ void SwHeaderFooterWin::ExecuteCommand(const OString& 
rIdent)
 SwFrameFormat* pHFFormat = const_cast< SwFrameFormat* >( 
rMaster.GetFooter().GetFooterFormat() );
 if ( m_bIsHeader )
 pHFFormat = const_cast< SwFrameFormat* >( 
rMaster.GetHeader().GetHeaderFormat() );
+SfxItemSet aSet( pHFFormat->GetAttrSet() );
 
-SfxItemPool* pPool = pHFFormat->GetAttrSet().GetPool();
-SfxItemSet aSet(
-*pPool,
-svl::Items<
-RES_BACKGROUND, RES_SHADOW,
-XATTR_FILL_FIRST, XATTR_FILL_LAST,
-SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{});
-
-aSet.Put( pHFFormat->GetAttrSet() );
-
-aSet.Put( pHFFormat->makeBackgroundBrushItem() );
-
-// Create a box info item... needed by the dialog
-SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
-const SfxPoolItem *pBoxInfo;
-if ( SfxItemState::SET == pHFFormat->GetAttrSet().GetItemState( 
SID_ATTR_BORDER_INNER,
-true, ) )
-aBoxInfo = *static_cast(pBoxInfo);
-
-aBoxInfo.SetTable( false );
-aBoxInfo.SetDist( true);
-aBoxInfo.SetMinDist( false );
-aBoxInfo.SetDefDist( MIN_BORDER_DIST );
-aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE );
-aSet.Put( aBoxInfo );
-
-if (svx::ShowBorderBackgroundDlg(GetFrameWeld(), ))
+// Items to hand over XPropertyList things like XColorList,
+// XHatchList, XGradientList, and XBitmapList to the Area TabPage:
+aSet.MergeRange( SID_COLOR_TABLE, SID_PATTERN_LIST );
+// create needed items for XPropertyList entries from the DrawModel so 
that
+// the Area TabPage can access them
+
rSh.GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->PutAreaListItems( 
aSet );
+
+if (svx::ShowBorderBackgroundDlg( GetFrameWeld(),  ) )
 {
-const SfxPoolItem* pItem;
-if ( SfxItemState::SET == aSet.GetItemState( RES_BACKGROUND, 
false,  ) ) {
-pHFFormat->SetFormatAttr( *pItem );
-rView.GetDocShell()->SetModified();
-}
-
-if ( SfxItemState::SET == aSet.GetItemState( RES_BOX, false, 
 ) ) {
-pHFFormat->SetFormatAttr( *pItem );
-rView.GetDocShell()->SetModified();
-}
-
-if ( SfxItemState::SET == aSet.GetItemState( RES_SHADOW, false, 
 ) ) {
-pHFFormat->SetFormatAttr( *pItem );
-rView.GetDocShell()->SetModified();
-}
+pHFFormat->SetFormatAttr( aSet );
+rView.GetDocShell()->SetModified();
 }
 }
 else if (rIdent == "delete")
___
Libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |9 -
 sd/qa/unit/import-tests-smartart.cxx|7 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit f4fbb127897ea6afe27055d3b6cfcb0441080902
Author: Miklos Vajna 
AuthorDate: Thu Feb 28 15:00:01 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 28 20:27:12 2019 +0100

oox smartart, picture strip: fix too wide child shapes

Once the constraints determine the size, the aspect ratio may shrink one
dimension to achieve the requested ratio. Implement the case where a >1
ratio shrinks the width, so the container of the image-text shape pair
has correct aspect ratio.

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

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 7dc6e7622cb0..336760575339 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -985,7 +985,14 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 nNumSpaces += 4;
 sal_Int32 nHeight
 = rShape->getSize().Height / (nRow + (nRow + nNumSpaces) * 
fSpace);
-aChildSize = awt::Size(rShape->getSize().Width, nHeight);
+
+if (fChildAspectRatio > 1)
+{
+// Shrink width if the aspect ratio requires it.
+nWidth = std::min(rShape->getSize().Width,
+  static_cast(nHeight * 
fChildAspectRatio));
+aChildSize = awt::Size(nWidth, nHeight);
+}
 }
 
 awt::Point aCurrPos(0, 0);
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index 3a98496735ef..22513adc312a 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -980,6 +980,13 @@ void SdImportTestSmartArt::testPictureStrip()
 // Actual  : 263', i.e. the left margin was too small.
 CPPUNIT_ASSERT_EQUAL(static_cast(nWidth * fFactor), 
nTextLeftDistance);
 
+// Make sure that aspect ratio is not ignored, i.e. width is not larger 
than height 3 times.
+uno::Reference xFirstPair = getChildShape(xGroup, 0);
+awt::Size aFirstPairSize = xFirstPair->getSize();
+// Without the accompanying fix in place, this test would have failed: bad 
width was 16932, good
+// width is 12540, but let's accept 12541 as well.
+CPPUNIT_ASSERT_LESSEQUAL(aFirstPairSize.Height * 3 + 1, 
aFirstPairSize.Width);
+
 xDocShRef->DoClose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_setup.mk ios/UnitTest

2019-02-28 Thread Libreoffice Gerrit user

 ios/CustomTarget_iOS_setup.mk  |4 
 ios/UnitTest/UnitTest.xcodeproj/project.pbxproj|8 
 ios/UnitTest/UnitTest/Assets.xcassets/AppIcon.appiconset/Contents.json |   98 
++
 ios/UnitTest/UnitTest/Assets.xcassets/Contents.json|6 
 ios/UnitTest/UnitTest/Base.lproj/LaunchScreen.storyboard   |   25 
++
 ios/UnitTest/UnitTest/Base.lproj/Main.storyboard   |   24 
++
 6 files changed, 160 insertions(+), 5 deletions(-)

New commits:
commit 2538dc89dee754b3b4621371e01b52995fc5e193
Author: Tor Lillqvist 
AuthorDate: Thu Feb 28 19:31:09 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 28 20:08:06 2019 +0200

I had forgotten to add these files to git

Change-Id: I02ab930c6e3304009c90eef36f55d61a4531af7c

diff --git 
a/ios/UnitTest/UnitTest/Assets.xcassets/AppIcon.appiconset/Contents.json 
b/ios/UnitTest/UnitTest/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index ..d8db8d65fd79
--- /dev/null
+++ b/ios/UnitTest/UnitTest/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+  "images" : [
+{
+  "idiom" : "iphone",
+  "size" : "20x20",
+  "scale" : "2x"
+},
+{
+  "idiom" : "iphone",
+  "size" : "20x20",
+  "scale" : "3x"
+},
+{
+  "idiom" : "iphone",
+  "size" : "29x29",
+  "scale" : "2x"
+},
+{
+  "idiom" : "iphone",
+  "size" : "29x29",
+  "scale" : "3x"
+},
+{
+  "idiom" : "iphone",
+  "size" : "40x40",
+  "scale" : "2x"
+},
+{
+  "idiom" : "iphone",
+  "size" : "40x40",
+  "scale" : "3x"
+},
+{
+  "idiom" : "iphone",
+  "size" : "60x60",
+  "scale" : "2x"
+},
+{
+  "idiom" : "iphone",
+  "size" : "60x60",
+  "scale" : "3x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "20x20",
+  "scale" : "1x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "20x20",
+  "scale" : "2x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "29x29",
+  "scale" : "1x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "29x29",
+  "scale" : "2x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "40x40",
+  "scale" : "1x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "40x40",
+  "scale" : "2x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "76x76",
+  "scale" : "1x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "76x76",
+  "scale" : "2x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "83.5x83.5",
+  "scale" : "2x"
+},
+{
+  "idiom" : "ios-marketing",
+  "size" : "1024x1024",
+  "scale" : "1x"
+}
+  ],
+  "info" : {
+"version" : 1,
+"author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ios/UnitTest/UnitTest/Assets.xcassets/Contents.json 
b/ios/UnitTest/UnitTest/Assets.xcassets/Contents.json
new file mode 100644
index ..da4a164c9186
--- /dev/null
+++ b/ios/UnitTest/UnitTest/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+"version" : 1,
+"author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ios/UnitTest/UnitTest/Base.lproj/LaunchScreen.storyboard 
b/ios/UnitTest/UnitTest/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index ..bfa36129419f
--- /dev/null
+++ b/ios/UnitTest/UnitTest/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ios/UnitTest/UnitTest/Base.lproj/Main.storyboard 
b/ios/UnitTest/UnitTest/Base.lproj/Main.storyboard
new file mode 100644
index ..942f0bc452d1
--- /dev/null
+++ b/ios/UnitTest/UnitTest/Base.lproj/Main.storyboard
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
commit 9f8373817ea06a6d921ad720e006c076a5f569ee
Author: Tor Lillqvist 
AuthorDate: Thu Feb 28 19:32:03 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 28 20:08:06 2019 +0200

Current ICU version is 63

Change-Id: I126dbbec9fb6cbb19f848d8317002c69b407a36b

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 59bf0469b13e..e651dd63f5bb 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -56,7 +56,9 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp

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

2019-02-28 Thread Libreoffice Gerrit user

 l10ntools/inc/cfglex.hxx  |2 ++
 l10ntools/inc/xrmlex.hxx  |2 ++
 l10ntools/source/cfgmerge.cxx |2 --
 l10ntools/source/xrmmerge.cxx |2 --
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 372f8519168d74cd5c1c1199ec3a07a8ae3f1edf
Author: Stephan Bergmann 
AuthorDate: Wed Feb 27 15:29:28 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 28 21:59:24 2019 +0100

loplugin:unreffun

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

diff --git a/l10ntools/inc/cfglex.hxx b/l10ntools/inc/cfglex.hxx
index f55477d2a59d..bc474a09bba7 100644
--- a/l10ntools/inc/cfglex.hxx
+++ b/l10ntools/inc/cfglex.hxx
@@ -27,6 +27,8 @@
 extern "C" void workOnTokenSet( int, char* );
 extern "C" FILE * init(int, char **);
 
+void yyerror(char const *);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/xrmlex.hxx b/l10ntools/inc/xrmlex.hxx
index 7e283118d218..483b6dbaaf01 100644
--- a/l10ntools/inc/xrmlex.hxx
+++ b/l10ntools/inc/xrmlex.hxx
@@ -33,6 +33,8 @@ extern "C" bool GetOutputFile( int argc, char* argv[]);
 extern "C" FILE *GetXrmFile();
 extern "C" const char* getFilename();
 
+void yyerror( const char * );
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index dd0ddf2a9529..ebe8487aa599 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -34,8 +34,6 @@
 #include 
 #include 
 
-void yyerror(char const *);
-
 namespace {
 
 namespace global {
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index ceafbe2129f1..4670dc7c3ab2 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -37,8 +37,6 @@
 
 using namespace std;
 
-void yyerror( const char * );
-
 // set of global variables
 static bool bMergeMode;
 static bool bDisplayName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 cui/source/inc/cuitabarea.hxx|2 +
 cui/source/tabpages/backgrnd.cxx |4 ++-
 cui/source/tabpages/tparea.cxx   |   48 ++-
 3 files changed, 38 insertions(+), 16 deletions(-)

New commits:
commit b3ef6fd488cb2b08488fd61494704755b0800712
Author: Caolán McNamara 
AuthorDate: Wed Feb 27 11:41:54 2019 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Feb 28 22:09:03 2019 +0100

Related: tdf#123711 better optimal size for highlighting tab

it only uses the color subtab, so just measure
ones which can be visible

Change-Id: Id09419480fd920b242f4d0d65e9ac5fbfb619784
Reviewed-on: https://gerrit.libreoffice.org/68432
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 19c52a601f25..3d69c9c717ae 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -252,6 +252,8 @@ protected:
 std::unique_ptr m_xBtnBitmap;
 std::unique_ptr m_xBtnPattern;
 
+void SetOptimalSize(weld::DialogController* pController);
+
 private:
 DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void);
 
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index b41680e22c81..e7926e552be3 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1480,7 +1480,9 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
 
 VclPtr SvxBkgTabPage::Create(TabPageParent pWindow, const 
SfxItemSet* rAttrs)
 {
-return VclPtr::Create(pWindow, *rAttrs);
+auto xRet = VclPtr::Create(pWindow, *rAttrs);
+xRet->SetOptimalSize(pWindow.pController);
+return xRet;
 }
 
 void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet)
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index cacca8f8d51e..a311becb2fe1 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -117,8 +117,11 @@ SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, 
const SfxItemSet& rInAttrs
 m_xBtnPattern->connect_toggled(aLink);
 
 SetExchangeSupport();
+}
 
-TabPageParent aFillTab(m_xFillTab.get(), pParent.pController);
+void SvxAreaTabPage::SetOptimalSize(weld::DialogController* pController)
+{
+TabPageParent aFillTab(m_xFillTab.get(), pController);
 // TEMP
 if (!aFillTab.pController)
 aFillTab.pParent = GetParentDialog();
@@ -126,21 +129,34 @@ SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, 
const SfxItemSet& rInAttrs
 // Calculate optimal size of all pages..
 m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(aFillTab, 
_rXFSet));
 m_aColorSize = m_xFillTab->get_preferred_size();
-m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(aFillTab, 
_rXFSet));
-Size aGradientSize = m_xFillTab->get_preferred_size();
-m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(aFillTab, 
_rXFSet));
-Size aBitmapSize = m_xFillTab->get_preferred_size();
-m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(aFillTab, 
_rXFSet));
-Size aHatchSize = m_xFillTab->get_preferred_size();
-m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(aFillTab, 
_rXFSet));
-Size aPatternSize = m_xFillTab->get_preferred_size();
+Size aSize(m_aColorSize);
+
+if (m_xBtnGradient->get_visible())
+{
+m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(aFillTab, 
_rXFSet));
+Size aGradientSize = m_xFillTab->get_preferred_size();
+lclExtendSize(aSize, aGradientSize);
+}
+if (m_xBtnBitmap->get_visible())
+{
+m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(aFillTab, 
_rXFSet));
+Size aBitmapSize = m_xFillTab->get_preferred_size();
+lclExtendSize(aSize, aBitmapSize);
+}
+if (m_xBtnHatch->get_visible())
+{
+m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(aFillTab, 
_rXFSet));
+Size aHatchSize = m_xFillTab->get_preferred_size();
+lclExtendSize(aSize, aHatchSize);
+}
+if (m_xBtnPattern->get_visible())
+{
+m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(aFillTab, 
_rXFSet));
+Size aPatternSize = m_xFillTab->get_preferred_size();
+lclExtendSize(aSize, aPatternSize);
+}
 m_pFillTabPage.disposeAndClear();
 
-Size aSize(m_aColorSize);
-lclExtendSize(aSize, aGradientSize);
-lclExtendSize(aSize, aBitmapSize);
-lclExtendSize(aSize, aHatchSize);
-lclExtendSize(aSize, aPatternSize);
 m_xFillTab->set_size_request(aSize.Width(), aSize.Height());
 }
 
@@ -326,7 +342,9 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
 
 VclPtr SvxAreaTabPage::Create(TabPageParent pParent, const 
SfxItemSet* rAttrs)
 {
-return VclPtr::Create(pParent, *rAttrs);
+auto xRet = VclPtr::Create(pParent, *rAttrs);
+xRet->SetOptimalSize(pParent.pController);
+return xRet;
 }
 
 namespace {

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

2019-02-28 Thread Libreoffice Gerrit user

 vcl/source/treelist/treelistbox.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 8b07376f70f5e1192d9ac1e97bcf34de7a09a8a2
Author: Caolán McNamara 
AuthorDate: Wed Feb 27 11:15:02 2019 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Feb 28 22:08:37 2019 +0100

Resolves: tdf#123711 measure scrollbar for optimal width

Change-Id: I30225124e44e8a6290270ecba5024f36508817d3
Reviewed-on: https://gerrit.libreoffice.org/68429
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/treelist/treelistbox.cxx 
b/vcl/source/treelist/treelistbox.cxx
index 6aea58ad91b4..0ece3b5eb793 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -3133,6 +3133,10 @@ Size SvTreeListBox::GetOptimalSize() const
 }
 long nMinWidth = nMinWidthInChars * approximate_char_width();
 aRet.setWidth( std::max(aRet.Width(), nMinWidth) );
+
+if (GetStyle() & WB_VSCROLL)
+aRet.AdjustWidth(GetSettings().GetStyleSettings().GetScrollBarSize());
+
 return aRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 svl/source/numbers/zformat.cxx |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 609ea85b530185910bf326201f785fd32bcbad2b
Author: Eike Rathke 
AuthorDate: Thu Feb 28 14:44:02 2019 +0100
Commit: Eike Rathke 
CommitDate: Thu Feb 28 19:54:37 2019 +0100

Resolves: tdf#123748 do not strip date part before calling Time::GetClock()

GetClock() needs it to properly scale and round the floating point
value. It also handles negative values, fiddling with that is only
needed for the [] formats.

Regression from

commit e2e47898180e547cad7ccde1e5890385d573e551
CommitDate: Fri Aug 31 12:50:52 2018 +0200

Use tools::Time::GetClock() in number formatter for wall clock time

Change-Id: I05fe9e22886d4e59f110c0a826dadb43234d348a
Reviewed-on: https://gerrit.libreoffice.org/68508
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 47f194285aa9..db066e136c06 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3000,7 +3000,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
 {
 using namespace ::com::sun::star::i18n;
 bool bCalendarSet = false;
-double fNumberOrig = fNumber;
+const double fNumberOrig = fNumber;
 bool bRes = false;
 bool bSign = false;
 if (fNumber < 0.0)
@@ -3020,10 +3020,6 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
 return false;
 }
 }
-else
-{
-fNumber -= floor(fNumber); // Else truncate date
-}
 bool bInputLine;
 sal_Int32 nCntPost;
 if ( rScan.GetStandardPrec() == SvNumberFormatter::INPUTSTRING_PRECISION &&
@@ -3037,10 +3033,6 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
 bInputLine = false;
 nCntPost = rInfo.nCntPost;
 }
-if (bSign && !rInfo.bThousand) // No [] format
-{
-fNumber = 1.0 - fNumber; // "Inverse"
-}
 
 OUStringBuffer sSecStr;
 sal_Int32 nSecPos = 0; // For figure by figure processing
@@ -3049,7 +3041,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
 {
 sal_uInt16 nCHour, nCMinute, nCSecond;
 double fFractionOfSecond;
-tools::Time::GetClock( fNumber, nCHour, nCMinute, nCSecond, 
fFractionOfSecond, nCntPost);
+tools::Time::GetClock( fNumberOrig, nCHour, nCMinute, nCSecond, 
fFractionOfSecond, nCntPost);
 nHour = nCHour;
 nMin = nCMinute;
 nSec = nCSecond;
___
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 include/editeng include/sfx2 include/svl include/svx sc/inc sd/inc svl/source svx/source sw/inc sw/source

2019-02-28 Thread Libreoffice Gerrit user

 editeng/inc/editattr.hxx |2 +-
 editeng/inc/editdoc.hxx  |8 
 editeng/source/editeng/editdoc.cxx   |8 
 editeng/source/editeng/editeng.cxx   |2 +-
 editeng/source/editeng/editobj2.hxx  |2 +-
 editeng/source/items/numitem.cxx |4 ++--
 editeng/source/outliner/outliner.cxx |2 +-
 editeng/source/outliner/paralist.cxx |4 ++--
 editeng/source/outliner/paralist.hxx |3 ++-
 include/editeng/brushitem.hxx|2 +-
 include/editeng/charrotateitem.hxx   |4 ++--
 include/editeng/colritem.hxx |2 +-
 include/editeng/editeng.hxx  |2 +-
 include/editeng/editobj.hxx  |2 +-
 include/editeng/fhgtitem.hxx |2 +-
 include/editeng/fontitem.hxx |2 +-
 include/editeng/frmdiritem.hxx   |2 +-
 include/editeng/lrspitem.hxx |2 +-
 include/editeng/numitem.hxx  |4 ++--
 include/editeng/outliner.hxx |4 ++--
 include/editeng/outlobj.hxx  |2 +-
 include/editeng/postitem.hxx |2 +-
 include/editeng/protitem.hxx |2 +-
 include/editeng/rsiditem.hxx |2 +-
 include/editeng/shaditem.hxx |2 +-
 include/editeng/tstpitem.hxx |4 ++--
 include/editeng/ulspitem.hxx |2 +-
 include/editeng/wghtitem.hxx |2 +-
 include/sfx2/viewsh.hxx  |2 +-
 include/svl/eitem.hxx|2 +-
 include/svl/intitem.hxx  |6 +++---
 include/svl/itempool.hxx |2 +-
 include/svl/itemset.hxx  |2 +-
 include/svl/poolitem.hxx |5 +++--
 include/svl/stritem.hxx  |2 +-
 include/svl/undo.hxx |7 ---
 include/svx/e3ditem.hxx  |2 +-
 include/svx/sdr/properties/defaultproperties.hxx |3 ++-
 include/svx/sdtaitm.hxx  |2 +-
 include/svx/svdmodel.hxx |2 +-
 include/svx/svdobj.hxx   |2 +-
 include/svx/svdogrp.hxx  |2 +-
 include/svx/svdotable.hxx|2 +-
 include/svx/svdpage.hxx  |2 +-
 include/svx/svdtext.hxx  |2 +-
 include/svx/xbtmpit.hxx  |2 +-
 include/svx/xfillit0.hxx |2 +-
 include/svx/xflbmpit.hxx |2 +-
 include/svx/xflbmtit.hxx |2 +-
 include/svx/xflbstit.hxx |2 +-
 include/svx/xflclit.hxx  |2 +-
 include/svx/xfltrit.hxx  |2 +-
 include/svx/xit.hxx  |2 +-
 sc/inc/attrib.hxx|6 +++---
 sd/inc/drawdoc.hxx   |2 +-
 sd/inc/sdpage.hxx|2 +-
 svl/source/items/cenumitm.cxx|2 +-
 svx/source/inc/cell.hxx  |2 +-
 svx/source/inc/tablemodel.hxx|3 ++-
 svx/source/sdr/properties/defaultproperties.cxx  |2 +-
 svx/source/svdraw/svdattr.cxx|2 +-
 svx/source/svdraw/svdtext.cxx|2 +-
 svx/source/table/cell.cxx|2 +-
 svx/source/table/svdotable.cxx   |2 +-
 svx/source/table/tablelayouter.hxx   |4 ++--
 svx/source/table/tablemodel.cxx  |2 +-
 sw/inc/IMark.hxx |2 +-
 sw/inc/charfmt.hxx   |2 +-
 sw/inc/crsrsh.hxx|2 +-
 sw/inc/doc.hxx   |2 +-
 sw/inc/docary.hxx|   18 +-
 sw/inc/docufld.hxx   |2 +-
 sw/inc/fldbas.hxx|8 +---
 sw/inc/fmtanchr.hxx  |2 +-
 sw/inc/fmtautofmt.hxx|2 +-
 sw/inc/fmtclbl.hxx   |2 +-
 sw/inc/fmtclds.hxx   |4 ++--
 sw/inc/fmtcntnt.hxx  |2 +-
 sw/inc/fmtcol.hxx|2 +-
 sw/inc/fmteiro.hxx   |2 +-
 sw/inc/fmtfld.hxx|2 +-
 sw/inc/fmtfollowtextflow.hxx |2 +-

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - svtools/uiconfig

2019-02-28 Thread Libreoffice Gerrit user

 svtools/uiconfig/ui/graphicexport.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 37fa4d75ef7f1f419dcd3f69c9c168992699735d
Author: Caolán McNamara 
AuthorDate: Tue Feb 26 09:28:45 2019 +
Commit: Michael Weghorn 
CommitDate: Thu Feb 28 21:41:51 2019 +0100

tdf#123693 raise max size

Change-Id: I52d69d825ed11a15d9dbbe61f157035361fa5d52
Reviewed-on: https://gerrit.libreoffice.org/68375
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/svtools/uiconfig/ui/graphicexport.ui 
b/svtools/uiconfig/ui/graphicexport.ui
index fa1965fcbe97..ddf5ee1574fd 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -17,17 +17,17 @@
 10
   
   
-999.990001
+9.9905
 1
 10
   
   
-999.990001
+9.9905
 1
 10
   
   
-999.990001
+9
 1
 10
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - helpcontent2

2019-02-28 Thread Libreoffice Gerrit user

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

New commits:
commit e0944d27d64228d532671e7aea5c2d7779807c25
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Feb 28 15:58:51 2019 -0600
Commit: Gerrit Code Review 
CommitDate: Thu Feb 28 23:03:17 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2'
  - This paragraph just repeats what the paragraph immediately above says

Change-Id: Iccc9fb41811a4914fdda0f346f9bd32049932448
(cherry picked from commit 36a01a03a960bc2e152cb8ecd21844f91cfa46bd)
Reviewed-on: https://gerrit.libreoffice.org/68517
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 06e3b4dcb878..e5e19bf05d9f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 06e3b4dcb878f735bca347d3a19ad011e45330f0
+Subproject commit e5e19bf05d9f59e61c19b1d40aacedc643f6d6f1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sd/qa/unit/export-tests.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2023b29d0f86d478748d6d0a69a38dd66c9ceb67
Author: Andrea Gelmini 
AuthorDate: Thu Feb 28 21:23:05 2019 +0100
Commit: Julien Nabet 
CommitDate: Thu Feb 28 23:01:52 2019 +0100

Fix typo

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

diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 9e6ef5595355..d2ab9ba010ed 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -1171,7 +1171,7 @@ void SdExportTest::testTdf123557()
 xDocShRef = saveAndReload(xDocShRef.get(), ODP, );
 xmlDocPtr pXmlDoc = parseExport(tempFile, "content.xml");
 
-// Contains 2 interactive sequence and 3 triggered effects.
+// Contains 2 interactive sequences and 3 triggered effects.
 assertXPath(pXmlDoc, "//draw:page", 1);
 assertXPath(pXmlDoc, "//draw:page/anim:par", 1);
 assertXPath(pXmlDoc, "//draw:page"
___
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' - ucb/source

2019-02-28 Thread Libreoffice Gerrit user

 ucb/source/ucp/webdav/SerfSession.cxx |2 +-
 ucb/source/ucp/webdav/SerfSession.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6e07ecc750237db0ab7eb75c0e15d9d527b2c1b
Author: Szymon Kłos 
AuthorDate: Fri Mar 1 00:40:47 2019 +0100
Commit: Szymon Kłos 
CommitDate: Fri Mar 1 00:48:53 2019 +0100

WebDAV serf: crash fix on init

Change-Id: I418865f4552cb91c7e2ba47e6b73baf8ee0547a3
Reviewed-on: https://gerrit.libreoffice.org/68519
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/ucb/source/ucp/webdav/SerfSession.cxx 
b/ucb/source/ucp/webdav/SerfSession.cxx
index ab41f1f5ac0f..a801b3e45c51 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -1120,7 +1120,7 @@ void SerfSession::abort()
 }
 
 
-const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const
+const ucbhelper::InternetProxyServer SerfSession::getProxySettings() const
 {
 if ( m_aUri.GetScheme() == "http" || m_aUri.GetScheme() == "https" )
 {
diff --git a/ucb/source/ucp/webdav/SerfSession.hxx 
b/ucb/source/ucp/webdav/SerfSession.hxx
index 3e162258117c..0993af3dc91f 100644
--- a/ucb/source/ucp/webdav/SerfSession.hxx
+++ b/ucb/source/ucp/webdav/SerfSession.hxx
@@ -236,7 +236,7 @@ private:
 /// @throws DAVException
 void HandleError( std::shared_ptr rReqProc );
 
-const ucbhelper::InternetProxyServer & getProxySettings() const;
+const ucbhelper::InternetProxyServer getProxySettings() const;
 
 static bool removeExpiredLocktoken( const OUString & inURL,
  const DAVRequestEnvironment & rEnv );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sc/source/core/tool/parclass.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d2be2f1aebb883c74460d049a5e2b821ecd5947c
Author: Eike Rathke 
AuthorDate: Thu Feb 28 15:00:11 2019 +0100
Commit: Eike Rathke 
CommitDate: Thu Feb 28 22:34:52 2019 +0100

ocMatTrans with ForceArray

Now that OOXML reveiled that the formula expression containing a
TRANSPOSE() call shall be in array mode, the old comment about
Excel not forcing array on the argument (in BIFF token class)
makes sense. Use ForceArray and remove now moot comment.

Change-Id: Iab2bced788de3429aab2bb7c3ca7f24d5dbf0340
Reviewed-on: https://gerrit.libreoffice.org/68509
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 76c132672a25..b8428191842e 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -174,7 +174,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocMatDet,  {{ ForceArray 
  }, 0, Value }},
 { ocMatInv,  {{ ForceArray 
  }, 0, Value }},
 { ocMatMult, {{ ForceArray, ForceArray 
  }, 0, Value }},
-{ ocMatTrans,{{ Array  
  }, 0, ForceArrayReturn }}, // strange, but Xcl doesn't ForceArray on the 
argument
+{ ocMatTrans,{{ ForceArray 
  }, 0, ForceArrayReturn }},
 { ocMatValue,{{ Reference, Value, Value
  }, 0, Value }},
 { ocMatch,   {{ Value, ReferenceOrForceArray, Value
  }, 0, Value }},
 { ocMax, {{ ReferenceOrRefArray
  }, 1, Value }},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 source/text/shared/01/font_features.xhp |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 36a01a03a960bc2e152cb8ecd21844f91cfa46bd
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Feb 28 15:58:51 2019 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Feb 28 15:58:51 2019 -0600

This paragraph just repeats what the paragraph immediately above says

Change-Id: Iccc9fb41811a4914fdda0f346f9bd32049932448

diff --git a/source/text/shared/01/font_features.xhp 
b/source/text/shared/01/font_features.xhp
index 61d4b3065..8bb08fda2 100644
--- a/source/text/shared/01/font_features.xhp
+++ b/source/text/shared/01/font_features.xhp
@@ -32,7 +32,6 @@
 Then press Features...
 
 %PRODUCTNAME supports OpenType font format. The two main 
benefits of the OpenType format are its cross-platform compatibility, and its 
ability to support widely expanded character sets and layout features, which 
provide richer linguistic support and advanced typographic control.
-OpenType fonts can include an expanded character set and 
layout features, providing broader linguistic support and more precise 
typographic control.
 The 
features displayed in the Font Features dialog depends on the selected 
font.
 Font features box
 The font features box contains the configurable features 
available for the font.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2019-02-28 Thread Libreoffice Gerrit user

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

New commits:
commit c66366fdcfd44e361cfeaaed872ac8d272b0cbfb
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Feb 28 15:58:51 2019 -0600
Commit: Gerrit Code Review 
CommitDate: Thu Feb 28 22:59:30 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - This paragraph just repeats what the paragraph immediately above says

Change-Id: Iccc9fb41811a4914fdda0f346f9bd32049932448

diff --git a/helpcontent2 b/helpcontent2
index 3b685b808679..36a01a03a960 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3b685b808679c01eb3cb49675d5d7a4d89171172
+Subproject commit 36a01a03a960bc2e152cb8ecd21844f91cfa46bd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-2' - source/text

2019-02-28 Thread Libreoffice Gerrit user

 source/text/shared/01/font_features.xhp |1 -
 1 file changed, 1 deletion(-)

New commits:
commit e5e19bf05d9f59e61c19b1d40aacedc643f6d6f1
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Feb 28 15:58:51 2019 -0600
Commit: Olivier Hallot 
CommitDate: Thu Feb 28 23:03:17 2019 +0100

This paragraph just repeats what the paragraph immediately above says

Change-Id: Iccc9fb41811a4914fdda0f346f9bd32049932448
(cherry picked from commit 36a01a03a960bc2e152cb8ecd21844f91cfa46bd)
Reviewed-on: https://gerrit.libreoffice.org/68517
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/font_features.xhp 
b/source/text/shared/01/font_features.xhp
index 61d4b3065..8bb08fda2 100644
--- a/source/text/shared/01/font_features.xhp
+++ b/source/text/shared/01/font_features.xhp
@@ -32,7 +32,6 @@
 Then press Features...
 
 %PRODUCTNAME supports OpenType font format. The two main 
benefits of the OpenType format are its cross-platform compatibility, and its 
ability to support widely expanded character sets and layout features, which 
provide richer linguistic support and advanced typographic control.
-OpenType fonts can include an expanded character set and 
layout features, providing broader linguistic support and more precise 
typographic control.
 The 
features displayed in the Font Features dialog depends on the selected 
font.
 Font features box
 The font features box contains the configurable features 
available for the font.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: header footer background images don't display on file reopen

2019-02-28 Thread Aditya Sahu

This e-mail is to inform that the bug tdf#116382 [1] has been resolved
successfully. Now, the menu item Border and Background accessed from header
and footer drop-down menu opens the "Border/Background" dialog with a
different set of tabpages ( Borders, Area and Transparency). This should
not cause the problem of disappearance of header/footer background image
each time when the .odt file is saved and re-opened.

The patch has also resolved some other bugs: tdf#115457
, tdf#100503
. Affected
users are requested to please verify that these bugs have been resolved by
the patch [2] and thereafter update their status. As for me, it was really
a great experience resolving the bug and it would not have been possible
without Jim's help. I look forward to resolve more easyHacks on
LibreOffice. Loving the community so far!  ☺

See:
[1] Resolved - Fixed : tdf#116382 :
https://bugs.documentfoundation.org/show_bug.cgi?id=116382

[2] Patch can be found here : https://gerrit.libreoffice.org/#/c/67483/

Cheers,
Aditya Sahu 

On Thu, Feb 7, 2019 at 8:08 PM Michael Stahl  wrote:

> On 07.02.19 15:19, Michael Stahl wrote:
> > On 27.01.19 02:17, Jim Raykowski wrote:
> >> Trying to make header and footer background images redisplay on
> >> opening. I noticed draw:fill="bitmap" in
> >> style:header-footer-properties in a .fodt test file.
> >>
> >> ...
> >>
> >> 
> >>
> >> 
> >>
> >>  >> fo:margin-bottom="0.1965in" draw:fill="bitmap" style:repeat="repeat"
> >> draw:fill-image-ref-point="top-left">
> >>
> >> 
> >>
> >>
> iVBORw0KGgoNSUhEUgAAApUAAACpCAYAAAENcfbOCXBIWXMAAA7EAAAOxQGMMD9a
>
> >>
> >>
> >> ...
> >>
> >> If draw:fill="bitmap" is removed the image shows in the header on
> >> reopen. When not removed blue background fill is shown.
> >>
> >> Is draw:fill="bitmap" needed?
> >
> > what's odd about this is that you have draw:fill="bitmap" attribute but
> > not draw:fill-image-name="..." - that's even more invalid than Regina
> > says :)
> >
> > iirc the idea was that both draw:fill attributes (new and not-yet-valid)
> > and style:background-image element (old and valid) should be exported,
> > so that old LO/OOo versions can read the style:background-image and new
> > LO versions the draw:fill attributes which have more features.
> >
> > when i try with Writer 6.1, i get the draw:fill-image-name plus a couple
> > more (draw:opacity="100%" draw:fill-image-width="0cm"
> > draw:fill-image-height="0cm" style:repeat="repeat"
> > draw:fill-image-ref-point-x="0%" draw:fill-image-ref-point-y="0%"
> > draw:fill-image-ref-point="center" draw:tile-repeat-offset="0%
> > vertical") ... not sure why you manage to get only draw:fill?
>
> okay - it depends on *how* you set the background image.
>
> i've used the Format->Page dialog to set it, that works fine as above.
>
> but there's a second way, in the document view via the blue header
> button drop-down menu "Border and Backgrounds..." - set an image there
> and i get similar results as you (data loss).
>
> apparently there's a bug to have the blue button drop-down call the same
> dialog as Format->Page dialog, which ought to fix the problem.
>
> https://bugs.documentfoundation.org/show_bug.cgi?id=116382
>
>  is apparently working on this...
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: solenv/clang-format

2019-02-28 Thread Libreoffice Gerrit user

 solenv/clang-format/blacklist |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 405809f566833315b624eee6cdb0cd86c56b65ef
Author: Jens Carl 
AuthorDate: Wed Feb 27 21:57:32 2019 +
Commit: Jens Carl 
CommitDate: Fri Mar 1 00:51:51 2019 +0100

test: enable clang-format for xnamecontainer

Unintentionally formatted these files with commit
4b98337699e5e59a543d95c73ea7c64b3d9a1caf with my Vim set up (better keep
them formatted then revert everything).

Change-Id: Ie017fae2bdf952a5d0313d8b5654813ff8d402ad
Reviewed-on: https://gerrit.libreoffice.org/68476
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 39c02006623c..2b2d27ee4e11 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7572,7 +7572,6 @@ include/systools/win32/uwinapi.h
 include/test/bootstrapfixture.hxx
 include/test/calc_unoapi_test.hxx
 include/test/callgrind.hxx
-include/test/container/xnamecontainer.hxx
 include/test/container/xnamed.hxx
 include/test/container/xnamereplace.hxx
 include/test/htmltesttools.hxx
@@ -16548,7 +16547,6 @@ sw/source/uibase/wrtsh/wrtundo.cxx
 test/source/bootstrapfixture.cxx
 test/source/calc_unoapi_test.cxx
 test/source/callgrind.cxx
-test/source/container/xnamecontainer.cxx
 test/source/container/xnamed.cxx
 test/source/container/xnamereplace.cxx
 test/source/diff/diff.cxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-2' - help3xsl/paginathing.js

2019-02-28 Thread Libreoffice Gerrit user

 help3xsl/paginathing.js |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit aa7a881b0cddfab63d3fdfe3904f8a70200b8ad7
Author: Ilmari Lauhakangas 
AuthorDate: Wed Jan 23 14:43:45 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Mar 1 01:44:45 2019 +0100

Moved the pagination controls to the top

As the height of the result list keeps changing constantly,
it was highly annoying to click the arrows in the controls.

Change-Id: I82308adc3971f25ed629009bf1e0854d38197560
Reviewed-on: https://gerrit.libreoffice.org/66795
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit b3686d53d10873b1260091a4c6a898575516217e)
Reviewed-on: https://gerrit.libreoffice.org/68522
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/paginathing.js b/help3xsl/paginathing.js
index 2f3636022..81edf3e0d 100644
--- a/help3xsl/paginathing.js
+++ b/help3xsl/paginathing.js
@@ -29,17 +29,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
  * SOFTWARE.
  */
-// Polyfill for .after()
+// Polyfill for .before()
+// from: 
https://github.com/jserz/js_piece/blob/master/DOM/ChildNode/before()/before().md
 (function (arr) {
   arr.forEach(function (item) {
-if (item.hasOwnProperty('after')) {
+if (item.hasOwnProperty('before')) {
   return;
 }
-Object.defineProperty(item, 'after', {
+Object.defineProperty(item, 'before', {
   configurable: true,
   enumerable: true,
   writable: true,
-  value: function after() {
+  value: function before() {
 var argArr = Array.prototype.slice.call(arguments),
   docFrag = document.createDocumentFragment();
 
@@ -48,7 +49,7 @@
   docFrag.appendChild(isNode ? argItem : 
document.createTextNode(String(argItem)));
 });
 
-this.parentNode.insertBefore(docFrag, this.nextSibling);
+this.parentNode.insertBefore(docFrag, this);
   }
 });
   });
@@ -229,7 +230,7 @@ var Paginator = function(element) {
 }
 }
 
-el.after(container);
+el.before(container);
 container.appendChild(ul);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - helpcontent2

2019-02-28 Thread Libreoffice Gerrit user

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

New commits:
commit 42384985e1fd377e3e4a08f65ed699858336e700
Author: Ilmari Lauhakangas 
AuthorDate: Wed Jan 23 14:43:45 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Mar 1 01:44:45 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2'
  - Moved the pagination controls to the top

As the height of the result list keeps changing constantly,
it was highly annoying to click the arrows in the controls.

Change-Id: I82308adc3971f25ed629009bf1e0854d38197560
Reviewed-on: https://gerrit.libreoffice.org/66795
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit b3686d53d10873b1260091a4c6a898575516217e)
Reviewed-on: https://gerrit.libreoffice.org/68522
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index e5e19bf05d9f..aa7a881b0cdd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e5e19bf05d9f59e61c19b1d40aacedc643f6d6f1
+Subproject commit aa7a881b0cddfab63d3fdfe3904f8a70200b8ad7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sw/source/uibase/shells/basesh.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 1dc25980171ff79345484631882d6ea0eb6f9388
Author: Jim Raykowski 
AuthorDate: Tue Feb 26 00:05:52 2019 -0900
Commit: Jim Raykowski 
CommitDate: Fri Mar 1 03:44:12 2019 +0100

tdf#123516 Speed up insert of large tables with auto format table style

This patch replaces SwFEShell::SetTableStyle use to resolve tdf#108227
with SwTable::SetTableStyleName. The gain in insert speed is a result of
eliminating SwFEShell::SetTableStyle call to the time consuming
SwFEShell::UpdateTableStyleFormatting function which is somewhat
redundant when inserting a table.

Change-Id: Ide1e003d9709a6758e021b52fcf9e40a7b0fcba0
Reviewed-on: https://gerrit.libreoffice.org/68372
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index e78e91fa76eb..fa22a93d72ff 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -111,6 +111,7 @@
 
 #include 
 #include 
+#include 
 
 FlyMode SwBaseShell::eFrameMode = FLY_DRAG_END;
 
@@ -2695,8 +2696,14 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
 if( !aTableName.isEmpty() && !rSh.GetTableStyle( aTableName ) )
 rSh.GetTableFormat()->SetName( aTableName );
 
-if( pTAFormat != nullptr && aAutoName != 
SwStyleNameMapper::GetUIName( RES_POOLTABSTYLE_DEFAULT, OUString() ) )
-rSh.SetTableStyle( aAutoName );
+if( pTAFormat != nullptr && !aAutoName.isEmpty()
+&& aAutoName != SwStyleNameMapper::GetUIName( 
RES_POOLTABSTYLE_DEFAULT, OUString() )
+&& aAutoName != SwViewShell::GetShellRes()->aStrNone )
+{
+SwTableNode* pTableNode = const_cast( 
rSh.IsCursorInTable() );
+if ( pTableNode )
+pTableNode->GetTable().SetTableStyleName( aAutoName );
+}
 
 rSh.EndAllAction();
 rTempView.AutoCaption(TABLE_CAP);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 connectivity/source/drivers/hsqldb/HView.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c61dc240e04fd5f6b70e16644d0a317f9f4bdff9
Author: Andrea Gelmini 
AuthorDate: Mon Feb 25 13:27:18 2019 +
Commit: Julien Nabet 
CommitDate: Fri Mar 1 07:07:48 2019 +0100

Fix typo

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

diff --git a/connectivity/source/drivers/hsqldb/HView.cxx 
b/connectivity/source/drivers/hsqldb/HView.cxx
index bd4e65eca2c4..71dae8440da9 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -118,7 +118,7 @@ namespace connectivity { namespace hsqldb
 {
 if ( bDropSucceeded )
 // drop succeeded, but creation failed -> re-create the view 
with the original
-// statemnet
+// statement
 xStatement->execute( sRestoreCommand );
 throw;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Glade & Accessibility, git issue

2019-02-28 Thread Olivier Hallot

Hi..

On using Glade on a dialog (*.ui) and changing the Help button order, I
get the following complaint from git at commit time

*
* You have some suspicious patch lines:
*
* In sc/uiconfig/scalc/ui/solverdlg.ui
* translatable .ui file line without context (line 415)
sc/uiconfig/scalc/ui/solverdlg.ui:415:   
Cell
reference
* translatable .ui file line without context (line 432)
sc/uiconfig/scalc/ui/solverdlg.ui:432:   
Cell
reference
* translatable .ui file line without context (line 449)
sc/uiconfig/scalc/ui/solverdlg.ui:449:   
Cell
reference
* translatable .ui file line without context (line 466)
sc/uiconfig/scalc/ui/solverdlg.ui:466:   
Cell
reference
* translatable .ui file line without context (line 532)
sc/uiconfig/scalc/ui/solverdlg.ui:532:   
Operator
* translatable .ui file line without context (line 554)
sc/uiconfig/scalc/ui/solverdlg.ui:554:   
Operator
* translatable .ui file line without context (line 576)
sc/uiconfig/scalc/ui/solverdlg.ui:576:   
Operator
* translatable .ui file line without context (line 598)
sc/uiconfig/scalc/ui/solverdlg.ui:598:   
Operator
* translatable .ui file line without context (line 616)
sc/uiconfig/scalc/ui/solverdlg.ui:616:   
Value
* translatable .ui file line without context (line 634)
sc/uiconfig/scalc/ui/solverdlg.ui:634:   
Value
* translatable .ui file line without context (line 652)
sc/uiconfig/scalc/ui/solverdlg.ui:652:   
Value
* translatable .ui file line without context (line 670)
sc/uiconfig/scalc/ui/solverdlg.ui:670:   
Value


It seems that on saving the ui file, Glade 3.22.1 is changing the
context settings of the indicated objects above, which were not the
purpose of my edit. The following diff lines

-    Operator
+    Operator

seems to be what makes git unhappy.

Is there a setting in Glade for that or must I restore manually the
context attribute?

Thank you

-- 
Olivier Hallot
LibreOffice Documentation Coordinator
Comunidade LibreOffice 
Rio de Janeiro - Brasil - Local Time: UTC-03:00
http://tdf.io/joinus 

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

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

2019-02-28 Thread Libreoffice Gerrit user

 slideshow/source/engine/animationnodes/animationaudionode.cxx |   21 --
 slideshow/source/engine/animationnodes/animationaudionode.hxx |1 
 slideshow/source/engine/soundplayer.cxx   |5 ++
 slideshow/source/inc/soundplayer.hxx  |1 
 4 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 71755f36394c1ffbf01af0180a05a258916dd5c9
Author: Mark Hung 
AuthorDate: Wed Feb 27 23:20:31 2019 +0800
Commit: Mark Hung 
CommitDate: Fri Mar 1 00:24:05 2019 +0100

tdf#123743 deactive after the player is stopped.

The queried media duration for gstreamer isn't ready at the beginning.
Instead of deactivate the audio node immediately after querying the
duration, schedule to update the media duration and use the updated
duration to schedule deactivation.

Change-Id: I8bfa69377fbc18b21baf48bc293d2d0853e8805a
Reviewed-on: https://gerrit.libreoffice.org/68451
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx 
b/slideshow/source/engine/animationnodes/animationaudionode.cxx
index b024de24de53..9e3f6bc25271 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.cxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx
@@ -76,12 +76,14 @@ void AnimationAudioNode::activate_st()
 }
 else
 {
-// no node duration. Take inherent media time, then
+// no node duration. Take inherent media time. We have to recheck
+// if the player is playing in case the duration isn't accurate
+// or the progress fall behind.
 auto self(getSelf());
 scheduleDeactivationEvent(
-makeDelay( [self] () { self->deactivate(); },
+makeDelay( [this] () { this->checkPlayingStatus(); },
mpPlayer->getDuration(),
-   "AnimationAudioNode::deactivate with delay") );
+   "AnimationAudioNode::check if sitll playing with 
delay") );
 }
 }
 else
@@ -182,6 +184,19 @@ bool AnimationAudioNode::handleAnimationEvent(
 return true;
 }
 
+void AnimationAudioNode::checkPlayingStatus()
+{
+auto self(getSelf());
+double nDuration = mpPlayer->getDuration();
+if (!mpPlayer->isPlaying() || nDuration < 0.0)
+nDuration = 0.0;
+
+scheduleDeactivationEvent(
+makeDelay( [self] () { self->deactivate(); },
+nDuration,
+"AnimationAudioNode::deactivate with delay") );
+}
+
 } // namespace internal
 } // namespace presentation
 
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx 
b/slideshow/source/engine/animationnodes/animationaudionode.hxx
index 6efd40fdbd20..30de41cfb44e 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.hxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx
@@ -59,6 +59,7 @@ private:
 
 void createPlayer() const;
 void resetPlayer() const;
+void checkPlayingStatus();
 };
 
 } // namespace internal
diff --git a/slideshow/source/engine/soundplayer.cxx 
b/slideshow/source/engine/soundplayer.cxx
index 65b578304d62..18a1948089f9 100644
--- a/slideshow/source/engine/soundplayer.cxx
+++ b/slideshow/source/engine/soundplayer.cxx
@@ -170,6 +170,11 @@ namespace slideshow
 if( mxPlayer.is() )
 mxPlayer->setPlaybackLoop( bLoop );
 }
+
+bool SoundPlayer::isPlaying() const
+{
+return mxPlayer->isPlaying();
+}
 }
 }
 
diff --git a/slideshow/source/inc/soundplayer.hxx 
b/slideshow/source/inc/soundplayer.hxx
index ea496d88b8cc..92ac94b851fb 100644
--- a/slideshow/source/inc/soundplayer.hxx
+++ b/slideshow/source/inc/soundplayer.hxx
@@ -83,6 +83,7 @@ namespace slideshow
 
 bool startPlayback();
 bool stopPlayback();
+bool isPlaying() const;
 
 void setPlaybackLoop( bool bLoop );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sc/qa/extras/sctablesheetsobj.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 94d152054d8be172c56a2243f44a566c9a3e2215
Author: Jens Carl 
AuthorDate: Wed Feb 27 22:13:54 2019 +
Commit: Jens Carl 
CommitDate: Fri Mar 1 00:52:29 2019 +0100

Add test XNameContainer::testRemoveByNameNoneExistingElement

Add test XNameContainer::testRemoveByNameNoneExistingElement to get the
same coverage as before when these case where split with commit
4b98337699e5e59a543d95c73ea7c64b3d9a1caf.

Change-Id: I45ba5af4e2b3137d9379623556ce4129a860e696
Reviewed-on: https://gerrit.libreoffice.org/68477
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/sc/qa/extras/sctablesheetsobj.cxx 
b/sc/qa/extras/sctablesheetsobj.cxx
index f6539a21a5fd..363ee924fc09 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -57,6 +57,7 @@ public:
 
 // XNameContainer
 CPPUNIT_TEST(testRemoveByName);
+CPPUNIT_TEST(testRemoveByNameNoneExistingElement);
 
 CPPUNIT_TEST_SUITE_END();
 
___
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' - uui/source

2019-02-28 Thread Libreoffice Gerrit user

 uui/source/lockcorrupt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ca0c4f23e69a2aae19a9f6899d5c88b0da10b55
Author: Noel Grandin 
AuthorDate: Thu Feb 28 10:55:01 2019 +0200
Commit: Caolán McNamara 
CommitDate: Fri Mar 1 00:59:09 2019 +0100

fix LockCorruptQueryBox title

regression from
commit 082e69fefb7439fd4f3d543f0c402039e94c1e9c
Date:   Mon Feb 26 16:53:37 2018 +
convert various MessBox to weld::MessageDialog

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

diff --git a/uui/source/lockcorrupt.cxx b/uui/source/lockcorrupt.cxx
index bba82db1db3f..008d4555a520 100644
--- a/uui/source/lockcorrupt.cxx
+++ b/uui/source/lockcorrupt.cxx
@@ -28,7 +28,7 @@ LockCorruptQueryBox::LockCorruptQueryBox(weld::Window* 
pParent, const std::local
 : m_xQueryBox(Application::CreateMessageDialog(pParent, 
VclMessageType::Question,
   VclButtonsType::NONE, Translate::get(STR_LOCKCORRUPT_MSG, 
rResLocale)))
 {
-m_xQueryBox->set_title(Translate::get(STR_LOCKCORRUPT_MSG, rResLocale));
+m_xQueryBox->set_title(Translate::get(STR_LOCKCORRUPT_TITLE, rResLocale));
 m_xQueryBox->add_button(Translate::get(STR_LOCKCORRUPT_OPENREADONLY_BTN, 
rResLocale), RET_OK);
 
m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), 
RET_CANCEL);
 m_xQueryBox->set_default_response(RET_OK);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sc/qa/extras/scdatapilotfieldgroupsobj.cxx |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 5265c7691a0a3e97021c4373bd9946246a1f7580
Author: Jens Carl 
AuthorDate: Fri Mar 1 05:30:52 2019 +
Commit: Jens Carl 
CommitDate: Fri Mar 1 07:35:19 2019 +0100

Rename ScDataPilotFieldGroupItemObj to ScDataPilotFieldGroupsObj

Correct class name to mirror the name of object we are testing against.

Change-Id: Id89f29843045182bc01d48e7368648ede886d963
Reviewed-on: https://gerrit.libreoffice.org/68524
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx 
b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
index 9a9fdcb7e102..8bdaf055af48 100644
--- a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
@@ -46,22 +46,22 @@ namespace sc_apitest
 {
 const auto nMaxFieldIndex = 6;
 
-class ScDataPilotFieldGroupItemObj : public CalcUnoApiTest,
- public apitest::XElementAccess,
- public apitest::XEnumerationAccess,
- public apitest::XIndexAccess,
- public apitest::XNameAccess,
- public apitest::XNameContainer,
- public apitest::XServiceInfo
+class ScDataPilotFieldGroupsObj : public CalcUnoApiTest,
+  public apitest::XElementAccess,
+  public apitest::XEnumerationAccess,
+  public apitest::XIndexAccess,
+  public apitest::XNameAccess,
+  public apitest::XNameContainer,
+  public apitest::XServiceInfo
 {
 public:
-ScDataPilotFieldGroupItemObj();
+ScDataPilotFieldGroupsObj();
 
 virtual uno::Reference init() override;
 virtual void setUp() override;
 virtual void tearDown() override;
 
-CPPUNIT_TEST_SUITE(ScDataPilotFieldGroupItemObj);
+CPPUNIT_TEST_SUITE(ScDataPilotFieldGroupsObj);
 
 // XElementAccess
 CPPUNIT_TEST(testGetElementType);
@@ -97,7 +97,7 @@ private:
 uno::Reference m_xComponent;
 };
 
-ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj()
+ScDataPilotFieldGroupsObj::ScDataPilotFieldGroupsObj()
 : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 , XElementAccess(cppu::UnoType::get())
 , XIndexAccess(1)
@@ -107,7 +107,7 @@ ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj()
 {
 }
 
-uno::Reference ScDataPilotFieldGroupItemObj::init()
+uno::Reference ScDataPilotFieldGroupsObj::init()
 {
 table::CellRangeAddress aCellRangeAddress(0, 1, 0, nMaxFieldIndex - 1, 
nMaxFieldIndex - 1);
 table::CellAddress aCellAddress(0, 7, 8);
@@ -210,20 +210,20 @@ uno::Reference 
ScDataPilotFieldGroupItemObj::init()
 return aDPFGI.Groups;
 }
 
-void ScDataPilotFieldGroupItemObj::setUp()
+void ScDataPilotFieldGroupsObj::setUp()
 {
 CalcUnoApiTest::setUp();
 // create a calc document
 m_xComponent = loadFromDesktop("private:factory/scalc");
 }
 
-void ScDataPilotFieldGroupItemObj::tearDown()
+void ScDataPilotFieldGroupsObj::tearDown()
 {
 closeDocument(m_xComponent);
 CalcUnoApiTest::tearDown();
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldGroupItemObj);
+CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldGroupsObj);
 
 } // namespace sc_apitest
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_datapilotfieldgroupitemobj.mk sc/Module_sc.mk sc/qa

2019-02-28 Thread Libreoffice Gerrit user

 qadevOOo/Jar_OOoRunner.mk| 
   1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldGroupItemObj.csv | 
   2 
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java| 
 251 --
 sc/CppunitTest_sc_datapilotfieldgroupitemobj.mk  | 
  47 +
 sc/Module_sc.mk  | 
   1 
 sc/qa/extras/scdatapilotfieldgroupitemobj.cxx| 
 193 +++
 sc/qa/unoapi/sc_1.sce| 
   1 
 7 files changed, 241 insertions(+), 255 deletions(-)

New commits:
commit f58359f8c561b6a377044bba6c0e76eec2db91e7
Author: Jens Carl 
AuthorDate: Fri Mar 1 05:55:21 2019 +
Commit: Jens Carl 
CommitDate: Fri Mar 1 08:23:24 2019 +0100

tdf#45904 Move XNamed Java tests to C++

Move XNamed Java tests to C++ for ScDataPilotFieldGroupItemObj.

Change-Id: I1070f99e2e1655f72c1a6ffaf3f61618b083140e
Reviewed-on: https://gerrit.libreoffice.org/68525
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 1a84aada850a..b73fd46f1c44 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -964,7 +964,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/mod/_sc/ScCellTextCursor \
 qadevOOo/tests/java/mod/_sc/ScChartsObj \
 qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj \
-qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj \
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj \
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj \
 qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldGroupItemObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldGroupItemObj.csv
deleted file mode 100644
index b68ef064305b..
--- 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldGroupItemObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScDataPilotFieldGroupItemObj";"com::sun::star::container::XNamed";"getName()"
-"ScDataPilotFieldGroupItemObj";"com::sun::star::container::XNamed";"setName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java 
b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
deleted file mode 100644
index 583166d92bec..
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package mod._sc;
-
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.container.XNamed;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.DataPilotFieldGroupInfo;
-import com.sun.star.sheet.XDataPilotDescriptor;
-import com.sun.star.sheet.XDataPilotFieldGrouping;
-import com.sun.star.sheet.XDataPilotTables;
-import com.sun.star.sheet.XDataPilotTablesSupplier;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.table.CellAddress;
-import com.sun.star.table.CellRangeAddress;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import util.SOfficeFactory;
-
-
-
-public class ScDataPilotFieldGroupItemObj extends TestCase
-{
-private XSpreadsheetDocument xSheetDoc = null;
-
-/**
- * A field is filled some values. This integer determines the size of the
- * field in x and y direction.
- */
-private static final int mMaxFieldIndex = 6;
-
-/**
- * Creates Spreadsheet document.
- */
-@Override
-protected void initialize (TestParameters tParam, PrintWriter log) throws 
Exception
-{
-SOfficeFactory SOF = SOfficeFactory.getFactory (
-tParam.getMSF ());
-
-log.println

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

2019-02-28 Thread Libreoffice Gerrit user

 sfx2/source/doc/sfxbasemodel.cxx |   12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 517b8037f8c9be93c578befd5b2c3458b3306bc6
Author: Stephan Bergmann 
AuthorDate: Thu Feb 28 10:46:41 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Mar 1 08:30:21 2019 +0100

Use lambda instead of std::bind + wrapper function

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

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 1bc11c4f00e1..efa1cc3695aa 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1496,16 +1496,6 @@ sal_Bool SAL_CALL SfxBaseModel::isReadonly()
 return !m_pData->m_pObjectShell.is() || 
m_pData->m_pObjectShell->IsReadOnly();
 }
 
-/**
- * Proxy around SfxObjectShell::Save_Impl(), as vcl::solarthread::syncExecute()
- * does not seem to accept lambdas.
- */
-static bool SaveImplStatic(SfxObjectShell* pThis, const SfxItemSet* pParams)
-{
-return pThis->Save_Impl(pParams);
-}
-
-
 //  XStorable2
 
 
@@ -1596,7 +1586,7 @@ void SAL_CALL SfxBaseModel::storeSelf( constSequence< 
beans::PropertyValue >
 m_pData->m_pObjectShell->GetMedium( )->SetInCheckIn( nSlotId == 
SID_CHECKIN );
 if (bOnMainThread)
 bRet = vcl::solarthread::syncExecute(
-std::bind(, m_pData->m_pObjectShell.get(), 
pParams.get()));
+[this, ] { return 
m_pData->m_pObjectShell->Save_Impl(pParams.get()); });
 else
 bRet = m_pData->m_pObjectShell->Save_Impl(pParams.get());
 m_pData->m_pObjectShell->GetMedium( )->SetInCheckIn( nSlotId != 
SID_CHECKIN );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 svx/source/svdraw/svdopath.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4bdc3ad0e8b50255eef77a74d383adba623c25f6
Author: Mike Kaganski 
AuthorDate: Fri Mar 1 07:46:42 2019 +0100
Commit: Mike Kaganski 
CommitDate: Fri Mar 1 08:48:54 2019 +0100

Slightly reduce rounding errors taking line angle

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

diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index fe7f07d8569b..ecbafc92cd53 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1672,7 +1672,8 @@ void SdrPathObj::ImpForceLineAngle()
 const basegfx::B2DPoint aB2DPoint1(aPoly.getB2DPoint(1));
 const Point aPoint0(FRound(aB2DPoint0.getX()), FRound(aB2DPoint0.getY()));
 const Point aPoint1(FRound(aB2DPoint1.getX()), FRound(aB2DPoint1.getY()));
-const Point aDelt(aPoint1 - aPoint0);
+const basegfx::B2DPoint aB2DDelt(aB2DPoint1 - aB2DPoint0);
+const Point aDelt(FRound(aB2DDelt.getX()), FRound(aB2DDelt.getY()));
 
 aGeo.nRotationAngle=GetAngle(aDelt);
 aGeo.nShearAngle=0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 toolkit/source/controls/dialogcontrol.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bea51529e98c34791f4705c632939184b20bf2a4
Author: Samuel Mehrbrodt 
AuthorDate: Fri Mar 1 08:19:59 2019 +0100
Commit: Julien Nabet 
CommitDate: Fri Mar 1 08:48:35 2019 +0100

Fix typo

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

diff --git a/toolkit/source/controls/dialogcontrol.cxx 
b/toolkit/source/controls/dialogcontrol.cxx
index 1d4b9fe735df..67c2afb54ee6 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -482,7 +482,7 @@ void SAL_CALL UnoDialogControl::windowResized( const 
css::awt::WindowEvent& e )
 if ( !pOutDev || mbSizeModified )
 return;
 
-// Currentley we are simply using MapUnit::MapAppFont
+// Currently we are simply using MapUnit::MapAppFont
 ::Size aAppFontSize( e.Width, e.Height );
 
 Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sd/uiconfig/sdraw/popupmenu/graphic.xml|1 +
 sd/uiconfig/simpress/popupmenu/graphic.xml |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 576519914588021d6e456128c5dee9496abee282
Author: andreas kainz 
AuthorDate: Thu Feb 28 23:27:25 2019 +0100
Commit: andreas_kainz 
CommitDate: Fri Mar 1 08:36:56 2019 +0100

tdf#123763 move back break command to graphic context menu for 
vectorgraphics

Change-Id: I8af6a0197dc83117d936a7fcf8b794e6d853256a
Reviewed-on: https://gerrit.libreoffice.org/68518
Reviewed-by: V Stuart Foote 
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sd/uiconfig/sdraw/popupmenu/graphic.xml 
b/sd/uiconfig/sdraw/popupmenu/graphic.xml
index 9107d5888f6b..38a367993e14 100644
--- a/sd/uiconfig/sdraw/popupmenu/graphic.xml
+++ b/sd/uiconfig/sdraw/popupmenu/graphic.xml
@@ -69,6 +69,7 @@
   
   
   
+  
   
   
   
diff --git a/sd/uiconfig/simpress/popupmenu/graphic.xml 
b/sd/uiconfig/simpress/popupmenu/graphic.xml
index 112ddab678e6..c067b5e07858 100644
--- a/sd/uiconfig/simpress/popupmenu/graphic.xml
+++ b/sd/uiconfig/simpress/popupmenu/graphic.xml
@@ -69,6 +69,7 @@
   
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 toolkit/source/controls/unocontrol.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit e55c7ff6df82c597763d2eb551f7ccdaa95cd0a9
Author: Samuel Mehrbrodt 
AuthorDate: Thu Feb 28 21:24:54 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Fri Mar 1 07:59:43 2019 +0100

tdf#123772 UnoControlDialogModel: Don't ignore property "Sizeable"

which is supposed to make the dialog resizable, but was silently ignored.

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

diff --git a/toolkit/source/controls/unocontrol.cxx 
b/toolkit/source/controls/unocontrol.cxx
index 302327c4575d..f7612736efc6 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1165,6 +1165,16 @@ void UnoControl::createPeer( const Reference< XToolkit 
>& rxToolkit, const Refer
 aDescr.WindowAttributes |= WindowAttribute::MOVEABLE;
 }
 
+// Sizeable
+aPropName = GetPropertyName( BASEPROPERTY_SIZEABLE );
+if ( xInfo->hasPropertyByName( aPropName ) )
+{
+aVal = xPSet->getPropertyValue( aPropName );
+bool b = bool();
+if ( ( aVal >>= b ) && b)
+aDescr.WindowAttributes |= WindowAttribute::SIZEABLE;
+}
+
 // Closeable
 aPropName = GetPropertyName( BASEPROPERTY_CLOSEABLE );
 if ( xInfo->hasPropertyByName( aPropName ) )
___
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/source

2019-02-28 Thread Libreoffice Gerrit user

 vcl/source/filter/graphicfilter.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 68c8b98dfb9f3463bdc8f1233fd578e236e4d570
Author: Tor Lillqvist 
AuthorDate: Wed Feb 27 14:28:55 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 28 08:59:45 2019 +0100

tdf#122537: Use "best speed" instead of default compression level on iOS

Speed is more important than size in the use case where this showed up
in a profile of the iOS app (inserting an image). This change causes
zlib's deflate_fast() being used instead of its deflate_slow(). For a
specific image I tested with the former takes 1.5 s, the latter 3.4 s.

This is just one aspect of the slowness of image insertio. The
resizing operations mentioned in the bug report is not yet
investigated.

Change-Id: Icf023522b965cb0265000c821a478610d098cd0a
Reviewed-on: https://gerrit.libreoffice.org/68434
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index b30b8afbe130..e7f86486d792 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2269,6 +2269,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, 
rData, bool )
 
 sal_uInt16  nFormat = GRFILTER_FORMAT_DONTKNOW;
 OString aShortName;
+css::uno::Sequence< css::beans::PropertyValue > aFilterData;
 switch( rData.mnFormat )
 {
 case ConvertDataFormat::BMP: aShortName = BMP_SHORTNAME; break;
@@ -2295,8 +2296,17 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, 
rData, bool )
 else if( !aShortName.isEmpty() )
 {
 // Export
+#ifdef IOS
+if (aShortName == PNG_SHORTNAME)
+{
+aFilterData.realloc(aFilterData.getLength() + 1);
+aFilterData[aFilterData.getLength() - 1].Name = "Compression";
+// We "know" that this gets passed to zlib's deflateInit2_(). 1 
means best speed.
+aFilterData[aFilterData.getLength() - 1].Value <<= 1;
+}
+#endif
 nFormat = GetExportFormatNumberForShortName( 
OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) );
-bRet = ExportGraphic( rData.maGraphic, OUString(), rData.mrStm, 
nFormat ) == ERRCODE_NONE;
+bRet = ExportGraphic( rData.maGraphic, OUString(), rData.mrStm, 
nFormat,  ) == ERRCODE_NONE;
 }
 
 return bRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 sw/qa/extras/layout/layout.cxx|9 +
 sw/source/core/layout/newfrm.cxx  |4 ++--
 sw/source/core/layout/trvlfrm.cxx |   12 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit 8ae5a98852c2f3d87d6efff598f0c7d54df835d3
Author: Miklos Vajna 
AuthorDate: Wed Feb 27 21:31:06 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 28 09:17:49 2019 +0100

sw btlr writing mode shell: left/right cursor travelling, fix dest para

Fix aVerticalLeftToRightBottomToTop:

- fnXDiff takes "logically larger, logically smaller" arguments, so it's
  first - second for top to bottom text (existing directions) but it's
  second - first for btlr

- fnXInc was effectively unused before, but it probably meant to provide
  logical left + width, so set that to physical left - width for btlr

And then port 3 places in lcl_UpDown() to use aRectFnSet, so we get
correct behavior for both ttb and btt directions.

With this, pressing the left/right arrow jumps to the previous / next
paragraph correctly.

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

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index a1f805d42bd9..6b54065d9e88 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2841,6 +2841,7 @@ void SwLayoutWriter::testBtlrCell()
 CPPUNIT_ASSERT_LESS(nFirstParaBottom, rCharRect.Top());
 
 // Test that pressing "up" at the start of the cell goes to the next 
character position.
+sal_uLong nNodeIndex = pWrtShell->GetCursor()->Start()->nNode.GetIndex();
 sal_Int32 nIndex = pWrtShell->GetCursor()->Start()->nContent.GetIndex();
 KeyEvent aKeyEvent(0, KEY_UP);
 SwEditWin& rEditWin = pShell->GetView()->GetEditWin();
@@ -2849,6 +2850,14 @@ void SwLayoutWriter::testBtlrCell()
 // Without the accompanying fix in place, this test would have failed: 
"up" was interpreted as
 // logical "left", which does nothing if you're at the start of the text 
anyway.
 CPPUNIT_ASSERT_EQUAL(nIndex + 1, 
pWrtShell->GetCursor()->Start()->nContent.GetIndex());
+
+// Test that pressing "right" goes to the next paragraph (logical "down").
+aKeyEvent = KeyEvent(0, KEY_RIGHT);
+rEditWin.KeyInput(aKeyEvent);
+Scheduler::ProcessEventsToIdle();
+// Without the accompanying fix in place, this test would have failed: the 
cursor went to the
+// paragraph after the table.
+CPPUNIT_ASSERT_EQUAL(nNodeIndex + 1, 
pWrtShell->GetCursor()->Start()->nNode.GetIndex());
 #endif
 }
 
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 94e016434e47..bfaf62657091 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -275,9 +275,9 @@ static SwRectFnCollection aVerticalLeftToRightBottomToTop = 
{
 
 /*.fnSetPos =*/::SetLowerLeftCorner,
 /*.fnMakePos =*/::MakeRightPos,
-/*.fnXDiff =*/,
+/*.fnXDiff =*/,
 /*.fnYDiff =*/,
-/*.fnXInc =*/,
+/*.fnXInc =*/,
 /*.fnYInc =*/,
 
 /*.fnSetLeftAndWidth =*/::SetBottomAndHeight,
diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index a434a20567c2..912cbafbb43e 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -757,8 +757,8 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame 
*pStart,
 while ( pCell && !pCell->IsCellFrame() )
 pCell = pCell->GetUpper();
 OSL_ENSURE( pCell, "could not find the cell" );
-nX =  aRectFnSet.GetLeft(pCell->getFrameArea()) +
-  aRectFnSet.GetWidth(pCell->getFrameArea()) / 2;
+nX = aRectFnSet.XInc(aRectFnSet.GetLeft(pCell->getFrameArea()),
+ aRectFnSet.GetWidth(pCell->getFrameArea()) / 
2);
 
 //The flow leads from one table to the next. The X-value needs to 
be
 //corrected based on the middle of the starting cell by the amount
@@ -778,14 +778,14 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame 
*pStart,
 const long nPrtLeft = bRTL ?
 aRectFnSet.GetPrtRight(*pTable) :
 aRectFnSet.GetPrtLeft(*pTable);
-if ( bRTL != (nX < nPrtLeft) )
+if (bRTL != (aRectFnSet.XDiff(nPrtLeft, nX) > 0))
 nX = nPrtLeft;
 else
 {
 const long nPrtRight = bRTL ?
 aRectFnSet.GetPrtLeft(*pTable) :
 aRectFnSet.GetPrtRight(*pTable);
-if ( bRTL != (nX > nPrtRight) )
+if (bRTL != (aRectFnSet.XDiff(nX, nPrtRight) > 0))
 nX = nPrtRight;
 }
 }
@@ -884,7 +884,7 @@ static bool

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

2019-02-28 Thread Libreoffice Gerrit user

 sw/source/uibase/frmdlg/colmgr.cxx |   27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 0d0119efd526c17018044a805347d5bce195065a
Author: Stephan Bergmann 
AuthorDate: Wed Feb 27 21:19:21 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 28 09:27:02 2019 +0100

In FitToAcutalSize, keep SwColumn's width >= left + right borders

Given SwColumn::m_nWish is documented as "Desired width, borders included."
(sw/inc/fmtclds.hxx), it appears that the invariant

  GetWishWidth() >= GetLeft() + GetRight()

should always hold for SwColumn instances.

However, during UITest_writer_tests4's test_tdf113284 loading of
sw/qa/uitest/writer_tests/data/tdf113284.odt, it appears that some 
five-column
table is created for which initially all SwColumns'

  GetWishWidth() = 13107
  GetLeft() = 144 (except for first SwColumn, where it's 0)
  GetRight() = 144 (except for last SwColumn, where it's 0)

and later FitToActualSize is called reducing each SwColunn to

  GetWishWidth() = 286

so that for most SwColumns (except first and last), GetLeft() + GetRight() 
= 288
would exceed GetWishWidth().  And then (still during loading of the test's
document), SwFormatCol::CalcPrtColWidth (sw/source/core/layout/atrfrm.cxx) 
is
called for such a problematic SwColumn, trying to subtract from its
GetWishWidth() (the result of SwFormatCol::CalcColWidth) both GetLeft() and
GetRight(), and store that into sal_uInt16 nRet.  Which triggers Clang's
-fsanitize=implicit-signed-integer-truncation "runtime error: implicit
conversion from type 'int' of value -2 (32-bit, signed) to type 'sal_uInt16'
(aka 'unsigned short') changed the value to 65534 (16-bit, unsigned)".

So make sure that FitToAcutalSize upholds that presumed SwColumns invariant,
shrinking the borders as necessary.

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

diff --git a/sw/source/uibase/frmdlg/colmgr.cxx 
b/sw/source/uibase/frmdlg/colmgr.cxx
index c2ff97fe7145..f9c624293429 100644
--- a/sw/source/uibase/frmdlg/colmgr.cxx
+++ b/sw/source/uibase/frmdlg/colmgr.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -34,7 +38,28 @@ void FitToActualSize(SwFormatCol& rCol, sal_uInt16 nWidth)
 for(sal_uInt16 i = 0; i < nCount; ++i)
 {
 const sal_uInt16 nTmp = rCol.CalcColWidth(i, nWidth);
-rCol.GetColumns()[i].SetWishWidth(nTmp);
+auto & col = rCol.GetColumns()[i];
+col.SetWishWidth(nTmp);
+// If necessary, shrink borders (as equally as possible) to keep up 
the invariant that
+// GetWishWidth() >= GetLeft() + GetRight():
+sal_uInt32 const borders = col.GetLeft() + col.GetRight();
+if (borders > nTmp)
+{
+auto const shrink =  borders - nTmp;
+auto const half = shrink / 2; // rounds down
+if (col.GetLeft() < col.GetRight())
+{
+auto const shrinkLeft = std::min(sal_uInt32(col.GetLeft()), 
half);
+col.SetLeft(col.GetLeft() - shrinkLeft);
+col.SetRight(col.GetRight() - (shrink - shrinkLeft));
+}
+else
+{
+auto const shrinkRight = std::min(sal_uInt32(col.GetRight()), 
half);
+col.SetLeft(col.GetLeft() - (shrink - shrinkRight));
+col.SetRight(col.GetRight() - shrinkRight);
+}
+}
 }
 rCol.SetWishWidth(nWidth);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/inc vcl/qt5 vcl/source

2019-02-28 Thread Libreoffice Gerrit user

 vcl/inc/qt5/Qt5Menu.hxx|2 
 vcl/inc/salmenu.hxx|1 
 vcl/qt5/Qt5Menu.cxx|   92 +
 vcl/source/window/menu.cxx |   12 -
 4 files changed, 82 insertions(+), 25 deletions(-)

New commits:
commit e14015edd9fb090bf7444f850dff42c84321bb35
Author: Aleksei Nikiforov 
AuthorDate: Wed Feb 27 15:03:07 2019 +0300
Commit: Michael Weghorn 
CommitDate: Thu Feb 28 09:27:56 2019 +0100

tdf#121970 KDE5: Regenerate menu when it's set as submenu

Also add item bits change notification function
for SalMenu to properly convert regenerated menu items
to check or radiocheck items.

Change-Id: I61f16a771b484644bbefd9afaf2776232d38a2f9
Reviewed-on: https://gerrit.libreoffice.org/68438
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit f341921825370fb98ad896a20d823c5f0cb537f6)
Reviewed-on: https://gerrit.libreoffice.org/68458
Reviewed-by: Michael Weghorn 

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index ea4369263f62..1ad62a82b9bd 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -39,6 +39,7 @@ private:
 
 void ReinitializeActionGroup(unsigned nPos);
 void ResetAllActionGroups();
+void UpdateActionGroupItem(Qt5MenuItem* pSalMenuItem);
 
 public:
 Qt5Menu(bool bMenuBar);
@@ -51,6 +52,7 @@ public:
 virtual void SetFrame(const SalFrame* pFrame) override;
 const Qt5Frame* GetFrame() const;
 Qt5Menu* GetTopLevel();
+virtual void SetItemBits(unsigned nPos, MenuItemBits nBits) override;
 virtual void CheckItem(unsigned nPos, bool bCheck) override;
 virtual void EnableItem(unsigned nPos, bool bEnable) override;
 virtual void ShowItem(unsigned nPos, bool bShow) override;
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 0b6cd9e22481..6829e3a623d1 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -68,6 +68,7 @@ public:
 virtual void RemoveItem( unsigned nPos ) = 0;
 virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, 
unsigned nPos ) = 0;
 virtual void SetFrame( const SalFrame* pFrame ) = 0;
+virtual void SetItemBits( unsigned /*nPos*/, MenuItemBits /*nBits*/ ) {}
 virtual void CheckItem( unsigned nPos, bool bCheck ) = 0;
 virtual void EnableItem( unsigned nPos, bool bEnable ) = 0;
 virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const 
OUString& rText )= 0;
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 049d90b7b4da..a00cce02dffa 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -40,8 +40,6 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 OUString aText = mpVCLMenu->GetItemText(nId);
 NativeItemText(aText);
 vcl::KeyCode nAccelKey = mpVCLMenu->GetAccelKey(nId);
-bool bChecked = mpVCLMenu->IsItemChecked(nId);
-MenuItemBits itemBits = mpVCLMenu->GetItemBits(nId);
 
 pSalMenuItem->mpAction.reset();
 pSalMenuItem->mpMenu.reset();
@@ -138,24 +136,9 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 
 ReinitializeActionGroup(nPos);
 
-
pAction->setShortcut(toQString(nAccelKey.GetName(GetFrame()->GetWindow(;
+UpdateActionGroupItem(pSalMenuItem);
 
-if (itemBits & MenuItemBits::CHECKABLE)
-{
-pAction->setCheckable(true);
-pAction->setChecked(bChecked);
-}
-else if (itemBits & MenuItemBits::RADIOCHECK)
-{
-pAction->setCheckable(true);
-
-if (pSalMenuItem->mpActionGroup)
-{
-pSalMenuItem->mpActionGroup->addAction(pAction);
-}
-
-pAction->setChecked(bChecked);
-}
+
pAction->setShortcut(toQString(nAccelKey.GetName(GetFrame()->GetWindow(;
 
 connect(pAction, ::triggered, this,
 [pSalMenuItem] { slotMenuTriggered(pSalMenuItem); });
@@ -297,6 +280,43 @@ void Qt5Menu::ResetAllActionGroups()
 }
 }
 
+void Qt5Menu::UpdateActionGroupItem(Qt5MenuItem* pSalMenuItem)
+{
+QAction* pAction = pSalMenuItem->getAction();
+if (!pAction)
+return;
+
+bool bChecked = mpVCLMenu->IsItemChecked(pSalMenuItem->mnId);
+MenuItemBits itemBits = mpVCLMenu->GetItemBits(pSalMenuItem->mnId);
+
+if (itemBits & MenuItemBits::RADIOCHECK)
+{
+pAction->setCheckable(true);
+
+if (pSalMenuItem->mpActionGroup)
+{
+pSalMenuItem->mpActionGroup->addAction(pAction);
+}
+
+pAction->setChecked(bChecked);
+}
+else
+{
+pAction->setActionGroup(nullptr);
+
+if (itemBits & MenuItemBits::CHECKABLE)
+{
+pAction->setCheckable(true);
+

[Libreoffice-commits] core.git: idlc/source l10ntools/source unoidl/source

2019-02-28 Thread Libreoffice Gerrit user

 idlc/source/scanner.l  |2 +-
 l10ntools/source/cfglex.l  |8 
 l10ntools/source/xrmlex.l  |8 
 unoidl/source/sourceprovider-scanner.l |   12 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 88156ea385e4d81c41a4a46157029671bb019751
Author: Stephan Bergmann 
AuthorDate: Wed Feb 27 10:24:52 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 28 09:30:01 2019 +0100

loplugin:includeform

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

diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index a4137551701b..1ba611dc52ea 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -24,7 +24,7 @@
  * scanner.ll - Lexical scanner for IDLC 1.0
  */
 
-#include "sal/config.h"
+#include 
 
 #include 
 #include 
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index 50f22421a027..f5fc2280dfe2 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -23,7 +23,7 @@
  * lexer for parsing cfg source files
  */
 
-#include "sal/config.h"
+#include 
 
 /* enlarge token buffer to tokenize whole strings */
 #undef YYLMAX
@@ -38,13 +38,13 @@
 #endif
 
 /* table of possible token ids */
-#include "tokens.h"
+#include 
 #include 
 #include 
 
-#include "sal/main.h"
+#include 
 
-#include "cfglex.hxx"
+#include 
 
 #define YY_NO_UNISTD_H
 
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 8ecd4c0cec78..c4d18337c5ad 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -23,7 +23,7 @@
  * lexer for parsing xml-property source files (*.xml)
  */
 
-#include "sal/config.h"
+#include 
 
 /* enlarge token buffer to tokenize whole strings */
 #undef YYLMAX
@@ -38,12 +38,12 @@
 #endif
 
 /* table of possible token ids */
-#include "tokens.h"
-#include "xrmlex.hxx"
+#include 
+#include 
 #include 
 #include 
 
-#include "sal/main.h"
+#include 
 
 #define YY_NO_UNISTD_H
 
diff --git a/unoidl/source/sourceprovider-scanner.l 
b/unoidl/source/sourceprovider-scanner.l
index 014966a1c60e..29d594caf8e5 100644
--- a/unoidl/source/sourceprovider-scanner.l
+++ b/unoidl/source/sourceprovider-scanner.l
@@ -30,15 +30,15 @@
 
 %{
 
-#include "rtl/math.h"
-#include "rtl/string.hxx"
-#include "rtl/ustring.hxx"
-#include "rtl/textenc.h"
-#include "sal/types.h"
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 #include "sourceprovider-parser-requires.hxx"
-#include "sourceprovider-parser.hxx"
+#include 
 #include "sourceprovider-scanner.hxx"
 
 namespace unoidl { namespace detail {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 idlc/source/scanner.l |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68008da159f5be16a5dcc67a27c3442add86e1c1
Author: Stephan Bergmann 
AuthorDate: Wed Feb 27 13:39:44 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 28 09:30:52 2019 +0100

loplugin:cstylecast

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

diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 1ba611dc52ea..37b2bbff0829 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -227,7 +227,7 @@ static void parseLineAndFile(sal_Char* pBuf)
 h = r;
 for (; *r != '\0' && *r != ' ' && *r != '\t'; r++) ;
 *r++ = 0;
-idlc()->setLineNumber((sal_uInt32)atol(h));
+idlc()->setLineNumber(sal_uInt32(atol(h)));
 yylineno = atol(h);
 
 /* Find file name, if present */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/inc vcl/qt5

2019-02-28 Thread Libreoffice Gerrit user

 vcl/inc/qt5/Qt5Menu.hxx |2 +-
 vcl/qt5/Qt5Menu.cxx |   45 +++--
 2 files changed, 24 insertions(+), 23 deletions(-)

New commits:
commit 5df2207997aa5de50abd3ce6e47bc20ab53dfb61
Author: Aleksei Nikiforov 
AuthorDate: Wed Feb 27 15:02:15 2019 +0300
Commit: Michael Weghorn 
CommitDate: Thu Feb 28 09:30:19 2019 +0100

KDE5: set correct parent menu in function

Set correct parent menu in function Qt5Menu::InsertMenuItem
instead of just returning it and setting it later if needed.

Change-Id: Id866987e91ec1d57c720735da6afc44109aa901a
Reviewed-on: https://gerrit.libreoffice.org/68437
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit c74cc70966e9bc3756509f4d50af50ec181e1774)
Reviewed-on: https://gerrit.libreoffice.org/68459
Reviewed-by: Michael Weghorn 

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 1ad62a82b9bd..fb2f7e17027b 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -35,7 +35,7 @@ private:
 void DoFullMenuUpdate(Menu* pMenuBar);
 static void NativeItemText(OUString& rItemText);
 
-QMenu* InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos);
+void InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos);
 
 void ReinitializeActionGroup(unsigned nPos);
 void ResetAllActionGroups();
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index a00cce02dffa..49de2c0305a7 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -33,9 +33,8 @@ Qt5Menu::Qt5Menu(bool bMenuBar)
 
 bool Qt5Menu::VisibleMenuBar() { return true; }
 
-QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
+void Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
 {
-QMenu* pQMenu = mpQMenu;
 sal_uInt16 nId = pSalMenuItem->mnId;
 OUString aText = mpVCLMenu->GetItemText(nId);
 NativeItemText(aText);
@@ -49,7 +48,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 // top-level menu
 if (mpQMenuBar)
 {
-pQMenu = new QMenu(toQString(aText), nullptr);
+QMenu* pQMenu = new QMenu(toQString(aText), nullptr);
 pSalMenuItem->mpMenu.reset(pQMenu);
 
 if ((nPos != MENU_APPEND)
@@ -62,31 +61,38 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 mpQMenuBar->addMenu(pQMenu);
 }
 
+// correct parent menu for generated menu
+if (pSalMenuItem->mpSubMenu)
+{
+pSalMenuItem->mpSubMenu->mpQMenu = pQMenu;
+}
+
 connect(pQMenu, ::aboutToShow, this,
 [pSalMenuItem] { slotMenuAboutToShow(pSalMenuItem); });
 connect(pQMenu, ::aboutToHide, this,
 [pSalMenuItem] { slotMenuAboutToHide(pSalMenuItem); });
 }
 }
-else if (pQMenu)
+else if (mpQMenu)
 {
 if (pSalMenuItem->mpSubMenu)
 {
 // submenu
-QMenu* pTempQMenu = new QMenu(toQString(aText), nullptr);
-pSalMenuItem->mpMenu.reset(pTempQMenu);
+QMenu* pQMenu = new QMenu(toQString(aText), nullptr);
+pSalMenuItem->mpMenu.reset(pQMenu);
 
 if ((nPos != MENU_APPEND)
-&& (static_cast(nPos) < 
static_cast(pQMenu->actions().size(
+&& (static_cast(nPos) < 
static_cast(mpQMenu->actions().size(
 {
-pQMenu->insertMenu(pQMenu->actions()[nPos], pTempQMenu);
+mpQMenu->insertMenu(mpQMenu->actions()[nPos], pQMenu);
 }
 else
 {
-pQMenu->addMenu(pTempQMenu);
+mpQMenu->addMenu(pQMenu);
 }
 
-pQMenu = pTempQMenu;
+// correct parent menu for generated menu
+pSalMenuItem->mpSubMenu->mpQMenu = pQMenu;
 
 ReinitializeActionGroup(nPos);
 
@@ -107,13 +113,13 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 pAction->setSeparator(true);
 
 if ((nPos != MENU_APPEND)
-&& (static_cast(nPos) < 
static_cast(pQMenu->actions().size(
+&& (static_cast(nPos) < 
static_cast(mpQMenu->actions().size(
 {
-pQMenu->insertAction(pQMenu->actions()[nPos], pAction);
+mpQMenu->insertAction(mpQMenu->actions()[nPos], pAction);
 }
 else
 {
-pQMenu->addAction(pAction);
+mpQMenu->addAction(pAction);
 }
 
 ReinitializeActionGroup(nPos);
@@ -125,13 +131,13 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 pSalMenuItem->mpAction.reset(pAction);
 
 if ((nPos != MENU_APPEND)
-

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

2019-02-28 Thread Libreoffice Gerrit user

 sfx2/source/doc/sfxbasemodel.cxx |   12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit bf75515989a5dfda613b1047977648288d941a85
Author: Samuel Mehrbrodt 
AuthorDate: Wed Feb 27 15:06:45 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 28 10:12:21 2019 +0100

Use lambda instead of std::bind + wrapper function

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

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 7740b5c1a41a..1bc11c4f00e1 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1505,16 +1505,6 @@ static bool SaveImplStatic(SfxObjectShell* pThis, const 
SfxItemSet* pParams)
 return pThis->Save_Impl(pParams);
 }
 
-/**
- * Proxy around SfxBaseModel::impl_store(), as vcl::solarthread::syncExecute()
- * does not seem to accept lambdas or void functions.
- */
-static bool ImplStoreStatic(SfxBaseModel* pThis, const OUString& rURL,
-const uno::Sequence& rArgs, 
bool bSaveTo)
-{
-pThis->impl_store(rURL, rArgs, bSaveTo);
-return true;
-}
 
 //  XStorable2
 
@@ -1704,7 +1694,7 @@ void SAL_CALL SfxBaseModel::storeToURL( const   OUString& 
  rURL
 utl::MediaDescriptor aDescriptor(rArgs);
 bool bOnMainThread = 
aDescriptor.getUnpackedValueOrDefault("OnMainThread", false);
 if (bOnMainThread)
-vcl::solarthread::syncExecute(std::bind(, this, 
rURL, rArgs, true));
+vcl::solarthread::syncExecute([this, rURL, rArgs]() { 
impl_store(rURL, rArgs, true); });
 else
 impl_store(rURL, rArgs, true);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: ios/Mobile.xcodeproj

2019-02-28 Thread Libreoffice Gerrit user

 ios/Mobile.xcodeproj/project.pbxproj |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 5c5a9f522152f98b20f0c0eafccbf2429220dd28
Author: Tor Lillqvist 
AuthorDate: Wed Feb 27 20:34:07 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 28 11:22:03 2019 +0200

Add zcodec.cxx from tools

Change-Id: If08b0bddab02277595190a7127d6f0c3f6f0

diff --git a/ios/Mobile.xcodeproj/project.pbxproj 
b/ios/Mobile.xcodeproj/project.pbxproj
index 9bd35c5df..0641f99a1 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -302,6 +302,7 @@
BE34D1FE219076CF00815297 /* output2.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = output2.cxx; 
path = "../../ios-device/sc/source/ui/view/output2.cxx"; sourceTree = 
""; };
BE34D1FF219076CF00815297 /* formatsh.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = formatsh.cxx; 
path = "../../ios-device/sc/source/ui/view/formatsh.cxx"; sourceTree = 
""; };
BE34D200219076CF00815297 /* dbfunc3.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbfunc3.cxx; 
path = "../../ios-device/sc/source/ui/view/dbfunc3.cxx"; sourceTree = 
""; };
+   BE43FD39222693F200376855 /* zcodec.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = zcodec.cxx; 
path = "../../ios-device/tools/source/zcodec/zcodec.cxx"; sourceTree = 
""; };
BE58E129217F295B00249358 /* Log.hpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path 
= Log.hpp; sourceTree = ""; };
BE58E12A217F295B00249358 /* Png.hpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path 
= Png.hpp; sourceTree = ""; };
BE58E12B217F295B00249358 /* SigUtil.hpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path 
= SigUtil.hpp; sourceTree = ""; };
@@ -937,6 +938,14 @@
name = view;
sourceTree = "";
};
+   BE43FD38222693CC00376855 /* zcodec */ = {
+   isa = PBXGroup;
+   children = (
+   BE43FD39222693F200376855 /* zcodec.cxx */,
+   );
+   name = zcodec;
+   sourceTree = "";
+   };
BE58E1312187938700249358 /* headless */ = {
isa = PBXGroup;
children = (
@@ -1403,6 +1412,7 @@
isa = PBXGroup;
children = (
BEB6524C216FD0AA00B8C09A /* stream */,
+   BE43FD38222693CC00376855 /* zcodec */,
);
name = tools;
sourceTree = "";
___
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' - download.lst

2019-02-28 Thread Libreoffice Gerrit user

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 89ef9597a660f730a825b15e1058f681b075b82a
Author: David Tardon 
AuthorDate: Thu Mar 29 09:20:19 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Feb 28 10:33:50 2019 +0100

upload openssl 1.0.2o

Reviewed-on: https://gerrit.libreoffice.org/52051
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 9c459fd919cb8199a69fc2d630742930e533285b)

Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042
Reviewed-on: https://gerrit.libreoffice.org/68444
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index dea9159f2138..f8c0e2a630bc 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export ODFGEN_TARBALL := 
libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_MD5SUM := 10e9e37f492094b9ef296f68f24a7666
-export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz
+export OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
+export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-28 Thread Libreoffice Gerrit user

 filter/source/msfilter/svdfppt.cxx |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 93c08ca200c12a505e00a9a5aeeff2c730d23b74
Author: Johnny_M 
AuthorDate: Sat Feb 23 15:41:28 2019 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 28 10:33:10 2019 +0100

Translate German variable names

As in f2afa2af10d9d30d7160e73881ca6fe5a409f35a

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

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 162500f5a984..3cd0247d8fc5 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2152,7 +2152,7 @@ bool SdrPowerPointImport::ReadFontCollection()
 DffRecordHeader* pEnvHd = aDocRecManager.GetRecordHeader( 
PPT_PST_Environment );
 if ( pEnvHd )
 {
-sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for 
restoring it later
+sal_uLong nOldFPos = rStCtrl.Tell(); // remember FilePos for restoring 
it later
 pEnvHd->SeekToContent( rStCtrl );
 DffRecordHeader aListHd;
 if ( SeekToRec( rStCtrl, PPT_PST_FontCollection, 
pEnvHd->GetRecEndFilePos(),  ) )
@@ -2190,7 +2190,7 @@ bool SdrPowerPointImport::ReadFontCollection()
 m_pFonts->insert(m_pFonts->begin() + nCount2++, 
std::move(pFont));
 }
 }
-rStCtrl.Seek( nFPosMerk ); // restore FilePos
+rStCtrl.Seek( nOldFPos ); // restore FilePos
 }
 return bRet;
 }
@@ -2360,7 +2360,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* 
pTextObj, SdrTextObj*
 bool SdrPowerPointImport::SeekToDocument( DffRecordHeader* pRecHd ) const
 {
 bool bRet;
-sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it 
should the situation arise
+sal_uLong nOldFPos = rStCtrl.Tell(); // remember FilePos for restoring it 
should the situation arise
 rStCtrl.Seek( nDocStreamPos );
 DffRecordHeader aDocHd;
 ReadDffRecordHeader( rStCtrl, aDocHd );
@@ -2373,7 +2373,7 @@ bool SdrPowerPointImport::SeekToDocument( 
DffRecordHeader* pRecHd ) const
 aDocHd.SeekToBegOfRecord( rStCtrl );
 }
 if ( !bRet )
-rStCtrl.Seek( nFPosMerk ); // restore FilePos
+rStCtrl.Seek( nOldFPos ); // restore FilePos
 return bRet;
 }
 
@@ -2745,7 +2745,7 @@ static void ImportComment10( SvxMSDffManager const & 
rMan, SvStream& rStCtrl, Sd
 // be sure not to import masterpages with this method
 void SdrPowerPointImport::ImportPage( SdrPage* pRet, const 
PptSlidePersistEntry* pMasterPersist )
 {
-sal_uInt32 nMerk = rStCtrl.Tell();
+sal_uInt32 nOldPos = rStCtrl.Tell();
 PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
 if ( ( !pList ) || ( pList->size() <= nCurrentPageNum ) )
 return;
@@ -2966,7 +2966,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, 
const PptSlidePersistEntry*
 if (rSlidePersist.xSolverContainer)
 SolveSolver(*rSlidePersist.xSolverContainer);
 }
-rStCtrl.Seek( nMerk );
+rStCtrl.Seek( nOldPos );
 }
 
 const PptSlideLayoutAtom* SdrPowerPointImport::GetSlideLayoutAtom() const
@@ -3032,7 +3032,7 @@ SdrObject* 
SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
 {
 SdrObject* pRet = nullptr;
 std::unique_ptr pSet;
-sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it 
later
+sal_uLong nOldFPos = rStCtrl.Tell(); // remember FilePos for restoring it 
later
 DffRecordHeader aPageHd;
 if ( SeekToCurrentPage(  ) )
 {   // and now search for the background attributes of the Page
@@ -3066,7 +3066,7 @@ SdrObject* 
SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
 }
 }
 }
-rStCtrl.Seek( nFPosMerk ); // restore FilePos
+rStCtrl.Seek( nOldFPos ); // restore FilePos
 if ( !pSet )
 {
 pSet.reset(new SfxItemSet( pSdrModel->GetItemPool() ));
@@ -5185,7 +5185,7 @@ void PPTStyleTextPropReader::ReadCharProps( SvStream& 
rIn, PPTCharPropSet& aChar
 void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& 
rTextHeader,
PPTTextRulerInterpreter const & rRuler, 
const DffRecordHeader& rExtParaHd, TSS_Type nInstance )
 {
-sal_uInt32 nMerk = rIn.Tell();
+sal_uInt32 nOldPos = rIn.Tell();
 sal_uInt32 nExtParaPos = ( rExtParaHd.nRecType == 
PPT_PST_ExtendedParagraphAtom ) ? rExtParaHd.nFilePos + 8 : 0;
 
 std::vector< StyleTextProp9 > aStyleTextProp9;
@@ -5199,7 +5199,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const 
DffRecordHeader& rTextHe
 aStyleTextProp9.emplace_back();
 aStyleTextProp9.back().Read( rIn );
 }
-rIn.Seek( nMerk );
+rIn.Seek( nOldPos );
 }
 
 OUString aString;
@@ -5409,7 +5409,7

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

2019-02-28 Thread Libreoffice Gerrit user

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bc06c1a5b459f69a4c97d10ce2ba03fa5e29d50f
Author: Caolán McNamara 
AuthorDate: Mon Sep 3 09:19:29 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 28 10:35:36 2019 +0100

upgrade to openssl 1.0.2p

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

Change-Id: Ifacf5dce39d830838b3cf57df760a04df97ade4b
Reviewed-on: https://gerrit.libreoffice.org/68445
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index f8c0e2a630bc..4ed21beecc85 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export ODFGEN_TARBALL := 
libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
-export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
+export OPENSSL_MD5SUM := ac5eb30bf5798aa14b1ae6d0e7da58df
+export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/inc include/comphelper include/cppcanvas include/oox sc/inc sdext/source sfx2/source slideshow/source svx/source ucb/source unotools/source

2019-02-28 Thread Libreoffice Gerrit user

 filter/inc/gfxtypes.hxx|6 --
 include/comphelper/propagg.hxx |1 -
 include/comphelper/propertycontainerhelper.hxx |1 -
 include/cppcanvas/canvasgraphic.hxx|2 --
 include/cppcanvas/sprite.hxx   |2 --
 include/oox/drawingml/clrscheme.hxx|2 --
 sc/inc/dptabres.hxx|2 --
 sdext/source/pdfimport/inc/pdfiprocessor.hxx   |2 --
 sfx2/source/control/objface.cxx|2 --
 slideshow/source/inc/animation.hxx |2 --
 slideshow/source/inc/cursormanager.hxx |2 --
 slideshow/source/inc/expressionnode.hxx|2 --
 slideshow/source/inc/unoviewcontainer.hxx  |2 --
 slideshow/source/inc/vieweventhandler.hxx  |1 -
 svx/source/inc/fmexpl.hxx  |2 --
 ucb/source/core/FileAccess.cxx |2 --
 unotools/source/config/eventcfg.cxx|1 -
 17 files changed, 34 deletions(-)

New commits:
commit 376ee49f68384cf16aec57d54506378b67ccd402
Author: Noel Grandin 
AuthorDate: Thu Feb 28 09:15:10 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 28 10:35:22 2019 +0100

remove some unused typedefs

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

diff --git a/filter/inc/gfxtypes.hxx b/filter/inc/gfxtypes.hxx
index 135aa5fd4988..365e381c0ab4 100644
--- a/filter/inc/gfxtypes.hxx
+++ b/filter/inc/gfxtypes.hxx
@@ -315,12 +315,6 @@ namespace std
 };
 }
 
-namespace svgi
-{
-typedef std::unordered_set StatePool;
-typedef std::unordered_map StateMap;
-} // namespace svgi
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index cb0b1749b36e..3e153a64a39b 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -61,7 +61,6 @@ namespace internal
 };
 
 typedef std::map< sal_Int32, OPropertyAccessor >  PropertyAccessorMap;
-typedef PropertyAccessorMap::iterator   
PropertyAccessorMapIterator;
 typedef PropertyAccessorMap::const_iterator 
ConstPropertyAccessorMapIterator;
 }
 
diff --git a/include/comphelper/propertycontainerhelper.hxx 
b/include/comphelper/propertycontainerhelper.hxx
index 0b5a178f6e4a..6564cc0f85b3 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -72,7 +72,6 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription
 class COMPHELPER_DLLPUBLIC OPropertyContainerHelper
 {
 typedef ::std::vector< css::uno::Any >  PropertyContainer;
-typedef PropertyContainer::const_iterator   
ConstPropertyContainerIterator;
 PropertyContainer   m_aHoldProperties;
 // the properties which are hold by this class' instance, not the 
derived one's
 
diff --git a/include/cppcanvas/canvasgraphic.hxx 
b/include/cppcanvas/canvasgraphic.hxx
index 8f1797ab9045..501df5b51749 100644
--- a/include/cppcanvas/canvasgraphic.hxx
+++ b/include/cppcanvas/canvasgraphic.hxx
@@ -75,8 +75,6 @@ namespace cppcanvas
 virtual bool draw() const = 0;
 
 };
-
-typedef std::shared_ptr< ::cppcanvas::CanvasGraphic > 
CanvasGraphicSharedPtr;
 }
 
 #endif // INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx
index 52b967ee0231..b52bffd90e83 100644
--- a/include/cppcanvas/sprite.hxx
+++ b/include/cppcanvas/sprite.hxx
@@ -97,8 +97,6 @@ namespace cppcanvas
  */
 virtual void setPriority( double fPriority ) = 0;
 };
-
-typedef std::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr;
 }
 
 #endif // INCLUDED_CPPCANVAS_SPRITE_HXX
diff --git a/include/oox/drawingml/clrscheme.hxx 
b/include/oox/drawingml/clrscheme.hxx
index 8b99b8523d77..80c932b44a1e 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -90,8 +90,6 @@ public:
 ::Color& rColor) const;
 };
 
-typedef std::shared_ptr< ClrScheme > ClrSchemePtr;
-
 } }
 
 #endif // INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 0a20f3cffa76..13eeb5fc5135 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -483,8 +483,6 @@ public:
 ScDPDataDimension*  GetChildDimension() { return 
pChildDimension.get(); }
 };
 
-typedef std::vector ScDPDataMembers;
-
 //  result dimension contains only members
 
 class ScDPResultDimension
diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx 
b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
index 281c78be6c8d..196a59ba3a8b 100644
--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
@@ -169,8 +169,6 @@ namespace pdfi
 typedef std::unordered_map IdToFontMap;
 typedef std::unordered_map

[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg

2019-02-28 Thread Libreoffice Gerrit user

 icon-themes/sifr/cmd/lc_toggleanchortype.png|binary
 icon-themes/sifr/cmd/sc_advancedmode.png|binary
 icon-themes/sifr/cmd/sc_anchormenu.png  |binary
 icon-themes/sifr/cmd/sc_animationmode.png   |binary
 icon-themes/sifr/cmd/sc_autoformat.png  |binary
 icon-themes/sifr/cmd/sc_autooutline.png |binary
 icon-themes/sifr/cmd/sc_dbnewform.png   |binary
 icon-themes/sifr/cmd/sc_dbnewformautopilot.png  |binary
 icon-themes/sifr_dark/cmd/lc_toggleanchortype.png   |binary
 icon-themes/sifr_dark/cmd/sc_advancedmode.png   |binary
 icon-themes/sifr_dark/cmd/sc_anchormenu.png |binary
 icon-themes/sifr_dark/cmd/sc_animationmode.png  |binary
 icon-themes/sifr_dark/cmd/sc_autoformat.png |binary
 icon-themes/sifr_dark/cmd/sc_autooutline.png|binary
 icon-themes/sifr_dark/cmd/sc_dbnewform.png  |binary
 icon-themes/sifr_dark/cmd/sc_dbnewformautopilot.png |binary
 icon-themes/sifr_svg/cmd/lc_toggleanchortype.svg|6 ++
 icon-themes/sifr_svg/cmd/sc_advancedmode.svg|   10 ++
 icon-themes/sifr_svg/cmd/sc_anchormenu.svg  |6 ++
 icon-themes/sifr_svg/cmd/sc_animationmode.svg   |6 ++
 icon-themes/sifr_svg/cmd/sc_autoformat.svg  |6 ++
 icon-themes/sifr_svg/cmd/sc_autooutline.svg |6 ++
 icon-themes/sifr_svg/cmd/sc_dbnewform.svg   |4 
 icon-themes/sifr_svg/cmd/sc_dbnewformautopilot.svg  |4 
 24 files changed, 40 insertions(+), 8 deletions(-)

New commits:
commit d569fe313bbad33b1be49647506e51d1f3893f0f
Author: andreas kainz 
AuthorDate: Wed Feb 27 07:35:19 2019 +0100
Commit: andreas_kainz 
CommitDate: Thu Feb 28 10:36:08 2019 +0100

Sifr icon theme update

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

diff --git a/icon-themes/sifr/cmd/lc_toggleanchortype.png 
b/icon-themes/sifr/cmd/lc_toggleanchortype.png
index 59ab4a0f4382..8c6c023eda73 100644
Binary files a/icon-themes/sifr/cmd/lc_toggleanchortype.png and 
b/icon-themes/sifr/cmd/lc_toggleanchortype.png differ
diff --git a/icon-themes/sifr/cmd/sc_advancedmode.png 
b/icon-themes/sifr/cmd/sc_advancedmode.png
new file mode 100644
index ..a1b581ba4212
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_advancedmode.png differ
diff --git a/icon-themes/sifr/cmd/sc_anchormenu.png 
b/icon-themes/sifr/cmd/sc_anchormenu.png
new file mode 100644
index ..b8a44df91df9
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_anchormenu.png differ
diff --git a/icon-themes/sifr/cmd/sc_animationmode.png 
b/icon-themes/sifr/cmd/sc_animationmode.png
new file mode 100644
index ..edf3d51c00fe
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_animationmode.png differ
diff --git a/icon-themes/sifr/cmd/sc_autoformat.png 
b/icon-themes/sifr/cmd/sc_autoformat.png
new file mode 100644
index ..c2e8a84148ae
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_autoformat.png differ
diff --git a/icon-themes/sifr/cmd/sc_autooutline.png 
b/icon-themes/sifr/cmd/sc_autooutline.png
new file mode 100644
index ..294924b9a9f3
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_autooutline.png differ
diff --git a/icon-themes/sifr/cmd/sc_dbnewform.png 
b/icon-themes/sifr/cmd/sc_dbnewform.png
index 7a18870479cc..1f6cc3a2591d 100644
Binary files a/icon-themes/sifr/cmd/sc_dbnewform.png and 
b/icon-themes/sifr/cmd/sc_dbnewform.png differ
diff --git a/icon-themes/sifr/cmd/sc_dbnewformautopilot.png 
b/icon-themes/sifr/cmd/sc_dbnewformautopilot.png
index 6a6274a6835f..f1d19a013b02 100644
Binary files a/icon-themes/sifr/cmd/sc_dbnewformautopilot.png and 
b/icon-themes/sifr/cmd/sc_dbnewformautopilot.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_toggleanchortype.png 
b/icon-themes/sifr_dark/cmd/lc_toggleanchortype.png
index c6a64ae69015..91d27d162bc5 100644
Binary files a/icon-themes/sifr_dark/cmd/lc_toggleanchortype.png and 
b/icon-themes/sifr_dark/cmd/lc_toggleanchortype.png differ
diff --git a/icon-themes/sifr_dark/cmd/sc_advancedmode.png 
b/icon-themes/sifr_dark/cmd/sc_advancedmode.png
new file mode 100644
index ..d0003fd9d14b
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_advancedmode.png 
differ
diff --git a/icon-themes/sifr_dark/cmd/sc_anchormenu.png 
b/icon-themes/sifr_dark/cmd/sc_anchormenu.png
new file mode 100644
index ..1202a80230ca
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_anchormenu.png differ
diff --git a/icon-themes/sifr_dark/cmd/sc_animationmode.png 
b/icon-themes/sifr_dark/cmd/sc_animationmode.png
new file mode 100644
index ..da42209aef7e
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_animationmode.png 
differ
diff --git a/icon-themes/sifr_dark/cmd/sc_autoformat.png 
b/icon-themes/sifr_dark/cmd/sc_autoformat.png
new

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

2019-02-28 Thread Libreoffice Gerrit user

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a150aed05d1b67acf1d9ad92fe9cee474af7d5d1
Author: Michael Stahl 
AuthorDate: Wed Feb 27 12:18:01 2019 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 28 10:36:09 2019 +0100

openssl: upgrade to release 1.0.2r

Fixes CVE-2019-1559, plus a couple low-severity CVEs.

Reviewed-on: https://gerrit.libreoffice.org/68430
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd)

Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b
Reviewed-on: https://gerrit.libreoffice.org/68446
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 4ed21beecc85..0ad1b34c5fe0 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export ODFGEN_TARBALL := 
libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_MD5SUM := ac5eb30bf5798aa14b1ae6d0e7da58df
-export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
+export OPENSSL_MD5SUM := 0d2baaf04c56d542f6cc757b9c2a2aac
+export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-4' - 4 commits - download.lst

2019-02-28 Thread Libreoffice Gerrit user

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 52bb4626f834a924c55d89c8f7e2d82f036d41c2
Author: Michael Stahl 
AuthorDate: Wed Feb 27 12:18:01 2019 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 27 14:44:58 2019 +0100

openssl: upgrade to release 1.0.2r

Fixes CVE-2019-1559, plus a couple low-severity CVEs.

Reviewed-on: https://gerrit.libreoffice.org/68430
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd)

Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b

diff --git a/download.lst b/download.lst
index 1208afbac9a6..9e0210158084 100644
--- a/download.lst
+++ b/download.lst
@@ -176,8 +176,8 @@ export OPENCOLLADA_SHA256SUM := 
8f25d429237cde289a448c82a0a830791354ccce5ee40d77
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_SHA256SUM := 
d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400
 export OPENLDAP_TARBALL := openldap-2.4.44.tgz
-export OPENSSL_SHA256SUM := 
50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
-export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
+export OPENSSL_SHA256SUM := 
ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6
+export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz
 export ORCUS_SHA256SUM := 
676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908
 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
commit ae2715497a85ef98a737df6824d2f098eb6516cc
Author: Caolán McNamara 
AuthorDate: Mon Sep 3 09:19:29 2018 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 27 12:51:27 2019 +0100

upgrade to openssl 1.0.2p

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

Change-Id: Ifacf5dce39d830838b3cf57df760a04df97ade4b

diff --git a/download.lst b/download.lst
index 90473f228d48..1208afbac9a6 100644
--- a/download.lst
+++ b/download.lst
@@ -176,8 +176,8 @@ export OPENCOLLADA_SHA256SUM := 
8f25d429237cde289a448c82a0a830791354ccce5ee40d77
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_SHA256SUM := 
d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400
 export OPENLDAP_TARBALL := openldap-2.4.44.tgz
-export OPENSSL_SHA256SUM := 
ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
-export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
+export OPENSSL_SHA256SUM := 
50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
+export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
 export ORCUS_SHA256SUM := 
676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908
 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
commit d1fa0084777f5d3483f5411fe17bfeb75cef7f60
Author: David Tardon 
AuthorDate: Thu Mar 29 09:20:19 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Feb 27 12:48:39 2019 +0100

upload openssl 1.0.2o

Reviewed-on: https://gerrit.libreoffice.org/52051
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 9c459fd919cb8199a69fc2d630742930e533285b)

Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042

diff --git a/download.lst b/download.lst
index c1ac0d40..90473f228d48 100644
--- a/download.lst
+++ b/download.lst
@@ -176,8 +176,8 @@ export OPENCOLLADA_SHA256SUM := 
8f25d429237cde289a448c82a0a830791354ccce5ee40d77
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_SHA256SUM := 
d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400
 export OPENLDAP_TARBALL := openldap-2.4.44.tgz
-export OPENSSL_SHA256SUM := 
8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f
-export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz
+export OPENSSL_SHA256SUM := 
ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
+export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
 export ORCUS_SHA256SUM := 
676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908
 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
commit f596986a1fc134f9a77c99dbb0df83a9343f76b4
Author: David Tardon 
AuthorDate: Tue Nov 7 19:16:57 2017 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 27 12:47:13 2019 +0100

upload openssl 1.0.2m

Change-Id: Iac75c0a2633a11c4ca3f2007c62bf74be2f576ca
Reviewed-on: https://gerrit.libreoffice.org/44421
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 899d7139355b8bea4bc1e6f9c05dededdb6f2c39)

diff --git a/download.lst

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-0' - 3 commits - download.lst

2019-02-28 Thread Libreoffice Gerrit user

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0225ca8d10f63560d04ebc2be0304c7cc898271c
Author: Michael Stahl 
AuthorDate: Wed Feb 27 12:18:01 2019 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 27 14:44:21 2019 +0100

openssl: upgrade to release 1.0.2r

Fixes CVE-2019-1559, plus a couple low-severity CVEs.

Reviewed-on: https://gerrit.libreoffice.org/68430
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd)

Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b

diff --git a/download.lst b/download.lst
index 7638089d4dda..d2c50e34cd99 100644
--- a/download.lst
+++ b/download.lst
@@ -188,8 +188,8 @@ export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
-export OPENSSL_SHA256SUM := 
50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
-export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
+export OPENSSL_SHA256SUM := 
ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6
+export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz
 export ORCUS_SHA256SUM := 
62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9
 export ORCUS_TARBALL := liborcus-0.13.3.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
commit 4a35b5b43f6fb1d5133cae957eb0a14e71047e7f
Author: Caolán McNamara 
AuthorDate: Mon Sep 3 09:19:29 2018 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 27 12:51:30 2019 +0100

upgrade to openssl 1.0.2p

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

Change-Id: Ifacf5dce39d830838b3cf57df760a04df97ade4b

diff --git a/download.lst b/download.lst
index 44271d3abf7d..7638089d4dda 100644
--- a/download.lst
+++ b/download.lst
@@ -188,8 +188,8 @@ export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
-export OPENSSL_SHA256SUM := 
ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
-export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
+export OPENSSL_SHA256SUM := 
50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
+export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
 export ORCUS_SHA256SUM := 
62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9
 export ORCUS_TARBALL := liborcus-0.13.3.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
commit 272297a5cf3d9aa35f9777660c403104adcaf4f2
Author: David Tardon 
AuthorDate: Thu Mar 29 09:20:19 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Feb 27 12:49:32 2019 +0100

upload openssl 1.0.2o

Reviewed-on: https://gerrit.libreoffice.org/52051
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 9c459fd919cb8199a69fc2d630742930e533285b)

Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042

diff --git a/download.lst b/download.lst
index ffbbf458db18..44271d3abf7d 100644
--- a/download.lst
+++ b/download.lst
@@ -188,8 +188,8 @@ export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
-export OPENSSL_SHA256SUM := 
8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f
-export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz
+export OPENSSL_SHA256SUM := 
ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
+export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
 export ORCUS_SHA256SUM := 
62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9
 export ORCUS_TARBALL := liborcus-0.13.3.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 5 commits - download.lst external/openssl

2019-02-28 Thread Libreoffice Gerrit user

 download.lst  |4 ++--
 external/openssl/openssllnx.patch |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fdb9054acb704ded71195d702ba65c492575605d
Author: Michael Stahl 
AuthorDate: Wed Feb 27 12:18:01 2019 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 27 14:46:28 2019 +0100

openssl: upgrade to release 1.0.2r

Fixes CVE-2019-1559, plus a couple low-severity CVEs.

Reviewed-on: https://gerrit.libreoffice.org/68430
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd)

Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b

diff --git a/download.lst b/download.lst
index 82d9bd2750df..272f185dae95 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export ODFGEN_TARBALL := 
libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_MD5SUM := ac5eb30bf5798aa14b1ae6d0e7da58df
-export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
+export OPENSSL_MD5SUM := 0d2baaf04c56d542f6cc757b9c2a2aac
+export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
commit 5b9b15a62a61275f472f52404ecc815850811a25
Author: Caolán McNamara 
AuthorDate: Mon Sep 3 09:19:29 2018 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 27 12:41:09 2019 +0100

upgrade to openssl 1.0.2p

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

Change-Id: Ifacf5dce39d830838b3cf57df760a04df97ade4b

diff --git a/download.lst b/download.lst
index 518e8295962c..82d9bd2750df 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export ODFGEN_TARBALL := 
libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
-export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
+export OPENSSL_MD5SUM := ac5eb30bf5798aa14b1ae6d0e7da58df
+export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
commit 53e3e0cda1768881998e75d958cb57e97d1d4391
Author: David Tardon 
AuthorDate: Thu Mar 29 09:20:19 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Feb 27 12:37:31 2019 +0100

upload openssl 1.0.2o

Reviewed-on: https://gerrit.libreoffice.org/52051
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 9c459fd919cb8199a69fc2d630742930e533285b)

Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042

diff --git a/download.lst b/download.lst
index f694b79fd9da..518e8295962c 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export ODFGEN_TARBALL := 
libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_MD5SUM := 10e9e37f492094b9ef296f68f24a7666
-export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz
+export OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
+export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
 export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
commit 1b23cc46e1a70748304ba987edfb00295ca3beef
Author: David Tardon 
AuthorDate: Tue Nov 7 19:16:57 2017 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 27 12:35:03 2019 +0100

upload openssl 1.0.2m

Reviewed-on: https://gerrit.libreoffice.org/44421
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 899d7139355b8bea4bc1e6f9c05dededdb6f2c39)

Change-Id: Iac75c0a2633a11c4ca3f2007c62bf74be2f576ca

diff --git a/download.lst b/download.lst
index 5e7a056c9531..f694b79fd9da 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export ODFGEN_TARBALL := 
libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL :=

[Libreoffice-bugs] [Bug 122652] [META] Memory problems in LibreOffice

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=122652

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Depends on||95346


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=95346
[Bug 95346] XLSX file crashes LibreOffice calc when save or very slow and eats
600 MB to 2 GB of RAM
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 108897] [META] XLSX (OOXML) bug tracker

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=108897

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Depends on||95346


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=95346
[Bug 95346] XLSX file crashes LibreOffice calc when save or very slow and eats
600 MB to 2 GB of RAM
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 95346] XLSX file crashes LibreOffice calc when save or very slow and eats 600 MB to 2 GB of RAM

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=95346

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Blocks||108897, 122652


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=108897
[Bug 108897] [META] XLSX (OOXML) bug tracker
https://bugs.documentfoundation.org/show_bug.cgi?id=122652
[Bug 122652] [META] Memory problems in LibreOffice
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 108897] [META] XLSX (OOXML) bug tracker

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=108897

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 Depends on||95231


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=95231
[Bug 95231] Colors are not displayed in cells only after save as XLSX
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 95231] Colors are not displayed in cells only after save as XLSX

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=95231

Roman Kuznetsov <79045_79...@mail.ru> changed:

   What|Removed |Added

 CC||79045_79...@mail.ru
 Resolution|--- |WORKSFORME
   Keywords||filter:xlsx
 Status|NEW |RESOLVED
 Blocks||108897

--- Comment #13 from Roman Kuznetsov <79045_79...@mail.ru> ---
don't repro in

Version: 6.3.0.0.alpha0+
Build ID: c57dc7d41bd62f933cffab6131edb7252606382d
CPU threads: 4; OS: Windows 6.1; UI render: default; VCL: win; 
Locale: ru-RU (ru_RU); UI-Language: en-US
Calc: threaded

Status->WFM


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=108897
[Bug 108897] [META] XLSX (OOXML) bug tracker
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 108897] [META] XLSX (OOXML) bug tracker

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=108897
Bug 108897 depends on bug 95231, which changed state.

Bug 95231 Summary: Colors are not displayed in cells only after save as XLSX
https://bugs.documentfoundation.org/show_bug.cgi?id=95231

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 123761] latest aol gold software

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=123761

himajin100...@gmail.com changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|UNCONFIRMED |RESOLVED

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 123750] KDE5/ Plasma: LO Filedialog isn't showing removable devices

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=123750

Vera Blagoveschenskaya  changed:

   What|Removed |Added

 CC||ver...@basealt.ru

--- Comment #1 from Vera Blagoveschenskaya  ---
Hello,

I've tried to save file to usb in LO 6.1.6.0.0+, 6.2.2.0.0+, 6.3.0.0.alpha0+
My removable device is shown correctly and I can save file on it.

Version: 6.1.6.0.0+
Build ID: 2ab2280f21fa491154e17c303dc70fcf059123b3
CPU threads: 4; OS: Linux 4.19; UI render: default; VCL: kde4; 
TinderBox: Linux-rpm_deb-x86_64@70-TDF, Branch:libreoffice-6-1, Time:
2019-02-13_11:49:06
Locale: ru-RU (ru_RU.UTF-8); Calc: group threaded

Version: 6.2.2.0.0+
Build ID: b17bffe4eb15e4cec969aa2699ce8be60e01b1c1
CPU threads: 4; OS: Linux 4.19; UI render: default; VCL: kde5; 
TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:libreoffice-6-2, Time:
2019-02-25_17:41:32
Locale: ru-RU (ru_RU.UTF-8); UI-Language: en-US
Calc: threaded

Version: 6.3.0.0.alpha0+
Build ID: 5413c8871dec08eff19f514f5f391b946a45c86c
CPU threads: 4; OS: Linux 4.19; UI render: default; VCL: kde5; 
TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:master, Time:
2019-02-27_23:42:10
Locale: ru-RU (ru_RU.UTF-8); UI-Language: en-US
Calc: threaded

Could you please provide us with more details?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 122436] Writer can't display or export eps with preview correctly

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=122436

--- Comment #6 from medmedin2014  ---
(In reply to raal from comment #5)
> I can not confirm  with Version: 6.3.0.0.alpha0+
> Build ID: 465939feb0e9c382e5581b53b72008979ece4807
> CPU threads: 4; OS: Linux 4.15; UI render: default; VCL: gtk3; 
> 
> Seems to be fixed with dev version. Please could you test it with
> dev version?  You can download it here:
> http://dev-builds.libreoffice.org/daily/master/
> Thank you

Which version should I install ? and is It safe to use it for opening my old
files ? I have only one old laptop wich I use for studies so I want to be sure
not installing an earlier version, because now what I have with my Ubuntu Mate
18.04.2 is just version 6.1.5.2, and I alreay use libreoffice ppa to get latest
versions.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 121440] EDITING DOCX, Word document edited in Writer by typing after and before footnote number, the typed text become superscript

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=121440

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:6.3.0

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 121440] EDITING DOCX, Word document edited in Writer by typing after and before footnote number, the typed text become superscript

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=121440

--- Comment #5 from Commit Notification 
 ---
Vasily Melenchuk committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/+/691ca4e1a3e510d54894a1e7df7fa4ad9f9cba11%5E%21

tdf#121440 writerfilter: do not use imported style for foot/endnotes

It will be available in 6.3.0.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 122436] Writer can't display or export eps with preview correctly

2019-02-28 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=122436

--- Comment #8 from raal  ---
Hello, for ubuntu you can use for example
https://dev-builds.libreoffice.org/daily/master/Linux-rpm_deb-x86_64@86-TDF/current/

file
master~2019-02-27_23.42.10_LibreOfficeDev_6.3.0.0.alpha0_Linux_x86-64_deb.tar.gz
unpack and install with sudo dpkg -i *

this master version is installed in /opt directory

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

1 2 3 4 >

1 - 100 of 375 matches

Mail list logo