date:20170911

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

2017-09-11 Thread Mike Kaganski

 include/oox/export/utils.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f0809a84b6c85a254bc23c5f55f86116d14a145d
Author: Mike Kaganski 
Date:   Mon Sep 11 09:15:46 2017 +0300

include/oox/export/utils.hxx: make functions constexpr

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

diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index d94d6c4228ae..927987115a60 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -34,7 +34,7 @@ inline OString I64S_(sal_Int64 x) { return 
OString::number(x); }
  * @return const char* literal "true" for true value, or literal "false"
  * for false value.
  */
-static inline const char* ToPsz(bool b)
+static constexpr const char* ToPsz(bool b)
 {
 return b ? "true" : "false";
 }
@@ -42,7 +42,7 @@ static inline const char* ToPsz(bool b)
 /**
  * @return literal "1" for true value, or literal "0" for false value.
  */
-static inline const char* ToPsz10(bool b)
+static constexpr const char* ToPsz10(bool b)
 {
 // xlsx seems to use "1" or "0" for boolean values.  I wonder it ever uses
 // the "true" "false" variant.
@@ -51,12 +51,12 @@ static inline const char* ToPsz10(bool b)
 
 #define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
 
-static inline sal_Int64 PPTtoEMU( sal_Int32 nPPT )
+static constexpr sal_Int64 PPTtoEMU( sal_Int32 nPPT )
 {
 return (sal_Int64)( (double)nPPT * 1587.5 );
 }
 
-static inline sal_Int64 TwipsToEMU( sal_Int32 nTwips )
+static constexpr sal_Int64 TwipsToEMU( sal_Int32 nTwips )
 {
 return sal_Int64( nTwips ) * 635;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - cui/source

2017-09-11 Thread Andreas Brandner

 cui/source/options/optgdlg.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 73e91d3652bbe4cf942464f9a6c582b574d578d1
Author: Andreas Brandner 
Date:   Fri Sep 8 18:51:21 2017 +0200

tdf#108406 offline help-images helpimg are no longer selectable as iconset

Change-Id: I6733ed2a04c01c288de2cd6af938a6c6ff1b4481
Reviewed-on: https://gerrit.libreoffice.org/42117
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 60adba3fb904ed66251ff39c82fe20bec151ef0b)
Reviewed-on: https://gerrit.libreoffice.org/42140
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 07496d9e6c26..40cbe21b8747 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -665,6 +665,10 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 StyleSettings aStyleSettings = 
Application::GetSettings().GetStyleSettings();
 mInstalledIconThemes = aStyleSettings.GetInstalledIconThemes();
 
+//Removing "Helpimg" from the list, as it is not a real iconset (see 
tdf#108406)
+mInstalledIconThemes.erase(std::remove_if(mInstalledIconThemes.begin(), 
mInstalledIconThemes.end(),
+[](vcl::IconThemeInfo theme) { return 
theme.GetDisplayName() == "Helpimg";}), mInstalledIconThemes.end());
+
 // Start with the automatically chosen icon theme
 OUString autoThemeId = aStyleSettings.GetAutomaticallyChosenIconTheme();
 const vcl::IconThemeInfo& autoIconTheme = 
vcl::IconThemeInfo::FindIconThemeById(mInstalledIconThemes, autoThemeId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Ivan Safonov

 framework/source/services/autorecovery.cxx |  272 +++--
 1 file changed, 105 insertions(+), 167 deletions(-)

New commits:
commit ba7492ebe6f943976fc41274672ec41c035b4fbb
Author: Ivan Safonov 
Date:   Wed Aug 23 23:04:12 2017 +0300

tdf#46037: Replace ConfigurationHelper with new configuration API

Remove all occurences of ConfigurationHelper
in /framework/source/services/autorecovery.cxx.

com.sun.star.configuration.ConfigurationAccess used only
to receive configuration updates.

In the second version of the patch corrected the indentation
and fdo replaced with tdf in the patch title.

comphelper::ConfigurationChanges::create returns shared_ptr,
using unique_ptr can result in bugs.

Also rebase this patch.

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

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index ae1558256933..bde4a609c068 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -33,6 +33,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -69,7 +70,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -93,6 +94,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -529,15 +532,12 @@ private:
 m_xCFG, open it on demand and cache it
 afterwards.
 
-@return [com.sun.star.container.XNameAccess]
-the configuration object
-
 @throw  [com.sun.star.uno.RuntimeException]
 if config could not be opened successfully!
 
 @threadsafe
   */
-css::uno::Reference< css::container::XNameAccess > implts_openConfig();
+void implts_openConfig();
 
 /** @short  read the underlying configuration.
 
@@ -988,21 +988,10 @@ private:
 
 // recovery.xcu
 static const char CFG_PACKAGE_RECOVERY[] = "org.openoffice.Office.Recovery/";
-static const char CFG_ENTRY_RECOVERYLIST[] = "RecoveryList";
-static const char CFG_PATH_RECOVERYINFO[] = "RecoveryInfo";
-static const char CFG_ENTRY_CRASHED[] = "Crashed";
-static const char CFG_ENTRY_SESSIONDATA[] = "SessionData";
 
 static const char CFG_ENTRY_AUTOSAVE_ENABLED[] = "AutoSave/Enabled";
 static const char CFG_ENTRY_AUTOSAVE_TIMEINTERVALL[] = 
"AutoSave/TimeIntervall"; //sic!
 
-static const char CFG_ENTRY_USERAUTOSAVE_ENABLED[] = 
"AutoSave/UserAutoSaveEnabled";
-
-static const char CFG_PATH_AUTOSAVE[] = "AutoSave";
-static const char CFG_ENTRY_MINSPACE_DOCSAVE[] = "MinSpaceDocSave";
-static const char CFG_ENTRY_MINSPACE_CONFIGSAVE[] = "MinSpaceConfigSave";
-
-static const char CFG_PACKAGE_MODULES[] = 
"org.openoffice.Setup/Office/Factories";
 static const char CFG_ENTRY_REALDEFAULTFILTER[] = "ooSetupFactoryActualFilter";
 
 static const char CFG_ENTRY_PROP_TEMPURL[] = "TempURL";
@@ -1698,39 +1687,40 @@ void SAL_CALL AutoRecovery::disposing(const 
css::lang::EventObject& aEvent)
 } /* SAFE */
 }
 
-css::uno::Reference< css::container::XNameAccess > 
AutoRecovery::implts_openConfig()
+void AutoRecovery::implts_openConfig()
 {
 /* SAFE */ {
 osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
 
 if (m_xRecoveryCFG.is())
-return m_xRecoveryCFG;
-
+return;
 } /* SAFE */
 
-OUString sCFG_PACKAGE_RECOVERY(CFG_PACKAGE_RECOVERY);
+css::uno::Reference xConfigProvider(
+css::configuration::theDefaultProvider::get(m_xContext));
+
+std::vector lParams;
+css::beans::PropertyValue aParam;
+
+// set root path
+aParam.Name = "nodepath";
+aParam.Value <<= OUString(CFG_PACKAGE_RECOVERY);
+lParams.push_back(css::uno::Any(aParam));
+
 // throws a RuntimeException if an error occurs!
-css::uno::Reference< css::container::XNameAccess > xCFG(
-::comphelper::ConfigurationHelper::openConfig(m_xContext, 
sCFG_PACKAGE_RECOVERY, ::comphelper::EConfigurationModes::Standard),
-css::uno::UNO_QUERY);
+css::uno::Reference xCFG(
+xConfigProvider->createInstanceWithArguments(
+"com.sun.star.configuration.ConfigurationAccess",
+comphelper::containerToSequence(lParams)),
+css::uno::UNO_QUERY);
 
 sal_Int32 nMinSpaceDocSave= MIN_DISCSPACE_DOCSAVE;
 sal_Int32 nMinSpaceConfigSave = MIN_DISCSPACE_CONFIGSAVE;
 
 try
 {
-OUString sCFG_PATH_AUTOSAVE(CFG_PATH_AUTOSAVE);
-::comphelper::ConfigurationHelper::readDirectKey(m_xContext,
- sCFG_PACKAGE_RECOVERY,
- sCFG_PATH_AUTOSAVE,
- 
CFG_ENTRY_MINSPACE_DOCSAVE,
-

[Libreoffice-commits] core.git: editeng/source filter/source forms/source formula/source fpicker/source framework/source

2017-09-11 Thread Noel Grandin

 editeng/source/editeng/editobj.cxx  |4 -
 editeng/source/editeng/edtspell.cxx |2 
 editeng/source/editeng/impedit.cxx  |2 
 editeng/source/editeng/impedit2.cxx |8 +-
 editeng/source/editeng/impedit3.cxx |2 
 editeng/source/editeng/impedit4.cxx |4 -
 editeng/source/uno/unotext2.cxx |6 +-
 filter/source/config/cache/filtercache.cxx  |   44 
 filter/source/flash/swfwriter2.cxx  |   14 ++---
 filter/source/msfilter/escherex.cxx |6 +-
 filter/source/msfilter/msdffimp.cxx |8 +-
 filter/source/svg/svgexport.cxx |2 
 filter/source/svg/svgreader.cxx |6 +-
 forms/source/component/DatabaseForm.cxx |   24 
 forms/source/component/ListBox.cxx  |4 -
 forms/source/solar/control/navtoolbar.cxx   |2 
 forms/source/xforms/binding.cxx |8 +-
 formula/source/ui/dlg/FormulaHelper.cxx |6 +-
 fpicker/source/office/RemoteFilesDialog.cxx |4 -
 framework/source/layoutmanager/toolbarlayoutmanager.cxx |   24 
 framework/source/services/autorecovery.cxx  |6 +-
 21 files changed, 92 insertions(+), 94 deletions(-)

New commits:
commit 9c5c905680f7cb58eb3d0fbf25725a50c17896da
Author: Noel Grandin 
Date:   Mon Sep 11 08:54:58 2017 +0200

clang-tidy modernize-use-emplace in editeng..framework

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

diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index a20217749d46..549d8cee1992 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -924,7 +924,7 @@ void EditTextObjectImpl::GetAllSections( 
std::vector& rAttrs )
 if (rBorders.size() == 1 && rBorders[0] == 0)
 {
 // Empty paragraph. Push an empty section.
-aAttrs.push_back(editeng::Section(nPara, 0, 0));
+aAttrs.emplace_back(nPara, 0, 0);
 continue;
 }
 
@@ -934,7 +934,7 @@ void EditTextObjectImpl::GetAllSections( 
std::vector& rAttrs )
 for (++itBorder; itBorder != itBorderEnd; ++itBorder, nPrev = nCur)
 {
 nCur = *itBorder;
-aAttrs.push_back(editeng::Section(nPara, nPrev, nCur));
+aAttrs.emplace_back(nPara, nPrev, nCur);
 }
 }
 
diff --git a/editeng/source/editeng/edtspell.cxx 
b/editeng/source/editeng/edtspell.cxx
index c2810f49ed07..47603ca1a039 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -428,7 +428,7 @@ void WrongList::InsertWrong( size_t nStart, size_t nEnd )
 if (nPos != maRanges.end())
 maRanges.insert(nPos, editeng::MisspellRange(nStart, nEnd));
 else
-maRanges.push_back(editeng::MisspellRange(nStart, nEnd));
+maRanges.emplace_back(nStart, nEnd);
 
 SAL_WARN_IF(DbgIsBuggy(), "editeng", "InsertWrong: WrongList broken!");
 }
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index f0f80b4f700d..aaf24df25f18 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -451,7 +451,7 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel, 
vcl::Region* pRegion,
 if (bMm100ToTwip)
 rRectangle = OutputDevice::LogicToLogic(rRectangle, 
MapUnit::Map100thMM, MapUnit::MapTwip);
 rRectangle.Move(aOrigin.getX(), aOrigin.getY());
-v.push_back(rRectangle.toString().getStr());
+v.emplace_back(rRectangle.toString().getStr());
 }
 sRectangle = comphelper::string::join("; ", v);
 }
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index adf436e894b7..1e020d6d5ac3 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1672,7 +1672,7 @@ void ImpEditEngine::InitScriptTypes( sal_Int32 nPara )
 
 sal_Int32 nPos = 0;
 short nScriptType = _xBI->getScriptType( aText, nPos );
-rTypes.push_back( ScriptTypePosInfo( nScriptType, nPos, nTextLen ) );
+rTypes.emplace_back( nScriptType, nPos, nTextLen );
 nPos = _xBI->endOfScript( aText, nPos, nScriptType );
 while ( ( nPos != (-1) ) && ( nPos < nTextLen ) )
 {
@@ -1699,7 +1699,7 @@ void ImpEditEngine::InitScriptTypes( sal_Int32 nPara )
 break;
 }
 }
-rTypes.push_back( ScriptTypePosInfo( nScriptType, nPos, 
nTextLen ) )

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

2017-09-11 Thread Noel Grandin

 dbaccess/source/core/api/FilteredContainer.cxx|6 
 dbaccess/source/core/api/RowSet.cxx   |8 -
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx|7 -
 dbaccess/source/core/api/StaticSet.cxx|2 
 dbaccess/source/core/dataaccess/connection.cxx|   10 -
 dbaccess/source/core/dataaccess/datasource.cxx|2 
 dbaccess/source/core/misc/DatabaseDataProvider.cxx|6 
 dbaccess/source/ext/macromigration/macromigrationdialog.cxx   |4 
 dbaccess/source/ext/macromigration/migrationengine.cxx|2 
 dbaccess/source/ext/macromigration/migrationlog.cxx   |   66 +-
 dbaccess/source/filter/xml/xmlExport.cxx  |4 
 dbaccess/source/ui/app/AppControllerGen.cxx   |2 
 dbaccess/source/ui/app/AppDetailView.cxx  |   20 +--
 dbaccess/source/ui/browser/brwctrlr.cxx   |2 
 dbaccess/source/ui/browser/genericcontroller.cxx  |2 
 dbaccess/source/ui/browser/unodatbr.cxx   |   32 ++--
 dbaccess/source/ui/control/RelationControl.cxx|6 
 dbaccess/source/ui/dlg/DbAdminImpl.cxx|   10 -
 dbaccess/source/ui/dlg/dbfindex.cxx   |6 
 dbaccess/source/ui/dlg/generalpage.cxx|4 
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx |2 
 dbaccess/source/ui/misc/DExport.cxx   |2 
 dbaccess/source/ui/misc/WCopyTable.cxx|   12 -
 dbaccess/source/ui/querydesign/JoinTableView.cxx  |2 
 dbaccess/source/ui/querydesign/querycontroller.cxx|6 
 desktop/qa/desktop_lib/test_desktop_lib.cxx   |2 
 desktop/source/app/dispatchwatcher.cxx|2 
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx   |2 
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx  |2 
 desktop/source/deployment/manager/dp_activepackages.cxx   |   10 -
 desktop/source/deployment/manager/dp_extensionmanager.cxx |6 
 desktop/source/deployment/misc/dp_ucb.cxx |2 
 desktop/source/deployment/misc/dp_update.cxx  |4 
 desktop/source/deployment/registry/component/dp_component.cxx |5 
 desktop/source/deployment/registry/dp_backenddb.cxx   |4 
 desktop/source/deployment/registry/package/dp_package.cxx |5 
 drawinglayer/source/primitive2d/animatedprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/svggradientprimitive2d.cxx|5 
 drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx|2 
 drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx|   22 +--
 drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx  |2 
 drawinglayer/source/processor2d/contourextractor2d.cxx|8 -
 drawinglayer/source/processor2d/textaspolygonextractor2d.cxx  |6 
 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |2 
 drawinglayer/source/tools/emfphelperdata.cxx  |   12 -
 drawinglayer/source/tools/wmfemfhelper.cxx|4 
 46 files changed, 163 insertions(+), 171 deletions(-)

New commits:
commit 3428bd5fa3626844355f20997ba690fd04297982
Author: Noel Grandin 
Date:   Mon Sep 11 08:54:30 2017 +0200

clang-tidy modernize-use-emplace in d*

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

diff --git a/dbaccess/source/core/api/FilteredContainer.cxx 
b/dbaccess/source/core/api/FilteredContainer.cxx
index 49a36fdf12e3..6f9b1548026a 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -57,7 +57,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& 
_rTableFilter, std::vector<
 {
 if (pTableFilters->indexOf('%') != -1)
 {
-_rOut.push_back(WildCard(pTableFilters->replace('%', '*')));
+_rOut.emplace_back(pTableFilters->replace('%', '*'));
 }
 else
 {
@@ -276,7 +276,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& 
_rTableFilter, std::vector<
 const OUString*  name = aNames.getConstArray();
 const OUString*  nameEnd = name + aNames.getLength();
 for ( ; name != nameEnd; ++name )
-aUnfilteredTables.push_back( TableInfo( *name ) );
+aUnfilteredTables.emplace_back( *name );
 
 reFill( lcl_filter( aUnfilteredTables,
 _rTableFilter, _rTableTypeFilter, m_xMetaData, 
m_xMasterContainer ) );
@@ -357,7 +357,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& 
_rTableFilter, std::vector<
 sName   = xCurrentRow->getString(3);

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

2017-09-11 Thread Caolán McNamara

 include/vcl/opengl/OpenGLContext.hxx|1 +
 slideshow/source/engine/opengl/TransitionerImpl.cxx |1 -
 vcl/source/opengl/OpenGLContext.cxx |   11 +--
 vcl/unx/gtk3/gtk3gtkinst.cxx|   13 +
 4 files changed, 23 insertions(+), 3 deletions(-)

New commits:
commit 1a547a566eba5943f9e4d9987baf4aee80846dd1
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 10 16:07:49 2017 +0100

hidpi+gtk3: move setting the opengl slide viewport

to when the window size is set, and adjust to gtk3 hidpi
scaling factor

Change-Id: Id9bd0defd0b6ae640ac57f88133d954202d4bcc3
Reviewed-on: https://gerrit.libreoffice.org/42143
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index 738f503269d2..b638d70ccc36 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -158,6 +158,7 @@ public:
 private:
 virtual bool initWindow();
 virtual void destroyCurrentContext();
+virtual void adjustToNewSize();
 
 protected:
 bool InitGL();
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx 
b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 95d97533325e..846b5ca8c0c0 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -344,7 +344,6 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( 
const Reference< presenta
 
 mpContext->swapBuffers();
 
-glViewport(0, 0, aCanvasArea.Width, aCanvasArea.Height);
 CHECK_GL_ERROR();
 
 return true;
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index d2a5fc8a963b..d5ade0408fc5 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -333,14 +333,21 @@ void OpenGLContext::restoreDefaultFramebuffer()
 
 void OpenGLContext::setWinPosAndSize(const Point &rPos, const Size& rSize)
 {
-if(m_xWindow)
+if (m_xWindow)
 m_xWindow->SetPosSizePixel(rPos, rSize);
-if( m_pChildWindow )
+if (m_pChildWindow)
 m_pChildWindow->SetPosSizePixel(rPos, rSize);
 
 GLWindow& rGLWin = getModifiableOpenGLWindow();
 rGLWin.Width = rSize.Width();
 rGLWin.Height = rSize.Height();
+adjustToNewSize();
+}
+
+void OpenGLContext::adjustToNewSize()
+{
+const GLWindow& rGLWin = getOpenGLWindow();
+glViewport(0, 0, rGLWin.Width, rGLWin.Height);
 }
 
 void OpenGLContext::setWinSize(const Size& rSize)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 2e76077521fc..72b71c9d7519 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -978,6 +978,19 @@ private:
 }
 #endif
 
+virtual void adjustToNewSize() override
+{
+#if GTK_CHECK_VERSION(3,16,0)
+if (m_pGLArea)
+{
+int scale = gtk_widget_get_scale_factor(m_pGLArea);
+int width = m_aGLWin.Width * scale;
+int height = m_aGLWin.Height * scale;
+glViewport(0, 0, width, height);
+}
+#endif
+}
+
 virtual void makeCurrent() override
 {
 if (isCurrent())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Caolán McNamara

 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ead4daeabd273c8b632d22a3330ca92dc58ec0f8
Author: CaolÃ¡n McNamara 
Date:   Thu Sep 7 16:39:12 2017 +0100

its really the contents we want to redraw

doesn't matter in practice though, but change it anyway

Change-Id: I9df8304f01c80a899bdd7219fc4ce459bda7de08
Reviewed-on: https://gerrit.libreoffice.org/42065
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 898df4499adc..60619cec48f9 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -3309,7 +3309,8 @@ cairo::SurfaceSharedPtr 
GtkSalGraphics::CreateSurface(const OutputDevice& /*rRef
 void GtkSalGraphics::WidgetQueueDraw() const
 {
 //request gtk to sync the entire contents
-gtk_widget_queue_draw(mpWindow);
+GtkWidget *pWidget = GTK_WIDGET(mpFrame->getFixedContainer());
+gtk_widget_queue_draw(pWidget);
 }
 
 namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Ivan Safonov license statement

2017-09-11 Thread Stephan Bergmann


On 07/17/2017 06:46 AM, Ivan Safonov wrote:

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.


put on file as 
 
"added Ivan Safonov"

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

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

2017-09-11 Thread Stephan Bergmann

 compilerplugins/clang/passparamsbyref.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bbfa7ab8ded08d73dcb86c5e9fa3692b629e5bf
Author: Stephan Bergmann 
Date:   Mon Sep 11 10:29:01 2017 +0200

clang::Type vs. llvm::Type ambiguity

Change-Id: Idba5c15f31b25b86e2bd7b9be348a17c184fec0d

diff --git a/compilerplugins/clang/passparamsbyref.cxx 
b/compilerplugins/clang/passparamsbyref.cxx
index 01362afc9a82..94c910e60cb5 100644
--- a/compilerplugins/clang/passparamsbyref.cxx
+++ b/compilerplugins/clang/passparamsbyref.cxx
@@ -188,7 +188,7 @@ bool PassParamsByRef::isFat(QualType type) {
 if (type->isIncompleteType()) {
 return false;
 }
-Type const * t2 = type.getTypePtrOrNull();
+clang::Type const * t2 = type.getTypePtrOrNull();
 return t2 != nullptr
 && compiler.getASTContext().getTypeSizeInChars(t2).getQuantity() > 64;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Stephan Bergmann

 compilerplugins/clang/cstylecast.cxx |6 +++---
 compilerplugins/clang/dyncastvisibility.cxx  |4 ++--
 compilerplugins/clang/faileddyncast.cxx  |4 ++--
 compilerplugins/clang/implicitboolconversion.cxx |8 +---
 compilerplugins/clang/refcounting.cxx|   20 ++--
 compilerplugins/clang/salbool.cxx|   10 ++
 compilerplugins/clang/useuniqueptr.cxx   |2 +-
 compilerplugins/clang/vclwidgets.cxx |   22 +++---
 8 files changed, 40 insertions(+), 36 deletions(-)

New commits:
commit b4c9c0d137a9157b4efef213267fc3a6b75ed4b0
Author: Stephan Bergmann 
Date:   Mon Sep 11 10:48:12 2017 +0200

More clang::*Type vs. llvm::*Type ambiguities

Change-Id: I21133976793ab018c633dda077029666308526db

diff --git a/compilerplugins/clang/cstylecast.cxx 
b/compilerplugins/clang/cstylecast.cxx
index 8504ca573dcb..b428b1d1503f 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -26,8 +26,8 @@ bool areSimilar(QualType type1, QualType type2) {
 if (!t2->isPointerType()) {
 return false;
 }
-auto t1a = t1->getAs();
-auto t2a = t2->getAs();
+auto t1a = t1->getAs();
+auto t2a = t2->getAs();
 t1 = t1a->getPointeeType().getTypePtr();
 t2 = t2a->getPointeeType().getTypePtr();
 } else if (t1->isMemberPointerType()) {
@@ -77,7 +77,7 @@ bool areSimilar(QualType type1, QualType type2) {
 
 QualType resolvePointers(QualType type) {
 while (type->isPointerType()) {
-type = type->getAs()->getPointeeType();
+type = type->getAs()->getPointeeType();
 }
 return type;
 }
diff --git a/compilerplugins/clang/dyncastvisibility.cxx 
b/compilerplugins/clang/dyncastvisibility.cxx
index 31d20fba80d7..8cae22fbe534 100644
--- a/compilerplugins/clang/dyncastvisibility.cxx
+++ b/compilerplugins/clang/dyncastvisibility.cxx
@@ -91,7 +91,7 @@ public:
 if (auto const t = td->getAs()) {
 td = t->getPointeeType();
 }
-while (auto const t = td->getAs()) {
+while (auto const t = td->getAs()) {
 td = t->getPointeeType();
 }
 auto const rtd = td->getAs();
@@ -104,7 +104,7 @@ public:
 return true;
 }
 auto ts = expr->getSubExpr()->getType();
-while (auto const t = ts->getAs()) {
+while (auto const t = ts->getAs()) {
 ts = t->getPointeeType();
 }
 auto const rts = ts->getAs();
diff --git a/compilerplugins/clang/faileddyncast.cxx 
b/compilerplugins/clang/faileddyncast.cxx
index 9be28f0a9f88..bdc9ce6e5fad 100644
--- a/compilerplugins/clang/faileddyncast.cxx
+++ b/compilerplugins/clang/faileddyncast.cxx
@@ -22,12 +22,12 @@ bool isAlwaysNull(CXXDynamicCastExpr const * expr) {
   QualType SrcType = expr->getSubExpr()->getType();
   QualType DestType = expr->getType();
 
-  if (const PointerType *SrcPTy = SrcType->getAs()) {
+  if (const clang::PointerType *SrcPTy = SrcType->getAs()) 
{
 SrcType = SrcPTy->getPointeeType();
 #if 0
 DestType = DestType->castAs()->getPointeeType();
 #else
-auto DstPTy = DestType->getAs();
+auto DstPTy = DestType->getAs();
 if (!DstPTy)
   return false;
 DestType = DstPTy->getPointeeType();
diff --git a/compilerplugins/clang/implicitboolconversion.cxx 
b/compilerplugins/clang/implicitboolconversion.cxx
index 9bb8be2182c0..1151a78f4384 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -412,7 +412,7 @@ bool 
ImplicitBoolConversion::TraverseCXXMemberCallExpr(CXXMemberCallExpr * expr)
 = ignoreParenImpCastAndComma(expr->getImplicitObjectArgument())
 ->getType();
 if (dyn_cast(expr->getCallee())->isArrow()) {
-ty = ty->getAs()->getPointeeType();
+ty = ty->getAs()->getPointeeType();
 }
 TemplateSpecializationType const * ct
 = ty->getAs();
@@ -913,7 +913,8 @@ bool ImplicitBoolConversion::isExternCFunctionCall(
 if (d != nullptr) {
 FunctionDecl const * fd = dyn_cast(d);
 if (fd != nullptr) {
-PointerType const * pt = fd->getType()->getAs();
+clang::PointerType const * pt = fd->getType()
+->getAs();
 QualType t2(pt == nullptr ? fd->getType() : pt->getPointeeType());
 *functionType = t2->getAs();
 assert(
@@ -927,7 +928,8 @@ bool ImplicitBoolConversion::isExternCFunctionCall(
 }
 VarDecl const * vd = dyn_cast(d);
 if (vd != nullptr) {
-PointerType const * pt = vd->getType()->getAs();
+clang::PointerType const * pt = vd->getType()
+->getAs();
 *functionType
 = ((pt == nullptr ? vd->getType() : pt

[Libreoffice-commits] dev-tools.git: esc-reporting/qa-tools.py

2017-09-11 Thread Xisco Fauli

 esc-reporting/qa-tools.py |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9cfbdbceaec0e635495839d412dcc8d8de827eff
Author: Xisco Fauli 
Date:   Mon Sep 11 11:05:21 2017 +0200

QA tools: ignore tdf 89903 here

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index c9f2073..c00c95d 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -688,8 +688,10 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 lResults['fixBugPing'][0].append(rowId)
 lResults['fixBugPing'][1].append('')
 
-if rowStatus == 'ASSIGNED' and 
datetime.datetime.strptime(row['last_change_time'], "%Y-%m-%dT%H:%M:%SZ") < 
cfg['inactiveAssigned'] and \
-'easyHack' not in row['keywords']:
+#Ignore tdf#89903
+if rowStatus == 'ASSIGNED' and \
+datetime.datetime.strptime(row['last_change_time'], 
"%Y-%m-%dT%H:%M:%SZ") < cfg['inactiveAssigned'] and \
+'easyHack' not in row['keywords'] and rowId != 89903:
 if 'inactiveAssigned' not in lResults:
 lResults['inactiveAssigned'] = [[],[]]
 lResults['inactiveAssigned'][0].append(rowId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2017-09-11 Thread Stephan Bergmann

 offapi/com/sun/star/xml/crypto/DigestID.idl |4 
 1 file changed, 4 insertions(+)

New commits:
commit 64fb35889d76d44ac293918c4e475d0272ec903e
Author: Stephan Bergmann 
Date:   Mon Sep 11 11:10:41 2017 +0200

Missing @since tags

Change-Id: Ic19041193264627baefd487ddd1d3c05088c027e

diff --git a/offapi/com/sun/star/xml/crypto/DigestID.idl 
b/offapi/com/sun/star/xml/crypto/DigestID.idl
index bf21c4285cfa..970eb11471d7 100644
--- a/offapi/com/sun/star/xml/crypto/DigestID.idl
+++ b/offapi/com/sun/star/xml/crypto/DigestID.idl
@@ -50,11 +50,15 @@ constants DigestID
 const long SHA256_1K = 4;
 
 /** identifier of SHA-512 algorithm
+
+@since LibreOffice 6.0
  */
 const long SHA512 = 5;
 
 /** identifier of SHA-512 algorithm that is applied to the first
 kilobyte of data.
+
+@since LibreOffice 6.0
  */
 const long SHA512_1K = 6;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 include/sot include/tools

2017-09-11 Thread Noel Grandin

 include/sfx2/docfilt.hxx |6 +++---
 include/sot/storage.hxx  |8 
 include/tools/stream.hxx |6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 80b04f3d767bced56c68839731c48284bc1a59e3
Author: Noel Grandin 
Date:   Mon Sep 11 10:32:30 2017 +0200

long->sal_Int32 in various Get/SetVersion

sal_Int32 appears to be the widest type we need here

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

diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 75b889f451d3..95fde5036d06 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -58,7 +58,7 @@ class SFX2_DLLPUBLIC SfxFilter
 OUString maProvider;
 
 SfxFilterFlags  nFormatType;
-sal_uIntPtr nVersion;
+sal_Int32   nVersion;
 SotClipboardFormatId lFormat;
 
 public:
@@ -98,8 +98,8 @@ public:
 boolUsesStorage() const { return GetFormat() != 
SotClipboardFormatId::NONE; }
 void SetURLPattern( const OUString& rStr );
 voidSetUIName( const OUString& rName ) { aUIName = rName; }
-voidSetVersion( sal_uIntPtr nVersionP ) { nVersion = 
nVersionP; }
-sal_uIntPtr   GetVersion() const { return nVersion; }
+voidSetVersion( sal_Int32 nVersionP ) { nVersion = nVersionP; }
+sal_Int32   GetVersion() const { return nVersion; }
 OUString GetSuffixes() const;
 OUString GetDefaultExtension() const;
 const OUString& GetServiceName() const { return aServiceName; }
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 2aa3ac0131d8..4ca0bc9d9387 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -40,7 +40,7 @@ friend class SotStorage;
 protected:
 virtual std::size_t GetData(void* pData, std::size_t nSize) override;
 virtual std::size_t PutData(const void* pData, std::size_t nSize) override;
-virtual sal_uInt64  SeekPos(sal_uInt64 nPos) override;
+virtual sal_uInt64  SeekPos(sal_uInt64 nPos) override;
 virtual voidFlushData() override;
 virtual ~SotStorageStream() override;
 public:
@@ -70,7 +70,7 @@ friend class SotStorageStream;
 boolm_bIsRoot;   // e.g.: File Storage
 boolm_bDelStm;
 OString m_aKey;  // aKey.Len != 0  -> encryption
-longm_nVersion;
+sal_Int32   m_nVersion;
 
 protected:
 virtual ~SotStorage() override;
@@ -96,11 +96,11 @@ public:
 
 const OString&  GetKey() const { return m_aKey;}
 
-voidSetVersion( long nVers )
+voidSetVersion( sal_Int32 nVers )
 {
 m_nVersion = nVers;
 }
-longGetVersion() const
+sal_Int32   GetVersion() const
 {
 return m_nVersion;
 }
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index cd7f20e57e91..0a4164e8dfa6 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -172,7 +172,7 @@ private:
 unsigned char   m_nCryptMask;
 
 // Userdata
-longm_nVersion;   // for external use
+sal_Int32   m_nVersion;   // for external use
 
 SvStream ( const SvStream& rStream ) = delete;
 SvStream&   operator=( const SvStream& rStream ) = delete;
@@ -384,8 +384,8 @@ public:
 boolIsWritable() const { return m_isWritable; }
 StreamMode  GetStreamMode() const { return m_eStreamMode; }
 
-longGetVersion() { return m_nVersion; }
-voidSetVersion( long n ) { m_nVersion = n; }
+sal_Int32   GetVersion() { return m_nVersion; }
+voidSetVersion( sal_Int32 n ) { m_nVersion = n; }
 
 friend SvStream& operator<<( SvStream& rStr, SvStrPtr f ); // for Manips
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Caolán McNamara

 vcl/unx/gtk3/gtk3gtkinst.cxx |  159 +--
 1 file changed, 140 insertions(+), 19 deletions(-)

New commits:
commit 22e39ae69825e0b83f03b343f22faf065602a72a
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 10 21:23:24 2017 +0100

gtk3: flicker-free opengl transitions

leave the GtkGLArea opengl context alone except for the final render into 
it,
create a new context for the slide transitions to play with

set up a pair of framebuffers, a scratch one to let the transitions render
into, the other to take a snapshot when the transition is finished with it 
and
then tell GtkGLArea we're ready to render it and when the callback comes 
around
copy the snapshot into it.

Change-Id: I3515614baf7eea0ff53c46edbaf9cf66f926eef2
Reviewed-on: https://gerrit.libreoffice.org/42144
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 72b71c9d7519..3cab164d80cf 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -910,6 +910,14 @@ class GtkOpenGLContext : public OpenGLContext
 GLWindow m_aGLWin;
 #if GTK_CHECK_VERSION(3,16,0)
 GtkWidget *m_pGLArea;
+GdkGLContext *m_pContext;
+guint m_nAreaFrameBuffer;
+guint m_nFrameBuffer;
+guint m_nRenderBuffer;
+guint m_nDepthBuffer;
+guint m_nFrameScratchBuffer;
+guint m_nRenderScratchBuffer;
+guint m_nDepthScratchBuffer;
 #endif
 
 public:
@@ -917,6 +925,14 @@ public:
 : OpenGLContext()
 #if GTK_CHECK_VERSION(3,16,0)
 , m_pGLArea(nullptr)
+, m_pContext(nullptr)
+, m_nAreaFrameBuffer(0)
+, m_nFrameBuffer(0)
+, m_nRenderBuffer(0)
+, m_nDepthBuffer(0)
+, m_nFrameScratchBuffer(0)
+, m_nRenderScratchBuffer(0)
+, m_nDepthScratchBuffer(0)
 #endif
 {
 }
@@ -947,8 +963,73 @@ private:
 GtkOpenGLContext* pThis = static_cast(context);
 pThis->m_pGLArea = nullptr;
 }
+
+static gboolean signalRender(GtkGLArea*, GdkGLContext*, gpointer window)
+{
+GtkOpenGLContext* pThis = static_cast(window);
+
+int scale = gtk_widget_get_scale_factor(pThis->m_pGLArea);
+int width = pThis->m_aGLWin.Width * scale;
+int height = pThis->m_aGLWin.Height * scale;
+
+glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
+
+glBindFramebuffer(GL_READ_FRAMEBUFFER, pThis->m_nAreaFrameBuffer);
+glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
+
+glBlitFramebuffer(0, 0, width, height, 0, 0, width, height,
+  GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, 
GL_NEAREST);
+
+gdk_gl_context_make_current(pThis->m_pContext);
+return true;
+}
+
 #endif
 
+virtual void adjustToNewSize() override
+{
+#if GTK_CHECK_VERSION(3,16,0)
+if (m_pGLArea)
+{
+int scale = gtk_widget_get_scale_factor(m_pGLArea);
+int width = m_aGLWin.Width * scale;
+int height = m_aGLWin.Height * scale;
+
+gtk_gl_area_make_current(GTK_GL_AREA(m_pGLArea));
+glBindRenderbuffer(GL_RENDERBUFFER, m_nRenderBuffer);
+glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB8, width, height);
+glBindRenderbuffer(GL_RENDERBUFFER, m_nDepthBuffer);
+glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, 
width, height);
+glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_nAreaFrameBuffer);
+glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, 
GL_COLOR_ATTACHMENT0_EXT,
+ GL_RENDERBUFFER_EXT, m_nRenderBuffer);
+glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, 
GL_DEPTH_ATTACHMENT_EXT,
+ GL_RENDERBUFFER_EXT, m_nDepthBuffer);
+
+gdk_gl_context_make_current(m_pContext);
+glBindRenderbuffer(GL_RENDERBUFFER, m_nRenderBuffer);
+glBindRenderbuffer(GL_RENDERBUFFER, m_nDepthBuffer);
+glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_nFrameBuffer);
+glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, 
GL_COLOR_ATTACHMENT0_EXT,
+ GL_RENDERBUFFER_EXT, m_nRenderBuffer);
+glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, 
GL_DEPTH_ATTACHMENT_EXT,
+ GL_RENDERBUFFER_EXT, m_nDepthBuffer);
+glViewport(0, 0, width, height);
+
+glBindRenderbuffer(GL_RENDERBUFFER, m_nRenderScratchBuffer);
+glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB8, width, height);
+glBindRenderbuffer(GL_RENDERBUFFER, m_nDepthScratchBuffer);
+glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, 
width, height);
+glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_nFrameScratchBuffer);
+glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, 
GL_COL

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

2017-09-11 Thread Szymon Kłos

 dev/null  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   15 ---
 sw/source/core/edit/edfcol.cxx|   15 +--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   10 +-
 4 files changed, 6 insertions(+), 34 deletions(-)

New commits:
commit 653e49371444e5ae48b1570e85822577fb8fd147
Author: Szymon KÅos 
Date:   Mon Sep 11 10:53:47 2017 +0200

