[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 3 commits - editeng/source include/editeng include/sfx2 sc/qa sd/inc sd/qa sd/source sfx2/source sw/qa

[Miklos Vajna]

 editeng/source/editeng/editview.cxx|8 +++-
 editeng/source/editeng/impedit.cxx |2 +
 include/editeng/outliner.hxx   |2 +
 include/sfx2/viewsh.hxx|2 +
 sc/qa/unit/tiledrendering/tiledrendering.cxx   |1 
 sd/inc/undo/undomanager.hxx|   10 -
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |   40 
 sd/source/core/undo/undomanager.cxx|   50 +
 sd/source/ui/view/viewshe3.cxx |   11 +
 sfx2/source/view/viewsh.cxx|6 +++
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   44 ++
 11 files changed, 173 insertions(+), 3 deletions(-)

New commits:
commit 5c99ed5f6524deb58f5a2ef4b91f69bfa0d21b25
Author: Miklos Vajna 
Date:   Wed Aug 17 07:53:16 2016 +0200

sd lok: limit undo/redo access to undo actions created by the same view

Unlike in Writer, the state and the exec method of .uno:Undo is
different codepath so for now ignore the Repair argument of the command,
assuming that the command is only dispatched if the command is enabled.

Change-Id: I3bfe8d72522f32efe436e21c383c99b3612eab6b
(cherry picked from commit e0a3269183bf145511361a3968dca07824923dd4)

diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index a020038..5c3a082 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -22,11 +22,14 @@
 
 #include 
 #include 
+#include "sddllapi.h"
+
+class SfxViewShell;
 
 namespace sd
 {
 
-class UndoManager : public SdrUndoManager
+class SD_DLLPUBLIC UndoManager : public SdrUndoManager
 {
 public:
 UndoManager( sal_uInt16 nMaxUndoActionCount = 20 );
@@ -34,6 +37,9 @@ public:
 virtual voidEnterListAction(const OUString &rComment, const 
OUString& rRepeatComment, sal_uInt16 nId, sal_Int32 nViewShellId) override;
 
 virtual voidAddUndoAction( SfxUndoAction *pAction, bool 
bTryMerg=false ) override;
+size_t GetUndoActionCount(const bool bCurrentLevel = true) const override;
+size_t GetRedoActionCount(const bool bCurrentLevel = true) const override;
+void SetViewShell(SfxViewShell* pViewShell);
 
 /** Set or reset the undo manager linked with the called undo manager.
 */
@@ -47,6 +53,8 @@ private:
 synchronize the undo managers.
 */
 ::svl::IUndoManager* mpLinkedUndoManager;
+/// Return undo/redo info for this view.
+SfxViewShell* mpViewShell;
 
 /** Call ClearRedo() at the linked undo manager, when present.
 
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 93c67d9..77f4ab1 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -69,6 +69,7 @@ public:
 void testViewCursorParts();
 void testCursorViews();
 void testViewLock();
+void testUndoLimiting();
 
 CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -93,6 +94,7 @@ public:
 CPPUNIT_TEST(testViewCursorParts);
 CPPUNIT_TEST(testCursorViews);
 CPPUNIT_TEST(testViewLock);
+CPPUNIT_TEST(testUndoLimiting);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1067,6 +1069,43 @@ void SdTiledRenderingTest::testViewLock()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void SdTiledRenderingTest::testUndoLimiting()
+{
+comphelper::LibreOfficeKit::setActive();
+
+// Create the first view.
+SdXImpressDocument* pXImpressDocument = createDoc("title-shape.odp");
+SfxViewShell& rViewShell1 = 
pXImpressDocument->GetDocShell()->GetViewShell()->GetViewShellBase();
+SfxLokHelper::createView();
+
pXImpressDocument->initializeForTiledRendering(uno::Sequence());
+SfxViewShell& rViewShell2 = 
pXImpressDocument->GetDocShell()->GetViewShell()->GetViewShellBase();
+
+// Begin text edit on the only object on the slide.
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+SdrView* pView = pViewShell->GetView();
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::TAB);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::TAB);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
+pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT(pView->IsTextEdit());
+
+// Now check what views see the undo action.
+SdDrawDocument* pDocument = pXImpressDocument->GetDoc();
+sd::UndoManager* pUndoManager = pDocument->GetUndoManager();
+pUndoManager->SetViewShell(&rViewShell1);
+// This was 1, undo action was visible to the first view, even if the
+// action belongs to the second view.
+CPPUNIT_ASSERT_EQUAL(static_cast(0), 
pUndoManager->GetUndoActionCount());
+pUndoManager->SetViewShell(&rViewShell2);
+CPPUNIT_ASSERT_EQUAL(s

Re: Lai Chen Yao license statement

[jan iversen]

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

[Libreoffice-commits] core.git: extras/source include/sfx2 include/vcl sfx2/Library_sfx.mk sfx2/source sw/uiconfig vcl/source

[Szymon Kłos]

 extras/source/glade/libreoffice-catalog.xml.in |3 
 include/sfx2/sidebar/SidebarToolBox.hxx|2 
 include/vcl/toolbox.hxx|6 +
 sfx2/Library_sfx.mk|1 
 sfx2/source/notebookbar/BigToolBox.cxx |   53 
 sfx2/source/notebookbar/BigToolBox.hxx |   48 ++
 sw/uiconfig/swriter/ui/notebookbar.ui  |   53 
 vcl/source/window/toolbox.cxx  |   81 ++---
 8 files changed, 202 insertions(+), 45 deletions(-)

New commits:
commit ce59d3be31c144279a8ab857a2f1fc71bafab343
Author: Szymon Kłos 
Date:   Tue Aug 16 09:40:27 2016 +0200

GSoC notebookbar: BigToolBox

+ New container: sfxlo-BigToolBox
+ Writer: Paste button with dropdown menu

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

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 244e0db..ebb4d47 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -831,5 +831,8 @@
 
+
   
 
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx 
b/include/sfx2/sidebar/SidebarToolBox.hxx
index 131364d..17a8e48 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -59,7 +59,7 @@ public:
 
 css::uno::Reference GetFirstController();
 
-private:
+protected:
 typedef std::map> ControllerContainer;
 ControllerContainer maControllers;
 bool mbAreHandlersRegistered;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 06df859..96a2580 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -68,6 +68,9 @@ enum ToolBoxButtonSize { TOOLBOX_BUTTONSIZE_DONTCARE, 
TOOLBOX_BUTTONSIZE_SMALL,
 //   toolbox is prevented from centering the items
 enum class ToolBoxLayoutMode { Normal, LockVert };
 
+// Position of the text when icon and text are painted
+enum ToolBoxTextPosition { Right, Bottom };
+
 struct ImplToolSize
 {
 long mnWidth;
@@ -146,6 +149,7 @@ private:
 PointerStylemeLastStyle;
 WinBits mnWinStyle;
 ToolBoxLayoutMode   meLayoutMode;
+ToolBoxTextPosition meTextPosition;
 Link maClickHdl;
 Link maDoubleClickHdl;
 Link maActivateHdl;
@@ -511,6 +515,8 @@ public:
 
 void SetToolbarLayoutMode( ToolBoxLayoutMode eLayout );
 void statusChanged(const css::frame::FeatureStateEvent& rEvent);
+
+void SetToolBoxTextPosition( ToolBoxTextPosition ePosition );
 };
 
 inline void ToolBox::CheckItem( sal_uInt16 nItemId, bool bCheck )
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 4606975..02956b1 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -240,6 +240,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/doc/saveastemplatedlg \
 sfx2/source/explorer/nochaos \
 sfx2/source/inet/inettbc \
+sfx2/source/notebookbar/BigToolBox \
 sfx2/source/notebookbar/DropdownBox \
 sfx2/source/notebookbar/NotebookBarPopupMenu \
 sfx2/source/notebookbar/NotebookbarToolBox \
diff --git a/sfx2/source/notebookbar/BigToolBox.cxx 
b/sfx2/source/notebookbar/BigToolBox.cxx
new file mode 100644
index 000..8848cba
--- /dev/null
+++ b/sfx2/source/notebookbar/BigToolBox.cxx
@@ -0,0 +1,53 @@
+/* -*- 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 "BigToolBox.hxx"
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+namespace sfx2 { namespace notebookbar {
+
+BigToolBox::BigToolBox(vcl::Window* pParent)
+: SidebarToolBox(pParent)
+{
+SvtMiscOptions aMiscOptions;
+aMiscOptions.RemoveListenerLink(LINK(this, SidebarToolBox, 
ChangedIconSizeHandler));
+
+SetToolboxButtonSize(TOOLBOX_BUTTONSIZE_LARGE);
+SetButtonType(ButtonType::SYMBOLTEXT);
+SetToolBoxTextPosition(ToolBoxText

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

[Tor Lillqvist]

 include/xmloff/fasttokenhandler.hxx |8 
 xmloff/source/core/fasttokenhandler.cxx |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d5ffeddff2a241c2cbbf1e3a03e41aee47307f87
Author: Tor Lillqvist 
Date:   Wed Aug 17 09:56:52 2016 +0300

loplugin:staticmethods

Change-Id: I84fe6603010defcfae32250c86e75cf2237f64a1

diff --git a/include/xmloff/fasttokenhandler.hxx 
b/include/xmloff/fasttokenhandler.hxx
index 9cda5e3..991318e 100644
--- a/include/xmloff/fasttokenhandler.hxx
+++ b/include/xmloff/fasttokenhandler.hxx
@@ -27,7 +27,7 @@ public:
 ~TokenMap();
 
 /** Returns the token identifier for the passed Unicode token name. */
-sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName ) const;
+static sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName );
 
 /** Returns the UTF8 name of the passed token identifier as byte sequence. 
*/
 css::uno::Sequence< sal_Int8 > getUtf8TokenName( sal_Int32 nToken ) const
@@ -39,20 +39,20 @@ public:
 }
 
 /** Returns the token identifier for the passed UTF8 token name. */
-sal_Int32 getTokenFromUtf8( const css::uno::Sequence< sal_Int8 >& 
rUtf8Name ) const
+static sal_Int32 getTokenFromUtf8( const css::uno::Sequence< sal_Int8 >& 
rUtf8Name )
 {
 return getTokenFromUTF8( reinterpret_cast< const char* >(
 rUtf8Name.getConstArray() ), rUtf8Name.getLength() );
 }
 
 /** Returns the token identifier for a UTF8 string passed in pToken */
-sal_Int32 getTokenFromUTF8( const char *pToken, sal_Int32 nLength ) const
+static sal_Int32 getTokenFromUTF8( const char *pToken, sal_Int32 nLength )
 {
 return getTokenPerfectHash( pToken, nLength );
 }
 
 private:
-sal_Int32 getTokenPerfectHash( const char *pToken, sal_Int32 nLength ) 
const;
+static sal_Int32 getTokenPerfectHash( const char *pToken, sal_Int32 
nLength );
 
 std::vector< css::uno::Sequence< sal_Int8 > > maTokenNames;
 };
diff --git a/xmloff/source/core/fasttokenhandler.cxx 
b/xmloff/source/core/fasttokenhandler.cxx
index 722584c..9e2b45f 100644
--- a/xmloff/source/core/fasttokenhandler.cxx
+++ b/xmloff/source/core/fasttokenhandler.cxx
@@ -55,14 +55,14 @@ TokenMap::~TokenMap()
 {
 }
 
-sal_Int32 TokenMap::getTokenFromUnicode( const OUString& rUnicodeName ) const
+sal_Int32 TokenMap::getTokenFromUnicode( const OUString& rUnicodeName )
 {
 OString aUtf8Name = OUStringToOString( rUnicodeName, RTL_TEXTENCODING_UTF8 
);
 const struct xmltoken* pToken = Perfect_Hash::in_word_set( 
aUtf8Name.getStr(), aUtf8Name.getLength() );
 return pToken ? pToken->nToken : XML_TOKEN_INVALID;
 }
 
-sal_Int32 TokenMap::getTokenPerfectHash( const char *pStr, sal_Int32 nLength ) 
const
+sal_Int32 TokenMap::getTokenPerfectHash( const char *pStr, sal_Int32 nLength )
 {
 const struct xmltoken *pToken = Perfect_Hash::in_word_set( pStr, nLength );
 return pToken ? pToken->nToken : XML_TOKEN_INVALID;
@@ -87,13 +87,13 @@ uno::Sequence< sal_Int8 > 
FastTokenHandler::getUTF8Identifier( sal_Int32 nToken
 sal_Int32 FastTokenHandler::getTokenFromUTF8( const uno::Sequence< sal_Int8 >& 
rIdentifier )
 throw (uno::RuntimeException, std::exception)
 {
-return mrTokenMap.getTokenFromUtf8( rIdentifier );
+return TokenMap::getTokenFromUtf8( rIdentifier );
 }
 
 // Much faster direct C++ shortcut
 sal_Int32 FastTokenHandler::getTokenDirect( const char* pToken, sal_Int32 
nLength ) const
 {
-return mrTokenMap.getTokenFromUTF8( pToken, nLength );
+return TokenMap::getTokenFromUTF8( pToken, nLength );
 }
 
 } // namespace token
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 include/xmloff/fasttokenhandler.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 293b6080e9f3cd911d0046bfa16f556616c59d04
Author: Tor Lillqvist 
Date:   Wed Aug 17 10:24:15 2016 +0300

UTF-8 is Unicode, too

There is no dichotomy of "Unicode" vs. "UTF-8". What is meant is
UTF-16 (OUString) vs. UTF-8. So say so in the comments.

Change-Id: I14fa7f543e87ed9e54fb37374a0b17d7e09a0879

diff --git a/include/xmloff/fasttokenhandler.hxx 
b/include/xmloff/fasttokenhandler.hxx
index 991318e..c71cbf1 100644
--- a/include/xmloff/fasttokenhandler.hxx
+++ b/include/xmloff/fasttokenhandler.hxx
@@ -26,10 +26,10 @@ public:
 explicit TokenMap();
 ~TokenMap();
 
-/** Returns the token identifier for the passed Unicode token name. */
+/** Returns the token identifier for the passed OUString (UTF-16) token 
name. */
 static sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName );
 
-/** Returns the UTF8 name of the passed token identifier as byte sequence. 
*/
+/** Returns the UTF-8 name of the passed token identifier as byte 
sequence. */
 css::uno::Sequence< sal_Int8 > getUtf8TokenName( sal_Int32 nToken ) const
 {
 SAL_WARN_IF(nToken < 0 || nToken >= XML_TOKEN_COUNT, "xmloff", "Wrong 
nToken parameter");
@@ -38,14 +38,14 @@ public:
 return css::uno::Sequence< sal_Int8 >();
 }
 
-/** Returns the token identifier for the passed UTF8 token name. */
+/** Returns the token identifier for the passed UTF-8 token name. */
 static sal_Int32 getTokenFromUtf8( const css::uno::Sequence< sal_Int8 >& 
rUtf8Name )
 {
 return getTokenFromUTF8( reinterpret_cast< const char* >(
 rUtf8Name.getConstArray() ), rUtf8Name.getLength() );
 }
 
-/** Returns the token identifier for a UTF8 string passed in pToken */
+/** Returns the token identifier for a UTF-8 string */
 static sal_Int32 getTokenFromUTF8( const char *pToken, sal_Int32 nLength )
 {
 return getTokenPerfectHash( pToken, nLength );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rishabh Kumar]

 cui/source/inc/cuitabarea.hxx|   37 ++-
 cui/source/tabpages/tabarea.cxx  |2 
 cui/source/tabpages/tpbitmap.cxx |  469 ++-
 cui/uiconfig/ui/bitmaptabpage.ui |  387 
 4 files changed, 885 insertions(+), 10 deletions(-)

New commits:
commit 0e867bc4cba66c14d543e111ea8ab89dc2444ee0
Author: Rishabh Kumar 
Date:   Fri Aug 12 04:22:28 2016 +0530

[GSoC] Add new Bitmap controls to bitmap tab

Change-Id: I0eb59e5082da1efa52dcb3b85f6e4129aad3e676
Reviewed-on: https://gerrit.libreoffice.org/26402
Tested-by: Jenkins 
Tested-by: Yousuf Philips 
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 25c0924..2d4935f 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -33,9 +33,9 @@
 #include 
 #include 
 #include 
+#include 
 
 class SdrModel;
-class SdrView;
 class SvxBitmapCtl;
 
 //
@@ -534,9 +534,23 @@ class SvxBitmapTabPage : public SvxTabPage
 {
 using TabPage::ActivatePage;
 using TabPage::DeactivatePage;
+static const sal_uInt16 pBitmapRanges[];
 private:
 
 VclPtr   m_pBitmapLB;
+VclPtrm_pBitmapStyleLB;
+VclPtr m_pSizeBox;
+VclPtr   m_pTsbScale;
+VclPtrm_pBitmapWidth;
+VclPtrm_pBitmapHeight;
+VclPtr m_pPositionBox;
+VclPtrm_pPositionLB;
+VclPtr m_pPositionOffBox;
+VclPtrm_pPositionOffX;
+VclPtrm_pPositionOffY;
+VclPtr m_pTileOffBox;
+VclPtrm_pTileOffLB;
+VclPtrm_pTileOffset;
 VclPtr m_pBtnImport;
 VclPtrm_pCtlBitmapPreview;
 
@@ -547,6 +561,8 @@ private:
 XFillStyleItem m_aXFStyleItem;
 XFillBitmapItemm_aXBitmapItem;
 
+double m_fObjectWidth;
+double m_fObjectHeight;
 sal_uInt16*m_nPageType;
 sal_uInt16 m_nDlgType;
 sal_Int32* m_nPos;
@@ -555,12 +571,28 @@ private:
 
 XFillAttrSetItem   m_aXFillAttr;
 SfxItemSet&m_rXFSet;
-
+const SdrView* mpView;
+SfxMapUnit mePoolUnit;
+FieldUnit  meDlgUnit;
+Size   rBitmapSize;
+Size   rFilledSize;
+Size   rZoomedSize;
+sal_Int64  nFilledWidthPercent;
+sal_Int64  nFilledHeightPercent;
+sal_Int64  nZoomedWidthPercent;
+sal_Int64  nZoomedHeightPercent;
 DECL_LINK_TYPED( ModifyBitmapHdl, ValueSet*, void );
+DECL_LINK_TYPED( ClickScaleHdl, Button*, void );
+DECL_LINK_TYPED( ModifyBitmapStyleHdl, ListBox&, void );
+DECL_LINK_TYPED( ModifyBitmapSizeHdl, Edit&, void );
+DECL_LINK_TYPED( ModifyBitmapPositionHdl, ListBox&, void );
+DECL_LINK_TYPED( ModifyPositionOffsetHdl, Edit&, void );
+DECL_LINK_TYPED( ModifyTileOffsetHdl, Edit&, void );
 DECL_LINK_TYPED( ClickRenameHdl, SvxPresetListBox*, void );
 DECL_LINK_TYPED( ClickDeleteHdl, SvxPresetListBox*, void );
 DECL_LINK_TYPED( ClickImportHdl, Button*, void );
 void ClickBitmapHdl_Impl();
+void CalculateBitmapPresetSize();
 sal_Int32 SearchBitmapList(const OUString& rBitmapName);
 
 public:
@@ -571,6 +603,7 @@ public:
 voidConstruct();
 
 static VclPtr Create( vcl::Window*, const SfxItemSet* );
+static const sal_uInt16* GetRanges() { return pBitmapRanges; }
 
 virtual bool FillItemSet( SfxItemSet* ) override;
 virtual void Reset( const SfxItemSet * ) override;
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 1b9edb6..e403d45 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -92,7 +92,7 @@ SvxAreaTabDialog::SvxAreaTabDialog
 m_nColorTabPage = AddTabPage( "RID_SVXPAGE_COLOR", 
SvxColorTabPage::Create, nullptr );
 m_nGradientTabPage = AddTabPage( "RID_SVXPAGE_GRADIENT", 
SvxGradientTabPage::Create, nullptr );
 m_nHatchTabPage = AddTabPage( "RID_SVXPAGE_HATCH", 
SvxHatchTabPage::Create, nullptr );
-m_nBitmapTabPage = AddTabPage( "RID_SVXPAGE_BITMAP", 
SvxBitmapTabPage::Create, nullptr );
+m_nBitmapTabPage = AddTabPage( "RID_SVXPAGE_BITMAP", 
SvxBitmapTabPage::Create, SvxBitmapTabPage::GetRanges );
 m_nPatternTabPage = AddTabPage( "RID_SVXPAGE_PATTERN", 
SvxPatternTabPage::Create,  nullptr);
 
 SetCurPageId( "RID_SVXPAGE_AREA" );
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index b298a7c..aaca75d 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -40,11 +40,35 @@
 #include "sfx2/opengrf.hxx"
 #include 
 #include 
+#include 
 
 #include 
 
 using

[Libreoffice-commits] core.git: basctl/source basegfx/source chart2/inc chart2/source connectivity/source dbaccess/source include/basic include/editeng

[Noel Grandin]

 basctl/source/basicide/idetemp.hxx  |1 
 basctl/source/inc/scriptdocument.hxx|3 -
 basegfx/source/range/b2drangeclipper.cxx|   10 
 chart2/inc/ChartView.hxx|3 -
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx |4 -
 chart2/source/view/inc/GL3DBarChart.hxx |1 
 connectivity/source/drivers/mork/MorkParser.hxx |   14 --
 connectivity/source/inc/RowFunctionParser.hxx   |3 -
 dbaccess/source/filter/xml/xmlEnums.hxx |7 ---
 dbaccess/source/ui/inc/QEnumTypes.hxx   |1 
 dbaccess/source/ui/inc/dbadmin.hxx  |1 
 dbaccess/source/ui/inc/linkeddocuments.hxx  |6 --
 include/basic/basmgr.hxx|2 
 include/basic/sbxdef.hxx|8 ---
 include/editeng/bulletitem.hxx  |4 +
 include/editeng/eedata.hxx  |8 ---
 include/editeng/outliner.hxx|9 +---
 include/editeng/svxenum.hxx |   27 +---
 18 files changed, 12 insertions(+), 100 deletions(-)

New commits:
commit d5de00cc73ca6b60f586c13f22d7b78470984dea
Author: Noel Grandin 
Date:   Thu Aug 11 15:46:21 2016 +0200

loplugin:unusedenumconstants in basctl..editeng

Change-Id: I49a23a197969d58a3a2d6b2be1fbe4a647c7fa08

diff --git a/basctl/source/basicide/idetemp.hxx 
b/basctl/source/basicide/idetemp.hxx
index b70e654..178c1e5 100644
--- a/basctl/source/basicide/idetemp.hxx
+++ b/basctl/source/basicide/idetemp.hxx
@@ -36,7 +36,6 @@ enum SvxChooseControlEnum
 SVX_SNAP_PREVIEW,
 SVX_SNAP_SELECT,
 SVX_SNAP_URLBUTTON,
-SVX_SNAP_NOTHING,
 SVX_SNAP_IMAGECONTROL,
 SVX_SNAP_PROGRESSBAR,
 SVX_SNAP_HFIXEDLINE,
diff --git a/basctl/source/inc/scriptdocument.hxx 
b/basctl/source/inc/scriptdocument.hxx
index 4a162f8..1a02436 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -139,9 +139,6 @@ namespace basctl
 the application-wide scripts/dialogs.
 */
 AllWithApplication,
-/** real documents only
-*/
-DocumentsOnly,
 /** real documents only, sorted lexicographically by their title 
(using the sys locale's default
 collator)
 */
diff --git a/basegfx/source/range/b2drangeclipper.cxx 
b/basegfx/source/range/b2drangeclipper.cxx
index 3814437..41dfb46 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -59,16 +59,6 @@ namespace basegfx
 class ActiveEdge
 {
 public:
-/** The two possible active rectangle edges differ by one
-coordinate value - the upper edge has the lower, the
-lower edge the higher value.
- */
-enum EdgeType {
-/// edge with lower coordinate value
-UPPER=0,
-/// edge with higher coordinate value
-LOWER=1
-};
 
 enum EdgeDirection {
 /// edge proceeds to the left
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 12421dc..7fadb39 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -58,8 +58,7 @@ struct CreateShapeParam2D;
 enum TimeBasedMode
 {
 MANUAL,
-AUTOMATIC,
-AUTOMATIC_WRAP
+AUTOMATIC
 };
 
 struct TimeBasedInfo
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 61eb885..2258949 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -139,9 +139,7 @@ enum
 PROP_DIAGRAM_DATATABLEHBORDER,
 PROP_DIAGRAM_DATATABLEVBORDER,
 PROP_DIAGRAM_DATATABLEOUTLINE,
-PROP_DIAGRAM_EXTERNALDATA,
-
-PROP_DIAGRAM_ROUNDED_EDGE
+PROP_DIAGRAM_EXTERNALDATA
 };
 
 void lcl_AddPropertiesToVector(
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx 
b/chart2/source/view/inc/GL3DBarChart.hxx
index 9269ce2..d04c397 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -50,7 +50,6 @@ enum RenderEventType
 EVENT_SHOW_SCROLL,
 EVENT_SHOW_SELECT,
 EVENT_AUTO_FLY,
-EVENT_DIE,
 EVENT_SELECTBAR_UPDEDATE
 };
 
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx 
b/connectivity/source/drivers/mork/MorkParser.hxx
index 972f914..b435574 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -59,23 +59,9 @@ enum MorkErrors
 {
 NoError = 0,
 FailedToOpen,
-UnsupportedVersion,
 Def

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf100507.rtf  |   22 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |6 ++
 sw/source/uibase/shells/textsh.cxx |5 +
 writerfilter/source/rtftok/rtfdispatchflag.cxx |3 ++-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   19 ++-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 
 6 files changed, 57 insertions(+), 2 deletions(-)

New commits:
commit faaec32b1b6f2a9f8fb0541a5355beddfec37432
Author: Miklos Vajna 
Date:   Tue Aug 16 09:16:47 2016 +0200

tdf#100507 RTF import: don't set default para style to the 0th char style

Regression from commit 1be0a3fa9ebb22b607c54b47739d4467acfed259
(n#825305: writerfilter RTF import: override style properties like Word,
2014-06-17), the problem was that the RTF_PARD handler wanted to set a
default paragraph style, but it didn't check if the 0th style is
actually a paragraph one. This resulted in using a character style name
as a paragraph one, throwing in SwUnoCursorHelper::SetTextFormatColl()
-> all paragraph properties were lost, including the left indent.

Fix this by tracking the style type, and filtering out character styles
when looking up a default paragraph style.

Change-Id: I41faab0e72667b89ec9a507014b395a675847abf
(cherry picked from commit 2de168e99ba9cd2539f1ddbeffad7e3eb71a7b1b)
Reviewed-on: https://gerrit.libreoffice.org/28167
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/rtfimport/data/tdf100507.rtf 
b/sw/qa/extras/rtfimport/data/tdf100507.rtf
new file mode 100644
index 000..1665c4e
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf100507.rtf
@@ -0,0 +1,22 @@
+{\rtf1\ansi\ansicpg1252\deff0\dntblnsbdb\viewkind1
+{\fonttbl
+{\f0\froman\fcharset0 Times New Roman;}
+{\f1\fnil\fcharset0 Arial;}
+{\f2\fnil\fcharset0 Arial;}
+{\f3\fnil\fcharset0 Arial;}
+{\f4\fnil\fcharset0 Arial;}
+{\f5\fnil\fcharset0 Arial;}
+{\f6\fnil\fcharset0 Arial;}
+{\f7\fnil\fcharset0 Arial;}
+{\f8\fnil\fcharset0 Arial;}
+}
+{\colortbl;\red255\green255\blue0;\red0\green0\blue255;\red255\green255\blue255;}
+{\stylesheet
+{\*\cs0 Default Paragraph Font;}
+}
+\jexpand\pgwsxn12240\pghsxn15840
+\margl1748\margr1460\margt678\margb478\marglsxn1748\margrsxn1460\cols1\colno1\colw9032
+{\pard\plain \li3752\ql
+{\f2\b\fs20 Generation 1}
+\par}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 1f2a7fb..5f5d27a 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2678,6 +2678,12 @@ DECLARE_RTFIMPORT_TEST(testTdf78506, "tdf78506.rtf")
 }
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf100507, "tdf100507.rtf")
+{
+// This was 0: left margin of the first paragraph was lost on import.
+CPPUNIT_ASSERT_EQUAL(static_cast(6618), 
getProperty(getParagraph(1), "ParaLeftMargin"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx 
b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 8844503..b8f5b7f 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -485,7 +485,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 // By default the style with index 0 is applied.
 {
 OUString const aName = getStyleName(0);
-if (!aName.isEmpty())
+// But only in case it's not a character style.
+if (!aName.isEmpty() && getStyleType(0) != 
NS_ooxml::LN_Value_ST_StyleType_character)
 {
 
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_pStyle, 
std::make_shared(aName));
 m_aStates.top().nCurrentStyleIndex = 0;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8268a2f..93f1207 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -699,6 +699,19 @@ OUString RTFDocumentImpl::getStyleName(int nIndex)
 return m_pSuperstream->getStyleName(nIndex);
 }
 
+Id RTFDocumentImpl::getStyleType(int nIndex)
+{
+if (!m_pSuperstream)
+{
+Id nRet = 0;
+if (m_aStyleTypes.find(nIndex) != m_aStyleTypes.end())
+nRet = m_aStyleTypes[nIndex];
+return nRet;
+}
+else
+return m_pSuperstream->getStyleType(nIndex);
+}
+
 RTFParserState& RTFDocumentImpl::getDefaultState()
 {
 if (!m_pSuperstream)
@@ -1246,10 +1259,13 @@ void RTFDocumentImpl::text(OUString& rString)
 }
 break;
 case Destination::STYLEENTRY:
-if 
(m_aStates.top().aTableAttributes.find(NS_ooxml::LN_CT_Style_type))
+{
+RTFValue::Pointer_t pType = 
m_aStates.top().aTableAttributes.find(NS

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - basctl/Module_basctl.mk bin/gbuild-to-ide chart2/Module_chart2.mk cui/Module_cui.mk dbaccess/Module_dbaccess.mk desktop/Module_des

[Armin Le Grand]

 Makefile.in |4 +-
 RepositoryModule_host.mk|2 -
 basctl/Module_basctl.mk |3 +
 bin/gbuild-to-ide   |   44 
 chart2/Module_chart2.mk |3 +
 cui/Module_cui.mk   |3 +
 dbaccess/Module_dbaccess.mk |3 +
 desktop/Module_desktop.mk   |3 +
 filter/Module_filter.mk |3 +
 formula/Module_formula.mk   |3 +
 fpicker/Module_fpicker.mk   |3 +
 postprocess/CustomTarget_signing.mk |3 +
 reportdesign/Module_reportdesign.mk |3 +
 sc/Module_sc.mk |5 ++
 sd/Module_sd.mk |3 +
 sfx2/Module_sfx2.mk |3 +
 solenv/gbuild/Module.mk |   40 -
 solenv/gbuild/Postprocess.mk|1 
 solenv/gbuild/TargetLocations.mk|1 
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |   14 ---
 solenv/gbuild/gbuild.help.txt   |1 
 starmath/Module_starmath.mk |3 +
 svtools/Module_svtools.mk   |3 +
 svx/Module_svx.mk   |3 +
 sw/Module_sw.mk |9 ++--
 uui/Module_uui.mk   |3 +
 vcl/Module_vcl.mk   |3 +
 xmlsecurity/Module_xmlsecurity.mk   |3 +
 28 files changed, 119 insertions(+), 56 deletions(-)

New commits:
commit f4ba3e9df26ce76abe345de696ad900bb4e130c5
Author: Armin Le Grand 
Date:   Wed Aug 17 09:43:33 2016 +0200

added and adapted to target screenshot

Up to now the screenshot creation was added/dependent of
target slowcheck. Since quite some modules have added screenshot
creations now, I added an own target 'screenshot' to allow to keep
current slowcheck and screenshot creation separated

Change-Id: I80a49a0db607edf8e0405672d570f624d29912e7

diff --git a/Makefile.in b/Makefile.in
index ef56bee..1cf3837 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck 
uicheck
+gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck 
uicheck screenshot
 
 .PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only 
build-l10n-only check clean clean-build clean-host test-install distclean 
distro-pack-install docs download etags fetch findunusedcode get-submodules id 
install install-strip tags debugrun help showmodules translations packageinfo 
internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
 
@@ -95,7 +95,7 @@ $(1).clean $(1).showdeliverables:
cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)
 
 $(1).all: bootstrap fetch
-   $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if 
$(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1))
+   $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if 
$(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1) $(WORKDIR)/Module/screenshot/$(1))
 
 endef
 
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 5954a50..2a174e5 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -182,7 +182,7 @@ endef
 # otherwise cyclic dependencies ruin everything.
 # do not serialize on a partial build as that may fail due to missing deps.
 # the default goal is all (see Module.mk)
-ifeq (,$(filter-out all build check unitcheck slowcheck subsequentcheck 
uicheck,$(MAKECMDGOALS)))
+ifeq (,$(filter-out all build check unitcheck slowcheck screenshot 
subsequentcheck uicheck,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
scfilt \
$(call gb_Helper_optional,SCRIPTING,vbaobj) \
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 5cedca0..7d0901c 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -35,7 +35,8 @@ $(eval $(call gb_Module_add_l10n_targets,basctl,\
UIConfig_basicide \
 ))
 
-$(eval $(call gb_Module_add_slowcheck_targets,basctl,\
+# screenshots
+$(eval $(call gb_Module_add_screenshot_targets,basctl,\
 CppunitTest_basctl_dialogs_test \
 ))
 
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index a4b837b..0492920 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -561,16 +561,16 @@ isExecutable=true
 result = KdevelopIntegrationGenerator.launchestemplate % {'launches': 
launches}
 result += self.g

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

[Noel Grandin]

 xmloff/qa/unit/tokenmap-test.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8cb4a74de40973006e569f25958bd7585ddfc3e4
Author: Noel Grandin 
Date:   Wed Aug 17 09:52:52 2016 +0200

loplugin:staticcall

Change-Id: I0e35e3e6b7540fb1b8a65b034095d2b1fe80715f

diff --git a/xmloff/qa/unit/tokenmap-test.cxx b/xmloff/qa/unit/tokenmap-test.cxx
index 8a05eb1..74a04a0 100644
--- a/xmloff/qa/unit/tokenmap-test.cxx
+++ b/xmloff/qa/unit/tokenmap-test.cxx
@@ -40,7 +40,7 @@ void TokenmapTest::test_roundTrip()
 {
 // check that the getIdentifier <-> getToken roundtrip works
 Sequence< sal_Int8 > rUtf8Name = tokenMap.getUtf8TokenName(nToken);
-sal_Int32 ret = tokenMap.getTokenFromUTF8(
+sal_Int32 ret = token::TokenMap::getTokenFromUTF8(
 reinterpret_cast< const char * >(rUtf8Name.getConstArray()),
 rUtf8Name.getLength() );
 CPPUNIT_ASSERT_EQUAL(ret, nToken);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 officecfg/registry/schema/org/openoffice/VCL.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a88e8607800e68461c4f7fc5e1f72f5f802c53fd
Author: Caolán McNamara 
Date:   Wed Aug 17 09:12:22 2016 +0100

these are typically used for export substitution

Change-Id: I6d31e7eaa87fc43faeefb5d4095efab8cedd3679

diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index 47cd29a..0d8afd1 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -33,7 +33,7 @@
   
   
 
-  Contains a list of substitute fonts used in MS import 
filters.
+  Contains a list of substitute fonts used in MS export 
filters.
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx |binary
 1 file changed

New commits:
commit 6be059453e243af45de6f5a3fa33d30b6dbf3d36
Author: Stephan Bergmann 
Date:   Wed Aug 17 10:14:45 2016 +0200

Use full absolute URL in footer-contain-hyperlink.docx

What this binary change does is change in the contained
word/_rels/footer1.xml.rels from

  Target="www.google.com"

to

  Target="http://www.google.com/";

because of:

 vmiklos, do you know how
  sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx (introduced 
with
  4654e9b113a66c800161d0ee82d587055fff4f8b ["fdo#74271: Added unit test & 
code
  changes for footer contains hyperlink."]) was created?  It contains a
  word/_rels/footer1.xml.rels with a http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
  Target="www.google.com" TargetMode="External"/>, where that
  Target="www.google.com" is not a proper URL, but the 
testFooterContainHyper
  link test in sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx expects it to 
end
  up as "http://www.google.com/";
 sberg: [...] that sounds like a bug, MSO resolves that as a 
regular
  relative file reference, i.e. to 
file:///...\ooxmlexport\data\www.google.com
 vmiklos, ah, that's good to know; I'm trying to fix tdf#86087 
["FILESAVE
  FILEOPEN VIEWING: Can't open or save relative links in docx"] by turning
  relative URLs into absolute ones when reading docx etc. in
  writerfilter/source/dmapper/DomainMapper_Impl.cxx, but that now caused 
that
  test to fail
 vmiklos, so I guess it's best to modify
  sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx to contain
   instead of merely 
 sberg: yes, i think so

Change-Id: I7986acb66f260faaf8fe5398f3778cc35fb9930d

diff --git a/sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx 
b/sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx
index 27b00ed..42c68d5 100644
Binary files a/sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx and 
b/sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cui/source/inc/cuitabarea.hxx|1 -
 cui/source/tabpages/tpbitmap.cxx |3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 0214be9338f5a375014f8246f9908bbd22b27e58
Author: Stephan Bergmann 
Date:   Wed Aug 17 10:36:12 2016 +0200

-Werror,-Wunused-private-field

Change-Id: I7c1f1438be7226b9ea4692f1c4e39782288f6196

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 2d4935f..db9a99c 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -573,7 +573,6 @@ private:
 SfxItemSet&m_rXFSet;
 const SdrView* mpView;
 SfxMapUnit mePoolUnit;
-FieldUnit  meDlgUnit;
 Size   rBitmapSize;
 Size   rFilledSize;
 Size   rZoomedSize;
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index aaca75d..5646ad1 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -92,8 +92,7 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, 
const SfxItemSet& rInA
 
 m_aXFillAttr  ( rInAttrs.GetPool() ),
 m_rXFSet  ( m_aXFillAttr.GetItemSet() ),
-mpView(nullptr),
-meDlgUnit(GetModuleFieldUnit( GetItemSet() ))
+mpView(nullptr)
 {
 get(m_pBitmapLB,"BITMAP");
 get(m_pBitmapStyleLB, "bitmapstyle");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Zoner Draw import, Week 12 report

[Alex P]

During the last GSoC week we improved rotation and mirroring of
polygons/stars and images, now it should work correctly. Arc mirroring is
still not working because it is much more difficult to implement.

http://i.imgur.com/RWM3VMk.png
http://i.imgur.com/YUONVUK.png

Also I added some input checks to fix possible crashes in libzmf and added
more test files to libzmf-test.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 writerfilter/source/rtftok/rtfsdrimport.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 8004bcd6e1180bdeae03200b2e5f6f93351d5e07
Author: Miklos Vajna 
Date:   Wed Aug 17 08:04:58 2016 +0200

sw: use std::lround() instead of manual rounding in RTFSdrImport

Change-Id: If869c3f987996918904dca76de92d3e35789efa5

diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index c70050f..dd700c9 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -8,6 +8,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -222,7 +223,7 @@ void 
RTFSdrImport::applyProperty(uno::Reference const& xShape,
 sal_Int32 nRotation = aValue.toInt32()*100/65536;
 uno::Reference xServiceInfo(xShape, 
uno::UNO_QUERY);
 if (!xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
-xPropertySet->setPropertyValue("RotateAngle", 
uno::makeAny(sal_Int32(NormAngle360(nRotation * -1;
+xPropertySet->setPropertyValue("RotateAngle", 
uno::makeAny(sal_Int32(NormAngle360(static_cast(nRotation) * -1;
 }
 
 if (nHoriOrient != 0 && xPropertySet.is())
@@ -897,8 +898,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, 
ShapeOrPict const shap
 nTop = static_cast< sal_Int32 >(rShape.nTop + fHeightRatio * 
(*oRelTop - *oGroupTop));
 
 // See lclGetAbsRect() in the VML import.
-aSize.Width = static_cast(fWidthRatio * (*oRelRight - 
*oRelLeft) + 0.5);
-aSize.Height = static_cast(fHeightRatio * (*oRelBottom 
- *oRelTop) + 0.5);
+aSize.Width = std::lround(fWidthRatio * (*oRelRight - *oRelLeft));
+aSize.Height = std::lround(fHeightRatio * (*oRelBottom - 
*oRelTop));
 }
 
 if (m_bTextFrame)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   22 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 +
 2 files changed, 23 insertions(+)

New commits:
commit 0dd82f4ffe7ae462bae30b93d245d2234c55ef84
Author: Stephan Bergmann 
Date:   Wed Aug 17 11:36:10 2016 +0200

tdf#86087: Convert relative URLs to absolute upon import of docx etc.

...to fix the import part of tdf#86087.  Apparently, "fragment-only" 
relative
same-document URLs (like <#anchor>) are supposed to remain relative; 
otherwise,
various tests like testFdo69548::Import in CppunitTest_sw_ooxmlimport fail.

Change-Id: I2dbba2f2f1e225f85e21600e68a3c4cffdb023b2

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 98a9900..256e690 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -68,6 +68,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -241,6 +242,13 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bParaHadField(false)
 
 {
+m_aBaseUrl = rMediaDesc.getUnpackedValueOrDefault(
+utl::MediaDescriptor::PROP_DOCUMENTBASEURL(), OUString());
+if (m_aBaseUrl.isEmpty()) {
+m_aBaseUrl = rMediaDesc.getUnpackedValueOrDefault(
+utl::MediaDescriptor::PROP_URL(), OUString());
+}
+
 appendTableManager( );
 GetBodyText();
 uno::Reference< text::XTextAppend > xBodyTextAppend( m_xBodyText, 
uno::UNO_QUERY );
@@ -3867,6 +3875,20 @@ void DomainMapper_Impl::CloseFieldCommand()
 
 if (!sURL.isEmpty())
 {
+// Try to make absolute any relative URLs, except
+// for relative same-document URLs that only 
contain
+// a fragment part:
+if (!sURL.startsWith("#")) {
+try {
+sURL = rtl::Uri::convertRelToAbs(
+m_aBaseUrl, sURL);
+} catch (rtl::MalformedUriException & e) {
+SAL_WARN(
+"writerfilter.dmapper",
+"MalformedUriException "
+<< e.getMessage());
+}
+}
 pContext->SetHyperlinkURL(sURL);
 }
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 5c34a23..ec40e8e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -343,6 +343,7 @@ public:
 private:
 SourceDocumentType 
 m_eDocumentType;
 DomainMapper&  
 m_rDMapper;
+OUString m_aBaseUrl;
 css::uno::Reference m_xTextDocument;
 css::uno::Reference m_xDocumentSettings;
 css::uno::Reference m_xTextFactory;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 sw/CppunitTest_sw_mailmerge.mk|2 
 sw/qa/extras/mailmerge/data/linked-labels.odt |binary
 sw/qa/extras/mailmerge/mailmerge.cxx  |  112 --
 3 files changed, 91 insertions(+), 23 deletions(-)

New commits:
commit 9dbaf6b3b6112d9e16fd64ab0ed5dff6e513e5f8
Author: Jan-Marek Glogowski 
Date:   Wed Jan 20 10:48:37 2016 +0100

tdf#95292 MM: add unit test

bEndOfDB was handled inconsistently in ToNextRecord for record
selections and normal record iteration.

This unit test checks mail merge to generate the correct amount
of three pages (actually five with the hidden, empty pages) for
a five record data subset, mailing a linked label document with
two labels. Previously the third / last page was missing.

On Windows, this test originally failed, because the test document
for synced labels opens the "synchronize" dialog, which is
generated from an UI file, which are missing in the default test
configuration.

So this patch also switches the mail merge unit test to the
"instdir configuration", which has locking enabled and prevents
opening a documents twice. As a result we can't use a document for
two test and have to load the source document for inspection after
the UNO mail merge call, because it can just work with a file name
as the source document. This way the document isn't opened twice,
and the tests still pass on Windows.

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

diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index 131fc81..701bb93 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \
 xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_mailmerge))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,sw_mailmerge))
 $(eval $(call gb_CppunitTest_use_ure,sw_mailmerge))
 $(eval $(call gb_CppunitTest_use_vcl,sw_mailmerge))
 
diff --git a/sw/qa/extras/mailmerge/data/linked-labels.odt 
b/sw/qa/extras/mailmerge/data/linked-labels.odt
new file mode 100644
index 000..a89fd92
Binary files /dev/null and b/sw/qa/extras/mailmerge/data/linked-labels.odt 
differ
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 8e13aef..4b2e8ef 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -10,6 +10,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
@@ -21,6 +22,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -66,20 +69,20 @@ public:
  * The 'verify' method actually has to execute the mail merge by
  * calling executeMailMerge() after modifying the job arguments.
  */
-void executeMailMergeTest(const char* filename, const char* datasource, 
const char* tablename, bool file)
+void executeMailMergeTest(const char* filename, const char* datasource, 
const char* tablename, bool file, int selection)
 {
+maMMtestFilename = filename;
 header();
 preTest(filename);
-load(mpTestDocumentPath, filename);
 
 utl::TempFile aTempDir(nullptr, true);
 const OUString aWorkDir = aTempDir.GetURL();
 const OUString aURI( m_directories.getURLFromSrc(mpTestDocumentPath) + 
OUString::createFromAscii(datasource) );
 OUString aDBName = registerDBsource( aURI, aWorkDir );
-initMailMergeJobAndArgs( filename, tablename, aDBName, "LOMM_", 
aWorkDir, file );
+initMailMergeJobAndArgs( filename, tablename, aDBName, "LOMM_", 
aWorkDir, file, selection );
 
-postTest(filename);
 verify();
+postTest(filename);
 finish();
 
 ::utl::removeTree(aWorkDir);
@@ -105,28 +108,64 @@ public:
 return aDBName;
 }
 
+uno::Reference< sdbc::XRowSet > getXResultFromDataset( const char* 
tablename, const OUString &aDBName )
+{
+uno::Reference< sdbc::XRowSet > xCurResultSet;
+uno::Reference< uno::XInterface > xInstance = 
getMultiServiceFactory()->createInstance( "com.sun.star.sdb.RowSet" );
+uno::Reference< beans::XPropertySet > xRowSetPropSet( xInstance, 
uno::UNO_QUERY );
+assert( xRowSetPropSet.is() && "failed to get XPropertySet interface 
from RowSet" );
+if (xRowSetPropSet.is())
+{
+xRowSetPropSet->setPropertyValue( "DataSourceName",
uno::makeAny( aDBName ) );
+xRowSetPropSet->setPropertyValue( "Command",   
uno::makeAny( OUString::createFromAscii(tablename) ) );
+xRowSetPropSet->setPropertyValue( "CommandType",   
uno::makeAny( sdb::CommandType::TABLE ) );
+
+uno::Reference< sdbc::XRowSet > xRowSet( xInstance, uno::UNO_QUERY 
);
+   

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sc/qa vcl/source

[Armin Le Grand]

 dev/null   |binary
 sc/qa/unit/screenshots/screenshots.cxx |5 ++---
 vcl/source/window/tabdlg.cxx   |1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f8a692b69334d57b8d2a0262209eecb0d88dc380
Author: Armin Le Grand 
Date:   Wed Aug 17 12:30:11 2016 +0200

Adapted sc screenshot test to create new document

Change-Id: I644d2fcb9fe4ec66e964192d3dda61ca331acece

diff --git a/sc/qa/unit/screenshots/data/empty.ods 
b/sc/qa/unit/screenshots/data/empty.ods
deleted file mode 100644
index 14b4232..000
Binary files a/sc/qa/unit/screenshots/data/empty.ods and /dev/null differ
diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index c52bbc5..8edeca8 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -72,11 +72,9 @@ public:
 virtual ~ScScreenshotTest();
 
 void testOpeningModalDialogs();
-//void testOpeningModelessDialogs();
 
 CPPUNIT_TEST_SUITE(ScScreenshotTest);
 CPPUNIT_TEST(testOpeningModalDialogs);
-//CPPUNIT_TEST(testOpeningModelessDialogs);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -99,7 +97,8 @@ void ScScreenshotTest::initializeWithDoc(const char* pName)
 {
 if (mxComponent.is())
 mxComponent->dispose();
-mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY) 
+ OUString::createFromAscii(pName), "com.sun.star.sheet.SpreadsheetDocument");
+// use new, epty doc to avoid file locking
+mxComponent = loadFromDesktop("private:factory/scalc", 
"com.sun.star.sheet.SpreadsheetDocument");
 
 mpFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent);
 CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", mpFoundShell);
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 335c00c..99da7cc 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 void TabDialog::ImplInitTabDialogData()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit ea704f00dea2c4fe0a229876993801ea83c3c4a1
Author: Stephan Bergmann 
Date:   Wed Aug 17 13:10:50 2016 +0200

Avoid division by zero

...when i == 0.

Change-Id: Iae1adbe559370bdba195afb74e83b5c94e5de4e2

diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 6cc80b3..2c357db 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1657,7 +1657,7 @@ void ScInterpreter::ScPow()
 if (fVal1 < 0 && fVal2 != 0.0)
 {
 int i = (int) (1 / fVal2 + ((fVal2 < 0) ? -0.5 : 0.5));
-if (rtl::math::approxEqual(1 / ((double) i), fVal2) && i % 2 != 0)
+if (i % 2 != 0 && rtl::math::approxEqual(1 / ((double) i), fVal2))
 PushDouble(-pow(-fVal1, fVal2));
 else
 PushDouble(pow(fVal1, fVal2));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 solenv/gbuild/gbuild.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 62c4a8aacf76771e97a8da35096e6ad69a11979a
Author: Stephan Bergmann 
Date:   Wed Aug 17 13:35:58 2016 +0200

"make debug=t" enables debuginfo again

...which had inadvertently been broken with
99db9f2295eb9a8b3288df9798a292b8d6e1b854 "Make --enable-symbols orthogonal 
to
--enable-debug/-dbgutil"

Change-Id: I3962aa8c67426f3aebc5ad746f7ac281c68d941a

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 815465d..c623770 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -87,12 +87,14 @@ gb_DEBUGLEVEL := 1
 # make DEBUG=true should force -g
 ifeq ($(origin DEBUG),command line)
 ENABLE_DEBUGINFO_FOR := all
+ENABLE_SYMBOLS := TRUE
 endif
 endif
 ifneq ($(strip $(debug)),)
 gb_DEBUGLEVEL := 1
 ifeq ($(origin debug),command line)
 ENABLE_DEBUGINFO_FOR := all
+ENABLE_SYMBOLS := TRUE
 endif
 endif
 ifeq ($(gb_ENABLE_DBGUTIL),$(true))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes of ESC call: 2016-08-11

[Stephan Bergmann]

On 08/11/2016 05:07 PM, Jan Holesovsky wrote:

* "make debug=T" doesnt build with symbols anymore (Bjoern)
+ instead "make debug=T enable_symbols=T" is needed
+ not objecting to this in principle (Bjoern)
+ in fact, I would have objections (Thorsten)
+ me too (Jan-Marek)
+ for the command line a new env var doing both might be a compromise 
(Bjoern)
+ what is the use-case, actually? (Eike)
+ want to have enable_symbols implied by debug too (Thorsten)
+ no idea what was the reason (Bjoern)
AI: + explain the reason / bring it to some ESC when Stephan is here (Stephan / 
Bjoern)
+ let's have this talk when Shephan is here


 
"'make debug=t' enables debuginfo again" should restore the expected 
behavior.

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

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

[Miklos Vajna]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   25 +++
 desktop/source/lib/init.cxx |   53 +++
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   68 +++-
 3 files changed, 145 insertions(+), 1 deletion(-)

New commits:
commit 69fb6a307172e244497bc618a102afccdd7c93b7
Author: Miklos Vajna 
Date:   Wed Aug 17 12:17:19 2016 +0200

lok::Document::getCommandValues: expose redline info

Index is added as a property for each item, so that later changes can be
identified by the index when they are accepted/rejected.

Change-Id: I9362d208fdbed1f46d64558d44498d2b19150c81

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 0174391..a1e7cc0 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -92,6 +92,7 @@ public:
 void testContextMenuWriter();
 void testContextMenuImpress();
 void testNotificationCompression();
+void testRedlineWriter();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
 CPPUNIT_TEST(testGetStyles);
@@ -119,6 +120,7 @@ public:
 CPPUNIT_TEST(testContextMenuWriter);
 CPPUNIT_TEST(testContextMenuImpress);
 CPPUNIT_TEST(testNotificationCompression);
+CPPUNIT_TEST(testRedlineWriter);
 CPPUNIT_TEST_SUITE_END();
 
 uno::Reference mxComponent;
@@ -1380,6 +1382,29 @@ void DesktopLOKTest::testNotificationCompression()
 CPPUNIT_ASSERT_EQUAL(std::string("1"), std::get<1>(notifs[i++]));
 }
 
+void DesktopLOKTest::testRedlineWriter()
+{
+// Load a Writer document, enable change recording and press a key.
+comphelper::LibreOfficeKit::setActive();
+LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+uno::Reference xPropertySet(mxComponent, 
uno::UNO_QUERY);
+xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(true));
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 't', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP, 't', 0);
+
+// Get redline info.
+boost::property_tree::ptree aTree;
+char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, 
".uno:AcceptTrackedChanges");
+std::stringstream aStream(pJSON);
+free(pJSON);
+CPPUNIT_ASSERT(!aStream.str().empty());
+boost::property_tree::read_json(aStream, aTree);
+// Make sure that pressing a key creates exactly one redline.
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aTree.get_child("redlines").size());
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0d4fb4f..17955e8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -50,6 +50,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -80,6 +81,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -1810,8 +1812,55 @@ static char* getUndoOrRedo(LibreOfficeKitDocument* 
pThis, UndoOrRedo eCommand)
 return pJson;
 }
 
+/// Returns the JSON representation of the redline stack.
+static char* getTrackedChanges(LibreOfficeKitDocument* pThis)
+{
+LibLODocument_Impl* pDocument = static_cast(pThis);
+
+uno::Reference 
xRedlinesSupplier(pDocument->mxComponent, uno::UNO_QUERY);
+if (!xRedlinesSupplier.is())
+return nullptr;
+
+uno::Reference xRedlines = 
xRedlinesSupplier->getRedlines()->createEnumeration();
+boost::property_tree::ptree aRedlines;
+for (size_t nIndex = 0; xRedlines->hasMoreElements(); ++nIndex)
+{
+uno::Reference xRedline(xRedlines->nextElement(), 
uno::UNO_QUERY);
+boost::property_tree::ptree aRedline;
+aRedline.put("index", nIndex);
+
+OUString sAuthor;
+xRedline->getPropertyValue("RedlineAuthor") >>= sAuthor;
+aRedline.put("author", sAuthor.toUtf8().getStr());
+
+OUString sType;
+xRedline->getPropertyValue("RedlineType") >>= sType;
+aRedline.put("type", sType.toUtf8().getStr());
+
+OUString sComment;
+xRedline->getPropertyValue("RedlineComment") >>= sComment;
+aRedline.put("comment", sComment.toUtf8().getStr());
+
+util::DateTime aDateTime;
+xRedline->getPropertyValue("RedlineDateTime") >>= aDateTime;
+OUString sDateTime = utl::toISO8601(aDateTime);
+aRedline.put("dateTime", sDateTime.toUtf8().getStr());
+
+aRedlines.push_back(std::make_pair("", aRedline));
+}
+
+boost::property_tree::ptree aTree;
+aTree.add_child("redlines", aRedlines);
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+char* pJson = strdup(aStream.str().c_str());
+return pJson;
+}
+
 static char* doc_getCommandValues(LibreOfficeKitDocument* pThis, const char* 
pCommand)
 {
+SolarMutexGuard aGuard;
+
 OString aCom

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

[Miklos Vajna]

 writerfilter/source/rtftok/rtfsdrimport.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 0cb7d76bc5552245642ba423a87831cd9e0b2b92
Author: Miklos Vajna 
Date:   Wed Aug 17 14:04:33 2016 +0200

writerfilter: fix Android build

lround() is missing in the std namespace on the broken Android toolchain, 
work
it around.

Change-Id: Ib53ace52c3a7c345de1326e3566a279f2a3f1bce

diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index dd700c9..c04014f 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -41,6 +41,17 @@
 
 using namespace com::sun::star;
 
+#if defined(ANDROID)
+namespace std
+{
+template
+T lround(T x)
+{
+return ::lround(x);
+}
+}
+#endif
+
 namespace writerfilter
 {
 namespace rtftok
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac connectivity/source download.lst external/firebird external/libtommath external/Module_external.mk Makefile.fetch RepositoryExternal.mk

[Wastack]

 Makefile.fetch   |1 
 RepositoryExternal.mk|   49 
 configure.ac |   29 
 connectivity/source/drivers/firebird/Driver.cxx  |   19 
 download.lst |4 
 external/Module_external.mk  |1 
 external/firebird/ExternalPackage_firebird.mk|   11 
 external/firebird/ExternalProject_firebird.mk|   45 
 external/firebird/UnpackedTarball_firebird.mk|   11 
 external/firebird/firebird-Engine12.patch|   16 
 external/firebird/firebird-c++11.patch.1 |   27 
 external/firebird/firebird-c++14.patch   |   30 
 external/firebird/firebird-configure-x86-64-macosx.patch.1   |   12 
 external/firebird/firebird-cygwin-msvc.patch |  687 +++
 external/firebird/firebird-cygwin-msvc.patch.1   |  484 ---
 external/firebird/firebird-macosx.patch.1|  185 +-
 external/firebird/firebird-rpath.patch.0 |   16 
 external/firebird/firebird.disable-ib-util-not-found.patch.1 |8 
 external/libtommath/ExternalProject_libtommath.mk|   36 
 external/libtommath/Makefile |7 
 external/libtommath/Module_libtommath.mk |   17 
 external/libtommath/README   |6 
 external/libtommath/UnpackedTarball_libtommath.mk|   20 
 external/libtommath/libtommath-msvc.patch|   12 
 24 files changed, 1060 insertions(+), 673 deletions(-)

New commits:
commit 45f42681f4d1260c42140a313560534e605f81a4
Author: Wastack 
Date:   Thu Jul 28 17:16:19 2016 +0200

GSoC Upgrade firebird to 3.0

Embedded firebird is now version 3.0.

Supports MSVC 14.0.

Instead of fbembed, there are now two libraries: fbclient and
Engine12. fbclient is linked as fbembed before, Engine12 is loaded
at runtime from fbclient.

fb now needs system libtommath, which is supplied
as a new ExternalProject of LO.

Change-Id: I132939bdee745795b22f675e4265e9590079c45f
Reviewed-on: https://gerrit.libreoffice.org/27642
Tested-by: Jenkins 
Reviewed-by: Lionel Elie Mamane 

diff --git a/Makefile.fetch b/Makefile.fetch
index ea7b343..dc2f648 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -160,6 +160,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
$(call fetch_Optional,LIBPNG,PNG_TARBALL) \
+   $(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
LIBXMLSEC_TARBALL \
$(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 806a5e8..0345edc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2901,6 +2901,36 @@ endef
 
 endif # SYSTEM_OPENLDAP
 
+ifneq ($(SYSTEM_LIBTOMMATH),)
+
+define gb_LinkTarget__use_libtommath
+$(call gb_LinkTarget_set_include,$(1),\
+   $(LIBTOMMATH_CFLAGS) \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBTOMMATH_LIBS))
+
+endef
+
+else # !SYSTEM_LIBTOMMATH
+define gb_LinkTarget__use_libtommath
+$(call gb_LinkTarget_set_include,$(1),\
+   -I${WORKDIR}/UnpackedTarball/libtommath \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,libtommath)/libtommath$(gb_StaticLibrary_PLAINEXT) \
+)
+$(call gb_LinkTarget_use_external_project,$(1),libtommath)
+
+endef
+
+endif # SYSTEM_LIBTOMMATH
+
+define gb_ExternalProject__use_libtommath
+$(call gb_ExternalProject_use_external_project,$(1),libtommath)
+
+endef
 
 ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
 
@@ -2915,38 +2945,29 @@ $(call gb_LinkTarget_add_libs,$(1),$(FIREBIRD_LIBS))
 
 endef
 
-# gb_LinkTarget__use_atomic_ops :=
-# gb_LinkTarget__use_tommath :=
-
 else # !SYSTEM_FIREBIRD
 
 #$(call gb_LinkTarget__use_libatomic_ops,$(1))
+#$(call gb_LinkTarget__use_libtommath,$(1))
 
 define gb_LinkTarget__use_libfbembed
 $(call gb_LinkTarget_use_package,$(1),firebird)
 $(call gb_LinkTarget_set_include,$(1),\
+   -I$(call 
gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/include \
$$(INCLUDE) \
-   -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \
 )
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,firebird)/gen/firebird/bin/ifbembed.lib \
+   $(call 
gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/bin/ifbclient.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb

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

[Henry Castro]

 loleaflet/src/control/Control.ColumnHeader.js |   20 +++
 loleaflet/src/control/Control.Header.js   |   16 +--
 loleaflet/src/control/Control.RowHeader.js|   27 ++
 loleaflet/src/layer/tile/CalcTileLayer.js |3 ++
 4 files changed, 64 insertions(+), 2 deletions(-)

New commits:
commit 2757adc3c69ce345a9ba8a82166d75665b7e1ef1
Author: Henry Castro 
Date:   Wed Aug 17 09:11:18 2016 -0400

loleaflet: add dblclick row/column to process optimal height/width

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index ba928eb..88a5b9f 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -226,6 +226,26 @@ L.Control.ColumnHeader = L.Control.Header.extend({
this._map.removeLayer(this._vertLine);
},
 
+   onDragClick: function (item, clicks, e) {
+   this._map.removeLayer(this._vertLine);
+
+   if (clicks === 2) {
+   var command = {
+   Col: {
+   type: 'unsigned short',
+   value: item.column - 1
+   },
+   Modifier: {
+   type: 'unsigned short',
+   value: 0
+   }
+   };
+
+   this._map.sendUnoCommand('.uno:SelectColumn ', command);
+   
this._map.sendUnoCommand('.uno:SetOptimalColumnWidthDirect');
+   }
+   },
+
_onUpdatePermission: function (e) {
if (this._map.getDocType() !== 'spreadsheet') {
return;
diff --git a/loleaflet/src/control/Control.Header.js 
b/loleaflet/src/control/Control.Header.js
index 3a56fc5..cbd8b53 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -7,6 +7,10 @@ L.Control.Header = L.Control.extend({
cursor: 'col-resize'
},
 
+   initialize: function () {
+   this._clicks = 0;
+   },
+
mouseInit: function (element) {
L.DomEvent.on(element, 'mousedown', this._onMouseDown, this);
},
@@ -61,12 +65,20 @@ L.Control.Header = L.Control.extend({
L.DomUtil.enableImageDrag();
L.DomUtil.enableTextSelection();
 
-   this.onDragEnd(this._item, this._start, this._offset, e);
+   if (this._dragging) {
+   this.onDragEnd(this._item, this._start, this._offset, 
e);
+   this._clicks = 0;
+   } else {
+   this.onDragClick(this._item, ++this._clicks, e);
+   setTimeout(L.bind(this.initialize, this), 200);
+   }
+
this._target = this._cursor = this._item = this._start = 
this._offset = null;
this._dragging = false;
},
 
onDragStart: function () {},
onDragMove: function () {},
-   onDragEnd: function () {}
+   onDragEnd: function () {},
+   onDragClick: function () {}
 });
diff --git a/loleaflet/src/control/Control.RowHeader.js 
b/loleaflet/src/control/Control.RowHeader.js
index c4ced20..53bc3a5 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -208,6 +208,33 @@ L.Control.RowHeader = L.Control.Header.extend({
this._map.removeLayer(this._horzLine);
},
 
+   onDragClick: function (item, clicks, e) {
+   this._map.removeLayer(this._horzLine);
+
+   if (clicks === 2) {
+   var command = {
+   Row: {
+   type: 'long',
+   value: item.row - 1
+   },
+   Modifier: {
+   type: 'unsigned short',
+   value: 0
+   }
+   };
+
+   var extra = {
+   aExtraHeight: {
+   type: 'unsigned short',
+   value: 
this._map._docLayer.STD_EXTRA_WIDTH
+   }
+   };
+
+   this._map.sendUnoCommand('.uno:SelectRow', command);
+   this._map.sendUnoCommand('.uno:SetOptimalRowHeight', 
extra);
+   }
+   },
+
_onUpdatePermission: function (e) {
if (this._map.getDocType() !== 'spreadsheet') {
return;
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 2641a

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

[Wastack]

 connectivity/source/drivers/firebird/Driver.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit d3a510e6ec7a42a7a30a24b7373931b8a8ef1a54
Author: Wastack 
Date:   Thu Aug 11 13:13:57 2016 +0200

tdf#73073 GSoC Firebird Set autoCommit true

Use autoCommit for embedded Firebird database.

Change-Id: I5633960b8e3d4e6ee8f9b4f29406c7208a059521
Reviewed-on: https://gerrit.libreoffice.org/28047
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/firebird/Driver.cxx 
b/connectivity/source/drivers/firebird/Driver.cxx
index a3224e5..ff63fbe 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -192,6 +192,10 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect(
 Connection* pCon = new Connection(this);
 Reference< XConnection > xCon = pCon;
 pCon->construct(url, info);
+
+if (url == "sdbc:embedded:firebird")
+pCon->setAutoCommit(true);
+
 m_xConnections.push_back(WeakReferenceHelper(*pCon));
 
 return xCon;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Wastack]

 connectivity/source/drivers/firebird/PreparedStatement.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3828e10f7c3918f89312228739b428dc5046b52e
Author: Wastack 
Date:   Tue Aug 16 19:25:25 2016 +0200

tdf#91324 correct firebird date format

Store date inside the embedded firebird database as:
Years as the years since 1900.
Months from 0 to 11.

Change-Id: Ic6269a183261c4c482f91f0d3871b42c54d4b99f
Reviewed-on: https://gerrit.libreoffice.org/28173
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 007714d..801acd8 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -391,8 +391,8 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex, 
const Date& rDate)
 {
 struct tm aCTime;
 aCTime.tm_mday = rDate.Day;
-aCTime.tm_mon = rDate.Month;
-aCTime.tm_year = rDate.Year;
+aCTime.tm_mon = rDate.Month -1;
+aCTime.tm_year = rDate.Year -1900;
 
 ISC_DATE aISCDate;
 isc_encode_sql_date(&aCTime, &aISCDate);
@@ -422,8 +422,8 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 
nIndex, const DateTime&
 aCTime.tm_min = rTimestamp.Minutes;
 aCTime.tm_hour = rTimestamp.Hours;
 aCTime.tm_mday = rTimestamp.Day;
-aCTime.tm_mon = rTimestamp.Month;
-aCTime.tm_year = rTimestamp.Year;
+aCTime.tm_mon = rTimestamp.Month - 1;
+aCTime.tm_year = rTimestamp.Year - 1900;
 
 ISC_TIMESTAMP aISCTimestamp;
 isc_encode_timestamp(&aCTime, &aISCTimestamp);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit cc0a182b8f38d1beb1dac4c473eb2f79952fa563
Author: Olivier Hallot 
Date:   Wed Aug 3 19:32:03 2016 -0300

Updated core
Project: help  38af1adac0c495b5865cd70d8a29163ec2fcdc14

Document classification help page enhancements

Added more information on
Objective of classification
Categories
Levels
Customization
Pasting contents
Toolbar

Grammar and liguistics checks welcome.
Corrected lawsuits

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

diff --git a/helpcontent2 b/helpcontent2
index 2e14134..38af1ad 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2e141341684eb610834db92693d715f3fd01d0dd
+Subproject commit 38af1adac0c495b5865cd70d8a29163ec2fcdc14
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/shared/guide/main.xhp |3 
 source/text/swriter/classificationbar.xhp |  136 ++
 2 files changed, 123 insertions(+), 16 deletions(-)

New commits:
commit 38af1adac0c495b5865cd70d8a29163ec2fcdc14
Author: Olivier Hallot 
Date:   Wed Aug 3 19:32:03 2016 -0300

Document classification help page enhancements

Added more information on
Objective of classification
Categories
Levels
Customization
Pasting contents
Toolbar

Grammar and liguistics checks welcome.
Corrected lawsuits

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

diff --git a/source/text/shared/guide/main.xhp 
b/source/text/shared/guide/main.xhp
index 5f4b33b..c8564a8 100644
--- a/source/text/shared/guide/main.xhp
+++ b/source/text/shared/guide/main.xhp
@@ -43,6 +43,7 @@
 
 
 
+
 
 
 
@@ -206,4 +207,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/swriter/classificationbar.xhp 
b/source/text/swriter/classificationbar.xhp
index 92b7a83..ac6c8d0 100644
--- a/source/text/swriter/classificationbar.xhp
+++ b/source/text/swriter/classificationbar.xhp
@@ -1,29 +1,135 @@
 
+
 
-
+ *
+-->
+
 
-
-Classification Bar
-/text/swriter/classificationbar.xhp
-
+  
+Document Classification
+/text/swriter/classificationbar.xhp
+  
 
+
 
+
+Document Classification 
+
+  classification;BAILS levels
+  classification;BAF category
+  classification;security levels
+  classification;document
+  classification;classification bar
+  document;classification
+
+
+Document classification and security is an important issue for 
businesses and governments.
+Information is exchanged between users and organizations that 
collaborate to pursue a business goal. Where sensitive information is involved, 
it is assumed that the parties will have agreed what information is sensitive 
and how such information will be identified and handled. Any recipient of a 
resource will rely upon the provider of the information to follow the agreed 
procedures to identify the sensitivity of the information.
+%PRODUCTNAME provides standardized means for such sensitivity 
information to be expressed and may be used between parties if interoperable 
systems are to be implemented. It provides a set of standard “fields” that 
can be used to hold sensitivity information. It does not attempt to define what 
the contents of these “fields” should be. This approach is an improvement 
upon the only alternative that exists at the moment, which is for the provider 
to use an arbitrary means to express sensitivity that may not be useful to a 
recipient.
+While this standard has been developed with the intent that it 
would be applicable in any domain of activity, %PRODUCTNAME retained the 
aerospace and defense industry nomenclature and categories, where sensitivity 
marking results from national security, export control and intellectual 
property policies.
+%PRODUCTNAME implemented the open standards produced by TSCP (Transglobal Secure Collaboration Participation, 
Inc.) independent of a specific vendor. Two of them are interesting:
+
+
+  
+Business Authentication Framework (BAF) specifies how to describe the existing policy (which 
is probably some legal text) in a machine-readable format.
+  
+  
+Business Authorization Identification and Labeling Scheme 
(BAILS) specifies how to refer to such a BAF policy in a document. The concepts in BAILS are so generic that they can be applied to any 
format that supports document-level user-defined properties.
+  
+
+BAF Categories
+
+  classification;displayed in user interface
+  classification;headers and footers
+  classification;watermark
+  classification;categories
+
+
+The 
default BAF categories for %PRODUCTNAME are listed below.
+Only the 
Intellectual Properties category will modify the layout of the document with a 
watermark, fields in the header and footer and an information bar on top of the 
document area. Each item inserted in the document is controlled by the 
classification configuration file.
+Intellectual Property
+Intellectual 
property is a generic term for the nature of the contents of the document. 
Select this category for general purpose document classification.
+National Security
+Selects the 
category of this document for the national security policy type. The selected 
category is saved together with the document as BAILS metadata in the file 
properties and no modifications is carried in the document layout or the user 
interface.
+Export 
Control
+Selects the 
category of this document for the export control policy type. The selected 
category is saved together with the document as BAILS metadata in the file 
properties and no modifications is carried in the document layout or the user 
interface.
+Refer 
to your corporate data security policy and information security of

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

[Mike Kaganski]

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |   16 
++
 instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf |6 +++
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |   10 
++
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt |3 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt   |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +
 instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |2 +
 7 files changed, 40 insertions(+)

New commits:
commit 190f0685c866b6232564c9d207456d3292d7a551
Author: Mike Kaganski 
Date:   Tue Aug 16 23:53:51 2016 +1000

tdf#69066: use Restart Manager to restart processes during installation

The goal is to allow installer to automatically close and restart closed
applications, and thus diminish users frustration when they don't know
how to close explorer.exe, or how to start it again and bring desktop back.

Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/aa370379

Notes:
* A dialog MsiRMFilesInUse must be present in MSI.
* It will only be used when operating system's Windows Installer version
is >=4.0, and OS is Vista or newer. If system's Windows Installer is older,
then current FilesInUse dialog will be used.
* MSIRESTARTMANAGERCONTROL property has default value of 0, that enables
installer to use the Restart Manager. It is explicitly set in MSI just in 
case.
* Do not use Restart Manager and do reboot is selected by default.

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

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index f4293a5..4d39022 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -684,3 +684,19 @@ en-US  = "Create a start link on desktop"
 
 [OOO_CONTROL_321]
 en-US  = "Load [ProductName] during system start-up"
+
+[OOO_CONTROL_322]
+en-US  = "Some files that need to be updated are currently in use."
+
+[OOO_CONTROL_323]
+en-US  = "The following applications are using files that need to be updated 
by this setup. You can let Installation Wizard close them and attempt to 
restart them or reboot the machine later."
+
+[OOO_CONTROL_324]
+en-US  = "{&MSSansBold8}Files in Use"
+
+[OOO_CONTROL_325]
+en-US  = "Cancel"
+
+[OOO_CONTROL_326]
+en-US  = "OK"
+
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
index e311558..9bd6e44 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
@@ -43,3 +43,9 @@ en-US = "&Anyone who uses this computer (all users)"
 [OOO_RADIOBUTTON_9]
 en-US = "Only for &me ([USERNAME])"
 
+[OOO_RADIOBUTTON_10]
+en-US = "&Close the applications and attempt to restart them."
+
+[OOO_RADIOBUTTON_11]
+en-US = "&Do not close applications. A reboot will be required."
+
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 11def31..f90d76f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -177,6 +177,16 @@ MaintenanceWelcome Image   Bitmap  0   0   122 
234 1   ImageBmp
 MaintenanceWelcome NextPushButton  230 243 66  17  
3   OOO_CONTROL_148 Cancel  
 MaintenanceWelcome TextLine1   Text135 8   225 45  
65539   OOO_CONTROL_149 
 MaintenanceWelcome TextLine2   Text135 55  228 50  
65539   OOO_CONTROL_150 
+MsiRMFilesInUseBanner  Bitmap  0   0   374 44  1   
BannerBmp   
+MsiRMFilesInUseDlgTitleText13  6   280 15  
196611  OOO_CONTROL_324 
+MsiRMFilesInUseDlgDesc Text21  23  272 25  196611  
OOO_CONTROL_322 
+MsiRMFilesInUseBannerLine  Line0   44  374 0   
1   
+MsiRMFilesInUseDlgText Text21  51  326 43  3   
OOO_CONTROL_323 
+MsiRMFilesInUseListListBox 21  95  332 85  7   
FileInUseProcess
+MsiRMFilesInUseShutdownOption  RadioButtonGroup26  190 
305 45  3   MsiUIRMOption 

[GSoC] Zoner Draw import, project results

[Alex P]

libzmf currently supports importing of Zoner Draw 4-5 documents and BMI
images (bitmap format used in Zoner Draw).

Supported features:
- layers, pages
- curves (lines, bezier curves, curve combinations)
- rectangles
- ellipses
- arcs
- polygons, stars
- barcodes
- object groups and combinations
- rotation, mirroring
- text. Font, size, alignment, bold/italic, line spacing.
- tables
- images
- fill: color, gradient (only linear and radial), image
- pen: color, width, line caps and corners, arrows, dashes
- transparency
- shadows

Missing features:
- Arc mirroring and rotation not fully implemented.
- Blend. Decided to skip this for now to finish more important features.
- Rectangle round corners.
- Table cell text vertical alignment. Not reverse engineered yet.
- There are some issues with table cell borders. Possibly a bug in
LibreOffice or ODF generator.
- Advanced text features such as outline fill color, custom baseline curve
and mirroring. Not supported in librevenge/ODF.
- Image fit and crop placement. Not supported in librevenge/ODF for images
but probably can be implement using image fill.
- Pen calligraphy properties: stretch, angle. Not supported in
librevenge/ODF.
- Complex dash patterns (more than 2 different dashes). Not supported in
librevenge/ODF.
- Arrow position is wrong for half of the arrows. Possibly a bug in
LibreOffice or ODF generator.
- Conical, rectangular, cross-shaped gradients. Not supported in
librevenge/ODF.
- Shadow blur. Not supported in librevenge/ODF.
- Skewing/deforming ("Perspective"). Too difficult to implement.

Code:

libzmf
https://gerrit.libreoffice.org/gitweb?p=libzmf.git&a=search&h=HEAD&st=author&s=alex

libzmf-test
https://gerrit.libreoffice.org/gitweb?p=libzmf-test.git&a=search&h=HEAD&st=author&s=alex

libzmf integration to LibreOffice
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=aaed6fe55a67ee3e92bedf9eed2e2f7c044be19d

OleToy, reverse engineering of zmf4
https://github.com/renyxa/re-lab/commits/master?author=alex.pan...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 sc/source/core/tool/interpr7.cxx |  119 +--
 1 file changed, 101 insertions(+), 18 deletions(-)

New commits:
commit 7d733e16513a1b9413303d60feb03c5a0de941fc
Author: Eike Rathke 
Date:   Wed Aug 17 15:58:42 2016 +0200

Resolves: tdf#88257 handle FILTERXML array/matrix context

... in which subsequent node elements are to be stored in the result
matrix.

Change-Id: Ia980a99a2b9ffba0e651f5d4c2420c8acfb80615

diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 7b2624b..2d48c6b 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -8,6 +8,9 @@
  */
 
 #include "interpre.hxx"
+#include "jumpmatrix.hxx"
+#include "formulacell.hxx"
+#include "scmatrix.hxx"
 #include 
 #include 
 #include 
@@ -33,6 +36,54 @@ void ScInterpreter::ScFilterXML()
 sal_uInt8 nParamCount = GetByte();
 if (MustHaveParamCount( nParamCount, 2 ) )
 {
+SCSIZE nMatCols = 1, nMatRows = 1, nNode = 0;
+const ScMatrix* pPathMatrix = nullptr;
+// In array/matrix context node elements' results are to be
+// subsequently stored. Check this before obtaining any argument from
+// the stack so the stack type can be used.
+if (pJumpMatrix || bMatrixFormula || pCur->IsInForceArray())
+{
+if (pJumpMatrix)
+{
+// Single result, GetString() will retrieve the corresponding
+// argument and JumpMatrix() will store it at the proper
+// position. Note that nMatCols and nMatRows are still 1.
+SCSIZE nCurCol = 0, nCurRow = 0;
+pJumpMatrix->GetPos( nCurCol, nCurRow);
+nNode = nCurRow;
+}
+else if (bMatrixFormula)
+{
+// If there is no formula cell then continue with a single
+// result.
+if (pMyFormulaCell)
+{
+SCCOL nCols;
+SCROW nRows;
+pMyFormulaCell->GetMatColsRows( nCols, nRows);
+nMatCols = nCols;
+nMatRows = nRows;
+}
+}
+else if (GetStackType() == formula::svMatrix)
+{
+pPathMatrix = pStack[sp-1]->GetMatrix();
+if (!pPathMatrix)
+{
+PushIllegalParameter();
+return;
+}
+pPathMatrix->GetDimensions( nMatCols, nMatRows);
+
+/* TODO: it is unclear what should happen if there are
+ * different path arguments in matrix elements. We may have to
+ * evaluate each, and for repeated identical paths use
+ * subsequent nodes. As is, the path at 0,0 is used as obtained
+ * by GetString(). */
+
+}
+}
+
 OUString aXPathExpression = GetString().getString();
 OUString aString = GetString().getString();
 if(aString.isEmpty() || aXPathExpression.isEmpty())
@@ -70,8 +121,6 @@ void ScInterpreter::ScFilterXML()
 return;
 }
 
-rtl::OUString aResult;
-
 switch(pXPathObj->type)
 {
 case XPATH_UNDEFINED:
@@ -85,30 +134,64 @@ void ScInterpreter::ScFilterXML()
 return;
 }
 
-size_t nSize = pNodeSet->nodeNr;
-if( nSize >= 1 )
+const size_t nSize = pNodeSet->nodeNr;
+if (nNode >= nSize)
+{
+// For pJumpMatrix
+PushError( formula::NOTAVAILABLE);
+return;
+}
+
+/* TODO: for nMatCols>1 IF stack type is svMatrix, i.e.
+ * pPathMatrix!=nullptr, we may want a result matrix with
+ * nMatCols columns as well, but clarify first how to treat
+ * differing path elements. */
+
+ScMatrixRef xResMat;
+if (nMatRows > 1)
 {
-if(pNodeSet->nodeTab[0]->type == XML_NAMESPACE_DECL)
+xResMat = GetNewMat( 1, nMatRows, true);
+if (!xResMat)
 {
-xmlNsPtr ns = 
reinterpret_cast(pNodeSet->nodeTab[0]);
-xmlNodePtr cur = 
reinterpret_cast(ns->next);
-std::shared_ptr 
pChar2(xmlNodeGetContent(cur), xmlFree);
-aResult = 
OStringToOUString(OString(reinterpret_cast(pChar2.get())), 
RTL_TEXTENCODING_UTF8);
+PushError( formula::errCodeOverflow);
+return;
+}
+}
+
+for ( ; nNode <

[Libreoffice-commits] core.git: solenv/sanitizers

[Stephan Bergmann]

 solenv/sanitizers/ubsan-suppressions |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit be9cb972503d1eb6283d43a8bbabfef7f5ffef0a
Author: Stephan Bergmann 
Date:   Wed Aug 17 16:02:10 2016 +0200

Silence -fsanitize=float-divide-by-zero in some parts of sc

...that rely on floating-point division by zero to produce infinity

Change-Id: I081c88a9631b1d8aab85c600c6da04f158089644

diff --git a/solenv/sanitizers/ubsan-suppressions 
b/solenv/sanitizers/ubsan-suppressions
new file mode 100644
index 000..529f77c
--- /dev/null
+++ b/solenv/sanitizers/ubsan-suppressions
@@ -0,0 +1,18 @@
+#
+# 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/.
+#
+
+# Various places in sc rely on floating-point division by zero to produce
+# infinity (as triggered by CppunitTest_sc_functions_test); silence those UBSan
+# reports by adding
+# suppressions=/path-to-this/solenv/sanitizers/ubsan-suppressions to the
+# UBSAN_OPTIONS environment variable (and making sure to compile with
+# -fsanitize-recover=float-divide-by-zero):
+
+float-divide-by-zero:sc/source/core/tool/interpr2.cxx
+float-divide-by-zero:scaddins/source/analysis/analysis.cxx
+float-divide-by-zero:scaddins/source/analysis/financial.cxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 external/firebird/ExternalProject_firebird.mk |   26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

New commits:
commit ebe4259437254123697d6d62a4475f112efff31c
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 16:54:03 2016 +0200

fixup firebird with internal icu

Change-Id: I38e44875234aa0c8382ab6e01b4f4c5cc16b834e

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 82de2d3..670041b 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -49,26 +49,24 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,libtommath) 
\
-L$(call gb_UnpackedTarball_get_dir,libtommath) 
\
) \
-   $(if $(filter WNT MACOSX,$(OS)), \
-   $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
-   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
-   )) \
+   $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
+   -I$(call gb_UnpackedTarball_get_dir,icu)/source 
\
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
+   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
+   ) \
" \
&& export CXXFLAGS=" \
$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
$(BOOST_CPPFLAGS) \
-L$(call 
gb_UnpackedTarball_get_dir,boost)/source/lib \
) \
-   $(if $(filter-out WNT MACOSX,$(OS)), \
-   $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
-   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
-   )) \
+   $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
+   -I$(call gb_UnpackedTarball_get_dir,icu)/source 
\
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
+   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
+   ) \
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-L$(call gb_UnpackedTarball_get_dir,libtommath) 
\
) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source solenv/gbuild solenv/sanitizers

[Caolán McNamara]

 sc/qa/unit/subsequent_export-test.cxx |   12 +---
 sc/source/core/tool/interpr1.cxx  |   12 ++--
 sc/source/core/tool/interpr2.cxx  |8 
 solenv/gbuild/CppunitTest.mk  |2 ++
 solenv/sanitizers/ubsan-suppressions  |1 +
 5 files changed, 14 insertions(+), 21 deletions(-)

New commits:
commit f2033c28f4ddb5984fc9b2374486f229f296d5f6
Author: Caolán McNamara 
Date:   Wed Aug 17 13:21:11 2016 +0100

enable password export tests under macosx

gerrit says they build with this cert folder
disable variable in place

Change-Id: Ibf711a01e6c055613c65dd94d85b523e7c8b5acd

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 60131bc..8cbb1fa 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -84,14 +84,10 @@ public:
 virtual void setUp() override;
 virtual void tearDown() override;
 
-#if !defined MACOSX && !defined DRAGONFLY
 ScDocShellRef saveAndReloadPassword( ScDocShell*, const OUString&, const 
OUString&, const OUString&, SfxFilterFlags );
-#endif
 
 void test();
-#if !defined MACOSX && !defined DRAGONFLY
 void testPasswordExport();
-#endif
 void testConditionalFormatExportODS();
 void testConditionalFormatExportXLSX();
 void testColorScaleExportODS();
@@ -178,9 +174,7 @@ public:
 
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
-#if !defined(MACOSX) && !defined(DRAGONFLY)
 CPPUNIT_TEST(testPasswordExport);
-#endif
 CPPUNIT_TEST(testConditionalFormatExportODS);
 CPPUNIT_TEST(testConditionalFormatExportXLSX);
 CPPUNIT_TEST(testColorScaleExportODS);
@@ -294,7 +288,6 @@ void ScExportTest::registerNamespaces(xmlXPathContextPtr& 
pXmlXPathCtx)
 }
 }
 
-#if !defined MACOSX && !defined DRAGONFLY
 ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const 
OUString &rFilter,
 const OUString &rUserData, const OUString& rTypeName, SfxFilterFlags 
nFormatType)
 {
@@ -329,7 +322,6 @@ ScDocShellRef 
ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUSt
 OUString aPass("test");
 return load(aTempFile.GetURL(), rFilter, rUserData, rTypeName, 
nFormatType, nFormat, SOFFICE_FILEFORMAT_CURRENT, &aPass);
 }
-#endif
 
 void ScExportTest::test()
 {
@@ -352,7 +344,6 @@ void ScExportTest::test()
 xDocSh->DoClose();
 }
 
-#if !defined MACOSX && !defined DRAGONFLY
 void ScExportTest::testPasswordExport()
 {
 ScDocShell* pShell = new ScDocShell(
@@ -363,7 +354,7 @@ void ScExportTest::testPasswordExport()
 
 ScDocument& rDoc = pShell->GetDocument();
 
-rDoc.SetValue(0,0,0, 1.0);
+rDoc.SetValue(0, 0, 0, 1.0);
 
 sal_Int32 nFormat = FORMAT_ODS;
 OUString aFilterName(getFileFormats()[nFormat].pFilterName, 
strlen(getFileFormats()[nFormat].pFilterName), RTL_TEXTENCODING_UTF8) ;
@@ -377,7 +368,6 @@ void ScExportTest::testPasswordExport()
 
 xDocSh->DoClose();
 }
-#endif
 
 void ScExportTest::testConditionalFormatExportODS()
 {
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 5532192..f192b1e 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -21,6 +21,8 @@
 
 # Cap the number of threads unittests use.
 export MAX_CONCURRENCY=4
+# Disable searching for certificates by default
+export MOZILLA_CERTIFICATE_FOLDER=0
 
 gb_CppunitTest_UNITTESTFAILED ?= 
$(GBUILDDIR)/platform/unittest-failed-default.sh
 gb_CppunitTest_PYTHONDEPS ?= $(call gb_Library_get_target,pyuno_wrapper) $(if 
$(SYSTEM_PYTHON),,$(call gb_Package_get_target,python3))
commit 34d7a1d9bf0866b9dddb684e723d9f1e5e9a3697
Author: Caolán McNamara 
Date:   Wed Aug 17 15:10:59 2016 +0100

revert div by 0 ubsan hackarounds now

Change-Id: I6497a87d3071f91d5465033d2dc6ecafaa6461f4

Revert "use div() instead of /0 to content ubsan"

This reverts commit fa293f7d6792a2beab048461c8a067e9ca980bb8.

Revert "use div() instead of /0 to content ubsan"

This reverts commit e043cce9a48c1e4f4dd232a58de64f03d1d3919f.

Revert "use div() instead of /0 to content ubsan"

This reverts commit ebe04c075649c677b55941e3b4e57fbca150b5db.

Revert "use div() instead of /0 to content ubsan"

This reverts commit fb2c146752074b132d665e40343a08dcb2e6672e.

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index bec54db..52db341 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1697,7 +1697,7 @@ void ScInterpreter::ScTan()
 
 void ScInterpreter::ScCot()
 {
-PushDouble(div(1.0, ::rtl::math::tan(GetDouble(;
+PushDouble(1.0 / ::rtl::math::tan(GetDouble()));
 }
 
 void ScInterpreter::ScArcSin()
@@ -1737,7 +1737,7 @@ void ScInterpreter::ScTanHyp()
 
 void ScInterpreter::ScCotHyp()
 {
-PushDouble(div(1.0, tanh(GetDouble(;
+PushDouble(1.0 / tanh(GetDouble()));
 }
 
 void ScInterpreter::ScArcSinHyp()
@

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

[Miklos Vajna]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   41 ++--
 sw/qa/extras/uiwriter/uiwriter.cxx  |   33 
 sw/sdi/swriter.sdi  |2 
 sw/source/uibase/uiview/view2.cxx   |   20 -
 4 files changed, 89 insertions(+), 7 deletions(-)

New commits:
commit 087b71f423cf6c047137fb1316527132bb47fc05
Author: Miklos Vajna 
Date:   Wed Aug 17 15:40:14 2016 +0200

sw: allow accept/reject of redline by index

Previously .uno:AcceptTrackedChange / .uno:RejectTrackedChange always
worked by cursor position, but redlines are stored in the redline table,
so they have a unique index. Allow specifying that index when invoking
the command, and in that case ignore the cursor position.

The index is not stable after an insertion / deletion.

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

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 9351b61..e975381 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -466,8 +466,10 @@ static void documentRedline(GtkWidget* pButton, gpointer 
/*pItem*/)
 GtkWidget* pDialog = gtk_dialog_new_with_buttons("Manage Changes",
  GTK_WINDOW 
(gtk_widget_get_toplevel(GTK_WIDGET(pDocView))),
  GTK_DIALOG_MODAL,
- "Close",
- GTK_RESPONSE_OK,
+ "Accept",
+ GTK_RESPONSE_YES,
+ "Reject",
+ GTK_RESPONSE_NO,
  nullptr);
 GtkWidget* pContentArea = gtk_dialog_get_content_area(GTK_DIALOG 
(pDialog));
 
@@ -486,7 +488,7 @@ static void documentRedline(GtkWidget* pButton, gpointer 
/*pItem*/)
-1);
 }
 GtkWidget* pTreeView = 
gtk_tree_view_new_with_model(GTK_TREE_MODEL(pTreeStore));
-std::vector aColumns = {"Index", "Type", "Comment", "Author", 
"Timestamp"};
+std::vector aColumns = {"Index", "Author", "Type", "Comment", 
"Timestamp"};
 for (size_t nColumn = 0; nColumn < aColumns.size(); ++nColumn)
 {
 GtkCellRenderer* pRenderer = gtk_cell_renderer_text_new();
@@ -500,7 +502,38 @@ static void documentRedline(GtkWidget* pButton, gpointer 
/*pItem*/)
 
 // Show the dialog.
 gtk_widget_show_all(pDialog);
-gtk_dialog_run(GTK_DIALOG(pDialog));
+gint res = gtk_dialog_run(GTK_DIALOG(pDialog));
+
+// Dispatch the matching command, if necessary.
+if (res == GTK_RESPONSE_YES || res == GTK_RESPONSE_NO)
+{
+GtkTreeSelection* pSelection = 
gtk_tree_view_get_selection(GTK_TREE_VIEW(pTreeView));
+GtkTreeIter aTreeIter;
+GtkTreeModel* pTreeModel;
+if (gtk_tree_selection_get_selected(pSelection, &pTreeModel, 
&aTreeIter))
+{
+gint nIndex = 0;
+// 0: index
+gtk_tree_model_get(pTreeModel, &aTreeIter, 0, &nIndex, -1);
+std::string aCommand;
+if (res == GTK_RESPONSE_YES)
+aCommand = ".uno:AcceptTrackedChange";
+else
+aCommand = ".uno:RejectTrackedChange";
+// Without the '.uno:' prefix.
+std::string aKey = aCommand.substr(strlen(".uno:"));
+
+// Post the command.
+boost::property_tree::ptree aCommandTree;
+aCommandTree.put(boost::property_tree::ptree::path_type(aKey + 
"/type", '/'), "unsigned short");
+aCommandTree.put(boost::property_tree::ptree::path_type(aKey + 
"/value", '/'), nIndex);
+
+aStream.str(std::string());
+boost::property_tree::write_json(aStream, aCommandTree);
+std::string aArguments = aStream.str();
+lok_doc_view_post_command(pDocView, aCommand.c_str(), 
aArguments.c_str(), false);
+}
+}
 
 gtk_widget_destroy(pDialog);
 }
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index a835533..c0fa9e2 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -202,6 +202,7 @@ public:
 void testTdf84695();
 void testTdf84695NormalChar();
 void testTableStyleUndo();
+void testRedlineParam();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -305,6 +306,7 @@ public:
 CPPUNIT_TEST(testTdf84695);
 CPPUNIT_TEST(testTdf84695NormalChar);
 CPPUNIT_TEST(testTableStyleUnd

[Libreoffice-commits] core.git: 8 commits - config_host.mk.in configure.ac include/LibreOfficeKit ios/experimental RepositoryExternal.mk svx/source sw/source vcl/headless vcl/ios vcl/Library_vcl.mk vc

[Tor Lillqvist]

 RepositoryExternal.mk| 
   2 -
 config_host.mk.in| 
   1 
 configure.ac | 
   8 +++--
 include/LibreOfficeKit/LibreOfficeKitInit.h  | 
   8 ++---
 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   8 ++---
 ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m | 
   3 +-
 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h   | 
   1 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m   | 
   1 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h| 
   1 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m| 
   1 
 svx/source/form/fmscriptingenv.cxx   | 
   2 +
 sw/source/core/crsr/crsrsh.cxx   | 
   8 -
 vcl/Library_vcl.mk   | 
  13 
 vcl/headless/svpbmp.cxx  | 
   4 --
 vcl/headless/svpgdi.cxx  | 
  14 -
 vcl/headless/svpinst.cxx | 
  15 --
 vcl/ios/dummies.cxx  | 
   5 +++
 vcl/quartz/salgdicommon.cxx  | 
   8 ++---
 18 files changed, 51 insertions(+), 52 deletions(-)

New commits:
commit 53f9b5affe109342f1f6f02a2211fdd8b7047571
Author: Tor Lillqvist 
Date:   Wed Aug 17 17:25:58 2016 +0300

Drop some iOS-only code that seems unnecessary and in fact crashes now

Change-Id: I146e340548830c18bc6737a723e0b4d3a684d1c9

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 1dc8702..509f3bf 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2655,10 +2655,6 @@ SwCursorShell::SwCursorShell( SwCursorShell& rShell, 
vcl::Window *pInitWin )
 m_bSetCursorInReadOnly = true;
 m_pVisibleCursor = new SwVisibleCursor( this );
 m_bMacroExecAllowed = rShell.IsMacroExecAllowed();
-
-#if defined(IOS)
-HideCursor();
-#endif
 }
 
 /// default constructor
@@ -2706,10 +2702,6 @@ SwCursorShell::SwCursorShell( SwDoc& rDoc, vcl::Window 
*pInitWin,
 
 m_pVisibleCursor = new SwVisibleCursor( this );
 m_bMacroExecAllowed = true;
-
-#if defined(IOS)
-HideCursor();
-#endif
 }
 
 SwCursorShell::~SwCursorShell()
commit a1d9ed56029b5c6e70500314719ddcfae848aca0
Author: Tor Lillqvist 
Date:   Wed Aug 17 16:26:58 2016 +0300

We use a much newer ICU version now

Change-Id: If631e7a4d3faabcce52e3c890faed5e649d2e967

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index ce3f01a..6c9960e 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
objects = {
 
 /* Begin PBXBuildFile section */
-   BE03BF9318F9A7CC00620DC7 /* icudt54l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt54l.dat */; };
+   BE03BF9318F9A7CC00620DC7 /* icudt57l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt57l.dat */; };
BE55B06D18D87CC600950228 /* DocumentTableViewController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = BE55B06C18D87CC600950228 /* 
DocumentTableViewController.m */; };
BE82BD7618218E2E00A447B5 /* Foundation.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = BE82BD7518218E2E00A447B5 /* 
Foundation.framework */; };
BE82BD7818218E2E00A447B5 /* CoreGraphics.framework in 
Frameworks */ = {isa = PBXBuildFile; fileRef = BE82BD7718218E2E00A447B5 /* 
CoreGraphics.framework */; };
@@ -39,7 +39,7 @@
 
 /* Begin PBXFileReference section */
BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp; 
path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree 
= ""; };
-   BE03BF9218F9A7CC00620DC7 /* icudt54l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt54l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt54l.dat; sourceTree 
= ""; };
+   BE03BF9218F9A7CC00620DC7 /* icudt57l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt57l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt57l.dat; sourceTree 
= ""; };
BE03BF9518FC

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

[Tor Lillqvist]

 include/LibreOfficeKit/LibreOfficeKitInit.h |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bb10522fd92948b442cd5742677fcae65b8f8027
Author: Tor Lillqvist 
Date:   Wed Aug 17 18:25:46 2016 +0300

Revert "These 'inline' keywords are fairly pointless"

Nah, they are a good idea in most cases.

This reverts commit 1c8e4f74c63312fca5898452fae4ba32268fce65.

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index aedc606..bbef7d5 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -51,22 +51,22 @@ extern "C"
   );
 }
 
-char *lok_dlerror(void)
+inline char *lok_dlerror(void)
 {
 return dlerror();
 }
 
-void *lok_dlsym(void *Hnd, const char *pName)
+inline void *lok_dlsym(void *Hnd, const char *pName)
 {
 return dlsym(Hnd, pName);
 }
 
-int lok_dlclose(void *Hnd)
+inline int lok_dlclose(void *Hnd)
 {
 return dlclose(Hnd);
 }
 
-void extendUnoPath(const char *pPath)
+inline void extendUnoPath(const char *pPath)
 {
 (void)pPath;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 external/firebird/ExternalProject_firebird.mk |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 64ccdbe5060986feda35d035012b1ed1016139a7
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 17:25:49 2016 +0200

fixup firebird with internal icu: link time

Let us see whether firebird uses LDFLAGS on MacOSX now...

Change-Id: If1a2d1f11f1c17d8e4cc21f0bae87ec042333e8e

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 670041b..11a289b 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -35,7 +35,6 @@ MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \

$(gb_Package_SOURCEDIR_firebird)/gen/Release/firebird/plugins/libEngine12.dylib 
\

$(gb_Package_SOURCEDIR_firebird)/gen/Release/firebird/lib/libfbclient.dylib.3.0.0)
 
-# do not set LDFLAGS - it is mysteriously not used by firebird on MacOSX
 $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
@@ -53,7 +52,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,icu)/source 
\
-I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
-   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
&& export CXXFLAGS=" \
@@ -65,15 +63,22 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,icu)/source 
\
-I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
-   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-L$(call gb_UnpackedTarball_get_dir,libtommath) 
\
) \
" \
+   && export LDFLAGS=" \
+   $(if $(SYSTEM_ICU),$(ICU_LIBS), \
+   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
+   ) \
+   " \
$(if $(filter MACOSX,$(OS)), \
&& export DYLD_LIBRARY_PATH="$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib" \
)\
+   $(if $(filter-out WNT MACOSX IOS,$(OS)), \
+   && export LD_LIBRARY_PATH="$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib" \
+   )\
&& MAKE=$(MAKE) ./configure \
--without-editline \
--without-fbsample --without-fbsample-db \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Library_vcl.mk

[Tor Lillqvist]

 vcl/Library_vcl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d4c19fe44cbdb2fa462c7044318fe34958261ea
Author: Tor Lillqvist 
Date:   Wed Aug 17 18:29:47 2016 +0300

Nah, just check for iOS explicitly for now

Fixes build breakage on Linux with a system cairo.

Change-Id: I4ef52fbd4a95f72c78433038654571d59efe8996

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 252d1c9..b79087d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -535,7 +535,7 @@ endif
 
 vcl_headless_code= \
 vcl/headless/svpframe \
-$(call gb_Helper_optional,CAIRO, \
+$(if $(filter-out IOS,$(OS)), \
vcl/headless/svpbmp \
vcl/headless/svpgdi \
vcl/headless/svpdata) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/std.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e175592a2732c34e16bcd9c19dc465e4974071c3
Author: Stephan Bergmann 
Date:   Wed Aug 17 17:51:13 2016 +0200

Add missing Loader$1.class

...that was introduced with abbf4777f29374025d576ef8daa3f6dcba02ddf5
"cid#1326844: DP: Use doPrivileged"

Change-Id: I8cd4d947b258313d4d171c5888490d1a860ebee7

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 9fe1e79..841ecdd 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -83,6 +83,7 @@ REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
 
 SDK_JAVA_UNO_BOOTSTRAP_FILES=\
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
+-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$1.class$(SQM) \
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
 -C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/std.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5e1476af00466e657290d952365f2cf91a59a614
Author: Stephan Bergmann 
Date:   Wed Aug 17 17:58:35 2016 +0200

Remove duplicate line

...that was added with both c4c10c17adfb139a208deeb1a47a9fcad924b9c3
"INTEGRATION: CWS sb87: #i88687# let Loader call new unoinfo instead of old
juh.jar UnoInfo.getJars" and 9d53b3321881bd54526f08a9219c539c1430f2b5
"INTEGRATION: CWS jsc21"

Change-Id: I355cbd933e3cff76416d02af8d6717326e0f3cb7

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 841ecdd..4cabe70 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -84,7 +84,6 @@ REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
 SDK_JAVA_UNO_BOOTSTRAP_FILES=\
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$1.class$(SQM) \
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
 -C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
 -C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/InstallationFinder.class$(SQM) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - 1443 commits - accessibility/inc accessibility/source animations/source avmedia/inc avmedia/Library_avmedia.mk avmedia/Module_avme

[Armin Le Grand]

Rebased ref, commits from common ancestor:
commit 7e4cf5bd2880724329ae467e5e23faddc157947c
Author: Armin Le Grand 
Date:   Wed Aug 17 18:22:03 2016 +0200

Resync to master & adaptions

Change-Id: Ib3d58165c3727c011ff65a7ef1bfb00f3ba7b4cb

diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index 8edeca8..97fa0af 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -42,7 +42,6 @@
 #include 
 
 using namespace css;
-static const char* DATA_DIRECTORY = "/sc/qa/unit/screenshots/data/";
 
 class ScScreenshotTest : public ScreenshotTest
 {
@@ -53,11 +52,11 @@ private:
 ScDocShellRef   mxDocSh;
 ScTabViewShell* mpViewShell;
 ScAbstractDialogFactory*mpFact;
-std::unique_ptr   mpStream;
+std::unique_ptr mpStream;
 std::unique_ptr mpItemSet;
 
 /// helper
-void initializeWithDoc(const char* pName);
+void initialize();
 
 /// helper method to populate KnownDialogs, called in setUp(). Needs to be
 /// written and has to add entries to KnownDialogs
@@ -93,7 +92,7 @@ ScScreenshotTest::~ScScreenshotTest()
 {
 }
 
-void ScScreenshotTest::initializeWithDoc(const char* pName)
+void ScScreenshotTest::initialize()
 {
 if (mxComponent.is())
 mxComponent->dispose();
@@ -113,7 +112,14 @@ void ScScreenshotTest::initializeWithDoc(const char* pName)
 CPPUNIT_ASSERT_MESSAGE("Failed to create dialog factory", mpFact);
 
 const OUString aCsv("some, strings, here, separated, by, commas");
-mpStream.reset(new ScImportStringStream(aCsv));
+SvMemoryStream* pNewMemStream = new SvMemoryStream(const_cast(aCsv.getStr()), aCsv.getLength() * sizeof(sal_Unicode), StreamMode::READ);
+pNewMemStream->SetStreamCharSet( RTL_TEXTENCODING_UNICODE );
+#ifdef OSL_BIGENDIAN
+pNewMemStream->SetEndian(SvStreamEndian::BIG);
+#else
+pNewMemStream->SetEndian(SvStreamEndian::LITTLE);
+#endif
+mpStream.reset(pNewMemStream);
 }
 
 void ScScreenshotTest::registerKnownDialogsByID(mapType& rKnownDialogs)
@@ -272,7 +278,7 @@ VclAbstractDialog* 
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
 
 void ScScreenshotTest::testOpeningModalDialogs()
 {
-initializeWithDoc("empty.ods");
+initialize();
 
 /// process input file containing the UXMLDescriptions of the dialogs to 
dump
 processDialogBatchFile("sc/qa/unit/screenshots/data/screenshots.txt");
commit 3a195837c1ca92bca0f3154a84fda78751342186
Author: Armin Le Grand 
Date:   Wed Aug 17 12:30:11 2016 +0200

Adapted sc screenshot test to create new document

Change-Id: I644d2fcb9fe4ec66e964192d3dda61ca331acece

diff --git a/sc/qa/unit/screenshots/data/empty.ods 
b/sc/qa/unit/screenshots/data/empty.ods
deleted file mode 100644
index 14b4232..000
Binary files a/sc/qa/unit/screenshots/data/empty.ods and /dev/null differ
diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index c52bbc5..8edeca8 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -72,11 +72,9 @@ public:
 virtual ~ScScreenshotTest();
 
 void testOpeningModalDialogs();
-//void testOpeningModelessDialogs();
 
 CPPUNIT_TEST_SUITE(ScScreenshotTest);
 CPPUNIT_TEST(testOpeningModalDialogs);
-//CPPUNIT_TEST(testOpeningModelessDialogs);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -99,7 +97,8 @@ void ScScreenshotTest::initializeWithDoc(const char* pName)
 {
 if (mxComponent.is())
 mxComponent->dispose();
-mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY) 
+ OUString::createFromAscii(pName), "com.sun.star.sheet.SpreadsheetDocument");
+// use new, epty doc to avoid file locking
+mxComponent = loadFromDesktop("private:factory/scalc", 
"com.sun.star.sheet.SpreadsheetDocument");
 
 mpFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent);
 CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", mpFoundShell);
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 335c00c..99da7cc 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 void TabDialog::ImplInitTabDialogData()
commit 1dd07de59c6f67b388dd206cbb1d276e96089299
Author: Armin Le Grand 
Date:   Wed Aug 17 09:43:33 2016 +0200

added and adapted to target screenshot

Up to now the screenshot creation was added/dependent of
target slowcheck. Since quite some modules have added screenshot
creations now, I added an own target 'screenshot' to allow to keep
current slowcheck and screenshot creation separated

Change-Id: I80a49a0db607edf8e0405672d570f624d29912e7

diff --git a/Makefile.in b/Makefile.in
index f7f68ed..a27d55d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 

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

[Lionel Elie Mamane]

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/firebird-cloop-compiler.patch.1 |   12 
 2 files changed, 13 insertions(+)

New commits:
commit 5dad45d798eaaeaa4c6e480e4ce4cd06964e7a1f
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 18:36:04 2016 +0200

firebird: have built-in cloop use same compiler as everyone else

Change-Id: I44cbbc82e34b9f4047a2fbebc3b959e3e148452a

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index eebe4d0..5715d0c 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/firebird.disable-ib-util-not-found.patch.1 \
external/firebird/firebird-Engine12.patch \
external/firebird/firebird-rpath.patch.0 \
+   external/firebird/firebird-cloop-compiler.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-cloop-compiler.patch.1 
b/external/firebird/firebird-cloop-compiler.patch.1
new file mode 100644
index 000..ac82bb0
--- /dev/null
+++ b/external/firebird/firebird-cloop-compiler.patch.1
@@ -0,0 +1,12 @@
+diff -ur firebird.org/extern/cloop/Makefile firebird/extern/cloop/Makefile
+--- firebird.org/extern/cloop/Makefile 2016-08-17 18:32:59.078044357 +0200
 firebird/extern/cloop/Makefile 2016-08-17 18:33:14.430518561 +0200
+@@ -4,8 +4,6 @@
+ 
+ TARGET:= release
+ 
+-CC:= gcc
+-CXX   := g++
+ LD:= $(CXX)
+ 
+ SRC_DIR   := src
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

compiler (in)-compatibilities

[Lionel Elie Mamane]

Hi,

Short version: do we have a way to include compiler flags only with
some compiler version?

Long version: So, firebird currently is incompatible with GCC 6. AFAIK
there are two breaker issues:

1) compiled code aborts in free() because it free()s an address that
   was not malloc()ed

2) code that does not compile


Issue 1 is fixed by adding
 -fno-sized-deallocation -fno-delete-null-pointer-checks
to CXXFLAGS.

Issue 2 is fixed by backporting an upstream commit from their master
branch.

Number 2 I can do, no problem. But number 1 I feel I shouldn't do
unconditionally, because another compiler than GCC 6 probably will not
know these flags? Any advice there?

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

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

[Lionel Elie Mamane]

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/firebird-gcc6.patch.1   |   19 +++
 2 files changed, 20 insertions(+)

New commits:
commit 31b13ed9ef5c46e732208be17d7c90c3af89ed42
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 19:21:14 2016 +0200

firebird: gcc6 compatibility part 1

Change-Id: I4fbb131a629275626510d5311550e8bf8cdef6d5

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 5715d0c..f015a91 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-Engine12.patch \
external/firebird/firebird-rpath.patch.0 \
external/firebird/firebird-cloop-compiler.patch.1 \
+   external/firebird/firebird-gcc6.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-gcc6.patch.1 
b/external/firebird/firebird-gcc6.patch.1
new file mode 100644
index 000..e136141
--- /dev/null
+++ b/external/firebird/firebird-gcc6.patch.1
@@ -0,0 +1,19 @@
+commit 3618aa2171674babf79ef935aa049c40a3db1321
+Author: asfernandes 
+Date:   Sat Mar 5 03:39:36 2016 +
+
+Make the generated code compatible with gcc 6 in C++-14 mode.
+
+diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
+index 2af96c6..2dcffd6 100644
+--- a/src/gpre/c_cxx.cpp
 b/src/gpre/c_cxx.cpp
+@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
+   printa(0, "static %sshort\n   isc_%dl = %d;",
+  (request->req_flags & REQ_extend_dpb) ? "" : 
CONST_STR,
+  request->req_ident, request->req_length);
+-  printa(0, "static %schar\n   isc_%d [] = {", CONST_STR, 
request->req_ident);
++  printa(0, "static %sunsigned char\n   isc_%d [] = {", 
CONST_STR, request->req_ident);
+ 
+   const TEXT* string_type = "blr";
+   if (gpreGlob.sw_raw)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 external/firebird/ExternalProject_firebird.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 40bab0a345305ec271baa374cab20d55eeb2661d
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 19:30:41 2016 +0200

firebird: gcc6 compatibility part 2

Change-Id: I78ef547f4996050bffe83ab7e0e6acd046264bf8

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 11a289b..6b3e689 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -55,6 +55,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
) \
" \
&& export CXXFLAGS=" \
+   $(if $(shell test '$(GCC_VERSION)' -ge 600 && echo 
yes),-fno-sized-deallocation -fno-delete-null-pointer-checks,) \
$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
$(BOOST_CPPFLAGS) \
-L$(call 
gb_UnpackedTarball_get_dir,boost)/source/lib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: compiler (in)-compatibilities

[Lionel Elie Mamane]

Yes, I know. I will not fix firebird's code, they will hopefully do it
"soon". I can add some work-around compiler flags, though.

I found out about GCC_VERSION and am now using that to conditionally
enable the work-around compiler flags.

On Wed, Aug 17, 2016 at 07:28:19PM +0200, Luc Castermans wrote:
> actually case 1 is wrong code. Compiler is correct and code should be
> corrected.
> 
> regards,
> 
> Luc
> 
> Op 17 aug. 2016 19:18 schreef "Lionel Elie Mamane" :
> 
> > Hi,
> >
> > Short version: do we have a way to include compiler flags only with
> > some compiler version?
> >
> > Long version: So, firebird currently is incompatible with GCC 6. AFAIK
> > there are two breaker issues:
> >
> > 1) compiled code aborts in free() because it free()s an address that
> >was not malloc()ed
> >
> > 2) code that does not compile
> >
> >
> > Issue 1 is fixed by adding
> >  -fno-sized-deallocation -fno-delete-null-pointer-checks
> > to CXXFLAGS.
> >
> > Issue 2 is fixed by backporting an upstream commit from their master
> > branch.
> >
> > Number 2 I can do, no problem. But number 1 I feel I shouldn't do
> > unconditionally, because another compiler than GCC 6 probably will not
> > know these flags? Any advice there?
> >
> > --
> > Lionel
> > ___
> > LibreOffice mailing list
> > LibreOffice@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/libreoffice
> >
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Lionel Elie Mamane]

 external/firebird/firebird-cygwin-msvc.patch |   31 +--
 1 file changed, 2 insertions(+), 29 deletions(-)

New commits:
commit 2a871f0f24de805d8d11ae75a896004a5e522b8e
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 19:51:41 2016 +0200

firebird: fixup cloop on Windows

newly added patch was already essentially included in 
firebird-cygwin-msvc.patch

Change-Id: Ibb4d17ced8fd58dd46ff8ca54c8a0d9d0422345e

diff --git a/external/firebird/firebird-cygwin-msvc.patch 
b/external/firebird/firebird-cygwin-msvc.patch
index 10c1dfe..3e769c8 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -532,17 +532,7 @@ diff -ur extern/btyacc/Makefile extern/btyacc/Makefile
  #define DLL_EXPORT __declspec(dllexport)
 --- extern/cloop/Makefile  2016-07-07 15:56:28.279136300 +0200
 +++ extern/cloop/Makefile  2016-07-13 16:22:38.493479800 +0200
-@@ -4,15 +4,15 @@
- 
- TARGET:= release
- 
--CC:= gcc
--CXX   := g++
--LD:= $(CXX)
-+#CC   := gcc
-+#CXX  := g++
-+#LD   := $(CXX)
- 
+@@ -11,8 +11,8 @@
  SRC_DIR   := src
  BUILD_DIR := build
  OUT_DIR   := output
@@ -553,7 +543,7 @@ diff -ur extern/btyacc/Makefile extern/btyacc/Makefile
  
  OBJ_DIR := $(BUILD_DIR)/$(TARGET)
  BIN_DIR := $(OUT_DIR)/$(TARGET)/bin
-@@ -27,17 +27,17 @@
+@@ -27,7 +27,7 @@
  OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
  OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
  
@@ -562,23 +552,6 @@ diff -ur extern/btyacc/Makefile extern/btyacc/Makefile
  CXX_FLAGS := $(C_FLAGS)
  FPC_FLAGS := -Mdelphi
  
--ifeq ($(TARGET),release)
--  CXX_FLAGS += -O3
--endif
--
--ifeq ($(TARGET),debug)
--  FPC_FLAGS += -g
--endif
-+#ifeq ($(TARGET),release)
-+# CXX_FLAGS += -O3
-+#endif
-+
-+#ifeq ($(TARGET),debug)
-+# FPC_FLAGS += -g
-+#endif
- 
- vpath %.c $(SRC_DIRS)
- vpath %.cpp $(SRC_DIRS)
 @@ -53,7 +53,7 @@
  .PHONY: all mkdirs clean
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Martin Nathansen]

 sw/source/core/crsr/crsrsh.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e879ddeda3d81ec95022142f7d4e514bfec8b123
Author: Martin Nathansen 
Date:   Fri Aug 12 13:04:19 2016 +0200

Resolves: tdf#101245 doc(x) protected areas not protected with disabled 
cursor

Protected areas of imported doc(x) documents are now protected even when
the “enable cursor” option is disabled: It is still possible to set the
cursor into the protected area, but the text is not editable anymore.

Change-Id: If45dfc82fb7cc70e0a6569a9d735eafcafda9bc2
Reviewed-on: https://gerrit.libreoffice.org/28075
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 509f3bf..5b6edb7 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -67,6 +67,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace util;
@@ -3044,7 +3045,9 @@ bool SwCursorShell::HasReadonlySel(bool bAnnotationMode) 
const
 {
 bool bRet = false;
 // If protected area is to be ignored, then selections are never read-only.
-if ((IsReadOnlyAvailable() || GetViewOptions()->IsFormView()) && 
!GetViewOptions()->IsIgnoreProtectedArea())
+if ((IsReadOnlyAvailable() || GetViewOptions()->IsFormView() ||
+GetDoc()->GetDocumentSettingManager().get( 
DocumentSettingId::PROTECT_FORM )) &&
+!GetViewOptions()->IsIgnoreProtectedArea())
 {
 if ( m_pTableCursor != nullptr )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Devart

[toki]

My recommendation would be to remove _all_ extensions provided by Devart
from the LibreOffice Extension website, and permanently ban them from
contributing anything to the project.

I don't object to commercially distributed licenses.
I don't object to developers that are selling Open Source Licensed product.

I do, however, think that a company that claims to use OSI licenses, but
whose license contains clauses such as the following is being, at best,
intentionally deceptive:

«
1.1. If you are a legally licensed user, depending on the license type
specified in the registration letter you have received from Devart upon
purchase of the Software:
- the "Desktop License" allows you to install and use the Software on a
single desktop computer, provided it is accessed by no more than one
person at a time
, either directly or remotely, for sole purposes only in accordance with
this Agreement. If more than one person can simultaneously use the
computer where you plan to install the product, you must purchase a
Server License. A Desktop License is valid for one single desktop
installation;
- the "Server License" allows you to install and use the Software on a
single server, provided it is accessed by more than one person at a
time, either directly or remotely. This definition includes, but is not
limited to, Web servers, application servers, batch servers, and desktop
workstations, where more than one concurrent users can access the
Software. A Server License is valid for one single server installation,
provided it is used by 1 (one) legal entity in accordance with this
Agreement.

1.2. If you are a legally licensed user of the Software, you are also
entitled to:
- make one copy of the Software for archival purposes only, or copy the
Software onto the hard disk of your computer and retain the original for
archival pur
poses;
- develop and test Applications with the Software, subject to the
Limitations below.

1.3. You are allowed to use evaluation versions of the Software as
specified in the Evaluation section.

No other rights or privileges are granted in this Agreement.

2.1 You may not reverse engineer, decompile, or disassemble the Software.
2.2 You may not reproduce or distribute any Software documentation
without express written permission from Devart.
2.3 You may not distribute and sell any portion of the Software
integrating it into your Applications.
2.4 You may not transfer, assign, or modify the Software, in whole or in
part. In particular, the Software license is non-transferable, and you
may not transfer the installation package.
»


Here is a list of licenses approved the Open Source Initiative,

Academic Free License 3.0 (AFL-3.0)
Affero General Public License: See GNU Affero General Public License
3.0 (AGPL-3.0)
Adaptive Public License (APL-1.0)
Apache License 2.0 (Apache-2.0)
Apple Public Source License (APSL-2.0)
Artistic license 2.0 (Artistic-2.0)
Attribution Assurance Licenses (AAL)
BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)
BSD 2-Clause "Simplified" or "FreeBSD" License (BSD-2-Clause)
Boost Software License (BSL-1.0)
CeCILL License 2.1 (CECILL-2.1)
Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1)
Common Development and Distribution License 1.0 (CDDL-1.0)
Common Public Attribution License 1.0 (CPAL-1.0)
CUA Office Public License Version 1.0 (CUA-OPL-1.0)
EU DataGrid Software License (EUDatagrid)
Eclipse Public License 1.0 (EPL-1.0)
eCos License version 2.0
Educational Community License, Version 2.0 (ECL-2.0)
Eiffel Forum License V2.0 (EFL-2.0)
Entessa Public License (Entessa)
European Union Public License, Version 1.1 (EUPL-1.1) (links to
every language's version on their site)
Fair License (Fair)
Frameworx License (Frameworx-1.0)
Free Public License 1.0.0
GNU Affero General Public License v3 (AGPL-3.0)
GNU General Public License version 2.0 (GPL-2.0)
GNU General Public License version 3.0 (GPL-3.0)
GNU Library or "Lesser" General Public License version 2.1 (LGPL-2.1)
GNU Library or "Lesser" General Public License version 3.0 (LGPL-3.0)
Historical Permission Notice and Disclaimer (HPND)
IBM Public License 1.0 (IPL-1.0)
IPA Font License (IPA)
ISC License (ISC)
LaTeX Project Public License 1.3c (LPPL-1.3c)
Licence Libre du Québec – Permissive (LiLiQ-P) version 1.1
Licence Libre du Québec – Réciprocité (LiLiQ-R) version 1.1
Licence Libre du Québec – Réciprocité forte (LiLiQ-R+) version 1.1
Lucent Public License Version 1.02 (LPL-1.02)
MirOS Licence (MirOS)
Microsoft Public License (MS-PL)
Microsoft Reciprocal License (MS-RL)
MIT license (MIT)
Motosoto License (Motosoto)
Mozilla Public License 2.0 (MPL-2.0)
Multics License (Multics)
NASA Open Source Agreement 1.3 (NASA-1.3)
NTP License (NTP)
Naumen Public License (Naumen)
Nethack General Public License (NGPL)
Nokia Open

Re: How to "flush" Writer node changes into layouting?

[Miklos Vajna]

Hi Jan-Marek,

On Sat, Aug 13, 2016 at 02:10:15AM +0200, Jan-Marek Glogowski 
 wrote:
> 2. Fix the layouting problem introduced by commit
> 60d34e1c840d2c317bb7d0a5b14f4602c22b3fcc
> 
> This also just happens for large MM documents with page bound frames.
> Everything with 300+ pages is basically unbearable now. The commit is
> correct, but previously the - now enabled - "fixup" code was just run at
> the end of the SwPageFrm generation.
> 
> One of the bugs uncovered by the fix is fixed by "Use InsertPage in
> AssertFlyPages", but for the second I just found the workaround done by
> "Switch back to InsertPageBreak in SwDoc::AppendDoc".
> 
> I would like to get rid of this workaround, but before spending even
> more time on the problem, I would like to know, if anyone knows - as
> quoted from the patch:
> 
> +  // a magic call to sync with whatever, so AssertFlyPages
> +  // sees the correct format AKA same as InsertPageBreak does
> 
> ???
> 
> My workaround just works, because InsertPageBreak actually splits the
> current content node, which moves the cursor to a now page, which isn't
> generated. Now EndOfAction needs to fix the cursor and somehow something
> in the stack is able to flush the cached data. Some comments in the code
> of the backtrace mention an IdleCollector, but I guess that's code is
> already done.
> 
> I've added most information to the commit message of "Switch back to
> InsertPageBreak in SwDoc::AppendDoc"

Do I understand correctly that the tip of your branch is a unit test for
the problem, and the previous commit is the conditional revert? (As in:
it re-introduces the previously existing behavior without introducing
the mentioned Coverity problem again.) If so, I think that's fine to
have, but please don't pick the revert as-is to master, i.e. instead of
introducing that #if 0 code, just remove the code that would be
disabled. I'm afraid I don't know more about the SwDoc::AppendDoc() code
than you. :-)

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: helpcontent2

[Stanislav Horacek]

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

New commits:
commit b7ccf456349c5c72b6b021e6a27d2bd8f30d7196
Author: Stanislav Horacek 
Date:   Fri Aug 12 21:43:15 2016 +0200

Updated core
Project: help  641b43850cb2903e640bfbdd5df413e80aff2b68

tdf#99840 update info on saving of pen drawings in Impress

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

diff --git a/helpcontent2 b/helpcontent2
index 38af1ad..641b438 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 38af1adac0c495b5865cd70d8a29163ec2fcdc14
+Subproject commit 641b43850cb2903e640bfbdd5df413e80aff2b68
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stanislav Horacek]

 source/text/simpress/01/0608.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 641b43850cb2903e640bfbdd5df413e80aff2b68
Author: Stanislav Horacek 
Date:   Fri Aug 12 21:43:15 2016 +0200

tdf#99840 update info on saving of pen drawings in Impress

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

diff --git a/source/text/simpress/01/0608.xhp 
b/source/text/simpress/01/0608.xhp
index 1de9b14..39bd613 100644
--- a/source/text/simpress/01/0608.xhp
+++ b/source/text/simpress/01/0608.xhp
@@ -97,7 +97,7 @@
 
 Mouse 
pointer as pen
 Changes the mouse 
pointer to a pen which you can use to draw on slides during the 
presentation.
-Anything you write 
with the pen is not saved when you exit the slide show. The properties of the 
pen can be changed by choosing the Pen Width or Change pen 
Color command in the context menu of the running slide show.
+Anything you write 
with the pen will appear in your slides after exiting the slideshow. The 
properties of the pen can be changed by choosing the Pen Width or 
Change pen Color command in the context menu of the running slide 
show.
 
 
 Animations allowed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 officecfg/registry/data/org/openoffice/VCL.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9555b9c71031e2f91d0975f2eafa32481160508a
Author: Caolán McNamara 
Date:   Wed Aug 17 09:35:57 2016 +0100

Tino should be Tinos

Change-Id: I9f02547e2c800816abe395c42fecadba2ee7332e

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 52cacda..7319470 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -108,7 +108,7 @@
 Arial Unicode MS;DejaVu Sans;Lucida Sans Unicode;Tahoma;Albany 
AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;SansSerif
   
   
-Liberation Serif;Thorndale AMT;Thorndale;Times New 
Roman;Tino;DejaVu Serif;Nimbus Roman No9 L;Times;Lucida Serif;Lucida 
Bright;Timmons;New York;Serif
+Liberation Serif;Thorndale AMT;Thorndale;Times New 
Roman;Tinos;DejaVu Serif;Nimbus Roman No9 L;Times;Lucida Serif;Lucida 
Bright;Timmons;New York;Serif
   
   
 StarSymbol;OpenSymbol;Arial Unicode MS;StarBats;Zapf 
Dingbats;WingDings;Symbol
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: single installation 'regression'

[Caolán McNamara]

On Fri, 2016-07-29 at 13:44 +0100, Caolán McNamara wrote:
> On Thu, 2016-07-28 at 16:18 +0100, Michael Meeks wrote:
> > 
> >     * ~Component   count net * all regressions
> ...
> > 
> >   Installation -   1 (+0)
> >                 + http://tdf.io/allregressions
> 
> Just to take a brief look at one of the two categories which have
> just a single regression claimed for them then we have
> 
> https://bugs.documentfoundation.org/show_bug.cgi?id=69066
> for Windows installation woes (apparently) with explorer extensions.
> This one is a typical 50 comment trainwreck which may no longer be
> the original problem at this point.

Thanks to...

commit 190f0685c866b6232564c9d207456d3292d7a551
Author: Mike Kaganski 
Date:   Tue Aug 16 23:53:51 2016 +1000

tdf#69066: use Restart Manager to restart processes during installation

we have a plausible improvement to the situation now.

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

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

[Thorsten Behrens]

 download.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 327f5cc66f122979943d2c896eb1824791a854c9
Author: Thorsten Behrens 
Date:   Thu Aug 18 01:36:24 2016 +0200

Update officeotron jar - now built with java 1.6 target

Mac did not like the previous 1.7 bytecode version.

Change-Id: I0dc22731cadaed7883023cb89a84d7c9304714e1

diff --git a/download.lst b/download.lst
index 4383abb..3e5de64 100644
--- a/download.lst
+++ b/download.lst
@@ -119,7 +119,7 @@ export ODFGEN_MD5SUM := 32572ea48d9021bbd6fa317ddb697abc
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export ODFVALIDATOR_JAR := 
e7f181c1d969dbd553644b191cb0a6d3-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
-export OFFICEOTRON_JAR := 
c038af04c1431525e3fdee57d32b865e-officeotron-0.7.4-master.jar
+export OFFICEOTRON_JAR := 
a1adc7a47ed126ed029893c23c8bdd43-officeotron-0.7.4-master.jar
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens]

 configure.ac |  222 ++-
 1 file changed, 114 insertions(+), 108 deletions(-)

New commits:
commit eab85ed43846c7304980c098522f51de7ff11da8
Author: Thorsten Behrens 
Date:   Thu Aug 18 02:05:22 2016 +0200

configure: move export validation, check for min jre

officeotron needs JRE 1.6 at minimum, so check for that and bail
out sensibly. Had to move that entire block down after java version
checks.

Change-Id: I69b510c53a789478710dae6167a237c2edf40f2d

diff --git a/configure.ac b/configure.ac
index 4263324..75b28b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2740,114 +2740,6 @@ dnl ENABLE_JAVA="TRUE" if we want there to be 
*run-time* (and build-time) suppor
 dnl ENABLE_JAVA="" indicate no Java support at all
 
 dnl ===
-dnl Export file validation
-dnl ===
-AC_MSG_CHECKING([whether to enable export file validation])
-if test "$with_export_validation" = yes; then
-AC_MSG_RESULT([yes])
-AC_DEFINE(HAVE_EXPORT_VALIDATION)
-
-AC_PATH_PROGS(ODFVALIDATOR, odfvalidator)
-if test -z "$ODFVALIDATOR"; then
-# remember to download the ODF toolkit with validator later
-AC_MSG_NOTICE([no odfvalidator found, will download it])
-BUILD_TYPE="$BUILD_TYPE ODFVALIDATOR"
-ODFVALIDATOR="$SRC_ROOT/bin/odfvalidator.sh"
-
-# and fetch name of odfvalidator jar name from download.lst
-ODFVALIDATOR_JAR=`sed -ne "s/export *ODFVALIDATOR_JAR *:= *\(.*\) 
*/\1/p" download.lst`
-AC_SUBST(ODFVALIDATOR_JAR)
-
-if test -z "$ODFVALIDATOR_JAR"; then
-AC_MSG_ERROR([odfvalidator jar location is not determined 
(--with-export-validation)])
-fi
-fi
-if test "$build_os" = "cygwin"; then
-# In case of CygWin it will be executed from Windows,
-# so we need to run bash and absolute path to validator
-# so instead of "odfvalidator" it will be
-# something like "bash.exe C:\cygwin\opt\lo\bin\odfvalidator"
-ODFVALIDATOR="bash.exe `cygpath -m "$ODFVALIDATOR"`"
-else
-ODFVALIDATOR="sh $ODFVALIDATOR"
-fi
-AC_SUBST(ODFVALIDATOR)
-
-
-AC_PATH_PROGS(OFFICEOTRON, officeotron)
-if test -z "$OFFICEOTRON"; then
-# remember to download the officeotron with validator later
-AC_MSG_NOTICE([no officeotron found, will download it])
-BUILD_TYPE="$BUILD_TYPE OFFICEOTRON"
-OFFICEOTRON="$SRC_ROOT/bin/officeotron.sh"
-
-# and fetch name of officeotron jar name from download.lst
-OFFICEOTRON_JAR=`sed -ne "s/export *OFFICEOTRON_JAR *:= *\(.*\) 
*/\1/p" download.lst`
-AC_SUBST(OFFICEOTRON_JAR)
-
-if test -z "$OFFICEOTRON_JAR"; then
-AC_MSG_ERROR([officeotron jar location is not determined 
(--with-export-validation)])
-fi
-else
-# check version of existing officeotron
-OFFICEOTRON_VER=`$OFFICEOTRON --version | $AWK -F. '{ print 
\$1*1+\$2*100+\$3 }'`
-if test 0"$OFFICEOTRON_VER" -lt 704; then
-AC_MSG_ERROR([officeotron too old])
-fi
-fi
-if test "$build_os" = "cygwin"; then
-# In case of CygWin it will be executed from Windows,
-# so we need to run bash and absolute path to validator
-# so instead of "odfvalidator" it will be
-# something like "bash.exe C:\cygwin\opt\lo\bin\odfvalidator"
-OFFICEOTRON="bash.exe `cygpath -m "$OFFICEOTRON"`"
-else
-OFFICEOTRON="sh $OFFICEOTRON"
-fi
-AC_SUBST(OFFICEOTRON)
-else
-AC_MSG_RESULT([no])
-fi
-
-AC_MSG_CHECKING([for Microsoft Binary File Format Validator])
-if test "$with_bffvalidator" != "no"; then
-AC_DEFINE(HAVE_BFFVALIDATOR)
-
-if test "$with_export_validation" != "yes"; then
-AC_MSG_ERROR([Please enable export validation 
(-with-export-validation)!])
-fi
-
-if test "$with_bffvalidator" = "yes"; then
-BFFVALIDATOR=`win_short_path_for_make "$PROGRAMFILES/Microsoft 
Office/BFFValidator/BFFValidator.exe"`
-else
-BFFVALIDATOR="$with_bffvalidator"
-fi
-
-if test "$build_os" = "cygwin"; then
-if test -n "$BFFVALIDATOR" -a -e "`cygpath $BFFVALIDATOR`"; then
-AC_MSG_RESULT($BFFVALIDATOR)
-else
-AC_MSG_ERROR([bffvalidator not found, but required by 
--with-bffvalidator])
-fi
-elif test -n "$BFFVALIDATOR"; then
-# We are not in CygWin but need to run Windows binary with wine
-AC_PATH_PROGS(WINE, wine)
-
-# so swap in a shell wrapper that converts paths transparently
-BFFVALIDATOR_EXE="$BFFVALIDATOR"
-BFFVALIDATOR="sh $SRC_ROOT/bin/bffvalidator.sh"
-AC_SUBST(BFFVALIDATOR_EXE)
-AC_MSG_RESULT($BFFVALIDATOR)
-else
-AC_MSG_ERROR([bffvalidator not found, but required by 
--with-bffvalidator])

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - 90 commits - basctl/CppunitTest_basctl_dialogs_test.mk basctl/Module_basctl.mk basctl/qa bin/gbuild-to-ide chart2/CppunitTest_char

[Armin Le Grand]

Rebased ref, commits from common ancestor:
commit a06a8ecb743aa3ffb1be83fbb98f7aa06bc230cb
Author: Armin Le Grand 
Date:   Wed Aug 17 12:30:11 2016 +0200

screenshots: fix sc screenshot test

Seems to need a new document

Change-Id: I644d2fcb9fe4ec66e964192d3dda61ca331acece

diff --git a/sc/qa/unit/screenshots/data/empty.ods 
b/sc/qa/unit/screenshots/data/empty.ods
deleted file mode 100644
index 14b4232..000
Binary files a/sc/qa/unit/screenshots/data/empty.ods and /dev/null differ
diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index c52bbc5..97fa0af 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -42,7 +42,6 @@
 #include 
 
 using namespace css;
-static const char* DATA_DIRECTORY = "/sc/qa/unit/screenshots/data/";
 
 class ScScreenshotTest : public ScreenshotTest
 {
@@ -53,11 +52,11 @@ private:
 ScDocShellRef   mxDocSh;
 ScTabViewShell* mpViewShell;
 ScAbstractDialogFactory*mpFact;
-std::unique_ptr   mpStream;
+std::unique_ptr mpStream;
 std::unique_ptr mpItemSet;
 
 /// helper
-void initializeWithDoc(const char* pName);
+void initialize();
 
 /// helper method to populate KnownDialogs, called in setUp(). Needs to be
 /// written and has to add entries to KnownDialogs
@@ -72,11 +71,9 @@ public:
 virtual ~ScScreenshotTest();
 
 void testOpeningModalDialogs();
-//void testOpeningModelessDialogs();
 
 CPPUNIT_TEST_SUITE(ScScreenshotTest);
 CPPUNIT_TEST(testOpeningModalDialogs);
-//CPPUNIT_TEST(testOpeningModelessDialogs);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -95,11 +92,12 @@ ScScreenshotTest::~ScScreenshotTest()
 {
 }
 
-void ScScreenshotTest::initializeWithDoc(const char* pName)
+void ScScreenshotTest::initialize()
 {
 if (mxComponent.is())
 mxComponent->dispose();
-mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY) 
+ OUString::createFromAscii(pName), "com.sun.star.sheet.SpreadsheetDocument");
+// use new, epty doc to avoid file locking
+mxComponent = loadFromDesktop("private:factory/scalc", 
"com.sun.star.sheet.SpreadsheetDocument");
 
 mpFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent);
 CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", mpFoundShell);
@@ -114,7 +112,14 @@ void ScScreenshotTest::initializeWithDoc(const char* pName)
 CPPUNIT_ASSERT_MESSAGE("Failed to create dialog factory", mpFact);
 
 const OUString aCsv("some, strings, here, separated, by, commas");
-mpStream.reset(new ScImportStringStream(aCsv));
+SvMemoryStream* pNewMemStream = new SvMemoryStream(const_cast(aCsv.getStr()), aCsv.getLength() * sizeof(sal_Unicode), StreamMode::READ);
+pNewMemStream->SetStreamCharSet( RTL_TEXTENCODING_UNICODE );
+#ifdef OSL_BIGENDIAN
+pNewMemStream->SetEndian(SvStreamEndian::BIG);
+#else
+pNewMemStream->SetEndian(SvStreamEndian::LITTLE);
+#endif
+mpStream.reset(pNewMemStream);
 }
 
 void ScScreenshotTest::registerKnownDialogsByID(mapType& rKnownDialogs)
@@ -273,7 +278,7 @@ VclAbstractDialog* 
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
 
 void ScScreenshotTest::testOpeningModalDialogs()
 {
-initializeWithDoc("empty.ods");
+initialize();
 
 /// process input file containing the UXMLDescriptions of the dialogs to 
dump
 processDialogBatchFile("sc/qa/unit/screenshots/data/screenshots.txt");
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 335c00c..99da7cc 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 void TabDialog::ImplInitTabDialogData()
commit ce6cbf86a5e4e23404a6102d18bb7433a64531d1
Author: Armin Le Grand 
Date:   Wed Aug 17 09:43:33 2016 +0200

screenshots: add new global make target

Up to now the screenshot creation was added/dependent of
target slowcheck. Since quite some modules have added screenshot
creations now, I added an own target 'screenshot' to allow to keep
current slowcheck and screenshot creation separated

Change-Id: I80a49a0db607edf8e0405672d570f624d29912e7

diff --git a/Makefile.in b/Makefile.in
index f7f68ed..ab0e356 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,7 +97,7 @@ $(1).clean $(1).showdeliverables:
cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)
 
 $(1).all: bootstrap fetch
-   $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if 
$(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1))
+   $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if 
$(CROSS_COMPILING),,

[Libreoffice-commits] core.git: 53 commits - basctl/CppunitTest_basctl_dialogs_test.mk basctl/Module_basctl.mk basctl/qa bin/gbuild-to-ide chart2/CppunitTest_chart2_dialogs_test.mk chart2/Module_chart

[Armin Le Grand]

 Makefile.in |2 
 RepositoryModule_host.mk|2 
 basctl/CppunitTest_basctl_dialogs_test.mk   |   67 +
 basctl/Module_basctl.mk |5 
 basctl/qa/unit/basctl-dialogs-test.cxx  |   78 +
 basctl/qa/unit/data/basctl-dialogs-test.txt |   47 +
 bin/gbuild-to-ide   |   44 -
 chart2/CppunitTest_chart2_dialogs_test.mk   |   69 +
 chart2/Module_chart2.mk |5 
 chart2/qa/unit/chart2-dialogs-test.cxx  |   78 +
 chart2/qa/unit/data/chart2-dialogs-test.txt |   69 +
 cui/CppunitTest_cui_dialogs_test.mk |   68 +
 cui/Module_cui.mk   |5 
 cui/qa/unit/cui-dialogs-test.cxx|   78 +
 cui/qa/unit/data/cui-dialogs-test.txt   |  226 +
 dbaccess/CppunitTest_dbaccess_dialogs_test.mk   |   67 +
 dbaccess/Module_dbaccess.mk |5 
 dbaccess/qa/unit/data/dbaccess-dialogs-test.txt |  102 ++
 dbaccess/qa/unit/dbaccess-dialogs-test.cxx  |   78 +
 desktop/CppunitTest_desktop_dialogs_test.mk |   67 +
 desktop/Module_desktop.mk   |5 
 desktop/qa/unit/data/desktop-dialogs-test.txt   |   45 +
 desktop/qa/unit/desktop-dialogs-test.cxx|   78 +
 filter/CppunitTest_filter_dialogs_test.mk   |   66 +
 filter/Module_filter.mk |5 
 filter/qa/unit/data/filter-dialogs-test.txt |   50 +
 filter/qa/unit/filter-dialogs-test.cxx  |   78 +
 formula/CppunitTest_formula_dialogs_test.mk |   61 +
 formula/Module_formula.mk   |5 
 formula/qa/unit/data/formula-dialogs-test.txt   |   40 
 formula/qa/unit/formula-dialogs-test.cxx|   78 +
 fpicker/CppunitTest_fpicker_dialogs_test.mk |   61 +
 fpicker/Module_fpicker.mk   |5 
 fpicker/qa/unit/data/fpicker-dialogs-test.txt   |   40 
 fpicker/qa/unit/fpicker-dialogs-test.cxx|   78 +
 include/sfx2/tabdlg.hxx |3 
 include/test/screenshot_test.hxx|   91 ++
 include/vcl/abstdlg.hxx |9 
 include/vcl/builder.hxx |   15 
 include/vcl/dialog.hxx  |   12 
 include/vcl/tabdlg.hxx  |4 
 include/vcl/window.hxx  |2 
 postprocess/CustomTarget_signing.mk |3 
 reportdesign/CppunitTest_reportdesign_dialogs_test.mk   |   67 +
 reportdesign/Module_reportdesign.mk |5 
 reportdesign/qa/unit/data/reportdesign-dialogs-test.txt |   51 +
 reportdesign/qa/unit/reportdesign-dialogs-test.cxx  |   78 +
 sc/CppunitTest_sc_screenshots.mk|   63 +
 sc/Module_sc.mk |4 
 sc/inc/scabstdlg.hxx|3 
 sc/qa/unit/screenshots/data/screenshots.txt |  164 +++
 sc/qa/unit/screenshots/screenshots.cxx  |  291 +++
 sc/source/ui/attrdlg/scdlgfact.cxx  |5 
 sc/source/ui/attrdlg/scdlgfact.hxx  |   25 
 sc/source/ui/inc/protectiondlg.hxx  |4 
 sc/source/ui/inc/sharedocdlg.hxx|2 
 sc/source/ui/inc/tabbgcolordlg.hxx  |3 
 sc/source/ui/inc/viewfunc.hxx   |2 
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx |4 
 sc/source/ui/view/tabvwshf.cxx  |3 
 sd/CppunitTest_sd_dialogs_test.mk   |   71 +
 sd/Module_sd.mk |5 
 sd/inc/sdabstdlg.hxx|3 
 sd/qa/unit/data/dialogs-test.txt|   76 +
 sd/qa/unit/dialogs-test.cxx |  662 
 sd/source/filter/html/pubdlg.cxx|   27 
 sd/source/ui/dlg/headerfooterdlg.cxx|   41 
 sd/source/ui/dlg/sddlgfact.hxx  |   24 
 sd/source/ui/inc/drawview.hxx   |2 
 sd/source/ui/inc/pubdlg.hxx |4 
 sfx2/CppunitTest_sfx2_dialogs_test.mk   |   67 +
 sfx2/Module_sfx2.mk |5 
 sfx2/qa/unit/data/sfx2-dialogs-test.txt |   71 +
 sfx2/qa/unit/sfx2-dialogs-test.cxx  |   78 +
 sfx2/source/dialog/tabdlg.cxx   |   50 +
 solenv/gbuild/CppunitTest.mk|

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.1-4'

[Christian Lohmaier]

Tag 'cp-5.1-4' created by Andras Timar  at 
2016-08-18 05:13 +

cp-5.1-4

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.1-4'

[Andras Timar]

Tag 'cp-5.1-4' created by Andras Timar  at 
2016-08-18 05:13 +

cp-5.1-4

Changes since cp-5.1-3-56:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.1-4'

[Andras Timar]

Tag 'cp-5.1-4' created by Andras Timar  at 
2016-08-18 05:13 +

cp-5.1-4

Changes since cp-5.1-3:
Andras Timar (1):
  Update pt_PT dictionary to version 16.7.4.1

---
 pt_PT/description.xml |2 -
 pt_PT/pt_PT.aff   |   25 +++--
 pt_PT/pt_PT.dic   |   93 +++---
 3 files changed, 74 insertions(+), 46 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.1-4'

[Miklos Vajna]

Tag 'cp-5.1-4' created by Andras Timar  at 
2016-08-18 05:13 +

cp-5.1-4

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

[Libreoffice-commits] online.git: loolwsd/QueueHandler.hpp

[Miklos Vajna]

 loolwsd/QueueHandler.hpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f85dcba905a5afa61255732d2467724ae7c49261
Author: Miklos Vajna 
Date:   Thu Aug 18 08:18:54 2016 +0200

QueueHandler: use std::move()

Change-Id: I849a273a68986fb665dc7c1d03c54fd7dcf9b488

diff --git a/loolwsd/QueueHandler.hpp b/loolwsd/QueueHandler.hpp
index 431279a..8c6cca3 100644
--- a/loolwsd/QueueHandler.hpp
+++ b/loolwsd/QueueHandler.hpp
@@ -21,7 +21,7 @@ public:
 QueueHandler(std::shared_ptr queue,
  const std::shared_ptr& session,
  const std::string& name):
-_queue(queue),
+_queue(std::move(queue)),
 _session(session),
 _name(name)
 {
___
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' - 2 commits - desktop/qa desktop/source libreofficekit/qa sw/qa sw/sdi sw/source

[Miklos Vajna]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   25 
 desktop/source/lib/init.cxx |   53 ++
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |  101 +++-
 sw/qa/extras/uiwriter/uiwriter.cxx  |   33 ++
 sw/sdi/swriter.sdi  |6 -
 sw/source/uibase/uiview/view2.cxx   |   20 +++
 6 files changed, 230 insertions(+), 8 deletions(-)

New commits:
commit 1a0fa139e50b0718a2a19ded10366af76d656058
Author: Miklos Vajna 
Date:   Wed Aug 17 15:40:14 2016 +0200

sw: allow accept/reject of redline by index

Previously .uno:AcceptTrackedChange / .uno:RejectTrackedChange always
worked by cursor position, but redlines are stored in the redline table,
so they have a unique index. Allow specifying that index when invoking
the command, and in that case ignore the cursor position.

The index is not stable after an insertion / deletion.

Reviewed-on: https://gerrit.libreoffice.org/28192
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit 087b71f423cf6c047137fb1316527132bb47fc05)

Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx

Change-Id: I493a22e84800ded224fb6b9c61261744dc0fb64f

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index e30f9a8e..2b3090e 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -466,8 +466,10 @@ static void documentRedline(GtkWidget* pButton, gpointer 
/*pItem*/)
 GtkWidget* pDialog = gtk_dialog_new_with_buttons("Manage Changes",
  GTK_WINDOW 
(gtk_widget_get_toplevel(GTK_WIDGET(pDocView))),
  GTK_DIALOG_MODAL,
- "Close",
- GTK_RESPONSE_OK,
+ "Accept",
+ GTK_RESPONSE_YES,
+ "Reject",
+ GTK_RESPONSE_NO,
  nullptr);
 GtkWidget* pContentArea = gtk_dialog_get_content_area(GTK_DIALOG 
(pDialog));
 
@@ -486,7 +488,7 @@ static void documentRedline(GtkWidget* pButton, gpointer 
/*pItem*/)
-1);
 }
 GtkWidget* pTreeView = 
gtk_tree_view_new_with_model(GTK_TREE_MODEL(pTreeStore));
-std::vector aColumns = {"Index", "Type", "Comment", "Author", 
"Timestamp"};
+std::vector aColumns = {"Index", "Author", "Type", "Comment", 
"Timestamp"};
 for (size_t nColumn = 0; nColumn < aColumns.size(); ++nColumn)
 {
 GtkCellRenderer* pRenderer = gtk_cell_renderer_text_new();
@@ -500,7 +502,38 @@ static void documentRedline(GtkWidget* pButton, gpointer 
/*pItem*/)
 
 // Show the dialog.
 gtk_widget_show_all(pDialog);
-gtk_dialog_run(GTK_DIALOG(pDialog));
+gint res = gtk_dialog_run(GTK_DIALOG(pDialog));
+
+// Dispatch the matching command, if necessary.
+if (res == GTK_RESPONSE_YES || res == GTK_RESPONSE_NO)
+{
+GtkTreeSelection* pSelection = 
gtk_tree_view_get_selection(GTK_TREE_VIEW(pTreeView));
+GtkTreeIter aTreeIter;
+GtkTreeModel* pTreeModel;
+if (gtk_tree_selection_get_selected(pSelection, &pTreeModel, 
&aTreeIter))
+{
+gint nIndex = 0;
+// 0: index
+gtk_tree_model_get(pTreeModel, &aTreeIter, 0, &nIndex, -1);
+std::string aCommand;
+if (res == GTK_RESPONSE_YES)
+aCommand = ".uno:AcceptTrackedChange";
+else
+aCommand = ".uno:RejectTrackedChange";
+// Without the '.uno:' prefix.
+std::string aKey = aCommand.substr(strlen(".uno:"));
+
+// Post the command.
+boost::property_tree::ptree aCommandTree;
+aCommandTree.put(boost::property_tree::ptree::path_type(aKey + 
"/type", '/'), "unsigned short");
+aCommandTree.put(boost::property_tree::ptree::path_type(aKey + 
"/value", '/'), nIndex);
+
+aStream.str(std::string());
+boost::property_tree::write_json(aStream, aCommandTree);
+std::string aArguments = aStream.str();
+lok_doc_view_post_command(pDocView, aCommand.c_str(), 
aArguments.c_str(), false);
+}
+}
 
 gtk_widget_destroy(pDialog);
 }
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index ca524d3..b6838bd 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -188,6 +188,7 @@ public:
 void testTdf99004();
 void testTdf84695();
 void testClassificationP

[Libreoffice-commits] core.git: 13 commits - cui/source filter/source include/svx lotuswordpro/source reportdesign/source sc/source sd/source svx/source sw/source xmloff/source

[Noel Grandin]

 cui/source/dialogs/sdrcelldlg.cxx |2 
 cui/source/inc/cuitabarea.hxx |   53 +--
 cui/source/inc/cuitabline.hxx |   16 +-
 cui/source/inc/labdlg.hxx |   14 +-
 cui/source/tabpages/labdlg.cxx|   60 
 cui/source/tabpages/measure.cxx   |  124 +-
 cui/source/tabpages/tabarea.cxx   |2 
 cui/source/tabpages/tabline.cxx   |2 
 cui/source/tabpages/tparea.cxx|   27 ++-
 cui/source/tabpages/tpbitmap.cxx  |6 
 cui/source/tabpages/tpcolor.cxx   |   52 +++
 cui/source/tabpages/tpgradnt.cxx  |6 
 cui/source/tabpages/tphatch.cxx   |6 
 cui/source/tabpages/tpline.cxx|   21 +--
 cui/source/tabpages/tplnedef.cxx  |   15 +-
 cui/source/tabpages/tplneend.cxx  |   11 -
 cui/source/tabpages/tppattern.cxx |6 
 cui/source/tabpages/tpshadow.cxx  |   10 -
 cui/source/tabpages/tptrans.cxx   |   10 -
 filter/source/msfilter/msdffimp.cxx   |8 -
 include/svx/scene3d.hxx   |2 
 include/svx/svx3ditems.hxx|2 
 include/svx/sxcecitm.hxx  |4 
 include/svx/sxctitm.hxx   |4 
 include/svx/sxekitm.hxx   |   11 -
 include/svx/sxmtpitm.hxx  |8 -
 include/svx/tabarea.hxx   |   17 --
 include/svx/viewpt3d.hxx  |2 
 include/svx/xenum.hxx |9 -
 include/svx/xftadit.hxx   |2 
 include/svx/xftshit.hxx   |2 
 include/svx/xmleohlp.hxx  |5 
 include/svx/xtextit0.hxx  |2 
 lotuswordpro/source/filter/lwpbackgroundstuff.cxx |2 
 reportdesign/source/core/api/ReportDefinition.cxx |8 -
 sc/source/core/data/postit.cxx|2 
 sc/source/core/tool/detfunc.cxx   |2 
 sc/source/filter/excel/xiescher.cxx   |2 
 sc/source/filter/xml/xmlwrap.cxx  |4 
 sc/source/ui/unoobj/servuno.cxx   |4 
 sd/source/filter/xml/sdxmlwrp.cxx |4 
 sd/source/ui/func/fuconrec.cxx|6 
 sd/source/ui/unoidl/unomodel.cxx  |4 
 svx/source/customshapes/EnhancedCustomShape3d.cxx |4 
 svx/source/dialog/fontwork.cxx|   44 +++---
 svx/source/engine3d/float3d.cxx   |   14 +-
 svx/source/engine3d/scene3d.cxx   |2 
 svx/source/engine3d/svx3ditems.cxx|4 
 svx/source/engine3d/viewpt3d2.cxx |2 
 svx/source/sdr/attribute/sdrformtextattribute.cxx |   10 -
 svx/source/sdr/attribute/sdrtextattribute.cxx |2 
 svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx |   18 +-
 svx/source/sdr/properties/e3dsceneproperties.cxx  |2 
 svx/source/svdraw/svdattr.cxx |   20 +-
 svx/source/svdraw/svdhdl.cxx  |4 
 svx/source/svdraw/svdibrow.cxx|8 -
 svx/source/svdraw/svdocapt.cxx|   34 ++--
 svx/source/svdraw/svdoedge.cxx|   22 +--
 svx/source/svdraw/svdomeas.cxx|   66 -
 svx/source/svdraw/svdotext.cxx|2 
 svx/source/svdraw/svdotextpathdecomposition.cxx   |   32 ++--
 svx/source/xml/xmleohlp.cxx   |   20 +-
 svx/source/xml/xmlexport.cxx  |4 
 svx/source/xoutdev/xattrbmp.cxx   |   12 -
 sw/source/filter/ww8/ww8graf.cxx  |4 
 sw/source/filter/xml/swxml.cxx|2 
 sw/source/filter/xml/wrtxml.cxx   |2 
 sw/source/filter/xml/xmlexp.cxx   |2 
 sw/source/filter/xml/xmlimp.cxx   |2 
 sw/source/uibase/uno/unotxdoc.cxx |2 
 xmloff/source/draw/sdpropls.cxx   |   38 ++---
 71 files changed, 474 insertions(+), 463 deletions(-)

New commits:
commit 6fdfa13a096c55f5038c4a850cfb108d30143d4b
Author: Noel Grandin 
Date:   Thu Aug 18 08:47:59 2016 +0200

convert SdrCaptionEscDir to scoped enum

Change-Id: Iec6dfbdc65efde86ff24ddc51c48eb697bf4ead1

diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index a7e77a7..a7b1064 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/c

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

[Miklos Vajna]

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

New commits:
commit 19eab7b79c13edc657f4e3f380889ed0206357bd
Author: Miklos Vajna 
Date:   Thu Aug 18 08:19:20 2016 +0200

svl: no need to iterate in reverse order in GetRedoActionsInfo()

We have random access to the array after all, so the non-reverse order
is OK as well, and it's more readable.

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

diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index f2f6bd8..ae55539 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -1333,9 +1333,11 @@ OUString SfxUndoManager::GetRedoActionsInfo() const
 {
 boost::property_tree::ptree aActions;
 const SfxUndoArray* pUndoArray = m_xData->pActUndoArray;
-for (size_t i = GetRedoActionCount(); i > 0; --i)
+size_t nCount = GetRedoActionCount();
+for (size_t i = 0; i < nCount; ++i)
 {
-boost::property_tree::ptree aAction = lcl_ActionToJson(i - 1, 
pUndoArray->aUndoActions[pUndoArray->nCurUndoAction - 1 + i].pAction);
+size_t nIndex = nCount - i - 1;
+boost::property_tree::ptree aAction = lcl_ActionToJson(nIndex, 
pUndoArray->aUndoActions[pUndoArray->nCurUndoAction + nIndex].pAction);
 aActions.push_back(std::make_pair("", aAction));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/source/window/tabdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96b8a84118e0195be03983bde0b3448f3a216bd2
Author: Stephan Bergmann 
Date:   Thu Aug 18 08:56:53 2016 +0200

loplugin:redundantcast

Change-Id: I1b1c348311930499e9ee971b87257db40f3873b3

diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 99da7cc..6c97b1f 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -327,7 +327,7 @@ std::vector 
TabDialog::getAllPageUIXMLDescriptions() const
 
 bool TabDialog::selectPageByUIXMLDescription(const OString& rUIXMLDescription)
 {
-TabControl* pTabCtrl = 
dynamic_cast(findTabControl(const_cast(this)));
+TabControl* pTabCtrl = dynamic_cast(findTabControl(this));
 
 if (pTabCtrl)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits