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

[Libreoffice Gerrit user]

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

New commits:
commit 1be537ea29cd02ea01ab8ecd078135cd45c9ff40
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 09:06:39 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 5 08:48:33 2018 +0200

-Werror=return-local-addr (-with-webdav=serf)

Missing adaption after 2e142c0ee54744d35517f0b9c49a24302fb32d47 
"tdf#114227: Add
support for PAC to ucbhelper::InternetProxyDecider on Windows", found by
.

Change-Id: I5093827035a9bbc31f3d8d2262e14df55fa610aa
Reviewed-on: https://gerrit.libreoffice.org/59961
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 
(cherry picked from commit 200f88c55842a3947eb3cbc5ce05b044eb25d338)
Reviewed-on: https://gerrit.libreoffice.org/59981
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

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

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

[Libreoffice Gerrit user]

 external/libcmis/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2020bd758cc51d1eb47fdc1d6711770e064db8b6
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 16:51:19 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 5 08:16:21 2018 +0200

Update external/libcmis upstream URL

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

diff --git a/external/libcmis/README b/external/libcmis/README
index c39861a7614f..8065e7c76adc 100644
--- a/external/libcmis/README
+++ b/external/libcmis/README
@@ -1,7 +1,7 @@
 A C++ client library for the CMIS interface.
 
 From:
-[http://sourceforge.net/projects/libcmis/]
+[https://github.com/tdf/libcmis]
 
 Wikipedia (CMIS):
 Content Management Interoperability Services (CMIS) is an open standard that 
defines an
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Menu.hxx |6 ++-
 vcl/qt5/Qt5Menu.cxx |   77 ++--
 2 files changed, 72 insertions(+), 11 deletions(-)

New commits:
commit 6f3fcf10630a161dd10e80ad47b8ba90398bafaf
Author: Thorsten Behrens 
AuthorDate: Wed Sep 5 01:37:28 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Sep 5 08:08:37 2018 +0200

kde5: make disabled and hidden menu items work

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

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 412a9d9798f0..bbd18709ce51 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -68,11 +68,13 @@ class Qt5MenuItem : public SalMenuItem
 public:
 Qt5MenuItem(const SalItemParams*);
 
+Qt5Menu* mpParentMenu; // The menu into which this menu item is inserted
+Qt5Menu* mpSubMenu; // Submenu of this item (if defined)
+QAction* mpAction; // action corresponding to this item
 sal_uInt16 mnId; // Item ID
 MenuItemType mnType; // Item type
 bool mbVisible; // Item visibility.
-Qt5Menu* mpParentMenu; // The menu into which this menu item is inserted
-Qt5Menu* mpSubMenu; // Submenu of this item (if defined)
+bool mbEnabled; // Item active.
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 7e7b5a5195a9..c7abd17c30d2 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -114,6 +115,7 @@ void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu* 
pParentMenu)
 {
 // leaf menu
 QAction* pAction = pQMenu->addAction(toQString(aText));
+pSalMenuItem->mpAction = pAction;
 
pAction->setShortcut(toQString(nAccelKey.GetName(GetFrame()->GetWindow(;
 
 if (itemBits & MenuItemBits::CHECKABLE)
@@ -132,6 +134,9 @@ void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu* 
pParentMenu)
 pQAG->addAction(pAction);
 }
 
+pAction->setEnabled(pSalMenuItem->mbEnabled);
+pAction->setVisible(pSalMenuItem->mbVisible);
+
 connect(pAction, &QAction::triggered, this,
 [this, pSalMenuItem] { 
DispatchCommand(pSalMenuItem); });
 }
@@ -147,17 +152,68 @@ void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu* 
pParentMenu)
 }
 }
 
-void Qt5Menu::ShowItem(unsigned, bool) {}
+void Qt5Menu::ShowItem(unsigned nPos, bool bShow)
+{
+if (nPos < maItems.size())
+{
+Qt5MenuItem* pSalMenuItem = GetItemAtPos(nPos);
+if (pSalMenuItem->mpAction)
+pSalMenuItem->mpAction->setVisible(bShow);
+pSalMenuItem->mbVisible = bShow;
+}
+}
+
+void Qt5Menu::CheckItem(unsigned nPos, bool bChecked)
+{
+if (nPos < maItems.size())
+{
+Qt5MenuItem* pSalMenuItem = GetItemAtPos(nPos);
+if (pSalMenuItem->mpAction)
+pSalMenuItem->mpAction->setChecked(bChecked);
+}
+}
+
+void Qt5Menu::EnableItem(unsigned nPos, bool bEnable)
+{
+if (nPos < maItems.size())
+{
+Qt5MenuItem* pSalMenuItem = GetItemAtPos(nPos);
+if (pSalMenuItem->mpAction)
+pSalMenuItem->mpAction->setEnabled(bEnable);
+pSalMenuItem->mbEnabled = bEnable;
+}
+}
 
-void Qt5Menu::CheckItem(unsigned, bool) {}
+void Qt5Menu::SetItemText(unsigned, SalMenuItem* pItem, const rtl::OUString& 
rText)
+{
+Qt5MenuItem* pSalMenuItem = static_cast(pItem);
+if (pSalMenuItem->mpAction)
+pSalMenuItem->mpAction->setText(toQString(rText));
+}
 
-void Qt5Menu::EnableItem(unsigned, bool) {}
+void Qt5Menu::SetItemImage(unsigned, SalMenuItem* pItem, const Image& rImage)
+{
+BitmapEx aBmpEx(rImage.GetBitmapEx());
+Bitmap aBmp(aBmpEx.GetBitmap());
 
-void Qt5Menu::SetItemText(unsigned, SalMenuItem*, const rtl::OUString&) {}
+if (!aBmp || !aBmp.ImplGetSalBitmap())
+return;
 
-void Qt5Menu::SetItemImage(unsigned, SalMenuItem*, const Image&) {}
+// simple case, no transparency
+Qt5MenuItem* pSalMenuItem = static_cast(pItem);
+if (pSalMenuItem->mpAction)
+pSalMenuItem->mpAction->setIcon(QPixmap::fromImage(
+
*static_cast(aBmp.ImplGetSalBitmap().get())->GetQImage()));
+}
 
-void Qt5Menu::SetAccelerator(unsigned, SalMenuItem*, const vcl::KeyCode&, 
const OUString&) {}
+void Qt5Menu::SetAccelerator(unsigned, SalMenuItem* pItem, const vcl::KeyCode&,
+ const OUString& rText)
+{
+Qt5MenuItem* pSalMenuItem = static_cast(pItem);
+if (pSalMenuItem->mpAction)
+pSalMenuItem->mpAction->setShortcut(
+QKeySequence(toQString(rText), QKeySequence::PortableText));
+}
 
 void Qt5Menu::GetSystemMe

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Bitmap.hxx|1 -
 vcl/inc/qt5/Qt5Font.hxx  |3 ---
 vcl/inc/qt5/Qt5FontFace.hxx  |2 --
 vcl/inc/qt5/Qt5MainWindow.hxx|1 -
 vcl/inc/qt5/Qt5Menu.hxx  |1 -
 vcl/inc/qt5/Qt5Object.hxx|1 -
 vcl/inc/qt5/Qt5System.hxx|3 ---
 vcl/inc/qt5/Qt5Timer.hxx |1 -
 vcl/inc/qt5/Qt5VirtualDevice.hxx |1 -
 vcl/inc/qt5/Qt5Widget.hxx|1 -
 vcl/qt5/Qt5Bitmap.cxx|2 --
 vcl/qt5/Qt5Data.cxx  |1 +
 vcl/qt5/Qt5Font.cxx  |2 --
 vcl/qt5/Qt5FontFace.cxx  |2 --
 vcl/qt5/Qt5MainWindow.cxx|2 --
 vcl/qt5/Qt5Menu.cxx  |2 --
 vcl/qt5/Qt5Object.cxx|2 --
 vcl/qt5/Qt5System.cxx|3 ---
 vcl/qt5/Qt5Timer.cxx |2 --
 vcl/qt5/Qt5VirtualDevice.cxx |2 --
 vcl/qt5/Qt5Widget.cxx|2 --
 21 files changed, 1 insertion(+), 36 deletions(-)

New commits:
commit 1ddbf5c37a472c72b3b2be23381e18a9f1ad5823
Author: Thorsten Behrens 
AuthorDate: Tue Sep 4 22:56:38 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Sep 5 08:07:59 2018 +0200

kde5: cleanup cargo-culted empty dtors

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

diff --git a/vcl/inc/qt5/Qt5Bitmap.hxx b/vcl/inc/qt5/Qt5Bitmap.hxx
index c89038a28fb7..ba2ea5a2f58a 100644
--- a/vcl/inc/qt5/Qt5Bitmap.hxx
+++ b/vcl/inc/qt5/Qt5Bitmap.hxx
@@ -38,7 +38,6 @@ class VCL_DLLPUBLIC Qt5Bitmap : public SalBitmap
 public:
 Qt5Bitmap();
 Qt5Bitmap(const QImage& rQImage);
-virtual ~Qt5Bitmap() override;
 
 const QImage* GetQImage() const { return m_pImage.get(); }
 
diff --git a/vcl/inc/qt5/Qt5Font.hxx b/vcl/inc/qt5/Qt5Font.hxx
index 034cda35c2d4..de5cd16039f1 100644
--- a/vcl/inc/qt5/Qt5Font.hxx
+++ b/vcl/inc/qt5/Qt5Font.hxx
@@ -33,9 +33,6 @@ class Qt5Font final : public QFont, public LogicalFontInstance
 virtual hb_font_t* ImplInitHbFont() override;
 
 explicit Qt5Font(const PhysicalFontFace&, const FontSelectPattern&);
-
-public:
-virtual ~Qt5Font() override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx
index c653b4be6f6e..4f8f968700f9 100644
--- a/vcl/inc/qt5/Qt5FontFace.hxx
+++ b/vcl/inc/qt5/Qt5FontFace.hxx
@@ -34,8 +34,6 @@ class QFont;
 class Qt5FontFace : public PhysicalFontFace
 {
 public:
-virtual ~Qt5FontFace() override;
-
 static Qt5FontFace* fromQFont(const QFont& rFont);
 static void fillAttributesFromQFont(const QFont& rFont, FontAttributes& 
rFA);
 
diff --git a/vcl/inc/qt5/Qt5MainWindow.hxx b/vcl/inc/qt5/Qt5MainWindow.hxx
index caac2299c4bc..a2a7e184c291 100644
--- a/vcl/inc/qt5/Qt5MainWindow.hxx
+++ b/vcl/inc/qt5/Qt5MainWindow.hxx
@@ -35,7 +35,6 @@ class Qt5MainWindow : public QMainWindow
 public:
 Qt5MainWindow(Qt5Frame& rFrame, QWidget* parent = Q_NULLPTR,
   Qt::WindowFlags f = Qt::WindowFlags());
-virtual ~Qt5MainWindow() override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 4b4081e09545..412a9d9798f0 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -67,7 +67,6 @@ class Qt5MenuItem : public SalMenuItem
 {
 public:
 Qt5MenuItem(const SalItemParams*);
-virtual ~Qt5MenuItem() override;
 
 sal_uInt16 mnId; // Item ID
 MenuItemType mnType; // Item type
diff --git a/vcl/inc/qt5/Qt5Object.hxx b/vcl/inc/qt5/Qt5Object.hxx
index df62016aded1..ecfdbf7d37b2 100644
--- a/vcl/inc/qt5/Qt5Object.hxx
+++ b/vcl/inc/qt5/Qt5Object.hxx
@@ -38,7 +38,6 @@ class Qt5Object : public SalObject
 
 public:
 Qt5Object(Qt5Frame* pParent, bool bShow);
-virtual ~Qt5Object() override;
 
 virtual void ResetClipRegion() override;
 virtual void BeginSetClipRegion(sal_uLong nRects) override;
diff --git a/vcl/inc/qt5/Qt5System.hxx b/vcl/inc/qt5/Qt5System.hxx
index fbc753757b36..0d51bb29f358 100644
--- a/vcl/inc/qt5/Qt5System.hxx
+++ b/vcl/inc/qt5/Qt5System.hxx
@@ -15,9 +15,6 @@
 class Qt5System : public SalGenericSystem
 {
 public:
-Qt5System();
-virtual ~Qt5System() override;
-
 virtual unsigned int GetDisplayScreenCount() override;
 virtual tools::Rectangle GetDisplayScreenPosSizePixel(unsigned int 
nScreen) override;
 virtual int ShowNativeDialog(const OUString& rTitle, const OUString& 
rMessage,
diff --git a/vcl/inc/qt5/Qt5Timer.hxx b/vcl/inc/qt5/Qt5Timer.hxx
index 74f9ea712019..43613d8cf4a1 100644
--- a/vcl/inc/qt5/Qt5Timer.hxx
+++ b/vcl/inc/qt5/Qt5Timer.hxx
@@ -37,7 +37,6 @@ Q_SIGNALS:
 
 public:
 Qt5Timer();
-virtual ~Qt5Timer() override;
 
 virtual void Start(sal_uIntPtr nMS) override;
 virtual void Stop() override;
diff --git a/vcl/inc/qt5/Qt5VirtualDevice.hxx b/vcl/inc/qt5/Qt5VirtualDevice.hxx
index 80ed0fc

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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Frame.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 702824f66751bbb4c3d0f38035e85027c0de64c0
Author: Thorsten Behrens 
AuthorDate: Tue Sep 4 22:37:27 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Sep 5 08:07:24 2018 +0200

kde5: get focus on dialogs on open

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

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 895c9742cd89..e90ab1119a93 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -565,6 +565,7 @@ void Qt5Frame::ToTop(SalFrameToTop nFlags)
 
 if (isWindow() && !(nFlags & SalFrameToTop::GrabFocusOnly))
 pWidget->raise();
+pWidget->setFocus();
 pWidget->activateWindow();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 configure.ac  |4 
 vcl/qt5/Qt5Frame.cxx  |   30 +-
 vcl/unx/kde5/KDE5SalFrame.cxx |   16 
 vcl/unx/kde5/KDE5SalFrame.hxx |3 +++
 4 files changed, 44 insertions(+), 9 deletions(-)

New commits:
commit f970499651c85d429cc31518ed65c37c33c9936b
Author: Thorsten Behrens 
AuthorDate: Tue Sep 4 21:05:03 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Sep 5 08:06:56 2018 +0200

kde5: add screensaver disable and fixups

- call X11 screensaver disable for preso
- add SAL_NO_MOUSEGRABS check for mouse capture
- call min/max size methods on correct widget

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

diff --git a/configure.ac b/configure.ac
index b72e4fd4e8bc..0e9d452ca591 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11273,6 +11273,10 @@ then
 KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore 
-lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets 
-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network $KF5_XCB_LIBS"
 KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 
+if test "$USING_X11" = TRUE; then
+KF5_LIBS="$KF5_LIBS -lQt5X11Extras"
+fi
+
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 198c75b04b82..895c9742cd89 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -317,13 +317,23 @@ void Qt5Frame::Show(bool bVisible, bool /*bNoActivate*/)
 void Qt5Frame::SetMinClientSize(long nWidth, long nHeight)
 {
 if (!isChild())
-m_pQWidget->setMinimumSize(nWidth, nHeight);
+{
+if (m_pTopLevel)
+m_pTopLevel->setMinimumSize(nWidth, nHeight);
+else
+m_pQWidget->setMinimumSize(nWidth, nHeight);
+}
 }
 
 void Qt5Frame::SetMaxClientSize(long nWidth, long nHeight)
 {
 if (!isChild())
-m_pQWidget->setMaximumSize(nWidth, nHeight);
+{
+if (m_pTopLevel)
+m_pTopLevel->setMaximumSize(nWidth, nHeight);
+else
+m_pQWidget->setMaximumSize(nWidth, nHeight);
+}
 }
 
 void Qt5Frame::Center()
@@ -572,19 +582,21 @@ void Qt5Frame::SetPointer(PointerStyle ePointerStyle)
 
 void Qt5Frame::CaptureMouse(bool bMouse)
 {
-QWidget* const pWidget = m_pTopLevel ? m_pTopLevel : m_pQWidget;
+static const char* pEnv = getenv("SAL_NO_MOUSEGRABS");
+if (pEnv && *pEnv)
+return;
+
 if (bMouse)
-pWidget->grabMouse();
+m_pQWidget->grabMouse();
 else
-pWidget->releaseMouse();
+m_pQWidget->releaseMouse();
 }
 
 void Qt5Frame::SetPointerPos(long nX, long nY)
 {
-QWidget* const pWidget = m_pTopLevel ? m_pTopLevel : m_pQWidget;
-QCursor aCursor = pWidget->cursor();
-aCursor.setPos(pWidget->mapToGlobal(QPoint(nX, nY)));
-pWidget->setCursor(aCursor);
+QCursor aCursor = m_pQWidget->cursor();
+aCursor.setPos(m_pQWidget->mapToGlobal(QPoint(nX, nY)));
+m_pQWidget->setCursor(aCursor);
 }
 
 void Qt5Frame::Flush()
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
index dffc759d44a2..9c82f6ca53b1 100644
--- a/vcl/unx/kde5/KDE5SalFrame.cxx
+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -221,4 +222,19 @@ void KDE5SalFrame::ReleaseGraphics(SalGraphics* pSalGraph)
 m_bGraphicsInUse = false;
 }
 
+void KDE5SalFrame::StartPresentation(bool bStart)
+{
+// disable screensaver for running preso
+boost::optional aWindow;
+boost::optional aDisplay;
+if (QX11Info::isPlatformX11())
+{
+aWindow = QX11Info::appRootWindow();
+aDisplay = QX11Info::display();
+}
+
+m_ScreenSaverInhibitor.inhibit(bStart, "presentation", 
QX11Info::isPlatformX11(), aWindow,
+   aDisplay);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalFrame.hxx b/vcl/unx/kde5/KDE5SalFrame.hxx
index 6135d630adb3..e39dab65503d 100644
--- a/vcl/unx/kde5/KDE5SalFrame.hxx
+++ b/vcl/unx/kde5/KDE5SalFrame.hxx
@@ -24,6 +24,7 @@
 #undef Status
 
 #include 
+#include 
 
 #include "KDE5SalGraphics.hxx"
 
@@ -34,6 +35,7 @@ class KDE5SalFrame : public Qt5Frame
 {
 private:
 std::unique_ptr m_pKDE5Graphics;
+ScreenSaverInhibitor m_ScreenSaverInhibitor;
 bool m_bGraphicsInUse;
 
 public:
@@ -43,6 +45,7 @@ public:
 virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
 virtual void UpdateSettings(AllSettings& rSettings) override;
 
+virtual void StartPresentation(bool bStart) override;
 virtual LanguageType GetInputLanguage() override { return LANGUAGE_SYSTEM; 
}
 virtual const SystemEnvData* GetSystemData() const override { return 
nullptr; }
 

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Frame.hxx  |4 -
 vcl/qt5/Qt5Frame.cxx  |  154 +-
 vcl/qt5/Qt5Widget.cxx |3 
 vcl/unx/kde5/KDE5SalFrame.hxx |5 -
 4 files changed, 127 insertions(+), 39 deletions(-)

New commits:
commit 58069fef2d81a81f35a0a5f40441d841a5636cd0
Author: Thorsten Behrens 
AuthorDate: Tue Sep 4 09:17:11 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Sep 5 08:06:11 2018 +0200

kde5: add more missing pieces to Qt5Frame

- some cleanup
- ShowFullScreen
- ToTop/SetAlwaysOnTop
- CaptureMouse/SetPointerPos
- Beep/Flush
- ClipRegion functions

Change-Id: Ieafdbdae3f808879b9ad0ebed0fa99a2e4f7ee2e
Reviewed-on: https://gerrit.libreoffice.org/60008
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index e81add10ad1e..0eb796330e38 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -54,6 +54,8 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
 // of SvpSalGraphics (which the derived class then owns)
 SvpSalGraphics* m_pSvpGraphics;
 DamageHandler m_aDamageHandler;
+QRegion m_aRegion;
+bool m_bNullRegion;
 
 bool m_bGraphicsInUse;
 SalFrameStyleFlags m_nStyle;
@@ -128,8 +130,8 @@ public:
 virtual void SetPointer(PointerStyle ePointerStyle) override;
 virtual void CaptureMouse(bool bMouse) override;
 virtual void SetPointerPos(long nX, long nY) override;
+using SalFrame::Flush;
 virtual void Flush() override;
-virtual void Flush(const tools::Rectangle& rRect) override;
 virtual void SetInputContext(SalInputContext* pContext) override;
 virtual void EndExtTextInput(EndExtTextInputFlags nFlags) override;
 virtual OUString GetKeyName(sal_uInt16 nKeyCode) override;
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index b6ce6dc5736a..198c75b04b82 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -58,6 +58,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags 
nStyle, bool bUseCairo)
 : m_pTopLevel(nullptr)
 , m_bUseCairo(bUseCairo)
 , m_pSvpGraphics(nullptr)
+, m_bNullRegion(true)
 , m_bGraphicsInUse(false)
 , m_ePointerStyle(PointerStyle::Arrow)
 , m_bDefaultSize(true)
@@ -236,17 +237,11 @@ QWindow* Qt5Frame::windowHandle()
 
 QScreen* Qt5Frame::screen()
 {
-QWindow* winHandle = nullptr;
-
-if (m_pTopLevel)
-winHandle = m_pTopLevel->windowHandle();
+QWindow* const pWindow = windowHandle();
+if (pWindow)
+return pWindow->screen();
 else
-winHandle = m_pQWidget->windowHandle();
-
-if (winHandle)
-return winHandle->screen();
-
-return nullptr;
+return nullptr;
 }
 
 bool Qt5Frame::isMinimized()
@@ -302,9 +297,9 @@ void Qt5Frame::SetIcon(sal_uInt16 nIcon)
 
 void Qt5Frame::SetMenu(SalMenu* pMenu) { m_pSalMenu = 
static_cast(pMenu); }
 
-void Qt5Frame::DrawMenuBar() {}
+void Qt5Frame::DrawMenuBar() { /* not needed */}
 
-void Qt5Frame::SetExtendedFrameStyle(SalExtStyle /*nExtStyle*/) {}
+void Qt5Frame::SetExtendedFrameStyle(SalExtStyle /*nExtStyle*/) { /* not 
needed */}
 
 void Qt5Frame::Show(bool bVisible, bool /*bNoActivate*/)
 {
@@ -521,13 +516,47 @@ bool Qt5Frame::GetWindowState(SalFrameState* pState)
 return true;
 }
 
-void Qt5Frame::ShowFullScreen(bool /*bFullScreen*/, sal_Int32 /*nDisplay*/) {}
+void Qt5Frame::ShowFullScreen(bool bFullScreen, sal_Int32 nScreen)
+{
+assert(m_pTopLevel);
+
+if (isWindow())
+{
+QWidget* const pWidget = m_pTopLevel ? m_pTopLevel : m_pQWidget;
+pWidget->show();
+
+// do that before going fullscreen
+SetScreenNumber(nScreen);
+bFullScreen ? windowHandle()->showFullScreen() : 
windowHandle()->showNormal();
+}
+}
+
+void Qt5Frame::StartPresentation(bool)
+{
+// meh - so there's no Qt platform independent solution - defer to
+// KDE5 impl. For everyone else:
+// 
https://forum.qt.io/topic/38504/solved-qdialog-in-fullscreen-disable-os-screensaver
+}
 
-void Qt5Frame::StartPresentation(bool /*bStart*/) {}
+void Qt5Frame::SetAlwaysOnTop(bool bOnTop)
+{
+QWidget* const pWidget = m_pTopLevel ? m_pTopLevel : m_pQWidget;
+const Qt::WindowFlags flags = pWidget->windowFlags();
+if (bOnTop)
+pWidget->setWindowFlags(flags | Qt::CustomizeWindowHint | 
Qt::WindowStaysOnTopHint);
+else
+pWidget->setWindowFlags(flags & ~(Qt::CustomizeWindowHint | 
Qt::WindowStaysOnTopHint));
+pWidget->show();
+}
 
-void Qt5Frame::SetAlwaysOnTop(bool /*bOnTop*/) {}
+void Qt5Frame::ToTop(SalFrameToTop nFlags)
+{
+QWidget* const pWidget = m_pTopLevel ? m_pTopLevel : m_pQWidget;
 
-void Qt5Frame::ToTop(SalFrameToTop /*nFlags*/) {}
+if (isWindow() && !(nFlags & SalFrameToTop::GrabFocusOnly))
+pWidget->raise();
+pWidget->activateWindow();
+}
 
 void Qt5Frame::SetPointer(PointerStyle ePointer

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

[Libreoffice Gerrit user]

 sw/qa/extras/uiwriter/uiwriter2.cxx   |   39 ++
 sw/source/core/doc/DocumentRedlineManager.cxx |   22 ++
 2 files changed, 61 insertions(+)

New commits:
commit 1bbbe57dfc0b43d6b5444798d77dcdf5e4e76e49
Author: László Németh 
AuthorDate: Tue Aug 28 21:13:09 2018 +0200
Commit: László Németh 
CommitDate: Wed Sep 5 07:48:59 2018 +0200

tdf#119571 change tracking: show layout changes at paragraph join

in Show changes mode, too. Delayed update of the paragraph
layout at file saving etc. resulted invisible style changes.

All removed paragraphs get the style of the first (partially
deleted) paragraph to avoid text insertion with bad style in
the deleted area later, as in MSO (except the incomplete undo
of paragraph styles here and at other paragraph
formattings during change tracking).

Note: see also tdf#105413 for the remaining problem: style
changes after deleted paragraphs are losing in Show changes mode.

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

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 0a789a73b87d..77398885940c 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -24,10 +24,12 @@ class SwUiWriterTest2 : public SwModelTestBase
 public:
 void testTdf101534();
 void testTdf54819();
+void testTdf119571();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest2);
 CPPUNIT_TEST(testTdf101534);
 CPPUNIT_TEST(testTdf54819);
+CPPUNIT_TEST(testTdf119571);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -91,6 +93,43 @@ void SwUiWriterTest2::testTdf54819()
  getProperty(getParagraph(1), 
"ParaStyleName"));
 }
 
+void SwUiWriterTest2::testTdf119571()
+{
+load(DATA_DIRECTORY, "tdf54819.fodt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"),
+ getProperty(getParagraph(1), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString("Standard"),
+ getProperty(getParagraph(2), 
"ParaStyleName"));
+
+//turn on red-lining and show changes
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | 
RedlineFlags::ShowDelete
+  | 
RedlineFlags::ShowInsert);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// join paragraphs by removing the end of the first one with paragraph 
break
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, 
/*bBasicCall=*/false);
+pWrtShell->EndPara(/*bSelect=*/true);
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, 
/*bBasicCall=*/false);
+rtl::Reference pTransfer = new SwTransferable(*pWrtShell);
+pTransfer->Cut();
+
+// second paragraph changes its style in "Show changes" mode
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"),
+ getProperty(getParagraph(1), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"),
+ getProperty(getParagraph(2), 
"ParaStyleName"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest2);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 6838e7fc8dcd..c5b259f6aef6 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1692,6 +1692,28 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 if (pDelNode != nullptr && pTextNode != nullptr && 
pDelNode != pTextNode)
 pTextNode->CopyCollFormat( *pDelNode );
 }
+else
+{
+// tdf#119571 update the style of the joined paragraph
+// after a partially deleted paragraph to show its correct 
style
+// in "Show changes" mode, too. All removed paragraphs
+// get the style of the first (partially deleted) paragraph
+// to avoid text insertion with bad style in the deleted
+// area later.
+SwContentNode* pDelNd = 
pStt->nNode.GetNode().GetContentNode();
+SwContentNode* pTextNd = 
pEnd->nNode.GetNode().GetContentNode();
+SwTextNode*

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

[Libreoffice Gerrit user]

 sw/qa/extras/uiwriter/data2/tdf54819.fodt |9 ++
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   36 ++
 sw/source/core/doc/DocumentRedlineManager.cxx |   13 +
 3 files changed, 58 insertions(+)

New commits:
commit 22639148ae5400bac98f32a75d7431b857c80195
Author: László Németh 
AuthorDate: Tue Aug 28 18:23:17 2018 +0200
Commit: László Németh 
CommitDate: Wed Sep 5 07:41:09 2018 +0200

tdf#54819 change tracking: keep paragraph style after full deletion

of the previous paragraph(s), as in editing without change tracking.

This is a workaround for the regression introduced by #i100466#.

NOTE: We change the style of the first removed paragraph to restore
normal editing function during change tracking, too. Manual fix
of the spoiled paragraph does the same style changes in the
previously deleted paragraphs, so this commit doesn't introduce
any new oddity.

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

diff --git a/sw/qa/extras/uiwriter/data2/tdf54819.fodt 
b/sw/qa/extras/uiwriter/data2/tdf54819.fodt
new file mode 100644
index ..f9a8e9d0b698
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data2/tdf54819.fodt
@@ -0,0 +1,9 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+  
+
+  Lorem ipsum
+  dolor sit amet.
+
+  
+
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 239700294b71..0a789a73b87d 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -22,9 +23,11 @@ class SwUiWriterTest2 : public SwModelTestBase
 {
 public:
 void testTdf101534();
+void testTdf54819();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest2);
 CPPUNIT_TEST(testTdf101534);
+CPPUNIT_TEST(testTdf54819);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -55,6 +58,39 @@ void SwUiWriterTest2::testTdf101534()
 CPPUNIT_ASSERT(aSet.HasItem(RES_LR_SPACE));
 }
 
+void SwUiWriterTest2::testTdf54819()
+{
+load(DATA_DIRECTORY, "tdf54819.fodt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"),
+ getProperty(getParagraph(1), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString("Standard"),
+ getProperty(getParagraph(2), 
"ParaStyleName"));
+
+//turn on red-lining and hide changes
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE("redlines shouldn't be visible",
+   !IDocumentRedlineAccess::IsShowChanges(
+   
pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// remove first paragraph with paragraph break
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell()

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - postprocess/packcomponents salhelper/inc solenv/gbuild

[Libreoffice Gerrit user]

 postprocess/packcomponents/makefile.mk|1 -
 salhelper/inc/salhelper/simplereferenceobject.hxx |   16 ++--
 solenv/gbuild/LinkTarget.mk   |2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 1065d8ce5c66d901c0092f7a22b1f0bdd4c53526
Author: Damjan Jovanovic 
AuthorDate: Wed Sep 5 02:48:29 2018 +
Commit: Damjan Jovanovic 
CommitDate: Wed Sep 5 02:48:29 2018 +

Further fixes to get Windows building.

Use native paths when calling idlc.

Don't export all symbols from salhelper's SimpleReferenceObject
on Windows, only those we have to, as some modules fail to link
otherwise.

There is no "date" component any more, it's been renamed.

Patch by: me

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 5b9efd1c7484..d99bd879a07a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -147,7 +147,6 @@ my_components = \
 component/xmloff/source/transform/xof \
 component/xmloff/util/xo \
 component/xmlscript/util/xcr \
-date \
 dbase \
 dbp \
 dbpool2 \
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx 
b/salhelper/inc/salhelper/simplereferenceobject.hxx
index 9221e5462be5..b88591244e0e 100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -70,7 +70,11 @@ namespace salhelper {
 as missing vector delete errors stopped linking. The small consolation is
 that is a private method, so it may as well not exist. Right?
  */
+#if defined _MSC_VER
+class SimpleReferenceObject
+#else
 class SALHELPER_DLLPUBLIC SimpleReferenceObject
+#endif
 {
 public:
 inline SimpleReferenceObject() SAL_THROW(()): m_nCount(0) {}
@@ -89,25 +93,25 @@ public:
 
 /** see general class documentation
  */
-static void * operator new(std::size_t nSize) SAL_THROW((std::bad_alloc));
+SALHELPER_DLLPUBLIC static void * operator new(std::size_t nSize) 
SAL_THROW((std::bad_alloc));
 
 /** see general class documentation
  */
-static void * operator new(std::size_t nSize,
+SALHELPER_DLLPUBLIC static void * operator new(std::size_t nSize,
std::nothrow_t const & rNothrow)
 SAL_THROW(());
 
 /** see general class documentation
  */
-static void operator delete(void * pPtr) SAL_THROW(());
+SALHELPER_DLLPUBLIC static void operator delete(void * pPtr) SAL_THROW(());
 
 /** see general class documentation
  */
-static void operator delete(void * pPtr, std::nothrow_t const & rNothrow)
+SALHELPER_DLLPUBLIC static void operator delete(void * pPtr, 
std::nothrow_t const & rNothrow)
 SAL_THROW(());
 
 protected:
-virtual ~SimpleReferenceObject() SAL_THROW(());
+SALHELPER_DLLPUBLIC virtual ~SimpleReferenceObject() SAL_THROW(());
 
 private:
 oslInterlockedCount m_nCount;
@@ -130,7 +134,7 @@ private:
 /** not implemented (see general class documentation)
 @internal
  */
-static void operator delete[](void * pPtr);
+SALHELPER_DLLPUBLIC static void operator delete[](void * pPtr);
 };
 
 }
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index d71b4881e9ad..78c3f7f021c6 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -544,7 +544,7 @@ endif
 
 $(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag): $(2) $(3)
$(call gb_Output_announce,$@,$(true),PVTIDL,2)
-   -$$(call gb_Helper_abbreviate_dirs,\
+   -$$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/urd) && 
\
mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/rdb) && 
\
mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) && 
\
___
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' - sw/uiconfig

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/columnpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2fb0332c9edce317c371feafc5ae64d81c05febd
Author: Gabor Kelemen 
AuthorDate: Thu Aug 23 00:29:34 2018 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 5 05:46:00 2018 +0200

tdf#119152 Hide Text Direction dropdown from Columns tab by default

To restore behavior seen before 6.1

Change-Id: I7dd6b566b4964298a3e08c6c6dd663f87857d038
Reviewed-on: https://gerrit.libreoffice.org/59479
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 4f3dec1104a21d93d400c76ab0ae85083aec8492)
Reviewed-on: https://gerrit.libreoffice.org/59955
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/columnpage.ui 
b/sw/uiconfig/swriter/ui/columnpage.ui
index 2b85eda09491..4648d383888d 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -704,7 +704,7 @@
 
 
   
-True
+True
 False
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/popupmenu/form.xml|   37 ++--
 sd/uiconfig/sdraw/popupmenu/form.xml|6 ++-
 sd/uiconfig/simpress/popupmenu/form.xml |6 ++-
 sw/uiconfig/sglobal/popupmenu/form.xml  |   49 ++--
 sw/uiconfig/sweb/popupmenu/form.xml |   49 ++--
 sw/uiconfig/swform/popupmenu/form.xml   |   49 ++--
 sw/uiconfig/swreport/popupmenu/form.xml |   49 ++--
 sw/uiconfig/swriter/popupmenu/form.xml  |   49 ++--
 sw/uiconfig/swxform/popupmenu/form.xml  |   49 ++--
 9 files changed, 156 insertions(+), 187 deletions(-)

New commits:
commit 8bf82d47d6bd749fc0a7c5fac211be44406e9615
Author: andreas kainz 
AuthorDate: Tue Sep 4 01:13:11 2018 +0200
Commit: andreas_kainz 
CommitDate: Wed Sep 5 05:13:55 2018 +0200

tdf#119532 Contextmenu Form update

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

diff --git a/sc/uiconfig/scalc/popupmenu/form.xml 
b/sc/uiconfig/scalc/popupmenu/form.xml
index 72fc473f1443..d1875118b331 100644
--- a/sc/uiconfig/scalc/popupmenu/form.xml
+++ b/sc/uiconfig/scalc/popupmenu/form.xml
@@ -15,24 +15,11 @@
   
   
   
-  
-  
-  
   
   
   
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-
-  
+  
   
 
   
@@ -44,14 +31,22 @@
   
 
   
-  
-  
-  
+  
 
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
 
   
+  
+  
+  
+  
+  
+  
+  
 
diff --git a/sd/uiconfig/sdraw/popupmenu/form.xml 
b/sd/uiconfig/sdraw/popupmenu/form.xml
index 730778430cb0..0cf281e5eed4 100644
--- a/sd/uiconfig/sdraw/popupmenu/form.xml
+++ b/sd/uiconfig/sdraw/popupmenu/form.xml
@@ -13,6 +13,7 @@
   
   
   
+  
   
   
   
@@ -41,9 +42,10 @@
   
 
   
-  
+  
+  
+  
   
-  
   
   
   
diff --git a/sd/uiconfig/simpress/popupmenu/form.xml 
b/sd/uiconfig/simpress/popupmenu/form.xml
index 730778430cb0..0cf281e5eed4 100644
--- a/sd/uiconfig/simpress/popupmenu/form.xml
+++ b/sd/uiconfig/simpress/popupmenu/form.xml
@@ -13,6 +13,7 @@
   
   
   
+  
   
   
   
@@ -41,9 +42,10 @@
   
 
   
-  
+  
+  
+  
   
-  
   
   
   
diff --git a/sw/uiconfig/sglobal/popupmenu/form.xml 
b/sw/uiconfig/sglobal/popupmenu/form.xml
index af77788a519f..6f6533171a85 100644
--- a/sw/uiconfig/sglobal/popupmenu/form.xml
+++ b/sw/uiconfig/sglobal/popupmenu/form.xml
@@ -14,18 +14,23 @@
   
   
   
-  
-  
-  
   
   
   
   
-  
+  
+  
 
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
   
@@ -39,28 +44,18 @@
   
 
   
-  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
   
-  
+  
+  
+  
+  
   
-  
-
-  
-  
-  
-  
-
-  
+  
+  
 
diff --git a/sw/uiconfig/sweb/popupmenu/form.xml 
b/sw/uiconfig/sweb/popupmenu/form.xml
index af77788a519f..6f6533171a85 100644
--- a/sw/uiconfig/sweb/popupmenu/form.xml
+++ b/sw/uiconfig/sweb/popupmenu/form.xml
@@ -14,18 +14,23 @@
   
   
   
-  
-  
-  
   
   
   
   
-  
+  
+  
 
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
   
@@ -39,28 +44,18 @@
   
 
   
-  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
   
-  
+  
+  
+  
+  
   
-  
-
-  
-  
-  
-  
-
-  
+  
+  
 
diff --git a/sw/uiconfig/swform/popupmenu/form.xml 
b/sw/uiconfig/swform/popupmenu/form.xml
index af77788a519f..6f6533171a85 100644
--- a/sw/uiconfig/swform/popupmenu/form.xml
+++ b/sw/uiconfig/swform/popupmenu/form.xml
@@ -14,18 +14,23 @@
   
   
   
-  
-  
-  
   
   
   
   
-  
+  
+  
 
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
   
@@ -39,28 +44,18 @@
   
 
   
-  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
   
-  
+  
+  
+  
+  
   
-  
-
-  
-  
-  
-  
-
-  
+  
+  
 
diff --git a/sw/uiconfig/swreport/popupmenu/form.xml 
b/sw/uiconfig/swreport/popupmenu/form.xml
index af77788a519f..6f6533171a85 100644
--- a/sw/uiconfig/swreport/popupmenu/form.xml
+++ b/sw/uiconfig/swreport/popupmenu/form.xml
@@ -14,18 +14,23 @@
   
   
   
-  
-  
-  
   
   
   
   
-  
+  
+  
 
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
   
@@ -39,28 +44,18 @@
   
 
   
-  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
   
-  
+  
+  
+  
+  
   
-  
-
- 

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

[Libreoffice Gerrit user]

 sc/source/filter/inc/orcusinterface.hxx |   12 ++-
 sc/source/filter/orcus/interface.cxx|   97 +---
 sc/source/filter/orcus/orcusfiltersimpl.cxx |5 -
 3 files changed, 87 insertions(+), 27 deletions(-)

New commits:
commit 5e8fd488f17fe0433cc9b31ace6527fb06ea3bb0
Author: Kohei Yoshida 
AuthorDate: Tue Sep 4 20:21:26 2018 -0400
Commit: Kohei Yoshida 
CommitDate: Wed Sep 5 04:06:26 2018 +0200

tdf#116453: Pick up non-UTF8 encoding and use it for string values.

Change-Id: Ibb0455359ad41871e86a8858f6fe0c5b834bcb13
Reviewed-on: https://gerrit.libreoffice.org/60013
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index dce0d5b0a64e..cca677f9435c 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -49,6 +49,7 @@ class ScOrcusGlobalSettings : public 
orcus::spreadsheet::iface::import_global_se
 ScDocumentImport& mrDoc;
 formula::FormulaGrammar::Grammar meCalcGrammar;
 orcus::spreadsheet::formula_grammar_t meOrcusGrammar;
+rtl_TextEncoding mnTextEncoding;
 
 public:
 ScOrcusGlobalSettings(ScDocumentImport& rDoc);
@@ -63,6 +64,11 @@ public:
 {
 return meCalcGrammar;
 }
+
+rtl_TextEncoding getTextEncoding() const
+{
+return mnTextEncoding;
+}
 };
 
 class ScOrcusRefResolver : public 
orcus::spreadsheet::iface::import_reference_resolver
@@ -178,7 +184,7 @@ private:
 class ScOrcusAutoFilter : public orcus::spreadsheet::iface::import_auto_filter
 {
 public:
-ScOrcusAutoFilter();
+ScOrcusAutoFilter( const ScOrcusGlobalSettings& rGS );
 
 virtual ~ScOrcusAutoFilter() override;
 
@@ -193,6 +199,7 @@ public:
 virtual void commit() override;
 
 private:
+const ScOrcusGlobalSettings& mrGlobalSettings;
 ScRange maRange;
 };
 
@@ -339,6 +346,7 @@ public:
 class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles
 {
 private:
+ScOrcusFactory& mrFactory;
 ScDocument& mrDoc;
 
 struct font
@@ -470,7 +478,7 @@ private:
 void applyXfToItemSet(SfxItemSet& rSet, const xf& rXf);
 
 public:
-ScOrcusStyles(ScDocument& rDoc, bool bSkipDefaultStyles=false);
+ScOrcusStyles( ScOrcusFactory& rFactory, ScDocument& rDoc, bool 
bSkipDefaultStyles=false );
 
 void applyXfToItemSet(SfxItemSet& rSet, size_t xfId);
 
diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index 7b8425d3007d..44dc12201531 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -93,6 +93,7 @@ 
ScOrcusGlobalSettings::ScOrcusGlobalSettings(ScDocumentImport& rDoc)
 : mrDoc(rDoc)
 , meCalcGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED)
 , meOrcusGrammar(os::formula_grammar_t::unknown)
+, mnTextEncoding(RTL_TEXTENCODING_UTF8)
 {
 }
 
@@ -101,9 +102,56 @@ void ScOrcusGlobalSettings::set_origin_date(int year, int 
month, int day)
 mrDoc.setOriginDate(year, month, day);
 }
 
-void ScOrcusGlobalSettings::set_character_set(orcus::character_set_t /*cs*/)
+void ScOrcusGlobalSettings::set_character_set(orcus::character_set_t cs)
 {
-// TODO
+switch (cs)
+{
+case orcus::character_set_t::iso_2022_jp:
+case orcus::character_set_t::iso_2022_jp_2:
+mnTextEncoding = RTL_TEXTENCODING_ISO_2022_JP;
+break;
+case orcus::character_set_t::jis_x0201:
+mnTextEncoding = RTL_TEXTENCODING_JIS_X_0201;
+break;
+case orcus::character_set_t::shift_jis:
+mnTextEncoding = RTL_TEXTENCODING_SHIFT_JIS;
+break;
+case orcus::character_set_t::us_ascii:
+mnTextEncoding = RTL_TEXTENCODING_ASCII_US;
+break;
+case orcus::character_set_t::utf_7:
+mnTextEncoding = RTL_TEXTENCODING_UTF7;
+break;
+case orcus::character_set_t::windows_1250:
+mnTextEncoding = RTL_TEXTENCODING_MS_1250;
+break;
+case orcus::character_set_t::windows_1251:
+mnTextEncoding = RTL_TEXTENCODING_MS_1251;
+break;
+case orcus::character_set_t::windows_1252:
+mnTextEncoding = RTL_TEXTENCODING_MS_1252;
+break;
+case orcus::character_set_t::windows_1253:
+mnTextEncoding = RTL_TEXTENCODING_MS_1253;
+break;
+case orcus::character_set_t::windows_1254:
+mnTextEncoding = RTL_TEXTENCODING_MS_1254;
+break;
+case orcus::character_set_t::windows_1255:
+mnTextEncoding = RTL_TEXTENCODING_MS_1255;
+break;
+case orcus::character_set_t::windows_1256:
+mnTextEncoding = RTL_TEXTENCODING_MS_1256;
+break;
+case orcus::character_set_t::windows_1257:
+mnTextEncoding = RTL_TEXTENCODING_MS_1257;
+break;
+cas

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

[Libreoffice Gerrit user]

 icon-themes/karasa_jaga/cmd/32/acceptalltrackedchanges.png   
|binary
 icon-themes/karasa_jaga/cmd/32/accepttrackedchanges.png  
|binary
 icon-themes/karasa_jaga/cmd/32/addname.png   
|binary
 icon-themes/karasa_jaga/cmd/32/auditingfillmode.png  
|binary
 icon-themes/karasa_jaga/cmd/32/cleararrowdependents.png  
|binary
 icon-themes/karasa_jaga/cmd/32/cleararrowprecedents.png  
|binary
 icon-themes/karasa_jaga/cmd/32/cleararrows.png   
|binary
 icon-themes/karasa_jaga/cmd/32/closemasterview.png   
|binary
 icon-themes/karasa_jaga/cmd/32/commentchangetracking.png 
|binary
 icon-themes/karasa_jaga/cmd/32/dataproviderrefresh.png   
|binary
 icon-themes/karasa_jaga/cmd/32/definename.png
|binary
 icon-themes/karasa_jaga/cmd/32/deleteallnotes.png
|binary
 icon-themes/karasa_jaga/cmd/32/deletecell.png
|binary
 icon-themes/karasa_jaga/cmd/32/displaymasterbackground.png   
|binary
 icon-themes/karasa_jaga/cmd/32/drawcaption.png   
|binary
 icon-themes/karasa_jaga/cmd/32/formatcelldialog.png  
|binary
 icon-themes/karasa_jaga/cmd/32/hideallnotes.png  
|binary
 icon-themes/karasa_jaga/cmd/32/hidenote.png  
|binary
 icon-themes/karasa_jaga/cmd/32/inputlinevisible.png  
|binary
 icon-themes/karasa_jaga/cmd/32/insertcellsdown.png   
|binary
 icon-themes/karasa_jaga/cmd/32/insertcellsright.png  
|binary
 icon-themes/karasa_jaga/cmd/32/insertcolumnbreak.png 
|binary
 icon-themes/karasa_jaga/cmd/32/insertfooter.png  
|binary
 icon-themes/karasa_jaga/cmd/32/insertheader.png  
|binary
 icon-themes/karasa_jaga/cmd/32/insertlayer.png   
|binary
 icon-themes/karasa_jaga/cmd/32/insertlinebreak.png   
|binary
 icon-themes/karasa_jaga/cmd/32/insertsectionbreak.png
|binary
 icon-themes/karasa_jaga/cmd/32/insertslidenumber.png 
|binary
 icon-themes/karasa_jaga/cmd/32/insertslidesfield.png 
|binary
 icon-themes/karasa_jaga/cmd/32/insertslidetitlefield.png 
|binary
 icon-themes/karasa_jaga/cmd/32/masterpage.png
|binary
 icon-themes/karasa_jaga/cmd/32/menubar.png   
|binary
 icon-themes/karasa_jaga/cmd/32/moduledialog.png  
|binary
 icon-themes/karasa_jaga/cmd/32/nexttrackedchange.png 
|binary
 icon-themes/karasa_jaga/cmd/32/outputqualityblackwhite.png   
|binary
 icon-themes/karasa_jaga/cmd/32/outputqualitycolor.png
|binary
 icon-themes/karasa_jaga/cmd/32/outputqualitygrayscale.png
|binary
 icon-themes/karasa_jaga/cmd/32/pagemode.png  
|binary
 icon-themes/karasa_jaga/cmd/32/paralefttoright.png   
|binary
 icon-themes/karasa_jaga/cmd/32/pararighttoleft.png   
|binary
 icon-themes/karasa_jaga/cmd/32/pastespecial.png  
|binary
 icon-themes/karasa_jaga/cmd/32/pasteunformatted.png  
|binary
 icon-themes/karasa_jaga/cmd/32/previoustrackedchange.png 
|binary
 icon-themes/karasa_jaga/cmd/32/protecttracechangemode.png
|binary
 icon-themes/karasa_jaga/cmd/32/rejectalltrackedchanges.png   
|binary
 icon-themes/karasa_jaga/cmd/32/savebackground.png
|binary
 icon-themes/karasa_jaga/cmd/32/selectbackground.png  
|binary
 icon-themes/karasa_jaga/cmd/32/sharedocument.png 
|binary
 icon-themes/karasa_jaga/cmd/32/showallnotes.png  
|binary
 icon-themes/karasa_jaga/cmd/32/showdependents.png
|binary
 icon-themes/karasa_jaga/cmd/32/showerrors.png
|binary
 icon-themes/karasa_jaga/cmd/32/showfmexplorer.png
|binary
 icon-themes/karasa_jaga/cmd/32/showinvalid.png   
|binary
 icon-themes/karasa_jaga/cmd/32/showprecedents.png
|binary
 icon-themes/karasa_jaga/cmd/32/showtrackedchanges.png
|binary
 icon-themes/karasa_jaga/cmd/32/solverdialog.png  
|binary
 icon-themes/karasa_jaga/cmd/32/titlepagedialog.png   
|binary
 icon-themes/karasa_jaga/cmd/32/toolprotectiondocument.png
|binary
 icon-themes/karasa_jaga/cmd/32/updatecurindex.png
|binary
 icon-themes/karasa_jaga/cmd/32/verticalcaption.png   
|binary
 icon-themes/karasa

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

[Libreoffice Gerrit user]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   20 -
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   20 +
 sc/uiconfig/scalc/menubar/menubar.xml|  163 
+-
 3 files changed, 107 insertions(+), 96 deletions(-)

New commits:
commit 5d7e9ce7dfae4c53bd3eea3f23f987f8682752b7
Author: Maxim Monastirsky 
AuthorDate: Mon Sep 3 12:17:33 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Wed Sep 5 01:47:55 2018 +0200

Revert "Menubar Calc: update sheet menuentry according to table in writer"

This reverts commit 94787b2f8457156c4c9a906717a2b48709ecea91.
This reverts commit a96351eda8b18168a7dd1ae4824e4364f2938e5b.
This reverts commit e68783344a88b827c5fe6a0fd1174b36d75d4d3c.

Change-Id: I726ec48d996ad13f209ce1d139d88401d4d27ddb
Reviewed-on: https://gerrit.libreoffice.org/59930
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 67c85f9814c3..1837e3e42bc9 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2508,26 +2508,6 @@
   1
 
   
-  
-
-  ~Insert
-
-  
-  
-
-  ~Delete
-
-  
-  
-
-  ~Select
-
-  
-  
-
-  Si~ze
-
-  
   
 
   Vertical Callouts
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 5856bb024d17..b185aac57576 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2677,6 +2677,26 @@
   T~able
 
   
+  
+
+  ~Insert
+
+  
+  
+
+  ~Delete
+
+  
+  
+
+  ~Select
+
+  
+  
+
+  Si~ze
+
+  
   
 
   ~Convert
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 3491634a58aa..35d099157f0a 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -95,6 +95,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -114,21 +131,10 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 
 
 
 
-
 
 
 
@@ -381,6 +387,30 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -388,11 +418,7 @@
 
 
 
-
 
-
-
-
 
 
 
@@ -413,6 +439,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -484,60 +515,41 @@
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
 
 
-
+
 
-
-
-
-
-
-
-
+
+
 
 
-
+

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

[Libreoffice Gerrit user]

 include/test/table/xcell.hxx  |   37 +++
 qadevOOo/Jar_OOoRunner.mk |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv |6 
 qadevOOo/tests/java/ifc/table/_XCell.java |  157 --
 sc/qa/extras/sccellobj.cxx|8 
 test/Library_subsequenttest.mk|1 
 test/source/table/xcell.cxx   |   80 +++
 7 files changed, 126 insertions(+), 164 deletions(-)

New commits:
commit 6914ad12af3c9f51fa33d733b3355694e0254cdc
Author: Rahul Gurung 
AuthorDate: Sun Sep 2 11:36:24 2018 +0530
Commit: Jens Carl 
CommitDate: Wed Sep 5 00:47:36 2018 +0200

tdf#45904 Move _XCell Java tests to C++

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

diff --git a/include/test/table/xcell.hxx b/include/test/table/xcell.hxx
new file mode 100644
index ..a0249aac9163
--- /dev/null
+++ b/include/test/table/xcell.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef INCLUDED_TEST_TABLE_XCELL_HXX
+#define INCLUDED_TEST_TABLE_XCELL_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XCell
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetError();
+void testGetType();
+void testSetGetFormula();
+void testSetGetValue();
+
+protected:
+~XCell() {}
+};
+}
+
+#endif // INCLUDED_TEST_TABLE_XCELL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 4aba76420ecb..c096f498c63a 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -587,7 +587,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/table/_TableColumn \
 qadevOOo/tests/java/ifc/table/_TableRow \
 qadevOOo/tests/java/ifc/table/_XAutoFormattable \
-qadevOOo/tests/java/ifc/table/_XCell \
 qadevOOo/tests/java/ifc/table/_XCellRange \
 qadevOOo/tests/java/ifc/table/_XColumnRowRange \
 qadevOOo/tests/java/ifc/table/_XTableChart \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
index aab8c8f92f01..b936c50045d4 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
@@ -126,12 +126,6 @@
 "ScCellObj";"com::sun::star::sheet::XCellRangesQuery";"queryIntersection()"
 "ScCellObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScCellObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScCellObj";"com::sun::star::table::XCell";"getFormula()"
-"ScCellObj";"com::sun::star::table::XCell";"setFormula()"
-"ScCellObj";"com::sun::star::table::XCell";"getValue()"
-"ScCellObj";"com::sun::star::table::XCell";"setValue()"
-"ScCellObj";"com::sun::star::table::XCell";"getType()"
-"ScCellObj";"com::sun::star::table::XCell";"getError()"
 "ScCellObj";"com::sun::star::text::XTextRange";"getText()"
 "ScCellObj";"com::sun::star::text::XTextRange";"getStart()"
 "ScCellObj";"com::sun::star::text::XTextRange";"getEnd()"
diff --git a/qadevOOo/tests/java/ifc/table/_XCell.java 
b/qadevOOo/tests/java/ifc/table/_XCell.java
deleted file mode 100644
index e81776c974db..
--- a/qadevOOo/tests/java/ifc/table/_XCell.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.table;
-
-import lib.MultiMethodTest;
-import util.utils;
-
-import com.sun.star.table.CellContentType;
-import com.sun.star.table.XCell;
-
-
-/**
-* Testing com.sun.star.table.XCell
-* interface methods :
-* 
-*   getFormu

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

[Libreoffice Gerrit user]

 cui/source/tabpages/page.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 6a3300fdf65b91350d2c8f63c57cab2c38c3c828
Author: Caolán McNamara 
AuthorDate: Mon Sep 3 10:09:55 2018 +0100
Commit: Maxim Monastirsky 
CommitDate: Wed Sep 5 00:35:37 2018 +0200

Resolves: tdf#119574 set specific width for style list widget

so super wide style name doesn't break things

Change-Id: I096eb1d3deeb935b43566b4d3ccb45d89ac2a56a
Reviewed-on: https://gerrit.libreoffice.org/59929
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: Maxim Monastirsky 

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index df36ebf3a12d..054bc8fb16ed 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -183,6 +183,8 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, 
const SfxItemSet& rAttr)
 , m_xPrintRangeQueryText(m_xBuilder->weld_label("labelMsg"))
 , m_xBspWin(new weld::CustomWeld(*m_xBuilder, "drawingareaPageDirection", 
m_aBspWin))
 {
+
m_xRegisterLB->set_size_request(m_xRegisterLB->get_approximate_digit_width() * 
20, -1);
+
 bBorderModified = false;
 m_aBspWin.EnableRTL(false);
 
@@ -1425,8 +1427,10 @@ void SvxPageDescPage::SetCollectionList(const 
std::vector &aList)
 OSL_ENSURE(!aList.empty(), "Empty string list");
 
 sStandardRegister = aList[0];
+m_xRegisterLB->freeze();
 for (size_t i = 1; i < aList.size(); ++i)
 m_xRegisterLB->append_text(aList[i]);
+m_xRegisterLB->thaw();
 
 m_xRegisterCB->show();
 m_xRegisterFT->show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

Hi guys,

Prototype agenda below, bug metrics also at the link below;
extra items appreciated as last-week:

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

Lets use the new TDF jitsi goodness this week at:

http://jitsi.documentfoundation.org/esc

ATB,

Michael.

* Completed Action Items:

* Pending Action Items:
+ default bitergia filter for master + libreoffice-* (Christian)
[ should be possible to add raw data to filter command (Christian) ]
  
* Release Engineering update (Christian)
+ 6.0.7 – due in October
+ 6.1.1 RC2 status
  + RC2 next week
+ 6.1.2 shortened cycle to just one RC, since otherwise 6.1.1 would overlap 
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
246(246) (topicUI) bugs open, 295(295) (needsUXEval)
+ Updates:
BZ changes   1 week1 month3 months   12 months  
 added  8(-3) 21(1)  36(2)   99(2)  
 commented 52(-14)   141(-10)   363(6) 1650(-33)
   removed  0(0)   0(0)   1(0)9(0)  
  resolved  2(-1)  9(-4) 31(1)  145(0)  
+ top 10 contributors:
  Kainz, Andreas made 120 changes in 1 month, and 162 changes in 1 year
  Tietze, Heiko made 53 changes in 1 month, and 603 changes in 1 year
  Xisco Faulí made 27 changes in 1 month, and 317 changes in 1 year
  Thomas Lendo made 21 changes in 1 month, and 216 changes in 1 year
  Monastirsky, Maxim made 19 changes in 1 month, and 57 changes in 1 
year
  dieterp made 12 changes in 1 month, and 134 changes in 1 year
  Foote, V Stuart made 12 changes in 1 month, and 254 changes in 1 year
  Nabet, Julien made 12 changes in 1 month, and 35 changes in 1 year
  Kaganski, Mike made 9 changes in 1 month, and 73 changes in 1 year
  kompilainenn made 7 changes in 1 month, and 36 changes in 1 year
  + menu reorganization: depth of rational ...
+ comments in 

* Crash Testing
+ 0(-1) import failure, 38(+36) export failures
+ ?? 5 coverity issues
+ Google / ossfuzz: down for a while, build fixed again
  - ?? 5 issues, 1 serious
  - build fixed now again
+ ?? ForcePoint, round 9
  - 38 issues, 5 unfixed, all writer layout
  - complicated, no progress this week
- perhaps will just throw an exception for the corner-case...
  
* Crash Reporting (Xisco)
+ ??
+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
 + 459 (last 7 days) (+25)
+ http://crashreport.libreoffice.org/stats/version/6.0.4.2
 + 776 731 (last 7 days) (+45)
+ http://crashreport.libreoffice.org/stats/version/6.0.5.2
 + 1018 (last 7 days) (-24)
+ http://crashreport.libreoffice.org/stats/version/6.0.6.2
 + 540 (last 7 days) (+106)

+ http://crashreport.libreoffice.org/stats/version/6.1.0.3
 + 2177 1626 (last 7 days) (+551)
 + top 1 - new crash in 6.1.0.3 in GL – looks like locking
   + epoxy upgrade on master didn’t fix tdf#119028
   + probably not worth backporting to 6.1
   + aware of no reproducer steps at the moment 
 + top 3 – regression since 6.1.

* Hackfests & Events
   + nextCloud conference
   + FrOScon in Bonn: Aug 25
  + Bubli, Thorsten, Cloph, Rene
  + was pretty nice, 2 talks, 7-8 contributors there
   + Munich (Thorsten)
  + Oct 26-28th, CIB main office
  + an Open Gov’t meeting from the City of Munich
  + good to have a hack-fest back-to-back there.
   + Conference – September 26 - 28
   + DINAcon - Bern / Switzerland – Hackfest ~October 19th (Michael)

* mentoring/easyhack update
  committer...   1 week  1 month  3 months  12 months   
  open   86(6)  130(-11)  132(-10)  143(-10)
   reviews 1263(29)4509(-231)   13498(529)26827(503)
merged  250(-42)   1227(-35) 3891(-31)14644(39) 
 abandoned8(0)   38(0)157(-8)   944(-9) 
   own commits  201(-75)989(-55) 3353(-139)   15410(-96)
review commits   74(-7) 294(-31)  980(0)   3712(-4) 
contributor...   1 week1 month3 months 12 months
  open  15(-5)51(-20) 51(-21)   55(-20) 
   reviews 102(36)   265(3) 1029(-611)   25686(-513)
merged  44(30)   117(-2) 415(12)  1691(16)  
 abandoned   9(3) 22(4)   73(-6)   322(-6)  
   own commits  50(18)   144(-22)485(16)  1536(32)  
review commits   0(0)  0(0)0(0)  0(0)   
+ easyHack statistics:
   needsDevEval 53(53)   needsUXEval 2(2)   cleanup_comments 220(22

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - external/libcmis

[Libreoffice Gerrit user]

 external/libcmis/UnpackedTarball_libcmis.mk |1 +
 external/libcmis/boost-1.68.patch.0 |   15 +++
 2 files changed, 16 insertions(+)

New commits:
commit af17b06f657257c6bfee19c1d8d1c4b632fbcc2a
Author: rezso 
AuthorDate: Tue Sep 4 01:18:10 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Sep 4 21:37:26 2018 +0200

tdf#119344 fix libcmis build with boost 1.68

Change-Id: I80d6ea8ecd001dc02b941c1eb8974c9244316045
Reviewed-on: https://gerrit.libreoffice.org/59958
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3ef3569c4ae1c5319aff0664d52cbd8a8d42c909)
Reviewed-on: https://gerrit.libreoffice.org/59971
Reviewed-by: Thorsten Behrens 

diff --git a/external/libcmis/UnpackedTarball_libcmis.mk 
b/external/libcmis/UnpackedTarball_libcmis.mk
index 8ce0b03d10c4..0ec8f5182edc 100644
--- a/external/libcmis/UnpackedTarball_libcmis.mk
+++ b/external/libcmis/UnpackedTarball_libcmis.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcmis, \

external/libcmis/libcmis-sharepoint-repository-root.patch \

external/libcmis/libcmis-fix-error-handling.patch \
external/libcmis/c++17.patch.0 \
+   
external/libcmis/boost-1.68.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/libcmis/boost-1.68.patch.0 
b/external/libcmis/boost-1.68.patch.0
new file mode 100644
index ..2d86a4db2865
--- /dev/null
+++ b/external/libcmis/boost-1.68.patch.0
@@ -0,0 +1,15 @@
+--- src/libcmis/xml-utils.cxx.orig 2016-03-01 16:14:26 UTC
 src/libcmis/xml-utils.cxx
+@@ -31,7 +31,12 @@
+ #include 
+ #include 
+ 
++#include 
++#if (BOOST_VERSION >= 106800)
++#include 
++#else
+ #include 
++#endif
+ #include 
+ 
+ #include "xml-utils.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/CppunitTest_sw_ww8export3.mk   |   58 ++
 sw/Module_sw.mk   |1 
 sw/qa/extras/ww8export/data/tdf94009_zeroPgMargin.odt |binary
 sw/qa/extras/ww8export/ww8export3.cxx |   43 +
 sw/source/filter/ww8/ww8atr.cxx   |2 
 5 files changed, 104 insertions(+)

New commits:
commit efd316b6171b9e1827c5e34ddb12658f48268e24
Author: Justin Luth 
AuthorDate: Tue Sep 4 09:38:42 2018 +0300
Commit: Justin Luth 
CommitDate: Tue Sep 4 21:30:19 2018 +0200

tdf#94009 ww8export: always export section margins

Since the internal SW defaults (0) don't match the import
defaults, always write the top/bottom, left/right margins
into the document definition.

It is very rare indeed to have a zero margin anyway, since
the page margin being zero is highly discouraged because
of printing. The bug report is for DOCX, but it also
affects DOC.

I don't have an example where LRSpace is skipped, but it
only makes sense to treat these two the same just in case.

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

diff --git a/sw/CppunitTest_sw_ww8export3.mk b/sw/CppunitTest_sw_ww8export3.mk
new file mode 100644
index ..564f344d7297
--- /dev/null
+++ b/sw/CppunitTest_sw_ww8export3.mk
@@ -0,0 +1,58 @@
+# -*- 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,sw_ww8export3))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_ww8export3, \
+sw/qa/extras/ww8export/ww8export3 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_ww8export3, \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
+sal \
+sfx \
+test \
+unotest \
+utl \
+sw \
+tl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_ww8export3,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_ww8export3,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/qa/extras/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_ww8export3,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_ww8export3))
+$(eval $(call gb_CppunitTest_use_vcl,sw_ww8export3))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_ww8export3,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_ww8export3))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index c3feaa8feb5b..cafeb93af03b 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_ooxmlimport2 \
 CppunitTest_sw_ww8export \
 CppunitTest_sw_ww8export2 \
+CppunitTest_sw_ww8export3 \
 CppunitTest_sw_ww8import \
 CppunitTest_sw_rtfexport \
 CppunitTest_sw_rtfexport2 \
diff --git a/sw/qa/extras/ww8export/data/tdf94009_zeroPgMargin.odt 
b/sw/qa/extras/ww8export/data/tdf94009_zeroPgMargin.odt
new file mode 100644
index ..e3143ec049f5
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf94009_zeroPgMargin.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
new file mode 100644
index ..8adc21445a6d
--- /dev/null
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/extras/ww8export/data/", "MS Word 97")
+{
+}
+
+bool mustTestImportOf(const char* filename) const override
+{
+// If the testcase is stored in some other format, it's pointless to 
test.
+return OString(filename).endsWith(".doc");
+}
+};
+DECLARE_WW8EXPORT_TEST(testTdf94009_zeroPgMargin, "tdf94009_zeroPgMargin.odt")
+{
+uno::Reference 
defaultStyle(getStyles("PageStyles")->getByName("Standard"),
+  

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

[Libreoffice Gerrit user]

 salhelper/inc/salhelper/simplereferenceobject.hxx |4 
 salhelper/source/simplereferenceobject.cxx|6 ++
 2 files changed, 10 insertions(+)

New commits:
commit 1a06b0a46509dca80846592d48841aff4bbfe6b8
Author: Damjan Jovanovic 
AuthorDate: Tue Sep 4 16:52:58 2018 +
Commit: Damjan Jovanovic 
CommitDate: Tue Sep 4 16:52:58 2018 +

Windows really really wants a vector delete operator in salhelper's

simplereferenceobject, and won't link without it, so give it one
but keep it private so subclasses (hopefuly) can't use it, as intended.

Patch by: me

diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx 
b/salhelper/inc/salhelper/simplereferenceobject.hxx
index e567ea85635e..9221e5462be5 100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -65,6 +65,10 @@ namespace salhelper {
 operators new[] and delete[].  But since arrays of reference-counted
 objects are of no use, anyway, it seems best to simply declare and not
 define (private) operators new[] and delete[].
+
+Note how during the move to gbuild, the delete[] had to be implemented,
+as missing vector delete errors stopped linking. The small consolation is
+that is a private method, so it may as well not exist. Right?
  */
 class SALHELPER_DLLPUBLIC SimpleReferenceObject
 {
diff --git a/salhelper/source/simplereferenceobject.cxx 
b/salhelper/source/simplereferenceobject.cxx
index 7b0c9938d0dc..6ae041447f18 100644
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
@@ -68,3 +68,9 @@ void SimpleReferenceObject::operator delete(void * pPtr, 
std::nothrow_t const &)
 ::operator delete(pPtr, std::nothrow);
 #endif // WNT
 }
+
+void SimpleReferenceObject::operator delete[](void * pPtr)
+SAL_THROW(())
+{
+::operator delete[](pPtr);
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 external/libcmis/UnpackedTarball_libcmis.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit aa978430637448effd2b94dbedd561c1c7a52f42
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 17:44:12 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 4 20:02:15 2018 +0200

Record external/libcmis/xwwwformurlencoded.patch.0 as sent upstream

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

diff --git a/external/libcmis/UnpackedTarball_libcmis.mk 
b/external/libcmis/UnpackedTarball_libcmis.mk
index 8944fc024bc6..e7731b631dad 100644
--- a/external/libcmis/UnpackedTarball_libcmis.mk
+++ b/external/libcmis/UnpackedTarball_libcmis.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libcmis,$(LIBCMIS_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libcmis,1))
 