tdf#112304 Revert "Watermark: not visible if page background was set"

This reverts commit 39c08074a286855dd014ce1c30b8f7ef95b10242.
Fixed by: I69517efb7d82acd719d6a27a09ba61554dbf1ec9

Change-Id: Icd45b3f55292670ff7338a367eba212453a0687e
Reviewed-on: https://gerrit.libreoffice.org/42155
Tested-by: Jenkins 
Reviewed-by: Szymon KÅos 

diff --git a/sw/qa/extras/ooxmlexport/data/watermark-layer.docx 
b/sw/qa/extras/ooxmlexport/data/watermark-layer.docx
deleted file mode 100755
index 9428686c1bad..
Binary files a/sw/qa/extras/ooxmlexport/data/watermark-layer.docx and /dev/null 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 5f45cbcc7109..693d18d59fb4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -31,10 +31,8 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
-#include 
 
 class Test : public SwModelTestBase
 {
@@ -1014,19 +1012,6 @@ DECLARE_OOXMLEXPORT_TEST(testActiveXControlAtRunEnd, 
"activex_control_at_run_end
 
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,getProperty(xPropertySet2,"AnchorType"));
 }
 
-DECLARE_OOXMLEXPORT_TEST(testWatermarkLayer, "watermark-layer.docx")
-{
-// Watermark was not visible if page background was set.
-
-SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
-CPPUNIT_ASSERT(pTextDoc);
-SdrPage* pPage = 
pTextDoc->GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
-SdrObject* pObject = pPage->GetObj(0);
-
-CPPUNIT_ASSERT(pObject);
-CPPUNIT_ASSERT_EQUAL(static_cast(1), pObject->GetLayer().get());
-}
-
 DECLARE_OOXMLEXPORT_TEST(testActiveXOptionButtonGroup, 
"activex_option_button_group.docx")
 {
 // Optionbutton groups were not handled
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 17eeea9847b5..1b29cbedaf59 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -68,7 +68,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -460,8 +459,7 @@ SfxWatermarkItem SwEditShell::GetWatermark()
 void lcl_placeWatermarkInHeader(const SfxWatermarkItem& rWatermark,
 const uno::Reference& xModel,
 const uno::Reference& 
xPageStyle,
-const uno::Reference& xHeaderText,
-sal_Int16 nLayer)
+const uno::Reference& xHeaderText)
 {
 uno::Reference xMultiServiceFactory(xModel, 
uno::UNO_QUERY);
 OUString aShapeServiceName = "com.sun.star.drawing.CustomShape";
@@ -583,7 +581,6 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& 
rWatermark,
 xPropertySet->setPropertyValue("Transformation", 
uno::makeAny(aMatrix));
 xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT, 
uno::makeAny(static_cast(text::HoriOrientation::CENTER)));
 xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT, 
uno::makeAny(static_cast(text::VertOrientation::CENTER)));
-xPropertySet->setPropertyValue(UNO_NAME_MISC_OBJ_LAYERID, 
uno::makeAny(nLayer));
 
 uno::Reference xTextRange(xShape, uno::UNO_QUERY);
 xTextRange->setString(rWatermark.GetText());
@@ -629,8 +626,6 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& 
rWatermark)
 uno::Reference 
xStyleFamilies(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
 uno::Reference 
xStyleFamily(xStyleFamilies->getByName("PageStyles"), uno::UNO_QUERY);
 
-sal_Int16 nHeavenId = 
GetDoc()->getIDocumentDrawModelAccess().GetHeavenId().get();
-
 std::set aUsedPageStyles = lcl_getUsedPageStyles(this);
 for (const OUString& rPageStyleName : aUsedPageStyles)
 {
@@ -656,16 +651,16 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& 
rWatermark)
 uno::Reference xHeaderTextRight;
 
 xPageStyle->getPropertyValue(UNO_NAME_HEADER_TEXT) >>= xHeaderText;
-lcl_placeWatermarkInHeader(rWatermark, xModel, xPageStyle, 
xHeaderText, nHeavenId);
+lcl_placeWatermarkInHeader(rWatermark, xModel, xPageStyle, 
xHeaderText);
 
 xPageStyle->getPropertyValue(UNO_NAME_HEADER_TEXT_FIRST) >>= 
xHeaderTextFirst;
-lcl_placeWatermarkInHeader(rWatermark, xModel, xPageStyle, 
xHeaderTextFirst, nHeavenId);
+lcl_placeWatermarkInHeader(rWatermark, xModel, xPageStyle, 
xHeaderTextFirst);
 
 xPageStyle->getPropertyValue(UNO_NAM

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

2017-09-11 Thread Michael Stahl

On 09.09.2017 22:52, Thorsten Behrens wrote:
> jan Iversen wrote:
>> commit 25e395c7e07015fb5c9b88978093889315d32f3c
>> Author: jan Iversen 
>> Date:   Sat Sep 9 20:59:52 2017 +0200
>>
>> iOS, update gbuild platform
>>
>> IOS => iOS

this is a rather inconsistent change: the files are now called "iOS-*"
while the $(OS) variable is still "IOS", so this only works on
case-insensitive file systems; cf. solenv/gbuild/gbuild.mk:

> # Include platform/cpu/compiler specific config/definitions
> include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk

do you want to change the value of $(OS) too?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-09-11 Thread Tor Lillqvist

> do you want to change the value of $(OS) too?
>
>
Which would make it inconsistent with all the other $(OS) values, which all
are UPPER-CASE ONLY, no?

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

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

2017-09-11 Thread Miklos Vajna

 connectivity/Library_file.mk|1 
 connectivity/source/drivers/calc/CDatabaseMetaData.cxx  |  211 --
 connectivity/source/drivers/component/CDatabaseMetaData.cxx |  247 
 connectivity/source/drivers/writer/WDatabaseMetaData.cxx|  211 --
 connectivity/source/inc/calc/CDatabaseMetaData.hxx  |   11 
 connectivity/source/inc/component/CDatabaseMetaData.hxx |   52 ++
 connectivity/source/inc/writer/WDatabaseMetaData.hxx|   11 
 7 files changed, 307 insertions(+), 437 deletions(-)

New commits:
commit 020c3eebc2435c4a03076c99e36b5f144e358fe5
Author: Miklos Vajna 
Date:   Mon Sep 11 09:04:51 2017 +0200

connectivity DatabaseMetaData: pull out OComponent from OCalc/Writer

Only getURL() and getTables() is custom, the rest can be shared.

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

diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index d44f27e247ac..e6ff6bcfa29d 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,file,\
 
 $(eval $(call gb_Library_add_exception_objects,file,\
connectivity/source/drivers/component/CColumns \
+   connectivity/source/drivers/component/CDatabaseMetaData \
connectivity/source/drivers/component/CPreparedStatement \
connectivity/source/drivers/component/CResultSet \
connectivity/source/drivers/component/CStatement \
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx 
b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 795c72103152..4f44dce752ed 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -38,6 +38,7 @@
 
 using namespace connectivity::calc;
 using namespace connectivity::file;
+using namespace connectivity::component;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbcx;
@@ -46,192 +47,14 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::sheet;
 
-
-OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon)
:ODatabaseMetaData(_pCon)
+OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon)
:OComponentDatabaseMetaData(_pCon)
 {
 }
 
-
 OCalcDatabaseMetaData::~OCalcDatabaseMetaData()
 {
 }
 
-
-Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
-{
-::osl::MutexGuard aGuard( m_aMutex );
-
-ODatabaseMetaDataResultSet* pResult = new 
ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
-Reference< XResultSet > xRef = pResult;
-
-static ODatabaseMetaDataResultSet::ORows aRows;
-if(aRows.empty())
-{
-ODatabaseMetaDataResultSet::ORow aRow;
-
-aRows.reserve(6);
-aRow.reserve(18);
-
-aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
-aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
-aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535));
-aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); // 
ORowSetValue((sal_Int32)ColumnValue::NULLABLE)
-aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-aRow.push_back(new 
ORowSetValueDecorator((sal_Int32)ColumnSearch::CHAR));
-aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-aRow.push_back(new ORowSetValueDecorator((sal_Int32)10));
-
-
-aRows.push_back(aRow);
-
-aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL"));
-aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
-aRow[3] = ODatabaseMetaDataResultSet::get0Value();
-aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-aRow[15] = ODatabaseMetaDataResultSet::get0Value();
-aRows.push_back(aRow);
-
-aRow[1] = new ORowSetValueDecorator(OUString("BOOL"));
-aRow[2] = new ORowSetValueDecorator(DataType::BIT);
-aRow[3] = new ORowSe

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

2017-09-11 Thread Justin Luth

 oox/source/vml/vmlshapecontext.cxx|2 +-
 sw/qa/extras/ooxmlexport/data/tdf97648_relativeWidth.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   11 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit c14be5f5545768fc06bd1e3900e076dc28be2649
Author: Justin Luth 
Date:   Thu Sep 7 21:07:40 2017 -0400

tdf#97648 vml import: fix horizontalLine percentage

o:hrpct (horizontal line width as a percentage) was
overwriting valid widths with an invalid string since 2012.

For some reason, commit 96c7ab19b77c2f90acd4c34552474b0f616f48a7
thought it would be a good idea to set the width as a
percent string, even though the code doesn't seem to
handle percent strings. (like "100%").

The logic was that since 100% width is saved as nWidth=0 by
Microsoft, so it doesn't make a difference.  Well, it does make
a difference for every other percentage, since nWidth IS provided
for those. That width value is the only thing LO can currently
handle - it does nothing with the maWidthPercent for these
horizontal lines.

Saving hrpct to maWidthPercent seems like the proper variable
for this data, but once again, this doesn't in fact change much
in LO. It certainly doesn't affect the width of the line.

Since this patch only affects o:hr shapes, this is a pretty
safe change, for the benefit of all <100% o:hrpct's.

An "assert false" and "make check" only showed docs containing
100%, width=0 samples. I added a unit test for several other
lengths. I also hacked that test to provide a width value for the
100% line - even though that is not natural - just so it can be
seen in LO.

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

diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index f49d0ddfae04..4ddd8c5d8e0a 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -304,7 +304,7 @@ ShapeTypeContext::ShapeTypeContext( ContextHandler2Helper 
const & rParent, Shape
 // - given width is used only if explicit o:hrpct="0" is given
 OUString hrpct = rAttribs.getString( O_TOKEN( hrpct ), "1000" );
 if( hrpct != "0" )
-mrTypeModel.maWidth = OUString::number( hrpct.toInt32() / 10 ) + 
"%";
+mrTypeModel.maWidthPercent = OUString::number( hrpct.toInt32() );
 }
 
 // stroke settings (may be overridden by v:stroke element later)
diff --git a/sw/qa/extras/ooxmlexport/data/tdf97648_relativeWidth.docx 
b/sw/qa/extras/ooxmlexport/data/tdf97648_relativeWidth.docx
new file mode 100644
index ..8419113f1617
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf97648_relativeWidth.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 693d18d59fb4..a89799b87e39 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -9,6 +9,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -204,6 +205,16 @@ DECLARE_OOXMLEXPORT_TEST(tdf105490_negativeMargins, 
"tdf105490_negativeMargins.d
 }
 #endif
 
+DECLARE_OOXMLEXPORT_TEST(testTdf97648_relativeWidth,"tdf97648_relativeWidth.docx")
+{
+int i = mbExported ? 0 : 1;
+//divide everything by 10 to avoid rounding errors etc
+CPPUNIT_ASSERT_EQUAL( sal_Int32(15995/10), 
getShape(++i)->getSize().Width/10);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(8001/10),  
getShape(++i)->getSize().Width/10);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(4001/10),  
getShape(++i)->getSize().Width/10);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(1600/10),  
getShape(++i)->getSize().Width/10);
+}
+
 
DECLARE_OOXMLEXPORT_TEST(testTdf104061_tableSectionColumns,"tdf104061_tableSectionColumns.docx")
 {
 CPPUNIT_ASSERT_MESSAGE("There should be two or three pages", getPages() <= 
3 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .git-hooks/pre-commit

2017-09-11 Thread Caolán McNamara

 .git-hooks/pre-commit |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 3fa79c0fa5619911e7a251e2b3a837fdaa426f48
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 11 10:44:06 2017 +0100

disallow .ui translatable entries without context at checkin

Change-Id: Iece6ae3c4eabad4cd113f469495d2c42833a7b92
Reviewed-on: https://gerrit.libreoffice.org/42157
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
index 4a21655e8cfe..07569905488b 100755
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@@ -92,6 +92,11 @@ sub check_whitespaces($)
 {
 bad_line("use tooltip_text instead of tooltip_markup", $_, 
$src_limited);
 }
+if ((/translatable="yes"/) and not(/context=/))
+{
+bad_line("translatable .ui file line without context", $_, 
$src_limited);
+}
+
 }
 }
 if ( $found_bad)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Dennis Francis

 sc/source/ui/app/transobj.cxx |   11 ++-
 sc/source/ui/inc/transobj.hxx |1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 157d1a774086d7344d443005442682f2ca3c01a9
Author: Dennis Francis 
Date:   Wed Sep 6 20:35:11 2017 +0530

tdf#108299: Limit the size of bitmap created for clipboard...

to screen size. This is to avoid hang in ScTransferObj::GetData()
for BMP/PNG flavors due to unhandled structured exception when
opengl is used and user copies full rows in the spreadsheet.

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

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index d24e83b7382b..9f80b62a19f1 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "transobj.hxx"
 #include "patattr.hxx"
@@ -64,6 +65,7 @@
 #include "cellsuno.hxx"
 #include "stringutil.hxx"
 #include "formulaiter.hxx"
+#include "tabvwsh.hxx"
 #include 
 
 using namespace com::sun::star;
@@ -174,6 +176,8 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const 
TransferableObjectDesc
 aBlock = ScRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
 nVisibleTab = nTab1;// valid table as default
 
+aMaxBitMapSize = 
ScTabViewShell::GetActiveViewShell()->GetViewFrame()->GetWindow().GetSizePixel();
+
 tools::Rectangle aMMRect = pDoc->GetMMRect( nCol1,nRow1, nCol2,nRow2, 
nTab1 );
 aObjDesc.maSize = aMMRect.GetSize();
 PrepareOLE( aObjDesc );
@@ -354,8 +358,13 @@ bool ScTransferObj::GetData( const 
datatransfer::DataFlavor& rFlavor, const OUSt
 tools::Rectangle aMMRect = pDoc->GetMMRect( aBlock.aStart.Col(), 
aBlock.aStart.Row(),
  aBlock.aEnd.Col(), 
aBlock.aEnd.Row(),
  aBlock.aStart.Tab() );
+
 ScopedVclPtrInstance< VirtualDevice > pVirtDev;
-pVirtDev->SetOutputSizePixel( pVirtDev->LogicToPixel( 
aMMRect.GetSize(), MapUnit::Map100thMM ) );
+Size aSize = pVirtDev->LogicToPixel( aMMRect.GetSize(), 
MapUnit::Map100thMM );
+// Limit the width and height to screen area in pixel scale
+aSize.Width() = std::min( aMaxBitMapSize.Width(), aSize.Width() );
+aSize.Height() = std::min( aMaxBitMapSize.Height(), aSize.Height() 
);
+pVirtDev->SetOutputSizePixel( aSize );
 
 PaintToDev( pVirtDev, pDoc, 1.0, aBlock );
 
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index b897a727937e..f40de060d413 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -42,6 +42,7 @@ class ScTransferObj : public TransferableHelper
 private:
 ScDocument* pDoc;
 ScRange aBlock;
+SizeaMaxBitMapSize;
 SCROW   nNonFiltered;   // non-filtered rows
 TransferableObjectDescriptoraObjDesc;
 SfxObjectShellRef   aDocShellRef;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread jani libreoffice

It builds on macosx which is the only source for iOS so I do no really see a 
need to change the file names.

I followed the all caps standard for OS which makes sense to me.

rgds
jan i

Sent from my iPad

> On 11 Sep 2017, at 12:22, Tor Lillqvist  wrote:
> 
> 
>> do you want to change the value of $(OS) too?
>> 
> 
> Which would make it inconsistent with all the other $(OS) values, which all 
> are UPPER-CASE ONLY, no?
> 
> --tml
>  
> 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-09-11 Thread Johnny_M

 vcl/headless/svpprn.cxx  |2 +-
 vcl/inc/win/salgdi.h |2 +-
 vcl/inc/win/wincomp.hxx  |2 +-
 vcl/source/app/help.cxx  |2 +-
 vcl/source/control/button.cxx|4 ++--
 vcl/source/edit/textdoc.cxx  |   18 +-
 vcl/source/filter/sgf.ini|2 +-
 vcl/source/filter/sgvmain.hxx|4 ++--
 vcl/source/filter/sgvtext.cxx|2 +-
 vcl/source/gdi/bitmap.cxx|2 +-
 vcl/source/window/menufloatingwindow.cxx |2 +-
 vcl/source/window/tabdlg.cxx |2 +-
 vcl/source/window/winproc.cxx|6 +++---
 vcl/unx/generic/print/genprnpsp.cxx  |2 +-
 vcl/win/window/salobj.cxx|4 ++--
 15 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 59010ca14ba07f0a1d6f662bb1f8fbad33f3c654
Author: Johnny_M 
Date:   Sun Sep 10 21:40:52 2017 +0200

Translate German comments/debug strings (leftovers in dirs vbahelper and 
vcl)

Translates leftovers found using a custom regex.

Additionally:
- Translated the "SGV Fonts for StarView" INI file parameter group
  in vcl/source/filter/sgf.ini and .../sgvtext.cxx

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

diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 92a11e99d03a..488f17bb4084 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -217,7 +217,7 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* 
pList )
 for( ::std::vector< OUString >::iterator it = aPrinters.begin(); it != 
aPrinters.end(); ++it )
 {
 const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) );
-// Neuen Eintrag anlegen
+// create new entry
 SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
 pInfo->maPrinterName= *it;
 pInfo->maDriver = rInfo.m_aDriverName;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index acc64e0ac17c..38edc94d0d37 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -174,7 +174,7 @@ private:
 COLORREFmnTextColor;// TextColor
 RGNDATA*mpClipRgnData;  // ClipRegion-Data
 RGNDATA*mpStdClipRgnData;   // Cache 
Standard-ClipRegion-Data
-int mnPenWidth; // Linienbreite
+int mnPenWidth; // line width
 
 LogicalFontInstance* GetWinFontEntry(int nFallbackLevel);
 
diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index c2182c4ff255..8fd774fc6eb1 100644
--- a/vcl/inc/win/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -196,7 +196,7 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
 #endif
 
 
-// - 5.0-Erweiterungen -
+// - 5.0 extensions -
 
 #ifndef COLOR_GRADIENTACTIVECAPTION
 #define COLOR_GRADIENTACTIVECAPTION 27
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 1d8faa415222..e2410e596b62 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -630,7 +630,7 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, 
sal_uInt16 nHelpWinStyle, Quic
 
pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( 
rHelpArea.TopLeft() ),
 
pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( 
rHelpArea.BottomRight() ) );
 
-// Welche Position vom Rechteck?
+// which position of the rectangle?
 aPos = devHelpArea.Center();
 
 if ( nStyle & QuickHelpFlags::Left )
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 705d8d5f0154..4d6d26b318f5 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2599,7 +2599,7 @@ bool RadioButton::SetModeRadioImage( const Image& rImage )
 
 void RadioButton::SetState( bool bCheck )
 {
-// TabStop-Flag richtig mitfuehren
+// carry the TabStop flag along correctly
 if ( bCheck )
 mpWindowImpl->mnStyle |= WB_TABSTOP;
 else
@@ -3691,7 +3691,7 @@ Size CheckBox::CalcMinimumSize( long nMaxWidth ) const
 {
 // is this still correct ? since the checkbox now
 // shows a focus rect it should be 2 pixels wider and longer
-/* da ansonsten im Writer die Control zu weit oben haengen
+/* since otherwise the controls in the Writer hang too far up
 aSize.Width() += 2;
 aSize.Height() += 2;
 */
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 70976cb35530..3daf97e2761b 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -193,9 +193,9 @@ void TextNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 
nNew )
 }
 }
 
-SAL_WARN_IF( rAttrib.GetStart() > rAttrib.GetEnd(), "vcl", "Expand: 
Attribut verdreht!" );
-

[Libreoffice-commits] core.git: hwpfilter/source i18nlangtag/source idlc/source jvmfwk/plugins jvmfwk/source libreofficekit/qa lotuswordpro/source

2017-09-11 Thread Noel Grandin

 hwpfilter/source/attributes.cxx   |2 
 i18nlangtag/source/isolang/isolang.cxx|6 -
 i18nlangtag/source/languagetag/languagetag.cxx|   80 +++---
 idlc/source/astinterface.cxx  |3 
 idlc/source/idlccompile.cxx   |8 -
 idlc/source/options.cxx   |4 
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx   |9 -
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx|2 
 jvmfwk/source/framework.cxx   |3 
 libreofficekit/qa/tilebench/tilebench.cxx |   32 ++---
 lotuswordpro/source/filter/lwpbulletstylemgr.cxx  |2 
 lotuswordpro/source/filter/lwpgrfobj.cxx  |2 
 lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx |2 
 lotuswordpro/source/filter/xfilter/xftextspan.cxx |2 
 14 files changed, 77 insertions(+), 80 deletions(-)

New commits:
commit 7ca4ea54b4d610104df1b88ae5b04c2081a4a429
Author: Noel Grandin 
Date:   Mon Sep 11 11:29:40 2017 +0200

clang-tidy modernize-use-emplace in hwpfilter..lotuswordpro

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

diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx
index a59850e51fca..e8da00ec2592 100644
--- a/hwpfilter/source/attributes.cxx
+++ b/hwpfilter/source/attributes.cxx
@@ -139,7 +139,7 @@ void AttributeListImpl::addAttribute(   const OUString 
&sName ,
 const OUString &sType ,
 const OUString &sValue )
 {
-m_pImpl->vecAttribute.push_back( TagAttribute( sName , sType , sValue ) );
+m_pImpl->vecAttribute.emplace_back( sName , sType , sValue );
 }
 
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index cee528e5ebde..232f05c652dd 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1488,17 +1488,17 @@ LanguageType MsLangId::convertUnxByteStringToLanguage(
 for (const Bcp47CountryEntry* pEntry = aImplBcp47CountryEntries;
 pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
 {
-aVec.push_back( LanguagetagMapping( pEntry->getTagString(), 
pEntry->mnLang));
+aVec.emplace_back( pEntry->getTagString(), pEntry->mnLang);
 }
 for (const IsoLanguageScriptCountryEntry* pEntry = 
aImplIsoLangScriptEntries;
 pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
 {
-aVec.push_back( LanguagetagMapping( pEntry->getTagString(), 
pEntry->mnLang));
+aVec.emplace_back( pEntry->getTagString(), pEntry->mnLang);
 }
 for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
 pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
 {
-aVec.push_back( LanguagetagMapping( pEntry->getTagString(), 
pEntry->mnLang));
+aVec.emplace_back( pEntry->getTagString(), pEntry->mnLang);
 }
 return aVec;
 }
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index eecb7f42985d..684364ff1c81 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2149,15 +2149,15 @@ LanguageTag & LanguageTag::makeFallback()
 if (!aCountry.isEmpty())
 {
 if (bIncludeFullBcp47)
-aVec.push_back( aLanguage + "-" + aCountry);
+aVec.emplace_back(aLanguage + "-" + aCountry);
 if (aLanguage == "zh")
 {
 // For zh-HK or zh-MO also list zh-TW, for all other zh-XX also
 // list zh-CN.
 if (aCountry == "HK" || aCountry == "MO")
-aVec.push_back( aLanguage + "-TW");
+aVec.emplace_back(aLanguage + "-TW");
 else if (aCountry != "CN")
-aVec.push_back( aLanguage + "-CN");
+aVec.emplace_back(aLanguage + "-CN");
 aVec.push_back( aLanguage);
 }
 else if (aLanguage == "sh")
@@ -2165,11 +2165,11 @@ LanguageTag & LanguageTag::makeFallback()
 // Manual list instead of calling
 // LanguageTag( "sr-Latn-" + aCountry).getFallbackStrings( 
true)
 // that would also include "sh-*" again.
-aVec.push_back( "sr-Latn-" + aCountry);
-aVec.push_back( "sr-Latn");
-aVec.push_back( "sh");  // legacy with script, before default 
script with country
-aVec.push_back( "sr-" + aCountry);
-aVec.push_back( "sr");
+aVec.emplace_back("sr-Latn-" + aCountry);
+aVec.emplace_back("sr-Latn");
+aVec.emplace_back("sh");  // legacy with script, before 
default script with country
+

Weekly QA Report (W36-2017)

2017-09-11 Thread Xisco Fauli

Hello,

What have happened in QA in the last 7 days?

  * 114 have been created, of which, 32 are still unconfirmed ( Total
Unconfirmed bugs: 400 )
Link: http://tinyurl.com/y7j69xlh

  * 1173 comments have been written.

== STATUS CHANGED ==
  * 10 bugs have been changed to 'ASSIGNED'.
Link: http://tinyurl.com/ybwv898c
Done by: Xisco Faulí ( 2 ), Yousuf Philips (jay) ( 2 ), Tamás Zolnai
( 1 ), Miklos Vajna ( 1 ), Vasily Melenchuk (CIB) ( 1 ), Justin L ( 1 ),
Bartosz ( 1 ), Eike Rathke ( 1 )

  * 2 bugs have been changed to 'CLOSED'.
Link: http://tinyurl.com/y9rg4x8f
Done by: roumanet ( 1 ), Eike Rathke ( 1 )

  * 53 bugs have been changed to 'NEEDINFO'.
Link: http://tinyurl.com/ya7l8jxe
Done by: Jean-Baptiste Faure ( 14 ), Buovjaga ( 12 ), Xisco Faulí (
10 ), Heiko Tietze ( 4 ), Alex Thurgood ( 3 ), raal ( 2 ), Timur ( 2 ),
dieterp ( 2 ), V Stuart Foote ( 1 ), Julien Nabet ( 1 ), m.a.riosv ( 1
), Jacques Guilleron ( 1 )

  * 75 bugs have been changed to 'NEW'.
Link: http://tinyurl.com/yd88mxp3
Done by: Buovjaga ( 16 ), Heiko Tietze ( 12 ), Xisco Faulí ( 9 ),
Alex Thurgood ( 6 ), Thomas Lendo ( 4 ), Regina Henschel ( 3 ), raal ( 3
), Aron Budea ( 3 ), Telesto ( 2 ), Yousuf Philips (jay) ( 2 ),
Jean-Baptiste Faure ( 2 ), dieterp ( 2 ), V Stuart Foote ( 1 ), Thorsten
Behrens (CIB) ( 1 ), Kevin Suo ( 1 ), Julien Nabet ( 1 ), robert ( 1 ),
OfficeUser ( 1 ), m.a.riosv ( 1 ), lvm ( 1 ), Harald Koester ( 1 ),
Caolán McNamara ( 1 ), Terje Bråten ( 1 )

  * 3 bugs have been changed to 'REOPENED'.
Link: http://tinyurl.com/ybhm8nr3
Done by: stephan ( 1 ), mohn.mail ( 1 ), Eric Trogneux ( 1 )

  * 33 bugs have been changed to 'RESOLVED DUPLICATE'.
Link: http://tinyurl.com/ycyr4org
Done by: Alex Thurgood ( 5 ), Xisco Faulí ( 4 ), Buovjaga ( 4 ),
Justin L ( 4 ), Timur ( 2 ), Miklos Vajna ( 1 ), Thomas Lendo ( 1 ),
Szymon Kłos ( 1 ), Regina Henschel ( 1 ), raal ( 1 ), Tomaz Vajngerl ( 1
), Mike Kaganski ( 1 ), m.a.riosv ( 1 ), Jan Holesovsky ( 1 ),
Jean-Baptiste Faure ( 1 ), Adolfo Jayme ( 1 ), Christian Lohmaier ( 1 ),
Omar Baez ( 1 ), Katarina Behrens (CIB) ( 1 )

  * 51 bugs have been changed to 'RESOLVED FIXED'.
Link: http://tinyurl.com/ya62w7wm
Done by: Tamás Zolnai ( 5 ), Caolán McNamara ( 5 ), Andreas Brandner
( 5 ), Michael Stahl ( 4 ), Justin L ( 4 ), Eike Rathke ( 3 ), Aron
Budea ( 3 ), Xisco Faulí ( 2 ), V Stuart Foote ( 2 ), Buovjaga ( 2 ),
Jan Holesovsky ( 2 ), Christian Lohmaier ( 2 ), Winfried Donkers ( 1 ),
Miklos Vajna ( 1 ), Vasily Melenchuk (CIB) ( 1 ), Szymon Kłos ( 1 ),
Julien Nabet ( 1 ), Yousuf Philips (jay) ( 1 ), Muhammet Kara ( 1 ),
Mike Kaganski ( 1 ), Michael Meeks ( 1 ), Sophia Schroeder ( 1 ), Adolfo
Jayme ( 1 ), Dennis Francis ( 1 )

  * 1 bug has been changed to 'RESOLVED INSUFFICIENTDATA'.
Link: http://tinyurl.com/yda5ejd5
Done by: Jean-Baptiste Faure ( 1 )

  * 1 bug has been changed to 'RESOLVED INVALID'.
Link: http://tinyurl.com/y8qrj7bd
Done by: V Stuart Foote ( 1 )

  * 1 bug has been changed to 'RESOLVED MOVED'.
Link: http://tinyurl.com/y7svwvug
Done by: Aron Budea ( 1 )

  * 10 bugs have been changed to 'RESOLVED NOTABUG'.
Link: http://tinyurl.com/yarhapou
Done by: Buovjaga ( 3 ), Xisco Faulí ( 2 ), Telesto ( 1 ), raal ( 1
), Mike Kaganski ( 1 ), Jacques Guilleron ( 1 ), grac ( 1 )

  * 5 bugs have been changed to 'RESOLVED NOTOURBUG'.
Link: http://tinyurl.com/y8z2fygj
Done by: Buovjaga ( 1 ), Stephan Bergmann ( 1 ), rundr.walther ( 1
), Jean-Baptiste Faure ( 1 ), Caolán McNamara ( 1 )

  * 8 bugs have been changed to 'RESOLVED WONTFIX'.
Link: http://tinyurl.com/ycvd9fxv
Done by: Heiko Tietze ( 3 ), Thomas Lendo ( 1 ), Szymon Kłos ( 1 ),
Yousuf Philips (jay) ( 1 ), andreas_k ( 1 ), Justin L ( 1 )

  * 25 bugs have been changed to 'RESOLVED WORKSFORME'.
Link: http://tinyurl.com/y7ql2z6v
Done by: Buovjaga ( 3 ), Yousuf Philips (jay) ( 3 ), Xisco Faulí ( 2
), Thomas Lendo ( 2 ), Timur ( 2 ), Winfried Donkers ( 1 ), V Stuart
Foote ( 1 ), Telesto ( 1 ), Maxim Monastirsky ( 1 ), Mike ( 1 ),
andreas_k ( 1 ), Justin L ( 1 ), haim kilov ( 1 ), Gabriel Muñoz ( 1 ),
David Berky ( 1 ), Christian Lohmaier ( 1 ), Arnaud Versini ( 1 ), BG ( 1 )

  * 13 bugs have been changed to 'UNCONFIRMED'.
Link: http://tinyurl.com/yadcfn8u
Done by: Buovjaga ( 1 ), Chris Bird ( 1 ), Davi P ( 1 ), dynapb ( 1
), PaulJayD ( 1 ), Marc Oggier ( 1 ), Peter Toye ( 1 ), l2683566 ( 1 ),
jetibest ( 1 ), Ilgiz ( 1 ), fhdata ( 1 ), Aron Budea ( 1 ), Claude ( 1 )

  * 16 bugs have been changed to 'VERIFIED FIXED'.
Link: http://tinyurl.com/ydh8otb9
Done by: Xisco Faulí ( 7 ), Alex Thurgood ( 3 ), Jacques Guilleron (
3 ), Julien Nabet ( 1 ), Óvári ( 1 ), Jean-Baptiste Faure ( 1 )

== KEYWORDS ADDED ==
  * 'accessibility' has been added to 1 bug.
Link: http://tinyurl.com/yawe49uc
Done by: perie_gut ( 1 )

  * 'bibisectRequest' has been added to 3 bugs.
Link: http://tinyurl.com/yck8fb2b

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

2017-09-11 Thread Jochen Nitschke

 svtools/source/contnr/treelistbox.cxx |4 
 sw/source/filter/html/htmltabw.cxx|   33 +++--
 vcl/unx/gtk/salprn-gtk.cxx|4 
 3 files changed, 15 insertions(+), 26 deletions(-)

New commits:
commit 3b2df17f8e1b8b4d90dda691c79ffda9d2643bae
Author: Jochen Nitschke 
Date:   Mon Sep 11 07:00:49 2017 +0200

cppcheck: knownConditionTrueFalse

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

diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index d0a7e2003738..894fa12ef6f4 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2724,7 +2724,6 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, 
long nLine, vcl::Render
 bool bInUse = rEntry.HasInUseEmphasis();
 // if a ClipRegion was set from outside, we don't have to reset it
 const WinBits nWindowStyle = GetStyle();
-const bool bResetClipRegion = false;
 const bool bHideSelection = (nWindowStyle & WB_HIDESELECTION) !=0 && 
!HasFocus();
 const StyleSettings& rSettings = 
rRenderContext.GetSettings().GetStyleSettings();
 
@@ -2981,9 +2980,6 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, 
long nLine, vcl::Render
 }
 }
 }
-
-if (bResetClipRegion)
-rRenderContext.SetClipRegion();
 }
 
 void SvTreeListBox::PreparePaint(vcl::RenderContext& /*rRenderContext*/, 
SvTreeListEntry& /*rEntry*/)
diff --git a/sw/source/filter/html/htmltabw.cxx 
b/sw/source/filter/html/htmltabw.cxx
index d159d5d806f6..9f9f61a9d9e1 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -262,8 +262,6 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
 if ( !nRowSpan )
 return;
 
-bool bOutWidth = true;
-
 const SwStartNode* pSttNd = pBox->GetSttNd();
 bool bHead = false;
 if( pSttNd )
@@ -317,30 +315,29 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
 }
 
 long nWidth = 0;
+bool bOutWidth = true;
 sal_uInt32 nPrcWidth = SAL_MAX_UINT32;
-if( bOutWidth )
+
+if( m_bLayoutExport )
 {
-if( m_bLayoutExport )
+if( pCell->HasPrcWidthOpt() )
 {
-if( pCell->HasPrcWidthOpt() )
-{
-nPrcWidth = pCell->GetWidthOpt();
-}
-else
-{
-nWidth = pCell->GetWidthOpt();
-if( !nWidth )
-bOutWidth = false;
-}
+nPrcWidth = pCell->GetWidthOpt();
 }
 else
 {
-if( HasRelWidths() )
-nPrcWidth = GetPrcWidth(nCol, nColSpan);
-else
-nWidth = GetAbsWidth( nCol, nColSpan );
+nWidth = pCell->GetWidthOpt();
+if( !nWidth )
+bOutWidth = false;
 }
 }
+else
+{
+if( HasRelWidths() )
+nPrcWidth = GetPrcWidth(nCol, nColSpan);
+else
+nWidth = GetAbsWidth( nCol, nColSpan );
+}
 
 long nHeight = pCell->GetHeight() > 0
 ? GetAbsHeight( pCell->GetHeight(), nRow, nRowSpan )
diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
index f82525481731..09c26aab4aab 100644
--- a/vcl/unx/gtk/salprn-gtk.cxx
+++ b/vcl/unx/gtk/salprn-gtk.cxx
@@ -435,7 +435,6 @@ GtkPrintDialog::impl_initCustomTab()
 GtkWidget* pCurParent = nullptr;
 GtkWidget* pCurTabPage = nullptr;
 GtkWidget* pCurSubGroup = nullptr;
-GtkWidget* pStandardPrintRangeContainer = nullptr;
 bool bIgnoreSubgroup = false;
 for (int i = 0; i != rOptions.getLength(); i++)
 {
@@ -723,9 +722,6 @@ GtkPrintDialog::impl_initCustomTab()
 }
 }
 
-if (pStandardPrintRangeContainer)
-gtk_widget_destroy(pStandardPrintRangeContainer);
-
 CustomTabs_t::const_reverse_iterator aEnd = aCustomTabs.rend();
 for (CustomTabs_t::const_reverse_iterator aI = aCustomTabs.rbegin(); aI != 
aEnd; ++aI)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Tamás Zolnai

 dev/null |binary
 1 file changed

New commits:
commit b30932fc55ed0dc14184c7015043fc42d5f274d6
Author: TamÃ¡s Zolnai 
Date:   Mon Sep 11 12:39:00 2017 +0200

This test file was added by accident

Change-Id: Ia00aa806fcaa890ef89a031ccb90e3aa831710d8

diff --git a/sc/qa/unit/data/xls/tdf112278.xls 
b/sc/qa/unit/data/xls/tdf112278.xls
deleted file mode 100755
index 09cfc9f7b518..
Binary files a/sc/qa/unit/data/xls/tdf112278.xls and /dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Stephan Bergmann

 extensions/source/scanner/sane.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 033bb0382354cdebec8262b54b0539a4b69d56f6
Author: Stephan Bergmann 
Date:   Mon Sep 11 14:27:57 2017 +0200

Make clamping of aParams.format work reliably

...regardless of the details of the type of aParams.format, SANE_Frame, 
which
the SANE documentation at  
is
vague about.  (It could, e.g., validly have negative values in an 
implementation
where SANE_Frame is an enum with additional, negative enumerators besides 
the
required SAN_FRAME_GRAY...BLUE.)

Before 2687a5aca143c53c364cb44993ca601b8dd1c65e 
"-Werror,-Wtautological-compare
with latest clang" the code had explicitly checked for aParams.format < 0.

Change-Id: Ie2a19e67e942841c5a52b862cb427bac77d6ebb2

diff --git a/extensions/source/scanner/sane.cxx 
b/extensions/source/scanner/sane.cxx
index 80b6bb30f5c9..6d29d0a5670d 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -623,8 +624,14 @@ bool Sane::Start( BitmapTransporter& rBitmap )
   "SANE_FRAME_RED", "SANE_FRAME_GREEN",
   "SANE_FRAME_BLUE", "Unknown !!!" };
 fprintf( stderr, "Parameters for frame %d:\n", nStream );
-if( aParams.format > 4 )
+if( static_cast<
+typename std::make_unsigned<
+typename 
std::underlying_type::type>::type>(
+aParams.format)
+> 4 )
+{
 aParams.format = (SANE_Frame)5;
+}
 fprintf( stderr, "format:   %s\n", ppFormats[ 
(int)aParams.format ] );
 fprintf( stderr, "last_frame:   %s\n", aParams.last_frame ? 
"TRUE" : "FALSE" );
 fprintf( stderr, "depth:%d\n", (int)aParams.depth );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Stephan Bergmann

 svx/source/dialog/swframeposstrings.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 68e1eb77c9ea2887ba4c113f307c764bc7a3eeef
Author: Stephan Bergmann 
Date:   Mon Sep 11 14:35:36 2017 +0200

Clean up SvxSwFramePosString::GetString

...after 2687a5aca143c53c364cb44993ca601b8dd1c65e
"-Werror,-Wtautological-compare with latest clang".  Even with a compiler 
that
chose int as the underlying type of StringId, eId could only be negative 
after
UB has happened elsewhere, but nevertheless keep checking for it in the 
assert
(which is a macro in which -Wtautological-compare is apparently disabled 
with
recent Clang trunk at least).

Change-Id: I448c6d48e9f84ef84089f4735776b6a66599dc67

diff --git a/svx/source/dialog/swframeposstrings.cxx 
b/svx/source/dialog/swframeposstrings.cxx
index d2e9c8e05ab0..3c667bc1f71a 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -17,19 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "swframeposstrings.hrc"
 
 OUString SvxSwFramePosString::GetString(StringId eId)
 {
-assert(SAL_N_ELEMENTS(RID_SVXSW_FRAMEPOSITIONS) == 
SvxSwFramePosString::STR_MAX);
-DBG_ASSERT(eId >= 0 && eId < STR_MAX, "invalid StringId");
-if(!(eId < STR_MAX))
-eId = LEFT;
+static_assert(
+(SAL_N_ELEMENTS(RID_SVXSW_FRAMEPOSITIONS)
+ == SvxSwFramePosString::STR_MAX),
+"RID_SVXSW_FRAMEPOSITIONS too small");
+assert(eId >= 0 && eId < STR_MAX);
 return SvxResId(RID_SVXSW_FRAMEPOSITIONS[eId]);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/qa-tools.py

2017-09-11 Thread Xisco Fauli

 esc-reporting/qa-tools.py |   67 +-
 1 file changed, 61 insertions(+), 6 deletions(-)

New commits:
commit f9509a7e42ab2bc6f9705e3156107e1045ca94fc
Author: Xisco Fauli 
Date:   Mon Sep 11 12:30:26 2017 +0200

QA tools: add metabugs info to the weekly reports

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index c00c95d..acb3617 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -98,7 +98,9 @@ def util_create_detailed_person(email):
  'whiteboard_removed': 0,
  'severity_changed': 0,
  'priority_changed': 0,
- 'system_changed': 0
+ 'system_changed': 0,
+ 'metabug_added': 0,
+ 'metabug_removed': 0
  }
 
 def util_create_statList():
@@ -118,6 +120,7 @@ def util_create_statList():
  'count': 0,
  'keywords': {k:0 for k in keywords_list}
  },
+ 'metabugs': {}
  }
 },
 'detailedReport':
@@ -150,6 +153,8 @@ def util_create_statList():
 'severity_changed': {s:0 for s in severities_list},
 'priority_changed':  {p:0 for p in priorities_list},
 'system_changed': {p:0 for p in system_list},
+'metabug_added': {},
+'metabug_removed': {},
 'lists': {
 'author': [[], []],
 'confirm': [[], []],
@@ -162,7 +167,9 @@ def util_create_statList():
 'whiteboard_removed': {},
 'severity_changed': {s: [[], []] for s in severities_list},
 'priority_changed': {p: [[], []] for p in priorities_list},
-'system_changed': {p: [[], []] for p in system_list}
+'system_changed': {p: [[], []] for p in system_list},
+'metabug_added': {},
+'metabug_removed': {}
 }
 },
 'massping':
@@ -230,6 +237,8 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 lResults = {}
 urlPath = "https://bugs.documentfoundation.org/show_bug.cgi?id=";
 for key, row in bugzillaData['bugs'].items():
+rowId = row['id']
+
 #Ignore META bugs and deletionrequest bugs.
 if not row['summary'].lower().startswith('[meta]') and 
row['component'] != 'deletionrequest':
 creationDate = datetime.datetime.strptime(row['creation_time'], 
"%Y-%m-%dT%H:%M:%SZ")
@@ -240,7 +249,6 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 
 statList['data']['bugs']['all']['count'] += 1
 
-rowId = row['id']
 rowStatus = row['status']
 rowResolution = row['resolution']
 
@@ -359,6 +367,35 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 # Use this variable in case the status is set before the 
resolution
 newStatus = None
 for change in action['changes']:
+if change['field_name'] == 'blocks':
+if change['added']:
+for metabug in change['added'].split(', '):
+#TODO
+#util_increase_user_actions(statList, key, 
actionMail, bugTargets, 'metabug_added', actionDate)
+
+if actionDate >= cfg[reportPeriod] and 
int(metabug) in row['blocks']:
+if metabug not in 
statList['detailedReport']['metabug_added']:
+
statList['detailedReport']['metabug_added'][metabug] = 0
+
statList['detailedReport']['lists']['metabug_added'][metabug] = [[],[]]
+
statList['detailedReport']['metabug_added'][metabug] += 1
+
+
statList['detailedReport']['lists']['metabug_added'][metabug][0].append(key)
+
statList['detailedReport']['lists']['metabug_added'][metabug][1].append(actionMail)
+
+if change['removed']:
+for metabug in change['removed'].split(', '):
+#TODO
+#util_increase_user_actions(statList, key, 
actionMail, bugTargets, 'metabug_added', actionDate)
+
+if actionDate >= cfg[reportPeriod] and 
int(metabug) in row['blocks']:
+if metabug not in 
statList['detailedReport']['metabug_removed']:
+
statList['detailedReport']['metabug_removed'][metabug] = 0
+
statList['detailedReport']['lists']['metabug_removed'][metabug] = [[],[]]
+
statList['detailedReport']['metabug_removed'][metabug] += 1
+
+
statList['detailedReport']['lists']['metabug_removed'][metabug][0].

[Libreoffice-commits] libvisio.git: src/lib

2017-09-11 Thread David Tardon

 src/lib/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 634a8eacdb0e06bd3e171e963d4a57f742da4b33
Author: David Tardon 
Date:   Mon Sep 11 14:59:20 2017 +0200

fix build with older boost

Change-Id: I3a2e6d9d9e554f9e2ad010219379f5f61c5f8c25

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f482b9f..2828971 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -12,6 +12,7 @@ AM_CXXFLAGS = \
-I$(top_srcdir)/src/lib \
-I$(top_builddir)/src/lib \
-DBOOST_ERROR_CODE_HEADER_ONLY \
+   -DBOOST_SPIRIT_USE_PHOENIX_V3 \
-DBOOST_SYSTEM_NO_DEPRECATED \
$(LIBVISIO_CXXFLAGS) \
$(DEBUG_CXXFLAGS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .git-hooks/pre-commit

2017-09-11 Thread Caolán McNamara

 .git-hooks/pre-commit |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 354d460af2f74b74406967da63567e60a1fe782e
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 11 12:13:20 2017 +0100

insist in a domain in .ui files

and just check .ui files for those .ui-specific patterns

Change-Id: If7b9c8779f7592db5b22ab96058dd85666ca9bdf
Reviewed-on: https://gerrit.libreoffice.org/42160
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
index 07569905488b..e35156f012e6 100755
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@@ -86,17 +86,20 @@ sub check_whitespaces($)
 }
 if (/True<\/property>/)
 {
-bad_line("use font attributes instead of use-markup", $_, 
$src_limited);
+bad_line("use font attributes instead of use-markup", $_, 
"ui");
 }
 if (/___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Andras Timar

 cui/uiconfig/ui/menuassignpage.ui  |   34 +++
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui |   74 -
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui|   32 +++
 3 files changed, 70 insertions(+), 70 deletions(-)

New commits:
commit c2917d90ed0f5b503662ec460605b3e1d34c70d9
Author: Andras Timar 
Date:   Mon Sep 11 14:16:30 2017 +0200

add missing context attributes to .ui files

Change-Id: If66a4e867b3b406aed90ab2259637e536e236ea3
Reviewed-on: https://gerrit.libreoffice.org/42164
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/cui/uiconfig/ui/menuassignpage.ui 
b/cui/uiconfig/ui/menuassignpage.ui
index faf402b44fbf..4dc7ad6ae5e2 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -150,7 +150,7 @@
 start
 
   
-_Insert
+_Insert
 True
 True
 True
@@ -168,7 +168,7 @@
 
 
   
-_Modify
+_Modify
 True
 True
 True
@@ -186,7 +186,7 @@
 
 
   
-Rese_t
+Rese_t
 True
 True
 True
@@ -228,7 +228,7 @@
 
 
   
-_Function
+_Function
 True
 True
 True
@@ -264,7 +264,7 @@
 
 
   
-_+
+_+
 True
 True
 True
@@ -281,7 +281,7 @@
 
 
   
-_-
+_-
 True
 True
 True
@@ -395,7 +395,7 @@
   
 True
 False
-_Add
+_Add
 True
 add
 
@@ -440,7 +440,7 @@
   
 True
 False
-Remo_ve
+Remo_ve
 True
 remove
 
@@ -489,7 +489,7 @@
   
 True
 True
-Local help is not installed.
+Local help is not installed.
 False
 False
 False
@@ -525,7 +525,7 @@
 True
 True
 5
-Type to search
+Type to search
   
   
 1
@@ -582,7 +582,7 @@
 
   
 False
-Label
+Label
   
 
   
@@ -606,7 +606,7 @@
   
 True
 False
-Insert Separator
+Insert Separator
 True
   
 
@@ -614,7 +614,7 @@
   
 True
 False
-Insert Submenu
+Insert Submenu
 True
   
 
@@ -626,7 +626,7 @@
   
 True
 False
-Rename...
+Rename...
 True
   
 
@@ -634,7 +634,7 @@
   
 True
 False
-Change Icon...
+Change Icon...
 True
   
 
@@ -642,7 +642,7 @@
   
 True
 False
-Reset Icon
+Reset Icon
 True
   
 
@@ -650,7 +650,7 @@
   
 True
 False
-Restore Default 
Command
+Restore Default Command
 True
   
 
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index f4933e3a4e6a..f384b9796270 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -4620,7 +4620,7 @@
 False

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

2017-09-11 Thread Miklos Vajna

 external/libepubgen/libepubgen-epub3.patch.1 |   61 +++
 1 file changed, 61 insertions(+)

New commits:
commit ebf34ec31fb441d6226075a51f5f83ebf4668082
Author: Miklos Vajna 
Date:   Mon Sep 11 12:32:22 2017 +0200

EPUB export: ignore line though type/style 'none'

In CSS this is a boolean property, but in ODF it's an enum, so map none
to false and everything else to true.

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

diff --git a/external/libepubgen/libepubgen-epub3.patch.1 
b/external/libepubgen/libepubgen-epub3.patch.1
index 0fdf0c72f070..0146310f46d0 100644
--- a/external/libepubgen/libepubgen-epub3.patch.1
+++ b/external/libepubgen/libepubgen-epub3.patch.1
@@ -1994,3 +1994,64 @@ index 0f7f1e0..1bd1e16 100644
 -- 
 2.12.3
 
+From 7be89d1881e175182039ca93a1546d79933cab85 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Mon, 11 Sep 2017 11:03:03 +0200
+Subject: [PATCH] EPUBSpanStyleManager: ignore line though type/style 'none'
+
+In CSS this is a boolean property, but in ODF it's an enum, so map none
+to false and everything else to true.
+---
+ src/lib/EPUBSpanStyleManager.cpp   | 11 +++-
+ src/lib/EPUBTextGenerator.cpp  |  4 +--
+ src/test/EPUBTextGeneratorTest.cpp | 58 --
+ 3 files changed, 68 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/EPUBSpanStyleManager.cpp 
b/src/lib/EPUBSpanStyleManager.cpp
+index 4887858..211946c 100644
+--- a/src/lib/EPUBSpanStyleManager.cpp
 b/src/lib/EPUBSpanStyleManager.cpp
+@@ -137,8 +137,17 @@ void 
EPUBSpanStyleManager::extractDecorations(RVNGPropertyList const &pList, EPU
+   // replaceme by text-decoration-line when its implementation will appear in 
browser
+   std::stringstream s;
+ 
+-  if (pList["style:text-line-through-style"] || 
pList["style:text-line-through-type"])
++  // line-though style or type 'none' is not line-though, everything else is.
++  const librevenge::RVNGProperty *textLineThoughStyle = 
pList["style:text-line-through-style"];
++  bool lineThough = textLineThoughStyle && textLineThoughStyle->getStr() != 
"none";
++  if (!lineThough)
++  {
++const librevenge::RVNGProperty *textLineThoughType = 
pList["style:text-line-through-type"];
++lineThough = textLineThoughType && textLineThoughType->getStr() != "none";
++  }
++  if (lineThough)
+ s << " line-through";
++
+   if (pList["style:text-overline-style"] || pList["style:text-overline-type"])
+ s << " overline";
+   if (pList["style:text-underline-style"] || 
pList["style:text-underline-type"])
+diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
+index 1bd1e16..07aa50d 100644
+--- a/src/lib/EPUBTextGenerator.cpp
 b/src/lib/EPUBTextGenerator.cpp
+@@ -596,7 +596,7 @@ void EPUBTextGenerator::closeFrame()
+ }
+ 
+ /// Checks if the media type is an EPUB 3 Core Media Type or not.
+-static bool isValidMimeType(const RVNGString& mediaType)
++static bool isValidMimeType(const RVNGString &mediaType)
+ {
+   // Defined at .
+   static char const *(types[])=
+@@ -607,7 +607,7 @@ static bool isValidMimeType(const RVNGString& mediaType)
+ "image/svg+xml"
+   };
+ 
+-  for (const auto& i : types)
++  for (const auto &i : types)
+   {
+ if (mediaType == i)
+   return true;
+-- 
+2.12.3
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Jochen Nitschke

 sc/source/ui/view/gridwin4.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit e07e38f71c728630e993cbff5bc78c76fc02d692
Author: Jochen Nitschke 
Date:   Mon Sep 11 01:41:36 2017 +0200

remove constant bool variable

had no meaning since introduced in
commit 11b5e05a827851e287315345bf563fda7e24d151
Date:   Tue Nov 14 14:57:04 2006 +
INTEGRATION: CWS aw024 (1.26.134); FILE MERGED

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

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 5ffe55505ddf..eb059ddd024a 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1782,8 +1782,6 @@ void ScGridWindow::GetSelectionRects( ::std::vector< 
tools::Rectangle >& rPixelR
 PutInOrder( nX1, nX2 );
 PutInOrder( nY1, nY2 );
 
-bool bRepeat = true;
-
 SCCOL nTestX2 = nX2;
 SCROW nTestY2 = nY2;
 
@@ -1912,7 +1910,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< 
tools::Rectangle >& rPixelR
 }
 }
 
-if ( aMultiMark.IsCellMarked( nThisX, nThisY, true ) == 
bRepeat )
+if ( aMultiMark.IsCellMarked( nThisX, nThisY, true ) )
 {
 if ( !pMergeFlag->IsOverlapped() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Tor Lillqvist

 sw/qa/core/uwriter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0eae830ca1f12691c73e7e13c8efe08d23506304
Author: Tor Lillqvist 
Date:   Mon Sep 11 17:37:11 2017 +0300

loplugin:unusedvariablecheck

Change-Id: Iaeed1da4ec76075271b48147e3f9372d966e6f99

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index d619d94282a0..76dbb783faf3 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1269,7 +1269,6 @@ void SwDocTest::testTableAutoFormats()
 SfxInt32Item aRAngle = aBoxAF.m_aRotateAngle;
 //Set m_aRotateMode
 aBoxAF.m_aRotateMode.SetValue( SVX_ROTATE_MODE_CENTER );
-SvxRotateModeItem aRMode = aBoxAF.m_aRotateMode;
 //Set m_sNumFormatString
 OUString aNFString = "UnitTestFormat";
 aBoxAF.m_sNumFormatString = aNFString;
@@ -1414,6 +1413,7 @@ void SwDocTest::testTableAutoFormats()
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).m_aRotateAngle == aRAngle ) 
);
 #if !(defined(__clang__) && __clang_major__ == 4 && __clang_minor__ == 0) // 
Temporary fix for mysterious problem with Clang on F26
 //Get m_aRotateMode
+SvxRotateModeItem aRMode = aBoxAF.m_aRotateMode;
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).m_aRotateMode == aRMode ) );
 #endif
 //Get m_sNumFormatString
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Muhammet Kara

 cui/source/customize/cfgutil.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 167876df09254d43ae1f45d658b59f84b5b724e8
Author: Muhammet Kara 
Date:   Mon Sep 11 15:03:33 2017 +0300

tdf#108011: Customize dialog's commands list should respond to keyboard

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

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 3c409e182ed2..2a8e591b82dc 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -252,6 +252,7 @@ 
SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits
 {
 SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
 GetModel()->SetSortMode( SortAscending );
+SetQuickSearch( true );
 }
 
 VCL_BUILDER_FACTORY_CONSTRUCTOR(SfxConfigFunctionListBox, WB_TABSTOP)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Stephan Bergmann

 svtools/source/config/itemholder2.cxx |   23 ---
 svtools/source/config/itemholder2.hxx |1 -
 2 files changed, 8 insertions(+), 16 deletions(-)

New commits:
commit 2c7d421a3cacb602aabc89c5e49351ae4a5f7846
Author: Stephan Bergmann 
Date:   Mon Sep 11 17:07:08 2017 +0200

Avoid "ThreadSanitizer: lock-order-inversion (potential deadlock)"

...during CppunitTest_vcl_lifecycle:

> WARNING: ThreadSanitizer: lock-order-inversion (potential deadlock) 
(pid=7827)
>   Cycle in lock order graph: M526212022946269680 (0x) => 
M536063647131142976 (0x) => M526212022946269680
>
>   Mutex M536063647131142976 acquired here while holding mutex 
M526212022946269680 in main thread:
> #0 pthread_mutex_lock 
compiler-rt/lib/tsan/../sanitizer_common/sanitizer_common_interceptors.inc:3800 
(cppunittester+0x45aec7)
> #1 osl_acquireMutex sal/osl/unx/mutex.cxx:97:16 
(libuno_sal.so.3+0xc1ffa)
> #2 osl::Mutex::acquire() include/osl/mutex.hxx:56:20 
(libsvtlo.so+0x2f0b88)
> #3 osl::ClearableGuard::ClearableGuard(osl::Mutex&) 
include/osl/mutex.hxx:163:17 (libsvtlo.so+0x39bdaf)
> #4 osl::ResettableGuard::ResettableGuard(osl::Mutex&) 
include/osl/mutex.hxx:208:17 (libsvtlo.so+0x3971ac)
> #5 svtools::ItemHolder2::impl_addItem(EItem) 
svtools/source/config/itemholder2.cxx:92:33 (libsvtlo.so+0x395f9e)
> #6 svtools::ItemHolder2::holdConfigItem(EItem) 
svtools/source/config/itemholder2.cxx:80:14 (libsvtlo.so+0x395eaf)
> #7 SvtHelpOptions::SvtHelpOptions() 
svtools/source/config/helpopt.cxx:250:9 (libsvtlo.so+0x38e571)
> #8 SfxApplication::GetOrCreate() sfx2/source/appl/app.cxx:159:53 
(libsfxlo.so+0x3afeef)
> #9 (anonymous 
namespace)::SfxGlobalEvents_Impl::SfxGlobalEvents_Impl(com::sun::star::uno::Reference
 const&) sfx2/source/notify/globalevents.cxx:149:5 (libsfxlo.so+0xc5f054)
> #10 (anonymous 
namespace)::Instance::Instance(com::sun::star::uno::Reference
 const&) sfx2/source/notify/globalevents.cxx:422:50 (libsfxlo.so+0xc5eca7)
> #11 rtl::StaticWithArg<(anonymous namespace)::Instance, 
com::sun::star::uno::Reference, 
(anonymous 
namespace)::Singleton>::get(com::sun::star::uno::Reference
 const&) include/rtl/instance.hxx:455:18 (libsfxlo.so+0xc5ebc6)
> #12 com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation 
sfx2/source/notify/globalevents.cxx:441:17 (libsfxlo.so+0xc5ea16)
> #13 std::_Function_handler const&), 
com::sun::star::uno::XInterface* (*)(com::sun::star::uno::XComponentContext*, 
com::sun::star::uno::Sequence 
const&)>::_M_invoke(std::_Any_data const&, 
com::sun::star::uno::XComponentContext*&&, 
com::sun::star::uno::Sequence const&) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:1716:9
 (libuno_cppuhelpergcc3.so.3+0x19b166)
> #14 std::function 
const&)>::operator()(com::sun::star::uno::XComponentContext*, 
com::sun::star::uno::Sequence const&) const 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:2127:14
 (libuno_cppuhelpergcc3.so.3+0x14f50d)
> #15 
cppuhelper::ServiceManager::Data::Implementation::createInstance(com::sun::star::uno::Reference
 const&, bool) cppuhelper/source/servicemanager.cxx:665:13 
(libuno_cppuhelpergcc3.so.3+0x134ccb)
> #16 (anonymous 
namespace)::SingletonFactory::createInstanceWithContext(com::sun::star::uno::Reference
 const&) cppuhelper/source/servicemanager.cxx:521:29 
(libuno_cppuhelpergcc3.so.3+0x14938e)
> #17 non-virtual thunk to (anonymous 
namespace)::SingletonFactory::createInstanceWithContext(com::sun::star::uno::Reference
 const&) cppuhelper/source/servicemanager.cxx 
(libuno_cppuhelpergcc3.so.3+0x1494e6)
> #18 cppu::ComponentContext::lookupMap(rtl::OUString const&) 
cppuhelper/source/component_context.cxx:308:25 
(libuno_cppuhelpergcc3.so.3+0x5afc9)
> #19 cppu::ComponentContext::getValueByName(rtl::OUString const&) 
cppuhelper/source/component_context.cxx:382:14 
(libuno_cppuhelpergcc3.so.3+0x5c234)
> #20 non-virtual thunk to 
cppu::ComponentContext::getValueByName(rtl::OUString const&) 
cppuhelper/source/component_context.cxx (libuno_cppuhelpergcc3.so.3+0x5c406)
> #21 
com::sun::star::frame::theGlobalEventBroadcaster::get(com::sun::star::uno::Reference
 const&) 
workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/frame/theGlobalEventBroadcaster.hpp:36:22
 (libvcllo.so+0x5e785b)
> #22 Dialog::StateChanged(StateChangedType) 
vcl/source/window/dialog.cxx:694:84 (libvcllo.so+0x5e210a)
> #23 vcl::Window::CompatStateChanged(StateChangedType) 
vcl/source/window/window.cxx:3704:5 (libvcllo.so+0x861862)
> #24 vcl::Window::Show(bool, ShowFlags) 
vcl/source/window/window.cxx:2281:9 (libvcllo.so+0x85e752)
> #25 LifecycleTest::testLeakage() vcl/qa/cppunit/lifecycle.cxx:309:25 
(libtest_vcl_lifecycle.so+0x52bb6)
> #26 void std::__i

minutes of ESC call ...

2017-09-11 Thread Michael Meeks

Seemingly I forgot to post these last Thursday: apologies !

* Present:
+ Thorsten, Miklos, Kendy, Caolan, Olivier, Shinnok, Xisco, Michael M,
  Stephan, Eike, Jan-Marek, Sophie, Heiko, Christian, Michael S

* Completed Action Items:
+ submitted an ESC / architecture discussion talk (Michael)
+ send a nice mail explaining cleanup commit issues (Michael)
+ simplify & update dev-central build details & link to wiki (Shinnok)
 [ found the repo, looked at the code – could simplify it and 
   have pointers to the wiki – doing it as lower prio. ]

* Pending Action Items:
+ fwd build details on Mac / CVE build / test failure to the list (Shinnok)
 [ need to re-compile to find the errors and/or transcribe the text.
   How many tinderboxes on Mac ?
 + three – should have configure line there (Thorsten)
 + both Jenkins and non-Jenkins builders look different (Michael) ]
+ font issues
 [ 
http://nabble.documentfoundation.org/Minutes-of-ESC-call-2017-08-17-tt4220768.html#a4221038
 + have a deeper look / hunt for solutions (Xisco)
+ See below
 + dialog / cropping → perhaps have a look ? (Caolan)
+ 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=0c8b749e602b6743857a9bc4efb24b6183690311
+ landed in master: looks like it fixes -lots- of things:
+ gone into all version (Caolan)
+ 
https://bugs.documentfoundation.org/show_bug.cgi?id=107249
+ 
https://bugs.documentfoundation.org/show_bug.cgi?id=108710
+ 
https://bugs.documentfoundation.org/show_bug.cgi?id=108891
+ 
https://bugs.documentfoundation.org/show_bug.cgi?id=106111
+ Comparisons before and after:
+ 
https://bug-attachments.documentfoundation.org/attachment.cgi?id=136090
+ 
https://bug-attachments.documentfoundation.org/attachment.cgi?id=136091
+ 
https://bug-attachments.documentfoundation.org/attachment.cgi?id=136061
+ better ceil() than round() to avoid cropping by all means (Jay)
 + we want it to work as the original code did (Caolan)
 + http://bugs.documentfoundation.org/attachment.cgi?id=136092
 + still not perfect 136092 – attachment, a difference (Heiko)
   + smaller line-spacing vs. 5.1
   + best to get a new bug – with the file (Xisco)
   + pictures less useful ]

* Release Engineering update (Christian)
+ this week – nothing.
+ 5.3.7 - 1st week of October as initially scheduled
+ 5.4.2 RC1 – branch next Tuesday ...
+ Online
+ Android
 + fixed x86 platform / NSS building & will push patch
 + focus on getting the viewer into shape.
+ will split off the 5.4 project in pootle this weekend
 + and move to actual master strings.
+ do we have a conference gap in the schedule ? (Michael)
 + move it if there is a concern ?

* Documentation (Olivier)
 * Implemented L10n in UI for helponline.libreoffice.org
 + and browser detect language
 + built in https://helponline.libreoffice.org/6.0/
 + backporting to 5.4 and 5.3
 * Entering in revision phase for Getting started Guide 6.0,
 + Now waiting for 6.0 new features
+ Please fill the wiki page with the new features

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
255(255) (topicUI) bugs open, 408(408) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added  6(1) 19(2) 32(-1) 133(-8) 
 commented 40(4)180(14)   475(-17)   2952(-72)
   removed  0(0)  0(-1) 4(-1)  43(-1) 
  resolved  5(0) 22(-3)68(-2) 285(-2) 
+ top 10 contributors:
  Tietze, Heiko made 124 changes in 1 month, and 1588 changes in 1 year
  Thomas Lendo made 59 changes in 1 month, and 460 changes in 1 year
  Philips, Yousuf made 45 changes in 1 month, and 1428 changes in 1 year
  Adolfo Jayme Barrientos made 38 changes in 1 month, and 66 changes in 
1 y
  Cor Nouws made 38 changes in 1 month, and 336 changes in 1 year
  Foote, V Stuart made 32 changes in 1 month, and 562 changes in 1 year
  Buovjaga made 18 changes in 1 month, and 354 changes in 1 year
  Dieter Praas made 14 changes in 1 month, and 52 changes in 1 year
  Telesto made 13 changes in 1 month, and 75 changes in 1 year
  Faulí Tarazona, Xisco made 12 changes in 1 month, and 470 changes in 
1 y
+ Mascot update
   + more triage work requested
+ OS survey
   + https://demo.collaboracloudsuite.com/tdf/index.php/s/Coj67L

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svl/source

2017-09-11 Thread Eike Rathke

 svl/source/numbers/zforfind.cxx |   63 ++--
 svl/source/numbers/zforfind.hxx |   21 +++--
 svl/source/numbers/zforlist.cxx |2 -
 3 files changed, 48 insertions(+), 38 deletions(-)

New commits:
commit 54bb595027197b6ffba9b95b2eafedefa03f3996
Author: Eike Rathke 
Date:   Tue Aug 29 18:24:05 2017 +0200

Resolves: tdf#91758 more stringent check for ISO date like looking input

 This is a combination of 4 commits.

Related: tdf#91758 don't remember nCanForceToIso8601 state

CanForceToIso8601() can be called twice for different DateOrder.

(cherry picked from commit ae6c5083f04f8fad299cdc7a6b6558f1270cc619)

Related: tdf#91758 shortcut CanForceToIso8601() for MayBeIso8601() results

(cherry picked from commit 6254fbf8a76a0d8edb290b03e0632ef6513a8d98)

Resolves: tdf#91758 more stringent check for ISO date like looking input

Already check at the end of input analysis whether it could be an ISO date 
to
not apply x-y-z onto MDY or DMY later. For an acceptable ISO input, apart 
from
M and D restrictions, Y-M-D year numbers must be greater than 12 in MDY 
order
or greater than 31 in DMY order, or have at least 3 digits (possibly 
leading 0).

(cherry picked from commit 1cfe6a904d3349413173f5d412c280936f938a9e)

 Conflicts:
svl/source/numbers/zforfind.cxx

Backported.

3cd6967931abcbf806a539a19f7f9371398567c2
8d3eb7e2403421469050850e45d1db5c0be018f5

Force ISO date format again if ISO input, tdf#91758 follow-up

... and input doesn't match a date acceptance pattern, even if less than 3
digits in year.

(cherry picked from commit f49ef5b771910384de0bc2d4c86ad3e0442b295a)

b25aa8e813c06a224cfa95ead79c0f3bf2d2d672

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

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 08fc26e20435..b900f3856296 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -132,7 +132,6 @@ void ImpSvNumberInputScan::Reset()
 nAcceptedDatePattern = -2;
 nDatePatternStart = 0;
 nDatePatternNumbers = 0;
-nCanForceToIso8601 = 0;
 
 for (sal_uInt32 i = 0; i < SV_MAX_ANZ_INPUT_STRINGS; i++)
 {
@@ -1046,47 +1045,69 @@ bool ImpSvNumberInputScan::MayBeIso8601()
 
 bool ImpSvNumberInputScan::CanForceToIso8601( DateOrder eDateOrder )
 {
-if (nCanForceToIso8601 == 0)
+int nCanForceToIso8601 = 0;
+if (!MayBeIso8601())
 {
-
-if (!MayBeIso8601())
-{
-nCanForceToIso8601 = 1;
-}
-else if (nMayBeIso8601 >= 3)
-{
-nCanForceToIso8601 = 2; // at least 3 digits in year
-}
-else
+return false;
+}
+else if (nMayBeIso8601 >= 3)
+{
+return true;// at least 3 digits in year
+}
+else
+{
+if (eDateOrder == DateOrder::Invalid)
 {
-nCanForceToIso8601 = 1;
+// As if any of the cases below can be applied, but only if a
+// locale dependent date pattern was not matched.
+return (GetDatePatternNumbers() != nAnzNums) || 
!IsDatePatternNumberOfType(0,'Y');
 }
 
-sal_Int32 n;
-switch (eDateOrder)
-{
+nCanForceToIso8601 = 1;
+}
+
+sal_Int32 n;
+switch (eDateOrder)
+{
 case DateOrder::DMY:   // "day" value out of range => ISO 
8601 year
 if ((n = sStrArray[nNums[0]].toInt32()) < 1 || n > 31)
 {
 nCanForceToIso8601 = 2;
 }
-break;
+break;
 case DateOrder::MDY:   // "month" value out of range => 
ISO 8601 year
 if ((n = sStrArray[nNums[0]].toInt32()) < 1 || n > 12)
 {
 nCanForceToIso8601 = 2;
 }
-break;
+break;
 case DateOrder::YMD:   // always possible
 nCanForceToIso8601 = 2;
-break;
+break;
 default: break;
-}
 }
 return nCanForceToIso8601 > 1;
 }
 
 
+bool ImpSvNumberInputScan::IsAcceptableIso8601( const SvNumberformat* pFormat )
+{
+if (pFormat && (pFormat->GetType() & css::util::NumberFormat::DATE))
+{
+switch (pFormatter->GetEvalDateFormat())
+{
+case NF_EVALDATEFORMAT_INTL:
+return CanForceToIso8601( GetDateOrder());
+case NF_EVALDATEFORMAT_FORMAT:
+return CanForceToIso8601( pFormat->GetDateOrder());
+default:
+return CanForceToIso8601( GetDateOrder()) || 
CanForceToIso8601( pFormat->GetDateOrder());
+}
+}
+return CanForceToIso8601( GetDateOrder());
+}
+
+
 bool ImpSvNumberInputScan:

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

2017-09-11 Thread Stephan Bergmann

 filter/qa/cppunit/xslt-test.cxx |   44 +++-
 filter/source/xsltfilter/LibXSLTTransformer.cxx |   21 +--
 filter/source/xsltfilter/LibXSLTTransformer.hxx |3 +
 3 files changed, 48 insertions(+), 20 deletions(-)

New commits:
commit cd8aeed1569222edd8bfd05d9d833f74b679fcd0
Author: Stephan Bergmann 
Date:   Mon Sep 11 17:58:13 2017 +0200

Fix data races during CppunitTest_filter_xslt

Change-Id: I140ac8a24326959ba341adddbbf505ff16616283

diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index 65de2667e493..7354cc85374f 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -7,7 +7,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+#include 
 #include 
+#include 
 
 #include 
 #include 
@@ -19,7 +23,6 @@
 #include 
 
 #include 
-#include 
 
 #include 
 #include 
@@ -51,22 +54,37 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-struct Listener : public ::cppu::WeakImplHelper
+class Listener : public ::cppu::WeakImplHelper
 {
-bool m_bDone;
-
+public:
 Listener() : m_bDone(false) {}
 
+void wait() {
+std::unique_lock g(m_mutex);
+m_cond.wait(g, [this]() { return m_bDone; });
+}
+
+private:
+std::mutex m_mutex;
+std::condition_variable m_cond;
+bool m_bDone;
+
 virtual void SAL_CALL disposing(const lang::EventObject&) throw() override 
{}
-virtual void SAL_CALL started() throw() override { m_bDone = false; }
-virtual void SAL_CALL closed() throw() override { m_bDone = true; }
-virtual void SAL_CALL terminated() throw() override { m_bDone = true; }
+virtual void SAL_CALL started() throw() override {}
+virtual void SAL_CALL closed() throw() override { notifyDone(); }
+virtual void SAL_CALL terminated() throw() override { notifyDone(); }
 virtual void SAL_CALL error(const uno::Any& e) override
 {
-m_bDone = true; // set on error too, otherwise main thread waits 
forever
+notifyDone(); // set on error too, otherwise main thread waits forever
 SAL_WARN("filter.xslt", "exception " << e);
 CPPUNIT_FAIL("exception while in XSLT");
 }
+
+void notifyDone() {
+std::unique_lock g(m_mutex);
+m_bDone = true;
+m_cond.notify_all();
+}
 };
 
 void XsltFilterTest::testXsltCopyNew()
@@ -109,10 +127,7 @@ void XsltFilterTest::testXsltCopyNew()
 
 xXslt->start();
 
-TimeValue delay;
-delay.Seconds = 0;
-delay.Nanosec = 100;
-while (!xListener->m_bDone) { osl_waitThread(&delay); }
+xListener->wait();
 
 xIn->closeInput();
 xOut->closeOutput();
@@ -171,10 +186,7 @@ void XsltFilterTest::testXsltCopyOld()
 
 xXslt->start();
 
-TimeValue delay;
-delay.Seconds = 0;
-delay.Nanosec = 100;
-while (!xListener->m_bDone) { osl_waitThread(&delay); }
+xListener->wait();
 
 xIn->closeInput();
 xOut->closeOutput();
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx 
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 33719eb5e4c6..35d3dfcc8242 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -298,7 +298,12 @@ namespace XSLT
 std::unique_ptr oh(new 
OleHandler(m_transformer->getComponentContext()));
 if (styleSheet)
 {
-m_tcontext = xsltNewTransformContext(styleSheet, doc);
+xsltTransformContextPtr tcontext = xsltNewTransformContext(
+styleSheet, doc);
+{
+std::unique_lock g(m_mutex);
+m_tcontext = tcontext;
+}
 oh->registercontext(m_tcontext);
 xsltQuoteUserParams(m_tcontext, ¶ms[0]);
 result = xsltApplyStylesheetUser(styleSheet, doc, nullptr, 
nullptr, nullptr,
@@ -331,7 +336,10 @@ namespace XSLT
 oh.reset();
 xsltFreeStylesheet(styleSheet);
 xsltFreeTransformContext(m_tcontext);
-m_tcontext = nullptr;
+{
+std::unique_lock g(m_mutex);
+m_tcontext = nullptr;
+}
 xmlFreeDoc(doc);
 xmlFreeDoc(result);
 }
@@ -354,12 +362,17 @@ namespace XSLT
 
 void Reader::forceStateStopped()
 {
-if (!m_tcontext)
+xsltTransformContextPtr tcontext;
+{
+std::unique_lock g(m_mutex);
+tcontext = m_tcontext;
+}
+if (!tcontext)
 return;
 //tdf#100057 If we force a cancel, libxslt will of course just keep on 
going unless something
 //tells it to stop. Here we force the stopped state so that libxslt 
will stop processing
 //and so Reader::execute will complete and we can join cleanly
-m_tcontext->state = XSLT_STATE_STOPPED;
+tcontext->state = XSLT_STATE_STOPPED;
 }
 
 Reader::~Reader()
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx 
b/fi

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/prj instsetoo_native/inc_sdkoo

2017-09-11 Thread Matthias Seidel

 connectivity/prj/build.lst   |2 -
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt |   12 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d75eb34a7154f1e8aaaddf1cbc57b8fe60860d12
Author: Matthias Seidel 
Date:   Mon Sep 11 14:46:15 2017 +

Minor changes to Windows installer (SDK/InstallChangeFolder)

diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index f893a630ae34..acd441e5b6a4 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
@@ -145,17 +145,17 @@ FileTypeDialogNextPushButton  230 243 
66  17  3   OOO_CONTROL_134 Cancel
 InstallChangeFolderBanner  Bitmap  0   0   374 44  1   
BannerBmp   
 InstallChangeFolderBannerLine  Line0   44  376 0   
1   
 InstallChangeFolderCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_111 ComboText   
-InstallChangeFolderCombo   DirectoryCombo  21  64  277 80  
4128779 _BrowseProperty Up  
-InstallChangeFolderComboText   Text21  50  99  14  
3   OOO_CONTROL_113 Combo   
+InstallChangeFolderCombo   DirectoryCombo  21  64  292 80  
4128779 _BrowseProperty Up  
+InstallChangeFolderComboText   Text21  51  99  14  
3   OOO_CONTROL_113 Combo   
 InstallChangeFolderDlgDesc Text21  23  249 25  65539   
OOO_CONTROL_114 
 InstallChangeFolderDlgLine Line0   234 376 0   1   

 InstallChangeFolderDlgTitleText13  6   257 25  
65539   OOO_CONTROL_115 
-InstallChangeFolderListDirectoryList   21  90  332 97  
15  _BrowseProperty TailText
-InstallChangeFolderNewFolder   PushButton  335 64  19  
19  3670019 NewFolderIcoListOOO_CONTROL_117
+InstallChangeFolderListDirectoryList   21  90  345 97  
11  _BrowseProperty TailText
+InstallChangeFolderNewFolder   PushButton  348 64  19  
19  3670019 NewFolderIcoListOOO_CONTROL_117
 InstallChangeFolderOK  PushButton  230 243 66  17  
3   OOO_CONTROL_118 Cancel  
-InstallChangeFolderTailPathEdit21  207 332 17  
15  _BrowseProperty OK  
+InstallChangeFolderTailPathEdit21  207 345 17  
15  _BrowseProperty OK  
 InstallChangeFolderTailTextText21  193 99  13  
3   OOO_CONTROL_120 Tail
-InstallChangeFolderUp  PushButton  310 64  19  19  
3670019 UpIco   NewFolder   OOO_CONTROL_121
+InstallChangeFolderUp  PushButton  322 64  19  19  
3670019 UpIco   NewFolder   OOO_CONTROL_121
 InstallWelcome BackPushButton  164 243 66  17  1   
OOO_CONTROL_122 Copyright   
 InstallWelcome Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_123 Back
 InstallWelcome Copyright   Text135 144 228 73  65539   
OOO_CONTROL_124 Next
commit 97e67306667c2004167fcd2ae6c556788d427f9d
Author: Damjan Jovanovic 
Date:   Sun Sep 10 13:56:45 2017 +

main/connectivity/util depends on main/connectivity/java/sdbc_postgresql.

The missing dependency was sometimes causing util to build first,
failing due to missing sdbc_postgresql.xcu.

Found by: Matthias Seidel
Patch by: me

diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 249cf339c84a..9244df25ed97 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -26,4 +26,4 @@ cn  connectivity\source\simpledbt   nmake   - 
  all cn_simpledbt
 cn  connectivity\source\dbtools nmake   -   all cn_dbtools 
cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
 cn  connectivity\qa\connectivity\tools  nmake   -   all 
cn_qa_tools cn_inc NULL
 cn  connectivity\qa nmake   -   all cn_qa 
cn_inc NULL
-cn  connectivity\util   nmake   -   all cn_util 
cn_ado cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase 
cn_hsqldb cn_macab NULL
+cn  connectivity\util   nmake   -   all cn_util 
cn_ado cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dba

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

2017-09-11 Thread Stephan Bergmann

 filter/source/xsltfilter/LibXSLTTransformer.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b58777e6cd5ea1b3ef20ea81a6487635a1e19380
Author: Stephan Bergmann 
Date:   Mon Sep 11 18:08:29 2017 +0200

Fix further data race during CppunitTest_filter_xslt

> WARNING: ThreadSanitizer: data race (pid=25817)
>   Write of size 8 at 0x7b5108a8 by thread T2:
> #0 memset 
compiler-rt/lib/tsan/../sanitizer_common/sanitizer_common_interceptors.inc:710 
(cppunittester+0x46672b)
> #1 xsltFreeTransformContext 
workdir/UnpackedTarball/xslt/libxslt/transform.c:760:5 (libxslt.so.1+0x383a2)
> #2 XSLT::Reader::execute() 
filter/source/xsltfilter/LibXSLTTransformer.cxx:338:9 
(libxsltfilterlo.so+0x10aa9)
> #3 salhelper::Thread::run() salhelper/source/thread.cxx:40:9 
(libuno_salhelpergcc3.so.3+0x5f6c)
> #4 non-virtual thunk to salhelper::Thread::run() 
salhelper/source/thread.cxx (libuno_salhelpergcc3.so.3+0x603c)
> #5 threadFunc include/osl/thread.hxx:185:15 
(libuno_salhelpergcc3.so.3+0x6fac)
> #6 osl_thread_start_Impl(void*) sal/osl/unx/thread.cxx:237:9 
(libuno_sal.so.3+0xeb6b5)
>
>   Previous write of size 4 at 0x7b5108a8 by main thread (mutexes: 
write M713392882458407696):
> #0 XSLT::Reader::forceStateStopped() 
filter/source/xsltfilter/LibXSLTTransformer.cxx:375:25 
(libxsltfilterlo.so+0x1100e)
> #1 XSLT::LibXSLTTransformer::~LibXSLTTransformer() 
filter/source/xsltfilter/LibXSLTTransformer.hxx:127:27 
(libxsltfilterlo.so+0x18346)
> #2 XSLT::LibXSLTTransformer::~LibXSLTTransformer() 
filter/source/xsltfilter/LibXSLTTransformer.hxx:124:48 
(libxsltfilterlo.so+0x1850c)
> #3 cppu::OWeakObject::release() cppuhelper/source/weak.cxx:232:9 
(libuno_cppuhelpergcc3.so.3+0x20a527)
> #4 
cppu::WeakImplHelper::release() 
include/cppuhelper/implbase.hxx:112:62 (libxsltfilterlo.so+0x18168)
> #5 non-virtual thunk to 
cppu::WeakImplHelper::release() 
include/cppuhelper/implbase.hxx (libxsltfilterlo.so+0x188fc)
> #6 
com::sun::star::uno::Reference::~Reference()
 include/com/sun/star/uno/Reference.hxx:110:22 (libtest_filter_xslt.so+0x14c44)
> #7 (anonymous namespace)::XsltFilterTest::testXsltCopyOld() 
filter/qa/cppunit/xslt-test.cxx:201:1 (libtest_filter_xslt.so+0x94c6)
> #8 void std::__invoke_impl(std::__invoke_memfun_deref, void ((anonymous 
namespace)::XsltFilterTest::* const&)(), (anonymous 
namespace)::XsltFilterTest*&) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:227:14
 (libtest_filter_xslt.so+0xeeae)
> #9 std::result_of::type std::__invoke(void ((anonymous namespace)::XsltFilterTest::* 
const&)(), (anonymous namespace)::XsltFilterTest*&) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:250:14
 (libtest_filter_xslt.so+0xed9d)
> #10 
_ZNKSt12_Mem_fn_baseIMN12_GLOBAL__N_114XsltFilterTestEFvvELb1EEclIJRPS1_EEEDTclsr3stdE8__invokedtdefpT6_M_pmfspclsr3stdE7forwardIT_Efp_EEEDpOS8_
 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:604:11
 (libtest_filter_xslt.so+0xec7b)
> #11 void std::_Bind ((anonymous 
namespace)::XsltFilterTest*)>::__call(std::tuple<>&&, 
std::_Index_tuple<0ul>) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:933:11
 (libtest_filter_xslt.so+0xebeb)
> #12 void std::_Bind ((anonymous 
namespace)::XsltFilterTest*)>::operator()<, void>() 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:991:17
 (libtest_filter_xslt.so+0xeaf6)
> #13 std::_Function_handler ((anonymous 
namespace)::XsltFilterTest*)> >::_M_invoke(std::_Any_data const&) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:1731:2
 (libtest_filter_xslt.so+0xe4ba)
> #14 std::function::operator()() const 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:2127:14
 (libtest_filter_xslt.so+0x1fb3e)
> #15 CppUnit::TestCaller<(anonymous 
namespace)::XsltFilterTest>::runTest() 
workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:175:7 
(libtest_filter_xslt.so+0xdc5c)
> #16 CppUnit::TestCaseMethodFunctor::operator()() const 
workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5 
(libcppunit-1.14.so.0+0xd61d2)
> #17 (anonymous namespace)::Protector::protect(CppUnit::Functor 
const&, CppUnit::ProtectorContext const&) 
test/source/vclbootstrapprotector.cxx:39:14 (libvclbootstrapprotector.so+0x1114)
> #18 CppUnit::ProtectorChain::ProtectFunctor::operator()() const 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25 
(libcppunit-1.14.so.0+0xc7614)
> #19 (anonymous namespace)::Prot::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) 
unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx:89:12 
(unobootstrapprot

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

2017-09-11 Thread Stephan Bergmann

 filter/source/xsltfilter/LibXSLTTransformer.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 31d606d42d3f2b0577c74af5778778c975d519ae
Author: Stephan Bergmann 
Date:   Mon Sep 11 18:13:51 2017 +0200

...and fix previous commit cd8aeed1569222edd8bfd05d9d833f74b679fcd0

"Fix data races during CppunitTest_filter_xslt".  (Funny how after each
attempted fix, 'make CppunitTest_filter_xslt' succeeded multiple times in a 
row,
and only started to fail ThreadSanitizer after pushing the attempted fix.)

Change-Id: I24cab2dd1b068b02ccd4827cf8dcb11cf301d1c0

diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx 
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 869643003edb..0fc7e434c1ea 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -364,17 +364,13 @@ namespace XSLT
 
 void Reader::forceStateStopped()
 {
-xsltTransformContextPtr tcontext;
-{
-std::unique_lock g(m_mutex);
-tcontext = m_tcontext;
-}
-if (!tcontext)
+std::unique_lock g(m_mutex);
+if (!m_tcontext)
 return;
 //tdf#100057 If we force a cancel, libxslt will of course just keep on 
going unless something
 //tells it to stop. Here we force the stopped state so that libxslt 
will stop processing
 //and so Reader::execute will complete and we can join cleanly
-tcontext->state = XSLT_STATE_STOPPED;
+m_tcontext->state = XSLT_STATE_STOPPED;
 }
 
 Reader::~Reader()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Report for 09/07/2017

2017-09-11 Thread Shinnok

Hi,

That's good news. The next step for you is to pick an easyHack to tackle on. 
You can choose any that's listed here:
https://wiki.documentfoundation.org/Development/EasyHacks/by_Required_Skill 

Or even better, I have a recommendation for you:
https://bugs.documentfoundation.org/show_bug.cgi?id=110742 

The way you would go about this is register with Bugzilla, assign the bug to 
you to signal that you've started working on it and then proceed. As soon as 
you have a workable patch you need to register using Gerrit and submit your 
patch for review, follow these instructions:
https://wiki.documentfoundation.org/Development/gerrit 

If you get stuck or need further help, you can ask for it using this list, the 
Bugzilla comments section or hop on to IRC at freenode.net on channel 
#libreoffice-dev.

Cheers,
Shinnok

> On Sep 7, 2017, at 5:27 PM, namitha.ni...@ssrlabs.com wrote:
> 
> Hi Shinnok
> 
> As per our previous discussions, I have completed the make with
> build-nocheck and it seems to have run without an issue. With this the
> build issues appear to have been solved after running
> ./autogen.sh --without-java --without-doxygen --disable-cve-tests and make
> build-nocheck. What would be the ideal procedure to proceed further ?
> 
> Regards
> Namitha Ninan
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice-commits] online.git: common/Session.hpp wsd/ClientSession.cpp wsd/ClientSession.hpp

2017-09-11 Thread Michael Meeks

 common/Session.hpp|1 +
 wsd/ClientSession.cpp |   21 +
 wsd/ClientSession.hpp |3 +++
 3 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 5c879a17b22b60ede615d3e32d74f01af7c4b7f5
Author: Michael Meeks 
Date:   Mon Sep 11 18:59:38 2017 +0100

Count key-strokes, and report per session.

Change-Id: Id661fc15d4a75e322024ce62d24b2d7dae8f256a

diff --git a/common/Session.hpp b/common/Session.hpp
index 99961848..645ec3c5 100644
--- a/common/Session.hpp
+++ b/common/Session.hpp
@@ -119,6 +119,7 @@ private:
 /// True if the user is active, otherwise false (switched tabs).
 std::atomic _isActive;
 
+/// Time of the last interactive event being received
 std::chrono::steady_clock::time_point _lastActivityTime;
 
 // Whether websocket received close frame.  Closing Handshake
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 2e455029..c96a8542 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -40,7 +40,8 @@ ClientSession::ClientSession(const std::string& id,
 _uriPublic(uriPublic),
 _isDocumentOwner(false),
 _isAttached(false),
-_isViewLoaded(false)
+_isViewLoaded(false),
+_keyEvents(1)
 {
 const size_t curConnections = ++LOOLWSD::NumConnections;
 LOG_INF("ClientSession ctor [" << getName() << "], current number of 
connections: " << curConnections);
@@ -82,7 +83,6 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 updateLastActivityTime();
 docBroker->updateLastActivityTime();
 }
-
 if (tokens[0] == "loolclient")
 {
 const auto versionTuple = ParseVersion(tokens[1]);
@@ -240,6 +240,9 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 }
 else
 {
+if (tokens[0] == "key")
+_keyEvents++;
+
 if (!filterMessage(firstLine))
 {
 const std::string dummyFrame = "dummymsg";
@@ -879,9 +882,19 @@ void ClientSession::dumpState(std::ostream& os)
 os << "\t\tisReadOnly: " << isReadOnly()
<< "\n\t\tisDocumentOwner: " << _isDocumentOwner
<< "\n\t\tisAttached: " << _isAttached
-   << "\n";
+   << "\n\t\tkeyEvents: " << _keyEvents;
+
+std::shared_ptr socket = _socket.lock();
+if (socket)
+{
+uint64_t sent, recv;
+socket->getIOStats(sent, recv);
+os << "\n\t\tsent/keystroke: " << (double)sent/_keyEvents << "bytes";
+}
+
+os << "\n";
 _senderQueue.dumpState(os);
-}
 
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index dd2ea0e3..abadb86d 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -162,6 +162,9 @@ private:
 /// Wopi FileInfo object
 std::unique_ptr _wopiFileInfo;
 
+/// Count of key-strokes
+uint64_t _keyEvents;
+
 SenderQueue> _senderQueue;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Andrea Gelmini

 cui/source/dialogs/iconcdlg.cxx |2 +-
 include/vcl/lazydelete.hxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b9f2f43a9b6724fa1a09ba3115ac9abb25d52c8a
Author: Andrea Gelmini 
Date:   Mon Sep 11 21:32:13 2017 +0200

Fix typos

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

diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 825d846f8635..8c2f7a2f34e8 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -57,7 +57,7 @@ IconChoicePage::~IconChoicePage()
 
 /**
 |
-| Activate / Deaktivate
+| Activate / Deactivate
 |
 \**/
 
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 4bc122457279..930d6c2a4157 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -56,7 +56,7 @@ namespace vcl
 object to be destroyed lazy. The static method creates the LazyDeletor
 (which in turn registers itself in LazyDelete) if this is the first time
 a T* is to be destroyed lazy. It then inserts the object. When the 
LazyDeletor
-gets delte it will delete the stored objects in a fashion
+gets delete it will delete the stored objects in a fashion
 that will ensure the correct order of deletion via the specialized is_less 
method
 (e.g. if a Window is a child of another Window and therefore should be 
destroyed
 first it is "less" in this sense)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/qa-tools.py

2017-09-11 Thread Xisco Fauli

 esc-reporting/qa-tools.py |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 69a135b6cdcc358ba22dbaef27180541832c3d49
Author: Xisco Fauli 
Date:   Mon Sep 11 22:14:14 2017 +0200

QA tools: warn about metabugs without alias

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index acb3617..889a684 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -737,6 +737,12 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 elif row['summary'].lower().startswith('[meta]'):
 statList['data']['bugs']['metabugs'][rowId] = row['alias']
 
+if not row['alias']:
+if 'emptyAlias' not in lResults:
+lResults['emptyAlias'] = [[],[]]
+lResults['emptyAlias'][0].append(rowId)
+lResults['emptyAlias'][1].append('')
+
 for dKey, dValue in lResults.items():
 if dValue:
 print('\n=== ' + dKey + ' ===')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Ashod Nakashian

 sw/source/core/edit/edfcol.cxx |   22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

New commits:
commit c43152a008961f78bce30c19b84810ed9472870d
Author: Ashod Nakashian 
Date:   Sun Sep 10 13:06:09 2017 -0400

sw: let user choose cert when inserting paragraph signature

Change-Id: I1dca4d66e0666e45216253ea92010810bab93edf
Reviewed-on: https://gerrit.libreoffice.org/42170
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 

diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 1b29cbedaf59..bc605825ea9e 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -36,6 +36,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -690,22 +692,18 @@ void SwEditShell::SignParagraph(SwPaM* pPaM)
 if (utf8Text.isEmpty())
 return;
 
-// 2. Get certificate and SignatureInformation (needed to show signer 
name).
-//FIXME: Temporary until the Paragraph Signing Dialog is available.
-uno::Reference xComponentContext = 
cppu::defaultBootstrap_InitialComponentContext();
-uno::Reference xSEInitializer = 
xml::crypto::SEInitializer::create(xComponentContext);
-uno::Reference xSecurityContext = 
xSEInitializer->createSecurityContext(OUString());
-uno::Reference xSecurityEnvironment = 
xSecurityContext->getSecurityEnvironment();
-uno::Sequence> aCertificates = 
xSecurityEnvironment->getPersonalCertificates();
-if (!aCertificates.hasElements())
-return;
+// 2. Get certificate.
+uno::Reference xSigner(
+security::DocumentDigitalSignatures::createWithVersion(
+comphelper::getProcessComponentContext(), "1.2" ) );
 
-uno::Reference xCert = aCertificates[0];
-if (!xCert.is())
+OUString aDescription;
+uno::Reference xCertificate = 
xSigner->chooseCertificate(aDescription);
+if (!xCertificate.is())
 return;
 
 // 3. Sign it.
-svl::crypto::Signing signing(xCert);
+svl::crypto::Signing signing(xCertificate);
 signing.AddDataRange(utf8Text.getStr(), utf8Text.getLength());
 OStringBuffer sigBuf;
 if (!signing.Sign(sigBuf))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Tamás Zolnai

 sc/source/filter/excel/xepivot.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bc9714fefb2dd2ad55a92aaacb6b246f354ed2c0
Author: TamÃ¡s Zolnai 
Date:   Mon Sep 11 17:02:55 2017 +0200

tdf#112328: Pivot table, XLS: Popup button for column fields is missing

...after round trip in Calc

Wrong heading row was exported.

Change-Id: I410eeeff7d7af408de1ea8128b6b21ac0cc76ea5
Reviewed-on: https://gerrit.libreoffice.org/42175
Tested-by: Jenkins 
Reviewed-by: TamÃ¡s Zolnai 

diff --git a/sc/source/filter/excel/xepivot.cxx 
b/sc/source/filter/excel/xepivot.cxx
index 82f7db5646b4..00fe96fa8e37 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -1429,9 +1429,9 @@ void XclExpPivotTable::Finalize()
 maPTInfo.mnDataRows = rnXclRow2 - rnDataXclRow + 1;
 
 // first heading
-maPTInfo.mnFirstHeadRow = rnXclRow1;
+maPTInfo.mnFirstHeadRow = rnXclRow1 + 1;
 if (bExtraHeaderRow)
-maPTInfo.mnFirstHeadRow += 2;
+maPTInfo.mnFirstHeadRow += 1;
 }
 
 // records 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Ashod Nakashian

 sw/source/core/edit/edfcol.cxx  |  105 +---
 sw/source/uibase/shells/textsh1.cxx |   11 ---
 2 files changed, 98 insertions(+), 18 deletions(-)

New commits:
commit 75ca51725274b95417aa2c7f169145e3cd3b3b4f
Author: Ashod Nakashian 
Date:   Mon Sep 11 08:21:45 2017 -0400

sw: support paragraph signing undo/redo

Change-Id: I45930a99ce46f20777bd3114e44aa23666a2cc74
Reviewed-on: https://gerrit.libreoffice.org/42171
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 

diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index bc605825ea9e..8394a7a8abcc 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -76,6 +76,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define WATERMARK_NAME "PowerPlusWaterMarkObject"
 
@@ -672,6 +673,75 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& 
rWatermark)
 }
 }
 
+class SwUndoParagraphSigning : public SwUndo
+{
+private:
+sal_uLong m_nNodeIndex;
+SwDoc* m_pDoc;
+uno::Reference m_xField;
+uno::Reference m_xParent;
+OUString m_signature;
+OUString m_display;
+
+public:
+SwUndoParagraphSigning(const SwPosition& rPos,
+   const uno::Reference& xField,
+   const uno::Reference& xParent);
+
+virtual void UndoImpl(::sw::UndoRedoContext&) override;
+virtual void RedoImpl(::sw::UndoRedoContext&) override;
+virtual void RepeatImpl(::sw::RepeatContext&) override;
+};
+
+SwUndoParagraphSigning::SwUndoParagraphSigning(const SwPosition& rPos,
+   const 
uno::Reference& xField,
+   const 
uno::Reference& xParent)
+  : SwUndo(SwUndoId::PARA_SIGN_ADD, rPos.GetDoc()),
+m_nNodeIndex(rPos.nNode.GetIndex()),
+m_pDoc(rPos.GetDoc()),
+m_xField(xField),
+m_xParent(xParent)
+{
+// Save the metadata and field content to undo/redo.
+static const OUString metaNS("urn:bails");
+uno::Reference xModel = 
m_pDoc->GetDocShell()->GetBaseModel();
+const css::uno::Reference xSubject(m_xField, 
uno::UNO_QUERY);
+std::map aStatements = 
SwRDFHelper::getStatements(xModel, metaNS, xSubject);
+const auto it = aStatements.find("loext:signature:signature");
+if (it != aStatements.end())
+m_signature = it->second;
+
+uno::Reference xText(m_xField, uno::UNO_QUERY);
+m_display = xText->getString();
+}
+
+void SwUndoParagraphSigning::UndoImpl(::sw::UndoRedoContext&)
+{
+lcl_RemoveParagraphSignatureField(m_xField);
+}
+
+void SwUndoParagraphSigning::RedoImpl(::sw::UndoRedoContext&)
+{
+static const OUString metaFile("bails.rdf");
+static const OUString metaNS("urn:bails");
+const OUString name = "loext:signature:signature";
+
+uno::Reference xModel = 
m_pDoc->GetDocShell()->GetBaseModel();
+uno::Reference xMultiServiceFactory(xModel, 
uno::UNO_QUERY);
+m_xField = 
uno::Reference(xMultiServiceFactory->createInstance("com.sun.star.text.textfield.MetadataField"),
 uno::UNO_QUERY);
+m_xField->attach(m_xParent->getAnchor()->getStart());
+
+const css::uno::Reference xSubject(m_xField, 
uno::UNO_QUERY);
+SwRDFHelper::addStatement(xModel, metaNS, metaFile, xSubject, name, 
m_signature);
+
+uno::Reference xText(m_xField, uno::UNO_QUERY);
+xText->setString(m_display);
+}
+
+void SwUndoParagraphSigning::RepeatImpl(::sw::RepeatContext&)
+{
+}
+
 void SwEditShell::SignParagraph(SwPaM* pPaM)
 {
 if (!pPaM)
@@ -719,6 +789,8 @@ void SwEditShell::SignParagraph(SwPaM* pPaM)
 uno::Reference xMultiServiceFactory(xModel, 
uno::UNO_QUERY);
 uno::Reference 
xField(xMultiServiceFactory->createInstance("com.sun.star.text.textfield.MetadataField"),
 uno::UNO_QUERY);
 
+GetDoc()->GetIDocumentUndoRedo().StartUndo(SwUndoId::PARA_SIGN_ADD, 
nullptr);
+
 uno::Reference xContent(xField, uno::UNO_QUERY);
 xContent->attach(xParent->getAnchor()->getStart());
 
@@ -726,9 +798,23 @@ void SwEditShell::SignParagraph(SwPaM* pPaM)
 const OUString name = "loext:signature:signature";
 SwRDFHelper::addStatement(xModel, metaNS, metaFile, xRes, name, 
OStringToOUString(signature, RTL_TEXTENCODING_UTF8, 0));
 
-const std::pair res = 
lcl_MakeParagraphSignatureFieldText(xModel, xField, utf8Text);
-uno::Reference xText(xField, uno::UNO_QUERY);
-xText->setString(res.second + " ");
+{
+// Disable undo to avoid introducing noise when we edit the metadata 
field.
+const bool isUndoEnabled = GetDoc()->GetIDocumentUndoRedo().DoesUndo();
+GetDoc()->GetIDocumentUndoRedo().DoUndo(false);
+comphelper::ScopeGuard const g([&] () {
+GetDoc()->GetIDocumentUndoRedo().DoUndo(isUndoEnabled);
+ });
+
+const std::pair res = 
lcl_MakeParagraphSignatureFieldText(xModel, xField, utf8Text);
+uno::Reference xText(xField, uno::UNO_QUERY);
+xText->setString(re

New Defects reported by Coverity Scan for LibreOffice

2017-09-11 Thread scan-admin


Hi,

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

2 new defect(s) introduced to LibreOffice found with Coverity Scan.
2 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 2 of 2 defect(s)


** CID 1417678:  Error handling issues  (UNCAUGHT_EXCEPT)
/sw/source/uibase/dbui/dbmgr.cxx: 805 in SwDBManager::~SwDBManager()()



*** CID 1417678:  Error handling issues  (UNCAUGHT_EXCEPT)
/sw/source/uibase/dbui/dbmgr.cxx: 805 in SwDBManager::~SwDBManager()()
799 , pImpl(new SwDBManager_Impl(*this))
800 , pMergeEvtSrc(nullptr)
801 , m_pDoc(pDoc)
802 {
803 }
804 
>>> CID 1417678:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::DeploymentException" is 
>>> thrown but the throw list "throw()" doesn't allow it to be thrown. This 
>>> will cause a call to unexpected() which usually calls terminate().
805 SwDBManager::~SwDBManager()
806 {
807 RevokeLastRegistrations();
808 
809 // copy required, m_DataSourceParams can be modified while 
disposing components
810 std::vector> aCopiedConnections;

** CID 1078469:  Error handling issues  (CHECKED_RETURN)
/reportdesign/source/ui/inspection/GeometryHandler.cxx: 1899 in 
rptui::GeometryHandler::impl_isDefaultFunction_nothrow(const 
com::sun::star::uno::Reference &, 
rtl::OUString &, rtl::OUString &) const()



*** CID 1078469:  Error handling issues  (CHECKED_RETURN)
/reportdesign/source/ui/inspection/GeometryHandler.cxx: 1899 in 
rptui::GeometryHandler::impl_isDefaultFunction_nothrow(const 
com::sun::star::uno::Reference &, 
rtl::OUString &, rtl::OUString &) const()
1893 sal_Int32 start = 0;
1894 sal_Int32 end = sFormula.getLength();
1895 if ( aTextSearch.SearchForward(sFormula,&start,&end) && 
start == 0 && end == sFormula.getLength()) // default function found
1896 {
1897 aSearchOptions.searchString = 
"\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]";
1898 utl::TextSearch aDataSearch( aSearchOptions);
>>> CID 1078469:  Error handling issues  (CHECKED_RETURN)
>>> Calling "SearchForward" without checking return value (as is done 
>>> elsewhere 20 out of 25 times).
1899 aDataSearch.SearchForward(sFormula,&start,&end );
1900 ++start;
1901 _rDataField = sFormula.copy(start,end-start-1);
1902 _rsDefaultFunctionName = aIter->m_sName;
1903 break;
1904 }



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpy2qWdtUsJf5fe18Sf2m7v2a7mVo5Djp6ZB1Dvuk1bdOiShrFLckprT8FAJNm-2FYVtWjWCW4S7u2m6yqGwWakpq8eqyouAk-2Fi6BH9s7pHvRCd4uqNCVEZPCoUdfxXwxUm8rpVSCE8zqJ7cJK2Ik4t4FORAv2VhG4uk3xgQnJ-2BYh6Ck-3D

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRbVDbis712qZDP-2FA8y06Nq4k1FZJSDV-2FTHi5VQof9xGafB4oBwGYxuHHknceo2QLpCrZ44Ciy7AqBR2QyX6OCB5lwWgMDuK-2FivqaohkU3M9kT-2Fww10Qt2GoaCJAOQCa0Wv4ijH4oV8jCt0XXa7QeAwh_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpy2qWdtUsJf5fe18Sf2m7v2b5YLdN1BxyJmusGLsCZqitEPJmdxciRSNbPuQ8YmtIkmnw01Q3UpGR8Lu1SuSLUKcSBXWaQs-2B9Q6mltlw1nev6bInseqI6VPOQbcxA5LbCK6RcDWIpFb5KRaYW6dlvN4Clz5Y-2BKyZ0POZptv02gyts-3D

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

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

2017-09-11 Thread Jochen Nitschke

 sfx2/source/view/viewfrm.cxx   |5 ++---
 svtools/source/contnr/treelist.cxx |2 +-
 sw/source/filter/ww8/ww8par5.cxx   |5 ++---
 vcl/source/gdi/print3.cxx  |7 +--
 4 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 7e2a6709d9511f983f9981258c38ccc125bcd3fe
Author: Jochen Nitschke 
Date:   Mon Sep 11 17:08:33 2017 +0200

cppcheck: identicalConditionAfterEarlyExit

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

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 75d833880caa..a8e83f9c95be 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -794,8 +794,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
 {
 const SfxViewShell *pVSh;
 const SfxShell *pFSh;
-if ( !pSh ||
- !pSh->HasName() ||
+if ( !pSh->HasName() ||
  !( pSh->Get_Impl()->nLoadedFlags &  
SfxLoadedFlags::MAINDOCUMENT ) ||
  ( pSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED &&
( !(pVSh = pSh->GetViewShell())  ||
@@ -815,7 +814,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
 
 case SID_RELOAD:
 {
-if ( !pSh || !pSh->CanReload_Impl() || pSh->GetCreateMode() == 
SfxObjectCreateMode::EMBEDDED )
+if ( !pSh->CanReload_Impl() || pSh->GetCreateMode() == 
SfxObjectCreateMode::EMBEDDED )
 rSet.DisableItem(nWhich);
 else
 {
diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index ce0a07cef863..8d6c72b570c4 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -433,7 +433,7 @@ sal_uLong SvTreeList::GetChildCount( const SvTreeListEntry* 
pParent ) const
 if ( !pParent )
 return GetEntryCount();
 
-if (!pParent || pParent->m_Children.empty())
+if (pParent->m_Children.empty())
 return 0;
 
 sal_uLong nCount = 0;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index e306bbef3290..36d700d715c1 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -922,7 +922,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
 }
 
 // no routine available
-if (bNested || !bHasHandler || bCodeNest)
+if (!bHasHandler || bCodeNest)
 {
 if( m_nFieldTagBad[nI] & nMask )  // Flag: Tag it when bad
 return Read_F_Tag( &aF );   // Result not as text
@@ -2723,12 +2723,11 @@ void SwWW8ImplReader::Read_SubF_Ruby( 
WW8ReadFieldParams& rReadParam)
 //Create a new char style if necessary
 if (!pCharFormat)
 {
-SwCharFormat *pFormat=nullptr;
 OUString aNm;
 //Take this as the base name
 SwStyleNameMapper::FillUIName(RES_POOLCHR_RUBYTEXT,aNm);
 aNm+=OUString::number(m_aRubyCharFormats.size()+1);
-pFormat = m_rDoc.MakeCharFormat(aNm, m_rDoc.GetDfltCharFormat());
+SwCharFormat *pFormat = m_rDoc.MakeCharFormat(aNm, 
m_rDoc.GetDfltCharFormat());
 SvxFontHeightItem aHeightItem(nFontSize*10, 100, 
RES_CHRATR_FONTSIZE);
 SvxFontItem aFontItem(FAMILY_DONTKNOW,sFontName,
 OUString(), PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, 
RES_CHRATR_FONT);
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index e70c4d02dd82..a825d0b23438 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1266,16 +1266,11 @@ DrawModeFlags PrinterController::removeTransparencies( 
GDIMetaFile const & i_rIn
 void PrinterController::printFilteredPage( int i_nPage )
 {
 if( mpImplData->meJobState != css::view::PrintableState_JOB_STARTED )
-return;
+return; // rhbz#657394: check that we are still printing...
 
 GDIMetaFile aPageFile;
 PrinterController::PageSize aPageSize = getFilteredPageFile( i_nPage, 
aPageFile );
 
-if (mpImplData->meJobState != css::view::PrintableState_JOB_STARTED)
-{   // rhbz#657394: check that we are still printing...
-return;
-}
-
 if( mpImplData->mpProgress )
 {
 // do nothing if printing is canceled
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-11 Thread Noel Grandin

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

New commits:
commit 8ff99af537b2daff07717990be10780ad6824f25
Author: Noel Grandin 
Date:   Mon Sep 11 17:01:43 2017 +0200

use more GetColumnsRange

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

diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index b4c448133f6e..ae608b3c2e94 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -326,7 +326,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW 
nRow1,
 *t->GetSingleRef() = aRefData;
 }
 
-for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
+for (SCCOL nCol : GetColumnsRange(nTab1, nCol1, nCol2))
 {
 for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - oox/source package/source postprocess/qa reportdesign/source sax/qa sax/source

2017-09-11 Thread Noel Grandin

 oox/source/core/filterdetect.cxx  |2 
 oox/source/core/recordparser.cxx  |2 
 oox/source/drawingml/chart/titleconverter.cxx |2 
 oox/source/drawingml/clrscheme.cxx|2 
 oox/source/drawingml/color.cxx|8 +--
 oox/source/drawingml/diagram/datamodelcontext.cxx |4 -
 oox/source/drawingml/diagram/diagram.cxx  |5 --
 oox/source/drawingml/linepropertiescontext.cxx|2 
 oox/source/drawingml/textfield.cxx|   12 ++---
 oox/source/dump/dffdumper.cxx |2 
 oox/source/dump/dumperbase.cxx|4 -
 oox/source/dump/oledumper.cxx |   14 +++---
 oox/source/export/chartexport.cxx |8 +--
 oox/source/export/shapes.cxx  |4 -
 oox/source/mathml/importutils.cxx |6 +-
 oox/source/ole/axcontrol.cxx  |2 
 oox/source/ppt/conditioncontext.cxx   |2 
 oox/source/ppt/slidefragmenthandler.cxx   |2 
 oox/source/vml/vmlformatting.cxx  |   46 +++---
 oox/source/vml/vmlshape.cxx   |   28 ++---
 oox/source/vml/vmlshapecontext.cxx|2 
 oox/source/vml/vmltextbox.cxx |2 
 package/source/manifest/ManifestImport.cxx|4 -
 package/source/xstor/ohierarchyholder.cxx |2 
 package/source/xstor/xstorage.cxx |4 -
 postprocess/qa/services.cxx   |   14 ++
 reportdesign/source/filter/xml/xmlExport.cxx  |   18 
 reportdesign/source/ui/dlg/GroupsSorting.cxx  |2 
 reportdesign/source/ui/misc/RptUndo.cxx   |2 
 reportdesign/source/ui/report/ReportSection.cxx   |2 
 sax/qa/cppunit/xmlimport.cxx  |4 -
 sax/source/tools/fastattribs.cxx  |4 -
 sax/source/tools/fshelper.cxx |4 -
 33 files changed, 109 insertions(+), 112 deletions(-)

New commits:
commit 65e293f524437a548b6c099bbe6099b56957063c
Author: Noel Grandin 
Date:   Mon Sep 11 16:43:19 2017 +0200

clang-tidy modernize-use-emplace in package..sax

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

diff --git a/package/source/manifest/ManifestImport.cxx 
b/package/source/manifest/ManifestImport.cxx
index bfde6aa3cb2c..3868be460c41 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -351,7 +351,7 @@ OUString ManifestImport::PushNameAndNamespaces( const 
OUString& aName, const uno
 aNamespaces[aNsName] = aAttrValue;
 } else {
 // this is no namespace declaration
-aAttribsStrs.push_back( pair< OUString, OUString >( aAttrName, 
aAttrValue ) );
+aAttribsStrs.emplace_back( aAttrName, aAttrValue );
 }
 }
 }
@@ -360,7 +360,7 @@ OUString ManifestImport::PushNameAndNamespaces( const 
OUString& aName, const uno
 if ( !aConvertedName.getLength() )
 aConvertedName = ConvertName( aName );
 
-aStack.push_back( ManifestScopeEntry( aConvertedName, aNamespaces ) );
+aStack.emplace_back( aConvertedName, aNamespaces );
 
 for (const std::pair & rAttribsStr : aAttribsStrs) {
 // convert the attribute names on filling
diff --git a/package/source/xstor/ohierarchyholder.cxx 
b/package/source/xstor/ohierarchyholder.cxx
index 96a079e5ccd5..c07c7740c502 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -123,7 +123,7 @@ uno::Reference< embed::XExtendedStorageStream > 
OHierarchyElement_Impl::GetStrea
 xStreamComp->addEventListener( static_cast< lang::XEventListener* 
>( this ) );
 }
 
-m_aOpenStreams.push_back( uno::WeakReference< 
embed::XExtendedStorageStream >( xResult ) );
+m_aOpenStreams.emplace_back( xResult );
 }
 else
 {
diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index 79b239588c77..06c5ec31ae4e 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -375,7 +375,7 @@ void OStorage_Impl::SetReadOnlyWrap( OStorage& aStorage )
 {
 // Weak reference is used inside the holder so the refcount must not be 
zero at this point
 OSL_ENSURE( aStorage.GetRefCount_Impl(), "There must be a reference alive 
to use this method!" );
-m_aReadOnlyWrapVector.push_back( StorageHolder_Impl( &aStorage ) );
+m_aReadOnlyWrapVector.emplace_back( &aStorage );
 }
 
 void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage )
@@ -2042,7 +2042,7 @@ void OStorage::MakeLinkToSubComponent_Impl( const 
uno::Reference< lang::XCompone
 xComponent->addEventListener( uno::Reference< lang::XEvent

55 matches

Mail list logo