[Libreoffice-commits] core.git: xmlsecurity/workben

[Miklos Vajna]

 xmlsecurity/workben/pdfverify.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 107bcc88397f7167cf9599255f4e8c4de299e659
Author: Miklos Vajna 
Date:   Fri Dec 16 09:11:18 2016 +0100

cid#1374075 cid#1374076 Executable_pdfverify: uncaught exceptions

SAL_INFO() throwing std::length_error and other uninteresting cases.

Change-Id: I841c7d81ff51c95ea60d63625e296f9886798f92

diff --git a/xmlsecurity/workben/pdfverify.cxx 
b/xmlsecurity/workben/pdfverify.cxx
index 04c33d8..92504fc 100644
--- a/xmlsecurity/workben/pdfverify.cxx
+++ b/xmlsecurity/workben/pdfverify.cxx
@@ -22,7 +22,9 @@
 
 using namespace com::sun::star;
 
-SAL_IMPLEMENT_MAIN_WITH_ARGS(nArgc, pArgv)
+namespace
+{
+int pdfVerify(int nArgc, char** pArgv)
 {
 if (nArgc < 2)
 {
@@ -151,5 +153,19 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(nArgc, pArgv)
 
 return 0;
 }
+}
+
+SAL_IMPLEMENT_MAIN_WITH_ARGS(nArgc, pArgv)
+{
+try
+{
+return pdfVerify(nArgc, pArgv);
+}
+catch (...)
+{
+std::cerr << "pdfverify: uncaught exception while invoking 
pdfVerify()" << std::endl;
+return 1;
+}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl unusedcode.easy vcl/inc vcl/Library_vcl.mk vcl/source

[Takeshi Abe]

 include/vcl/rendersettings.hxx   |   34 --
 include/vcl/window.hxx   |1 -
 unusedcode.easy  |2 --
 vcl/Library_vcl.mk   |1 -
 vcl/inc/pch/precompiled_vcl.hxx  |2 +-
 vcl/inc/window.h |1 -
 vcl/source/gdi/impanmvw.cxx  |5 +++--
 vcl/source/outdev/rendersettings.cxx |   18 --
 8 files changed, 4 insertions(+), 60 deletions(-)

New commits:
commit 6ee75be645d605cbecd0ebda54303891acf25664
Author: Takeshi Abe 
Date:   Thu Dec 15 21:48:17 2016 +0900

vcl: Kill unused RenderSettings

Change-Id: Ie74d4f3258ef553b4febcc544204080d8c6e0f40
Reviewed-on: https://gerrit.libreoffice.org/32046
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/include/vcl/rendersettings.hxx b/include/vcl/rendersettings.hxx
deleted file mode 100644
index d516dfc..000
--- a/include/vcl/rendersettings.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- 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_RENDERSETTINGS_HXX
-#define INCLUDED_VCL_RENDERSETTINGS_HXX
-
-#include 
-#include 
-#include 
-
-namespace vcl
-{
-
-class VCL_DLLPUBLIC RenderSettings final
-{
-OutDevState maOutDevState;
-std::unique_ptr mpBackground;
-
-public:
-RenderSettings()
-{}
-};
-
-}
-
-#endif // INCLUDED_VCL_RENDERSETTINGS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 8aa141e..1b5759b 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -101,7 +101,6 @@ namespace dnd {
 
 namespace vcl {
 struct ControlLayoutData;
-class RenderSettings;
 }
 
 namespace svt { class PopupWindowControllerImpl; }
diff --git a/unusedcode.easy b/unusedcode.easy
index 7285029..e932550 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -74,10 +74,8 @@ std::_Rb_tree, std::allocator > >::reserve(unsigned long)
 vcl::MapChar(vcl::TrueTypeFont*, unsigned short, bool)
 vcl::Region::IsInside(Rectangle const&) const
-vcl::RenderSettings::PushAndApply(OutputDevice&)
 vcl::Window::DrawGradientWallpaper(OutputDevice&, long, long, long, long, 
Wallpaper const&)
 vcl::Window::DrawSelectionBackground(Rectangle const&, unsigned short, bool, 
bool, bool, Color*)
-vcl::Window::GetRenderSettings()
 vcl::Window::SetDoubleBuffering(bool)
 vclcanvas::CanvasBitmapHelper::setData(com::sun::star::uno::Sequence const&, com::sun::star::rendering::IntegerBitmapLayout const&, 
com::sun::star::geometry::IntegerRectangle2D const&)
 vclcanvas::CanvasBitmapHelper::setPixel(com::sun::star::uno::Sequence const&, com::sun::star::rendering::IntegerBitmapLayout const&, 
com::sun::star::geometry::IntegerPoint2D const&)
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5fd6a82..a57fdb4 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -232,7 +232,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/outdev/textline \
 vcl/source/outdev/pixel \
 vcl/source/outdev/rect \
-vcl/source/outdev/rendersettings \
 vcl/source/outdev/line \
 vcl/source/outdev/polyline \
 vcl/source/outdev/hatch \
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 7d32977..ec459c7 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -50,7 +50,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -298,5 +297,6 @@
 #include 
 #include 
 #include 
+#include 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 061996d..cb5d7e6 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -24,7 +24,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index c8616ef..185fee4 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -17,12 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include "impanmvw.hxx"
+
 #include 
 #include 
 #include 
 
-#include "impanmvw.hxx"
+#include "window.h"
 
 ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut,
 const Point& rPt, const Size& rSz,
diff --git a/vcl/source/outdev/rendersettings.cxx 
b/vcl/source/outdev/rendersettings.cxx
deleted file mode 100644
index ab9d10d..000
--- a/vcl/source/outdev/rendersettings.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
-/* -*- 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 s

Re: Tinderbox failure, Android-ARM@24-Bytemark-Hosting, MASTER, last success: 2016-12-15 09:13:53

[Miklos Vajna]

Hi,

On Fri, Dec 16, 2016 at 02:47:44AM +, "lohmaier+libreoff...@googlemail.com" 
 wrote:
>   a7bd683  coverity#1397206 Resource leak
>   932719a  coverity#1397203 Dereference after null check
>   7a9d5485a  coverity#1397207 Dereference before null check
>   f74cad4  coverity#1397204 Dereference null return value
>   eb0e2da  coverity#1397200 Unchecked return value
>   0c56509  remove superfluous this->Init() call
>   6a33475  Resolves: tdf#103543 disable mass broadcasts from drawing objects' 
> changes
>   b954f14  prevent mutiple broadcasts during the series of changes on one 
> drawing object
>   ba53b2d  avoid dynamic_cast
>   4dae0f0  Updated core Project: help  
> 2234be96c0865090b2e1c47e5138f011b566512c
>   4c50797  tdf#104221: Make up for non-existent FillItemSet
>   426215c  tdf#75856 SwTwips: replace with unambiguous sal_Int32
>   690cf2a  no point in having both SAL_WARN and OSL_FAIL for the same thing
>   f080490  Typo
>   48e956e  Try to fix Android and iOS build
>   86a5537  Bump iOS version here, too
>   8e1730b3  We use ICU 58 now
>   3e97376  Build HarfBuzz with CoreText support also for iOS
>   5ed995f  No EGL on iOS either
>   3099953  Fix iOS (and --disable-scripting in general?) build
>   646b8b6  Makefile: try to get gbuild-to-ide running on the internal python3
>   a8b06ac  Updated core Project: help  
> 7d62908799da6b9ec1f4c2749fbbef9d7093effd
>   b035edf  Updated core Project: help  
> 612e430cec8a3298855f5642b4b589b74f7282ad
>   857e191  Updated core Project: help  
> 6b12e054bde038fae6a6ee03c52b3c6664ab4300
>   db2892b  Updated core Project: help  
> b57f991c21f157f79e12b18664972d51ab7f3fbc
>   08d6478  Updated core Project: help  
> ad3d97a39a7f420365ed0ae186981cad6a887da3
>   d266cb3  tdf#104621 framework: Redo commit 
> 84f2ff67a7e404febf710b1dc7f66d06745c503f
>   bd6723f  disable the 'two different log areas in the same file' loplugin 
> check
>   8ad521d  convert macro to member function
>   721116c  Phase out support for HAVE_BROKEN_STATIC_INITIALIZER_LIST
>   ef4b903  tdf#103514: Try harder to ignore non-SFNT fonts
>   4843705  fix collision
>   043c188  hunspell defines this for some time now
>   64362ec  fix build with hunspell < 1.5
>   5bd30fe  fix svxlo-ColorListBox->svxcorelo-SvxColorListBox glade catalog
>   f2fae36  build our own fontconfig and freetype under oss-fuzz
>   7f9a389  if building against system hunspell < 1.5.4 > 1.4.0
>   a7c3572  xmlsecurity: hold XMLDocumentWrapper by rtl::Reference in 
> XSecController

This last commit is mine, that caused the initial breakage. Tor fixed
the problem in 48e956e506b056eefcbf5c24a706b6152e7ea8b3. Any idea which
of the above commits introduced this:

> [build ECH] CustomTarget/postprocess/registry/writer.list
> [build ECH] CustomTarget/postprocess/registry/xsltfilter.list
> [build ECH] CustomTarget/postprocess/registry/Langpack-en-US.list
> /bin/cp: cannot stat 
> '/home/android/lo/master-android-arm/workdir/CustomTarget/postprocess/images/images_tango.zip':
>  No such file or directory
> make[1]: *** 
> [/home/android/lo/master-android-arm/instdir/share/config/images_tango.zip] 
> Error 1

In the meantime?

Thanks,

Miklos


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

Re: OpenCL enabled by default after OS reinstall causing Unit Test Failure

[Miklos Vajna]

Hi,

On Thu, Dec 15, 2016 at 11:57:43AM -0700, slacka  wrote:
> If someone wants to dig deeper, I’d be glad to run special debug builds like
> I did for Ashod’s failing Unit tests.
> 
> Or, should we just blacklist my driver? What info do you need for that?

See officecfg/registry/schema/org/openoffice/Office/Common.xcs, search
for OpenCLBlackList. You need to add driver info there to blacklist an
OpenCL driver, I think.

Regards,

Miklos


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

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

[Caolán McNamara]

 sw/source/core/doc/docdesc.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9f8e640e782f1a76f232f1dae8c19196a9cd5850
Author: Caolán McNamara 
Date:   Thu Dec 15 21:00:23 2016 +

these are SwTwips, currently INVALID_TWIPS == LONG_MAX, so use INVALID_TWIPS

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

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 43bf4c7..5472e05 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -882,10 +882,10 @@ void SwDoc::CheckDefaultPageFormat()
 const SwFormatFrameSize& rMasterSize  = rMaster.GetFrameSize();
 const SwFormatFrameSize& rLeftSize= rLeft.GetFrameSize();
 
-const bool bSetSize = LONG_MAX == rMasterSize.GetWidth() ||
-  LONG_MAX == rMasterSize.GetHeight() ||
-  LONG_MAX == rLeftSize.GetWidth() ||
-  LONG_MAX == rLeftSize.GetHeight();
+const bool bSetSize = INVALID_TWIPS == rMasterSize.GetWidth() ||
+  INVALID_TWIPS == rMasterSize.GetHeight() ||
+  INVALID_TWIPS == rLeftSize.GetWidth() ||
+  INVALID_TWIPS == rLeftSize.GetHeight();
 
 if ( bSetSize )
 lcl_DefaultPageFormat( rDesc.GetPoolFormatId(), rDesc.GetMaster(), 
rDesc.GetLeft(), rDesc.GetFirstMaster(), rDesc.GetFirstLeft() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - starmath/qa starmath/source

[Gulsah Kose]

 starmath/qa/cppunit/test_nodetotextvisitors.cxx |3 +++
 starmath/source/parse.cxx   |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0d0507ad622516fdc03d994ba3136cebd058a301
Author: Gulsah Kose 
Date:   Mon Sep 26 17:58:43 2016 +0300

tdf#97164 Add text for visualition of percent symbol.

Change-Id: I31dc1a7a4ed0bc0e760e10c1a2ff52660a258e12
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/29299
Reviewed-by: Takeshi Abe 
Tested-by: Takeshi Abe 
(cherry picked from commit 8e466c431e6d61911b2b15895a4b63df12422057)
Reviewed-on: https://gerrit.libreoffice.org/31976
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx 
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index ffa3f59..d97d59f 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -661,6 +661,9 @@ void Test::testMiscEquivalent()
 
 // tdf#88320
 ParseAndCompare("A_1,B_2", "A_{1},B_2", "Comma between a digit and 
non-digit delimits subscript");
+
+//tdf#97164
+ParseAndCompare("100 %", "100\"%\"", "Percent symbol at the end");
 }
 
 void Test::testParser()
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 591404a..06562a5 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -654,7 +654,7 @@ void SmParser::NextToken()
 m_aCurToken.cMathChar  = '\0';
 m_aCurToken.nGroup = TG::NONE;
 m_aCurToken.nLevel = 5;
-m_aCurToken.aText.clear();
+m_aCurToken.aText  ="%";
 m_aCurToken.nRow   = m_Row;
 m_aCurToken.nCol   = nTmpStart - m_nColOff;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/source/filter/ww8/docxattributeoutput.cxx |2 --
 sw/source/filter/ww8/docxexport.cxx  |6 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 644bddc80a6c4d3bec2f32d6dcbbc0f450582511
Author: Mike Kaganski 
Date:   Tue Dec 13 10:05:04 2016 +0300

tdf#99227 follow-up: synchronize setting serializers

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

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2324039..084247e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4269,8 +4269,6 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 CharGrabBag(*pGrabBag);
 }
 
-//  tdf#99227: to be sure that we write to the right stream
-m_rExport.SdrExporter().setSerializer(m_pSerializer);
 m_rExport.SdrExporter().startDMLAnchorInline(pFrameFormat, rSize);
 
 // picture description (used for pic:cNvPr later too)
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 5f41a53..00bbb83 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -603,11 +603,14 @@ void DocxExport::WriteFootnotesEndnotes()
 
 // switch the serializer to redirect the output to word/footnotes.xml
 m_pAttrOutput->SetSerializer( pFootnotesFS );
+// tdf#99227
+m_pSdrExport->setSerializer( pFootnotesFS );
 
 // do the work
 m_pAttrOutput->FootnotesEndnotes( true );
 
 // switch the serializer back
+m_pSdrExport->setSerializer( m_pDocumentFS );
 m_pAttrOutput->SetSerializer( m_pDocumentFS );
 }
 
@@ -624,11 +627,14 @@ void DocxExport::WriteFootnotesEndnotes()
 
 // switch the serializer to redirect the output to word/endnotes.xml
 m_pAttrOutput->SetSerializer( pEndnotesFS );
+// tdf#99227
+m_pSdrExport->setSerializer( pEndnotesFS );
 
 // do the work
 m_pAttrOutput->FootnotesEndnotes( false );
 
 // switch the serializer back
+m_pSdrExport->setSerializer( m_pDocumentFS );
 m_pAttrOutput->SetSerializer( m_pDocumentFS );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[Stephan Bergmann]

 Makefile.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 657bca91b115b380af16c13e5ca5d6a0f0f4a562
Author: Stephan Bergmann 
Date:   Fri Dec 16 10:09:45 2016 +0100

Make 'make CompilerTest_compilerplugins_clang' work

Change-Id: I0a43bff9c87254d16ade84f3da2ff380250ebd9c

diff --git a/Makefile.in b/Makefile.in
index 9b04965..3a8b838 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -113,6 +113,7 @@ gbuild_TARGETS := AllLangHelp \
CliLibrary \
CliNativeLibrary \
CliUnoApi \
+   CompilerTest \
Configuration \
CppunitTest \
CustomTarget \
___
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' - cui/source

[Caolán McNamara]

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

New commits:
commit e88cd210690b9d14101d5800bbbf8422a9e12d3e
Author: Caolán McNamara 
Date:   Thu Dec 15 21:17:58 2016 +

coverity#1397204 Dereference null return value

Change-Id: Ief4b455b316b55ebf012a8650c96da037df0135c
(cherry picked from commit f74cad45681cc0ea5706a112a0e17f14a3197e39)

diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5990721..511c3c8 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -222,7 +222,7 @@ static void lcl_SetCheckButton( SvTreeListEntry* pEntry, 
bool bCheck )
 SvLBoxButton* pItem = 
static_cast(pEntry->GetFirstItem(SvLBoxItemType::Button));
 
 DBG_ASSERT(pItem,"SetCheckButton:Item not found");
-if (pItem->GetType() == SvLBoxItemType::Button)
+if (pItem && pItem->GetType() == SvLBoxItemType::Button)
 {
 if (bCheck)
 pItem->SetStateChecked();
___
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' - sw/source

[Caolán McNamara]

 sw/source/core/draw/dcontact.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f4b7650ecd46e5404b35dccfb8b7d3b0a385d633
Author: Caolán McNamara 
Date:   Thu Dec 15 21:21:38 2016 +

coverity#1397207 Dereference before null check

Change-Id: I2578d59e98a2b1b040d9284b0ad0f68fd331d0df
(cherry picked from commit 7a9d5485a815af26c63790e3165477c68e164117)

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index ded98a2..a62d9a4 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -415,9 +415,9 @@ const SwAnchoredObject* SwFlyDrawContact::GetAnchoredObj( 
const SdrObject* _pSdr
 
 const SwAnchoredObject* pRetAnchoredObj = nullptr;
 
-if ( _pSdrObj && dynamic_cast( _pSdrObj) !=  
nullptr )
+if (const SwVirtFlyDrawObj* pFlyDrawObj = dynamic_cast(_pSdrObj))
 {
-pRetAnchoredObj = static_cast(_pSdrObj)->GetFlyFrame();
+pRetAnchoredObj = pFlyDrawObj->GetFlyFrame();
 }
 
 return pRetAnchoredObj;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 editeng/source/accessibility/AccessibleContextBase.cxx |6 --
 svx/source/accessibility/AccessibleShape.cxx   |   38 +++--
 sw/source/core/view/viewimp.cxx|   12 -
 3 files changed, 18 insertions(+), 38 deletions(-)

New commits:
commit 9ada2da6f1bceb5d24f23d8df08103535714918a
Author: Michael Stahl 
Date:   Thu Dec 15 23:08:53 2016 +0100

tdf#104488 sw: assert if exception escapes from UpdateAccessible()

SwViewShellImp::UpdateAccessible() is called during scrolling and the
like, and if the a11y code doesn't catch the exceptions the document
view won't get repainted.

Change-Id: I4ec591aacf514bef8c5a66a7e674b0cee3b7201a

diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index e403be9..335f45a 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -297,7 +297,17 @@ void SwViewShellImp::UpdateAccessible()
 OSL_ENSURE( pWin, "no window, no access" );
 
 if( IsAccessible() && rIDLA.GetCurrentViewShell() && pWin )
-GetAccessibleMap().GetDocumentView();
+{
+try
+{
+GetAccessibleMap().GetDocumentView();
+}
+catch (uno::Exception const& e)
+{
+SAL_WARN("sw.a11y", "exception: " << e.Message);
+assert(!"SwViewShellImp::UpdateAccessible: unhandled exception");
+}
+}
 }
 
 void SwViewShellImp::DisposeAccessible(const SwFrame *pFrame,
commit ffb5bf421f5c0c565128116df40318f5b707b821
Author: Michael Stahl 
Date:   Thu Dec 15 23:00:25 2016 +0100

svx: remove nonsense exception throwing code

Commit 60f11adb950e4f9645cc9ecb0f5af8235cc97366 added code to
AccessibleShape::getAccessibleStateSet() that tries to retrieve some
state from the parent, but the implementation of the base class
AccessibleContextBase::getAccessibleParent() throws if it is already
disposed, which is the condition checked just before, so surely
this doesn't have any other effect than throw DisposedException,
except possibly in the mpText == null case which is already
handled in the other branch with identical code.

Change-Id: Iaf109f69036437989abbbf914ef32cca1528a97e

diff --git a/svx/source/accessibility/AccessibleShape.cxx 
b/svx/source/accessibility/AccessibleShape.cxx
index b7a23a8..8df4e04 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -410,38 +410,10 @@ uno::Reference SAL_CALL
 ::osl::MutexGuard aGuard (maMutex);
 Reference xStateSet;
 
-if (rBHelper.bDisposed || mpText == nullptr)
-// Return a minimal state set that only contains the DEFUNC state.
+if (IsDisposed())
 {
+// Return a minimal state set that only contains the DEFUNC state.
 xStateSet = AccessibleContextBase::getAccessibleStateSet ();
-::utl::AccessibleStateSetHelper* pStateSet =
-  static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
-css::uno::Reference xTempAcc = getAccessibleParent();
-if( xTempAcc.is() )
-{
-css::uno::Reference
-xTempAccContext = 
xTempAcc->getAccessibleContext();
-if( xTempAccContext.is() )
-{
-css::uno::Reference rState =
-xTempAccContext->getAccessibleStateSet();
-if( rState.is() )   {
-css::uno::Sequence aStates = rState->getStates();
-int count = aStates.getLength();
-for( int iIndex = 0;iIndex < count;iIndex++ )
-{
-if( aStates[iIndex] == AccessibleStateType::EDITABLE )
-{
-pStateSet->AddState 
(AccessibleStateType::EDITABLE);
-pStateSet->AddState 
(AccessibleStateType::RESIZABLE);
-pStateSet->AddState 
(AccessibleStateType::MOVEABLE);
-break;
-}
-}
-}
-}
-}
-xStateSet.set( new ::utl::AccessibleStateSetHelper (*pStateSet));
 }
 else
 {
commit 5a3b272f106378cbf78aba0fde1db3642275
Author: Michael Stahl 
Date:   Thu Dec 15 22:46:08 2016 +0100

tdf#104488 editeng,svx: throw less Accessible exceptions

For some of these functions it doesn't make sense to throw
DisposedException as they can return a sensible default value.

Particularly AccessibleShape::getAccessibleChildCount() was throwing an
exception that was never caught.

Change-Id: I000149cf9bb0fd13f69650ad8224a8daf26f7bee

diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx 
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 57d9f36..1b92baa 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng

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

[Bjoern Michaelsen]

On Fri, Nov 25, 2016 at 12:02:03PM +0100, Michael Stahl wrote:
> since the goal of the policy is  "we can make incompatible changes
> whenever it doesn't affect any 3rd party extension or macro", the
> "published" tag is much less useful as guidance than it may appear at
> first glance.

So, uhmm, if the current/old use of "published" doesnt service core developers
and doesnt serve UNO users, maybe we should consider making it useful? A
radical step would be to remove the "published" tag everywhere (as we allow
ourselves API changes anywhere already) and then carefully readd them in areas
where we are reasonably sure we dont have to break the API again soon.

Best,

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

[Libreoffice-commits] cppunit.git: 4 commits - examples/cppunittest examples/hierarchy examples/money examples/simple include/cppunit src/cppunit src/CppUnitLibraries.dsw src/DllPlugInTester src/msvc6

[David Tardon]

 examples/cppunittest/Makefile.am|2 
 examples/hierarchy/Makefile.am  |2 
 examples/money/Makefile.am  |2 
 examples/simple/Makefile.am |2 
 include/cppunit/TestAssert.h|2 
 include/cppunit/TestCaller.h|4 
 include/cppunit/extensions/ExceptionTestCaseDecorator.h |2 
 include/cppunit/portability/Makefile.am |2 
 src/CppUnitLibraries.dsw|  104 -
 src/DllPlugInTester/DllPlugInTester.dsp |  269 --
 src/DllPlugInTester/DllPlugInTester.vcproj  |  718 --
 src/DllPlugInTester/DllPlugInTesterTest.dsp |  181 -
 src/DllPlugInTester/DllPlugInTesterTest.vcproj  |  339 ---
 src/DllPlugInTester/Makefile.am |2 
 src/cppunit/DefaultProtector.cpp|2 
 src/cppunit/Makefile.am |2 
 src/cppunit/TestCase.cpp|2 
 src/cppunit/cppunit.dsp |  687 --
 src/cppunit/cppunit.vcproj  | 1643 ---
 src/cppunit/cppunit_dll.dsp |  662 --
 src/cppunit/cppunit_dll.vcproj  | 1652 
 src/msvc6/DSPlugIn/DSPlugIn.dsp |  606 -
 src/msvc6/DllPlugInTester/DllPlugInTester.dsp   |  150 -
 src/msvc6/testpluginrunner/TestPlugInRunner.dsp |  473 
 src/msvc6/testpluginrunner/TestPlugInRunner.vcproj  | 1114 --
 src/msvc6/testrunner/TestRunner.dsp |  458 
 src/msvc6/testrunner/TestRunner.vcproj  | 1597 ---
 src/qttestrunner/qttestrunner.vcproj|  388 ---
 src/qttestrunner/qttestrunner_dll.vcproj|  415 
 29 files changed, 13 insertions(+), 11469 deletions(-)

New commits:
commit fcc0062e64edff6a64fb6d0ce9d8695b6373d1f2
Author: David Tardon 
Date:   Fri Dec 16 10:24:44 2016 +0100

AM_CPPFLAGS is preferred by "newer" versions of automake

diff --git a/examples/cppunittest/Makefile.am b/examples/cppunittest/Makefile.am
index 4b93173..0ac94cf 100644
--- a/examples/cppunittest/Makefile.am
+++ b/examples/cppunittest/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST = CppUnitTestMain.dsw CppUnitTestMain.dsp 
CppUnitTestPlugIn.dsp CppUn
 TESTS = cppunittestmain
 check_PROGRAMS = $(TESTS)
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 cppunittestmain_SOURCES = \
assertion_traitsTest.cpp \
diff --git a/examples/hierarchy/Makefile.am b/examples/hierarchy/Makefile.am
index 5c2f169..59ef870 100644
--- a/examples/hierarchy/Makefile.am
+++ b/examples/hierarchy/Makefile.am
@@ -5,7 +5,7 @@ XFAIL_TESTS = hierarchy
 
 check_PROGRAMS = $(TESTS)
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 hierarchy_SOURCES = BoardGame.cpp \
Chess.cpp \
diff --git a/examples/money/Makefile.am b/examples/money/Makefile.am
index 3fe56c0..e55e9c3 100644
--- a/examples/money/Makefile.am
+++ b/examples/money/Makefile.am
@@ -1,7 +1,7 @@
 # Include cookbook.html in distro
 EXTRA_DIST = money.dsp money.dsw configure.in StdAfx.cpp
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 TESTS = MoneyApp
 check_PROGRAMS = $(TESTS)
diff --git a/examples/simple/Makefile.am b/examples/simple/Makefile.am
index 82f033f..ca39316 100644
--- a/examples/simple/Makefile.am
+++ b/examples/simple/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = simple.dsp simple_plugin.dsp SimplePlugIn.cpp
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 noinst_PROGRAMS = simple
 
diff --git a/src/DllPlugInTester/Makefile.am b/src/DllPlugInTester/Makefile.am
index 8322956..7586d97 100644
--- a/src/DllPlugInTester/Makefile.am
+++ b/src/DllPlugInTester/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = DllPlugInTester.dsp DllPlugInTesterTest.dsp
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 bin_PROGRAMS = DllPlugInTester
 
diff --git a/src/cppunit/Makefile.am b/src/cppunit/Makefile.am
index 15cc24d..7be8b4f 100644
--- a/src/cppunit/Makefile.am
+++ b/src/cppunit/Makefile.am
@@ -3,7 +3,7 @@
 #
 
 EXTRA_DIST = cppunit.dsp cppunit_dll.dsp DllMain.cpp
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libcppunit.la
 
commit 967fc7e4bd88914b7555177864a5949b9717f233
Author: David Tardon 
Date:   Fri Dec 16 10:22:02 2016 +0100

er

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/5c73299cdb5f3f2c87c0c87a826e27211e7338ee/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 editeng/source/accessibility/AccessibleContextBase.cxx |9 -
 include/editeng/AccessibleContextBase.hxx  |6 --
 2 files changed, 15 deletions(-)

New commits:
commit 10bf49c18d56f198e63514953a1c6e2ea17fcc9c
Author: Stephan Bergmann 
Date:   Fri Dec 16 10:37:26 2016 +0100

loplugin:unnecessaryoverride

Change-Id: I24a0e495b64a1db8b7c45f3c68e06ad3301bd9c4

diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx 
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 1b92baa..7b80e9c 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -437,15 +437,6 @@ uno::Sequence< OUString > SAL_CALL
 
 // XTypeProvider
 
-uno::Sequence< css::uno::Type>
-AccessibleContextBase::getTypes()
-throw (css::uno::RuntimeException, std::exception)
-{
-// This class supports no interfaces on its own.  Just return those
-// supported by the base class.
-return WeakComponentImplHelper::getTypes();
-}
-
 uno::Sequence SAL_CALL
 AccessibleContextBase::getImplementationId()
 throw (css::uno::RuntimeException, std::exception)
diff --git a/include/editeng/AccessibleContextBase.hxx 
b/include/editeng/AccessibleContextBase.hxx
index dc0c19a..24bb87e 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -266,12 +266,6 @@ public:
 
 //=  XTypeProvider  ===
 
-/** Returns a sequence of all supported interfaces.
-*/
-virtual css::uno::Sequence< css::uno::Type> SAL_CALL
-getTypes()
-throw (css::uno::RuntimeException, std::exception) override;
-
 /** Returns a implementation id.
 */
 virtual css::uno::Sequence SAL_CALL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

On 12/16/2016 10:28 AM, Bjoern Michaelsen wrote:

On Fri, Nov 25, 2016 at 12:02:03PM +0100, Michael Stahl wrote:

since the goal of the policy is  "we can make incompatible changes
whenever it doesn't affect any 3rd party extension or macro", the
"published" tag is much less useful as guidance than it may appear at
first glance.


So, uhmm, if the current/old use of "published" doesnt service core developers
and doesnt serve UNO users, maybe we should consider making it useful? A
radical step would be to remove the "published" tag everywhere (as we allow
ourselves API changes anywhere already) and then carefully readd them in areas
where we are reasonably sure we dont have to break the API again soon.


Which wouldn't change anything, except for some back-and-forth on the 
published-ness status.  Published entities /will/ be changed, for 
carefully weighed reasons.  And still, IMO, the published-ness of an 
entity is a useful rough estimate of the entity's likeliness of change 
(for clients) resp. of the acceptability of doing a change (for us as 
producer).

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

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

[Caolán McNamara]

 sw/inc/hints.hxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit dbbfb3766519a61eba1cd00066a363069e0884aa
Author: Caolán McNamara 
Date:   Fri Dec 16 09:05:19 2016 +

SwDocPosUpdate definition uses SwTwips while decl is long

Change-Id: I0873ac53a328dbd1b27851f65503fa0b99297fea

diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index d3e7d14..ce7c644 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_INC_HINTS_HXX
 
 #include 
+#include 
 #include 
 #include 
 
@@ -147,8 +148,8 @@ public:
 class SwDocPosUpdate : public SwMsgPoolItem
 {
 public:
-const long nDocPos;
-SwDocPosUpdate( const long nDocPos );
+const SwTwips nDocPos;
+SwDocPosUpdate( const SwTwips nDocPos );
 };
 
 /// SwTableFormulaUpdate is sent when the table has to be newly calculated or 
when a table itself is merged or splitted
___
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.1' - desktop/CppunitTest_desktop_app.mk desktop/Module_desktop.mk desktop/qa desktop/source

[Mike Kaganski]

 desktop/CppunitTest_desktop_app.mk  |   28 +++
 desktop/Module_desktop.mk   |1 
 desktop/qa/desktop_app/test_desktop_app.cxx |  101 
 desktop/source/app/cmdlineargs.cxx  |   84 +++
 desktop/source/app/cmdlineargs.hxx  |   13 +--
 5 files changed, 220 insertions(+), 7 deletions(-)

New commits:
commit 8c0743c21156d39384ffcb49fd92144eb22e71e8
Author: Mike Kaganski 
Date:   Mon Jul 11 06:38:50 2016 +1000

tdf#100837: Support Office URI Schemes

This patch adds support for Office URI Schemes (see
https://msdn.microsoft.com/en-us/library/dn906146).
This will enable browser (non-CMIS) integration of LibreOffice
with MS SharePoint server (v.2013 tested).

In this patch, in addition to ms-* schemes, a new scheme is
introduced: vnd.libreoffice.command, which is analogous to ms-*.
Its purpose is to enable flexible configuration of server and
client, where some types of documents are declared as handled by
LibreOffice, and other are handled by other software. E.g., ODTs
may have "vnd.libreoffice.command" scheme, while DOCXs could be
"ms-word". Client may register LibreOffice to handle both, or to
handle only "vnd.libreoffice.command" scheme.

Unit test included.

TODO in a later patch: add a mechanism to register LibreOffice
to the schemes with OS.

Change-Id: I1c449a211102036f87163058a4c90a93eb32c948
Reviewed-on: https://gerrit.libreoffice.org/27094
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins 
Reviewed-on: https://gerrit.libreoffice.org/32007
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/desktop/CppunitTest_desktop_app.mk 
b/desktop/CppunitTest_desktop_app.mk
new file mode 100644
index 000..1275b6e
--- /dev/null
+++ b/desktop/CppunitTest_desktop_app.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,desktop_app))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,desktop_app, \
+desktop/qa/desktop_app/test_desktop_app \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,desktop_app, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+sofficeapp \
+))
+
+$(eval $(call gb_CppunitTest_use_external,desktop_app,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,desktop_app))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index d74d406..50ec774 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -127,6 +127,7 @@ $(eval $(call gb_Module_add_targets,desktop, \
 endif
 
 $(eval $(call gb_Module_add_check_targets,desktop, \
+CppunitTest_desktop_app \
 CppunitTest_desktop_version \
 ))
 
diff --git a/desktop/qa/desktop_app/test_desktop_app.cxx 
b/desktop/qa/desktop_app/test_desktop_app.cxx
new file mode 100644
index 000..c800b2c
--- /dev/null
+++ b/desktop/qa/desktop_app/test_desktop_app.cxx
@@ -0,0 +1,101 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include 
+#include 
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "../../source/app/cmdlineargs.hxx"
+
+namespace {
+
+class Test: public ::CppUnit::TestFixture {
+public:
+void testTdf100837();
+
+CPPUNIT_TEST_SUITE(Test);
+CPPUNIT_TEST(testTdf100837);
+CPPUNIT_TEST_SUITE_END();
+};
+
+class TestSupplier : public desktop::CommandLineArgs::Supplier {
+public:
+virtual ~TestSupplier() {}
+virtual boost::optional< OUString > getCwdUrl() override { return 
boost::optional< OUString >(); }
+virtual bool next(OUString * argum

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/source

[Mike Kaganski]

 desktop/source/app/cmdlineargs.cxx |  265 -
 desktop/source/app/cmdlinehelp.cxx |2 
 2 files changed, 89 insertions(+), 178 deletions(-)

New commits:
commit c33e089691a4185a2571c31e1a9b10ef837f3b81
Author: Mike Kaganski 
Date:   Tue Jul 19 20:03:01 2016 +1000

Restructure CommandLineArgs::ParseCommandLine_Impl

CommandLineArgs::ParseCommandLine_Impl is restructured to remove
multiple redundant booleans and make its structure more clear.
Command line "events" (that specify following filenames treatment)
are grouped to an enum. (NB: "events" is not invented by me, this
is currently used term).

Normalized treatment of --display param: now it is always ignored.
Previously, if it happened to be a known switch like --writer, it
handled as it's not after --display.

Immediate parameters to switches --pt, --convert-to, --outdir,
--printer-name are now treated likewise. They are treated as
corresponding values, even if they happen to be known switches.

--language (without "=") is no more a recognized switch. Before
this it skipped all filenames until next file management switch.

After this gets approved, TODO is to tweak Office URIs to take
current event into account: e.g., to print opened file if it's
after -p.

Change-Id: Ic2f3980548f8906f695d297dc6677bd2cbd19c5b
Reviewed-on: https://gerrit.libreoffice.org/27316
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/32011
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index 3f6a017..881062f 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -205,22 +205,9 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& 
supplier )
 {
 m_cwdUrl = supplier.getCwdUrl();
 
-// parse command line arguments
-bool bOpenEvent(true);
-bool bPrintEvent(false);
-bool bViewEvent(false);
-bool bStartEvent(false);
-bool bPrintToEvent(false);
-bool bPrinterName(false);
-bool bForceOpenEvent(false);
-bool bForceNewEvent(false);
-bool bDisplaySpec(false);
-bool bOpenDoc(false);
-bool bConversionEvent(false);
-bool bConversionParamsEvent(false);
-bool bBatchPrintEvent(false);
-bool bBatchPrinterNameEvent(false);
-bool bConversionOutEvent(false);
+enum class CommandLineEvent { Open, Print, View, Start, PrintTo,
+  ForceOpen, ForceNew, Conversion, BatchPrint 
};
+CommandLineEvent eCurrentEvent = CommandLineEvent::Open;
 
 for (;;)
 {
@@ -267,8 +254,8 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& 
supplier )
 {
 m_textcat = true;
 m_conversionparams = "txt:Text";
-bOpenEvent = false;
-bConversionEvent = true;
+eCurrentEvent = CommandLineEvent::Conversion;
+setHeadless();
 }
 else if ( oArg == "quickstart" )
 {
@@ -341,8 +328,8 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& 
supplier )
 
 // We specifically need to consume the following 2 arguments
 // for --protector
-assert( supplier.next( &aArg ) );
-assert( supplier.next( &aArg ) );
+if ((!supplier.next(&aArg) || !supplier.next(&aArg)) && 
m_unknown.isEmpty())
+m_unknown = "--protector must be followed by two 
arguments";
 }
 else if ( oArg == "version" )
 {
@@ -442,120 +429,80 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& 
supplier )
 else if ( aArg == "-n" )
 {
 // force new documents based on the following documents
-bForceNewEvent  = true;
-bOpenEvent  = false;
-bForceOpenEvent = false;
-bPrintToEvent   = false;
-bPrintEvent = false;
-bViewEvent  = false;
-bStartEvent = false;
-bDisplaySpec= false;
+eCurrentEvent = CommandLineEvent::ForceNew;
 }
 else if ( aArg == "-o" )
 {
 // force open documents regardless if they are templates or not
-bForceOpenEvent = true;
-bOpenEvent  = false;
-bForceNewEvent  = false;
-bPrintToEvent   = false;
-bPrintEvent = false;
-bViewEvent  = false;
-bStartEvent = false;
-bDisplaySpec= false;
+eCurrentEvent = CommandLineEvent::ForceOpen;
 }
 else if ( oArg == "pt" )
 {
 // Print to special p

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/qa desktop/source

[Mike Kaganski]

 desktop/qa/desktop_app/test_desktop_app.cxx |   56 +++---
 desktop/source/app/cmdlineargs.cxx  |  147 
 2 files changed, 105 insertions(+), 98 deletions(-)

New commits:
commit 9d06b0baf7e618fe11539c6713c506460320a3ef
Author: Mike Kaganski 
Date:   Thu Jul 28 21:41:11 2016 +1000

tdf#100837: honor LibreOffice command line arguments for Office URIs

This patch allows modifying open mode set in Office URI by using
LibreOffice usual command line arguments. For instance, if there is
-p "ofe:...", then the file won't be open for editing, but instead
will be printed.

Change-Id: I4bde9b6e1c0e92b63ee3834ee1fd8f6e1bd321f2
Reviewed-on: https://gerrit.libreoffice.org/27629
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/32013
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/desktop/qa/desktop_app/test_desktop_app.cxx 
b/desktop/qa/desktop_app/test_desktop_app.cxx
index c800b2c..9d8225e 100644
--- a/desktop/qa/desktop_app/test_desktop_app.cxx
+++ b/desktop/qa/desktop_app/test_desktop_app.cxx
@@ -47,6 +47,7 @@ public:
 
 class TestSupplier : public desktop::CommandLineArgs::Supplier {
 public:
+TestSupplier(std::initializer_list args) : m_args(args) {}
 virtual ~TestSupplier() {}
 virtual boost::optional< OUString > getCwdUrl() override { return 
boost::optional< OUString >(); }
 virtual bool next(OUString * argument) override {
@@ -59,7 +60,6 @@ public:
 return false;
 }
 }
-TestSupplier& operator << (const OUString& arg) { m_args.push_back(arg); 
return *this; }
 private:
 std::vector< OUString > m_args;
 std::vector< OUString >::size_type m_index = 0;
@@ -73,23 +73,43 @@ void Test::testTdf100837() {
 // Without this we're crashing because callees are using 
getProcessServiceFactory
 ::comphelper::setProcessServiceFactory(xSM);
 
-TestSupplier supplier;
-supplier << "--view" << "foo" << "ms-word:ofe|u|bar1" << 
"ms-word:ofv|u|bar2" << "ms-word:nft|u|bar3" << "baz";
-desktop::CommandLineArgs args(supplier);
-auto vViewList = args.GetViewList();
-auto vForceOpenList = args.GetForceOpenList();
-auto vForceNewList = args.GetForceNewList();
-// 3 documents go to View list: foo; bar2; baz
-CPPUNIT_ASSERT_EQUAL(decltype(vViewList.size())(3), vViewList.size());
-CPPUNIT_ASSERT_EQUAL(OUString("foo"),  vViewList[0]);
-CPPUNIT_ASSERT_EQUAL(OUString("bar2"), vViewList[1]);
-CPPUNIT_ASSERT_EQUAL(OUString("baz"),  vViewList[2]);
-// 1 document goes to ForceOpen list: bar1
-CPPUNIT_ASSERT_EQUAL(decltype(vForceOpenList.size())(1), 
vForceOpenList.size());
-CPPUNIT_ASSERT_EQUAL(OUString("bar1"), vForceOpenList[0]);
-// 1 document goes to ForceNew list: bar3
-CPPUNIT_ASSERT_EQUAL(decltype(vForceNewList.size())(1), 
vForceNewList.size());
-CPPUNIT_ASSERT_EQUAL(OUString("bar3"), vForceNewList[0]);
+{
+// 1. Test default behaviour: Office URIs define open mode
+TestSupplier supplier{ "foo", "ms-word:ofe|u|bar1", 
"ms-word:ofv|u|bar2", "ms-word:nft|u|bar3", "baz" };
+desktop::CommandLineArgs args(supplier);
+auto vOpenList  = args.GetOpenList();
+auto vForceOpenList = args.GetForceOpenList();
+auto vViewList  = args.GetViewList();
+auto vForceNewList  = args.GetForceNewList();
+// 2 documents go to Open list: foo; baz
+CPPUNIT_ASSERT_EQUAL(decltype(vOpenList.size())(2), vOpenList.size());
+CPPUNIT_ASSERT_EQUAL(OUString("foo"), vOpenList[0]);
+CPPUNIT_ASSERT_EQUAL(OUString("baz"), vOpenList[1]);
+// 1 document goes to ForceOpen list: bar1
+CPPUNIT_ASSERT_EQUAL(decltype(vForceOpenList.size())(1), 
vForceOpenList.size());
+CPPUNIT_ASSERT_EQUAL(OUString("bar1"), vForceOpenList[0]);
+// 1 document goes to View list: bar2
+CPPUNIT_ASSERT_EQUAL(decltype(vViewList.size())(1), vViewList.size());
+CPPUNIT_ASSERT_EQUAL(OUString("bar2"), vViewList[0]);
+// 1 document goes to ForceNew list: bar3
+CPPUNIT_ASSERT_EQUAL(decltype(vForceNewList.size())(1), 
vForceNewList.size());
+CPPUNIT_ASSERT_EQUAL(OUString("bar3"), vForceNewList[0]);
+}
+
+{
+// 2. Test explicit open mode arguments. Office URI commands should 
have no effect
+TestSupplier supplier{ "--view", "ms-word:ofe|u|foo", "-o", 
"ms-word:ofv|u|bar", "ms-word:nft|u|baz" };
+desktop::CommandLineArgs args(supplier);
+auto vViewList  = args.GetViewList();
+auto vForceOpenList = args.GetForceOpenList();
+// 1 document goes to View list: foo
+CPPUNIT_ASSERT_EQUAL(decltype(vViewList.size())(1), vViewList.size());
+CPPUNIT_ASSERT_EQUAL(OUString("foo"), vViewList[0]);
+// 2 documents go to ForceOpen list: bar, baz
+CPPUNIT_ASSERT_EQUAL(decltype(vForceOpenList.size

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

[Pranav Kant]

 wsd/LOOLWebSocket.hpp |   31 +++
 1 file changed, 31 insertions(+)

New commits:
commit b26969b98ca13adb75271871d1663b72807c69e3
Author: Pranav Kant 
Date:   Fri Dec 16 12:52:23 2016 +0530

wsd: set minimum socket buffer size in debug mode

Change-Id: Ieae9721d45ade34c5ce9773867ab1ab997a344dc
Reviewed-on: https://gerrit.libreoffice.org/32071
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/wsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp
index 28d74ae..6c83b1a 100644
--- a/wsd/LOOLWebSocket.hpp
+++ b/wsd/LOOLWebSocket.hpp
@@ -51,6 +51,13 @@ private:
 }
 #endif
 
+void setMinSocketBufferSize()
+{
+// Lets set it to zero as system will automatically adjust it to 
minimum
+setSendBufferSize(0);
+LOG_INF("Send buffer size for web socket set to minimum: " << 
getSendBufferSize());
+}
+
 public:
 LOOLWebSocket(const Socket& socket) :
 Poco::Net::WebSocket(socket)
@@ -61,6 +68,14 @@ public:
   Poco::Net::HTTPServerResponse& response) :
 Poco::Net::WebSocket(request, response)
 {
+#if ENABLE_DEBUG
+setMinSocketBufferSize();
+#else
+if (UnitWSD::isUnitTesting())
+{
+setMinSocketBufferSize();
+}
+#endif
 }
 
 LOOLWebSocket(Poco::Net::HTTPClientSession& cs,
@@ -68,6 +83,14 @@ public:
   Poco::Net::HTTPResponse& response) :
 Poco::Net::WebSocket(cs, request, response)
 {
+#if ENABLE_DEBUG
+setMinSocketBufferSize();
+#else
+if (UnitWSD::isUnitTesting())
+{
+setMinSocketBufferSize();
+}
+#endif
 }
 
 LOOLWebSocket(Poco::Net::HTTPClientSession& cs,
@@ -76,6 +99,14 @@ public:
   Poco::Net::HTTPCredentials& credentials) :
 Poco::Net::WebSocket(cs, request, response, credentials)
 {
+#if ENABLE_DEBUG
+setMinSocketBufferSize();
+#else
+if (UnitWSD::isUnitTesting())
+{
+setMinSocketBufferSize();
+}
+#endif
 }
 
 /// Wrapper for Poco::Net::WebSocket::receiveFrame() that handles PING 
frames
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/UnitHTTP.cpp common/UnitHTTP.hpp test/Makefile.am test/UnitMinSocketBufferSize.cpp

[Pranav Kant]

 common/UnitHTTP.cpp  |4 +
 common/UnitHTTP.hpp  |2 
 test/Makefile.am |6 +-
 test/UnitMinSocketBufferSize.cpp |   84 +++
 4 files changed, 94 insertions(+), 2 deletions(-)

New commits:
commit 0e043853ea68e68354de5d9c87a32029319dfdc6
Author: Pranav Kant 
Date:   Fri Dec 16 13:16:31 2016 +0530

tdf#104695: Unit test for missing tiles due to low socket buffer size

Change-Id: I278c5d532cb9b6340dee71a4b66410b32a164704
Reviewed-on: https://gerrit.libreoffice.org/32072
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/common/UnitHTTP.cpp b/common/UnitHTTP.cpp
index 6775695..29f5e40 100644
--- a/common/UnitHTTP.cpp
+++ b/common/UnitHTTP.cpp
@@ -33,3 +33,7 @@ UnitWebSocket::UnitWebSocket(const std::string &docURL)
 }
 }
 
+LOOLWebSocket* UnitWebSocket::getLOOLWebSocket() const
+{
+return _socket;
+}
diff --git a/common/UnitHTTP.hpp b/common/UnitHTTP.hpp
index e70af89..ec3882a 100644
--- a/common/UnitHTTP.hpp
+++ b/common/UnitHTTP.hpp
@@ -130,6 +130,8 @@ public:
 delete _socket;
 delete _session;
 }
+
+LOOLWebSocket* getLOOLWebSocket() const;
 };
 
 #endif
diff --git a/test/Makefile.am b/test/Makefile.am
index 2a285bc..68f8c81 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,8 @@ noinst_LTLIBRARIES = \
 unit-timeout.la unit-prefork.la \
 unit-storage.la unit-fonts.la \
 unit-admin.la unit-tilecache.la \
-   unit-fuzz.la unit-oob.la
+   unit-fuzz.la unit-oob.la \
+   unit-minsocketbuffersize.la
 
 MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
 AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION)
@@ -59,6 +60,7 @@ unit_timeout_la_SOURCES = UnitTimeout.cpp
 unit_prefork_la_SOURCES = UnitPrefork.cpp
 unit_storage_la_SOURCES = UnitStorage.cpp
 unit_tilecache_la_SOURCES = UnitTileCache.cpp
+unit_minsocketbuffersize_la_SOURCES = UnitMinSocketBufferSize.cpp
 
 if HAVE_LO_PATH
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -70,7 +72,7 @@ if HAVE_LO_PATH
 check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME unit-fonts.la is unstable, disabled for now.
-TESTS = unit-oob.la unit-tilecache.la unit-storage.la unit-timeout.la 
unit-prefork.la unit-admin.la
+TESTS = unit-oob.la unit-tilecache.la unit-storage.la unit-timeout.la 
unit-prefork.la unit-admin.la unit-minsocketbuffersize.la
 else
 TESTS = ${top_builddir}/test/test
 endif
diff --git a/test/UnitMinSocketBufferSize.cpp b/test/UnitMinSocketBufferSize.cpp
new file mode 100644
index 000..00e1dba
--- /dev/null
+++ b/test/UnitMinSocketBufferSize.cpp
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "Log.hpp"
+#include "Protocol.hpp"
+#include "Unit.hpp"
+#include "UnitHTTP.hpp"
+#include "helpers.hpp"
+
+using namespace helpers;
+
+class UnitMinSocketBufferSize: public UnitWSD
+{
+enum {
+PHASE_LOAD, // load the document
+PHASE_REQUEST,  // Request tiles etc.
+PHASE_CHECK_RESPONSE// Check if we got correct response
+} _phase;
+std::string _docURL, _docPath;
+std::unique_ptr _ws;
+public:
+UnitMinSocketBufferSize() :
+_phase(PHASE_LOAD)
+{
+}
+
+virtual void invokeTest()
+{
+switch (_phase)
+{
+case PHASE_LOAD:
+{
+getDocumentPathAndURL("Example.odt", _docPath, _docURL);
+_ws = std::unique_ptr(new UnitWebSocket(_docURL));
+assert(_ws.get());
+
+_phase = PHASE_REQUEST;
+LOG_DBG("Document loaded successfully.");
+break;
+}
+case PHASE_REQUEST:
+{
+const std::string loadMsg = "load url=" + _docURL;
+const std::string tilecombineMsg = "tilecombine part=0 width=256 
height=256 
tileposx=0,3840,7680,11520,0,3840,7680,11520,0,3840,7680,11520,0,3840,7680,11520,0,3840,7680,11520
 
tileposy=0,0,0,0,3840,3840,3840,3840,7680,7680,7680,7680,11520,11520,11520,11520,15360,15360,15360,15360
 tilewidth=3840 tileheight=3840";
+_ws->getLOOLWebSocket()->sendFrame(loadMsg.data(), loadMsg.size());
+_ws->getLOOLWebSocket()->sendFrame(tilecombineMsg.data(), 
tilecombineMsg.size());
+
+LOG_DBG("Tilecombine request sent");
+_phase = PHASE_CHECK_RESPONSE;
+break;
+}
+case PHASE_CHECK_RESPONSE:
+LOG_DBG("Checking if get back all the tiles");
+int nTiles = 20;
+bool success = true;
+while (nTiles--)
+{
+const auto til

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 2 commits - configure.ac distro-configs/CPLinux.conf distro-configs/CPWin32.conf

[Andras Timar]

 configure.ac|2 +-
 distro-configs/CPLinux.conf |1 +
 distro-configs/CPWin32.conf |1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5991e2de51985223d2478fbec256ee42142be22a
Author: Andras Timar 
Date:   Fri Dec 16 11:28:34 2016 +0100

Bump version to 5.1-15

Change-Id: I0a4f6332df0f761dcdc4cb8262aef03125bfe22d

diff --git a/configure.ac b/configure.ac
index 1484aa7..7bb8b93 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.1.10.14],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.1.10.15],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit 24676ffd2d766d3dde6f36224f0bad14f148dc9e
Author: Andras Timar 
Date:   Fri Dec 16 10:49:51 2016 +0100

--enable-symbols for Windows and Linux

Change-Id: I4ae001f7ec1936b7932a6fcb0c13a366b281edc3

diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf
index bd14184..5e9b3a4 100644
--- a/distro-configs/CPLinux.conf
+++ b/distro-configs/CPLinux.conf
@@ -44,3 +44,4 @@
 --with-package-format=deb rpm
 --enable-release-build
 --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es 
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn 
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
+--enable-symbols
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index 4b2f403..e8bd314 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -22,3 +22,4 @@
 --enable-mergelibs
 --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es 
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn 
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
 --enable-windows-build-signing
+--enable-symbols
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 665c06e2f0dfdb42162cc29d109d3a045a2e7faf
Author: Caolán McNamara 
Date:   Thu Dec 15 20:45:59 2016 +

there want to be 32bit in size, not "long"

Change-Id: I88c89b37c649247e886e523ea1d2c2fb7c3552c9

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 2be1b5b..8c56b6b 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -851,19 +851,19 @@ inline sal_uInt16 Get_UShort( sal_uInt8 *& p )
 return n;
 }
 
-inline short Get_Short( sal_uInt8 *& p )
+inline sal_Int16 Get_Short( sal_uInt8 *& p )
 {
 return Get_UShort(p);
 }
 
-inline sal_uLong Get_ULong( sal_uInt8 *& p )
+inline sal_uInt32 Get_ULong( sal_uInt8 *& p )
 {
-sal_uLong n = SVBT32ToUInt32( *reinterpret_cast(p) );
+sal_uInt32 n = SVBT32ToUInt32( *reinterpret_cast(p) );
 p += 4;
 return n;
 }
 
-inline long Get_Long( sal_uInt8 *& p )
+inline sal_Int32 Get_Long( sal_uInt8 *& p )
 {
 return Get_ULong(p);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

On 16/12/16 09:28, Bjoern Michaelsen wrote:
> On Fri, Nov 25, 2016 at 12:02:03PM +0100, Michael Stahl wrote:
>> since the goal of the policy is  "we can make incompatible changes
>> whenever it doesn't affect any 3rd party extension or macro", the
>> "published" tag is much less useful as guidance than it may appear at
>> first glance.
> 
> So, uhmm, if the current/old use of "published" doesn't service core 
> developers
> and doesnt serve UNO users, maybe we should consider making it useful ? A
> radical step would be to remove the "published" tag everywhere (as we allow
> ourselves API changes anywhere already) and then carefully readd them in areas
> where we are reasonably sure we dont have to break the API again soon.

Hmm ! ;-) My concern would be that removing the 'published' tag
everywhere would end up making it much harder to change all UNO APIs.
There is a spectrum of views on how conservative (or otherwise) we
should be around changing published APIs ATM, and how to do that but

so far - I've not heard anyone articulate the view that an un-published
API cannot be easily changed =) so - there is at least -some- hope for
improvement of -some- of the UNO APIs without sterilization of the whole
space[1]. Personally I'd never create a new API that is published ;-)
but ...

Are we truly sure that removing the 'published' keyword in averaging
this out would help everyone adopt a more flexible, comprehensible and
positive approach ? I fear that we'd go entirely the other way and have
problems everywhere ;-)

Given what UNO promises, I would imagine that the best place to invest
work here is with some focus on future-proofing things. As far as I can
see, there are a ton of exciting possibilities when you can capture so
much type information on both sides. It should be possible eg. to add
parameters to methods, and append methods to existing interfaces if the
right work is done in the bridging - and if we engineer around default
values for those parameters. Similarly, as Kendy pointed out there is no
fundamental reason why we can't extend enumerations etc. if we get the
bindings right. Which reminds me - this is prolly a great item for the
budget / funding discussion =) I'll try to file an item with a better
spec. there

ATB,

Michael.

[1] - sure we can have a policy, sure it can be written down somewhere -
the theory is all good - but the 'smell' of badness, relational pain,
extra work, etc. that surrounds UNO is already bad enough IMHO without
making the situation less clear.
-- 
michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |   62 +++
 sw/source/filter/ww8/ww8scan.hxx |   48 +++---
 2 files changed, 55 insertions(+), 55 deletions(-)

New commits:
commit 980dce83b23793024977b23281e51eb295d9bf5e
Author: Caolán McNamara 
Date:   Fri Dec 16 10:44:08 2016 +

these sal_uLongs want to be sal_uInt64

Change-Id: Ie1b17585cdb80836ad5ffed2b5ad787032b812e8

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 5bfa5ab..09f44c2 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5930,9 +5930,9 @@ void WW8Fib::WriteHeader(SvStream& rStrm)
 sal_uInt8 *pData = pDataPtr;
 memset( pData, 0, nUnencryptedHdr );
 
-sal_uLong nPos = rStrm.Tell();
+const sal_uInt64 nPos = rStrm.Tell();
 m_cbMac = rStrm.Seek( STREAM_SEEK_TO_END );
-rStrm.Seek( nPos );
+rStrm.Seek(nPos);
 
 Set_UInt16( pData, m_wIdent );
 Set_UInt16( pData, m_nFib );
@@ -6018,9 +6018,9 @@ void WW8Fib::Write(SvStream& rStrm)
 sal_uInt8 *pData = pDataPtr;
 memset( pData, 0, m_fcMin - nUnencryptedHdr );
 
-sal_uLong nPos = rStrm.Tell();
+const sal_uInt64 nPos = rStrm.Tell();
 m_cbMac = rStrm.Seek( STREAM_SEEK_TO_END );
-rStrm.Seek( nPos );
+rStrm.Seek(nPos);
 
 // ignore 2 longs, because they are unimportant
 pData += 2 * sizeof( sal_Int32);
commit c4d0e535ab64356104f258b345b858a46a09df2a
Author: Caolán McNamara 
Date:   Fri Dec 16 10:42:28 2016 +

these sal_uLongs want to be sal_uInt32

Change-Id: I722a70d978bb353937f928e4359d47221bfd2a95

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 8c56b6b..5bfa5ab 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -945,7 +945,7 @@ sal_uInt32 WW8PLCFx_PCDAttrs::GetIdx() const
 return 0;
 }
 
-void WW8PLCFx_PCDAttrs::SetIdx( sal_uLong )
+void WW8PLCFx_PCDAttrs::SetIdx(sal_uInt32)
 {
 }
 
@@ -1133,7 +1133,7 @@ WW8PLCFx_PCD::~WW8PLCFx_PCD()
 delete pPcdI;
 }
 
-sal_uLong WW8PLCFx_PCD::GetIMax() const
+sal_uInt32 WW8PLCFx_PCD::GetIMax() const
 {
 return pPcdI ? pPcdI->GetIMax() : 0;
 }
@@ -1143,7 +1143,7 @@ sal_uInt32 WW8PLCFx_PCD::GetIdx() const
 return pPcdI ? pPcdI->GetIdx() : 0;
 }
 
-void WW8PLCFx_PCD::SetIdx( sal_uLong nIdx )
+void WW8PLCFx_PCD::SetIdx(sal_uInt32 nIdx)
 {
 if (pPcdI)
 pPcdI->SetIdx( nIdx );
@@ -1371,7 +1371,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
 
 if( m_pPieceIter )// Complex File ?
 {
-sal_uLong nOldPos = m_pPieceIter->GetIdx();
+sal_uInt32 nOldPos = m_pPieceIter->GetIdx();
 
 for (m_pPieceIter->SetIdx(0);
 m_pPieceIter->GetIdx() < m_pPieceIter->GetIMax(); 
m_pPieceIter->advance())
@@ -1789,7 +1789,7 @@ static bool WW8SkipField(WW8PLCFspecial& rPLCF)
 static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF)
 {
 void* pData;
-sal_uLong nOldIdx = rPLCF.GetIdx();
+sal_uInt32 nOldIdx = rPLCF.GetIdx();
 
 rF.nLen = rF.nId = rF.nOpt = 0;
 rF.bCodeNest = rF.bResNest = false;
@@ -2779,12 +2779,12 @@ long WW8PLCFx::GetNoSprms( WW8_CP& rStart, WW8_CP& 
rEnd, sal_Int32& rLen )
 }
 
 // ...Idx2: Default: ignore
-sal_uLong WW8PLCFx::GetIdx2() const
+sal_uInt32 WW8PLCFx::GetIdx2() const
 {
 return 0;
 }
 
-void WW8PLCFx::SetIdx2(sal_uLong )
+void WW8PLCFx::SetIdx2(sal_uInt32)
 {
 }
 
@@ -2912,7 +2912,7 @@ sal_uInt32 WW8PLCFx_Fc_FKP::GetIdx() const
 return u;
 }
 
-void WW8PLCFx_Fc_FKP::SetIdx( sal_uLong nIdx )
+void WW8PLCFx_Fc_FKP::SetIdx(sal_uInt32 nIdx)
 {
 if( !( nIdx & 0xff00L ) )
 {
@@ -3127,7 +3127,7 @@ void WW8PLCFx_Cp_FKP::ResetAttrStartEnd()
 bLineEnd   = false;
 }
 
-sal_uLong WW8PLCFx_Cp_FKP::GetPCDIdx() const
+sal_uInt32 WW8PLCFx_Cp_FKP::GetPCDIdx() const
 {
 return pPcd ? pPcd->GetIdx() : 0;
 }
@@ -3178,9 +3178,9 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
 */
 if( !pPieceIter )
 return;
-sal_uLong nOldPos = pPieceIter->GetIdx();
+const sal_uInt32 nOldPos = pPieceIter->GetIdx();
 bool bOk = pPieceIter->SeekPos(nOrigCp);
-pPieceIter->SetIdx( nOldPos );
+pPieceIter->SetIdx(nOldPos);
 if (!bOk)
 return;
 }
@@ -3205,7 +3205,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
 
 //We set the piece iterator to the piece that contains the
 //character, now we have the correct piece for this character
-sal_uLong nOldPos = pPieceIter->GetIdx();
+sal_uInt32 nOldPos = pPieceIter->GetIdx();
 p->nStartPos = nOrigCp;
 pPieceIter->SeekPos( p->nStartPos);
 
@@ -3389,7 +3389,7 @@ sal_uInt32 WW8PLCFx_SEPX::GetIdx() const
 return pPLCF ? pPLCF->GetIdx() : 0;
 }
 
-void WW8PLCFx_SEPX::SetIdx( sal_uLong nIdx )
+void WW8PLCFx_SEPX::SetIdx(sal_uInt32 nIdx)
 {

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - wsd/LOOLWebSocket.hpp

[Pranav Kant]

 wsd/LOOLWebSocket.hpp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit caafbdeed115b3cc22fd692d2a9abf31b876b1bb
Author: Pranav Kant 
Date:   Fri Dec 16 11:32:16 2016 +0530

Add missing config.h

Change-Id: Ib63c0bdfc8126fea211c5311c957985de6b00129
(cherry picked from commit 9b37eed7274398a539cd5151fd0b6aa174228bd4)
Reviewed-on: https://gerrit.libreoffice.org/32075
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp
index 373b41a..02dc14d 100644
--- a/wsd/LOOLWebSocket.hpp
+++ b/wsd/LOOLWebSocket.hpp
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_LOOLWEBSOCKET_HPP
 #define INCLUDED_LOOLWEBSOCKET_HPP
 
+#include "config.h"
+
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - 2 commits - common/UnitHTTP.cpp common/UnitHTTP.hpp test/Makefile.am test/UnitMinSocketBufferSize.cpp wsd/LOOLWebSock

[Pranav Kant]

 common/UnitHTTP.cpp  |4 +
 common/UnitHTTP.hpp  |2 
 test/Makefile.am |6 +-
 test/UnitMinSocketBufferSize.cpp |   84 +++
 wsd/LOOLWebSocket.hpp|   31 ++
 5 files changed, 125 insertions(+), 2 deletions(-)

New commits:
commit 268ffa2c5a6e4a40474e62d65be5a3e00e90cc20
Author: Pranav Kant 
Date:   Fri Dec 16 13:16:31 2016 +0530

New unit test for missing tiles due to low socket buffer size

Change-Id: I278c5d532cb9b6340dee71a4b66410b32a164704
(cherry picked from commit da7d1ee60064947b405fc52f121ae011000b083f)
Reviewed-on: https://gerrit.libreoffice.org/32074
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/common/UnitHTTP.cpp b/common/UnitHTTP.cpp
index 6775695..29f5e40 100644
--- a/common/UnitHTTP.cpp
+++ b/common/UnitHTTP.cpp
@@ -33,3 +33,7 @@ UnitWebSocket::UnitWebSocket(const std::string &docURL)
 }
 }
 
+LOOLWebSocket* UnitWebSocket::getLOOLWebSocket() const
+{
+return _socket;
+}
diff --git a/common/UnitHTTP.hpp b/common/UnitHTTP.hpp
index e70af89..ec3882a 100644
--- a/common/UnitHTTP.hpp
+++ b/common/UnitHTTP.hpp
@@ -130,6 +130,8 @@ public:
 delete _socket;
 delete _session;
 }
+
+LOOLWebSocket* getLOOLWebSocket() const;
 };
 
 #endif
diff --git a/test/Makefile.am b/test/Makefile.am
index e18d3db..5a7d33e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,8 @@ noinst_LTLIBRARIES = \
 unit-timeout.la unit-prefork.la \
 unit-storage.la unit-fonts.la \
 unit-admin.la unit-tilecache.la \
-   unit-fuzz.la unit-requests.la
+   unit-fuzz.la unit-requests.la \
+   unit-minsocketbuffersize.la
 
 MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
 AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION)
@@ -59,6 +60,7 @@ unit_timeout_la_SOURCES = UnitTimeout.cpp
 unit_prefork_la_SOURCES = UnitPrefork.cpp
 unit_storage_la_SOURCES = UnitStorage.cpp
 unit_tilecache_la_SOURCES = UnitTileCache.cpp
+unit_minsocketbuffersize_la_SOURCES = UnitMinSocketBufferSize.cpp
 
 if HAVE_LO_PATH
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -70,7 +72,7 @@ if HAVE_LO_PATH
 check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME unit-fonts.la is unstable, disabled for now.
-TESTS = unit-tilecache.la unit-storage.la unit-timeout.la unit-prefork.la 
unit-admin.la unit-requests.la
+TESTS = unit-tilecache.la unit-storage.la unit-timeout.la unit-prefork.la 
unit-admin.la unit-requests.la unit-minsocketbuffersize.la
 else
 TESTS = ${top_builddir}/test/test
 endif
diff --git a/test/UnitMinSocketBufferSize.cpp b/test/UnitMinSocketBufferSize.cpp
new file mode 100644
index 000..00e1dba
--- /dev/null
+++ b/test/UnitMinSocketBufferSize.cpp
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "Log.hpp"
+#include "Protocol.hpp"
+#include "Unit.hpp"
+#include "UnitHTTP.hpp"
+#include "helpers.hpp"
+
+using namespace helpers;
+
+class UnitMinSocketBufferSize: public UnitWSD
+{
+enum {
+PHASE_LOAD, // load the document
+PHASE_REQUEST,  // Request tiles etc.
+PHASE_CHECK_RESPONSE// Check if we got correct response
+} _phase;
+std::string _docURL, _docPath;
+std::unique_ptr _ws;
+public:
+UnitMinSocketBufferSize() :
+_phase(PHASE_LOAD)
+{
+}
+
+virtual void invokeTest()
+{
+switch (_phase)
+{
+case PHASE_LOAD:
+{
+getDocumentPathAndURL("Example.odt", _docPath, _docURL);
+_ws = std::unique_ptr(new UnitWebSocket(_docURL));
+assert(_ws.get());
+
+_phase = PHASE_REQUEST;
+LOG_DBG("Document loaded successfully.");
+break;
+}
+case PHASE_REQUEST:
+{
+const std::string loadMsg = "load url=" + _docURL;
+const std::string tilecombineMsg = "tilecombine part=0 width=256 
height=256 
tileposx=0,3840,7680,11520,0,3840,7680,11520,0,3840,7680,11520,0,3840,7680,11520,0,3840,7680,11520
 
tileposy=0,0,0,0,3840,3840,3840,3840,7680,7680,7680,7680,11520,11520,11520,11520,15360,15360,15360,15360
 tilewidth=3840 tileheight=3840";
+_ws->getLOOLWebSocket()->sendFrame(loadMsg.data(), loadMsg.size());
+_ws->getLOOLWebSocket()->sendFrame(tilecombineMsg.data(), 
tilecombineMsg.size());
+
+LOG_DBG("Tilecombine request sent");
+_phase = PHASE_CHECK_RESPONSE;
+break;
+}
+case PHASE_CHECK_RESPONSE:
+LOG_DBG("Checking if get back all the tiles");

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

[Tamás Zolnai]

 sc/source/ui/Accessibility/AccessibleDocument.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06ea887f8ba34a628d7641eab210501f7bd2493d
Author: Tamás Zolnai 
Date:   Fri Dec 16 01:46:52 2016 +

tdf#71435: Accessible caret-moved events are missing when "freeze" is 
enabled

Two accessible document is created when "freeze" options is
enabled. meSplitPos identifies which accessible document handle
which part of the window. We should handle events only in that
accessible document which handles the active part.

Change-Id: Ic9674344951f620546dd272beaad796de611d258
Reviewed-on: https://gerrit.libreoffice.org/32065
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index e34f666..2416aa2 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1577,7 +1577,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, 
const SfxHint& rHint )
 }
 else if ((rHint.GetId() == SfxHintId::ScAccEnterEditMode)) // this 
event comes only on creating edit field of a cell
 {
-if (mpViewShell->GetViewData().HasEditView(meSplitPos))
+if (mpViewShell->GetViewData().GetEditActivePart() == meSplitPos)
 {
 ScViewData& rViewData = mpViewShell->GetViewData();
 const EditEngine* pEditEng = 
rViewData.GetEditView(meSplitPos)->GetEditEngine();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/table/TableDesignPane.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ccc2c027cf30d94414e5c1e26f9bb2d878aff82
Author: Stephan Bergmann 
Date:   Fri Dec 16 12:49:30 2016 +0100

Better way of converting from OUStringLiteral to OString

Change-Id: If31548d280fa8cabced50f3d2e78abde1b2562e5

diff --git a/sd/source/ui/table/TableDesignPane.cxx 
b/sd/source/ui/table/TableDesignPane.cxx
index 41f1ad8..fbb9cc2 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -110,7 +110,7 @@ TableDesignWidget::TableDesignWidget( VclBuilderContainer* 
pParent, ViewShellBas
 
 for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i)
 {
-pParent->get(m_aCheckBoxes[i], OUStringToOString(gPropNames[i], 
RTL_TEXTENCODING_UTF8));
+pParent->get(m_aCheckBoxes[i], OString(gPropNames[i].data, 
gPropNames[i].size));
 m_aCheckBoxes[i]->SetClickHdl( LINK( this, TableDesignWidget, 
implCheckBoxHdl ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/rtl sal/qa

[Stephan Bergmann]

 include/rtl/ustring.hxx |2 +-
 sal/qa/rtl/strings/test_oustring_stringliterals.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0dc19268d2f82c4b95b1a0de28a19aea4e0f7e76
Author: Stephan Bergmann 
Date:   Fri Dec 16 12:57:53 2016 +0100

Typo in meant-to-be-overloading function name

Change-Id: I65ab9176b39a436afce23e6bd4423ebf76219166

diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index ff6b834..337e850 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -819,7 +819,7 @@ public:
 /** @overload @since LibreOffice 5.3 */
 template
 typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
-equalIgnoreAsciiCase(T & literal) const {
+equalsIgnoreAsciiCase(T & literal) const {
 return
 rtl_ustr_compareIgnoreAsciiCase_WithLength(
 pData->buffer, pData->length,
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx 
b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 1a40117..0db4e29 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -267,7 +267,7 @@ void test::oustring::StringLiterals::checkUtf16() {
 s1 += u"fde";
 CPPUNIT_ASSERT_EQUAL(rtl::OUString("defde"), s1);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), s1.reverseCompareTo(u"defde"));
-CPPUNIT_ASSERT(s1.equalIgnoreAsciiCase(u"DEFDE"));
+CPPUNIT_ASSERT(s1.equalsIgnoreAsciiCase(u"DEFDE"));
 CPPUNIT_ASSERT(s1.match(u"fde", 2));
 CPPUNIT_ASSERT(s1.matchIgnoreAsciiCase(u"FDE", 2));
 rtl::OUString s2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

Hi,

On Fri, Dec 16, 2016 at 10:42:43AM +, Michael Meeks wrote:
>   Hmm ! ;-) My concern would be that removing the 'published' tag
> everywhere would end up making it much harder to change all UNO APIs.
> There is a spectrum of views on how conservative (or otherwise) we
> should be around changing published APIs ATM, and how to do that but

Maybe we should change the meaning of "published" then? Currently, "published"
means a onesided promise to each and eevery person on this planet -- people 
that we have
no relation with at all -- that we will never ever change this API and we dont
ever get anything in return. This is painful, as a feedback channel with
"everyone on this planet" is kinda hard to come by, much less so driving
conclusive negotiations on it.

So how about this instead:

1/ We unpublish all API
2/ We give UNO user an opportunity to ask for republishing specific parts of
   the API, when they provide a reasonable use case and promise to be the
   "client steward" for these.
3/ We continue to change unpublished API as core developers see reasonable. We
   promise to release changes to these newly republished APIs only after
   checking back with the "client steward" for that part of the UNO API for
   advisory _non-blocking_ input[1].

I see multiple advantages to this:

- we (core devs) still retain the perogatibve to do the ultimate decisions on
  UNO API changes
- UNO clients have an incentive to get closer to upstream (us)
  (we might even get some to become interested in core development)
- UNO clients learn about the rationale for UNO changes early on -- this might
  help reduce flaming and butthurt
- we learn what parts of the API are actually externally used
- UNO clients are able to get early prerelease heads-up on API changes and have
  adapted by the time the change is released to the world => Less stuff broken
  on release day.

There might be some hope that UNO API users like WollMux, Mendeley, Zotero
might be interested in this -- and by talking to them instead of with
$ANONYMOUS_GUY_ON_THE_INTERTUBES we might get a sensible feedback channel and
bring out ecosystem closer together -- as they have incentives to join this
discussion.

Best,

Bjoern

[1] Note this doesnt mean you cant change published APIs on master before
getting feedback as releases are at least 2-3 months off from release to
public.

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

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

[Tor Lillqvist]

I have an even blunter suggestion: In a branch (branched off 5.2, for
instance), we unpublish and rename all existing API. (For instance,
s/com::sun::star/libreoffice/.) We make this very public, and make a test
build available that contains it. And then we wait for reports what
external software actually breaks against this test build. As such reports
come in, we rename back those APIs, and mark them published. Once a week we
distribute a new build from that branch. If after half a year no new
complaints arrive, we know what APIs actively used and/or developed
external software actually uses, and do the corresponding change also in
master.

Of course I don't really believe this suggestion has any chance of being
accepted. But it is Friday, and one can dream.

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

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

[Michael Meeks]

Hi Bjoern,

On 16/12/16 12:11, Bjoern Michaelsen wrote:
> Maybe we should change the meaning of "published" then? Currently, "published"
> means a onesided promise to each and eevery person on this planet -- people 
> that we have
> no relation with at all -- that we will never ever change this API and we dont
> ever get anything in return.

Fair enough.

> 1/ We unpublish all API
> 2/ We give UNO user an opportunity to ask for republishing specific parts of
>the API, when they provide a reasonable use case and promise to be the
>"client steward" for these.

Sounds sensible to me; ideally with unit tests etc. FWIW - I'd suggest
that much of the udkapi can remain published though.

> 3/ We continue to change unpublished API as core developers see reasonable. We
>promise to release changes to these newly republished APIs only after
>checking back with the "client steward" for that part of the UNO API for
>advisory _non-blocking_ input[1].

I like a mapping of real people to bits of API. Particularly if we
focus just on those bindings that have real problems with extension
(currently) - like Java, C++ etc.

> I see multiple advantages to this:
> 
> - we (core devs) still retain the perogatibve to do the ultimate decisions on
>   UNO API changes

You know - I still really like having some area where people can work
without asking someone; I think having an "ultimate decision making
authority" that is frequently wielded when necessary is a net negative
in general =) It is also just generally a social ill to have to have
guardians watching left & right and jumping on people - the less we can
do of that the better.

> There might be some hope that UNO API users like WollMux, Mendeley, Zotero
> might be interested in this -- and by talking to them instead of with
> $ANONYMOUS_GUY_ON_THE_INTERTUBES we might get a sensible feedback channel and
> bring out ecosystem closer together -- as they have incentives to join this
> discussion.

I would love some reliable way whereby: without asking them we can get
a dump of all the interfaces they use =) I'm well up for making eg. our
external C++ bindings less efficient - if we win that =) IMHO making
good, data-driven decisions, and even better relational decisions [ we
can go talk to the one user of foo Interface ;-] is -far- more useful,
the Mono guys had a tool to help with this. I love your idea of getting
the extension guys closer to us and getting some database of people who
care about interfaces.

ATB,

Michael.

-- 
michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Tamás Zolnai]

 sc/source/ui/Accessibility/AccessibleDocument.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c869dac7c71395fd86a930c556893b6694a36e8a
Author: Tamás Zolnai 
Date:   Fri Dec 16 01:46:52 2016 +

tdf#71435: Accessible caret-moved events are missing when "freeze" is 
enabled

Two accessible document is created when "freeze" options is
enabled. meSplitPos identifies which accessible document handle
which part of the window. We should handle events only in that
accessible document which handles the active part.

Change-Id: Ic9674344951f620546dd272beaad796de611d258
Reviewed-on: https://gerrit.libreoffice.org/32065
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 06ea887f8ba34a628d7641eab210501f7bd2493d)
Reviewed-on: https://gerrit.libreoffice.org/32077
Tested-by: Tamás Zolnai 

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index f919af43..79b1a48 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1581,7 +1581,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, 
const SfxHint& rHint )
 }
 else if ((rHint.GetId() == SC_HINT_ACC_ENTEREDITMODE)) // this event 
comes only on creating edit field of a cell
 {
-if (mpViewShell->GetViewData().HasEditView(meSplitPos))
+if (mpViewShell->GetViewData().GetEditActivePart() == meSplitPos)
 {
 ScViewData& rViewData = mpViewShell->GetViewData();
 const EditEngine* pEditEng = 
rViewData.GetEditView(meSplitPos)->GetEditEngine();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 include/vcl/salbtype.hxx|7 ++
 vcl/qa/cppunit/canvasbitmaptest.cxx |  112 ++--
 2 files changed, 63 insertions(+), 56 deletions(-)

New commits:
commit 0e1b831b93048c68735f2e2dbdcee587db4862ef
Author: Miklos Vajna 
Date:   Fri Dec 16 09:14:24 2016 +0100

CppunitTest_vcl_complextext: fix loplugin:cppunitassertequals warnings

Change-Id: I18b052cadb061535d7552f2ec1eac4b932489d22

diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index a40f24f..ca5993b 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -137,6 +137,13 @@ public:
 inline sal_uInt16   GetColorError( const BitmapColor& rBitmapColor ) const;
 };
 
+template
+inline std::basic_ostream& operator 
<<(std::basic_ostream& rStream, const BitmapColor& rColor)
+{
+return rStream << "mcBlueOrIndex: " << (int)rColor.GetBlueOrIndex() << ", 
mcGreen: "
+<< (int)rColor.GetGreen() << ", mcRed: " << (int)rColor.GetRed() << ", 
mbIndex: " << (int)rColor.IsIndex();
+}
+
 class Palette;
 
 class VCL_DLLPUBLIC BitmapPalette
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx 
b/vcl/qa/cppunit/canvasbitmaptest.cxx
index f069ab6..519973d 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -93,14 +93,14 @@ void checkCanvasBitmap( const 
rtl::Reference& xBmp,
 nDepth = pAcc->GetBitCount();
 }
 
-CPPUNIT_ASSERT_MESSAGE( "Original bitmap size not (200,200)",
-aContainedBmp.GetSizePixel() == Size(200,200));
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Original bitmap size not (200,200)",
+Size(200,200), aContainedBmp.GetSizePixel());
 
 CPPUNIT_ASSERT_MESSAGE( "Original bitmap size via API not (200,200)",
 xBmp->getSize().Width == 200 && 
xBmp->getSize().Height == 200);
 
-CPPUNIT_ASSERT_MESSAGE( "alpha state mismatch",
-bool(xBmp->hasAlpha()) == 
aContainedBmpEx.IsTransparent());
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "alpha state mismatch",
+aContainedBmpEx.IsTransparent(), 
bool(xBmp->hasAlpha()));
 
 CPPUNIT_ASSERT_MESSAGE( "getScaledBitmap() failed",
 xBmp->getScaledBitmap( 
geometry::RealSize2D(500,500), false ).is());
@@ -110,32 +110,32 @@ void checkCanvasBitmap( const 
rtl::Reference& xBmp,
 
 const sal_Int32 nExpectedBitsPerPixel(
 aContainedBmpEx.IsTransparent() ? std::max(8,nDepth)+8 : nDepth);
-CPPUNIT_ASSERT_MESSAGE( "# scanlines not 1",
-aLayout.ScanLines == 1);
-CPPUNIT_ASSERT_MESSAGE( "# scanline bytes mismatch",
-aLayout.ScanLineBytes == 
(nExpectedBitsPerPixel+7)/8);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "# scanlines not 1",
+static_cast(1), aLayout.ScanLines);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "# scanline bytes mismatch",
+
static_cast((nExpectedBitsPerPixel+7)/8), aLayout.ScanLineBytes);
 CPPUNIT_ASSERT_MESSAGE( "# scanline stride mismatch",
 aLayout.ScanLineStride == 
(nExpectedBitsPerPixel+7)/8 ||
 aLayout.ScanLineStride == 
-(nExpectedBitsPerPixel+7)/8);
-CPPUNIT_ASSERT_MESSAGE( "# plane stride not 0",
-aLayout.PlaneStride == 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "# plane stride not 0",
+static_cast(0), aLayout.PlaneStride);
 
 CPPUNIT_ASSERT_MESSAGE( "Color space not there",
 aLayout.ColorSpace.is());
 
-CPPUNIT_ASSERT_MESSAGE( "Palette existence does not conform to bitmap",
-aLayout.Palette.is() == (nDepth <= 8));
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Palette existence does not conform to 
bitmap",
+(nDepth <= 8), aLayout.Palette.is());
 
 uno::Sequence aPixelData2 = xBmp->getPixel( aLayout, 
geometry::IntegerPoint2D(0,0) );
 
-CPPUNIT_ASSERT_MESSAGE( "getData and getPixel did not return same amount 
of data",
-aPixelData2.getLength() == aPixelData.getLength());
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "getData and getPixel did not return same 
amount of data",
+aPixelData.getLength(), aPixelData2.getLength());
 
 aPixelData = xBmp->getData(aLayout, 
geometry::IntegerRectangle2D(0,0,200,1));
-CPPUNIT_ASSERT_MESSAGE( "# scanlines not 1 for getPixel",
-aLayout.ScanLines == 1);
-CPPUNIT_ASSERT_MESSAGE( "# scanline bytes mismatch for getPixel",
-aLayout.ScanLineBytes == 
(200*nExpectedBitsPerPixel+7)/8);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "# scanlines not 1 for getPixel",
+static_cast(1), aLayout.ScanLines);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "# scanline bytes mismatch for getPixel",
+
static_cast((200*nExpecte

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

[Aman Kumar]

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 07e28c9045a640a9ade51e9fa6caf222cbf2746b
Author: Gabor Kelemen 
Date:   Thu Dec 15 20:42:24 2016 +0100

Updated core
Project: help  6eb8d7cd07d0d3fe043747e20ee394a427b9959e

tdf#88414 Connect the Navigator side pane to help

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

diff --git a/helpcontent2 b/helpcontent2
index 2234be9..6eb8d7c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2234be96c0865090b2e1c47e5138f011b566512c
+Subproject commit 6eb8d7cd07d0d3fe043747e20ee394a427b9959e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/swriter/01/0211.xhp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6eb8d7cd07d0d3fe043747e20ee394a427b9959e
Author: Gabor Kelemen 
Date:   Thu Dec 15 20:42:24 2016 +0100

tdf#88414 Connect the Navigator side pane to help

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

diff --git a/source/text/swriter/01/0211.xhp 
b/source/text/swriter/01/0211.xhp
index c452b7e..78615bd 100644
--- a/source/text/swriter/01/0211.xhp
+++ b/source/text/swriter/01/0211.xhp
@@ -29,6 +29,7 @@
 
 
 
+
 Navigator
 Shows or hides the Navigator window, where you can 
quickly jump to different parts of your document. Navigator is also available 
as a deck of the Sidebar. You can also use the Navigator to insert elements 
from the current document or other open documents, and to organize master 
documents. To edit an item in the Navigator, right-click the item, and 
then choose a command from the context menu. If you want, you can dock the 
Navigator at the edge of your workspace.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] cppunit.git: 4 commits - examples/cppunittest include/cppunit NEWS src/cppunit

[Markus Mohrhard]

 NEWS |   13 +++--
 examples/cppunittest/HelperMacrosTest.cpp|   23 +
 examples/cppunittest/HelperMacrosTest.h  |3 +
 include/cppunit/TestAssert.h |   31 -
 include/cppunit/TestCaller.h |   20 ++--
 include/cppunit/extensions/HelperMacros.h|   11 
 include/cppunit/extensions/TestNamer.h   |7 ++
 include/cppunit/extensions/TestSuiteBuilderContext.h |   15 ++
 include/cppunit/tools/Makefile.am|3 -
 include/cppunit/tools/StringHelper.h |   45 +++
 src/cppunit/TestNamer.cpp|1 
 11 files changed, 133 insertions(+), 39 deletions(-)

New commits:
commit 079bdbdd2b0e23f30ee733b7592c9c5bc119bd1e
Author: Markus Mohrhard 
Date:   Fri Dec 16 14:03:26 2016 +0100

add changes for TestCaller and TEST_CASE_PARAMETERIZED into NEWS

diff --git a/NEWS b/NEWS
index 9044dbe..eee1a75 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
   New in CppUnit 1.14.0:
   -
 
+  - TestCaller supports any callable that can be put into
+std::function.
+
+  - CPPUNIT_TEST_PARAMETERIZED executes a test for any value in
+an iteratable.
+
+  - Added new Assertion macros: ASSERT_LESS, ASSERT_GREATER,
+ASSERT_LESSEQUAL, ASSERT_GREATEREQUAL
+
 * Portability:
   - Always build with C++11.
 
@@ -17,10 +26,6 @@
 * Test Plug-in Runner: 
   - Fixed crash on Win64 in test runner (fdo#81433)
 
-  - Added new Assertion macros: ASSERT_LESS, ASSERT_GREATER,
-ASSERT_LESSEQUAL, ASSERT_GREATEREQUAL
-
-
   New in CppUnit 1.13.2:
   -
 
commit 4e529c6a6569d1f352e02af16e53aba7ae7bdc1a
Author: Markus Mohrhard 
Date:   Fri Dec 16 13:53:51 2016 +0100

implement parameterized tests

This allows to execute the same test with different parameters and
treats each execution as an own test. The change consists of two parts,
the TestCaller can now handle any callable which also makes it easy to
generate programatically more complex test cases as well as the new
CPPUNIT_TEST_PARAMETERIZED macro. That macro takes the test name as well
as an iteratable, e.g. std::initializer_list.

An example for this usage is:

class SimpleTest : public CppUnit::TestFixture
{
public:
CPPUNIT_TEST_SUITE(SimpleTest);
CPPUNIT_TEST_PARAMETERIZED(test, {1, 2, 3, 4});
CPPUNIT_TEST_SUITE_END();

void test(int i)
{
CPPUNIT_ASSERT(i < 5);
}
};

which will execute test 4 times with the values 1 to 4.

diff --git a/examples/cppunittest/HelperMacrosTest.cpp 
b/examples/cppunittest/HelperMacrosTest.cpp
index 4e83b81..2cdd3a7 100644
--- a/examples/cppunittest/HelperMacrosTest.cpp
+++ b/examples/cppunittest/HelperMacrosTest.cpp
@@ -77,6 +77,19 @@ public:
   }
 };
 
+class ParameterizedTestFixture : public CPPUNIT_NS::TestFixture
+{
+CPPUNIT_TEST_SUITE(ParameterizedTestFixture);
+CPPUNIT_TEST_PARAMETERIZED(testMethod, {1, 2, 3, 4});
+CPPUNIT_TEST_SUITE_END();
+
+public:
+
+void testMethod(int /*val*/)
+{
+}
+};
+
 
 #undef TEST_ADD_N_MOCK
 #define TEST_ADD_N_MOCK( totalCount )  
\
@@ -225,3 +238,13 @@ HelperMacrosTest::testAddTest()
   suite->run( m_result );
   m_testListener->verify();
 }
+
+void
+HelperMacrosTest::testParameterizedTests()
+{
+  std::unique_ptr suite( 
ParameterizedTestFixture::suite() );
+  m_testListener->setExpectedStartTestCall(4);
+  m_testListener->setExpectedAddFailureCall( 0 );
+  suite->run(m_result);
+  m_testListener->verify();
+}
diff --git a/examples/cppunittest/HelperMacrosTest.h 
b/examples/cppunittest/HelperMacrosTest.h
index 7a09797..966b125 100644
--- a/examples/cppunittest/HelperMacrosTest.h
+++ b/examples/cppunittest/HelperMacrosTest.h
@@ -16,6 +16,7 @@ class HelperMacrosTest : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST( testExceptionNotCaught );
   CPPUNIT_TEST( testCustomTests );
   CPPUNIT_TEST( testAddTest );
+  CPPUNIT_TEST( testParameterizedTests );
   CPPUNIT_TEST_SUITE_END();
 
 public:
@@ -39,6 +40,8 @@ public:
   void testCustomTests();
   void testAddTest();
 
+  void testParameterizedTests();
+
 private:
   HelperMacrosTest( const HelperMacrosTest © );
   void operator =( const HelperMacrosTest © );
diff --git a/include/cppunit/extensions/HelperMacros.h 
b/include/cppunit/extensions/HelperMacros.h
index 3dfab2d..4c30319 100644
--- a/include/cppunit/extensions/HelperMacros.h
+++ b/include/cppunit/extensions/HelperMacros.h
@@ -301,6 +301,17 @@ public:
   \
   &TestFixtureType::testMethod,   \
   context.makeFixture() ) ) )
 
+#define CPPUNIT_TEST_PARAMETERIZED( testMethod, ... )\
+for (au

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit f82a2d2a241ce3d731253080911607d04dec8844
Author: Gabor Kelemen 
Date:   Thu Dec 15 23:49:57 2016 +0100

Updated core
Project: help  2ecebd5cd909f68f388490f26da74e67416f274f

Restore connection between the 'Insert hyperlink' UI and help

Renaming hyperlink to link is still left to do.

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

diff --git a/helpcontent2 b/helpcontent2
index 6eb8d7c..2ecebd5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6eb8d7cd07d0d3fe043747e20ee394a427b9959e
+Subproject commit 2ecebd5cd909f68f388490f26da74e67416f274f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/shared/02/09070100.xhp |  101 -
 source/text/shared/02/09070200.xhp |   22 
 source/text/shared/02/09070300.xhp |   34 +++-
 source/text/shared/02/09070400.xhp |   34 +++-
 4 files changed, 108 insertions(+), 83 deletions(-)

New commits:
commit 2ecebd5cd909f68f388490f26da74e67416f274f
Author: Gabor Kelemen 
Date:   Thu Dec 15 23:49:57 2016 +0100

Restore connection between the 'Insert hyperlink' UI and help

Renaming hyperlink to link is still left to do.

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

diff --git a/source/text/shared/02/09070100.xhp 
b/source/text/shared/02/09070100.xhp
index 0ef584c..d0f8934 100644
--- a/source/text/shared/02/09070100.xhp
+++ b/source/text/shared/02/09070100.xhp
@@ -30,56 +30,67 @@
 
 
 
-Internet
-Use the Internet page of the Hyperlink 
dialog to edit hyperlinks with WWW or FTP addresses.
+Internet
+Use the 
Internet page of the Hyperlink dialog to edit hyperlinks with WWW or 
FTP addresses.
 
 
   
 
-The fields for the login name, password and anonymous user are only 
available for FTP addresses.
-Type of hyperlink
-Web
-Creates
 an http hyperlink.
-FTP
-Creates an 
FTP hyperlink.
-URL
-Enter a URL for the file that you want to open when 
you click the hyperlink. If you do not specify a target frame, the file opens 
in the current document or frame.see 
i48946
-Specifies the 
position in the target document where you wish to jump to.
-Inserts the target 
in the Target field of the Hyperlink 
dialog.
-Once the hyperlink 
has been completely entered, click on Close to set the link and 
leave the dialog.
-Login name
-Specifies your login 
name, if you are working with FTP addresses.
-Password
-Specifies your 
password, if you are working with FTP addresses.
-Anonymous user
-Allows you to 
log in to the FTP address as an anonymous user.
+The fields for 
the login name, password and anonymous user are only available for FTP 
addresses.
+Type of 
hyperlink
+Web
+Creates an http 
hyperlink.
+
+FTP
+Creates an FTP 
hyperlink.
+
+URL
+Enter a URL for the file that you want to open 
when you click the hyperlink. If you do not specify a target frame, the file 
opens in the current document or frame.see 
i48946
+
+Specifies the 
position in the target document where you wish to jump to.
+Inserts the target 
in the Target field of the Hyperlink 
dialog.
+Once the hyperlink 
has been completely entered, click on Close to set the link and 
leave the dialog.
+
+Login name
+Specifies your login name, if you are 
working with FTP addresses.
+
+Password
+Specifies your password, if you are 
working with FTP addresses.
+
+Anonymous user
+Allows you to log in to the FTP 
address as an anonymous user.
+
 
-Further settings
-
-
-
-Frame
-Enter the name of the frame that you want the linked 
file to open in, or select a predefined frame from the list. If you leave this 
box blank, the linked file opens in the current browser 
window.
-
-
-
-Form
-Specifies whether 
the hyperlink is inserted as text or as a button.
-
-
-
-Events
-Opens the 
Assign Macro dialog, in which you can give events such as "mouse 
over object" or "trigger hyperlink" their own program codes.
-
-
-
-Text
-Specifies the 
visible text or button caption for the hyperlink.
-
-
-
-Name
-Enter a name for the hyperlink. $[officename] 
inserts a NAME tag in the hyperlink.
+Further 
settings
+
+
+
+Frame
+Enter the name of the frame that you want the linked file to open in, 
or select a predefined frame from the list. If you leave this box blank, the 
linked file opens in the current browser window.
+
+
+
+
+Form
+Specifies whether the hyperlink is inserted as text or as a 
button.
+
+
+
+
+Events
+Opens the Assign Macro dialog, in which you can give 
events such as "mouse over object" or "trigger hyperlink" their own program 
codes.
+
+
+
+
+Text
+Specifies the visible text or button caption for the 
hyperlink.
+
+
+
+
+Name
+Enter a name for the hyperlink. $[officename] inserts a NAME 
tag in the hyperlink.
 
 
 
diff --git a/source/text/shared/02/09070200.xhp 
b/source/text/shared/02/09070200.xhp
index d434571..4cf1f72 100644
--- a/source/text/shared/02/09070200.xhp
+++ b/source/text/shared/02/09070200.xhp
@@ -30,21 +30,23 @@
 
 
 
-Mail
-On the Mail page in the Hyperlink 
dialog you can edit hyperlinks for e-mail addresses.
+Mail
+On the 
Mail page in the Hyperlink dialog you can edit hyperlinks for 
e-mail addresses.
 
 
   
 
+
 Mail
-E-mail
-Assigns the 
specified e-mail address to the hyperlink. Clicking the new hyperlink 
in the document will open a new message document, addressed to the receiver 
specified in the Recipient field.
-Recipient
-Specifies the full URL of the 
addressee, in the form mailto:n...@provider.com or 
news:group.server.com. You can also use drag-and-drop.
-Data Sources
-Hides or show

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

[Bjoern Michaelsen]

Hi,

On Fri, Dec 16, 2016 at 12:24:33PM +, Michael Meeks wrote:
> > - we (core devs) still retain the perogatibve to do the ultimate decisions 
> > on
> >   UNO API changes
> 
>   You know - I still really like having some area where people can work
> without asking someone; I think having an "ultimate decision making
> authority" that is frequently wielded when necessary is a net negative
> in general =) It is also just generally a social ill to have to have
> guardians watching left & right and jumping on people - the less we can
> do of that the better.

That is what I am saying though? I do NOT want to change much about where the
decisions are made (core devs and ESC). But these feedback channels might
provide us with a more educated base for decision. I assume in the end we will
have:

- 80% changes are uncontroversial anyway
- 10% find initial discussion, but are accepted once rationale is discussed
  (plus those caring about this are informed earlier an can adapt in the time
  to release -- also learning more about core development)
-  5% find discussion with some clients still disagreeing with core devs. Though
  luck, but no change to the situation before for the most part. Also adaption
  on the client side is still possible and we save ourselves from "all rants
  on release date" phenomena
-  5% core devs learn about a use case they didnt consider and come back with a
  better suited change

>   I would love some reliable way whereby: without asking them we can get
> a dump of all the interfaces they use =) I'm well up for making eg. our
> external C++ bindings less efficient - if we win that =) IMHO making
> good, data-driven decisions, and even better relational decisions [ we
> can go talk to the one user of foo Interface ;-] is -far- more useful,
> the Mono guys had a tool to help with this. I love your idea of getting
> the extension guys closer to us and getting some database of people who
> care about interfaces.

Also a nice idea. Im unsure how doable automatically that is with the
abstraction layercake of UNO, but indeed would be interesting. FWIW, I already
wrote two draft ideas for the budget from this:
 
https://wiki.documentfoundation.org/index.php?title=Development%2FBudget2017&diff=140531&oldid=140527

Best,

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

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 9558a0cd3e8315b888415778fa7981f5f8e42231
Author: Gabor Kelemen 
Date:   Fri Dec 16 00:36:44 2016 +0100

Updated core
Project: help  c349db3a49bae0d8a45528b8889bd36b337117b4

Update 'Insert Names' dialog to 'Paste Names'

There is a new terminology for the same thing.
Also document a new button.
Updated the bookmarks and ahids to restore connection
between UI and help page.

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

diff --git a/helpcontent2 b/helpcontent2
index 2ecebd5..c349db3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2ecebd5cd909f68f388490f26da74e67416f274f
+Subproject commit c349db3a49bae0d8a45528b8889bd36b337117b4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/scalc/01/04070200.xhp |   26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

New commits:
commit c349db3a49bae0d8a45528b8889bd36b337117b4
Author: Gabor Kelemen 
Date:   Fri Dec 16 00:36:44 2016 +0100

Update 'Insert Names' dialog to 'Paste Names'

There is a new terminology for the same thing.
Also document a new button.
Updated the bookmarks and ahids to restore connection
between UI and help page.

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

diff --git a/source/text/scalc/01/04070200.xhp 
b/source/text/scalc/01/04070200.xhp
index 3200f6c..3684cb9 100644
--- a/source/text/scalc/01/04070200.xhp
+++ b/source/text/scalc/01/04070200.xhp
@@ -22,7 +22,7 @@
 
 
 
-Insert Name
+Paste Names
 /text/scalc/01/04070200.xhp
 
 
@@ -31,22 +31,28 @@
 
 
 cell ranges; inserting named 
ranges
-inserting; cell ranges
+inserting; cell ranges 
pasting; cell ranges
 
-
 
-Insert Name
+
+Paste 
Names
 Inserts a defined named cell range at the current 
cursor's position.
 
 You can only insert a cell area after having defined a name for the 
area.
 
   
 
-
-Insert name Changed in 
#102078#
-Lists all 
defined cell areas. Double-click an entry to insert the named area into the 
active sheet at the current cursor position.
-
-Insert All
-Inserts a 
list of all named areas and the corresponding cell references at the current 
cursor position.
+
+
+Table 
area
+Lists all defined cell areas. 
Double-click an entry to insert the named area into the active sheet at the 
current cursor position.
+
+
+Paste 
All
+Inserts a list of all named areas 
and the corresponding cell references at the current cursor 
position.
+
+
+Paste
+Inserts the selected named area and the 
corresponding cell reference at the current cursor position.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/index.html

[Olivier Hallot]

 source/index.html |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 330afbbc626e0e811a3bf0fc709fedc41b11eed2
Author: Olivier Hallot 
Date:   Thu Dec 15 20:09:21 2016 -0200

Fix URL for invoking help page in HC3

Missing ?

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

diff --git a/source/index.html b/source/index.html
index 9acc559..703c3f6 100644
--- a/source/index.html
+++ b/source/index.html
@@ -19,8 +19,8 @@
  
  
 
-   Calc
-   Writer
+   Calc
+   Writer
Impress
Draw
Chart
@@ -34,13 +34,13 @@
   
  
  
-

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit 5b5856415d87cc1c1fa29364d0c9fe921059fb7d
Author: Olivier Hallot 
Date:   Thu Dec 15 20:09:21 2016 -0200

Updated core
Project: help  330afbbc626e0e811a3bf0fc709fedc41b11eed2

Fix URL for invoking help page in HC3

Missing ?

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

diff --git a/helpcontent2 b/helpcontent2
index c349db3..330afbb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c349db3a49bae0d8a45528b8889bd36b337117b4
+Subproject commit 330afbbc626e0e811a3bf0fc709fedc41b11eed2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 wsd/Storage.cpp |   29 ++---
 1 file changed, 26 insertions(+), 3 deletions(-)

New commits:
commit 20f8c8d65a8830f6b4ab806b128182f592cce255
Author: Tor Lillqvist 
Date:   Fri Dec 16 15:19:27 2016 +0200

Use also the LastModifiedTime property from the WOPI CheckFileInfo response

If not present, set the FileInfo _modifiedTime to the UNIX epoch.

Change-Id: I2e805d34e426368e5319cb9321159c21fe8ae9e0

diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 585711f..d0e1fca 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -15,10 +15,12 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -26,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "Auth.hpp"
 #include "Common.hpp"
@@ -393,6 +396,7 @@ std::unique_ptr 
WopiStorage::getWOPIFileInfo(const Po
 bool disablePrint = false;
 bool disableExport = false;
 bool disableCopy = false;
+std::string lastModifiedTime;
 std::string resMsg;
 Poco::StreamCopier::copyToString(rs, resMsg);
 
@@ -420,14 +424,33 @@ std::unique_ptr 
WopiStorage::getWOPIFileInfo(const Po
 getWOPIValue(object, "DisablePrint", disablePrint);
 getWOPIValue(object, "DisableExport", disableExport);
 getWOPIValue(object, "DisableCopy", disableCopy);
+getWOPIValue(object, "LastModifiedTime", lastModifiedTime);
 }
 else
 Log::error("WOPI::CheckFileInfo is missing JSON payload");
 
 if (!_fileInfo.isValid())
 {
-// WOPI doesn't support file last modified time.
-_fileInfo = FileInfo({filename, ownerId, Poco::Timestamp(), size});
+Poco::Timestamp modifiedTime = Poco::Timestamp::fromEpochTime(0);
+if (lastModifiedTime != "")
+{
+Poco::DateTime dateTime;
+int timeZoneDifferential;
+bool valid = false;
+try
+{
+
Poco::DateTimeParser::parse(Poco::DateTimeFormat::ISO8601_FRAC_FORMAT, 
lastModifiedTime, dateTime, timeZoneDifferential);
+valid = true;
+}
+catch (const Poco::SyntaxException& exc)
+{
+LOG_WRN("LastModifiedTime property [" + lastModifiedTime + "] 
was invalid format: " << exc.displayText() <<
+(exc.nested() ? " (" + exc.nested()->displayText() + 
")" : ""));
+}
+if (valid)
+modifiedTime = dateTime.timestamp();
+}
+_fileInfo = FileInfo({filename, ownerId, modifiedTime, size});
 }
 
 return std::unique_ptr(new 
WOPIFileInfo({userId, userName, canWrite, postMessageOrigin, hidePrintOption, 
hideSaveOption, hideExportOption, enableOwnerTermination, disablePrint, 
disableExport, disableCopy, callDuration}));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 test/source/screenshot_test.cxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit bfcecd677434a253b326bfe31d87b1a0958c8cea
Author: Samuel Mehrbrodt 
Date:   Fri Dec 16 14:44:58 2016 +0100

screnshot test: Ignore error when creating directories

createPath documentation advises against relying on the E_EXIST error code,
so we just ignore it

Change-Id: I0e842315e1fd5c661d2b504b196e320f84c58e4f
Reviewed-on: https://gerrit.libreoffice.org/32081
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index 798ed20..84275b5 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -54,8 +54,7 @@ void ScreenshotTest::setUp()
 mxDesktop = css::frame::Desktop::create( 
comphelper::getComponentContext(getMultiServiceFactory()) );
 CPPUNIT_ASSERT_MESSAGE("no desktop!", mxDesktop.is());
 
-osl::FileBase::RC err = osl::Directory::create( 
m_directories.getURLFromWorkdir( OUStringToOString(m_aScreenshotDirectory, 
RTL_TEXTENCODING_UTF8).getStr())) ;
-CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to create screenshot 
directory - " + m_directories.getURLFromWorkdir( 
OUStringToOString(m_aScreenshotDirectory, RTL_TEXTENCODING_UTF8).getStr()), 
RTL_TEXTENCODING_UTF8).getStr(), (err == osl::FileBase::E_None || err == 
osl::FileBase::E_EXIST) );
+osl::Directory::create( m_directories.getURLFromWorkdir( 
OUStringToOString(m_aScreenshotDirectory, RTL_TEXTENCODING_UTF8).getStr())) ;
 
 // initialize maKnownDialogs
 if (maKnownDialogs.empty())
@@ -71,10 +70,7 @@ void ScreenshotTest::implSaveScreenshot(const Bitmap& 
rScreenshot, const OString
 aDirname = m_aScreenshotDirectory + "/" + aDirname +
( (maCurrentLanguage == "en-US") ? OUString() : "/" + 
maCurrentLanguage );
 
-osl::FileBase::RC err = 
osl::Directory::createPath(m_directories.getURLFromWorkdir(OUStringToOString(aDirname,RTL_TEXTENCODING_UTF8).getStr()));
-CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to create screenshot 
directory - " + m_directories.getURLFromWorkdir(
-OUStringToOString(aDirname, RTL_TEXTENCODING_UTF8).getStr()), 
RTL_TEXTENCODING_UTF8).getStr(),
-   (err == osl::FileBase::E_None || err == 
osl::FileBase::E_EXIST) );
+
osl::Directory::createPath(m_directories.getURLFromWorkdir(OUStringToOString(aDirname,RTL_TEXTENCODING_UTF8).getStr()));
 
 OUString aFullPath = 
m_directories.getPathFromWorkdir(OUStringToOString(aDirname + "/" + aBasename + 
".png",RTL_TEXTENCODING_UTF8).getStr());
 SvFileStream aNew(aFullPath, StreamMode::WRITE | StreamMode::TRUNC);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit b998313d9d1ec511eff5076029e62608c8c5ca0e
Author: Stephan Bergmann 
Date:   Fri Dec 16 15:14:23 2016 +0100

Make move detection in loplugin:passstuffbyref work with MSVCRT

...where an ImplicitCastExpr happens to appear between CXXConstructExpr and
CallExpr

Change-Id: I62226cc89d87bd3d9c03743b650f10c32c18f9be

diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index 8695ae6..fca6b73 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -204,7 +204,7 @@ void PassStuffByRef::checkParams(const FunctionDecl * 
functionDecl) {
 auto cxxConstructExpr = 
dyn_cast(cxxCtorInitializer->getInit());
 if (cxxConstructExpr && cxxConstructExpr->getNumArgs() == 
1)
 {
-if (auto callExpr = 
dyn_cast(cxxConstructExpr->getArg(0))) {
+if (auto callExpr = 
dyn_cast(cxxConstructExpr->getArg(0)->IgnoreParenImpCasts())) {
 if 
(loplugin::DeclCheck(callExpr->getCalleeDecl()).Function("move").StdNamespace())
 {
 bFoundMove = true;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 compilerplugins/clang/passstuffbyref.cxx  |2 +-
 compilerplugins/clang/test/passstuffbyref.cxx |   11 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 9d7802e7fc055d5d4d28fcf01461e8a7dbe208a0
Author: Stephan Bergmann 
Date:   Fri Dec 16 15:16:37 2016 +0100

Make move detection in loplugin::passstuffbyref work for parenthesized cases

Change-Id: I56754a718af9433c0fa654ccb8eb34da00e75420

diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index fca6b73..8bbea52 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -201,7 +201,7 @@ void PassStuffByRef::checkParams(const FunctionDecl * 
functionDecl) {
 for (CXXCtorInitializer const * cxxCtorInitializer : 
cxxConstructorDecl->inits()) {
 if (cxxCtorInitializer->isMemberInitializer())
 {
-auto cxxConstructExpr = 
dyn_cast(cxxCtorInitializer->getInit());
+auto cxxConstructExpr = 
dyn_cast(cxxCtorInitializer->getInit()->IgnoreParenImpCasts());
 if (cxxConstructExpr && cxxConstructExpr->getNumArgs() == 
1)
 {
 if (auto callExpr = 
dyn_cast(cxxConstructExpr->getArg(0)->IgnoreParenImpCasts())) {
diff --git a/compilerplugins/clang/test/passstuffbyref.cxx 
b/compilerplugins/clang/test/passstuffbyref.cxx
index d871c5b..7c31af7 100644
--- a/compilerplugins/clang/test/passstuffbyref.cxx
+++ b/compilerplugins/clang/test/passstuffbyref.cxx
@@ -10,19 +10,20 @@
 #include 
 
 struct S {
-OUString mv;
+OUString mv1;
+OUString mv2;
 
 // make sure we ignore cases where the passed in parameter is std::move'd
-S(OUString v)
-  : mv(std::move(v)) {}
+S(OUString v1, OUString v2)
+  : mv1(std::move(v1)), mv2((std::move(v2))) {}
 };
 
 
 void f() // expected-error {{Unreferenced externally visible function 
definition [loplugin:unreffun]}}
 {
 S* s;
-OUString v;
-s = new S(v);
+OUString v1, v2;
+s = new S(v1, v2);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 desktop/source/app/cmdlinehelp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f54d5cd7a1cd8d0e8d87c1d54931ead4498ac7ce
Author: Stephan Bergmann 
Date:   Fri Dec 16 15:19:30 2016 +0100

-Werror,-Wnonportable-include-path (clang-cl)

Change-Id: I2a64b18c707085f7d4485ba46d599e8ab0df2408

diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index 915f060..cd0d46d 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -29,7 +29,7 @@
 #ifdef _WIN32
 #include "windows.h"
 #include "io.h"
-#include "Fcntl.h"
+#include "fcntl.h"
 #endif
 
 namespace desktop
___
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' - sc/source

[Eike Rathke]

 sc/source/core/data/drwlayer.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3d4aec8c32bf7b95657c40485f093c8e4a36b77c
Author: Eike Rathke 
Date:   Fri Dec 16 00:18:52 2016 +0100

Resolves: tdf#103543 disable mass broadcasts from drawing objects' changes

Specifically the a11y listeners are nasty bottle necks. A11y will get
updated on paint/view. We're touching all objects on that drawing page
to reposition so interdependencies that need to be broadcasted should
not happen.

Change-Id: Ic80446e22422a3097281ba20eecf0a078ac6a7cb
(cherry picked from commit 6a334757082be4915e7e731ce4c1b0bd4641050d)
Reviewed-on: https://gerrit.libreoffice.org/32064
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index f2e93dd..d7a51a2 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -587,6 +587,9 @@ void ScDrawLayer::SetPageSize( sal_uInt16 nPageNo, const 
Size& rSize, bool bUpda
 
 bool bNegativePage = pDoc && pDoc->IsNegativePage( 
static_cast(nPageNo) );
 
+// Disable mass broadcasts from drawing objects' position changes.
+bool bWasLocked = isLocked();
+setLock(true);
 const size_t nCount = pPage->GetObjCount();
 for ( size_t i = 0; i < nCount; ++i )
 {
@@ -595,6 +598,7 @@ void ScDrawLayer::SetPageSize( sal_uInt16 nPageNo, const 
Size& rSize, bool bUpda
 if( pData )
 RecalcPos( pObj, *pData, bNegativePage, bUpdateNoteCaptionPos 
);
 }
+setLock(bWasLocked);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 desktop/source/app/cmdlinehelp.cxx |6 +++---
 vcl/opengl/win/gdiimpl.cxx |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 704fbec2bfac21d44a988d593cdb8de172bc8f10
Author: Stephan Bergmann 
Date:   Fri Dec 16 15:21:04 2016 +0100

loplugin:nullptr (clang-cl)

Change-Id: I557e752ca05146e2a571d027fc3d1875afd6ef26

diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index cd0d46d..6103c90 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -178,19 +178,19 @@ namespace desktop
 int fileHandle = _open_osfhandle(stdHandle, _O_TEXT);
 FILE *fp = _fdopen(fileHandle, "r");
 *stdin = *fp;
-setvbuf(stdin, NULL, _IONBF, 0);
+setvbuf(stdin, nullptr, _IONBF, 0);
 // stdout
 stdHandle = 
reinterpret_cast(GetStdHandle(STD_OUTPUT_HANDLE));
 fileHandle = _open_osfhandle(stdHandle, _O_TEXT);
 fp = _fdopen(fileHandle, "w");
 *stdout = *fp;
-setvbuf(stdout, NULL, _IONBF, 0);
+setvbuf(stdout, nullptr, _IONBF, 0);
 // stderr
 stdHandle = 
reinterpret_cast(GetStdHandle(STD_ERROR_HANDLE));
 fileHandle = _open_osfhandle(stdHandle, _O_TEXT);
 fp = _fdopen(fileHandle, "w");
 *stderr = *fp;
-setvbuf(stderr, NULL, _IONBF, 0);
+setvbuf(stderr, nullptr, _IONBF, 0);
 }
 
 ~lcl_Console()
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 0d0159d..89e595c 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -566,7 +566,7 @@ bool WinOpenGLContext::ImplInit()
 
 if (!InitGL())
 {
-wglMakeCurrent(NULL, NULL);
+wglMakeCurrent(nullptr, nullptr);
 g_bAnyCurrent = false;
 wglDeleteContext(hTempRC);
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit cc69d4f26bb57e85f3a944d91a63c4ed8000d3c7
Author: Stephan Bergmann 
Date:   Fri Dec 16 15:21:59 2016 +0100

loplugin:unnecessaryoverride (clang-cl)

Change-Id: I9e4f210c9670b28a99b779d15ec32303832ce48b

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx 
b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index cb559a5..ff02faf 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -248,9 +248,6 @@ public:
 AsyncPickerEvents()
 {}
 
-virtual ~AsyncPickerEvents() override
-{}
-
 virtual void before() override
 {}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 configure.ac |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 5d50612bfb5569cfc886d729545a7e9f7840c305
Author: Caolán McNamara 
Date:   Fri Dec 16 09:45:18 2016 +

COM_IS_CLANG is used before its set

since

commit 817cd83cb76582cda848da0370d3e1b68f5bbb01
Author: Peter Foley 
Date:   Mon Jan 18 14:19:51 2016 -0500

Improve LTO flags on Android

so just drop the piece which can never be true here

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

diff --git a/configure.ac b/configure.ac
index eb2dd83..3e58408 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,11 +536,7 @@ if test -n "$with_android_ndk"; then
 if test "$ENABLE_LTO" = TRUE; then
 # -flto comes from com_GCC_defs.mk, too, but we need to make sure it 
gets passed as part of
 # $CC and $CXX when building external libraries
- if test "$COM_IS_CLANG" = TRUE; then
-ANDROIDCFLAGS="$ANDROIDCFLAGS -flto"
-else
-ANDROIDCFLAGS="$ANDROIDCFLAGS -flto -fuse-linker-plugin -O2"
-fi
+ANDROIDCFLAGS="$ANDROIDCFLAGS -flto -fuse-linker-plugin -O2"
 fi
 
 # gdbserver can be in different locations
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - odk/source sal/inc sc/source vcl/win winaccessibility/source xmlsecurity/source

[Stephan Bergmann]

 odk/source/unoapploader/win/unoapploader.c|4 -
 sal/inc/rtllifecycle.h|   24 
+-
 sc/source/ui/docshell/dataprovider.cxx|2 
 vcl/win/gdi/salfont.cxx   |1 
 winaccessibility/source/service/msaaservice_impl.cxx  |5 --
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |2 
 xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx   |   12 
++---
 xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx|8 
+--
 8 files changed, 27 insertions(+), 31 deletions(-)

New commits:
commit 54c401d775c15e39d4939342ef2132132873ccf1
Author: Stephan Bergmann 
Date:   Fri Dec 16 15:28:15 2016 +0100

loplugin:staticmethods (clang-cl)

Change-Id: Id97600a7d29fbe938d67ea074ca12dd665a29cc3

diff --git 
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx 
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index e439b44..5136db9 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -177,7 +177,7 @@ class SecurityEnvironment_MSCryptImpl : public 
::cppu::WeakImplHelper<
 
 xmlSecKeysMngrPtr createKeysManager() throw( css::uno::Exception , 
css::uno::RuntimeException ) ;
 
-void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( 
css::uno::Exception , css::uno::RuntimeException ) ;
+static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( 
css::uno::Exception , css::uno::RuntimeException ) ;
 } ;
 
 #endif // 
INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SECURITYENVIRONMENT_MSCRYPTIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 86cab56..7d5fd3e 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -157,7 +157,7 @@ SAL_CALL XMLEncryption_MSCryptImpl::encrypt(
 pEncCtx = xmlSecEncCtxCreate( pMngr ) ;
 if( pEncCtx == nullptr )
 {
-pSecEnv->destroyKeysManager( pMngr );
+SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr );
 //throw XMLEncryptionException() ;
 clearErrorRecorder();
 return aTemplate;
@@ -167,13 +167,13 @@ SAL_CALL XMLEncryption_MSCryptImpl::encrypt(
 if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 ) {
 
aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
 xmlSecEncCtxDestroy( pEncCtx ) ;
-pSecEnv->destroyKeysManager( pMngr );
+SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr );
 clearErrorRecorder();
 return aTemplate;
 }
 
aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
 xmlSecEncCtxDestroy( pEncCtx ) ;
-pSecEnv->destroyKeysManager( pMngr );
+SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr );
 
 //get the new EncryptedData element
 if (isParentRef)
@@ -263,7 +263,7 @@ XMLEncryption_MSCryptImpl::decrypt(
 pEncCtx = xmlSecEncCtxCreate( pMngr ) ;
 if( pEncCtx == nullptr )
 {
-pSecEnv->destroyKeysManager( pMngr );
+SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr );
 //throw XMLEncryptionException() ;
 clearErrorRecorder();
 return aTemplate;
@@ -273,7 +273,7 @@ XMLEncryption_MSCryptImpl::decrypt(
 if( xmlSecEncCtxDecrypt( pEncCtx , pEncryptedData ) < 0 || pEncCtx->result 
== nullptr ) {
 
aTemplate->setStatus(css::xml::crypto::SecurityOperationStatus_UNKNOWN);
 xmlSecEncCtxDestroy( pEncCtx ) ;
-pSecEnv->destroyKeysManager( pMngr );
+SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr );
 
 //throw XMLEncryptionException() ;
 clearErrorRecorder();
@@ -306,7 +306,7 @@ XMLEncryption_MSCryptImpl::decrypt(
 
 //Destroy the encryption context
 xmlSecEncCtxDestroy( pEncCtx ) ;
-pSecEnv->destroyKeysManager( pMngr );
+SecurityEnvironment_MSCryptImpl::destroyKeysManager( pMngr );
 
 //get the decrypted element
 XMLElementWrapper_XmlSecImpl * ret = new 
XMLElementWrapper_XmlSecImpl(isParentRef?
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index abf01ac..ac5ffda 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -116,7 +116,7 @@ SAL_CALL XMLSignature_MSCryptImpl::generate(
 if( pDsigCtx == nullptr )
 {
 //throw XMLSignatureException() ;
-pSecEnv->destroyKeysManager( pMngr );
+SecurityEnvironment

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

[Khaled Hosny]

 vcl/source/gdi/CommonSalLayout.cxx |   45 +
 1 file changed, 12 insertions(+), 33 deletions(-)

New commits:
commit 0c49ab77067413901f8e2956fbdbc45671384b73
Author: Khaled Hosny 
Date:   Wed Dec 14 17:51:33 2016 +0200

Simplify CommonSalLayout::ParseFeatures()

Use OString::getToken() instead of manually tokenizing the string.

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

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index af8ebfa..956bad0 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -131,50 +131,29 @@ static hb_unicode_funcs_t* getUnicodeFuncs()
 }
 #endif
 
-void CommonSalLayout::ParseFeatures(const OUString& name)
+void CommonSalLayout::ParseFeatures(const OUString& aName)
 {
-int nFeatures = 0;
-int nStart = name.indexOf(FontSelectPatternAttributes::FEAT_PREFIX);
-if (nStart < 0)
+if (aName.indexOf(FontSelectPatternAttributes::FEAT_PREFIX) < 0)
 return;
-OString oName = OUStringToOString(name, RTL_TEXTENCODING_ASCII_US);
-for (int nNext = nStart; nNext > 0; nNext = 
name.indexOf(FontSelectPatternAttributes::FEAT_SEPARATOR, nNext + 1))
+
+OString sName = OUStringToOString(aName, RTL_TEXTENCODING_ASCII_US);
+sName = sName.getToken(1, FontSelectPatternAttributes::FEAT_PREFIX);
+sal_Int32 nIndex = 0;
+do
 {
-if (name.match("lang=", nNext + 1))
+OString sToken = sName.getToken(0, 
FontSelectPatternAttributes::FEAT_SEPARATOR, nIndex);
+if (sToken.startsWith("lang="))
 {
-int endamp = 
name.indexOf(FontSelectPatternAttributes::FEAT_SEPARATOR, nNext+1);
-int enddelim = name.indexOf(' ', nNext+1);
-int end = name.getLength();
-if (endamp < 0)
-{
-if (enddelim > 0)
-end = enddelim;
-}
-else if (enddelim < 0 || endamp < enddelim)
-end = endamp;
-else
-end = enddelim;
-msLanguage = oName.copy(nNext + 6, end - nNext - 6);
+msLanguage = sToken.getToken(1, '=');
 }
 else
-++nFeatures;
-}
-if (nFeatures == 0)
-return;
-
-maFeatures.reserve(nFeatures);
-for (int nThis = nStart, nNext = 
name.indexOf(FontSelectPatternAttributes::FEAT_SEPARATOR, nStart + 1);
- nThis > 0;
- nThis = nNext, nNext = 
name.indexOf(FontSelectPatternAttributes::FEAT_SEPARATOR, nNext + 1))
-{
-if (!name.match("lang=", nThis + 1))
 {
-int end = nNext > 0 ? nNext : name.getLength();
 hb_feature_t aFeature;
-if (hb_feature_from_string(oName.getStr() + nThis + 1, end - nThis 
- 1, &aFeature))
+if (hb_feature_from_string(sToken.getStr(), sToken.getLength(), 
&aFeature))
 maFeatures.push_back(aFeature);
 }
 }
+while (nIndex >= 0);
 }
 
 #if defined(_WIN32)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Winfried Donkers]

 sc/source/core/tool/interpr3.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 245b615400904274e264d5051baf63b3613db935
Author: Winfried Donkers 
Date:   Mon Dec 12 16:09:04 2016 +0100

tdf#104581 handle constraints for NEGBINOMDIST in compliance with ODFF1.2.

Also changed varaiable names for easier understanding of their meaning.

Change-Id: I7c6f338c04898c7b07ebeb97fb331d51fa691f5b
Reviewed-on: https://gerrit.libreoffice.org/31910
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index d05c34d..1b6a367 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1493,17 +1493,17 @@ void ScInterpreter::ScNegBinomDist()
 {
 if ( MustHaveParamCount( GetByte(), 3 ) )
 {
-double p  = GetDouble();// p
-double r  = GetDouble();// r
-double x  = GetDouble();// x
-if (r < 0.0 || x < 0.0 || p < 0.0 || p > 1.0)
+double p = GetDouble();// probability
+double s = ::rtl::math::approxFloor(GetDouble());  // No of successes
+double f = ::rtl::math::approxFloor(GetDouble());  // No of failures
+if ((f + s) <= 1.0 || p < 0.0 || p > 1.0)
 PushIllegalArgument();
 else
 {
 double q = 1.0 - p;
-double fFactor = pow(p,r);
-for (double i = 0.0; i < x; i++)
-fFactor *= (i+r)/(i+1.0)*q;
+double fFactor = pow(p,s);
+for (double i = 0.0; i < f; i++)
+fFactor *= (i+s)/(i+1.0)*q;
 PushDouble(fFactor);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/source/gdi/CommonSalLayout.cxx |3 ++-
 vcl/win/gdi/winlayout.cxx  |   16 +---
 2 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit ab291ac3b8576a086cab60ffb64d60b046a271a2
Author: Khaled Hosny 
Date:   Fri Dec 16 09:16:29 2016 +0200

tdf#104159: Fix caching glyphs of non-UI fonts

Partially reverts "tdf#103725: Fix horizontal scaling on Windows",
which didn't work on newer Windows versions anyway.

This reverts commit a5750d92b2136d60d698b41ef5760f2efac0ffce.

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

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index d68534f..af8ebfa 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -19,6 +19,7 @@
 
 #include "CommonSalLayout.hxx"
 
+#include 
 #include 
 #include 
 #include 
@@ -195,7 +196,7 @@ CommonSalLayout::CommonSalLayout(HDC hDC, WinFontInstance& 
rWinFontInstance, con
 }
 
 // Calculate the mnAveWidthFactor, see the comment where it is used.
-if (mrFontSelData.mnWidth)
+if (mrFontSelData.mnWidth && ! OpenGLHelper::isVCLOpenGLEnabled())
 {
 double nUPEM = hb_face_get_upem(hb_font_get_face(mpHbFont));
 
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 57ac16f..b60ce1b 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -496,19 +496,9 @@ std::vector 
D2DWriteTextOutRenderer::GetGlyphInkBoxes(uint16_t * pGid
 bool D2DWriteTextOutRenderer::GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** 
ppFontFace, float * lfSize) const
 {
 bool succeeded = false;
-IDWriteFont* pFont;
-
-LOGFONTW aLogFont;
-HFONT hFont = static_cast(::GetCurrentObject(hDC, OBJ_FONT));
-GetObjectW(hFont, sizeof(LOGFONTW), &aLogFont);
 try
 {
-succeeded = SUCCEEDED(mpGdiInterop->CreateFontFromLOGFONT(&aLogFont, 
&pFont));
-if (succeeded)
-{
-succeeded = SUCCEEDED(pFont->CreateFontFace(ppFontFace));
-pFont->Release();
-}
+succeeded = SUCCEEDED(mpGdiInterop->CreateFontFaceFromHdc(hDC, 
ppFontFace));
 }
 catch (const std::exception& e)
 {
@@ -518,6 +508,10 @@ bool D2DWriteTextOutRenderer::GetDWriteFaceFromHDC(HDC 
hDC, IDWriteFontFace ** p
 
 if (succeeded)
 {
+LOGFONTW aLogFont;
+HFONT hFont = static_cast(::GetCurrentObject(hDC, OBJ_FONT));
+
+GetObjectW(hFont, sizeof(LOGFONTW), &aLogFont);
 float dpix, dpiy;
 mpRT->GetDpi(&dpix, &dpiy);
 *lfSize = aLogFont.lfHeight * 96.0f / dpiy;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 sfx2/source/control/unoctitm.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3ab307e568156b0fdafe1ee592870ef8c0e44750
Author: Pranav Kant 
Date:   Fri Dec 16 19:23:41 2016 +0530

lok: Sort ascending/descending is enabled/disabled state

... and not true/false

Change-Id: Ie9ae6cbf70c1934dda1002deabda23c9f461c8b1
Reviewed-on: https://gerrit.libreoffice.org/32085
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 067619d4..26252a36 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1050,15 +1050,15 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "EntireRow" ||
  aEvent.FeatureURL.Path == "EntireColumn" ||
  aEvent.FeatureURL.Path == "EntireCell" ||
- aEvent.FeatureURL.Path == "MergeCells")
+ aEvent.FeatureURL.Path == "MergeCells" ||
+ aEvent.FeatureURL.Path == "SortAscending" ||
+ aEvent.FeatureURL.Path == "SortDescending")
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
 }
 else if (aEvent.FeatureURL.Path == "InsertPage" ||
  aEvent.FeatureURL.Path == "DeletePage" ||
- aEvent.FeatureURL.Path == "DuplicatePage" ||
- aEvent.FeatureURL.Path == "SortAscending" ||
- aEvent.FeatureURL.Path == "SortDescending")
+ aEvent.FeatureURL.Path == "DuplicatePage")
 {
 aBuffer.append(OUString::boolean(aEvent.IsEnabled));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 desktop/source/lib/init.cxx  |1 -
 sfx2/source/control/unoctitm.cxx |   15 +--
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit c5ceb0134dddb79207d3b8ddb7a36ee1ca294329
Author: Pranav Kant 
Date:   Fri Dec 16 19:35:02 2016 +0530

lok: Fix state feedback for ToggleMergeCells

Now it broadcasts "disabled" to disable the command and
true/false to tell the status of the command which automatically
means "enabled"

Change-Id: I3314da77fb2b84d97f64b9832d65791b84fcd7df
Reviewed-on: https://gerrit.libreoffice.org/32086
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ea947b8..26c18df 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1316,7 +1316,6 @@ static void doc_iniUnoCommands ()
 OUString(".uno:EntireRow"),
 OUString(".uno:EntireColumn"),
 OUString(".uno:EntireCell"),
-OUString(".uno:MergeCells"),
 OUString(".uno:AssignLayout"),
 OUString(".uno:StatusDocPos"),
 OUString(".uno:RowColSelCount"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 26252a36..ad66f45 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1050,7 +1050,6 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "EntireRow" ||
  aEvent.FeatureURL.Path == "EntireColumn" ||
  aEvent.FeatureURL.Path == "EntireCell" ||
- aEvent.FeatureURL.Path == "MergeCells" ||
  aEvent.FeatureURL.Path == "SortAscending" ||
  aEvent.FeatureURL.Path == "SortDescending")
 {
@@ -1095,7 +1094,6 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 }
 else if (aEvent.FeatureURL.Path == "InsertMode" ||
  aEvent.FeatureURL.Path == "WrapText" ||
- aEvent.FeatureURL.Path == "ToggleMergeCells" ||
  aEvent.FeatureURL.Path == "NumberFormatCurrency" ||
  aEvent.FeatureURL.Path == "NumberFormatPercent" ||
  aEvent.FeatureURL.Path == "NumberFormatDate")
@@ -1107,6 +1105,19 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aBuffer.append(OUString::boolean(aBool));
 }
 }
+else if (aEvent.FeatureURL.Path == "ToggleMergeCells")
+{
+if (aEvent.IsEnabled)
+{
+sal_Bool aBool;
+aEvent.State >>= aBool;
+aBuffer.append(OUString::boolean(aBool));
+}
+else
+{
+aBuffer.append(OUString("disabled"));
+}
+}
 else if (aEvent.FeatureURL.Path == "Position")
 {
 css::awt::Point aPoint;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 56cb689a6457a5e3b9f8b7c60155b9d114584f77
Author: Pranav Kant 
Date:   Fri Dec 16 20:15:40 2016 +0530

Handle enabled/disabled, true/false toolbar button states

If we get a true/false, assume its enabled.

Change-Id: I364c7cd611481757b674877ed44ac6ee0f6b0e58
Reviewed-on: https://gerrit.libreoffice.org/32089
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index bbbe2e2..77c24db 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1000,10 +1000,12 @@ map.on('commandstatechanged', function (e) {
var id = commandName.toLowerCase().substr(5);
if (typeof formatButtons[id] !== 'undefined') {
if (state === 'true') {
+   toolbar.enable(id);
toolbar.check(id);
toolbarUpMore.check(id);
}
else if (state === 'false') {
+   toolbar.enable(id);
toolbar.uncheck(id);
toolbarUpMore.uncheck(id);
}
@@ -1027,6 +1029,7 @@ map.on('commandstatechanged', function (e) {
toolbar.enable(id);
toolbarUpMore.enable(id);
} else {
+   toolbar.uncheck(id);
toolbar.disable(id);
toolbarUpMore.disable(id);
}
commit 98036fd90935663263ad4a1be25c7c57e930825b
Author: Pranav Kant 
Date:   Fri Dec 16 18:44:40 2016 +0530

loleaflet: Don't move items to 'toolbar-more' after resizebreak

Change-Id: I9660e84f68cde2ab5eed6871d4f3948a736575b9
Reviewed-on: https://gerrit.libreoffice.org/32088
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 89a7ecf..bbbe2e2 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -27,6 +27,9 @@ function resizeToolbar() {
// move items from toolbar-up -> toolbar-up-more
while ($('#toolbar-up')[0].scrollWidth > Math.max($(window).width(), 
parseInt($('body').css('min-width' {
var itemId = toolbarUp.items[toolbarUp.items.length - 4].id;
+   if (itemId === 'resizebreak') {
+   return;
+   }
item = toolbarUp.get(itemId);
toolbarUp.remove(itemId);
toolbarUpMore.insert(toolbarUpMore.items[0], item);
@@ -362,7 +365,7 @@ $(function () {
{type: 'html',   id: 'styles', html: ''},
{type: 'html',   id: 'fonts', html: ''},
{type: 'html',   id: 'fontsizes', html: ''},
-   {type: 'break'},
+   {type: 'break', id: 'resizebreak'},
{type: 'button',  id: 'bold',  img: 'bold', hint: 
_('Bold'), uno: 'Bold'},
{type: 'button',  id: 'italic', img: 'italic', hint: 
_('Italic'), uno: 'Italic'},
{type: 'button',  id: 'underline',  img: 'underline', 
hint: _('Underline'), uno: 'Underline'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Getting rid of 'oldref' in the help files

[Jan Holesovsky]

Hi Cloph, all,

I've recently proposed some help cleanups on the documentation@ ML, and
this is the first one of them.  I'm cross-posting to l10n@ and
documentation@ - this change is supposed to be transparent for L10n and
Documentation teams, but they should know :-)

The idea is to get rid of the 'oldref' attribute in the help files; ie.
change

  Heading

to

  Heading

The 'oldref' comes from helpcontent -> helpcontent2 migration, and the
documentation says "This contains the reference number used by the old
help files and is only used for migration purposes."

Unfortunately, it is used in the msgctx flag in the .po files, like:

#: main0503.xhp
msgctxt ""
"main0503.xhp\n"
"hd_id3155084\n"
"21\n"
"help.text"
msgid "Flexible Application Interface"
msgstr "Snadno přizpůsobitelné uživatelské rozhraní"

The "21\n" above is the oldref.

As we talked on the IRC - unless there are any objections, can you
please do your magic with the next translation update so that we remove
these oldrefs from the helpcontent, the .po templates, and .po
translations themselves?

The helpcontent2 part of that is this:

  git grep -l 'oldref="[0-9]*"' | xargs sed -i 's/ *\https://lists.freedesktop.org/mailman/listinfo/libreoffice

Bug TDF#99097 - Call for reflection

[Pierre Lepage]

Bug TDF#99097 

The source of the problem comes from source code LO which interprets the
code NN (nn) as the abbreviation of the day whereas VBA interprets the code
NN like minutes.

Codes definition in LO are:
  sKeyword[NF_KEY_M] =   "M";// month 1
  sKeyword[NF_KEY_MM] ="MM"; // month 01
  sKeyword[NF_KEY_NN] = "NN";  // *Day of week short*
  sKeyword[NF_KEY_NNN] =   "NNN";// Day of week long

In the BASIC machine we have the following definition when the format code
NN is alone. In particular, when the NN code is not embedded in the year
and day codes, in which case the decoding of LO applies.

#define VBAFORMAT_N "n"
#define VBAFORMAT_NN"nn"

*Where n and nn are interpreted like minutes.*

So we have to decide here the desired behavior of the BASIC machine when
the N or NN code is in the string of a format. Do we stick to LO and then
the only way to get the minutes is to use the M or MM code? In this case,
we will have a possible collision with the code for the months. Or should
we look for compatibility with VBA? It seemed possible to me to code an
exception to obtain the desirable behavior (compatibility with VBA) of the
codes "N" and "NN". But, I do not like this approach. Especially since LO's
special use of the "N" and "NN" codes does not seem useful to me and could
be abandoned. I have attached a Calc file that reproduces the Date/Time
codes as encoded in the /libreoffice/svl/source/numbers/zforscan.cxx file.
I highlighted the problem codes related to the bug.

So, my question is: what do you think?

Regards


Format_Code
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - include/rtl sal/qa

[Stephan Bergmann]

 include/rtl/ustring.hxx |2 +-
 sal/qa/rtl/strings/test_oustring_stringliterals.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 976f5101f375304f67ebccb546ea265c08f72404
Author: Stephan Bergmann 
Date:   Fri Dec 16 12:57:53 2016 +0100

Typo in meant-to-be-overloading function name

Change-Id: I65ab9176b39a436afce23e6bd4423ebf76219166
(cherry picked from commit 0dc19268d2f82c4b95b1a0de28a19aea4e0f7e76)
Reviewed-on: https://gerrit.libreoffice.org/32079
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index ff6b834..337e850 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -819,7 +819,7 @@ public:
 /** @overload @since LibreOffice 5.3 */
 template
 typename libreoffice_internal::ConstCharArrayDetector::TypeUtf16
-equalIgnoreAsciiCase(T & literal) const {
+equalsIgnoreAsciiCase(T & literal) const {
 return
 rtl_ustr_compareIgnoreAsciiCase_WithLength(
 pData->buffer, pData->length,
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx 
b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 27f7080..859d1ac 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -264,7 +264,7 @@ void test::oustring::StringLiterals::checkUtf16() {
 s1 += u"fde";
 CPPUNIT_ASSERT_EQUAL(rtl::OUString("defde"), s1);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), s1.reverseCompareTo(u"defde"));
-CPPUNIT_ASSERT(s1.equalIgnoreAsciiCase(u"DEFDE"));
+CPPUNIT_ASSERT(s1.equalsIgnoreAsciiCase(u"DEFDE"));
 CPPUNIT_ASSERT(s1.match(u"fde", 2));
 CPPUNIT_ASSERT(s1.matchIgnoreAsciiCase(u"FDE", 2));
 rtl::OUString s2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Getting rid of 'oldref' in the help files

[Jan Iversen]

> this change is supposed to be transparent for L10n and
> Documentation teams, but they should know :-)

It does not seem transparent for the few languages that do not use pootle (sl 
and sr) please do not forget those.

It does also influence the help repo (of course), since the change will be a 
very big commit.

> [Or - any objections to this change?]

No objections as I think it is a good and welcome change, just a question.

As we discussed in ESC (and Oliver sort of pushed) it seems the goal is to move 
away from .xhp to .xhtml (if I understood it correct). If decided do we then 
want to do that as a set of small steps or make 1 script that does it ?

Please just see this as a question of how often to we want to run these 
conversions.

have a nice weekend
rgds
jan I.

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

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

[Caolán McNamara]

 sfx2/source/control/unoctitm.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 429290b8cf1fba8f730e00786dd3fd864a5c9ad5
Author: Caolán McNamara 
Date:   Fri Dec 16 15:24:22 2016 +

-Werror=maybe-unintialized

Change-Id: I73eb58e44c00d5e1cfcabe71f2ba946a81a62fa7

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index ad66f45..3b0a6b8 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1107,10 +1107,10 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 }
 else if (aEvent.FeatureURL.Path == "ToggleMergeCells")
 {
-if (aEvent.IsEnabled)
+sal_Bool aBool;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aBool))
 {
-sal_Bool aBool;
-aEvent.State >>= aBool;
 aBuffer.append(OUString::boolean(aBool));
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/draw/dcontact.cxx  |3 +--
 sw/source/filter/ww8/wrtw8esh.cxx |   16 +++-
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit c175620c312652b521694547d335f4f70cb11661
Author: Caolán McNamara 
Date:   Fri Dec 16 16:21:15 2016 +

crashtesting: 10 squillion .doc export asserts

since...

commit 880e622d2e324a85a7b2b6ddc60e06cc423195b4
Author: Bjoern Michaelsen 
Date:   Sun Dec 11 14:30:44 2016 +0100

refactor out lcl_GetWW8Pos

IIUC the old code only changes the X/Y if its not NO_CONV for
that direction, so lets reintroduce that and then drop the assert

Change-Id: Ia5b0e668fff83466dc2ab59aa163cb9a87984b0e

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 47d1420..4d8d224 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1386,7 +1386,6 @@ namespace
 return pAnchoredObj->GetRelPosToLine();
 default: ;
 }
-assert(false);
 return Point();
 }
 }
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 7368c79..9f50c20 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2675,16 +2675,22 @@ bool WinwordAnchoring::ConvertPosition( 
SwFormatHoriOrient& _iorHoriOri,
 }
 
 }
-if(eVertConv != sw::WW8AnchorConv::NO_CONV || eHoriConv != 
sw::WW8AnchorConv::NO_CONV)
+if (eVertConv != sw::WW8AnchorConv::NO_CONV || eHoriConv != 
sw::WW8AnchorConv::NO_CONV)
 {
 sw::WW8AnchorConvResult aResult(eHoriConv, eVertConv);
 _rFrameFormat.CallSwClientNotify(sw::WW8AnchorConvHint(aResult));
 if(!aResult.m_bConverted)
 return false;
-lcl_SetRelationOrient(_iorHoriOri, eHoriConv, [&_iorHoriOri]() 
{_iorHoriOri.SetHoriOrient(text::HoriOrientation::NONE);} );
-_iorHoriOri.SetPos(aResult.m_aPos.X());
-lcl_SetRelationOrient(_iorVertOri, eVertConv, [&_iorVertOri]() 
{_iorVertOri.SetVertOrient(text::VertOrientation::NONE);} );
-_iorVertOri.SetPos(aResult.m_aPos.Y());
+if (eHoriConv != sw::WW8AnchorConv::NO_CONV)
+{
+lcl_SetRelationOrient(_iorHoriOri, eHoriConv, [&_iorHoriOri]() 
{_iorHoriOri.SetHoriOrient(text::HoriOrientation::NONE);} );
+_iorHoriOri.SetPos(aResult.m_aPos.X());
+}
+if (eVertConv != sw::WW8AnchorConv::NO_CONV)
+{
+lcl_SetRelationOrient(_iorVertOri, eVertConv, [&_iorVertOri]() 
{_iorVertOri.SetVertOrient(text::VertOrientation::NONE);} );
+_iorVertOri.SetPos(aResult.m_aPos.Y());
+}
 return true;
 }
 return false;
commit 50826a1152eb9ceaf234338e55685758262e4c17
Author: Caolán McNamara 
Date:   Fri Dec 16 15:59:49 2016 +

fix a regression in lcl_GetWW8Pos

wrong since...

commit 880e622d2e324a85a7b2b6ddc60e06cc423195b4
Author: Bjoern Michaelsen 
Date:   Sun Dec 11 14:30:44 2016 +0100

refactor out lcl_GetWW8Pos

Change-Id: If7b680aa80a3d2e197b853a46afdcee6be83046c

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 0ef9fca..47d1420 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1569,7 +1569,7 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, 
const SfxHint& rHint)
 // No distinction between layout directions, because of missing
 // information about WW8 in vertical layout.
 rResult.m_aPos.setX(lcl_GetWW8Pos(pAnchoredObj, bFollowTextFlow, 
rResult.m_eHoriConv).getX());
-rResult.m_aPos.setY(lcl_GetWW8Pos(pAnchoredObj, bFollowTextFlow, 
rResult.m_eHoriConv).getY());
+rResult.m_aPos.setY(lcl_GetWW8Pos(pAnchoredObj, bFollowTextFlow, 
rResult.m_eVertConv).getY());
 rResult.m_bConverted = true;
 }
 else if (auto pRestoreFlyAnchorHint = dynamic_cast(&rHint))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Getting rid of 'oldref' in the help files

[Jan Holesovsky]

Hi Jan,

Jan Iversen píše v Pá 16. 12. 2016 v 16:27 +0100:

> > this change is supposed to be transparent for L10n and
> > Documentation teams, but they should know :-)
> 
> It does not seem transparent for the few languages that do not use pootle (sl 
> and sr) please do not forget those.

Thanks for the reminder.  I hope Cloph can do the upgrade for them some
way that fits them too, though?

> It does also influence the help repo (of course), since the change will be a 
> very big commit.
> 
> > [Or - any objections to this change?]
> 
> No objections as I think it is a good and welcome change, just a question.
> 
> As we discussed in ESC (and Oliver sort of pushed) it seems the goal
> is to move away from .xhp to .xhtml (if I understood it correct). If
> decided do we then want to do that as a set of small steps or make 1
> script that does it ?

I tried to explain on the documentation@ why a big-bang move to html is
not a good idea from many reasons in another thread; to name the most
important ones:

* big-bang "let's abandon one technology and hooray for another one"
  always brings lots of regressions that are hard to fix in a timely
  manner; incremental changes are easier to maintain

* html does not have markup for some of the semantics that we have (and
  need) in the help files (like  or  to name few)

* there are many ways how to describe the same thing in html ('s and
  's vs.  and  vs. 's with css vs. who-knows-what)
  which would make the help harder to maintain, if we eg. want to reuse
  the information from there to generate other representations (like
  eg. books or so)

> Please just see this as a question of how often to we want to run these 
> conversions.

One more may be needed if we agree that the id="..." attribute could be
done non-mandatory, because that one affects the msgctx too.

If we want to make the XHP markup look more like HTML markup (which I
don't object in general & this is up to agreement between between the
Documentation and L10n people), there might be additional conversions
needed, for things like  ->  etc. - but I'd like to keep
this separate from the cleanup effort / topic.

All the best,
Kendy

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

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

[Michael Stahl]

 sw/source/core/access/accfrmobj.cxx |   11 ---
 sw/source/core/draw/dcontact.cxx|9 -
 2 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit ae3ec0d53a22ae5d2b7fb244a6056d0627b71873
Author: Michael Stahl 
Date:   Fri Dec 16 17:21:48 2016 +0100

tdf#91260 sw: fix nasty corner case of SdrGroupObject in header

or footer.  Some very special handling going on to paint these in
VOCOfDrawVirtObj with a GetSwDrawVirtObj().GetOffset() added;
they are falsely identified as invisible because their
sub-objects have an anchor set but it is always on the first page
so to properly check them we'd have to add the same GetOffset()
thing but checking the top-level object should be sufficient.

(regression from 689cead9e0837dc932e3a4cd765f7d319b529018)

Change-Id: Ida6fcd41948f46410ca02193549e426bc9dae8c5

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 4d8d224..a1651f6 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2117,6 +2117,13 @@ namespace sdr
 
 drawinglayer::primitive2d::Primitive2DContainer 
VOCOfDrawVirtObj::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) 
const
 {
+// tdf#91260 have already checked top-level one is on the right 
page
+assert(isPrimitiveVisible(rDisplayInfo));
+// nasty corner case: override to clear page frame to disable the
+// sub-objects' anchor check, because their anchor is always on
+// the first page that the page style is applied to
+DisplayInfo aDisplayInfo(rDisplayInfo);
+aDisplayInfo.SetWriterPageFrame(basegfx::B2IRectangle());
 const VCOfDrawVirtObj& rVC = static_cast< const VCOfDrawVirtObj& 
>(GetViewContact());
 const SdrObject& rReferencedObject = 
rVC.GetSwDrawVirtObj().GetReferencedObj();
 drawinglayer::primitive2d::Primitive2DContainer xRetval;
@@ -2141,7 +2148,7 @@ namespace sdr
 
 // Get the VOC of the referenced object (the Group) and fetch 
primitives from it
 const ViewObjectContact& rVOCOfRefObj = 
rReferencedObject.GetViewContact().GetViewObjectContact(GetObjectContact());
-impAddPrimitivesFromGroup(rVOCOfRefObj, aOffsetMatrix, 
rDisplayInfo, xRetval);
+impAddPrimitivesFromGroup(rVOCOfRefObj, aOffsetMatrix, 
aDisplayInfo, xRetval);
 }
 else
 {
commit bdd1a03b450f9f8a0ead46c38bec58f6879b2c5d
Author: Michael Stahl 
Date:   Fri Dec 16 15:49:19 2016 +0100

tdf#101464 tdf#91260 tdf#104620 sw: fix null SwPageFrame crash

It turns out that draw objects in header/footer often don't have
AnchoredObject::mpPageFrame set, so use FindPageFrameOfAnchor()
instead.

(regression from ae06f4be6bbdebc10a88c386064d548848e57f80)

Change-Id: I6d54baa3acffa6775d5b57a1517c77a964065dd0

diff --git a/sw/source/core/access/accfrmobj.cxx 
b/sw/source/core/access/accfrmobj.cxx
index bc7f06d..3c6b3e5 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -257,14 +257,19 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap& 
rAccMap ) const
 }
 else if( mpDrawObj )
 {
-aBox = SwRect( mpDrawObj->GetCurrentBoundRect() );
 SwDrawContact const*const pContact(dynamic_cast(::GetUserCall(mpDrawObj)));
 // assume that a) the SwVirt* objects that don't have this are handled
 // by the mpFrame case above b) for genuine SdrObject this must be set
 // if it's connected to layout
 assert(pContact);
-// tdf#91260 drawing object may be partially off-page
-aBox.Intersection(pContact->GetPageFrame()->Frame());
+SwPageFrame const*const pPage(const_cast(
+pContact->GetAnchoredObj(mpDrawObj))->FindPageFrameOfAnchor());
+if (pPage) // may end up here with partial layout -> not visible
+{
+aBox = SwRect( mpDrawObj->GetCurrentBoundRect() );
+// tdf#91260 drawing object may be partially off-page
+aBox.Intersection(pPage->Frame());
+}
 }
 else if ( mpWindow )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e2151b30b270ef47faf403a412ee6e858febdeee
Author: Pranav Kant 
Date:   Fri Dec 16 21:47:07 2016 +0530

loleaflet: Fix incorrect key name

It is insertannotation, not just annotation

Change-Id: I1bc01e87da963d0e07d670ffec261e33b45062d2
Reviewed-on: https://gerrit.libreoffice.org/32096
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 77c24db..3ae6e54 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -403,7 +403,7 @@ $(function () {
{type: 'break', id: 'incdecindent'},
{type: 'html',  id: 'inserttable-html', html: ''},
{type: 'button',  id: 'inserttable',  img: 
'inserttable', hint: _('Insert table')},
-   {type: 'button',  id: 'annotation', img: 'annotation', 
hint: _('Insert comment'), uno: 'InsertAnnotation'},
+   {type: 'button',  id: 'insertannotation', img: 
'annotation', hint: _('Insert comment'), uno: 'InsertAnnotation'},
{type: 'button',  id: 'insertgraphic',  img: 
'insertgraphic', hint: _('Insert graphic')},
{type: 'button',  id: 'specialcharacter', img: 
'specialcharacter', hint: _('Special Character')},
{type: 'html', id: 'right'},
@@ -539,7 +539,7 @@ $(function () {
 var formatButtons = {
'undo': true, 'redo': true, 'save': true,
'bold': true, 'italic': true, 'underline': true, 'strikeout': true,
-   'annotation': true, 'inserttable': true,
+   'insertannotation': true, 'inserttable': true,
'fontcolor': true, 'backcolor': true, 'bullet': true, 'numbering': true,
'alignleft': true, 'alignhorizontal': true, 'alignright': true, 
'alignblock': true,
'incrementindent': true, 'decrementindent': true, 'insertgraphic': true,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |   33 -
 1 file changed, 16 insertions(+), 17 deletions(-)

New commits:
commit d1a3d365b01400907486ee8b57884465fd3073a2
Author: Pranav Kant 
Date:   Fri Dec 16 22:08:17 2016 +0530

loleaflet: Cleanup & fix default numbering/bullet state

Automatically initialize formatButtons internal object to
preclude the possibility of one forgetting to enter the id of the
button in formatButtons object.

Fix 'id' of default numbering/bullet button after which it is
correctly showing the state now.

Change-Id: I57247e1b0e6d462153a47d31a883ceb04ecff74b
Reviewed-on: https://gerrit.libreoffice.org/32101
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 3ae6e54..bd24fb5 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -333,6 +333,11 @@ function onColorPick(e, color) {
map.focus();
 }
 
+// This object is used to store enabled/disabled state of each and every 
eligible item
+// (i.e the one having UNO command) of toolbar-up. When the permission is 
changed to/from
+// edit/view mode, state from this object is read and then applied on 
corresponding buttons
+var formatButtons = {};
+
 $(function () {
$('#toolbar-up-more').w2toolbar({
name: 'toolbar-up-more',
@@ -395,8 +400,8 @@ $(function () {
{type: 'button',  id: 'sortascending',  img: 
'sortascending', hint: _('Sort Ascending'), uno: 'SortAscending'},
{type: 'button',  id: 'sortdescending',  img: 
'sortdescending', hint: _('Sort Descending'), uno: 'SortDescending'},
{type: 'break',   id: 'break-align'},
-   {type: 'button',  id: 'bullet',  img: 'bullet', hint: 
_('Bullets on/off'), uno: 'DefaultBullet'},
-   {type: 'button',  id: 'numbering',  img: 'numbering', 
hint: _('Numbering on/off'), uno: 'DefaultNumbering'},
+   {type: 'button',  id: 'defaultbullet',  img: 'bullet', 
hint: _('Bullets on/off'), uno: 'DefaultBullet'},
+   {type: 'button',  id: 'defaultnumbering',  img: 
'numbering', hint: _('Numbering on/off'), uno: 'DefaultNumbering'},
{type: 'break',   id: 'break-numbering'},
{type: 'button',  id: 'incrementindent',  img: 
'incrementindent', hint: _('Increase indent'), uno: 'IncrementIndent'},
{type: 'button',  id: 'decrementindent',  img: 
'decrementindent', hint: _('Decrease indent'), uno: 'DecrementIndent'},
@@ -449,6 +454,15 @@ $(function () {
}
}
 
+   // Intialize the formatButtons object
+   if (Object.keys(formatButtons).length === 0) {
+   for (var itemIdx in w2ui['toolbar-up'].items) {
+   if 
(w2ui['toolbar-up'].items[itemIdx].uno) {
+   
formatButtons[w2ui['toolbar-up'].items[itemIdx].id] = true;
+   }
+   }
+   }
+
insertTable();
}
});
@@ -535,21 +549,6 @@ $(function () {
});
 });
 
-// This object is used to track enabled/disabled state when one is in view mode
-var formatButtons = {
-   'undo': true, 'redo': true, 'save': true,
-   'bold': true, 'italic': true, 'underline': true, 'strikeout': true,
-   'insertannotation': true, 'inserttable': true,
-   'fontcolor': true, 'backcolor': true, 'bullet': true, 'numbering': true,
-   'alignleft': true, 'alignhorizontal': true, 'alignright': true, 
'alignblock': true,
-   'incrementindent': true, 'decrementindent': true, 'insertgraphic': true,
-   'insertfootnote': true, 'repair': true, 'specialcharacter': true,
-   'wraptext': true, 'togglemergecells': true, 'numberformatcurrency': 
true,
-   'numberformatpercent': true, 'numberformatdecimal': true, 
'numberformatdate': true,
-   'numberformatincdecimals': true, 'numberformatdecdecimals': true,
-   'sortascending': true, 'sortdescending': true
-};
-
 var userJoinedPopupMessage = '' + _('%user has joined') + '';
 var userLeftPopupMessage = '' + _('%user has left') + '';
 var userPopupTimeout = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Getting rid of 'oldref' in the help files

[khagaroth]

>
> it seems the goal is to move away from .xhp to .xhtml
>
> I hope you meant HTML 5, because XHTML is a dead end (and good riddance).

html does not have markup for some of the semantics that we have (and need)
> in the help files (like  or  to name few)
>

Both  and  are part of HTML 5 and there is a good chance
the other things are as well.

there are many ways how to describe the same thing in html ('s and 's
> vs.  and  vs. 's with css vs. who-knows-what)


CSS is the preferred way, its the same as with styles and direct formatting
in Writer.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: config_host/config_locales.h.in

[Caolán McNamara]

 config_host/config_locales.h.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 62f2a279ed1f50521e185a5bcc1f73fe0782993a
Author: Caolán McNamara 
Date:   Fri Dec 16 17:03:48 2016 +

add missing WITH_LOCALE_cu

Change-Id: I78bee8ee1426096830f8402e3967819779426783

diff --git a/config_host/config_locales.h.in b/config_host/config_locales.h.in
index 142f1b1..a5f1e65 100644
--- a/config_host/config_locales.h.in
+++ b/config_host/config_locales.h.in
@@ -29,6 +29,7 @@
  * these are one.
  */
 #define WITH_LOCALE_ca 0
+#define WITH_LOCALE_cu 0
 #define WITH_LOCALE_dz 0
 #define WITH_LOCALE_el 0
 #define WITH_LOCALE_he 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Getting rid of 'oldref' in the help files

[Michael Stahl]

On 12/16/2016 05:38 PM, Jan Holesovsky wrote:
> * there are many ways how to describe the same thing in html ('s and
>   's vs.  and  vs. 's with css vs. who-knows-what)
>   which would make the help harder to maintain, if we eg. want to reuse
>   the information from there to generate other representations (like
>   eg. books or so)

oh and of course HTML help content effectively requires first ditching
the current built-in Writer-based help browser, since Writer can only
handle ~HTML3 or so and if people can just write HTML5 directly they
surely don't want to be restricted to a subset with no tool to verify
they didn't get it wrong, so the pages have to be displayed by a proper
web browser.

but maybe getting rid of the Writer based online help is already part of
the goal, i don't know.


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

Re: Getting rid of 'oldref' in the help files

[Olivier Hallot]

HI Michael

You nailed it.


Em 16/12/2016 15:05, Michael Stahl escreveu:
> but maybe getting rid of the Writer based online help is already part of
> the goal, i don't know.
Eric Raymonds, The Cathedral and the Bazaar:

/13. "Perfection (in design) is achieved not when there is nothing more
to add, but rather when there is nothing more to take away."/

Regards

-- 
Olivier Hallot
LIbreOffice Documentation Coordinator
Comunidade LibreOffice 
Rio de Janeiro - Brasil - Local Time: UTC-02:00
http://tdf.io/joinus 

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

[Libreoffice-commits] core.git: configure.ac external/fontconfig external/freetype RepositoryExternal.mk

[Caolán McNamara]

 RepositoryExternal.mk |8 +++-
 configure.ac  |9 +
 external/fontconfig/ExternalProject_fontconfig.mk |2 +-
 external/fontconfig/Module_fontconfig.mk  |4 
 external/freetype/Module_freetype.mk  |4 
 5 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit d3c06fb90485543f6ca4b1f833e6c4f82b28ba14
Author: Caolán McNamara 
Date:   Fri Dec 16 17:19:39 2016 +

Revert "build our own fontconfig and freetype under oss-fuzz"

did I break android here mysteriously

This reverts commit f2fae3684f35bfb03c4921adc4ecbddcff36374b.

Change-Id: I0d941d3e474c6693cd15e1b55baab83a3da48488

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3d5c5aa..dcc47a6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1273,7 +1273,7 @@ endef
 
 gb_ExternalProject__use_freetype :=
 
-else
+else ifeq ($(OS),ANDROID)
 
 define gb_LinkTarget__use_freetype_headers
 $(call gb_LinkTarget_use_external_project,$(1),freetype)
@@ -1286,7 +1286,7 @@ endef
 
 define gb_LinkTarget__use_freetype
 $(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_add_libs,$(1),-lfreetype)
+$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
 
 endef
 
@@ -1309,7 +1309,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
 
 endef
 
-else
+else ifeq ($(OS),ANDROID)
 
 define gb_LinkTarget__use_fontconfig
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
@@ -1318,8 +1318,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
-$(call gb_LinkTarget_add_libs,$(1),-lfontconfig)
-
 endef
 
 endif # SYSTEM_FONTCONFIG
diff --git a/configure.ac b/configure.ac
index 3e58408..20cd80e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -661,14 +661,7 @@ linux-gnu*|k*bsd*-gnu*)
 build_gstreamer_0_10=yes
 test_tde=yes
 test_kde4=yes
-if test "$enable_fuzzers" != yes; then
-test_freetype=yes
-test_fontconfig=yes
-else
-test_freetype=no
-test_fontconfig=no
-BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
-fi
+test_freetype=yes
 _os=Linux
 ;;
 
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk 
b/external/fontconfig/ExternalProject_fontconfig.mk
index 83387e3..e4de004 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter 
ANDROID,$(OS)),LIBS="-lm") \
./configure \
--disable-shared \
-   $(if $(filter ANDROID,$(OS)),--with-arch=arm) \
+   --with-arch=arm \
--with-expat-includes=$(call 
gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
--with-freetype-config=$(call 
gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \
diff --git a/external/fontconfig/Module_fontconfig.mk 
b/external/fontconfig/Module_fontconfig.mk
index e755f86..764af35 100644
--- a/external/fontconfig/Module_fontconfig.mk
+++ b/external/fontconfig/Module_fontconfig.mk
@@ -9,9 +9,13 @@
 
 $(eval $(call gb_Module_Module,fontconfig))
 
+ifeq ($(OS),ANDROID)
+
 $(eval $(call gb_Module_add_targets,fontconfig,\
ExternalProject_fontconfig \
UnpackedTarball_fontconfig \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/freetype/Module_freetype.mk 
b/external/freetype/Module_freetype.mk
index 290014c..f6e316d 100644
--- a/external/freetype/Module_freetype.mk
+++ b/external/freetype/Module_freetype.mk
@@ -9,9 +9,13 @@
 
 $(eval $(call gb_Module_Module,freetype))
 
+ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF)))
+
 $(eval $(call gb_Module_add_targets,freetype,\
ExternalProject_freetype \
UnpackedTarball_freetype \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-documentation] Re: Getting rid of 'oldref' in the help files

[Jan Holesovsky]

Hi,

khagaroth píše v Pá 16. 12. 2016 v 17:51 +0100:

> > I hope you meant HTML 5, because XHTML is a dead end (and good riddance).
> 
> html does not have markup for some of the semantics that we have (and need)
> > in the help files (like  or  to name few)
> >
> 
> Both  and  are part of HTML 5 and there is a good chance
> the other things are as well.

They are, but they mean a completely different thing than what they mean
in XHP ;-)

 in XHP is more like .

Similarly  is more like a  with some associated css.

Again - I'm talking semantics;  is a general thing, and has no
semantics by itself, similarly .  We'd lose this by converting to a
plain HTML.

All the best,
Kendy

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

[Libreoffice-commits] online.git: loleaflet/src

[Pranav Kant]

 loleaflet/src/map/Map.js |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit dd4a5278ad034652b8dfd8984806f29a059e3581
Author: Pranav Kant 
Date:   Fri Dec 16 23:08:44 2016 +0530

loleaflet: Fix cursor dissappearing during document load

Change-Id: I9e301d7d2b6e7d2626de91c242b7617fbc823572

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 5e6665a..a04b654 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -855,6 +855,7 @@ L.Map = L.Evented.extend({
_onLostFocus: function () {
if (!this._loaded) { return; }
 
+   console.debug('_onLostFocus: ');
var doclayer = this._docLayer;
if (!doclayer) { return; }
 
@@ -876,7 +877,9 @@ L.Map = L.Evented.extend({
if (!this._loaded) { return; }
 
var doclayer = this._docLayer;
-   if (doclayer) {
+   if (doclayer &&
+   typeof doclayer._isCursorOverlayVisibleOnLostFocus !== 
'undefined' &&
+   typeof doclayer._isCursorVisibleOnLostFocus !== 
'undefined') {
// we restore the old cursor position by a small delay, 
so that if the user clicks
// inside the document we skip to restore it, so that 
the user does not see the cursor
// jumping from the old position to the new one
___
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.1' - bin/pack-debug

[László Németh]

 bin/pack-debug |   28 +++-
 1 file changed, 7 insertions(+), 21 deletions(-)

New commits:
commit 22b9afc57831f2fbd6ddad8c4a166f9a02154888
Author: László Németh 
Date:   Fri Dec 16 19:11:34 2016 +0100

pack-debug: clean up

Change-Id: I046bd0546d2b9838e940c0cc3444a42a239175b7

diff --git a/bin/pack-debug b/bin/pack-debug
index f5a31ac..6270229 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -12,22 +12,15 @@
 # build path
 export BUILD_PATH=$PWD
 
-# set package base name, eg. collaboraoffice5.1
-# based on the actual directory, eg. /opt/collaboraoffice5.1,
-# or checking the PACKAGENAME environmental variable
-
-if [ -z "$PACKAGENAME" ]
-then
-DEBUGSRC_PACKAGENAME=$(basename $BUILD_PATH)
-else
-DEBUGSRC_PACKAGENAME=$PACKAGENAME
-fi
-echo PACKAGE NAME: $DEBUGSRC_PACKAGENAME
-
 # set install dirname and product version
 eval $(grep ^INSTALLDIRNAME config.log)
 eval $(grep ^PRODUCTVERSION config.log)
 
+# set package base name, eg. collaboraoffice5.1
+DEBUGSRC_PACKAGENAME=$INSTALLDIRNAME$PRODUCTVERSION
+
+echo PACKAGENAME: $DEBUGSRC_PACKAGENAME
+
 #
 # Function for re-build RPM files
 #
@@ -50,13 +43,6 @@ DEBUGSRC="$(find workdir -name 
${DEBUGSRC_PACKAGENAME}.spec.log)"
 
 echo Base spec file: $DEBUGSRC
 
-if [ -z "$DEBUGSRC" ]
-then
- echo "Missing ${DEBUGSRC_PACKAGENAME}.spec.log in workdir/, specify spec.log 
file name in PACKAGENAME"
- echo "For example: PACKAGENAME=collaboraoffice5.1 dbg_pkg"
- exit 1
-fi
-
 # create spec file, based on the spec file of the brand package
 
 cat $DEBUGSRC | awk '
@@ -76,7 +62,7 @@ cat $DEBUGSRC | awk '
 
  # create source file list
 
- find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev 
'/(workdir|qa|DEBS)/' | grep -E '/(source|inc)/' |
+ find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev 
'/(instdir|workdir|qa|DEBS)/' |
 
  # list all directories for complete rpm remove
 
@@ -204,7 +190,7 @@ cat $DEBUGSRC | awk '
 
  # create source file list
 
- find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev 
'/(workdir|qa|DEBS)/' | grep -E '/(source|inc)/' |
+ find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev 
'/(instdir|workdir|qa|DEBS)/' |
 
  # list all directories
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/qa/unit/data/functions/statistical/fods/forecast.ets.add.fods |  655 
+-
 1 file changed, 346 insertions(+), 309 deletions(-)

New commits:
commit 8bd9e0503ebb6771c543e2fd9a0dc0d2d715f304
Author: Eike Rathke 
Date:   Fri Dec 16 19:22:52 2016 +0100

adjust rounding decimals to expected values

This may have been the cause for some tinderboxes choking on this test
on Windows and Mac if the forecast results slightly differed due to the
initialization with random values and the calculation taking place with
a different internal floating point precision. So let's try.

Blindly throwing ROUND(...,12) at all values is wrong anyway because
that doesn't take the magnitude of the expected value into account. What
we actually want is an accuracy of 12 digits, not an accuracy of 12
decimals.

0.123456789012
1.23456789012
12.3456789012
123.456789012
...

Change-Id: If88d75277c3d17cfd72f36d0f88d093b63da8add

diff --git a/sc/qa/unit/data/functions/statistical/fods/forecast.ets.add.fods 
b/sc/qa/unit/data/functions/statistical/fods/forecast.ets.add.fods
index 2adca77..608ec05 100644
--- a/sc/qa/unit/data/functions/statistical/fods/forecast.ets.add.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/forecast.ets.add.fods
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2016-07-24T08:15:55.36200P0D1LibreOfficeDev/5.3.0.0.alpha1$Linux_X86_64
 
LibreOffice_project/02af87fdd76bc94fb51aeb160c74d6f719c42c63
+ 
2016-07-24T08:15:55.36200P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/a7bd6830e26d798068970684754fa23894d9f7c2
  
   
0
0
100804
-   89824
+   85714

 
  view1
@@ -32,7 +32,7 @@
   
   
2
-   46
+   1
0
0
0
@@ -41,7 +41,7 @@
0
0
0
-   39
+   0
0
75
60
@@ -50,7 +50,7 @@
   
  
  Sheet2
- 1241
+ 1857
  0
  75
  60
@@ -91,10 +91,12 @@
true
true
true
+   true
+   true
false
12632256
false
-   Lexmark-E352dn
+   Generic 
Printer

 
  cs
@@ -125,14 +127,12 @@
  
 

-   true
-   true
3
1
true
1
true
-   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
+   lQH+/0dlbmVyaWMgUHJpbnRlcgAAU0dFTlBSVAAWAAMAtgAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcm

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Winfried Donkers]

 sc/source/core/tool/interpr3.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 83675eeb30c92a17dd272894df34b89628de0142
Author: Winfried Donkers 
Date:   Mon Dec 12 16:09:04 2016 +0100

tdf#104581 handle constraints for NEGBINOMDIST in compliance with ODFF1.2.

Also changed varaiable names for easier understanding of their meaning.

Change-Id: I7c6f338c04898c7b07ebeb97fb331d51fa691f5b
Reviewed-on: https://gerrit.libreoffice.org/31910
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 245b615400904274e264d5051baf63b3613db935)
Reviewed-on: https://gerrit.libreoffice.org/32087

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index d05c34d..1b6a367 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1493,17 +1493,17 @@ void ScInterpreter::ScNegBinomDist()
 {
 if ( MustHaveParamCount( GetByte(), 3 ) )
 {
-double p  = GetDouble();// p
-double r  = GetDouble();// r
-double x  = GetDouble();// x
-if (r < 0.0 || x < 0.0 || p < 0.0 || p > 1.0)
+double p = GetDouble();// probability
+double s = ::rtl::math::approxFloor(GetDouble());  // No of successes
+double f = ::rtl::math::approxFloor(GetDouble());  // No of failures
+if ((f + s) <= 1.0 || p < 0.0 || p > 1.0)
 PushIllegalArgument();
 else
 {
 double q = 1.0 - p;
-double fFactor = pow(p,r);
-for (double i = 0.0; i < x; i++)
-fFactor *= (i+r)/(i+1.0)*q;
+double fFactor = pow(p,s);
+for (double i = 0.0; i < f; i++)
+fFactor *= (i+s)/(i+1.0)*q;
 PushDouble(fFactor);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-l10n] Re: Getting rid of 'oldref' in the help files

[Khaled Hosny]

On Fri, Dec 16, 2016 at 05:51:41PM +0100, khagaroth wrote:
> > there are many ways how to describe the same thing in html ('s and 's
> > vs.  and  vs. 's with css vs. who-knows-what)
> 
> CSS is the preferred way, its the same as with styles and direct formatting
> in Writer.

CSS is preferred for styling not semantics. But all of this is moot if
we don’t have an HTML5 help viewer anyway.

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

[Libreoffice-commits] core.git: i18npool/CustomTarget_breakiterator.mk

[Caolán McNamara]

 i18npool/CustomTarget_breakiterator.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c60e07a86338b13eda6487f45b393e407275904b
Author: Caolán McNamara 
Date:   Fri Dec 16 15:50:25 2016 +

icu genbrk built with enable-static can't find its data, help it out

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

diff --git a/i18npool/CustomTarget_breakiterator.mk 
b/i18npool/CustomTarget_breakiterator.mk
index 302ad46..11c07fe 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -87,7 +87,7 @@ $(i18npool_BIDIR)/%_brk.c : $(i18npool_BIDIR)/%.brk $(call 
gb_ExternalExecutable
 $(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(call 
gb_ExternalExecutable_get_dependencies,genbrk)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1)
$(call gb_Helper_abbreviate_dirs,\
-   $(call gb_ExternalExecutable_get_command,genbrk) -r $< -o $@ 
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
+   $(call gb_ExternalExecutable_get_command,genbrk) -i $(call 
gb_UnpackedTarball_get_dir,icu)/source/data/out/tmp -r $< -o $@ $(if 
$(findstring s,$(MAKEFLAGS)),> /dev/null))
 
 # fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4
 # * Prepend set empty as of Unicode Version 6.1 / ICU 49, which bails out if 
used.
___
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' - vcl/source vcl/win

[Khaled Hosny]

 vcl/source/gdi/CommonSalLayout.cxx |5 -
 vcl/win/gdi/winlayout.cxx  |   16 +---
 2 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit a813623240ac9614c8b2b8b890b9eb83663c72c1
Author: Khaled Hosny 
Date:   Fri Dec 16 09:16:29 2016 +0200

tdf#104159: Fix caching glyphs of non-UI fonts

Partially reverts "tdf#103725: Fix horizontal scaling on Windows",
which didn't work on newer Windows versions anyway.

This reverts commit a5750d92b2136d60d698b41ef5760f2efac0ffce.

Reviewed-on: https://gerrit.libreoffice.org/32068
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 
(cherry picked from commit ab291ac3b8576a086cab60ffb64d60b046a271a2)

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

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 8ab8eb3..521d178 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -19,6 +19,9 @@
 
 #include "CommonSalLayout.hxx"
 
+#if defined(_WIN32)
+#include 
+#endif
 #include 
 #include 
 #include 
@@ -195,7 +198,7 @@ CommonSalLayout::CommonSalLayout(HDC hDC, WinFontInstance& 
rWinFontInstance, con
 }
 
 // Calculate the mnAveWidthFactor, see the comment where it is used.
-if (mrFontSelData.mnWidth)
+if (mrFontSelData.mnWidth && ! OpenGLHelper::isVCLOpenGLEnabled())
 {
 double nUPEM = hb_face_get_upem(hb_font_get_face(mpHbFont));
 
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 2d35175..cefe4b1 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3341,19 +3341,9 @@ std::vector 
D2DWriteTextOutRenderer::GetGlyphInkBoxes(uint16_t * pGid
 bool D2DWriteTextOutRenderer::GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** 
ppFontFace, float * lfSize) const
 {
 bool succeeded = false;
-IDWriteFont* pFont;
-
-LOGFONTW aLogFont;
-HFONT hFont = static_cast(::GetCurrentObject(hDC, OBJ_FONT));
-GetObjectW(hFont, sizeof(LOGFONTW), &aLogFont);
 try
 {
-succeeded = SUCCEEDED(mpGdiInterop->CreateFontFromLOGFONT(&aLogFont, 
&pFont));
-if (succeeded)
-{
-succeeded = SUCCEEDED(pFont->CreateFontFace(ppFontFace));
-pFont->Release();
-}
+succeeded = SUCCEEDED(mpGdiInterop->CreateFontFaceFromHdc(hDC, 
ppFontFace));
 }
 catch (const std::exception& e)
 {
@@ -3363,6 +3353,10 @@ bool D2DWriteTextOutRenderer::GetDWriteFaceFromHDC(HDC 
hDC, IDWriteFontFace ** p
 
 if (succeeded)
 {
+LOGFONTW aLogFont;
+HFONT hFont = static_cast(::GetCurrentObject(hDC, OBJ_FONT));
+
+GetObjectW(hFont, sizeof(LOGFONTW), &aLogFont);
 float dpix, dpiy;
 mpRT->GetDpi(&dpix, &dpiy);
 *lfSize = aLogFont.lfHeight * 96.0f / dpiy;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a414ce2787ae47cfd9a078dd17a9403c32c0e3fc
Author: Pranav Kant 
Date:   Fri Dec 16 18:44:40 2016 +0530

loleaflet: Don't move items to 'toolbar-more' after resizebreak

Change-Id: I9660e84f68cde2ab5eed6871d4f3948a736575b9
Reviewed-on: https://gerrit.libreoffice.org/32088
Reviewed-by: pranavk 
Tested-by: pranavk 
(cherry picked from commit 98036fd90935663263ad4a1be25c7c57e930825b)
Reviewed-on: https://gerrit.libreoffice.org/32090
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index dd698e3..692b39b 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -27,6 +27,9 @@ function resizeToolbar() {
// move items from toolbar-up -> toolbar-up-more
while ($('#toolbar-up')[0].scrollWidth > Math.max($(window).width(), 
parseInt($('body').css('min-width' {
var itemId = toolbarUp.items[toolbarUp.items.length - 4].id;
+   if (itemId === 'resizebreak') {
+   return;
+   }
item = toolbarUp.get(itemId);
toolbarUp.remove(itemId);
toolbarUpMore.insert(toolbarUpMore.items[0], item);
@@ -348,7 +351,7 @@ $(function () {
{type: 'html',   id: 'styles', html: ''},
{type: 'html',   id: 'fonts', html: ''},
{type: 'html',   id: 'fontsizes', html: ''},
-   {type: 'break'},
+   {type: 'break', id: 'resizebreak'},
{type: 'button',  id: 'bold',  img: 'bold', hint: 
_('Bold'), uno: 'Bold'},
{type: 'button',  id: 'italic', img: 'italic', hint: 
_('Italic'), uno: 'Italic'},
{type: 'button',  id: 'underline',  img: 'underline', 
hint: _('Underline'), uno: 'Underline'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4b9753d262dc6e5048ed46c7d8571621a969cd74
Author: Pranav Kant 
Date:   Fri Dec 16 21:47:07 2016 +0530

loleaflet: Fix incorrect key name

It is insertannotation, not just annotation

Change-Id: I1bc01e87da963d0e07d670ffec261e33b45062d2
Reviewed-on: https://gerrit.libreoffice.org/32096
Reviewed-by: pranavk 
Tested-by: pranavk 
(cherry picked from commit e2151b30b270ef47faf403a412ee6e858febdeee)
Reviewed-on: https://gerrit.libreoffice.org/32102
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index ee1e304..dd698e3 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -384,7 +384,7 @@ $(function () {
{type: 'break', id: 'incdecindent'},
{type: 'html',  id: 'inserttable-html', html: ''},
{type: 'button',  id: 'inserttable',  img: 
'inserttable', hint: _('Insert table')},
-   {type: 'button',  id: 'annotation', img: 'annotation', 
hint: _('Insert comment'), uno: 'InsertAnnotation'},
+   {type: 'button',  id: 'insertannotation', img: 
'annotation', hint: _('Insert comment'), uno: 'InsertAnnotation'},
{type: 'button',  id: 'insertgraphic',  img: 
'insertgraphic', hint: _('Insert graphic')},
{type: 'button',  id: 'specialcharacter', img: 
'specialcharacter', hint: _('Special Character')},
{type: 'html', id: 'right'},
@@ -501,7 +501,7 @@ $(function () {
 var formatButtons = {
'undo': true, 'redo': true, 'save': true,
'bold': true, 'italic': true, 'underline': true, 'strikeout': true,
-   'annotation': true, 'inserttable': true,
+   'insertannotation': true, 'inserttable': true,
'fontcolor': true, 'backcolor': true, 'bullet': true, 'numbering': true,
'alignleft': true, 'alignhorizontal': true, 'alignright': true, 
'alignblock': true,
'incrementindent': true, 'decrementindent': true, 'insertgraphic': true,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/src

[Pranav Kant]

 loleaflet/src/map/Map.js |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a8dc6cc29533ead37daeca01069f7d70c6258a3f
Author: Pranav Kant 
Date:   Fri Dec 16 23:08:44 2016 +0530

loleaflet: Fix cursor dissappearing during document load

Change-Id: I9e301d7d2b6e7d2626de91c242b7617fbc823572
(cherry picked from commit dd4a5278ad034652b8dfd8984806f29a059e3581)
Reviewed-on: https://gerrit.libreoffice.org/32106
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index b53c2d7..6a5972c 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -824,6 +824,7 @@ L.Map = L.Evented.extend({
_onLostFocus: function () {
if (!this._loaded) { return; }
 
+   console.debug('_onLostFocus: ');
var doclayer = this._docLayer;
if (!doclayer) { return; }
 
@@ -844,7 +845,9 @@ L.Map = L.Evented.extend({
if (!this._loaded) { return; }
 
var doclayer = this._docLayer;
-   if (doclayer) {
+   if (doclayer &&
+   typeof doclayer._isCursorOverlayVisibleOnLostFocus !== 
'undefined' &&
+   typeof doclayer._isCursorVisibleOnLostFocus !== 
'undefined') {
// we restore the old cursor position by a small delay, 
so that if the user clicks
// inside the document we skip to restore it, so that 
the user does not see the cursor
// jumping from the old position to the new one
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-l10n] Re: Getting rid of 'oldref' in the help files

[Martin Srebotnjak]

Hi, Jan,

2016-12-16 17:38 GMT+01:00 Jan Holesovsky :

> > It does not seem transparent for the few languages that do not use
> pootle (sl and sr) please do not forget those.
>
> Thanks for the reminder.  I hope Cloph can do the upgrade for them some
> way that fits them too, though?


I do not mind this happening if it does not affect the l10n process.

With that in mind the date/point at which it will be run must be set.

Probably this will happen after 5.3.x branch? It would make sense to do it
after the 5.3.0 release, when most l10n teams finish with their work and
have finished translating help, and still not started translating the 5.x
master. Or maybe after 5.3.1 release?

The sl and sr team would probably send their po files zipped (or they would
be taken from the git) and the script should be run through them and they
would be entered in the git and returned to respective l10n teams.

This conversion process (including the majority of l10n from Pootle) should
happen in a short span (like two working days, maybe more if required by
the scripts to go through all the languages and to check all converted
files for consistency by some other scripts).

Probably one (or a few) languages should be taken first to test this
procedure/the scripts and to have better estimates of time and resources
needed.

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sfx2/source

[Pranav Kant]

 sfx2/source/control/unoctitm.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1308498296d0d3dec32de92bdbd275ee75a70d54
Author: Pranav Kant 
Date:   Fri Dec 16 19:23:41 2016 +0530

lok: Sort ascending/descending is enabled/disabled state

... and not true/false

Change-Id: Ie9ae6cbf70c1934dda1002deabda23c9f461c8b1
(cherry picked from commit fc8d82743c90430aaf7dd7354ce97d34429c9882)
Reviewed-on: https://gerrit.libreoffice.org/32091
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index f61065f..c8b0c27 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1172,15 +1172,15 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "EntireRow" ||
  aEvent.FeatureURL.Path == "EntireColumn" ||
  aEvent.FeatureURL.Path == "EntireCell" ||
- aEvent.FeatureURL.Path == "MergeCells")
+ aEvent.FeatureURL.Path == "MergeCells" ||
+ aEvent.FeatureURL.Path == "SortAscending" ||
+ aEvent.FeatureURL.Path == "SortDescending")
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
 }
 else if (aEvent.FeatureURL.Path == "InsertPage" ||
  aEvent.FeatureURL.Path == "DeletePage" ||
- aEvent.FeatureURL.Path == "DuplicatePage" ||
- aEvent.FeatureURL.Path == "SortAscending" ||
- aEvent.FeatureURL.Path == "SortDescending")
+ aEvent.FeatureURL.Path == "DuplicatePage")
 {
 aBuffer.append(OUString::boolean(aEvent.IsEnabled));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

MSVC 2015's broken static initializer_list causing build failure

[Luke Benes]

When I try to build with MSVC 2015 I get the following error:
checking whether C:/PROGRA~2/MICROS~1.0/VC/bin/amd64/cl.exe has broken static 
initializer_list support... yes
configure: error: working support for static initializer_list needed
Error running configure at ./autogen.sh line 281.

$ git bisect bad
721116c7ade10d76e3ed6832e3988c91427ba431 is the first bad commit
commit 721116c7ade10d76e3ed6832e3988c91427ba431
Author: Stephan Bergmann 
Date:   Thu Dec 15 08:54:08 2016 +0100

Phase out support for HAVE_BROKEN_STATIC_INITIALIZER_LIST

...I'm pondering a change that would make that a hard requirement, and from 
the
comment in configure.ac it looks like only old Clang < 3.4 were affected.

MSVC 2013 works fine. Is this a flaw in the detection logic or does it really 
lack support? 

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/source sfx2/source

[Pranav Kant]

 desktop/source/lib/init.cxx  |1 -
 sfx2/source/control/unoctitm.cxx |   15 +--
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 6bd899f3fa44f2d78092333a399e141889b43dca
Author: Pranav Kant 
Date:   Fri Dec 16 19:35:02 2016 +0530

lok: Fix state feedback for ToggleMergeCells

Now it broadcasts "disabled" to disable the command and
true/false to tell the status of the command.

Change-Id: I3314da77fb2b84d97f64b9832d65791b84fcd7df
(cherry picked from commit c34ac4cbcc1e8273f68125990c27e5b25297358d)
Reviewed-on: https://gerrit.libreoffice.org/32092
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 61a85ae..62d8d34 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1288,7 +1288,6 @@ static void doc_iniUnoCommands ()
 OUString(".uno:EntireRow"),
 OUString(".uno:EntireColumn"),
 OUString(".uno:EntireCell"),
-OUString(".uno:MergeCells"),
 OUString(".uno:AssignLayout"),
 OUString(".uno:StatusDocPos"),
 OUString(".uno:RowColSelCount"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c8b0c27..063f808 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1172,7 +1172,6 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "EntireRow" ||
  aEvent.FeatureURL.Path == "EntireColumn" ||
  aEvent.FeatureURL.Path == "EntireCell" ||
- aEvent.FeatureURL.Path == "MergeCells" ||
  aEvent.FeatureURL.Path == "SortAscending" ||
  aEvent.FeatureURL.Path == "SortDescending")
 {
@@ -1217,7 +1216,6 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 }
 else if (aEvent.FeatureURL.Path == "InsertMode" ||
  aEvent.FeatureURL.Path == "WrapText" ||
- aEvent.FeatureURL.Path == "ToggleMergeCells" ||
  aEvent.FeatureURL.Path == "NumberFormatCurrency" ||
  aEvent.FeatureURL.Path == "NumberFormatPercent" ||
  aEvent.FeatureURL.Path == "NumberFormatDate")
@@ -1229,6 +1227,19 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aBuffer.append(OUString::boolean(aBool));
 }
 }
+else if (aEvent.FeatureURL.Path == "ToggleMergeCells")
+{
+sal_Bool aBool;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aBool))
+{
+aBuffer.append(OUString::boolean(aBool));
+}
+else
+{
+aBuffer.append(OUString("disabled"));
+}
+}
 else if (aEvent.FeatureURL.Path == "Position")
 {
 css::awt::Point aPoint;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-l10n] Getting rid of 'oldref' in the help files

[Gabor Kelemen]

Hi all

2016-12-16 16:13 keltezéssel, Jan Holesovsky írta:
> The idea is to get rid of the 'oldref' attribute in the help files; ie.
> change
>
>l10n="U" oldref="13">Heading
>
> to
>
>l10n="U">Heading
I did not realized oldref being part of msgctxt, so in my recent help
commits removed a lot of these from the files I touched, even from
otherwise untouched strings. So I probably made quite a few fuzzy
strings - sorry about that.

With that being said, I fully support this move, like right now :).

Also if possible, please kill the l10n attribute along it. These two
make my eyes bleed while editing the original xml.

Regards
Gabor




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

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

[Thorsten Behrens]

Hi Björn,

Bjoern Michaelsen wrote:
> 1/ We unpublish all API
>
Ok so far -

> 2/ We give UNO user an opportunity to ask for republishing specific parts of
>the API, when they provide a reasonable use case and promise to be the
>"client steward" for these.
>
This is where the plan breaks already.

To relay some stories from real life - there's _so_ much integration
with especially OpenOffice out there, coming from legacy systems, tons
of macro-ized applications, sometimes bespoke development with the
company simply selling, not developing anymore - that by the time
those deployments 'see' our unpublished API (and subsequent changes
thereof), it's gonna be much, much, much too late to do anything about
it.

Those people will then simply walk away.

The idea that we could somehow entice a sizeable chunk of our API
consumers to be part of our community is a pipe dream. Like it or not,
with taking over market share from OpenOffice we inherited that API
promise, and I'd really prefer to continue serving that market
segment.

I mean, Linux has not been exactly timid in changing implementation
quite rapidly, still they managed to keep the userland API reasonably
stable. Why can't we? Except for the repulsiveness of XFoo2, XFoo3,
and some extra day of hacking here or there - did this really hold us
back so far?

> There might be some hope that UNO API users like WollMux, Mendeley, Zotero
> might be interested in this -- and by talking to them instead of with
> $ANONYMOUS_GUY_ON_THE_INTERTUBES we might get a sensible feedback channel and
> bring out ecosystem closer together -- as they have incentives to join this
> discussion.
> 
Orthogonally to the above, that's a really worthwhile idea. I was once
already kicking the idea of an API forum / mailing list / whatever
around; perhaps -- if properly seeded & tended -- the dev askbot
instance could be that?

Cheers,

-- Thorsten


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

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

[Bjoern Michaelsen]

Hi,

On Fri, Dec 16, 2016 at 11:40:21PM +0100, Thorsten Behrens wrote:
> To relay some stories from real life - there's _so_ much integration
> with especially OpenOffice out there, coming from legacy systems, tons
> of macro-ized applications, sometimes bespoke development with the
> company simply selling, not developing anymore - that by the time
> those deployments 'see' our unpublished API (and subsequent changes
> thereof), it's gonna be much, much, much too late to do anything about
> it.

As said in my reply to Michael already, this has little to do with the actual
decision making except for us to get a better information base.

Your statement and Michaels statement display the antipodes of these arguments
and I assume we will continue to have these discussion on the ESC on a
case-by-case base -- possibly just somewhat better informed now and then.

> Orthogonally to the above, that's a really worthwhile idea. I was once
> already kicking the idea of an API forum / mailing list / whatever
> around; perhaps -- if properly seeded & tended -- the dev askbot
> instance could be that?

see draft at: 
https://wiki.documentfoundation.org/index.php?title=Development%2FBudget2017&diff=140532&oldid=140527
(also mentions askbot already)

Best,

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

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 3315 commits - accessibility/inc accessibility/source android/Bootstrap android/mobile-config.py android/source animations/source app

[Douglas Mencken]

Rebased ref, commits from common ancestor:
commit 184d5f5050665ac727494de96e30894a5ca010d0
Author: Douglas Mencken 
Date:   Fri Oct 7 14:03:18 2016 -0400

Let that “ abletorunwindowsnativelysowhytouseOS ” rest in peace

This reverts commit
a6c88e4bf1d148ac462c2bcd7061eff602b627d6  
SAL_WNODEPRECATED_DECLARATIONS_ around new 10.12 deprecations

diff --git a/apple_remote/source/RemoteMainController.m 
b/apple_remote/source/RemoteMainController.m
index 9e933a3..79af22f 100644
--- a/apple_remote/source/RemoteMainController.m
+++ b/apple_remote/source/RemoteMainController.m
@@ -85,8 +85,6 @@
 
 - (void) postTheEvent: (short int)buttonIdentifier 
modifierFlags:(int)modifierFlags
 {
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-// 'NSApplicationDefined' is deprecated: first deprecated in macOS 
10.12
 [NSApp postEvent:
 [NSEventotherEventWithType:NSApplicationDefined
 location:NSZeroPoint
@@ -98,7 +96,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 data1: buttonIdentifier
 data2: 0]
 atStart: NO];
-SAL_WNODEPRECATED_DECLARATIONS_POP
 }
 
 
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index 90abe7a..5fb8a72 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -388,12 +388,7 @@ void SAL_CALL DropTarget::initialize(const Sequence< Any 
>& aArguments)
 
 id wnd = [mView window];
 NSWindow* parentWnd = [wnd parentWindow];
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-// 'NSClosableWindowMask' is deprecated: first deprecated in macOS 
10.12
-// 'NSResizableWindowMask' is deprecated: first deprecated in macOS 
10.12
-// 'NSTitleWindowMask' is deprecated: first deprecated in macOS 10.12
 unsigned int topWndStyle = (NSTitledWindowMask | NSClosableWindowMask | 
NSResizableWindowMask);
-SAL_WNODEPRECATED_DECLARATIONS_POP
 unsigned int wndStyles = [wnd styleMask] & topWndStyle;
 
 if (parentWnd == nil && (wndStyles == topWndStyle))
diff --git a/vcl/osx/a11ytextattributeswrapper.mm 
b/vcl/osx/a11ytextattributeswrapper.mm
index 7374a86..042fafd 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -272,11 +272,6 @@ using namespace ::com::sun::star::uno;
 sal_Int32 alignment;
 property.Value >>= alignment;
 NSNumber *textAlignment = nil;
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-// 'NSCenterTextAlignment' is deprecated: first deprecated in macOS 10.12
-// 'NSJustifiedTextAlignment' is deprecated: first deprecated in macOS 
10.12
-// 'NSLeftTextAlignment' is deprecated: first deprecated in macOS 10.12
-// 'NSRightTextAlignment' is deprecated: first deprecated in macOS 10.12
 switch(alignment) {
 case css::style::ParagraphAdjust_RIGHT : textAlignment = 
[NSNumber numberWithInteger:NSRightTextAlignment]; break;
 case css::style::ParagraphAdjust_CENTER: textAlignment = 
[NSNumber numberWithInteger:NSCenterTextAlignment]   ; break;
@@ -284,7 +279,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 case css::style::ParagraphAdjust_LEFT  :
 default : 
textAlignment = [NSNumber numberWithInteger:NSLeftTextAlignment] ; break;
 }
-SAL_WNODEPRECATED_DECLARATIONS_POP
 NSDictionary *paragraphStyle = [NSDictionary 
dictionaryWithObjectsAndKeys:textAlignment, @"AXTextAlignment", textAlignment, 
@"AXVisualTextAlignment", nil];
 [string addAttribute:@"AXParagraphStyle" value:paragraphStyle 
range:range];
 }
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index f082a416..6800e4b 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -156,12 +156,6 @@ void AquaSalFrame::initWindowAndView()
 maGeometry.nHeight = static_cast(aVisibleRect.size.height * 
0.8);
 
 // calculate style mask
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-// 'NSBorderlessWindowMask' is deprecated: first deprecated in macOS 
10.12
-// 'NSClosableWindowMask' is deprecated: first deprecated in macOS 
10.12
-// 'NSMiniaturizableWindowMask' is deprecated: first deprecated in 
macOS 10.12
-// 'NSResizableWindowMask' is deprecated: first deprecated in macOS 
10.12
-// 'NSTitledWindowMask' is deprecated: first deprecated in macOS 10.12
 if( (mnStyle & SalFrameStyleFlags::FLOAT) ||
 (mnStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) )
 mnStyleMask = NSBorderlessWindowMask;
@@ -195,7 +189,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 if( mnStyleMask != 0 )
 mnStyleMask |= NSTitledWindowMask;
 }
-SAL_WNODEPRECATED_DECLARATIONS_POP
 
 // #i91990# support GUI-less (daemon) execution
 @try
@@ -1413,17 +1406,6 @@ SalPointerState AquaSalFrame::GetPointerState()
 if( pCur )
 {
 bMouseEvent = true;
-SAL_WNODEPRECATED_DECLARATIONS_

[Libreoffice-commits] online.git: 4 commits - kit/ForKit.cpp kit/Kit.cpp loleaflet/dist loleaflet/src loolwsd-systemplate-setup

[Henry Castro]

 kit/ForKit.cpp   |3 ++-
 kit/Kit.cpp  |7 +++
 loleaflet/dist/toolbar/toolbar.js|8 
 loleaflet/src/control/Control.Menubar.js |4 +++-
 loolwsd-systemplate-setup|2 ++
 5 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 416c4a526731113b241b61c07bc1c1ea17f82b0e
Author: Henry Castro 
Date:   Fri Dec 16 22:34:53 2016 -0400

Revert "disable 'Insert Special Character' for Impress"

This reverts commit 0e786d14a0681e5ff9e8b421704593972e0c0a27.

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index bd24fb5..c122c59 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -825,8 +825,8 @@ map.on('doclayerinit', function () {
case 'presentation':
var presentationToolbar = w2ui['presentation-toolbar'];
presentationToolbar.show('presentation', 'presentationbreak', 
'insertpage', 'duplicatepage', 'deletepage');
-   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 
'specialcharacter');
-   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending', 'specialcharacter');
+   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
+   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
statusbar.insert('left', [
{type: 'break', id:'break1'},
{type: 'html',  id: 'PageStatus',
@@ -834,8 +834,8 @@ map.on('doclayerinit', function () {
]);
break;
case 'drawing':
-   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 
'specialcharacter');
-   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending', 'specialcharacter');
+   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
+   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
break;
}
toolbarUp.refresh();
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 4da078a..e854d5b 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -187,7 +187,9 @@ L.Control.Menubar = L.Control.extend({
{name: _('Reset zoom'), id: 'zoomreset', type: 
'action'}]
},
{name: _('Insert'), type: 'menu', menu: [
-   {name: _('Image'), id: 'insertgraphic', type: 
'action'}]
+   {name: _('Image'), id: 'insertgraphic', type: 
'action'},
+   {type: 'separator'},
+   {name: _('Special character...'), id: 
'specialcharacter', type: 'action'}]
},
{name: _('Tables'), type: 'menu', menu: [
{name: _('Insert'), type: 'menu', menu: [
commit 20f6d8cdc77659cbce9b4b8f508b61cc9bf18b3e
Author: Henry Castro 
Date:   Fri Dec 16 22:32:05 2016 -0400

kit: cosmetic

Required to custom lokit process de

Re: MSVC 2015's broken static initializer_list causing build failure

[Noel Grandin]

which update of VS2015 are you running? They added lots of stuff in the
later updates​
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice