[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 780bb69758850d7f04dd996af7564d253bfd1f97 Author: Andrea Gelmini Date: Mon May 8 00:44:48 2017 +0200 Removed duplicated include Change-Id: If24026da701ea041fa3138a8ab0905a175da4ea6 Reviewed-on: https://gerrit.libreoffice.org/37360 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index b0eea09405aa..9255837a9e3f 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/winlayout.cxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit 43e997d2d9f5ca98bf765e1c956bf56f66935eb5
Author: Noel Grandin
Date: Sun May 7 19:37:28 2017 +0200
hNonAliasedFont is unused
ever since commit e45d80f20ff6a05888f92ae942abed67609d5b20
Author: Tim Eves
Date: Tue Feb 23 16:45:21 2016 +
"tdf#97171: Use DirectWrite for OpenGL glyph caching"
Change-Id: Ib6675e89caa68a5ee725a36a0d5ded973cc98723
Reviewed-on: https://gerrit.libreoffice.org/37348
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index feb5565be153..a510eba4d61a 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -141,8 +141,6 @@ bool WinFontInstance::CacheGlyphToAtlas(HDC hDC, HFONT
hFont, int nGlyphIndex, S
OpenGLCompatibleDC aDC(rGraphics, 0, 0, nBitmapWidth, nBitmapHeight);
-HFONT hNonAntialiasedFont = nullptr;
-
SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
@@ -190,8 +188,6 @@ bool WinFontInstance::CacheGlyphToAtlas(HDC hDC, HFONT
hFont, int nGlyphIndex, S
default:
SAL_WARN("vcl.gdi", "DrawGlyphRun-EndDraw failed: " <<
WindowsErrorString(GetLastError()));
SelectFont(aDC.getCompatibleHDC(), hOrigFont);
-if (hNonAntialiasedFont != nullptr)
-DeleteObject(hNonAntialiasedFont);
return false;
}
@@ -205,8 +201,6 @@ bool WinFontInstance::CacheGlyphToAtlas(HDC hDC, HFONT
hFont, int nGlyphIndex, S
maGlyphCache.PutDrawElementInCache(aElement, nGlyphIndex);
SelectFont(aDC.getCompatibleHDC(), hOrigFont);
-if (hNonAntialiasedFont != nullptr)
-DeleteObject(hNonAntialiasedFont);
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/calbck.hxx|4 ++--
sw/inc/calc.hxx |2 +-
sw/inc/crsrsh.hxx|2 +-
sw/inc/doc.hxx |2 +-
sw/inc/pam.hxx |2 +-
sw/source/core/access/acccontext.cxx |9 +++--
sw/source/core/access/acccontext.hxx |3 +--
sw/source/core/access/accpara.cxx| 17 +++--
sw/source/core/access/accpara.hxx|5 +
sw/source/core/attr/calbck.cxx |8
sw/source/core/bastyp/calc.cxx |2 +-
sw/source/core/crsr/crsrsh.cxx |4 ++--
sw/source/core/crsr/pam.cxx |2 +-
sw/source/core/doc/doc.cxx |1 -
sw/source/core/doc/docftn.cxx|2 +-
sw/source/core/doc/lineinfo.cxx |4 ++--
sw/source/core/doc/number.cxx|2 +-
sw/source/core/docnode/section.cxx |2 +-
sw/source/core/fields/cellfml.cxx|4 ++--
sw/source/core/table/swtable.cxx |2 +-
sw/source/core/undo/unattr.cxx |2 +-
sw/source/uibase/uiview/view.cxx |2 +-
sw/source/uibase/uno/unotxdoc.cxx|2 +-
23 files changed, 37 insertions(+), 48 deletions(-)
New commits:
commit 90f94f399e20945d53b20ab3eb1bc29bb7774135
Author: Noel Grandin
Date: Fri May 5 14:14:38 2017 +0200
loplugin:checkunusedparams in sw(part1)
Change-Id: I4847b0f96033016e020212fb8d7331309db25b55
Reviewed-on: https://gerrit.libreoffice.org/37287
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 872de593bc2f..a6f07772c045 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -123,7 +123,7 @@ public:
// in case an SwModify object is destroyed that itself is registered in
another SwModify,
// its SwClient objects can decide to get registered to the latter instead
by calling this method
-void CheckRegistration( const SfxPoolItem *pOldValue, const SfxPoolItem
*pNewValue );
+void CheckRegistration( const SfxPoolItem *pOldValue );
// controlled access to Modify method
// mba: this is still considered a hack and it should be fixed; the name
makes grep-ing easier
@@ -221,7 +221,7 @@ private:
virtual void Modify( const SfxPoolItem* pOldValue, const SfxPoolItem
*pNewValue ) override
{
if( pNewValue && pNewValue->Which() == RES_OBJECTDYING )
-CheckRegistration(pOldValue,pNewValue);
+CheckRegistration(pOldValue);
else if( m_pToTell )
m_pToTell->ModifyNotification(pOldValue, pNewValue);
}
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 4bc00cc6bac4..9e7b3c817d08 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -183,7 +183,7 @@ public:
SwSbxValue Calculate( const OUString &rStr );
OUStringGetStrResult( const SwSbxValue& rValue );
-OUStringGetStrResult( double, bool bRound = true );
+OUStringGetStrResult( double );
SwCalcExp* VarInsert( const OUString& r );
SwCalcExp* VarLook( const OUString &rStr, bool bIns = false );
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 951b39f7194b..26b33a3df3c2 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -465,7 +465,7 @@ public:
// Cursor is placed in something that is protected or selection contains
// something that is protected.
-bool HasReadonlySel(bool bAnnotationMode = false) const;
+bool HasReadonlySel() const;
// Can the cursor be set to read only ranges?
bool IsReadOnlyAvailable() const { return m_bSetCursorInReadOnly; }
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f75ed2775890..464661358f9e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -889,7 +889,7 @@ public:
evaluating the respective settings (see implementation) */
static void CalculatePagesForPrinting( const SwRootFrame& rLayout,
SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
sal_Int32 nDocPageCount );
-static void UpdatePagesForPrintingWithPostItData( SwRenderData &rData,
const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+static void UpdatePagesForPrintingWithPostItData( SwRenderData &rData,
const SwPrintUIOptions &rOptions,
sal_Int32 nDocPageCount );
static void CalculatePagePairsForProspectPrinting( const SwRootFrame&
rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions,
sal_Int32 nDocPageCount );
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index d6f636626190..7bda3a7cbe9a 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -288,7 +288,7 @@ public:
/** Is in something protected (readonly) or selection contains
something protected. */
-bool HasReadonlySel( bool bFormView, bool bAnnotationMode = false ) const;
+bool HasReadonlySel( bool bFormView ) const;
bool ContainsPosition(const SwPosition & rPos) const
{
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/a
[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/source
xmlsecurity/inc/xmlsignaturehelper.hxx |2 +-
xmlsecurity/inc/xsecctl.hxx|2 +-
xmlsecurity/source/helper/documentsignaturemanager.cxx |2 +-
xmlsecurity/source/helper/xmlsignaturehelper.cxx |4 ++--
xmlsecurity/source/helper/xsecsign.cxx |2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 8dcb8c9105c2fb5d2b28af60c7072f1fd6e8d0c2
Author: Noel Grandin
Date: Fri May 5 13:37:12 2017 +0200
loplugin:checkunusedparams in xmlsecurity
Change-Id: I9460e43264a8cbf3bb2aef83893288b767b2736f
Reviewed-on: https://gerrit.libreoffice.org/37284
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx
b/xmlsecurity/inc/xmlsignaturehelper.hxx
index da3b8bf170a0..df77db92b7a8 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -157,7 +157,7 @@ public:
voidSetDateTime( sal_Int32 nSecurityId, const Date& rDate, const
tools::Time& rTime );
void SetDescription(sal_Int32 nSecurityId, const OUString& rDescription);
-voidAddForSigning( sal_Int32 securityId, const OUString& uri,
const OUString& objectURL, bool bBinary, bool bXAdESCompliantIfODF );
+voidAddForSigning( sal_Int32 securityId, const OUString& uri, bool
bBinary, bool bXAdESCompliantIfODF );
boolCreateAndWriteSignature( const css::uno::Reference<
css::xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF
);
boolReadAndVerifySignature( const css::uno::Reference<
css::io::XInputStream >& xInputStream );
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index 89457ddffd4e..b7ee1f8310b9 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -352,7 +352,7 @@ public:
/*
* For signature generation
*/
-void signAStream( sal_Int32 securityId, const OUString& uri, const
OUString& objectURL, bool isBinary, bool bXAdESCompliantIfODF);
+void signAStream( sal_Int32 securityId, const OUString& uri, bool
isBinary, bool bXAdESCompliantIfODF);
/** sets data that describes the certificate.
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index fb9fbf429cd2..f2a155b4db8d 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -309,7 +309,7 @@ bool DocumentSignatureManager::add(const
uno::Reference&
for (sal_Int32 n = 0; n < nElements; n++)
{
bool bBinaryMode = !isXML(aElements[n]);
-maSignatureHelper.AddForSigning(nSecurityId, aElements[n],
aElements[n], bBinaryMode, bAdESCompliant);
+maSignatureHelper.AddForSigning(nSecurityId, aElements[n],
bBinaryMode, bAdESCompliant);
}
maSignatureHelper.SetDateTime(nSecurityId, Date(Date::SYSTEM),
tools::Time(tools::Time::SYSTEM));
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 2de0839d4b82..c7dc4d192a34 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -134,9 +134,9 @@ void XMLSignatureHelper::SetDescription(sal_Int32
nSecurityId, const OUString& r
mpXSecController->setDescription(nSecurityId, rDescription);
}
-void XMLSignatureHelper::AddForSigning( sal_Int32 nSecurityId, const OUString&
uri, const OUString& objectURL, bool bBinary, bool bXAdESCompliantIfODF )
+void XMLSignatureHelper::AddForSigning( sal_Int32 nSecurityId, const OUString&
uri, bool bBinary, bool bXAdESCompliantIfODF )
{
-mpXSecController->signAStream( nSecurityId, uri, objectURL, bBinary,
bXAdESCompliantIfODF );
+mpXSecController->signAStream( nSecurityId, uri, bBinary,
bXAdESCompliantIfODF );
}
diff --git a/xmlsecurity/source/helper/xsecsign.cxx
b/xmlsecurity/source/helper/xsecsign.cxx
index a98611e47f20..092b8fb001e6 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -191,7 +191,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
return xReferenceResolvedListener;
}
-void XSecController::signAStream( sal_Int32 securityId, const OUString& uri,
const OUString& /*objectURL*/, bool isBinary, bool bXAdESCompliantIfODF)
+void XSecController::signAStream( sal_Int32 securityId, const OUString& uri,
bool isBinary, bool bXAdESCompliantIfODF)
{
const SignatureReferenceType type = isBinary ?
SignatureReferenceType::BINARYSTREAM : SignatureReferenceType::XMLSTREAM;
const sal_Int32 digestID = bXAdESCompliantIfODF ? cssxc::DigestID::SHA256
: cssxc::DigestID::SHA1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/l
[Libreoffice-commits] core.git: dbaccess/source include/xmloff reportdesign/source sc/source xmloff/inc xmloff/source
dbaccess/source/filter/xml/xmlExport.cxx | 24 +
include/xmloff/animexp.hxx |2
include/xmloff/nmspmap.hxx |2
include/xmloff/shapeexport.hxx | 26 +-
include/xmloff/txtparae.hxx | 11 +---
include/xmloff/xmlaustp.hxx |6 --
include/xmloff/xmlexppr.hxx |2
include/xmloff/xmlmetai.hxx |2
reportdesign/source/filter/xml/xmlExport.cxx | 26 +-
sc/source/filter/xml/xmlexprt.cxx| 12 +---
sc/source/filter/xml/xmlimprt.cxx|2
xmloff/inc/animationimport.hxx |2
xmloff/source/chart/SchXMLChartContext.cxx | 12 +---
xmloff/source/chart/SchXMLChartContext.hxx |5 -
xmloff/source/chart/SchXMLExport.cxx |7 --
xmloff/source/core/nmspmap.cxx |2
xmloff/source/draw/animationimport.cxx |2
xmloff/source/draw/animexp.cxx |2
xmloff/source/draw/sdxmlexp.cxx |7 --
xmloff/source/draw/shapeexport.cxx | 70 +++
xmloff/source/draw/ximpbody.cxx |2
xmloff/source/forms/elementexport.cxx| 18 +++---
xmloff/source/forms/elementimport.cxx|5 -
xmloff/source/forms/elementimport.hxx|3 -
xmloff/source/forms/formattributes.cxx | 32
xmloff/source/forms/formattributes.hxx | 32 +++-
xmloff/source/forms/layerexport.cxx |7 --
xmloff/source/forms/layerimport.cxx | 34 ++---
xmloff/source/forms/officeforms.cxx |4 -
xmloff/source/meta/xmlmetai.cxx |1
xmloff/source/meta/xmlversion.cxx|6 +-
xmloff/source/style/XMLPageExport.cxx|5 -
xmloff/source/style/impastpl.cxx |5 -
xmloff/source/style/impastpl.hxx |3 -
xmloff/source/style/xmlaustp.cxx | 12
xmloff/source/style/xmlexppr.cxx |6 --
xmloff/source/table/XMLTableExport.cxx |6 +-
xmloff/source/text/XMLTextFrameContext.cxx | 14 ++---
xmloff/source/text/txtparae.cxx | 42
39 files changed, 158 insertions(+), 303 deletions(-)
New commits:
commit 034e9de08e0812c0920819bce68df6d9d75cdab9
Author: Noel Grandin
Date: Fri May 5 13:32:49 2017 +0200
loplugin:checkunusedparams in xmloff
Change-Id: I59d2cb1f69882b62e6fe732e9d9214feec8a79a2
Reviewed-on: https://gerrit.libreoffice.org/37283
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
index 02b1e754874c..484a6a15bb52 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -1234,26 +1234,10 @@ void ODBExport::ExportAutoStyles_()
if ( getExportFlags() & SvXMLExportFlags::CONTENT )
{
collectComponentStyles();
-GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_TABLE
-,GetDocHandler()
-,GetMM100UnitConverter()
-,GetNamespaceMap()
-);
-GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_COLUMN
-,GetDocHandler()
-,GetMM100UnitConverter()
-,GetNamespaceMap()
-);
-GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL
-,GetDocHandler()
-,GetMM100UnitConverter()
-,GetNamespaceMap()
-);
-GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_ROW
-,GetDocHandler()
-,GetMM100UnitConverter()
-,GetNamespaceMap()
-);
+GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_TABLE);
+GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_COLUMN);
+GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL);
+GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_ROW);
exportDataStyles();
}
}
diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index 66a8ec7e297b..8822dce490fd 100644
--- a/include/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
@@ -36,7 +36,7 @@ public:
XMLAnimationsExporter( XMLShapeExport* pShapeExp );
virtual ~XMLAnimationsExporter() override;
-void prepare( const css::uno::Reference< css::drawing::XShape >& xShape,
SvXMLExport& rExport );
+void prepare( const css::uno::Reference< css::drawing::XShape >& xShape );
void collect( const css::uno::Reference< css::drawing::XShape >& xShape,
SvXMLExport&
[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source desktop/source include/svx include/ucbhelper include/vcl sc/inc sc/source sdext/source sd/source sfx2/inc sfx2/source starmath/inc
compilerplugins/clang/constantparam.cxx | 22 +++ compilerplugins/clang/constantparam.py | 69 +--- dbaccess/source/ui/browser/dbexchange.cxx |4 desktop/source/splash/splash.cxx|2 include/svx/dbaexchange.hxx |7 - include/svx/svdxcgv.hxx |2 include/ucbhelper/simpleauthenticationrequest.hxx |2 include/ucbhelper/simplenameclashresolverequest.hxx |5 include/vcl/outdev.hxx |1 include/vcl/print.hxx |4 include/vcl/toolbox.hxx |2 include/vcl/window.hxx |2 sc/inc/cellsuno.hxx |1 sc/source/filter/xml/xmlexprt.cxx |2 sc/source/filter/xml/xmlstyle.cxx |3 sc/source/filter/xml/xmlstyle.hxx |1 sc/source/ui/unoobj/cellsuno.cxx|6 - sd/source/ui/app/sdmod1.cxx |2 sd/source/ui/inc/OutlineViewShell.hxx |2 sd/source/ui/inc/PreviewRenderer.hxx|7 - sd/source/ui/sidebar/MasterPageContainerProviders.cxx |3 sd/source/ui/tools/PreviewRenderer.cxx |5 sd/source/ui/view/outlnvsh.cxx |4 sd/source/ui/view/sdview3.cxx |6 - sdext/source/presenter/PresenterController.cxx |2 sdext/source/presenter/PresenterFrameworkObserver.cxx |9 - sdext/source/presenter/PresenterFrameworkObserver.hxx |5 sdext/source/presenter/PresenterPaneBorderPainter.cxx |2 sdext/source/presenter/PresenterPaneFactory.cxx |7 - sdext/source/presenter/PresenterPaneFactory.hxx |3 sdext/source/presenter/PresenterTheme.cxx |2 sdext/source/presenter/PresenterTheme.hxx |1 sfx2/inc/bluthsndapi.hxx|3 sfx2/source/dialog/bluthsnd.cxx |5 sfx2/source/view/viewsh.cxx |2 starmath/inc/view.hxx |2 starmath/source/unomodel.cxx|2 starmath/source/view.cxx|6 - svtools/source/contnr/svlbitm.cxx |1 svtools/source/control/toolbarmenu.cxx |4 svtools/source/table/tablecontrol.cxx |2 svtools/source/table/tablecontrol_impl.cxx |4 svtools/source/table/tablecontrol_impl.hxx |2 svx/source/fmcomp/dbaexchange.cxx | 13 -- svx/source/svdraw/svdxcgv.cxx |4 sw/inc/crsrsh.hxx |1 sw/inc/docstyle.hxx |1 sw/source/core/crsr/crbm.cxx|3 sw/source/core/crsr/crossrefbookmark.cxx| 10 - sw/source/core/doc/docbm.cxx|4 sw/source/core/inc/crossrefbookmark.hxx |6 - sw/source/filter/ww8/docxattributeoutput.cxx| 22 --- sw/source/ui/dbui/dbinsdlg.cxx |2 sw/source/ui/misc/bookmark.cxx |2 sw/source/uibase/app/docstyle.cxx |9 - sw/source/uibase/dbui/dbtree.cxx|1 sw/source/uibase/dochdl/swdtflvr.cxx|1 sw/source/uibase/shells/textsh1.cxx |2 sw/source/uibase/utlui/navipi.cxx |2 ucb/source/core/ucbcmds.cxx |4 ucb/source/ucp/cmis/auth_provider.cxx |2 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx|3 ucbhelper/source/provider/simpleauthenticationrequest.cxx |5 ucbhelper/source/provider/simplenameclashresolverequest.cxx |5 vcl/inc/listbox.hxx |3 vcl/source/control/button.cxx | 10 - vcl/source/control/combobox.cxx |8 - vcl/source/control/edit.cxx |2 vcl/source/control/imp_listbox.cxx | 10 - vcl/source/control/listbox.cxx | 12 +- vcl/source/control/scrbar.cxx | 12 +- vcl/source/control/slider.cxx |
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3aec6e1227c3d738556a523b2fe999503a10b1b1
Author: Ashod Nakashian
Date: Sun May 7 23:23:02 2017 -0400
wsd: build fix due to merge error
Change-Id: Ib1d7ce1b880c71b0b2fd8262a92e7e965211653e
Reviewed-on: https://gerrit.libreoffice.org/37375
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 7f6703f0..3c0fd06e 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1468,7 +1468,7 @@ private:
if (jailId.empty())
{
LOG_ERR("Invalid JailId in child URI [" << request.getURI() <<
"].");
-return SocketHandlerInterface::SocketOwnership::UNCHANGED;
+return;
}
in.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd.xml.in wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp
loolwsd.xml.in | 15 ---
wsd/DocumentBroker.cpp |4 +++-
wsd/LOOLWSD.cpp|1 +
wsd/LOOLWSD.hpp|9 +
4 files changed, 21 insertions(+), 8 deletions(-)
New commits:
commit 7d823787bbdb8790aeca379c160873f3924b9942
Author: Ashod Nakashian
Date: Sun May 7 13:28:57 2017 -0400
wsd: configurable idle document timeout
When a document is idle (no activity from
any views) for this timeout duration, the
document is saved and unloaded to minimize
resource consumption.
Change-Id: If6f09136ae40c7e84180fc8c8adbf6db8396d292
Reviewed-on: https://gerrit.libreoffice.org/37374
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 5640d08f..449d9797 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -14,6 +14,7 @@
1
4
+3600
loleaflet.html
@@ -51,13 +52,13 @@
/etc/loolwsd/cert.pem
/etc/loolwsd/key.pem
/etc/loolwsd/ca-chain.cert.pem
-
- 1000
-
-
-
-
-
+
+1000
+
+
+
+
+
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index ad958964..f5af9895 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -222,6 +222,8 @@ void DocumentBroker::pollThread()
auto last30SecCheckTime = std::chrono::steady_clock::now();
static const bool AutoSaveEnabled = !std::getenv("LOOL_NO_AUTOSAVE");
+static const size_t IdleDocTimeoutSecs = LOOLWSD::getConfigValue(
+
"per_document.idle_timeout_secs", 3600);
// Main polling loop goodness.
while (!_stop && _poll->continuePolling() && !TerminationFlag)
@@ -273,7 +275,7 @@ void DocumentBroker::pollThread()
}
// Remove idle documents after 1 hour.
-const bool idle = (getIdleTimeSecs() >= 3600);
+const bool idle = (getIdleTimeSecs() >= IdleDocTimeoutSecs);
// If all sessions have been removed, no reason to linger.
if ((isLoaded() || _markToDestroy) && (_sessions.empty() || idle))
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 9c497e13..7f6703f0 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -622,6 +622,7 @@ void LOOLWSD::initialize(Application& self)
{ "file_server_root_path", "loleaflet/.." },
{ "num_prespawn_children", "1" },
{ "per_document.max_concurrency", "4" },
+{ "per_document.idle_timeout_secs", "3600" },
{ "loleaflet_html", "loleaflet.html" },
{ "logging.color", "true" },
{ "logging.level", "trace" },
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 72c3a9a1..46538dc0 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -81,6 +81,15 @@ public:
return LOOLWSD::SSLTermination.get();
}
+/// Returns the value of the specified application configuration,
+/// of the default, if one doesn't exist.
+template
+static
+T getConfigValue(const std::string& name, const T def)
+{
+return getConfigValue(Application::instance().config(), name, def);
+}
+
/// Trace a new session and take a snapshot of the file.
static void dumpNewSessionTrace(const std::string& id, const std::string&
sessionId, const std::string& uri, const std::string& path);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/Map.js |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit f9ee1c6150854b98e4519cd90c971b4726a0785c
Author: Ashod Nakashian
Date: Sun May 7 11:37:51 2017 -0400
loleaflet: configurable dimming timeout and fire event
Two timeout are now configurable.
idleTimeoutSecs, which controls when to dim because
of user inactivity, even if the tab is in focus.
outOfFocusTimeoutSecs, which controls when to dim
when the tab loses focus.
Currently they are set to 15 minutes and 30 seconds
respectively by default.
User_Idle event is now fired on dimming.
Change-Id: I894f6df44825b6814872f1c4986fab8dcd4d6cef
Reviewed-on: https://gerrit.libreoffice.org/37373
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 755d99d0..49cb285c 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -18,7 +18,9 @@ L.Map = L.Evented.extend({
defaultZoom: 10,
tileWidthTwips: 3840,
tileHeightTwips: 3840,
- urlPrefix: 'lool'
+ urlPrefix: 'lool',
+ idleTimeoutSecs: 15 * 60, // Dim when user is idle.
+ outOfFocusTimeoutSecs: 30, // Dim after switching tabs.
},
lastActiveTime: Date.now(),
@@ -853,12 +855,13 @@ L.Map = L.Evented.extend({
this._doclayer && this._docLayer._onMessage('textselection:',
null);
console.debug('_dim: sending userinactive');
+ map.fire('postMessage', {msgId: 'User_Idle'});
this._socket.sendMessage('userinactive');
},
_dimIfInactive: function () {
console.debug('_dimIfInactive: diff=' + (Date.now() -
this.lastActiveTime));
- if ((Date.now() - this.lastActiveTime) >= 10 * 60 * 1000) { //
Dim 10 minutes after last user activity
+ if ((Date.now() - this.lastActiveTime) >=
this.options.idleTimeoutSecs * 1000) {
this._dim();
} else {
this._startInactiveTimer();
@@ -894,7 +897,7 @@ L.Map = L.Evented.extend({
var map = this;
vex.timer = setTimeout(function() {
map._dim();
- }, 30 * 1000); // Dim in 30 seconds.
+ }, this.options.outOfFocusTimeoutSecs * 1000);
},
_onLostFocus: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Util.cpp kit/ForKit.cpp kit/Kit.cpp kit/Kit.hpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp
common/Util.cpp| 10 --
kit/ForKit.cpp | 12
kit/Kit.cpp| 16 +++-
kit/Kit.hpp|1 +
wsd/DocumentBroker.cpp |2 +-
wsd/DocumentBroker.hpp |8 +++-
wsd/LOOLWSD.cpp| 15 +--
7 files changed, 45 insertions(+), 19 deletions(-)
New commits:
commit 9798eafb8c71ef9eafedb58478d260573eda2e71
Author: Ashod Nakashian
Date: Sun May 7 11:05:34 2017 -0400
wsd: random jail paths instead of pid
Jail paths are now generate from a PRNG
instead of using the PID of the kit process.
The PRN is converted to base-64 and used
as the directory name where a given
kit is jailed.
Change-Id: I8e4bc35d9ccdfdae0e542ab707c417cd29ad52f3
Reviewed-on: https://gerrit.libreoffice.org/37372
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/common/Util.cpp b/common/Util.cpp
index 3260d130..612f971e 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -99,8 +99,14 @@ namespace Util
std::string getFilename(const size_t length)
{
-std::string s = getB64String(length);
-std::replace(s.begin(), s.end(), '/', '_');
+std::string s = getB64String(length * 2);
+s.erase(std::remove_if(s.begin(), s.end(),
+ [](const std::string::value_type& c)
+ {
+ // Remove undesirable characters in a
filename.
+ return c == '/' || c == ' ' || c == '+';
+ }),
+ s.end());
return s.substr(0, length);
}
}
diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 64d17f45..ab11f626 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -197,6 +197,7 @@ static void cleanupChildren()
std::vector jails;
Process::PID exitedChildPid;
int status;
+// Reap quickly without doing slow cleanup so WSD can spawn more rapidly.
while ((exitedChildPid = waitpid(-1, &status, WUNTRACED | WNOHANG)) > 0)
{
const auto it = childJails.find(exitedChildPid);
@@ -225,7 +226,10 @@ static int createLibreOfficeKit(const std::string&
childRoot,
const std::string& loSubPath,
bool queryVersion = false)
{
-LOG_DBG("Forking a loolkit process.");
+// Generate a jail ID to be used for in the jail path.
+const std::string jailId = Util::rng::getFilename(16);
+
+LOG_DBG("Forking a loolkit process with jailId: " << jailId << ".");
const Process::PID pid = fork();
if (!pid)
@@ -252,9 +256,9 @@ static int createLibreOfficeKit(const std::string&
childRoot,
}
#ifndef KIT_IN_PROCESS
-lokit_main(childRoot, sysTemplate, loTemplate, loSubPath,
NoCapsForKit, queryVersion, DisplayVersion);
+lokit_main(childRoot, jailId, sysTemplate, loTemplate, loSubPath,
NoCapsForKit, queryVersion, DisplayVersion);
#else
-lokit_main(childRoot, sysTemplate, loTemplate, loSubPath, true,
queryVersion, DisplayVersion);
+lokit_main(childRoot, jailId, sysTemplate, loTemplate, loSubPath,
true, queryVersion, DisplayVersion);
#endif
}
else
@@ -267,7 +271,7 @@ static int createLibreOfficeKit(const std::string&
childRoot,
else
{
LOG_INF("Forked kit [" << pid << "].");
-childJails[pid] = childRoot + std::to_string(pid);
+childJails[pid] = childRoot + jailId;
}
#ifndef KIT_IN_PROCESS
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 144c3b2c..628e9295 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1577,6 +1577,7 @@ void documentViewCallback(const int type, const char*
payload, void* data)
#ifndef BUILDING_TESTS
void lokit_main(const std::string& childRoot,
+const std::string& jailId,
const std::string& sysTemplate,
const std::string& loTemplate,
const std::string& loSubPath,
@@ -1610,12 +1611,6 @@ void lokit_main(const std::string& childRoot,
assert(!loTemplate.empty());
assert(!loSubPath.empty());
-// Ideally this will be a random ID, but forkit will cleanup
-// our jail directory when we die, and it's simpler to know
-// the jailId (i.e. the path) implicitly by knowing our pid.
-static const std::string pid = std::to_string(Process::id());
-static const std::string jailId = pid;
-
LOG_DBG("Process started.");
std::string userdir_url;
@@ -1772,7 +1767,10 @@ void lokit_main(const std::string& childRoot,
assert(loKit);
LOG_INF("Process is ready.");
-std::string requestUrl = std::string(NEW_CHILD_URI) + "pid=" + pid;
+static const std::string pid = std::to_string(Process::id());
+
+std::string requestUrl = NEW_CHILD_URI;
+requestUrl += "pid=" + pid + "&jaili
[Libreoffice-commits] online.git: test/TileCacheTests.cpp
test/TileCacheTests.cpp | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7633525904083bc427590834a4aa309f84bb32cc
Author: Ashod Nakashian
Date: Sun May 7 11:03:10 2017 -0400
wsd: correct the name of testDisconnectMultiView in output
Change-Id: Ibfcee83825bf8f48e635d93061bf4fd1306a95fc
Reviewed-on: https://gerrit.libreoffice.org/37371
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 227f7adb..16577b3f 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -354,19 +354,19 @@ void TileCacheTests::testCancelTilesMultiView()
void TileCacheTests::testDisconnectMultiView()
{
std::string documentPath, documentURL;
-getDocumentPathAndURL("setclientpart.ods", documentPath, documentURL,
"cancelTilesMultiView ");
+getDocumentPathAndURL("setclientpart.ods", documentPath, documentURL,
"disconnectMultiView ");
const size_t repeat = 4;
for (size_t j = 1; j <= repeat; ++j)
{
-std::cerr << "cancelTilesMultiView try #" << j << std::endl;
+std::cerr << "disconnectMultiView try #" << j << std::endl;
// Wait to clear previous sessions.
countLoolKitProcesses(InitialLoolKitCount);
// Request a huge tile, and cancel immediately.
-auto socket1 = loadDocAndGetSocket(_uri, documentURL,
"cancelTilesMultiView-1 ");
-auto socket2 = loadDocAndGetSocket(_uri, documentURL,
"cancelTilesMultiView-2 ", true);
+auto socket1 = loadDocAndGetSocket(_uri, documentURL,
"disconnectMultiView-1 ");
+auto socket2 = loadDocAndGetSocket(_uri, documentURL,
"disconnectMultiView-2 ", true);
sendTextFrame(socket1, "tilecombine part=0 width=256 height=256
tileposx=0,3840,7680,11520,0,3840,7680,11520
tileposy=0,0,0,0,3840,3840,3840,3840 tilewidth=3840 tileheight=3840",
"cancelTilesMultiView-1 ");
sendTextFrame(socket2, "tilecombine part=0 width=256 height=256
tileposx=0,3840,7680,0 tileposy=0,0,0,22520 tilewidth=3840 tileheight=3840",
"cancelTilesMultiView-2 ");
@@ -375,11 +375,11 @@ void TileCacheTests::testDisconnectMultiView()
for (auto i = 0; i < 4; ++i)
{
-getTileMessage(*socket2, "cancelTilesMultiView-2 ");
+getTileMessage(*socket2, "disconnectMultiView-2 ");
}
// Should never get more than 4 tiles on socket2.
-const auto res2 = getResponseString(socket2, "tile:",
"cancelTilesMultiView-2 ", 500);
+const auto res2 = getResponseString(socket2, "tile:",
"disconnectMultiView-2 ", 500);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/ForKit.cpp
kit/ForKit.cpp | 30 +-
1 file changed, 17 insertions(+), 13 deletions(-)
New commits:
commit f062b2058ea97be06a40b9a159ad4de58c7a2dc9
Author: Ashod Nakashian
Date: Sat May 6 22:13:02 2017 -0400
wsd: use fast tokenizer
Change-Id: I477bac24a5e944ce3d747db6e694f2766b44c7f3
Reviewed-on: https://gerrit.libreoffice.org/37370
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 035f69a9..64d17f45 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -26,7 +26,6 @@
#include
#include
-#include
#include
#include
@@ -42,7 +41,6 @@
#include "security.h"
using Poco::Process;
-using Poco::StringTokenizer;
using Poco::Thread;
#ifndef KIT_IN_PROCESS
using Poco::Util::Application;
@@ -96,21 +94,27 @@ public:
}
LOG_INF("ForKit command: [" << message << "].");
-StringTokenizer tokens(message, " ", StringTokenizer::TOK_IGNORE_EMPTY
| StringTokenizer::TOK_TRIM);
-
-if (tokens[0] == "spawn" && tokens.count() == 2)
+try
{
-const auto count = std::stoi(tokens[1]);
-if (count > 0)
-{
-LOG_INF("Setting to spawn " << tokens[1] << " child" << (count
== 1 ? "" : "ren") << " per request.");
-ForkCounter = count;
-}
-else
+std::vector tokens = LOOLProtocol::tokenize(message);
+if (tokens.size() == 2 && tokens[0] == "spawn")
{
-LOG_WRN("Cannot spawn " << tokens[1] << " children as
requested.");
+const auto count = std::stoi(tokens[1]);
+if (count > 0)
+{
+LOG_INF("Setting to spawn " << tokens[1] << " child" <<
(count == 1 ? "" : "ren") << " per request.");
+ForkCounter = count;
+}
+else
+{
+LOG_WRN("Cannot spawn " << tokens[1] << " children as
requested.");
+}
}
}
+catch (const std::exception& exc)
+{
+LOG_ERR("Error while processing forkit request [" << message <<
"]: " << exc.what());
+}
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/chartexport.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit d33e262a244f351febc9dbe605b05f76cb834eeb
Author: Jochen Nitschke
Date: Sun May 7 21:05:48 2017 +0200
remove unused bool
japanese candlesticks has no function since initial commit
a41687b62b0a6f2b79e44311ddf74c52e844ee36
New files from xlsx-shared-oox-chart-export-part1.diff
bool is unused since last loplugin:unusedparams in oox
commit 4cc0b82103e0b1d28a3ada59974aac0e7da18083
Change-Id: I30d51ecdeea851ebe1538e33ed1a0b32e131aa80
Reviewed-on: https://gerrit.libreoffice.org/37351
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 7b786c782fba..5d0ccdcca268 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1841,11 +1841,6 @@ void ChartExport::exportStockChart( const Reference<
chart2::XChartType >& xChar
FSEND );
bool bPrimaryAxes = true;
-bool bJapaneseCandleSticks = false;
-Reference< beans::XPropertySet > xCTProp( xChartType, uno::UNO_QUERY );
-if( xCTProp.is())
-xCTProp->getPropertyValue("Japanese") >>= bJapaneseCandleSticks;
-
Reference< chart2::XDataSeriesContainer > xDSCnt( xChartType,
uno::UNO_QUERY );
if(xDSCnt.is())
exportCandleStickSeries( xDSCnt->getDataSeries(), bPrimaryAxes );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit 451976d841f26bf5254ba1c6645171c1f331da6b
Author: Jochen Nitschke
Date: Sun May 7 22:46:58 2017 +0200
remove unused double
unused since commit 60fd81d83a2dbcb64a38910de49f8e2620353702
loplugin:checkunusedparams in filter
Change-Id: I69af38f19b0c39a778990bc62f3f6823c6d65f34
Reviewed-on: https://gerrit.libreoffice.org/37352
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index b3ad3f6b8890..a30da0c25912 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -493,7 +493,6 @@ void DXF2GDIMetaFile::DrawAttribEntity(const
DXFAttribEntity & rE, const DXFTran
void DXF2GDIMetaFile::DrawPolyLineEntity(const DXFPolyLineEntity & rE, const
DXFTransform & rTransform)
{
sal_uInt16 i,nPolySize;
-double fW;
const DXFBasicEntity * pBE;
nPolySize=0;
@@ -504,21 +503,12 @@ void DXF2GDIMetaFile::DrawPolyLineEntity(const
DXFPolyLineEntity & rE, const DXF
}
if (nPolySize<2) return;
tools::Polygon aPoly(nPolySize);
-fW=0.0;
pBE=rE.pSucc;
for (i=0; i(pBE)->aP0,aPoly[i]);
-if (i+1(pBE)->fSWidth>=0.0)
fW+=static_cast(pBE)->fSWidth;
-else fW+=rE.fSWidth;
-if (static_cast(pBE)->fEWidth>=0.0)
fW+=static_cast(pBE)->fEWidth;
-else fW+=rE.fEWidth;
-}
pBE=pBE->pSucc;
}
-fW/=2.0;
-if ((rE.nFlags&1)!=0) fW/=(double)nPolySize;
-else fW/=(double)(nPolySize-1);
+
if (SetLineAttribute(rE)) {
if ((rE.nFlags&1)!=0) pVirDev->DrawPolygon(aPoly);
else pVirDev->DrawPolyLine(aPoly);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source sd/source sw/source
cui/source/customize/cfg.cxx |4 ++--
sd/source/filter/eppt/pptexanimations.cxx |3 +--
sw/source/core/text/itratr.cxx|3 +--
3 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 0c363500584194f75dfa7f229ee932a759a95bbe
Author: Jochen Nitschke
Date: Sun May 7 23:18:14 2017 +0200
cppcheck nitpicks variableScope and redundantAssignment
Change-Id: I1399e066a96bbd9a3b59e2670a75b0022c882a1d
Reviewed-on: https://gerrit.libreoffice.org/37354
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 046b244b2106..5122f35908ee 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -996,7 +996,6 @@ bool SaveInData::LoadSubMenus(
if ( bItem )
{
bool bIsUserDefined = true;
-bool bUseDefaultLabel = false;
if ( nType == css::ui::ItemType::DEFAULT )
{
@@ -1011,6 +1010,7 @@ bool SaveInData::LoadSubMenus(
bIsUserDefined = true;
}
+bool bUseDefaultLabel = false;
// If custom label not set retrieve it from the command
// to info service
if ( aLabel.isEmpty() )
@@ -4290,7 +4290,6 @@ void ToolbarSaveInData::LoadToolbar(
if ( bItem )
{
bool bIsUserDefined = true;
-bool bUseDefaultLabel = false;
if ( nType == css::ui::ItemType::DEFAULT )
{
@@ -4305,6 +4304,7 @@ void ToolbarSaveInData::LoadToolbar(
bIsUserDefined = true;
}
+bool bUseDefaultLabel = false;
// If custom label not set retrieve it from the command
// to info service
if ( aLabel.isEmpty() )
diff --git a/sd/source/filter/eppt/pptexanimations.cxx
b/sd/source/filter/eppt/pptexanimations.cxx
index 58fd59517518..8e854220919f 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -491,12 +491,11 @@ void AnimationExporter::exportNode( SvStream& rStrm,
Reference< XAnimationNode >
bool bTakeBackInteractiveSequenceTimingForChild = false;
sal_Int16 nFillDefault = GetFillMode( xNode, nFDef );
-bool bSkipChildren = false;
-
Reference< XAnimationNode > xAudioNode;
static sal_uInt32 nAudioGroup;
{
+bool bSkipChildren = false;
EscherExContainer aContainer( rStrm, nContainerRecType, nInstance );
switch( xNode->getType() )
{
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 1c8ef5182e9b..a4fde667652f 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -359,11 +359,10 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont*
pFnt, const OUString &
while( nIdx < nEnd )
{
sal_Int32 nStop = nIdx;
-bool bClear = false;
LanguageType eLang = pFnt->GetLanguage();
assert(g_pBreakIt && g_pBreakIt->GetBreakIter().is());
-bClear = CH_BLANK == rText[ nStop ];
+bool bClear = CH_BLANK == rText[ nStop ];
Boundary aBndry( g_pBreakIt->GetBreakIter()->getWordBoundary( rText,
nIdx,
g_pBreakIt->GetLocale( eLang ),
WordType::DICTIONARY_WORD, true ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/curve/b2dcubicbezier.cxx | 75 ++--
1 file changed, 34 insertions(+), 41 deletions(-)
New commits:
commit c3e0b7dd4e7b1d33b8555e0acdf9f44cfc043ca2
Author: Jochen Nitschke
Date: Sun May 7 23:11:41 2017 +0200
cppcheck: knownConditionTrueFalse
remove bDone and simply 'break' the loop when done.
Change-Id: Idf4170083cbda3a783cb52bba9e94d3be512f167
Reviewed-on: https://gerrit.libreoffice.org/37355
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx
b/basegfx/source/curve/b2dcubicbezier.cxx
index 72fabc476327..a709166263e3 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -694,23 +694,42 @@ namespace basegfx
// look right and left for even smaller distances
double fStepValue(1.0 / (double)((nPointCount - 1) * 2)); // half the
edge step width
double fPosition((double)nSmallestIndex / (double)(nPointCount - 1));
-bool bDone(false);
-while(!bDone)
+while(true)
{
-if(!bDone)
+// test left
+double fPosLeft(fPosition - fStepValue);
+
+if(fPosLeft < 0.0)
{
-// test left
-double fPosLeft(fPosition - fStepValue);
+fPosLeft = 0.0;
+aVector = B2DVector(rTestPoint - maStartPoint);
+}
+else
+{
+aVector = B2DVector(rTestPoint - interpolatePoint(fPosLeft));
+}
+
+fNewQuadDist = aVector.getX() * aVector.getX() + aVector.getY() *
aVector.getY();
+
+if(fTools::less(fNewQuadDist, fQuadDist))
+{
+fQuadDist = fNewQuadDist;
+fPosition = fPosLeft;
+}
+else
+{
+// test right
+double fPosRight(fPosition + fStepValue);
-if(fPosLeft < 0.0)
+if(fPosRight > 1.0)
{
-fPosLeft = 0.0;
-aVector = B2DVector(rTestPoint - maStartPoint);
+fPosRight = 1.0;
+aVector = B2DVector(rTestPoint - maEndPoint);
}
else
{
-aVector = B2DVector(rTestPoint -
interpolatePoint(fPosLeft));
+aVector = B2DVector(rTestPoint -
interpolatePoint(fPosRight));
}
fNewQuadDist = aVector.getX() * aVector.getX() +
aVector.getY() * aVector.getY();
@@ -718,49 +737,23 @@ namespace basegfx
if(fTools::less(fNewQuadDist, fQuadDist))
{
fQuadDist = fNewQuadDist;
-fPosition = fPosLeft;
+fPosition = fPosRight;
}
else
{
-// test right
-double fPosRight(fPosition + fStepValue);
-
-if(fPosRight > 1.0)
-{
-fPosRight = 1.0;
-aVector = B2DVector(rTestPoint - maEndPoint);
-}
-else
-{
-aVector = B2DVector(rTestPoint -
interpolatePoint(fPosRight));
-}
-
-fNewQuadDist = aVector.getX() * aVector.getX() +
aVector.getY() * aVector.getY();
-
-if(fTools::less(fNewQuadDist, fQuadDist))
-{
-fQuadDist = fNewQuadDist;
-fPosition = fPosRight;
-}
-else
-{
-// not less left or right, done
-bDone = true;
-}
+// not less left or right, done
+break;
}
}
if(0.0 == fPosition || 1.0 == fPosition)
{
// if we are completely left or right, we are done
-bDone = true;
+break;
}
-if(!bDone)
-{
-// prepare next step value
-fStepValue /= 2.0;
-}
+// prepare next step value
+fStepValue /= 2.0;
}
rCut = fPosition;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry starmath/inc starmath/sdi starmath/source starmath/uiconfig starmath/UIConfig_smath.mk
officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu| 63 officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu |7 starmath/UIConfig_smath.mk |2 starmath/inc/edit.hxx|1 starmath/sdi/smath.sdi |2 starmath/source/edit.cxx | 36 starmath/uiconfig/smath/popupmenu/edit.xml | 265 + starmath/uiconfig/smath/ui/commandmenu.ui| 1586 -- 8 files changed, 338 insertions(+), 1624 deletions(-) New commits: commit 8da106529e85981ce37fbbd18160023c26cc7129 Author: Maxim Monastirsky Date: Sun May 7 03:32:25 2017 +0300 tdf#106479 Make edit context menu dispatcher based This allows us to add there any .uno command and also get the icon and keyboard shortcut for it. Use this to add clipboard commands. Change-Id: Ic42c28add7771f322491e8e7d6df052e3c2c8d75 Reviewed-on: https://gerrit.libreoffice.org/37353 Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu index 1fe747ff5d64..8adebca5535a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu @@ -141,7 +141,68 @@ 9 + + + New Line + + + + + Small Gap + + + + + Gap + + + + + + + ~Unary/Binary Operators + + + + + ~Relations + + + + + ~Set Operations + + + + + ~Functions + + + + + O~perators + + + + + ~Attributes + + + + + ~Brackets + + + + + For~mats + + + + + ~Others + + - diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu index bd679f723693..386dc8d39ac1 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu @@ -20,9 +20,14 @@ http://openoffice.org/2004/installation"; xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="MathWindowState" oor:package="org.openoffice.Office.UI"> + + + Edit Panel + + - Work Area + View Panel diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk index 52babf47879c..5aa6e4cfbb06 100644 --- a/starmath/UIConfig_smath.mk +++ b/starmath/UIConfig_smath.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/smath,\ )) $(eval $(call gb_UIConfig_add_popupmenufiles,modules/smath,\ + starmath/uiconfig/smath/popupmenu/edit \ starmath/uiconfig/smath/popupmenu/view \ )) @@ -30,7 +31,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\ starmath/uiconfig/smath/ui/alignmentdialog \ starmath/uiconfig/smath/ui/catalogdialog \ - starmath/uiconfig/smath/ui/commandmenu \ starmath/uiconfig/smath/ui/dockingelements \ starmath/uiconfig/smath/ui/fontdialog \ starmath/uiconfig/smath/ui/fontsizedialog \ diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 173ccba43a1d..54bfdbce5cb9 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -58,7 +58,6 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper virtual void KeyInput(const KeyEvent& rKEvt) override; virtual void Command(const CommandEvent& rCEvt) override; -DECL_LINK(MenuSelectHdl, Menu *, bool); DECL_LINK(ModifyTimerHdl, Timer *, void); DECL_LINK(CursorMoveTimerHdl, Timer *, void); diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi index 3c2a7ebacced..4f479193ee4e 100644 --- a/starmath/sdi/smath.sdi +++ b/starmath/sdi/smath.sdi @@ -217,7 +217,7 @@ SfxInt16Item Graphic SID_GAPHIC_SM SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT -() +(SfxStringItem Text SID_INSERTCOMMANDTEXT) [ AutoUpdate = FALSE, FastCall = FALSE, diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index df8816aff0f8..b2e41cd36d3d 100644 --- a/starmath/source/edit.cxx +++ b/starmath/s
[Libreoffice-commits] core.git: cui/source
cui/source/customize/cfg.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7d9e441eb98b4e964c08e41e53714a8607e22f8e Author: Maxim Monastirsky Date: Mon May 8 01:14:19 2017 +0300 Set modified flag on entry rename Tools > Customize... > Context Menus. Rename some entry, click OK. Open the dialog again, notice that the label modification wasn't saved. Change-Id: I78a7093e958d9d8709192ac34b6e0f178b7956de diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 438c13e7b630..046b244b2106 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2653,6 +2653,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) m_pContentsListBox->SetEntryText( pActEntry, aNewName ); GetSaveInData()->SetModified(); +GetTopLevelSelection()->SetModified(); } } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/win
vcl/inc/win/ScopedHDC.hxx | 45 +
vcl/win/gdi/winlayout.cxx | 12 ++--
2 files changed, 51 insertions(+), 6 deletions(-)
New commits:
commit dae61482df7ae540a1fb8feefbb92b5e7238444d
Author: Tomaž Vajngerl
Date: Sun May 7 16:19:34 2017 +0200
tdf#106265 ScopedHDC to clean-up hDC when rendering glyphs
Change-Id: I96ecf625126740610200c012c3c7002fac7e1548
Reviewed-on: https://gerrit.libreoffice.org/37347
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/inc/win/ScopedHDC.hxx b/vcl/inc/win/ScopedHDC.hxx
new file mode 100644
index ..bd4642ee6642
--- /dev/null
+++ b/vcl/inc/win/ScopedHDC.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_INC_WIN_SCOPEDHDC_HXX
+#define INCLUDED_VCL_INC_WIN_SCOPEDHDC_HXX
+
+class ScopedHDC
+{
+private:
+HDC m_hDC;
+
+public:
+explicit ScopedHDC(HDC hDC)
+: m_hDC(hDC)
+{}
+
+ScopedHDC(const ScopedHDC&) = delete;
+ScopedHDC& operator=(const ScopedHDC&) = delete;
+
+~ScopedHDC()
+{
+if (m_hDC)
+DeleteDC(m_hDC);
+}
+
+HDC get() const
+{
+return m_hDC;
+}
+
+explicit operator bool() const
+{
+return m_hDC != nullptr;
+}
+};
+
+#endif // INCLUDED_VCL_INC_WIN_SCOPEDHDC_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index d262f0633f92..feb5565be153 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -34,6 +34,7 @@
#include "sft.hxx"
#include "sallayout.hxx"
#include "CommonSalLayout.hxx"
+#include "win/ScopedHDC.hxx"
#include
#include
@@ -57,17 +58,17 @@ bool WinFontInstance::CacheGlyphToAtlas(HDC hDC, HFONT
hFont, int nGlyphIndex, S
{
OpenGLGlyphDrawElement aElement;
-HDC hNewDC = CreateCompatibleDC(hDC);
-if (hNewDC == nullptr)
+ScopedHDC aHDC(CreateCompatibleDC(hDC));
+
+if (!aHDC)
{
SAL_WARN("vcl.gdi", "CreateCompatibleDC failed: " <<
WindowsErrorString(GetLastError()));
return false;
}
-HFONT hOrigFont = static_cast(SelectObject(hNewDC, hFont));
+HFONT hOrigFont = static_cast(SelectObject(aHDC.get(), hFont));
if (hOrigFont == nullptr)
{
SAL_WARN("vcl.gdi", "SelectObject failed: " <<
WindowsErrorString(GetLastError()));
-DeleteDC(hNewDC);
return false;
}
@@ -76,10 +77,9 @@ bool WinFontInstance::CacheGlyphToAtlas(HDC hDC, HFONT
hFont, int nGlyphIndex, S
if (!pTxt)
return false;
-if (!pTxt->BindFont(hNewDC))
+if (!pTxt->BindFont(aHDC.get()))
{
SAL_WARN("vcl.gdi", "Binding of font failed. The font might not be
supported by Direct Write.");
-DeleteDC(hNewDC);
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.3-11'
Tag 'cp-5.3-11' created by Andras Timar at 2017-05-07 21:12 + cp-5.3-11 Changes since libreoffice-5-3-branch-point-28: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-11'
Tag 'cp-5.3-11' created by Andras Timar at 2017-05-07 21:12 + cp-5.3-11 Changes since cp-5.3-10-57: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.3-11'
Tag 'cp-5.3-11' created by Andras Timar at 2017-05-07 21:12 + cp-5.3-11 Changes since cp-5.3-10: Christian Lohmaier (1): update translations for 5.3.3 rc2 --- source/am/cui/source/options.po|8 source/am/cui/source/tabpages.po |8 source/am/cui/uiconfig/ui.po |8 source/am/fpicker/source/office.po | 10 source/am/officecfg/registry/data/org/openoffice/Office.po |6 source/am/sc/source/ui/src.po |8 source/am/sfx2/source/dialog.po| 12 source/am/svtools/source/dialogs.po|8 source/am/svtools/source/misc.po |8 source/am/svx/source/stbctrls.po |8 source/am/svx/uiconfig/ui.po | 10 source/bg/sc/uiconfig/scalc/ui.po | 20 source/bg/sfx2/source/dialog.po| 12 source/bg/svx/source/dialog.po | 30 source/bg/svx/source/form.po | 10 source/bg/svx/source/stbctrls.po |8 source/bg/svx/source/tbxctrls.po |6 source/bg/svx/uiconfig/ui.po | 289 source/bg/sw/source/ui/utlui.po| 21 source/bg/sw/source/uibase/utlui.po|6 source/bg/sw/uiconfig/swriter/ui.po|5 source/br/cui/uiconfig/ui.po | 70 - source/br/extensions/source/bibliography.po| 12 source/br/extensions/source/propctrlr.po | 152 ++-- source/br/sc/source/ui/src.po | 12 source/ca/helpcontent2/source/text/scalc/00.po | 20 source/ca/helpcontent2/source/text/scalc/01.po |8 source/ca/helpcontent2/source/text/scalc/guide.po | 10 source/ca/helpcontent2/source/text/shared/01.po|6 source/ca/helpcontent2/source/text/shared/guide.po |5 source/ca/helpcontent2/source/text/shared/optionen.po |8 source/ca/helpcontent2/source/text/simpress/guide.po | 10 source/ca/helpcontent2/source/text/swriter/01.po | 13 source/ca/helpcontent2/source/text/swriter/guide.po| 25 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/ca/sc/uiconfig/scalc/ui.po |6 source/ca/svx/uiconfig/ui.po | 12 source/cy/cui/uiconfig/ui.po |8 source/cy/sfx2/source/dialog.po| 12 source/cy/sfx2/uiconfig/ui.po | 15 source/cy/svtools/source/dialogs.po|8 source/cy/svtools/source/misc.po |8 source/cy/svx/source/stbctrls.po | 10 source/cy/svx/uiconfig/ui.po | 10 source/da/cui/uiconfig/ui.po |8 source/da/helpcontent2/source/text/scalc/01.po | 12 source/da/sfx2/source/dialog.po| 14 source/da/sfx2/uiconfig/ui.po | 17 source/da/svtools/source/dialogs.po| 10 source/da/svtools/source/java.po | 12 source/da/svtools/source/misc.po | 10 source/da/svx/source/stbctrls.po |8 source/da/svx/uiconfig/ui.po | 12 source/de/editeng/source/items.po | 10 source/de/formula/source/core/resource.po |8 source/de/helpcontent2/source/auxiliary.po |6 source/de/helpcontent2/source/text/sbasic/shared/01.po | 10 source/de/helpcontent2/source/text/scalc.po|6 source/de/helpcontent2/source/text/scalc/00.po |6 source/de/helpcontent2/source/text/scalc/01.po | 100 +- source/de/helpcontent2/source/text/scalc/guide.po | 34 source/de/helpcontent2/source/text/schart/01.po|6 source/de/helpcontent2/source/text/shared/00.po| 10 source/de/helpcontent2/source/text/shared/01.po| 12 source/de/helpcontent2/source/text/shared/explorer/database.po |8 source/de/helpcontent2/source/text/shared/guide.po | 16 source/de/helpcontent2/source/text/shared/optionen.po
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.3-11'
Tag 'cp-5.3-11' created by Andras Timar at 2017-05-07 21:12 + cp-5.3-11 Changes since cp-5.3-10: Olivier R (1): tdf#107558 French spelling dictionary (6.0.3) and thesaurus --- fr_FR/README_fr.txt |4 fr_FR/description.xml |2 fr_FR/fr.aff |17751 ++-- fr_FR/fr.dic |155369 +- fr_FR/package-description.txt |2 fr_FR/thes_fr.dat | 206 6 files changed, 88495 insertions(+), 84839 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 054cb1289379da63085334f8d2214f82dc5a34ad Author: Andras Timar Date: Sun May 7 22:54:32 2017 +0200 Bump version to 5.3-11 Change-Id: I8bbc26821d027c4643f4219839793c8aa0bea5d3 diff --git a/configure.ac b/configure.ac index 3011e18ce622..5a26ba861e0f 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.3.10.10],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.3.10.11],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7cb9ef51087e5d2a66af2eaed1e8f2342999cb45 Author: Olivier R Date: Tue May 2 03:33:24 2017 -0500 Updated core Project: dictionaries 94f10f3bdf176cd47f2c2e9ac26f357c2dd2007b tdf#107558 French spelling dictionary (6.0.3) and thesaurus Change-Id: Ia3da9c3b2e4a0ca1032edad131838b3a705e0597 (cherry picked from commit c82ad83da55f7c0d4667edea003b8038e473dcd1) Reviewed-on: https://gerrit.libreoffice.org/37141 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/dictionaries b/dictionaries index e90820839661..94f10f3bdf17 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit e90820839661af7a0274fb3d8e89d4c83d8eca97 +Subproject commit 94f10f3bdf176cd47f2c2e9ac26f357c2dd2007b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-5.3' - fr_FR/description.xml fr_FR/fr.aff fr_FR/fr.dic fr_FR/package-description.txt fr_FR/README_fr.txt fr_FR/thes_fr.dat
fr_FR/README_fr.txt |4 fr_FR/description.xml |2 fr_FR/fr.aff |17751 ++-- fr_FR/fr.dic |155369 +- fr_FR/package-description.txt |2 fr_FR/thes_fr.dat | 206 6 files changed, 88495 insertions(+), 84839 deletions(-) New commits: commit 94f10f3bdf176cd47f2c2e9ac26f357c2dd2007b Author: Olivier R Date: Tue May 2 03:33:24 2017 -0500 tdf#107558 French spelling dictionary (6.0.3) and thesaurus Change-Id: Ia3da9c3b2e4a0ca1032edad131838b3a705e0597 (cherry picked from commit c82ad83da55f7c0d4667edea003b8038e473dcd1) Reviewed-on: https://gerrit.libreoffice.org/37141 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/fr_FR/README_fr.txt b/fr_FR/README_fr.txt index 7dccd42..95762ee 100644 --- a/fr_FR/README_fr.txt +++ b/fr_FR/README_fr.txt @@ -1,7 +1,7 @@ ___ DICTIONNAIRES ORTHOGRAPHIQUES FRANÃAIS - version 5.4.1 + version 6.0.3 Olivier R. - dicollectefreefr Dicollecte : http://www.dicollecte.org/ @@ -17,8 +17,8 @@ ___ - Jean-Luc T. ; - Sylvain P. ; - Laurent Dubois ; - - Pierre Poisson ; - Dominique Pellé ; + - Pierre Poisson ; - Pierre-Yves ; - Pierre Choffardet ; - Leywen ; diff --git a/fr_FR/description.xml b/fr_FR/description.xml index a8ecd7b..868a980 100644 --- a/fr_FR/description.xml +++ b/fr_FR/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + French spelling dictionary, hyphenation rules, and thesaurus diff --git a/fr_FR/fr.aff b/fr_FR/fr.aff index 3518322..c6d2042 100644 --- a/fr_FR/fr.aff +++ b/fr_FR/fr.aff @@ -2,9 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# AFFIXES DU DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS âCLASSIQUEâ v5.4.1 +# AFFIXES DU DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS âCLASSIQUEâ v6.0.3 # par Olivier R. -- licence MPL 2.0 -# Généré le 25 08 2015 à 15:05 +# Généré le 25-04-2017 à 13:20 # Pour améliorer le dictionnaire, allez sur http://www.dicollecte.org/ @@ -44,7 +44,7 @@ MAP wW MAP xX MAP zZ -REP 79 +REP 82 REP ^Ca$ Ãa REP ^l l' REP ^d d' @@ -110,6 +110,8 @@ REP ett èt REP èt ett REP ell èl REP èl ell +REP t th +REP th t REP ième$ e REP ème$ e REP è$ e @@ -124,14 +126,16 @@ REP sanctionnable punissable REP questionnable discutable REP antitartre détartrant REP email courriel +REP construirent construisirent KEY azertyuiop|qsdfghjklmù|wxcvbn|aéz|yèu|iço|oà p|aqz|zse|edr|rft|tgy|yhu|uji|iko|olpm|qws|sxd|dcf|fvg|gbh|hnj -ICONV 40 +ICONV 41 ICONV â ' +ICONV ʼ ' ICONV ï¬ ffi ICONV ï¬ ffl ICONV ï¬ ff @@ -206,1154 +210,428 @@ BREAK â$ -AM 465 -AM po:nom is:mas -AM po:nom is:fem -AM po:adj is:epi -AM po:adj -AM po:v1__t___?? -AM po:nom po:adj -AM po:nom is:mas is:inv -AM po:adv -AM po:nom -AM po:nom is:epi -AM po:nom po:adj is:epi -AM po:npr is:epi is:inv -AM po:v1__t_q_?? -AM po:prn is:mas is:inv -AM po:prn is:fem is:inv -AM po:patr is:epi is:inv -AM po:nom is:mas is:sg -AM po:v1_i?? -AM po:v1_it___?? -AM po:nom is:fem is:sg -AM po:nom is:mas is:pl -AM po:ifut po:3sg -AM po:cond po:3sg -AM po:cond po:3pl -AM po:ifut po:3pl! -AM po:ifut po:2pl -AM po:ifut po:1pl -AM po:cond po:2pl -AM po:cond po:1pl -AM po:impe po:2sg -AM po:ifut po:2sg -AM po:ifut po:1sg -AM po:cond po:1sg po:2sg -AM po:ipre po:spre po:3pl -AM po:adj is:epi is:inv -AM po:v1_it_q_?? -AM po:nom is:fem is:pl -AM po:ipre po:spre po:1sg po:3sg -AM po:ipre po:spre po:2sg -AM po:nom is:fem is:inv -AM po:ppre -AM po:nb is:epi is:pl -AM po:iimp po:3sg -AM po:iimp po:3pl -AM po:simp po:3sg -AM po:ipre po:1pl -AM po:impe po:1pl -AM po:ipsi po:2pl -AM po:ipsi po:1pl -AM po:simp po:3pl -AM po:iimp po:1sg po:2sg -AM po:infi -AM po:interj -AM po:v1p_e_ -AM po:ipsi po:3sg -AM po:simp po:2pl -AM po:simp po:1pl -AM po:simp po:2sg -AM po:simp po:1sg -AM po:ipre po:2pl -AM po:ipsi po:3pl! -AM po:impe po:2pl -AM po:iimp po:spre po:2pl -AM po:iimp po:spre po:1pl -AM po:loc.adv -AM po:adj is:epi is:sg -AM po:ppas po:adj is:fem is:sg -AM po:ppas po:adj is:fem is:pl -AM po:ipre po:3sg -AM po:ppas po:adj is:mas is:pl -AM po:ppas po:adj is:mas is:sg -AM po:spre po:2sg -AM po:spre po:1sg po:3sg -AM po:nom is:epi is:inv -AM po:ipre po:1sg po:2sg -AM po:v2__t___?? -AM po:ipsi po:1sg po:2sg -AM po:v3__t___?? -AM po:v2__t_q_?? -AM is:mas is:sg -AM is:mas is:pl -AM po:v1__t___?? po:infi -AM po:ipsi po:2sg -AM po:ipsi po:1sg -AM po:v3__t_q_?? -AM po:nom po:adj is:mas -AM po:mg po:prep -AM po:prn is:epi is:inv -
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9fc7019099848cdb1457d03296f865aa85b835f1 Author: Christian Lohmaier Date: Wed May 3 13:25:16 2017 +0200 Updated core Project: translations 7439773399c3b11904cf66e4b24afc7c3c070376 update translations for 5.3.3 rc2 and force-fix errors using pocheck Change-Id: Ia6145031ca6088ffe54c6e7c1d60d618cc061284 diff --git a/translations b/translations index 769636b6ac57..7439773399c3 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 769636b6ac5701c4378d685440fed2e1f968f4bc +Subproject commit 7439773399c3b11904cf66e4b24afc7c3c070376 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-5.3' - source/am source/bg source/br source/ca source/cy source/da source/de source/en-GB source/es source/fr source/gl source/hr so
source/am/cui/source/options.po|8 source/am/cui/source/tabpages.po |8 source/am/cui/uiconfig/ui.po |8 source/am/fpicker/source/office.po | 10 source/am/officecfg/registry/data/org/openoffice/Office.po |6 source/am/sc/source/ui/src.po |8 source/am/sfx2/source/dialog.po| 12 source/am/svtools/source/dialogs.po|8 source/am/svtools/source/misc.po |8 source/am/svx/source/stbctrls.po |8 source/am/svx/uiconfig/ui.po | 10 source/bg/sc/uiconfig/scalc/ui.po | 20 source/bg/sfx2/source/dialog.po| 12 source/bg/svx/source/dialog.po | 30 source/bg/svx/source/form.po | 10 source/bg/svx/source/stbctrls.po |8 source/bg/svx/source/tbxctrls.po |6 source/bg/svx/uiconfig/ui.po | 289 source/bg/sw/source/ui/utlui.po| 21 source/bg/sw/source/uibase/utlui.po|6 source/bg/sw/uiconfig/swriter/ui.po|5 source/br/cui/uiconfig/ui.po | 70 - source/br/extensions/source/bibliography.po| 12 source/br/extensions/source/propctrlr.po | 152 ++-- source/br/sc/source/ui/src.po | 12 source/ca/helpcontent2/source/text/scalc/00.po | 20 source/ca/helpcontent2/source/text/scalc/01.po |8 source/ca/helpcontent2/source/text/scalc/guide.po | 10 source/ca/helpcontent2/source/text/shared/01.po|6 source/ca/helpcontent2/source/text/shared/guide.po |5 source/ca/helpcontent2/source/text/shared/optionen.po |8 source/ca/helpcontent2/source/text/simpress/guide.po | 10 source/ca/helpcontent2/source/text/swriter/01.po | 13 source/ca/helpcontent2/source/text/swriter/guide.po| 25 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/ca/sc/uiconfig/scalc/ui.po |6 source/ca/svx/uiconfig/ui.po | 12 source/cy/cui/uiconfig/ui.po |8 source/cy/sfx2/source/dialog.po| 12 source/cy/sfx2/uiconfig/ui.po | 15 source/cy/svtools/source/dialogs.po|8 source/cy/svtools/source/misc.po |8 source/cy/svx/source/stbctrls.po | 10 source/cy/svx/uiconfig/ui.po | 10 source/da/cui/uiconfig/ui.po |8 source/da/helpcontent2/source/text/scalc/01.po | 12 source/da/sfx2/source/dialog.po| 14 source/da/sfx2/uiconfig/ui.po | 17 source/da/svtools/source/dialogs.po| 10 source/da/svtools/source/java.po | 12 source/da/svtools/source/misc.po | 10 source/da/svx/source/stbctrls.po |8 source/da/svx/uiconfig/ui.po | 12 source/de/editeng/source/items.po | 10 source/de/formula/source/core/resource.po |8 source/de/helpcontent2/source/auxiliary.po |6 source/de/helpcontent2/source/text/sbasic/shared/01.po | 10 source/de/helpcontent2/source/text/scalc.po|6 source/de/helpcontent2/source/text/scalc/00.po |6 source/de/helpcontent2/source/text/scalc/01.po | 100 +- source/de/helpcontent2/source/text/scalc/guide.po | 34 source/de/helpcontent2/source/text/schart/01.po|6 source/de/helpcontent2/source/text/shared/00.po| 10 source/de/helpcontent2/source/text/shared/01.po| 12 source/de/helpcontent2/source/text/shared/explorer/database.po |8 source/de/helpcontent2/source/text/shared/guide.po | 16 source/de/helpcontent2/source/text/shared/optionen.po | 12 source/de/helpcontent2/source/text/smath/01.po | 22 source/de/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/de/sc/so
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 7 commits - basic/source officecfg/registry oox/source package/source starmath/source sw/qa sw/source writerfilter/source
basic/source/runtime/methods.cxx | 13 ++-
officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 ++
oox/source/drawingml/fillproperties.cxx|6 ++---
package/source/zippackage/ZipPackageStream.cxx |2 -
starmath/source/accessibility.cxx |2 -
sw/qa/extras/ooxmlexport/data/tdf107033.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 10 +++-
sw/source/core/unocore/unotbl.cxx |4 ++-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 +
writerfilter/source/dmapper/DomainMapper_Impl.hxx |4 ++-
writerfilter/source/dmapper/PropertyMap.cxx| 15 ++---
11 files changed, 52 insertions(+), 17 deletions(-)
New commits:
commit 1e9abd9acdb55275019977a3a1a603b14607d358
Author: Julien Nabet
Date: Sat May 6 15:01:48 2017 +0200
tdf#107644: Crash on inserting formula
See https://bugs.documentfoundation.org/attachment.cgi?id=133085
Accessibility related
Change-Id: I87063e50a59b06f4f5a974764de9aa34e111b4fb
Reviewed-on: https://gerrit.libreoffice.org/37315
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit 3d4938d2d8dc18c7b741efe90686f55f524fcfe2)
Reviewed-on: https://gerrit.libreoffice.org/37337
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 2e20df6eb9fe206b89d5eecbf88eea54d0719268)
diff --git a/starmath/source/accessibility.cxx
b/starmath/source/accessibility.cxx
index fece32e4c63c..19cc51784a62 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -417,7 +417,7 @@ void SAL_CALL
SmGraphicAccessible::removeAccessibleEventListener(
const Reference< XAccessibleEventListener >& xListener )
throw (RuntimeException, std::exception)
{
-if (xListener.is())
+if (xListener.is() && nClientId)
{
SolarMutexGuard aGuard;
sal_Int32 nListenerCount =
comphelper::AccessibleEventNotifier::removeEventListener( nClientId, xListener
);
commit 9b9e1cd83cb0d81f16b6e43d6a6f1362d8c82006
Author: Xisco Fauli
Date: Wed Apr 19 11:38:59 2017 +0200
tdf#105942 Don't hang when file is protected and compressed
Change-Id: I762e6e6d457ea3f5a1f1fd706268b832a71ee550
Reviewed-on: https://gerrit.libreoffice.org/36672
Tested-by: Jenkins
Reviewed-by: Xisco FaulÃ
(cherry picked from commit f8fdc6417b4d023b7c75485754a0ab1b164a69d6)
Reviewed-on: https://gerrit.libreoffice.org/37071
Reviewed-by: Miklos Vajna
(cherry picked from commit 31e22b4bd961ed946bf8f0f4ccb330c699292ddb)
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index f7b1f166..c66fbcf4642e 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -792,7 +792,7 @@ bool ZipPackageStream::saveChild(
uno::Reference< io::XSeekable > xSeek(xStream, uno::UNO_QUERY);
// It's not worth to deflate jpegs to save ~1% in a slow process
// Unfortunately, does not work for streams protected by password
-if (xSeek.is() && msMediaType.endsWith("/jpeg") && !m_bToBeEncrypted)
+if (xSeek.is() && msMediaType.endsWith("/jpeg") && !m_bToBeEncrypted
&& !m_bToBeCompressed)
{
ImplSetStoredData(*pTempEntry, xStream);
xSeek->seek(0);
commit 0cef8382afdc9477a0b85b24d722bc273c902f4b
Author: Thomas Beck
Date: Fri Apr 7 15:04:25 2017 +0200
tdf#106520 xlsx: black square where image should be
Reversed order of Transforms. Duotone will now be applied after a
ColorChange due to the ColorChange Transform not being able to
distinguish the colors properly anymore after Duotone had been applied.
This seems to better match what MSO is doing there.
Change-Id: I6ca66cc411c3e2a3d009325f0f1641c560949a54
Reviewed-on: https://gerrit.libreoffice.org/36263
Reviewed-by: Katarina Behrens
Tested-by: Katarina Behrens
(cherry picked from commit 184362002955d750c6597a444ae5240cf15932ac)
Reviewed-on: https://gerrit.libreoffice.org/37236
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
(cherry picked from commit da8e35e190b96a2cbd26f848bcd2acd139618ebb)
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index ed8dbfcc5741..ed01746b4c64 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -77,7 +77,7 @@ Reference< XGraphic > lclCheckAndApplyDuotoneTransform( const
BlipFillProperties
return xGraphic;
}
-Reference< XGraphic > lclCheckAndApplyChangeColorTransform( const
BlipFillProperties &aBlipProps, Reference< XGraphic > & xGraphic,
+Reference< XGraphic > lclCheckAndApplyChangeCol
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/uiconfig framework/uiconfig reportdesign/uiconfig scp2/source sc/uiconfi
basctl/uiconfig/basicide/menubar/menubar.xml |2 - chart2/uiconfig/menubar/menubar.xml |2 - dbaccess/uiconfig/dbapp/menubar/menubar.xml |2 - dbaccess/uiconfig/dbquery/menubar/menubar.xml |2 - dbaccess/uiconfig/dbrelation/menubar/menubar.xml |2 - dbaccess/uiconfig/dbtable/menubar/menubar.xml |2 - dbaccess/uiconfig/dbtdata/menubar/menubar.xml |2 - extensions/uiconfig/sbibliography/menubar/menubar.xml |2 - framework/uiconfig/startmodule/menubar/menubar.xml|2 - reportdesign/uiconfig/dbreport/menubar/menubar.xml|2 - sc/uiconfig/scalc/menubar/menubar.xml |2 - scp2/source/ooo/folderitem_ooo.scp| 23 -- sd/uiconfig/sdraw/menubar/menubar.xml |2 - sd/uiconfig/simpress/menubar/menubar.xml |2 - starmath/uiconfig/smath/menubar/menubar.xml |2 - svx/uiconfig/ui/crashreportdlg.ui |2 - sw/uiconfig/sglobal/menubar/menubar.xml |2 - sw/uiconfig/sweb/menubar/menubar.xml |2 - sw/uiconfig/swform/menubar/menubar.xml|2 - sw/uiconfig/swreport/menubar/menubar.xml |2 - sw/uiconfig/swriter/menubar/menubar.xml |2 - sw/uiconfig/swxform/menubar/menubar.xml |2 - 22 files changed, 1 insertion(+), 64 deletions(-) New commits: commit 6c56f2928120373457a41d45d6d22845329928f7 Author: Andras Timar Date: Sun May 7 22:45:52 2017 +0200 Collabora Office: remove Safe Mode from menus and Windows start menu Change-Id: I9eaf6ef76597be6bc35462308f1cee61cb9bae5a diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 2a177f62961d..fbde6a4e2cc5 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -101,8 +101,6 @@ - - diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 032e75894d7f..944924b677dc 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -172,8 +172,6 @@ - - diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index ecffe81468d0..2a02bc6b0d04 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -157,8 +157,6 @@ - - diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index bd460419e416..6e92d745c7f7 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -98,8 +98,6 @@ - - diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index 7f88113ab303..e66e76c613e8 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -81,8 +81,6 @@ - - diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml index ca66a41dde2e..08953683a6df 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -82,8 +82,6 @@ - - diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index 17678fec9918..5048718b33c3 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -90,8 +90,6 @@ - - diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml index 361fb47ac07b..d582390f0152 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml @@ -83,8 +83,6 @@ - - diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index 3718ee3bb6fa..adcdd1a93ad2 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/st
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8toolbar.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit c8e3a40a51a264455895535ea163a2c440f0851f
Author: Caolán McNamara
Date: Sun May 7 21:45:27 2017 +0100
ofc avoid oom
Change-Id: I2983d97895206db481b990ccd4f0ecd9d8b31b81
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx
b/sw/source/filter/ww8/ww8toolbar.cxx
index b269f013da52..61208f586b79 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -946,7 +946,15 @@ bool PlfMcd::Read(SvStream &rS)
nOffSet = rS.Tell();
Tcg255SubStruct::Read( rS );
rS.ReadInt32( iMac );
-if ( iMac )
+if (iMac < 0)
+return false;
+auto nMaxPossibleRecords = rS.remainingSize() / 24 /*sizeof MCD*/;
+if (static_cast(iMac) > nMaxPossibleRecords)
+{
+SAL_WARN("sw.ww8", iMac << " records claimed, but max possible is " <<
nMaxPossibleRecords);
+iMac = nMaxPossibleRecords;
+}
+if (iMac)
{
rgmcd.resize(iMac);
for ( sal_Int32 index = 0; index < iMac; ++index )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0be936f739752ce773f1c77f2c1dab022af785f5 Author: Mike Kaganski Date: Sun May 7 09:29:00 2017 +0200 tdf#107649: cp-specific: Try system credentials first by default Change-Id: I39f3cd85153f939c1a5ebd7c6830c0175328a966 Reviewed-on: https://gerrit.libreoffice.org/37335 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 37a1c9861ec7..b2fde9ddc4e8 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -941,7 +941,7 @@ automatically for all resources that support it (regardless of whether they are in "AuthenticateUsingSystemCredentials" list or not). -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source forms/source include/editeng
editeng/source/editeng/impedit.cxx |4 ++--
editeng/source/outliner/outlvw.cxx |2 +-
forms/source/richtext/richtextviewport.cxx |6 +++---
include/editeng/editdata.hxx |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 7cc8555e0ac9838d43bb644bac4052008057824d
Author: Jochen Nitschke
Date: Sun May 7 13:31:18 2017 +0200
convert EESelectionMode to scoped enum
Change-Id: I4da22d40d5b14878b5efac1f3e4a5c76adec37b3
Reviewed-on: https://gerrit.libreoffice.org/37341
Reviewed-by: Noel Grandin
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 71c1471a8961..86b71d6dba26 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -88,7 +88,7 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng,
vcl::Window* pWindo
pDragAndDropInfo= nullptr;
bReadOnly = false;
bClickedInSelection = false;
-eSelectionMode = EE_SELMODE_TXTONLY;
+eSelectionMode = EESelectionMode::TxtOnly;
eAnchorMode = EEAnchorMode::TopLeft;
nInvMore= 1;
nTravelXPos = TRAVEL_X_DONTKNOW;
@@ -196,7 +196,7 @@ void lcl_translateTwips(vcl::Window& rParent, vcl::Window&
rChild)
void ImpEditView::DrawSelection( EditSelection aTmpSel, vcl::Region* pRegion,
OutputDevice* pTargetDevice )
{
-if ( eSelectionMode == EE_SELMODE_HIDDEN )
+if ( eSelectionMode == EESelectionMode::Hidden )
return;
// It must be ensured before rendering the selection, that the contents of
diff --git a/editeng/source/outliner/outlvw.cxx
b/editeng/source/outliner/outlvw.cxx
index 455b04aa85b7..b1410319c3ee 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -54,7 +54,7 @@ OutlinerView::OutlinerView( Outliner* pOut, vcl::Window* pWin
)
pOwner = pOut;
pEditView.reset( new EditView( pOut->pEditEngine, pWin ) );
-pEditView->SetSelectionMode( EE_SELMODE_TXTONLY );
+pEditView->SetSelectionMode( EESelectionMode::TxtOnly );
}
OutlinerView::~OutlinerView()
diff --git a/forms/source/richtext/richtextviewport.cxx
b/forms/source/richtext/richtextviewport.cxx
index 32f12ebe681f..b4fda6652c91 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -45,7 +45,7 @@ namespace frm
Control::GetFocus();
if (m_pView)
{
-m_pView->SetSelectionMode( EE_SELMODE_STD );
+m_pView->SetSelectionMode( EESelectionMode::Std );
m_pView->ShowCursor();
}
}
@@ -55,7 +55,7 @@ namespace frm
if (m_pView)
{
m_pView->HideCursor();
-m_pView->SetSelectionMode( m_bHideInactiveSelection ?
EE_SELMODE_HIDDEN : EE_SELMODE_STD );
+m_pView->SetSelectionMode( m_bHideInactiveSelection ?
EESelectionMode::Hidden : EESelectionMode::Std );
}
Control::LoseFocus();
}
@@ -94,7 +94,7 @@ namespace frm
return;
m_bHideInactiveSelection = _bHide;
if ( !HasFocus() )
-m_pView->SetSelectionMode( m_bHideInactiveSelection ?
EE_SELMODE_HIDDEN : EE_SELMODE_STD );
+m_pView->SetSelectionMode( m_bHideInactiveSelection ?
EESelectionMode::Hidden : EESelectionMode::Std );
}
} // namespace frm
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index a13ecf822fcc..9560c2e32863 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -34,7 +34,7 @@ enum class HtmlTokenId : sal_Int16;
enum EETextFormat { EE_FORMAT_TEXT = 0x20, EE_FORMAT_RTF, EE_FORMAT_BIN
= 0x31, EE_FORMAT_HTML, EE_FORMAT_XML };
enum EEHorizontalTextDirection { EE_HTEXTDIR_DEFAULT, EE_HTEXTDIR_L2R,
EE_HTEXTDIR_R2L };
-enum EESelectionMode{ EE_SELMODE_STD, EE_SELMODE_TXTONLY,
EE_SELMODE_HIDDEN };
+enum class EESelectionMode { Std, TxtOnly, Hidden };
// EE_SELMODE_HIDDEN can be used to completely hide the selection. This is
useful e.g. when you want show the selection
// only as long as your window (which the edit view works on) has the focus
enum class EESpellState { Ok, LanguageNotInstalled, NoSpeller, ErrorFound };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-collect.py esc-reporting/esc-report.py
esc-reporting/esc-analyze.py | 10 +++---
esc-reporting/esc-collect.py | 26 +++---
esc-reporting/esc-report.py |5 -
3 files changed, 18 insertions(+), 23 deletions(-)
New commits:
commit 21c25bb0bf6e26200bfdfc4a98f2eeb0e6fae792
Author: jan Iversen
Date: Sun May 7 21:12:36 2017 +0200
esc-report, added crashtest to esc-prototype
diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 3f6bfd9..42c966e 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -477,7 +477,7 @@ def analyze_qa():
def analyze_esc():
-global cfg, statList, bugzillaData, bugzillaESCData, weekList
+global cfg, statList, bugzillaData, bugzillaESCData, crashData, weekList
print("esc: analyze bugzilla", flush=True)
@@ -561,6 +561,8 @@ def analyze_esc():
for id, row in bugzillaESCData['ESC_COMPONENT_UPDATE']['os'].items():
statList['data']['esc']['component']['os'][id] = row['count']
+statList['data']['esc']['crashtest'] = {'import':
crashData['crashtest']['crashlog'],
+'export':
crashData['crashtest']['exportCrash']}
@@ -821,7 +823,7 @@ def loadCfg(platform):
def runAnalyze():
-global cfg, statList, openhubData, bugzillaData, bugzillaESCData,
gerritData, gitData, weekList
+global cfg, statList, openhubData, bugzillaData, bugzillaESCData,
gerritData, gitData, crashData, weekList
x = (cfg['nowDate'] - datetime.timedelta(days=7)).strftime('%Y-%m-%d')
weekList = util_load_file(cfg['homedir'] + 'archive/stats_' + x + '.json')
@@ -831,6 +833,7 @@ def runAnalyze():
bugzillaESCData = util_load_data_file(cfg['homedir'] +
'dump/bugzilla_esc_dump.json')
gerritData = util_load_data_file(cfg['homedir'] + 'dump/gerrit_dump.json')
gitData = util_load_data_file(cfg['homedir'] + 'dump/git_dump.json')
+crashData = util_load_data_file(cfg['homedir'] + 'dump/crash_dump.json')
statList = util_create_statList()
try:
runLoadCSV()
@@ -875,7 +878,7 @@ def runAnalyze():
def runUpgrade(args):
-global cfg, statList, openhubData, bugzillaData, bugzillaESCData,
gerritData, gitData, weekList
+global cfg, statList, openhubData, bugzillaData, bugzillaESCData,
gerritData, gitData, crashData, weekList
args = args[1:]
openhubData = util_load_data_file(cfg['homedir'] +
'dump/openhub_dump.json')
@@ -883,6 +886,7 @@ def runUpgrade(args):
bugzillaESCData = util_load_data_file(cfg['homedir'] +
'dump/bugzilla_esc_dump.json')
gerritData = util_load_data_file(cfg['homedir'] + 'dump/gerrit_dump.json')
gitData = util_load_data_file(cfg['homedir'] + 'dump/git_dump.json')
+crashData = util_load_data_file(cfg['homedir'] + 'dump/crash_dump.json')
statList = util_create_statList()
runLoadCSV()
csvList = statList
diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 3a954c2..74c1883 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -662,9 +662,8 @@ def get_git(cfg):
def get_crash(cfg):
fileName = cfg['homedir'] + 'dump/crash_dump.json'
-searchDate, rawList = util_load_data_file(cfg, fileName, 'crash',
{'crashtest': {}, 'crashreport': {}})
-
-print("Updating crashtest dump from " + rawList['newest-entry'])
+rawList = {'crashtest': {}, 'crashreport': {}}
+print("Updating crashtest dump")
dirList =
util_load_url('http://dev-builds.libreoffice.org/crashtest/?C=M;O=D',
useRaw=True)
inx = dirList.find('alt="[DIR]"', 0)
if inx == -1:
@@ -675,22 +674,11 @@ def get_crash(cfg):
end = dirList.find('"', inx)
url = 'http://dev-builds.libreoffice.org/crashtest/' + dirList[inx:end]
-for type in 'exportCrashes', 'importCrash', 'validationErrors':
-tmp = util_load_url(url + type + '.csv', useRaw=True).replace('\r',
'').split('\n')
-csv = []
-for line in tmp:
-csv.append(line.split(','))
-for line in csv[1:]:
-for inx, item in enumerate(line):
-if item == '':
- line[inx] = 0
-else:
- line[inx] = int(item)
-rawList['crashtest'][type] = {}
-rawList['crashtest'][type]['title'] = csv[0]
-rawList['crashtest'][type]['data'] = csv[1:]
-
-print("Updating crashreport dump from " + rawList['newest-entry'])
+for type in 'crashlog', 'exportCrash':
+tmp = util_load_url(url + type + '.txt', useRaw=True).split('\n')
+rawList['crashtest'][type] = len(tmp) -1
+
+print("Updating crashreport dump")
print(".talk with moggi, about REST API")
diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index e769c87..7d6d5a3 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -308,9 +308,12 @@ def report_esc_prototype():
txt += ' closed:\n'
for id, title in
statList['escL
[Libreoffice-commits] dev-tools.git: esc-reporting/esc-report.py
esc-reporting/esc-report.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 987d489ea82308976a2e2d0cd6f24fab136d3c39
Author: jan Iversen
Date: Sun May 7 20:28:06 2017 +0200
esc-report, update
diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index cd51e72..e769c87 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -161,7 +161,7 @@ def report_day_mentoring():
def report_mentoring():
-global statList, openhubData, gerritData, gitData, bugzillaData, cfg
+global statList, cfg
fp = open('/tmp/esc_mentoring_report.txt', 'w', encoding='utf-8')
print("+ openhub statistics ({}), {} people did {} commits in 12 month
in {} lines of code\n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/gstreamer/gstwindow.cxx | 19 ---
1 file changed, 19 deletions(-)
New commits:
commit fa19a1f0b050ee6c2ba1f314360e8a2536f61396
Author: Arnaud Versini
Date: Sun May 7 14:25:41 2017 +0200
avmedia: remove useless mutex and lock
Change-Id: Ia6088fdb8734acb76c38067246fa626ddf964f8e
Reviewed-on: https://gerrit.libreoffice.org/37344
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/avmedia/source/gstreamer/gstwindow.cxx
b/avmedia/source/gstreamer/gstwindow.cxx
index 948fff012d0c..dace006253fb 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -31,24 +31,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace gstreamer {
-static ::osl::Mutex& ImplGetOwnStaticMutex()
-{
-static ::osl::Mutex* pMutex = nullptr;
-
-if( pMutex == nullptr )
-{
-::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-
-if( pMutex == nullptr )
-{
-static ::osl::Mutex aMutex;
-pMutex = &aMutex;
-}
-}
-
-return *pMutex;
-}
-
// Window
@@ -56,7 +38,6 @@ Window::Window() :
meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
mnPointerType( awt::SystemPointer::ARROW )
{
-::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() );
}
Window::~Window()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/mtfrenderer/emfppen.cxx | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit ff7f5e1bbd4a9a3e3fa3e4ddb349c97605dc8a01
Author: Bartosz Kosiorek
Date: Sun May 7 02:57:26 2017 +0200
tdf#31814 Introduce minimal value of line width to fix EMF+ import issues
Based on observation of different EMF+ files (eg. exported by ChemDraw),
there is minimal value of line width.
This commit is fixing all such import issues.
Change-Id: I5c26a1b511363eb1e429bf770ad0f482b124ecb5
Reviewed-on: https://gerrit.libreoffice.org/37319
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/cppcanvas/source/mtfrenderer/emfppen.cxx
b/cppcanvas/source/mtfrenderer/emfppen.cxx
index 03014b37b7a7..b3b0c97dcb8a 100755
--- a/cppcanvas/source/mtfrenderer/emfppen.cxx
+++ b/cppcanvas/source/mtfrenderer/emfppen.cxx
@@ -103,12 +103,16 @@ namespace cppcanvas
void EMFPPen::SetStrokeWidth(rendering::StrokeAttributes&
rStrokeAttributes, ImplRenderer& rR, const OutDevState& rState)
{
-#if OSL_DEBUG_LEVEL > 1
-if (penWidth == 0.0) {
-SAL_INFO("cppcanvas.emf", "TODO: pen with zero width - using
minimal which might not be correct");
-}
-#endif
+// If a zero width is specified, a minimum value is used, which is
determined by the units.
+//TODO Add support for other units than Pixel
rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform *
rR.MapSize(penWidth == 0.0 ? 0.05 : penWidth, 0)).getLength());
+
+// tdf#31814 Based on observation of different EMF+ files (eg.
exported by ChemDraw),
+// there is minimal value of line width
+if (rStrokeAttributes.StrokeWidth < 1.0)
+{
+rStrokeAttributes.StrokeWidth = 1.0;
+}
}
/// Convert stroke caps between EMF+ and rendering API
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - include/svx sd/source svx/source vcl/source
include/svx/svdoole2.hxx |4 +-
sd/source/core/sdpage.cxx |8 ++--
sd/source/ui/table/TableDesignPane.cxx |2 -
sd/source/ui/table/TableDesignPane.hxx | 17 ++
sd/source/ui/unoidl/unoobj.cxx |2 -
sd/source/ui/view/viewshe2.cxx |2 -
svx/source/svdraw/svdoole2.cxx | 53 +
svx/source/unodraw/unoshap4.cxx|2 -
vcl/source/outdev/map.cxx |4 --
9 files changed, 35 insertions(+), 59 deletions(-)
New commits:
commit 6483d363d1d8418a8c6bcf99f304161bee48d579
Author: Caolán McNamara
Date: Sun May 7 17:06:12 2017 +0100
drop unnecessary GraphicObject
Change-Id: Iadc741260b3c9f16248c817530b1630b22c626ee
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 402bf801b7d3..7f26842fa0b7 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -596,8 +596,6 @@ public:
svt::EmbeddedObjectRef mxObjRef;
std::unique_ptr mxGraphic;
-// TODO/LATER: do we really need this pointer?
-std::unique_ptr mxGraphicObject;
OUString maProgName;
OUStringaPersistName; // name of object in persist
SdrLightEmbeddedClient_Impl* pLightClient; // must be registered as client
only using AddOwnLightClient() call
@@ -647,7 +645,6 @@ public:
~SdrOle2ObjImpl()
{
mxGraphic.reset();
-mxGraphicObject.reset();
if (mxModifyListener.is())
{
@@ -758,7 +755,6 @@ void SdrOle2Obj::SetGraphic(const Graphic& rGrf)
{
// only for setting a preview graphic
mpImpl->mxGraphic.reset(new Graphic(rGrf));
-mpImpl->mxGraphicObject.reset(new GraphicObject(*mpImpl->mxGraphic));
SetChanged();
BroadcastObjectChange();
@@ -767,7 +763,6 @@ void SdrOle2Obj::SetGraphic(const Graphic& rGrf)
void SdrOle2Obj::ClearGraphic()
{
mpImpl->mxGraphic.reset();
-mpImpl->mxGraphicObject.reset();
SetChanged();
BroadcastObjectChange();
@@ -1519,7 +1514,6 @@ SdrOle2Obj& SdrOle2Obj::assignFrom(const SdrOle2Obj& rObj)
if (rOle2Obj.mpImpl->mxGraphic)
{
mpImpl->mxGraphic.reset(new Graphic(*rOle2Obj.mpImpl->mxGraphic));
-mpImpl->mxGraphicObject.reset(new
GraphicObject(*mpImpl->mxGraphic));
}
if( pModel && rObj.GetModel() && !IsEmptyPresObj() )
commit bd6efb29d7b588669a27a7132b357e692c571a60
Author: Caolán McNamara
Date: Sun May 7 17:05:12 2017 +0100
convert to use std::unique_ptr
Change-Id: If675a1d506d30ea05c3b2113d114f416b2947466
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 1ab690845bb2..402bf801b7d3 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -595,9 +595,9 @@ class SdrOle2ObjImpl
public:
svt::EmbeddedObjectRef mxObjRef;
-Graphic* mpGraphic;
+std::unique_ptr mxGraphic;
// TODO/LATER: do we really need this pointer?
-GraphicObject* mpGraphicObject;
+std::unique_ptr mxGraphicObject;
OUString maProgName;
OUStringaPersistName; // name of object in persist
SdrLightEmbeddedClient_Impl* pLightClient; // must be registered as client
only using AddOwnLightClient() call
@@ -616,8 +616,6 @@ public:
rtl::Reference mxModifyListener;
explicit SdrOle2ObjImpl( bool bFrame ) :
-mpGraphic(nullptr),
-mpGraphicObject(nullptr),
pLightClient (nullptr),
mbFrame(bFrame),
mbInDestruction(false),
@@ -633,8 +631,6 @@ public:
SdrOle2ObjImpl( bool bFrame, const svt::EmbeddedObjectRef& rObjRef ) :
mxObjRef(rObjRef),
-mpGraphic(nullptr),
-mpGraphicObject(nullptr),
pLightClient (nullptr),
mbFrame(bFrame),
mbInDestruction(false),
@@ -650,8 +646,8 @@ public:
~SdrOle2ObjImpl()
{
-delete mpGraphic;
-delete mpGraphicObject;
+mxGraphic.reset();
+mxGraphicObject.reset();
if (mxModifyListener.is())
{
@@ -761,16 +757,8 @@ bool SdrOle2Obj::isUiActive() const
void SdrOle2Obj::SetGraphic(const Graphic& rGrf)
{
// only for setting a preview graphic
-if (mpImpl->mpGraphic)
-{
-delete mpImpl->mpGraphic;
-mpImpl->mpGraphic = nullptr;
-delete mpImpl->mpGraphicObject;
-mpImpl->mpGraphicObject = nullptr;
-}
-
-mpImpl->mpGraphic = new Graphic(rGrf);
-mpImpl->mpGraphicObject = new GraphicObject(*mpImpl->mpGraphic);
+mpImpl->mxGraphic.reset(new Graphic(rGrf));
+mpImpl->mxGraphicObject.reset(new GraphicObject(*mpImpl->mxGraphic));
SetChanged();
BroadcastObjectChange();
@@ -778,13 +766,8 @@ void SdrOle2Obj::SetGraphic(const Graphic& rGrf)
void SdrOle2Obj::ClearGraphic()
{
-if (mpImpl->mpGraphic)
-{
-delete mpImpl->mpGraphic;
-mpImpl->mpGraphic = nullptr;
-delete mpImpl->mpGraphicObject;
-
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit.hxx |9 +++--
editeng/source/editeng/impedit2.cxx | 10 --
editeng/source/editeng/impedit3.cxx |3 +--
3 files changed, 4 insertions(+), 18 deletions(-)
New commits:
commit 525292acab017dcfd50ef0c0b6dc4a5229e32a4e
Author: Caolán McNamara
Date: Sun May 7 15:28:22 2017 +0100
create color config in ctor instead of on-demand
Change-Id: Id45b6cba3665c11074dbdc52757d1b6f0084b020
Reviewed-on: https://gerrit.libreoffice.org/37346
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 19333a665575..bb8f4e894a49 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -31,6 +31,7 @@
#include
#include "editeng/editeng.hxx"
#include
+#include
#include
#include
#include
@@ -84,10 +85,6 @@ namespace clipboard {
class XClipboard;
}
-namespace svtools {
-class ColorConfig;
-}
-
namespace editeng {
struct MisspellRanges;
}
@@ -425,7 +422,7 @@ private:
VclPtr< OutputDevice > pRefDev;
VclPtr mpOwnDev;
-svtools::ColorConfig* pColorConfig;
+svtools::ColorConfig maColorConfig;
mutable SvtCTLOptions* pCTLOptions;
SfxItemSet* pEmptyItemSet;
@@ -866,7 +863,7 @@ public:
voidFormatAndUpdate( EditView* pCurView = nullptr, bool
bCalledFromUndo = false );
inline void IdleFormatAndUpdate( EditView* pCurView );
-svtools::ColorConfig& GetColorConfig();
+const svtools::ColorConfig& GetColorConfig() const { return maColorConfig;
}
boolIsVisualCursorTravelingEnabled();
boolDoVisualCursorTraveling();
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index df975e1eb882..950a5bf79f1b 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -120,7 +120,6 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool*
pItemPool ) :
pUndoManager= nullptr;
pUndoMarkSelection = nullptr;
pTextRanger = nullptr;
-pColorConfig= nullptr;
pCTLOptions = nullptr;
nCurTextHeight = 0;
@@ -200,7 +199,6 @@ ImpEditEngine::~ImpEditEngine()
delete pUndoManager;
delete pTextRanger;
delete mpIMEInfos;
-delete pColorConfig;
delete pCTLOptions;
delete pSpellInfo;
}
@@ -4347,14 +4345,6 @@ void ImpEditEngine::SetForbiddenCharsTable( const
rtl::ReferenceSetForbiddenCharsTable( xForbiddenChars );
}
-svtools::ColorConfig& ImpEditEngine::GetColorConfig()
-{
-if ( !pColorConfig )
-pColorConfig = new svtools::ColorConfig;
-
-return *pColorConfig;
-}
-
bool ImpEditEngine::IsVisualCursorTravelingEnabled()
{
bool bVisualCursorTravaling = false;
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 85360b100f1a..f002bb3c31c9 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4393,7 +4393,7 @@ Reference < i18n::XExtendedInputSequenceChecker > const &
ImpEditEngine::ImplGet
Color ImpEditEngine::GetAutoColor() const
{
-Color aColor =
const_cast(this)->GetColorConfig().GetColorValue(
svtools::FONTCOLOR ).nColor;
+Color aColor = GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor;
if ( GetBackgroundColor() != COL_AUTO )
{
@@ -4406,7 +4406,6 @@ Color ImpEditEngine::GetAutoColor() const
return aColor;
}
-
bool ImpEditEngine::ImplCalcAsianCompression(ContentNode* pNode,
TextPortion* pTextPortion,
sal_Int32 nStartPos,
long* pDXArray, sal_uInt16
n100thPercentFromMax,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-automate.py esc-reporting/esc-report.py
esc-reporting/esc-analyze.py | 41 -
esc-reporting/esc-automate.py |2 +-
esc-reporting/esc-report.py | 14 +-
3 files changed, 30 insertions(+), 27 deletions(-)
New commits:
commit 6083a996bba50e7fe19d3c5baf5e9022ce6b2b46
Author: jan Iversen
Date: Sun May 7 16:56:05 2017 +0200
esc-report, cleanup
diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index f749739..3f6bfd9 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -222,7 +222,7 @@ def util_create_statList():
'people': {},
'escList': {},
'reportList': {},
- 'automateList': {}}
+ 'automateList': {'bugzilla': {}, 'gerrit': {}, 'pdf': {}}}
@@ -582,13 +582,13 @@ def analyze_reports():
'too_many_comments': [],
'top10commit': [],
'top10review': []}
-statList['automateList'] = {'to_abandon': [],
-'to_review': [],
-'missing_ui_cc': [],
-'to_unassign': [],
-'missing_cc': [],
-'assign_problem': [],
-'remove_cc': []}
+automateList = {'to_abandon': [],
+'to_review': [],
+'missing_ui_cc': [],
+'to_unassign': [],
+'missing_cc': [],
+'assign_problem': [],
+'remove_cc': []}
for id, row in statList['people'].items():
entry = {'name': row['name'], 'email': id, 'license': row['licenseText']}
@@ -626,9 +626,9 @@ def analyze_reports():
if x['email'] != ownerEmail and x['email'] !=
'c...@libreoffice.org':
cntReview += 1
if xDate < cfg['1monthDate'] and not doBlock:
-statList['automateList']['to_abandon'].append(entry)
+ automateList['to_abandon'].append(entry)
if cntReview == 0 and not
statList['people'][ownerEmail]['isCommitter']:
-statList['automateList']['to_review'].append(entry)
+ automateList['to_review'].append(entry)
for key, row in bugzillaData['bugs'].items():
if not 'cc' in row:
@@ -641,7 +641,7 @@ def analyze_reports():
if not 'easyHack' in row['keywords']:
if 'mentoring' in row['cc']:
- statList['automateList']['remove_cc'].append(key)
+ automateList['remove_cc'].append(key)
continue
if 'needsDevEval' in row['keywords']:
@@ -649,20 +649,20 @@ def analyze_reports():
if 'needsUXEval' in row['keywords']:
statList['reportList']['needsUXEval'].append(key)
if 'topicUI' in row['keywords'] and
'libreoffice-ux-adv...@lists.freedesktop.org' not in row['cc']:
- statList['automateList']['missing_ui_cc'].append(key)
+ automateList['missing_ui_cc'].append(key)
if row['status'] == 'NEEDINFO':
statList['reportList']['needinfo'].append(key)
elif row['status'] == 'ASSIGNED':
xDate = datetime.datetime.strptime(row['last_change_time'],
"%Y-%m-%dT%H:%M:%SZ")
if xDate < cfg['1monthDate']:
- statList['automateList']['to_unassign'].append(key)
+ automateList['to_unassign'].append(key)
if (row['status'] == 'ASSIGNED' and (row['assigned_to'] == '' or
row['assigned_to'] == 'libreoffice-b...@lists.freedesktop.org')) or \
(row['status'] != 'ASSIGNED' and row['assigned_to'] != '' and
row['assigned_to'] != 'libreoffice-b...@lists.freedesktop.org') :
- statList['automateList']['assign_problem'].append(key)
+ automateList['assign_problem'].append(key)
if len(row['comments']) >= 5:
statList['reportList']['too_many_comments'].append(key)
if not 'mentor...@documentfoundation.org' in row['cc']:
-statList['automateList']['missing_cc'].append(key)
+automateList['missing_cc'].append(key)
if row['comments'][-1]['creator'] ==
'libreoffice-comm...@lists.freedesktop.org' and not key in
cfg['bugzilla']['close_except']:
statList['reportList']['to_be_closed'].append(key)
cDate = datetime.datetime.strptime(row['creation_time'],
"%Y-%m-%dT%H:%M:%SZ")
@@ -688,8 +688,15 @@ def analyze_reports():
if len(statList['reportList']['top10review']) >= 10:
break
-statList['automateList']['award_1st_email'] =
statList['reportList']['award_1st_email']
-
+statList['automateList']['bugzilla'] = {'missing_ui_cc':
automateList['missing_ui_cc'],
+'to_unassign':
automateList['to_unassign'],
+'missing_cc':
automateList['missing_cc'],
+'assign_pr
Re: Question about exportCrashes.csv, importCrash.csv and validationErrors.csv
On Sun, 2017-05-07 at 09:58 +0200, Jan Iversen wrote: > Hi Caolán > > I guess you are the best to ask, I do this on our dev. list so we > have the answer documented. > > I have been tasked with adding the crash test numbers in the ESC > prototype agenda automatically. > > So far I have locating the files, you told earlier was the basis, > however when I look at the csv files, I cannot see how you come from > those to the 3 numbers you report ? > > Can you please tell me, how to calculate the number for the ESC > report from the csv files. Sum of the last row of importCrash.csv and exportCrash.csv for import and export failures respectively. But to the be honest, ever since we got the numbers down to near zero I generally don't bother with the csv unless there's been a dramatic jump and just count the number of lines in crashlog.txt and exportCrash.txt which is probably trivially possible to automate. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: 2 commits - esc-reporting/esc-analyze.py esc-reporting/esc-automate.py esc-reporting/esc-collect.py esc-reporting/esc-report.py
esc-reporting/esc-analyze.py | 165 -
esc-reporting/esc-automate.py | 119
esc-reporting/esc-collect.py | 18 ++-
esc-reporting/esc-report.py | 206 ++
4 files changed, 318 insertions(+), 190 deletions(-)
New commits:
commit 5ce255299da00e77e726e78ac8ece7db635bc3a0
Author: jan Iversen
Date: Sun May 7 16:08:32 2017 +0200
esc-report, first version of automate script
diff --git a/esc-reporting/esc-automate.py b/esc-reporting/esc-automate.py
new file mode 100755
index 000..23906c9
--- /dev/null
+++ b/esc-reporting/esc-automate.py
@@ -0,0 +1,119 @@
+#!/usr/bin/env python3
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+
+
+
+
+### DESCRIPTION
+#
+# This program automates update of bugzilla, gerrit and sends mail
+#
+# Installed on vm174:/usr/local/bin runs every night (generating and mailing
reports)
+#
+#
+
+
+
+import sys
+import os
+import datetime
+import json
+
+
+def util_load_data_file(fileName):
+try:
+ fp = open(fileName, encoding='utf-8')
+ rawData = json.load(fp)
+ fp.close()
+except Exception as e:
+ print('Error load file ' + fileName + ' due to ' + str(e))
+ exit(-1)
+return rawData
+
+
+
+def util_dump_file(fileName, rawList):
+try:
+ fp = open(fileName, 'w', encoding='utf-8')
+ json.dump(rawList, fp, ensure_ascii=False, indent=4, sort_keys=True)
+ fp.close()
+except Exception as e:
+ print('Error dump file ' + fileName + ' due to ' + str(e))
+ os.remove(fileName)
+ exit(-1)
+
+
+
+
+
+def runCfg(platform):
+global cfg
+if 'esc_homedir' in os.environ:
+ homeDir = os.environ['esc_homedir']
+else:
+ homeDir = '/home/esc-mentoring/esc'
+
+cfg = util_load_data_file(homeDir + '/config.json')
+cfg['homedir'] = homeDir + '/'
+cfg['platform'] = platform
+print("Reading and writing data to " + cfg['homedir'])
+
+cfg['award-mailed'] = util_load_data_file(cfg['homedir'] +
'award.json')['award-mailed']
+cfg['nowDate'] = datetime.datetime.now().replace(hour=0, minute=0,
second=0, microsecond=0)
+cfg['cutDate'] = cfg['nowDate'] - datetime.timedelta(days=365)
+cfg['1weekDate'] = cfg['nowDate'] - datetime.timedelta(days=7)
+cfg['1monthDate'] = cfg['nowDate'] - datetime.timedelta(days=30)
+cfg['3monthDate'] = cfg['nowDate'] - datetime.timedelta(days=90)
+cfg['1yearDate'] = cfg['nowDate'] - datetime.timedelta(days=365)
+return cfg
+
+
+
+def runAutomate():
+global cfg, autoList
+
+autoList = util_load_data_file(cfg['homedir'] + 'automate.json')
+
+xMail = []
+try:
+ x = automate_gerrit()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
+try:
+ x = automate_bugzilla()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
+try:
+ x = automate_pdf()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
+
+fp = open('/tmp/runAutoMail', 'w', encoding='utf-8')
+print("#!/bin/bash", file=fp)
+print("")
+for i in xMail:
+ if 'attach' in i:
+attach = '-a ' + i['attach'] + ' '
+ else:
+attach = ''
+ print("mail -s '" + i['title'] + "' " + attach + i['mail'] + " < " +
i['file'], file=fp)
+fp.close()
+
+
+
+if __name__ == '__main__':
+runCfg(sys.platform)
+runAutomate()
commit 0412317845f6da3b0b5bb17aeb3db24e1ba9c6ef
Author: jan Iversen
Date: Sun May 7 16:08:08 2017 +0200
esc-report, moved analyze functions to esc-analyze
diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index f4fc753..f749739 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -220,7 +220,9 @@ def util_create_statList():
'esc': {}},
'stat': {'openhub_last_analyse': "2001-01-01"},
'people': {},
- 'escList': {}}
+ 'escList': {},
+ 'reportList': {},
+ 'automateList': {}}
@@ -560,6 +562,136 @@ def analyze_esc():
statList['data']['esc']['component']['os'][id] = row['count']
+
+
+def analyze_reports():
+global cfg, statList, openhubData, bugzillaData, gerritData, gitData
+
+print("reports: analyze", flush=True)
+mailedDate = datetime.datetime.strptime(cfg['git']['last-mail-run'],
'%Y-%m-%d') - datetime.timedelta(days=90)
+zeroDate = datetime.datetime(year=2001, month=1, day=1)
+statList['reportList'] = {'we_miss_you_email': [],
+ 'award_1st_email': [],
+ 'pending_license': [],
+ 'missing_license': []
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit f5c0d7508b972898153bbf4069c9ea48f53d64d5
Author: Caolán McNamara
Date: Sun May 7 14:56:51 2017 +0100
ofz check against expected struct size
don't copy vector and const up as well
Change-Id: Ia9c9dd9e0dee2300f8f60eec15b67e4a349c8a93
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e6c87cf0d852..aa22f3a9e6da 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4979,10 +4979,14 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
for (size_t i=0; i < aLinkStrings.size() && i < aStringIds.size(); ++i)
{
-ww::bytes stringId = aStringIds[i];
-WW8_STRINGID *stringIdStruct =
reinterpret_cast(&stringId[0]);
-m_aLinkStringMap[SVBT16ToShort(stringIdStruct->nStringId)] =
-aLinkStrings[i];
+const ww::bytes& stringId = aStringIds[i];
+if (stringId.size() < sizeof(WW8_STRINGID))
+{
+SAL_WARN("sw.ww8", "SwWW8ImplReader::CoreLoad: WW8_STRINGID is too
short");
+continue;
+}
+const WW8_STRINGID *stringIdStruct = reinterpret_cast(stringId.data());
+m_aLinkStringMap[SVBT16ToShort(stringIdStruct->nStringId)] =
aLinkStrings[i];
}
ReadDocVars(); // import document variables as meta information.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - starmath/source
starmath/source/accessibility.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2e20df6eb9fe206b89d5eecbf88eea54d0719268
Author: Julien Nabet
Date: Sat May 6 15:01:48 2017 +0200
tdf#107644: Crash on inserting formula
See https://bugs.documentfoundation.org/attachment.cgi?id=133085
Accessibility related
Change-Id: I87063e50a59b06f4f5a974764de9aa34e111b4fb
Reviewed-on: https://gerrit.libreoffice.org/37315
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit 3d4938d2d8dc18c7b741efe90686f55f524fcfe2)
Reviewed-on: https://gerrit.libreoffice.org/37337
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/source/accessibility.cxx
b/starmath/source/accessibility.cxx
index fece32e4c63c..19cc51784a62 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -417,7 +417,7 @@ void SAL_CALL
SmGraphicAccessible::removeAccessibleEventListener(
const Reference< XAccessibleEventListener >& xListener )
throw (RuntimeException, std::exception)
{
-if (xListener.is())
+if (xListener.is() && nClientId)
{
SolarMutexGuard aGuard;
sal_Int32 nListenerCount =
comphelper::AccessibleEventNotifier::removeEventListener( nClientId, xListener
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/form/UIControlArranger.java | 36 ++-
1 file changed, 25 insertions(+), 11 deletions(-)
New commits:
commit aa722151d0e76fddbc3801667f5d613690d5a4d9
Author: Julien Nabet
Date: Sun May 7 07:58:46 2017 +0200
tdf#107668: fix form wizard
Regression from
https://cgit.freedesktop.org/libreoffice/core/commit/?id=fcf9c22e00db0107391775f51fac53555711b951
Use an hashmap to find the right helpText
Change-Id: Ie3389406525fb068fb24262a40b8e6af4c744100
Reviewed-on: https://gerrit.libreoffice.org/37334
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java
b/wizards/com/sun/star/wizards/form/UIControlArranger.java
index a6b4b77f3a41..15122111fec1 100644
--- a/wizards/com/sun/star/wizards/form/UIControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java
@@ -17,6 +17,9 @@
*/
package com.sun.star.wizards.form;
+import java.util.Map;
+import java.util.HashMap;
+
import com.sun.star.awt.ItemEvent;
import com.sun.star.awt.Size;
import com.sun.star.awt.XControl;
@@ -44,11 +47,15 @@ public class UIControlArranger
private final XRadioButton optAlignLeft;
private final XRadioButton optAlignRight;
private final XControl flnLabelPlacement;
-private final String[] HelpTexts = new String[4];
+private final Map helpTexts = new HashMap(4);
private final ArrangeButtonList[] m_aArrangeList = new
ArrangeButtonList[2];
private final Integer IControlStep;
private static final int SOBASEIMAGEYPOSITION = 66;
private static final int SOIMAGELISTHEIGHT = 60;
+private static final String ARRANGELISTSIDE =
"private:graphicrepository/wizards/res/formarrangelistside_42.png";
+private static final String ARRANGELISTTOP =
"private:graphicrepository/wizards/res/formarrangelisttop_42.png";
+private static final String ARRANGETABLE =
"private:graphicrepository/wizards/res/formarrangetable_42.png";
+private static final String ARRANGEFREE =
"private:graphicrepository/wizards/res/formarrangefree_42.png";
public UIControlArranger(FormWizard _CurUnoDialog, FormDocument
_curFormDocument)
{
@@ -102,16 +109,23 @@ public class UIControlArranger
});
-HelpTexts[0] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM +
36); // "Columnar - Labels Left"
-HelpTexts[1] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM +
37); // "Columnar - Labels of Top"
-HelpTexts[2] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM +
40); // "As Data Sheet"
-HelpTexts[3] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM +
39); // In Blocks - Labels Above"
-
DefaultListModel imageModel = new DefaultListModel();
-
imageModel.addElement("private:graphicrepository/wizards/res/formarrangelistside_42.png");
-
imageModel.addElement("private:graphicrepository/wizards/res/formarrangelisttop_42.png");
-
imageModel.addElement("private:graphicrepository/wizards/res/formarrangetable_42.png");
-
imageModel.addElement("private:graphicrepository/wizards/res/formarrangefree_42.png");
+imageModel.addElement(ARRANGELISTSIDE);
+imageModel.addElement(ARRANGELISTTOP);
+imageModel.addElement(ARRANGETABLE);
+imageModel.addElement(ARRANGEFREE);
+
+// "Columnar - Labels Left"
+helpTexts.put(ARRANGELISTSIDE,
CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 36));
+
+// "Columnar - Labels of Top"
+helpTexts.put(ARRANGELISTTOP,
CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 37));
+
+// "As Data Sheet"
+helpTexts.put(ARRANGETABLE,
CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40));
+
+// "In Blocks - Labels Above"
+helpTexts.put(ARRANGEFREE,
CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 39));
String sMainArrangementHeader =
CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 41); // "Arrangement of
the main form"
m_aArrangeList[0] = new ArrangeButtonList(0, imageModel,
sMainArrangementHeader);
@@ -134,7 +148,7 @@ public class UIControlArranger
{
return PropertyNames.EMPTY_STRING;
}
-return HelpTexts[((Integer) listItem).intValue()];
+return (String) helpTexts.get(listItem);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source include/vcl sc/source sd/source sw/source vcl/inc vcl/source vcl/unx writerfilter/source writerperfect/source xmlhelp/source
chart2/source/controller/dialogs/ObjectNameProvider.cxx |1 +
include/vcl/menu.hxx|8 ++--
include/vcl/vclevent.hxx|7 +--
include/vcl/window.hxx |2 +-
sc/source/ui/view/hintwin.cxx |1 +
sd/source/ui/framework/factories/FullScreenPane.hxx |1 +
sd/source/ui/presenter/CanvasUpdateRequester.cxx|1 +
sw/source/filter/html/parcss1.cxx |1 +
vcl/inc/impfontcharmap.hxx |3 +++
vcl/inc/svdata.hxx |1 +
vcl/inc/unx/printergfx.hxx |2 ++
vcl/source/bitmap/BitmapTools.cxx |1 +
vcl/unx/generic/print/common_gfx.cxx|2 +-
writerfilter/source/dmapper/GraphicHelpers.cxx |1 +
writerfilter/source/rtftok/rtftokenizer.cxx |1 +
writerperfect/source/common/WPFTResMgr.cxx |2 +-
xmlhelp/source/cxxhelp/provider/databases.cxx |5 +++--
17 files changed, 31 insertions(+), 9 deletions(-)
New commits:
commit 5aa54f17441afee8c2001d73f4b590eeeafd7414
Author: Jochen Nitschke
Date: Fri May 5 15:29:21 2017 +0200
break circular include
of include/vcl/window.hxx and include/vcl/vclevent.hxx
Change-Id: Iacb3cc942693a732de5899af26e08e0977a83102
Reviewed-on: https://gerrit.libreoffice.org/37338
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 574de211aff5..66a7fa3637bf 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -33,6 +33,7 @@
#include "RegressionCurveHelper.hxx"
#include
#include
+#include
#include
#include
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index e3a0e8b8c529..ddf12f629c99 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -47,7 +47,6 @@ class PopupMenu;
class KeyEvent;
class CommandEvent;
class MenuFloatingWindow;
-namespace vcl { class Window; }
class SalMenu;
class MenuBarWindow;
struct SystemMenuData;
@@ -57,7 +56,12 @@ namespace com { namespace sun { namespace star { namespace
accessibility {
class XAccessible;
-namespace vcl { struct MenuLayoutData; }
+namespace vcl
+{
+class Window;
+struct MenuLayoutData;
+typedef OutputDevice RenderContext; // same as in include/vcl/outdev.hxx
+}
#define MENU_APPEND(sal_uInt16(0x))
#define MENU_ITEM_NOTFOUND (sal_uInt16(0x))
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index a60723167427..933ce2666fba 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -20,10 +20,8 @@
#ifndef INCLUDED_VCL_VCLEVENT_HXX
#define INCLUDED_VCL_VCLEVENT_HXX
-#include
#include
#include
-#include
#include
@@ -35,6 +33,11 @@ namespace com { namespace sun { namespace star {
}
}}}
+namespace vcl
+{
+class Window;
+}
+
enum class VclEventId
{
NONE,
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 36370a7c8137..ac9e1a60b908 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1548,7 +1549,6 @@ public:
// Only for compatibility - because many people outside haven't included
event.hxx
// These require Window to be defined for VclPtr
-#include
#include
#endif // INCLUDED_VCL_WINDOW_HXX
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index 32f71131717c..816bb40281f5 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#define HINT_LINESPACE 2
#define HINT_INDENT 3
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx
b/sd/source/ui/framework/factories/FullScreenPane.hxx
index 3253ea153fac..1329a05c4458 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
class WorkWindow;
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx
b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
index 456c37d43a58..2517c710c1d7 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
@@ -20,6 +20,7 @@
#include "CanvasUpdateRequester.hxx"
#include
#include
+#include
#include
using namespace ::com::sun::star;
diff --git a/sw/source/filter/html/parcss1.cxx
b/sw/source/filter/html/parcss1.cxx
index c22f8412e140..e3c6c44921be 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -19,6 +19,7 @@
[Libreoffice-commits] core.git: basctl/source eventattacher/source extensions/test include/vcl l10ntools/source sfx2/source svx/source sw/inc sw/source
basctl/source/basicide/macrodlg.cxx |2
+-
eventattacher/source/eventattacher.cxx |2
+-
extensions/test/ole/EventListenerSample/EventListener/EventListener.idl |2
+-
include/vcl/prgsbar.hxx |2
+-
l10ntools/source/helpmerge.cxx |2
+-
sfx2/source/dialog/newstyle.cxx |2
+-
svx/source/form/fmmodel.cxx |4
++--
sw/inc/crsrsh.hxx |2
+-
sw/source/core/text/widorp.cxx |2
+-
sw/source/uibase/uiview/pview.cxx |4
++--
sw/source/uibase/wrtsh/select.cxx |4
++--
11 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit fbd414741157b969924318462ebfcfb5ccf4d3dc
Author: Andrea Gelmini
Date: Sat May 6 10:05:28 2017 +0200
Fix typos
To complete commit 076758857a98
Change-Id: I6424109e3aee8a3236e40168bdd98c725a7afafb
Reviewed-on: https://gerrit.libreoffice.org/37306
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/basctl/source/basicide/macrodlg.cxx
b/basctl/source/basicide/macrodlg.cxx
index c060df0765fe..db4f1142942f 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -513,7 +513,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *,
pBox, void )
SbMethod* pMethod =
static_cast(pModule->GetMethods()->Get( iMeth ));
if( pMethod->IsHidden() )
continue;
-DBG_ASSERT( pMethod, "Methode not found! (NULL)" );
+DBG_ASSERT( pMethod, "Method not found! (NULL)" );
sal_uInt16 nStart, nEnd;
pMethod->GetLineRange( nStart, nEnd );
aMacros.insert( map< sal_uInt16, SbMethod*>::value_type( nStart,
pMethod ) );
diff --git a/eventattacher/source/eventattacher.cxx
b/eventattacher/source/eventattacher.cxx
index a8707c287e14..06bd2eed2bb5 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -786,7 +786,7 @@ void EventAttacherImpl::removeListener
const Reference< XIdlMethod >* pMethods = aMethodSeq.getConstArray();
for( i = 0 ; i < nLen ; i++ )
{
-// Call Methode
+// Call Method
const Reference< XIdlMethod >& rxMethod = pMethods[i];
// Is it the right method?
diff --git
a/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl
b/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl
index b1a4dfd6e80f..010034184da0 100644
--- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl
+++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl
@@ -34,7 +34,7 @@ import "ocidl.idl";
]
interface IEvtListener : IDispatch
{
-[id(1), helpstring("Methode disposing")] HRESULT disposing([in]
IDispatch* source);
+[id(1), helpstring("Method disposing")] HRESULT disposing([in]
IDispatch* source);
};
[
diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx
index fcdad3fac97f..f28c82e78e75 100644
--- a/include/vcl/prgsbar.hxx
+++ b/include/vcl/prgsbar.hxx
@@ -38,7 +38,7 @@
*
* ---
*
- * Methodes
+ * Methods
*
* Use SetValue() to set a percentage between 0 and 100. A value larger
* than 100 will cause the last rectangle to start flashing
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 3cd2d9dab20c..092de8a61790 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -196,7 +196,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file ,
MergeDataFile* pMergeDataFile
return true;
}
-/* ProcessHelp Methode: search for en-US entry and replace it with the current
language*/
+/* ProcessHelp method: search for en-US entry and replace it with the current
language*/
void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur ,
ResData *pResData , MergeDataFile* pMergeDataFile ){
XMLElement* pXMLElement = nullptr;
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 11f58bb798ee..e19d944ed1a2 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -26,7 +26,7 @@
#include
#include
-// PRIVATE METHODES --
+// Private methods --
IMPL_LINK_NOARG( SfxNewStyleDlg, OKClickHdl, Button*, void )
{
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index 22c9e206ed4b..5038a551b6f1 100644
--- a/svx/source/form/fmmodel.cxx
[Libreoffice-commits] core.git: starmath/source
starmath/source/accessibility.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3d4938d2d8dc18c7b741efe90686f55f524fcfe2
Author: Julien Nabet
Date: Sat May 6 15:01:48 2017 +0200
tdf#107644: Crash on inserting formula
See https://bugs.documentfoundation.org/attachment.cgi?id=133085
Accessibility related
Change-Id: I87063e50a59b06f4f5a974764de9aa34e111b4fb
Reviewed-on: https://gerrit.libreoffice.org/37315
Reviewed-by: Noel Grandin
Tested-by: Jenkins
Reviewed-by: sam tygier
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/starmath/source/accessibility.cxx
b/starmath/source/accessibility.cxx
index 10278840f4c0..dad27759cc61 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -392,7 +392,7 @@ void SAL_CALL
SmGraphicAccessible::addAccessibleEventListener(
void SAL_CALL SmGraphicAccessible::removeAccessibleEventListener(
const Reference< XAccessibleEventListener >& xListener )
{
-if (xListener.is())
+if (xListener.is() && nClientId)
{
SolarMutexGuard aGuard;
sal_Int32 nListenerCount =
comphelper::AccessibleEventNotifier::removeEventListener( nClientId, xListener
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-report.py
esc-reporting/esc-analyze.py | 36 +++-
esc-reporting/esc-report.py | 63 ---
2 files changed, 70 insertions(+), 29 deletions(-)
New commits:
commit 157afd3f53d28de0be5bdf728cc17db1d9213d98
Author: jan Iversen
Date: Sun May 7 11:13:50 2017 +0200
esc-report resiliance added to analyze/report too
diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index dd7a457..f4fc753 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -688,14 +688,34 @@ def runAnalyze():
gerritData = util_load_data_file(cfg['homedir'] + 'dump/gerrit_dump.json')
gitData = util_load_data_file(cfg['homedir'] + 'dump/git_dump.json')
statList = util_create_statList()
-runLoadCSV()
-
-analyze_mentoring()
-analyze_ui()
-analyze_qa()
-analyze_esc()
-analyze_myfunc()
-analyze_final()
+try:
+ runLoadCSV()
+except:
+ pass
+try:
+ analyze_mentoring()
+except:
+ pass
+try:
+ analyze_ui()
+except:
+ pass
+try:
+ analyze_qa()
+except:
+ pass
+try:
+ analyze_esc()
+except:
+ pass
+try:
+ analyze_myfunc()
+except:
+ pass
+try:
+ analyze_final()
+except:
+ pass
def runUpgrade(args):
diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index e45057c..2920470 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -897,27 +897,48 @@ def runReport():
gitData = util_load_data_file(cfg['homedir'] + 'dump/git_dump.json')
xMail = []
-x = report_bug_metrics()
-if not x is None:
- xMail.append(x)
-x = report_day_mentoring()
-if not x is None:
- xMail.append(x)
-x = report_mentoring()
-if not x is None:
- xMail.append(x)
-x = report_ui()
-if not x is None:
- xMail.append(x)
-x = report_qa()
-if not x is None:
- xMail.append(x)
-x = report_myfunc()
-if not x is None:
- xMail.append(x)
-x = report_esc_prototype()
-if not x is None:
- xMail.append(x)
+try:
+ x = report_bug_metrics()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
+try:
+ x = report_day_mentoring()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
+try:
+ x = report_mentoring()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
+try:
+ x = report_ui()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
+try:
+ x = report_qa()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
+try:
+ x = report_myfunc()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
+try:
+ x = report_esc_prototype()
+ if not x is None:
+xMail.append(x)
+except:
+ pass
fp = open('/tmp/runMail', 'w', encoding='utf-8')
print("#!/bin/bash", file=fp)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py
esc-reporting/esc-collect.py | 30 -- 1 file changed, 24 insertions(+), 6 deletions(-) New commits: commit fdcbe4abc89988a27308b45c0df1c8bbab9452dc Author: jan Iversen Date: Sun May 7 11:02:59 2017 +0200 esc-report, make collecting resiliant to failures diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py index 8315bc3..434f24f 100755 --- a/esc-reporting/esc-collect.py +++ b/esc-reporting/esc-collect.py @@ -722,12 +722,30 @@ def runCfg(platform): def runBuild(cfg): -crashData = get_crash(cfg) -openhubData = get_openhub(cfg) -bugzillaData = get_bugzilla(cfg) -ESCData = get_esc_bugzilla(cfg) -gerritData = get_gerrit(cfg) -gitData = get_git(cfg) +try: + crashData = get_crash(cfg) +except: + pass +try: + openhubData = get_openhub(cfg) +except: + pass +try: + bugzillaData = get_bugzilla(cfg) +except: + pass +try: + ESCData = get_esc_bugzilla(cfg) +except: + pass +try: + gerritData = get_gerrit(cfg) +except: + pass +try: + gitData = get_git(cfg) +except: + pass ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py
esc-reporting/esc-collect.py | 43 ++-
1 file changed, 42 insertions(+), 1 deletion(-)
New commits:
commit d3b30e1a8fae958446bc7bcbf8fc1dacfee42152
Author: jan Iversen
Date: Sun May 7 10:32:48 2017 +0200
esc-report, add collect of crashtest csv files
diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 280ff21..8315bc3 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -660,6 +660,46 @@ def get_git(cfg):
+def get_crash(cfg):
+fileName = cfg['homedir'] + 'dump/crash_dump.json'
+searchDate, rawList = util_load_data_file(cfg, fileName, 'crash',
{'crashtest': {}, 'crashreport': {}})
+
+print("Updating crashtest dump from " + rawList['newest-entry'])
+dirList =
util_load_url('http://dev-builds.libreoffice.org/crashtest/?C=M;O=D',
useRaw=True)
+inx = dirList.find('alt="[DIR]"', 0)
+if inx == -1:
+ print("ERROR: http://dev-builds.libreoffice.org/crashtest/?C=M;O=D not
showing DIR list")
+ return
+inx = dirList.find('alt="[DIR]"', inx+8)
+inx = dirList.find('href="', inx) +6
+end = dirList.find('"', inx)
+url = 'http://dev-builds.libreoffice.org/crashtest/' + dirList[inx:end]
+
+for type in 'exportCrashes', 'importCrash', 'validationErrors':
+tmp = util_load_url(url + type + '.csv', useRaw=True).replace('\r',
'').split('\n')
+csv = []
+for line in tmp:
+csv.append(line.split(','))
+for line in csv[1:]:
+for inx, item in enumerate(line):
+if item == '':
+ line[inx] = 0
+else:
+ line[inx] = int(item)
+rawList['crashtest'][type] = {}
+rawList['crashtest'][type]['title'] = csv[0]
+rawList['crashtest'][type]['data'] = csv[1:]
+
+print("Updating crashreport dump from " + rawList['newest-entry'])
+print(".talk with moggi, about REST API")
+
+
+rawList['newest-entry'] = datetime.datetime.now().strftime('%Y-%m-%d %H')
+util_dump_file(fileName, rawList)
+return rawList
+
+
+
def runCfg(platform):
if 'esc_homedir' in os.environ:
homeDir = os.environ['esc_homedir']
@@ -682,7 +722,8 @@ def runCfg(platform):
def runBuild(cfg):
-#problem openhubData = get_openhub(cfg)
+crashData = get_crash(cfg)
+openhubData = get_openhub(cfg)
bugzillaData = get_bugzilla(cfg)
ESCData = get_esc_bugzilla(cfg)
gerritData = get_gerrit(cfg)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Question about exportCrashes.csv, importCrash.csv and validationErrors.csv
Hi Caolán I guess you are the best to ask, I do this on our dev. list so we have the answer documented. I have been tasked with adding the crash test numbers in the ESC prototype agenda automatically. So far I have locating the files, you told earlier was the basis, however when I look at the csv files, I cannot see how you come from those to the 3 numbers you report ? Can you please tell me, how to calculate the number for the ESC report from the csv files. thanks in advance. rgds jan I. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
