[Libreoffice-commits] help.git: help3xsl/fuse.js

[Stephan Bergmann]

 help3xsl/fuse.js |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 23665d6b04829ac2b949c88de261c6f7b2de8baa
Author: Stephan Bergmann 
Date:   Wed Apr 18 07:55:46 2018 +0200

Remove unused sourceMappingURL

Caused

  Source map error: TypeError: NetworkError when attempting to fetch 
resource.
  Resource URL: file:///data/sbergman/lo-clang/core/instdir/help/fuse.js
  Source Map URL: fuse.js.map

when loading

  


in the browser.

Change-Id: I5d318fe8c358cedbb961113561edea3b6d4a2ce1
Reviewed-on: https://gerrit.libreoffice.org/53077
Tested-by: Jenkins 
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Stephan Bergmann 

diff --git a/help3xsl/fuse.js b/help3xsl/fuse.js
index e2fbc0a8b..b451ec1c0 100644
--- a/help3xsl/fuse.js
+++ b/help3xsl/fuse.js
@@ -995,4 +995,3 @@ module.exports = Fuse;
 /***/ })
 /**/ ]);
 });
-//# sourceMappingURL=fuse.js.map
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit 773191d76d0c4a01f52a670018d505e86441407d
Author: Stephan Bergmann 
Date:   Wed Apr 18 07:55:46 2018 +0200

Updated core
Project: help  23665d6b04829ac2b949c88de261c6f7b2de8baa

Remove unused sourceMappingURL

Caused

  Source map error: TypeError: NetworkError when attempting to fetch 
resource.
  Resource URL: file:///data/sbergman/lo-clang/core/instdir/help/fuse.js
  Source Map URL: fuse.js.map

when loading

  


in the browser.

Change-Id: I5d318fe8c358cedbb961113561edea3b6d4a2ce1
Reviewed-on: https://gerrit.libreoffice.org/53077
Tested-by: Jenkins 
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Stephan Bergmann 

diff --git a/helpcontent2 b/helpcontent2
index f4c54d3af32c..23665d6b0482 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f4c54d3af32ca4c6d02afff71532dbf10147fd33
+Subproject commit 23665d6b04829ac2b949c88de261c6f7b2de8baa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/unx/gtk3/gtk3gtkinst.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 767dcdb65bf982edea356177a335668499f396f6
Author: Stephan Bergmann 
Date:   Wed Apr 18 08:54:10 2018 +0200

-Werror=unused-parameter

Change-Id: Ibba26b0eb3d85f2da3caafa1b8cc60357de297d5

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f18ea71869de..921c57920d01 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1557,6 +1557,8 @@ public:
 gtk_menu_popup_at_rect(m_pMenu, gtk_widget_get_window(pWidget), 
&aRect, GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_WEST, nullptr);
 }
 else
+#else
+(void) rRect;
 #endif
 {
 guint nButton;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 officecfg/registry/data/org/openoffice/Office/Impress.xcu |4 ++--
 officecfg/util/data_val.xsl   |   13 -
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit d2799676584b51f66721717b69a5604cf4a65af8
Author: Stephan Bergmann 
Date:   Tue Apr 17 23:15:45 2018 +0200

Find non-set-elements marked as mandatory

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

diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu 
b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 72d2fb8b4155..b8323973c891 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -195,12 +195,12 @@
   vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions-ogl.xml
 
   
-  
+  
 
   $(work)
 
   
-  
+  
 
   $(work)
 
diff --git a/officecfg/util/data_val.xsl b/officecfg/util/data_val.xsl
index 97508eb34a00..3e2200dbd526 100644
--- a/officecfg/util/data_val.xsl
+++ b/officecfg/util/data_val.xsl
@@ -48,6 +48,7 @@
 
 
 
+
 
 
 
@@ -72,9 +73,11 @@
 
 
 
+
 
-
+
 
+
 
 
 
@@ -82,6 +85,7 @@
 
 
 
+
 
 
 
@@ -99,6 +103,7 @@
 
 
 
+
 
 
 
@@ -139,6 +144,7 @@
 
 
 
+
 
 
 
@@ -147,10 +153,15 @@
 
 
 
+
 
 
 
 
+
+
+ERROR: Node '' that is not a set element is marked as 
mandatory!
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 svx/source/engine3d/view3d.cxx   |   12 +--
 svx/source/form/fmpage.cxx   |4 -
 svx/source/svdraw/svddrgmt.cxx   |  134 +--
 svx/source/svdraw/svdlayer.cxx   |8 +-
 svx/source/svdraw/svdmodel.cxx   |   18 ++--
 svx/source/svdraw/svdobjplusdata.cxx |   16 ++--
 svx/source/svdraw/svdopath.cxx   |   26 +++---
 svx/source/svdraw/svdorect.cxx   |   12 +--
 svx/source/svdraw/svdotxat.cxx   |6 -
 svx/source/svdraw/svdpage.cxx|   16 ++--
 svx/source/svdraw/svdxcgv.cxx|   18 ++--
 svx/source/table/svdotable.cxx   |   12 +--
 12 files changed, 141 insertions(+), 141 deletions(-)

New commits:
commit f2df50ab7c443932bf75be1795e93998c52d7575
Author: Noel Grandin 
Date:   Tue Apr 17 16:47:57 2018 +0200

rename Neu->New in svx

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

diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 62724e184dd0..eddba2dd0e55 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -363,7 +363,7 @@ SdrModel* E3dView::GetMarkedObjModel() const
 return SdrView::GetMarkedObjModel();
 }
 
-SdrModel* pNewModel = nullptr;
+SdrModel* pNewModelel = nullptr;
 tools::Rectangle aSelectedSnapRect;
 
 // set 3d selection flags at all directly selected objects
@@ -405,13 +405,13 @@ SdrModel* E3dView::GetMarkedObjModel() const
 
 // call parent. This will copy all scenes and the selection flags at the 
3D objects. So
 // it will be possible to delete all non-selected 3d objects from the 
cloned 3d scenes
-pNewModel = SdrView::GetMarkedObjModel();
+pNewModelel = SdrView::GetMarkedObjModel();
 
-if(pNewModel)
+if(pNewModelel)
 {
-for(sal_uInt16 nPg(0); nPg < pNewModel->GetPageCount(); nPg++)
+for(sal_uInt16 nPg(0); nPg < pNewModelel->GetPageCount(); nPg++)
 {
-const SdrPage* pSrcPg=pNewModel->GetPage(nPg);
+const SdrPage* pSrcPg=pNewModelel->GetPage(nPg);
 const size_t nObjCount(pSrcPg->GetObjCount());
 
 for(size_t nOb = 0; nOb < nObjCount; ++nOb)
@@ -436,7 +436,7 @@ SdrModel* E3dView::GetMarkedObjModel() const
 // restore old selection
 rCurrentMarkList = aOldML;
 
-return pNewModel;
+return pNewModelel;
 }
 
 // When pasting objects have to integrated if a scene is inserted, but
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 41abde23855a..1f455702302d 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -70,9 +70,9 @@ FmFormPage::~FmFormPage()
 {
 }
 
-SdrPage* FmFormPage::Clone(SdrModel* pNewModel) const
+SdrPage* FmFormPage::Clone(SdrModel* pNewModelel) const
 {
-FmFormModel& rFmFormModel(static_cast< FmFormModel& >(nullptr == pNewModel 
? getSdrModelFromSdrPage() : *pNewModel));
+FmFormModel& rFmFormModel(static_cast< FmFormModel& >(nullptr == 
pNewModelel ? getSdrModelFromSdrPage() : *pNewModelel));
 FmFormPage* pClonedFmFormPage(
 new FmFormPage(
 rFmFormModel,
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 1cb2f5aa8bd3..7492063bd766 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1976,29 +1976,29 @@ void SdrDragResize::MoveSdrDrag(const Point& rNoSnapPnt)
 }
 }
 
-Fraction aNeuXFact(nXMul,nXDiv);
-Fraction aNeuYFact(nYMul,nYDiv);
+Fraction aNewXFact(nXMul,nXDiv);
+Fraction aNewYFact(nYMul,nYDiv);
 
 if (bOrtho)
 {
-if (aNeuXFact>aMaxFact)
+if (aNewXFact>aMaxFact)
 {
-aNeuXFact=aMaxFact;
-aNeuYFact=aMaxFact;
+aNewXFact=aMaxFact;
+aNewYFact=aMaxFact;
 }
 
-if (aNeuYFact>aMaxFact)
+if (aNewYFact>aMaxFact)
 {
-aNeuXFact=aMaxFact;
-aNeuYFact=aMaxFact;
+aNewXFact=aMaxFact;
+aNewYFact=aMaxFact;
 }
 }
 
 if (bXNeg)
-
aNeuXFact=Fraction(-aNeuXFact.GetNumerator(),aNeuXFact.GetDenominator());
+
aNewXFact=Fraction(-aNewXFact.GetNumerator(),aNewXFact.GetDenominator());
 
 if (bYNeg)
-
aNeuYFact=Fraction(-aNeuYFact.GetNumerator(),aNeuYFact.GetDenominator());
+
aNewYFact=Fraction(-aNewYFact.GetNumerator(),aNewYFact.GetDenominator());
 
 if (DragStat().CheckMinMoved(aPnt))
 {
@@ -2007,8 +2007,8 @@ void SdrDragResize::MoveSdrDrag(const Point& rNoSnapPnt)
 {
 Hide();
 DragStat().NextMove(aPnt);
-aXFact=aNeuXFact;
-aYFact=aNeuYFact;
+aXFact=aNewXFact;
+aYFact=aNewYFact;
 Show();
 }
 }
@@ -2294,7 +2294,7 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
 
 Point aP0(DragStat().GetStart());

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

[Stephan Bergmann]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 200aa825c8905a7f5e636301fc0d3b0c39793e4e
Author: Stephan Bergmann 
Date:   Wed Apr 18 08:28:56 2018 +0200

Translate::GetReadStringHook() may be null

e.g., during CppunitTest_sc_screenshots

Change-Id: I71bd617df629dab57c73252db0e46ab51eee2a18

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 640f14a3c8ef..f18ea71869de 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4119,26 +4119,32 @@ private:
 if (GTK_IS_BUTTON(pWidget))
 {
 GtkButton* pButton = GTK_BUTTON(pWidget);
-set_label(pButton, (*m_pStringReplace)(get_label(pButton)));
+if (m_pStringReplace != nullptr) {
+set_label(pButton, (*m_pStringReplace)(get_label(pButton)));
+}
 if (gtk_button_get_use_underline(pButton))
 m_aMnemonicButtons.push_back(pButton);
 }
 else if (GTK_IS_LABEL(pWidget))
 {
 GtkLabel* pLabel = GTK_LABEL(pWidget);
-set_label(pLabel, (*m_pStringReplace)(get_label(pLabel)));
+if (m_pStringReplace != nullptr) {
+set_label(pLabel, (*m_pStringReplace)(get_label(pLabel)));
+}
 if (gtk_label_get_use_underline(pLabel))
 m_aMnemonicLabels.push_back(pLabel);
 }
 else if (GTK_IS_WINDOW(pWidget))
 {
-GtkWindow* pWindow = GTK_WINDOW(pWidget);
-set_title(pWindow, (*m_pStringReplace)(get_title(pWindow)));
-if (GTK_IS_MESSAGE_DIALOG(pWindow))
-{
-GtkMessageDialog* pMessageDialog = GTK_MESSAGE_DIALOG(pWindow);
-set_primary_text(pMessageDialog, 
(*m_pStringReplace)(get_primary_text(pMessageDialog)));
-set_secondary_text(pMessageDialog, 
(*m_pStringReplace)(get_secondary_text(pMessageDialog)));
+if (m_pStringReplace != nullptr) {
+GtkWindow* pWindow = GTK_WINDOW(pWidget);
+set_title(pWindow, (*m_pStringReplace)(get_title(pWindow)));
+if (GTK_IS_MESSAGE_DIALOG(pWindow))
+{
+GtkMessageDialog* pMessageDialog = 
GTK_MESSAGE_DIALOG(pWindow);
+set_primary_text(pMessageDialog, 
(*m_pStringReplace)(get_primary_text(pMessageDialog)));
+set_secondary_text(pMessageDialog, 
(*m_pStringReplace)(get_secondary_text(pMessageDialog)));
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source solenv/bin

[Mike Kaganski]

 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 -
 scp2/source/ooo/vc_redist.scp  |2 -
 solenv/bin/modules/installer/windows/upgrade.pm|   15 
+-
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 606852089e32a2065ee5fc3224f7b2940e6b1323
Author: Mike Kaganski 
Date:   Wed Apr 18 07:05:04 2018 +0100

Revert two last changes to Upgrade table

This reverts commits 914f6385d98f8c898102c971a4d5b0eb9f075ef0 and
a6045159237419ce8fa49202c672e3895f0ab30a. A investigation required why
is the problem with them; meanwhile, they break builds.

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

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 326b70fcddc7..12ba10f300c9 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -43,7 +43,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED;VCRUNTIME_DETECTED_32
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index c4750ff5ad69..921a9433e820 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -93,7 +93,7 @@ WindowsCustomAction gid_Customaction_InstallVCRedist
 Source = VCREDIST_EXE_NAME;
 Target = "/repair /norestart /passive";
 Inbinarytable = 1;
-Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
(VCRUNTIME_DETECTED Or VCRUNTIME_DETECTED_32) And UCRT_DETECTED ) And VC_REDIST 
= 1", "behind_ExecuteAction");
+Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
VCRUNTIME_DETECTED And UCRT_DETECTED ) And VC_REDIST = 1", 
"behind_ExecuteAction");
 End
 
 #endif
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm 
b/solenv/bin/modules/installer/windows/upgrade.pm
index b008d010fb15..9e0d7ea79fb7 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -46,15 +46,16 @@ sub create_upgrade_table
 push(@upgradetable, $newline);
 
 # Detecting if VC Runtime is installed on system
-$newline = "{36F68A90-239C-34DF-B58C-64B30153CE35}" . "\t" . "14.0.24215" 
. "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED";
-push(@upgradetable, $newline);
-
-# 32-bit installer must also detect if 32-bit Runtime is installed
-if ( $installer::globals::cpuname ne 'X86_64' )
+$newline = "VCRUNTIME_UPGRADE_CODE" . "\t" . "14.0.24215" . "\t" . 
"15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . "VCRUNTIME_DETECTED";
+if ( $installer::globals::cpuname eq 'X86_64' )
 {
-$newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . 
"14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED_32";
-push(@upgradetable, $newline);
+$newline =~ 
s/VCRUNTIME_UPGRADE_CODE/{36F68A90-239C-34DF-B58C-64B30153CE35}/;
 }
+else
+{
+$newline =~ 
s/VCRUNTIME_UPGRADE_CODE/{65E5BD06-6392-3027-8C26-853107D3CF1A}/;
+}
+push(@upgradetable, $newline);
 
 # Saving the file
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - common/Util.cpp common/Util.hpp wsd/FileServer.cpp

[Jan Holesovsky]

 common/Util.cpp|   28 
 common/Util.hpp|8 
 wsd/FileServer.cpp |7 +--
 3 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit 0dfdcd93ee2c4f4f6c3c31e3b4b5bae3b0a3bac3
Author: Jan Holesovsky 
Date:   Wed Apr 4 12:36:11 2018 +0200

Sanity-check the scheme and host for frame ancestor, POCO does not do that.

Change-Id: Ieea9532ccd2a11e74f370a340e68f46122469848
(cherry picked from commit c8ef63253a94a4f74cc4238d7d070f75e26bec3e)
Signed-off-by: Andras Timar 

diff --git a/common/Util.cpp b/common/Util.cpp
index bd7209f9b..166f7115d 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -378,6 +378,34 @@ namespace Util
 
 return map;
 }
+
+bool isValidURIScheme(const std::string& scheme)
+{
+if (scheme.empty())
+return false;
+
+for (char c : scheme)
+{
+if (!isalpha(c))
+return false;
+}
+
+return true;
+}
+
+bool isValidURIHost(const std::string& host)
+{
+if (host.empty())
+return false;
+
+for (char c : host)
+{
+if (!isalnum(c) && c != '_' && c != '-' && c != '.' && c !=':' && 
c != '[' && c != ']')
+return false;
+}
+
+return true;
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Util.hpp b/common/Util.hpp
index 5480d7907..57c2346de 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -211,6 +211,14 @@ namespace Util
 return trimmed(std::string(s));
 }
 
+/// Check for the URI scheme validity.
+/// For now just a basic sanity check, can be extended if necessary.
+bool isValidURIScheme(const std::string& scheme);
+
+/// Check for the URI host validity.
+/// For now just a basic sanity check, can be extended if necessary.
+bool isValidURIHost(const std::string& host);
+
 /// Given one or more patterns to allow, and one or more to deny,
 /// the match member will return true if, and only if, the subject
 /// matches the allowed list, but not the deny.
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 8b40706d9..8555f2be1 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -426,9 +426,12 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 
 // Keep only the origin, reject everything else
 Poco::URI uriFrameAncestor(frameAncestor);
-if (!frameAncestor.empty() && !uriFrameAncestor.getScheme().empty() && 
!uriFrameAncestor.getHost().empty())
+std::string frameAncestorScheme = uriFrameAncestor.getScheme();
+std::string frameAncestorHost = uriFrameAncestor.getHost();
+
+if (!frameAncestor.empty() && Util::isValidURIScheme(frameAncestorScheme) 
&& Util::isValidURIHost(frameAncestorHost))
 {
-frameAncestor = uriFrameAncestor.getScheme() + "://" + 
uriFrameAncestor.getHost() + ":" + std::to_string(uriFrameAncestor.getPort());
+frameAncestor = frameAncestorScheme + "://" + frameAncestorHost + ":" 
+ std::to_string(uriFrameAncestor.getPort());
 
 LOG_TRC("Final frame ancestor: " << frameAncestor);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Tor Lillqvist]

 config_host.mk.in|1 +
 configure.ac |1 +
 solenv/gbuild/platform/macosx.mk |4 
 3 files changed, 6 insertions(+)

New commits:
commit 55b9706bea5aa9b654ab39bc7d56339422e17087
Author: Tor Lillqvist 
Date:   Tue Apr 17 23:04:37 2018 +0300

Do use -O1 for Apple Clang older than 9.1.0

Don't want to risk breaking something by using -O2 with an older
Clang, even if I don't remember exactly what the issue was when
introducing the -O1 in 7b660e1423554928350e1de2cd4cb7eb577a27ec.

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 965cdaf6887a..8f9fb90c98e7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -62,6 +62,7 @@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
 @x_CFLAGS@ export CFLAGS=@CFLAGS@
 export CLANGDIR=@CLANGDIR@
 export CLANGLIBDIR=@CLANGLIBDIR@
+export CLANGVER=@CLANGVER@
 export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
 export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
 export LIBCMIS_CFLAGS=$(gb_SPACE)@LIBCMIS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index dbd524126005..717e7c1e3d4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3635,6 +3635,7 @@ if test "$COM_IS_CLANG" = TRUE; then
 AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
 fi
 AC_SUBST(COM_IS_CLANG)
+AC_SUBST(CLANGVER)
 
 SHOWINCLUDES_PREFIX=
 if test "$_os" = WINNT; then
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 37ff092ef4cb..be107371f123 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -22,6 +22,10 @@ export VCL_HIDE_WINDOWS=1
 
 gb_SDKDIR := $(MACOSX_SDK_PATH)
 
+ifeq (PRE_9_1_0,$(shell test $(CLANGVER) -lt 90100 && echo PRE_9_1_0))
+gb_COMPILEROPTFLAGS := -O1
+endif
+
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
 # Darwin mktemp -t expects a prefix, not a pattern
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

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

New commits:
commit 842812a01c9ff959308a1d373fc5daae10304005
Author: Julien Nabet 
Date:   Tue Apr 17 21:09:28 2018 +0200

tdf#117021: fix datasource example

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

diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index d046ac5a299e..04b9a7512bdd 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -376,7 +376,7 @@
 #define STR_ORACLE_DATABASE_NAME
NC_("STR_ORACLE_DATABASE_NAME", "Name of the Oracle database")
 #define STR_MSACCESS_MDB_FILE   
NC_("STR_MSACCESS_MDB_FILE", "Microsoft Access database file")
 #define STR_NO_ADDITIONAL_SETTINGS  
NC_("STR_NO_ADDITIONAL_SETTINGS", "No more settings are necessary. To verify 
that the connection is working, click the '%test' button.")
-#define STR_COMMONURL   NC_("STR_COMMONURL", 
"Datasource URL (e.g. postgresql://host:port/database)" )
+#define STR_COMMONURL   NC_("STR_COMMONURL", 
"Datasource URL (e.g. host=$host:$port dbname=$database)" )
 #define STR_HOSTNAMENC_("STR_HOSTNAME", "~Host 
name")
 #define STR_MOZILLA_PROFILE_NAME
NC_("STR_MOZILLA_PROFILE_NAME", "~Mozilla profile name")
 #define STR_THUNDERBIRD_PROFILE_NAME
NC_("STR_THUNDERBIRD_PROFILE_NAME", "~Thunderbird profile name")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 sd/uiconfig/simpress/ui/notebookbar.ui |13340 +++--
 1 file changed, 11168 insertions(+), 2172 deletions(-)

New commits:
commit 57ca02a7486090f1dd63977bb8fb351f9bf9a7f3
Author: andreas kainz 
Date:   Wed Apr 18 00:04:09 2018 +0200

NB Impress tabbed toolbar big update

Change-Id: I4e0a6e3eb1f945daf2036bc1d009ae96d5a72802
Reviewed-on: https://gerrit.libreoffice.org/53072
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 2142652f4dc0..d8c657c3c05d 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1,381 +1,7592 @@
 
 
-
+
   
-  
   
-  
+  
+  
 True
 False
-cmd/lc_bringtofront.png
-  
-  
-True
-False
-cmd/lc_exportto.png
-  
-  
-True
-False
-cmd/lc_exportdirecttopdf.png
-  
-  
-True
-False
-cmd/lc_fontworkgalleryfloater.png
-  
-  
-True
-False
-cmd/lc_formatpaintbrush.png
-  
-  
-True
-False
-cmd/lc_editheaderandfooter.png
-  
-  
-True
-False
-cmd/lc_hyperlinkdialog.png
-  
-  
-True
-False
-cmd/lc_insertannotation.png
-  
-  
-True
-False
-cmd/lc_insertgraphic.png
-  
-  
-True
-False
-cmd/lc_insertmath.png
-  
-  
-True
-False
-cmd/lc_importfromfile.png
-  
-  
-True
-False
-cmd/lc_insertobjectchart.png
-  
-  
-True
-False
-cmd/lc_insertslide.png
+
+  
+True
+False
+.uno:ChangeBezier
+  
+
+
+  
+True
+False
+.uno:ChangePolygon
+  
+
+
+  
+True
+False
+.uno:convert_to_contour
+  
+
+
+  
+True
+False
+.uno:ConvertInto3D
+  
+
+
+  
+True
+False
+.uno:ConvertInto3DLatheFast
+  
+
+
+  
+True
+False
+.uno:ConvertIntoBitmap
+  
+
+
+  
+True
+False
+.uno:ConvertIntoMetaFile
+  
+
   
-  
+  
 True
 False
-cmd/lc_insertsymbol.png
+
+  
+True
+False
+.uno:Line
+  
+
+
+  
+True
+False
+.uno:Freeline_Unfilled
+  
+
+
+  
+True
+False
+.uno:Freeline
+  
+
+
+  
+True
+False
+.uno:Bezier_Unfilled
+  
+
+
+  
+True
+False
+.uno:BezierFill
+  
+
+
+  
+True
+False
+.uno:Polygon_Unfilled
+  
+
+
+  
+True
+False
+.uno:Polygon_Diagonal_Unfilled
+  
+
+
+  
+True
+False
+.uno:Polygon_Diagonal
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:BasicShapes
+  
+
+
+  
+True
+False
+.uno:SymbolShapes
+  
+
+
+  
+True
+False
+.uno:ArrowShapes
+  
+
+
+  
+True
+False
+.uno:StarShapes
+  
+
+
+  
+True
+False
+.uno:CalloutShapes
+  
+
+
+  
+True
+False
+.uno:FlowChartShapes
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:DrawCaption
+  
+
+
+  
+True
+False
+.uno:VerticalCaption
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:DrawText
+  
+
+
+  
+True
+False
+.uno:VerticalText
+  
+
+
+  
+True
+False
+.uno:InsertGraphic
+  
+
+
+  
+True
+False
+.uno:FontworkGalleryFloater
+  
+
+
+  
+True
+False
+.uno:Text_Marquee
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:ToggleObjectBezierMode
+  
+
+
+  
+True
+False
+.uno:ExtrusionToggle
+  
+
   
-  
+  
 True
 False
-cmd/lc_inserttable.png
+
+  
+True
+False
+.uno:InsertDateFieldFix
+  
+
+
+  
+True
+False
+.uno:InsertDateFieldVar
+  
+
+
+  
+True
+False
+.uno:InsertTimeFieldFix
+  
+
+
+  
+True
+False
+.uno:InsertTimeFieldVar
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:InsertAuthorField
+  
+
+
+  
+ 

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

[Caolán McNamara]

 include/svx/fmtools.hxx|2 +-
 svx/source/form/fmtools.cxx|4 ++--
 svx/source/form/formcontroller.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c395eeb09381a7a8b9157027e0ac7d9536943fb3
Author: Caolán McNamara 
Date:   Tue Apr 17 21:02:22 2018 +0100

Resolves: tdf#117068 wrong parent for exception dialog

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

diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 239551e0c5b9..000f3032ca83 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -72,7 +72,7 @@ namespace vcl { class Window; }
 // display info about a simple css::sdbc::SQLException
 void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent);
 SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* 
_pParent);
-void displayException(const css::sdb::SQLErrorEvent&);
+void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = 
nullptr);
 void displayException(const css::uno::Any&, vcl::Window* _pParent = nullptr);
 
 sal_Int32 getElementPos(const css::uno::Reference< 
css::container::XIndexAccess>& xCont, const css::uno::Reference< 
css::uno::XInterface>& xElement);
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 39c9969705be..25a3a38cf581 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -150,9 +150,9 @@ void displayException(const css::sdb::SQLContext& _rExcept, 
vcl::Window* _pParen
 }
 
 
-void displayException(const css::sdb::SQLErrorEvent& _rEvent)
+void displayException(const css::sdb::SQLErrorEvent& _rEvent, vcl::Window* 
_pParent)
 {
-displayException(_rEvent.Reason);
+displayException(_rEvent.Reason, _pParent);
 }
 
 
diff --git a/svx/source/form/formcontroller.cxx 
b/svx/source/form/formcontroller.cxx
index 139147fd377e..4691584d8b24 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3829,7 +3829,7 @@ void SAL_CALL FormController::errorOccured(const 
SQLErrorEvent& aEvent)
 else
 {
 aGuard.clear();
-displayException( aEvent );
+displayException(aEvent, getDialogParentWindow());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 drawinglayer/source/tools/emfphelperdata.cxx |   10 +-
 drawinglayer/source/tools/emfphelperdata.hxx |1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit a2851d562cdfaf06e5f767030677846f3f129b1c
Author: Bartosz Kosiorek 
Date:   Sun Apr 15 02:00:16 2018 +0200

tdf#117015 EMF+ Fix for displaying EMF+ files where GetDC is used

With EMF+ Only mode, still the EMF records could be used for
displaying objects, by using Get Device Context (GetDC).
Files identified as EMF+ Only can contain both EMF+ records and EMF 
records. All EMF+
records are used to render the image. The EMF records that are part of the 
drawing are those
preceded by a Get Device Context record.

Unfortunately after finishing EMF drawing, the clip region was
not reset. As a result records after EMF record was not displayed.

With this patch, the issue was fixed by resetting clip region.

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

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx 
b/drawinglayer/source/tools/emfphelperdata.cxx
index 3c9d10e62fd8..a7c455cfc1aa 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -745,7 +745,8 @@ namespace emfplushelper
 mMFlags(0),
 mMStream(),
 mrTargetHolders(rTargetHolders),
-mrPropertyHolders(rPropertyHolders)
+mrPropertyHolders(rPropertyHolders),
+bIsGetDCProcessing(false)
 {
 
rMS.ReadInt32(mnFrameLeft).ReadInt32(mnFrameTop).ReadInt32(mnFrameRight).ReadInt32(mnFrameBottom);
 SAL_INFO("drawinglayer", "EMF+ picture frame: " << mnFrameLeft << "," 
<< mnFrameTop << " - " << mnFrameRight << "," << mnFrameBottom);
@@ -838,6 +839,12 @@ namespace emfplushelper
 
 SAL_INFO("drawinglayer", "EMF+ record size: " << size << " type: " 
<< emfTypeToName(type) << " flags: " << flags << " data size: " << dataSize);
 
+if (bIsGetDCProcessing)
+{
+SAL_INFO("drawinglayer", "EMF+ Resets the current clipping 
region for the world space to infinity.");
+wmfemfhelper::HandleNewClipRegion(::basegfx::B2DPolyPolygon(), 
mrTargetHolders, mrPropertyHolders);
+bIsGetDCProcessing = false;
+}
 if (type == EmfPlusRecordTypeObject && ((mbMultipart && (flags & 
0x7fff) == (mMFlags & 0x7fff)) || (flags & 0x8000)))
 {
 if (!mbMultipart)
@@ -912,6 +919,7 @@ namespace emfplushelper
 }
 case EmfPlusRecordTypeGetDC:
 {
+bIsGetDCProcessing = true;
 SAL_INFO("drawinglayer", "EMF+ GetDC");
 SAL_INFO("drawinglayer", "EMF+\talready used in 
svtools wmf/emf filter parser");
 break;
diff --git a/drawinglayer/source/tools/emfphelperdata.hxx 
b/drawinglayer/source/tools/emfphelperdata.hxx
index e5402d1fe267..281a5f7ebbba 100644
--- a/drawinglayer/source/tools/emfphelperdata.hxx
+++ b/drawinglayer/source/tools/emfphelperdata.hxx
@@ -171,6 +171,7 @@ namespace emfplushelper
 /// data holders
 wmfemfhelper::TargetHolders&mrTargetHolders;
 wmfemfhelper::PropertyHolders&  mrPropertyHolders;
+boolbIsGetDCProcessing;
 
 // readers
 void processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 
flags, sal_uInt32 dataSize, bool bUseWholeStream = false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   11 
+-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit c42ed19c1dcde6e2c6210e6f8cc90ba8ba654de1
Author: andreas kainz 
Date:   Tue Apr 17 20:07:28 2018 +0200

NB Implementation: sync impress label with writer/calc

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 84bb3a2fb6d0..db7c95aa8da6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4617,7 +4617,16 @@
   
   
 
-  ~Default Formatting
+  Clear
+
+
+  Clear ~Direct Formatting
+
+
+  Clear Direct Formatting
+
+
+  1
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd.xml.in wsd/Admin.cpp wsd/Admin.hpp wsd/FileServer.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

[Michael Meeks]

 loolwsd.xml.in |1 +
 wsd/Admin.cpp  |   12 
 wsd/Admin.hpp  |6 +-
 wsd/FileServer.cpp |7 +++
 wsd/LOOLWSD.cpp|2 ++
 wsd/LOOLWSD.hpp|1 +
 6 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit ce06a9ae3778c45ab146ecb5b8fc839f9e4f2e7d
Author: Michael Meeks 
Date:   Tue Apr 17 20:47:17 2018 +0100

Allow the Admin console to be disabled in the configuration.

Change-Id: Iacde8e891f42e9ef9399ebbebbd2b2978188d4c4

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 38e81a2b0..456790005 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -107,6 +107,7 @@
 true
 
 
+true
 true
 
 
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 41407d071..dc1ff562f 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -294,6 +294,12 @@ bool AdminSocketHandler::handleInitialRequest(
 const std::weak_ptr &socketWeak,
 const Poco::Net::HTTPRequest& request)
 {
+if (!LOOLWSD::AdminEnabled)
+{
+LOG_ERR("Request for disabled admin console");
+return false;
+}
+
 std::shared_ptr socket = socketWeak.lock();
 
 // Different session id pool for admin sessions (?)
@@ -607,4 +613,10 @@ void Admin::dumpState(std::ostream& os)
 SocketPoll::dumpState(os);
 }
 
+void Admin::start()
+{
+if (LOOLWSD::AdminEnabled)
+startThread();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp
index 571979401..49107d5c9 100644
--- a/wsd/Admin.hpp
+++ b/wsd/Admin.hpp
@@ -60,11 +60,7 @@ public:
 return admin;
 }
 
-void start()
-{
-// FIXME: not if admin console is not enabled ?
-startThread();
-}
+void start();
 
 /// Custom poll thread function
 void pollingThread() override;
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 24ab20b01..b4c66056b 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -113,6 +113,8 @@ bool isPamAuthOk(const std::string& user, const 
std::string& pass)
 bool FileServerRequestHandler::isAdminLoggedIn(const HTTPRequest& request,
HTTPResponse &response)
 {
+assert(LOOLWSD::AdminEnabled);
+
 const auto& config = Application::instance().config();
 const std::string sslKeyPath = config.getString("ssl.key_file_path", "");
 
@@ -250,11 +252,16 @@ void FileServerRequestHandler::handleRequest(const 
HTTPRequest& request, Poco::M
 if (request.getMethod() == HTTPRequest::HTTP_GET)
 {
 if (endPoint == "admin.html" ||
+endPoint == "admin-bundle.js" ||
+endPoint == "admin-localizations.js" ||
 endPoint == "adminSettings.html" ||
 endPoint == "adminAnalytics.html")
 {
 noCache = true;
 
+if (!LOOLWSD::AdminEnabled)
+throw Poco::FileAccessDeniedException("Admin console 
disabled");
+
 if (!FileServerRequestHandler::isAdminLoggedIn(request, 
response))
 throw Poco::Net::NotAuthenticatedException("Invalid admin 
login");
 
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index da4280ffb..5249e2880 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -569,6 +569,7 @@ std::atomic LOOLWSD::ForKitProcId(-1);
 #endif
 bool LOOLWSD::NoSeccomp = false;
 bool LOOLWSD::NoCapsForKit = false;
+bool LOOLWSD::AdminEnabled = true;
 #ifdef FUZZER
 bool LOOLWSD::DummyLOK = false;
 std::string LOOLWSD::FuzzFileName;
@@ -856,6 +857,7 @@ void LOOLWSD::initialize(Application& self)
 
 NoSeccomp = !getConfigValue(conf, "security.seccomp", true);
 NoCapsForKit = !getConfigValue(conf, "security.capabilities", true);
+AdminEnabled = getConfigValue(conf, "admin_console.enable", true);
 
 #if ENABLE_SUPPORT_KEY
 const std::string supportKeyString = getConfigValue(conf, 
"support_key", "");
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 55e060217..3ec79c867 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -44,6 +44,7 @@ public:
 static unsigned int NumPreSpawnedChildren;
 static bool NoCapsForKit;
 static bool NoSeccomp;
+static bool AdminEnabled;
 static std::atomic ForKitWritePipe;
 static std::atomic ForKitProcId;
 static bool DummyLOK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source download.lst external/libetonyek

[Caolán McNamara]

 cui/source/dialogs/hldocntp.cxx  |  180 
+-
 cui/source/inc/hldocntp.hxx  |1 
 download.lst |6 
 external/libetonyek/0001-add-missing-include-for-std-min.patch.1 |   25 -
 external/libetonyek/Library_etonyek.mk   |   27 +
 external/libetonyek/UnpackedTarball_libetonyek.mk|3 
 external/libetonyek/c++17.patch  |   11 
 external/libetonyek/ubsan.patch  |8 
 external/libetonyek/warnings.patch   |   11 
 9 files changed, 149 insertions(+), 123 deletions(-)

New commits:
commit ce07d65f1fec8d536dcadcb0e8e13f969c05d9c8
Author: Caolán McNamara 
Date:   Tue Apr 10 17:09:57 2018 +0100

grab an early libetonyek-0.1.8 snapshot

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

diff --git a/download.lst b/download.lst
index 354c39285f43..0a1fa65396d1 100644
--- a/download.lst
+++ b/download.lst
@@ -39,9 +39,9 @@ export EPM_SHA256SUM := 
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EPUBGEN_SHA256SUM := 
730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633
 export EPUBGEN_TARBALL := libepubgen-0.1.0.tar.bz2
-export ETONYEK_SHA256SUM := 
69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac
-export ETONYEK_VERSION_MICRO := 7
-export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
+export ETONYEK_SHA256SUM := 
8a70cc83a9ee031444f9c891609b1cc11e20e2d6b41ae02d17d8f1ca8a68c4f2
+export ETONYEK_VERSION_MICRO := 8
+export ETONYEK_TARBALL := 
libetonyek-0.1.$(ETONYEK_VERSION_MICRO)-snapshot1.tar.xz
 export EXPAT_SHA256SUM := 
d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
 export EXPAT_TARBALL := expat-2.2.5.tar.bz2
 export FIREBIRD_SHA256SUM := 
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
diff --git a/external/libetonyek/0001-add-missing-include-for-std-min.patch.1 
b/external/libetonyek/0001-add-missing-include-for-std-min.patch.1
deleted file mode 100644
index dc3e70988d56..
--- a/external/libetonyek/0001-add-missing-include-for-std-min.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From cc71d75b4d9b88b5c920cd039bab3e707e71568b Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Mon, 23 Oct 2017 12:55:43 +0200
-Subject: [PATCH] add missing include for std::min
-
-Change-Id: I2088057657f3ce23b91dbbc7b4f5840914dbcaa8

- src/lib/IWASnappyStream.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/IWASnappyStream.cpp b/src/lib/IWASnappyStream.cpp
-index 7b28681..9cc84c3 100644
 a/src/lib/IWASnappyStream.cpp
-+++ b/src/lib/IWASnappyStream.cpp
-@@ -9,6 +9,7 @@
- 
- #include "IWASnappyStream.h"
- 
-+#include 
- #include 
- #include 
- #include 
--- 
-2.14.1
-
diff --git a/external/libetonyek/Library_etonyek.mk 
b/external/libetonyek/Library_etonyek.mk
index b79d3603bffe..414b2d02b707 100644
--- a/external/libetonyek/Library_etonyek.mk
+++ b/external/libetonyek/Library_etonyek.mk
@@ -43,6 +43,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,etonyek,\
UnpackedTarball/libetonyek/src/lib/EtonyekDocument \
UnpackedTarball/libetonyek/src/lib/IWAField \
UnpackedTarball/libetonyek/src/lib/IWAMessage \
+   UnpackedTarball/libetonyek/src/lib/IWAObjectIndex \
UnpackedTarball/libetonyek/src/lib/IWAParser \
UnpackedTarball/libetonyek/src/lib/IWAReader \
UnpackedTarball/libetonyek/src/lib/IWASnappyStream \
@@ -84,15 +85,17 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,etonyek,\
UnpackedTarball/libetonyek/src/lib/IWORKXMLContextBase \
UnpackedTarball/libetonyek/src/lib/IWORKXMLParserState \
UnpackedTarball/libetonyek/src/lib/IWORKZlibStream \
+   UnpackedTarball/libetonyek/src/lib/KEY1Dictionary \
UnpackedTarball/libetonyek/src/lib/KEY1Parser \
+   UnpackedTarball/libetonyek/src/lib/KEY1ParserState \
UnpackedTarball/libetonyek/src/lib/KEY1Token \
-   UnpackedTarball/libetonyek/src/lib/KEY2Collector \
UnpackedTarball/libetonyek/src/lib/KEY2Dictionary \
UnpackedTarball/libetonyek/src/lib/KEY2Parser \
UnpackedTarball/libetonyek/src/lib/KEY2ParserState \
UnpackedTarball/libetonyek/src/lib/KEY2Token \
UnpackedTarball/libetonyek/src/lib/KEY6Parser \
UnpackedTarball/libetonyek/src/lib/KEYCollector \
+   UnpackedTarball/libetonyek/src/lib/KEYProperties \
UnpackedTarball/libetonyek/src/lib/KEYTypes \
UnpackedTarball/libetonyek/src/lib/NUM1Dictionary \
UnpackedTarball/libetonyek/src/lib/NUM1Parser \
@@ -111,12 +114,16 @@ $(eval $

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   45 ++-
 1 file changed, 24 insertions(+), 21 deletions(-)

New commits:
commit 42f5a0fbbfe91827fdc0a27525e8cd8938871db2
Author: Caolán McNamara 
Date:   Tue Apr 17 14:07:23 2018 +0100

tdf#117034 check for runtime version check gtk_menu_popup_at_rect

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 2e5bb0083199..640f14a3c8ef 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1550,32 +1550,35 @@ public:
 gulong nSignalId = g_signal_connect_swapped(G_OBJECT(m_pMenu), 
"deactivate", G_CALLBACK(g_main_loop_quit), pLoop);
 
 #if GTK_CHECK_VERSION(3,22,0)
-GdkRectangle aRect{static_cast(rRect.Left()), 
static_cast(rRect.Top()),
-   static_cast(rRect.GetWidth()), 
static_cast(rRect.GetHeight())};
-gtk_menu_popup_at_rect(m_pMenu, gtk_widget_get_window(pWidget), 
&aRect, GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_WEST, nullptr);
-#else
-(void)rRect;
-
-guint nButton;
-guint32 nTime;
-
-//typically there is an event, and we can then distinguish if this was
-//launched from the keyboard (gets auto-mnemoniced) or the mouse (which
-//doesn't)
-GdkEvent *pEvent = gtk_get_current_event();
-if (pEvent)
+if (gtk_check_version(3, 22, 0) == nullptr)
 {
-gdk_event_get_button(pEvent, &nButton);
-nTime = gdk_event_get_time(pEvent);
+GdkRectangle aRect{static_cast(rRect.Left()), 
static_cast(rRect.Top()),
+   static_cast(rRect.GetWidth()), 
static_cast(rRect.GetHeight())};
+gtk_menu_popup_at_rect(m_pMenu, gtk_widget_get_window(pWidget), 
&aRect, GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_WEST, nullptr);
 }
 else
+#endif
 {
-nButton = 0;
-nTime = GtkSalFrame::GetLastInputEventTime();
-}
+guint nButton;
+guint32 nTime;
+
+//typically there is an event, and we can then distinguish if this 
was
+//launched from the keyboard (gets auto-mnemoniced) or the mouse 
(which
+//doesn't)
+GdkEvent *pEvent = gtk_get_current_event();
+if (pEvent)
+{
+gdk_event_get_button(pEvent, &nButton);
+nTime = gdk_event_get_time(pEvent);
+}
+else
+{
+nButton = 0;
+nTime = GtkSalFrame::GetLastInputEventTime();
+}
 
-gtk_menu_popup(m_pMenu, nullptr, nullptr, nullptr, nullptr, nButton, 
nTime);
-#endif
+gtk_menu_popup(m_pMenu, nullptr, nullptr, nullptr, nullptr, 
nButton, nTime);
+}
 
 if (g_main_loop_is_running(pLoop))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/source/dialogs/hldocntp.cxx  |4 ++--
 include/sfx2/dispatch.hxx|7 ---
 sfx2/source/control/dispatch.cxx |   17 +++--
 sfx2/source/doc/objserv.cxx  |4 ++--
 4 files changed, 23 insertions(+), 9 deletions(-)

New commits:
commit effa599086c38b3391d03dc5b6770b523e886b60
Author: Caolán McNamara 
Date:   Tue Apr 17 16:59:44 2018 +0100

Related: tdf#116928 set specific parent for document warning dialog

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

diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 99a24a1a8271..965198480d95 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -374,11 +374,11 @@ void SvxHyperlinkNewDocTp::DoApply ()
 if (pViewFrame)
 {
 SfxStringItem aNewName( SID_FILE_NAME, 
aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
+SfxUnoFrameItem aDocFrame( SID_FILLFRAME, 
pViewFrame->GetFrame().GetFrameInterface() );
 
 pViewFrame->GetDispatcher()->ExecuteList(
 SID_SAVEASDOC, SfxCallMode::SYNCHRON,
-{ &aNewName });
-
+{ &aNewName }, { &aDocFrame } );
 }
 }
 }
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 49777df94687..3ff8856985a2 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -130,9 +130,10 @@ public:
 SfxItemSet const * pInternalArgs,
 sal_uInt16 nModi);
 
-const SfxPoolItem*  ExecuteList( sal_uInt16 nSlot,
- SfxCallMode nCall,
- std::initializer_list 
args);
+const SfxPoolItem*  ExecuteList(sal_uInt16 nSlot,
+SfxCallMode nCall,
+std::initializer_list 
args,
+std::initializer_list 
internalargs = std::initializer_list());
 
 const SfxPoolItem*  Execute( sal_uInt16 nSlot,
  SfxCallMode nCall,
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 6bc623a7b461..c05609f01ce7 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1079,7 +1079,8 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 
nSlot, SfxCallMode eCall,
 });
 */
 const SfxPoolItem* SfxDispatcher::ExecuteList(sal_uInt16 nSlot, SfxCallMode 
eCall,
-std::initializer_list args)
+std::initializer_list args,
+std::initializer_list internalargs)
 {
 if ( IsLocked() )
 return nullptr;
@@ -1097,7 +1098,19 @@ const SfxPoolItem* SfxDispatcher::ExecuteList(sal_uInt16 
nSlot, SfxCallMode eCal
MappedPut_Impl( aSet, *pArg );
}
 
-   SfxRequest aReq( nSlot, eCall, aSet );
+   SfxRequest aReq(nSlot, eCall, aSet);
+
+   if (internalargs.begin() != internalargs.end())
+   {
+   SfxAllItemSet aInternalSet(SfxGetpApp()->GetPool());
+   for (const SfxPoolItem *pArg : internalargs)
+   {
+   assert(pArg);
+   aInternalSet.Put(*pArg);
+   }
+   aReq.SetInternalArgs_Impl(aInternalSet);
+   }
+
Execute_( *pShell, *pSlot, aReq, eCall );
return aReq.GetReturnValue();
 }
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index a8e4a94f8a63..7485cfe04a5f 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -698,7 +698,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 if ( lErr != ERRCODE_IO_ABORT )
 {
 SfxErrorContext aEc(ERRCTX_SFX_SAVEASDOC,GetTitle());
-ErrorHandler::HandleError( lErr );
+ErrorHandler::HandleError(lErr, rReq.GetFrameWeld());
 }
 
 if ( nId == SID_EXPORTDOCASPDF )
@@ -787,7 +787,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 
 SetModified( false );
 ErrCode lErr = GetErrorCode();
-ErrorHandler::HandleError(lErr);
+ErrorHandler::HandleError(lErr, rReq.GetFrameWeld());
 
 rReq.SetReturnValue( SfxBoolItem(0, true) );
 rReq.Done();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 cui/source/dialogs/SpellDialog.cxx   |2 +-
 drawinglayer/source/tools/emfphelperdata.cxx |2 +-
 include/svx/scene3d.hxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 79ee6c979dcb87228836964af4f153f42edba745
Author: Andrea Gelmini 
Date:   Tue Apr 17 18:26:40 2018 +0200

Fix typos

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

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index e3242b486b30..b782ed533d73 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1958,7 +1958,7 @@ void SentenceEditWindow_Impl::UndoActionEnd()
 
 void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset)
 {
-// Shoudn't we always add the real signed value instead???
+// Shouldn't we always add the real signed value instead???
 if(nOffset > 0)
 m_nErrorEnd = m_nErrorEnd - static_cast(nOffset);
 else
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx 
b/drawinglayer/source/tools/emfphelperdata.cxx
index cdf79d378b49..3c9d10e62fd8 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -127,7 +127,7 @@ namespace emfplushelper
 }
 case UnitTypeMillimeter:
 {
-SAL_INFO("drawinglayer", "EMF+\t TODO Test Converting 
Milimeters to Pixels, if it is working correctly.");
+SAL_INFO("drawinglayer", "EMF+\t TODO Test Converting 
Millimeters to Pixels, if it is working correctly.");
 return 3.779528f;
 }
 case UnitTypeDocument:
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 3c54bf83b2b6..c3412f64 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -168,7 +168,7 @@ public:
 void ResumeReportingDirtyRects();
 void SetAllSceneRectsDirty();
 
-// set selection fropm E3dObject (temporary flag for 3D actions)
+// set selection from E3dObject (temporary flag for 3D actions)
 virtual void SetSelected(bool bNew) override;
 
 // derived from SdrObjList
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.0.4.1'

[Christian Lohmaier]

Tag 'libreoffice-6.0.4.1' created by Christian Lohmaier 
 at 2018-04-17 19:03 +

Tag libreoffice-6.0.4.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJa1kTlAAoJEPQ0oe+v7q6jj1QQALMK3oarZyF4SPnpfbk/h4FF
s9N9GNRmSlSa1Ji38sbPxwGk5zg3TbbqUMbrc6TLY43+mQxgm6UwaYyAli0+HWSr
ZaRyrxnVIfZLIzexAqu0mmMFjo0vWBkdr3iEy9oLzNqJusOyvty0TkP3P8uHaEr/
QqYf5nYzFTXtEu3ghFGxuWm7L0QSQ7tfgQTtV54/u9tJg6M6Oye07kVecpRJdw54
IKHrJCIZoexQNB33i6WxNobQX6nvNhPUqTuGSD9lFJG8SgsZXAYz8x0zB16lwJSS
6Tb5N8ZZVqYkkDj5I/La5l/NLtGd1rTFwYggq/vk8JhnEn9Lua1Wzu086rQt8TUZ
tAGMypSUZnS8hfMksiX+IOh3+idkAIheKmKYrBFy2gw4KlTHPz6rIBQB75qc9Q+O
OBw98Oz1iwdanS/06iTNp2E9qwZwDmbFdioJtYSNdBifyiHn+gccqB/BL5Qni2zM
RpbQ46dBnUBh5Rz/LQuSHrBLOF1VA4Rt2RhE2dWW5eN5YUx7ufw88Zr3nP2u++1F
qaKoc1fhDzzy2y7mikmiQtPoMz+zi3D2WAni978qSGvI+Yml9rnPAqWOXQxrLaOM
kJNnrAsSkIXwLGmSTnDJoCH0lJW4PLdrUppc2HQqIDgulca2MCtM/oSp+onhKD86
rrwW/wiUHpTrTzPDsNPV
=+d/l
-END PGP SIGNATURE-

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.0.4.1'

[Christian Lohmaier]

Tag 'libreoffice-6.0.4.1' created by Christian Lohmaier 
 at 2018-04-17 19:02 +

Tag libreoffice-6.0.4.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJa1kThAAoJEPQ0oe+v7q6j9ToP/jh1q05wv7wKH/XPLkRRaLL4
jPorosylYNUFylulQe5Sy0uNWdYQ/VV0fQ888YG05LrrqMN4d/XAgclSPNHNJV+5
OlMP2PbeDr1w8P4fRevDglLv68UUnSW06OaSZhf64RgL2ASB2a5FDpo6Io+YHfoF
njAPXHKfIuPInjWd6dIUAEXkP7GnH+Jkn/cTbyy0Q4VlStU+XPQ+sq9QqOei2Bi8
FuEZdo8NEi5OxeENaFxEnQuf41WHaZPw9qORhqakVuncl80DnlyeLouxF1pwH7bZ
On/jac89VfVgi7dfbq46WzAbfeISY8GPwBq5rbLgWFO9Qkr1RxiH1mDwqchwPe/z
OFiUFE05O2Kf0U7sSnRLkomutOR9n+CgBmUkvjoOZmgrkYkTwIF8rteHgez7Fy6I
M9aOEQcU9ciERWrGRpdw0mSARUVIuxLlOyu5/TxF/lYPZGhWkgo51u7+xin/6V1i
y6jryPjvMEXsz5CqUwiLUQC2EjQD4jLigiV4B9YJQYDCCfEtsZ5lk/evmQiOpXNu
/cpEOZ0hBVDDEmhpK9Hp7NrZFlIJhfTurJE+k9juHuZQhRUCCNJIJ6gW2zsMsM9n
HIW3ouDs7Cx8AqyJRj+ahGqDcL4rjbU/DIvCyosaupurt4Iuj5R22JpQ4xrqaLGH
NcLJlM9tvT572aUNh/de
=9oYo
-END PGP SIGNATURE-

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.0.4.1'

[Christian Lohmaier]

Tag 'libreoffice-6.0.4.1' created by Christian Lohmaier 
 at 2018-04-17 19:02 +

Tag libreoffice-6.0.4.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJa1kTdAAoJEPQ0oe+v7q6jfaQP/0DeIGdAA04x+lubvDjjOxbb
2Bs50sOTIFXiKpYNsw0JqqkJ5eP/UHE/cI6IxMLYdX+U06+q+BEG9+/ThFI2uPlc
d3ZqLEhkJpZmcWDzQjQRwypRj75NEXCxYPJAyf4KuGT/F2yVRecl9SYxKklpHgfi
1q0FF/aW3wG5SrEiyC01kFs31O4RWZK4l+Lq7qkJXDBuvLzA3EtW+YRFfcG7ZjtV
ysQ+rjgOnTxU8VSbe+hPQ7GL5Yz6mmQS6UNXMQien7gSk5oxJCsztL9+MaRqQ4Uc
2ao1bFROxLhxkbF4jRgjtpOEB8jPf09zp6PSflw5NwLCBUQNNwhPqR0r43+wPqKP
Zv2clRYgfV6C6dGe7BVH+fls9ZLvAUYMDRYdYEhncybraHznDnQcjfb9h1EfHZsd
JlScRG0x+J3Q7Yn/X4sL42+7nG5pwLTha6P2X/msMRzHOmRibtUaaxEiqw+Hb5A+
vYvokXzHctebbxPm2U4QNjokKfaXLaEP35oqxeE+YZ4GfHGpW76VjtosVw6h5jiO
pomDl1WTNHa8KnnDtch1o1QsdLFqWPcaI1SZbsE8Ajo+FoVVvogxI2pOp9/GbNgi
UoCdO87/qvPDC79L/GM19L6JajHfDeu+0h8YujI7uzNEl6YzYt8GYPJ0pa1iYnjl
Hm8S2N/i6tJf/FqULHc2
=WutG
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-4' - configure.ac

[Christian Lohmaier]

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

New commits:
commit d217ba2c212d7b1bdb3b7c5e890ee4e97c349c89
Author: Christian Lohmaier 
Date:   Tue Apr 17 21:03:32 2018 +0200

bump product version to 6.0.4.1.0+

Change-Id: I1f2fdf570ea3eef61bf62341d8014c50f8bb9834

diff --git a/configure.ac b/configure.ac
index 4e50fe94a4e8..e6bfb13ebab8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.4.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.0.4.1'

[Christian Lohmaier]

Tag 'libreoffice-6.0.4.1' created by Christian Lohmaier 
 at 2018-04-17 19:03 +

Tag libreoffice-6.0.4.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJa1kToAAoJEPQ0oe+v7q6jemMQANMbl28du/iNR9d5n/4rd8Pt
dkH6urPeWWOKZ6awwY9ai8vttVwtkwHhLK6tLDi9CoHzv3qeJKsWQax3fDBf6J0q
UcrVLvJMq8ZPh3T1RIX4gi/8+Fs/iRFCn0qbO/GdKxCWYOmcxbmgiMZDkOc8C10T
cck4gAYOO9tky8Y8ZsprxLifcc9Cr5JW6ghJ+wKc4rDJ6H8VU+/SpfxES7KCiITO
DRLp56LqOPxkbWPmL4CNXpWcI/fF/eD4UZWI7wHqGe7arfAvr1byxmJmKy+AFu0o
/6u5rKeu0iz7nZ+AjE0EFpjKhA23BlaqSh1XAazRmIqxr+oPy2F4VH//D1EVT7n5
Y0YtIswq+a3IC9l4crgcY/mtT2z3Pok+tTozGRZ74syvy/jsEXYXjPTT3CjVO5Jx
EOUt1avFfg00gqx19ybxCg7EYU56dvQEL2PCe6wRCwoyKFCjryhkMKnNhAgW7YT7
jQI+fGDd3QL4s7jzvHyPRpZ0NuhF99PaO2NumFqoCFchLL0QW01lbkk54NPNWlks
OuSMzMnx8LalesNtwbfimys+pdfiHkroou8VLMdk/yjMLEKHhvi5NCa0+6l1yEcn
4naVq6NDfuNnLPR3gcHejBCyGrCIIDHkWUl12uw3gThOm/yWbFnRPSen4DYsl8CY
Z2CHpXhTR58WJtnJLuQx
=3l1i
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - configure.ac

[Christian Lohmaier]

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

New commits:
commit a4f2730727e5c52cf44bb865cfdd7a8e79ef082e
Author: Christian Lohmaier 
Date:   Tue Apr 17 20:59:52 2018 +0200

bump product version to 6.0.5.0.0+

Change-Id: Idc75c4d0891448576fff71a84b2b3b42fc8a78ad

diff --git a/configure.ac b/configure.ac
index 4e50fe94a4e8..d0f0cbdf0e07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.5.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-6-0-4'

[Christian Lohmaier]

New branch 'libreoffice-6-0-4' available with the following commits:
commit fce32721750e70fff4f75e81c1a5693677980891
Author: Christian Lohmaier 
Date:   Tue Apr 17 20:57:53 2018 +0200

Branch libreoffice-6-0-4

This is 'libreoffice-6-0-4' - the stable branch for the 6.0.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.0.x release,
please use the 'libreoffice-6-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ie6e4b00627fc29c246ef0044b7e9f3b8b8dc658e

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-6-0-4'

[Christian Lohmaier]

New branch 'libreoffice-6-0-4' available with the following commits:
commit 0433857c218d32fdf3e8ce5570e44a7dad6fc3bb
Author: Christian Lohmaier 
Date:   Tue Apr 17 20:57:36 2018 +0200

Branch libreoffice-6-0-4

This is 'libreoffice-6-0-4' - the stable branch for the 6.0.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.0.x release,
please use the 'libreoffice-6-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I05cf9a5498f2ed60c7d5694da45e54eeace34f3c

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-6-0-4'

[Christian Lohmaier]

New branch 'libreoffice-6-0-4' available with the following commits:
commit c8f93fdee8bd19bd6250f0d27aa83fb1047789a5
Author: Christian Lohmaier 
Date:   Tue Apr 17 20:57:36 2018 +0200

Branch libreoffice-6-0-4

This is 'libreoffice-6-0-4' - the stable branch for the 6.0.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.0.x release,
please use the 'libreoffice-6-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I04be5e3364b13958017ebafea22131bdc497e4ba

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-6-0-4'

[Christian Lohmaier]

New branch 'libreoffice-6-0-4' available with the following commits:
commit b6426eade7133a0d15491848542134b3e0d79baf
Author: Christian Lohmaier 
Date:   Tue Apr 17 20:57:36 2018 +0200

Branch libreoffice-6-0-4

This is 'libreoffice-6-0-4' - the stable branch for the 6.0.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.0.x release,
please use the 'libreoffice-6-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I2ef552880c3e16505cc92e7788c47c6f2eec2f90

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

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

[Stephan Bergmann]

 compilerplugins/clang/casttovoid.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit cb06f61967850f7c3bbaaf3575901d6a18b94c96
Author: Stephan Bergmann 
Date:   Tue Apr 17 17:13:50 2018 +0200

More containsPreprocessingConditionalInclusion checking in 
loplugin:casttovoid

...to avoid false positive with --disable-dbgutil in SfxApplication ctor
(sfx2/source/appl/app.cxx), which contains

bool bOk = InitializeDde();
  #ifdef DBG_UTIL
...
  #else
(void)bOk;
  #endif

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

diff --git a/compilerplugins/clang/casttovoid.cxx 
b/compilerplugins/clang/casttovoid.cxx
index c67d7ca10870..e8b080dab2a5 100644
--- a/compilerplugins/clang/casttovoid.cxx
+++ b/compilerplugins/clang/casttovoid.cxx
@@ -380,6 +380,11 @@ private:
 } else if (!i.second.castToVoid.empty()
&& !isWarnUnusedType(i.first->getType()))
 {
+auto const fun = 
dyn_cast_or_null(i.first->getDeclContext());
+assert(fun != nullptr);
+if 
(containsPreprocessingConditionalInclusion(fun->getSourceRange())) {
+continue;
+}
 report(
 DiagnosticsEngine::Warning,
 "unused variable %select{declaration|name}0",
___
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' - translations

[Christian Lohmaier]

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

New commits:
commit d221ef42fc8db7c3c56f2883eec3b594b46567c0
Author: Christian Lohmaier 
Date:   Tue Apr 17 20:29:31 2018 +0200

Updated core
Project: translations  d42511d49b23ede170624557f8674303b7ab116b

update translations for 6.0.4 rc1

and force-fix errors using pocheck

Change-Id: Ib90d986cfad20954583a265574abe54c9b8a50bf

diff --git a/translations b/translations
index ef1d018c8b01..d42511d49b23 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ef1d018c8b016c29186b0391a830ce83e8d9198b
+Subproject commit d42511d49b23ede170624557f8674303b7ab116b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 external/firebird/firebird-macosx.patch.1 |   20 
 1 file changed, 20 deletions(-)

New commits:
commit 25812b3eb420b0160b07ae604c5589a305c26938
Author: Tor Lillqvist 
Date:   Tue Apr 17 10:20:37 2018 +0300

We don't build for i386 on macOS anyway

No no need to patch the Firebird build settings for i386.

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

diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index 8961c4278924..e379ca738b18 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -65,26 +65,6 @@
cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
mkdir -p $(FB_FW)/Resources/doc
 firebird.org/builds/posix/prefix.darwin_i386   2016-08-01 
22:55:34.0 +0200
-+++ firebird/builds/posix/prefix.darwin_i386   2016-08-01 23:02:46.0 
+0200
-@@ -26,14 +26,14 @@
- # 4. for  CFLAGS, CXXFLAGS, LDFLAGS export '-m32 -arch i386'
- # 5. export MACOSX_DEPLOYMENT_TARGET=10.7 
- 
--DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
-+DYLD_LIBRARY_PATH:=$(FIREBIRD)/lib:$(DYLD_LIBRARY_PATH)
- export DYLD_LIBRARY_PATH
- 
- MACOSX_DEPLOYMENT_TARGET=10.7
- export MACOSX_DEPLOYMENT_TARGET
- 
--PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -arch i386 
-mmacosx-version-min=10.7
--DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -arch i386 
-mmacosx-version-min=10.7 -Wno-non-virtual-dtor
-+PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -arch i386
-+DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -arch i386 
-Wno-non-virtual-dtor
- CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden 
-fno-weak
- 
- EXE_LINK_OPTIONS:=-m32
 --- firebird.org/builds/posix/Makefile.in  2016-08-08 17:58:20.0 
+0200
 +++ firebird/builds/posix/Makefile.in  2016-08-08 17:57:17.0 +0200
 @@ -191,6 +191,9 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/Library_dbui.mk svx/Library_svxcore.mk

[Don Lewis]

 dbaccess/Library_dbui.mk |9 +
 svx/Library_svxcore.mk   |9 +
 2 files changed, 18 insertions(+)

New commits:
commit 943443f350b571beb4e9c932067456e415ffa8fb
Author: Don Lewis 
Date:   Tue Apr 17 16:59:48 2018 +

Fix build with gcc 4.9 by tweaking optimization options for two files.

This is a workaround for:


diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 7a0adb992bdc..885fcc5c6b05 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -286,6 +286,15 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
 ))
 endif
 
+# g++49 -Os sometimes leaves inline class methods undefined,
+# See: 
+ifeq ($(COM)$(shell expr $(CCNUMVER) '>=' 00040009 '&' $(CCNUMVER) '<' 
0005),GCC1)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   dbaccess/source/ui/uno/ColumnControl, \
+   $(gb_COMPILEROPTFLAGS) -fno-devirtualize 
-fno-devirtualize-speculatively \
+))
+endif
+
 $(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/shared/dbu_reghelper \
dbaccess/source/shared/dbustrings \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 49f1101dee24..de5133ab6905 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -449,6 +449,15 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \
 ))
 endif
 
+# g++49 -Os sometimes leaves inline class methods undefined,
+# See: 
+ifeq ($(COM)$(shell expr $(CCNUMVER) '>=' 00040009 '&' $(CCNUMVER) '<' 
0005),GCC1)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+svx/source/fmcomp/fmgridif, \
+$(gb_COMPILEROPTFLAGS) -fno-devirtualize -fno-devirtualize-speculatively \
+))
+endif
+
 $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
 
 $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - common/UnitHTTP.cpp common/UnitHTTP.hpp Makefile.am tools/Connect.cpp tools/WebSocketDump.cpp

[Michael Meeks]

 Makefile.am |8 +
 common/UnitHTTP.cpp |   41 
 common/UnitHTTP.hpp |   29 +
 tools/Connect.cpp   |   11 --
 tools/WebSocketDump.cpp |  240 
 5 files changed, 276 insertions(+), 53 deletions(-)

New commits:
commit f68d54e02a43738754ba82a40ab42644cc6565aa
Author: Michael Meeks 
Date:   Tue Apr 17 14:01:49 2018 +0100

Initial websocket test tool for remote admin connections.

Change-Id: I8be2068bf7d77c70720a044556d11f5fc80b2f0c

diff --git a/Makefile.am b/Makefile.am
index bbff1083e..6aedc561c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,9 @@ SUBDIRS = . test loleaflet
 
 export ENABLE_DEBUG
 
-bin_PROGRAMS = loolwsd loolforkit loolmap loolmount looltool loolstress 
loolconfig
+bin_PROGRAMS = \
+   loolwsd loolforkit loolmap loolmount \
+   looltool loolstress loolconfig loolsocketdump
 
 dist_bin_SCRIPTS = loolwsd-systemplate-setup
 
@@ -131,6 +133,9 @@ loolconfig_SOURCES = tools/Config.cpp \
 common/Log.cpp \
 common/Util.cpp
 
+loolsocketdump_SOURCES = tools/WebSocketDump.cpp \
+$(shared_sources)
+
 wsd_headers = wsd/Admin.hpp \
   wsd/AdminModel.hpp \
   wsd/Auth.hpp \
diff --git a/tools/Connect.cpp b/tools/Connect.cpp
index 04b55ea0c..26db06674 100644
--- a/tools/Connect.cpp
+++ b/tools/Connect.cpp
@@ -236,13 +236,10 @@ private:
 
 namespace Util
 {
-
-void alertAllUsers(const std::string& cmd, const std::string& kind)
-{
-std::cout << "error: cmd=" << cmd << " kind=" << kind << std::endl;
-(void) kind;
-}
-
+void alertAllUsers(const std::string& cmd, const std::string& kind)
+{
+std::cout << "error: cmd=" << cmd << " kind=" << kind << std::endl;
+}
 }
 
 POCO_APP_MAIN(Connect)
diff --git a/tools/WebSocketDump.cpp b/tools/WebSocketDump.cpp
new file mode 100644
index 0..a72e646c4
--- /dev/null
+++ b/tools/WebSocketDump.cpp
@@ -0,0 +1,240 @@
+/* -*- 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/.
+ */
+
+/* A simple tool that accepts web-socket connections and dumps the contents */
+
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#if ENABLE_SSL
+#  include 
+#endif
+
+// Dumps incoming websocket messages and doesn't respond.
+class DumpSocketHandler : public WebSocketHandler
+{
+public:
+DumpSocketHandler()
+{
+}
+
+private:
+/// Process incoming websocket messages
+void handleMessage(bool fin, WSOpCode code, std::vector &data)
+{
+std::cout << "WebSocket message code " << (int)code << " fin " << fin 
<< " data:\n";
+Util::dumpHex(std::cout, "", "", data, false);
+}
+};
+
+/// Handles incoming connections and dispatches to the appropriate handler.
+class ClientRequestDispatcher : public SocketHandlerInterface
+{
+public:
+ClientRequestDispatcher()
+{
+}
+
+private:
+
+/// Set the socket associated with this ResponseClient.
+void onConnect(const std::shared_ptr& socket) override
+{
+_socket = socket;
+LOG_TRC("#" << socket->getFD() << " Connected to 
ClientRequestDispatcher.");
+}
+
+/// Called after successful socket reads.
+void handleIncomingMessage(SocketDisposition & /* disposition */) override
+{
+std::shared_ptr socket = _socket.lock();
+std::vector& in = socket->_inBuffer;
+LOG_TRC("#" << socket->getFD() << " handling incoming " << in.size() 
<< " bytes.");
+
+// Find the end of the header, if any.
+static const std::string marker("\r\n\r\n");
+auto itBody = std::search(in.begin(), in.end(),
+  marker.begin(), marker.end());
+if (itBody == in.end())
+{
+LOG_DBG("#" << socket->getFD() << " doesn't have enough data 
yet.");
+return;
+}
+
+// Skip the marker.
+itBody += marker.size();
+
+Poco::MemoryInputStream message(&in[0], in.size());
+Poco::Net::HTTPRequest request;
+try
+{
+request.read(message);
+
+Log::StreamLogger logger = Log::info();
+if (logger.enabled())
+{
+logger << "#" << socket->getFD() << ": Client HTTP Request: "
+   << request.getMethod() << ' '
+   << request.getURI() << ' '
+   << request.getVersion();
+
+for (const auto& it : request)
+{
+logger << " / " << it.first << ": " << it.second;
+  

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

[Caolán McNamara]

 sw/inc/swabstdlg.hxx  |2 
 sw/source/ui/dialog/swdlgfact.cxx |   16 ++-
 sw/source/ui/dialog/swdlgfact.hxx |   11 +-
 sw/source/ui/fldui/DropDownFieldDialog.cxx|  125 +++---
 sw/source/uibase/inc/DropDownFieldDialog.hxx  |   48 -
 sw/source/uibase/inc/wrtsh.hxx|2 
 sw/source/uibase/wrtsh/wrtsh2.cxx |9 +
 sw/uiconfig/swriter/ui/dropdownfielddialog.ui |  119 
 8 files changed, 185 insertions(+), 147 deletions(-)

New commits:
commit 9a360f993d7a791c548801779d7f444f87541489
Author: Caolán McNamara 
Date:   Tue Apr 17 09:51:26 2018 +0100

weld DropDownFieldDialog

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

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index d64bc9aad389..92699b35f7ee 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -396,7 +396,7 @@ public:
 const SwDBData& rData) = 0;
 virtual VclPtr CreateSwFootNoteOptionDlg(vcl::Window 
*pParent, SwWrtShell &rSh) = 0;
 
-virtual VclPtr 
CreateDropDownFieldDialog(SwWrtShell &rSh,
+virtual VclPtr 
CreateDropDownFieldDialog(weld::Window* pParent, SwWrtShell &rSh,
 SwField* pField, bool bPrevButton, bool bNextButton) = 0;
 virtual VclPtr CreateSwEnvDlg ( vcl::Window* 
pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool 
bInsert ) = 0;
 
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index cf431989c93f..fd0e2009e953 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -133,7 +133,12 @@ short AbstractSwConvertTableDlg_Impl::Execute()
 return m_xDlg->run();
 }
 IMPL_ABSTDLG_BASE(AbstractSwInsertDBColAutoPilot_Impl);
-IMPL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl);
+
+short AbstractDropDownFieldDialog_Impl::Execute()
+{
+return m_xDlg->execute();
+}
+
 IMPL_ABSTDLG_BASE(AbstractSwLabDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl);
 short AbstractSwAutoFormatDlg_Impl::Execute()
@@ -281,12 +286,12 @@ void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( 
const uno::Sequence< uno::A
 
 bool AbstractDropDownFieldDialog_Impl::PrevButtonPressed() const
 {
-return pDlg->PrevButtonPressed();
+return m_xDlg->PrevButtonPressed();
 }
 
 bool AbstractDropDownFieldDialog_Impl::NextButtonPressed() const
 {
-return pDlg->NextButtonPressed();
+return m_xDlg->NextButtonPressed();
 }
 
 void AbstractSwLabDlg_Impl::SetCurPageId( sal_uInt16 nId )
@@ -758,11 +763,10 @@ VclPtr 
SwAbstractDialogFactory_Impl::CreateSwFootNoteOptio
 return VclPtr::Create( pDlg );
 }
 
-VclPtr 
SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(
+VclPtr 
SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(weld::Window *pParent,
 SwWrtShell &rSh, SwField* pField, bool bPrevButton, bool bNextButton)
 {
-VclPtr pDlg = 
VclPtr::Create(nullptr, rSh, pField, bPrevButton, 
bNextButton);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new 
sw::DropDownFieldDialog(pParent, rSh, pField, bPrevButton, bNextButton));
 }
 
 VclPtr SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( 
vcl::Window* pParent, const SfxItemSet& rSet,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index b708efc4098c..48fd7f95c91f 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -262,7 +262,14 @@ class AbstractSwInsertDBColAutoPilot_Impl :  public 
AbstractSwInsertDBColAutoPil
 
 class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog
 {
-DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, 
sw::DropDownFieldDialog)
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractDropDownFieldDialog_Impl(sw::DropDownFieldDialog* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
 virtual bool  PrevButtonPressed() const override;
 virtual bool  NextButtonPressed() const override;
 };
@@ -537,7 +544,7 @@ public:
 const SwDBData& rData) override;
 virtual VclPtr CreateSwFootNoteOptionDlg(vcl::Window 
*pParent, SwWrtShell &rSh) override;
 
-virtual VclPtr 
CreateDropDownFieldDialog(SwWrtShell &rSh,
+virtual VclPtr 
CreateDropDownFieldDialog(weld::Window* pParent, SwWrtShell &rSh,
 SwField* pField, bool bPrevButton, bool bNextButton) override;
 virtual VclPtr CreateSwEnvDlg ( vcl::Window* 
pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool 
bInsert ) override;
 virtual VclPtr CreateSwLabDlg(const SfxItemSet& rSet,
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx 
b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 8de7bd7c32d8..d21758e062dc 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/so

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

[Jens Carl]

 include/test/sheet/sheetsortdescriptor2.hxx |   34 
 qadevOOo/Jar_OOoRunner.mk   |2 
 qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java |  135 
 qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java   |  130 ---
 sc/CppunitTest_sc_sortdescriptorbaseobj.mk  |   43 +
 sc/Module_sc.mk |1 
 sc/qa/extras/scsortdescriptorbaseobj.cxx|   87 ++
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/sheetsortdescriptor2.cxx  |  121 ++
 9 files changed, 287 insertions(+), 267 deletions(-)

New commits:
commit 73a7c7ddbc52ed3fe512d4c5206e90810f14b50c
Author: Jens Carl 
Date:   Tue Apr 10 04:46:44 2018 +

tdf#45904 Move _SheetSortDescriptor Java tests to C++

The C++ tests are now located in sheetsortdescriptor2.(hxx|cxx), because
this is the latest implementation of the UNO API interface
(SheetSortDescriptor2.idl).

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

diff --git a/include/test/sheet/sheetsortdescriptor2.hxx 
b/include/test/sheet/sheetsortdescriptor2.hxx
new file mode 100644
index ..0f3c5713d94c
--- /dev/null
+++ b/include/test/sheet/sheetsortdescriptor2.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_SHEETSORTDESCRIPTOR2_HXX
+#define INCLUDED_TEST_SHEET_SHEETSORTDESCRIPTOR2_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST SheetSortDescriptor2
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testSheetSortDescriptor2Properties();
+
+protected:
+~SheetSortDescriptor2() {}
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_SHEET_SHEETSORTDESCRIPTOR2_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 56d52e04ffc6..575e130efcd8 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -562,7 +562,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer \
 qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer \
 qadevOOo/tests/java/ifc/sdb/_XSQLErrorBroadcaster \
-qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor \
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \
 qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
 qadevOOo/tests/java/ifc/sheet/_XCellRangeData \
@@ -1037,7 +1036,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/mod/_sc/ScShapeObj \
 qadevOOo/tests/java/mod/_sc/ScSheetLinkObj \
 qadevOOo/tests/java/mod/_sc/ScSheetLinksObj \
-qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase \
 qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings \
 qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj \
 qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj \
diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java 
b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java
deleted file mode 100644
index f540d77db610..
--- a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.sheet;
-
-import lib.MultiMethodTest;
-import util.ValueChanger;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.table.CellAddress;
-import com.sun.star.util.XSortable;
-
-/**
-* Testing com.sun.star.sheet.SheetSortDescriptor
-* service properties: 
-* 
-*   BindFormatsToContent
-*   CopyOutputData
-*   IsCaseSensitive
-*   IsUs

Re: Compiling --enable-pdfium fails

[Stephan Bergmann]

On 17/04/18 17:23, Дилян Палаузов wrote:

for 6.0.3.2 I call
   ./configure --enable-evolution2 --enable-avahi --enable-python=system 
--enable-eot --enable-online-update --enable-introspection=yes 
--without-doxygen --with-jdk-home=/opt/jdk --with-ant-home=/opt/ant 
--without-junit --enable-formula-logger --enable-introspection 
--with-system-bzip2 --with-system-cairo --with-system-epoxy 
--with-system-zlib --with-system-jpeg --with-system-expat 
--with-system-libxml --with-system-icu --with-system-openldap 
--with-system-poppler --with-system-curl --with-system-boost 
--with-webdav --with-krb5 --with-gssapi --with-system-lcms2 --with-boost 
--with-system-nss --with-system-graphite --with-system-harfbuzz 
--with-system-openssl --with-system-libpng --disable-firebird-sdbc



which implies --enable-pdfium, and then `make` shows:

mkdir -p /src/libreoffice-6.0.3.2/instdir
/src/libreoffice-6.0.3.2/solenv/bin/install-gdb-printers -a 
/src/libreoffice-6.0.3.2/instdir -c

make -j 4  -rs -f /src/libreoffice-6.0.3.2/Makefile.gbuild    all
[build DEP] LNK:Executable/unoidl-write
[build DEP] LNK:Executable/unoidl-check
[build DEP] LNK:Library/libunoidllo.so
[build DEP] LNK:Library/libpdfiumlo.so
[build DEP] LNK:Executable/cppumaker
[build PAT] liborcus
[build DEP] LNK:Library/libunoidllo.so
[build LNK] Library/libunoidllo.so
[build UIC] modules/BasicIDE
[build CXX] 
workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp
/src/libreoffice-6.0.3.2/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp: 
In function ‘boolean _src_fill_buffer(j_decompress_ptr)’:
/src/libreoffice-6.0.3.2/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp:78:10: 
error: invalid conversion from ‘int’ to ‘boolean’ [-fpermissive]

    return 0;
   ^


I assume some weird boolean typedef from your --with-system-jpeg.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Compiling --enable-pdfium fails

[Дилян Палаузов]

Hello,

for 6.0.3.2 I call
  ./configure --enable-evolution2 --enable-avahi  
--enable-python=system --enable-eot --enable-online-update  
--enable-introspection=yes --without-doxygen --with-jdk-home=/opt/jdk  
--with-ant-home=/opt/ant --without-junit --enable-formula-logger  
--enable-introspection --with-system-bzip2 --with-system-cairo  
--with-system-epoxy --with-system-zlib --with-system-jpeg  
--with-system-expat --with-system-libxml --with-system-icu  
--with-system-openldap --with-system-poppler --with-system-curl  
--with-system-boost --with-webdav --with-krb5 --with-gssapi  
--with-system-lcms2 --with-boost --with-system-nss  
--with-system-graphite --with-system-harfbuzz --with-system-openssl  
--with-system-libpng --disable-firebird-sdbc



which implies --enable-pdfium, and then `make` shows:

mkdir -p /src/libreoffice-6.0.3.2/instdir
/src/libreoffice-6.0.3.2/solenv/bin/install-gdb-printers -a  
/src/libreoffice-6.0.3.2/instdir -c

make -j 4  -rs -f /src/libreoffice-6.0.3.2/Makefile.gbuildall
[build DEP] LNK:Executable/unoidl-write
[build DEP] LNK:Executable/unoidl-check
[build DEP] LNK:Library/libunoidllo.so
[build DEP] LNK:Library/libpdfiumlo.so
[build DEP] LNK:Executable/cppumaker
[build PAT] liborcus
[build DEP] LNK:Library/libunoidllo.so
[build LNK] Library/libunoidllo.so
[build UIC] modules/BasicIDE
[build CXX]  
workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp
/src/libreoffice-6.0.3.2/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp: In function ‘boolean  
_src_fill_buffer(j_decompress_ptr)’:
/src/libreoffice-6.0.3.2/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp:78:10: error: invalid conversion from ‘int’ to ‘boolean’  
[-fpermissive]

   return 0;
  ^
/src/libreoffice-6.0.3.2/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp: In function ‘boolean _src_resync(j_decompress_ptr,  
int)’:
/src/libreoffice-6.0.3.2/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp:82:10: error: invalid conversion from ‘int’ to ‘boolean’  
[-fpermissive]

   return 0;
  ^
/src/libreoffice-6.0.3/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp: In function ‘bool JpegLoadInfo(const uint8_t*, uint32_t, int*, int*, int*, int*,  
bool*)’:
/src/libreoffice-6.0.3/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp:151:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘2’ to ‘int jpeg_read_header(j_decompress_ptr,  
boolean)’

   int ret = jpeg_read_header(&cinfo, true);
  ^
/src/libreoffice-6.0.3/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp: In member function ‘bool  
CCodec_JpegDecoder::InitDecode()’:
/src/libreoffice-6.0.3/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp:235:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘2’ to ‘int jpeg_read_header(j_decompress_ptr,  
boolean)’

   int ret = jpeg_read_header(&cinfo, true);
  ^
/src/libreoffice-6.0.3.2/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp: In member function ‘int CCodec_JpegModule::ReadHeader(CCodec_JpegModule::Context*, int*, int*,  
int*)’:
/src/libreoffice-6.0.3.2/workdir/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp:463:48: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘2’ to ‘int jpeg_read_header(j_decompress_ptr,  
boolean)’

   int ret = jpeg_read_header(&ctx->m_Info, true);
^
make[1]: ***  
[/src/libreoffice-6.0.3.2/solenv/gbuild/LinkTarget.mk:340:  
/src/libreoffice-6.0.3.2/workdir/GenCxxObject/UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg.o] Error  
1

make[1]: *** Waiting for unfinished jobs
[build CXX] codemaker/source/javamaker/javamaker.cxx
[build CXX] codemaker/source/javamaker/javaoptions.cxx
[build CXX] codemaker/source/javamaker/classfile.cxx
make: *** [Makefile:268: build] Error 2

I use gcc 7.3.1 20180416.

Any ideas?

Regards
  Dilian

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

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

[Caolán McNamara]

 sfx2/source/appl/appserv.cxx|4 -
 sfx2/source/appl/sfxhelp.cxx|6 -
 uui/source/secmacrowarnings.cxx |2 
 vcl/source/window/builder.cxx   |4 -
 vcl/unx/gtk3/gtk3gtkinst.cxx|  148 ++--
 5 files changed, 102 insertions(+), 62 deletions(-)

New commits:
commit a418c365644a4bfb0e40621d1b36b1708978a500
Author: Caolán McNamara 
Date:   Tue Apr 17 13:08:14 2018 +0100

let's just run ResHookProc over everything

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

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index b38468b5bfa7..1c19d40fecd9 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -313,13 +313,10 @@ namespace
 
 class LicenseDialog : public weld::GenericDialogController
 {
-std::unique_ptr m_xLabel;
 public:
 LicenseDialog(weld::Window* pParent)
 : GenericDialogController(pParent, "sfx/ui/licensedialog.ui",  
"LicenseDialog")
-, m_xLabel(m_xBuilder->weld_label("label"))
 {
-
m_xLabel->set_label(Translate::GetReadStringHook()(m_xLabel->get_label()));
 }
 
 short execute()
@@ -337,7 +334,6 @@ namespace
 SafeModeQueryDialog(weld::Window* pParent)
 : MessageDialogController(pParent, 
"sfx/ui/safemodequerydialog.ui", "SafeModeQueryDialog")
 {
-
m_xDialog->set_primary_text(Translate::GetReadStringHook()(m_xDialog->get_primary_text()));
 }
 
 short execute()
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index d0cc5248264b..a45f2ac62b6d 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -909,8 +909,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 LanguageTag aLangTag = Application::GetSettings().GetUILanguageTag();
 OUString sLocaleString = SvtLanguageTable::GetLanguageString( 
aLangTag.getLanguageType() );
 OUString sPrimText = xQueryBox->get_primary_text();
-
xQueryBox->set_primary_text(Translate::GetReadStringHook()(sPrimText).replaceAll("$UILOCALE",
 sLocaleString));
-
xQueryBox->set_title(Translate::GetReadStringHook()(xQueryBox->get_title()));
+xQueryBox->set_primary_text(sPrimText.replaceAll("$UILOCALE", 
sLocaleString));
 short OnlineHelpBox = xQueryBox->run();
 
 if(OnlineHelpBox == RET_OK)
@@ -1056,8 +1055,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, 
weld::Widget* pWidget, const OUSt
 LanguageTag aLangTag = Application::GetSettings().GetUILanguageTag();
 OUString sLocaleString = SvtLanguageTable::GetLanguageString( 
aLangTag.getLanguageType() );
 OUString sPrimText = xQueryBox->get_primary_text();
-
xQueryBox->set_primary_text(Translate::GetReadStringHook()(sPrimText).replaceAll("$UILOCALE",
 sLocaleString));
-
xQueryBox->set_title(Translate::GetReadStringHook()(xQueryBox->get_title()));
+xQueryBox->set_primary_text(sPrimText.replaceAll("$UILOCALE", 
sLocaleString));
 xQueryBox->connect_help(LINK(nullptr, NoHelpErrorBox, HelpRequestHdl));
 short OnlineHelpBox = xQueryBox->run();
 xQueryBox->hide();
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 9363db6a0265..e90b2520d865 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -74,8 +74,6 @@ MacroWarning::MacroWarning(weld::Window* pParent, bool 
_bWithSignatures)
 , mbShowSignatures   ( _bWithSignatures )
 , mnActSecLevel  ( 0 )
 {
-
m_xDialog->set_title(Translate::GetReadStringHook()(m_xDialog->get_title()));
-
 InitControls();
 
 mxEnableBtn->connect_clicked(LINK(this, MacroWarning, EnableBtnHdl));
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index db9bfef526e2..167094a3abe1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2604,7 +2604,7 @@ std::vector 
VclBuilder::handleItems(xmlreader::XmlReader &reader) cons
 else
 sFinalValue = OUString::fromUtf8(sValue);
 
-if (m_bLegacy && m_pStringReplace)
+if (m_pStringReplace)
 sFinalValue = (*m_pStringReplace)(sFinalValue);
 
 aItems.push_back(sFinalValue);
@@ -3349,7 +3349,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader 
&reader, stringmap &rMap)
 if (!sProperty.isEmpty())
 {
 sProperty = sProperty.replace('_', '-');
-if (m_bLegacy && m_pStringReplace)
+if (m_pStringReplace)
 sFinalValue = (*m_pStringReplace)(sFinalValue);
 rMap[sProperty] = sFinalValue;
 }
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx

[Libreoffice-commits] help.git: help3xsl/index2.html

[Stephan Bergmann]

 help3xsl/index2.html |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4c54d3af32ca4c6d02afff71532dbf10147fd33
Author: Stephan Bergmann 
Date:   Tue Apr 17 16:00:48 2018 +0200

Include help2.js not help.js

Otherwise, causes a

  ReferenceError: getParameterByName is not defined

when loading

  


in the browser.

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

diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index c7a6b6ee1..b7872710b 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit 8b843c5aac1ed8c5922b5ef4d36daa13538dd02f
Author: Stephan Bergmann 
Date:   Tue Apr 17 16:00:48 2018 +0200

Updated core
Project: help  f4c54d3af32ca4c6d02afff71532dbf10147fd33

Include help2.js not help.js

Otherwise, causes a

  ReferenceError: getParameterByName is not defined

when loading

  


in the browser.

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

diff --git a/helpcontent2 b/helpcontent2
index 49375fa3358e..f4c54d3af32c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 49375fa3358ea5bf8cb8ba0f1bf4f5ab0ada40c3
+Subproject commit f4c54d3af32ca4c6d02afff71532dbf10147fd33
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/source dbaccess/uiconfig solenv/gbuild

[Caolán McNamara]

 dbaccess/source/core/inc/warndlg.hxx   |4 
 dbaccess/source/core/misc/warndlg.cxx  |2 --
 dbaccess/source/ui/dlg/migrwarndlg.cxx |2 --
 dbaccess/source/ui/inc/migrwarndlg.hxx |4 
 dbaccess/uiconfig/ui/migrwarndlg.ui|   33 +
 solenv/gbuild/platform/macosx.mk   |2 --
 6 files changed, 13 insertions(+), 34 deletions(-)

New commits:
commit 4b5f85447fd17d18f05f8d4a292ee6ac381f4252
Author: Caolán McNamara 
Date:   Tue Apr 17 11:48:13 2018 +0100

Resolves: tdf#117057 use same style warning as elsewhere

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

diff --git a/dbaccess/source/core/inc/warndlg.hxx 
b/dbaccess/source/core/inc/warndlg.hxx
index 54cfe88cb6a4..3e0935bd732c 100644
--- a/dbaccess/source/core/inc/warndlg.hxx
+++ b/dbaccess/source/core/inc/warndlg.hxx
@@ -15,10 +15,6 @@ namespace dbaccess
 {
 class MigrationWarnDialog : public weld::MessageDialogController
 {
-private:
-std::unique_ptr m_xOkBtn;
-std::unique_ptr m_xLaterBtn;
-
 public:
 MigrationWarnDialog(weld::Window* pParent);
 };
diff --git a/dbaccess/source/core/misc/warndlg.cxx 
b/dbaccess/source/core/misc/warndlg.cxx
index e8446b6e7539..985c892eb9fa 100644
--- a/dbaccess/source/core/misc/warndlg.cxx
+++ b/dbaccess/source/core/misc/warndlg.cxx
@@ -13,8 +13,6 @@ namespace dbaccess
 {
 MigrationWarnDialog::MigrationWarnDialog(weld::Window* pParent)
 : MessageDialogController(pParent, "TODOUIfile", "MigrationWarnDialog", 
"ask")
-, m_xOkBtn(m_xBuilder->weld_button("yes"))
-, m_xLaterBtn(m_xBuilder->weld_button("later"))
 {
 }
 }
diff --git a/dbaccess/source/ui/dlg/migrwarndlg.cxx 
b/dbaccess/source/ui/dlg/migrwarndlg.cxx
index 9281dc11a941..ef3fa007303c 100644
--- a/dbaccess/source/ui/dlg/migrwarndlg.cxx
+++ b/dbaccess/source/ui/dlg/migrwarndlg.cxx
@@ -13,8 +13,6 @@ namespace dbaui
 {
 MigrationWarnDialog::MigrationWarnDialog(weld::Window* pParent)
 : MessageDialogController(pParent, "dbaccess/ui/migrwarndlg.ui", 
"MigrationWarnDialog")
-, m_xOkBtn(m_xBuilder->weld_button("yes"))
-, m_xLaterBtn(m_xBuilder->weld_button("later"))
 {
 }
 }
diff --git a/dbaccess/source/ui/inc/migrwarndlg.hxx 
b/dbaccess/source/ui/inc/migrwarndlg.hxx
index 7f18ad02f446..25e31046ce57 100644
--- a/dbaccess/source/ui/inc/migrwarndlg.hxx
+++ b/dbaccess/source/ui/inc/migrwarndlg.hxx
@@ -15,10 +15,6 @@ namespace dbaui
 {
 class MigrationWarnDialog : public weld::MessageDialogController
 {
-private:
-std::unique_ptr m_xOkBtn;
-std::unique_ptr m_xLaterBtn;
-
 public:
 MigrationWarnDialog(weld::Window* pParent);
 };
diff --git a/dbaccess/uiconfig/ui/migrwarndlg.ui 
b/dbaccess/uiconfig/ui/migrwarndlg.ui
index 8fa8e4934520..c504f9b2ac9f 100644
--- a/dbaccess/uiconfig/ui/migrwarndlg.ui
+++ b/dbaccess/uiconfig/ui/migrwarndlg.ui
@@ -1,13 +1,15 @@
 
-
+
 
   
   
 False
-dialog
 Confirm Migration
 False
 True
+dialog
+The document contains 
embedded HSQL data, which is deprecated.
+Would you like to migrate to 
Firebird now?
 
   
 False
@@ -16,13 +18,13 @@
 
   
 False
-end
 
   
-yes
+gtk-yes
 True
 True
 True
+True
   
   
 True
@@ -31,11 +33,12 @@
   
 
 
-  
-later
+  
+_Later
 True
 True
 True
+True
   
   
 True
@@ -50,24 +53,14 @@
 0
   
 
-
-  
-True
-False
-The document contains embedded HSQL 
data, which is deprecated.
-Would you like to migrate to Firebird now?
-  
-  
-False
-True
-1
-  
-
   
 
 
   yes
-  later
+  no
 
+
+  
+
   
 
commit 201ec4edb0bb8e0baad04ee3a1a19bdef29e2c2b
Author: Tor Lillqvist 
Date:   Tue Apr 17 09:38:45 2018 +0300

No need to restrict optimization to -O1 level

Works fine with -O2 as far as I see. At least with current Xcode.

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

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 781af67f2268..37ff092ef4cb 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -22,8 +22,6 @@ export VCL_HIDE_WINDOWS=1
 
 gb_SDKDIR := $(MACOSX_SDK_PATH)
 
-gb_COMPILEROPTFLAGS := -O1
-
 include $(GBUILDDIR)/platform/com_GCC_

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

[Caolán McNamara]

 sw/source/ui/config/mailconfigpage.cxx |  303 +++--
 sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui |   42 +-
 2 files changed, 159 insertions(+), 186 deletions(-)

New commits:
commit a9c4c9d961c63ae7759bc8a8dac00ba86981844e
Author: Caolán McNamara 
Date:   Tue Apr 17 12:29:08 2018 +0100

weld SwAuthenticationSettingsDialog

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

diff --git a/sw/source/ui/config/mailconfigpage.cxx 
b/sw/source/ui/config/mailconfigpage.cxx
index 74575f59bb13..41acaecc53ba 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -72,45 +73,39 @@ public:
 virtual void dispose() override;
 };
 
-class SwAuthenticationSettingsDialog : public SfxModalDialog
+class SwAuthenticationSettingsDialog : public weld::GenericDialogController
 {
-VclPtrm_pAuthenticationCB;
-
-VclPtr m_pSeparateAuthenticationRB;
-VclPtr m_pSMTPAfterPOPRB;
-
-VclPtr   m_pOutgoingServerFT;
-VclPtr   m_pUserNameFT;
-VclPtrm_pUserNameED;
-VclPtr   m_pOutPasswordFT;
-VclPtrm_pOutPasswordED;
-
-VclPtr   m_pIncomingServerFT;
-VclPtr   m_pServerFT;
-VclPtrm_pServerED;
-VclPtr   m_pPortFT;
-VclPtrm_pPortNF;
-VclPtr   m_pProtocolFT;
-VclPtr m_pPOP3RB;
-VclPtr m_pIMAPRB;
-VclPtr   m_pInUsernameFT;
-VclPtrm_pInUsernameED;
-VclPtr   m_pInPasswordFT;
-VclPtrm_pInPasswordED;
-
-VclPtrm_pOKPB;
-
-SwMailMergeConfigItem& rConfigItem;
-
-DECL_LINK(OKHdl_Impl, Button*, void);
-DECL_LINK( CheckBoxHdl_Impl, Button*, void);
-DECL_LINK(RadioButtonHdl_Impl, Button*, void);
-DECL_LINK(InServerHdl_Impl, Button*, void);
+SwMailMergeConfigItem& m_rConfigItem;
+
+std::unique_ptr m_xAuthenticationCB;
+std::unique_ptr m_xSeparateAuthenticationRB;
+std::unique_ptr m_xSMTPAfterPOPRB;
+std::unique_ptr   m_xOutgoingServerFT;
+std::unique_ptr   m_xUserNameFT;
+std::unique_ptr   m_xUserNameED;
+std::unique_ptr   m_xOutPasswordFT;
+std::unique_ptr   m_xOutPasswordED;
+std::unique_ptr   m_xIncomingServerFT;
+std::unique_ptr   m_xServerFT;
+std::unique_ptr   m_xServerED;
+std::unique_ptr   m_xPortFT;
+std::unique_ptr  m_xPortNF;
+std::unique_ptr   m_xProtocolFT;
+std::unique_ptr m_xPOP3RB;
+std::unique_ptr m_xIMAPRB;
+std::unique_ptr   m_xInUsernameFT;
+std::unique_ptr   m_xInUsernameED;
+std::unique_ptr   m_xInPasswordFT;
+std::unique_ptr   m_xInPasswordED;
+std::unique_ptr  m_xOKPB;
+
+DECL_LINK(OKHdl_Impl, weld::Button&, void);
+DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(RadioButtonHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(InServerHdl_Impl, weld::Button&, void);
 
 public:
-SwAuthenticationSettingsDialog(SwMailConfigPage* pParent, 
SwMailMergeConfigItem& rItem);
-virtual ~SwAuthenticationSettingsDialog() override;
-virtual void dispose() override;
+SwAuthenticationSettingsDialog(weld::Window* pParent, 
SwMailMergeConfigItem& rItem);
 };
 
 SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& 
rSet ) :
@@ -215,8 +210,8 @@ IMPL_LINK_NOARG(SwMailConfigPage, AuthenticationHdl, 
Button*, void)
 {
 m_pConfigItem->SetMailAddress(m_pAddressED->GetText());
 
-ScopedVclPtrInstance< SwAuthenticationSettingsDialog > aDlg(this, 
*m_pConfigItem);
-aDlg->Execute();
+SwAuthenticationSettingsDialog aDlg(GetFrameWeld(), *m_pConfigItem);
+aDlg.run();
 }
 
 IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, Button*, void)
@@ -397,158 +392,124 @@ SwMailConfigDlg::SwMailConfigDlg(vcl::Window* pParent, 
SfxItemSet& rSet)
 }
 
 SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
-SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem)
-: SfxModalDialog(pParent, "AuthenticationSettingsDialog", 
"modules/swriter/ui/authenticationsettingsdialog.ui")
-, rConfigItem( rItem )
+weld::Window* pParent, SwMailMergeConfigItem& rItem)
+: GenericDialogController(pParent, 
"modules/swriter/ui/authenticationsettingsdialog.ui", 
"AuthenticationSettingsDialog")
+, m_rConfigItem(rItem)
+, m_xAuthenticationCB(m_xBuilder->weld_check_button("authentication"))
+, 
m_xSeparateAuthenticationRB(m_xBuilder->weld_radio_button("separateauthentication"))
+, m_xSMTPAfterPOPRB(m_xBuilder->weld_radio_button("smtpafterpop"))
+, m_xOutgoingServerFT(m_xBuilder->weld_label("label1"))
+, m_xUserNameFT(m_xBuilder->weld_label("username_label"))
+   

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/osx

[heiko tietze]

 vcl/osx/salframe.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 54473bec1f419773dd0a44c3ed2754b7f7f7e840
Author: heiko tietze 
Date:   Mon Apr 16 12:11:33 2018 +0200

tdf#117033 - Tooltips show the wrong symbol for MOD3 combinations

Symbol for MOD3 added

Change-Id: Idb76199fbff240fe39c96ed837db098a4283d70b
Reviewed-on: https://gerrit.libreoffice.org/52957
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
Tested-by: Jenkins 
(cherry picked from commit e422efcaff1bf789343a73a16e46b00f303e3032)
Reviewed-on: https://gerrit.libreoffice.org/53015
Reviewed-by: Heiko Tietze 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index c029f25159ba..ef22d101cf6a 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1026,13 +1026,13 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 if( it != aKeyMap.end() )
 {
 if( (nKeyCode & KEY_SHIFT) != 0 )
-aResult.append( u'\x21e7' );
+aResult.append( u'\x21e7' ); //⇧
 if( (nKeyCode & KEY_MOD1) != 0 )
-aResult.append( u'\x2318' );
-// we do not really handle Alt (see below)
-// we map it to MOD3, which is actually Command
-if( (nKeyCode & (KEY_MOD2|KEY_MOD3)) != 0 )
-aResult.append( u'\x2325' );
+aResult.append( u'\x2318' ); //⌘
+if( (nKeyCode & KEY_MOD2) != 0 )
+aResult.append( u'\x2325' ); //⌥
+if( (nKeyCode & KEY_MOD3) != 0 )
+aResult.append( u'\x2303' ); //⌃
 
 aResult.append( it->second );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/source/options/optgdlg.cxx |2 +-
 vcl/inc/BitmapScaleConvolutionFilter.hxx   |4 ++--
 vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6384e5ec123354744059473c4b347df244195dd8
Author: Caolán McNamara 
Date:   Tue Apr 17 10:22:51 2018 +0100

presumably Kernel is leaking

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

diff --git a/vcl/inc/BitmapScaleConvolutionFilter.hxx 
b/vcl/inc/BitmapScaleConvolutionFilter.hxx
index 16830a08a147..6b4642eb6455 100644
--- a/vcl/inc/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/BitmapScaleConvolutionFilter.hxx
@@ -30,7 +30,7 @@ class VCL_DLLPUBLIC BitmapScaleConvolutionFilter : public 
BitmapFilter
 {
 protected:
 BitmapScaleConvolutionFilter(const double& rScaleX, const double& rScaleY, 
Kernel* pKernel)
-: mpKernel(pKernel)
+: mxKernel(pKernel)
 , mrScaleX(rScaleX)
 , mrScaleY(rScaleY)
 {
@@ -39,7 +39,7 @@ protected:
 virtual BitmapEx execute(BitmapEx const& rBitmap) override;
 
 private:
-Kernel* mpKernel;
+std::unique_ptr mxKernel;
 double mrScaleX;
 double mrScaleY;
 };
diff --git a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx 
b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
index 4997812a2cb5..e14f9930e47b 100644
--- a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
@@ -377,7 +377,7 @@ BitmapEx BitmapScaleConvolutionFilter::execute(BitmapEx 
const& rBitmapEx)
 bool bRetval = false;
 Bitmap aBitmap(rBitmapEx.GetBitmap());
 
-bRetval = ImplScaleConvolution(aBitmap, mrScaleX, mrScaleY, *mpKernel);
+bRetval = ImplScaleConvolution(aBitmap, mrScaleX, mrScaleY, *mxKernel);
 
 if (bRetval)
 return BitmapEx(aBitmap);
commit 858817e158ca3eff5815b8fec67d54a8b63676ca
Author: Caolán McNamara 
Date:   Tue Apr 17 13:13:08 2018 +0100

missing dialog parent for restart for language change

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

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index af6c1cbabb19..4dcb91416e8c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1382,7 +1382,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
 // display info
 SolarMutexGuard aGuard;
 svtools::executeRestartDialog(
-comphelper::getProcessComponentContext(), nullptr,
+comphelper::getProcessComponentContext(), GetFrameWeld(),
 svtools::RESTART_REASON_LANGUAGE_CHANGE);
 
 // tell quickstarter to stop being a veto listener
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source sc/qa sc/source slideshow/source sw/inc udkapi/com wizards/com

[Andrea Gelmini]

 filter/source/xslt/export/wordml/ooo2wordml_field.xsl |4 ++--
 sc/qa/unit/filters-test.cxx   |4 ++--
 sc/source/filter/inc/xistream.hxx |2 +-
 slideshow/source/engine/slideshowimpl.cxx |4 ++--
 sw/inc/doc.hxx|2 +-
 udkapi/com/sun/star/script/ArrayWrapper.idl   |2 +-
 wizards/com/sun/star/wizards/common/FileAccess.java   |2 +-
 wizards/com/sun/star/wizards/common/FileAccess.py |2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 5fa6a79864af82c9d60ddef0d618106a8214e431
Author: Andrea Gelmini 
Date:   Mon Apr 16 11:34:54 2018 +0200

Fix typos

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

diff --git a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl 
b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl
index 3d488b923944..3e327e11a4b8 100644
--- a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl
+++ b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl
@@ -283,13 +283,13 @@
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 0c4eeb808145..2a0afb4323aa 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -470,7 +470,7 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
 {
 {
 // This example doc contains cell anchored shape that is rotated, the
-// rotated shape is in fact clipped by the sheet boundries (and thus
+// rotated shape is in fact clipped by the sheet boundaries (and thus
 // is a good edge case test to see if we import it still correctly)
 ScDocShellRef xDocSh = 
loadDoc("legacycellanchoredrotatedclippedshape.", FORMAT_ODS);
 
@@ -496,7 +496,7 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
 }
 {
 // This example doc contains cell anchored shape that is rotated, the
-// rotated shape is in fact clipped by the sheet boundries, 
additionally
+// rotated shape is in fact clipped by the sheet boundaries, 
additionally
 // the shape is completely hidden because the rows the shape occupies
 // are hidden
 ScDocShellRef xDocSh = 
loadDoc("legacycellanchoredrotatedhiddenshape.", FORMAT_ODS, true);
diff --git a/sc/source/filter/inc/xistream.hxx 
b/sc/source/filter/inc/xistream.hxx
index 47e78e7ad4cb..dabbbcfba759 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -259,7 +259,7 @@ private:
 initially enables it. DisableDecryption() may be used to stop the usage of
 the decryption temporarily (sometimes record contents are never encrypted,
 i.e. all BOF records or the stream position in BOUNDSHEET). Decryption will
-be reenabled automatically, if a new record is started with the function
+be re-enabled automatically, if a new record is started with the function
 StartNextRecord().
 
 It is possible to store several stream positions inside a record (including
diff --git a/slideshow/source/engine/slideshowimpl.cxx 
b/slideshow/source/engine/slideshowimpl.cxx
index de8861a336c0..f58593baa3dc 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -267,7 +267,7 @@ public:
 bool notifyHyperLinkClicked( OUString const& hyperLink );
 
 /** Notification from eventmultiplexer that an animation event has 
occurred.
-This will be forewarded to all registered XSlideShowListener
+This will be forwarded to all registered XSlideShowListener
  */
 bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode );
 
@@ -2313,7 +2313,7 @@ bool SlideShowImpl::notifyHyperLinkClicked( OUString 
const& hyperLink )
 }
 
 /** Notification from eventmultiplexer that an animation event has occurred.
-This will be forewarded to all registered XSlideShoeListener
+This will be forwarded to all registered XSlideShoeListener
  */
 bool SlideShowImpl::handleAnimationEvent( const AnimationNodeSharedPtr& rNode )
 {
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 88a510de05f7..a5d88504ab94 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -821,7 +821,7 @@ public:
 void ReplaceCompatibilityOptions( const SwDoc& rSource );
 
 /** Replace all user defined document properties with xSourceDocProps.
-Convenince function used by ReplaceDocumentProperties to skip some UNO 
calls.
+Convenience function used by ReplaceDocumentProperties to skip some 
UNO calls.
  */
 void ReplaceUserDefinedDocumentProperties( const css::uno::Reference< 
css::document::XDocumentProperties >& xSourceDocProps );
 
diff --git a/udkapi/com/sun/star/script/ArrayWrapper.idl 
b/udkapi/com

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

[Andrea Gelmini]

 dbaccess/source/filter/hsqldb/fbalterparser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a72d075b7b7b8907a045016c65f04c849de842a
Author: Andrea Gelmini 
Date:   Mon Apr 16 11:25:30 2018 +0200

Fix typo

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

diff --git a/dbaccess/source/filter/hsqldb/fbalterparser.cxx 
b/dbaccess/source/filter/hsqldb/fbalterparser.cxx
index 80bf72b2e635..d0b0db3de7a5 100644
--- a/dbaccess/source/filter/hsqldb/fbalterparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbalterparser.cxx
@@ -26,7 +26,7 @@ OUString FbAlterStmtParser::compose() const
 {
 if (getActionType() == AlterAction::UNKNOWN)
 {
-SAL_WARN("dbaccess", "Unkown type of ALTER statement in 
FbAlterStmtParser");
+SAL_WARN("dbaccess", "Unknown type of ALTER statement in 
FbAlterStmtParser");
 return OUString{};
 }
 else if (getActionType() == AlterAction::ADD_FOREIGN)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/inc vcl/Library_vcl.mk vcl/osx vcl/source vcl/unx vcl/win

[Noel Grandin]

 include/vcl/bitmap.hxx  |   15 ++--
 include/vcl/bitmapex.hxx|4 -
 solenv/clang-format/blacklist   |2 
 vcl/Library_vcl.mk  |1 
 vcl/inc/impbmp.hxx  |   78 ---
 vcl/inc/pch/precompiled_vcl.hxx |1 
 vcl/inc/salbmp.hxx  |6 +
 vcl/osx/salinst.cxx |9 +-
 vcl/source/bitmap/bitmap.cxx|   78 +--
 vcl/source/bitmap/bitmappaint.cxx   |   14 ++--
 vcl/source/gdi/bitmap3.cxx  |   24 +++
 vcl/source/gdi/bitmap4.cxx  |1 
 vcl/source/gdi/bmpacc.cxx   |   18 +++--
 vcl/source/gdi/impbmp.cxx   |  120 
 vcl/source/outdev/bitmap.cxx|   41 +---
 vcl/source/outdev/mask.cxx  |9 +-
 vcl/source/window/introwin.cxx  |1 
 vcl/source/window/window2.cxx   |1 
 vcl/unx/generic/window/salframe.cxx |5 -
 vcl/unx/gtk/gtksalframe.cxx |1 
 vcl/unx/gtk3/gtk3gtkframe.cxx   |1 
 vcl/win/window/salframe.cxx |3 
 vcl/win/window/salmenu.cxx  |1 
 23 files changed, 120 insertions(+), 314 deletions(-)

New commits:
commit f462a76f2bbaa79bf935a51bdf8cead25dbb
Author: Noel Grandin 
Date:   Mon Apr 16 11:27:31 2018 +0200

remove ImpBitmap

it's not adding anything useful, just hold the underlying SalBitmap
instead

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

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 5740fc38eb63..cc50a6dc9bcc 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -187,7 +187,6 @@ class   BitmapInfoAccess;
 class   BitmapReadAccess;
 class   BitmapWriteAccess;
 class   BitmapPalette;
-class   ImpBitmap;
 class   Color;
 class   GDIMetaFile;
 class   AlphaMask;
@@ -227,8 +226,8 @@ public:
 inline bool operator!() const;
 booloperator==( const Bitmap& rBitmap ) const;
 booloperator!=( const Bitmap& rBitmap ) const { return 
!operator==(rBitmap); }
-// only compares if we are using the same internal copy-on-write Impl class
-boolShallowEquals( const Bitmap& rBitmap ) const { 
return mxImpBmp == rBitmap.mxImpBmp; }
+// only compares if we are using the same internal copy-on-write SalBitmap 
class
+boolShallowEquals( const Bitmap& rBitmap ) const { 
return mxSalBmp == rBitmap.mxSalBmp; }
 
 inline bool IsEmpty() const;
 voidSetEmpty();
@@ -671,8 +670,8 @@ public:
 SAL_DLLPRIVATE void ReassignWithSize(const Bitmap& rBitmap);
 
 SAL_DLLPRIVATE void ImplMakeUnique();
-const std::shared_ptr& ImplGetImpBitmap() const { return 
mxImpBmp; }
-SAL_DLLPRIVATE void ImplSetImpBitmap( const 
std::shared_ptr& xImpBmp );
+const std::shared_ptr& ImplGetSalBitmap() const { return 
mxSalBmp; }
+SAL_DLLPRIVATE void ImplSetSalBitmap( const 
std::shared_ptr& xImpBmp );
 
 SAL_DLLPRIVATE bool ImplScaleFast( const double& rScaleX, const 
double& rScaleY );
 SAL_DLLPRIVATE bool ImplScaleInterpolate( const double& rScaleX, const 
double& rScaleY );
@@ -736,7 +735,7 @@ private:
 SAL_DLLPRIVATE bool ImplConvertGhosted();
 
 private:
-std::shared_ptr mxImpBmp;
+std::shared_ptr mxSalBmp;
 MapMode maPrefMapMode;
 Size maPrefSize;
 
@@ -744,12 +743,12 @@ private:
 
 inline bool Bitmap::operator!() const
 {
-return( mxImpBmp == nullptr );
+return( mxSalBmp == nullptr );
 }
 
 inline bool Bitmap::IsEmpty() const
 {
-return( mxImpBmp == nullptr );
+return( mxSalBmp == nullptr );
 }
 
 inline const MapMode& Bitmap::GetPrefMapMode() const
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index dedd064b17d3..41b1fb28a010 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -463,8 +463,8 @@ public:
 voidCombineMaskOr(Color maskColor, sal_uInt8 nTol);
 public:
 
-SAL_DLLPRIVATE std::shared_ptr const & ImplGetBitmapImpBitmap() 
const { return maBitmap.ImplGetImpBitmap(); }
-SAL_DLLPRIVATE std::shared_ptr const & ImplGetMaskImpBitmap() 
const { return maMask.ImplGetImpBitmap(); }
+SAL_DLLPRIVATE std::shared_ptr const & ImplGetBitmapSalBitmap() 
const { return maBitmap.ImplGetSalBitmap(); }
+SAL_DLLPRIVATE std::shared_ptr const & ImplGetMaskSalBitmap() 
const { return maMask.ImplGetSalBitmap(); }
 
 
 private:
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 277911b2b46d..3ef8903afca2 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17587,7 +17587,6 @@ vcl/inc/headless/svpvd.hxx
 vcl/inc/helpwin.hxx
 vcl/inc/image.h
 vcl/inc/impanmvw.hxx
-vcl/inc/impbmp.hxx
 vcl/inc/impdel.hxx
 vcl/inc/i

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

[andreas kainz]

 sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml |1 +
 sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml  |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 432c7dd62b3ea7634a43850ea937c6bc681884d8
Author: andreas kainz 
Date:   Tue Apr 17 12:14:27 2018 +0200

NB Implementation: show menubar in NBShortcuts everywhere

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

diff --git a/sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml 
b/sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml
index 6bf1a4e8a4b3..96931c4989a7 100644
--- a/sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml
+++ b/sd/uiconfig/simpress/toolbar/notebookbarshortcuts.xml
@@ -12,4 +12,5 @@
   
   
   
+  
 
diff --git a/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml 
b/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml
index cee4d56f1b68..ae234802c0ef 100644
--- a/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml
+++ b/sw/uiconfig/swriter/toolbar/notebookbarshortcuts.xml
@@ -12,5 +12,5 @@
   
   
   
-  
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/weld.hxx  |4 ++--
 sc/source/ui/inc/impex.hxx|3 ++-
 sw/source/ui/misc/insfnote.cxx|2 +-
 sw/source/uibase/inc/insfnote.hxx |2 +-
 vcl/source/app/salvtables.cxx |8 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 2d1690da6d4d97751e19b2e46a46d971bb060c14
Author: Caolán McNamara 
Date:   Tue Apr 17 10:25:56 2018 +0100

coverity#1434889 Uncaught exception

and

coverity#1401334 Uncaught exception

Change-Id: Ib2fadd83068cc94c972f6312719081d5ac75d8ce

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 058f7d3a6bb8..47d399a8eb69 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -746,7 +746,7 @@ public:
 void set_help_id(const OString& rHelpId) { 
getDialog()->set_help_id(rHelpId); }
 OString get_help_id() const { return getConstDialog()->get_help_id(); }
 void response(int nResponse) { getDialog()->response(nResponse); }
-virtual ~DialogController();
+virtual ~DialogController() COVERITY_NOEXCEPT_FALSE;
 };
 
 class VCL_DLLPUBLIC GenericDialogController : public DialogController
@@ -761,7 +761,7 @@ protected:
 public:
 GenericDialogController(weld::Widget* pParent, const OUString& rUIFile,
 const OString& rDialogId);
-virtual ~GenericDialogController() override;
+virtual ~GenericDialogController() COVERITY_NOEXCEPT_FALSE override;
 };
 
 class VCL_DLLPUBLIC MessageDialogController : public DialogController
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index d82265dd5c3d..c41fb83fafa2 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_IMPEX_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_IMPEX_HXX
 
+#include 
 #include 
 #include 
 #include 
@@ -48,7 +49,7 @@ class ScImportExport
 {
 ScDocShell* pDocSh;
 ScDocument* pDoc;
-std::unique_ptr pUndoDoc;
+std::unique_ptr> pUndoDoc;
 ScRange aRange;
 OUStringaStreamPath;
 OUStringaNonConvertibleChars;
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 19dc1c01c0c8..8131efc698ec 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -180,7 +180,7 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(weld::Window *pParent, 
SwWrtShell &rShell, bo
 }
 }
 
-SwInsFootNoteDlg::~SwInsFootNoteDlg()
+SwInsFootNoteDlg::~SwInsFootNoteDlg() COVERITY_NOEXCEPT_FALSE
 {
 SwViewShell::SetCareDialog(nullptr);
 
diff --git a/sw/source/uibase/inc/insfnote.hxx 
b/sw/source/uibase/inc/insfnote.hxx
index 49ea5563fede..c86b53f00146 100644
--- a/sw/source/uibase/inc/insfnote.hxx
+++ b/sw/source/uibase/inc/insfnote.hxx
@@ -61,7 +61,7 @@ class SwInsFootNoteDlg: public weld::GenericDialogController
 
 public:
 SwInsFootNoteDlg(weld::Window * pParent, SwWrtShell &rSh, bool bEd);
-virtual ~SwInsFootNoteDlg() override;
+virtual ~SwInsFootNoteDlg() COVERITY_NOEXCEPT_FALSE override;
 
 const OUString& GetFontName() { return m_aFontName; }
 boolIsEndNote() const { return m_xEndNoteBtn->get_active(); }
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index c478974f9482..dd831b6d3a8f 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2024,7 +2024,9 @@ namespace weld
 return rController->getDialog()->runAsync(rController, func);
 }
 
-DialogController::~DialogController() = default;
+DialogController::~DialogController() COVERITY_NOEXCEPT_FALSE
+{
+}
 
 Dialog* GenericDialogController::getDialog() { return m_xDialog.get(); }
 
@@ -2034,7 +2036,9 @@ namespace weld
 {
 }
 
-GenericDialogController::~GenericDialogController() = default;
+GenericDialogController::~GenericDialogController() COVERITY_NOEXCEPT_FALSE
+{
+}
 
 Dialog* MessageDialogController::getDialog() { return m_xDialog.get(); }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/core/data/table3.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 59dbaff0d98c747f1792b17931d8363daf556238
Author: Stephan Bergmann 
Date:   Mon Apr 16 16:25:06 2018 +0200

Only relevant whether mpTestEqualCondition is non-null

...so change it from 'const bool*' to just 'bool'

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

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5704a4ec59f1..3e94e174e8b3 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2262,7 +2262,7 @@ class QueryEvaluator
 svl::SharedStringPool& mrStrPool;
 const ScTable& mrTab;
 const ScQueryParam& mrParam;
-const bool* mpTestEqualCondition;
+bool mpTestEqualCondition;
 utl::TransliterationWrapper* mpTransliteration;
 CollatorWrapper* mpCollator;
 const bool mbMatchWholeCell;
@@ -2336,7 +2336,7 @@ class QueryEvaluator
 
 public:
 QueryEvaluator(ScDocument& rDoc, const ScTable& rTab, const ScQueryParam& 
rParam,
-   const bool* pTestEqualCondition) :
+   bool pTestEqualCondition) :
 mrDoc(rDoc),
 mrStrPool(rDoc.GetSharedStringPool()),
 mrTab(rTab),
@@ -2767,7 +2767,7 @@ bool ScTable::ValidQuery(
 bool* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new 
bool[nEntryCount] );
 
 longnPos = -1;
-QueryEvaluator aEval(*pDocument, *this, rParam, pbTestEqualCondition);
+QueryEvaluator aEval(*pDocument, *this, rParam, pbTestEqualCondition != 
nullptr);
 ScQueryParam::const_iterator it, itBeg = rParam.begin(), itEnd = 
rParam.end();
 for (it = itBeg; it != itEnd && (*it)->bDoQuery; ++it)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/inc/BitmapScaleConvolutionFilter.hxx |   20 
 1 file changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 5d35d01dc79c5af817e8a78dfddef35ce5a612e4
Author: Caolán McNamara 
Date:   Tue Apr 17 10:21:05 2018 +0100

coverity#1434893 Uninitialized pointer field

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

diff --git a/vcl/inc/BitmapScaleConvolutionFilter.hxx 
b/vcl/inc/BitmapScaleConvolutionFilter.hxx
index 9a0c5dafbb04..16830a08a147 100644
--- a/vcl/inc/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/BitmapScaleConvolutionFilter.hxx
@@ -28,19 +28,18 @@ namespace vcl
 {
 class VCL_DLLPUBLIC BitmapScaleConvolutionFilter : public BitmapFilter
 {
-public:
-BitmapScaleConvolutionFilter(const double& rScaleX, const double& rScaleY)
-: mrScaleX(rScaleX)
+protected:
+BitmapScaleConvolutionFilter(const double& rScaleX, const double& rScaleY, 
Kernel* pKernel)
+: mpKernel(pKernel)
+, mrScaleX(rScaleX)
 , mrScaleY(rScaleY)
 {
 }
 
 virtual BitmapEx execute(BitmapEx const& rBitmap) override;
 
-protected:
-Kernel* mpKernel;
-
 private:
+Kernel* mpKernel;
 double mrScaleX;
 double mrScaleY;
 };
@@ -49,9 +48,8 @@ class VCL_DLLPUBLIC BitmapScaleBilinearFilter : public 
BitmapScaleConvolutionFil
 {
 public:
 BitmapScaleBilinearFilter(const double& rScaleX, const double& rScaleY)
-: BitmapScaleConvolutionFilter(rScaleX, rScaleY)
+: BitmapScaleConvolutionFilter(rScaleX, rScaleY, new BilinearKernel)
 {
-mpKernel = new BilinearKernel();
 }
 };
 
@@ -59,9 +57,8 @@ class VCL_DLLPUBLIC BitmapScaleBicubicFilter : public 
BitmapScaleConvolutionFilt
 {
 public:
 BitmapScaleBicubicFilter(const double& rScaleX, const double& rScaleY)
-  : BitmapScaleConvolutionFilter(rScaleX, rScaleY)
+  : BitmapScaleConvolutionFilter(rScaleX, rScaleY, new BicubicKernel)
 {
-mpKernel = new BicubicKernel();
 }
 };
 
@@ -69,9 +66,8 @@ class VCL_DLLPUBLIC BitmapScaleLanczos3Filter : public 
BitmapScaleConvolutionFil
 {
 public:
 BitmapScaleLanczos3Filter(const double& rScaleX, const double& rScaleY)
-: BitmapScaleConvolutionFilter(rScaleX, rScaleY)
+: BitmapScaleConvolutionFilter(rScaleX, rScaleY, new Lanczos3Kernel)
 {
-mpKernel = new Lanczos3Kernel();
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/source/dialogs/SignSignatureLineDialog.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0658b056ad326c27e7d7b3f40219c2b6f34a9d9e
Author: Caolán McNamara 
Date:   Tue Apr 17 10:36:06 2018 +0100

coverity#1434900 Uninitialized scalar field

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

diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx 
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index cf2ad66dba81..4349ec5ad4e0 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -56,12 +56,13 @@ 
SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Referenc
 , m_xLabelHint(m_xBuilder->weld_label("label_hint"))
 , m_xLabelHintText(m_xBuilder->weld_label("label_hint_text"))
 , m_xLabelAddComment(m_xBuilder->weld_label("label_add_comment"))
+, m_bShowSignDate(false)
 {
 Reference 
xIndexAccess(m_xModel->getCurrentSelection(),
 UNO_QUERY_THROW);
 m_xShapeProperties.set(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
 
-bool bIsSignatureLine;
+bool bIsSignatureLine(false);
 m_xShapeProperties->getPropertyValue("IsSignatureLine") >>= 
bIsSignatureLine;
 if (!bIsSignatureLine)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/uiconfig framework/uiconfig reportdesign/uiconfig sc/uiconfi

[Andras Timar]

 basctl/uiconfig/basicide/menubar/menubar.xml  |4 
 chart2/uiconfig/menubar/menubar.xml   |4 
 dbaccess/uiconfig/dbapp/menubar/menubar.xml   |4 
 dbaccess/uiconfig/dbquery/menubar/menubar.xml |4 
 dbaccess/uiconfig/dbrelation/menubar/menubar.xml  |4 
 dbaccess/uiconfig/dbtable/menubar/menubar.xml |4 
 dbaccess/uiconfig/dbtdata/menubar/menubar.xml |4 
 extensions/uiconfig/sbibliography/menubar/menubar.xml |4 
 framework/uiconfig/startmodule/menubar/menubar.xml|4 
 reportdesign/uiconfig/dbreport/menubar/menubar.xml|4 
 sc/uiconfig/scalc/menubar/menubar.xml |4 
 sd/uiconfig/sdraw/menubar/menubar.xml |4 
 sd/uiconfig/simpress/menubar/menubar.xml  |4 
 sfx2/source/appl/appserv.cxx  |4 ++--
 starmath/uiconfig/smath/menubar/menubar.xml   |4 
 sw/uiconfig/sglobal/menubar/menubar.xml   |4 
 sw/uiconfig/sweb/menubar/menubar.xml  |4 
 sw/uiconfig/swform/menubar/menubar.xml|4 
 sw/uiconfig/swreport/menubar/menubar.xml  |4 
 sw/uiconfig/swriter/menubar/menubar.xml   |4 
 sw/uiconfig/swxform/menubar/menubar.xml   |4 
 21 files changed, 2 insertions(+), 82 deletions(-)

New commits:
commit 6331b18f307cb928044b2deb27e8e33949cc0348
Author: Andras Timar 
Date:   Tue Apr 17 14:06:38 2018 +0200

Send feedback to supp...@collaboraoffice.com

Change-Id: Ic734235426001e4aa7119476c1e6884b7c39776d

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 334330afda8e..a6f675bd4b85 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -497,8 +497,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 case SID_SEND_FEEDBACK:
 {
 OUString module = SfxHelp::GetCurrentModuleIdentifier();
-OUString 
sURL("https://hub.libreoffice.org/send-feedback/?LOversion="; + 
utl::ConfigManager::getAboutBoxProductVersion() +
-"&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule=" 
+ module.copy(module.lastIndexOf('.') + 1 )  );
+OUString 
sURL("mailto:supp...@collaboraoffice.com?Subject=Version:%20"; + 
utl::ConfigManager::getAboutBoxProductVersion() +
+",%20Locale:%20" + utl::ConfigManager::getLocale() + 
",%20Module:%20" + module.copy(module.lastIndexOf('.') + 1 )  );
 sfx2::openUriExternally(sURL, false);
 break;
 }
commit 6f7163795c9d341394170b96a5402bdd4a50a2f0
Author: Andras Timar 
Date:   Tue Apr 17 13:29:39 2018 +0200

Remove Help - Restart in Safe Mode menu item

Change-Id: I2a3cdbc73a0a4033b60f0d67b3673bd24e4fce50

diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml 
b/basctl/uiconfig/basicide/menubar/menubar.xml
index 15f6f539f086..70a02a8214e2 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -152,8 +152,6 @@
 
 
 
-
-
 
 
 
diff --git a/chart2/uiconfig/menubar/menubar.xml 
b/chart2/uiconfig/menubar/menubar.xml
index 5d3c33749cc2..823804a6880c 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -172,8 +172,6 @@
 
 
 
-
-
 
 
 
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml 
b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index d896facc4828..b7de4f5d08f2 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -151,8 +151,6 @@
 
 
 
-
-
 
 
 
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml 
b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index b027a308ac0c..bc38d043805a 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -98,8 +98,6 @@
 
 
 
-
-
 
 
 
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml 
b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 4c54eedf14eb..cfdad4e95e68 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -81,8 +81,6 @@
 
 
 
-
-
 
 
 
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index 6490b70030c4..499acc75911a 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable

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

[Mike Kaganski]

 cui/source/dialogs/SpellDialog.cxx |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit f7de9473b2fddd84d03fb521709d805486292800
Author: Mike Kaganski 
Date:   Mon Apr 16 14:25:16 2018 +0100

tdf#116725: justify selection to handle right-to-left selections

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

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 5e7537d9509c..e3242b486b30 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1242,15 +1242,16 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& 
rNEvt )
 {
 TextEngine* pTextEngine = GetTextEngine();
 TextView* pTextView = pTextEngine->GetActiveView();
-const TextSelection& rCurrentSelection = pTextView->GetSelection();
+TextSelection aCurrentSelection = pTextView->GetSelection();
+aCurrentSelection.Justify();
 //determine if the selection contains a field
 bool bHasFieldLeft = false;
 bool bHasErrorLeft = false;
 
-bool bHasRange = rCurrentSelection.HasRange();
+bool bHasRange = aCurrentSelection.HasRange();
 sal_uInt8 nSelectionType = 0; // invalid type!
 
-TextPaM aCursor(rCurrentSelection.GetStart());
+TextPaM aCursor(aCurrentSelection.GetStart());
 const TextCharAttrib* pBackAttr = pTextEngine->FindCharAttrib( 
aCursor, TEXTATTR_SPELL_BACKGROUND );
 const TextCharAttrib* pErrorAttr = pTextEngine->FindCharAttrib( 
aCursor, TEXTATTR_SPELL_ERROR );
 const TextCharAttrib* pBackAttrLeft = nullptr;
@@ -1261,21 +1262,21 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& 
rNEvt )
 if(bHasRange)
 {
 if(pBackAttr &&
-pBackAttr->GetStart() == 
rCurrentSelection.GetStart().GetIndex() &&
-pBackAttr->GetEnd() == 
rCurrentSelection.GetEnd().GetIndex())
+pBackAttr->GetStart() == 
aCurrentSelection.GetStart().GetIndex() &&
+pBackAttr->GetEnd() == 
aCurrentSelection.GetEnd().GetIndex())
 {
 nSelectionType = FULL;
 }
 else if(pErrorAttr &&
-pErrorAttr->GetStart() <= 
rCurrentSelection.GetStart().GetIndex() &&
-pErrorAttr->GetEnd() >= 
rCurrentSelection.GetEnd().GetIndex())
+pErrorAttr->GetStart() <= 
aCurrentSelection.GetStart().GetIndex() &&
+pErrorAttr->GetEnd() >= 
aCurrentSelection.GetEnd().GetIndex())
 {
 nSelectionType = INSIDE_YES;
 }
 else
 {
 nSelectionType = bHasField||bHasError ? BRACE : OUTSIDE_NO;
-while(aCursor.GetIndex() < 
rCurrentSelection.GetEnd().GetIndex())
+while(aCursor.GetIndex() < 
aCurrentSelection.GetEnd().GetIndex())
 {
 ++aCursor.GetIndex();
 const TextCharAttrib* pIntBackAttr = 
pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_BACKGROUND );
@@ -1296,8 +1297,8 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& 
rNEvt )
 const TextCharAttrib* pCurAttr = pBackAttr ? pBackAttr : 
pErrorAttr;
 if(pCurAttr)
 {
-nSelectionType = pCurAttr->GetStart() == 
rCurrentSelection.GetStart().GetIndex() ?
-LEFT_NO : pCurAttr->GetEnd() == 
rCurrentSelection.GetEnd().GetIndex() ? RIGHT_NO : INSIDE_NO;
+nSelectionType = pCurAttr->GetStart() == 
aCurrentSelection.GetStart().GetIndex() ?
+LEFT_NO : pCurAttr->GetEnd() == 
aCurrentSelection.GetEnd().GetIndex() ? RIGHT_NO : INSIDE_NO;
 }
 else
 nSelectionType = OUTSIDE_NO;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 14 commits - cui/source include/sfx2 include/svtools instsetoo_native/inc_openoffice lotuswordpro/source sc/source sfx2/source solenv

[Eike Rathke]

 cui/source/factory/init.cxx   
|2 
 cui/source/inc/treeopt.hxx
|   13 
 cui/source/options/optjava.cxx
|   22 
 cui/source/options/optjava.hxx
|4 
 cui/source/options/treeopt.cxx
|   20 
 include/sfx2/sidebar/ResourceManager.hxx  
|1 
 include/svtools/restartdialog.hxx 
|2 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
|2 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
|2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
|1 
 lotuswordpro/source/filter/lwpfrib.cxx
|2 
 sc/source/core/data/table3.cxx
|   14 
 sc/source/ui/view/gridwin4.cxx
|7 
 sc/source/ui/view/select.cxx  
|4 
 sfx2/source/appl/workwin.cxx  
|   23 -
 sfx2/source/inc/workwin.hxx   
|2 
 sfx2/source/sidebar/ResourceManager.cxx   
|5 
 sfx2/source/sidebar/SidebarController.cxx 
|6 
 solenv/bin/modules/installer/windows/property.pm  
|4 
 sw/qa/extras/layout/data/tdf116925.docx   
|binary
 sw/qa/extras/layout/layout.cxx
|   22 
 sw/qa/extras/ooxmlimport/data/tdf116486.docx  
|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  
|6 
 sw/qa/extras/uiwriter/data/redlineFrame_at_char_start_inside.fodt 
|   73 +++
 sw/qa/extras/uiwriter/data/redlineFrame_at_char_start_outside.fodt
|   73 +++
 sw/qa/extras/uiwriter/data/redline_fly_duplication_at_para_end_inside.fodt
|  228 +
 sw/qa/extras/uiwriter/data/redline_fly_duplication_at_para_start_outside.fodt 
|  229 ++
 sw/qa/extras/uiwriter/uiwriter.cxx
|   42 +
 sw/source/core/doc/docredln.cxx   
|8 
 sw/source/core/layout/paintfrm.cxx
|   26 +
 sw/source/core/layout/tabfrm.cxx  
|4 
 sw/source/core/text/itrform2.cxx  
|   12 
 vcl/unx/generic/window/salframe.cxx   
|   14 
 33 files changed, 825 insertions(+), 48 deletions(-)

New commits:
commit d8b9a10d0c07e36b7cb7ad4217731105402df127
Author: Eike Rathke 
Date:   Mon Apr 16 16:02:17 2018 +0200

Resolves: tdf#116003 check presence of subtotal in group, tdf#107267 
follow-up

Change-Id: Ifed6e28926c689dd17914b8b1cbf47b58e2ffcdc
(cherry picked from commit f50e370db8f7ae20b12e312ad89a0f9961b7ee7a)
Reviewed-on: https://gerrit.libreoffice.org/52989
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 4b48a0b49de597fc9e9abb012fb31b6fedfee85b)

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index cf96a01a926e..d649e581782f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2164,11 +2164,20 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
 
 for (sal_uInt16 nLevel = 0; nLevel no formula or
+// label and do not insert a row.
+continue;
+}
+
 // increment end row
 nGlobalEndRow++;
 
 // add row entry for formula
-aRowEntry.nGroupNo = nLevelCount - nLevel - 1;
+aRowEntry.nGroupNo = nGroupNo;
 aRowEntry.nSubStartRow = nGlobalStartRow;
 aRowEntry.nFuncStart = nGlobalStartFunc;
 aRowEntry.nDestRow = nGlobalEndRow;
@@ -2186,10 +2195,9 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
 DBShowRow(aRowEntry.nDestRow, true);
 
 // insert label
-ScSubTotalFunc* eResFunc = 
rParam.pFunctions[aRowEntry.nGroupNo];
 OUString label = ScGlobal::GetRscString(STR_TABLE_GRAND);
 label += " ";
-label += 
ScGlobal::GetRscString(lcl_GetSubTotalStrId(eResFunc[0]));
+label += 
ScGlobal::GetRscString(lcl_GetSubTotalStrId(pResFunc[0]));
 SetString(nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, 
nTab, label);
 ApplyStyle(nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestR

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

[Andras Timar]

 filter/source/config/fragments/filters/BroadBand_eBook.xcu   |2 +-
 filter/source/config/fragments/filters/ClarisWorks.xcu   |2 +-
 filter/source/config/fragments/filters/ClarisWorks_Calc.xcu  |2 +-
 filter/source/config/fragments/filters/ClarisWorks_Draw.xcu  |2 +-
 filter/source/config/fragments/filters/ClarisWorks_Impress.xcu   |2 +-
 filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu   |2 +-
 filter/source/config/fragments/filters/CorelDrawDocument.xcu |2 +-
 filter/source/config/fragments/filters/CorelPresentationExchange.xcu |2 +-
 filter/source/config/fragments/filters/DIF.xcu   |2 +-
 filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu |2 +-
 filter/source/config/fragments/filters/DocBook_File.xcu  |2 +-
 filter/source/config/fragments/filters/DosWord.xcu   |2 +-
 filter/source/config/fragments/filters/FictionBook_2.xcu |2 +-
 filter/source/config/fragments/filters/FreehandDocument.xcu  |2 +-
 filter/source/config/fragments/filters/Lotus.xcu |2 +-
 filter/source/config/fragments/filters/LotusWordPro.xcu  |2 +-
 filter/source/config/fragments/filters/MacWrite.xcu  |2 +-
 filter/source/config/fragments/filters/Mac_Word.xcu  |2 +-
 filter/source/config/fragments/filters/Mac_Works.xcu |2 +-
 filter/source/config/fragments/filters/Mac_Works_Calc.xcu|2 +-
 filter/source/config/fragments/filters/Mariner_Write.xcu |2 +-
 filter/source/config/fragments/filters/PageMakerDocument.xcu |2 +-
 filter/source/config/fragments/filters/PalmDoc.xcu   |2 +-
 filter/source/config/fragments/filters/Palm_Text_Document.xcu|2 +-
 filter/source/config/fragments/filters/Plucker_eBook.xcu |2 +-
 filter/source/config/fragments/filters/QPro.xcu  |2 +-
 filter/source/config/fragments/filters/QXPDocument.xcu   |2 +-
 filter/source/config/fragments/filters/UOF_presentation.xcu  |2 +-
 filter/source/config/fragments/filters/UOF_spreadsheet.xcu   |2 +-
 filter/source/config/fragments/filters/UOF_text.xcu  |2 +-
 filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu|2 +-
 filter/source/config/fragments/filters/WPS_QPro_Calc.xcu |2 +-
 filter/source/config/fragments/filters/WordPerfect.xcu   |2 +-
 filter/source/config/fragments/filters/WordPerfectGraphics.xcu   |2 +-
 filter/source/config/fragments/filters/WriteNow.xcu  |2 +-
 filter/source/config/fragments/filters/ZMFDocument.xcu   |2 +-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs   |2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)

New commits:
commit 69750128451f540ea4f1311c57f809e73109da6b
Author: Andras Timar 
Date:   Tue Apr 17 13:14:47 2018 +0200

Display warning at attempted loading of exotic file format

Change-Id: I5dbf0545230795806aa3eb28e0a9e6170d916de2

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 0c004bbaf030..99850de17bba 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2459,7 +2459,7 @@
 
   
 
-2
+1
   
   
 
commit c35b35caa3fde541fbae1457c1b712b469e269b2
Author: Andras Timar 
Date:   Tue Apr 17 13:12:32 2018 +0200

Flag a few more import filters as EXOTIC

Change-Id: I171efc7e533039ab61d7ae607673aaf81d88c73d

diff --git a/filter/source/config/fragments/filters/BroadBand_eBook.xcu 
b/filter/source/config/fragments/filters/BroadBand_eBook.xcu
index 3a54aed07d92..cb53d790c5dc 100644
--- a/filter/source/config/fragments/filters/BroadBand_eBook.xcu
+++ b/filter/source/config/fragments/filters/BroadBand_eBook.xcu
@@ -9,7 +9,7 @@
 
 
 
-IMPORT ALIEN 3RDPARTYFILTER PREFERRED
+IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC
 
 
 org.libreoffice.comp.Writer.EBookImportFilter
diff --git a/filter/source/config/fragments/filters/ClarisWorks.xcu 
b/filter/source/config/fragments/filters/ClarisWorks.xcu
index 8288c34ff66f..788bd9bd2f32 100644
--- a/filter/source/config/fragments/filters/ClarisWorks.xcu
+++ b/filter/source/config/fragments/filters/ClarisWorks.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-IMPORT ALIEN 3RDPARTYFILTER 
PREFERRED
+IMPORT ALIEN 3RDPARTYFILTER PREFERRED 
EXOTIC
 
 com.sun.star.comp.Writer.MWAWImportFilter
 
diff --git a/filter/source/config/fragments/filters/C

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

[Eike Rathke]

 sc/source/core/data/table3.cxx |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 4b48a0b49de597fc9e9abb012fb31b6fedfee85b
Author: Eike Rathke 
Date:   Mon Apr 16 16:02:17 2018 +0200

Resolves: tdf#116003 check presence of subtotal in group, tdf#107267 
follow-up

Change-Id: Ifed6e28926c689dd17914b8b1cbf47b58e2ffcdc
(cherry picked from commit f50e370db8f7ae20b12e312ad89a0f9961b7ee7a)
Reviewed-on: https://gerrit.libreoffice.org/52989
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index cf96a01a926e..d649e581782f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2164,11 +2164,20 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
 
 for (sal_uInt16 nLevel = 0; nLevel no formula or
+// label and do not insert a row.
+continue;
+}
+
 // increment end row
 nGlobalEndRow++;
 
 // add row entry for formula
-aRowEntry.nGroupNo = nLevelCount - nLevel - 1;
+aRowEntry.nGroupNo = nGroupNo;
 aRowEntry.nSubStartRow = nGlobalStartRow;
 aRowEntry.nFuncStart = nGlobalStartFunc;
 aRowEntry.nDestRow = nGlobalEndRow;
@@ -2186,10 +2195,9 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
 DBShowRow(aRowEntry.nDestRow, true);
 
 // insert label
-ScSubTotalFunc* eResFunc = 
rParam.pFunctions[aRowEntry.nGroupNo];
 OUString label = ScGlobal::GetRscString(STR_TABLE_GRAND);
 label += " ";
-label += 
ScGlobal::GetRscString(lcl_GetSubTotalStrId(eResFunc[0]));
+label += 
ScGlobal::GetRscString(lcl_GetSubTotalStrId(pResFunc[0]));
 SetString(nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, 
nTab, label);
 ApplyStyle(nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, 
pStyle);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwptablelayout.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit a5cd6eb9efadc3d0ca2648acdc96e780bda8ad20
Author: Caolán McNamara 
Date:   Tue Apr 17 09:08:09 2018 +0100

ofz#7729 Null-dereference READ

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

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 379c44b34c13..ff4b7f65a6f9 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -543,8 +543,13 @@ OUString LwpTableLayout::GetColumnWidth(sal_uInt16 nCol)
  */
 void LwpTableLayout::RegisterColumns()
 {
-LwpTable * pTable = GetTable();
-LwpSuperTableLayout * pSuper = GetSuperTableLayout();
+LwpTable* pTable = GetTable();
+if (!pTable)
+throw std::range_error("corrupt LwpTableLayout");
+
+LwpSuperTableLayout* pSuper = GetSuperTableLayout();
+if (!pSuper)
+throw std::range_error("corrupt LwpTableLayout");
 
 sal_uInt16 nCols = m_nCols;
 
@@ -556,9 +561,6 @@ void LwpTableLayout::RegisterColumns()
 m_aColumns[i] = nullptr;
 }
 
-if (!pTable)
-throw std::range_error("corrupt LwpTableLayout");
-
 double dDefaultColumn = pTable->GetWidth();
 sal_uInt16 nJustifiableColumn = nCols;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/inc/win/salgdi.h|4 +++-
 vcl/win/gdi/salfont.cxx |   48 ++--
 vcl/win/gdi/salgdi.cxx  |2 ++
 3 files changed, 43 insertions(+), 11 deletions(-)

New commits:
commit 335036f0d05bdfde49cacf245863c686d07a2d5f
Author: Khaled Hosny 
Date:   Mon Apr 16 22:30:50 2018 +0200

tdf#116812: Revert "The mfFontScale[n] is always 1.0"

This reverts commit 1b7e788eb3bf9cbe56ed5cc4a3fa7fa5e70ac40a
and followup commit 843c6d6eec95b99e867c28ab27860215d5d72b37.

Change-Id: I42d1ab76778466db356f0597c90e1afc2dc9997d
Reviewed-on: https://gerrit.libreoffice.org/53013
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index b1edef997d85..23531842dde3 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -166,6 +166,8 @@ private:
 HFONT   mhFonts[ MAX_FALLBACK ];// Font + Fallbacks
 const WinFontFace*  mpWinFontData[ MAX_FALLBACK ];  // pointer to the most 
recent font face
 WinFontInstance*   mpWinFontEntry[ MAX_FALLBACK ]; // pointer to the 
most recent font instance
+float   mfFontScale[ MAX_FALLBACK ];// allows 
metrics emulation of huge font sizes
+float   mfCurrentFontScale;
 HRGNmhRegion;   // vcl::Region Handle
 HPENmhDefPen;   // DefaultPen
 HBRUSH  mhDefBrush; // DefaultBrush
@@ -205,7 +207,7 @@ public:
 
 HWND gethWnd();
 
-HFONT   ImplDoSetFont( FontSelectPattern const * i_pFont, 
HFONT& o_rOldFont );
+HFONT   ImplDoSetFont( FontSelectPattern const * i_pFont, 
float& o_rFontScale, HFONT& o_rOldFont );
 
 public:
 explicit WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND 
hWnd,
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 7c6bb027f245..f9b9418ccb75 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -62,6 +62,8 @@ using namespace vcl;
 // The cache limit is set by the rough number of characters needed to read 
your average Asian newspaper.
 static o3tl::lru_map g_BoundRectCache(3000);
 
+static const int MAXFONTHEIGHT = 2048;
+
 inline FIXED FixedFromDouble( double d )
 {
 const long l = static_cast( d * 65536. );
@@ -838,11 +840,10 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
 }
 }
 
-HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern const * i_pFont, HFONT& 
o_rOldFont)
+HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern const * i_pFont, float& 
o_rFontScale, HFONT& o_rOldFont)
 {
 // clear the cache on font change
 g_BoundRectCache.clear();
-
 HFONT hNewFont = nullptr;
 
 HDC hdcScreen = nullptr;
@@ -853,6 +854,26 @@ HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern 
const * i_pFont, HFONT& o_
 LOGFONTW aLogFont;
 ImplGetLogFontFromFontSelect( getHDC(), i_pFont, aLogFont, true );
 
+// #i47675# limit font requests to MAXFONTHEIGHT
+// TODO: share MAXFONTHEIGHT font instance
+if( (-aLogFont.lfHeight <= MAXFONTHEIGHT)
+&&  (+aLogFont.lfWidth <= MAXFONTHEIGHT) )
+{
+o_rFontScale = 1.0;
+}
+else if( -aLogFont.lfHeight >= +aLogFont.lfWidth )
+{
+o_rFontScale = -aLogFont.lfHeight / (float)MAXFONTHEIGHT;
+aLogFont.lfHeight = -MAXFONTHEIGHT;
+aLogFont.lfWidth = FRound( aLogFont.lfWidth / o_rFontScale );
+}
+else // #i95867# also limit font widths
+{
+o_rFontScale = +aLogFont.lfWidth / (float)MAXFONTHEIGHT;
+aLogFont.lfWidth = +MAXFONTHEIGHT;
+aLogFont.lfHeight = FRound( aLogFont.lfHeight / o_rFontScale );
+}
+
 hNewFont = ::CreateFontIndirectW( &aLogFont );
 if( hdcScreen )
 {
@@ -890,6 +911,7 @@ void WinSalGraphics::SetFont( const FontSelectPattern* 
pFont, int nFallbackLevel
 // deselect still active font
 if( mhDefFont )
 ::SelectFont( getHDC(), mhDefFont );
+mfCurrentFontScale = mfFontScale[nFallbackLevel];
 // release no longer referenced font handles
 for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
 {
@@ -922,7 +944,8 @@ void WinSalGraphics::SetFont( const FontSelectPattern* 
pFont, int nFallbackLevel
 mpWinFontData[ nFallbackLevel ] = static_cast( 
pFont->mpFontData );
 
 HFONT hOldFont = nullptr;
-HFONT hNewFont = ImplDoSetFont(pFont, hOldFont);
+HFONT hNewFont = ImplDoSetFont(pFont, mfFontScale[ nFallbackLevel ], 
hOldFont);
+mfCurrentFontScale = mfFontScale[nFallbackLevel];
 
 if( !mhDefFont )
 {
@@ -971,7 +994,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricDataRef& 
rxFontMetric, int nFa
 {
 int nKashidaWidth = 0;
 if (GetCharWidthI(getHDC(), nKashidaGid, 1, nullptr, &nKashidaWidth))
-rxFontMetric->SetMinKashida(nKashidaWidth);
+
rxFontMetric->SetMinKashida(static_cast(mfFontScale

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

[Olivier Hallot]

 sfx2/source/appl/sfxhelp.cxx |   99 +++
 1 file changed, 92 insertions(+), 7 deletions(-)

New commits:
commit cdbb14cedb7d07aec0dda47fbb5ab65a02fb0cf6
Author: Olivier Hallot 
Date:   Tue Apr 10 22:50:31 2018 -0300

Enable new Help to be installed as extension

This patch enables the new help to be installed as an extension

The extension must match the locale and LibreOffice version

Extension id must be .help.libreoffice.org
Version must match product version

Help extension can be packed as Uno package from new help
offline build (--with-help=html)

To test the patch, use the en-US help in uno package format available in

https://helponline.libreoffice.org/Help_en-US_6.1.oxt

(To make it distinct from other help installations, the headings paragraphs
are in red.)

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

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 43606ae0183e..d0cc5248264b 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -82,6 +83,10 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::system;
+using ::com::sun::star::deployment::PackageInformationProvider;
+using ::com::sun::star::deployment::XPackageInformationProvider;
+
+namespace uno = css::uno ;
 
 class NoHelpErrorBox
 {
@@ -200,6 +205,78 @@ bool impl_hasHTMLHelpInstalled()
 return bOK;
 }
 
+// Root path of the HTML help extension
+OUString getExtensionHTMLHelpRootURL()
+{
+static OUString s_instURL;
+if (!s_instURL.isEmpty())
+return s_instURL;
+
+static OUString aLocaleStr;
+
+if (aLocaleStr.isEmpty())
+{
+// detect installed locale
+aLocaleStr = HelpLocaleString();
+}
+
+Reference< XComponentContext > m_xContext( 
comphelper::getProcessComponentContext() );
+const Reference< XPackageInformationProvider > xPackageInfo = 
PackageInformationProvider::get(m_xContext);
+
+s_instURL = xPackageInfo->getPackageLocation(aLocaleStr + 
".help.libreoffice.org");
+
+return s_instURL;
+}
+
+/// Check if HTML help extension is installed
+/// verify extension installed and correct version
+bool impl_hasHTMLHelpExtensionInstalled()
+{
+if (comphelper::LibreOfficeKit::isActive())
+return false;
+
+static OUString aLocaleStr;
+static OUString aRootURL;
+static OUString aVersion;
+
+if (aLocaleStr.isEmpty())
+{
+// detect installed locale
+aLocaleStr = HelpLocaleString();
+}
+
+OUString aIdentifier(aLocaleStr + ".help.libreoffice.org");
+
+if (aRootURL.isEmpty())
+{
+Reference< XComponentContext > m_xContext( 
comphelper::getProcessComponentContext() );
+const Reference< XPackageInformationProvider > xPackageInfo = 
PackageInformationProvider::get(m_xContext);
+aRootURL = xPackageInfo->getPackageLocation(aIdentifier);
+if(aRootURL.isEmpty())
+{
+return false;
+}
+uno::Sequence< uno::Sequence< OUString > > aExtensionList 
(xPackageInfo->getExtensionList());
+
+if(aExtensionList.hasElements())
+{
+for (long i = aExtensionList.getLength() - 1; i >= 0; i--)
+{
+SAL_INFO("sfx.appl", aExtensionList[i][0] + " - " + 
aExtensionList[i][1]) ;
+if (aExtensionList[i][0] == aIdentifier)
+{
+aVersion = aExtensionList[i][1];
+break;
+}
+}
+}
+}
+
+bool bOK(!aRootURL.isEmpty() && 
(aVersion.startsWith(utl::ConfigManager::getProductVersion(;
+
+return bOK;
+}
+
 } // namespace
 
 /// Return the locale we prefer for displaying help
@@ -690,12 +767,12 @@ static bool impl_showOnlineHelp( const OUString& rURL )
 #define SHTML3 "\"> window.location.href = \""
 #define SHTML4 "\";Help Page 
Redirection"
 
-static bool impl_showOfflineHelp( const OUString& rURL )
+
+static bool impl_showOfflineHelp( const OUString& rURL, const OUString& 
rBaseInstallPath)
 {
-OUString aBaseInstallPath = getHelpRootURL();
 OUString const aInternal( "vnd.sun.star.help://"  );
 
-OUString aHelpLink( aBaseInstallPath + "/index.html?" );
+OUString aHelpLink( rBaseInstallPath + "/index.html?" );
 aHelpLink += rURL.copy( aInternal.getLength() );
 aHelpLink = aHelpLink.replaceAll("%2F","/").replaceAll("%3A",":");
 
@@ -813,10 +890,14 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 impl_showOnlineHelp( aHelpURL );
 return true;
 }
-
+if ( impl_

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

[Caolán McNamara]

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

New commits:
commit 08ec0144cc6c58ce9aeb4d573cee4fd46c484bcd
Author: Caolán McNamara 
Date:   Tue Apr 17 09:20:56 2018 +0100

ofz#7671 Undefined-shift

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

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index fc5b87d6814c..2e842b106f78 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1986,7 +1986,7 @@ void 
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
 nCenterX = nCoordWidth / 2;
 if ( nCenterY == 2 )
 nCenterY = nCoordHeight / 2;
-if ( ( nPositionY >= 0x256 ) || ( nPositionY <= 0x107 ) )  
 // position y
+if ((nPositionY >= 0x256 || nPositionY <= 0x107) && i < 
sizeof(sal_uInt32) * 8)   // position y
 nAdjustmentsWhichNeedsToBeConverted |= ( 1U << i );
 EnhancedCustomShapeParameterPair aPolar;
 
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPolar.First,  
nCenterX, bool( nFlags & SvxMSDffHandleFlags::CENTER_X_IS_SPECIAL ), true  );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sc/source/ui/app/inputwin.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit a860c94f0da22065074cc36e8ddda73261641533
Author: Maxim Monastirsky 
Date:   Sun Apr 15 22:28:32 2018 +0300

tdf#117017 Make modifier keys not trigger the InputChanged handler

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

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index da42d3bfff18..985365e3f2fd 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1425,6 +1425,10 @@ void ScTextWnd::Command( const CommandEvent& rCEvt )
 {
 //don't call InputChanged for CommandEventId::Swipe
 }
+else if ( nCommand == CommandEventId::ModKeyChange )
+{
+//don't call InputChanged for CommandEventId::ModKeyChange
+}
 else
 SC_MOD()->InputChanged( mpEditView.get() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sc/source/ui/view/cellsh.cxx   |2 --
 sc/source/ui/view/tabview3.cxx |2 --
 2 files changed, 4 deletions(-)

New commits:
commit 3732d5ab1782bbadfee457115fbd8dce78453cc2
Author: Maxim Monastirsky 
Date:   Sun Apr 15 13:15:28 2018 +0300

tdf#116821 Keep row/column buttons enabled even when insert impossible

So other commands included in these buttons (like delete or set height/
width), could still be used.

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

diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index beca02abd382..cb2d374bdb6e 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -245,7 +245,6 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
 break;
 }
 case FID_INS_CELLSDOWN:
-case SID_ROW_OPERATIONS:
 bDisable = (!bSimpleArea) || GetViewData()->SimpleColMarked();
 break;
 
@@ -266,7 +265,6 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
 break;
 }
 case FID_INS_CELLSRIGHT:
-case SID_COLUMN_OPERATIONS:
 bDisable = (!bSimpleArea) || GetViewData()->SimpleRowMarked();
 break;
 
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 41bd76e976ad..4621d6ce120a 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -536,8 +536,6 @@ void ScTabView::SelectionChanged()
 rBindings.Invalidate( FID_INS_CELL );
 rBindings.Invalidate( FID_INS_CELLSDOWN );
 rBindings.Invalidate( FID_INS_CELLSRIGHT );
-rBindings.Invalidate( SID_ROW_OPERATIONS );
-rBindings.Invalidate( SID_COLUMN_OPERATIONS );
 
 rBindings.Invalidate( FID_CHG_COMMENT );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/weld.hxx   |3 
 sw/inc/swabstdlg.hxx   |7 --
 sw/source/ui/dialog/swdlgfact.cxx  |   37 +++
 sw/source/ui/dialog/swdlgfact.hxx  |   16 ++--
 sw/source/ui/fldui/inpdlg.cxx  |   83 +
 sw/source/uibase/fldui/fldmgr.cxx  |2 
 sw/source/uibase/inc/inpdlg.hxx|   36 +--
 sw/source/uibase/inc/wrtsh.hxx |4 -
 sw/source/uibase/shells/textfld.cxx|2 
 sw/source/uibase/wrtsh/wrtsh2.cxx  |   24 ++-
 sw/uiconfig/swriter/ui/inputfielddialog.ui |   94 +
 11 files changed, 140 insertions(+), 168 deletions(-)

New commits:
commit c8780642a5e8dc0bdcc97940ee7d9cacdc64c928
Author: Caolán McNamara 
Date:   Mon Apr 16 13:10:48 2018 +0100

weld SwFieldInputDlg

and GetWindowState/SetWindowState are unused as it turns out

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 74ce9a7ab37d..058f7d3a6bb8 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -745,6 +745,7 @@ public:
 OUString get_title() const { return getConstDialog()->get_title(); }
 void set_help_id(const OString& rHelpId) { 
getDialog()->set_help_id(rHelpId); }
 OString get_help_id() const { return getConstDialog()->get_help_id(); }
+void response(int nResponse) { getDialog()->response(nResponse); }
 virtual ~DialogController();
 };
 
@@ -781,7 +782,7 @@ public:
 virtual ~MessageDialogController() override;
 void set_primary_text(const OUString& rText) { 
m_xDialog->set_primary_text(rText); }
 OUString get_primary_text() const { return m_xDialog->get_primary_text(); }
-void set_default_response(int response) { 
m_xDialog->set_default_response(response); }
+void set_default_response(int nResponse) { 
m_xDialog->set_default_response(nResponse); }
 };
 }
 #endif
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 2c24fc1bfbe1..d64bc9aad389 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -104,9 +104,6 @@ class AbstractFieldInputDlg : public 
VclAbstractTerminatedDialog
 protected:
 virtual ~AbstractFieldInputDlg() override = default;
 public:
-//from class SalFrame
-virtual void  SetWindowState( const OString & rStr ) = 0;
-virtual OString   GetWindowState() const = 0;
 virtual void  EndDialog(sal_Int32 nResult) override = 0;
 virtual bool  PrevButtonPressed() const = 0;
 virtual bool  NextButtonPressed() const = 0;
@@ -278,8 +275,6 @@ class AbstractDropDownFieldDialog : public VclAbstractDialog
 protected:
 virtual ~AbstractDropDownFieldDialog() override = default;
 public:
-virtual OString   GetWindowState() const = 0; //this method inherit 
from SystemWindow
-virtual void  SetWindowState( const OString & rStr ) = 0; //this 
method inherit from SystemWindow
 virtual bool  PrevButtonPressed() const = 0;
 virtual bool  NextButtonPressed() const = 0;
 };
@@ -460,7 +455,7 @@ public:
 virtual VclPtrCreateGlossaryDlg(SfxViewFrame* 
pViewFrame,
 SwGlossaryHdl* pGlosHdl,
 SwWrtShell *pWrtShell) = 0;
-virtual VclPtr
CreateFieldInputDlg(vcl::Window *pParent,
+virtual VclPtr
CreateFieldInputDlg(weld::Window *pParent,
 SwWrtShell &rSh, SwField* pField, bool bPrevButton, bool bNextButton) 
= 0;
 virtual VclPtr 
CreateInsFootNoteDlg(weld::Window * pParent,
 SwWrtShell &rSh, bool bEd = false) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index e3e9559a3331..cf431989c93f 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -147,7 +147,11 @@ short AbstractSwRenameXNamedDlg_Impl::Execute()
 }
 IMPL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractFieldInputDlg_Impl);
+
+short AbstractFieldInputDlg_Impl::Execute()
+{
+return m_xDlg->execute();
+}
 
 short AbstractInsFootNoteDlg_Impl::Execute()
 {
@@ -275,16 +279,6 @@ void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( const 
uno::Sequence< uno::A
 pDlg->DataToDoc(rSelection, rxSource, xConnection, xResultSet);
 }
 
-OString AbstractDropDownFieldDialog_Impl::GetWindowState() const
-{
-return pDlg->GetWindowState();
-}
-
-void AbstractDropDownFieldDialog_Impl::SetWindowState( const OString& rStr )
-{
-pDlg->SetWindowState(rStr);
-}
-
 bool AbstractDropDownFieldDialog_Impl::PrevButtonPressed() const
 {
 return pDlg->PrevButtonPressed();
@@ -442,29 +436,19 @@ OUString AbstractGlossaryDlg

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

19 new defect(s) introduced to LibreOffice found with Coverity Scan.
5 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 19 of 19 defect(s)


** CID 1434905:  Error handling issues  (NEGATIVE_RETURNS)
/dbaccess/source/ui/tabledesign/TEditControl.cxx: 1519 in 
dbaui::OTableEditorCtrl::SetPrimaryKey(bool)()



*** CID 1434905:  Error handling issues  (NEGATIVE_RETURNS)
/dbaccess/source/ui/tabledesign/TEditControl.cxx: 1519 in 
dbaui::OTableEditorCtrl::SetPrimaryKey(bool)()
1513 if( bSet )
1514 {
1515 long nIndex = FirstSelectedRow();
1516 while( nIndex != SFX_ENDOFSELECTION )
1517 {
1518 // Set the key
>>> CID 1434905:  Error handling issues  (NEGATIVE_RETURNS)
>>> "nIndex" is passed to a parameter that cannot be negative. [Note: The 
>>> source code implementation of the function has been overridden by a builtin 
>>> model.]
1519  std::shared_ptr  pRow = (*m_pRowList)[nIndex];
1520 OFieldDescription* pFieldDescr = pRow->GetActFieldDescr();
1521 if(pFieldDescr)
1522 
AdjustFieldDescription(pFieldDescr,aInsertedPrimKeys,nIndex,false,true);
1523 
1524 nIndex = NextSelectedRow();

** CID 1434904:  Error handling issues  (NEGATIVE_RETURNS)
/dbaccess/source/ui/tabledesign/TEditControl.cxx: 1283 in 
dbaui::OTableEditorCtrl::IsPrimaryKeyAllowed(long)()



*** CID 1434904:  Error handling issues  (NEGATIVE_RETURNS)
/dbaccess/source/ui/tabledesign/TEditControl.cxx: 1283 in 
dbaui::OTableEditorCtrl::IsPrimaryKeyAllowed(long)()
1277 // - No Memo or Image entries
1278 // - DROP is not permitted (see above) and the column is not 
Required (not null flag is not set).
1279 long nIndex = FirstSelectedRow();
1280  std::shared_ptr  pRow;
1281 while( nIndex != SFX_ENDOFSELECTION )
1282 {
>>> CID 1434904:  Error handling issues  (NEGATIVE_RETURNS)
>>> "nIndex" is passed to a parameter that cannot be negative. [Note: The 
>>> source code implementation of the function has been overridden by a builtin 
>>> model.]
1283 pRow = (*m_pRowList)[nIndex];
1284 OFieldDescription* pFieldDescr = pRow->GetActFieldDescr();
1285 if(!pFieldDescr)
1286 return false;
1287 else
1288 {

** CID 1434903:  Error handling issues  (NEGATIVE_RETURNS)
/dbaccess/source/ui/tabledesign/TEditControl.cxx: 1519 in 
dbaui::OTableEditorCtrl::SetPrimaryKey(bool)()



*** CID 1434903:  Error handling issues  (NEGATIVE_RETURNS)
/dbaccess/source/ui/tabledesign/TEditControl.cxx: 1519 in 
dbaui::OTableEditorCtrl::SetPrimaryKey(bool)()
1513 if( bSet )
1514 {
1515 long nIndex = FirstSelectedRow();
1516 while( nIndex != SFX_ENDOFSELECTION )
1517 {
1518 // Set the key
>>> CID 1434903:  Error handling issues  (NEGATIVE_RETURNS)
>>> "nIndex" is passed to a parameter that cannot be negative. [Note: The 
>>> source code implementation of the function has been overridden by a builtin 
>>> model.]
1519  std::shared_ptr  pRow = (*m_pRowList)[nIndex];
1520 OFieldDescription* pFieldDescr = pRow->GetActFieldDescr();
1521 if(pFieldDescr)
1522 
AdjustFieldDescription(pFieldDescr,aInsertedPrimKeys,nIndex,false,true);
1523 
1524 nIndex = NextSelectedRow();

** CID 1434902:  Error handling issues  (NEGATIVE_RETURNS)
/dbaccess/source/ui/tabledesign/TableUndo.cxx: 170 in 
dbaui::OTableEditorDelUndoAct::OTableEditorDelUndoAct(dbaui::OTableEditorCtrl 
*)()



*** CID 1434902:  Error handling issues  (NEGATIVE_RETURNS)
/dbaccess/source/ui/tabledesign/TableUndo.cxx: 170 in 
dbaui::OTableEditorDelUndoAct::OTableEditorDelUndoAct(dbaui::OTableEditorCtrl 
*)()
164 sal_Int32 nIndex = pOwner->FirstSelectedRow();
165  std::shared_ptr  pOriginalRow;
166  std::shared_ptr  pNewRow;
167 
168 while( nIndex != SFX_ENDOFSELECTION )
169 {
>>> CID 1434902:  Error handling issues  (NEGATIVE_RETURNS)
>>> "nIndex" is passed to a parameter that cannot be negative. [Note: The 
>>> source code implementation of the function has been overridden by a builtin 
>>> model.]
170 pOrig

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

[Samuel Mehrbrodt]

 officecfg/registry/data/org/openoffice/Office/Impress.xcu   |5 +++
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |   16 +++-
 sd/source/ui/animations/CustomAnimationDialog.cxx   |5 ---
 sd/source/ui/animations/SlideTransitionPane.cxx |6 
 sd/source/ui/dlg/filedlg.cxx|   10 +++
 sd/source/ui/dlg/tpaction.cxx   |6 +---
 6 files changed, 34 insertions(+), 14 deletions(-)

New commits:
commit cdb14b4f079e56243c55029e4322f587fd6335b0
Author: Samuel Mehrbrodt 
Date:   Tue Jul 5 09:03:59 2016 +

tdf#100715 Slide transition sound: Remember remember last folder

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

diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu 
b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index accf3471a3f1..72d2fb8b4155 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -200,4 +200,9 @@
   $(work)
 
   
+  
+
+  $(work)
+
+  
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index e27df89f8129..7a2a7b7ec0d6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1632,7 +1632,7 @@
 
 
   
-Contains configuration items form Impress Photo Album 
function.
+Contains configuration items for Impress Photo Album 
function.
   
   
 
@@ -1644,5 +1644,19 @@
 $(work)
   
 
+
+  
+Contains configuration items for Sound related functions.
+  
+  
+
+  
+Access path, where sounds were loaded last time.
+The default is work directory.
+  
+
+$(work)
+  
+
   
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx 
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 72df60f6dab4..4012cf686649 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1496,16 +1496,13 @@ void CustomAnimationEffectTabPage::openSoundFileDialog()
 {
 SdOpenSoundFileDialog aFileDialog(GetFrameWeld());
 
-OUString aFile( SvtPathOptions().GetWorkPath() );
-aFileDialog.SetPath( aFile );
-
 bool bValidSoundFile = false;
 bool bQuitLoop = false;
 long nPos = 0;
 
 while( !bQuitLoop && (aFileDialog.Execute() == ERRCODE_NONE) )
 {
-aFile = aFileDialog.GetPath();
+OUString aFile = aFileDialog.GetPath();
 nPos = getSoundObject( aFile );
 
 if( nPos < 0 ) // not in Soundliste
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index 1ada6a56eac5..c7384415d1a5 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -735,12 +735,8 @@ void SlideTransitionPane::openSoundFileDialog()
 
 SdOpenSoundFileDialog aFileDialog(GetFrameWeld());
 
-OUString aFile;
 DBG_ASSERT( mpLB_SOUND->GetSelectedEntryPos() == 2,
 "Dialog should only open when \"Other sound\" is selected" );
-aFile = SvtPathOptions().GetWorkPath();
-
-aFileDialog.SetPath( aFile );
 
 bool bValidSoundFile( false );
 bool bQuitLoop( false );
@@ -748,7 +744,7 @@ void SlideTransitionPane::openSoundFileDialog()
 while( ! bQuitLoop &&
aFileDialog.Execute() == ERRCODE_NONE )
 {
-aFile = aFileDialog.GetPath();
+OUString aFile = aFileDialog.GetPath();
 tSoundListType::size_type nPos = 0;
 bValidSoundFile = lcl_findSoundInList( maSoundList, aFile, nPos );
 
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 25f07dca28e3..56688e35932a 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // ---  SdFileDialog_Imp---
 
@@ -235,6 +236,9 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog(weld::Window 
*pParent)
 aDescr = SdResId(STR_MIDI_FILE);
 mpImpl->AddFilter( aDescr, "*.mid" );
 #endif
+
+// Restore last selected path
+
mpImpl->SetDisplayDirectory(officecfg::Office::Impress::Sound::Path::get());
 }
 
 SdOpenSoundFileDialog::~SdOpenSoundFileDialog()
@@ -248,6 +252,12 @@ ErrCode SdOpenSoundFileDialog::Execute()
 
 OUString SdOpenSoundFileDialog::GetPath() const
 {
+// Save last selected path
+std::shared_ptr batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Impress::Sound::Path::set(mpImpl->GetPath(), batch);
+ 

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

[Miklos Vajna]

 sw/CppunitTest_sw_layoutwriter.mk  |   72 +
 sw/Module_sw.mk|1 
 sw/qa/extras/layout/data/tdf116830.odt |binary
 sw/qa/extras/layout/layout.cxx |   68 +++
 sw/source/core/layout/paintfrm.cxx |4 +
 5 files changed, 144 insertions(+), 1 deletion(-)

New commits:
commit 05ed69af14af8f138f69941c7c6186b39c742eb4
Author: Miklos Vajna 
Date:   Thu Apr 5 18:04:25 2018 +0200

tdf#116830 sw: handle cell background for BACKGROUND_PARA_OVER_DRAWINGS

Commit 18b3feb8bef06bf7b126fd0bc743e19479cb8026 (n#778133 sw: add
BackgroundParaOverDrawings compat flag, 2012-09-12) added a layout
compat flag that is meant to make Writer behave the same as Word when it
comes to the order of various backgrounds.

The original fix was that in case there are background shapes and also
paragraph backgrounds, then this flag can opt in to have the paragraph
backgrounds on top of background shapes.

Cell backgrounds behave the same way in Word, so extend the behavior of
the compat flag to cover not only the background of text frames but also
of cell frames.

(The test could be hacked into CppunitTest_sw_uiwriter, but 1) this is
layout, not UI and 2) that one started to get rather large.)

(cherry picked from commit 09954c381895f340c9b73af64b0833d8b4689c06)

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

diff --git a/sw/CppunitTest_sw_layoutwriter.mk 
b/sw/CppunitTest_sw_layoutwriter.mk
new file mode 100644
index ..675299180e44
--- /dev/null
+++ b/sw/CppunitTest_sw_layoutwriter.mk
@@ -0,0 +1,72 @@
+# -*- 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_layoutwriter))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_layoutwriter, \
+sw/qa/extras/layout/layout \
+))
+
+# note: this links msword only for the reason to have a order dependency,
+# because "make sw.check" will not see the dependency through services.rdb
+$(eval $(call gb_CppunitTest_use_libraries,sw_layoutwriter, \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+msword \
+sal \
+sfx \
+svl \
+svt \
+svxcore \
+sw \
+test \
+unotest \
+vcl \
+tl \
+utl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_layoutwriter,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_layoutwriter,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/qa/extras/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_layoutwriter))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_layoutwriter))
+$(eval $(call gb_CppunitTest_use_vcl,sw_layoutwriter))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_layoutwriter,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_layoutwriter))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_layoutwriter, \
+modules/swriter \
+))
+
+$(call gb_CppunitTest_get_target,sw_layoutwriter): \
+$(call gb_Library_get_target,textconv_dict)
+
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(call gb_CppunitTest_get_target,sw_layoutwriter): \
+$(call gb_ExternalPackage_get_target,fonts_liberation)
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 0ab442fb3c7b..03d46c2799fa 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_odfimport \
 CppunitTest_sw_txtexport \
 CppunitTest_sw_uiwriter \
+CppunitTest_sw_layoutwriter \
 CppunitTest_sw_mailmerge \
 CppunitTest_sw_globalfilter \
 ))
diff --git a/sw/qa/extras/layout/data/tdf116830.odt 
b/sw/qa/extras/layout/data/tdf116830.odt
new file mode 100644
index ..8faacc3ddaec
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf116830.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
new file mode 100644
index ..16efa14c5875
--- /dev/null
+++ b/sw/qa/extras/layout/layout.cxx
@@ -0,0 +1,68 @@
+/* -*- 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

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sc/inc sc/source

[Samuel Mehrbrodt]

 sc/inc/document.hxx  |1 +
 sc/source/core/data/document.cxx |9 +
 2 files changed, 10 insertions(+)

New commits:
commit b672dda2d1a6f055a5e7ab60d37a3f100fc4e944
Author: Samuel Mehrbrodt 
Date:   Tue Apr 17 10:22:04 2018 +0200

Add missing method GetAllNoteEntries

Needed for f382fb59ab4065b38d0db5660940bd45e850bc5a

Manually cherry-picked from ec25d34fa3ac900950ff24fcb224f7e827352803

Change-Id: I3a2217accb9be93beccaf9bf2d938c7455b5fa2e

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index a0faa9aef87d..690bab10710d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1109,6 +1109,7 @@ public:
 SCROW GetNotePosition( SCTAB nTab, SCCOL nCol, size_t nIndex ) const;
 
 SC_DLLPUBLIC void GetAllNoteEntries( std::vector& rNotes ) 
const;
+SC_DLLPUBLIC void GetAllNoteEntries( SCTAB nTab, 
std::vector& rNotes ) const;
 void GetNotesInRange( const ScRangeList& rRange, 
std::vector& rNotes ) const;
 bool ContainsNotesInRange( const ScRangeList& rRange ) const;
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index bed73d7c32e9..ec223b5c4e00 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6541,6 +6541,15 @@ void ScDocument::GetAllNoteEntries( 
std::vector& rNotes ) const
 }
 }
 
+void ScDocument::GetAllNoteEntries( SCTAB nTab, std::vector& 
rNotes ) const
+{
+const ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+return;
+
+return pTab->GetAllNoteEntries( rNotes );
+}
+
 void ScDocument::GetNotesInRange( const ScRangeList& rRange, 
std::vector& rNotes ) const
 {
 for( size_t i = 0; i < rRange.size(); ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/inc/swabstdlg.hxx|4 
 sw/source/ui/dialog/swdlgfact.cxx   |   30 ++-
 sw/source/ui/dialog/swdlgfact.hxx   |   26 ++-
 sw/source/ui/dialog/swuiexp.cxx |1 
 sw/source/ui/fldui/javaedit.cxx |  225 
 sw/source/ui/index/multmrk.cxx  |   50 ++
 sw/source/uibase/inc/javaedit.hxx   |   73 -
 sw/source/uibase/inc/multmrk.hxx|   29 +--
 sw/source/uibase/shells/textfld.cxx |4 
 sw/source/uibase/shells/textidx.cxx |2 
 sw/uiconfig/swriter/ui/insertscript.ui  |  212 ++
 sw/uiconfig/swriter/ui/selectindexdialog.ui |   49 +-
 12 files changed, 371 insertions(+), 334 deletions(-)

New commits:
commit 8a35cafb58c38e84541a44f8534c0511d2400e75
Author: Caolán McNamara 
Date:   Mon Apr 16 20:52:37 2018 +0100

weld SwMultiTOXMarkDlg

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

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 862f8bb94751..2c24fc1bfbe1 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -477,7 +477,7 @@ public:
 const css::uno::Reference< 
css::sdbc::XConnection>& xConnection ) = 0;
 virtual VclPtr   
CreateMailMergeCreateFromDlg(vcl::Window* pParent) = 0;
 virtual VclPtr 
CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) = 0;
-virtual VclPtr  
CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) = 0;
+virtual VclPtr  
CreateMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr &rTOXMgr) = 0;
 virtual VclPtr   
CreateOutlineTabDialog(vcl::Window* pParent,
 const SfxItemSet* pSwItemSet,
 SwWrtShell &) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index 6796a973c5dc..e3e9559a3331 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -123,6 +123,10 @@ short AbstractSwSortDlg_Impl::Execute()
 {
 return m_xDlg->execute();
 }
+short AbstractMultiTOXMarkDlg_Impl::Execute()
+{
+return m_xDlg->execute();
+}
 IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
 short AbstractSwConvertTableDlg_Impl::Execute()
 {
@@ -987,10 +991,9 @@ VclPtr 
SwAbstractDialogFactory_Impl::Creat
 return VclPtr::Create( pDlg );
 }
 
-VclPtr 
SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(vcl::Window* pParent, 
SwTOXMgr &rTOXMgr)
+VclPtr 
SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(weld::Window* pParent, 
SwTOXMgr &rTOXMgr)
 {
-VclPtr pDlg = VclPtr::Create(pParent, rTOXMgr);
-return VclPtr::Create(pDlg);
+return VclPtr::Create(new 
SwMultiTOXMarkDlg(pParent, rTOXMgr));
 }
 
 VclPtr 
SwAbstractDialogFactory_Impl::CreateSvxNumBulletTabDialog(vcl::Window* pParent,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index 904e005276c4..d53aad217e3c 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -25,6 +25,7 @@ class SwInsertAbstractDlg;
 class SwAsciiFilterDlg;
 class Dialog;
 class SwBreakDlg;
+class SwMultiTOXMarkDlg;
 class SwSortDlg;
 class SwTableHeightDlg;
 class SwTableWidthDlg;
@@ -135,6 +136,18 @@ public:
 virtual short Execute() override;
 };
 
+class AbstractMultiTOXMarkDlg_Impl : public VclAbstractDialog
+{
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractMultiTOXMarkDlg_Impl(SwMultiTOXMarkDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
+};
+
 class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
 {
 protected:
@@ -591,7 +604,7 @@ public:
 const css::uno::Reference< 
css::sdbc::XConnection>& xConnection ) override;
 virtual VclPtr 
CreateMailMergeCreateFromDlg(vcl::Window* pParent) override;
 virtual VclPtr 
CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) override;
-virtual VclPtr  
CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) override;
+virtual VclPtr  
CreateMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr &rTOXMgr) override;
 virtual VclPtr   
CreateOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet,
 SwWrtShell &) override;
 virtual VclPtr   
CreateSvxNumBulletTabDialog(vcl::Window* pParent,
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index f541a4507909..ba351e57ced5 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/

[Libreoffice-commits] core.git: cui/source dbaccess/source include/vcl sc/source sd/source vcl/source

[Muhammet Kara]

 cui/source/customize/SvxToolbarConfigPage.cxx |6 +--
 dbaccess/source/ui/misc/WTypeSelect.cxx   |2 -
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |8 ++--
 dbaccess/source/ui/tabledesign/TEditControl.cxx   |2 -
 include/vcl/menu.hxx  |1 
 sc/source/ui/navipi/content.cxx   |6 +--
 sc/source/ui/navipi/navipi.cxx|6 +--
 sd/source/ui/animations/CustomAnimationDialog.cxx |   32 +-
 sd/source/ui/animations/CustomAnimationList.cxx   |6 +--
 sd/source/ui/annotations/annotationmanager.cxx|8 ++--
 sd/source/ui/slideshow/slideshowimpl.cxx  |4 +-
 vcl/source/window/menu.cxx|5 ++
 12 files changed, 46 insertions(+), 40 deletions(-)

New commits:
commit 66ed9797ba8f61994a187dfcc189f375dcd0cdcc
Author: Muhammet Kara 
Date:   Thu Apr 12 21:53:29 2018 +0300

Simplify calls to Menu::CheckItem

in cui, dbaccess, vcl, sc, sd

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

diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx 
b/cui/source/customize/SvxToolbarConfigPage.cxx
index dfa1e000d7c7..b07b84d73f67 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -825,17 +825,17 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, SelectToolbar, 
ListBox&, void )
 {
 case 0:
 {
-pGearMenu->CheckItem( pGearMenu->GetItemId("gear_iconOnly") );
+pGearMenu->CheckItem( "gear_iconOnly" );
 break;
 }
 case 1:
 {
-pGearMenu->CheckItem( pGearMenu->GetItemId("gear_textOnly") );
+pGearMenu->CheckItem( "gear_textOnly" );
 break;
 }
 case 2:
 {
-pGearMenu->CheckItem( pGearMenu->GetItemId("gear_iconAndText") );
+pGearMenu->CheckItem( "gear_iconAndText" );
 break;
 }
 }
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx 
b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 1ac0fe566412..42f25cb2cf12 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -445,7 +445,7 @@ bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
 }
 
 if (bCheckOk)
-aContextMenu->CheckItem(aContextMenu->GetItemId("primarykey"));
+aContextMenu->CheckItem("primarykey");
 
 if (aContextMenu->Execute(this, ptWhere))
 {
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx 
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 94a6897bde6d..39f1c0a5866e 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1958,10 +1958,10 @@ void OSelectionBrowseBox::Command(const CommandEvent& 
rEvt)
 {
 VclBuilder aBuilder(nullptr, 
VclBuilderContainer::getUIRootDir(), "dbaccess/ui/queryfuncmenu.ui", "");
 VclPtr aContextMenu(aBuilder.get_menu("menu"));
-
aContextMenu->CheckItem(aContextMenu->GetItemId("functions"), 
m_bVisibleRow[BROW_FUNCTION_ROW]);
-
aContextMenu->CheckItem(aContextMenu->GetItemId("tablename"), 
m_bVisibleRow[BROW_TABLE_ROW]);
-aContextMenu->CheckItem(aContextMenu->GetItemId("alias"), 
m_bVisibleRow[BROW_COLUMNALIAS_ROW]);
-
aContextMenu->CheckItem(aContextMenu->GetItemId("distinct"), 
static_cast(getDesignView()->getController()).isDistinct());
+aContextMenu->CheckItem("functions", 
m_bVisibleRow[BROW_FUNCTION_ROW]);
+aContextMenu->CheckItem("tablename", 
m_bVisibleRow[BROW_TABLE_ROW]);
+aContextMenu->CheckItem("alias", 
m_bVisibleRow[BROW_COLUMNALIAS_ROW]);
+aContextMenu->CheckItem("distinct", 
static_cast(getDesignView()->getController()).isDistinct());
 
 aContextMenu->Execute(this, aMenuPos);
 
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx 
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index f68fc597d516..841ab7ba8161 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1368,7 +1368,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
 
aContextMenu->EnableItem(aContextMenu->GetItemId("delete"), 
IsDeleteAllowed(nRow));
 
aContextMenu->EnableItem(aContextMenu->GetItemId("primarykey"), 
IsPrimaryKeyAllowed(nRow));
 
aContextMenu->EnableItem(aContextMenu->GetItemId("insert"), 
IsInsertNewAllowed(nRow));
-
aContextMenu->CheckItem(aContextMenu->GetI

[Libreoffice-commits] core.git: Branch 'feature/cib_contract935' - 2 commits - include/vcl sfx2/source sw/inc toolkit/source vcl/source

[Samuel Mehrbrodt]

Rebased ref, commits from common ancestor:
commit 15fd0e43fac98e018b9eb1df44344dd3457a7fb8
Author: Samuel Mehrbrodt 
Date:   Mon Apr 16 13:02:42 2018 +0200

Set parent window for print dialog

In embedded LO this dialog sometimes shows up in background.

Change-Id: I9b7f423aaa6b2bbe915398287a5f3b955af930b4

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index edb5ff7ff7c3..cfd661b057e2 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -471,7 +471,8 @@ bool 
Printer::PreparePrintJob(std::shared_ptr xController,
 {
 try
 {
-ScopedVclPtrInstance< PrintDialog > aDlg( nullptr, xController );
+VclPtr xParent = xController->getWindow();
+ScopedVclPtrInstance< PrintDialog > aDlg( xParent, xController );
 if( ! aDlg->Execute() )
 {
 xController->abortJob();
commit 22441165ecfeeae2953246eb9e0ad2a18fea21d1
Author: Caolán McNamara 
Date:   Mon Feb 19 16:33:35 2018 +

make it possible to set parent window for printer error messages

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

Change-Id: I0effa3645454ef9d03393ae8b256cd624ca04f03

diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx
index bd65f4d2ce27..23cbcf8112be 100644
--- a/include/vcl/oldprintadaptor.hxx
+++ b/include/vcl/oldprintadaptor.hxx
@@ -29,7 +29,7 @@ namespace vcl
 {
 ImplOldStyleAdaptorData*mpData;
 public:
-OldStylePrintAdaptor( const VclPtr< Printer >& );
+OldStylePrintAdaptor(const VclPtr&, const 
VclPtr&);
 virtual ~OldStylePrintAdaptor() override;
 
 void StartPage();
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index f452564c107d..83e086fd1d0a 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -394,7 +394,7 @@ class VCL_DLLPUBLIC PrinterController
 {
 ImplPrinterControllerData*  mpImplData;
 protected:
-PrinterController( const 
VclPtr& );
+PrinterController( const 
VclPtr&, const VclPtr& );
 public:
 struct MultiPageSetup
 {
@@ -436,6 +436,7 @@ public:
 virtual ~PrinterController();
 
 const VclPtr&  getPrinter() const;
+const VclPtr&  getWindow() const;
 
 /** For implementations: get current job properties as changed by e.g. 
print dialog
 
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index ca5baf74771f..22ebdfc7bb6a 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -104,7 +104,7 @@ SfxPrinterController::SfxPrinterController( const 
VclPtr& i_rPrinter,
 SfxViewShell* pView,
 const uno::Sequence< 
beans::PropertyValue >& rProps
   )
-: PrinterController( i_rPrinter)
+: PrinterController(i_rPrinter, pView ? pView->GetWindow() : nullptr)
 , maCompleteSelection( i_rComplete )
 , maSelection( i_rSelection )
 , mxRenderable( i_xRender )
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 1d5a34b6c343..eaa28183b9ef 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -82,7 +82,6 @@ class SwAccessibleMap;
 namespace vcl
 {
 typedef OutputDevice RenderContext;
-class OldStylePrintAdaptor;
 }
 
 // Define for flags needed in ctor or layers below.
diff --git a/toolkit/source/awt/vclxprinter.cxx 
b/toolkit/source/awt/vclxprinter.cxx
index 9adc64e1196e..a3f19096d6ea 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -284,7 +285,7 @@ sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, 
sal_Int16 /*nCopies*/
 if (mxPrinter.get())
 {
 maInitJobSetup = mxPrinter->GetJobSetup();
-mxListener.reset(new vcl::OldStylePrintAdaptor(mxPrinter));
+mxListener.reset(new vcl::OldStylePrintAdaptor(mxPrinter, nullptr));
 }
 
 return bDone;
diff --git a/vcl/source/gdi/oldprintadaptor.cxx 
b/vcl/source/gdi/oldprintadaptor.cxx
index 1f354febbd25..03bdd1c800fe 100644
--- a/vcl/source/gdi/oldprintadaptor.cxx
+++ b/vcl/source/gdi/oldprintadaptor.cxx
@@ -44,8 +44,8 @@ namespace vcl
 };
 }
 
-OldStylePrintAdaptor::OldStylePrintAdaptor( const VclPtr< Printer >& 
i_xPrinter )
-: PrinterController( i_xPrinter )
+OldStylePrintAdaptor::OldStylePrintAdaptor( const VclPtr< Printer >& 
i_xPrinter, const VclPtr& i_xWindow )
+: PrinterController( i_xPrinter, i_xWindow )
 , mpData( new ImplOldStyleAdaptorData() )
 {
 }
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index b9de9928cc76..

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

[Noel Grandin]

 vcl/source/bitmap/bitmap.cxx |6 +-
 vcl/source/gdi/impbmp.cxx|4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 3564b46992fc30e212011c19043a2553178ccbca
Author: Noel Grandin 
Date:   Tue Apr 17 08:19:37 2018 +0200

move the ImpBitmap::GetBitCount logic up to Bitmap

in preparation for removing ImpBitmap

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

diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index f02acce300e1..c1cf3027c2f0 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -247,7 +247,11 @@ Size Bitmap::GetSizePixel() const
 
 sal_uInt16 Bitmap::GetBitCount() const
 {
-return( mxImpBmp ? mxImpBmp->GetBitCount() : 0 );
+if (!mxImpBmp)
+return 0;
+sal_uInt16 nBitCount = mxImpBmp->GetBitCount();
+return ( nBitCount <= 4 ) ? ( ( nBitCount <= 1 ) ? 1 : 4 ):
+( ( nBitCount <= 8 ) ? 8 : 24);
 }
 
 bool Bitmap::HasGreyPalette() const
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 04b3f4c34912..1bea17ce3173 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -72,9 +72,7 @@ Size ImpBitmap::GetSize() const
 
 sal_uInt16 ImpBitmap::GetBitCount() const
 {
-sal_uInt16 nBitCount = mpSalBitmap->GetBitCount();
-return ( nBitCount <= 4 ) ? ( ( nBitCount <= 1 ) ? 1 : 4 ):
-( ( nBitCount <= 8 ) ? 8 : 24);
+return mpSalBitmap->GetBitCount();
 }
 
 BitmapBuffer* ImpBitmap::AcquireBuffer( BitmapAccessMode nMode )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/KitHelper.hpp wsd/FileServer.cpp

[Miklos Vajna]

 kit/KitHelper.hpp  |2 +-
 wsd/FileServer.cpp |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cb761748ed790b79b717c41949c1da3cc5b25563
Author: Miklos Vajna 
Date:   Tue Apr 17 09:13:45 2018 +0200

Avoid unnecessary copy-initialization

These are copy-constructed from a const reference but are only used as
const reference; make them a const reference.

Change-Id: Id193905b65224c2db4aab88999a92e60d3af3fdf

diff --git a/kit/KitHelper.hpp b/kit/KitHelper.hpp
index bc4e2350e..3021f2534 100644
--- a/kit/KitHelper.hpp
+++ b/kit/KitHelper.hpp
@@ -154,7 +154,7 @@ namespace LOKitHelper
 std::string partinfo(ptrValue);
 std::free(ptrValue);
 const auto aPartInfo = Util::JsonToMap(partinfo);
-for (const auto prop: aPartInfo)
+for (const auto& prop: aPartInfo)
 {
 const std::string& name = prop.first;
 if (name == "visible")
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index f45a4d852..24ab20b01 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -601,8 +601,8 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 
 // Keep only the origin, reject everything else
 Poco::URI uriFrameAncestor(frameAncestor);
-std::string frameAncestorScheme = uriFrameAncestor.getScheme();
-std::string frameAncestorHost = uriFrameAncestor.getHost();
+const std::string& frameAncestorScheme = uriFrameAncestor.getScheme();
+const std::string& frameAncestorHost = uriFrameAncestor.getHost();
 
 if (!frameAncestor.empty() && Util::isValidURIScheme(frameAncestorScheme) 
&& Util::isValidURIHost(frameAncestorHost))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source dbaccess/source forms/source include/connectivity include/svx svx/source sw/inc sw/source

[Noel Grandin]

 connectivity/source/inc/OColumn.hxx |9 
 connectivity/source/inc/OTypeInfo.hxx   |9 
 connectivity/source/inc/TKeyValue.hxx   |9 
 connectivity/source/inc/TSkipDeletedSet.hxx |9 
 connectivity/source/inc/TSortIndex.hxx  |   10 -
 connectivity/source/inc/file/fanalyzer.hxx  |8 ---
 connectivity/source/inc/file/fcode.hxx  |   10 -
 connectivity/source/inc/file/fcomp.hxx  |8 ---
 dbaccess/source/ui/inc/sbamultiplex.hxx |8 +++
 forms/source/component/EventThread.hxx  |6 ++---
 forms/source/component/FormattedField.cxx   |2 -
 include/connectivity/FValue.hxx |9 
 include/connectivity/sqliterator.hxx|9 
 include/connectivity/sqlscan.hxx|9 
 include/svx/fmgridif.hxx|   20 +-
 include/svx/xtable.hxx  |4 ---
 svx/source/xoutdev/xtable.cxx   |   12 ---
 sw/inc/unoframe.hxx |8 ---
 sw/inc/unotxdoc.hxx |4 ---
 sw/source/core/inc/observablethread.hxx |8 ++-
 sw/source/core/unocore/unoframe.cxx |   30 
 sw/source/uibase/uno/unotxdoc.cxx   |   10 -
 22 files changed, 20 insertions(+), 191 deletions(-)

New commits:
commit 9a831a6c19a30869782cfeb17f1c649a4ce4d9d9
Author: Noel Grandin 
Date:   Mon Apr 16 16:54:25 2018 +0200

remove no longer necessary operator new/delete overrides

and use "using" statements for the places where the overrides were
resolving ambiguities

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

diff --git a/connectivity/source/inc/OColumn.hxx 
b/connectivity/source/inc/OColumn.hxx
index 375f6ce9dc5a..a60f44e2bb8b 100644
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
@@ -95,15 +95,6 @@ namespace connectivity
 m_ColumnLabel = _aColumnName;
 }
 
-static void * operator new( size_t nSize )
-{ return ::rtl_allocateMemory( nSize ); }
-static void * operator new( size_t ,void* _pHint )
-{ return _pHint; }
-static void operator delete( void * pMem )
-{ ::rtl_freeMemory( pMem ); }
-static void operator delete( void *,void* )
-{  }
-
 bool isAutoIncrement()  const { return m_AutoIncrement; }
 bool isCaseSensitive()  const { return m_CaseSensitive; }
 bool isSearchable() const { return m_Searchable; }
diff --git a/connectivity/source/inc/OTypeInfo.hxx 
b/connectivity/source/inc/OTypeInfo.hxx
index 002a5a7c067c..65163085cf20 100644
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
@@ -43,15 +43,6 @@ namespace connectivity
 ,nType( css::sdbc::DataType::OTHER)
 {}
 
-static void * operator new( size_t nSize )
-{ return ::rtl_allocateMemory( nSize ); }
-static void * operator new( size_t /*nSize*/,void* _pHint )
-{ return _pHint; }
-static void operator delete( void * pMem )
-{ ::rtl_freeMemory( pMem ); }
-static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
-{  }
-
 bool operator == (const OTypeInfo& lh) const { return lh.nType == 
nType; }
 bool operator != (const OTypeInfo& lh) const { return lh.nType != 
nType; }
 };
diff --git a/connectivity/source/inc/TKeyValue.hxx 
b/connectivity/source/inc/TKeyValue.hxx
index 4cd5613b7bd2..f1911b6c03f4 100644
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
@@ -34,15 +34,6 @@ namespace connectivity
 
 ~OKeyValue();
 
-static void * operator new( size_t nSize )
-{ return ::rtl_allocateMemory( nSize ); }
-static void * operator new( size_t,void* _pHint )
-{ return _pHint; }
-static void operator delete( void * pMem )
-{ ::rtl_freeMemory( pMem ); }
-static void operator delete( void *,void* )
-{  }
-
 static OKeyValue* createKeyValue(sal_Int32 nVal);
 //  static OKeyValue* createEmptyKeyValue();
 
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx 
b/connectivity/source/inc/TSkipDeletedSet.hxx
index 6e177c877f54..373e87ea3d7b 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -41,15 +41,6 @@ namespace connectivity
 OSkipDeletedSet(IResultSetHelper* _pHelper);
 ~OSkipDeletedSet();
 
-static void * operator new( size_t nSize )
-{ return ::rtl_allocateMemory( nSize ); }
-static void * operator new( size_t,void* _pHint )
-   

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

[Gabor Kelemen]

 sw/qa/core/test_ToxLinkProcessor.cxx  |1 -
 sw/source/core/access/accpara.cxx |1 -
 sw/source/core/access/accportions.cxx |1 -
 sw/source/core/crsr/viscrs.cxx|1 -
 sw/source/core/doc/docedt.cxx |1 -
 sw/source/core/doc/docfld.cxx |1 -
 sw/source/core/doc/poolfmt.cxx|1 -
 sw/source/core/frmedt/feshview.cxx|1 -
 sw/source/core/swg/swblocks.cxx   |1 -
 sw/source/core/tox/ToxLinkProcessor.cxx   |1 -
 sw/source/core/unocore/unoidx.cxx |1 -
 sw/source/core/unocore/unoobj2.cxx|1 -
 sw/source/core/view/viewimp.cxx   |1 -
 sw/source/core/view/viewpg.cxx|2 --
 sw/source/core/view/vprint.cxx|1 -
 sw/source/filter/html/swhtml.cxx  |1 -
 sw/source/filter/ww8/ww8par.cxx   |1 -
 sw/source/ui/dialog/swdlgfact.cxx |1 -
 sw/source/ui/dochdl/selglos.cxx   |1 -
 sw/source/ui/index/cntex.cxx  |1 -
 sw/source/ui/misc/swmodalredlineacceptdlg.cxx |1 -
 sw/source/ui/utlui/swrenamexnameddlg.cxx  |1 -
 sw/source/uibase/app/apphdl.cxx   |2 --
 sw/source/uibase/app/swdll.cxx|2 --
 sw/source/uibase/dbui/dbtree.cxx  |1 -
 sw/source/uibase/dialog/regionsw.cxx  |1 -
 sw/source/uibase/docvw/PageBreakWin.cxx   |1 -
 sw/source/uibase/docvw/edtwin.cxx |1 -
 sw/source/uibase/docvw/romenu.cxx |1 -
 sw/source/uibase/envelp/syncbtn.cxx   |1 -
 sw/source/uibase/index/idxmrk.cxx |1 -
 sw/source/uibase/shells/beziersh.cxx  |1 -
 sw/source/uibase/shells/drformsh.cxx  |1 -
 sw/source/uibase/shells/drwbassh.cxx  |1 -
 sw/source/uibase/shells/drwtxtex.cxx  |1 -
 sw/source/uibase/shells/drwtxtsh.cxx  |1 -
 sw/source/uibase/shells/grfsh.cxx |1 -
 sw/source/uibase/shells/grfshex.cxx   |1 -
 sw/source/uibase/shells/listsh.cxx|1 -
 sw/source/uibase/shells/mediash.cxx   |1 -
 sw/source/uibase/shells/navsh.cxx |1 -
 sw/source/uibase/shells/olesh.cxx |1 -
 sw/source/uibase/shells/textdrw.cxx   |2 --
 sw/source/uibase/shells/textsh2.cxx   |1 -
 sw/source/uibase/shells/txtattr.cxx   |1 -
 sw/source/uibase/uiview/view.cxx  |1 -
 sw/source/uibase/uiview/view0.cxx |1 -
 sw/source/uibase/uiview/viewmdi.cxx   |1 -
 sw/source/uibase/utlui/gloslst.cxx|2 --
 sw/source/uibase/utlui/uitool.cxx |1 -
 sw/source/uibase/web/wformsh.cxx  |1 -
 sw/source/uibase/web/wfrmsh.cxx   |1 -
 sw/source/uibase/web/wgrfsh.cxx   |1 -
 sw/source/uibase/web/wlistsh.cxx  |1 -
 sw/source/uibase/web/wolesh.cxx   |1 -
 sw/source/uibase/web/wtabsh.cxx   |1 -
 sw/source/uibase/web/wtextsh.cxx  |1 -
 sw/source/uibase/web/wview.cxx|1 -
 58 files changed, 63 deletions(-)

New commits:
commit b3f094c2573de12bf3d386f19b924b536cb89af0
Author: Gabor Kelemen 
Date:   Mon Mar 26 01:49:01 2018 +0200

tdf#42949 Remove unnecessary localization headers from sw

Found by searching for the header names and the localization function:
git grep -l -e \ sw | xargs grep -c -e SwResId -e 
StartProgress -e GetResource | grep :0$ | grep -v /pch

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

diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx 
b/sw/qa/core/test_ToxLinkProcessor.cxx
index 00c10aa16271..c4998751a640 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -20,7 +20,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 5a779d55548a..238fcfa62f83 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -42,7 +42,6 @@
 #include 
 #include 
 #include "accpara.hxx"
-#include 
 #include "accportions.hxx"
 #include 
 #include 
diff --git a/sw/source/core/access/accportions.cxx 
b/sw/source/core/access/accportions.cxx
index a4c2009ed7f8..48be5185f308 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -24,7 +24,6 @@
 #include 
 
 // for portion replacement in Special()
-#include 
 #include 
 
 // for GetWordBoundary(...), GetSentenceBoundary(...):
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 443e494b6a7d..b11db04d393f 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b

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

[Patrick Jaap]

 sw/qa/extras/ooxmlimport/data/tdf116486.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |6 ++
 sw/source/core/layout/tabfrm.cxx |4 
 sw/source/core/text/itrform2.cxx |   12 
 4 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit ae910b993f69205866f94ac8928f13f57e94560b
Author: Patrick Jaap 
Date:   Tue Apr 10 13:24:04 2018 +0200

tdf#116486 Consider upper margin in paragraph positioning with flys

The problem was the following:
There is a paragraph with an upper margin defined. Also, there
is a flyframe intersecting this upper margin. The desired behavior
is to reposition the parapgraph, such that it (including it's upper
margin) is located below the flyframe.

This patch increases the bounding rectangle of the paragraph by the
upper margin.

For compatibility, there is a compat-flag query. I re-used a related one.

Change-Id: I9dbc75e07e2ba0658fdbbfa9989be24a68660713
Reviewed-on: https://gerrit.libreoffice.org/52685
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit d07fc485d46f431405a3f6a002f951a08c559677)
Reviewed-on: https://gerrit.libreoffice.org/52938

diff --git a/sw/qa/extras/ooxmlimport/data/tdf116486.docx 
b/sw/qa/extras/ooxmlimport/data/tdf116486.docx
new file mode 100644
index ..c6a4891b0cf4
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf116486.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 3af5a063c002..22bf0b01f752 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1602,6 +1602,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf114217, "tdf114217.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(0), xDrawPage->getCount());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf116486, "tdf116486.docx")
+{
+OUString aTop = parseDump("/root/page/body/txt/Special", "nHeight");
+CPPUNIT_ASSERT_EQUAL( OUString("4006"), aTop );
+}
+
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in 
ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 6421eedca0be..e762ab1f5842 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2314,12 +2314,24 @@ void SwTextFormatter::CalcFlyWidth( SwTextFormatInfo 
&rInf )
 SwRect aLine( rInf.X() + nLeftMin, nTop, rInf.RealWidth() - rInf.X()
   + nLeftMar - nLeftMin , nHeight );
 
+// tdf#116486: consider also the upper margin from getFramePrintArea 
because intersections
+// with this additional space should lead to repositioning of 
paragraphs
+// For compatibility we grab a related compat flag:
+if ( 
GetTextFrame()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_VERTICAL_FLY_OFFSETS)
 )
+{
+const long nUpper = m_pFrame->getFramePrintArea().Top();
+// Increase the rectangle
+if( nUpper > 0 && nTop >= nUpper  )
+aLine.SubTop( nUpper );
+}
 SwRect aLineVert( aLine );
 if ( m_pFrame->IsRightToLeft() )
 m_pFrame->SwitchLTRtoRTL( aLineVert );
 
 if ( m_pFrame->IsVertical() )
 m_pFrame->SwitchHorizontalToVertical( aLineVert );
+
+// GetFrame(...) determines and returns the intersection rectangle
 SwRect aInter( rTextFly.GetFrame( aLineVert ) );
 
 if ( m_pFrame->IsRightToLeft() )
commit e68518d230eee6f69e4cc2ed90e99aaab268946b
Author: Michael Stahl 
Date:   Mon Apr 16 10:34:09 2018 +0200

Revert "sw-table-join-fix-i99267.diff:"

This reverts commit 6b1204329ad365a46214472bcff335e63c51bdf4.

The comment has nothing to do with the code around it,
and it turns out the commit is utter nonsense:

The actual intended change was done in CWS sw32bf02 at a different
place in SwTabFrame::MakeAll(), see commit
4439427aadeaa0cb611011b46f0fa14bfa196f33.

This was then apparently extracted as a patch and added to ooo-build:


https://cgit.freedesktop.org/libreoffice/build/commit/?id=d33db589f6e7814df84f71506539f6f89448d9fd

And then there was a rebase on top of a DEV300 that includes
the CWS and that moved the patch to apply in this incorrect location:


https://cgit.freedesktop.org/libreoffice/build/commit/?id=d91410b81a02ce9b970ebd838fda0b28f6d8a5f8

Change-Id: I89db4ea0d1b06450c8fd8618cc824612e225fffe
Reviewed-on: https://gerrit.libreoffice.org/52945
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 8885ffd9702f72047d9fc94c82ee57221e4e927c)
Reviewed-on: https://gerrit.libreoffice.org/52975
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index a02236b905fa..52cb1fdb91ff 100755
--- a/sw/source/core/lay

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

[Miklos Vajna]

 sw/qa/extras/layout/data/tdf116848.odt |binary
 sw/qa/extras/layout/layout.cxx |9 +
 sw/source/core/layout/findfrm.cxx  |5 -
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit e4b335fac90a2128a5df3641050d6382883de1e8
Author: Miklos Vajna 
Date:   Mon Apr 16 22:14:12 2018 +0200

tdf#116848 sw, sections in tables: no split in headers or footers

The motivation for split section-in-tables was multiple pages, so
disabling it for headers/footers is not a problem, and fixes the layout
loop.

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

diff --git a/sw/qa/extras/layout/data/tdf116848.odt 
b/sw/qa/extras/layout/data/tdf116848.odt
new file mode 100644
index ..e3a96c78a521
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf116848.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 9a73e2025147..aa2146354fc0 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -19,11 +19,13 @@ public:
 void testTdf116830();
 void testTdf116925();
 void testTdf117028();
+void testTdf116848();
 
 CPPUNIT_TEST_SUITE(SwLayoutWriter);
 CPPUNIT_TEST(testTdf116830);
 CPPUNIT_TEST(testTdf116925);
 CPPUNIT_TEST(testTdf117028);
+CPPUNIT_TEST(testTdf116848);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -108,6 +110,13 @@ void SwLayoutWriter::testTdf117028()
 assertXPathContent(pXmlDoc, "//textarray/text", "Hello");
 }
 
+void SwLayoutWriter::testTdf116848()
+{
+SwDoc* pDoc = createDoc("tdf116848.odt");
+// This resulted in a layout loop.
+pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutWriter);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/layout/findfrm.cxx 
b/sw/source/core/layout/findfrm.cxx
index 60b37f363555..baca3edfa189 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1265,9 +1265,12 @@ static bool lcl_IsInSectionDirectly( const SwFrame *pUp )
 else if( pUp->IsSctFrame() )
 {
 auto pSection = static_cast(pUp);
+const SwFrame* pHeaderFooter = pSection->FindFooterOrHeader();
+// When the section frame is not in header/footer:
 // Allow move of frame in case our only column is not growable.
 // Also allow if there is a previous section frame (to move back).
-return bSeenColumn || !pSection->Growable() || 
pSection->GetPrecede();
+bool bAllowOutsideHeaderFooter = !pSection->Growable() || 
pSection->GetPrecede();
+return bSeenColumn || (!pHeaderFooter && 
bAllowOutsideHeaderFooter);
 }
 else if( pUp->IsTabFrame() )
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits