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

[Libreoffice Gerrit user]

 qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java |   44 +---
 sc/source/core/data/docpool.cxx |2 
 2 files changed, 16 insertions(+), 30 deletions(-)

New commits:
commit d08e63fb1ab16d96e3d1404c4b82267447104a0f
Author: Heiko Tietze 
AuthorDate: Thu Dec 6 17:09:20 2018 +0100
Commit: Heiko Tietze 
CommitDate: Fri Dec 7 08:40:31 2018 +0100

tdf#121759 Revert "tdf#99296 - Disable headers/footers by default"

This reverts commit 08b5048198d59441cb8033ed14cd17e68c943004.

Disabled h/f lead to an inactive menu entry (tdf#121759).
Also, the change was not accepted by the OP (tdf#99296).
See discussion on the mailing list, Gerrit, and BZ.

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

diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java 
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index d7ff676f5a0e..74670742c8ae 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -106,35 +106,6 @@ public class ScAccessiblePageHeader extends TestCase {
 e.printStackTrace(log);
 }
 
-XStyleFamiliesSupplier StyleFam = UnoRuntime.queryInterface(
-XStyleFamiliesSupplier.class,
-xSpreadsheetDoc );
-XNameAccess StyleFamNames = StyleFam.getStyleFamilies();
-XStyle StdStyle = null;
-
-XNameAccess PageStyles = (XNameAccess) AnyConverter.toObject(
-new Type(XNameAccess.class),
-StyleFamNames.getByName("PageStyles"));
-StdStyle = (XStyle) AnyConverter.toObject(
-new Type(XStyle.class), PageStyles.getByName("Default"));
-
-//get the property-set
-final XPropertySet PropSet = 
UnoRuntime.queryInterface(XPropertySet.class, StdStyle);
-
-// tdf#99296 - Disable headers/footers by default
-try {
-PropSet.setPropertyValue("HeaderIsOn", Boolean.TRUE);
-PropSet.setPropertyValue("FooterIsOn", Boolean.TRUE);
-} catch (com.sun.star.beans.UnknownPropertyException upe) {
-log.println("Don't know the Property 'HeaderIsOn' or 
'FooterIsOn'");
-} catch (com.sun.star.lang.WrappedTargetException wte) {
-log.println("WrappedTargetException while setting Property 
'HeaderIsOn' or 'FooterIsOn'");
-} catch (com.sun.star.lang.IllegalArgumentException iae) {
-log.println("IllegalArgumentException while setting Property 
'HeaderIsOn' or 'FooterIsOn'");
-} catch (com.sun.star.beans.PropertyVetoException pve) {
-log.println("PropertyVetoException while setting Property 
'HeaderIsOn' or 'FooterIsOn'");
-}
-
 XModel aModel = UnoRuntime.queryInterface(XModel.class, 
xSpreadsheetDoc);
 
 XController xController = aModel.getCurrentController();
@@ -180,6 +151,21 @@ public class ScAccessiblePageHeader extends TestCase {
 
 TestEnvironment tEnv = new TestEnvironment(oObj);
 
+XStyleFamiliesSupplier StyleFam = UnoRuntime.queryInterface(
+XStyleFamiliesSupplier.class,
+xSpreadsheetDoc );
+XNameAccess StyleFamNames = StyleFam.getStyleFamilies();
+XStyle StdStyle = null;
+
+XNameAccess PageStyles = (XNameAccess) AnyConverter.toObject(
+new Type(XNameAccess.class),
+StyleFamNames.getByName("PageStyles"));
+StdStyle = (XStyle) AnyConverter.toObject(
+new Type(XStyle.class), PageStyles.getByName("Default"));
+
+//get the property-set
+final XPropertySet PropSet = 
UnoRuntime.queryInterface(XPropertySet.class, StdStyle);
+
 XHeaderFooterContent RPHC = null;
 // creation of testobject here
 // first we write what we are intend to do to log file
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 530c79e11d92..0a0819b533e0 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -290,7 +290,7 @@ ScDocumentPool::ScDocumentPool()
 mvPoolDefaults[ ATTR_PAGE_SIZE   - ATTR_STARTINDEX ] = new 
SvxSizeItem( ATTR_PAGE_SIZE );
 mvPoolDefaults[ ATTR_PAGE_HORCENTER  - ATTR_STARTINDEX ] = new 
SfxBoolItem( ATTR_PAGE_HORCENTER );
 mvPoolDefaults[ ATTR_PAGE_VERCENTER  - ATTR_STARTINDEX ] = new 
SfxBoolItem( ATTR_PAGE_VERCENTER );
-mvPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new 
SfxBoolItem( ATTR_PAGE_ON, false );
+mvPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new 
SfxBoolItem( ATTR_PAGE_ON, true );
 mvPoolDefaults[ ATTR_PAGE_DYNAMIC- ATTR_STARTINDEX ] = new 
SfxBoolItem( ATTR_PAGE_DYNAMIC, true );
 mvPoolDefaults[ ATTR_PAGE_SHARED - ATTR_STARTINDEX ] = new 
SfxBoolIt

Re: Compiler baselines

[Stephan Bergmann]

On 23/11/2018 08:57, Stephan Bergmann wrote:

On 21/11/2018 17:42, Stephan Bergmann wrote:
If nobody objects, we'd update the build baselines on master (towards 
LO 6.3) as follows (cf README.md):

* Linux GCC: from GCC 4.8.1 to GCC 7


(See the discussion in its own sub-thread at 
 
"Re: Compiler baselines" about rolling this out on Jenkins.)


Enforced now with 
 
"Bump (Linux) GCC baseline to 7.0.0".

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

[Libreoffice-commits] core.git: cppcanvas/Library_cppcanvas.mk cppcanvas/source

[Libreoffice Gerrit user]

 cppcanvas/Library_cppcanvas.mk |9 
 cppcanvas/source/inc/implrenderer.hxx  |   23 
 cppcanvas/source/mtfrenderer/emfpbrush.cxx |  309 ---
 cppcanvas/source/mtfrenderer/emfpbrush.hxx |  131 -
 cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx |  164 --
 cppcanvas/source/mtfrenderer/emfpcustomlinecap.hxx |   47 
 cppcanvas/source/mtfrenderer/emfpfont.cxx  |   75 
 cppcanvas/source/mtfrenderer/emfpfont.hxx  |   42 
 cppcanvas/source/mtfrenderer/emfpimage.cxx |  101 -
 cppcanvas/source/mtfrenderer/emfpimage.hxx |   44 
 cppcanvas/source/mtfrenderer/emfplus.cxx   | 1666 -
 cppcanvas/source/mtfrenderer/emfppath.cxx  |  193 --
 cppcanvas/source/mtfrenderer/emfppath.hxx  |   50 
 cppcanvas/source/mtfrenderer/emfppen.cxx   |  296 ---
 cppcanvas/source/mtfrenderer/emfppen.hxx   |   79 
 cppcanvas/source/mtfrenderer/emfpregion.cxx|   86 -
 cppcanvas/source/mtfrenderer/emfpregion.hxx|   42 
 cppcanvas/source/mtfrenderer/emfpstringformat.cxx  |   66 
 cppcanvas/source/mtfrenderer/emfpstringformat.hxx  |   54 
 cppcanvas/source/mtfrenderer/implrenderer.cxx  |   13 
 20 files changed, 1 insertion(+), 3489 deletions(-)

New commits:
commit 217ad59a412ebab07a106b14c8976d20bddb9356
Author: Bartosz Kosiorek 
AuthorDate: Fri Nov 30 23:08:47 2018 +0100
Commit: Noel Grandin 
CommitDate: Fri Dec 7 08:29:18 2018 +0100

tdf#111486 Removed not used EMF+ code

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

diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index 8a374b58dcee..6aa698d5e9b7 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -50,20 +50,11 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\
 $(eval $(call gb_Library_add_exception_objects,cppcanvas,\
cppcanvas/source/mtfrenderer/bitmapaction \
cppcanvas/source/mtfrenderer/cachedprimitivebase \
-   cppcanvas/source/mtfrenderer/emfpbrush \
-   cppcanvas/source/mtfrenderer/emfpcustomlinecap \
-   cppcanvas/source/mtfrenderer/emfpfont \
-   cppcanvas/source/mtfrenderer/emfpimage \
-   cppcanvas/source/mtfrenderer/emfplus \
-   cppcanvas/source/mtfrenderer/emfppen \
-   cppcanvas/source/mtfrenderer/emfppath \
-   cppcanvas/source/mtfrenderer/emfpregion \
cppcanvas/source/mtfrenderer/implrenderer \
cppcanvas/source/mtfrenderer/lineaction \
cppcanvas/source/mtfrenderer/mtftools \
cppcanvas/source/mtfrenderer/pointaction \
cppcanvas/source/mtfrenderer/polypolyaction \
-   cppcanvas/source/mtfrenderer/emfpstringformat \
cppcanvas/source/mtfrenderer/textaction \
cppcanvas/source/mtfrenderer/textlineshelper \
cppcanvas/source/mtfrenderer/transparencygroupaction \
diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index 6fec26e3d18a..26fc5046eede 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -196,15 +196,6 @@ namespace cppcanvas
 // (externally not visible)
 typedef std::vector< MtfAction >  ActionVector;
 
-/* EMF+ */
-static void ReadRectangle (SvStream& s, float& x, float& y, float 
&width, float& height, bool bCompressed = false);
-static void ReadPoint (SvStream& s, float& x, float& y, sal_uInt32 
flags);
-void MapToDevice (double &x, double &y) const;
-::basegfx::B2DPoint Map (double ix, double iy) const;
-::basegfx::B2DSize MapSize (double iwidth, double iheight) const;
-void GraphicStatePush (GraphicStateMap& map, sal_Int32 index, 
OutDevState const & rState);
-void GraphicStatePop (GraphicStateMap& map, sal_Int32 index, 
OutDevState& rState);
-
 private:
 ImplRenderer(const ImplRenderer&) = delete;
 ImplRenderer& operator=( const ImplRenderer& ) = delete;
@@ -257,20 +248,6 @@ namespace cppcanvas
 
 void processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 
flags, sal_uInt32 dataSize, bool bUseWholeStream = false);
 
-/* EMF+ */
-void processEMFPlus( MetaCommentAction const * pAct, const 
ActionFactoryParameters& rFactoryParms, OutDevState& rState, const 
CanvasSharedPtr& rCanvas );
-double setFont(css::rendering::FontRequest& aFontRequest, 
sal_uInt8 fontObjectId, const ActionFactoryParameters& rParms, OutDevState& 
rState );
-
-/// Render LineCap, like the start or end arrow of a polygon.
-/// @return how much we should shorten the original polygon.
-double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, 
double fPolyLength,
-const ::base

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

[Libreoffice Gerrit user]

 svx/source/tbxctrls/itemwin.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 74e1281955782ca5c8a2dfb6d668a53e097b9be1
Author: Jim Raykowski 
AuthorDate: Sat Dec 1 16:08:30 2018 -0900
Commit: Noel Grandin 
CommitDate: Fri Dec 7 08:27:34 2018 +0100

tdf#121448 Check if fill box event notify is already handled

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

diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index c41ba2a86dc1..03725e3868f4 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -420,7 +420,7 @@ bool SvxFillTypeBox::EventNotify( NotifyEvent& rNEvt )
 if (isDisposed())
 return false;
 
-if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
+if ( !bHandled && rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
 {
 const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
 switch ( pKEvt->GetKeyCode().GetCode() )
@@ -482,7 +482,7 @@ bool SvxFillAttrBox::EventNotify( NotifyEvent& rNEvt )
 {
 bool bHandled = ListBox::EventNotify( rNEvt );
 
-if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
+if ( !bHandled && rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
 {
 const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/ui/inc/tabbgcolordlg.hxx  |   13 +++-
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx |   87 
 sc/uiconfig/scalc/ui/tabcolordialog.ui  |   45 +++-
 3 files changed, 98 insertions(+), 47 deletions(-)

New commits:
commit 0a139d98477c116f14041b3c4ebb7bb6204808d3
Author: Jim Raykowski 
AuthorDate: Fri Nov 30 00:43:22 2018 -0900
Commit: Noel Grandin 
CommitDate: Fri Dec 7 08:26:58 2018 +0100

tdf#105225 Add palette choice to calc tab background color dialog

Change-Id: I9891a20d3bc3de51fec84fb54c7aae42f7142662
Reviewed-on: https://gerrit.libreoffice.org/64329
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Reviewed-by: Noel Grandin 

diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx 
b/sc/source/ui/inc/tabbgcolordlg.hxx
index 4b27a4fe73e6..f5c2d330f344 100644
--- a/sc/source/ui/inc/tabbgcolordlg.hxx
+++ b/sc/source/ui/inc/tabbgcolordlg.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TABBGCOLORDLG_HXX
 
 #include 
+#include 
 
 class ScTabBgColorDlg : public weld::GenericDialogController
 {
@@ -36,7 +37,7 @@ public:
 class ScTabBgColorValueSet : public ColorValueSet
 {
 public:
-ScTabBgColorValueSet();
+ScTabBgColorValueSet(std::unique_ptr pWindow);
 virtual ~ScTabBgColorValueSet() override;
 
 void SetDialog(ScTabBgColorDlg* pTabBgColorDlg)
@@ -50,14 +51,18 @@ public:
 };
 
 private:
+PaletteManager  m_aPaletteManager;
 Color   m_aTabBgColor;
 const OUString  m_aTabBgColorNoColorText;
-ScTabBgColorValueSetm_aTabBgColorSet;
-std::unique_ptr m_xTabBgColorSet;
+
+std::unique_ptr m_xSelectPalette;
+std::unique_ptr m_xTabBgColorSet;
+std::unique_ptr m_xTabBgColorSetWin;
 std::unique_ptr m_xBtnOk;
 
-voidFillColorValueSets_Impl();
+void FillPaletteLB();
 
+DECL_LINK(SelectPaletteLBHdl, weld::ComboBox&, void);
 DECL_LINK(TabBgColorDblClickHdl_Impl, SvtValueSet*, void);
 DECL_LINK(TabBgColorOKHdl_Impl, weld::Button&, void);
 };
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx 
b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 7ea90d530b4d..f9c0eb0ce502 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -30,6 +30,8 @@
 #include 
 #include 
 
+#include 
+
 #define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl)
 
 ScTabBgColorDlg::ScTabBgColorDlg(weld::Window* pParent, const OUString& rTitle,
@@ -37,16 +39,30 @@ ScTabBgColorDlg::ScTabBgColorDlg(weld::Window* pParent, 
const OUString& rTitle,
 : GenericDialogController(pParent, "modules/scalc/ui/tabcolordialog.ui", 
"TabColorDialog")
 , m_aTabBgColor(rDefaultColor)
 , m_aTabBgColorNoColorText(rTabBgColorNoColorText)
-, m_xTabBgColorSet(new weld::CustomWeld(*m_xBuilder, "colorset", 
m_aTabBgColorSet))
+, m_xSelectPalette(m_xBuilder->weld_combo_box("paletteselector"))
+, m_xTabBgColorSet(new 
ScTabBgColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
+, m_xTabBgColorSetWin(new weld::CustomWeld(*m_xBuilder, "colorset", 
*m_xTabBgColorSet))
 , m_xBtnOk(m_xBuilder->weld_button("ok"))
 {
-m_aTabBgColorSet.SetDialog(this);
-m_aTabBgColorSet.SetColCount(SvxColorValueSet::getColumnCount());
+m_xTabBgColorSet->SetDialog(this);
+m_xTabBgColorSet->SetColCount(SvxColorValueSet::getColumnCount());
 
 m_xDialog->set_title(rTitle);
 
-FillColorValueSets_Impl();
-m_aTabBgColorSet.SetDoubleClickHdl(HDL(TabBgColorDblClickHdl_Impl));
+const WinBits nBits(m_xTabBgColorSet->GetStyle() | WB_NAMEFIELD | 
WB_ITEMBORDER | WB_NONEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT | 
WB_NOPOINTERFOCUS);
+m_xTabBgColorSet->SetStyle(nBits);
+m_xTabBgColorSet->SetText(m_aTabBgColorNoColorText);
+
+const sal_uInt32 nColCount = SvxColorValueSet::getColumnCount();
+const sal_uInt32 nRowCount(10);
+const sal_uInt32 nLength = SvxColorValueSet::getEntryEdgeLength();
+Size aSize(m_xTabBgColorSet->CalcWindowSizePixel(Size(nLength, nLength), 
nColCount, nRowCount));
+m_xTabBgColorSetWin->set_size_request(aSize.Width() + 8, aSize.Height() + 
8);
+
+FillPaletteLB();
+
+m_xSelectPalette->connect_changed(LINK(this, ScTabBgColorDlg, 
SelectPaletteLBHdl));
+m_xTabBgColorSet->SetDoubleClickHdl(HDL(TabBgColorDblClickHdl_Impl));
 m_xBtnOk->connect_clicked(HDL(TabBgColorOKHdl_Impl));
 }
 
@@ -59,48 +75,37 @@ void ScTabBgColorDlg::GetSelectedColor( Color& rColor ) 
const
 rColor = m_aTabBgColor;
 }
 
-void ScTabBgColorDlg::FillColorValueSets_Impl()
+void ScTabBgColorDlg::FillPaletteLB()
 {
-SfxObjectShell* pDocSh = SfxObjectShell::Current();
-const SfxPoolItem* pItem = nullptr;
-XColorListRef pColorList;
-
-OSL_ENSURE( pDocSh, "DocShell not found!" );
-
-if ( pDocSh && ( nullptr != ( pItem = pDocSh->GetItem(SID_COLOR_TABLE) ) ) 
)
-pColorList = static_cast(pItem)->GetCol

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

[Libreoffice Gerrit user]

 sd/source/core/sdpage2.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 2c8ef031af56f5e787e7984e746ffb8b65bf0a5b
Author: Paul Trojahn 
AuthorDate: Sun Nov 4 23:07:45 2018 +0100
Commit: Noel Grandin 
CommitDate: Fri Dec 7 08:26:17 2018 +0100

tdf#63029 Copy and paste comments with slide

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

diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 0744eca27585..996f9760f121 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -391,6 +392,22 @@ void SdPage::lateInit(const SdPage& rSrcPage)
 // animations
 rSrcPage.cloneAnimations(*this);
 
+// annotations
+for(const Reference< XAnnotation >& srcAnnotation : rSrcPage.maAnnotations)
+{
+Reference< XAnnotation > ref;
+createAnnotation(ref);
+ref->setPosition(srcAnnotation->getPosition());
+ref->setSize(srcAnnotation->getSize());
+ref->setAuthor(srcAnnotation->getAuthor());
+ref->setInitials(srcAnnotation->getInitials());
+ref->setDateTime(srcAnnotation->getDateTime());
+Reference< ::css::text::XTextCopy > srcRange ( 
srcAnnotation->getTextRange(), uno::UNO_QUERY);
+Reference< ::css::text::XTextCopy > range ( ref->getTextRange(), 
uno::UNO_QUERY);
+if(srcRange.is() && range.is())
+range->copyText( srcRange );
+}
+
 // fix user calls for duplicated slide
 SdrObjListIter aSourceIter( &rSrcPage, SdrIterMode::DeepWithGroups );
 SdrObjListIter aTargetIter( this, SdrIterMode::DeepWithGroups );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/core/text/guess.cxx  |2 +-
 sw/source/core/text/porlay.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a10dd637dc842e0b0221b8ec10965c8f130b4059
Author: himajin10 
AuthorDate: Thu Dec 6 16:42:04 2018 +0900
Commit: Noel Grandin 
CommitDate: Fri Dec 7 08:22:27 2018 +0100

adapt to the change from sal_Int32 to TextFrameIndex

see commit 2136dc24 and commit e721f958

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

diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index e966dfa6a9d7..76fb43c1eb9e 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -202,7 +202,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo &rInf,
 nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, 
rInf.GetCachedVclData().get() );
 
 #if OSL_DEBUG_LEVEL > 1
-if ( COMPLETE_STRING != nCutPos )
+if ( TextFrameIndex(COMPLETE_STRING) != nCutPos )
 {
 sal_uInt16 nMinSize;
 rInf.GetTextSize( &rSI, rInf.GetIdx(), nCutPos - rInf.GetIdx(),
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 781c8aef5302..ef435fc6f133 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1371,7 +1371,7 @@ void SwScriptInfo::InitScriptInfo(const SwTextNode& rNode,
 // Check that ScriptChangeInfos are in increasing order of
 // position and that we don't have "empty" changes.
 sal_uInt8 nLastTyp = i18n::ScriptType::WEAK;
-sal_Int32 nLastPos = 0;
+TextFrameIndex nLastPos = TextFrameIndex(0);
 for (const auto& rScriptChange : m_ScriptChanges)
 {
 SAL_WARN_IF( nLastTyp == rScriptChange.type ||
___
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' - external/libnumbertext

[Libreoffice Gerrit user]

 external/libnumbertext/ExternalProject_libnumbertext.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e92da60341cbc882cf310f04f0d15862763a888
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 15:31:13 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 7 07:49:47 2018 +0100

Typo causing external/libnumbertext to always use $(gb_COMPILERNOOPTFLAGS)

...ever since f1579d3d6c5f5f3a651825e035b93bee7a4f43c6 "tdf#117171 support
localized number name numbering styles"

Change-Id: I93dcfa9f1310b35e3068a7e0efdce258364a7d78
Reviewed-on: https://gerrit.libreoffice.org/64720
Reviewed-by: László Németh 
Tested-by: László Németh 
Tested-by: Jenkins
(cherry picked from commit 82af7584dcfe78b2242b3611bc00375871093189)
Reviewed-on: https://gerrit.libreoffice.org/64743
Reviewed-by: Stephan Bergmann 

diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk 
b/external/libnumbertext/ExternalProject_libnumbertext.mk
index 2b899c63d132..b12012e16577 100644
--- a/external/libnumbertext/ExternalProject_libnumbertext.mk
+++ b/external/libnumbertext/ExternalProject_libnumbertext.mk
@@ -37,7 +37,7 @@ $(call 
gb_ExternalProject_get_state_target,libnumbertext,build):
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM))\
$(if $(filter 
AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
$(if 
$(libnumbertext_CPPFLAGS),CPPFLAGS='$(libnumbertext_CPPFLAGS)') \
-   CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED) $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if 
$(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX)" \
+   CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if 
$(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX)" \
&& cd src && $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 4723ea4b509fb6df5da1c798859cd85790c1f1fb
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 23:26:32 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 7 07:50:13 2018 +0100

No need to silence -Wregister in lcms2.h any more

...since 2bea600f0295cab7fad3edb55f0c5e092640e49e "external/lcms2: Stop
warnings/errors about 'register'" patched those uses away

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

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 0a1c2c6998af..3ebe2ce38673 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -24,15 +24,7 @@
 #include 
 #include 
 
-#if defined __GNUC__ && __cplusplus > 201402L
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wregister"
-#endif
 #include 
-#if defined __GNUC__ && __cplusplus > 201402L
-#pragma GCC diagnostic pop
-#endif
 
 #include 
 #include 
___
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' - solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 solenv/flatpak-manifest.in |   12 
 1 file changed, 12 deletions(-)

New commits:
commit f8d469e6a062e4a246bad8426c040d0e1b944a48
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 12:02:32 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 7 07:49:18 2018 +0100

No need to bundle gst-libav in the flatpak any more

756c9f2317605e39d9cb058e650962acd2d81739 "Merge upstream fixes into
solenv/flatpak-manifest.in" had introduced it (via 

"For now, bundle gst-libav to be able to play mp4 videos in impress" to fix
 "Impress
don't insert a video" back when the LO flatpak was based on
org.gnome.Platform//3.26 which doesn't contain
/usr/lib/gstreamer-1.0/libgstlibav.so.  (And
/app/lib/gstreamer-1.0/libgstlibav.so is apparently the only file that the
gst-libav module contributes to the LO flatpak.)

When 727bfa2c87db170483c1e4ae895174295b070c77 "Merge in Flatpak 
improvements"
switched the runtime to org.freedesktop.Platform//1.6 (via
 "port to freedesktop.org 1.6 
runtime")
it kept the gst-libav module even though org.freedesktop.Platform//1.6 
contains
/usr/lib/gstreamer-1.0/libgstlibav.so.  Lets assume it was kept by accident 
and
can be removed.  (At least the scenario from  "Impress don't
insert a video" still works with this change.)

Change-Id: I692d01bfe5882c05d63124db7cdfa6390540e69f
Reviewed-on: https://gerrit.libreoffice.org/64703
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 3c015ddfb8096e2b7adc49e3e0ac67c6c0dfd9c0)
Reviewed-on: https://gerrit.libreoffice.org/64731

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index bc06bdd56b1e..bfd5cfa08d70 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -32,18 +32,6 @@
 ]
 },
 {
-"name": "gst-libav",
-"config-opts": [ "--disable-gtk-doc", "--with-system-libav" ],
-"cleanup": [ "*.la", "/share/gtk-doc" ],
-"sources": [
-{
-"type" : "archive",
-"url" : 
"https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.5.tar.xz";,
-"sha256" : 
"e4d2f315f478d47281fbfdfbd590a63d23704ca37911d7142d5992616f4b28d3"
-}
-]
-},
-{
 "name": "gvfs",
 "cleanup": [ "/libexec/*", "/share/dbus-1/services/*", 
"/share/gvfs/mounts" ],
 "config-opts": [ "--disable-hal", "--disable-gdu", 
"--disable-gcr", "--disable-obexftp",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/postgresql

[Libreoffice Gerrit user]

 external/postgresql/UnpackedTarball_postgresql.mk |3 
 external/postgresql/postgresql-9.2.1-autoreconf.patch |  521 --
 2 files changed, 2 insertions(+), 522 deletions(-)

New commits:
commit 7c3c2ef49f636653808d3cbd2629cb18ffc45ee1
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 17:15:08 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 7 07:48:45 2018 +0100

Use gb_UnpackedTarball_update_autoconf_configs in external/postgresql

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

diff --git a/external/postgresql/UnpackedTarball_postgresql.mk 
b/external/postgresql/UnpackedTarball_postgresql.mk
index 2e41bf66d806..3ae5eed0746b 100644
--- a/external/postgresql/UnpackedTarball_postgresql.mk
+++ b/external/postgresql/UnpackedTarball_postgresql.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
external/postgresql/postgresql-libs-leak.patch \
-   external/postgresql/postgresql-9.2.1-autoreconf.patch \
external/postgresql/postgresql-9.2.1-libreoffice.patch \
 ))
 
@@ -25,4 +24,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
 ))
 endif
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,postgresql))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/postgresql/postgresql-9.2.1-autoreconf.patch 
b/external/postgresql/postgresql-9.2.1-autoreconf.patch
deleted file mode 100644
index 9cbf84f252c8..
--- a/external/postgresql/postgresql-9.2.1-autoreconf.patch
+++ /dev/null
@@ -1,521 +0,0 @@
 misc/build/postgresql-9.1.1/configure  2011-09-22 23:57:57.0 
+0200
-+++ misc/build/postgresql-9.1.1.patched/configure  2012-02-03 
11:50:07.0 +0100
-@@ -830,6 +830,7 @@
- with_krb_srvnam
- with_pam
- with_ldap
-+with_mozldap
- with_bonjour
- with_openssl
- with_selinux
-@@ -1527,6 +1528,7 @@
-   [postgres]
-   --with-pam  build with PAM support
-   --with-ldap build with LDAP support
-+  --with-mozldap  build with Mozilla LDAP support
-   --with-bonjour  build with Bonjour support
-   --with-openssl  build with OpenSSL support
-   --with-selinux  build with SELinux support
-@@ -5412,6 +5414,42 @@
- 
- 
- 
-+{ $as_echo "$as_me:$LINENO: checking whether to use Mozilla C SDK for LDAP 
support" >&5
-+$as_echo_n "checking whether to use Mozilla C SDK for LDAP support... " >&6; }
-+
-+
-+
-+# Check whether --with-mozldap was given.
-+if test "${with_mozldap+set}" = set; then
-+  withval=$with_mozldap;
-+  case $withval in
-+yes)
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_MOZLDAP 1
-+_ACEOF
-+
-+  ;;
-+no)
-+  :
-+  ;;
-+*)
-+  { { $as_echo "$as_me:$LINENO: error: no argument expected for 
--with-mozldap option" >&5
-+$as_echo "$as_me: error: no argument expected for --with-mozldap option" >&2;}
-+   { (exit 1); exit 1; }; }
-+  ;;
-+  esac
-+
-+else
-+  with_mozldap=no
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:$LINENO: result: $with_mozldap" >&5
-+$as_echo "$with_mozldap" >&6; }
-+
-+
- 
- #
- # Kerberos configuration parameters
-@@ -8627,11 +8665,11 @@
- *** Not using spinlocks will cause poor performance." >&2;}
- fi
- 
--if test "$with_gssapi" = yes ; then
-+if test "$with_krb5" = yes ; then
-   if test "$PORTNAME" != "win32"; then
--{ $as_echo "$as_me:$LINENO: checking for library containing 
gss_init_sec_context" >&5
--$as_echo_n "checking for library containing gss_init_sec_context... " >&6; }
--if test "${ac_cv_search_gss_init_sec_context+set}" = set; then
-+ { $as_echo "$as_me:$LINENO: checking for library containing com_err" >&5
-+$as_echo_n "checking for library containing com_err... " >&6; }
-+if test "${ac_cv_search_com_err+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_func_search_save_LIBS=$LIBS
-@@ -8648,16 +8686,16 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char gss_init_sec_context ();
-+char com_err ();
- int
- main ()
- {
--return gss_init_sec_context ();
-+return com_err ();
-   ;
-   return 0;
- }
- _ACEOF
--for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'; do
-+for ac_lib in '' com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes 
-lasn1 -lroken'; do
-   if test -z "$ac_lib"; then
- ac_res="none required"
-   else
-@@ -8685,7 +8723,7 @@
-test "$cross_compiling" = yes ||
-$as_test_x conftest$ac_exeext
-}; then
--  ac_cv_search_gss_init_sec_context=$ac_res
-+  ac_cv_search_com_err=$ac_res
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8696,40 +8734,33 @@
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-   conftest$ac_exeext
--  if test "${ac_cv_search_gss_init_sec_context+set}" = set; then
-+  if tes

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

[Libreoffice Gerrit user]

 svl/source/items/macitem.cxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit e9774088efddff4383af4f3c55d9c8287d258212
Author: Stephan Bergmann 
AuthorDate: Sun Nov 25 17:13:19 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 7 07:48:20 2018 +0100

Revert "Blind fix for pre-C++14 std::equal, for now"

This reverts commit 75299cd119dcb3121540471354d2b33af7f6684d, now that we 
have
full C++17 support.

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

diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 7cad10f07a63..f45b7bfe9bf2 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -81,16 +81,15 @@ bool SvxMacroTableDtor::operator==( const 
SvxMacroTableDtor& rOther ) const
 {
 // Count different => odd in any case
 // Compare single ones; the sequence matters due to performance reasons
-return aSvxMacroTable.size() == rOther.aSvxMacroTable.size()
-&& std::equal(aSvxMacroTable.begin(), aSvxMacroTable.end(),
-rOther.aSvxMacroTable.begin(),
-[](const SvxMacroTable::value_type& rOwnEntry, const 
SvxMacroTable::value_type& rOtherEntry) {
-const SvxMacro& rOwnMac = rOwnEntry.second;
-const SvxMacro& rOtherMac = rOtherEntry.second;
-return rOwnEntry.first == rOtherEntry.first
-&& rOwnMac.GetLibName() == rOtherMac.GetLibName()
-&& rOwnMac.GetMacName() == rOtherMac.GetMacName();
-});
+return std::equal(aSvxMacroTable.begin(), aSvxMacroTable.end(),
+rOther.aSvxMacroTable.begin(), rOther.aSvxMacroTable.end(),
+[](const SvxMacroTable::value_type& rOwnEntry, const 
SvxMacroTable::value_type& rOtherEntry) {
+const SvxMacro& rOwnMac = rOwnEntry.second;
+const SvxMacro& rOtherMac = rOtherEntry.second;
+return rOwnEntry.first == rOtherEntry.first
+&& rOwnMac.GetLibName() == rOtherMac.GetLibName()
+&& rOwnMac.GetMacName() == rOtherMac.GetMacName();
+});
 }
 
 void SvxMacroTableDtor::Read( SvStream& rStrm )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac external/libcmis

[Libreoffice Gerrit user]

 configure.ac  |4 ++--
 external/libcmis/StaticLibrary_libcmis.mk |7 ++-
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 665ac8f32d3aaaf7c27e8976e14fd4819edbf79b
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 18:48:21 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 7 07:46:20 2018 +0100

All supported versions of Clang and GCC support at least C++17 now

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

diff --git a/configure.ac b/configure.ac
index 9f60e40384a0..44143a0c81a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6205,12 +6205,12 @@ dnl 
===
 dnl C++11
 dnl ===
 
-AC_MSG_CHECKING([whether $CXX supports C++17, C++14, or C++11])
+AC_MSG_CHECKING([whether $CXX supports C++17])
 CXXFLAGS_CXX11=
 if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
 CXXFLAGS_CXX11=-std:c++17
 elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
-my_flags='-std=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 
-std=c++1z -std=gnu++14 -std=gnu++1y -std=c++14 -std=c++1y -std=gnu++11 
-std=gnu++0x -std=c++11 -std=c++0x'
+my_flags='-std=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 
-std=c++1z'
 for flag in $my_flags; do
 if test "$COM" = MSC; then
 flag="-Xclang $flag"
diff --git a/external/libcmis/StaticLibrary_libcmis.mk 
b/external/libcmis/StaticLibrary_libcmis.mk
index 6e666f489c7a..2998ec24d2fb 100644
--- a/external/libcmis/StaticLibrary_libcmis.mk
+++ b/external/libcmis/StaticLibrary_libcmis.mk
@@ -13,13 +13,10 @@ $(eval $(call 
gb_StaticLibrary_set_warnings_not_errors,libcmis))
 
 ifeq ($(COM_IS_CLANG),TRUE)
 # Avoid narrowing conversion error (even though the option is technically a 
warning)
-# caused by boost.
-# Also avoid -Wdynamic-exception-spec errors in C++17 mode.
+# caused by boost, and avoid -Wdynamic-exception-spec errors.
 $(eval $(call gb_StaticLibrary_add_cxxflags,libcmis,\
 -Wno-error=c++11-narrowing \
-$(if $(filter -std=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 
-std=c++1z, \
-$(CXXFLAGS_CXX11)), \
--Wno-error=dynamic-exception-spec) \
+-Wno-error=dynamic-exception-spec \
 ))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/xmloff/shapeexport.hxx|4 +---
 sc/source/filter/xml/xmlexprt.cxx |4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit f3e258e343dd6e3ca39fc8cb710ed6c4cbb530ba
Author: Noel Grandin 
AuthorDate: Thu Dec 6 09:05:23 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 7 07:42:35 2018 +0100

remove unused XMLShapeExportFlags::NO_CHART_DATA

dead since
commit ec712408961a4a2efc667a7af83a21209907f9eb
Date:   Fri Nov 20 11:58:22 2009 +0100
chartpositioning: #i100778# chart positioning excluding labels

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

diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index d9cb574deadc..6dbbde2b8b82 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -53,8 +53,6 @@ enum class XMLShapeExportFlags {
  WIDTH= 0x0004,
  HEIGHT   = 0x0008,
  SIZE = WIDTH | HEIGHT,
-// when you set this flag a chart does NOT export its own data as table element
- NO_CHART_DATA = 0x0010,
 // When setting the flag below no ignorableWhiteSpace will be called around
 // the drawing object elements
  NO_WS= 0x0020,
@@ -63,7 +61,7 @@ enum class XMLShapeExportFlags {
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 #define SEF_DEFAULT 
XMLShapeExportFlags::POSITION|XMLShapeExportFlags::SIZE
diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 6f4109e4f5f7..a71d2ffc325f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3433,7 +3433,7 @@ void ScXMLExport::ExportShape(const uno::Reference < 
drawing::XShape >& xShape,
 SvXMLAttributeList* pAttrList = new 
SvXMLAttributeList();
 pAttrList->AddAttribute(
 GetNamespaceMap().GetQNameByKey( 
XML_NAMESPACE_DRAW, GetXMLToken( XML_NOTIFY_ON_UPDATE_OF_RANGES ) ), sRanges );
-GetShapeExport()->exportShape( xShape, 
XMLShapeExportFlags::NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList );
+GetShapeExport()->exportShape( xShape, 
SEF_DEFAULT, pPoint, pAttrList );
 }
 }
 }
@@ -3467,7 +3467,7 @@ void ScXMLExport::ExportShape(const uno::Reference < 
drawing::XShape >& xShape,
 pAttrList->AddAttribute(
 GetNamespaceMap().GetQNameByKey( 
XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), sRanges );
 }
-GetShapeExport()->exportShape(xShape, 
XMLShapeExportFlags::NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList);
+GetShapeExport()->exportShape(xShape, 
SEF_DEFAULT, pPoint, pAttrList);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/unotools/fontcvt.hxx |6 +-
 unotools/source/misc/fontcvt.cxx |2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit e57d61f9c052c4ebb3f940a67ed6dddf26ad5cf0
Author: Noel Grandin 
AuthorDate: Wed Dec 5 17:00:48 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 7 07:39:31 2018 +0100

the FontToSubsFontFlags enum is not a bitmask

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

diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index f24a5e3e48ae..2877e18972ea 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -28,12 +28,8 @@
 enum class FontToSubsFontFlags
 {
 IMPORT   = 0x01,
-EXPORT   = 0x02,
+EXPORT   = 0x02
 };
-namespace o3tl
-{
-template<> struct typed_flags : 
is_typed_flags {};
-}
 
 typedef void* FontToSubsFontConverter;
 UNOTOOLS_DLLPUBLIC FontToSubsFontConverter CreateFontToSubsFontConverter( 
const OUString& rFontName, FontToSubsFontFlags nFlags );
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 8a47fdb27495..663954c1bfc1 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1387,7 +1387,7 @@ FontToSubsFontConverter CreateFontToSubsFontConverter( 
const OUString& rOrgName,
 
 OUString aName = GetEnglishSearchFontName( rOrgName );
 
-if ( nFlags & FontToSubsFontFlags::IMPORT )
+if ( nFlags == FontToSubsFontFlags::IMPORT )
 {
 const int nEntries = 2; // only StarMath+StarBats
 for( int i = 0; i < nEntries; ++i )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 editeng/source/editeng/impedit2.cxx |2 --
 include/editeng/editstat.hxx|3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 504ae08d8ca7755106926326e8cde8ed015bd2ee
Author: Noel Grandin 
AuthorDate: Wed Dec 5 12:02:21 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 7 07:39:13 2018 +0100

remove unused EditStatusFlags enum value

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

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 1c5fa806ef7d..490496e7b7c6 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -903,8 +903,6 @@ EditSelection const & ImpEditEngine::MoveCursor( const 
KeyEvent& rKeyEvent, Edit
 {
 CursorMoved( aOldPaM.GetNode() );
 }
-else
-aStatus.GetStatusWord() = aStatus.GetStatusWord() | 
EditStatusFlags::CRSRMOVEFAIL;
 
 // May cause, an CreateAnchor or deselection all
 aSelEngine.SetCurView( pEditView );
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 5c8c9873b08a..d7c8c441cf29 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -79,14 +79,13 @@ enum class EditStatusFlags
 HSCROLL = 0x0001,
 VSCROLL = 0x0002,
 CURSOROUT   = 0x0004,
-CRSRMOVEFAIL= 0x0008,
 TEXTWIDTHCHANGED= 0x0010,
 TextHeightChanged   = 0x0020,
 WRONGWORDCHANGED= 0x0040
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 inline void SetFlags( EVControlBits& rBits, EVControlBits nMask, bool bOn )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source filter/source include/editeng sd/source svx/source sw/source

[Libreoffice Gerrit user]

 editeng/source/uno/unonrule.cxx|2 +-
 filter/source/msfilter/svdfppt.cxx |3 +--
 include/editeng/numitem.hxx|3 +--
 sd/source/core/drawdoc4.cxx|2 +-
 sd/source/core/stlpool.cxx |5 ++---
 svx/source/sidebar/nbdtmg.cxx  |6 ++
 sw/source/core/doc/number.cxx  |2 +-
 7 files changed, 9 insertions(+), 14 deletions(-)

New commits:
commit 3aa02154941bd04c1646948bcfbec20c2873e189
Author: Noel Grandin 
AuthorDate: Wed Dec 5 11:43:30 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 7 07:38:53 2018 +0100

remove unused SvxNumRuleFlags::CHAR_TEXT_DISTANCE

which is dead as far back as its introduction in

commit fd069bee7e57ad529c3c0974559fd2d84ec3151a
Date:   Mon Sep 18 16:07:07 2000 +
initial import

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

diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 1f5c104fca9f..ea7b262523f7 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -487,7 +487,7 @@ css::uno::Reference< css::container::XIndexReplace > 
SvxCreateNumRule(const SvxN
 }
 else
 {
-SvxNumRule aDefaultRule( SvxNumRuleFlags::BULLET_REL_SIZE | 
SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE, 
SVX_MAX_NUM, false);
+SvxNumRule aDefaultRule( SvxNumRuleFlags::BULLET_REL_SIZE | 
SvxNumRuleFlags::BULLET_COLOR, SVX_MAX_NUM, false);
 return new SvxUnoNumberingRules( aDefaultRule );
 }
 }
diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 2670bff723e2..42807c8585bc 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -4380,8 +4380,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& 
rSlideHd, SvStream& rIn, Sd
 eNumRuleType = SvxNumRuleType::NUMBERING;
 break;
 }
-SvxNumRule aRule( SvxNumRuleFlags::BULLET_REL_SIZE | 
SvxNumRuleFlags::BULLET_COLOR |
-SvxNumRuleFlags::CHAR_TEXT_DISTANCE,
+SvxNumRule aRule( SvxNumRuleFlags::BULLET_REL_SIZE | 
SvxNumRuleFlags::BULLET_COLOR,
 nLevels, false, eNumRuleType );
 for ( sal_uInt16 nCount = 0; nDepth < nLevels; nCount++ )
 {
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 94cc2e90cf07..8fb543e7a305 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -221,7 +221,6 @@ enum class SvxNumRuleFlags
 {
 NONE= 0x,
 CONTINUOUS  = 0x0001, // consecutive numbers possible?
-CHAR_TEXT_DISTANCE  = 0x0002, // Distance Symbol<->Text?
 CHAR_STYLE  = 0x0004, // Character styles?
 BULLET_REL_SIZE = 0x0008, // relative bullet size?
 BULLET_COLOR= 0x0010, // Bullet color
@@ -231,7 +230,7 @@ enum class SvxNumRuleFlags
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 enum class SvxNumRuleType
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index d4a56c215b29..1f4a7d9dfabf 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1249,7 +1249,7 @@ void SdDrawDocument::SetTextDefaults() const
 aNumberFormat.SetStart(1);
 aNumberFormat.SetNumAdjust(SvxAdjust::Left);
 
-SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | 
SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE, 
SVX_MAX_NUM, false);
+SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | 
SvxNumRuleFlags::BULLET_COLOR, SVX_MAX_NUM, false);
 
 //aNumberFormat.SetAbsLSpace( 0 );
 //aNumberFormat.SetFirstLineOffset( 0 );
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index cfbaf9f31079..2cb12ccfcf79 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1102,7 +1102,7 @@ void SdStyleSheetPool::PutNumBulletItem( 
SfxStyleSheetBase* pSheet,
 aNumberFormat.SetStart(1);
 aNumberFormat.SetNumAdjust(SvxAdjust::Left);
 
-SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | 
SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE, 
SVX_MAX_NUM, false);
+SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | 
SvxNumRuleFlags::BULLET_COLOR, SVX_MAX_NUM, false);
 
 for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
 {
@@ -1158,8 +1158,7 @@ void SdStyleSheetPool::PutNumBulletItem( 
SfxStyleSheetBase* pSheet,
 aNumberFormat.SetStart(1);
 aNumberFormat.SetNumAdjust(SvxAdjust::Left);
 
-SvxNumRule aNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | 
SvxNumRuleFlags::BULLET_COLOR |
- SvxNumRuleFlags::

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

[Libreoffice Gerrit user]

 include/vcl/treelist.hxx |   11 +++
 vcl/source/treelist/treelist.cxx |   38 +++---
 2 files changed, 22 insertions(+), 27 deletions(-)

New commits:
commit 9afd48075fafda24d554d17ca4a31e98e3f6be35
Author: Noel Grandin 
AuthorDate: Thu Dec 6 16:30:36 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 7 07:38:36 2018 +0100

move a couple of method from SvTreeList to SvListView

where they really want to be anyway, instead of passing "this" as a
pointer into them

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

diff --git a/include/vcl/treelist.hxx b/include/vcl/treelist.hxx
index fb2aaadc..48fb5cb26c82 100644
--- a/include/vcl/treelist.hxx
+++ b/include/vcl/treelist.hxx
@@ -234,14 +234,9 @@ class VCL_DLLPUBLIC SvListView
 protected:
 SvTreeList* pModel;
 
-voidExpandListEntry( SvTreeListEntry* pParent )
-{ SvTreeList::Expand(this,pParent); }
-
-voidCollapseListEntry( SvTreeListEntry* pParent )
-{ SvTreeList::Collapse(this,pParent); }
-
-boolSelectListEntry( SvTreeListEntry* pEntry, bool bSelect 
)
-{ return SvTreeList::Select(this,pEntry,bSelect); }
+voidExpandListEntry( SvTreeListEntry* pParent );
+voidCollapseListEntry( SvTreeListEntry* pParent );
+boolSelectListEntry( SvTreeListEntry* pEntry, bool bSelect 
);
 
 public:
 SvListView();   // Sets the Model to 0
diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index cc5297111c78..cafccba11c13 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -893,48 +893,48 @@ void SvTreeList::SetAbsolutePositions()
 bAbsPositionsValid = true;
 }
 
-void SvTreeList::Expand( SvListView* pView, SvTreeListEntry* pEntry )
+void SvListView::ExpandListEntry( SvTreeListEntry* pEntry )
 {
-DBG_ASSERT(pEntry&&pView,"Expand:View/Entry?");
-if ( pView->IsExpanded(pEntry) )
+DBG_ASSERT(pEntry,"Expand:View/Entry?");
+if ( IsExpanded(pEntry) )
 return;
 
 DBG_ASSERT(!pEntry->m_Children.empty(), "SvTreeList::Expand: We expected 
to have child entries.");
 
-SvViewDataEntry* pViewData = pView->GetViewData(pEntry);
+SvViewDataEntry* pViewData = GetViewData(pEntry);
 pViewData->SetExpanded(true);
 SvTreeListEntry* pParent = pEntry->pParent;
 // if parent is visible, invalidate status data
-if ( pView->IsExpanded( pParent ) )
+if ( IsExpanded( pParent ) )
 {
-pView->m_pImpl->m_bVisPositionsValid = false;
-pView->m_pImpl->m_nVisibleCount = 0;
+m_pImpl->m_bVisPositionsValid = false;
+m_pImpl->m_nVisibleCount = 0;
 }
 }
 
-void SvTreeList::Collapse( SvListView* pView, SvTreeListEntry* pEntry )
+void SvListView::CollapseListEntry( SvTreeListEntry* pEntry )
 {
-DBG_ASSERT(pView&&pEntry,"Collapse:View/Entry?");
-if ( !pView->IsExpanded(pEntry) )
+DBG_ASSERT(pEntry,"Collapse:View/Entry?");
+if ( !IsExpanded(pEntry) )
 return;
 
 DBG_ASSERT(!pEntry->m_Children.empty(), "SvTreeList::Collapse: We expected 
to have child entries.");
 
-SvViewDataEntry* pViewData = pView->GetViewData( pEntry );
+SvViewDataEntry* pViewData = GetViewData( pEntry );
 pViewData->SetExpanded(false);
 
 SvTreeListEntry* pParent = pEntry->pParent;
-if ( pView->IsExpanded(pParent) )
+if ( IsExpanded(pParent) )
 {
-pView->m_pImpl->m_nVisibleCount = 0;
-pView->m_pImpl->m_bVisPositionsValid = false;
+m_pImpl->m_nVisibleCount = 0;
+m_pImpl->m_bVisPositionsValid = false;
 }
 }
 
-bool SvTreeList::Select( SvListView* pView, SvTreeListEntry* pEntry, bool 
bSelect )
+bool SvListView::SelectListEntry( SvTreeListEntry* pEntry, bool bSelect )
 {
-DBG_ASSERT(pView&&pEntry,"Select:View/Entry?");
-SvViewDataEntry* pViewData = pView->GetViewData( pEntry );
+DBG_ASSERT(pEntry,"Select:View/Entry?");
+SvViewDataEntry* pViewData = GetViewData( pEntry );
 if ( bSelect )
 {
 if ( pViewData->IsSelected() || !pViewData->IsSelectable() )
@@ -942,7 +942,7 @@ bool SvTreeList::Select( SvListView* pView, 
SvTreeListEntry* pEntry, bool bSelec
 else
 {
 pViewData->SetSelected(true);
-pView->m_pImpl->m_nSelectionCount++;
+m_pImpl->m_nSelectionCount++;
 }
 }
 else
@@ -952,7 +952,7 @@ bool SvTreeList::Select( SvListView* pView, 
SvTreeListEntry* pEntry, bool bSelec
 else
 {
 pViewData->SetSelected(false);
-pView->m_pImpl->m_nSelectionCount--;
+m_pImpl->m_nSelectionCount--;
 }
 }
 return true;
___
Libreoffice-commits mailing list
libreoffice-c

[Libreoffice-commits] core.git: basctl/source basic/source compilerplugins/clang connectivity/source cppu/source cui/source drawinglayer/source extensions/source framework/source i18npool/source idlc/

[Libreoffice Gerrit user]

 basctl/source/basicide/baside2b.cxx  |4 
 basic/source/classes/sbunoobj.cxx|9 
 basic/source/classes/sbxmod.cxx  |1 
 basic/source/inc/sbunoobj.hxx|3 
 basic/source/runtime/methods.cxx |8 
 compilerplugins/clang/singlevalfields.could-be-bool.results  |   30 
 compilerplugins/clang/singlevalfields.cxx|   46 
 compilerplugins/clang/singlevalfields.results| 1172 ++-
 connectivity/source/commontools/dbconversion.cxx |2 
 connectivity/source/commontools/filtermanager.cxx|2 
 connectivity/source/drivers/hsqldb/HStorageAccess.cxx|2 
 cppu/source/typelib/static_types.cxx |2 
 cppu/source/typelib/typelib.cxx  |2 
 cui/source/dialogs/screenshotannotationdlg.cxx   |   10 
 drawinglayer/source/primitive2d/controlprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx   |6 
 drawinglayer/source/primitive2d/sceneprimitive2d.cxx |2 
 drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx |2 
 drawinglayer/source/primitive2d/texteffectprimitive2d.cxx|2 
 drawinglayer/source/primitive2d/textprimitive2d.cxx  |2 
 drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx|2 
 drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx   |2 
 extensions/source/bibliography/bibmod.cxx|2 
 extensions/source/bibliography/bibprop.hxx   |   20 
 framework/source/loadenv/loadenv.cxx |2 
 i18npool/source/nativenumber/nativenumbersupplier.cxx|6 
 idlc/source/astdeclaration.cxx   |2 
 sc/source/ui/view/formatsh.cxx   |2 
 scripting/source/stringresource/stringresource.cxx   |2 
 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx   |5 
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |3 
 sd/source/ui/dlg/headerfooterdlg.cxx |2 
 sd/source/ui/view/sdview.cxx |2 
 sfx2/source/appl/newhelp.cxx |2 
 sfx2/source/view/classificationhelper.cxx|   22 
 svtools/source/control/filectrl.cxx  |2 
 svx/source/sdr/overlay/overlayrectangle.cxx  |2 
 svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx |2 
 svx/source/xoutdev/xattr.cxx |2 
 sw/source/core/fields/reffld.cxx |2 
 sw/source/core/layout/paintfrm.cxx   |4 
 sw/source/uibase/docvw/AnchorOverlayObject.cxx   |2 
 ucb/source/ucp/file/filglob.cxx  |2 
 unotools/source/misc/mediadescriptor.cxx |4 
 vcl/source/app/svapp.cxx |2 
 vcl/source/window/printdlg.cxx   |4 
 vcl/unx/generic/window/FWS.cxx   |9 
 47 files changed, 1244 insertions(+), 178 deletions(-)

New commits:
commit 38187ec15b6cbaedcadcbd8f3bcb632a5c6be88f
Author: Noel Grandin 
AuthorDate: Thu Dec 6 11:37:51 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 7 07:38:24 2018 +0100

loplugin:singlevalfields extend to all static vars

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

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 99208550315b..7ddaa8a81875 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -66,7 +66,7 @@ long const nBasePad = 2;
 long const nCursorPad = 5;
 
 long nVirtToolBoxHeight;// inited in WatchWindow, used in Stackwindow
-long nHeaderBarHeight;
+static const long nHeaderBarHeight = 16;
 
 // Returns pBase converted to SbxVariable if valid and is not an SbxMethod.
 SbxVariable* IsSbxVariable (SbxBase* pBase)
@@ -1581,8 +1581,6 @@ WatchWindow::WatchWindow (Layout* pParent)
 if ( nRWBtnSize > nVirtToolBoxHeight )
 nVirtToolBoxHeight = nRWBtnSize;
 
-nHeaderBarHeight = 16;
-
 aTreeListBox->SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST);
 aTreeListBox->EnableInplaceEditing(true);
 aTreeListBox->SetSelectHdl( LINK( this, WatchWindow, TreeListHdl ) );
diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 21e57c5d206b..f3c276d88003 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3657,15 +3657,6 @@ void SbUnoService::Notify( SfxBroadcaster& rBC, const 
SfxHint& rHint )
 }

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui|   67 +
 sc/uiconfig/scalc/ui/notebookbar_compact.ui|7 -
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui |7 -
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui|7 -
 4 files changed, 5 insertions(+), 83 deletions(-)

New commits:
commit 7f9d84f47dcbacdd080ccfc60d05af6d5a2d39e8
Author: andreas kainz 
AuthorDate: Wed Nov 28 21:12:44 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 7 06:51:02 2018 +0100

remove uno:InsertObjectChartFromFile command from UI

cause command isn't available any more

Change-Id: Ie73491e02979fe24f59e8c627b69f902a12b512a
Reviewed-on: https://gerrit.libreoffice.org/64711
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 7dbd56d5bfa79d948c4d291ffe79fb5b49d4fdd9)
Reviewed-on: https://gerrit.libreoffice.org/64737

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 3a6e49c5eeaf..bd8b1a5cba49 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1019,13 +1019,6 @@
   
 
 
-  
-True
-False
-.uno:InsertObjectChartFromFile
-  
-
-
   
 True
 False
@@ -4623,72 +4616,22 @@
 True
   
 
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-center
-vertical
-
-  
-True
-True
-both-horiz
-False
-
-  
-True
-False
-.uno:InsertObjectChartFromFile
-  
-  
-False
-True
-  
-
-  
-  
-False
-True
-0
-  
-
 
-  
+  
 True
-True
-both-horiz
-False
-
-  
-True
-False
-.uno:InsertObject
-  
-  
-False
-True
-  
-
+False
+.uno:InsertObject
   
   
 False
-True
-1
+True
   
 
   
   
 False
 True
-1
+0
   
 
 
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index e9eab32b947b..a65b903df599 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -1130,13 +1130,6 @@
   
 
 
-  
-True
-False
-.uno:InsertObjectChartFromFile
-  
-
-
   
 True
 False
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index a178dc6ca5e4..9ef4b34e425e 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -1655,13 +1655,6 @@
   
 
 
-  
-True
-False
-.uno:InsertObjectChartFromFile
-  
-
-
   
 True
 False
diff --git a/sc/uiconfig/sca

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

[Libreoffice Gerrit user]

 sw/source/uibase/app/apphdl.cxx |   17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 60714a814847f6d10f00aa6809a3896a48741e0b
Author: Mike Kaganski 
AuthorDate: Thu Dec 6 23:36:04 2018 +0300
Commit: Mike Kaganski 
CommitDate: Fri Dec 7 05:51:38 2018 +0100

tdf#121606: displaying Mail Merge toolbar shouldn't activate connection

At least I think so. Thus now the code that queries the state of the
toolbar controls only queries dataset if connection is active.

Operating the navigation buttons (next/prev) will, naturally, activate
connection if not yet active. This should also enable the other controls
that may be initially disabled: create/save/print/email documents. Thus,
the navigation controls also check if they have activated the connection,
and invalidate said document creation controls state. Possibly there's a
better place for the invalidation of the controls, but I was unable to
find one.

Regression after commit 5c2c5ff01c23e4f7a8947746afc13a46cbef5bec

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

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index b041a53964de..7ee90e3cea06 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -156,7 +156,8 @@ void SwModule::StateOther(SfxItemSet &rSet)
 xConfigItem = pView->GetMailMergeConfigItem();
 if (!xConfigItem)
 rSet.DisableItem(nWhich);
-else
+else if (xConfigItem->GetConnection().is()
+ && !xConfigItem->GetConnection()->isClosed())
 {
 bool bFirst, bLast;
 bool bValid = xConfigItem->IsResultSetFirstLast(bFirst, 
bLast);
@@ -209,6 +210,8 @@ void SwModule::StateOther(SfxItemSet &rSet)
 // #i51949# hide e-Mail option if e-Mail is not supported
 // #i63267# printing might be disabled
 if (!xConfigItem ||
+!xConfigItem->GetConnection().is() ||
+xConfigItem->GetConnection()->isClosed() ||
 !xConfigItem->GetResultSet().is() ||
 xConfigItem->GetCurrentDBData().sDataSource.isEmpty() ||
 xConfigItem->GetCurrentDBData().sCommand.isEmpty() ||
@@ -729,6 +732,9 @@ void SwModule::ExecOther(SfxRequest& rReq)
 if (!xConfigItem)
 return;
 
+const bool bHadConnection
+= xConfigItem->GetConnection().is() && 
!xConfigItem->GetConnection()->isClosed();
+
 sal_Int32 nPos = xConfigItem->GetResultSetPosition();
 switch (nWhich)
 {
@@ -766,6 +772,15 @@ void SwModule::ExecOther(SfxRequest& rReq)
 rBindings.Invalidate(FN_MAILMERGE_LAST_ENTRY);
 rBindings.Invalidate(FN_MAILMERGE_CURRENT_ENTRY);
 rBindings.Invalidate(FN_MAILMERGE_EXCLUDE_ENTRY);
+if (!bHadConnection && xConfigItem->GetConnection().is()
+&& !xConfigItem->GetConnection()->isClosed())
+{
+// The connection has been activated. Update controls that 
were disabled
+rBindings.Invalidate(FN_MAILMERGE_CREATE_DOCUMENTS);
+rBindings.Invalidate(FN_MAILMERGE_SAVE_DOCUMENTS);
+rBindings.Invalidate(FN_MAILMERGE_PRINT_DOCUMENTS);
+rBindings.Invalidate(FN_MAILMERGE_EMAIL_DOCUMENTS);
+}
 rBindings.Update();
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO integration in iOS Project

[Tor Lillqvist]

> I downloaded LO iOS project from git and tried to build but it did't
> succeeded
>
You need to describe in detail exactly what you did and in what way it did
not succeed for anybody to be able to help you.

Please note that the LibreOffice "core" repository contains a somewhat
outdated iOS app, "LibreOfficeLight", that nobody has been working on for
almost a year. In the "online" repository is a different app being
developed that is much more promising (although I must say here that I am
not objective here, it is I and my colleagues at Collabora Productivity who
work on that...). Read the ios/README file in the "online" repository.

The information in this email and in any files transmitted with it is
> intended only for the addressee and may contain confidential and/or
> privileged material.
>

Please avoid such silly disclaimers in email sent to a publicly archived
mailing list. There is no way the information in such email stays
confidential. It is available on several sites for anybody to read.

(Also, please don't respond to this email privately to me only. That is not
how Open Source works. But sure, if you want to buy consulting work related
to iOS and LibreOffice from Collabora Productivity, feel free to contact us
privately.)

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

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

[Libreoffice Gerrit user]

 qadevOOo/Jar_OOoRunner.mk  |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv |2 
 qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java|  115 
--
 sc/qa/extras/scuniquecellformatsobj.cxx|9 
 sc/qa/unoapi/sc_7.sce  |1 
 5 files changed, 8 insertions(+), 120 deletions(-)

New commits:
commit beae6c7a7f163daad0d4dea63a3d403af2745fd1
Author: Jens Carl 
AuthorDate: Thu Dec 6 06:51:14 2018 +
Commit: Jens Carl 
CommitDate: Fri Dec 7 00:15:29 2018 +0100

tdf#45904 Move XIndexAccess Java tests to C++

Move XIndexAccess Java tests to C++ for ScUniqueCellFormatsObj.

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

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 86bda8985a6b..be961b469267 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1008,7 +1008,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/mod/_sc/ScTableSheetsObj \
 qadevOOo/tests/java/mod/_sc/ScTableValidationObj \
 qadevOOo/tests/java/mod/_sc/ScTabViewObj \
-qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj \
 qadevOOo/tests/java/mod/_sc/ScViewPaneObj \
 qadevOOo/tests/java/mod/_sc/XMLContentExporter \
 qadevOOo/tests/java/mod/_sc/XMLContentImporter \
diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
deleted file mode 100644
index 548af7fb988b..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScUniqueCellFormatsObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScUniqueCellFormatsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java 
b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
deleted file mode 100644
index 808ac6739ca7..
--- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
+++ /dev/null
@@ -1,115 +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.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XUniqueCellFormatRangesSupplier;
-import com.sun.star.table.XCellRange;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-import java.awt.Color;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import util.SOfficeFactory;
-
-
-public class ScUniqueCellFormatsObj extends TestCase {
-private XSpreadsheetDocument xSheetDoc = null;
-static XSpreadsheet oSheet = null;
-
-/**
-* Creates Spreadsheet document.
-*/
-@Override
-protected void initialize(TestParameters tParam, PrintWriter log) throws 
Exception {
-// get a soffice factory object
-SOfficeFactory SOF = SOfficeFactory.getFactory(
- tParam.getMSF());
-
-log.println("creating a sheetdocument");
-xSheetDoc = SOF.createCalcDoc(null);
-}
-
-/**
-* Disposes Spreadsheet document.
-*/
-@Override
-protected void cleanup(TestParameters tParam, PrintWriter log) {
-util.DesktopTools.closeDoc(xSheetDoc);
-}
-
-@Override
-protected TestEnvironment createTestEnvironment(TestParameters tParam,
-PrintWriter log) throws 
Exception {
-log.println("Getting the first sheet");
-
-XIndexAccess xIA = UnoRuntime.queryInterface(
-   XIndexAccess.class, xSheetDoc.getSheets());
-
-oSheet = UnoRuntime.queryInterface(
- XSpreadsheet.class, xIA.getByIndex(0));
-
-changeColor("A1:A5", 0, 255, 0);
-  

[Libreoffice-commits] online.git: docker/scripts

[Libreoffice Gerrit user]

 docker/scripts/run-lool.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30b8170fab303b98c905db2bec7f6967c2e74c77
Author: Andras Timar 
AuthorDate: Thu Dec 6 23:47:49 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 6 23:47:49 2018 +0100

docker: fix permission (owner) of /etc/loolwsd/key.pem

Change-Id: I9e0a9d8bc8c0fc0119e9c66389c1012023046c89

diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index a283672b4..f9ec69338 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -23,6 +23,7 @@ openssl genrsa -out "certs/servers/localhost/privkey.pem" 
2048 -key "certs/serve
 openssl req -key "certs/servers/localhost/privkey.pem" -new -sha256 -out 
"certs/tmp/localhost.csr.pem" -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy 
Authority/CN=localhost"
 openssl x509 -req -in certs/tmp/localhost.csr.pem -CA certs/ca/root.crt.pem 
-CAkey certs/ca/root.key.pem -CAcreateserial -out 
certs/servers/localhost/cert.pem -days 9131
 mv certs/servers/localhost/privkey.pem /etc/loolwsd/key.pem
+chown lool: /etc/loolwsd/key.pem
 mv certs/servers/localhost/cert.pem /etc/loolwsd/cert.pem
 mv certs/ca/root.crt.pem /etc/loolwsd/ca-chain.cert.pem
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/Dockerfile

[Libreoffice Gerrit user]

 docker/Dockerfile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 70fe177a0fda5246e01fc12ce59a6e45cca6f303
Author: Andras Timar 
AuthorDate: Thu Dec 6 23:31:40 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 6 23:31:40 2018 +0100

docker: install openssl

Change-Id: I35a223068f67d3a0740968996ec4af9c723873dc

diff --git a/docker/Dockerfile b/docker/Dockerfile
index bfc5934e2..2cebb82af 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get upgrade -y
 # install apt-transport-https in order to set up repo for Poco
 # install adduser, findutils and cpio that we need later
 # install an editor
-RUN apt-get -y install apt-transport-https locales-all libpng16-16 
libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 
libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50 libcap2-bin
+RUN apt-get -y install apt-transport-https locales-all libpng16-16 
libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 
libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50 libcap2-bin 
openssl
 
 # tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
 RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei 
fonts-droid-fallback fonts-noto-cjk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

MacOS Python: how to install additional packages

[Jens Tröger]

Hello,

I was playing around with LO on my Mac, particularly with the Python
interpreter and uno.  Now I need a few more packages in that Python
environment, and it gets tricky.  There is no virtual env installed,
when I attempt to create one, compiling modules fails because the build
tools differ between my system and LO’s Python.

For example:

  $ /Applications/LibreOffice.app/Contents/Resources/python
  Python 3.5.5 (default, Sep 11 2018, 01:20:06) 
  [GCC 4.2.1 Compatible Apple LLVM 9.1.0 (clang-902.0.39.2)] on darwin
  Type "help", "copyright", "credits" or "license" for more information.
  >>> import pip
  >>> pip.main(['install', 'regex'])

fails as well as 

  $ cd /Applications/LibreOffice.app/Contents/Resources
  /Applications/LibreOffice.app/Contents/Resources > ./python -m venv .
  /Applications/LibreOffice.app/Contents/Resources > ./bin/pip install regex

fails. Including LO’s path into PYTHONPATH like I would do on Linux
doesn’t work either:

  >>> import uno
  Traceback (most recent call last):
File "", line 1, in 
File "/Applications/LibreOffice.app/Contents/Resources/uno.py", line 19, in 

  import pyuno
  ModuleNotFoundError: No module named 'pyuno'

What’s the recommended approach here?

Cheers,
Jens

-- 
Jens Tröger
http://savage.light-speed.de/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

LO integration in iOS Project

[Satheesh Babu Rachamadugu]

Hai Team,

I have a requirement in one of my iOS application to view and edit the word 
document file from App sandbox.

I searched a lot in internet but did't found any suitable solution, finally i 
found LO will fulfill my requirement.

I downloaded LO iOS project from git and tried to build but it did't succeeded

Could you please help us  LO integration into my project by providing the 
step-by-step process.
Thanks.

Regards,
Sateesh



Disclaimer:

The information in this email and in any files transmitted with it is intended 
only for the addressee and may contain confidential and/or privileged material. 
Access to this email by anyone else is unauthorized. If you receive this in 
error, please contact the sender immediately and delete the material from any 
computer. If you are not the intended recipient, any disclosure, copying, 
distribution or any action taken or omitted to be taken in reliance on it, is 
strictly prohibited. Statement and opinions expressed in this e-mail are those 
of the sender, and do not necessarily reflect those of DEWA. DEWA accepts no 
liability for any damage caused by any virus/worms transmitted by this email.

Dubai Electricity and Water Authority, Dubai, UAE, http://www.dewa.gov.ae

Our Vision: A sustainable innovative world-class utility.
Our Mission: We are committed to the happiness of our stakeholders and 
promoting Dubai's vision through the delivery of sustainable electricity and 
water services at a world-class level of reliability, efficiency and safety in 
an environment that nurtures innovation with a competent workforce and 
effective partnerships; supporting resources sustainability.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: Trying to create editor using LibreOffice

[Rohit Garg Satpal Garg]

Thanks Mike. Really appreciate your fast response.

-Original Message-
From: Kaganski Mike [mailto:mikekagan...@hotmail.com]
Sent: Tuesday, December 4, 2018 4:17 PM
To: Rohit Garg Satpal Garg; libreoffice@lists.freedesktop.org
Cc: Fibeesh C.Aboobacker
Subject: Re: Trying to create editor using LibreOffice

This is an External Email. If suspicious, report to: is@dewa.gov.ae 


Hi,

On 04.12.2018 13:33, Rohit Garg Satpal Garg wrote:
> Hi Team,
>
> I am trying to create editing application for my one of the research
> projects but I am stuck on implementation of
> getLinreOfficeKitHandler() which is missing from the source files.

It is not missing. See implementation in
Java_org_libreoffice_kit_LibreOfficeKit_getLibreOfficeKitHandle() at 
sal/android/libreofficekit-jni.c:152.

--
Best regards,
Mike Kaganski




Disclaimer:

The information in this email and in any files transmitted with it is intended 
only for the addressee and may contain confidential and/or privileged material. 
Access to this email by anyone else is unauthorized. If you receive this in 
error, please contact the sender immediately and delete the material from any 
computer. If you are not the intended recipient, any disclosure, copying, 
distribution or any action taken or omitted to be taken in reliance on it, is 
strictly prohibited. Statement and opinions expressed in this e-mail are those 
of the sender, and do not necessarily reflect those of DEWA. DEWA accepts no 
liability for any damage caused by any virus/worms transmitted by this email.

Dubai Electricity and Water Authority, Dubai, UAE, http://www.dewa.gov.ae

Our Vision: A sustainable innovative world-class utility.
Our Mission: We are committed to the happiness of our stakeholders and 
promoting Dubai’s vision through the delivery of sustainable electricity and 
water services at a world-class level of reliability, efficiency and safety in 
an environment that nurtures innovation with a competent workforce and 
effective partnerships; supporting resources sustainability.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

query regarding GSoC participation

[Akash Singh]

sir/madam,
I'm Akash Singh 3rd year Btech student and want to join development of some
project under your organisation , I want to know where and how to start
if I can get somebody's contact who can guide me it will be a great help
for me.
thank you.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: docker/Dockerfile

[Libreoffice Gerrit user]

 docker/Dockerfile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bea079cfce4b98dc343419be5e2f8f22d5efb679
Author: Andras Timar 
AuthorDate: Thu Dec 6 23:21:38 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 6 23:21:38 2018 +0100

docker: install libcap2-bin

Change-Id: Ibd6f794190ec2f6f511f6b8546bbcd237a971a43

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8589bf9c6..bfc5934e2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get upgrade -y
 # install apt-transport-https in order to set up repo for Poco
 # install adduser, findutils and cpio that we need later
 # install an editor
-RUN apt-get -y install apt-transport-https locales-all libpng16-16 
libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 
libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50
+RUN apt-get -y install apt-transport-https locales-all libpng16-16 
libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 
libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50 libcap2-bin
 
 # tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
 RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei 
fonts-droid-fallback fonts-noto-cjk
___
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' - filter/source

[Libreoffice Gerrit user]

 filter/source/msfilter/svdfppt.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit eafe89573f03ba638059bbe014fab1ed6d45d153
Author: Stephan Bergmann 
AuthorDate: Wed Dec 5 10:14:17 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 23:19:12 2018 +0100

Fix reading 16 bit millisecond value

It had originally been read as 16 bit via >> in
d2000efb31f864e912c6cf52760eea0e602b6893 "#i106421#: move msfilter to 
filter",
then accidentally changed to be read as 32 bit via >> in
9830fd36dbdb72c79703b0c61efc027fba793c5a "date/time IDL datatypes 
incompatible
change" (and later changed to be read as 32 bit explicitly via ReadUInt32 
with
15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 "convert SvStream::operator>> 
methods
to ReadXXX methods").

Change-Id: I5062e67a578d182a0df2726ab8d0bae465f154f3
Reviewed-on: https://gerrit.libreoffice.org/64604
Reviewed-by: Lionel Elie Mamane 
Tested-by: Jenkins
(cherry picked from commit f84f5b0a0cdb82f444de572f9d8554a96056f874)
Reviewed-on: https://gerrit.libreoffice.org/64636

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index cc2fc42ad4a6..0f702e8f8531 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2705,6 +2705,7 @@ void ImportComment10( SvxMSDffManager const & rMan, 
SvStream& rStCtrl, SdrPage*
 
 case PPT_PST_CommentAtom10 :
 {
+sal_uInt16 millisec = 0;
 rStCtrl.ReadInt32( nIndex )
.ReadInt16( aDateTime.Year )
.ReadUInt16( aDateTime.Month )
@@ -2713,11 +2714,11 @@ void ImportComment10( SvxMSDffManager const & rMan, 
SvStream& rStCtrl, SdrPage*
.ReadUInt16( aDateTime.Hours )
.ReadUInt16( aDateTime.Minutes )
.ReadUInt16( aDateTime.Seconds )
-   .ReadUInt32( aDateTime.NanoSeconds )
+   .ReadUInt16( millisec )
.ReadInt32( nPosX )
.ReadInt32( nPosY );
 
-aDateTime.NanoSeconds *= ::tools::Time::nanoPerMilli;
+aDateTime.NanoSeconds = millisec * ::tools::Time::nanoPerMilli;
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libnumbertext

[Libreoffice Gerrit user]

 external/libnumbertext/ExternalProject_libnumbertext.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 82af7584dcfe78b2242b3611bc00375871093189
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 15:31:13 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 23:17:28 2018 +0100

Typo causing external/libnumbertext to always use $(gb_COMPILERNOOPTFLAGS)

...ever since f1579d3d6c5f5f3a651825e035b93bee7a4f43c6 "tdf#117171 support
localized number name numbering styles"

Change-Id: I93dcfa9f1310b35e3068a7e0efdce258364a7d78
Reviewed-on: https://gerrit.libreoffice.org/64720
Reviewed-by: László Németh 
Tested-by: László Németh 
Tested-by: Jenkins

diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk 
b/external/libnumbertext/ExternalProject_libnumbertext.mk
index 2b899c63d132..b12012e16577 100644
--- a/external/libnumbertext/ExternalProject_libnumbertext.mk
+++ b/external/libnumbertext/ExternalProject_libnumbertext.mk
@@ -37,7 +37,7 @@ $(call 
gb_ExternalProject_get_state_target,libnumbertext,build):
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM))\
$(if $(filter 
AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
$(if 
$(libnumbertext_CPPFLAGS),CPPFLAGS='$(libnumbertext_CPPFLAGS)') \
-   CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED) $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if 
$(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX)" \
+   CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if 
$(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX)" \
&& cd src && $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'private/kendy/new-stuff'

[Libreoffice Gerrit user]

New branch 'private/kendy/new-stuff' available with the following commits:
commit 96ed87bdccc8985b96bb6b0ce5aaa4bd4685e3c3
Author: Szymon Kłos 
Date:   Thu Dec 6 11:40:54 2018 +0100

Slide switching buttons in mobile

Change-Id: Idf30f53dc8e1a68d0c99dfef484ea9796ee40550

commit 3e910e602e20c24321aaad8d97be57256034fb45
Author: Szymon Kłos 
Date:   Tue Dec 4 23:28:55 2018 +0100

WOPI: Action_RemoveView

Change-Id: Ie8160b70b94c5cb9012560fde64e7e4e9eb079cf

commit 3af486114a311b8fb64f37b17c29723b2098c2a7
Author: Ashod Nakashian 
Date:   Wed Dec 5 08:59:59 2018 -0500

leaflet: check status change by comparing payloads only

Since we have two status message commands, we need
to store and compare just the payloads, lest we
unnecessarily re-process the document state when
nothing has changed (except we got status: vs statusupdate:
or vice versa).

Change-Id: I8506fc4ced3e7677ccc6725893b5ad8eeb8e9f9d

commit a956556e152dae16e95b3e15cd0b23890d96a374
Author: Ashod Nakashian 
Date:   Fri Nov 30 09:10:28 2018 -0500

wsd: document forced autosave and why isAutosave=false

Change-Id: I5bb35898bb917f6768327b264e87dd9000a10ecc

commit c55fa25f0f6a192e54ee2c658bcf33c2a57e0317
Author: Henry Castro 
Date:   Tue Dec 4 21:57:31 2018 -0400

loleaflet: restore original preserveAspectRatio attribute

Change-Id: Ia34deb90c958e3d633d098b63c49adfd5bc3bdac

commit beedc12346ae422d8a478c9005f425eb0b6096a2
Author: Szymon Kłos 
Date:   Tue Dec 4 16:46:45 2018 +0100

Enable undo & redo after enterEditMode

Change-Id: I275f16613eafe74539a8ddd939a8db9979174e6d

commit a91175b1f7def7c3d94e648d7a71a3e0c1088d53
Author: Szymon Kłos 
Date:   Tue Dec 4 15:37:14 2018 +0100

Enable buttons after read-only mode exit

Change-Id: Ic6680d53d07ba0d3a026ae0e17ba5ba812e60e32

commit 694e454e7cc7d11e8c9f45bb3b6d71ef51ce84cf
Author: Szymon Kłos 
Date:   Mon Dec 3 19:17:16 2018 +0100

Reload menubar on permissions change

Change-Id: I156315982cea806de9f0cd21ef45e018be0b3c52

commit c79183788c330821fac027b8da14828be08d7d3f
Author: Jan Holesovsky 
Date:   Fri Nov 30 16:29:18 2018 +0100

mobile view mode: Don't show the 'edit' button on the desktop.

Change-Id: Ia7f3fa5036c0f47fb9da51042b5cfe673871e432

commit 3e63aab55b3e0f170bae5590fbf96f3f252242b1
Author: Jan Holesovsky 
Date:   Fri Nov 30 16:18:43 2018 +0100

mobile view mode: More screen space for Writer and Calc.

Change-Id: Ia754aad59d09254d538480619aec1020f4eb4943

commit 8f93a6ba38132150793d79099b62d0333cce0bd9
Author: Jan Holesovsky 
Date:   Fri Nov 30 15:24:29 2018 +0100

mobile view mode: Don't hide the content of the upper toolbar when 
read-only.

Change-Id: I7d3cf8f5f1946f05254cc22d7ea6fedfe872e225

commit 89826be862ffaeae1a62bb5e8f974d1e277c9f03
Author: Jan Holesovsky 
Date:   Fri Nov 30 14:37:11 2018 +0100

mobile: Fix the naming confusion also for toolbar-down.

Change-Id: I717d1364926a788a15ac9b5e89c4e5fe28a8cac3

commit ecc66d53258e9e3cfc3ed853ad0c8fcece09768a
Author: Jan Holesovsky 
Date:   Fri Nov 30 14:31:34 2018 +0100

mobile: Fix confusion between  naming and w2ui naming.

Both were using toolbar-up, but the  was always up, but the actual
w2ui toolbar (named toolbar-up) was at the bottom.

Change-Id: Ic3ff80f68bfb878d2ed77e98e5be10ca96d64987

commit fc09b8c45bc305860c2310b4d4601a8db98e33f0
Author: Jan Holesovsky 
Date:   Fri Nov 30 13:15:02 2018 +0100

mobile view mode: Start with the read-only mode, upgrade to edit when 
needed.

Change-Id: I268bf89465aac871b83238b8e7c534ef80428e88

commit 8f72cbb8c4c81682e9294e42b5dbb5693561990e
Author: Jan Holesovsky 
Date:   Fri Nov 30 12:17:48 2018 +0100

mobile view mode: Add the floating action button.

The icon comes from the Material Design pages: https://material.io

Change-Id: I59acf7bfb6c65030721605ead057c8854f529a3b

commit e58353657ae02441e49c3857207e6780b7710643
Author: Marco Cecchetti 
Date:   Thu Nov 29 23:37:31 2018 +0100

loleaflet: shape scaling rework

Now shape scaling is handled through the transform dialog instead of
simulating a drag and drop event in core.

For performing a uniform scaling when the shape/image is rotated we
need to inform the client about the rotation angle for the
selectedgraphic object that has been achieved but appending an
angle argument
to the graphic selection callback.

The client check if the angle is divisible by 90 in order to decide if
uniform scaling should be used or it doesn't.

Moreover now it is also possible to reverse shapes/images through
negative scaling.

Change-Id: Iadb93f5883ac403313c1358cb3d8cc9db78338fd

commit 5f6b92b14e22ec03814b67ae809ed2e25365ab27
Author: Szymon Kłos 
Date:   Thu Nov 22 18:37:53 2018 +0100

Zooming dialogs: per instance, not global

Change-Id: Id5a0ba

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

[Libreoffice Gerrit user]

 ios/Mobile/Base.lproj/Main.storyboard  |   53 -
 ios/Mobile/TemplateCollectionViewController.mm |   12 +++--
 2 files changed, 42 insertions(+), 23 deletions(-)

New commits:
commit da45975a5aea927bb8bdcaf4a58b0deced862b5c
Author: Tor Lillqvist 
AuthorDate: Thu Dec 6 17:14:47 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Dec 7 00:09:13 2018 +0200

Make the template collection view look much better

Now it finally looks like I want, but oh boy was that a pain. I am not
sure at all I understand what I am doing in Xcode's Interface Builder.

I tried hard at first to use the cell size 200x220 for the cell size
of the UICollectionView, consisting of a 200x200 UIImageView and a
200x20 UILabel below. But that did not seem to work, it still used a
(default?) size of 150x150. Weird. Anyway, let's commit this state now
that seems to work.

Change-Id: I4021133619fbf62cd633392d93f19c2bbc81311a

diff --git a/ios/Mobile/Base.lproj/Main.storyboard 
b/ios/Mobile/Base.lproj/Main.storyboard
index 64685855d..062c453af 100644
--- a/ios/Mobile/Base.lproj/Main.storyboard
+++ b/ios/Mobile/Base.lproj/Main.storyboard
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 
@@ -43,49 +43,66 @@
 
 
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
 
 
 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-
-
-
 
 
 
-
-
+
+
+
+
+
+
+
 
-
 
 
 
-
+
 
 
 
-
+
 
 
 
diff --git a/ios/Mobile/TemplateCollectionViewController.mm 
b/ios/Mobile/TemplateCollectionViewController.mm
index 91d5689d0..94a922825 100644
--- a/ios/Mobile/TemplateCollectionViewController.mm
+++ b/ios/Mobile/TemplateCollectionViewController.mm
@@ -12,8 +12,7 @@
 #import "TemplateCollectionViewController.h"
 #import "TemplateSectionHeaderView.h"
 
-static NSString *mapTemplateExtensionToActua

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

[Libreoffice Gerrit user]

 configure.ac |   14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 9e16ad5d511cfa85b3be87f6da36f9b8e0b47424
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 18:14:19 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 23:02:19 2018 +0100

--enable-python=system no longer works on macOS

e.g.:

> [CXX] pyuno/source/module/pyuno_callable.cxx
> In file included from pyuno/source/module/pyuno_callable.cxx:19:
> In file included from pyuno/source/module/pyuno_impl.hxx:27:
> In file included from 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7/Python.h:85:
> 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7/unicodeobject.h:534:5:
 error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
> register PyObject *obj, /* Object */
> ^

(and some $enable_python=system/$_os=Darwin-specific code can thus be 
removed,
too)

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

diff --git a/configure.ac b/configure.ac
index 4e55ddbff76e..9f60e40384a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8263,6 +8263,9 @@ fully-internal)
 ;;
 system)
 AC_MSG_RESULT([system])
+if test "$_os" = Darwin; then
+AC_MSG_ERROR([--enable-python=system doesn't work on macOS: 
/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7/unicodeobject.h
 is known to contain uses of "register", which is removed from C++17])
+fi
 ;;
 *)
 AC_MSG_ERROR([Incorrect --enable-python option])
@@ -8274,17 +8277,6 @@ if test $enable_python != no; then
 fi
 
 if test $enable_python = system; then
-if test -z "$PYTHON_CFLAGS" -a $_os = Darwin; then
-python_version=2.7
-PYTHON=python$python_version
-if test -d 
"$FRAMEWORKSHOME/Python.framework/Versions/${python_version}/include/python${python_version}";
 then
-
PYTHON_CFLAGS="-I$FRAMEWORKSHOME/Python.framework/Versions/${python_version}/include/python${python_version}"
-PYTHON_LIBS="-framework Python"
-else
-PYTHON_CFLAGS="`$PYTHON-config --includes`"
-PYTHON_LIBS="`$PYTHON-config --libs`"
-fi
-fi
 if test -n "$PYTHON_CFLAGS" -a -n "$PYTHON_LIBS"; then
 # Fallback: Accept these in the environment, or as set above
 # for MacOSX.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac connectivity/source cppu/qa external/poppler include/o3tl include/rtl include/sal solenv/gbuild ucb/source

[Libreoffice Gerrit user]

 configure.ac|4 +-
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx |2 -
 cppu/qa/cppumaker/test_cppumaker.cxx|2 -
 external/poppler/StaticLibrary_poppler.mk   |   16 
--
 include/o3tl/safeint.hxx|2 -
 include/rtl/stringutils.hxx |   10 --
 include/sal/types.h |2 -
 solenv/gbuild/platform/com_GCC_defs.mk  |   14 +---
 ucb/source/ucp/cmis/auth_provider.hxx   |4 +-
 ucb/source/ucp/cmis/certvalidation_handler.hxx  |4 +-
 ucb/source/ucp/cmis/cmis_content.hxx|4 +-
 ucb/source/ucp/cmis/cmis_url.cxx|4 +-
 12 files changed, 17 insertions(+), 51 deletions(-)

New commits:
commit d7b46ef1cf69c9fe5c4c36958ca5d5b40de8cf8d
Author: Stephan Bergmann 
AuthorDate: Sat Nov 24 17:41:50 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 23:01:34 2018 +0100

Remove obsolete GCC version checks

...after  "Bump (Linux) GCC baseline 
to
7.0.0".  (In some cases, those checks now need to check for __clang__, 
which was
implicitly covered in the past by Clang consistently reporting to be
GCC 4.2.1.)

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

diff --git a/configure.ac b/configure.ac
index 02114bfd17f9..4e55ddbff76e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6258,13 +6258,13 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 
 #if defined SYSTEM_LIBCMIS
 // See ucb/source/ucp/cmis/auth_provider.hxx:
-#if __GNUC__ >= 7
+#if !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
 #include 
-#if __GNUC__ >= 7
+#if !defined __clang__
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
index 9b687f74e8ad..6397831e80dd 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
@@ -444,7 +444,7 @@ void SAL_CALL 
OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co
 break;
 }
 
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
 [[fallthrough]];
 #else
 BOOST_FALLTHROUGH;
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx 
b/cppu/qa/cppumaker/test_cppumaker.cxx
index e73a502333f8..cc310188b105 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -444,7 +444,7 @@ void Test::testBigStruct() {
 CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), 
guard.p->m23.getLength());
 
 //This is a very platform specific test.
-#if defined __GNUC__ && __GNUC__ >= 3 // see CPPU_GCC3_ALIGN
+#if defined __GNUC__ // see CPPU_GCC3_ALIGN
 #if defined(LINUX) && (defined (X86_64) || defined(X86) || defined(PPC))
 CPPUNIT_ASSERT_EQUAL(
 #if defined X86_64 || defined PPC
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index f145b7ae9c39..84873d9c7c2a 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -33,22 +33,6 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
 ))
 endif
 
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864
-# can't easily check for 4.8.2 exactly so just apply to GCC 4.8.x
-ifeq ($(COM),GCC)
-ifeq ($(COM_IS_CLANG),)
-ifeq ($(CPUNAME),INTEL)
-ifeq ($(shell expr '$(GCC_VERSION)' '<' 409),1)
-ifeq ($(shell expr '$(GCC_VERSION)' '>=' 408),1)
-$(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
-   -march=i586 \
-))
-endif
-endif
-endif
-endif
-endif
-
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,poppler,cc))
 
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index 6f879965840c..ae28ca4b6570 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -112,7 +112,7 @@ template inline bool checked_sub(T a, T b, T& 
result)
 return !msl::utilities::SafeSubtract(a, b, result);
 }
 
-#elif (defined __GNUC__ && __GNUC__ >= 5) || 
(__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined 
__clang__) && !(defined(__clang__) && defined(__i386__)))
+#eli

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

[Libreoffice Gerrit user]

 README.md|2 +-
 configure.ac |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 65b9c62354f77c0d3ff02dfa3151447c629ef419
Author: Stephan Bergmann 
AuthorDate: Sat Nov 24 12:27:37 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 23:00:56 2018 +0100

Bump (Linux) GCC baseline to 7.0.0

...as discussed at


"minutes of ESC call ..."

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

diff --git a/README.md b/README.md
index d72e9549c4fa..ddfe9a760a47 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ run and compile LibreOffice, also used by the TDF builds:
 * Build: 10.13.2 + Xcode 9.3
 * Linux:
 * Runtime: RHEL 6 or CentOS 6
-* Build: either GCC 4.8.1; or Clang 5.0.2 with libstdc++ 7.3.0
+* Build: either GCC 7.0.0; or Clang 5.0.2 with libstdc++ 7.3.0
 * iOS (only for LibreOfficeKit):
 * Runtime: 11.4 (only support for newer i devices == 64 bit)
 * Build: Xcode 9.3 and iPhone SDK 11.4
diff --git a/configure.ac b/configure.ac
index d338e625638c..02114bfd17f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3796,8 +3796,8 @@ if test "$GCC" = "yes" -a -z "$COM_IS_CLANG"; then
 
 AC_MSG_RESULT([gcc $_gcc_version ($gcc_full_version)])
 
-if test "$gcc_full_version" -lt 40801; then
-AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 
4.8.1])
+if test "$gcc_full_version" -lt 7; then
+AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 
7.0.0])
 fi
 else
 # Explicitly force GCC_VERSION to be empty, even for Clang, to check 
incorrect uses.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/Dockerfile

[Libreoffice Gerrit user]

 docker/Dockerfile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 433c0b43b115d0dc473a9d05c7984f77ffb18f7a
Author: Andras Timar 
AuthorDate: Thu Dec 6 22:47:15 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 6 22:47:25 2018 +0100

docker: fix libpng dependency

Change-Id: I1ab093460c4cac1fbcb8f37ad54e742d5560206c

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0df3c0d44..8589bf9c6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get upgrade -y
 # install apt-transport-https in order to set up repo for Poco
 # install adduser, findutils and cpio that we need later
 # install an editor
-RUN apt-get -y install apt-transport-https locales-all libpng12-0 libxinerama1 
libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 
libxcb-render0 adduser cpio findutils nano libpoco*50
+RUN apt-get -y install apt-transport-https locales-all libpng16-16 
libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 
libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50
 
 # tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
 RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei 
fonts-droid-fallback fonts-noto-cjk
___
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' - sw/uiconfig

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/templatedialog1.ui  |1 -
 sw/uiconfig/swriter/ui/templatedialog16.ui |1 -
 sw/uiconfig/swriter/ui/templatedialog2.ui  |1 -
 sw/uiconfig/swriter/ui/templatedialog4.ui  |1 -
 sw/uiconfig/swriter/ui/templatedialog8.ui  |1 -
 5 files changed, 5 deletions(-)

New commits:
commit a32e5befd14334264cdf4279c56c3d552a2fcfe2
Author: Caolán McNamara 
AuthorDate: Thu Dec 6 15:44:24 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 6 20:44:59 2018 +0100

remove extra padding in action area

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

diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui 
b/sw/uiconfig/swriter/ui/templatedialog1.ui
index a7960a1646b6..8877434470a5 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -56,7 +56,6 @@
 True
 True
 True
-12
 True
   
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui 
b/sw/uiconfig/swriter/ui/templatedialog16.ui
index 3bebf8e38684..164525f9 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -42,7 +42,6 @@
 True
 True
 True
-12
 True
   
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui 
b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 237fc0c7b5e7..336cc1557b96 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -56,7 +56,6 @@
 True
 True
 True
-12
 True
   
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui 
b/sw/uiconfig/swriter/ui/templatedialog4.ui
index 6dd1aebca436..c73bc5e71b5f 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -56,7 +56,6 @@
 True
 True
 True
-12
 True
   
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui 
b/sw/uiconfig/swriter/ui/templatedialog8.ui
index 91c9d5fb3025..20640bcddf93 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -43,7 +43,6 @@
 True
 True
 True
-12
 True
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/templatedialog1.ui  |1 -
 sw/uiconfig/swriter/ui/templatedialog16.ui |1 -
 sw/uiconfig/swriter/ui/templatedialog2.ui  |1 -
 sw/uiconfig/swriter/ui/templatedialog4.ui  |1 -
 sw/uiconfig/swriter/ui/templatedialog8.ui  |1 -
 5 files changed, 5 deletions(-)

New commits:
commit f623c992fa15f3f503591c2bc225eeae5a50c5ce
Author: Caolán McNamara 
AuthorDate: Thu Dec 6 15:44:24 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 6 20:44:42 2018 +0100

remove extra padding in action area

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

diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui 
b/sw/uiconfig/swriter/ui/templatedialog1.ui
index a7960a1646b6..8877434470a5 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -56,7 +56,6 @@
 True
 True
 True
-12
 True
   
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui 
b/sw/uiconfig/swriter/ui/templatedialog16.ui
index 3bebf8e38684..164525f9 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -42,7 +42,6 @@
 True
 True
 True
-12
 True
   
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui 
b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 237fc0c7b5e7..336cc1557b96 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -56,7 +56,6 @@
 True
 True
 True
-12
 True
   
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui 
b/sw/uiconfig/swriter/ui/templatedialog4.ui
index 6dd1aebca436..c73bc5e71b5f 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -56,7 +56,6 @@
 True
 True
 True
-12
 True
   
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui 
b/sw/uiconfig/swriter/ui/templatedialog8.ui
index 91c9d5fb3025..20640bcddf93 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -43,7 +43,6 @@
 True
 True
 True
-12
 True
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bridges/Library_cpp_uno.mk

[Libreoffice Gerrit user]

 bridges/Library_cpp_uno.mk |   58 +
 1 file changed, 58 insertions(+)

New commits:
commit c7a1dc7dc622ebcd1f2473443c920e5dc854df04
Author: Damjan Jovanovic 
AuthorDate: Thu Dec 6 17:35:55 2018 +
Commit: Damjan Jovanovic 
CommitDate: Thu Dec 6 17:35:55 2018 +

Linux needs "-ldl" for the dynamic linker functions.

Patch by: me

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index d46b5f30907f..86e0f9c51c13 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -162,6 +162,10 @@ $(eval $(call 
gb_Library_add_exception_objects,$(COMNAME)_uno,\
 bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp \
 ))
 
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 ##
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-ARM-gcc3)
 ##
@@ -183,6 +187,10 @@ $(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
bridges/source/cpp_uno/gcc3_linux_arm/armhelper \
 ))
 
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 ###
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-HPPA-gcc3)
 ###
@@ -202,6 +210,10 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
 , $(gb_COMPILERNOOPTFLAGS) \
 ))
 
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 ###
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-IA64-gcc3)
 ###
@@ -222,6 +234,10 @@ $(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
bridges/source/cpp_uno/gcc3_linux_ia64/call \
 ))
 
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-INTEL-gcc3)
 
@@ -238,6 +254,10 @@ $(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
 ))
 
 
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 ###
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-M68K-gcc3)
 ###
@@ -255,6 +275,11 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
 , $(gb_COMPILERNOOPTFLAGS) \
 ))
 
+
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 #
 # It's a MIPS, apparently...
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-GODSON-gcc3)
@@ -272,6 +297,11 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
 , $(gb_COMPILERNOOPTFLAGS) \
 ))
 
+
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 ##
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-POWERPC-gcc3)
 ##
@@ -287,6 +317,11 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
 , $(gb_COMPILERNOOPTFLAGS) \
 ))
 
+
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-POWERPC64-gcc3)
 
@@ -303,6 +338,11 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
 , $(gb_COMPILERNOOPTFLAGS) \
 ))
 
+
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 ###
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-S390-gcc3)
 ###
@@ -313,6 +353,11 @@ $(eval $(call 
gb_Library_add_exception_objects,$(COMNAME)_uno,\
bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp \
 ))
 
+
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-S390X-gcc3)
 
@@ -323,6 +368,11 @@ $(eval $(call 
gb_Library_add_exception_objects,$(COMNAME)_uno,\
bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp \
 ))
 
+
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-SPARC-gcc3)
 
@@ -343,6 +393,10 @@ $(eval $(call gb_Library_add_asmobjects,$(COMNAME)_uno,\
bridges/source/cpp_uno/gcc3_linux_sparc/call \
 ))
 
+$(eval $(call gb_Library_add_libs,$(COMNAME)_uno,\
+   -ldl \
+))
+
 #
 else ifeq ($(OS)-$(CPUNAME)-$(COMNAME),LINUX-X86_64-gcc3)
 ###

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui|   67 +
 sc/uiconfig/scalc/ui/notebookbar_compact.ui|7 -
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui |7 -
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui|7 -
 4 files changed, 5 insertions(+), 83 deletions(-)

New commits:
commit 7dbd56d5bfa79d948c4d291ffe79fb5b49d4fdd9
Author: andreas kainz 
AuthorDate: Wed Nov 28 21:12:44 2018 +0100
Commit: andreas_kainz 
CommitDate: Thu Dec 6 19:48:56 2018 +0100

remove uno:InsertObjectChartFromFile command from UI

cause command isn't available any more

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 3a6e49c5eeaf..bd8b1a5cba49 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1019,13 +1019,6 @@
   
 
 
-  
-True
-False
-.uno:InsertObjectChartFromFile
-  
-
-
   
 True
 False
@@ -4623,72 +4616,22 @@
 True
   
 
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-center
-vertical
-
-  
-True
-True
-both-horiz
-False
-
-  
-True
-False
-.uno:InsertObjectChartFromFile
-  
-  
-False
-True
-  
-
-  
-  
-False
-True
-0
-  
-
 
-  
+  
 True
-True
-both-horiz
-False
-
-  
-True
-False
-.uno:InsertObject
-  
-  
-False
-True
-  
-
+False
+.uno:InsertObject
   
   
 False
-True
-1
+True
   
 
   
   
 False
 True
-1
+0
   
 
 
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index e9eab32b947b..a65b903df599 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -1130,13 +1130,6 @@
   
 
 
-  
-True
-False
-.uno:InsertObjectChartFromFile
-  
-
-
   
 True
 False
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index a178dc6ca5e4..9ef4b34e425e 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -1655,13 +1655,6 @@
   
 
 
-  
-True
-False
-.uno:InsertObjectChartFromFile
-  
-
-
   
 True
 False
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 8d6a834ba81b..9eefefc5b034 10

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

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit 16eddb555444b4fb40319913b77455f3c741494f
Author: Michael Stahl 
AuthorDate: Wed Dec 5 16:37:18 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Dec 6 19:23:15 2018 +0100

temp?

Change-Id: Ide2abf0c2ce054b75c917063a5d5aa8d13430426

diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 7b6411163cb3..c756aedf4cd2 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -267,6 +267,7 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const 
SwPosition &rPos,
 
 bool bGoOn = true;
 TextFrameIndex const nOffset = MapModelToViewPos(rPos);
+assert(nOffset != TextFrameIndex(COMPLETE_STRING)); // not going to 
end well
 TextFrameIndex nNextOfst;
 
 do
commit b6f42f452c964ce7f86a707273c5d800106087a3
Author: Michael Stahl 
AuthorDate: Tue Dec 4 15:57:47 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Dec 6 19:23:15 2018 +0100

sw_redlinehide_4b: FindText layout parameter

Change-Id: I22c0adb40219bc53b5685e2e20bd55bfd65fd4a3

diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index dd3b2720abf0..2a89054e02eb 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -116,7 +116,8 @@ public:
 SwDocPositions nStart, SwDocPositions nEnde,
 bool& bCancel,
 FindRanges,
-bool bReplace = false );
+bool bReplace = false,
+SwRootFrame const*const pLayout = nullptr);
 sal_uLong FindFormat( const SwTextFormatColl& rFormatColl,
 SwDocPositions nStart, SwDocPositions nEnde,
 bool& bCancel,
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 903902c50351..8c2f062611ab 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3330,7 +3330,7 @@ sal_uLong SwCursorShell::FindText( const 
i18nutil::SearchOptions2& rSearchOpt,
 m_pTableCursor = nullptr;
 SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
 sal_uLong nRet = m_pCurrentCursor->FindText(rSearchOpt, bSearchInNotes, 
eStart, eEnd,
- bCancel, eRng, bReplace );
+ bCancel, eRng, bReplace, GetLayout());
 if( nRet || bCancel )
 UpdateCursor();
 return nRet;
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 62e42184fcae..5fe3a757e890 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -654,13 +654,19 @@ struct SwFindParaText : public SwFindParas
 {
 const i18nutil::SearchOptions2& m_rSearchOpt;
 SwCursor& m_rCursor;
+SwRootFrame const* m_pLayout;
 utl::TextSearch m_aSText;
 bool const m_bReplace;
 bool const m_bSearchInNotes;
 
-SwFindParaText( const i18nutil::SearchOptions2& rOpt, bool bSearchInNotes, 
bool bRepl, SwCursor& rCursor )
-: m_rSearchOpt( rOpt ), m_rCursor( rCursor ), m_aSText( 
utl::TextSearch::UpgradeToSearchOptions2( rOpt) ),
-m_bReplace( bRepl ), m_bSearchInNotes( bSearchInNotes )
+SwFindParaText(const i18nutil::SearchOptions2& rOpt, bool bSearchInNotes,
+bool bRepl, SwCursor& rCursor, SwRootFrame const*const pLayout)
+: m_rSearchOpt( rOpt )
+, m_rCursor( rCursor )
+, m_pLayout(pLayout)
+, m_aSText( utl::TextSearch::UpgradeToSearchOptions2(rOpt) )
+, m_bReplace( bRepl )
+, m_bSearchInNotes( bSearchInNotes )
 {}
 virtual int DoFind(SwPaM &, SwMoveFnCollection const &, const SwPaM &, 
bool bInReadOnly) override;
 virtual bool IsReplaceMode() const override;
@@ -731,7 +737,8 @@ bool SwFindParaText::IsReplaceMode() const
 
 sal_uLong SwCursor::FindText( const i18nutil::SearchOptions2& rSearchOpt, bool 
bSearchInNotes,
   SwDocPositions nStart, SwDocPositions nEnd,
-  bool& bCancel, FindRanges eFndRngs, bool bReplace )
+  bool& bCancel, FindRanges eFndRngs, bool bReplace,
+  SwRootFrame const*const pLayout)
 {
 // switch off OLE-notifications
 SwDoc* pDoc = GetDoc();
@@ -747,7 +754,7 @@ sal_uLong SwCursor::FindText( const 
i18nutil::SearchOptions2& rSearchOpt, bool b
 bool bSearchSel = 0 != (rSearchOpt.searchFlag & 
SearchFlags::REG_NOT_BEGINOFLINE);
 if( bSearchSel )
 eFndRngs = static_cast(eFndRngs | FindRanges::InSel);
-SwFindParaText aSwFindParaText( rSearchOpt, bSearchInNotes, bReplace, 
*this );
+SwFindParaText aSwFindParaText(rSearchOpt, bSearchInNotes, bReplace, 
*this, pLayout);
 sal_uLong nRet = FindAll( aSwFindParaText, nStart, nEnd, eFndRngs, bCancel 
);
 pDoc->SetOle2Link( aLnk );
 if( nRet && bReplace )
commit 8e8afe11b89400fdaf63152a6ccdbce13eb93464
Author: Michael Stahl 
AuthorDate: Tue Dec 4 14:20:02 2018 +0100
Commit: Michael Stahl 
Com

Re: [Libreoffice-qa] minutes of ESC call ...

[Heiko Tietze]

On 06.12.18 17:51, Michael Meeks wrote:
> Hi Markus,
> 
> On 06/12/2018 16:46, Markus Mohrhard wrote:
>>          + minor complaint wrt. single Chart save removal in calc
>> (Heiko)
>>             + how to know ? - checkout release notes
>>  
>> These people should feel free to complain to me. However the removal was
>> necessary and long overdue. Actually, the feature was responsible for
>> many regressions and was originally intended by me for debugging purposes.
> 
>   Amusing =) Heiko would know those involved I guess.

Of course it was necessary. I mentioned the irritation just as a reminder to 
acknowledge everyone about changes. If it was announces at the ESC people can 
blame me to not forward the info :-).



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

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

[Libreoffice Gerrit user]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv |2 
 sc/CppunitTest_sc_uniquecellformatsobj.mk  |   43 

 sc/Module_sc.mk|1 
 sc/qa/extras/scuniquecellformatsobj.cxx|   89 
++
 4 files changed, 133 insertions(+), 2 deletions(-)

New commits:
commit 04ce016e9c618e0b2b35271982e07f265dea81b1
Author: Jens Carl 
AuthorDate: Thu Dec 6 06:38:40 2018 +
Commit: Jens Carl 
CommitDate: Thu Dec 6 18:44:34 2018 +0100

tdf#45904 Move XElementAccess Java tests to C++

Move XElementAccess Java tests to C++ for ScUniqueCellFormatsObj.

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

diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
index f06e22629bbd..03cdf463291b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
@@ -1,5 +1,3 @@
 "ScUniqueCellFormatsObj";"com::sun::star::container::XIndexAccess";"getCount()"
 
"ScUniqueCellFormatsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"ScUniqueCellFormatsObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScUniqueCellFormatsObj";"com::sun::star::container::XElementAccess";"hasElements()"
 
"ScUniqueCellFormatsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/sc/CppunitTest_sc_uniquecellformatsobj.mk 
b/sc/CppunitTest_sc_uniquecellformatsobj.mk
new file mode 100644
index ..6efd2f1100bb
--- /dev/null
+++ b/sc/CppunitTest_sc_uniquecellformatsobj.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# 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/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_uniquecellformatsobj))
+
+$(eval $(call 
gb_CppunitTest_use_external,sc_uniquecellformatsobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_uniquecellformatsobj, \
+   sc/qa/extras/scuniquecellformatsobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_uniquecellformatsobj, \
+   cppu \
+   sal \
+   subsequenttest \
+   test \
+   unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_uniquecellformatsobj,\
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_uniquecellformatsobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_uniquecellformatsobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_uniquecellformatsobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_uniquecellformatsobj,\
+$(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_uniquecellformatsobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 60a1f6ebaf44..e7aa99051ae7 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -185,6 +185,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_tablevalidationobj \
CppunitTest_sc_tabviewobj \
CppunitTest_sc_uniquecellformatsenumeration \
+   CppunitTest_sc_uniquecellformatsobj \
CppunitTest_sc_viewpaneobj \
 ))
 
diff --git a/sc/qa/extras/scuniquecellformatsobj.cxx 
b/sc/qa/extras/scuniquecellformatsobj.cxx
new file mode 100644
index ..9cd1959fa205
--- /dev/null
+++ b/sc/qa/extras/scuniquecellformatsobj.cxx
@@ -0,0 +1,89 @@
+/* -*- 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 
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest
+{
+class ScUniqueCellFormatsObj : public CalcUnoApiTest, public 
apitest::XElementAccess
+{
+public:
+ScUniqueCellFormatsObj();
+
+virtual uno::Reference init() override;
+virtual void setUp() override;
+virtual void tearDown() override;
+
+CPPUNIT_TEST_SUITE(ScUniqueCellFormatsObj);
+
+// XElementAccess
+CPPUNIT_TEST(testGetElementType);
+CPPUNIT_TEST(testHasE

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

[Libreoffice Gerrit user]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv |1 -
 sc/qa/extras/scuniquecellformatsobj.cxx|8 
+++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit a9d928cd9b8073d422a5eab70f9de374bf07a260
Author: Jens Carl 
AuthorDate: Thu Dec 6 06:44:18 2018 +
Commit: Jens Carl 
CommitDate: Thu Dec 6 18:44:56 2018 +0100

tdf#45904 Move XEnumerationAccess Java test to C++

Move XEnumerationAccess Java test to C++ for ScUniqueCellFormatsObj.

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

diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
index 03cdf463291b..548af7fb988b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScUniqueCellFormatsObj.csv
@@ -1,3 +1,2 @@
 "ScUniqueCellFormatsObj";"com::sun::star::container::XIndexAccess";"getCount()"
 
"ScUniqueCellFormatsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"ScUniqueCellFormatsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/sc/qa/extras/scuniquecellformatsobj.cxx 
b/sc/qa/extras/scuniquecellformatsobj.cxx
index 9cd1959fa205..58c9b9633410 100644
--- a/sc/qa/extras/scuniquecellformatsobj.cxx
+++ b/sc/qa/extras/scuniquecellformatsobj.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -28,7 +29,9 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScUniqueCellFormatsObj : public CalcUnoApiTest, public 
apitest::XElementAccess
+class ScUniqueCellFormatsObj : public CalcUnoApiTest,
+   public apitest::XElementAccess,
+   public apitest::XEnumerationAccess
 {
 public:
 ScUniqueCellFormatsObj();
@@ -43,6 +46,9 @@ public:
 CPPUNIT_TEST(testGetElementType);
 CPPUNIT_TEST(testHasElements);
 
+// XEnumerationAccess
+CPPUNIT_TEST(testCreateEnumeration);
+
 CPPUNIT_TEST_SUITE_END();
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 fpicker/source/win32/FilterContainer.cxx |   23 +--
 fpicker/source/win32/FilterContainer.hxx |7 ---
 fpicker/source/win32/VistaFilePickerImpl.cxx |   20 
 3 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit ff8c49236b8c2498b1c186192fc6ab6ce076d21a
Author: Mike Kaganski 
AuthorDate: Thu Dec 6 09:46:45 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 6 18:07:55 2018 +0100

Optimize getting filter mask by index from CFilterContainer

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

diff --git a/fpicker/source/win32/FilterContainer.cxx 
b/fpicker/source/win32/FilterContainer.cxx
index a9a85f3ca48e..4fabed1460e4 100644
--- a/fpicker/source/win32/FilterContainer.cxx
+++ b/fpicker/source/win32/FilterContainer.cxx
@@ -99,33 +99,36 @@ void CFilterContainer::empty()
 // Precondition: the container is not empty
 //   there is a filter identified by the name
 
-bool CFilterContainer::getFilter( const OUString& aName, OUString& theFilter ) 
const
+bool CFilterContainer::getFilterByName(const OUString& aName, OUString& 
theFilter) const
 {
 OSL_PRECOND( !m_vFilters.empty() , "Empty filter container" );
+return getFilterByIndex(getFilterTagPos(aName), theFilter);
+}
 
-sal_Int32 pos = getFilterTagPos( aName );
+bool CFilterContainer::getFilterByIndex(sal_Int32 aIndex, OUString& theFilter) 
const
+{
+bool bRet = true;
 
 try
 {
-if ( pos > -1 )
-theFilter = m_vFilters.at( pos ).second;
+theFilter = m_vFilters.at(aIndex).second;
 }
-catch( std::out_of_range& )
+catch (std::out_of_range&)
 {
-OSL_FAIL( "Filter not in filter container" );
-pos = -1;
+OSL_FAIL("Filter index out of range");
+bRet = false;
 }
 
-return pos > -1;
+return bRet;
 }
 
-bool CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const
+bool CFilterContainer::getFilterNameByIndex(sal_Int32 aIndex, OUString& 
theName) const
 {
 bool bRet = true;
 
 try
 {
-theFilter = m_vFilters.at( aIndex ).first;
+theName = m_vFilters.at(aIndex).first;
 }
 catch( std::out_of_range& )
 {
diff --git a/fpicker/source/win32/FilterContainer.hxx 
b/fpicker/source/win32/FilterContainer.hxx
index 89c3987aca45..f54b10a7f3f0 100644
--- a/fpicker/source/win32/FilterContainer.hxx
+++ b/fpicker/source/win32/FilterContainer.hxx
@@ -58,11 +58,12 @@ public:
 // clear all entries
 void empty( );
 
-// retrieve a filter from the container both methods
+// retrieve a filter from the container. These methods
 // return true on success and false if the specified
 // filter was not found
-bool getFilter( const OUString& aName, OUString& theFilter ) const;
-bool getFilter( sal_Int32 aIndex, OUString& theFilter ) const;
+bool getFilterByName(const OUString& aName, OUString& theFilter) const;
+bool getFilterByIndex(sal_Int32 aIndex, OUString& theFilter) const;
+bool getFilterNameByIndex(sal_Int32 aIndex, OUString& theName) const;
 
 // returns the position of the specified filter or -1
 // if the filter was not found
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index 6c168a244fa0..1bd177f1d7f4 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -428,7 +428,7 @@ void VistaFilePickerImpl::impl_sta_getCurrentFilter(const 
RequestRef& rRequest)
 ::sal_Int32 nRealIndex = (nIndex-1); // COM dialog base on 1 ... 
filter container on 0 .-)
 if (
 (nRealIndex >= 0 ) &&
-(m_lFilters.getFilter(nRealIndex, sTitle))
+(m_lFilters.getFilterNameByIndex(nRealIndex, sTitle))
)
 rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
 else if ( nRealIndex == -1 ) // Dialog not visible yet
@@ -1003,16 +1003,12 @@ void 
VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
 {
 // COM dialog base on 1 ... filter container on 0 .-)
 ::size_t nRealIndex = (nFileType-1);
-std::vector vStrings;
-::std::vector lFilters
-= lcl_buildFilterList(m_lFilters, vStrings);
-if ( nRealIndex < lFilters.size() )
+OUString sFilter;
+if (m_lFilters.getFilterByIndex(nRealIndex, sFilter))
 {
-PCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec;
-
-lpFilterExt = wcsrchr( lpFilterExt, '.' );
-if ( lpFilterExt )
-aFileURL += o3tl::toU(lpFi

Re: minutes of ESC call ...

[Michael Meeks]

Hi Markus,

On 06/12/2018 16:46, Markus Mohrhard wrote:
>          + minor complaint wrt. single Chart save removal in calc
> (Heiko)
>             + how to know ? - checkout release notes
>  
> These people should feel free to complain to me. However the removal was
> necessary and long overdue. Actually, the feature was responsible for
> many regressions and was originally intended by me for debugging purposes.

Amusing =) Heiko would know those involved I guess.

> perftest is not running on gandalf, instead on vm139. 
> 
> As I'm one of the main users of gandalf (e.g. update, UI testing, random
> config) and some more exotic builds not managed by jenkins I will try to
> take care of the update during the weekend.

Thanks so much for that ! seems like that one machine does a lot.

ATB,

Michael.

-- 
michael.me...@collabora.com <><, GM Collabora Productivity
Hangout: mejme...@gmail.com, Skype: mmeeks
(M) +44 7795 666 147 - timezone usually UK / Europe
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

[Markus Mohrhard]

Hey all,

On Thu, Dec 6, 2018 at 4:31 PM Michael Meeks 
wrote:

>  + minor complaint wrt. single Chart save removal in calc (Heiko)
> + how to know ? - checkout release notes
>
>

These people should feel free to complain to me. However the removal was
necessary and long overdue. Actually, the feature was responsible for many
regressions and was originally intended by me for debugging purposes.


> * Tinderbox bits (Stephan)
> + gandalf – too old compiler; keeps failing tinderboxen
>+ bit of a problem, needs SUSE goodwill to help us connect a
> console etc.
>+ can we not live-upgrade it ? (Thorsten)
>+ just needs a new gcc (Stephan)
>   + some SLES12 there – with internal repos etc. (Thorsten)
>  + in some odd state there.
>+ not eager to touch it unless we can afford to loose it (Thorsten)
> + rsync some container or other onto there ?
> + what jobs run there ? (Thorsten)
>+ lcov, perftest(?), random config,
>  UI testing, update, UI testing (Stephan, Christian)
>+ can we move jobs off it ?
>   + unclear if they have extra build deps ? (Christian)
>  + perhaps more sustainable to migrate this (Thorsten)
> + poke Guilhelm → to poke admins (Christian)
>


perftest is not running on gandalf, instead on vm139.

As I'm one of the main users of gandalf (e.g. update, UI testing, random
config) and some more exotic builds not managed by jenkins I will try to
take care of the update during the weekend. I already managed to get gperf
working but the SUSE network firewall blocks access to github so flex could
not be updated. The new compiler should be possible without major issues.

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

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

[Libreoffice Gerrit user]

 solenv/gbuild/CppunitTest.mk |4 ++--
 solenv/gbuild/Gallery.mk |3 ---
 solenv/gbuild/PythonTest.mk  |3 ---
 solenv/gbuild/UITest.mk  |3 ---
 solenv/gbuild/gbuild.mk  |3 +++
 vcl/source/app/salplug.cxx   |6 +++---
 6 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 2edc86a592bc943fcffef0a8ae8db220e18e2b37
Author: Jan-Marek Glogowski 
AuthorDate: Fri Nov 23 13:44:28 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 6 17:41:53 2018 +0100

Default all tests to run with the svp plugin

Otherwise a test can already require a windowed VCL plugin by
calling gb_CppunitTest_use_vcl_non_headless(_with_windows)?.

For compatibility on unix --headless still implies the use of the
svp plugin, but now a SAL_USE_VCLPLUGIN will override it.

All the explicit SAL_USE_VCLPLUGIN=svp are not needed, as this is
now included in the gb_TEST_ENV_VARS variable and gengal already
calls Application::EnableConsoleOnly().

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 283ea290d04a..d7e63888a660 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -122,8 +122,8 @@ else
( \
$(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; 
do LO_TEST_LOCALE="$$l" ) \
$(if 
$(gb_CppunitTest_PREGDBTRACE),$(gb_CppunitTest_PREGDBTRACE) &&) \
-   $(gb_TEST_ENV_VARS) \
-   $(if $(gb_CppunitTest__vcl_no_svp),,SAL_USE_VCLPLUGIN=$(or 
$(SAL_USE_VCLPLUGIN),svp)) \
+   $(if $(gb_CppunitTest__vcl_no_svp), \
+   $(filter 
SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
$(EXTRA_ENV_VARS) \
$(if $(filter 
gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index ef8dcc65cee5..17569a626e6f 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -20,9 +20,6 @@ $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
RESPONSEFILE=$(call var2file,$(shell $(call 
gb_MKTEMP)),100,$(GALLERY_FILES)) && \
$(call gb_Helper_print_on_error,\
-   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if 
$(DISABLE_GUI),, \
-   SAL_USE_VCLPLUGIN=svp \
-   )) \
$(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \
--build-tree \
--destdir $(GALLERY_BASEDIR) \
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 6460f408410a..07bbf7f397d8 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -56,9 +56,6 @@ else
TestUserDir="$(call gb_Helper_make_url,$(dir $(call 
gb_PythonTest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=1 \
$(gb_TEST_ENV_VARS) \
-   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if 
$(DISABLE_GUI),, \
-   SAL_USE_VCLPLUGIN=svp \
-   )) \
$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) 
$(gb_CppunitTest_RR) \
$(gb_PythonTest_COMMAND) \
$(if 
$(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index d3946626ac69..858dfabba65e 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -70,9 +70,6 @@ else
TestUserDir="$(call gb_Helper_make_url,$(dir $(call 
gb_UITest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=0 \
$(gb_TEST_ENV_VARS) \
-   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if 
$(DISABLE_GUI),, \
-   SAL_USE_VCLPLUGIN=svp \
-   )) \
$(gb_UITest_COMMAND) \
--soffice="$(gb_UITest_SOFFICEARG)" \
--userdir=$(call gb_Helper_make_url,$(dir $(call 
gb_UITest_get_target,$*))user) \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 8760c4d69ca6..222742293e2d 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -248,6 +248,9 @@ gb_TEST_ENV_VARS := MAX_CONCURRENCY=4
 gb_TEST_ENV_VARS += MOZILLA_CERTIFICATE_FOLDER=0
 # Avoid hanging if the cups daemon requests a password:
 gb_TEST_ENV_VARS += SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1
+ifeq (,$(SAL_USE_VCLPLUGIN))
+gb_TEST_ENV_VARS += SAL_USE_VCLPLUGIN=svp
+endif
 
 # This is used to detect whether LibreOffice is being built (as opposed to 
building
 # 3rd-party code). Used for tag deprecation for API we want to
diff --git a/vcl/source/app/sal

[Libreoffice-commits] core.git: dbaccess/JunitTest_dbaccess_complex.mk solenv/gbuild svl/JunitTest_svl_complex.mk toolkit/JunitTest_toolkit_complex.mk

[Libreoffice Gerrit user]

 dbaccess/JunitTest_dbaccess_complex.mk |1 +
 solenv/gbuild/JunitTest.mk |1 -
 svl/JunitTest_svl_complex.mk   |1 +
 toolkit/JunitTest_toolkit_complex.mk   |1 -
 4 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 86f5f598a2bdd71f95921c20e0361dee54b266c1
Author: Jan-Marek Glogowski 
AuthorDate: Wed Dec 5 15:53:41 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 6 17:40:33 2018 +0100

Drop juh.jar dependency from Java UNO tests

Since upstream Java reverted the strict classpath checks, it's
not needed anymore.

See discussion in https://gerrit.libreoffice.org/#/c/63118 and
http://hg.openjdk.java.net/jdk-updates/jdk11u/rev/8513ac27b651

Change-Id: Iff863702b1aeda157c8e230ab36372a71dcfb4bb
Todo: tdf#121925
Reviewed-on: https://gerrit.libreoffice.org/64634
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/dbaccess/JunitTest_dbaccess_complex.mk 
b/dbaccess/JunitTest_dbaccess_complex.mk
index 947d9c3ab3c0..ba333cbf3b27 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_JunitTest_use_unoapi_jars,dbaccess_complex))
 
 $(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\
 ConnectivityTools \
+juh \
 ))
 
 $(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 7af730567d62..5a584e06895b 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -155,7 +155,6 @@ endef
 define gb_JunitTest_use_unoapi_jars
 $(eval $(call gb_JunitTest_use_jars,$(1),\
 OOoRunner \
-juh \
 jurt \
 ridl \
 test \
diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk
index 097cfad9b53f..eb28ac3af596 100644
--- a/svl/JunitTest_svl_complex.mk
+++ b/svl/JunitTest_svl_complex.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_JunitTest_use_unoapi_jars,svl_complex))
 
 $(eval $(call gb_JunitTest_use_jars,svl_complex,\
 ConnectivityTools \
+juh \
 ))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,svl_complex,\
diff --git a/toolkit/JunitTest_toolkit_complex.mk 
b/toolkit/JunitTest_toolkit_complex.mk
index 2c79bd0e40e3..6f9b069902ec 100644
--- a/toolkit/JunitTest_toolkit_complex.mk
+++ b/toolkit/JunitTest_toolkit_complex.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_JunitTest_JunitTest,toolkit_complex))
 
 $(eval $(call gb_JunitTest_use_jars,toolkit_complex,\
 OOoRunner \
-juh \
 ridl \
 test \
 unoil \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 solenv/flatpak-manifest.in |   12 
 1 file changed, 12 deletions(-)

New commits:
commit 3c015ddfb8096e2b7adc49e3e0ac67c6c0dfd9c0
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 12:02:32 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 17:36:06 2018 +0100

No need to bundle gst-libav in the flatpak any more

756c9f2317605e39d9cb058e650962acd2d81739 "Merge upstream fixes into
solenv/flatpak-manifest.in" had introduced it (via 

"For now, bundle gst-libav to be able to play mp4 videos in impress" to fix
 "Impress
don't insert a video" back when the LO flatpak was based on
org.gnome.Platform//3.26 which doesn't contain
/usr/lib/gstreamer-1.0/libgstlibav.so.  (And
/app/lib/gstreamer-1.0/libgstlibav.so is apparently the only file that the
gst-libav module contributes to the LO flatpak.)

When 727bfa2c87db170483c1e4ae895174295b070c77 "Merge in Flatpak 
improvements"
switched the runtime to org.freedesktop.Platform//1.6 (via
 "port to freedesktop.org 1.6 
runtime")
it kept the gst-libav module even though org.freedesktop.Platform//1.6 
contains
/usr/lib/gstreamer-1.0/libgstlibav.so.  Lets assume it was kept by accident 
and
can be removed.  (At least the scenario from  "Impress don't
insert a video" still works with this change.)

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index a3df66f8a207..94f996d4e194 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -32,18 +32,6 @@
 ]
 },
 {
-"name": "gst-libav",
-"config-opts": [ "--disable-gtk-doc", "--with-system-libav" ],
-"cleanup": [ "*.la", "/share/gtk-doc" ],
-"sources": [
-{
-"type" : "archive",
-"url" : 
"https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.5.tar.xz";,
-"sha256" : 
"e4d2f315f478d47281fbfdfbd590a63d23704ca37911d7142d5992616f4b28d3"
-}
-]
-},
-{
 "name": "gvfs",
 "cleanup": [ "/libexec/*", "/share/dbus-1/services/*", 
"/share/gvfs/mounts" ],
 "config-opts": [ "--disable-hal", "--disable-gdu", 
"--disable-gcr", "--disable-obexftp",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes from the UX/design meeting 2018-Dec-06

[Drew Jensen]

ah ok - once again I seem to be failing at understanding, I didn't notice
any of this till the email today and thought the patch was pending not that
it was already incorporated.
I was not attempting to comment on whether it was a good thing or not -
just that what I see in the UI using the tabbed bar makes reasonable sense
IMO. I just wanted to make sure to pay attention to the change for the
documentation work.



On Thu, Dec 6, 2018 at 11:12 AM Heiko Tietze  wrote:

> On 06.12.18 15:41, Drew Jensen wrote:
> > ...
> > My question Is; Will this change in menus to happen in the 6.2 release?
>
> Yes it is/was in 6.2 But I will revert the patch that disables
> header/footer by default and abort this menu change.
>
> ___
> 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

Re: Minutes from the UX/design meeting 2018-Dec-06

[Heiko Tietze]

On 06.12.18 15:41, Drew Jensen wrote:
> ...
> My question Is; Will this change in menus to happen in the 6.2 release?

Yes it is/was in 6.2 But I will revert the patch that disables header/footer by 
default and abort this menu change.



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

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

[Libreoffice Gerrit user]

 slideshow/source/engine/animationnodes/animationcommandnode.cxx |7 +--
 slideshow/source/engine/animationnodes/animationcommandnode.hxx |1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f820f6eb6036197bbb53e2d5e4bf4d5341ad280d
Author: Caolán McNamara 
AuthorDate: Thu Dec 6 13:19:57 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 6 16:44:56 2018 +0100

Resolves: tdf#121942 action deactivated twice

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

diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx 
b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
index 3bd05db936b2..1b764b1c5a4a 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
@@ -38,6 +38,7 @@ AnimationCommandNode::AnimationCommandNode( 
uno::Reference const& pParent,
  NodeContext const& rContext ) :
 BaseNode( xNode, pParent, rContext ),
+mbToggled(false),
 mpShape(),
 mxCommandNode( xNode, css::uno::UNO_QUERY_THROW )
 {
@@ -80,12 +81,13 @@ void AnimationCommandNode::activate_st()
 // the command toggles the pause status on a media object
 case EffectCommands::TOGGLEPAUSE:
 {
-if( mpShape )
+if (mpShape)
 {
 if( mpShape->isPlaying() )
 mpShape->pause();
 else
 mpShape->play();
+mbToggled = true;
 }
 break;
 }
@@ -115,12 +117,13 @@ void AnimationCommandNode::deactivate_st( NodeState 
/*eDestState*/ )
 // the command toggles the pause status on a media object
 case EffectCommands::TOGGLEPAUSE:
 {
-if( mpShape )
+if (mpShape && mbToggled)
 {
 if( mpShape->isPlaying() )
 mpShape->pause();
 else
 mpShape->play();
+mbToggled = false;
 }
 break;
 }
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx 
b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
index cf753e001949..1aacd1b6a071 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -50,6 +50,7 @@ private:
 virtual bool hasPendingAnimation() const override;
 
 private:
+bool mbToggled;
 IExternalMediaShapeBaseSharedPtr mpShape;
 css::uno::Reference mxCommandNode;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Jmux, Michael S, Kendy, Stephan, Heiko, Christian, Michael M,
  Thorsten, Olivier, Xisco, Eike 

* Completed Action Items:
+ fwd port experimental firebird migration patch to -6-2 (Xisco)

* Pending Action Items:
+ run certification script (Kendy)
  [ hope to have run for next time ]
+ add screenshot builder to basic build stats (Christian)
  [ still WIP] 

* Release Engineering update (Christian)
+ 6.2 Beta 2 – no request → skip  
+ 6.1.4 RC2
  + due next week tagging expected Tues.  
+ 6.2 RC 1 – Dec 17th
  + Late Features ?
 + donation infobar: merged to master & -6-2 (Heiko)
 + red-lining paragraph attribute re-work (Michael S)
+ trying to aim for UI freeze on Dec 17 for switching the 
default
+ preparing a back-port of parts already done to -6-2 branch
   + can merge this branch tomorrow
+ doing some testing / fixing of crashers from printing & 
formatting 
+ have a few more issues to fix
+ can we turn it out of experimental in master ? (Thorten)
   + then we get crash-testing – next week perhaps.
 + showstopper fixed for Notebookbar (Heiko)
+ https://bugs.documentfoundation.org/show_bug.cgi?id=103226
+ thanks to Mike K.
 + minor complaint wrt. single Chart save removal in calc (Heiko)
+ how to know ? - checkout release notes
+ Remotes
+ Android viewer
 + tinderbox off-line while it is updated to gcc7 baseline.
+ Online

* Documentation (Olivier)
+ New Help (nothing this week)
+ Help contents
+ pages fixes and refactor (A. Gelmini, erAck,
M. Kaganski, LibreOficiant, ohallot)
+ New help page on OpenPGP encryption (ohallot, bubli).
+ Guides
+ Team working in updating Calc Guide to 6.2

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
260(260) (topicUI) bugs open, 285(285) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added  9(1) 28(-4)58(2)  102(3)  
 commented 68(34)   168(7)424(37)1468(30) 
   removed  0(-5) 8(0)  8(0)   13(-1) 
  resolved  2(2)  5(-3)23(1)  113(-3) 
+ top 10 contributors:
  Tietze, Heiko made 114 changes in 1 month, and 551 changes in 1 year
  Xisco Faulí made 60 changes in 1 month, and 303 changes in 1 year
  Thomas Lendo made 50 changes in 1 month, and 342 changes in 1 year
  kompilainenn made 21 changes in 1 month, and 63 changes in 1 year
  Dieter Praas made 16 changes in 1 month, and 115 changes in 1 year
  Cor Nouws made 11 changes in 1 month, and 81 changes in 1 year
  himajin10 made 9 changes in 1 month, and 13 changes in 1 year
  Pedro made 9 changes in 1 month, and 64 changes in 1 year
  Henschel, Regina made 9 changes in 1 month, and 72 changes in 1 year
  Kainz, Andreas made 8 changes in 1 month, and 135 changes in 1 year
   + 11 new needsUXEval between Nov/29-Dec/06

   * Rework tab Header/Footer in dialogue Page style in Calc
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121777
   * Autocorrect: an option to avoid auto-capitalization of some words
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121779
   * Doesn't active menu item Insert->Headers and Footers in Calc 6.2
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121759
   * Table with no styles created by table picker differs from a table 
 with no styles created by insert table dialog
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121816
   * UI: Name of options section "HTML Compatibility" doesn't match 
 the wider scope of available options
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121837
   * The problem of drawing trapezoidal graphs
 + https://bugs.documentfoundation.org/show_bug.cgi?id=116672
   * Gutters
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121883
   * Horizontal table borders appear slightly fatter compared to 
 vertical lines and compared to previous versions
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121026
   * Unsaved changes to document indicator invisible
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121814
   => New/In discussion
   
   * UX - Simplify Page Border Menu & Provide Basic Cover Page Templates
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121864
   => Accepted
   
   * Tabbed UI in Windows does not get theme color - remains white.
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121877
   => Dup

* Crash Testing (Caolan)
+ 1 (+0) impor

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

[Libreoffice Gerrit user]

 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ef36747c186e53702e9857fddc5ddfd31b1c842b
Author: Michael Weghorn 
AuthorDate: Tue Dec 4 09:24:32 2018 +0100
Commit: Katarina Behrens 
CommitDate: Thu Dec 6 16:03:45 2018 +0100

tdf#121892 Guard Gtk3KDE5FilePicker::execute with SolarMutexGuard

Adhere to what gtk3's file picker does as well.
Threading is involved in Gtk3KDE5FilePickerIpc::execute().

Change-Id: I4fa0a12f46ed13ef04211cb8577e77d1db5e8eae
Reviewed-on: https://gerrit.libreoffice.org/64502
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 8dbe0af729c9e054135a0f41706165033441f867)
Reviewed-on: https://gerrit.libreoffice.org/64585
Reviewed-by: Katarina Behrens 

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index 919328dd9d6c..8006bc37c7dc 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -94,7 +94,11 @@ void SAL_CALL Gtk3KDE5FilePicker::setTitle(const OUString& 
title)
 m_ipc.sendCommand(Commands::SetTitle, title);
 }
 
-sal_Int16 SAL_CALL Gtk3KDE5FilePicker::execute() { return m_ipc.execute(); }
+sal_Int16 SAL_CALL Gtk3KDE5FilePicker::execute()
+{
+SolarMutexGuard g;
+return m_ipc.execute();
+}
 
 void SAL_CALL Gtk3KDE5FilePicker::setMultiSelectionMode(sal_Bool multiSelect)
 {
___
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' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ec01cd7a2263922f2aaab6bee8aa826fb67cc7ea
Author: Michael Weghorn 
AuthorDate: Tue Dec 4 09:24:32 2018 +0100
Commit: Katarina Behrens 
CommitDate: Thu Dec 6 16:03:29 2018 +0100

tdf#121892 Guard Gtk3KDE5FilePicker::execute with SolarMutexGuard

Adhere to what gtk3's file picker does as well.
Threading is involved in Gtk3KDE5FilePickerIpc::execute().

Change-Id: I4fa0a12f46ed13ef04211cb8577e77d1db5e8eae
Reviewed-on: https://gerrit.libreoffice.org/64502
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 8dbe0af729c9e054135a0f41706165033441f867)
Reviewed-on: https://gerrit.libreoffice.org/64586
Reviewed-by: Katarina Behrens 

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index 919328dd9d6c..8006bc37c7dc 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -94,7 +94,11 @@ void SAL_CALL Gtk3KDE5FilePicker::setTitle(const OUString& 
title)
 m_ipc.sendCommand(Commands::SetTitle, title);
 }
 
-sal_Int16 SAL_CALL Gtk3KDE5FilePicker::execute() { return m_ipc.execute(); }
+sal_Int16 SAL_CALL Gtk3KDE5FilePicker::execute()
+{
+SolarMutexGuard g;
+return m_ipc.execute();
+}
 
 void SAL_CALL Gtk3KDE5FilePicker::setMultiSelectionMode(sal_Bool multiSelect)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 AllLangHelp_shared.mk|1 
 source/auxiliary/shared.tree |2 
 source/text/shared/01/0107.xhp   |   43 ++-
 source/text/shared/guide/cmis-remote-files-setup.xhp |9 -
 source/text/shared/guide/digital_signatures.xhp  |1 
 source/text/shared/guide/openpgp.xhp |  104 +++
 source/text/shared/optionen/01010100.xhp |   16 ++
 source/text/shared/optionen/01010600.xhp |   10 -
 8 files changed, 136 insertions(+), 50 deletions(-)

New commits:
commit fe0a1e4dbf6de65be1820553fba7b7e215013f85
Author: Olivier Hallot 
AuthorDate: Sun Dec 2 22:46:19 2018 -0200
Commit: Katarina Behrens 
CommitDate: Thu Dec 6 15:42:13 2018 +0100

tdf#116078 OpenPGP encryption

+ some update (drop) references to LO file picker

Addressed comments by reviewer.
fix ordered list

Fixed reviewer comment.
Fixed DTD violations

Change-Id: Ie71f736a5713b042e185e93e595b6880ffe7541c
Reviewed-on: https://gerrit.libreoffice.org/64436
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 6d87868ef..b0259809d 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -689,6 +689,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/guide/navigator_setcursor \
 helpcontent2/source/text/shared/guide/navpane_on \
 helpcontent2/source/text/shared/guide/numbering_stop \
+helpcontent2/source/text/shared/guide/openpgp \
 helpcontent2/source/text/shared/guide/pageformat_max \
 helpcontent2/source/text/shared/guide/paintbrush \
 helpcontent2/source/text/shared/guide/pasting \
diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree
index b5722fc1c..de91edac3 100644
--- a/source/auxiliary/shared.tree
+++ b/source/auxiliary/shared.tree
@@ -113,6 +113,7 @@
 Signing Existing PDFs
 Adding Signature Lines in 
Text Documents
 Signing Signature Lines in 
Text Documents
+Encrypting Documents with 
OpenPGP
 

 Printing Address 
Labels
@@ -145,6 +146,7 @@
 Saving Documents 
Automatically
 Saving Documents in Other 
Formats
 Importing and 
Exporting Data in Text Format
+Encrypting Documents with 
OpenPGP


 Inserting 
Hyperlinks
diff --git a/source/text/shared/01/0107.xhp 
b/source/text/shared/01/0107.xhp
index 78e131f50..c1e0b221f 100644
--- a/source/text/shared/01/0107.xhp
+++ b/source/text/shared/01/0107.xhp
@@ -41,40 +41,11 @@
 
   
 
-The following 
sections describe the %PRODUCTNAME Save 
as dialog. To activate the %PRODUCTNAME 
Open and Save dialog boxes, choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME- General, and then select the 
Use %PRODUCTNAME dialogs in the Open/Save dialogs 
area.
+%PRODUCTNAME uses the 
native file picker dialog of the window manager of your operating system for 
the Save as command.
+
 To save a document 
as a template, use the command File - Templates - Save As 
Template.
-
-
-Connect 
To Server
-Opens a dialog where you can set up connection to various types of 
servers, including WebDAV, FTP, SSH, Windows Share and CMIS.
-
-
-Up One 
Level
-
-Move up one folder in the folder hierarchy. 
Long-click to see the higher level folders.UFI: still a 
long-click
-
-
-Create New Folder
-
-Creates a new folder.
-
-
 
-
-
-Places 
area
-Displays "favourite" places, i.e. shortcuts to local or remote 
locations.
-
-
-
-
-Display 
area
-
-Displays the files and folders in the folder that you are 
in.
-
-
-
-
+
 File 
name
 
 Enter a file name or a path for the file. You can also enter a URL
@@ -86,10 +57,12 @@
 
 Select the file format for the document that you are saving. In 
the display area, only the documents with this file type are displayed. File 
types are described in Information on Import and 
Export Filters.
 
+
 
 
 Always save your 
document in a %PRODUCTNAME file type before 
saving it to an external file type. When you export to an external file type, 
some formatting features may be lost.
 
+
 
 
 Save
@@ -101,11 +74,17 @@
 Protects the file with a password that 
must be entered before a user can open the file.
 Only documents 
using the %PRODUCTNAME XML-based format can be 
saved with a password.
 removed autoextension, i82752
+
+Encrypt with GPG key
+Use 
OpenPGP public keys to encrypt documents.
+
 Edit filter settings
 Allows you to set the spreadsheet saving 
options for some types of data files.UFI: had to change text 
and remove Calc switch because switch did not work 
correctly
+
 Selection
 Exports only the selected graphic objects in %PRODUCTNAME Draw and Impress to another format. If 
this box is not checked, the entire document is exported.
 If you are 
exporting to any document file type, 

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit b3d0b00f76dc851bc699742af19aee2340012026
Author: Olivier Hallot 
AuthorDate: Sun Dec 2 22:46:19 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Thu Dec 6 15:42:13 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#116078 OpenPGP encryption

+ some update (drop) references to LO file picker

Addressed comments by reviewer.
fix ordered list

Fixed reviewer comment.
Fixed DTD violations

Change-Id: Ie71f736a5713b042e185e93e595b6880ffe7541c
Reviewed-on: https://gerrit.libreoffice.org/64436
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/helpcontent2 b/helpcontent2
index 8e718f78ec45..fe0a1e4dbf6d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8e718f78ec456aa228240da579780391b51e8d9a
+Subproject commit fe0a1e4dbf6de65be1820553fba7b7e215013f85
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes from the UX/design meeting 2018-Dec-06

[Drew Jensen]

I was just now looking at this using the tabbed notebook interface (though
I'm running the 6.3Alpha0 build, so maybe there is some difference there
from 6.2) and I see that the different places where the header/footer
dialog is available already enables or disables depending on what was
selected in the page format dialog.  Given that the page format button is
next to the header/footer button it becomes a visual clue that when you
disable them in the page format dialog and return to the main window the
h/f dialog button is immediately disabled.

Plus it is good to see that both the page format and header/footer dialog
is available during print preview, which is where one can notice that it is
or isn't there, right.

My question Is; Will this change in menus to happen in the 6.2 release?

Thanks and best wishes,

Drew


On Thu, Dec 6, 2018 at 9:27 AM Samuel Mehrbrodt 
wrote:

> Am 06.12.2018 um 15:12 schrieb Heiko Tietze:
> > Please comment on BZ
> https://bugs.documentfoundation.org/show_bug.cgi?id=121759;
>
> I already commented a week ago:
> https://bugs.documentfoundation.org/show_bug.cgi?id=121759#c6
>
> >   so far there is no other opinion and yours would be 1 against 2.
> Since when is this decided by votes?
>
> I tried to do what you are doing (disable header and footer by default
> in Calc) some time ago, but I came to the conclusion that there needs to
> be some serious UX improvements before we can do that.
> Joe Average will not know how to enable them (that he has to go to
> Format->Page to enable them).
>
> If you want to disable headers and footers by default, you need to
>
> 1) Always enable the Insert->Header/Footer menu entry
> 2) Add an option to enable Header/Footer to the Header/Footer dialog
>
> or something similiar.
>
> Regards
> Samuel
> ___
> 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] online.git: ios/Mobile

[Libreoffice Gerrit user]

 ios/Mobile/Base.lproj/Main.storyboard |   22 +++---
 ios/Mobile/Resources/Templates/Blank (A4).ott.png |binary
 ios/Mobile/Resources/Templates/Blank (widescreen).otp.png |binary
 ios/Mobile/Resources/Templates/Blank.otp.png  |binary
 ios/Mobile/Resources/Templates/Blank.ots.png  |binary
 ios/Mobile/TemplateCollectionViewController.mm|7 +++-
 6 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 8b106eb3127ed49a5af825826df0aad2af9603b0
Author: Tor Lillqvist 
AuthorDate: Thu Dec 6 16:33:39 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 6 16:38:50 2018 +0200

Look for thumbnails of the templates and show them in the template browser

Add such thumbnails. Rename the presentation templates to not have
colons in their name, as that seems to be problematic for macOS and/or
iOS, sigh. (Shadows of pre-OS X MacOS, where the coln was the path
component separator, not the slash.)

Hack on the storyboard scene for the template browser. More work is
needed there; the thumbnails aren't scaled down for some reason. I
need to make sure the aspect ratio is maintained, too. Maybe to get it
to look like I want I need to do some coding and not just tweak the
storyboard in the Xcode UI designer, sigh.

Change-Id: I959d051352c2f033c8563188155af5281961c7d8

diff --git a/ios/Mobile/Base.lproj/Main.storyboard 
b/ios/Mobile/Base.lproj/Main.storyboard
index ed8b0784b..64685855d 100644
--- a/ios/Mobile/Base.lproj/Main.storyboard
+++ b/ios/Mobile/Base.lproj/Main.storyboard
@@ -47,7 +47,7 @@
 
 
 
-
+
 
 
 
@@ -56,28 +56,28 @@
 
 
 
-
-
+
+
 
-
+
 
 
 
-
+
 
-
+
 
 
 
-
+
 
 
 
 
-
-
+
+
 
-
+
 
 
 
@@ -88,7 +88,7 @@
 
 
 
-
+
 
 
 
diff --git a/ios/Mobile/Resources/Templates/Blank A4.ott 
b/ios/Mobile/Resources/Templates/Blank (A4).ott
similarity index 100%
rename from ios/Mobile/Resources/Templates/Blank A4.ott
rename to ios/Mobile/Resources/Templates/Blank (A4).ott
diff --git a/ios/Mobile/Resources/Templates/Blank (A4).ott.png 
b/ios/Mobile/Resources/Templates/Blank (A4).ott.png
new file mode 100644
index 0..055df5e94
Binary files /dev/null and b/ios/Mobile/Resources/Templates/Blank (A4).ott.png 
differ
diff --git a/ios/Mobile/Resources/Templates/Blank 16:9.otp 
b/ios/Mobile/Resources/Templates/Blank (widescreen).otp
similarity index 100%
rename from ios/Mobile/Resources/Templates/Blank 16:9.otp
rename to ios/Mobile/Resources/Templates/Blank (widescreen).otp
diff --git a/ios/Mobile/Resources/Templates/Blank (widescreen).otp.png 
b/ios/Mobile/Resources/Templates/Blank (widescreen).otp.png
new file mode 100644
index 0..e4e7254f2
Binary files /dev/null and b/ios/Mobile/Resources/Templates/Blank 
(widescreen).otp.png differ
diff --git a/ios/Mobile/Resources/Templates/Blank 4:3.otp 
b/ios/Mobile/Resources/Templates/Blank.otp
similarity index 100%
rename from ios/Mobile/Resources/Templates/Blank 4:3.otp
rename to ios/Mobile/Resources/Templates/Blank.otp
diff --git a/ios/Mobile/Resources/Templates/Blank.otp.png 
b/ios/Mobile/Resources/Templates/Blank.otp.png
new file mode 100644
index 0..da2dc775c
Binary file

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

[Libreoffice Gerrit user]

 sc/source/core/opencl/op_math.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b6dbe0abef3e73f0f5c06073ccb8338831bf0522
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 12:58:11 2018 +0100
Commit: Luboš Luňák 
CommitDate: Thu Dec 6 15:35:55 2018 +0100

OpenCL SQRT() error checking

Change-Id: I6208cf21f53d1a2a0eb4f08962c7bddcc372aab5
Reviewed-on: https://gerrit.libreoffice.org/64545
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 581c7e4a0ec50aaa13112985c7e79cd66628f997)
Reviewed-on: https://gerrit.libreoffice.org/64612

diff --git a/sc/source/core/opencl/op_math.cxx 
b/sc/source/core/opencl/op_math.cxx
index ec4a75daa9eb..41e6a5818166 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -1277,6 +1277,10 @@ void OpSqrt::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "arg0=";
 ss << tmpCur->GetDouble() << ";\n";
 }
+else
+{
+throw Unhandled( __FILE__, __LINE__ );
+}
 }
 else
 {
@@ -1284,6 +1288,8 @@ void OpSqrt::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << vSubArguments[0]->GenSlidingWindowDeclRef();
 ss << ";\n";
 }
+ss << "if( arg0 < 0 )\n";
+ss << "return CreateDoubleError(IllegalArgument);\n";
 ss << "return sqrt(arg0);\n";
 ss << "}";
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/opencl/formulagroupcl.cxx |   91 ---
 1 file changed, 85 insertions(+), 6 deletions(-)

New commits:
commit e484c02516719f7ef378c304305b857d78ab9b62
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 16:45:14 2018 +0100
Commit: Luboš Luňák 
CommitDate: Thu Dec 6 15:36:05 2018 +0100

print also contents of OpenCL buffers in debug output

Specifically, the input arguments of the run programs and the results
buffer. This should make it much simpler to check if an OpenCL program
works correctly.

Change-Id: I0667082bf9a88757c8bda0c7ed54e2fc918534d7
Reviewed-on: https://gerrit.libreoffice.org/64547
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 8676a300ca16..cef9a82399d7 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -175,6 +175,84 @@ bool AllStringsAreNull(const rtl_uString* const* 
pStringArray, size_t nLength)
 return true;
 }
 
+OUString LimitedString( const OUString& str )
+{
+if( str.getLength() < 20 )
+return "\"" + str + "\"";
+else
+return "\"" + str.copy( 0, 20 ) + "\"...";
+}
+
+// Returns formatted contents of the data (possibly shortened), to be used in 
debug output.
+OUString DebugPeekData(const FormulaToken* ref, int doubleRefIndex = 0)
+{
+if (ref->GetType() == formula::svSingleVectorRef)
+{
+const formula::SingleVectorRefToken* pSVR =
+static_cast(ref);
+OUStringBuffer buf = "SingleRef {";
+for( size_t i = 0; i < std::min< size_t >( 4, pSVR->GetArrayLength()); 
++i )
+{
+if( i != 0 )
+buf.append( "," );
+if( pSVR->GetArray().mpNumericArray != nullptr )
+buf.append( pSVR->GetArray().mpNumericArray[ i ] );
+else if( pSVR->GetArray().mpStringArray != nullptr )
+buf.append( LimitedString( OUString( 
pSVR->GetArray().mpStringArray[ i ] )));
+}
+if( pSVR->GetArrayLength() > 4 )
+buf.append( ",..." );
+buf.append( "}" );
+return buf.makeStringAndClear();
+}
+else if (ref->GetType() == formula::svDoubleVectorRef)
+{
+const formula::DoubleVectorRefToken* pDVR =
+static_cast(ref);
+OUStringBuffer buf = "DoubleRef {";
+for( size_t i = 0; i < std::min< size_t >( 4, pDVR->GetArrayLength()); 
++i )
+{
+if( i != 0 )
+buf.append( "," );
+if( pDVR->GetArrays()[doubleRefIndex].mpNumericArray != nullptr )
+buf.append( pDVR->GetArrays()[doubleRefIndex].mpNumericArray[ 
i ] );
+else if( pDVR->GetArrays()[doubleRefIndex].mpStringArray != 
nullptr )
+buf.append( LimitedString( OUString( 
pDVR->GetArrays()[doubleRefIndex].mpStringArray[ i ] )));
+}
+if( pDVR->GetArrayLength() > 4 )
+buf.append( ",..." );
+buf.append( "}" );
+return buf.makeStringAndClear();
+}
+else if (ref->GetType() == formula::svString)
+{
+return "String " + LimitedString( ref->GetString().getString());
+}
+else if (ref->GetType() == formula::svDouble)
+{
+return OUString::number(ref->GetDouble());
+}
+else
+{
+return "?";
+}
+}
+
+// Returns formatted contents of a doubles buffer, to be used in debug output.
+OUString DebugPeekDoubles(const double* data, int size)
+{
+OUStringBuffer buf = "{";
+for( int i = 0; i < std::min( 4, size ); ++i )
+{
+if( i != 0 )
+buf.append( "," );
+buf.append( data[ i ] );
+}
+if( size > 4 )
+buf.append( ",..." );
+buf.append( "}" );
+return buf.makeStringAndClear();
+}
 
 } // anonymous namespace
 
@@ -250,7 +328,7 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int, 
cl_program )
 SAL_WARN("sc.opencl", "clEnqueueUnmapMemObject failed: " << 
openclwrapper::errorString(err));
 }
 
-SAL_INFO("sc.opencl", "Kernel " << k << " arg " << argno << ": cl_mem: " 
<< mpClmem);
+SAL_INFO("sc.opencl", "Kernel " << k << " arg " << argno << ": cl_mem: " 
<< mpClmem << " (" << DebugPeekData(ref, mnIndex) << ")");
 err = clSetKernelArg(k, argno, sizeof(cl_mem), 
static_cast(&mpClmem));
 if (CL_SUCCESS != err)
 throw OpenCLError("clSetKernelArg", err, __FILE__, __LINE__);
@@ -313,7 +391,7 @@ public:
 hashCode = s.hashCode();
 
 // Pass the scalar result back to the rest of the formula kernel
-SAL_INFO("sc.opencl", "Kernel " << k << " arg " << argno << ": 
cl_uint: " << hashCode);
+SAL_INFO("sc.opencl", "Kernel " << k << " arg " << argno << ": 
cl_uint: " << hashCode << "(" << DebugPeekData(ref) << ")" );
 cl_int err = clSetKernelArg(k, argno, sizeof(cl_uint), 
static_cast(&hashCode));
 if (C

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

[Libreoffice Gerrit user]

 vcl/source/gdi/sallayout.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8e409fb74b23c053effda4c892624548acc68903
Author: Caolán McNamara 
AuthorDate: Thu Dec 6 10:35:05 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 6 15:29:23 2018 +0100

Resolves: tdf#121936 uninitialized value used

since...

commit e194f597ae5882e1cda2cac2925577fff609f101
Date:   Sun Sep 30 16:07:16 2018 +0200

Change GlyphItem::nFallbackLevel to font instance

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

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 4cbca56d9b70..d49ad0430cfa 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -894,7 +894,7 @@ sal_Int32 GenericSalLayout::GetTextBreak( DeviceCoordinate 
nMaxWidth, DeviceCoor
 
 bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph,
 Point& rPos, int& nStart,
-const PhysicalFontFace**, int* const) const
+const PhysicalFontFace**, int* const 
pFallbackLevel) const
 {
 std::vector::const_iterator pGlyphIter = 
m_GlyphItems.Impl()->begin();
 std::vector::const_iterator pGlyphIterEnd = 
m_GlyphItems.Impl()->end();
@@ -917,6 +917,8 @@ bool GenericSalLayout::GetNextGlyph(const GlyphItem** 
pGlyph,
 
 // update return data with glyph info
 *pGlyph = &(*pGlyphIter);
+if (pFallbackLevel)
+*pFallbackLevel = 0;
 ++nStart;
 
 // calculate absolute position in pixel units
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes from the UX/design meeting 2018-Dec-06

[Samuel Mehrbrodt]

Am 06.12.2018 um 15:12 schrieb Heiko Tietze:

Please comment on BZ https://bugs.documentfoundation.org/show_bug.cgi?id=121759;


I already commented a week ago: 
https://bugs.documentfoundation.org/show_bug.cgi?id=121759#c6



  so far there is no other opinion and yours would be 1 against 2.

Since when is this decided by votes?

I tried to do what you are doing (disable header and footer by default 
in Calc) some time ago, but I came to the conclusion that there needs to 
be some serious UX improvements before we can do that.
Joe Average will not know how to enable them (that he has to go to 
Format->Page to enable them).


If you want to disable headers and footers by default, you need to

1) Always enable the Insert->Header/Footer menu entry
2) Add an option to enable Header/Footer to the Header/Footer dialog

or something similiar.

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

Re: Minutes from the UX/design meeting 2018-Dec-06

[Heiko Tietze]

On 06.12.18 14:44, Samuel Mehrbrodt wrote:
> Please don't move this again. It has just been moved to the Insert menu a few 
> releases ago. This will make users (and documentation writers) despair.
> 
> Moving it also doesn't fix the problem that the menu entry is disabled and 
> there is no hint how to enable it.

Please comment on BZ 
https://bugs.documentfoundation.org/show_bug.cgi?id=121759; so far there is no 
other opinion and yours would be 1 against 2. The patch is here 
https://gerrit.libreoffice.org/#/c/64712/



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

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

[Libreoffice Gerrit user]

 sw/source/ui/fldui/DropDownFieldDialog.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 67806532c397d7fc7ea93224a020f1f734c04077
Author: Caolán McNamara 
AuthorDate: Thu Dec 6 11:00:47 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 6 15:09:50 2018 +0100

Resolves: tdf#114144 let double click advance to next if 'next' exists

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

diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx 
b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 7bec262b6338..5ccead9f8504 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -134,6 +134,9 @@ IMPL_LINK_NOARG(sw::DropDownFieldDialog, NextHdl, 
weld::Button&, void)
 
 IMPL_LINK_NOARG(sw::DropDownFieldDialog, DoubleClickHdl, weld::TreeView&, void)
 {
+// tdf#114144, when next is available make double-click accept and go to 
next field
+if (m_xNextPB->get_visible() && m_xNextPB->get_sensitive())
+m_pPressedButton = m_xNextPB.get();
 m_xDialog->response(RET_OK);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/gdi/sallayout.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1c4810f804e19d2246f6976cdfdb54e474194843
Author: Caolán McNamara 
AuthorDate: Thu Dec 6 10:35:05 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 6 15:10:28 2018 +0100

Resolves: tdf#121936 uninitialized value used

since...

commit e194f597ae5882e1cda2cac2925577fff609f101
Date:   Sun Sep 30 16:07:16 2018 +0200

Change GlyphItem::nFallbackLevel to font instance

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

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 0fea93f90ee3..aad45b39e73e 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -892,7 +892,7 @@ sal_Int32 GenericSalLayout::GetTextBreak( DeviceCoordinate 
nMaxWidth, DeviceCoor
 
 bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph,
 Point& rPos, int& nStart,
-const PhysicalFontFace**, int* const) const
+const PhysicalFontFace**, int* const 
pFallbackLevel) const
 {
 std::vector::const_iterator pGlyphIter = 
m_GlyphItems.Impl()->begin();
 std::vector::const_iterator pGlyphIterEnd = 
m_GlyphItems.Impl()->end();
@@ -915,6 +915,8 @@ bool GenericSalLayout::GetNextGlyph(const GlyphItem** 
pGlyph,
 
 // update return data with glyph info
 *pGlyph = &(*pGlyphIter);
+if (pFallbackLevel)
+*pFallbackLevel = 0;
 ++nStart;
 
 // calculate absolute position in pixel units
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes from the UX/design meeting 2018-Dec-06

[Samuel Mehrbrodt]

Am 06.12.2018 um 14:41 schrieb Heiko Tietze:

  * Doesn't active menu item Insert->Headers and Footers in Calc 6.2
+https://bugs.documentfoundation.org/show_bug.cgi?id=121759
+ WFM/Move menu item
=> Assigned to Heiko
Please don't move this again. It has just been moved to the Insert menu 
a few releases ago. This will make users (and documentation writers) 
despair.


Moving it also doesn't fix the problem that the menu entry is disabled 
and there is no hint how to enable it.


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

Minutes from the UX/design meeting 2018-Dec-06

[Heiko Tietze]

Present: Franklin, Heiko

Tickets 

 * Selection box should include a grid guide
   + https://bugs.documentfoundation.org/show_bug.cgi?id=120992
   + dont see a use case (Heiko)
   => WF

 * Validity / List (Enhancement Request - Global Updates / Autofill specific to 
Data List
   + https://bugs.documentfoundation.org/show_bug.cgi?id=118100
   + totally unclear
   => WFM (@Cor: up to you to set it)

 * Doesn't active menu item Insert->Headers and Footers in Calc 6.2
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121759
   + WFM/Move menu item
   => Assigned to Heiko

 * Autocorrect: an option to avoid auto-capitalization of some words (eg,. mRNA)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121779
   + merge lists and have only one exception for all?
   => needsDevAdvice

 * Rework tab Header/Footer in dialogue Page style in Calc
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121777
   + looks good but low priority as users understand the two dialogs today 
(Franklin)
   => accepted





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 'libreoffice-6-2' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/fldui/DropDownFieldDialog.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b4b213dc088fddbf4c2e34350828354e9262e4fa
Author: Caolán McNamara 
AuthorDate: Thu Dec 6 11:00:47 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 6 14:22:03 2018 +0100

Resolves: tdf#114144 let double click advance to next if 'next' exists

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

diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx 
b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 7bec262b6338..5ccead9f8504 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -134,6 +134,9 @@ IMPL_LINK_NOARG(sw::DropDownFieldDialog, NextHdl, 
weld::Button&, void)
 
 IMPL_LINK_NOARG(sw::DropDownFieldDialog, DoubleClickHdl, weld::TreeView&, void)
 {
+// tdf#114144, when next is available make double-click accept and go to 
next field
+if (m_xNextPB->get_visible() && m_xNextPB->get_sensitive())
+m_pPressedButton = m_xNextPB.get();
 m_xDialog->response(RET_OK);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/osx/HtmlFmtFlt.cxx |2 +-
 vcl/osx/salframe.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cead2273b0d07e32b4e6fc7a2f11a0dd216847dc
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 14:21:04 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 14:21:04 2018 +0100

loplugin:unnecessaryparen

Change-Id: Id951b94240b487f8c8cc3f612906d4b2e0bfd76d

diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index 1cd679c2e8d3..6661d0e6fdde 100644
--- a/vcl/osx/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
@@ -149,7 +149,7 @@ Sequence HTMLFormatToTextHtml(const 
Sequence& aHTMLFormat)
can improve this
 */
 const char HtmlFormatStart[] = "Version:";
-int const HtmlFormatStartLen = (sizeof(HtmlFormatStart) - 1);
+int const HtmlFormatStartLen = sizeof(HtmlFormatStart) - 1;
 
 bool isHTMLFormat(const Sequence& aHtmlSequence)
 {
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 2a8eeb0b0af1..3a6cabbc41d2 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -321,7 +321,7 @@ void AquaSalFrame::SetTitle(const OUString& rTitle)
 [mpNSWindow setTitle: pTitle];
 
 // create an entry in the dock menu
-const SalFrameStyleFlags nAppWindowStyle = (SalFrameStyleFlags::CLOSEABLE 
| SalFrameStyleFlags::MOVEABLE);
+const SalFrameStyleFlags nAppWindowStyle = SalFrameStyleFlags::CLOSEABLE | 
SalFrameStyleFlags::MOVEABLE;
 if( mpParent == nullptr &&
 (mnStyle & nAppWindowStyle) == nAppWindowStyle )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/app/svapp.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b301dcc711636533d0d8dade7fbb1decb058e18b
Author: Tor Lillqvist 
AuthorDate: Thu Dec 6 15:05:43 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Dec 6 15:15:38 2018 +0200

Don't fail assertion when setting the dialog cancel mode to its current 
value

Change-Id: Ie9d78346bb104734fddeb27ff0414b4c7ef64ae9

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 40ff79b7d70f..f4d2080849de 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1438,9 +1438,11 @@ const LocaleDataWrapper& 
Application::GetAppLocaleDataWrapper()
 
 void Application::EnableHeadlessMode( bool dialogsAreFatal )
 {
-assert(GetDialogCancelMode() == DialogCancelMode::Off);
-SetDialogCancelMode(
-dialogsAreFatal ? DialogCancelMode::Fatal : DialogCancelMode::Silent );
+DialogCancelMode eNewMode = dialogsAreFatal ? DialogCancelMode::Fatal : 
DialogCancelMode::Silent;
+DialogCancelMode eOldMode = GetDialogCancelMode();
+assert(eOldMode == DialogCancelMode::Off || GetDialogCancelMode() == 
eNewMode);
+if (eOldMode != eNewMode)
+SetDialogCancelMode( eNewMode );
 }
 
 bool Application::IsHeadlessModeEnabled()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sdext/source/presenter/PresenterWindowManager.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c8d4253f8637e31bf0823ecadc00f97c8d416039
Author: Stephan Bergmann 
AuthorDate: Thu Dec 6 14:01:54 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 14:01:54 2018 +0100

-Werror,-Wunused-variable

Change-Id: I8c59f7aa0cde22468c9451f7d910cf0106138fd7

diff --git a/sdext/source/presenter/PresenterWindowManager.cxx 
b/sdext/source/presenter/PresenterWindowManager.cxx
index dcfa6664e74f..212e0da6d4c6 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -1000,7 +1000,6 @@ Reference 
PresenterWindowManager::CreateClipPolyPolyg
 ::std::vector aRectangles;
 aRectangles.reserve(1+nPaneCount);
 aRectangles.push_back(mxParentWindow->getPosSize());
-PresenterPaneContainer::PaneList::const_iterator iPane;
 for (const auto& pDescriptor : mpPaneContainer->maPanes)
 {
 if ( ! pDescriptor->mbIsActive)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 fpicker/source/win32/VistaFilePickerImpl.cxx |   22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

New commits:
commit f553e34aff94fd9bce9cce77e0a723021be7c38a
Author: Mike Kaganski 
AuthorDate: Thu Dec 6 01:32:35 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 6 13:50:42 2018 +0100

tdf#119747 FileSaveDialog: remove duplicate extension on Windows

This properly reimplements the fix, only changing the display strings
sent to native dialog, and never modifying the filter names as seen
by LibreOffice code.

Change-Id: Iee5f09acd6b12c0ba8b7568b16f8ab07821006ee
Reviewed-on: https://gerrit.libreoffice.org/64656
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
Reviewed-by: Thorsten Behrens 
Reviewed-by: Mike Kaganski 

diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index ff0cf2c27956..6c168a244fa0 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -147,8 +147,17 @@ bailout:
 return sURL;
 }
 
+// Vista file picker shows the filter mask next to filter name in the list; so 
we need to remove the
+// mask from the filter name to avoid duplicating masks
+static OUString lcl_AdjustFilterName(const OUString& sName)
+{
+const sal_Int32 idx = sName.indexOf("(.");
+return (idx > 0) ? sName.copy(0, idx).trim() : sName;
+}
 
-static ::std::vector< COMDLG_FILTERSPEC > 
lcl_buildFilterList(CFilterContainer& rContainer)
+// rvStrings holds the OUStrings, pointers to which data are stored in 
returned COMDLG_FILTERSPEC
+static ::std::vector lcl_buildFilterList(CFilterContainer& 
rContainer,
+
std::vector& rvStrings)
 {
   ::std::vector< COMDLG_FILTERSPEC > lList  ;
   CFilterContainer::FILTER_ENTRY_T   aFilter;
@@ -158,7 +167,8 @@ static ::std::vector< COMDLG_FILTERSPEC > 
lcl_buildFilterList(CFilterContainer&
 {
 COMDLG_FILTERSPEC aSpec;
 
-aSpec.pszName = o3tl::toW(aFilter.first.getStr()) ;
+rvStrings.push_back(lcl_AdjustFilterName(aFilter.first)); // to avoid 
dangling pointer
+aSpec.pszName = o3tl::toW(rvStrings.back().getStr());
 aSpec.pszSpec = o3tl::toW(aFilter.second.getStr());
 
 lList.push_back(aSpec);
@@ -824,7 +834,9 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()
 // SYNCHRONIZED->
 ::osl::ResettableMutexGuard aLock(m_aMutex);
 
-::std::vector< COMDLG_FILTERSPEC > lFilters   = 
lcl_buildFilterList(m_lFilters);
+std::vector vStrings; // to hold the adjusted filter names, 
pointers to which will be
+// stored in lFilters
+::std::vector< COMDLG_FILTERSPEC > lFilters   = 
lcl_buildFilterList(m_lFilters, vStrings);
 OUStringsCurrentFilter = m_lFilters.getCurrentFilter();
 sal_Int32  nCurrentFilter = 
m_lFilters.getFilterPos(sCurrentFilter);
 TFileDialogiDialog= 
impl_getBaseDialogInterface();
@@ -991,7 +1003,9 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const 
RequestRef& rRequest)
 {
 // COM dialog base on 1 ... filter container on 0 .-)
 ::size_t nRealIndex = (nFileType-1);
-::std::vector< COMDLG_FILTERSPEC > lFilters = 
lcl_buildFilterList(m_lFilters);
+std::vector vStrings;
+::std::vector lFilters
+= lcl_buildFilterList(m_lFilters, vStrings);
 if ( nRealIndex < lFilters.size() )
 {
 PCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 fpicker/source/win32/VistaFilePicker.cxx |2 -
 fpicker/source/win32/VistaFilePickerImpl.cxx |   39 +++
 fpicker/source/win32/VistaFilePickerImpl.hxx |2 -
 3 files changed, 6 insertions(+), 37 deletions(-)

New commits:
commit 38a47bc3a4f618da4613968d28c08c8dda064cea
Author: Mike Kaganski 
AuthorDate: Thu Dec 6 00:57:38 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 6 13:50:15 2018 +0100

Revert "tdf#119747 FileSaveDialog: Windows dialog shows only one extension."

This reverts commit 1b50fa88b148739a7b192ba70f08af2c6e326fd2.

Change-Id: Ide94c1be6a265cee2e70c319578d816efa1d2eb9
Reviewed-on: https://gerrit.libreoffice.org/64655
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/fpicker/source/win32/VistaFilePicker.cxx 
b/fpicker/source/win32/VistaFilePicker.cxx
index e1eb66a9ce83..0737100d07e6 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -119,7 +119,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& 
sTitle ,
 {
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle );
 rRequest->setArgument(PROP_FILTER_VALUE, sFilter);
 
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::NON_BLOCKED);
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index aa33dcdacbdb..ff0cf2c27956 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -360,22 +360,11 @@ void VistaFilePickerImpl::impl_sta_appendFilter(const 
RequestRef& rRequest)
 {
 const OUString sTitle  = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, 
OUString());
 const OUString sFilter = rRequest->getArgumentOrDefault(PROP_FILTER_VALUE, 
OUString());
+
 // SYNCHRONIZED->
 ::osl::ResettableMutexGuard aLock(m_aMutex);
 
-const sal_Int32 idx = sTitle.indexOf("(.");
-if (idx > 0)
-{
-const OUString sTitle_ = sTitle.copy(0, idx);
-m_mapRealFilter[sTitle_] = std::make_pair(sTitle, sFilter);
-m_lFilters.addFilter(sTitle_, sFilter);
-}
-else
-{
-m_mapRealFilter[sTitle] = std::make_pair(sTitle, sFilter);
-m_lFilters.addFilter(sTitle, sFilter);
-}
-
+m_lFilters.addFilter(sTitle, sFilter);
 }
 
 
@@ -395,20 +384,7 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const 
RequestRef& rRequest)
 for (i=0; i 0)
-{
-const OUString sTitle_ = sTitle.copy(0, idx);
-m_mapRealFilter[sTitle_] = std::make_pair(sTitle, sFilter);
-m_lFilters.addFilter(sTitle_, sFilter);
-}
-else
-{
-m_mapRealFilter[sTitle] = std::make_pair(sTitle, sFilter);
-m_lFilters.addFilter(sTitle, sFilter);
-}
+m_lFilters.addFilter(rFilter.First, rFilter.Second);
 }
 }
 
@@ -441,15 +417,10 @@ void VistaFilePickerImpl::impl_sta_getCurrentFilter(const 
RequestRef& rRequest)
 OUString sTitle;
 ::sal_Int32 nRealIndex = (nIndex-1); // COM dialog base on 1 ... 
filter container on 0 .-)
 if (
-(nRealIndex >= 0) &&
+(nRealIndex >= 0 ) &&
 (m_lFilters.getFilter(nRealIndex, sTitle))
-)
-{
-if (m_mapRealFilter.find(sTitle) != m_mapRealFilter.end())
-sTitle = m_mapRealFilter[sTitle].first;
-
+   )
 rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
-}
 else if ( nRealIndex == -1 ) // Dialog not visible yet
 {
 sTitle = m_lFilters.getCurrentFilter();
diff --git a/fpicker/source/win32/VistaFilePickerImpl.hxx 
b/fpicker/source/win32/VistaFilePickerImpl.hxx
index 460136a73b48..9cce75b5714f 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.hxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace fpicker{
 namespace win32{
@@ -306,7 +305,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
 
 /// @todo document me
 CFilterContainer m_lFilters;
-std::map> m_mapRealFilter;
 
 
 /** help us to handle dialog events and provide them to interested 
office
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 fpicker/source/win32/VistaFilePicker.cxx |   19 ++-
 1 file changed, 2 insertions(+), 17 deletions(-)

New commits:
commit 1d427cd700704bc80378e250d3350b505e4413bd
Author: Mike Kaganski 
AuthorDate: Thu Dec 6 00:56:15 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 6 13:48:55 2018 +0100

Revert "tdf#121497 "Save As": File Format Type unchanged in Windows"

This reverts commit c444eb7934d4a3c190e1d060805d9d175c1a9127.

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

diff --git a/fpicker/source/win32/VistaFilePicker.cxx 
b/fpicker/source/win32/VistaFilePicker.cxx
index 874bed2f5c5f..e1eb66a9ce83 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -119,14 +119,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const 
OUString& sTitle ,
 {
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
-const sal_Int32 idx = sTitle.indexOf("(.");
-if (idx > 0)
-{
-const OUString sTitle_ = sTitle.replaceAt(idx, 2, "(*.");
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle_);
-}
-else
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
 rRequest->setArgument(PROP_FILTER_VALUE, sFilter);
 
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::NON_BLOCKED);
@@ -136,14 +129,7 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const 
OUString& sTitle)
 {
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_SET_CURRENT_FILTER);
-const sal_Int32 idx = sTitle.indexOf("(.");
-if (idx > 0)
-{
-const OUString sTitle_ = sTitle.replaceAt(idx, 2, "(*.");
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle_);
-}
-else
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
 
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::NON_BLOCKED);
 }
@@ -156,7 +142,6 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter()
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::BLOCKED);
 
 const  OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, 
OUString());
-
 return sTitle;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/inc/pageformatpanel.hrc|   41 ++
 sd/source/ui/sidebar/SlideBackground.cxx  |   21 +++
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui |9 
 3 files changed, 62 insertions(+), 9 deletions(-)

New commits:
commit cc797cd31e99d47db5b2815a0a86c96204a65e62
Author: Xisco Fauli 
AuthorDate: Wed Dec 5 18:54:22 2018 +0100
Commit: Xisco Faulí 
CommitDate: Thu Dec 6 13:19:42 2018 +0100

tdf#121926: Take metrics into account

Similar to 6d9a2557a0f0366fff169f3c3581414b3cec80bd

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

diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc
new file mode 100644
index ..23325e26ac2f
--- /dev/null
+++ b/sd/inc/pageformatpanel.hrc
@@ -0,0 +1,41 @@
+/* -*- 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_SD_INC_PAGEFORMATPANEL_HRC
+#define INCLUDED_SD_INC_PAGEFORMATPANEL_HRC
+
+#define NC_(Context, String) reinterpret_cast(Context "\004" 
u8##String)
+
+// To translators: this is a listbox labelled by "Margins:", inch units
+const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
+{
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "None"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Narrow"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Moderate"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (0.75\")"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1\")"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (1.25\")"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Wide"),
+};
+
+// To translators: this is a listbox labelled by "Margins:", cm units
+const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
+{
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "None"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Narrow"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Moderate"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18cm)"),
+NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"),
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index f3ba7365cbfe..e1958c1927ad 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -29,8 +29,11 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include "PageMarginUtils.hxx"
 #include 
+#include 
 #include "DocumentHelper.hxx"
 #include "MasterPagesSelector.hxx"
 #include 
@@ -152,6 +155,24 @@ SlideBackground::SlideBackground(
 get(mpMasterLabel, "masterlabel");
 get(mpMarginSelectBox, "marginLB");
 
+::sd::DrawDocShell* pDocSh = dynamic_cast<::sd::DrawDocShell*>( 
SfxObjectShell::Current() );
+SdDrawDocument* pDoc = pDocSh ? pDocSh->GetDoc() : nullptr;
+SdOptions* pOptions = SD_MOD()->GetSdOptions(pDoc->GetDocumentType());
+if (pOptions)
+{
+FieldUnit eMetric = static_cast(pOptions->GetMetric());
+if (IsInch(eMetric))
+{
+for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i)
+
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i]));
+}
+else
+{
+for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); ++i)
+
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_CM[i]));
+}
+}
+
 maCustomEntry = get("customlabel")->GetText();
 
 addListener();
diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui 
b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index aa9183067e8d..256f06935ee4 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -244,15 +244,6 @@
   
 True
 False
-
-  None
-  Narrow
-  Moderate
-  Normal 0.75"
-  Normal 1"
-  Normal 1.25"
-  Wide
-
   
   
 1
___
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-4' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/oox/sheetdatacontext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c761ae3d363d6763dc182dd4481a9780521d9ed
Author: Eike Rathke 
AuthorDate: Wed Dec 5 00:21:17 2018 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Dec 6 12:58:37 2018 +0100

Resolves: tdf#121887 RowModel::mnRow is 1-based, always

Basically this was always wrong.

Original code didn't treat the r attribute as optional and
resulted in an invalid -1 row for such cases, hence the RowModel
wasn't applied later.

Then

commit af8e6f4f544ecd01d3eda5f38bbd4779d5e8b2c6
CommitDate: Wed May 29 22:05:02 2013 +0200

r is an optional attribute in c and r, fdo#65059

introduced a 0-based SheetDataContext::mnRow but assigned that to
a 1-based RowModel::mnRow as well if r attribute was missing, and
did not update SheetDataContext::mnRow if r attribute was given.

commit ff56553e34dfed01b9226ce7a516dbeb6da32124
CommitDate: Thu Mar 13 18:39:22 2014 -0400

fdo#76032: This row index is 1-based whereas our own mnRow is 0-based.

then correctly assigned the decremented r attribute to
SheetDataContext::mnRow but did not touch the assignment to
RowModel::mnRow if r was not given. Probably confused by the
++mnRow already there which is correct but not sufficient for the
assignment.

Which we now finally fix herewith..

Change-Id: Iae1563ed01b95e7852ddad4fd59374c07186b493
Reviewed-on: https://gerrit.libreoffice.org/64580
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 76fbe494785faee1313d1c0be8ed2ca7b0d74f68)
Reviewed-on: https://gerrit.libreoffice.org/64640
Reviewed-by: Kohei Yoshida 
Reviewed-by: Markus Mohrhard 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/filter/oox/sheetdatacontext.cxx 
b/sc/source/filter/oox/sheetdatacontext.cxx
index 5f17d8c419b6..9732ce668d5c 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -272,7 +272,7 @@ void SheetDataContext::importRow( const AttributeList& 
rAttribs )
 mnRow = nRow-1; // to 0-based row index.
 }
 else
-aModel.mnRow = ++mnRow;
+aModel.mnRow = (++mnRow + 1);   // increment 0-based row index, to 
1-based model row
 mrAddressConv.checkRow( mnRow, true);
 mnCol = -1;
 
___
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' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/opencl/formulagroupcl.cxx |1 +
 sc/source/core/opencl/op_addin.cxx   |   18 ++
 sc/source/core/opencl/op_math.cxx|5 +
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 6aa5db61725c46a3f4f6b310bac9db1c2984fe6f
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 12:36:46 2018 +0100
Commit: Luboš Luňák 
CommitDate: Thu Dec 6 12:49:38 2018 +0100

better/sane error checking in OpenCL BESSELJ()

Change-Id: I1f1945e7fd2721a320ab11196385e22a70d3da70
Reviewed-on: https://gerrit.libreoffice.org/64542
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 9881ac6874d0001795e5c8892e2d5ac80eeacdc8)
Reviewed-on: https://gerrit.libreoffice.org/64610

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 25dd22da6a7a..6ba5ba23d6e9 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -43,6 +43,7 @@ static const char* const publicFunc =
  "#define IllegalArgument 502\n"
  "#define IllegalFPOperation 503 // #NUM!\n"
  "#define NoValue 519 // #VALUE!\n"
+ "#define NoConvergence 523\n"
  "#define DivisionByZero 532 // #DIV/0!\n"
  "#define NOTAVAILABLE 0x7fff // #N/A\n"
  "\n"
diff --git a/sc/source/core/opencl/op_addin.cxx 
b/sc/source/core/opencl/op_addin.cxx
index 5feabef7076b..4dcfc9f8a59e 100644
--- a/sc/source/core/opencl/op_addin.cxx
+++ b/sc/source/core/opencl/op_addin.cxx
@@ -19,6 +19,7 @@ namespace sc { namespace opencl {
 void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
 const std::string &sSymName, SubArguments &vSubArguments)
 {
+CHECK_PARAMETER_COUNT( 2, 2 );
 ss << "\ndouble " << sSymName;
 ss << "_" << BinFuncName() << "(";
 for (size_t i = 0; i < vSubArguments.size(); i++)
@@ -31,11 +32,6 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "int gid0 = get_global_id(0);\n";
 ss << "double x = 0.0;\n";
 ss << "double N = 0.0;\n";
-if(vSubArguments.size() != 2)
-{
-ss << "return DBL_MAX;\n}\n";
-return ;
-}
 FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
 assert(tmpCur0);
 if(ocPush == vSubArguments[0]->GetFormulaToken()->GetOpCode())
@@ -58,8 +54,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 }
 else
 {
-ss << "return DBL_MAX;\n}\n";
-return ;
+throw Unhandled(__FILE__, __LINE__);
 }
 }
 else
@@ -90,8 +85,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 }
 else
 {
-ss << "return DBL_MAX;\n}\n";
-return ;
+throw Unhandled(__FILE__, __LINE__);
 }
 }
 else
@@ -104,7 +98,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "double f_PI_DIV_2 = f_PI / 2.0;\n";
 ss << "double f_PI_DIV_4 = f_PI / 4.0;\n";
 ss << "if( N < 0.0 )\n";
-ss << "return DBL_MAX;\n";
+ss << "return CreateDoubleError(IllegalArgument);\n";
 ss << "if (x == 0.0)\n";
 ss << "return (N == 0.0) ? 1.0 : 0.0;\n";
 ss << "double fSign = ((int)N % 2 == 1 && x < 0.0) ? -1.0 : 1.0;\n";
@@ -118,7 +112,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "return fSign * sqrt(f_2_DIV_PI/fX)";
 ss << "* cos(fX-N*f_PI_DIV_2-f_PI_DIV_4);\n";
 ss << "else\n";
-ss << "return DBL_MAX;\n";
+ss << "return CreateDoubleError(NoConvergence);\n";
 ss << "}\n";
 ss << "double epsilon = 1.0e-15;\n";
 ss << "bool bHasfound = false;\n";
@@ -179,7 +173,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream 
&ss,
 ss << "if (bHasfound)\n";
 ss << "return u * fSign;\n";
 ss << "else\n";
-ss << "return DBL_MAX;\n";
+ss << "return CreateDoubleError(NoConvergence);\n";
 ss << "}";
 }
 void OpGestep::GenSlidingWindowFunction(
commit 5740790582097fe70d933e9cc9c71be45dcd9f32
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 12:44:40 2018 +0100
Commit: Luboš Luňák 
CommitDate: Thu Dec 6 12:49:27 2018 +0100

fix OpenCL ROUND() when the second parameter is negative

Change-Id: Ibbf374f72e83609a602504d9ffde922896338c2c
Reviewed-on: https://gerrit.libreoffice.org/64543
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 79ed7bbacae43468b690a3d3a6b1acf31e641cee)
Reviewed-on: https://gerrit.libreoffice.org/64609

diff --git a/sc/source/core/opencl/op_math.cxx 
b/sc/source/core/opencl/op_math.cxx
index 341c3b04c333..ec4a75daa9eb 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -1609,6 +1609,7 @@ void OpLn::GenSlidingWindowFunction(
 void OpRound::GenSlidingWindowFu

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

[Libreoffice Gerrit user]

 sc/source/core/opencl/op_financial.cxx   |3 +++
 sc/source/core/opencl/op_statistical.cxx |2 ++
 2 files changed, 5 insertions(+)

New commits:
commit d5b45b81ff621744de3d9b4598cf36d2a6657a8c
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 13:25:18 2018 +0100
Commit: Luboš Luňák 
CommitDate: Thu Dec 6 12:50:04 2018 +0100

OpenCL FVSCHEDULE() error checking

Change-Id: If93a9ea6e0265ba616b4a1fbe138d310ea3e8693
Reviewed-on: https://gerrit.libreoffice.org/64546
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 3156228b1d737ca47ff4e959a6e357581af3ec2e)
Reviewed-on: https://gerrit.libreoffice.org/64613

diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index 6f728cbbbdd2..66d1f9d18e28 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -750,8 +750,11 @@ void 
OpMDuration::GenSlidingWindowFunction(std::stringstream& ss,
 void Fvschedule::GenSlidingWindowFunction(
 std::stringstream &ss, const std::string &sSymName, SubArguments 
&vSubArguments)
 {
+CHECK_PARAMETER_COUNT( 2, 2 );
 FormulaToken* pCur = vSubArguments[1]->GetFormulaToken();
 assert(pCur);
+if(vSubArguments[0]->GetFormulaToken()->GetType() != 
formula::svDoubleVectorRef)
+throw Unhandled( __FILE__, __LINE__ );
 const formula::DoubleVectorRefToken* pCurDVR =
 static_cast(pCur);
 size_t nCurWindowSize = pCurDVR->GetRefRowSize();
commit 168719432c10a87a86de4f494455c78844fdb81a
Author: Luboš Luňák 
AuthorDate: Tue Dec 4 12:57:55 2018 +0100
Commit: Luboš Luňák 
CommitDate: Thu Dec 6 12:49:49 2018 +0100

OpenCL NORMDIST() error checking

Change-Id: I15636a64ad869bf874fc6e2ada87842050da1a9a
Reviewed-on: https://gerrit.libreoffice.org/64544
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 866eb1c49d385f497aa1585284393343910098ab)
Reviewed-on: https://gerrit.libreoffice.org/64611

diff --git a/sc/source/core/opencl/op_statistical.cxx 
b/sc/source/core/opencl/op_statistical.cxx
index fd4508727d87..9e1637f0bfc3 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -4051,6 +4051,8 @@ void OpNormdist::GenSlidingWindowFunction(
 ss << "mue = tmp1;\n";
 ss << "sigma = tmp2;\n";
 ss << "c = tmp3;\n";
+ss << "if(sigma <= 0)\n";
+ss << "return CreateDoubleError(IllegalArgument);\n";
 ss << "double mid,tmp;\n";
 ss << "mid = (x - mue)/sigma;\n";
 ss << "if(c)\n";
___
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' - dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |   27 +-
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |3 +-
 dbaccess/source/ui/dlg/detailpages.cxx|   18 +-
 dbaccess/source/ui/dlg/detailpages.hxx|3 +-
 4 files changed, 33 insertions(+), 18 deletions(-)

New commits:
commit 9fe049918965c8ffa5bc8245f17ea7376539db8a
Author: Caolán McNamara 
AuthorDate: Thu Dec 6 09:34:38 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 6 12:41:07 2018 +0100

tdf#121935 crash on "set up connect to text files"

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

diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 4a3473e5dacc..5d0e19a955a7 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -69,9 +69,15 @@ using namespace ::com::sun::star;
 : OConnectionTabPageSetup(pParent, "dbaccess/ui/dbwiztextpage.ui", 
"DBWizTextPage",
   rCoreAttrs, STR_TEXT_HELPTEXT, 
STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE)
 , m_xSubContainer(m_xBuilder->weld_widget("TextPageContainer"))
-, m_aTextConnectionHelper(m_xSubContainer.get(), TC_EXTENSION | 
TC_SEPARATORS)
+, m_xTextConnectionHelper(new 
OTextConnectionHelper(m_xSubContainer.get(), TC_EXTENSION | TC_SEPARATORS))
 {
-m_aTextConnectionHelper.SetClickHandler(LINK( this, 
OTextConnectionPageSetup, ImplGetExtensionHdl ) );
+m_xTextConnectionHelper->SetClickHandler(LINK( this, 
OTextConnectionPageSetup, ImplGetExtensionHdl ) );
+}
+
+void OTextConnectionPageSetup::dispose()
+{
+m_xTextConnectionHelper.reset();
+OConnectionTabPageSetup::dispose();
 }
 
 OTextConnectionPageSetup::~OTextConnectionPageSetup()
@@ -81,27 +87,27 @@ using namespace ::com::sun::star;
 
 IMPL_LINK_NOARG(OTextConnectionPageSetup, ImplGetExtensionHdl, 
OTextConnectionHelper*, void)
 {
-SetRoadmapStateValue(!m_aTextConnectionHelper.GetExtension().isEmpty() 
&& OConnectionTabPageSetup::checkTestConnection());
+
SetRoadmapStateValue(!m_xTextConnectionHelper->GetExtension().isEmpty() && 
OConnectionTabPageSetup::checkTestConnection());
 callModifiedHdl();
 }
 
 bool OTextConnectionPageSetup::checkTestConnection()
 {
 bool bDoEnable = OConnectionTabPageSetup::checkTestConnection();
-bDoEnable = !m_aTextConnectionHelper.GetExtension().isEmpty() && 
bDoEnable;
+bDoEnable = !m_xTextConnectionHelper->GetExtension().isEmpty() && 
bDoEnable;
 return bDoEnable;
 }
 
 void OTextConnectionPageSetup::fillControls(std::vector< 
std::unique_ptr >& _rControlList)
 {
 OConnectionTabPageSetup::fillControls(_rControlList);
-m_aTextConnectionHelper.fillControls(_rControlList);
+m_xTextConnectionHelper->fillControls(_rControlList);
 }
 
 void OTextConnectionPageSetup::fillWindows(std::vector< 
std::unique_ptr >& _rControlList)
 {
 OConnectionTabPageSetup::fillWindows(_rControlList);
-m_aTextConnectionHelper.fillWindows(_rControlList);
+m_xTextConnectionHelper->fillWindows(_rControlList);
 }
 
 void OTextConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, 
bool _bSaveValue)
@@ -110,18 +116,19 @@ using namespace ::com::sun::star;
 bool bValid, bReadonly;
 getFlags(_rSet, bValid, bReadonly);
 OConnectionTabPageSetup::implInitControls( _rSet, _bSaveValue);
-m_aTextConnectionHelper.implInitControls(_rSet, bValid);
+m_xTextConnectionHelper->implInitControls(_rSet, bValid);
 }
 
 bool OTextConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
 {
 bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
-bChangedSomething = m_aTextConnectionHelper.FillItemSet(*_rSet, 
bChangedSomething);
+bChangedSomething = m_xTextConnectionHelper->FillItemSet(*_rSet, 
bChangedSomething);
 return bChangedSomething;
 }
 
-bool OTextConnectionPageSetup::prepareLeave(){
-return m_aTextConnectionHelper.prepareLeave();
+bool OTextConnectionPageSetup::prepareLeave()
+{
+return m_xTextConnectionHelper->prepareLeave();
 }
 
 VclPtr 
OLDAPConnectionPageSetup::CreateLDAPTabPage( vcl::Window* pParent, const 
SfxItemSet& _rAttrSet )
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 8f9acc5e1470..fdc36ff6db16 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -56,11 +56,12 @@ namespace dbaui
 {
 public:
 std::unique_ptr m_xSubConta

[Libreoffice-commits] online.git: docker/Dockerfile

[Libreoffice Gerrit user]

 docker/Dockerfile |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit b26db00c420d18d4a6c997e2144d6d3fd3af17f3
Author: Andras Timar 
AuthorDate: Thu Dec 6 12:29:23 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 6 12:29:23 2018 +0100

docker: we are based on Ubuntu 18.04 now

Change-Id: Ie81ec22081a1d7c71f4f1424a7b61c29b74b46d4

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c4c1423e0..0df3c0d44 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # get the latest fixes
 RUN apt-get update && apt-get upgrade -y
@@ -13,13 +13,7 @@ RUN apt-get update && apt-get upgrade -y
 # install apt-transport-https in order to set up repo for Poco
 # install adduser, findutils and cpio that we need later
 # install an editor
-RUN apt-get -y install apt-transport-https locales-all libpng12-0 libxinerama1 
libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 
libxcb-render0 adduser cpio findutils nano
-
-# set up 3rd party repo of Poco, dependency of loolwsd
-RUN echo "deb https://collaboraoffice.com/repos/Poco/ /" >> 
/etc/apt/sources.list.d/poco.list
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D
-RUN apt-get update
-RUN apt-get -y install libpoco*60
+RUN apt-get -y install apt-transport-https locales-all libpng12-0 libxinerama1 
libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 
libxcb-render0 adduser cpio findutils nano libpoco*50
 
 # tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
 RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei 
fonts-droid-fallback fonts-noto-cjk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/sbasic/shared/03/lib_tools.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e718f78ec456aa228240da579780391b51e8d9a
Author: Andrea Gelmini 
AuthorDate: Thu Dec 6 12:09:54 2018 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 6 12:18:00 2018 +0100

Fix typo

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

diff --git a/source/text/sbasic/shared/03/lib_tools.xhp 
b/source/text/sbasic/shared/03/lib_tools.xhp
index 716e29cc3..689103018 100644
--- a/source/text/sbasic/shared/03/lib_tools.xhp
+++ b/source/text/sbasic/shared/03/lib_tools.xhp
@@ -291,7 +291,7 @@
 OpenDocument
 
 
-' Opens a Document, checks beforehand, 
whether it has to be loaded or whether it is already on the desktop. If the 
parameter bDisposable is set to False then then returned document should not be 
disposed afterwards, because it is already opened.
+' Opens a Document, checks beforehand, 
whether it has to be loaded or whether it is already on the desktop. If the 
parameter bDisposable is set to False then the returned document should not be 
disposed afterwards, because it is already opened.
 
 Function OpenDocument(
 DocPath as String, 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 6c42acfa8ffd749777801af7a432b9796ab9d87c
Author: Andrea Gelmini 
AuthorDate: Thu Dec 6 12:09:54 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Dec 6 12:18:00 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix typo

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

diff --git a/helpcontent2 b/helpcontent2
index 4c0b3129e36d..8e718f78ec45 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4c0b3129e36d461f4d93ba924075cf6ec3e7ded1
+Subproject commit 8e718f78ec456aa228240da579780391b51e8d9a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/win/gdi/gdiimpl.cxx |   99 ++--
 1 file changed, 54 insertions(+), 45 deletions(-)

New commits:
commit 8eff8a7a37fe5183bb46f977582fccd463cafe99
Author: Dmitriy Shilin 
AuthorDate: Thu Dec 6 08:52:05 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 6 11:33:07 2018 +0100

vcl: split ImplIsPaletteEntry into low-level functions

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

diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index b24760a3cf95..d8fd23ed6847 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -61,8 +61,6 @@
 #define SAL_POLYPOLYCOUNT_STACKBUF  8
 #define SAL_POLYPOLYPOINTS_STACKBUF 64
 
-#define DITHER_PAL_DELTA51
-#define DITHER_MAX_SYSCOLOR 16
 #define DMAP( _def_nVal, _def_nThres )  
((pDitherDiff[_def_nVal]>(_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal])
 
 #define SAL_POLY_STACKBUF   32
@@ -168,31 +166,6 @@ void ImplPreparePolyDraw( bool  
bCloseFigures,
 }
 
 
-static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] =
-{
-{0,0,0, 0 },
-{0,0, 0x80, 0 },
-{0, 0x80,0, 0 },
-{0, 0x80, 0x80, 0 },
-{ 0x80,0,0, 0 },
-{ 0x80,0, 0x80, 0 },
-{ 0x80, 0x80,0, 0 },
-{ 0x80, 0x80, 0x80, 0 },
-{ 0xC0, 0xC0, 0xC0, 0 },
-{0,0, 0xFF, 0 },
-{0, 0xFF,0, 0 },
-{0, 0xFF, 0xFF, 0 },
-{ 0xFF,0,0, 0 },
-{ 0xFF,0, 0xFF, 0 },
-{ 0xFF, 0xFF,0, 0 },
-{ 0xFF, 0xFF, 0xFF, 0 }
-};
-
-static PALETTEENTRY aImplExtraColor1 =
-{
-0, 184, 255, 0
-};
-
 static BYTE aOrdDither8Bit[8][8] =
 {
{  0, 38,  9, 48,  2, 40, 12, 50 },
@@ -227,34 +200,71 @@ Color ImplGetROPColor( SalROPColor nROPColor )
 return nColor;
 }
 
-int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue )
+bool IsDitherColor(BYTE nRed, BYTE nGreen, BYTE nBlue)
 {
-// dither color?
-if ( !(nRed % DITHER_PAL_DELTA) && !(nGreen % DITHER_PAL_DELTA) && !(nBlue 
% DITHER_PAL_DELTA) )
-return TRUE;
+constexpr sal_uInt8 DITHER_PAL_DELTA = 51;
 
-PALETTEENTRY* pPalEntry = aImplSalSysPalEntryAry;
+return !(nRed % DITHER_PAL_DELTA) &&
+   !(nGreen % DITHER_PAL_DELTA) &&
+   !(nBlue % DITHER_PAL_DELTA);
+}
+
+bool IsPaletteColor(BYTE nRed, BYTE nGreen, BYTE nBlue)
+{
+static PALETTEENTRY aImplSalSysPalEntryAry[] =
+{
+{0,0,0, 0 },
+{0,0, 0x80, 0 },
+{0, 0x80,0, 0 },
+{0, 0x80, 0x80, 0 },
+{ 0x80,0,0, 0 },
+{ 0x80,0, 0x80, 0 },
+{ 0x80, 0x80,0, 0 },
+{ 0x80, 0x80, 0x80, 0 },
+{ 0xC0, 0xC0, 0xC0, 0 },
+{0,0, 0xFF, 0 },
+{0, 0xFF,0, 0 },
+{0, 0xFF, 0xFF, 0 },
+{ 0xFF,0,0, 0 },
+{ 0xFF,0, 0xFF, 0 },
+{ 0xFF, 0xFF,0, 0 },
+{ 0xFF, 0xFF, 0xFF, 0 }
+};
 
-// standard palette color?
-for ( sal_uInt16 i = 0; i < DITHER_MAX_SYSCOLOR; i++, pPalEntry++ )
+for (auto& rPalEntry : aImplSalSysPalEntryAry)
 {
-if( pPalEntry->peRed == nRed && pPalEntry->peGreen == nGreen && 
pPalEntry->peBlue == nBlue )
-return TRUE;
+if(rPalEntry.peRed == nRed &&
+   rPalEntry.peGreen == nGreen &&
+   rPalEntry.peBlue == nBlue)
+{
+return true;
+}
 }
 
-// extra color?
-if ( aImplExtraColor1.peRed == nRed &&
- aImplExtraColor1.peGreen == nGreen &&
- aImplExtraColor1.peBlue == nBlue )
+return false;
+}
+
+bool IsExtraColor(BYTE nRed, BYTE nGreen, BYTE nBlue)
+{
+static PALETTEENTRY aImplExtraColor1 =
 {
-return TRUE;
-}
+0, 184, 255, 0
+};
 
-return FALSE;
+return aImplExtraColor1.peRed == nRed &&
+   aImplExtraColor1.peGreen == nGreen &&
+   aImplExtraColor1.peBlue == nBlue;
 }
 
+bool ImplIsPaletteEntry(BYTE nRed, BYTE nGreen, BYTE nBlue)
+{
+return IsDitherColor(nRed, nGreen, nBlue) ||
+   IsPaletteColor(nRed, nGreen, nBlue) ||
+   IsExtraColor(nRed, nGreen, nBlue);
 }
 
+} // namespace
+
 WinSalGraphicsImpl::WinSalGraphicsImpl(WinSalGraphics& rParent):
 mrParent(rParent),
 mbXORMode(false),
@@ -280,7 +290,6 @@ WinSalGraphicsImpl::~WinSalGraphicsImpl()
 if ( !mbStockBrush )
 DeleteBrush( mhBrush );
 }
-
 }
 
 void WinSalGraphicsImpl::Init()
@@ -673,7 +682,7 @@ void ImplDrawBitmap( HDC hDC, const SalTwoRect& rPosAry, 
const WinSalBitmap& rSa
 }
 }
 
-}
+} // namespace
 
 void WinSalGraphicsImpl::drawBitmap(const SalTwoRect& rPosAry, const 
SalBitmap& rSalBitmap)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/inc/sdfilter.hxx  |5 +
 sd/source/filter/cgm/sdcgmfilter.cxx |7 -
 sd/source/filter/sdfilter.cxx|   37 --
 sd/source/filter/sdpptwrp.cxx|  126 ++-
 sd/source/ui/app/sddll.cxx   |3 
 5 files changed, 94 insertions(+), 84 deletions(-)

New commits:
commit 9fae95fef82bab8e0760d49ccce51a30ab705941
Author: Michael Meeks 
AuthorDate: Wed Nov 21 19:07:41 2018 +
Commit: Thorsten Behrens 
CommitDate: Thu Dec 6 11:28:53 2018 +0100

fix tdf#121468: preload fixes for Impress filters

was: Re-factor internal filter logic, and impl. preload properly.

Reviewed-on: https://gerrit.libreoffice.org/63761
Tested-by: Jenkins
Reviewed-by: Michael Meeks 
(cherry picked from commit 7b34fb18a4d60bfc4e32b7c382ac596cbc2e776f)
Reviewed-on: https://gerrit.libreoffice.org/63850

Conflicts:
sd/inc/sdfilter.hxx
sd/source/ui/app/sddll.cxx

Change-Id: I4c55ceb19d5db2c1e4756901d0d8b14878641a99
Reviewed-on: https://gerrit.libreoffice.org/64616
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
Reviewed-by: Thorsten Behrens 

diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index df1421f51727..7042505c913e 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SD_INC_SDFILTER_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -44,7 +45,9 @@ public:
 virtual boolExport() = 0;
 
 #ifndef DISABLE_DYNLOADING
-static ::osl::Module*   OpenLibrary( const OUString& rLibraryName );
+static void Preload();
+/// Open library @rLibraryName and lookup symbol @rFnSymbol
+static oslGenericFunction GetLibrarySymbol( const OUString& rLibraryName, 
const OUString &rFnSymbol );
 #endif
 
 protected:
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx 
b/sd/source/filter/cgm/sdcgmfilter.cxx
index 7bd04a246b10..91a0f62b1be2 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -61,17 +61,14 @@ namespace
 class CGMPointer
 {
 ImportCGMPointer m_pPointer;
-#ifndef DISABLE_DYNLOADING
-std::unique_ptr m_xLibrary;
-#endif
 public:
 CGMPointer()
 {
 #ifdef DISABLE_DYNLOADING
 m_pPointer = ImportCGM;
 #else
-m_xLibrary.reset(SdFilter::OpenLibrary("icg"));
-m_pPointer = m_xLibrary ? 
reinterpret_cast(m_xLibrary->getFunctionSymbol("ImportCGM")) 
: nullptr;
+m_pPointer = reinterpret_cast(
+SdFilter::GetLibrarySymbol("icg", "ImportCGM"));
 #endif
 }
 ImportCGMPointer get() { return m_pPointer; }
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index b822baa21c5c..fbffe2cf5ed9 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -58,14 +58,41 @@ OUString SdFilter::ImplGetFullLibraryName( const OUString& 
rLibraryName )
 }
 
 #ifndef DISABLE_DYNLOADING
+
+typedef std::map> SdModuleMap;
+static SdModuleMap g_SdModuleMap;
+
 extern "C" { static void thisModule() {} }
 
-::osl::Module* SdFilter::OpenLibrary( const OUString& rLibraryName )
+oslGenericFunction SdFilter::GetLibrarySymbol( const OUString& rLibraryName, 
const OUString &rFnSymbol )
+{
+osl::Module *pMod = nullptr;
+auto it = g_SdModuleMap.find(rLibraryName);
+if (it != g_SdModuleMap.end())
+pMod = it->second.get();
+
+if (!pMod)
+{
+pMod = new osl::Module;
+if (pMod->loadRelative(&thisModule, 
ImplGetFullLibraryName(rLibraryName),
+   SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY))
+g_SdModuleMap[rLibraryName] = std::unique_ptr(pMod);
+else
+{
+delete pMod;
+pMod = nullptr;
+}
+}
+if (!pMod)
+return nullptr;
+else
+return pMod->getFunctionSymbol(rFnSymbol);
+}
+
+void SdFilter::Preload()
 {
-std::unique_ptr< osl::Module > mod(new osl::Module);
-return mod->loadRelative(&thisModule, ImplGetFullLibraryName(rLibraryName),
- SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY)
-? mod.release() : nullptr;
+(void)GetLibrarySymbol("sdfilt", "ImportPPT");
+(void)GetLibrarySymbol("icg", "ImportCGM");
 }
 
 #endif
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index df3f4da8d010..0eaf9934a22b 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -74,7 +74,7 @@ SdPPTFilter::~SdPPTFilter()
 
 bool SdPPTFilter::Import()
 {
-boolbRet = false;
+bool bRet = false;
 tools::SvRef pStorage = new SotStorage( 
mrMedium.GetInStream(), false );
 if( !pStorage->GetError() )
 {
@@ -97,24 +97,18 @@ bool SdPPTFilter::Import()
 mrMedium.SetError(ERRCODE_SVX_READ_FILTER_PPOINT);
 else
 {
-#ifndef DISABLE_DYNLOADING
- 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - include/sfx2 sfx2/source xmlsecurity/qa

[Libreoffice Gerrit user]

 include/sfx2/signaturestate.hxx |4 +++-
 include/sfx2/strings.hrc|1 +
 sfx2/source/doc/objserv.cxx |8 +++-
 xmlsecurity/qa/unit/signing/signing.cxx |5 +++--
 4 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit e5871345dbf77bd09df6dd7bd201d3f9e84e2390
Author: Miklos Vajna 
AuthorDate: Mon Nov 26 09:21:18 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Dec 6 11:10:40 2018 +0100

sfx2: show partial signatures even if cert validation fails

(cherry picked from commit 4a59a8aba8c9d451edff790d9281d0095c1bd78e)

Conflicts:
xmlsecurity/qa/unit/signing/signing.cxx

Change-Id: I6060b7130827346ac5d6955bf38ebe3b476819fd
Reviewed-on: https://gerrit.libreoffice.org/64174
Tested-by: Jenkins
Reviewed-by: Sophie Gautier 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx
index a1fd09360906..8bdfdfac75d9 100644
--- a/include/sfx2/signaturestate.hxx
+++ b/include/sfx2/signaturestate.hxx
@@ -33,7 +33,9 @@ enum class SignatureState
 NOTVALIDATED  = 4,
 // signature and certificate are ok, but not all files are signed, as it 
was the case in
 // OOo 2.x - OOo 3.1.1. This state is only used together with document 
signatures.
-PARTIAL_OK= 5
+PARTIAL_OK= 5,
+/// Certificate could not be validated and the document is only partially 
signed.
+NOTVALIDATED_PARTIAL_OK = 6
 };
 
 #endif // INCLUDED_SFX2_SIGNATURESTATE_HXX
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 6d871b648d4f..82b71b7294e8 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -260,6 +260,7 @@
 #define STR_SIGNATURE_INVALID   NC_("STR_SIGNATURE_INVALID", 
"The signature was valid, but the document has been modified")
 #define STR_SIGNATURE_NOTVALIDATED  
NC_("STR_SIGNATURE_NOTVALIDATED", "The signature is OK, but the certificate 
could not be validated.")
 #define STR_SIGNATURE_PARTIAL_OK
NC_("STR_SIGNATURE_PARTIAL_OK", "The signature is OK, but the document is only 
partially signed.")
+#define STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK   
NC_("STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK", "The certificate could not be 
validated and the document is only partially signed.")
 #define STR_SIGNATURE_OKNC_("STR_SIGNATURE_OK", "This 
document is digitally signed and the signature is valid.")
 #define STR_SIGNATURE_SHOW  NC_("STR_SIGNATURE_SHOW", 
"Show Signatures")
 
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 8267795cc6cd..f69afb5e059e 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1067,6 +1067,10 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
 sMessage = SfxResId(STR_SIGNATURE_OK);
 aInfoBarType = InfoBarType::Info;
 break;
+case SignatureState::NOTVALIDATED_PARTIAL_OK:
+sMessage = 
SfxResId(STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK);
+aInfoBarType = InfoBarType::Warning;
+break;
 //FIXME SignatureState::Unknown, own message?
 default:
 break;
@@ -1284,7 +1288,9 @@ SignatureState 
SfxObjectShell::ImplCheckSignaturesInformation( const uno::Sequen
 }
 }
 
-if ( nResult == SignatureState::OK && !bCertValid )
+if (nResult == SignatureState::OK && !bCertValid && !bCompleteSignature)
+nResult = SignatureState::NOTVALIDATED_PARTIAL_OK;
+else if (nResult == SignatureState::OK && !bCertValid)
 nResult = SignatureState::NOTVALIDATED;
 else if ( nResult == SignatureState::OK && bCertValid && 
!bCompleteSignature)
 nResult = SignatureState::PARTIAL_OK;
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index cf3adf2ad42c..6b124654a292 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -488,13 +488,14 @@ void SigningTest::testOOXMLPartial()
 SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
 CPPUNIT_ASSERT(pObjectShell);
 // This was SignatureState::BROKEN due to missing RelationshipTransform 
and SHA-256 support.
-// We expect NOTVALIDATED in case the root CA is not imported on the 
system, and PARTIAL_OK otherwise, so accept both.
+// We expect NOTVALIDATED_PARTIAL_OK in case the root CA is not imported 
on the system, and PARTIAL_OK otherwise, so accept both.
+// But reject NOTVALIDATED, hiding incompleteness is not OK.
 SignatureState nActual = pObjectShell->GetDocumentSignatureState();
 CPPUNIT_ASSERT_MESSAGE(
 (OString::number(
  static_cast::type>(nActual))
  .getStr()),
-(n

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 6 commits - framework/source include/vcl sd/source sfx2/source vcl/inc vcl/source

[Libreoffice Gerrit user]

 framework/source/uiconfiguration/ImageArrayData.cxx   |   22 ---
 framework/source/uiconfiguration/ImageList.cxx|   37 +
 framework/source/uiconfiguration/ImplImageList.cxx|9 -
 framework/source/uiconfiguration/image.h  |   11 -
 framework/source/uiconfiguration/imagemanagerimpl.cxx |2 
 include/vcl/ImageTree.hxx |7 
 include/vcl/graph.hxx |2 
 include/vcl/image.hxx |3 
 sd/source/ui/controller/slidelayoutcontroller.cxx |   10 -
 sd/source/ui/sidebar/LayoutMenu.cxx   |   10 -
 sfx2/source/sidebar/Tools.cxx |   14 +
 vcl/inc/image.h   |   19 ++
 vcl/inc/implimagetree.hxx |   15 +-
 vcl/source/control/fixed.cxx  |3 
 vcl/source/gdi/graph.cxx  |   14 +
 vcl/source/helper/commandinfoprovider.cxx |   35 +---
 vcl/source/image/Image.cxx|  127 --
 vcl/source/image/ImageTree.cxx|   10 +
 vcl/source/image/ImplImage.cxx|   93 +
 vcl/source/image/ImplImageTree.cxx|   37 +++--
 vcl/source/window/builder.cxx |4 
 vcl/source/window/msgbox.cxx  |   11 -
 vcl/source/window/toolbox.cxx |   47 ++
 23 files changed, 327 insertions(+), 215 deletions(-)

New commits:
commit 5b7dd9231b5cfa775f35c3ba8d542b6f5b080af3
Author: Michael Meeks 
AuthorDate: Mon Nov 26 19:50:38 2018 +
Commit: Andras Timar 
CommitDate: Thu Dec 6 10:51:45 2018 +0100

Propagate stock info through slide layouts.

Change-Id: If717db82fe6ab14bbf32225c1f1c95f44954f011
(cherry picked from commit f107161bbd0eb4ee5766f5f983d18b32b929b15c)

diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx 
b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 82cc5ae0f06a..4ba598f10809 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -135,13 +135,11 @@ static void fillLayoutValueSet( ValueSet* pValue, const 
snewfoil_value_info_layo
 for( ; pInfo->mpStrResId; pInfo++ )
 {
 OUString aText(SdResId(pInfo->mpStrResId));
-BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
+Image aImg("private:graphicrepository/" + 
OUString::createFromAscii(pInfo->msBmpResId));
+pValue->InsertItem(static_cast(pInfo->maAutoLayout)+1, 
aImg, aText);
 
-pValue->InsertItem(static_cast(pInfo->maAutoLayout)+1,
-Image(aBmp), aText);
-
-aLayoutItemSize.Width()  = std::max( aLayoutItemSize.Width(),  
aBmp.GetSizePixel().Width()  );
-aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), 
aBmp.GetSizePixel().Height() );
+aLayoutItemSize.Width()  = std::max( aLayoutItemSize.Width(),  
aImg.GetSizePixel().Width()  );
+aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), 
aImg.GetSizePixel().Height() );
 }
 
 aLayoutItemSize = pValue->CalcItemSizePixel( aLayoutItemSize );
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx 
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 5a975ec80c49..2ba0c51e3484 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -530,12 +530,16 @@ void LayoutMenu::Fill()
 {
 if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical)
 {
-BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
+Image aImg("private:graphicrepository/" + 
OUString::createFromAscii(pInfo->msBmpResId));
 
 if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
-aBmp.Mirror (BmpMirrorFlags::Horizontal);
+{ // FIXME: avoid interpolating RTL layouts.
+BitmapEx aRTL = aImg.GetBitmapEx();
+aRTL.Mirror(BmpMirrorFlags::Horizontal);
+aImg = Image(aRTL);
+}
 
-InsertItem(i, Image(aBmp), SdResId(pInfo->mpStrResId));
+InsertItem(i, aImg, SdResId(pInfo->mpStrResId));
 SetItemData (i, new AutoLayout(pInfo->maAutoLayout));
 }
 }
commit ca936bb8b1728f470028e5ae0c55a808210f2b0c
Author: Michael Meeks 
AuthorDate: Mon Nov 26 16:59:42 2018 +
Commit: Andras Timar 
CommitDate: Thu Dec 6 10:51:34 2018 +0100

Use lazy-loading stock Image to simplify framework image lists.

Project stock names through XGraphic via origin URL.

Change-Id: Ib445694f7c142a163ef7e7bc0beea39b88b99e14
(cherry picked from commit 77b88eebaadebb626108172e4f2de36c60960051)

diff --git a/framework/source/uiconfiguration/ImageArrayData.cxx 
b/framework/source/uiconfiguration/ImageArrayData.cxx
index 508f79105d98..076cbcefb6dd 100644
--- 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 solenv/flatpak-manifest.in |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit a84ef3875bdbd2881d28ea721a077dede41e54eb
Author: Stephan Bergmann 
AuthorDate: Tue Dec 4 18:03:20 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 6 10:54:05 2018 +0100

Adapt solenv/flatpak-manifest.in to recent download.lst changes

(cherry picked from commit d1a1c9fa49dd24ba9eaee4b865e9ad110e77b13e, 
adapting
the pdfium block, which has only been upgraded to 3550 on libreoffice-6-2)

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index d0eb3c8f616b..bc06bdd56b1e 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -78,10 +78,10 @@
 "type": "shell"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/pdfium-3471.tar.bz2";,
-"sha256": 
"4acbc905fee1743e96169ca155347a81fb2b0f381281109c1860aa4408ec6c4f",
+"url": 
"https://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2";,
+"sha256": 
"572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679",
 "type": "file",
-"dest-filename": "external/tarballs/pdfium-3471.tar.bz2"
+"dest-filename": "external/tarballs/pdfium-3550.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";,
@@ -90,10 +90,10 @@
 "dest-filename": 
"external/tarballs/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/xmlsec1-1.2.26.tar.gz";,
-"sha256": 
"8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50",
+"url": 
"https://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz";,
+"sha256": 
"97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6",
 "type": "file",
-"dest-filename": "external/tarballs/xmlsec1-1.2.26.tar.gz"
+"dest-filename": "external/tarballs/xmlsec1-1.2.27.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz";,
@@ -366,10 +366,10 @@
 "dest-filename": 
"external/tarballs/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/mdds-1.4.1.tar.bz2";,
-"sha256": 
"9ac690c37f5f06dc88551405d5daf9d9ad25edf65aae6325b59e905c2ba444c3",
+"url": 
"https://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2";,
+"sha256": 
"25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81",
 "type": "file",
-"dest-filename": "external/tarballs/mdds-1.4.1.tar.bz2"
+"dest-filename": "external/tarballs/mdds-1.4.3.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";,
@@ -396,10 +396,10 @@
 "dest-filename": "external/tarballs/openldap-2.4.45.tgz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.14.0.tar.gz";,
-"sha256": 
"7bcfac3f4f490540292cfc87d3fde7b47eafa8450afa1e1a2c181d8293dcd4ef",
+"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz";,
+"sha256": 
"3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f",
 "type": "file",
-"dest-filename": "external/tarballs/liborcus-0.14.0.tar.gz"
+"dest-filename": "external/tarballs/liborcus-0.14.1.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 basctl/source/basicide/basicbox.cxx |  365 +---
 basctl/source/basicide/basicbox.hxx |  250 +---
 solenv/clang-format/blacklist   |2 
 3 files changed, 359 insertions(+), 258 deletions(-)

New commits:
commit 8ec5c249fc40fb80d2a00e54a0bd76451dbc6477
Author: tagezi 
AuthorDate: Wed Nov 28 22:37:13 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 6 10:26:45 2018 +0100

Format and document combobox classes of BasicIDE

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

diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index 15fa69537a74..d5e4980c7400 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -31,28 +31,42 @@
 
 namespace basctl
 {
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-SFX_IMPL_TOOLBOX_CONTROL( LibBoxControl, SfxStringItem );
+/*! Macro for implementation two metods for LibBoxControl Class
+ *
+ * @code
+ * SfxToolBoxControl* LibBoxControl::CreateImpl(sal_uInt16 nSlotId, sal_uInt16 
nId, ToolBox& rTbx)
+ * {
+ *  return new LibBoxControl(nSlotId, nId, rTbx);
+ * }
+ *
+ * void LibBoxControl::RegisterControl(sal_uInt16 nSlotId, SfxModule* pMod)
+ * {
+ *  SfxToolBoxControl::RegisterToolBoxControl(
+ *  pMod, SfxTbxCtrlFactory(* LibBoxControl::CreateImpl, 
typeid(nItemClass), nSlotId));
+ * }
+ * @endcode
+ * @see Macro SFX_DECL_TOOLBOX_CONTROL
+ */
+SFX_IMPL_TOOLBOX_CONTROL(LibBoxControl, SfxStringItem);
 
-LibBoxControl::LibBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& 
rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
+LibBoxControl::LibBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
+: SfxToolBoxControl(nSlotId, nId, rTbx)
 {
 }
 
-
-void LibBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const 
SfxPoolItem* pState )
+void LibBoxControl::StateChanged(sal_uInt16, SfxItemState eState, const 
SfxPoolItem* pState)
 {
 LibBox* pBox = static_cast(GetToolBox().GetItemWindow(GetId()));
 
-DBG_ASSERT( pBox, "Box not found" );
-if ( !pBox )
+DBG_ASSERT(pBox, "Box not found");
+if (!pBox)
 return;
 
-if ( eState != SfxItemState::DEFAULT )
+if (eState != SfxItemState::DEFAULT)
 pBox->Disable();
 else
 {
@@ -61,92 +75,65 @@ void LibBoxControl::StateChanged( sal_uInt16, SfxItemState 
eState, const SfxPool
 }
 }
 
-
-VclPtr LibBoxControl::CreateItemWindow( vcl::Window *pParent )
+VclPtr LibBoxControl::CreateItemWindow(vcl::Window* pParent)
 {
-return VclPtr::Create( pParent );
+return VclPtr::Create(pParent);
 }
 
-
-DocListenerBox::DocListenerBox( vcl::Window* pParent )
-:ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) )
-,m_aNotifier( *this )
+DocListenerBox::DocListenerBox(vcl::Window* pParent)
+: ListBox(pParent, WinBits(WB_BORDER | WB_DROPDOWN))
+, maNotifier(*this)
 {
 }
 
-DocListenerBox::~DocListenerBox()
-{
-disposeOnce();
-}
+DocListenerBox::~DocListenerBox() { disposeOnce(); }
 
 void DocListenerBox::dispose()
 {
-m_aNotifier.dispose();
+maNotifier.dispose();
 ListBox::dispose();
 }
 
-void DocListenerBox::onDocumentCreated( const ScriptDocument& /*_rDocument*/ )
-{
-FillBox();
-}
+/// Only calls FillBox(). Parameter is not used.
+void DocListenerBox::onDocumentCreated(const ScriptDocument& /*_rDoc*/) { 
FillBox(); }
 
-void DocListenerBox::onDocumentOpened( const ScriptDocument& /*_rDocument*/ )
-{
-FillBox();
-}
+/// Only calls FillBox(). Parameter is not used.
+void DocListenerBox::onDocumentOpened(const ScriptDocument& /*_rDoc*/) { 
FillBox(); }
 
-void DocListenerBox::onDocumentSave( const ScriptDocument& /*_rDocument*/ )
-{
-// not interested in
-}
+/// Only calls FillBox(). Parameter is not used.
+void DocListenerBox::onDocumentSaveAsDone(const ScriptDocument& /*_rDoc*/) { 
FillBox(); }
 
-void DocListenerBox::onDocumentSaveDone( const ScriptDocument& /*_rDocument*/ )
-{
-// not interested in
-}
+/// Only calls FillBox(). Parameter is not used.
+void DocListenerBox::onDocumentClosed(const ScriptDocument& /*_rDoc*/) { 
FillBox(); }
 
-void DocListenerBox::onDocumentSaveAs( const ScriptDocument& /*_rDocument*/ )
-{
-// not interested in
-}
+/// Not interested in. Do nothing.
+void DocListenerBox::onDocumentSave(const ScriptDocument& /*_rDoc*/) {}
 
-void DocListenerBox::onDocumentSaveAsDone( const ScriptDocument& 
/*_rDocument*/ )
-{
-FillBox();
-}
+/// Not interested in. Do nothing.
+void DocListenerBox::onDocumentSaveDone(const ScriptDocument& /*_rDoc*/) {}
 
-void DocListenerBox::onDocumentClosed( const ScriptDocument& /*_rDocument*/ )
-{
-FillBox();
-}
+/// Not interested in. Do nothing.
+void DocListenerBox::onDocumentSaveAs(const ScriptDocument& /*_rDo

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 6 commits - include/sfx2 sd/sdi sd/source sfx2/source

[Libreoffice Gerrit user]

 include/sfx2/viewsh.hxx |  
  3 
 sd/sdi/sdraw.sdi|  
  2 
 sd/source/ui/animations/CustomAnimationDialog.cxx   |  
 26 +--
 sd/source/ui/animations/CustomAnimationDialog.hxx   |  
  6 
 sd/source/ui/animations/CustomAnimationPane.cxx |  
 12 -
 sd/source/ui/animations/CustomAnimationPane.hxx |  
  2 
 sd/source/ui/framework/configuration/Configuration.cxx  |  
 17 --
 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx |  
 11 -
 sd/source/ui/framework/tools/FrameworkHelper.cxx|  
 17 --
 sd/source/ui/func/fupage.cxx|  
 68 +++---
 sd/source/ui/inc/framework/FrameworkHelper.hxx  |  
  6 
 sd/source/ui/inc/fupage.hxx |  
  2 
 sd/source/ui/sidebar/MasterPageDescriptor.cxx   |  
  1 
 sd/source/ui/sidebar/SlideBackground.cxx|  
 10 +
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx|  
 10 -
 sfx2/source/view/viewsh.cxx |  
  2 
 16 files changed, 109 insertions(+), 86 deletions(-)

New commits:
commit d581c7723550187f5185ccd22b8c42d34cab64b4
Author: Ashod Nakashian 
AuthorDate: Wed Sep 12 20:03:11 2018 -0400
Commit: Andras Timar 
CommitDate: Thu Dec 6 09:08:16 2018 +0100

sd: support inserting background image from file via .uno:SelectBackground

The UNO command always prompted the user via file open dialog.
This change allows for passing the filename as an argument
to allow for inserting slide background programatically.

Also, hide the Insert Image button in the sidebar
since we can't use that (just yet), because
it invokes .uno:SelectBackground directly. We would
need to send LOOL a notification to invoke this on
its own end to first prompt the user for a file.

Change-Id: I20c0e33d66f8bcd72a6388e39c4ac92e64978f45
(cherry picked from commit 2118143bdd246921439ba9e835207585203dd45f)

diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 5009acb6cf0c..f5d86d97aaa3 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -4024,7 +4024,7 @@ SfxVoidItem CloseMasterView SID_CLOSE_MASTER_VIEW()
 ]
 
 SfxVoidItem SelectBackground SID_SELECT_BACKGROUND
-()
+(SfxStringItem FileName SID_SELECT_BACKGROUND,SfxStringItem FilterName 
FN_PARAM_FILTER,SfxBoolItem AsLink FN_PARAM_1,SfxStringItem Style FN_PARAM_2)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 8f05c7b90727..155d8a3e5d86 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -125,7 +125,7 @@ rtl::Reference FuPage::Create( ViewShell* pViewSh, 
::sd::Window* pWin, :
 return xFunc;
 }
 
-void FuPage::DoExecute( SfxRequest& )
+void FuPage::DoExecute(SfxRequest& rReq)
 {
 mpDrawViewShell = dynamic_cast(mpViewShell);
 DBG_ASSERT( mpDrawViewShell, "sd::FuPage::FuPage(), called without a 
current DrawViewShell!" );
@@ -141,11 +141,12 @@ void FuPage::DoExecute( SfxRequest& )
 
 if( mpPage )
 {
-// if there are no arguments given, open the dialog
-if( !mpArgs )
+// If there are no arguments given, open the dialog, or if we have 
SelectBackground params, process first.
+const SfxPoolItem* pItem;
+if (!mpArgs || mpArgs->GetItemState(SID_SELECT_BACKGROUND, true, 
&pItem) == SfxItemState::SET)
 {
 mpView->SdrEndTextEdit();
-mpArgs = ExecuteDialog(mpWindow);
+mpArgs = ExecuteDialog(mpWindow, rReq);
 }
 
 // if we now have arguments, apply them to current page
@@ -203,7 +204,7 @@ void MergePageBackgroundFilling(SdPage *pPage, SdStyleSheet 
*pStyleSheet, bool b
 }
 }
 
-const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
+const SfxItemSet* FuPage::ExecuteDialog(vcl::Window* pParent, SfxRequest& rReq)
 {
 if (!mpDrawViewShell)
 return nullptr;
@@ -302,27 +303,56 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* 
pParent )
 }
 else if (nId == SID_SELECT_BACKGROUND)
 {
-SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE), 
pParent);
+OUString aFileName;
+OUString aFilterName;
+Graphic aGraphic;
+ErrCode nError = ERRCODE_GRFILTER_OPENERROR;
+bool bAsLink = false;
 
-if( aDlg.Execute() == ERRCODE_NONE )
+const SfxItemSet* pArgs = rReq.GetArgs();
+const SfxPoolItem* pItem;
+
+if (pArgs && pArgs->GetItemState(SID_SELECT_BACKGROUND, true, &pItem) 
== SfxItemState::SET)
 {
-Graphic aGraphic;