+# xwwwformurlencoded.patch.0 sent upstream as 

 $(eval $(call gb_UnpackedTarball_add_patches,libcmis, \

external/libcmis/libcmis-libxml2_compatibility.patch \

external/libcmis/libcmis-fix-google-drive.patch \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 external/libcmis/UnpackedTarball_libcmis.mk |1 
 external/libcmis/xwwwformurlencoded.patch.0 |   59 
 2 files changed, 60 insertions(+)

New commits:
commit 33f7485dedea90e0f80c6348fa8ac5f27c5052e0
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 16:45:00 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 4 20:00:38 2018 +0200

Properly encode OAuth2 credentials

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

diff --git a/external/libcmis/UnpackedTarball_libcmis.mk 
b/external/libcmis/UnpackedTarball_libcmis.mk
index 0ec8f5182edc..8944fc024bc6 100644
--- a/external/libcmis/UnpackedTarball_libcmis.mk
+++ b/external/libcmis/UnpackedTarball_libcmis.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcmis, \

external/libcmis/libcmis-fix-error-handling.patch \
external/libcmis/c++17.patch.0 \

external/libcmis/boost-1.68.patch.0 \
+   
external/libcmis/xwwwformurlencoded.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/libcmis/xwwwformurlencoded.patch.0 
b/external/libcmis/xwwwformurlencoded.patch.0
new file mode 100644
index ..b9f779cc6e80
--- /dev/null
+++ b/external/libcmis/xwwwformurlencoded.patch.0
@@ -0,0 +1,59 @@
+--- src/libcmis/oauth2-providers.cxx
 src/libcmis/oauth2-providers.cxx
+@@ -26,6 +26,8 @@
+  * instead of those above.
+  */
+ 
++#include 
++
+ #include 
+ #include 
+ 
+@@ -45,6 +47,29 @@
+ #define HTML_PARSE_RECOVER 0
+ #endif
+ 
++namespace {
++
++// See :
++void addXWwwFormUrlencoded(std::string * buffer, std::string const & data) {
++assert(buffer);
++for (string::const_iterator i = data.begin(); i != data.end(); ++i) {
++unsigned char c = static_cast(*i);
++if (c == ' ' || c == '*' || c == '-' || c == '.' || (c >= '0' && c <= 
'9')
++|| (c >= 'A' && c <= 'Z') || c == '_' || (c >= 'a' && c <= 'z'))
++{
++*buffer += static_cast(c);
++} else {
++static const char hex[16] = {
++'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 
'C', 'D', 'E', 'F'};
++*buffer += '%';
++*buffer += hex[c >> 4];
++*buffer += hex[c & 0xF];
++}
++}
++}
++
++}
++
+ string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& 
authUrl,
+   const string& username, const string& 
password )
+ {
+@@ -97,7 +120,7 @@
+ return string( );
+ 
+ loginEmailPost += "Email=";
+-loginEmailPost += string( username );
++addXWwwFormUrlencoded(&loginEmailPost, username);
+ 
+ istringstream loginEmailIs( loginEmailPost );
+ string loginEmailRes;
+@@ -119,7 +142,7 @@
+ return string( );
+ 
+ loginPasswdPost += "Passwd=";
+-loginPasswdPost += string( password );
++addXWwwFormUrlencoded(&loginPasswdPost, password);
+ 
+ istringstream loginPasswdIs( loginPasswdPost );
+ string loginPasswdRes;
___
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/salfont.cxx |   38 ++
 1 file changed, 18 insertions(+), 20 deletions(-)

New commits:
commit 7e7a1ff3926e86705199aa9814089e90f01c02ed
Author: Jan-Marek Glogowski 
AuthorDate: Tue Sep 4 17:24:03 2018 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Tue Sep 4 19:20:53 2018 +0200

tdf#119340 WIN don't always re-init the HFONT

After all the LogicalFontInstance refactoring, its FontSelectData
is now immutable, so the HFONT will never need to be changed.
Therefore we can skip the HFONT lookup in WinSalGraphics::SetFont,
if the WinFontInstance already has it set.

All the HFONT handling (basically WinSalGraphics::ImplDoSetFont)
should be moved to the WinFontInstance to further clean this up.

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

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 969cefd17279..8c1a6651bbd5 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -851,11 +851,6 @@ HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern 
const & i_rFont,
 g_BoundRectCache.clear();
 HFONT hNewFont = nullptr;
 
-HDC hdcScreen = nullptr;
-if( mbVirDev )
-// only required for virtual devices, see below for details
-hdcScreen = GetDC(nullptr);
-
 LOGFONTW aLogFont;
 ImplGetLogFontFromFontSelect( getHDC(), i_rFont, i_pFontFace, aLogFont );
 
@@ -878,8 +873,12 @@ HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern 
const & i_rFont,
 aLogFont.lfWidth = +MAXFONTHEIGHT;
 aLogFont.lfHeight = FRound( aLogFont.lfHeight / o_rFontScale );
 }
-
 hNewFont = ::CreateFontIndirectW( &aLogFont );
+
+HDC hdcScreen = nullptr;
+if( mbVirDev )
+// only required for virtual devices, see below for details
+hdcScreen = GetDC(nullptr);
 if( hdcScreen )
 {
 // select font into screen hdc first to get an antialiased font
@@ -934,12 +933,18 @@ void WinSalGraphics::SetFont(LogicalFontInstance* pFont, 
int nFallbackLevel)
 return;
 }
 
-// WinSalGraphics::GetEmbedFontData does not set mpFontInstance
-// since it is interested in font file data only.
-mpWinFontEntry[ nFallbackLevel ] = 
reinterpret_cast(pFont);
+mpWinFontEntry[ nFallbackLevel ] = static_cast(pFont);
 
 HFONT hOldFont = nullptr;
-HFONT hNewFont = ImplDoSetFont(pFont->GetFontSelectPattern(), 
pFont->GetFontFace(), mfFontScale[ nFallbackLevel ], hOldFont);
+HFONT hNewFont = mpWinFontEntry[ nFallbackLevel ]->GetHFONT();
+if (!hNewFont)
+{
+hNewFont = ImplDoSetFont(pFont->GetFontSelectPattern(), 
pFont->GetFontFace(), mfFontScale[ nFallbackLevel ], hOldFont);
+mpWinFontEntry[ nFallbackLevel ]->SetHFONT(hNewFont);
+}
+else
+hOldFont = ::SelectFont( getHDC(), hNewFont );
+
 mfCurrentFontScale = mfFontScale[nFallbackLevel];
 
 if( !mhDefFont )
@@ -962,16 +967,9 @@ void WinSalGraphics::SetFont(LogicalFontInstance* pFont, 
int nFallbackLevel)
 }
 }
 
-// store new font in correct layer
-if (mpWinFontEntry[nFallbackLevel])
-{
-mpWinFontEntry[nFallbackLevel]->SetHFONT(hNewFont);
-// now the font is live => update font face
-const WinFontFace* pFontFace = static_cast(mpWinFontEntry[nFallbackLevel]->GetFontFace());
-pFontFace->UpdateFromHDC(getHDC());
-}
-else
-mhFonts[ nFallbackLevel ] = hNewFont;
+// now the font is live => update font face
+const WinFontFace* pFontFace = static_cast(mpWinFontEntry[nFallbackLevel]->GetFontFace());
+pFontFace->UpdateFromHDC(getHDC());
 }
 
 void WinSalGraphics::GetFontMetric( ImplFontMetricDataRef& rxFontMetric, int 
nFallbackLevel )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 7 commits - solenv/gbuild sw/inc sw/qa sw/source

[Libreoffice Gerrit user]

 solenv/gbuild/CppunitTest.mk|7 +-
 solenv/gbuild/PythonTest.mk |2 
 sw/inc/docary.hxx   |4 -
 sw/qa/core/uwriter.cxx  |   55 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +
 sw/source/core/doc/DocumentRedlineManager.cxx   |2 
 sw/source/core/doc/docredln.cxx |   55 +---
 sw/source/core/undo/unovwr.cxx  |   19 +++--
 8 files changed, 103 insertions(+), 47 deletions(-)

New commits:
commit 22b5ee853e8ecf8a1542d4c54267b68e0ab4d4ac
Author: Michael Stahl 
AuthorDate: Tue Sep 4 18:59:01 2018 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 4 19:05:39 2018 +0200

sw: SwDocTest: adjust this so it actually tests something interesting

* test more than 1 paragraph, by calling SplitNode()
* enable Undo, because that's the more usual situation
* remove one mode that is identical to the previous one
* use SwUnoCursor because plain SwCursor isn't corrected when nodes
  are deleted
* create a selection before calling Delete functions

Change-Id: If406bd8c37b005e431fbaebe82f297b051da1ed3

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 1a6d18d35c3a..cc95e3ce1da2 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -35,6 +35,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1067,7 +1068,6 @@ void SwDocTest::randomTest()
 RedlineFlags::NONE,
 RedlineFlags::On | RedlineFlags::ShowMask,
 RedlineFlags::On | RedlineFlags::Ignore,
-RedlineFlags::On | RedlineFlags::Ignore | RedlineFlags::ShowMask,
 RedlineFlags::On | RedlineFlags::ShowInsert,
 RedlineFlags::On | RedlineFlags::ShowDelete
 };
@@ -1077,6 +1077,7 @@ void SwDocTest::randomTest()
 
 for( size_t rlm = 0; rlm < SAL_N_ELEMENTS(modes); rlm++ )
 {
+m_pDoc->GetIDocumentUndoRedo().DoUndo(true);
 m_pDoc->ClearDoc();
 
 // setup redlining
@@ -1085,15 +1086,31 @@ void SwDocTest::randomTest()
 
 for( int i = 0; i < 2000; i++ )
 {
-SwCursor aCrs(getRandomPosition(m_pDoc, i/20), nullptr);
-aCrs.SetMark();
+std::shared_ptr pCrs(
+m_pDoc->CreateUnoCursor(getRandomPosition(m_pDoc, i/20)));
 
 switch (getRand (i < 50 ? 3 : 6)) {
 // insert ops first
 case 0: {
-if 
(!m_pDoc->getIDocumentContentOperations().InsertString(aCrs, getRandString())) {
-//fprintf (stderr, "failed to insert string !\n");
+OUString const tmp(getRandString());
+sal_Int32 current(0);
+sal_Int32 nextBreak(tmp.indexOf('\n'));
+do
+{
+sal_Int32 const len((nextBreak == -1 ? tmp.getLength() : 
nextBreak - current));
+if (0 < len)
+{
+m_pDoc->getIDocumentContentOperations().InsertString(
+*pCrs, tmp.copy(current, len));
+}
+if (nextBreak != -1)
+{
+
m_pDoc->getIDocumentContentOperations().SplitNode(*pCrs->GetPoint(), false);
+current = nextBreak + 1;
+nextBreak = tmp.indexOf('\n', current);
+}
 }
+while (nextBreak != -1);
 break;
 }
 case 1:
@@ -1106,19 +1123,27 @@ void SwDocTest::randomTest()
 
 // movement / deletion ops later
 case 3: // deletion
+pCrs->SetMark();
 switch (getRand(6)) {
 case 0:
-m_pDoc->getIDocumentContentOperations().DelFullPara(aCrs);
+*pCrs->GetMark() = getRandomPosition(m_pDoc, 42);
+m_pDoc->getIDocumentContentOperations().DelFullPara(*pCrs);
 break;
 case 1:
-m_pDoc->getIDocumentContentOperations().DeleteRange(aCrs);
+*pCrs->GetMark() = getRandomPosition(m_pDoc, 42);
+m_pDoc->getIDocumentContentOperations().DeleteRange(*pCrs);
 break;
 case 2:
-
m_pDoc->getIDocumentContentOperations().DeleteAndJoin(aCrs, !!getRand(1));
+*pCrs->GetMark() = getRandomPosition(m_pDoc, 42);
+
m_pDoc->getIDocumentContentOperations().DeleteAndJoin(*pCrs, !!getRand(1));
 break;
 case 3:
 default:
-m_pDoc->getIDocumentContentOperations().Overwrite(aCrs, 
getRandString());
+OUString const tmp(getRandString());
+if (tmp.

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

[Libreoffice Gerrit user]

 sd/qa/unit/data/ppt/tdf119629.ppt|binary
 sd/qa/unit/export-tests.cxx  |   22 ++
 sd/source/filter/ppt/pptanimations.hxx   |4 
 sd/source/filter/ppt/pptinanimations.cxx |5 -
 4 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit 6db1448eaa30ac7e2ebc64ad561b1d4a2c6e4ff2
Author: Mark Hung 
AuthorDate: Mon Sep 3 21:56:07 2018 +0800
Commit: Mark Hung 
CommitDate: Tue Sep 4 18:15:34 2018 +0200

tdf#119629 Fix keytime formula and missing effect node type.

1. Don't override keytime formula value if already read.
2. MSO's effect node type Click parallel node, with group node,
after group node were missing, now mapping to ON_CLICK,
WITH_PREVIOUS, AFTER_PREVIOUS correspondingly.

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

diff --git a/sd/qa/unit/data/ppt/tdf119629.ppt 
b/sd/qa/unit/data/ppt/tdf119629.ppt
new file mode 100644
index ..b9c90e916fff
Binary files /dev/null and b/sd/qa/unit/data/ppt/tdf119629.ppt differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index b17fb213c5b1..3e5bd8ef3bfb 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -102,6 +102,7 @@ public:
 void testTdf115394PPT();
 void testBulletsAsImage();
 void testTdf113818();
+void testTdf119629();
 void testTdf113822();
 
 CPPUNIT_TEST_SUITE(SdExportTest);
@@ -130,6 +131,7 @@ public:
 CPPUNIT_TEST(testTdf115394PPT);
 CPPUNIT_TEST(testBulletsAsImage);
 CPPUNIT_TEST(testTdf113818);
+CPPUNIT_TEST(testTdf119629);
 CPPUNIT_TEST(testTdf113822);
 
 CPPUNIT_TEST_SUITE_END();
@@ -1137,6 +1139,26 @@ void SdExportTest::testTdf113818()
 xDocShRef->DoClose();
 }
 
+void SdExportTest::testTdf119629()
+{
+utl::TempFile tempFile;
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/tdf119629.ppt"), PPT);
+xDocShRef = saveAndReload(xDocShRef.get(), PPT);
+xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
+
+xmlDocPtr pXmlDoc = parseExport(tempFile, "content.xml");
+
+// MSO's effect node type Click parallel node, with group node, after 
group node
+// were missing.
+assertXPath(pXmlDoc, "//draw:page"
+"/anim:par[@presentation:node-type='timing-root']"
+"/anim:seq[@presentation:node-type='main-sequence']"
+"/anim:par[@presentation:node-type='on-click']"
+"/anim:par[@presentation:node-type='with-previous']"
+"/anim:par[@presentation:node-type='on-click']"
+"/anim:animate[@anim:formula='width*sin(2.5*pi*$)']", 1);
+xDocShRef->DoClose();
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
 
diff --git a/sd/source/filter/ppt/pptanimations.hxx 
b/sd/source/filter/ppt/pptanimations.hxx
index 8de13b56d090..f9d5fa5479a3 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -125,11 +125,15 @@ namespace ppt
 #define DFF_ANIM_PRESS_CLASS_OLE_ACTION 5
 #define DFF_ANIM_PRESS_CLASS_MEDIACALL  6
 
+// Effect node type.
 #define DFF_ANIM_NODE_TYPE_ON_CLICK 1
 #define DFF_ANIM_NODE_TYPE_WITH_PREVIOUS2
 #define DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS   3
 #define DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE4
 #define DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ  5
+#define DFF_ANIM_NODE_TYPE_CLICK_PARALLEL   6
+#define DFF_ANIM_NODE_TYPE_WITH_GROUP   7
+#define DFF_ANIM_NODE_TYPE_AFTER_GROUP  8
 #define DFF_ANIM_NODE_TYPE_TIMING_ROOT  9
 
 /* constants for fill entry in AnimationNode */
diff --git a/sd/source/filter/ppt/pptinanimations.cxx 
b/sd/source/filter/ppt/pptinanimations.cxx
index 18c3b82988f4..8e553159d968 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -673,8 +673,11 @@ void AnimationImporter::fillNode( Reference< 
XAnimationNode > const & xNode, con
 sal_Int16 nNodeType = css::presentation::EffectNodeType::DEFAULT;
 switch( nPPTNodeType )
 {
+case DFF_ANIM_NODE_TYPE_CLICK_PARALLEL: SAL_FALLTHROUGH;
 case DFF_ANIM_NODE_TYPE_ON_CLICK:   nNodeType = 
css::presentation::EffectNodeType::ON_CLICK;   break;
+case DFF_ANIM_NODE_TYPE_WITH_GROUP: SAL_FALLTHROUGH;
 case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS:  nNodeType = 
css::presentation::EffectNodeType::WITH_PREVIOUS; break;
+case DFF_ANIM_NODE_TYPE_AFTER_GROUP:SAL_FALLTHROUGH;
 case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: nNodeType = 
css::presentation::EffectNodeType::AFTER_PREVIOUS; break;
 case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE:  nNodeType = 
css::presentation::EffectNodeType::MAIN_SEQUENCE; break;
 case DFF_ANIM_NODE_TYPE_TIMING_ROOT:nNodeType = 
css::present

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

[Libreoffice Gerrit user]

 sd/inc/Outliner.hxx|9 -
 sd/source/ui/view/Outliner.cxx |   27 ---
 2 files changed, 16 insertions(+), 20 deletions(-)

New commits:
commit eda6f4bab8cf7ea899c875581d47c96cf006f657
Author: Caolán McNamara 
AuthorDate: Wed Aug 22 16:11:02 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 17:57:13 2018 +0200

Resolves: tdf#118799 use spelling/search dialog as message dialog parent

when visible

Change-Id: Id4d6df2a85aebd6887949f285e1a5ec1046dbf64
Reviewed-on: https://gerrit.libreoffice.org/59456
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 50c9ed67d29d6105f3907cb7a2fe3322685af53c)
Reviewed-on: https://gerrit.libreoffice.org/59975
Tested-by: Xisco Faulí 

diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 672fd1ac4dbb..b1c0b7cfdfb6 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -521,12 +521,11 @@ private:
 */
 virtual bool SpellNextDocument() override;
 
-/** Show the given message box and make it modal.  It is assumed that
-the parent of the given dialog is NULL, i.e. the application
-window.  This function makes sure that the otherwise non-modal
-search dialog, if visible, is locked, too.
+/** Find the right parent to use for a message. This function makes sure
+that the otherwise non-modal search or spell dialogs, if visible, are
+locked, too.
 */
-sal_uInt16 ShowModalMessageBox(weld::MessageDialog& rMessageBox);
+VclPtr GetMessageBoxParent();
 };
 
 #endif
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 1628d1c25693..efe694f06585 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1203,11 +1203,11 @@ void SdOutliner::ShowEndOfSearchDialog()
 else
 aString = SdResId(STR_END_SPELLING);
 
-// Show the message in an info box that is modal with respect to the
-// whole application.
-std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(nullptr,
+// Show the message in an info box that is modal with respect to the whole 
application.
+VclPtr xParent(GetMessageBoxParent());
+std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(xParent ? xParent->GetFrameWeld() : 
nullptr,
   VclMessageType::Info, 
VclButtonsType::Ok, aString));
-ShowModalMessageBox(*xInfoBox.get());
+xInfoBox->run();
 }
 
 bool SdOutliner::ShowWrapArroundDialog()
@@ -1245,9 +1245,10 @@ bool SdOutliner::ShowWrapArroundDialog()
 
 // Pop up question box that asks the user whether to wrap around.
 // The dialog is made modal with respect to the whole application.
-std::unique_ptr 
xQueryBox(Application::CreateMessageDialog(nullptr,
+VclPtr xParent(GetMessageBoxParent());
+std::unique_ptr 
xQueryBox(Application::CreateMessageDialog(xParent ? xParent->GetFrameWeld() : 
nullptr,
VclMessageType::Question, 
VclButtonsType::YesNo, SdResId(pStringId)));
-sal_uInt16 nBoxResult = ShowModalMessageBox(*xQueryBox.get());
+sal_uInt16 nBoxResult = xQueryBox->run();
 
 return (nBoxResult == RET_YES);
 }
@@ -1683,7 +1684,7 @@ bool SdOutliner::ConvertNextDocument()
 return !mbEndOfSearch;
 }
 
-sal_uInt16 SdOutliner::ShowModalMessageBox(weld::MessageDialog& rMessageBox)
+VclPtr SdOutliner::GetMessageBoxParent()
 {
 // We assume that the parent of the given message box is NULL, i.e. it is
 // modal with respect to the top application window. However, this
@@ -1713,16 +1714,12 @@ sal_uInt16 
SdOutliner::ShowModalMessageBox(weld::MessageDialog& rMessageBox)
 
 if (pChildWindow != nullptr)
 pSearchDialog = pChildWindow->GetWindow();
-if (pSearchDialog != nullptr)
-pSearchDialog->EnableInput(false);
 
-sal_uInt16 nResult = rMessageBox.run();
+if (pSearchDialog)
+return pSearchDialog;
 
-// Unlock the search dialog.
-if (pSearchDialog != nullptr)
-pSearchDialog->EnableInput();
-
-return nResult;
+std::shared_ptr pViewShell (mpWeakViewShell.lock());
+return pViewShell->GetActiveWindow();
 }
 
 //= SdOutliner::Implementation 
==
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/options/treeopt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8d7b1f2e7c13a1ebcf6dfa2afed80f1df6d2565d
Author: Caolán McNamara 
AuthorDate: Tue Sep 4 13:45:44 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 17:56:19 2018 +0200

tdf#119690 on 'apply' options dialog is still up, use that as parent

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

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 63df32ae9484..9615d1bc6a28 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -699,7 +699,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ApplyHdl_Impl, 
Button*, void)
 {
 SolarMutexGuard aGuard;
 
::svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
-m_pParent->GetFrameWeld(), 
eRestartReason);
+GetFrameWeld(), eRestartReason);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 ucb/source/ucp/webdav/SerfSession.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6f88d98d9a768c904b6813d36b43b4b894f0eb26
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 09:12:13 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 4 17:52:03 2018 +0200

loplugin:cstylecast (--with-webdav=serf)

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

diff --git a/ucb/source/ucp/webdav/SerfSession.cxx 
b/ucb/source/ucp/webdav/SerfSession.cxx
index a8be54cdc052..51a29a7445bf 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -615,7 +615,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
  ioResources.empty() )
 {
 m_aEnv = DAVRequestEnvironment();
-throw DAVException( DAVException::DAV_HTTP_ERROR, inPath, 
(sal_uInt16)APR_EGENERAL );
+throw DAVException( DAVException::DAV_HTTP_ERROR, inPath, APR_EGENERAL 
);
 }
 HandleError( aReqProc );
 }
@@ -643,7 +643,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
  ioResInfo.empty() )
 {
 m_aEnv = DAVRequestEnvironment();
-throw DAVException( DAVException::DAV_HTTP_ERROR, inPath, 
(sal_uInt16)APR_EGENERAL );
+throw DAVException( DAVException::DAV_HTTP_ERROR, inPath, APR_EGENERAL 
);
 }
 HandleError( aReqProc );
 }
___
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' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/ww8par.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 887ee9111f42847406c5ffc85a0ba635080de3de
Author: Caolán McNamara 
AuthorDate: Mon Sep 3 17:20:21 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 16:19:29 2018 +0200

ofz#10198 reset uncommitted fly stuff & pams before applying redlining

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

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0f2206c711b1..c4fd1cd33125 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5391,6 +5391,9 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const 
*pGloss)
 
 UpdateFields();
 
+m_xWFlyPara.reset();
+m_xSFlyPara.reset();
+
 // delete the pam before the call for hide all redlines (Bug 73683)
 if (m_bNewDoc)
   m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(eMode);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: help3/html

[Libreoffice Gerrit user]

 help3/html/index.html|5 -
 help3/html/snippets.js   |8 
 help3/html/xhpeditor.css |   17 +
 3 files changed, 25 insertions(+), 5 deletions(-)

New commits:
commit 2bc52821754a0fb5d97f2f1c98f70c396fa5f059
Author: Olivier Hallot 
AuthorDate: Tue Sep 4 09:56:35 2018 -0300
Commit: Olivier Hallot 
CommitDate: Tue Sep 4 16:05:51 2018 +0200

Add some more snippets

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

diff --git a/help3/html/index.html b/help3/html/index.html
index a4e806b..a5564d0 100644
--- a/help3/html/index.html
+++ b/help3/html/index.html
@@ -93,9 +93,12 @@
 Link
 
 
+
+will put the xml transformed here
+Rendered page 
 
+-->
 
 
 
diff --git a/help3/html/snippets.js b/help3/html/snippets.js
index a9c647c..891ae4e 100644
--- a/help3/html/snippets.js
+++ b/help3/html/snippets.js
@@ -47,7 +47,7 @@ function bascode_par() {
 // Tables
 // simple table cell
 function tCell (role){
-return '   \n   \n   ';
+return '   \n   \n   \n';
 }
 
 
@@ -67,7 +67,7 @@ function table2R3C() {
 var a1 = '\n';
 var a2 = '   \n';
 var a4 = '   \n';
-var a5 = a4 + '\n';
+var a5 = a4 + '\n\n';
 editor.replaceRange(a1 + a2 + tCell('tablehead') + tCell('tablehead') + 
tCell('tablehead') + a4 + a2 + tCell('tablecontent') + tCell('tablecontent') + 
tCell('tablecontent') + a5, editor.doc.getCursor());
 }
 
@@ -149,7 +149,7 @@ function tList(mode){
 
 function listItem(){
 var a1 = '\n';
-var a2 = '\n';
+var a2 = '\n\n';
 editor.replaceSelection(a1+ editor.doc.getSelection() + a2,'');
 }
 
@@ -161,7 +161,7 @@ function tVariable() {
 editor.replaceSelection(a1 + editor.doc.getSelection() + a2,'');
 }
 function tEmbed(){
-var a1 = '';
+var a1 = '\n';
 editor.replaceRange(a1, editor.doc.getCursor());
 }
 function tEmbedvar(){
diff --git a/help3/html/xhpeditor.css b/help3/html/xhpeditor.css
index 935c9bb..7036cf1 100644
--- a/help3/html/xhpeditor.css
+++ b/help3/html/xhpeditor.css
@@ -19,3 +19,20 @@
 display:inline-block;
 width:5em;
 }
+/*
+.leftside{
+top: 0%;
+left:0%;
+right:50%
+position:absolute;
+background: yellow;
+display:block;
+}
+.rightside{
+top: 0%;
+right:0%;
+left: 50%;
+position:absolute;
+background: cyan;
+}
+*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf119143.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   42 ++
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |   18 +++
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |5 ++
 writerfilter/source/ooxml/model.xml   |   24 ++
 5 files changed, 89 insertions(+)

New commits:
commit 348a1e11045ca8d9dbceab43a68d44dbde3f922c
Author: Mike Kaganski 
AuthorDate: Mon Aug 27 12:34:12 2018 +0300
Commit: Aron Budea 
CommitDate: Tue Sep 4 16:02:20 2018 +0200

tdf#119143: introduce tentative directional embedding import support

ECMA-376-1:2016 states that w:dir is functionally equivalent to LRE/RLE+PDF
pair around the enclosed runs. So this patch does just that.

Change-Id: Ibf9775338cc38a3bbc38a42a33fc64ae787b478f
Reviewed-on: https://gerrit.libreoffice.org/59643
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/59672
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf119143.docx 
b/sw/qa/extras/ooxmlexport/data/tdf119143.docx
new file mode 100644
index ..be0bc03f71c1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf119143.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 079fadcca914..7e6b07bde3ec 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -733,6 +733,48 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116976, "tdf116976.docx")
  getProperty(getShape(1), "RelativeWidth"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf119143, "tdf119143.docx")
+{
+const char sParaTextExpected[] =
+"\xD8\xB9\xD9\x86\xD8\xAF\xD9\x85\xD8\xA7 
\xD9\x8A\xD8\xB1\xD9\x8A\xD8\xAF \xD8\xA7\xD9\x84"
+"\xD8\xB9\xD8\xA7\xD9\x84\xD9\x85 \xD8\xA3\xD9\x86 
\xD9\x8A\xD8\xAA\xD9\x83\xD9\x84\xD9\x91"
+"\xD9\x85 \xE2\x80\xAC \xD8\x8C \xD9\x81\xD9\x87\xD9\x88 
\xD9\x8A\xD8\xAA\xD8\xAD\xD8\xAF"
+"\xD9\x91\xD8\xAB \xD8\xA8\xD9\x84\xD8\xBA\xD8\xA9 
\xD9\x8A\xD9\x88\xD9\x86\xD9\x8A\xD9\x83"
+"\xD9\x88\xD8\xAF. \xD8\xAA\xD8\xB3\xD8\xAC\xD9\x91\xD9\x84 
\xD8\xA7\xD9\x84\xD8\xA2\xD9"
+"\x86 \xD9\x84\xD8\xAD\xD8\xB6\xD9\x88\xD8\xB1 
\xD8\xA7\xD9\x84\xD9\x85\xD8\xA4\xD8\xAA\xD9"
+"\x85\xD8\xB1 \xD8\xA7\xD9\x84\xD8\xAF\xD9\x88\xD9\x84\xD9\x8A 
\xD8\xA7\xD9\x84\xD8\xB9\xD8"
+"\xA7\xD8\xB4\xD8\xB1 
\xD9\x84\xD9\x8A\xD9\x88\xD9\x86\xD9\x8A\xD9\x83\xD9\x88\xD8\xAF (Uni"
+"code Conference)\xD8\x8C \xD8\xA7\xD9\x84\xD8\xB0\xD9\x8A 
\xD8\xB3\xD9\x8A\xD8\xB9\xD9\x82"
+"\xD8\xAF \xD9\x81\xD9\x8A 10-12 \xD8\xA2\xD8\xB0\xD8\xA7\xD8\xB1 1997 
\xD8\xA8\xD9\x85\xD8"
+"\xAF\xD9\x8A\xD9\x86\xD8\xA9 
\xD9\x85\xD9\x8E\xD8\xA7\xD9\x8A\xD9\x90\xD9\x86\xD9\x92\xD8"
+"\xAA\xD9\x92\xD8\xB3\xD8\x8C 
\xD8\xA3\xD9\x84\xD9\x85\xD8\xA7\xD9\x86\xD9\x8A\xD8\xA7. "
+"\xD9\x88 \xD8\xB3\xD9\x8A\xD8\xAC\xD9\x85\xD8\xB9 
\xD8\xA7\xD9\x84\xD9\x85\xD8\xA4\xD8\xAA"
+"\xD9\x85\xD8\xB1 \xD8\xA8\xD9\x8A\xD9\x86 
\xD8\xAE\xD8\xA8\xD8\xB1\xD8\xA7\xD8\xA1 \xD9"
+"\x85\xD9\x86 \xD9\x83\xD8\xA7\xD9\x81\xD8\xA9 
\xD9\x82\xD8\xB7\xD8\xA7\xD8\xB9\xD8\xA7\xD8"
+"\xAA \xD8\xA7\xD9\x84\xD8\xB5\xD9\x86\xD8\xA7\xD8\xB9\xD8\xA9 
\xD8\xB9\xD9\x84\xD9\x89 "
+"\xD8\xA7\xD9\x84\xD8\xB4\xD8\xA8\xD9\x83\xD8\xA9 
\xD8\xA7\xD9\x84\xD8\xB9\xD8\xA7\xD9\x84"
+"\xD9\x85\xD9\x8A\xD8\xA9 
\xD8\xA7\xD9\x86\xD8\xAA\xD8\xB1\xD9\x86\xD9\x8A\xD8\xAA \xD9\x88"
+"\xD9\x8A\xD9\x88\xD9\x86\xD9\x8A\xD9\x83\xD9\x88\xD8\xAF\xD8\x8C 
\xD8\xAD\xD9\x8A\xD8\xAB "
+"\xD8\xB3\xD8\xAA\xD8\xAA\xD9\x85\xD8\x8C \xD8\xB9\xD9\x84\xD9\x89 
\xD8\xA7\xD9\x84\xD8\xB5"
+"\xD8\xB9\xD9\x8A\xD8\xAF\xD9\x8A\xD9\x86 
\xD8\xA7\xD9\x84\xD8\xAF\xD9\x88\xD9\x84\xD9\x8A "
+"\xD9\x88\xD8\xA7\xD9\x84\xD9\x85\xD8\xAD\xD9\x84\xD9\x8A 
\xD8\xB9\xD9\x84\xD9\x89 \xD8\xAD"
+"\xD8\xAF \xD8\xB3\xD9\x88\xD8\xA7\xD8\xA1 
\xD9\x85\xD9\x86\xD8\xA7\xD9\x82\xD8\xB4\xD8\xA9"
+" \xD8\xB3\xD8\xA8\xD9\x84 
\xD8\xA7\xD8\xB3\xD8\xAA\xD8\xAE\xD8\xAF\xD8\xA7\xD9\x85 \xD9"
+"\x8A\xD9\x88\xD9\x86\xD9\x83\xD9\x88\xD8\xAF \xD9\x81\xD9\x8A 
\xD8\xA7\xD9\x84\xD9\x86\xD8"
+"\xB8\xD9\x85 \xD8\xA7\xD9\x84\xD9\x82\xD8\xA7\xD8\xA6\xD9\x85\xD8\xA9 
\xD9\x88\xD9\x81\xD9"
+"\x8A\xD9\x85\xD8\xA7 \xD9\x8A\xD8\xAE\xD8\xB5 
\xD8\xA7\xD9\x84\xD8\xAA\xD8\xB7\xD8\xA8\xD9"
+"\x8A\xD9\x82\xD8\xA7\xD8\xAA 
\xD8\xA7\xD9\x84\xD8\xAD\xD8\xA7\xD8\xB3\xD9\x88\xD8\xA8\xD9"
+"\x8A\xD8\xA9\xD8\x8C 
\xD8\xA7\xD9\x84\xD8\xAE\xD8\xB7\xD9\x88\xD8\xB7\xD8\x8C \xD8\xAA\xD8"
+"\xB5\xD9\x85\xD9\x8A\xD9\x85 
\xD8\xA7\xD9\x84\xD9\x86\xD8\xB5\xD9\x88\xD8\xB5 \xD9\x88\xD8"
+"\xA7\xD9\x84\xD8\xAD\xD9\x88\xD8\xB3\xD8\xA8\xD8\xA9 
\xD9\x85\xD8\xAA\xD8\xB9\xD8\xAF\xD8"
+

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

[Libreoffice Gerrit user]

 basic/source/runtime/ddectrl.cxx |   41 +--
 basic/source/runtime/ddectrl.hxx |2 -
 2 files changed, 15 insertions(+), 28 deletions(-)

New commits:
commit bdfa446d2e79ca1d8f45e39ad4ee0bfc753ed553
Author: Noel Grandin 
AuthorDate: Tue Sep 4 13:19:39 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 4 15:39:05 2018 +0200

loplugin:useuniqueptr in SbiDdeControl

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

diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index adb2e7aebf2d..47858f2b97ff 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -22,8 +22,6 @@
 #include "ddectrl.hxx"
 #include 
 
-#define DDE_FREECHANNEL (reinterpret_cast(sal_IntPtr(-1)))
-
 #define DDE_FIRSTERR0x4000
 #define DDE_LASTERR 0x4011
 
@@ -88,13 +86,13 @@ size_t SbiDdeControl::GetFreeChannel()
 
 for (; nChannel < nListSize; ++nChannel)
 {
-if (aConvList[nChannel] == DDE_FREECHANNEL)
+if (!aConvList[nChannel])
 {
 return nChannel+1;
 }
 }
 
-aConvList.push_back(DDE_FREECHANNEL);
+aConvList.push_back(nullptr);
 return nChannel+1;
 }
 
@@ -102,17 +100,16 @@ ErrCode SbiDdeControl::Initiate( const OUString& 
rService, const OUString& rTopi
  size_t& rnHandle )
 {
 ErrCode nErr;
-DdeConnection* pConv = new DdeConnection( rService, rTopic );
-nErr = GetLastErr( pConv );
+std::unique_ptr pConv(new DdeConnection( rService, rTopic 
));
+nErr = GetLastErr( pConv.get() );
 if( nErr )
 {
-delete pConv;
 rnHandle = 0;
 }
 else
 {
 size_t nChannel = GetFreeChannel();
-aConvList[nChannel-1] = pConv;
+aConvList[nChannel-1] = std::move(pConv);
 rnHandle = nChannel;
 }
 return ERRCODE_NONE;
@@ -124,30 +121,20 @@ ErrCode SbiDdeControl::Terminate( size_t nChannel )
 {
 return ERRCODE_BASIC_DDE_NO_CHANNEL;
 }
-DdeConnection* pConv = aConvList[nChannel-1];
+DdeConnection* pConv = aConvList[nChannel-1].get();
 
-if( pConv == DDE_FREECHANNEL )
+if( !pConv )
 {
 return ERRCODE_BASIC_DDE_NO_CHANNEL;
 }
-delete pConv;
-aConvList[nChannel-1] = DDE_FREECHANNEL;
+aConvList[nChannel-1].reset();
 
 return ERRCODE_NONE;
 }
 
 ErrCode SbiDdeControl::TerminateAll()
 {
-for (DdeConnection* conv : aConvList)
-{
-if (conv != DDE_FREECHANNEL)
-{
-delete conv;
-}
-}
-
 aConvList.clear();
-
 return ERRCODE_NONE;
 }
 
@@ -158,9 +145,9 @@ ErrCode SbiDdeControl::Request( size_t nChannel, const 
OUString& rItem, OUString
 return ERRCODE_BASIC_DDE_NO_CHANNEL;
 }
 
-DdeConnection* pConv = aConvList[nChannel-1];
+DdeConnection* pConv = aConvList[nChannel-1].get();
 
-if( pConv == DDE_FREECHANNEL )
+if( !pConv )
 {
 return ERRCODE_BASIC_DDE_NO_CHANNEL;
 }
@@ -179,9 +166,9 @@ ErrCode SbiDdeControl::Execute( size_t nChannel, const 
OUString& rCommand )
 return ERRCODE_BASIC_DDE_NO_CHANNEL;
 }
 
-DdeConnection* pConv = aConvList[nChannel-1];
+DdeConnection* pConv = aConvList[nChannel-1].get();
 
-if( pConv == DDE_FREECHANNEL )
+if( !pConv )
 {
 return ERRCODE_BASIC_DDE_NO_CHANNEL;
 }
@@ -196,9 +183,9 @@ ErrCode SbiDdeControl::Poke( size_t nChannel, const 
OUString& rItem, const OUStr
 {
 return ERRCODE_BASIC_DDE_NO_CHANNEL;
 }
-DdeConnection* pConv = aConvList[nChannel-1];
+DdeConnection* pConv = aConvList[nChannel-1].get();
 
-if( pConv == DDE_FREECHANNEL )
+if( !pConv )
 {
 return ERRCODE_BASIC_DDE_NO_CHANNEL;
 }
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index 356fe42d684c..dd12241a31b5 100644
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -32,7 +32,7 @@ private:
 DECL_LINK( Data, const DdeData*, void );
 static ErrCode GetLastErr( DdeConnection* );
 size_t GetFreeChannel();
-std::vector aConvList;
+std::vector> aConvList;
 OUString aData;
 
 public:
___
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/txtnode/fntcache.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a910fb442e31afb53c4d43243dfe75f044b2355c
Author: Miklos Vajna 
AuthorDate: Tue Sep 4 13:17:10 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Sep 4 15:34:21 2018 +0200

sw: less vcl layout calls in SwFntObj::GetCursorOfst()

GenericSalLayout::LayoutText() calls for a single word document's
initial layout: 5 -> 4.

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

diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 8fa3eee79aa8..e893e43d1f8e 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2071,8 +2071,10 @@ TextFrameIndex SwFntObj::GetCursorOfst(SwDrawTextInfo 
&rInf)
 {
 m_pPrinter->SetLayoutMode( rInf.GetOut().GetLayoutMode() );
 m_pPrinter->SetDigitLanguage( rInf.GetOut().GetDigitLanguage() );
+SwTextGlyphsKey aGlyphsKey{ m_pPrinter, rInf.GetText(), rInf.GetIdx(), 
rInf.GetLen() };
+SalLayoutGlyphs* pGlyphs = lcl_CreateLayout(aGlyphsKey, 
m_aTextGlyphs[aGlyphsKey]);
 m_pPrinter->GetTextArray( rInf.GetText(), pKernArray.get(),
-sal_Int32(rInf.GetIdx()), sal_Int32(rInf.GetLen()));
+sal_Int32(rInf.GetIdx()), sal_Int32(rInf.GetLen()), nullptr, 
pGlyphs);
 }
 else
 rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray.get(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 200f88c55842a3947eb3cbc5ce05b044eb25d338
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 09:06:39 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 4 14:56:04 2018 +0200

-Werror=return-local-addr (-with-webdav=serf)

Missing adaption after 2e142c0ee54744d35517f0b9c49a24302fb32d47 
"tdf#114227: Add
support for PAC to ucbhelper::InternetProxyDecider on Windows", found by
.

Change-Id: I5093827035a9bbc31f3d8d2262e14df55fa610aa
Reviewed-on: https://gerrit.libreoffice.org/59961
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

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

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

[Libreoffice Gerrit user]

 sfx2/qa/cppunit/test_misc.cxx |9 +
 sfx2/source/doc/docfile.cxx   |   11 ++-
 2 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 72be5ac08aa963bdd42d2e56a62f43e69f728caa
Author: Miklos Vajna 
AuthorDate: Mon Sep 3 21:07:00 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Sep 4 14:33:37 2018 +0200

tdf#119381 sfx2 store: don't break symlink targets

osl::File::move() would not follow symlinks for the target, so don't
move the file in that case.

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

diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx
index fa3a2c1bca6d..83c4c8db77f7 100644
--- a/sfx2/qa/cppunit/test_misc.cxx
+++ b/sfx2/qa/cppunit/test_misc.cxx
@@ -186,6 +186,15 @@ void MiscTest::testHardLinks()
 // This failed: hard link count was 1, the hard link broke on store.
 CPPUNIT_ASSERT(buf.st_nlink > 1);
 
+// Test that symlinks are presreved as well.
+remove(aNew.getStr());
+symlink(aOld.getStr(), aNew.getStr());
+xStorable->storeToURL(aURL + ".2", {});
+nRet = lstat(aNew.getStr(), &buf);
+CPPUNIT_ASSERT_EQUAL(0, nRet);
+// This failed, the hello.odt.2 symlink was replaced with a real file.
+CPPUNIT_ASSERT(bool(S_ISLNK(buf.st_mode)));
+
 xComponent->dispose();
 #endif
 }
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index f8f5c85f757b..5d1888a60d5c 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -200,8 +200,8 @@ sal_uInt64 GetDefaultFileAttributes(const OUString& rURL)
 return nRet;
 }
 
-/// Determines if rURL is a non-hard-linked file:// URL.
-bool IsNotHardLinkedFile(const OUString& rURL)
+/// Determines if rURL is a non-linked (symlink or hardlink) file:// URL.
+bool IsNotLinkedFile(const OUString& rURL)
 {
 if (!comphelper::isFileUrl(rURL))
 return false;
@@ -212,10 +212,11 @@ bool IsNotHardLinkedFile(const OUString& rURL)
 return false;
 
 struct stat buf;
-if (stat(rPath.toUtf8().getStr(), &buf) != 0)
+if (lstat(rPath.toUtf8().getStr(), &buf) != 0)
 return false;
 
-if (buf.st_nlink > 1)
+// Hardlink or symlink: osl::File::move() doesn't play with these nicely.
+if (buf.st_nlink > 1 || S_ISLNK(buf.st_mode))
 return false;
 #endif
 
@@ -1843,7 +1844,7 @@ void SfxMedium::TransactedTransferForFS_Impl( const 
INetURLObject& aSource,
 OUString aDestMainURL = 
aDest.GetMainURL(INetURLObject::DecodeMechanism::NONE);
 
 sal_uInt64 nAttributes = 
GetDefaultFileAttributes(aDestMainURL);
-if (IsNotHardLinkedFile(aDestMainURL) && 
osl::File::move(aSourceMainURL, aDestMainURL) == osl::FileBase::E_None)
+if (IsNotLinkedFile(aDestMainURL) && 
osl::File::move(aSourceMainURL, aDestMainURL) == osl::FileBase::E_None)
 {
 if (nAttributes)
 // Adjust attributes, source might be created with
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/data/dptabres.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 6ee76d210846b84e93420a321c7908721ffe9e43
Author: Caolán McNamara 
AuthorDate: Sun Sep 2 21:20:40 2018 +0100
Commit: Michael Stahl 
CommitDate: Tue Sep 4 14:20:23 2018 +0200

ofz#10189 check container size

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

diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 2389e3d91dd0..e5198b4f2336 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2863,10 +2863,14 @@ void ScDPResultDimension::LateInitFrom(
 {
 if ( rParams.IsEnd( nPos ) )
 return;
-OSL_ENSURE( nPos <= pItemData.size(), 
OString::number(pItemData.size()).getStr() );
+if (nPos >= pItemData.size())
+{
+SAL_WARN("sc.core", "pos " << nPos << ", but vector size is " << 
pItemData.size());
+return;
+}
+SCROW rThisData = pItemData[nPos];
 ScDPDimension* pThisDim = rParams.GetDim( nPos );
 ScDPLevel* pThisLevel = rParams.GetLevel( nPos );
-SCROW rThisData = pItemData[nPos];
 
 if (!pThisDim || !pThisLevel)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/inc/svdata.hxx|   36 +--
 vcl/qt5/Qt5Data.cxx   |4 +-
 vcl/qt5/Qt5Instance.cxx   |5 +-
 vcl/source/app/svapp.cxx  |   66 +++
 vcl/source/app/svdata.cxx |   60 ++--
 vcl/source/app/svmain.cxx |   71 +++---
 vcl/source/control/button.cxx |6 +--
 vcl/source/gdi/configsettings.cxx |4 +-
 vcl/source/gdi/print.cxx  |9 ++--
 vcl/source/helper/lazydelete.cxx  |   21 ---
 vcl/unx/generic/app/salinst.cxx   |3 -
 vcl/unx/gtk/gtkinst.cxx   |7 +--
 vcl/unx/kde4/KDESalInstance.cxx   |3 -
 vcl/unx/kde5/KDE5SalInstance.cxx  |3 -
 14 files changed, 99 insertions(+), 199 deletions(-)

New commits:
commit b9757f5cfdb62b24e79eeb4c0ef0c8b98056cecf
Author: Noel Grandin 
AuthorDate: Mon Sep 3 16:19:02 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 4 14:19:27 2018 +0200

loplugin:useuniqueptr in vcl/svdata

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

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 52980ec3260b..679debce188e 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -126,16 +126,16 @@ struct ImplSVAppData
 ImeStatusWindowMode_SHOW
 };
 
-AllSettings*mpSettings = nullptr;   // Application 
settings
+std::unique_ptr mpSettings;   // Application settings
 LocaleConfigurationListener* mpCfgListener = nullptr;
-VclEventListeners*  mpEventListeners = nullptr; // listeners for 
vcl events (eg, extended toolkit)
-SVAppKeyListeners*  mpKeyListeners = nullptr;   // listeners for 
key events only (eg, extended toolkit)
+VclEventListeners   maEventListeners; // listeners for vcl events 
(eg, extended toolkit)
+SVAppKeyListeners   maKeyListeners;   // listeners for key events 
only (eg, extended toolkit)
 std::vector maPostedEventList;
-ImplAccelManager*   mpAccelMgr = nullptr;   // Accelerator 
Manager
-OUString*   mpAppName = nullptr;// Application name
-OUString*   mpAppFileName = nullptr;// Abs. 
Application FileName
-OUString*   mpDisplayName = nullptr;// Application 
Display Name
-OUString*   mpToolkitName = nullptr;// Toolkit Name
+ImplAccelManager*   mpAccelMgr;   // Accelerator Manager
+boost::optional mxAppName;// Application name
+boost::optional mxAppFileName;// Abs. Application 
FileName
+boost::optional mxDisplayName;// Application Display Name
+boost::optional mxToolkitName;// Toolkit Name
 Help*   mpHelp = nullptr;   // Application help
 VclPtr   mpActivePopupMenu;  // Actives 
Popup-Menu (in Execute)
 VclPtr mpWheelWindow;  // WheelWindow
@@ -226,8 +226,8 @@ struct ImplSVCtrlData
 {
 std::vector  maCheckImgList; // ImageList for 
CheckBoxes
 std::vector  maRadioImgList; // ImageList for 
RadioButtons
-Image*  mpDisclosurePlus = nullptr;
-Image*  mpDisclosureMinus = nullptr;
+std::unique_ptr  mpDisclosurePlus;
+std::unique_ptr  mpDisclosureMinus;
 ImplTBDragMgr*  mpTBDragMgr = nullptr;  // DragMgr for 
ToolBox
 sal_uInt16  mnCheckStyle = 0;   // CheckBox-Style 
for ImageList-Update
 sal_uInt16  mnRadioStyle = 0;   // Radio-Style for 
ImageList-Update
@@ -237,8 +237,8 @@ struct ImplSVCtrlData
 Color   mnLastRadioFColor;  // Last FaceColor 
for RadioImage
 Color   mnLastRadioWColor;  // Last 
WindowColor for RadioImage
 Color   mnLastRadioLColor;  // Last LightColor 
for RadioImage
-FieldUnitStringList*mpFieldUnitStrings = nullptr;   // list with field 
units
-FieldUnitStringList*mpCleanUnitStrings = nullptr;   // same list but 
with some "fluff" like spaces removed
+FieldUnitStringList maFieldUnitStrings;   // list with field units
+FieldUnitStringList maCleanUnitStrings;   // same list but with some 
"fluff" like spaces removed
 };
 
 struct ImplSVHelpData
@@ -341,7 +341,7 @@ struct ImplSVData
 VclPtr  mpDefaultWin;   // Default-Window
 boolmbDeInit = false;   // Is VCL 
deinitializing
 std::unique_ptr mpImeStatus;  // interface to 
ime status window, only used by the X11 backend
-SalSystem*  mpSalSystem = nullptr;  // SalSystem 
interface
+std::unique_ptr mpSalSystem;

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

[Libreoffice Gerrit user]

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

New commits:
commit 270946b220692e466b1eaaed85e4b08ea876fee2
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 09:16:07 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 4 14:17:28 2018 +0200

loplugin:salcall (--with-webdav=serf)

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

diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx 
b/ucb/source/ucp/webdav/webdavprovider.cxx
index 0096b5a39384..734f5702ef0f 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -87,7 +87,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 XSERVICEINFO_COMMOM_IMPL( ContentProvider,
   OUString( "com.sun.star.comp.WebDAVContentProvider" 
) )
 /// @throws css::uno::Exception
-static css::uno::Reference< css::uno::XInterface > SAL_CALL
+static css::uno::Reference< css::uno::XInterface >
 ContentProvider_CreateInstance( const css::uno::Reference< 
css::lang::XMultiServiceFactory> & rSMgr )
 {
 css::lang::XServiceInfo* pX =
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx 
b/ucb/source/ucp/webdav/webdavservices.cxx
index 7454c54d5da2..d082176d176a 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -25,7 +25,7 @@
 
 using namespace com::sun::star;
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * ucpdav1_component_getFactory(
 const sal_Char * pImplName, void * pServiceManager, void * 
/*pRegistryKey*/ )
 {
 void * pRet = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 ucb/source/ucp/webdav/PropertyMap.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22d57d223bd491495fbeff952a71da4c94745813
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 09:10:59 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 4 14:09:12 2018 +0200

loplugin:simplifybool (--with-webdav=serf)

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

diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx 
b/ucb/source/ucp/webdav/PropertyMap.hxx
index 7438566f732f..ef5693d760b3 100644
--- a/ucb/source/ucp/webdav/PropertyMap.hxx
+++ b/ucb/source/ucp/webdav/PropertyMap.hxx
@@ -31,7 +31,7 @@ struct equalPropertyName
   bool operator()( const css::beans::Property & p1,
const css::beans::Property & p2 ) const
   {
-return !!( p1.Name == p2.Name );
+return p1.Name == p2.Name;
   }
 };
 
___
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 7b6a65685f728c94ffd41f859a29e50b79f83abd
Author: Olivier Hallot 
AuthorDate: Tue Sep 4 07:38:03 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Sep 4 13:57:11 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Typo

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

diff --git a/helpcontent2 b/helpcontent2
index 401ca6e0d92c..c725ea5ca254 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 401ca6e0d92c9c95d14b89b90bef225664f7d462
+Subproject commit c725ea5ca254d3723acbd7fa7f75b41b63c555b1
___
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/scalc/01/func_day.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c725ea5ca254d3723acbd7fa7f75b41b63c555b1
Author: Olivier Hallot 
AuthorDate: Tue Sep 4 07:38:03 2018 -0300
Commit: Olivier Hallot 
CommitDate: Tue Sep 4 13:57:11 2018 +0200

Typo

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

diff --git a/source/text/scalc/01/func_day.xhp 
b/source/text/scalc/01/func_day.xhp
index d7cf403b0..f5501cc4a 100644
--- a/source/text/scalc/01/func_day.xhp
+++ b/source/text/scalc/01/func_day.xhp
@@ -36,7 +36,7 @@
 
 
 Examples
-=DAY(1)  returns 31 (since $[officename] starts counting at 
zero from December 30, 1899)
+=DAY(1)  returns 31 (since $[officename] starts counting at 
zero from December 30, 1899)
 =DAY(NOW())  returns the current day.
 =DAY(C4)  returns 5 if you enter 1901-08-05 in cell C4 (the 
date value might get formatted differently after you press Enter).
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/uibase/utlui/unotools.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 38e59471c6c2c3d0685978b4880709d00a94c3fc
Author: Samuel Mehrbrodt 
AuthorDate: Tue Jul 18 16:09:05 2017 +0200
Commit: Juergen Funk 
CommitDate: Tue Sep 4 13:24:46 2018 +0200

tdf#109188 Always load documents read-only in SwOneExampleFrame

Should be no problem since 38a3743e0c5d52f9386f74097fd512d3133fbbe3

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

Conflicts:
sw/source/uibase/utlui/unotools.cxx

Change-Id: I0ce47bc2bdaa900559a16baf25305066977caa6d

diff --git a/sw/source/uibase/utlui/unotools.cxx 
b/sw/source/uibase/utlui/unotools.cxx
index a4f2eaba3141..67a60f99d034 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -145,7 +145,7 @@ void SwOneExampleFrame::CreateControl()
 pValues[1].Name = "Referer";
 pValues[1].Value <<= OUString("private:user");
 pValues[2].Name = "ReadOnly";
-pValues[2].Value <<= (sTempURL != cFactory);
+pValues[2].Value <<= true;
 uno::Any aArgs;
 aArgs.setValue(&aSeq, 
cppu::UnoType>::get());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/data/dptabres.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 8767161e056b5d7fc8cf168d0541db86635d1041
Author: Caolán McNamara 
AuthorDate: Sun Sep 2 21:20:40 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 13:31:17 2018 +0200

ofz#10189 check container size

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

diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index c309a350bf59..38107b70e09f 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2862,10 +2862,14 @@ void ScDPResultDimension::LateInitFrom(
 {
 if ( rParams.IsEnd( nPos ) )
 return;
-OSL_ENSURE( nPos <= pItemData.size(), 
OString::number(pItemData.size()).getStr() );
+if (nPos >= pItemData.size())
+{
+SAL_WARN("sc.core", "pos " << nPos << ", but vector size is " << 
pItemData.size());
+return;
+}
+SCROW rThisData = pItemData[nPos];
 ScDPDimension* pThisDim = rParams.GetDim( nPos );
 ScDPLevel* pThisLevel = rParams.GetLevel( nPos );
-SCROW rThisData = pItemData[nPos];
 
 if (!pThisDim || !pThisLevel)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

avmedia VLC backend

[Kirk Puppy]

Hi all,

I've compiled LibreOffice-6.1.0.3 and 6.0.6.2 with:

--disable-gstreamer-1-0
--disable-gstreamer-0-10
--enable-vlc

Both versions build fine, but embedded video in Impress doesn't play. No
messages when ran from a terminal. This is using VLC-3.0.3. This did work
the last time I built LibreOffice-5.2.7.2 with VLC-2.2.6. I haven't did a
debug build yet, takes quite a while on my laptop. Has anyone tried the VLC
backend lately? I know it's marked experimental, so if it's known to be
broken please let me know.

Thanks for your help,
Kirk

P.S. I'm not on the list so please reply to all.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 ucb/source/ucp/webdav/webdavdatasupplier.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf8fbbaa683ef7eef5f9587b60486f622b50cb80
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 09:14:08 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 4 12:27:11 2018 +0200

loplugin:unnecessaryparen (--with-webdav=serf)

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

diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx 
b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index 11c951f3bcd8..141ed988aa14 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -92,7 +92,7 @@ DataSupplier_Impl::~DataSupplier_Impl()
 
 while ( it != end )
 {
-delete (*it);
+delete *it;
 ++it;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/Socket.cpp

[Libreoffice Gerrit user]

 net/Socket.cpp |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 997503a8d17178bb6eaab50e796f1be1dc84bbab
Author: Tor Lillqvist 
AuthorDate: Tue Sep 4 12:02:20 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Sep 4 12:24:48 2018 +0300

Make this file compile for iOS

Again, note that I don't claim this file (or the code-base as such)
would make much sense for iOS as such at the moment. I just want it to
compile for now. Baby steps etc. (And there is no public Xcode project
to compile it even partially.)

Change-Id: I1321d61e9e911c7d97c7309b78aab46d9cecec29

diff --git a/net/Socket.cpp b/net/Socket.cpp
index 2fc2a1425..98bb6b996 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -24,14 +24,18 @@
 
 #include 
 #include "Socket.hpp"
+#ifdef __linux
 #include "ServerSocket.hpp"
 #include "SslSocket.hpp"
+#endif
 #include "WebSocketHandler.hpp"
 
 int SocketPoll::DefaultPollTimeoutMs = 5000;
 std::atomic SocketPoll::InhibitThreadChecks(false);
 std::atomic Socket::InhibitThreadChecks(false);
 
+#ifdef __linux
+
 int Socket::createSocket(Socket::Type type)
 {
 int domain = type == Type::IPv4 ? AF_INET : AF_INET6;
@@ -216,12 +220,15 @@ void SocketPoll::insertNewWebSocketSync(const Poco::URI 
&uri, const std::shared_
 LOG_ERR("Failed to lookup client websocket host '" << uri.getHost() << 
"' skipping");
 }
 
+#endif
+
+#ifdef __linux
+
 void ServerSocket::dumpState(std::ostream& os)
 {
 os << "\t" << getFD() << "\t\n";
 }
 
-
 void SocketDisposition::execute()
 {
 // We should have hard ownership of this socket.
@@ -238,6 +245,8 @@ void SocketDisposition::execute()
 const int WebSocketHandler::InitialPingDelayMs = 25;
 const int WebSocketHandler::PingFrequencyMs = 18 * 1000;
 
+#endif
+
 void WebSocketHandler::dumpState(std::ostream& os)
 {
 os << (_shuttingDown ? "shutd " : "alive ")
@@ -272,6 +281,8 @@ void StreamSocket::send(Poco::Net::HTTPResponse& response)
 send(oss.str());
 }
 
+#ifdef __linux
+
 void SocketPoll::dumpState(std::ostream& os)
 {
 // FIXME: NOT thread-safe! _pollSockets is modified from the polling 
thread!
@@ -333,6 +344,8 @@ bool ServerSocket::bind(Type type, int port)
 return rc == 0;
 }
 
+#endif
+
 bool StreamSocket::parseHeader(const char *clientName,
Poco::MemoryInputStream &message,
Poco::Net::HTTPRequest &request,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/Auth.hpp

[Libreoffice Gerrit user]

 wsd/Auth.hpp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 496bf321a7546475a01bedbddc1f6ec39e91bc14
Author: Tor Lillqvist 
AuthorDate: Tue Sep 4 12:02:12 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Sep 4 12:17:46 2018 +0300

Make this file compile for iOS

diff --git a/wsd/Auth.hpp b/wsd/Auth.hpp
index 96bcb86b6..2ad47a3f1 100644
--- a/wsd/Auth.hpp
+++ b/wsd/Auth.hpp
@@ -14,8 +14,10 @@
 #include 
 #include 
 
+#ifdef __linux
 #include 
 #include 
+#endif
 #include 
 #include 
 
@@ -65,6 +67,8 @@ public:
 virtual bool verify(const std::string& token) = 0;
 };
 
+#ifdef __linux
+
 /// JWT Authorization.
 class JWTAuth : public AuthBase
 {
@@ -131,4 +135,6 @@ private:
 
 #endif
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 10c302f04781b1607f6500ba56c35195aca03ce0
Author: Tor Lillqvist 
AuthorDate: Tue Sep 4 11:55:31 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Sep 4 12:12:35 2018 +0300

Make std::chrono usage more portable

Add a std::chrono::time_point_cast to get it to compile against libc++
(for iOS).

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 8de6a9779..48671a0dc 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1785,9 +1785,9 @@ void DocumentBroker::dumpState(std::ostream& os)
 os << "\n  doc key: " << _docKey;
 os << "\n  doc id: " << _docId;
 os << "\n  num sessions: " << _sessions.size();
-const std::time_t t = std::chrono::system_clock::to_time_t(
+const std::time_t t = 
std::chrono::system_clock::to_time_t(std::chrono::time_point_cast(
 std::chrono::system_clock::now()
-+ (_lastSaveTime - std::chrono::steady_clock::now()));
++ (_lastSaveTime - std::chrono::steady_clock::now(;
 os << "\n  last saved: " << std::ctime(&t);
 os << "\n  cursor " << _cursorPosX << ", " << _cursorPosY
   << "( " << _cursorWidth << "," << _cursorHeight << ")\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/TileCache.cpp

[Libreoffice Gerrit user]

 wsd/TileCache.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0e9f5eba96ed1d83327002c4004843f38c425fe5
Author: Tor Lillqvist 
AuthorDate: Mon Sep 3 18:58:43 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Sep 4 12:04:07 2018 +0300

Make this file compile for iOS

Note that I don't claim this file would make much sense for iOS as
such at the moment. I just want it to compile for now. This holds for
all my other recent commits with the same 'Make this file compile for
iOS' commit message.

diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index c7743a5cc..5f995b30d 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -72,7 +72,7 @@ TileCache::TileCache(const std::string& docURL,
 
 TileCache::~TileCache()
 {
-_owner = std::thread::id(0);
+_owner = std::thread::id();
 LOG_INF("~TileCache dtor for uri [" << _docURL << "].");
 }
 
@@ -574,7 +574,7 @@ std::string TileCache::cancelTiles(const 
std::shared_ptr &subscri
 
 void TileCache::assertCorrectThread()
 {
-const bool correctThread = _owner == std::thread::id(0) || 
std::this_thread::get_id() == _owner;
+const bool correctThread = _owner == std::thread::id() || 
std::this_thread::get_id() == _owner;
 if (!correctThread)
 LOG_ERR("TileCache method invoked from foreign thread. Expected: " <<
 Log::to_string(_owner) << " but called from " <<
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit a416f72ce057eacbcf16e58456d4c11e42430ee6
Author: Caolán McNamara 
AuthorDate: Mon Sep 3 09:19:29 2018 +0100
Commit: Michael Stahl 
CommitDate: Tue Sep 4 10:57:04 2018 +0200

upgrade to openssl 1.0.2p

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

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

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

[Libreoffice Gerrit user]

 external/libcmis/UnpackedTarball_libcmis.mk |1 +
 external/libcmis/boost-1.68.patch.0 |   15 +++
 2 files changed, 16 insertions(+)

New commits:
commit 3ef3569c4ae1c5319aff0664d52cbd8a8d42c909
Author: rezso 
AuthorDate: Tue Sep 4 01:18:10 2018 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 4 10:45:17 2018 +0200

tdf#119344 fix libcmis build with boost 1.68

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

diff --git a/external/libcmis/UnpackedTarball_libcmis.mk 
b/external/libcmis/UnpackedTarball_libcmis.mk
index 8ce0b03d10c4..0ec8f5182edc 100644
--- a/external/libcmis/UnpackedTarball_libcmis.mk
+++ b/external/libcmis/UnpackedTarball_libcmis.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcmis, \

external/libcmis/libcmis-sharepoint-repository-root.patch \

external/libcmis/libcmis-fix-error-handling.patch \
external/libcmis/c++17.patch.0 \
+   
external/libcmis/boost-1.68.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/libcmis/boost-1.68.patch.0 
b/external/libcmis/boost-1.68.patch.0
new file mode 100644
index ..2d86a4db2865
--- /dev/null
+++ b/external/libcmis/boost-1.68.patch.0
@@ -0,0 +1,15 @@
+--- src/libcmis/xml-utils.cxx.orig 2016-03-01 16:14:26 UTC
 src/libcmis/xml-utils.cxx
+@@ -31,7 +31,12 @@
+ #include 
+ #include 
+ 
++#include 
++#if (BOOST_VERSION >= 106800)
++#include 
++#else
+ #include 
++#endif
+ #include 
+ 
+ #include "xml-utils.hxx"
___
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-1' - sfx2/qa sfx2/source

[Libreoffice Gerrit user]

 sfx2/qa/cppunit/test_misc.cxx |8 
 sfx2/source/doc/docfile.cxx   |4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 24177b61e7839a7b9726aed08997b44d08e89f10
Author: Miklos Vajna 
AuthorDate: Tue Aug 28 09:05:06 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Sep 4 10:26:30 2018 +0200

tdf#119050 sfx2 store: don't inherit temp file permissions when overwriting

The too aggressive error handling in commit
fb04780cf8523ad4e900ae8b9cecbe7a2697a12a (tdf#116117 sfx2 store: don't
inherit temp file permissions when renaming, 2018-03-12) means that if
the file is already there, then we don't try to stat() it; even if there
is no problem with that.

(cherry picked from commit 38afe2976eea427999c39ee3a73e7938ec8d5f7b)

Change-Id: Ie0b9084064834e339bcae3ad7b4a35c54cb9d3c2
Reviewed-on: https://gerrit.libreoffice.org/59709
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit ff0b1f3c8063f4d7c171a9ea2db4efbff16eda39)
Reviewed-on: https://gerrit.libreoffice.org/59760
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Eike Rathke 
Reviewed-by: Miklos Vajna 

diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx
index d74687b25431..817e246b6bf6 100644
--- a/sfx2/qa/cppunit/test_misc.cxx
+++ b/sfx2/qa/cppunit/test_misc.cxx
@@ -146,6 +146,14 @@ void MiscTest::testNoThumbnail()
 // requested so.
 CPPUNIT_ASSERT(aStatus.getAttributes() & osl_File_Attribute_GrpRead);
 CPPUNIT_ASSERT(aStatus.getAttributes() & osl_File_Attribute_OthRead);
+
+// Now "save as" again to trigger the "overwrite" case.
+xStorable->storeToURL(aTempFile.GetURL(), {});
+CPPUNIT_ASSERT_EQUAL(osl::DirectoryItem::E_None, 
aItem.getFileStatus(aStatus));
+// The following check used to fail in the past, result had temp file
+// permissions.
+CPPUNIT_ASSERT(aStatus.getAttributes() & osl_File_Attribute_GrpRead);
+
 umask(nMask);
 #endif
 
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 72a6c131fc41..2e8b874deedb 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -179,8 +179,10 @@ sal_uInt64 GetDefaultFileAttributes(const OUString& rURL)
 if (!comphelper::isFileUrl(rURL))
 return nRet;
 
+// Make sure the file exists (and create it if not).
 osl::File aFile(rURL);
-if (aFile.open(osl_File_OpenFlag_Create) != osl::File::E_None)
+osl::File::RC nRes = aFile.open(osl_File_OpenFlag_Create);
+if (nRes != osl::File::E_None && nRes != osl::File::E_EXIST)
 return nRet;
 
 aFile.close();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Frame.hxx |2 +
 vcl/qt5/Qt5Frame.cxx |   63 ++-
 2 files changed, 54 insertions(+), 11 deletions(-)

New commits:
commit c134154de1d96f458c4502372c7d7e4d12a58fb3
Author: Katarina Behrens 
AuthorDate: Wed Aug 29 14:04:56 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Sep 4 10:05:50 2018 +0200

kde5: fix initial [re]size of LibO main window

Consider also blank user profile (empty-ish WindowState) and show
maximized window in that case

Change-Id: Idddcef357cec5f6e6923884ee0c5b454451e8caa
Reviewed-on: https://gerrit.libreoffice.org/59764
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 3bec15f1ecf4..e81add10ad1e 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -82,6 +82,8 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
 bool isWindow();
 QWindow* windowHandle();
 QScreen* screen();
+bool isMinimized();
+bool isMaximized();
 
 void TriggerPaintEvent();
 void TriggerPaintEvent(QRect aRect);
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index f609f3cbaa5b..b6ce6dc5736a 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -118,7 +119,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags 
nStyle, bool bUseCairo)
 // fake an initial geometry, gets updated via configure event or SetPosSize
 if (m_bDefaultPos || m_bDefaultSize)
 {
-Size aDefSize = Size(0, 0); // CalcDefaultSize();
+Size aDefSize = CalcDefaultSize();
 maGeometry.nX = -1;
 maGeometry.nY = -1;
 maGeometry.nWidth = aDefSize.Width();
@@ -161,8 +162,8 @@ void Qt5Frame::TriggerPaintEvent(QRect aRect)
 
 void Qt5Frame::InitSvpSalGraphics(SvpSalGraphics* pSvpSalGraphics)
 {
-int width = 100;
-int height = 100;
+int width = 640;
+int height = 480;
 m_pSvpGraphics = pSvpSalGraphics;
 m_pSurface.reset(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, 
height));
 m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(width, 
height));
@@ -235,10 +236,33 @@ QWindow* Qt5Frame::windowHandle()
 
 QScreen* Qt5Frame::screen()
 {
+QWindow* winHandle = nullptr;
+
+if (m_pTopLevel)
+winHandle = m_pTopLevel->windowHandle();
+else
+winHandle = m_pQWidget->windowHandle();
+
+if (winHandle)
+return winHandle->screen();
+
+return nullptr;
+}
+
+bool Qt5Frame::isMinimized()
+{
 if (m_pTopLevel)
-return m_pTopLevel->windowHandle()->screen();
+return m_pTopLevel->isMinimized();
 else
-return m_pQWidget->windowHandle()->screen();
+return m_pQWidget->isMinimized();
+}
+
+bool Qt5Frame::isMaximized()
+{
+if (m_pTopLevel)
+return m_pTopLevel->isMaximized();
+else
+return m_pQWidget->isMaximized();
 }
 
 void Qt5Frame::SetTitle(const OUString& rTitle)
@@ -285,6 +309,10 @@ void Qt5Frame::SetExtendedFrameStyle(SalExtStyle 
/*nExtStyle*/) {}
 void Qt5Frame::Show(bool bVisible, bool /*bNoActivate*/)
 {
 assert(m_pQWidget);
+
+if (m_bDefaultSize)
+SetDefaultSize();
+
 if (m_pTopLevel)
 m_pTopLevel->setVisible(bVisible);
 else
@@ -316,10 +344,14 @@ void Qt5Frame::Center()
 Size Qt5Frame::CalcDefaultSize()
 {
 assert(isWindow());
+QSize qSize(0, 0);
 QScreen* pScreen = screen();
-if (!pScreen)
-return Size();
-return bestmaxFrameSizeForScreenSize(toSize(pScreen->size()));
+if (pScreen)
+qSize = pScreen->size();
+else
+qSize = QApplication::desktop()->screenGeometry(0).size();
+
+return bestmaxFrameSizeForScreenSize(toSize(qSize));
 }
 
 void Qt5Frame::SetDefaultSize()
@@ -341,7 +373,10 @@ void Qt5Frame::SetPosSize(long nX, long nY, long nWidth, 
long nHeight, sal_uInt1
 m_bDefaultSize = false;
 if (isChild(false) || !m_pQWidget->isMaximized())
 {
-m_pQWidget->resize(nWidth, nHeight);
+if (m_pTopLevel)
+m_pTopLevel->resize(nWidth, nHeight);
+else
+m_pQWidget->resize(nWidth, nHeight);
 }
 }
 else if (m_bDefaultSize)
@@ -420,7 +455,7 @@ void Qt5Frame::SetWindowState(const SalFrameState* pState)
   | WindowStateMask::MaximizedWidth | WindowStateMask::MaximizedHeight;
 
 if ((pState->mnMask & WindowStateMask::State) && (pState->mnState & 
WindowStateState::Maximized)
-&& (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask)
+&& !isMaximized() && (pState->mnMask & nMaxGeometryMask) == 
nMaxGeometryMask)
 m_pQWidget->showMaximized();
 else if (pState->mnMask
  & (WindowStateMask::X | WindowStateMask::Y | 
WindowStateMask::Width
@@ -449,6 +484,12 @@ void Qt5Frame::SetWindowState(const S

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f1/293fc1719a7dca21c17ac4ffc9a00ab135a3ab

[Libreoffice Gerrit user]

 f1/293fc1719a7dca21c17ac4ffc9a00ab135a3ab |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 562ae7ee72664aa1a396a3297241f6e780ae5aea
Author: Caolán McNamara 
AuthorDate: Tue Sep 4 09:05:20 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 09:05:20 2018 +0100

Notes added by 'git notes add'

diff --git a/f1/293fc1719a7dca21c17ac4ffc9a00ab135a3ab 
b/f1/293fc1719a7dca21c17ac4ffc9a00ab135a3ab
new file mode 100644
index ..7581214d010b
--- /dev/null
+++ b/f1/293fc1719a7dca21c17ac4ffc9a00ab135a3ab
@@ -0,0 +1 @@
+prefer: dd371caa3aff09c80c19772fcf5968cfcf14ff8c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/tool/interpr2.cxx |   62 +++
 1 file changed, 50 insertions(+), 12 deletions(-)

New commits:
commit 184aee6abd202f6f4e2c18d21f96a0d1a9fd947f
Author: Eike Rathke 
AuthorDate: Mon Aug 27 15:05:54 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 10:01:04 2018 +0200

Resolves: tdf#119533 reintroduce time rounding but cut, tdf#118800 follow-up

 This is a combination of 2 commits.

Resolves: tdf#119533 reintroduce time rounding but cut, tdf#118800 follow-up

Regression from

commit c69e7266916ac1b8917477fb4eccdb9098da5792
CommitDate: Thu Jul 19 14:01:30 2018 +0200

tdf#118800 fix rounding error in Calc function HOUR, MINUTE, SECOND.

Rounding was only an error if it produced a value of a full day in
seconds, or if it otherwise led to an inappropriately rounded-up
individual value, but in general some rounding is necessary.

Instead of omitting rounding completely, basically round to
nanoseconds and then do not round individual hour,minute,second
values but instead truncate to the next magnitude so 23:59:59.
gives 23h59m59s instead of 24h0m0s

Reviewed-on: https://gerrit.libreoffice.org/59677
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 273b3e10eab70ebc084cb62568bd699fddfb376e)

Shortcut small negative values to 0:0:0, tdf#119533 tdf#118800 follow-up

... instead of letting them end up as 24:0:0

Reviewed-on: https://gerrit.libreoffice.org/59699
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 98cb91686901dc0133c5c23dc5658d9623dbd436)

0212a2b422a931a24fd2748aa2826a5b60d2a397

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

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index debe3509eb44..eb5352e843ae 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -142,28 +142,66 @@ void ScInterpreter::ScGetDay()
 PushDouble(static_cast(aDate.GetDay()));
 }
 
+/* TODO: move this to tools::Time so also SvNumberFormatter and everything else
+ * can use it and all display the same values. */
+static void lcl_getHourMinuteSecond( double fTimeInDays, sal_Int32& nHour, 
sal_Int32& nMinute, sal_Int32& nSecond )
+{
+const double fTime = fTimeInDays - rtl::math::approxFloor(fTimeInDays); // 
date part absent
+
+// If 0 then full day (or no day), shortcut.
+// If < 0 then approxFloor() effectively returned the ceiling (note this
+// also holds for negative fTimeInDays values) because of a near identical
+// value, shortcut this to a full day as well.
+// If >= 1.0 (actually == 1.0) then fTimeInDays is a negative small value
+// not significant for a representable time and approxFloor() returned -1,
+// shortcut to 0:0:0, otherwise it would become 24:0:0.
+if (fTime <= 0.0 || fTime >= 1.0)
+{
+nHour = nMinute = nSecond = 0;
+return;
+}
+
+// In seconds, including milli and nano.
+const double fRawSeconds = fTime * DATE_TIME_FACTOR;
+
+// Round to nanoseconds, which is the highest resolution this could be
+// influenced by.
+double fSeconds = rtl::math::round( fRawSeconds, 9);
+
+// If this ended up as a full day the original value was very very close
+// but not quite. Take that.
+if (fSeconds >= tools::Time::secondPerDay)
+fSeconds = fRawSeconds;
+
+// Now do not round values (specifically not up), but truncate to the next
+// magnitude, so 23:59:59.99 is still 23:59:59 and not 24:00:00 (or even
+// 00:00:00 which Excel does).
+nHour = fSeconds / tools::Time::secondPerHour;
+fSeconds -= nHour * tools::Time::secondPerHour;
+nMinute = fSeconds / tools::Time::secondPerMinute;
+fSeconds -= nMinute * tools::Time::secondPerMinute;
+nSecond = fSeconds;
+}
+
 void ScInterpreter::ScGetMin()
 {
-double fTime = GetDouble();
-fTime -= ::rtl::math::approxFloor(fTime);   // date part absent
-long nVal = 
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR)) % 
::tools::Time::secondPerHour;
-PushDouble( static_cast(nVal / ::tools::Time::secondPerMinute) );
+sal_Int32 nHour, nMinute, nSecond;
+lcl_getHourMinuteSecond( GetDouble(), nHour, nMinute, nSecond);
+PushDouble( nMinute);
 }
 
 void ScInterpreter::ScGetSec()
 {
-double fTime = GetDouble();
-fTime -= ::rtl::math::approxFloor(fTime);   // date part absent
-long nVal = 
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR)) % 
::tools::Time::secondPerMinute;
-PushDouble( static_cast(nVal) );
+sal_Int32 nHour, nMinute, nSecond;
+lcl_getHourMinuteSecond( GetDouble(), nHour, nMinu

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

[Libreoffice Gerrit user]

 sc/source/core/tool/interpr3.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit da7929ed0ad5916f39111908fb7f897df8691c39
Author: Eike Rathke 
AuthorDate: Mon Aug 27 10:09:32 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 10:00:46 2018 +0200

Increase arbitrary sort elements limit from 10 to two full columns

The value 10 already was in the year 2000 initial commit,
probably some memory and performance constraints back then. At
least one full column should be sortable, make it two so we don't
bail out that early for functions like MODE() that can take
multiple ranges. In fact maybe ScMatrix::IsSizeAllocatable()
should be taken into account, which is much larger though and
QuickSort() might not play well with it.

Change-Id: I061abfd0f061c8df62c31468df744eb5dc7152be
Reviewed-on: https://gerrit.libreoffice.org/59637
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit e8cb36fd6234270c8c31147db35cccab9c234529)
Reviewed-on: https://gerrit.libreoffice.org/59660
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index b52a62fd3d20..28e8cd9a9c48 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -39,7 +39,9 @@
 using ::std::vector;
 using namespace formula;
 
-#define MAX_COUNT_DOUBLE_FOR_SORT 10
+/// Two columns of data should be sortable with GetSortArray() and QuickSort()
+// This is an arbitrary limit.
+#define MAX_COUNT_DOUBLE_FOR_SORT (MAXROWCOUNT * 2)
 
 const double ScInterpreter::fMaxGammaArgument = 171.624376956302;  // found 
experimental
 const double fMachEps = ::std::numeric_limits::epsilon();
___
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' - svl/source

[Libreoffice Gerrit user]

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

New commits:
commit 3099e4261eab39304411eec4cd782592fa139862
Author: Eike Rathke 
AuthorDate: Thu Aug 30 16:46:49 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 10:00:25 2018 +0200

Use INPUTSTRING_PRECISION to enable input of fraction of second

This got lost when SvNumberFormatter::INPUTSTRING_PRECISION was
introduced but not all places changed using the previous hard
coded number 300, so input of fraction of second in time clock and
duration was either truncated or not available at all, already
since

commit 0ce0dd5863208500d8d4658f1f68f34e254ab015
CommitDate: Tue Dec 1 16:58:07 2009 -0500

#i46511# Fixed one bug where the standard percent format
incorrectly got unlimited precision.

Change-Id: I9e4dd867b07090db16b23639fd01fb2cebb3f5d0
Reviewed-on: https://gerrit.libreoffice.org/59815
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 73c200d7e5779b18ee1406b7fbd2000a8c901589)
Reviewed-on: https://gerrit.libreoffice.org/59838
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index afbab5087e54..a1d55cbc82f9 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2945,7 +2945,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
 }
 bool bInputLine;
 sal_Int32 nCntPost;
-if ( rScan.GetStandardPrec() == 300 &&
+if ( rScan.GetStandardPrec() == SvNumberFormatter::INPUTSTRING_PRECISION &&
  0 < rInfo.nCntPost && rInfo.nCntPost < 7 )
 {   // round at 7 decimals (+5 of 86400 == 12 significant digits)
 bInputLine = true;
@@ -3807,7 +3807,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
 const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
 bool bInputLine;
 sal_Int32 nCntPost;
-if ( rScan.GetStandardPrec() == 300 &&
+if ( rScan.GetStandardPrec() == SvNumberFormatter::INPUTSTRING_PRECISION &&
  0 < rInfo.nCntPost && rInfo.nCntPost < 7 )
 {
 // round at 7 decimals (+5 of 86400 == 12 significant digits)
___
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' - slideshow/source

[Libreoffice Gerrit user]

 slideshow/source/engine/shapes/drawshapesubsetting.cxx |   23 +++--
 1 file changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 328646778fcf7242863f0fe20f33bd99d3386c63
Author: Mike Kaganski 
AuthorDate: Mon Sep 3 19:27:57 2018 +0300
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 09:59:17 2018 +0200

tdf#119146: fix populating maCurrentSubsets

Regression from commit 4600b07c1d787f959618d9ecf54161e4ea4ffa61

Before the mentioned commit, creating a subset X, and then adding
sub-subsets until all the subset is excluded, had left the subset X
with two *empty* nodes in maCurrentSubsets, 1st of them having both
mnStartIndex and mnEndIndex equal to maSubset.mnStartIndex, and 2nd
having both mnStartIndex and mnEndIndex equal to maSubset.mnEndIndex.

The commit above changed that to adding maSubset to maCurrentSubsets
in the beginning of each exclusion, which finally resulted in a messy
maCurrentSubsets with multiple duplicating nodes effectively covering
all maSubset. That resulted in the item as a whole handled *besides*
the sub-subsets.

This commit (1) avoids adding extra maSubset to maCurrentSubsets, and
(2) adds the two empty nodes in case all the subset has been excluded
by its sub-subsets.

Change-Id: I7fc5f2d0b6ecf4f9247351da3a2746032150557b
Reviewed-on: https://gerrit.libreoffice.org/59948
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit a8aaffa6ea0f0fd8cf1d22883173df64a93e3322)
Reviewed-on: https://gerrit.libreoffice.org/59952
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx 
b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 849df8d9897c..f88a0337aa31 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -213,6 +213,25 @@ namespace slideshow
 
 maCurrentSubsets.insert(maCurrentSubsets.end(), 
aNodesToAppend.begin(),
 aNodesToAppend.end());
+// Excluding subsets must not leave an absolutely empty 
maCurrentSubsets, because it
+// would mean "non-subsetting" mode unconditionally, with whole 
object added to subsets.
+// So to indicate a subset with all parts excluded, add two empty 
subsets (starting and
+// ending).
+if (maCurrentSubsets.empty())
+{
+if (maSubset.isEmpty())
+{
+maCurrentSubsets.emplace_back(0, 0);
+maCurrentSubsets.emplace_back(maActionClassVector.size(),
+  maActionClassVector.size());
+}
+else
+{
+maCurrentSubsets.emplace_back(maSubset.getStartIndex(),
+  maSubset.getStartIndex());
+maCurrentSubsets.emplace_back(maSubset.getEndIndex(), 
maSubset.getEndIndex());
+}
+}
 }
 
 void DrawShapeSubsetting::updateSubsets()
@@ -275,10 +294,10 @@ namespace slideshow
 
 void DrawShapeSubsetting::initCurrentSubsets()
 {
-// only add subset to vector, if it's not empty - that's
+// only add subset to vector, if vector is empty, and subset is 
not empty - that's
 // because the vector's content is later literally used
 // for e.g. painting.
-if( !maSubset.isEmpty() )
+if (maCurrentSubsets.empty() && !maSubset.isEmpty())
 maCurrentSubsets.push_back( maSubset );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/vcl/weld.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 25f109c229eb4300bee79e41ae69137d5f9fdb35
Author: Caolán McNamara 
AuthorDate: Mon Sep 3 19:23:05 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 09:58:38 2018 +0200

reformat current value on initial weld

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 74ad3803bdc0..60923123c57a 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -603,6 +603,7 @@ public:
 m_xSpinButton->connect_input(LINK(this, MetricSpinButton, 
spin_button_input));
 m_xSpinButton->connect_value_changed(
 LINK(this, MetricSpinButton, spin_button_value_changed));
+spin_button_output(*m_xSpinButton);
 }
 
 FieldUnit get_unit() const { return m_eSrcUnit; }
@@ -762,6 +763,7 @@ public:
 m_xSpinButton->connect_value_changed(LINK(this, TimeSpinButton, 
spin_button_value_changed));
 m_xSpinButton->connect_cursor_position(
 LINK(this, TimeSpinButton, spin_button_cursor_position));
+spin_button_output(*m_xSpinButton);
 }
 
 void set_value(const tools::Time& rTime) { 
m_xSpinButton->set_value(ConvertValue(rTime)); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst

[Libreoffice Gerrit user]

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

New commits:
commit dd371caa3aff09c80c19772fcf5968cfcf14ff8c
Author: Caolán McNamara 
AuthorDate: Mon Sep 3 09:19:29 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 4 09:57:58 2018 +0200

upgrade to openssl 1.0.2p

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

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

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

[Libreoffice Gerrit user]

 vcl/inc/unx/desktops.hxx  |2 
 vcl/unx/generic/desktopdetect/desktopdetector.cxx |   82 --
 vcl/unx/generic/plugadapt/salplug.cxx |7 -
 3 files changed, 2 insertions(+), 89 deletions(-)

New commits:
commit 97836184c61075c4d25b85fff0e24874020632cd
Author: rezso 
AuthorDate: Tue Sep 4 02:29:33 2018 +0200
Commit: Katarina Behrens 
CommitDate: Tue Sep 4 09:55:47 2018 +0200

remove unsupported TDE and KDE3 desktops from desktopdetect and salplug

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

diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx
index 89d6459ef955..1b8a7f5f7662 100644
--- a/vcl/inc/unx/desktops.hxx
+++ b/vcl/inc/unx/desktops.hxx
@@ -31,8 +31,6 @@ enum SAL_DLLPUBLIC_RTTI DesktopType {
 DESKTOP_UNITY,
 DESKTOP_XFCE,
 DESKTOP_MATE,
-DESKTOP_TDE,
-DESKTOP_KDE3,
 DESKTOP_KDE4,
 DESKTOP_KDE5
 }; // keep in sync with desktop_strings[] in salplug.cxx
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx 
b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 02ac9be09c3d..e39348c460e6 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -136,47 +136,6 @@ extern "C"
 typedef int(* XErrorHandler)(Display*,XErrorEvent*);
 }
 
-static int TDEVersion( Display* pDisplay )
-{
-int nRet = 0;
-
-Atom nFullSession = XInternAtom( pDisplay, "TDE_FULL_SESSION", True );
-Atom nTDEVersion  = XInternAtom( pDisplay, "TDE_SESSION_VERSION", True );
-
-if( nFullSession )
-{
-if( !nTDEVersion )
-return 14;
-
-AtomaRealType   = None;
-int nFormat = 8;
-unsigned long   nItems  = 0;
-unsigned long   nBytesLeft  = 0;
-unsigned char*  pProperty   = nullptr;
-XGetWindowProperty( pDisplay,
-DefaultRootWindow( pDisplay ),
-nTDEVersion,
-0, 1,
-False,
-AnyPropertyType,
-&aRealType,
-&nFormat,
-&nItems,
-&nBytesLeft,
-&pProperty );
-if( !WasXError() && nItems != 0 && pProperty )
-{
-nRet = *reinterpret_cast< sal_Int32* >( pProperty );
-}
-if( pProperty )
-{
-XFree( pProperty );
-pProperty = nullptr;
-}
-}
-return nRet;
-}
-
 static int KDEVersion( Display* pDisplay )
 {
 int nRet = 0;
@@ -218,39 +177,6 @@ static int KDEVersion( Display* pDisplay )
 return nRet;
 }
 
-static bool is_tde_desktop( Display* pDisplay )
-{
-if ( nullptr != getenv( "TDE_FULL_SESSION" ) )
-{
-return true; // TDE
-}
-
-if ( TDEVersion( pDisplay ) >= 14 )
-return true;
-
-return false;
-}
-
-static bool is_kde3_desktop( Display* pDisplay )
-{
-static const char * pFullVersion = getenv( "KDE_FULL_SESSION" );
-if ( pFullVersion )
-{
-static const char * pSessionVersion = getenv( "KDE_SESSION_VERSION" );
-if ( !pSessionVersion || pSessionVersion[0] == '0' )
-{
-return true; // does not exist => KDE3
-}
-
-if ( strcmp(pSessionVersion, "3" ) == 0 )
-{
-return true;
-}
-}
-
-return KDEVersion( pDisplay ) == 3;
-}
-
 static bool is_kde4_desktop( Display* pDisplay )
 {
 static const char * pFullVersion = getenv( "KDE_FULL_SESSION" );
@@ -288,8 +214,6 @@ DESKTOP_DETECTOR_PUBLIC DesktopType 
get_desktop_environment()
 {
 OString aOver( pOverride );
 
-if ( aOver.equalsIgnoreAsciiCase( "tde" ) )
-return DESKTOP_TDE;
 if ( aOver.equalsIgnoreAsciiCase( "kde5" ) )
 return DESKTOP_KDE5;
 if ( aOver.equalsIgnoreAsciiCase( "kde4" ) )
@@ -304,8 +228,6 @@ DESKTOP_DETECTOR_PUBLIC DesktopType 
get_desktop_environment()
 return DESKTOP_XFCE;
 if ( aOver.equalsIgnoreAsciiCase( "mate" ) )
 return DESKTOP_MATE;
-if ( aOver.equalsIgnoreAsciiCase( "kde" ) )
-return DESKTOP_KDE3;
 if ( aOver.equalsIgnoreAsciiCase( "none" ) )
 return DESKTOP_UNKNOWN;
 }
@@ -389,10 +311,6 @@ DESKTOP_DETECTOR_PUBLIC DesktopType 
get_desktop_environment()
 ret = DESKTOP_KDE4;
 else if ( is_gnome_desktop( pDisplay ) )
 ret = DESKTOP_GNOME;
-else if ( is_kde3_desktop( pDisplay ) )
-ret = DESKTOP_KDE3;
-else if ( is_tde_desktop( pDisplay ) )
-ret = DESKTOP_TDE;
 else
 ret = DESKTOP_UNKNOWN;
 
diff --git a/vcl/unx/generic

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

[Libreoffice Gerrit user]

 editeng/source/editeng/editeng.cxx|   24 +---
 editeng/source/editeng/impedit.cxx|   10 +--
 editeng/source/editeng/impedit.hxx|   15 +
 editeng/source/editeng/impedit2.cxx   |   62 +---
 editeng/source/editeng/impedit3.cxx   |6 --
 editeng/source/editeng/impedit4.cxx   |2 
 editeng/source/uno/unoedhlp.cxx   |   12 
 include/editeng/editdata.hxx  |   20 +-
 include/svl/hint.hxx  |   10 ---
 svx/source/accessibility/AccessibleTextHelper.cxx |   65 ++
 10 files changed, 43 insertions(+), 183 deletions(-)

New commits:
commit 6b669c9d9ee61c5c37c384c3a546467a048f5636
Author: Paul Trojahn 
AuthorDate: Thu Aug 9 11:04:33 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 4 09:41:28 2018 +0200

tdf#118967 Batch all a11y notifications

Currently all a11y notifications get send out immediately, which often
ends up formatting the document before it is ready. With the current
EnterBlockNotifications()/LeaveBlockNotifications() system it is difficult
to find all places that need blocking and any change in the a11y code
might require additional blocking in unpredictable places. By queueing
all notifications by default and only sending them out when the document
is ready, we can make sure that it can't be corrupted.

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

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index e601fa4172e7..40a1dcb5adfe 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1024,14 +1024,6 @@ bool EditEngine::PostKeyEvent( const KeyEvent& 
rKeyEvent, EditView* pEditView, v
 }
 }
 
-pImpEditEngine->EnterBlockNotifications();
-
-if ( GetNotifyHdl().IsSet() )
-{
-EENotify aNotify( EE_NOTIFY_INPUT_START );
-pImpEditEngine->CallNotify( aNotify );
-}
-
 if ( eFunc == KeyFuncType::DONTKNOW )
 {
 switch ( nCode )
@@ -1430,14 +1422,6 @@ bool EditEngine::PostKeyEvent( const KeyEvent& 
rKeyEvent, EditView* pEditView, v
 pImpEditEngine->CallStatusHdl();
 }
 
-if ( GetNotifyHdl().IsSet() )
-{
-EENotify aNotify( EE_NOTIFY_INPUT_END );
-pImpEditEngine->CallNotify( aNotify );
-}
-
-pImpEditEngine->LeaveBlockNotifications();
-
 return bDone;
 }
 
@@ -1534,10 +1518,8 @@ std::unique_ptr 
EditEngine::GetEmptyTextObject() const
 
 void EditEngine::SetText( const EditTextObject& rTextObject )
 {
-pImpEditEngine->EnterBlockNotifications();
 pImpEditEngine->SetText( rTextObject );
 pImpEditEngine->FormatAndUpdate();
-pImpEditEngine->LeaveBlockNotifications();
 }
 
 void EditEngine::ShowParagraph( sal_Int32 nParagraph, bool bShow )
@@ -2500,7 +2482,7 @@ void EditEngine::ParagraphInserted( sal_Int32 nPara )
 {
 EENotify aNotify( EE_NOTIFY_PARAGRAPHINSERTED );
 aNotify.nParagraph = nPara;
-pImpEditEngine->CallNotify( aNotify );
+pImpEditEngine->QueueNotify( aNotify );
 }
 }
 
@@ -2511,7 +2493,7 @@ void EditEngine::ParagraphDeleted( sal_Int32 nPara )
 {
 EENotify aNotify( EE_NOTIFY_PARAGRAPHREMOVED );
 aNotify.nParagraph = nPara;
-pImpEditEngine->CallNotify( aNotify );
+pImpEditEngine->QueueNotify( aNotify );
 }
 }
 void EditEngine::ParagraphConnected( sal_Int32 /*nLeftParagraph*/, sal_Int32 
/*nRightParagraph*/ )
@@ -2533,7 +2515,7 @@ void EditEngine::ParagraphHeightChanged( sal_Int32 nPara )
 {
 EENotify aNotify( EE_NOTIFY_TextHeightChanged );
 aNotify.nParagraph = nPara;
-pImpEditEngine->CallNotify( aNotify );
+pImpEditEngine->QueueNotify( aNotify );
 }
 }
 
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 7b8f9fbd112e..818722b34f57 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -148,8 +148,10 @@ void ImpEditView::SetEditSelection( const EditSelection& 
rEditSelection )
 eNotifyType = EE_NOTIFY_TEXTVIEWSELECTIONCHANGED;
 }
 EENotify aNotify( eNotifyType );
-pEditEngine->pImpEditEngine->CallNotify( aNotify );
+pEditEngine->pImpEditEngine->QueueNotify( aNotify );
 }
+if(pEditEngine->pImpEditEngine->IsFormatted())
+pEditEngine->pImpEditEngine->SendNotifications();
 }
 
 /// Translate absolute <-> relative twips: LOK wants absolute coordinates as 
output and gives absolute coordinates as input.
@@ -1272,7 +1274,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, 
ScrollRangeCheck nRangeCheck )
 if ( pEditEngine->pImpEditEngine->GetNotifyHdl().IsSet() )
 {
 EENotify aNot

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

[Libreoffice Gerrit user]

 framework/source/accelerators/acceleratorconfiguration.cxx |   46 
+-
 framework/source/inc/accelerators/acceleratorconfiguration.hxx |6 -
 2 files changed, 12 insertions(+), 40 deletions(-)

New commits:
commit 5876b81eaf84dff0114dc5142320d3ad9b324e30
Author: Noel Grandin 
AuthorDate: Mon Sep 3 16:53:12 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 4 09:35:37 2018 +0200

loplugin:useuniqueptr in AcceleratorConfiguration

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

diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx 
b/framework/source/accelerators/acceleratorconfiguration.cxx
index d7533b3973f5..e5f5cc3b80b5 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -79,7 +79,6 @@ namespace framework
 XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const 
css::uno::Reference< css::uno::XComponentContext >& xContext)
 : m_xContext  (xContext )
 , m_aPresetHandler(xContext )
-, m_pWriteCache   (nullptr)
 {
 }
 
@@ -371,13 +370,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const 
css::uno::Reference< c
 {
 SolarMutexGuard g;
 xContext = m_xContext;
-if (m_pWriteCache)
-{
-// be aware of reentrance problems - use temp variable for calling 
delete ... :-)
-AcceleratorCache* pTemp = m_pWriteCache;
-m_pWriteCache = nullptr;
-delete pTemp;
-}
+m_pWriteCache.reset();
 }
 
 css::uno::Reference< css::io::XSeekable > xSeek(xStream, 
css::uno::UNO_QUERY);
@@ -444,10 +437,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const 
css::uno::Reference< c
 if (bChanged)
 {
 m_aReadCache.takeOver(*m_pWriteCache);
-// live with reentrance .-)
-AcceleratorCache* pTemp = m_pWriteCache;
-m_pWriteCache = nullptr;
-delete pTemp;
+m_pWriteCache.reset();
 }
 }
 
@@ -459,7 +449,7 @@ AcceleratorCache& 
XMLBasedAcceleratorConfiguration::impl_getCFG(bool bWriteAcces
 //not still possible!
 if ( bWriteAccessRequested && !m_pWriteCache )
 {
-m_pWriteCache = new AcceleratorCache(m_aReadCache);
+m_pWriteCache.reset(new AcceleratorCache(m_aReadCache));
 }
 
 // in case, we have a writeable cache, we use it for reading too!
@@ -487,8 +477,6 @@ OUString 
XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
 
 XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const 
css::uno::Reference< css::uno::XComponentContext >& xContext)
 : m_xContext  (xContext
 )
-, m_pPrimaryWriteCache(nullptr 
   )
-, m_pSecondaryWriteCache(nullptr   
   )
 {
 const OUString 
CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators");
 m_xCfg.set(
@@ -765,25 +753,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
 
 bPreferred = true;
 m_aPrimaryReadCache = AcceleratorCache();
-if (m_pPrimaryWriteCache)
-{
-// be aware of reentrance problems - use temp variable for calling 
delete ... :-)
-AcceleratorCache* pTemp = m_pPrimaryWriteCache;
-m_pPrimaryWriteCache = nullptr;
-delete pTemp;
-}
+m_pPrimaryWriteCache.reset();
 m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess;
 impl_ts_load(bPreferred, xAccess); // load the preferred keys
 
 bPreferred = false;
 m_aSecondaryReadCache = AcceleratorCache();
-if (m_pSecondaryWriteCache)
-{
-// be aware of reentrance problems - use temp variable for calling 
delete ... :-)
-AcceleratorCache* pTemp = m_pSecondaryWriteCache;
-m_pSecondaryWriteCache = nullptr;
-delete pTemp;
-}
+m_pSecondaryWriteCache.reset();
 m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
 impl_ts_load(bPreferred, xAccess); // load the secondary keys
 }
@@ -1128,9 +1104,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(bool 
bPreferred)
 if (m_pPrimaryWriteCache)
 {
 m_aPrimaryReadCache.takeOver(*m_pPrimaryWriteCache);
-AcceleratorCache* pTemp = m_pPrimaryWriteCache;
-m_pPrimaryWriteCache = nullptr;
-delete pTemp;
+m_pPrimaryWriteCache.reset();
 }
 }
 
@@ -1166,9 +1140,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(bool 
bPreferred)
 if (m_pSecondaryWriteCache)
 {
 m_aSecondaryReadCache.takeOver(*m_pSecondaryWriteCache);
-AcceleratorCache* pTemp = m_pSecondaryWriteCache;
-m_pSecondaryWriteCache = nullptr;
-

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

[Libreoffice Gerrit user]

 sc/IwyuFilter_sc.yaml |8 
 sc/inc/progress.hxx   |1 +
 sc/source/filter/dif/difexp.cxx   |1 +
 sc/source/filter/excel/excform.cxx|1 +
 sc/source/filter/excel/excimp8.cxx|1 +
 sc/source/filter/excel/excrecds.cxx   |1 +
 sc/source/filter/excel/exctools.cxx   |1 +
 sc/source/filter/excel/impop.cxx  |3 +++
 sc/source/filter/excel/read.cxx   |1 +
 sc/source/filter/excel/xestream.cxx   |1 +
 sc/source/filter/excel/xiroot.cxx |1 +
 sc/source/filter/ftools/fapihelper.cxx|1 +
 sc/source/filter/ftools/fprogressbar.cxx  |1 +
 sc/source/filter/inc/addressconverter.hxx |4 +++-
 sc/source/filter/inc/biffhelper.hxx   |3 ++-
 sc/source/filter/inc/colrowst.hxx |3 ++-
 sc/source/filter/inc/condformatbuffer.hxx |3 ---
 sc/source/filter/inc/condformatcontext.hxx|2 --
 sc/source/filter/inc/defnamesbuffer.hxx   |5 +++--
 sc/source/filter/inc/dif.hxx  |6 +-
 sc/source/filter/inc/drawingfragment.hxx  |2 --
 sc/source/filter/inc/eeimport.hxx |2 --
 sc/source/filter/inc/eeparser.hxx |2 ++
 sc/source/filter/inc/excdoc.hxx   |9 +
 sc/source/filter/inc/excelhandlers.hxx|3 ++-
 sc/source/filter/inc/excimp8.hxx  |4 
 sc/source/filter/inc/excrecds.hxx |   11 ---
 sc/source/filter/inc/exp_op.hxx   |5 -
 sc/source/filter/inc/expbase.hxx  |2 +-
 sc/source/filter/inc/externallinkbuffer.hxx   |1 +
 sc/source/filter/inc/extlstcontext.hxx|   10 +-
 sc/source/filter/inc/fapihelper.hxx   |8 
 sc/source/filter/inc/formel.hxx   |5 -
 sc/source/filter/inc/formulabase.hxx  |   10 ++
 sc/source/filter/inc/formulabuffer.hxx|7 ---
 sc/source/filter/inc/fprogressbar.hxx |4 ++--
 sc/source/filter/inc/ftools.hxx   |8 +++-
 sc/source/filter/inc/htmlexp.hxx  |4 +++-
 sc/source/filter/inc/htmlimp.hxx  |1 -
 sc/source/filter/inc/imp_op.hxx   |9 ++---
 sc/source/filter/inc/lotattr.hxx  |2 --
 sc/source/filter/inc/lotfntbf.hxx |2 --
 sc/source/filter/inc/lotform.hxx  |1 -
 sc/source/filter/inc/lotimpop.hxx |3 ---
 sc/source/filter/inc/lotrange.hxx |5 +++--
 sc/source/filter/inc/xeescher.hxx |1 +
 sc/source/filter/inc/xestream.hxx |1 +
 sc/source/filter/inc/xistream.hxx |1 +
 sc/source/filter/lotus/lotattr.cxx|1 +
 sc/source/filter/oox/autofilterbuffer.cxx |1 +
 sc/source/filter/oox/condformatbuffer.cxx |1 +
 sc/source/filter/oox/defnamesbuffer.cxx   |1 +
 sc/source/filter/oox/externallinkbuffer.cxx   |1 +
 sc/source/filter/oox/externallinkfragment.cxx |1 +
 sc/source/filter/oox/extlstcontext.cxx|2 ++
 sc/source/filter/oox/formulabase.cxx  |2 ++
 sc/source/filter/oox/formulabuffer.cxx|1 +
 sc/source/filter/oox/formulaparser.cxx|1 +
 sc/source/filter/oox/pagesettings.cxx |1 +
 sc/source/filter/oox/pivotcachebuffer.cxx |1 +
 sc/source/filter/oox/sheetdatacontext.cxx |1 +
 sc/source/filter/oox/stylesbuffer.cxx |1 +
 sc/source/filter/oox/workbookfragment.cxx |1 +
 sc/source/filter/oox/worksheetbuffer.cxx  |1 +
 sc/source/filter/oox/worksheetfragment.cxx|1 +
 sc/source/filter/xcl97/XclExpChangeTrack.cxx  |1 +
 sc/source/filter/xcl97/XclImpChangeTrack.cxx  |1 +
 sc/source/filter/xcl97/xcl97rec.cxx   |1 +
 68 files changed, 97 insertions(+), 96 deletions(-)

New commits:
commit 9aee9781212328e78b6a34ac2b965b16fd0d9e3a
Author: Gabor Kelemen 
AuthorDate: Mon Aug 27 22:14:27 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Sep 4 09:29:23 2018 +0200

tdf#42949 Fix IWYU warnings in sc/source/filter/inc/[a-l]*

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

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

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 100e263949dd..62a5354aee56 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -375,3 +375,11 @@ blacklist:
 sc/source/core/opencl/opbase.hxx:
 # Needed for FormulaTreeNode()
 - formula/token.hxx
+sc/source/filter/inc/drawingfragment.hxx:
+# Needed for implicit dtor
+- drawingbase.hxx
+sc/source/filter/inc/excdoc.hxx:
+# Needed for unique_ptr type
+- class XclExpCha

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

[Libreoffice Gerrit user]

 framework/inc/classes/protocolhandlercache.hxx|   12 +--
 framework/source/fwi/classes/protocolhandlercache.cxx |   58 ++
 2 files changed, 28 insertions(+), 42 deletions(-)

New commits:
commit d587931fba77246db3a2ccc6ab61ca77446d23f4
Author: Noel Grandin 
AuthorDate: Mon Sep 3 16:52:39 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 4 09:28:20 2018 +0200

loplugin:useuniqueptr in HandlerCache

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

diff --git a/framework/inc/classes/protocolhandlercache.hxx 
b/framework/inc/classes/protocolhandlercache.hxx
index 31859fea13e0..6c3d7c677ad7 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -93,11 +93,11 @@ class FWI_DLLPUBLIC HandlerCache final
 private:
 
 /// list of all registered handler registered by her uno 
implementation names
-static HandlerHash* m_pHandler;
+static std::unique_ptr m_pHandler;
 /// maps URL pattern to handler names
-static PatternHash* m_pPattern;
+static std::unique_ptr m_pPattern;
 /// informs about config updates
-static HandlerCFGAccess* m_pConfig;
+static std::unique_ptr m_pConfig;
 /// ref count to construct/destruct internal member lists on demand by 
using singleton mechanism
 static sal_Int32 m_nRefCount;
 
@@ -110,7 +110,7 @@ class FWI_DLLPUBLIC HandlerCache final
 bool search( const OUString& sURL, ProtocolHandler* pReturn ) const;
 bool search( const css::util::URL&  aURL, ProtocolHandler* pReturn ) 
const;
 
-void takeOver(HandlerHash* pHandler, PatternHash* pPattern);
+void takeOver(std::unique_ptr pHandler, 
std::unique_ptr pPattern);
 };
 
 /**
@@ -137,8 +137,8 @@ class FWI_DLLPUBLIC HandlerCFGAccess : public 
::utl::ConfigItem
 /* interface */
 public:
  HandlerCFGAccess( const OUString& sPackage  );
-void read(   HandlerHash**ppHandler ,
- PatternHash**ppPattern );
+void read(   std::unique_ptr& 
ppHandler ,
+ std::unique_ptr& 
ppPattern );
 
 void setCache(HandlerCache* pCache) {m_pCache = pCache;};
 virtual void Notify(const css::uno::Sequence< OUString >& 
lPropertyNames) override;
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx 
b/framework/source/fwi/classes/protocolhandlercache.cxx
index 67cf91f4f0df..6070d5c2407c 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -73,10 +73,10 @@ PatternHash::const_iterator findPatternKey(PatternHash 
const * hash, const OUStr
 That means it use two static member list to hold all necessary 
information
 and a ref count mechanism to create/destroy it on demand.
  */
-HandlerHash* HandlerCache::m_pHandler  = nullptr;
-PatternHash* HandlerCache::m_pPattern  = nullptr;
+std::unique_ptr HandlerCache::m_pHandler;
+std::unique_ptr HandlerCache::m_pPattern;
 sal_Int32HandlerCache::m_nRefCount = 0;
-HandlerCFGAccess* HandlerCache::m_pConfig = nullptr;
+std::unique_ptr HandlerCache::m_pConfig;
 
 /**
 @short  ctor of the cache of all registered protocol handler
@@ -91,10 +91,10 @@ HandlerCache::HandlerCache()
 
 if (m_nRefCount==0)
 {
-m_pHandler = new HandlerHash;
-m_pPattern = new PatternHash;
-m_pConfig  = new HandlerCFGAccess(PACKAGENAME_PROTOCOLHANDLER);
-m_pConfig->read(&m_pHandler,&m_pPattern);
+m_pHandler.reset(new HandlerHash);
+m_pPattern.reset(new PatternHash);
+m_pConfig.reset(new HandlerCFGAccess(PACKAGENAME_PROTOCOLHANDLER));
+m_pConfig->read(m_pHandler,m_pPattern);
 m_pConfig->setCache(this);
 }
 
@@ -114,12 +114,9 @@ HandlerCache::~HandlerCache()
 {
 m_pConfig->setCache(nullptr);
 
-delete m_pConfig;
-delete m_pHandler;
-delete m_pPattern;
-m_pConfig = nullptr;
-m_pHandler= nullptr;
-m_pPattern= nullptr;
+m_pConfig.reset();
+m_pHandler.reset();
+m_pPattern.reset();
 }
 
 --m_nRefCount;
@@ -136,7 +133,7 @@ bool HandlerCache::search( const OUString& sURL, 
ProtocolHandler* pReturn ) cons
 
 SolarMutexGuard aGuard;
 
-PatternHash::const_iterator pItem = findPatternKey(m_pPattern, sURL);
+PatternHash::const_iterator pItem = findPatternKey(m_pPattern.get(), sURL);
 if (pItem!=m_pPattern->end())
 {
 *pReturn = (*m_pHandler)[pItem->second];
@@ -157,18 +154,12 @@ bool HandlerCache::search( const css::util::URL& aURL, 
ProtocolHandler* pReturn
 return search( aURL.Complete, pReturn );
 }
 
-void HandlerCache::tak

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

[Libreoffice Gerrit user]

 AllLangHelp_scalc.mk|1 
 AllLangHelp_shared.mk   |1 
 source/text/scalc/05/OpenCL_options.xhp |   59 -
 source/text/shared/optionen/01060900.xhp|  214 +---
 source/text/shared/optionen/detailedcalculation.xhp |   63 +
 source/text/shared/optionen/opencl.xhp  |6 
 6 files changed, 171 insertions(+), 173 deletions(-)

New commits:
commit 401ca6e0d92c9c95d14b89b90bef225664f7d462
Author: Olivier Hallot 
AuthorDate: Sat Aug 25 13:29:47 2018 -0300
Commit: Eike Rathke 
CommitDate: Tue Sep 4 09:23:23 2018 +0200

Refactor pages for string <-> numbers/refs/dates

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

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index eba3ef23b..9daadf9a6 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -276,7 +276,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/05/0214 \
 helpcontent2/source/text/scalc/06/calcsamplefiles \
 helpcontent2/source/text/scalc/05/empty_cells \
-helpcontent2/source/text/scalc/05/OpenCL_options \
 helpcontent2/source/text/scalc/guide/address_auto \
 helpcontent2/source/text/scalc/guide/auto_off \
 helpcontent2/source/text/scalc/guide/autofilter \
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 7a97be4bc..b019c5d6b 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -888,6 +888,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/optionen/01160200 \
 helpcontent2/source/text/shared/optionen/01160201 \
 helpcontent2/source/text/shared/optionen/BasicIDE \
+helpcontent2/source/text/shared/optionen/detailedcalculation \
 helpcontent2/source/text/shared/optionen/experimental \
 helpcontent2/source/text/shared/optionen/java \
 helpcontent2/source/text/shared/optionen/expertconfig \
diff --git a/source/text/scalc/05/OpenCL_options.xhp 
b/source/text/scalc/05/OpenCL_options.xhp
deleted file mode 100644
index 19a096f30..0
--- a/source/text/scalc/05/OpenCL_options.xhp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-OpenCL Options
-/text/scalc/05/OpenCL_options.xhp
-
-
-
-OpenCl;options
-
-
-OpenCL Options
-
-This page is under 
construction
-OpenCL: the 
open standard for parallel programming of heterogeneous systems.
-
-  
-
- Menu Tools - Options - LibreOffice Calc - 
Formula, and in section Detailed Calculation Settings press 
Details... button
-
-  
-
-OpenCL™ is the first open, royalty-free standard for cross-platform, parallel 
programming of modern processors found in personal computers, servers and 
handheld/embedded devices. OpenCL (Open Computing Language) greatly improves 
speed and responsiveness for a wide spectrum of applications in numerous market 
categories from gaming and entertainment to scientific and medical 
software
-for more 
information on OpenCL, visit http://www.khronos.org/opencl/";>the 
OpenCL site
-Contents to Numbers
-Conversion from text to number
-How to treat 
text when encountered as operand in an arithmetic operation or as argument to a 
function that expects a number instead. Unambiguous conversion is possible for 
integer numbers including exponents and ISO 8601 dates and times in their 
extended formats with separators. Fractional numeric values with decimal 
separators or dates other than ISO 8601 are locale dependent. Note that in 
locale dependent conversions the resulting numeric value may differ between 
locales!
-Generate 
#VALUE! error: Text found where numeric data is expected will generate 
#VALUE! error. Example: "123.45" will generate a 
#VALUE! error, while 123.45 not.
-Treat as 
zero: Any text found where numeric data is expected will be considered 
as a number of value zero. Example: "123.45" will map 
to zero, while 123.45 not.
-Convert 
only if unambiguous: If the text represents a valid and unambiguous 
numeric value, convert it. Example: "123.456" will 
generate a #VALUE! error because the text contains a separator, while "123456" will not.
-Convert 
also locale dependent: convert values valid in the locale 
representation. Example: "123,45" is a valid number 
in some locales because the comma is the decimal separator there.
-Treat 
empty string as zero
-This option 
determines how an empty string is treated when used in arithmetic operations. 
If you have set "Conversion from text to number" to either "Generate #VALUE! 
error" or "Treat as zero", you cannot choose (here) if conversion of an empty 
string to a number will generate an error or if it will treat empty strings as 
zero. Otherwise this option determines how empty strings are 
treated.
-Reference syntax for string reference
-Formula syntax 
to use when parsing referenc

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit fce81d39959acd4ed7885cc068db4cc178e88ce7
Author: Olivier Hallot 
AuthorDate: Sat Aug 25 13:29:47 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Sep 4 09:23:23 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Refactor pages for string <-> numbers/refs/dates

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

diff --git a/helpcontent2 b/helpcontent2
index 222f1120f957..401ca6e0d92c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 222f1120f957b927650e2317f03cbc92aa80480b
+Subproject commit 401ca6e0d92c9c95d14b89b90bef225664f7d462
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits