[Libreoffice-commits] core.git: 6 commits - avmedia/source basctl/source basegfx/source cui/source dbaccess/source drawinglayer/source editeng/source include/avmedia include/basegfx include/editeng in

[Noel Grandin]

 avmedia/source/framework/mediacontrol.cxx  |4 -
 avmedia/source/framework/mediaitem.cxx |   51 ++---
 avmedia/source/framework/mediatoolbox.cxx  |2 
 avmedia/source/viewer/mediawindow_impl.cxx |   16 ++--
 basctl/source/basicide/baside3.cxx |6 -
 basegfx/source/polygon/b2dlinegeometry.cxx |   14 +--
 basegfx/source/polygon/b2dpolygontools.cxx |   44 +--
 basegfx/source/polygon/b2dtrapezoid.cxx|4 -
 cui/source/customize/cfg.cxx   |6 -
 cui/source/dialogs/cuifmsearch.cxx |2 
 cui/source/dialogs/hldocntp.cxx|2 
 dbaccess/source/ui/dlg/sqlmessage.cxx  |   36 -
 dbaccess/source/ui/misc/datasourceconnector.cxx|2 
 dbaccess/source/ui/relationdesign/RelationTableView.cxx|2 
 drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx |2 
 editeng/source/editeng/editeng.cxx |2 
 editeng/source/editeng/impedit.hxx |2 
 editeng/source/editeng/impedit5.cxx|   10 +-
 editeng/source/uno/unoedhlp.cxx|8 +-
 editeng/source/uno/unofored.cxx|8 +-
 editeng/source/uno/unoforou.cxx|8 +-
 include/avmedia/mediaitem.hxx  |   36 +
 include/basegfx/polygon/b2dpolygontools.hxx|   32 
 include/editeng/editeng.hxx|   19 +++-
 include/tools/wintypes.hxx |   34 
 sd/source/ui/dlg/headerfooterdlg.cxx   |2 
 starmath/source/accessibility.cxx  |8 +-
 svtools/source/control/ctrlbox.cxx |2 
 svx/source/dialog/framelink.cxx|2 
 svx/source/dialog/prtqry.cxx   |2 
 svx/source/svdraw/svdomedia.cxx|   14 +--
 svx/source/tbxctrls/layctrl.cxx|2 
 uui/source/alreadyopen.cxx |4 -
 uui/source/filechanged.cxx |2 
 uui/source/lockfailed.cxx  |4 -
 uui/source/openlocked.cxx  |2 
 uui/source/trylater.cxx|2 
 vcl/generic/app/gensys.cxx |   33 
 vcl/source/control/button.cxx  |   14 +--
 vcl/source/control/ilstbox.cxx |4 -
 vcl/source/control/morebtn.cxx |6 -
 vcl/source/window/btndlg.cxx   |   12 +--
 vcl/source/window/layout.cxx   |4 -
 vcl/source/window/msgbox.cxx   |   28 +++
 44 files changed, 263 insertions(+), 236 deletions(-)

New commits:
commit aff09b486f26fa58a4f26a52e2b26286811d2441
Author: Noel Grandin 
Date:   Thu Mar 26 16:03:06 2015 +0200

convert GETATTRIBS_ constants to enum class

Change-Id: I236caa9e2dc80455198b442e72e8d9df58f03adc

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index afed139..acc0b85 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1728,7 +1728,7 @@ SfxItemSet EditEngine::GetAttribs( const ESelection& 
rSel, EditEngineAttribs nOn
 return pImpEditEngine->GetAttribs( aSel, nOnlyHardAttrib );
 }
 
-SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, 
sal_Int32 nEnd, sal_uInt8 nFlags ) const
+SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, 
sal_Int32 nEnd, GetAttribsFlags nFlags ) const
 {
 return pImpEditEngine->GetAttribs( nPara, nStart, nEnd, nFlags );
 }
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index dd2f644..321bfbf 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -807,7 +807,7 @@ public:
 sal_uInt16  GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine );
 sal_uInt32  GetParaHeight( sal_Int32 nParagraph );
 
-SfxItemSet  GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 
nEnd, sal_uInt8 nFlags = 0xFF ) const;
+SfxItemSet  GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 
nEnd, GetAttribsFlags nFlags = GetAttribsFlags::ALL ) const;
 SfxItemSet  GetAttribs( EditSelection aSel, EditEngineAttribs 
nOnlyHardAttrib = EditEngineAttribs_All  );
 voidSetAttribs( EditSelection aSel, const SfxItemSet& rSet, 
sal_uInt8 nSpecial = 0 );
 voidRemoveCharAttribs( EditSelection aSel, bool 
bRemoveParaAttr

[Libreoffice-commits] core.git: 6 commits - include/vcl svx/inc svx/Library_svxcore.mk svx/source vcl/CppunitTest_vcl_bitmap_test.mk vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/qa vcl/source

[Tomaž Vajngerl]

 include/vcl/BitmapFilterStackBlur.hxx   |   34 +
 include/vcl/bmpacc.hxx  |  381 +-
 include/vcl/pngwrite.hxx|   15 
 svx/Library_svxcore.mk  |1 
 svx/inc/sdr/overlay/overlayhandle.hxx   |   42 +
 svx/inc/sdr/overlay/overlaytools.hxx|   36 +
 svx/source/sdr/overlay/overlayhandle.cxx|   63 ++
 svx/source/sdr/overlay/overlaytools.cxx |   89 
 svx/source/svdraw/svdhdl.cxx|   54 ++
 vcl/CppunitTest_vcl_bitmap_test.mk  |   57 ++
 vcl/Library_vcl.mk  |2 
 vcl/Module_vcl.mk   |1 
 vcl/inc/BitmapSymmetryCheck.hxx |   31 +
 vcl/qa/cppunit/BitmapFilterTest.cxx |  175 
 vcl/qa/cppunit/BitmapTest.cxx   |   88 
 vcl/source/bitmap/BitmapFilterStackBlur.cxx |  590 
 vcl/source/bitmap/BitmapSymmetryCheck.cxx   |   81 +++
 vcl/source/gdi/bmpacc.cxx   |  122 -
 vcl/source/gdi/bmpacc2.cxx  |   65 +--
 vcl/source/gdi/bmpacc3.cxx  |  177 
 vcl/source/gdi/pngwrite.cxx |  539 ++---
 21 files changed, 2078 insertions(+), 565 deletions(-)

New commits:
commit 28c61871e876e6a2cac47439f768504b1a4c94a0
Author: Tomaž Vajngerl 
Date:   Thu Mar 26 22:44:32 2015 +0900

vcl: stack blur implementation + basic test & performance test

Change-Id: I793ed80a07d9488c5f75b3abdca6db344d80d3d8

diff --git a/include/vcl/BitmapFilterStackBlur.hxx 
b/include/vcl/BitmapFilterStackBlur.hxx
new file mode 100644
index 000..9b400c8
--- /dev/null
+++ b/include/vcl/BitmapFilterStackBlur.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef INCLUDED_VCL_BITMAPFILTERSTACKBLUR_HXX
+#define INCLUDED_VCL_BITMAPFILTERSTACKBLUR_HXX
+
+#include 
+#include 
+#include 
+
+class VCL_DLLPUBLIC BitmapFilterStackBlur : BitmapFilter
+{
+sal_Int32 mnRadius;
+bool mbExtend;
+
+public:
+BitmapFilterStackBlur(sal_Int32 nRadius, bool bExtend = true);
+virtual ~BitmapFilterStackBlur();
+
+virtual bool filter(Bitmap& rBitmap) SAL_OVERRIDE;
+
+bool filter(BitmapEx& rBitmap);
+};
+
+#endif // INCLUDED_VCL_BITMAPFILTERSTACKBLUR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk 
b/vcl/CppunitTest_vcl_bitmap_test.mk
index 527f5ef..5927b69 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,vcl_bitmap_test))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \
 vcl/qa/cppunit/BitmapTest \
+vcl/qa/cppunit/BitmapFilterTest \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 4507f5e..89ed3bb 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -316,6 +316,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/bitmap/bitmapfilter \
 vcl/source/bitmap/bitmapscalesuper \
 vcl/source/bitmap/BitmapSymmetryCheck \
+vcl/source/bitmap/BitmapFilterStackBlur \
 vcl/source/helper/canvasbitmap \
 vcl/source/helper/canvastools \
 vcl/source/helper/evntpost \
diff --git a/vcl/qa/cppunit/BitmapFilterTest.cxx 
b/vcl/qa/cppunit/BitmapFilterTest.cxx
new file mode 100644
index 000..e0cf3ef
--- /dev/null
+++ b/vcl/qa/cppunit/BitmapFilterTest.cxx
@@ -0,0 +1,175 @@
+/* -*- 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/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include "BitmapSymmetryCheck.hxx"
+
+#include 
+
+namespace
+{
+
+const bool constWriteResultBitmap(false);
+const bool constEnablePerformanceTest(false);
+
+class BitmapFilterTest : public CppUnit::TestFixture
+{
+
+void testBlurCorrectness();
+void testPerformance();
+
+CPPUNIT_TEST_SUITE(BitmapFilterTest);
+CPPUNIT_TEST(testBlurCorrectness);
+CPPUNIT_TEST(testPerformance);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void BitmapFilterTest::testBlurCorrectness()
+{
+// Setup test bitmap
+Size aSize(41, 31);
+Bitmap aBitmap24Bit(aSize, 24);
+
+sal_uLong nScanlineFormat = 0;
+sal_uInt16 nBPP = aBitmap24Bit.GetBitCount();
+
+{
+long aM

LibreOffice Gerrit News for core on 2015-03-27

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ tdf#57174 Opening Any Dialog the First Value in the Dialog Should be Sele
  in https://gerrit.libreoffice.org/14881 from Qiwen Gao
  about module include, sc, vcl
+ NSAppKitVersionNumber is always greater than NSAppKitVersionNumber10_7
  in https://gerrit.libreoffice.org/14637 from Robert Antoni Buj i Gelonch
  about module vcl
+ more breeze icons
  in https://gerrit.libreoffice.org/13058 from Jonathan Riddell
  about module icon-themes
+ tdf#90223:export tcPr left&  right margin for pptx
  in https://gerrit.libreoffice.org/15015 from Yogesh Bharate
  about module oox, sd
+ tdf#90222: replace ScaList in scaddins with a std container
  in https://gerrit.libreoffice.org/15012 from Pieter Adriaensen
  about module scaddins
+ New osl::Thread::sleepMicroseconds function
  in https://gerrit.libreoffice.org/15001 from Michał Świętek
  about module cppuhelper, desktop, helpcompiler, include, sal, ucb, vcl
+ tdf#90246 PPTX paragraph and bullet leftMargin and Indentation is not exp
  in https://gerrit.libreoffice.org/15016 from Priyanka Gaikwad
  about module include, oox, sd
 End of freshness 

+ tdf#81813: Typing to select value in dropdown resets after space characte
  in https://gerrit.libreoffice.org/15024 from Julien Nabet
  about module vcl
+ tdf#56467: improve export of formulas to SVG
  in https://gerrit.libreoffice.org/14992 from Christina Roßmanith
  about module filter
+ tdf#89666: vcl: speed up HbLayoutEngine with cache in SwTxtFormatInfo
  in https://gerrit.libreoffice.org/14732 from Michael Stahl
  about module include, sw, vcl
+ tdf#84323: Sketch how to make osl::Thread::wait more readable
  in https://gerrit.libreoffice.org/15018 from Stephan Bergmann
  about module cppuhelper, include
+ new clang plugin: staticmethods
  in https://gerrit.libreoffice.org/15000 from Noel Grandin
  about module comphelper, compilerplugins, include


* Merged changes on master for project core changed in the last 25 hours:

+ tdf#90174 FILESAVE: export of bullet color for pptx
  in https://gerrit.libreoffice.org/14966 from Priyanka Gaikwad
+ tdf#81073 :Addition of text zoom levels to print preview zoom
  in https://gerrit.libreoffice.org/14488 from Rishabh Kumar
+ tdf#67990: Management of case in combobox
  in https://gerrit.libreoffice.org/14885 from Julien Nabet
+ Cleanup comments for easyhacks
  in https://gerrit.libreoffice.org/15019 from Popa Adrian Marius
+ tdf#39440 cppcheck cleanliness, Fixing basic cpp errors
  in https://gerrit.libreoffice.org/14780 from Varun Dhall
+ tdf#89496 fixed crash on rtf shape group parsing
  in https://gerrit.libreoffice.org/14997 from Vasily Melenchuk
+ Fix DocumentRedlineManager code that crashes Writer.
  in https://gerrit.libreoffice.org/15002 from Mark Hung
+ Enhancement : tdf#89908 Add Search field to the autofilter
  in https://gerrit.libreoffice.org/14958 from Deena Francis
+ Added shortcut for arrows when doing start math formulas
  in https://gerrit.libreoffice.org/15011 from Robert Babiak
+ starmath: add test for detecting MathML's namespace prefix 'math:'
  in https://gerrit.libreoffice.org/15013 from Takeshi Abe
+ tdf#87904 changing the sort arrangment of impress's sidebar tabs
  in https://gerrit.libreoffice.org/14986 from Yousuf Philips
+ tdf#86606 remove direct formatting entries from context menu
  in https://gerrit.libreoffice.org/14979 from Yousuf Philips
+ tdf#57950: Replace chained O(U)StringBuffer::append() with operator+
  in https://gerrit.libreoffice.org/14998 from Austin Chen


* Abandoned changes on master for project core changed in the last 25 hours:

+ vcl: Reduce OpenGLX11CairoTextRender surface area to size of text bounds
  in https://gerrit.libreoffice.org/14148 from Chris Sherlock
+ start detection of kf5 stuff in configure.ac
  in https://gerrit.libreoffice.org/13079 from Jonathan Riddell


* Open changes needing tweaks, but being untouched for more than a week:

+ tdf#64575 Photo Album: Better Image Layout
  in https://gerrit.libreoffice.org/14912 from Enes Ateş
+ tdf#39468 Translate German Comments - sc/source/core/data/
  in https://gerrit.libreoffice.org/14866 from Christian M. Heller
+ tdf#49893: final fix for blank rectangle problem
  in https://gerrit.libreoffice.org/14584 from Vasily Melenchuk
+ xmloff: convert xof.component to use constructor syntax
  in https://gerrit.libreoffice.org/14820 from Chris Sherlock
+ xmloff: use constructor syntax in xo.component
  in https://gerrit.libreoffice.org/14803 from Chris Sherlock
+ sd: use constructor syntax for rest of sd.component
  in https://gerrit.libreoffice.org/14689 from Chris Sherlock
+ embeddedobj: convert emboleobj.*.component to constructor syntax
  in https://gerrit.libreoffice.org/14687 from Chris Sherlock
+ sc: use constructor syntax in sc.component
  in https://gerrit.libreoffice.org/14750 from Chris Sherlock
+ Convert ScDocument to constructo

[Libreoffice-commits] core.git: Branch 'private/moggi/conditional-format-api' - 8 commits - offapi/com sc/inc sc/qa sc/source

[Markus Mohrhard]

 offapi/com/sun/star/sheet/ConditionFormatOperator.idl |   10 
 sc/inc/conditio.hxx   |2 
 sc/qa/extras/new_cond_format.cxx  |2 
 sc/source/core/data/conditio.cxx  |   14 +
 sc/source/ui/inc/condformatuno.hxx|   46 +--
 sc/source/ui/unoobj/condformatuno.cxx |  244 +++---
 6 files changed, 255 insertions(+), 63 deletions(-)

New commits:
commit 8602dbb69bb256abb4edb97402715341022eadc7
Author: Markus Mohrhard 
Date:   Fri Mar 27 04:13:52 2015 +0100

implement one more method

Change-Id: Ie18be81fa664df88af605674968e302c59f7dc98

diff --git a/sc/source/ui/inc/condformatuno.hxx 
b/sc/source/ui/inc/condformatuno.hxx
index df5e358..04acec2 100644
--- a/sc/source/ui/inc/condformatuno.hxx
+++ b/sc/source/ui/inc/condformatuno.hxx
@@ -93,6 +93,7 @@ public:
 virtual ~ScCondFormatObj();
 
 static ScCondFormatObj* getImplementation( 
uno::Reference XCondFormat);
+ScDocShell* getDocShell();
 
 // XConditionalFormat
 virtual SAL_CALL void addEntry(const 
uno::Reference& xEntry)
@@ -176,7 +177,7 @@ class ScConditionEntryObj : public 
cppu::WeakImplHelper2 xParent);
 virtual ~ScConditionEntryObj();
 
 static ScConditionEntryObj* 
getImplementation(uno::Reference xCondition);
@@ -238,7 +239,7 @@ class ScColorScaleFormatObj : public 
cppu::WeakImplHelper1 xParent);
 virtual ~ScColorScaleFormatObj();
 
 static ScColorScaleFormatObj* 
getImplementation(uno::Reference xPropSet);
@@ -295,7 +296,7 @@ private:
 class ScDataBarFormatObj : public 
cppu::WeakImplHelper1
 {
 public:
-ScDataBarFormatObj();
+ScDataBarFormatObj(rtl::Reference xParent);
 virtual ~ScDataBarFormatObj();
 
 static ScDataBarFormatObj* 
getImplementation(uno::Reference xPropSet);
@@ -352,7 +353,7 @@ private:
 class ScIconSetFormatObj : public 
cppu::WeakImplHelper1
 {
 public:
-ScIconSetFormatObj();
+ScIconSetFormatObj(rtl::Reference xParent);
 virtual ~ScIconSetFormatObj();
 
 static ScIconSetFormatObj* 
getImplementation(uno::Reference xPropSet);
diff --git a/sc/source/ui/unoobj/condformatuno.cxx 
b/sc/source/ui/unoobj/condformatuno.cxx
index fcf32b5..aee40f7 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -295,6 +295,35 @@ ScConditionalFormatList* ScCondFormatsObj::getCoreObject()
 return pList;
 }
 
+namespace {
+
+uno::Reference createConditionEntry(const ScFormatEntry* 
pEntry,
+rtl::Reference xParent)
+{
+switch (pEntry->GetType())
+{
+case condformat::CONDITION:
+return new ScConditionEntryObj(xParent);
+break;
+case condformat::COLORSCALE:
+return new ScColorScaleFormatObj(xParent);
+break;
+case condformat::DATABAR:
+return new ScDataBarFormatObj(xParent);
+break;
+case condformat::ICONSET:
+return new ScIconSetFormatObj(xParent);
+break;
+case condformat::DATE:
+break;
+default:
+break;
+}
+return uno::Reference();
+}
+
+}
+
 ScCondFormatObj::ScCondFormatObj(ScDocShell* pDocShell, 
rtl::Reference xCondFormats,
 sal_Int32 nKey):
 mxCondFormatList(xCondFormats),
@@ -318,6 +347,11 @@ ScConditionalFormat* ScCondFormatObj::getCoreObject()
 return pFormat;
 }
 
+ScDocShell* ScCondFormatObj::getDocShell()
+{
+return mpDocShell;
+}
+
 void ScCondFormatObj::addEntry(const uno::Reference& 
/*xEntry*/)
 throw(uno::RuntimeException, std::exception)
 {
@@ -356,10 +390,18 @@ sal_Int32 ScCondFormatObj::getCount()
 return pFormat->size();
 }
 
-uno::Any ScCondFormatObj::getByIndex(sal_Int32 /*nIndex*/)
+uno::Any ScCondFormatObj::getByIndex(sal_Int32 nIndex)
 throw(uno::RuntimeException, std::exception)
 {
+SolarMutexGuard aGuard;
+if (getCoreObject()->size() >= size_t(nIndex))
+throw lang::IllegalArgumentException();
+
+const ScFormatEntry* pEntry = getCoreObject()->GetEntry(nIndex);
+uno::Reference xCondEntry =
+createConditionEntry(pEntry, this);
 uno::Any aAny;
+aAny <<= xCondEntry;
 return aAny;
 }
 
@@ -477,7 +519,9 @@ void SAL_CALL 
ScCondFormatObj::removeVetoableChangeListener( const OUString&,
 SAL_WARN("sc", "not implemented");
 }
 
-ScConditionEntryObj::ScConditionEntryObj():
+ScConditionEntryObj::ScConditionEntryObj(rtl::Reference 
xParent):
+mpDocShell(xParent->getDocShell()),
+mxParent(xParent),
 maPropSet(getConditionEntryrPropSet())
 {
 }
@@ -653,7 +697,9 @@ void SAL_CALL 
ScConditionEntryObj::removeVetoableChangeListener( const OUString&
 SAL_WARN("sc", "not implemented");
 }
 
-ScColorScaleFormatObj::ScColorScaleFormatObj():
+ScColorScaleFormatObj::ScColorScaleFormatObj(rtl::Reference 
xParent):
+mpDocShell(xParent->getDocShell()),
+mxParent(xParent),
 maPropSet(getColorScalePropSet())
 {
 }
@@ -753,7 +799,9 @@ void SAL_

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 7 commits - bridges/source sal/inc sal/rtl sal/util sc/source set_soenv.in shell/source solenv/gbuild solenv/inc

[Pedro Giffuni]

 bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx |5 +
 bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx  |   12 +++
 bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx   |   12 ++-
 bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx |   11 +++
 bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx|7 +-
 bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx |   12 +++
 bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx  |   12 ++-
 bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx|   12 ++-
 sal/inc/rtl/math.h|   15 
 sal/inc/rtl/math.hxx  |7 ++
 sal/inc/rtl/string.hxx|3 
 sal/rtl/source/math.cxx   |   13 
 sal/util/sal.map  |2 
 sc/source/core/tool/interpr1.cxx  |   44 +++---
 set_soenv.in  |   27 ++--
 shell/source/unix/sysshell/recently_used_file_handler.cxx |1 
 solenv/gbuild/platform/freebsd.mk |3 
 solenv/inc/unxfbsd.mk |   16 ++---
 18 files changed, 169 insertions(+), 45 deletions(-)

New commits:
commit 775929fdc096ef7224919dffddae722cf7ce4558
Author: Pedro Giffuni 
Date:   Thu Mar 26 22:31:35 2015 +

FreeBSD build structure changes

Part of
Code Review:https://reviews.freebsd.org/D2108

Author: Don Lewis (truckman at FreeBSD)

diff --git a/set_soenv.in b/set_soenv.in
index 7d0ffe3..2b96d28 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -359,7 +359,7 @@ elsif ( $platform =~ m/kfreebsd/ )
 elsif ( $platform =~ m/freebsd/ ) 
 { $BIG_SVX= "TRUE";
   $COM= "GCC";
-  $COMPATH= '@COMPATH@'; 
+  $COMPATH= '@COMPATH@' . '/bin'; 
   $CVER   = "C300";
   $GUI= "UNX";
   $GUIBASE= "unx";
@@ -2617,26 +2617,37 @@ sub GetCorrectPath
my @originalPairs = @_;
my @pairs = @originalPairs;
my @Path = split /$ps/, $oldPath;
+   my @buildPath;
+   my @sysPath;
+   my $elem;
+
+   for $elem (@Path) {
+   if ($elem eq '.' || $elem =~ m'^$SOLARENV/' ||
+   $elem =~ m'/solenv/') {
+   push @buildPath, $elem;
+   } else {
+   push @sysPath, $elem;
+   }
+   }
 
while (@pairs) {
my $path = shift @pairs;
my $cmd = shift @pairs;
my $to_append = 1;
-   my $elem;
 
if (! -x "$path/$cmd") {
AddWarning ("Missing executable $path/$cmd\n");
}
 
-   for $elem (@Path) {
+   for $elem (@sysPath) {
if ($elem eq $path) {
 #  print "Hit duplicate path in path; break\n";
$to_append = 0;
last;
}
-   if (-f "$elem/$cmd") {
+   if (-f "$elem/$cmd" && ! -l "$elem/$cmd") {
 #  print "Element already in path ...\n";
-   unshift @Path, $path;
+   unshift @sysPath, $path;
$to_append = 0;
last;
} else {
@@ -2644,7 +2655,7 @@ sub GetCorrectPath
}
}
if ($to_append) {
-   push @Path, $path;
+   push @sysPath, $path;
}
}
 
@@ -2654,14 +2665,14 @@ sub GetCorrectPath
my $cmd = shift @pairs;
my $realpath;
 
-   $realpath = PathLookup ($cmd, @Path);
+   $realpath = PathLookup ($cmd, @sysPath);
if (!($realpath eq $path)) {
AddWarning ("Path conflict for executables " .
 "$path/$cmd against $realpath");
}
}
 
-   return join $ps, CleanupPath (@Path);
+   return join $ps, @buildPath, CleanupPath (@sysPath);
 }
 
 #
diff --git a/solenv/gbuild/platform/freebsd.mk 
b/solenv/gbuild/platform/freebsd.mk
index 868786a..b816f44 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -96,6 +96,7 @@ gb_CXXFLAGS := \
-fvisibility-inlines-hidden \
-fvisibility=hidden \
-pipe \
+   -DHAVE_STL_INCLUDE_PATH \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -Werror
@@ -110,7 +111,6 @@ endif
 gb_LinkTarget_EXCEPTIONFLAGS := \
-DEXCEPTIONS_ON \
-fexceptions \
-   -fno-enforce-eh-specs \
 
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
@@ -121,6 +121,7 @@ gb_LinkTarget_LDFLAGS += \
-Wl,-z,combreloc \
-Wl,-z,defs \
$(subst -L../lib , ,$(SOLARLIB)) \
+   ${FBSD_LDFLAGS} \
 \
 
 ifeq ($(HAVE_LD

[Libreoffice-commits] core.git: Branch 'feature/vclref' - vcl/source

[Michael Meeks]

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

New commits:
commit f0ece36944e2a50edf89746795826a329e9d0800
Author: Michael Meeks 
Date:   Thu Mar 26 22:38:03 2015 +

get messagebox dispose ordering right.

Change-Id: Ia7085cf98141fdbd50cf9cc9ed45e2e0c09e448e

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index d176356..f47b6dc 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2020,13 +2020,13 @@ void MessageDialog::dispose()
 m_aOwnedButtons[i].disposeAndClear();
 m_aOwnedButtons.clear();
 
+m_pPrimaryMessage.disposeAndClear();
 m_pSecondaryMessage.disposeAndClear();
 m_pSecondaryMessage.disposeAndClear();
 m_pImage.disposeAndClear();
 m_pGrid.disposeAndClear();
 m_pOwnedActionArea.disposeAndClear();
 m_pOwnedContentArea.disposeAndClear();
-m_pPrimaryMessage.disposeAndClear();
 Dialog::dispose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclref' - vcl/source

[Michael Meeks]

 vcl/source/control/button.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4967e916129e0e8e23954e8ed9a3b2440cc36c19
Author: Michael Meeks 
Date:   Thu Mar 26 22:29:54 2015 +

no need to free mpButtonData in dispose.

Change-Id: Ie6f135d9e91d0831717c2a0726161825d0a06665

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 9233791..7d5e291 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -102,12 +102,11 @@ Button::Button( WindowType nType ) :
 Button::~Button()
 {
 disposeOnce();
+delete mpButtonData;
 }
 
 void Button::dispose()
 {
-delete mpButtonData;
-mpButtonData = NULL;
 Control::dispose();
 }
 
@@ -548,7 +547,7 @@ sal_uInt16& Button::ImplGetButtonState()
 
 sal_uInt16 Button::ImplGetButtonState() const
 {
-return mpButtonData ? mpButtonData->mnButtonState : 0;
+return mpButtonData->mnButtonState;
 }
 
 void Button::ImplSetSymbolAlign( SymbolAlign eAlign )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 57174] When Opening Any Dialog the First Value in the Dialog Should be Selected

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=57174

Katarina Behrens  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO
   Assignee|libreoffice-b...@lists.free |libreoffice-ux-advise@lists
   |desktop.org |.freedesktop.org

--- Comment #4 from Katarina Behrens  ---
This bug has been fixed as a part of GSoC 2015 application process. While I
would accept the code as non-trivial easy hack, thus a valid GSoC application
(the candidate fixed the bug and demonstrated understanding of LibO code), I do
question the validity of this bug. Here is why:

1. Sure, selecting (highlighting) the value  of a text|spin box makes it easier
for the user to delete the value or input their own value. But some users might
want to use the mouse and change the spin box value by clicking on spin
buttons. Highlighting the value might become confusing for them. One man's bug
is the other man's feature

2. What to do if there are more input fields in the dialog? Select the first
one? Or some other one? What if it's not the one the user wants to change?
(selecting multiple input fields is iirc not possible)

3. Finally, if we decide to select (hightlight) the values of input field(s) on
opening the dialog, we should do it consistently in every LibO dialog and
sidebar. 

UX team: any thoughts?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/vclref' - vcl/source

[Michael Meeks]

 vcl/source/gdi/print.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6c9230bb77462bdbe0bfbff6933a5395721bd97a
Author: Michael Meeks 
Date:   Thu Mar 26 22:14:24 2015 +

Fix unintended destruction of adjacent printers.

also audit commit: "start wrapping OutputDevice in VclPtr"

Change-Id: I6e018d7c3e3c8f941c184ad1aaa8593f7750c620

diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 0ecc001..bfb0aeb3 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1067,8 +1067,8 @@ void Printer::dispose()
 else
 pSVData->maGDIData.mpLastPrinter = mpPrev;
 
-mpPrev.disposeAndClear();
-mpNext.disposeAndClear();
+mpPrev.clear();
+mpNext.clear();
 OutputDevice::dispose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 vcl/qa/cppunit/lifecycle.cxx  |   17 +
 vcl/source/window/window2.cxx |   16 
 2 files changed, 25 insertions(+), 8 deletions(-)

New commits:
commit 12ad7b84dcb07e8bf799bdfaca32279fb1940ec0
Author: Michael Meeks 
Date:   Thu Mar 26 21:45:50 2015 +

Fix LazyDelete crasher, and add & test more post-dispose robustness.

Change-Id: I0e9460cb33b7cb5da9ddb950ff27bac8cbf7fed8

diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index 8be94a5..12b0a51 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -30,6 +30,7 @@ public:
 void testIsolatedWidgets();
 void testParentedWidgets();
 void testChildDispose();
+void testPostDispose();
 
 CPPUNIT_TEST_SUITE(LifecycleTest);
 CPPUNIT_TEST(testCast);
@@ -38,6 +39,7 @@ public:
 CPPUNIT_TEST(testIsolatedWidgets);
 CPPUNIT_TEST(testParentedWidgets);
 CPPUNIT_TEST(testChildDispose);
+CPPUNIT_TEST(testPostDispose);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -125,6 +127,21 @@ void LifecycleTest::testChildDispose()
 xWin->disposeOnce();
 }
 
+void LifecycleTest::testPostDispose()
+{
+VclPtr xWin(new WorkWindow((vcl::Window *)NULL, WB_STDWORK));
+xWin->disposeOnce();
+
+// check selected methods continue to work post-dispose
+CPPUNIT_ASSERT(!xWin->GetParent());
+xWin->Show();
+CPPUNIT_ASSERT(!xWin->IsReallyShown());
+CPPUNIT_ASSERT(!xWin->IsEnabled());
+CPPUNIT_ASSERT(!xWin->IsInputEnabled());
+CPPUNIT_ASSERT(!xWin->GetChild(0));
+CPPUNIT_ASSERT(!xWin->GetWindow(0));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(LifecycleTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 58a2664..b3ee05a 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -975,27 +975,27 @@ vcl::Window* Window::ImplGetWindow()
 
 ImplFrameData* Window::ImplGetFrameData()
 {
-return mpWindowImpl->mpFrameData;
+return mpWindowImpl ? mpWindowImpl->mpFrameData : NULL;
 }
 
 SalFrame* Window::ImplGetFrame() const
 {
-return mpWindowImpl->mpFrame;
+return mpWindowImpl ? mpWindowImpl->mpFrame : NULL;
 }
 
 vcl::Window* Window::ImplGetParent() const
 {
-return mpWindowImpl->mpParent;
+return mpWindowImpl ? mpWindowImpl->mpParent.get() : NULL;
 }
 
 vcl::Window* Window::ImplGetClientWindow() const
 {
-return mpWindowImpl->mpClientWindow;
+return mpWindowImpl ? mpWindowImpl->mpClientWindow.get() : NULL;
 }
 
 vcl::Window* Window::ImplGetBorderWindow() const
 {
-return mpWindowImpl->mpBorderWindow;
+return mpWindowImpl ? mpWindowImpl->mpBorderWindow.get() : NULL;
 }
 
 vcl::Window* Window::ImplGetFirstOverlapWindow()
@@ -1237,7 +1237,7 @@ bool Window::IsReallyVisible() const
 
 bool Window::IsReallyShown() const
 {
-return mpWindowImpl->mbReallyShown;
+return mpWindowImpl ? mpWindowImpl->mbReallyShown : false;
 }
 
 bool Window::IsInInitShow() const
@@ -1247,12 +1247,12 @@ bool Window::IsInInitShow() const
 
 bool Window::IsEnabled() const
 {
-return !mpWindowImpl->mbDisabled;
+return mpWindowImpl ? !mpWindowImpl->mbDisabled : false;
 }
 
 bool Window::IsInputEnabled() const
 {
-return !mpWindowImpl->mbInputDisabled;
+return mpWindowImpl ? !mpWindowImpl->mbInputDisabled : false;
 }
 
 bool Window::IsAlwaysEnableInput() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Photo Album: Better Image Layout, help needed

[Enes Ateş]

Hi,

I started to work on Photo Album: Better Image Layout bug #64575 . Image
size calculation is implemented and committed to gerrit. But I haven't
finished crop function yet.

I found some code pointers about CropHandlers [1] [2]. But I need some help
to use on my code.
I am trying to give "rectangular area" information to crop end point. I
already have image size and top left corner coordinate for rectangular
area. As I understand from code pointers, I should give Rectangle (left,
top, right, bottom) to create SdrHandlers. I use SdrHandlers and
GraphicObject to create SdrCropHandler. But I don't know exactly how can I
create them.

Thanks for your help.

[1]
http://opengrok.libreoffice.org/xref/core/svx/source/svdraw/svdograf.cxx#1429
[2]
http://opengrok.libreoffice.org/xref/core/svx/source/svdraw/svdmrkv.cxx#764

-- 

Enes Ateş
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/vcl vcl/source

[Michael Meeks]

Rebased ref, commits from common ancestor:
commit 3622549f3cb30f2a63c6c5191e41832f60ab9dbb
Author: Michael Meeks 
Date:   Tue Mar 24 17:52:38 2015 +

vcl: remove curious self referential OutputDevice ptr.

No need to pay a per-instance cost for this, also avoid a self
reference for every Window sub-class.

Change-Id: I040a0ede9481229e43a39bc23297969e90b95f5e

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index bf1d0c8..c5e004f 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -401,10 +401,6 @@ private:
 
 WindowImpl* mpWindowImpl;
 
-// This is a first attempt to start to remove the dependency of Window on
-// OutputDevice
-VclPtr<::OutputDevice> mpOutputDevice;
-
 #ifdef DBG_UTIL
 friend const char* ::ImplDbgCheckWindow( const void* pObj );
 #endif
@@ -681,8 +677,8 @@ public:
 Window( vcl::Window* pParent, const 
ResId& rResId );
 virtual ~Window();
 
-::OutputDevice const*   GetOutDev() const { return 
mpOutputDevice; };
-::OutputDevice* GetOutDev()   { return 
mpOutputDevice; };
+::OutputDevice const*   GetOutDev() const;
+::OutputDevice* GetOutDev();
 
 virtual voidEnableRTL ( bool bEnable = true ) 
SAL_OVERRIDE;
 virtual voidMouseMove( const MouseEvent& rMEvt );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 510482f..c80e180 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -581,6 +581,22 @@ Window::~Window()
 disposeOnce();
 }
 
+// We will eventually being removing the inheritance of OutputDevice
+// from Window. It will be replaced with a transient relationship such
+// that the OutputDevice is only live for the scope of the Paint method.
+// In the meantime this can help move us towards a Window use an
+// OutputDevice, not being one.
+
+::OutputDevice const* Window::GetOutDev() const
+{
+return this;
+}
+
+::OutputDevice* Window::GetOutDev()
+{
+return this;
+}
+
 } /* namespace vcl */
 
 WindowImpl::WindowImpl( WindowType nType )
@@ -1195,11 +1211,6 @@ void Window::ImplInitAppFontData( vcl::Window* pWindow )
 
 void Window::ImplInitWindowData( WindowType nType )
 {
-// We will eventually being removing the inheritance of OutputDevice from 
Window.
-// It will be replaced with a composition relationship. A Window will use 
an OutputDevice,
-// it will not *be* an OutputDevice
-mpOutputDevice = (OutputDevice*)this;
-
 mnRefCnt = 0;
 mpWindowImpl = new WindowImpl( nType );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/filter/excel/xestream.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 4dfa19d61331bab284e188422fbc95baf814b602
Author: Eike Rathke 
Date:   Thu Mar 26 20:54:16 2015 +0100

Revert "tdf#89319 remove redundant file seekings in XLS export"

As the crash tests have shown, the assert introduced with
71b630e5b683b3761af9d6bdce56f13f20da84c1 to force verification of the
assumption made in 8e2293e06adba3f22e824acad99983fb5b997e4d was hit in
120 documents.

Citing from https://gerrit.libreoffice.org/#/c/14427/ comment:
"The assumptions behind this patch are wrong. This only works if every
single part of the export goes through StartRecord/EndRecord calls. We
have some features that don't use that and need the STREAM_SEEK_TO_END
in the beginning of the StartRecord."

Revert "replace an OSL_ENSURE() with assert(), tdf#89319 related"

This reverts commit 71b630e5b683b3761af9d6bdce56f13f20da84c1.

Revert "tdf#89319 remove redundant file seekings in XLS export"

This reverts commit 8e2293e06adba3f22e824acad99983fb5b997e4d.

diff --git a/sc/source/filter/excel/xestream.cxx 
b/sc/source/filter/excel/xestream.cxx
index 36c4d79..9fdadd2 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -109,8 +109,6 @@ void XclExpStream::StartRecord( sal_uInt16 nRecId, sal_Size 
nRecSize )
 DisableEncryption();
 mnMaxContSize = mnCurrMaxSize = mnMaxRecSize;
 mnPredictSize = nRecSize;
-if ( mbInRec )
-mrStrm.Seek( STREAM_SEEK_TO_END );
 mbInRec = true;
 InitRecord( nRecId );
 SetSliceSize( 0 );
@@ -382,7 +380,7 @@ sal_uInt64 XclExpStream::SetSvStreamPos(sal_uInt64 const 
nPos)
 
 void XclExpStream::InitRecord( sal_uInt16 nRecId )
 {
-assert(mrStrm.remainingSize() == 0);// stream must be at end position
+mrStrm.Seek( STREAM_SEEK_TO_END );
 mrStrm.WriteUInt16( nRecId );
 
 mnLastSizePos = mrStrm.Tell();
@@ -419,7 +417,6 @@ void XclExpStream::StartContinue()
 UpdateRecSize();
 mnCurrMaxSize = mnMaxContSize;
 mnPredictSize -= mnCurrSize;
-mrStrm.Seek( STREAM_SEEK_TO_END );
 InitRecord( EXC_ID_CONT );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/floatwin.hxx  |9 -
 vcl/source/window/menu.cxx|3 ---
 vcl/source/window/winproc.cxx |5 +
 3 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit a62d7f3b08b413d17e650279110ab8a48c419b18
Author: Caolán McNamara 
Date:   Thu Mar 26 16:35:24 2015 +

remove the gap now to pretend it was never there

Change-Id: I234defd865e6bf5d9d9eccc85cde7e69c0549c3f

diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 6f230e8..60bc992 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -44,10 +44,10 @@ class ToolBox;
 #define FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE ((sal_uLong)0x0800)
 #define FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE  ((sal_uLong)0x1000)
 #define FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE  ((sal_uLong)0x2000)
-#define FLOATWIN_POPUPMODE_NEWLEVEL ((sal_uLong)0x8000)
-#define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE   ((sal_uLong)0x0001)
-#define FLOATWIN_POPUPMODE_GRABFOCUS((sal_uLong)0x0002)
-#define FLOATWIN_POPUPMODE_NOHORZPLACEMENT  ((sal_uLong)0x0004)
+#define FLOATWIN_POPUPMODE_NEWLEVEL ((sal_uLong)0x4000)
+#define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE   ((sal_uLong)0x8000)
+#define FLOATWIN_POPUPMODE_GRABFOCUS((sal_uLong)0x0001)
+#define FLOATWIN_POPUPMODE_NOHORZPLACEMENT  ((sal_uLong)0x0002)
 
 #define FLOATWIN_POPUPMODEEND_CANCEL((sal_uInt16)0x0001)
 #define FLOATWIN_POPUPMODEEND_TEAROFF   ((sal_uInt16)0x0002)
commit a8f9dd59de4e655bc77fa0546b81440aee46b837
Author: Caolán McNamara 
Date:   Thu Mar 26 16:32:59 2015 +

why would we ever want FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK

if we're from the menubar we never set it, but if we are
a submenu from a menu in the menubar we set it.

with it set, and on right click, the right click is passed
through to what ever is underneath the pointer

I don't see why we want to do that, especially the inconsistency
from e.g. the File menu, vs the "File->New" menu

Change-Id: I548f5c95e2511b5e921e8b74600f65eecdd8f498

diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index d017b21..6f230e8 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -44,7 +44,6 @@ class ToolBox;
 #define FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE ((sal_uLong)0x0800)
 #define FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE  ((sal_uLong)0x1000)
 #define FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE  ((sal_uLong)0x2000)
-#define FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ((sal_uLong)0x4000)
 #define FLOATWIN_POPUPMODE_NEWLEVEL ((sal_uLong)0x8000)
 #define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE   ((sal_uLong)0x0001)
 #define FLOATWIN_POPUPMODE_GRABFOCUS((sal_uLong)0x0002)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 2890efb..f719d27 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2870,9 +2870,6 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const 
Rectangle& rRect, sal_
 WinBits nStyle = WB_BORDER;
 if (bRealExecute)
 nPopupModeFlags |= FLOATWIN_POPUPMODE_NEWLEVEL;
-if (!pStartedFrom || !pStartedFrom->IsMenuBar())
-nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK;
-
 nPopupModeFlags |= FLOATWIN_POPUPMODE_NOKEYCLOSE | 
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
 
 // could be useful during debugging.
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 83dc516..cb0f3e7 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -145,10 +145,7 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, 
const Point& rMousePo
  (nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP) )
 return true;
 pLastLevelFloat->EndPopupMode( 
FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL );
-if ( nPopupFlags & 
FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK )
-return false;
-else
-return true;
+return true;
 }
 else
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC 2015

[Dobra Gábor]

Hello Everyone,

I am *Dobra *Gábor, currently Software Engineering Bachelor student at
Budapest University of Technology. I've already took part in LibreOffice
development, submitted patches for
https://bugs.documentfoundation.org/show_bug.cgi?id=89641 .

My general nickname is *dobragab*, I use this on IRC, and also in my email
address: dobra...@gmail.com .

I'm planning to submit proposals for the following ideas:

1. Rework of the Tools -> Customization... dialog
2. Improve user experience with CMIS / Gdocs / OneDrive / ... setup

Best Regards,

*Dobra *Gábor
dobragab
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Julien Nabet]

 sc/source/ui/docshell/docsh4.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 9dfad2baaf1f9c6d0933b2326cbf2ff522ae73d1
Author: Julien Nabet 
Date:   Mon Feb 16 23:53:55 2015 +0100

Resolves tdf#72152: respect page orientation of Calc files in recent docs

Change-Id: I2a8d4cce979ce0ff1fd260bfa796817a0dbb7ce2
Reviewed-on: https://gerrit.libreoffice.org/14512
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 38c22ed2b8b8f3530b8a0fe5a23a329e8e511c76)
Reviewed-on: https://gerrit.libreoffice.org/14989
Reviewed-by: Jean-Baptiste Faure 

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 1a1c6f8e..957e7a4 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -109,9 +109,6 @@ using namespace ::com::sun::star;
 static_cast((set).Get(ATTR_PAGE_FOOTERSET)).GetItemSet(). \
 Get(ATTR_PAGE_SHARED)).GetValue()
 
-#define SC_PREVIEW_SIZE_X   1
-#define SC_PREVIEW_SIZE_Y   12400
-
 void ScDocShell::Execute( SfxRequest& rReq )
 {
 //  SID_SC_RANGE (Range),
@@ -1900,7 +1897,16 @@ Rectangle ScDocShell::GetVisArea( sal_uInt16 nAspect ) 
const
 
 if( nAspect == ASPECT_THUMBNAIL )
 {
-Rectangle aArea( 0,0, SC_PREVIEW_SIZE_X,SC_PREVIEW_SIZE_Y );
+Size aSize = aDocument.GetPageSize(aDocument.GetVisibleTab());
+const long SC_PREVIEW_SIZE_X = 1;
+const long SC_PREVIEW_SIZE_Y = 12400;
+Rectangle aArea( 0,0, SC_PREVIEW_SIZE_X, SC_PREVIEW_SIZE_Y);
+if (aSize.Width() > aSize.Height())
+{
+aArea.Right() = SC_PREVIEW_SIZE_Y;
+aArea.Bottom() = SC_PREVIEW_SIZE_X;
+}
+
 bool bNegativePage = aDocument.IsNegativePage( 
aDocument.GetVisibleTab() );
 if ( bNegativePage )
 ScDrawLayer::MirrorRectRTL( aArea );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 34882] Special character favorites

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=34882

A (Andy)  changed:

   What|Removed |Added

 CC||stgohi-lob...@yahoo.de

--- Comment #10 from A (Andy)  ---
(In reply to Jay Philips from comment #9)
> A believe a special character split/group button would be the better
> approach, as it is used in other word processors.
> 
> MS Word - http://i.imgur.com/GiyojNv.png
> WPS Writer - http://i.imgur.com/05A02N9.png
> Wordperfect - http://i.imgur.com/gsxv8a3.png

I think this would be nice and good.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 pyuno/inc/pyuno/pyuno.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c492cbe08af160d17289716cc51721887e2c2afc
Author: Tor Lillqvist 
Date:   Thu Mar 26 17:24:25 2015 +0200

WaE: redundant const_cast on lhs of pointer comparison expression

Change-Id: Idd06653813e3f4863a5186eb6dce074227c25579

diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index 5efa96e..c83beb9 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -109,7 +109,7 @@ public:
 
 PyObject * getAcquired() const
 {
-Py_XINCREF( const_cast< PyObject*> (m) );
+Py_XINCREF( m );
 return m;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/control/ilstbox.cxx |4 ---
 vcl/source/window/menu.cxx |7 ++
 vcl/source/window/winproc.cxx  |   47 ++---
 3 files changed, 25 insertions(+), 33 deletions(-)

New commits:
commit 4f9e20c46b616c7c51bae74bfefd5247f922b2a6
Author: Caolán McNamara 
Date:   Thu Mar 26 16:07:26 2015 +

Resolves: fdo#84795 Menus don't disappear with right mouse click

Change-Id: I95ae2e2d564ec1c45de6df5158e4dec1d93053cb

diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 74969b8..0121b61 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3075,9 +3075,7 @@ void ImplListBoxFloatingWindow::StartFloat( bool 
bStartTracking )
 pGrandparentOutDev->ReMirror( aRect );
 
 // mouse-button right: close the List-Box-Float-win and don't stop the 
handling fdo#84795
-const sal_uLong nFlags = FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK | 
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
-
-StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN | nFlags );
+StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN | 
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE );
 
 if( nPos != LISTBOX_ENTRY_NOTFOUND )
 mpImplLB->ShowProminentEntry( nPos );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c7cfb4bae..2890efb 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2871,9 +2871,9 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const 
Rectangle& rRect, sal_
 if (bRealExecute)
 nPopupModeFlags |= FLOATWIN_POPUPMODE_NEWLEVEL;
 if (!pStartedFrom || !pStartedFrom->IsMenuBar())
-nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK | 
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
+nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK;
 
-nPopupModeFlags |= FLOATWIN_POPUPMODE_NOKEYCLOSE;
+nPopupModeFlags |= FLOATWIN_POPUPMODE_NOKEYCLOSE | 
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
 
 // could be useful during debugging.
 // nPopupModeFlags |= FLOATWIN_POPUPMODE_NOFOCUSCLOSE;
commit 473eae3a7d43ca13ef14eca844b991ffd143e3a0
Author: Caolán McNamara 
Date:   Thu Mar 26 15:28:57 2015 +

Revert "fdo#84795 Menu, DropDown-List don't disappear with right mouse 
click"

This reverts commit fa022a9c4fe74f3f67fb3c35ef49022842d7499b.

because if a right-click context menu is active and we click outside it in
order to remove it then that click goes to whatever is underneath the mouse
which is undesirable

the list dropdown part of this looks good, its the general menus that are 
the problem

Conflicts:
vcl/source/window/winproc.cxx

Change-Id: Ib96e52f22cdeefd59dbf4333f555d9f52b3385e2

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 8cdcd0f..c7cfb4bae 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2870,9 +2870,8 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const 
Rectangle& rRect, sal_
 WinBits nStyle = WB_BORDER;
 if (bRealExecute)
 nPopupModeFlags |= FLOATWIN_POPUPMODE_NEWLEVEL;
-
-// mouse-button right: close the sub-menu (float-win) and don't stop the 
handling fdo#84795
-nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK | 
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
+if (!pStartedFrom || !pStartedFrom->IsMenuBar())
+nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK | 
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
 
 nPopupModeFlags |= FLOATWIN_POPUPMODE_NOKEYCLOSE;
 
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 5f1ebc3..83dc516 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -60,9 +60,7 @@ bool ImplCallPreNotify( NotifyEvent& rEvt )
 || rEvt.GetWindow()->PreNotify( rEvt );
 }
 
-
-enum ENUM_IHMFM {IHMFM_FALSE = 0, IHMFM_TRUE = 1, IHMFM_FLOAT = 2};
-static sal_uInt16 ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& 
rMousePos,
+static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& 
rMousePos,
   sal_uInt16 nCode, MouseNotifyEvent 
nSVEvent,
   bool bMouseLeave )
 {
@@ -82,14 +80,14 @@ static sal_uInt16 ImplHandleMouseFloatMode( vcl::Window* 
pChild, const Point& rM
 if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE )
 {
 if ( bMouseLeave )
-return IHMFM_TRUE;
+return true;
 
 if ( !pFloat || (nHitTest == HITTEST_RECT) )
 {
 if ( pSVData->maHelpData.mpHelpWin && 
!pSVData->maHelpData.mbKeyboardHelp )
 ImplDestroyHelpWindow( true );
 pChild->ImplGetFrame()->SetPointer( POINTER_ARROW );
-return IHMFM_TRUE;
+return true;
 }
 }
 else
@@ -103,13 +101,13 @@ st

minutes of ESC call ...

[Michael Meeks]

* Present:
 Sophie, Cloph, Michael M, Stephan, Eike, Miklos, Bjoern, Kendy,
 Markus, Andras, Robinson, Muthu, Thorsten, Jan-Marek, Caolan,
 
* Completed Action Items:
 
* Pending Action Items:
+ please file an Easy-Hack this week: just a bug with whiteboard: (All)
"EasyHack DifficultyBeginner SkillCpp TopicCleanup"
+ thanks to: David, Markus
+ http://bit.ly/1KR4HWX
+ make sure to create a new openid if you are using the Google openID (all)
[ still need to get this done ! ]
+ poke Mathiew wrt. Windows / locking bug & revert if no response (Michael 
S)
https://bugs.documentfoundation.org/show_bug.cgi?id=72337
[ waiting for Michael - who is on vacation ]
+ if you have photos from ESC meetings during LibOCon, please send them to 
Sophie
+ clear old patches rotting on gerrrit (all)

https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:master+%28label:Code-Review%253D-1+OR+label:Code-Review%253D-2%29+age:6week,n,z

http://nabble.documentfoundation.org/LibreOffice-Gerrit-News-for-core-on-2015-03-23-td4144131.html
[ link to patches that are older than 6 weeks.
  Abandoning gets them off the list - but you can always re-vitalize 
them.
AI:   Rescue your patch now - or have it abandoned for you by next week 
(Bjoern) ]
 
* GSoC (missing)
+ student application period: March 16 to March 27th
+ looks like a good number of student applications
+ gone through the names briefly (Kendy)
+ quite a few returning students: nice ! (Bjoern)
+ calc - re-factoring God objects - may be hard (Markus)
+ ScDocument is used to hide much of the core from the rest.
+ currently ScDocument is the abstraction.
+ could we turn it into generic re-factoring (Kendy)
+ mess around pixels, twips, mapmode nastiness.
+ Wiki page for tasks:
https://wiki.documentfoundation.org/Development/Gsoc/Ideas
 
* Release Engineering update (Cloph)
+ 4.4.2 RC2 status
 + tagged today, windows build still running, Mac & Linux up-loaded to
   the pre-release server
 + buildfix1 tag as well.
 + missing test doc. caused a build to fail.
+ 4.3.7 RC1 April 7th or so
 + 2x weeks out.
+ 5.0.0 ? (ono) - 1st Alpha release - April 13th
 + week after 4.3.7
 + marketing / version-number survey in progress ...
+ Windows 64 bit story ? (Stephan)
 + targetting this for Alpha 1 with Norbert (Cloph)
+ Android & iOS Remote
 + Android - promoted to production;
   now supports watches ...
AI:  + poke Italo wrt. new shiny thing (Cloph)
 
* Crashtest update (Markus / Caolán)
+ using old officeotron
+ will be fixed with the run starting tomorrow
+ part of restoring the VM on new H/W
+ this should nail a number of bogus OOXML errors.
+ well worth having the latest version yourself.
+ regression around xls export crashes
+ jumped recently from 5 to 130.
+ still need to get asan working again
+ something of a space issue currently.
+ need for ubsan?
+ it does find problems (Stephan)
+ would be useful to have it there.
+ have some notes on settting it up:


+ import side looks good - thanks to Caolan.
 
* Writer SwClient/SwModify refactoring (Bjoern)
+ have you talked to Michael S ? (Michael)
+ not yet.
+ Horrible SwIterators ...
+ pokes into the internals of listeners etc.
+ would be great to get rid of; what is listening to what ?
+ didn't see before.
+ The broadcaster/listener relations for writer tables are rather bottom-up:
e.g. a SwTable is listening on a SwTableFrm etc.
https://wiki.openoffice.org/wiki/Writer/Core_And_Layout#Tables
this means the _model_ is listening to the view (partially)
assumption: this is the root cause for a lot of writer table bug pain
+ How to cope with/fix that?
+ tempted to slowly try to un-tangle the mess.
+ does indeed sound insane (Miklos)
+ good idea to build with Clang; SAL_OVERRIDE etc.
 
* Las Palmas hack-fest update (Stephan)
+ hoped for more enthusiasm from students etc.
+ seven students, with no C++ experience.
+ not a great recruitment experience.
+ mostly a Java background (Markus)
+ contact with the uni. busy - mid semester (Thorsten)
+ good to have people on the ground.
+ got interested people from a Google coding group
+ ideal to pick locations with a strong C++ / tech comp. sci focus.
+ on the plus side was great to meet in person & hack together (Thorsten)
+ lots of unis switching to Java / Python (M

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

[Caolán McNamara]

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

New commits:
commit df77bc8839f29b7035bd8542cc9f88db31571e88
Author: Caolán McNamara 
Date:   Thu Mar 26 15:43:23 2015 +

vexing parse

Change-Id: I6c91d94f7eec6001980fb221891157d1e436e1fb

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index ac6c4f7..dc1ec49 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -658,7 +658,7 @@ bool SdTransferable::WriteObject( SotStorageStreamRef& 
rxOStm, void* pObject, So
 void SdTransferable::DragFinished( sal_Int8 nDropAction )
 {
 if( mpSdView )
-const_cast<::sd::View*>(mpSdView)->DragFinished( nDropAction );
+const_cast< ::sd::View* >(mpSdView)->DragFinished( nDropAction );
 }
 
 void SdTransferable::ObjectReleased()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 sw/inc/unotbl.hxx   |2 +
 sw/source/core/doc/docdraw.cxx  |2 -
 sw/source/core/unocore/unoframe.cxx |   37 +--
 sw/source/core/unocore/unotbl.cxx   |   68 ++--
 4 files changed, 33 insertions(+), 76 deletions(-)

New commits:
commit 63fccb1101cacd7887a5f7a094fd376d164e3d73
Author: Bjoern Michaelsen 
Date:   Thu Mar 26 15:55:37 2015 +0100

remove copypasta

Change-Id: Ieed83781b89ff18f870ad8c64ca00d306b097aea

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 6a3ffd1..6a5b6d8 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3592,41 +3592,8 @@ void SwXTextEmbeddedObject::removeEventListener(const 
uno::Reference< lang::XEve
 
 uno::Reference< lang::XComponent >  
SwXTextEmbeddedObject::getEmbeddedObject(void) throw( uno::RuntimeException, 
std::exception )
 {
-uno::Reference< lang::XComponent >  xRet;
-SwFrmFmt*   pFmt = GetFrmFmt();
-if(pFmt)
-{
-SwDoc* pDoc = pFmt->GetDoc();
-const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
-OSL_ENSURE( pCnt->GetCntntIdx() &&
-   pDoc->GetNodes()[ pCnt->GetCntntIdx()->
-GetIndex() + 1 ]->GetOLENode(), "kein 
OLE-Node?");
-
-SwOLENode* pOleNode =  pDoc->GetNodes()[ pCnt->GetCntntIdx()
-->GetIndex() + 1 ]->GetOLENode();
-uno::Reference < embed::XEmbeddedObject > xIP = 
pOleNode->GetOLEObj().GetOleRef();
-if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
-{
-// TODO/LATER: the listener registered after client creation 
should be able to handle scaling, after that the client is not necessary here
-if ( pDoc->GetDocShell() )
-pDoc->GetDocShell()->GetIPClient( svt::EmbeddedObjectRef( xIP, 
embed::Aspects::MSOLE_CONTENT ) );
-
-xRet = uno::Reference < lang::XComponent >( xIP->getComponent(), 
uno::UNO_QUERY );
-uno::Reference< util::XModifyBroadcaster >  xBrdcst( xRet, 
uno::UNO_QUERY);
-uno::Reference< frame::XModel > xModel( xRet, uno::UNO_QUERY);
-if( xBrdcst.is() && xModel.is() )
-{
-SwXOLEListener* pListener = SwIterator( 
*pFmt ).First();
-//create a new one if the OLE object doesn't have one already
-if( !pListener )
-{
-uno::Reference< util::XModifyListener > xOLEListener = new 
SwXOLEListener(*pFmt, xModel);
-xBrdcst->addModifyListener( xOLEListener );
-}
-}
-}
-}
-return xRet;
+uno::Reference 
xObj(getExtendedControlOverEmbeddedObject());
+return xObj.is() ? uno::Reference(xObj->getComponent(), 
uno::UNO_QUERY) : nullptr;
 }
 
 uno::Reference< embed::XEmbeddedObject > SAL_CALL 
SwXTextEmbeddedObject::getExtendedControlOverEmbeddedObject()
commit 2bfc2c4a2cbc86ec193fdb30ab0f4f4fab01790d
Author: Bjoern Michaelsen 
Date:   Wed Mar 25 12:50:44 2015 +0100

fix horrible genglish

Change-Id: I2b7ed81511c6f89240f192cd6efaf8698e73f8ff

diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 54eeeb1..ff8190f 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -511,7 +511,7 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const 
SwFmtAnchor* pFlyAn,
 nOrdNum = pContact->GetMaster()->GetOrdNum();
 }
 else {
-OSL_ENSURE( false, "what is that for a format?" );
+OSL_ENSURE( false, "what kind of format is this?" );
 }
 }
 
commit 9e3064c172082eb43640381452d907bdb2ca6ebf
Author: Bjoern Michaelsen 
Date:   Wed Mar 25 11:26:06 2015 +0100

refactor FormatTable away from SwClients a bit

Change-Id: I43cf4ca6f8cf66b045eedd99108941ea44d56086

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 7a1fff4..7b667a1 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -604,20 +604,23 @@ static void lcl_InspectLines(SwTableLines& rLines, 
std::vector& rAllN
 }
 }
 
-static void lcl_FormatTable(SwFrmFmt* pTblFmt)
+static bool lcl_FormatTable(SwFrmFmt* pTblFmt)
 {
+bool bHasFrames = false;
 SwIterator aIter( *pTblFmt );
-for( SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+for(SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next())
 {
 // mba: no TYPEINFO for SwTabFrm
-if( pFrm->IsTabFrm() )
-{
-if(pFrm->IsValid())
-pFrm->InvalidatePos();
-static_cast(pFrm)->SetONECalcLowers();
-static_cast(pFrm)->Calc();
-}
+if(!pFrm->IsTabFrm())
+continue;
+SwTabFrm* pTabFrm = static_cast(pFrm);
+if(pTabFrm->IsValid())
+pTabFrm->InvalidatePos();
+pTabFrm->

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

[Rishabh Kumar]

 include/svx/dialogs.hrc  |   11 ++-
 svx/source/stbctrls/stbctrls.src |   45 +
 sw/source/uibase/ribbar/workctrl.cxx |   54 ---
 3 files changed, 87 insertions(+), 23 deletions(-)

New commits:
commit 97f08e0632b2a947848223f862dd89a36386cb71
Author: Rishabh Kumar 
Date:   Fri Mar 13 19:38:31 2015 +0530

tdf#81073 :Addition of text zoom levels to print preview zoom

SvxZoomItem includes text zoom level Ids unlike SfxUInt16Iem which only
includes zoom percent id.SfxUInt16Item is the base class for SvxZoomItem.

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

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 63963d0..e6abab7 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1087,9 +1087,18 @@
 #define RID_SVXIMG_SHADOW_SIZE   (RID_SVX_START + 1379)
 #define RID_SVXIMG_SHADOW_XDIST  (RID_SVX_START + 1380)
 #define RID_SVXIMG_SHADOW_YDIST  (RID_SVX_START + 1381)
+#define RID_SVXSTR_ZOOM_25   (RID_SVX_START + 1382)
+#define RID_SVXSTR_ZOOM_50   (RID_SVX_START + 1383)
+#define RID_SVXSTR_ZOOM_75   (RID_SVX_START + 1384)
+#define RID_SVXSTR_ZOOM_100  (RID_SVX_START + 1385)
+#define RID_SVXSTR_ZOOM_150  (RID_SVX_START + 1386)
+#define RID_SVXSTR_ZOOM_200  (RID_SVX_START + 1387)
+#define RID_SVXSTR_ZOOM_WHOLE_PAGE   (RID_SVX_START + 1388)
+#define RID_SVXSTR_ZOOM_PAGE_WIDTH   (RID_SVX_START + 1389)
+#define RID_SVXSTR_ZOOM_OPTIMAL_VIEW (RID_SVX_START + 1390)
 
 // !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new 
RIDs for Strings !!!
-#define RID_SVXSTR_NEXTFREE  (RID_SVX_START + 1382)
+#define RID_SVXSTR_NEXTFREE  (RID_SVX_START + 1391)
 
 // if we have _a_lot_ time, we should group the resource ids by type, instead
 // of grouping them by semantics. The reason is that resource ids have to be
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index ac26b26..a31e6d4 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -141,6 +141,51 @@ String RID_SVXSTR_ZOOM_OUT
 Text [ en-US ] = "Zoom Out";
 };
 
+String RID_SVXSTR_ZOOM_25
+{
+Text [ en-US ] = "25%" ;
+};
+
+String RID_SVXSTR_ZOOM_50
+{
+Text [ en-US ] = "50%" ;
+};
+
+String RID_SVXSTR_ZOOM_75
+{
+Text [ en-US ] = "75%" ;
+};
+
+String RID_SVXSTR_ZOOM_100
+{
+Text [ en-US ] = "100%" ;
+};
+
+String RID_SVXSTR_ZOOM_150
+{
+Text [ en-US ] = "150%" ;
+};
+
+String RID_SVXSTR_ZOOM_200
+{
+Text [ en-US ] = "200%" ;
+};
+
+String RID_SVXSTR_ZOOM_WHOLE_PAGE
+{
+Text [ en-US ] = "Entire Page" ;
+};
+
+String RID_SVXSTR_ZOOM_PAGE_WIDTH
+{
+Text [ en-US ] = "Page Width" ;
+};
+
+String RID_SVXSTR_ZOOM_OPTIMAL_VIEW
+{
+Text [ en-US ] = "Optimal View" ;
+};
+
  // PopupMenu -
 Menu RID_SVXMNU_ZOOM
 {
diff --git a/sw/source/uibase/ribbar/workctrl.cxx 
b/sw/source/uibase/ribbar/workctrl.cxx
index 7cbb8b9..b04dd47 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -46,8 +46,10 @@
 #include 
 #include "swabstdlg.hxx"
 #include 
-
+#include 
 #include 
+#include 
+#include 
 
 // Size check
 #define NAVI_ENTRIES 20
@@ -55,6 +57,8 @@
 #error SwScrollNaviPopup-CTOR static array wrong size. Are new IDs added?
 #endif
 
+#define ZOOM_ENTRIES 9
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -563,13 +567,17 @@ SwZoomBox_Impl::SwZoomBox_Impl(
 {
 EnableAutocomplete( false );
 sal_uInt16 aZoomValues[] =
-{   25, 50, 75, 100, 150, 200 };
-for(sal_uInt16 i = 0; i < sizeof(aZoomValues)/sizeof(sal_uInt16); i++)
+{ RID_SVXSTR_ZOOM_25 , RID_SVXSTR_ZOOM_50 ,
+  RID_SVXSTR_ZOOM_75 , RID_SVXSTR_ZOOM_100 ,
+  RID_SVXSTR_ZOOM_150 , RID_SVXSTR_ZOOM_200 ,
+  RID_SVXSTR_ZOOM_WHOLE_PAGE, RID_SVXSTR_ZOOM_PAGE_WIDTH ,
+  RID_SVXSTR_ZOOM_OPTIMAL_VIEW };
+for(sal_uInt16 i = 0; i < ZOOM_ENTRIES ; i++)
 {
-OUString sEntry = unicode::formatPercent(aZoomValues[i],
-Application::GetSettings().GetUILanguageTag());
+OUString sEntry = SVX_RESSTR( aZoomValues[i] );
 InsertEntry(sEntry);
 }
+
 }
 
 SwZoomBox_Impl::~SwZoomBox_Impl()
@@ -580,26 +588,28 @@ voidSwZoomBox_Impl::Select()
 if ( !IsTravelSelect() )
 {
 OUString sEntry(comphelper::string::remove(GetText(), '%'));
-sal_uInt16 nZoom = (sal_uInt16)sEntry.toInt32();
-if(nZoom < MINZOOM)
-nZoom = MINZOOM;
-if(nZoom > MAXZOOM)
-nZoom = MAXZOOM;
-
-SfxUInt16Item aItem( nSlotId, nZoom );
-if ( FN_PR

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

[Caolán McNamara]

 include/vcl/cmdevt.hxx   |   30 ++
 sd/source/ui/inc/slideshow.hxx   |2 
 sd/source/ui/slideshow/slideshow.cxx |5 +
 sd/source/ui/slideshow/slideshowimpl.cxx |   13 ++
 sd/source/ui/slideshow/slideshowimpl.hxx |1 
 sd/source/ui/view/viewshel.cxx   |   11 ++
 vcl/inc/salwtype.hxx |6 +
 vcl/inc/unx/gtk/gtkframe.hxx |1 
 vcl/source/window/winproc.cxx|  150 +++
 vcl/unx/gtk/window/gtksalframe.cxx   |   22 
 10 files changed, 183 insertions(+), 58 deletions(-)

New commits:
commit 873141fb5be5fa49b56ea413bc912af33f758a0b
Author: Caolán McNamara 
Date:   Thu Mar 26 10:20:34 2015 +

add GtkLongPressGesture support and implement long-press in slideshow

so a long press shows the context menu to e.g. allow switching on/off
draw-on-slide mode

Change-Id: Icd6ea52d2172217794f4fc802246ccf13020e134

diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx
index 8e62e25..851c5d9 100644
--- a/include/vcl/cmdevt.hxx
+++ b/include/vcl/cmdevt.hxx
@@ -355,6 +355,26 @@ public:
 double getVelocityY() const { return mnVelocityY; }
 };
 
+class VCL_DLLPUBLIC CommandLongPressData
+{
+double mnX;
+double mnY;
+public:
+CommandLongPressData()
+: mnX(0)
+, mnY(0)
+{
+}
+CommandLongPressData(double nX, double nY)
+: mnX(nX)
+, mnY(nY)
+{
+}
+double getX() const { return mnX; }
+double getY() const { return mnY; }
+};
+
+
 // - CommandEvent -
 #define COMMAND_CONTEXTMENU ((sal_uInt16)1)
 #define COMMAND_STARTDRAG   ((sal_uInt16)2)
@@ -376,6 +396,7 @@ public:
 #define COMMAND_PREPARERECONVERSION ((sal_uInt16)19)
 #define COMMAND_QUERYCHARPOSITION   ((sal_uInt16)20)
 #define COMMAND_SWIPE   ((sal_uInt16)21)
+#define COMMAND_LONGPRESS   ((sal_uInt16)22)
 
 class VCL_DLLPUBLIC CommandEvent
 {
@@ -404,6 +425,7 @@ public:
   CommandMediaData* GetMediaData() const;
 const CommandSelectionChangeData*   GetSelectionChangeData() const;
 const CommandSwipeData* GetSwipeData() const;
+const CommandLongPressData* GetLongPressData() const;
 };
 
 inline CommandEvent::CommandEvent()
@@ -494,6 +516,14 @@ inline const CommandSwipeData* 
CommandEvent::GetSwipeData() const
 return NULL;
 }
 
+inline const CommandLongPressData* CommandEvent::GetLongPressData() const
+{
+if( mnCommand == COMMAND_LONGPRESS )
+return (const CommandLongPressData*)(mpData);
+else
+return NULL;
+}
+
 #endif // INCLUDED_VCL_CMDEVT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index d6ef3ae..2f19ca0 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -53,6 +53,7 @@ namespace vcl { class Window; }
 class SfxRequest;
 class WorkWindow;
 class CommandSwipeData;
+class CommandLongPressData;
 struct ImplSVEvent;
 
 // TODO: Remove
@@ -156,6 +157,7 @@ public:
  This should only be called by the SdShowWindow */
 bool pause( bool bPause );
 bool swipe(const CommandSwipeData &rSwipeData);
+bool longpress(const CommandLongPressData& rLongPressData);
 
 // settings
 bool isFullScreen();// a.k.a. 
FuSlideShow::IsFullScreen()
diff --git a/sd/source/ui/slideshow/slideshow.cxx 
b/sd/source/ui/slideshow/slideshow.cxx
index cfcf5e3..b21680e 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1064,6 +1064,11 @@ bool SlideShow::swipe(const CommandSwipeData& rSwipeData)
 return mxController.is() && mxController->swipe(rSwipeData);
 }
 
+bool SlideShow::longpress(const CommandLongPressData& rLongPressData)
+{
+return mxController.is() && mxController->longpress(rLongPressData);
+}
+
 void SlideShow::StartInPlacePresentationConfigurationCallback()
 {
 if( mnInPlaceConfigEvent != 0 )
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 4e9959b..38eee1f 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1235,7 +1235,7 @@ void SlideshowImpl::slideEnded(const bool bReverse)
 
 bool SlideshowImpl::swipe(const CommandSwipeData &rSwipeData)
 {
-if (mbUsePen)
+if (mbUsePen || mnContextMenuEvent)
 return false;
 
 double nVelocityX = rSwipeData.getVelocityX();
@@ -1253,6 +1253,17 @@ bool SlideshowImpl::swipe(const CommandSwipeData 
&rSwipeData)
 return true;
 }
 
+bool SlideshowImpl::longpress(const CommandLongPressData &rLongPressData)
+{
+if (mnContextMenuEvent)
+return false;
+
+maPopupMousePos = Point(rLongPressData.getX(), rLongPressData.getY());
+mnContextMenuEvent = Application::PostUserEvent( LINK( this, 
SlideshowImpl, Contex

[Libreoffice-commits] core.git: Branch 'private/jmux/libreoffice-4-1-6+backports' - 15 commits - config_host/config_cups.h.in configure.ac include/sfx2 include/vcl sc/source sfx2/source shell/Package_

[Christoph Lutz]

 config_host/config_cups.h.in   |6 
 configure.ac   |3 
 include/sfx2/viewsh.hxx|5 
 include/vcl/jobdata.hxx|6 
 include/vcl/print.hxx  |9 
 include/vcl/printerinfomanager.hxx |   10 
 sc/source/ui/src/optdlg.src|6 
 sfx2/source/view/viewprn.cxx   |   15 +
 shell/Package_scripts_kde.mk   |6 
 shell/source/unix/misc/kde4-open-url.sh|   22 +
 sw/inc/dbmgr.hxx   |2 
 sw/source/core/fields/dbfld.cxx|4 
 sw/source/core/fields/docufld.cxx  |3 
 sw/source/ui/dbui/dbmgr.cxx|  307 -
 sw/source/ui/inc/view.hxx  |   11 
 sw/source/ui/uno/unomailmerge.cxx  |2 
 vcl/inc/cupsmgr.hxx|   23 +
 vcl/inc/unx/salframe.h |1 
 vcl/source/filter/wmf/enhwmf.cxx   |   17 +
 vcl/source/filter/wmf/winmtf.cxx   |   11 
 vcl/source/filter/wmf/winmtf.hxx   |2 
 vcl/source/gdi/print3.cxx  |   73 +++--
 vcl/unx/generic/printer/cupsmgr.cxx|  113 +++--
 vcl/unx/generic/printer/jobdata.cxx|   18 +
 vcl/unx/generic/printer/printerinfomanager.cxx |   15 +
 vcl/unx/generic/window/salframe.cxx|  147 +--
 vcl/unx/kde4/KDE4FilePicker.cxx|   76 +++---
 vcl/unx/kde4/KDE4FilePicker.hxx|6 
 28 files changed, 682 insertions(+), 237 deletions(-)

New commits:
commit 743966cdf34a85c01f42c303a341ef9a9ce7288d
Author: Christoph Lutz 
Date:   Mon Mar 9 15:37:45 2015 +

Don't store temporary mail merge file if mail merge job was cancelled

If a mail merge "to single file" is canceled, the temporary file was still 
saved.
This needed a lot of time for large mail merge results (>20s) which is not 
needed,
wanted and inteded. We want mail merge to return asap.

Reviewed-on: https://gerrit.libreoffice.org/14811
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 86a547e33bab2a89513385c5af535a6099526616)

Conflicts:

sw/source/uibase/dbui/dbmgr.cxx

Change-Id: I74e9048c7eb483766e7e677dd21167b7d844a518

diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index ba5f075..c8c2572 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1445,27 +1445,30 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* 
pSourceShell,
 {
 if( rMergeDescriptor.nMergeType != DBMGR_MERGE_PRINTER )
 {
-assert( aTempFile.get());
-INetURLObject aTempFileURL( 
rMergeDescriptor.bSubjectIsFilename ? sSubject : aTempFile->GetURL());
-SfxMedium* pDstMed = new SfxMedium(
-aTempFileURL.GetMainURL( INetURLObject::NO_DECODE ),
-STREAM_STD_READWRITE );
-pDstMed->SetFilter( pStoreToFilter );
-if(pDstMed->GetItemSet())
+if( !bCancel )
 {
-if(pStoreToFilterOptions )
-
pDstMed->GetItemSet()->Put(SfxStringItem(SID_FILE_FILTEROPTIONS, 
*pStoreToFilterOptions));
-if(rMergeDescriptor.aSaveToFilterData.getLength())
-
pDstMed->GetItemSet()->Put(SfxUsrAnyItem(SID_FILTER_DATA, 
makeAny(rMergeDescriptor.aSaveToFilterData)));
-}
+assert( aTempFile.get());
+INetURLObject aTempFileURL( 
rMergeDescriptor.bSubjectIsFilename ? sSubject : aTempFile->GetURL());
+SfxMedium* pDstMed = new SfxMedium(
+aTempFileURL.GetMainURL( INetURLObject::NO_DECODE 
),
+STREAM_STD_READWRITE );
+pDstMed->SetFilter( pStoreToFilter );
+if(pDstMed->GetItemSet())
+{
+if(pStoreToFilterOptions )
+
pDstMed->GetItemSet()->Put(SfxStringItem(SID_FILE_FILTEROPTIONS, 
*pStoreToFilterOptions));
+if(rMergeDescriptor.aSaveToFilterData.getLength())
+
pDstMed->GetItemSet()->Put(SfxUsrAnyItem(SID_FILTER_DATA, 
makeAny(rMergeDescriptor.aSaveToFilterData)));
+}
 
-xTargetDocShell->DoSaveAs(*pDstMed);
-xTargetDocShell->DoSaveCompleted(pDstMed);
-if( xTargetDocShell->GetError() )
-{
-// error message ??
-ErrorHandler::HandleError( xTargetDocShell->GetEr

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - include/vcl sd/source

[Miklos Vajna]

 include/vcl/ITiledRenderable.hxx |2 +-
 sd/source/ui/inc/unomodel.hxx|2 ++
 sd/source/ui/unoidl/unomodel.cxx |   23 +++
 3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 27f599d1c63d007977604c8b8893e7dea14e91b7
Author: Miklos Vajna 
Date:   Thu Mar 26 15:37:45 2015 +0100

SdXImpressDocument: implement resetSelection()

With this, when editing is finished, no text edit is active, also both
editeng and sdr selections are reset.

Change-Id: If953e1d8683171c1f1ed8c7d97ae34a163d14765

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 0717635..a10e448 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -124,7 +124,7 @@ public:
 /**
  * @see lok::Document::resetSelection().
  */
-virtual void resetSelection() { }
+virtual void resetSelection() = 0;
 };
 
 } // namespace vcl
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index fe5679b..409b620 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -250,6 +250,8 @@ public:
 virtual void setTextSelection(int nType, int nX, int nY) SAL_OVERRIDE;
 /// @see vcl::ITiledRenderable::setGraphicSelection().
 virtual void setGraphicSelection(int nType, int nX, int nY) SAL_OVERRIDE;
+/// @see lok::Document::resetSelection().
+virtual void resetSelection() SAL_OVERRIDE;
 
 // XComponent
 
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 4305b9b..0a1a955 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2451,6 +2451,29 @@ void SdXImpressDocument::setGraphicSelection(int nType, 
int nX, int nY)
 }
 }
 
+void SdXImpressDocument::resetSelection()
+{
+SolarMutexGuard aGuard;
+
+DrawViewShell* pViewShell = GetViewShell();
+if (!pViewShell)
+return;
+
+SdrView* pSdrView = pViewShell->GetView();
+if (!pSdrView)
+return;
+
+if (pSdrView->IsTextEdit())
+{
+// Reset the editeng selection.
+pSdrView->UnmarkAll();
+// Finish editing.
+pSdrView->SdrEndTextEdit();
+}
+// Reset graphic selection.
+pSdrView->UnmarkAll();
+}
+
 uno::Reference< i18n::XForbiddenCharacters > 
SdXImpressDocument::getForbiddenCharsTable()
 {
 uno::Reference< i18n::XForbiddenCharacters > xForb(mxForbidenCharacters);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39440] cppcheck cleanliness

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=39440

--- Comment #63 from Commit Notification 
 ---
Varun committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=69c2825708d1e78225ad2f515b792734443d8247

tdf#39440 cppcheck cleanliness, Fixing basic cpp errors

It will be available in 4.5.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Varun]

 desktop/unx/source/file_image_unx.c |2 +-
 rsc/source/rscpp/cpp6.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 69c2825708d1e78225ad2f515b792734443d8247
Author: Varun 
Date:   Sat Mar 7 16:41:40 2015 +0530

tdf#39440 cppcheck cleanliness, Fixing basic cpp errors

Initialized a non-initialized integer variable which is widely used in if 
else

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

diff --git a/desktop/unx/source/file_image_unx.c 
b/desktop/unx/source/file_image_unx.c
index eb3c0d5..fb67778 100644
--- a/desktop/unx/source/file_image_unx.c
+++ b/desktop/unx/source/file_image_unx.c
@@ -76,7 +76,7 @@ int file_image_pagein (file_image * image)
 long  s;
 size_tk;
 // force touching of each page despite the optimizer
-volatile char c = 0;
+volatile char c =0;
 
 if (image == 0)
 return EINVAL;
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
index b94c81f..74340dd 100644
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -584,7 +584,7 @@ DEFBUF* defendel(char* name, int delete)
 DEFBUF** prevp;
 char* np;
 int nhash;
-int temp;
+int temp=0;
 int size;
 
 for (nhash = 0, np = name; *np != EOS;)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vasily Melenchuk]

 sw/qa/extras/rtfimport/data/fdo89496.rtf|   18 ++
 sw/qa/extras/rtfimport/rtfimport.cxx|7 +++
 writerfilter/source/rtftok/rtfsdrimport.cxx |1 +
 3 files changed, 26 insertions(+)

New commits:
commit ed1605c1ea01c8b8d7809e3682d5c2104c16fa41
Author: Vasily Melenchuk 
Date:   Wed Mar 25 12:01:04 2015 +0300

tdf#89496 fixed crash on rtf shape group parsing

Fix is actually partial revert of my changes done for tdf#49893
(commit 2c411e4487f24968d6a62958fec85e4e3e1fda93): shape groups
were not taken into account

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

diff --git a/sw/qa/extras/rtfimport/data/fdo89496.rtf 
b/sw/qa/extras/rtfimport/data/fdo89496.rtf
new file mode 100644
index 000..761966d
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo89496.rtf
@@ -0,0 +1,18 @@
+{\rtf1
+
+{\shpgrp{\*\shpinst\shpleft6834\shptop109\shpright10578\shpbottom6825\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz30\shplid1057
+{\sp{\sn groupLeft}{\sv 7401}}{\sp{\sn groupTop}{\sv 7617}}{\sp{\sn 
groupRight}{\sv 11145}}{\sp{\sn groupBottom}{\sv 14333}}{\sp{\sn fFlipH}{\sv 
0}}{\sp{\sn fFlipV}{\sv 0}}{\sp{\sn lidRegroup}{\sv 0}}{\sp{\sn posh}{\sv 
0}}{\sp{\sn posv}{\sv 0}}
+{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fPseudoInline}{\sv 0}}{\sp{\sn 
fLayoutInCell}{\sv 1}}
+
+{\shp{\*\shpinst\shplid1058{\sp{\sn relLeft}{\sv 7401}}{\sp{\sn relTop}{\sv 
8181}}{\sp{\sn relRight}{\sv 10551}}
+{\sp{\sn relBottom}{\sv 14333}}{\sp{\sn fRelFlipH}{\sv 0}}{\sp{\sn 
fRelFlipV}{\sv 0}}{\sp{\sn shapeType}{\sv 75}}{\sp{\sn pib}{\sv 
{\pict\picscalex63\picscaley48\piccropl0\piccropr0\piccropt0\piccropb0
+\picw8812\pich22500\picwgoal4996\pichgoal12756\pngblip
+47494638396110001000d5ffffc0c0c0555f00aafcfcfcf6f6f6eaeaeae6e6e6e4e4e4e3e3e3c2c2c2c1c1c1bcbcbcb5b5b5b3b3b3b0b0b0adadada5a5a5a2a2a2a1a1a19f9f9f9494948a8a8a888686867b7b7b6c6c6c5c5c5c4e4e4e4b4b4b4747474646463d3d3d3c3c3c2e2e2e2525251b1b1b1818181010100909090606060303030021f9040102002c1000100684408170482c0a06c8a4728924389f506833b281302a8e6b164b18103024c52111504cca67332102e0042e9a40d9319f8300a343c1200f54e47f7e2a1e0b0a7d0d728a010d838400261a7c0d94947784252700127e9d159f6c8411140019080ea7a9a85f842122281612b1b3b25d6b1f29291d0fbbbdbc5d5e51c34e4cc64a46c94341003b
+}}}{\sp{\sn fRecolorFillAsPicture}{\sv 0}}{\sp{\sn fUseShapeAnchor}{\sv 0}}
+{\sp{\sn fLine}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn 
fBehindDocument}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1
+
+
+}
+}
+
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 5cffa27..7be90d9 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2219,6 +2219,13 @@ DECLARE_RTFIMPORT_TEST(testFdo49893_2, "fdo49893-2.rtf")
 CPPUNIT_ASSERT_EQUAL(OUString("HEADER"),  
parseDump("/root/page[3]/header/txt/text()"));
 }
 
+DECLARE_RTFIMPORT_TEST(testFdo89496, "fdo89496.rtf")
+{
+// Just ensure that document is loaded and shape exists
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShape.is());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 2c278c4..c3f2405 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -791,6 +791,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, 
ShapeOrPict const shap
 {
 m_xShape = xShape; // store it for later resolvePict call
 }
+return;
 }
 
 if (bCustom && xShape.is() && !bPib)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung]

 sw/source/core/doc/DocumentRedlineManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77cb94613be6315b618783b2aa76226ad3107163
Author: Mark Hung 
Date:   Wed Mar 25 23:17:11 2015 +0800

Fix DocumentRedlineManager code that crashes Writer.

One of my document crashes Writer when I delete one table row, with
change tracking enabled. I observed that in DeleteRedline(),
either Start or End of the SwRangeRedline object has been changed
so that it breaks the order of SwRedlineTable.

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

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index bc31678..4fb65aa 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1973,7 +1973,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& 
rRange, bool bSaveInUnd
 if( !pRedl->HasValidRange() )
 {
 // re-insert
-mpRedlineTbl->Remove( pRedl );
+mpRedlineTbl->Remove( n );
 mpRedlineTbl->Insert( pRedl );
 --n;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - toolkit/source vcl/source

[Julien Nabet]

 toolkit/source/awt/vclxwindows.cxx |4 ++--
 vcl/source/control/ilstbox.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6e36fc0cb769c2173e07af764ddc52e02cf8c9ba
Author: Julien Nabet 
Date:   Mon Mar 16 22:31:23 2015 +0100

tdf#67990: Management of case in combobox

I noticed these 2 points:
1) Combobox were used with autocomplete with default (false) value for 
matchCase
=> so initialize autocomplete with true value for matchCase
2) FindMatchingEntry uses bLazy as !matchCase
but when bLazy = false, no autocomplete can work since you must type the 
whole word
so just use "entryCombo" startsWith "typed string" instead of "entryCombo" 
== "typed string"

(thank you Lionel for this tip: 
http://nabble.documentfoundation.org/Finding-the-right-location-for-tdf-67990-Base-module-td4143324.html)

Change-Id: Ib1063002c3284122fd5279f27c1ccbc177bbac7c
Reviewed-on: https://gerrit.libreoffice.org/14885
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 76f33f10309b0ee384a75a7a854858b068d60495)
Reviewed-on: https://gerrit.libreoffice.org/15021

diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index 002ef31..e93095a 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4368,12 +4368,12 @@ void VCLXComboBox::setProperty( const OUString& 
PropertyName, const ::com::sun::
 {
 sal_Int16 n = sal_Int16();
 if ( Value >>= n )
- pComboBox->EnableAutocomplete( n != 0 );
+ pComboBox->EnableAutocomplete( n != 0, true );
 else
 {
 bool b = bool();
 if ( Value >>= b )
-pComboBox->EnableAutocomplete( b );
+pComboBox->EnableAutocomplete( b, true );
 }
 }
 break;
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 62db0c7..9c66383 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -287,7 +287,7 @@ sal_Int32 ImplEntryList::FindMatchingEntry( const OUString& 
rStr, sal_Int32 nSta
 }
 else
 {
-bMatch = rStr.isEmpty() || (rStr == pImplEntry->maStr );
+bMatch = rStr.isEmpty() || (pImplEntry->maStr.startsWith(rStr));
 }
 if ( bMatch )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Deena Francis]

 sc/inc/AccessibleFilterTopWindow.hxx |5 
 sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx |   14 +-
 sc/source/ui/cctrl/checklistmenu.cxx |   97 ++-
 sc/source/ui/cctrl/checklistmenu.src |5 
 sc/source/ui/inc/checklistmenu.hrc   |1 
 sc/source/ui/inc/checklistmenu.hxx   |6 
 6 files changed, 116 insertions(+), 12 deletions(-)

New commits:
commit f340278df616921c663075be692264ca37d86d84
Author: Deena Francis 
Date:   Mon Mar 23 06:54:36 2015 +0530

Enhancement : tdf#89908 Add Search field to the autofilter

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

diff --git a/sc/inc/AccessibleFilterTopWindow.hxx 
b/sc/inc/AccessibleFilterTopWindow.hxx
index 5983150..b389ef1 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -49,7 +49,7 @@ public:
 // Non-UNO Methods
 
 enum ChildControlType {
-LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, OK_BTN, CANCEL_BTN
+EDIT_SEARCH_BOX, LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, 
OK_BTN, CANCEL_BTN
 };
 void setAccessibleChild(
 const ::com::sun::star::uno::Reference<
@@ -61,6 +61,9 @@ private:
 ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible >
 mxAccMenu;
 
+/** Edit search box for searching field members */
+::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible >
+mxAccEditSearchBox;
 /** check list box for field member visibility */
 ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible >
 mxAccListBox;
diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx 
b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
index 9380967..8781ece 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
@@ -62,16 +62,18 @@ Reference 
ScAccessibleFilterTopWindow::getAccessibleChild(
 switch (nIndex)
 {
 case 0:
-return mxAccListBox;
+return mxAccEditSearchBox;
 case 1:
-return mxAccToggleAll;
+return mxAccListBox;
 case 2:
-return mxAccSingleOnBtn;
+return mxAccToggleAll;
 case 3:
-return mxAccSingleOffBtn;
+return mxAccSingleOnBtn;
 case 4:
-return mxAccOkBtn;
+return mxAccSingleOffBtn;
 case 5:
+return mxAccOkBtn;
+case 6:
 return mxAccCancelBtn;
 default:
 ;
@@ -90,6 +92,8 @@ void ScAccessibleFilterTopWindow::setAccessibleChild(
 {
 switch (eType)
 {
+case EDIT_SEARCH_BOX:
+mxAccEditSearchBox = rAccessible;
 case LISTBOX:
 mxAccListBox = rAccessible;
 break;
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 1366bf5..4e73d9e 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "document.hxx"
 
 using namespace com::sun::star;
@@ -855,6 +856,7 @@ void ScCheckListMenuWindow::CancelButton::Click()
 
 ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* 
pDoc) :
 ScMenuFloatingWindow(pParent, pDoc),
+maEdSearch(this),
 maChecks(this,  WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | 
WB_HASBUTTONSATROOT ),
 maChkToggleAll(this, 0),
 maBtnSelectSingle  (this, 0),
@@ -872,8 +874,9 @@ ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* 
pParent, ScDocument* p
 
 maWndSize = Size(200 * nScaleFactor, 330 * nScaleFactor);
 
-maTabStopCtrls.reserve(7);
+maTabStopCtrls.reserve(8);
 maTabStopCtrls.push_back(this);
+maTabStopCtrls.push_back(&maEdSearch);
 maTabStopCtrls.push_back(&maChecks);
 maTabStopCtrls.push_back(&maChkToggleAll);
 maTabStopCtrls.push_back(&maBtnSelectSingle);
@@ -895,6 +898,7 @@ void ScCheckListMenuWindow::getSectionPosSize(
 sal_Int32 nScaleFactor = GetDPIScaleFactor();
 
 // constant parameters.
+const long nSearchBoxMargin = 10 *nScaleFactor;
 const long nListBoxMargin = 5 * nScaleFactor;// horizontal 
distance from the side of the dialog to the listbox border.
 const long nListBoxInnerPadding = 5 * nScaleFactor;
 const long nTopMargin = 5 * nScaleFactor;
@@ -906,13 +910,14 @@ void ScCheckListMenuWindow::getSectionPosSize(
 const long nBtnHeight = nLabelHeight * 2;
 const long nBottomMargin = 10 * nScaleFactor;
 const long nMenuListMargin = 5 * nScaleFactor;
+const long nSearchBoxHeight = nLabe

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

[Julien Nabet]

 toolkit/source/awt/vclxwindows.cxx |4 ++--
 vcl/source/control/ilstbox.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 76f33f10309b0ee384a75a7a854858b068d60495
Author: Julien Nabet 
Date:   Mon Mar 16 22:31:23 2015 +0100

tdf#67990: Management of case in combobox

I noticed these 2 points:
1) Combobox were used with autocomplete with default (false) value for 
matchCase
=> so initialize autocomplete with true value for matchCase
2) FindMatchingEntry uses bLazy as !matchCase
but when bLazy = false, no autocomplete can work since you must type the 
whole word
so just use "entryCombo" startsWith "typed string" instead of "entryCombo" 
== "typed string"

(thank you Lionel for this tip: 
http://nabble.documentfoundation.org/Finding-the-right-location-for-tdf-67990-Base-module-td4143324.html)

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

diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index 8e80a52..a30695d 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4374,12 +4374,12 @@ void VCLXComboBox::setProperty( const OUString& 
PropertyName, const ::com::sun::
 {
 sal_Int16 n = sal_Int16();
 if ( Value >>= n )
- pComboBox->EnableAutocomplete( n != 0 );
+ pComboBox->EnableAutocomplete( n != 0, true );
 else
 {
 bool b = bool();
 if ( Value >>= b )
-pComboBox->EnableAutocomplete( b );
+pComboBox->EnableAutocomplete( b, true );
 }
 }
 break;
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index f01c0ec3..74969b8 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -287,7 +287,7 @@ sal_Int32 ImplEntryList::FindMatchingEntry( const OUString& 
rStr, sal_Int32 nSta
 }
 else
 {
-bMatch = rStr.isEmpty() || (rStr == pImplEntry->maStr );
+bMatch = rStr.isEmpty() || (pImplEntry->maStr.startsWith(rStr));
 }
 if ( bMatch )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[robert Babiak]

 starmath/source/parse.cxx |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 6c4100cf81e1678ff386549c0cdaa2f73a154ddc
Author: robert Babiak 
Date:   Wed Mar 25 15:28:32 2015 -0600

Added shortcut for arrows when doing start math formulas

Added shortcut of <- and -> for entering leftarrow and right arrow. This 
greatly speeds up entering formula when taking notes.

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

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 35d3a73..cb47ab9 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -557,6 +557,16 @@ void SmParser::NextToken()
 
 rnEndPos = nRealStart + 2;
 }
+else if (m_aBufferString.match("<-", nRealStart))
+{
+m_aCurToken.eType= TLEFTARROW;
+m_aCurToken.cMathChar = MS_LEFTARROW;
+m_aCurToken.nGroup   = TGSTANDALONE;
+m_aCurToken.nLevel   = 5;
+m_aCurToken.aText = "<-";
+
+rnEndPos = nRealStart + 2;
+}
 else if (m_aBufferString.match("<>", nRealStart))
 {
 m_aCurToken.eType= TNEQ;
@@ -854,6 +864,16 @@ void SmParser::NextToken()
 
 rnEndPos = nRealStart + 2;
 }
+else if (m_aBufferString.match("->", nRealStart))
+{
+m_aCurToken.eType= TRIGHTARROW;
+m_aCurToken.cMathChar = MS_RIGHTARROW;
+m_aCurToken.nGroup   = TGSTANDALONE;
+m_aCurToken.nLevel   = 5;
+m_aCurToken.aText = "->";
+
+rnEndPos = nRealStart + 2;
+}
 else
 {
 m_aCurToken.eType= TMINUS;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Information about our work on Libreoffice

[Miklos Vajna]

Hi Juergen,

On Thu, Mar 26, 2015 at 01:57:26PM +, Juergen Funk Mailinglist 
 wrote:
> I think that is a problem under your machine

Thanks for checking, then it's not something global -- I'll have a look
at it.

Regards,

Miklos


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

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

[Takeshi Abe]

 starmath/qa/extras/data/ns-prefix-math.mml |   13 +
 starmath/qa/extras/mmlimport-test.cxx  |   11 +++
 2 files changed, 24 insertions(+)

New commits:
commit 9aca5ac2290718fd87204968d7e2d0e1b51fb791
Author: Takeshi Abe 
Date:   Thu Mar 26 10:02:02 2015 +0900

starmath: add test for detecting MathML's namespace prefix 'math:'

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

diff --git a/starmath/qa/extras/data/ns-prefix-math.mml 
b/starmath/qa/extras/data/ns-prefix-math.mml
new file mode 100644
index 000..c4c9612
--- /dev/null
+++ b/starmath/qa/extras/data/ns-prefix-math.mml
@@ -0,0 +1,13 @@
+
+http://www.w3.org/1998/Math/MathML";>
+  
+
+  
+a
++
+b
+  
+
+2
+  
+
diff --git a/starmath/qa/extras/mmlimport-test.cxx 
b/starmath/qa/extras/mmlimport-test.cxx
index 3cfce68..e52ebf3 100644
--- a/starmath/qa/extras/mmlimport-test.cxx
+++ b/starmath/qa/extras/mmlimport-test.cxx
@@ -30,10 +30,12 @@ public:
 virtual void tearDown() SAL_OVERRIDE;
 
 void testSimple();
+void testNsPrefixMath();
 void testMaction();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testSimple);
+CPPUNIT_TEST(testNsPrefixMath);
 CPPUNIT_TEST(testMaction);
 CPPUNIT_TEST_SUITE_END();
 
@@ -83,6 +85,15 @@ void Test::tearDown()
 void Test::testSimple()
 {
 loadURL(getURLFromSrc("starmath/qa/extras/data/simple.mml"));
+OUString sExpected("left ( {italic \"a\" + italic \"b\"} right )^italic 
\"2\"");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("loaded text", sExpected, 
mxDocShell->GetText());
+}
+
+void Test::testNsPrefixMath()
+{
+loadURL(getURLFromSrc("starmath/qa/extras/data/ns-prefix-math.mml"));
+OUString sExpected("left ( {italic \"a\" + italic \"b\"} right )^italic 
\"2\"");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("loaded text", sExpected, 
mxDocShell->GetText());
 }
 
 void Test::testMaction()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-2' - svx/uiconfig

[Adolfo Jayme Barrientos]

 svx/uiconfig/ui/colorwindow.ui |   15 ++-
 1 file changed, 2 insertions(+), 13 deletions(-)

New commits:
commit 0a400104543d54f569ca15d6c3cdd7a49a3a0614
Author: Adolfo Jayme Barrientos 
Date:   Fri Mar 13 18:52:12 2015 -0600

Remove stray separator

Added in 93c4e3c9349a1ea07b822a2824559ad28f4a9a5e, presumably to workaround 
tdf#86159

Change-Id: Ief8ed1e355c937142b95524310f3e18485ef346d
(cherry picked from commit 3b4a7845fa72e03ce02e263c3518cbbb6882df75)
Reviewed-on: https://gerrit.libreoffice.org/14862
Tested-by: David Tardon 
Reviewed-by: David Tardon 
(cherry picked from commit 6bdf83c91be8a8959ff426c509927d4e0ad40bdd)
Reviewed-on: https://gerrit.libreoffice.org/15014
Reviewed-by: Christian Lohmaier 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 37e6627..4498156 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -93,8 +93,8 @@
   
 True
 False
-0
 Recent
+0
   
   
 False
@@ -142,17 +142,6 @@
 9
   
 
-
-  
-True
-False
-  
-  
-False
-True
-10
-  
-
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Popa Adrian Marius]

 svx/source/sdr/overlay/overlaymanagerbuffered.cxx |   46 --
 1 file changed, 46 deletions(-)

New commits:
commit e86f4d3a8fad72123c51d1c272246cd0890ddecd
Author: Popa Adrian Marius 
Date:   Thu Mar 26 15:30:04 2015 +0200

Cleanup comments for easyhacks

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

diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx 
b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 8766b5a..09a42d2 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -146,34 +146,6 @@ namespace sdr
 maBufferDevice);
 }
 
-//Region aRegionPixel(rRegionPixel);
-//RegionHandle aRegionHandle(aRegionPixel.BeginEnumRects());
-//Rectangle aRegionRectanglePixel;
-
-//while(aRegionPixel.GetEnumRects(aRegionHandle, 
aRegionRectanglePixel))
-//{
-#ifdef DBG_U//TIL
-//  // #i72754# possible graphical region test only with non-pro
-//  static bool bDoPaintForVisualControl(false);
-//  if(bDoPaintForVisualControl)
-//  {
-//  getOutputDevice().SetLineColor(COL_LIGHTGREEN);
-//  getOutputDevice().SetFillColor();
-//  getOutputDevice().DrawRect(aRegionRectanglePixel);
-//  }
-#endif
-//  // restore the area
-//  const Point aTopLeft(aRegionRectanglePixel.TopLeft());
-//  const Size aSize(aRegionRectanglePixel.GetSize());
-
-//  getOutputDevice().DrawOutDev(
-//  aTopLeft, aSize, // destination
-//  aTopLeft, aSize, // source
-//  maBufferDevice);
-//}
-
-//aRegionPixel.EndEnumRects(aRegionHandle);
-
 // restore MapModes
 getOutputDevice().EnableMapMode(bMapModeWasEnabledDest);
 
((OverlayManagerBuffered*)this)->maBufferDevice.EnableMapMode(bMapModeWasEnabledSource);
@@ -229,24 +201,6 @@ namespace sdr
 rSource);
 }
 
-//RegionHandle aRegionHandle(aRegion.BeginEnumRects());
-//Rectangle aRegionRectanglePixel;
-
-//while(aRegion.GetEnumRects(aRegionHandle, aRegionRectanglePixel))
-//{
-//  // for each rectangle, save the area
-//  Point aTopLeft(aRegionRectanglePixel.TopLeft());
-//  Size aSize(aRegionRectanglePixel.GetSize());
-
-//  maBufferDevice.DrawOutDev(
-//  aTopLeft, aSize, // destination
-//  aTopLeft, aSize, // source
-//  rSource);
-
-//}
-
-//aRegion.EndEnumRects(aRegionHandle);
-
 // restore MapModes
 rSource.EnableMapMode(bMapModeWasEnabledDest);
 maBufferDevice.EnableMapMode(bMapModeWasEnabledSource);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

AW: Information about our work on Libreoffice

[Juergen Funk Mailinglist]

Hi Miklos,

but under Ubuntu 12.04 it works too.

I think that is a problem under your machine

I can’t reproduce, sorry

Juergen


Von: Juergen Funk Mailinglist
Gesendet: Dienstag, 24. März 2015 16:57
An: Miklos Vajna
Cc: libreoffice
Betreff: AW: Information about our work on Libreoffice

Hi Miklos,

under windows, the repaint problem not exist, it works fine.

I try to look on linux.


Best
juergen

Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag 
von Juergen Funk Mailinglist
Gesendet: Dienstag, 24. März 2015 12:57
An: Tobias Madl; Miklos Vajna
Cc: libreoffice; Jennifer Liebel
Betreff: AW: Information about our work on Libreoffice

Hi Miklos,

I want try to fix, that.


Best
Juergen




Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag 
von Tobias Madl
Gesendet: Montag, 23. März 2015 17:55
An: Miklos Vajna
Cc: libreoffice; Jürgen Funk; Jennifer Liebel
Betreff: Re: Information about our work on Libreoffice

Hi Miklos,
atm i'm still very busy with the work at university, so for the next few days i 
will not be able to look over it. Maybe Jürgen could have a look. Otherwise i 
think you should do a bugreport, so people know about it. If i can manage to 
get some spare time, i will try to solve this issue.
Thanks for your patience and efforts
regards
Tobi

On Mon, Mar 23, 2015 at 4:40 PM, Miklos Vajna 
mailto:vmik...@collabora.co.uk>> wrote:
Hi Tobias,

On Sun, Mar 15, 2015 at 11:40:28AM +0100, Miklos Vajna 
mailto:vmik...@collabora.co.uk>> wrote:
> Thanks for the recent improvements, the current master is much better
> than what it was right after the merge. :-)
>
> With bcefd5cda926f86db16b1bcf6838431b5b0d61b5 I still see one problem,
> though:
>
> 1) Start Writer.
>
> 2) Press F11 to open the styles sidebar
>
> 3) Right-click on e.g. heading 1, and select modify -> repaint problem.
>
> Screenshot:
>
> http://people.freedesktop.org/~vmiklos/2015/heading1-repaint-problem.png

This is still a problem -- please let me know if you prefer a bugreport
instead.

Thanks,

Miklos

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

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 3 commits - include/svx libreofficekit/source svx/source

[Miklos Vajna]

 include/svx/sdr/table/tablecontroller.hxx |2 
 include/svx/selectioncontroller.hxx   |2 
 libreofficekit/source/gtk/lokdocview.cxx  |   64 +++---
 svx/source/svdraw/selectioncontroller.cxx |5 ++
 svx/source/svdraw/svdmrkv.cxx |   11 +
 svx/source/table/tablecontroller.cxx  |   44 +---
 6 files changed, 88 insertions(+), 40 deletions(-)

New commits:
commit 280d59e2967c6baa8738285501c15a7cc35379ff
Author: Miklos Vajna 
Date:   Thu Mar 26 11:53:57 2015 +0100

SdrTableObj tiled rendering: implement selection callbacks

This makes selections of Impress tables visible. Double-click in an
empty cell doesn't select the cell yet, neither extending cell text
selections into table ones work, but it's a start.

Change-Id: Idb8921d980ac9d7ab363c68c91c1a9e6cf0918e3

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 119ff78..14f19f3 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -66,6 +66,7 @@
 #include "tableundo.hxx"
 #include "tablelayouter.hxx"
 #include 
+#include 
 #include 
 
 using ::editeng::SvxBorderLine;
@@ -2083,18 +2084,18 @@ void SvxTableController::updateSelectionOverlay()
 {
 sdr::overlay::OverlayObjectCell::RangeVector aRanges;
 
-Rectangle aRect;
+Rectangle aStartRect, aEndRect;
 CellPos aStart,aEnd;
 getSelectedCells( aStart, aEnd );
-pTableObj->getCellBounds( aStart, aRect );
+pTableObj->getCellBounds( aStart, aStartRect );
 
-basegfx::B2DRange a2DRange( basegfx::B2DPoint(aRect.Left(), 
aRect.Top()) );
-a2DRange.expand( basegfx::B2DPoint(aRect.Right(), aRect.Bottom()) 
);
+basegfx::B2DRange a2DRange( basegfx::B2DPoint(aStartRect.Left(), 
aStartRect.Top()) );
+a2DRange.expand( basegfx::B2DPoint(aStartRect.Right(), 
aStartRect.Bottom()) );
 
 findMergeOrigin( aEnd );
-pTableObj->getCellBounds( aEnd, aRect );
-a2DRange.expand( basegfx::B2DPoint(aRect.Left(), aRect.Top()) );
-a2DRange.expand( basegfx::B2DPoint(aRect.Right(), aRect.Bottom()) 
);
+pTableObj->getCellBounds( aEnd, aEndRect );
+a2DRange.expand( basegfx::B2DPoint(aEndRect.Left(), 
aEndRect.Top()) );
+a2DRange.expand( basegfx::B2DPoint(aEndRect.Right(), 
aEndRect.Bottom()) );
 aRanges.push_back( a2DRange );
 
 ::Color aHighlight( COL_BLUE );
@@ -2122,6 +2123,27 @@ void SvxTableController::updateSelectionOverlay()
 }
 }
 }
+
+// If tiled rendering, emit callbacks for sdr table selection.
+if (pOutDev && pTableObj->GetModel()->isTiledRendering())
+{
+// Left edge of aStartRect.
+Rectangle aSelectionStart(aStartRect.Left(), aStartRect.Top(), 
aStartRect.Left(), aStartRect.Bottom());
+// Right edge of aEndRect.
+Rectangle aSelectionEnd(aEndRect.Right(), aEndRect.Top(), 
aEndRect.Right(), aEndRect.Bottom());
+Rectangle aSelection(a2DRange.getMinX(), a2DRange.getMinY(), 
a2DRange.getMaxX(), a2DRange.getMaxY());
+
+if (pOutDev->GetMapMode().GetMapUnit() == MAP_100TH_MM)
+{
+aSelectionStart = 
OutputDevice::LogicToLogic(aSelectionStart, MAP_100TH_MM, MAP_TWIP);
+aSelectionEnd = OutputDevice::LogicToLogic(aSelectionEnd, 
MAP_100TH_MM, MAP_TWIP);
+aSelection = OutputDevice::LogicToLogic(aSelection, 
MAP_100TH_MM, MAP_TWIP);
+}
+
+
pTableObj->GetModel()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_START,
 aSelectionStart.toString().getStr());
+
pTableObj->GetModel()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_END, 
aSelectionEnd.toString().getStr());
+
pTableObj->GetModel()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, 
aSelection.toString().getStr());
+}
 }
 }
 }
@@ -2134,6 +2156,14 @@ void SvxTableController::destroySelectionOverlay()
 {
 delete mpSelectionOverlay;
 mpSelectionOverlay = 0;
+
+if (mxTableObj->GetModel()->isTiledRendering())
+{
+// Clear the LOK text selection so far provided by this table.
+
mxTableObj->GetModel()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_START,
 "EMPTY");
+
mxTableObj->GetModel()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_END, 
"EMPTY");
+
mxTableObj->GetModel()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, 
"EMPTY");
+}
 }
 }
 
commit de90fa0128675959b789ede5bb897b20bf74cb28
Author: Miklos Vajna 
Date:   Thu Mar 26 14:22:55 2015 +0100

SdrMarkView tiled rendering: partially disable SdrTableObj gra

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sc/inc sc/source

[Jan Holesovsky]

 sc/inc/docuno.hxx  |7 +--
 sc/source/ui/unoobj/docuno.cxx |   14 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit ec974c8c4372e095eba844e1435676fb470beac2
Author: Jan Holesovsky 
Date:   Thu Mar 26 14:34:41 2015 +0100

sc tiled editing: Implement resetSelection().

Change-Id: I3eb8d749119e0b219dee9252e8fe332dd9dbed48

diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index e826eb7..5642569 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -388,6 +388,9 @@ public:
 /// @see vcl::ITiledRenderable::getParts().
 virtual int getParts() SAL_OVERRIDE;
 
+/// @see vcl::ITiledRenderable::initializeForTiledRendering().
+virtual void initializeForTiledRendering() SAL_OVERRIDE;
+
 /// @see vcl::ITiledRenderable::registerCallback().
 virtual void registerCallback(LibreOfficeKitCallback pCallback, void* 
pData) SAL_OVERRIDE;
 
@@ -400,8 +403,8 @@ public:
 /// @see vcl::ITiledRenderable::setGraphicSelection().
 virtual void setGraphicSelection(int nType, int nX, int nY) SAL_OVERRIDE;
 
-/// @see vcl::ITiledRenderable::initializeForTiledRendering().
-virtual void initializeForTiledRendering() SAL_OVERRIDE;
+/// @see lok::Document::resetSelection().
+virtual void resetSelection() SAL_OVERRIDE;
 };
 
 class ScDrawPagesObj : public cppu::WeakImplHelper2<
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index b72949c..21d30e1 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -643,6 +643,20 @@ void ScModelObj::setGraphicSelection(int nType, int nX, 
int nY)
 }
 }
 
+void ScModelObj::resetSelection()
+{
+SolarMutexGuard aGuard;
+
+ScViewData* pViewData = ScDocShell::GetViewData();
+ScTabView* pTabView  = pViewData->GetView();
+
+// deselect the shapes
+pTabView->DrawDeselectAll();
+
+// and hide the cell and text selection
+
pDocShell->GetDocument().GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION,
 "");
+}
+
 void ScModelObj::initializeForTiledRendering()
 {
 SolarMutexGuard aGuard;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 framework/source/layoutmanager/layoutmanager.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 3c22024f41029dd4c1dca6b265d1fd0f14fc2f95
Author: Caolán McNamara 
Date:   Thu Mar 26 13:37:10 2015 +

Resolves: tdf#90256 repair invalid docking positions

Change-Id: If144a867dc4be6975c08cd1eea9ebb540975aafc

diff --git a/framework/source/layoutmanager/layoutmanager.cxx 
b/framework/source/layoutmanager/layoutmanager.cxx
index d4e4eee..94e99ff 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -531,8 +531,15 @@ bool LayoutManager::readWindowStateData( const OUString& 
aName, UIElement& rElem
 else if ( aWindowState[n].Name == 
WINDOWSTATE_PROPERTY_DOCKPOS )
 {
 awt::Point aPoint;
-if ( aWindowState[n].Value >>= aPoint )
+if (aWindowState[n].Value >>= aPoint)
+{
+//tdf#90256 repair these broken Docking positions
+if (aPoint.X < 0)
+aPoint.X = SAL_MAX_INT32;
+if (aPoint.Y < 0)
+aPoint.Y = SAL_MAX_INT32;
 rElementData.m_aDockedData.m_aPos = aPoint;
+}
 }
 else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_POS 
)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - android/README

[Tomaž Vajngerl]

 android/README |  163 -
 1 file changed, 150 insertions(+), 13 deletions(-)

New commits:
commit 2b72fae01f90ca01b5ffda145e5b597313116f95
Author: Tomaž Vajngerl 
Date:   Thu Mar 26 22:26:44 2015 +0900

android: properly merge README with new content

Change-Id: I740c654f5844ef4cb7cbc5387c7b8a56e326e532

diff --git a/android/README b/android/README
index 5e8db7c..617e86b 100644
--- a/android/README
+++ b/android/README
@@ -1,4 +1,46 @@
+LibreOffice Android
+***
+
+Bootstrap
+*
+
+Contains common code for all projects on Android to bootstrap LibreOffice. In
+addition it is a home to LibreOfficeKit (LOK - see libreofficekit/README) JNI
+classes.
+
+LOAndroid3 (in experimental)
+
+
+LibreOffice Android application - the code is based on Fennec (Firefox for 
Android).
+It uses OpenGL ES 2 for rendering of the document tiles which are gathered from
+LibreOffice using LOK. The application contains the LibreOffice core in one 
shared
+library: liblo-native-code.so, which is bundled together with the application.
+
+TiledRendering
+**
+
+Tiled rendering is a technique that splits the document to bitmaps of same size
+(typically 256x256) which are fetched on demand.
+
+Architecture and Threading
+**
+
+The application implements editing support using 4 threads:
+1. The Android UI thread, we can't perform anything here that would take a 
considerable
+   amount of time.
+2. An OpenGL thread which contains the OpenGL context and is responsible for 
drawing
+   all layers (including tiles) to the screen.
+3. A thread (LOKitThread), that performs LibreOfficeKit calls, which may take 
more time
+   to complete. In addition it also receives events from the soffice thread 
(see below)
+   when the callback emits an event. Events are stored in a blocking queue 
(thread
+   processes events in FCFS order, goes to sleep when no more event is 
available and
+   awakens when there are events in queue again).
+4. A native thread created by LibreOfficeKit (we call it the soffice thread), 
where
+   LibreOffice itself runs. It receives calls from LOKitThread, and may emit 
callback
+   events as necessary.
+
 Android-specific notes
+**
 
 Note that this document has not necessarily been updated to match
 reality...
@@ -7,67 +49,67 @@ For instructions on how to build for Android, see 
README.cross.
 
 * Getting something running on an emulated device
 
-   Create an AVD in the android UI, don't even try to get
+Create an AVD in the android UI, don't even try to get
 the data partition size right in the GUI, that is doomed to producing
 an AVD that doesn't work. Instead start it from the console:
 
-   LD_LIBRARY_PATH=$(pwd)/lib emulator-arm -avd  -partition-size 500
+LD_LIBRARY_PATH=$(pwd)/lib emulator-arm -avd  -partition-size 500
 
 In order to have proper acceleration, you need the 32-bit libGL.so:
 
 sudo zypper in Mesa-libGL-devel-32bit
 
-   Where  is the literal name of the AVD that you entered.
+Where  is the literal name of the AVD that you entered.
 
-   Then:
+Then:
 
-   cd android/experimental/LOAndroid3
-   ant debug install
-   adb logcat
+cd android/experimental/LOAndroid3
+ant debug install
+adb logcat
 
-   And if all goes well - you should have some nice debug output to enjoy
+And if all goes well - you should have some nice debug output to enjoy
 when you start the app. After a while of this loop you might find that you have
 lost a lot of space on your emulator's or device's /data volume. If using the
 emulator, you can do:
 
-   adb shell stop; adb shell start
+adb shell stop; adb shell start
 
 but on a (non-rooted) device you probably just need to reboot it. On the other
 hand, this phenomenon might not happen on actual devices.
 
 * What about using a real device?
 
-   That works fine, too.
+That works fine, too.
 
 * Debugging
 
-   First of all, you need to configure the build with --enable-debug or
+First of all, you need to configure the build with --enable-debug or
 --enable-dbgutil.  You may want to provide --enable-selective-debuginfo too,
 like --enable-selective-debuginfo="sw/" or so, in order to fit into the memory
 during linking.
 
-   Building with all symbols is also possible but the linking is currently
+Building with all symbols is also possible but the linking is currently
 slow (around 10 to 15 minutes) and you need lots of memory (around 16GB + some
 swap).
 
-   You also want to avoid --with-android-package-name (or when you use
+You also want to avoid --with-android-package-name (or when you use
 that, you must set it to "org.libreoffice"), otherwise ndk-gdb will complain
 that
 
 ERROR: Could not extract package's data directory. Are you sure that
 

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

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |   70 +++
 1 file changed, 57 insertions(+), 13 deletions(-)

New commits:
commit bca0b4fb2c8b32ce11c6aae12cc60b5f00fa9fcc
Author: Eike Rathke 
Date:   Wed Mar 25 22:32:03 2015 +0100

TableRef: generate token for #Data

Change-Id: I06d4789b92d9f6567dd87c8d3cb6186538269663

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 9ae82f3..a82596c 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4804,6 +4804,23 @@ bool ScCompiler::HandleTableRef()
 bForwardToClose = true;
 }
 break;
+case ScTableRefToken::DATA:
+{
+if (pDBData->HasHeader())
+aRange.aStart.IncRow();
+/* TODO: this assumes totals to be present, they need to
+ * be implemented at the table. */
+if (aRange.aEnd.Row() - aRange.aStart.Row() >= 1)
+aRange.aEnd.IncRow(-1);
+if (aRange.aEnd.Row() < aRange.aStart.Row())
+{
+/* TODO: add RefData with deleted rows to generate
+ * #REF! error? */
+bAddRange = false;
+}
+bForwardToClose = true;
+}
+break;
 case ScTableRefToken::TOTALS:
 {
 aRange.aStart.SetRow( aRange.aEnd.Row());
commit 38c8e7e5317a90a96625e9d680fde18e3de89be8
Author: Eike Rathke 
Date:   Wed Mar 25 20:22:07 2015 +

TableRef: generate tokens for #Headers and #Totals

Change-Id: Ib28bae06022d151bc108ebb3062efe86cc3b8bb9

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 551f690..9ae82f3 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4780,26 +4780,53 @@ bool ScCompiler::HandleTableRef()
 pDBData->GetArea(aRange);
 aRange.aEnd.SetTab(aRange.aStart.Tab());
 ScTokenArray* pNew = new ScTokenArray();
-ScTableRefToken::Item eItem = pTR->GetItem();
 bool bGotToken = false;
-if (eItem == ScTableRefToken::TABLE || eItem == ScTableRefToken::ALL)
+bool bAddRange = true;
+bool bForwardToClose = false;
+ScTableRefToken::Item eItem = pTR->GetItem();
+switch (eItem)
+{
+case ScTableRefToken::TABLE:
+case ScTableRefToken::ALL:
+{
+// Optional [] (or [#All]) may follow.
+if ((bGotToken = GetToken()) && mpToken->GetOpCode() == 
ocTableRefOpen)
+{
+bool bAll = ((bGotToken = GetToken()) && 
mpToken->GetOpCode() == ocTableRefItemAll);
+if (bGotToken && (!bAll || (bGotToken = GetToken())) 
&& mpToken->GetOpCode() == ocTableRefClose)
+bGotToken = false;  // get next token below
+}
+}
+break;
+case ScTableRefToken::HEADERS:
+{
+aRange.aEnd.SetRow( aRange.aStart.Row());
+bForwardToClose = true;
+}
+break;
+case ScTableRefToken::TOTALS:
+{
+aRange.aStart.SetRow( aRange.aEnd.Row());
+bForwardToClose = true;
+}
+break;
+default:
+/* TODO: implement all other cases. */
+SetError(errUnknownToken);
+bAddRange = false;
+}
+if (bAddRange)
 {
 ScComplexRefData aRefData;
 aRefData.InitFlags();
-aRefData.SetRange(aRange, aPos);
+aRefData.SetRange( aRange, aPos);
 pNew->AddDoubleReference( aRefData );
-// Optional [] (or [#All]) may follow.
-if ((bGotToken = GetToken()) && mpToken->GetOpCode() == 
ocTableRefOpen)
-{
-bool bAll = ((bGotToken = GetToken()) && mpToken->GetOpCode() 
== ocTableRefItemAll);
-if (bGotToken && (!bAll || (bGotToken = GetToken())) && 
mpToken->GetOpCode() == ocTableRefClose)
-bGotToken = false;  // get next token below
-}
 }
-else
+if (bForwardToClose)
 {
-/* TODO: implement all other cases. */
-SetError(errUnknownToken);
+while ((bGotToken = GetToken()) && mpToken->GetOpCode() != 
ocTableRefClose)
+;
+bGotToken = false;  // get next token below
 }
 PushTokenArray( pNew, true );
 pNew->Reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - android/experimental android/README

[Tomaž Vajngerl]

 android/README 
 |  176 ++
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java
  |7 
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
   |1 
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
 |1 
 4 files changed, 49 insertions(+), 136 deletions(-)

New commits:
commit 9ebd22c353ca2e2b3d37b0c6d266b6c582538edc
Author: Tomaž Vajngerl 
Date:   Thu Mar 26 21:48:02 2015 +0900

android: add README

Change-Id: I7a2b3cb487b4dfe290bff36e3766357fbbc84fba

diff --git a/android/README b/android/README
index 5e8db7c..d7fdf77 100644
--- a/android/README
+++ b/android/README
@@ -1,136 +1,40 @@
-Android-specific notes
-
-Note that this document has not necessarily been updated to match
-reality...
-
-For instructions on how to build for Android, see README.cross.
-
-* Getting something running on an emulated device
-
-   Create an AVD in the android UI, don't even try to get
-the data partition size right in the GUI, that is doomed to producing
-an AVD that doesn't work. Instead start it from the console:
-
-   LD_LIBRARY_PATH=$(pwd)/lib emulator-arm -avd  -partition-size 500
-
-In order to have proper acceleration, you need the 32-bit libGL.so:
-
-sudo zypper in Mesa-libGL-devel-32bit
-
-   Where  is the literal name of the AVD that you entered.
-
-   Then:
-
-   cd android/experimental/LOAndroid3
-   ant debug install
-   adb logcat
-
-   And if all goes well - you should have some nice debug output to enjoy
-when you start the app. After a while of this loop you might find that you have
-lost a lot of space on your emulator's or device's /data volume. If using the
-emulator, you can do:
-
-   adb shell stop; adb shell start
-
-but on a (non-rooted) device you probably just need to reboot it. On the other
-hand, this phenomenon might not happen on actual devices.
-
-* What about using a real device?
-
-   That works fine, too.
-
-* Debugging
-
-   First of all, you need to configure the build with --enable-debug or
---enable-dbgutil.  You may want to provide --enable-selective-debuginfo too,
-like --enable-selective-debuginfo="sw/" or so, in order to fit into the memory
-during linking.
-
-   Building with all symbols is also possible but the linking is currently
-slow (around 10 to 15 minutes) and you need lots of memory (around 16GB + some
-swap).
-
-   You also want to avoid --with-android-package-name (or when you use
-that, you must set it to "org.libreoffice"), otherwise ndk-gdb will complain
-that
-
-ERROR: Could not extract package's data directory. Are you sure that
-   your installed application is debuggable?
-
-   When you have all this, install the .apk to the device, and:
-
-   cd android/experimental/LOAndroid3
-   /ndk-gdb --adb=/platform-tools/adb 
--start
-
-   Pretty printers aren't loaded automatically due to the single shared
-   object, but you can still load them manually. E.g. to have a 
pretty-printer for
-   rtl::OString, you need:
-
-   (gdb) python sys.path.insert(0, "/master/solenv/gdb")
-   (gdb) source /master/instdir/program/libuno_sal.so.3-gdb.py
-
-* Debuggint the Java part
-
-At the moment the code is not organized in a way that would make Eclipse or
-Android Studio happy as-is, so the quickest way is to use the jdb command-line
-debugger. Steps to use it:
-
-1) Find out the JDWP ID of a debuggable application:
-
-   adb jdwp
-
-From the list of currently active JDWP processes, the last number is the just
-started debuggable application.
-
-2) Forward the remote JDWP port/process ID to a local port:
-
-   adb forward tcp: jdwp:31739
-
-3) Connect to the running application:
-
-   jdb -sourcepath src/java/ -attach localhost:
-
-Assuming that you're already in the LOAndroid3 directory in your shell.
-
-* Common Errors / Gotchas
-
-lo_dlneeds: Could not read ELF header of /data/data/org.libreoffice...libfoo.so
-   This (most likely) means that the install quietly failed, and that
-the file is truncated; check it out with adb shell ls -l /data/data/
-
-
-* Detailed explanation
-
-Note: the below talk about unit tests is obsolete; we no longer have
-any makefilery etc to build unit tests for Android.
-
-Unit tests are the first thing we want to run on Android, to get some
-idea how well, if at all, the basic LO libraries work. We want to
-build even unit tests as normal Android apps, i.e. packaged as .apk
-files, so that they run in a sandboxed environment like that of
-whatever eventual end-user Android apps there will be that use LO
-code.
-
-Sure, we could quite easily build unit tests as plain Linux
-executables (built against the Android libraries, of course, not
-GNU/Linux ones), push them to the device or emulator with adb and r

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

[Noel Grandin]

 compilerplugins/clang/constantfunction.cxx   |  477 ---
 compilerplugins/clang/store/constantfunction.cxx |  477 +++
 2 files changed, 477 insertions(+), 477 deletions(-)

New commits:
commit 6aa542445f80b93b965feaa4dce7947fb9e25088
Author: Noel Grandin 
Date:   Thu Mar 26 14:24:43 2015 +0200

move the constantfunction plugin into /store

as sberg points out, it needs a massive blacklist, which is going
to be a pain to maintain. Until I can think of a way to make this
more resilient, move it where it can't bother people.

Change-Id: I64fc498146a3cb4ea9c1e37150c4ef50023b7bd5

diff --git a/compilerplugins/clang/constantfunction.cxx 
b/compilerplugins/clang/store/constantfunction.cxx
similarity index 100%
rename from compilerplugins/clang/constantfunction.cxx
rename to compilerplugins/clang/store/constantfunction.cxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 90222] replace ScaList in scaddins with a std container

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=90222

--- Comment #5 from David Tardon  ---
(In reply to Pieter Adriaensen from comment #4)
> I still have a question though: The ScaList is always used to put data of
> the same class in. So isn't it better to change it to vector instead of
> being a vector and doing static_casts?

Of course it is better! I assumed this is something that does not have to be
explicitly mentioned... Also, it should be vector, if possible.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.2.2-buildfix1' created by Christian Lohmaier 
 at 2015-03-26 12:51 -0700

Tag libreoffice-4.4.2.2-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVE/LKAAoJEPQ0oe+v7q6jxvEP/iqYU2uCRqLbmGdwXFIwj4Id
ugiblCZu//dyfBs01CkSKULFfIcM5OXo5aUXeqF4WswPTr1uvG8sskXoIg97TJth
S3C91gz/1s4VcFXYmNDLONF+TDBoXgNjXkde+aHXNsEBI0xj/0WeC4x6OUzb8xBc
4QjxEj1uY+6zPioA6DWJCt65KcCXYIILgbOpmmDR7imYnTYPwMZDihcghldyAdXT
RM2gChx/MT5v4JPCTcZLixtd7xk3U+TCtTZvC6xd2Lj8lOHOz2ov5pn2NfTKtNbs
cpXoTDVfE+VhJMDdfIKEiAV0PKOQCRrgS+fkL9slreEea1LYkHpdSmzJdZ1BpAVn
94dbRThuQ+JCnBmxwYqnzlcpEfbN2Bi3PFZ8SRcuSA0A5Ma2Wb37EpeZoT3OJrA9
5k12TxNNRPdE9dakDtx7TaWUINSpR4LI7+O7ti3JdmTop6jX5XNEqmjlv7o4jK9O
ZlrPYiox1HCBO17MmSuJMNHVfa+KF5Y5hcrtmVSBAu3d8SdKFG2hs4CHVr5m2fZW
aax2bgrgoGrcoO5q/D77lpkKQd7AEdTf/hZsW3xnp9TshfjDBZtqmmifeToSjdtX
VV54IWYn+tEfqTjafs2LYmRmXx+8pq2NXxyadwr826mRxQCFuUJunL0tLAoaAEyl
DIELx3PME8msMZ2dFu29
=Dncm
-END PGP SIGNATURE-

Changes since libreoffice-4.4.2.2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.2.2-buildfix1' created by Christian Lohmaier 
 at 2015-03-26 12:51 -0700

Tag libreoffice-4.4.2.2-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVE/LHAAoJEPQ0oe+v7q6jC6wQAMEP6GFFz2DfdGTEKaxDgAkz
MJ8sh2Py+hBGcVaaa/DRf5djK4L1Hiy2YCCl3jzKQnbt9LFku7TV5k7hLZc2NjKQ
2bXD6/uIjPTFR/GjqdsBYo6DrLogUzP2Xy/vexCWZKzvp+0Jw0Mx3DTNK8sxHeTl
XaUKHCMyqhM9HSpDsHydBEdOYLwA6y28Iq51s9k78mpt0+Lr/X9QMx1Wnhh3spZg
M09aChM83+0U+Y/sCRLK0NzuNFSfp3xOXGrfHlQv7BTy+8CO6XEGqW1W0oqFHMrV
ff/vdEmOB57lgGJF7PfKz4PZL+qFa6+haexThnw1jVk8/g72F66JobTl3hfEQIZd
UnbwzeImYfAHjCSh1XtrBBPwaguS/cJCySSC6bS6HwsfjXO6eOX3lDCvhHI4gB/J
3KRNDHiIRKujzHW+iDpZXk4j/MyGMI/TkvYT02ZXWspe+JPZRQCrwkO6v0u1/0ez
DuGbeET5QPsImGBvqyDVML6cbBXpzM2iFRE5peq7F/qGrlooROGLa71+lAxSQSK2
Et63KTqz4XZJc3zParRrmu1bwG+eDXiLpyLOM20DGsl6LvfJtAFWrYrw7B+7BGoD
mbRh9FzZ7RzFSzow4hO1YEs08qA12+2BRKzjtfUeVT4Y7lLZ2M21OBcamvpsUAv4
At/wLVDR1Mia9PKU20PM
=WWTS
-END PGP SIGNATURE-

Changes since libreoffice-4.4.2.2:
Christian Lohmaier (1):
  Version 4.4.2.2, tag libreoffice-4.4.2.2-buildfix1

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.2.2-buildfix1' created by Christian Lohmaier 
 at 2015-03-26 12:51 -0700

Tag libreoffice-4.4.2.2-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVE/LEAAoJEPQ0oe+v7q6jWKIQAJRBmB8p1lo2wt01lP1P/rRM
yVKlbH1GsOoZ6pou4UV19XLQvsNRe6yEmh2vcHRV0XXHxBQbuMvWxueEpIAiXlDE
4pYhLUO4EyYz+3+Tymh4vx5dXDfdPV1/K9ZkQ35L9MQY0xf0aUBETk4WSK2AuM8F
7RTFpgvK09xXUdfwutA+MsnSwMAueJ7KAJ1vLEQI3rOqYW8NE5jCM+O0qBwE7IqY
wb2EF/WimlMuNckajyAJCL79bRPMTLL6CYSsEaxTDd8mch+jnGAa9uP+63GwTu9V
o98g7EKstWqL/cMDn2MCkK0LVjbIGeQmud4Ic8+EE/2DyLSY+ijeHS0OPM5ESe8U
4hOMohK33D2X4oEBI043CwnshEKx+byK70rcJi7je/WtphXsQrLyQ2/1//hZJxjc
MqcVieT1N9UApWNcX2ltCKhrkoAvd9Jkl+tXMCkOqiRAVyhnvikLs/teuyOnLVKX
pjK3MHZ6N8rMeWPLuvvhhXo213dBU5buKLLI7saDO3M/5n5UJ6ipFosctJr95auU
zytL2tUEjCPv6njwBKnAWvvTx4kJY6Lj+sWdxGLozXbcRRCvZCwPYHKWzm1/BbsR
HJNWHK9HUT8th1GGJLdpJM0ZV8B0ptBx/N7m/2o8DDGUAPgvgKOiAtQu/woHDY0N
CVx1rWVsSn/mC4JvQzbu
=iHoo
-END PGP SIGNATURE-

Changes since libreoffice-4.4.2.2:
Christian Lohmaier (1):
  Version 4.4.2.2, tag libreoffice-4.4.2.2-buildfix1

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.2.2-buildfix1' created by Christian Lohmaier 
 at 2015-03-26 12:51 -0700

Tag libreoffice-4.4.2.2-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVE/K/AAoJEPQ0oe+v7q6jXgYQALUFkPW/6MP+COQFoH5gmgRU
0LQQB3GdChKA0kfnXzchIvkuJh/kFKTlHRXEudCbYKJAd1oBXFHCejvZHF++LWxO
jqxx4cFnZzCgph3xj/5C9a2fmnRyacIyAEKIwQCq/CmGp1WM7uqS2njEIr2T88B9
poWv2D61yK/ToOOOq3r5dHn0n4CrDNOgcQl3VQXVAZ+98VL8s02sQAZhLsLxVLFY
eIscWjJzKFBhK7VdjJSsX0ovuZ3X1nLRwY8me1751YmeQXoyqq98RSXhP0kE4TWy
fj251Az3rAjjt6TZ9bRdNdFlWApC4b16kfDvhBVimSb+CNHjLj+8IF4VKvWMG92v
q07S83WtGhE2hYmlgRS3VJv2ph2DaFhqgLGkPFK/9IyGRWr9czXRnzmFWRCdNu11
VZJUopQcYBHoo15QoGW8LqRSxVmk/FUnIPTuGD3jJfZktk+o9pSn5+b3vXEU9+8i
9qtOKkl0YHUo3ag4h8vS+1NEbEJd2v7TEl3SJyadF5fq+XQhlJFsS/KtRhEt+cQD
ZA7kMyFL3zWmRN50WN372AKN54AnCOEArCxOS8r5zX26qiEqtgE728N/QWmiM5Bh
NCiRENQiWuvBEatLdqSpbLMQlOx6mLFIjUqYDJD/hWwcuwUFVsRzz4IxdnB37za6
/pOAkSPtxJbHxRKvoqJ0
=ZIdt
-END PGP SIGNATURE-

Changes since libreoffice-4.4.2.2:
Christian Lohmaier (1):
  Version 4.4.2.2, tag libreoffice-4.4.2.2-buildfix1

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 sw/qa/extras/ww8import/data/fdo68963.doc |binary
 1 file changed

New commits:
commit 4ffd96036440545a24312f170cd1c5ce79154640
Author: Christian Lohmaier 
Date:   Thu Mar 26 12:42:33 2015 +0100

fix bugdoc that wasn't cherry-picked properly

copy from 9ac4e1b0b5b3c2eab2405f6403ea9cf84252b41a, as git fails to
cherry-pick/merge itself.

Change-Id: Ie6b85546f327b92d7ea36b88eed6e5b7b068fa23

diff --git a/sw/qa/extras/ww8import/data/fdo68963.doc 
b/sw/qa/extras/ww8import/data/fdo68963.doc
index 4b331f0..b31741f 100644
Binary files a/sw/qa/extras/ww8import/data/fdo68963.doc and 
b/sw/qa/extras/ww8import/data/fdo68963.doc differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice crash

[SOS]

Piet,

first i alayw provide some information when storing not a empty array a 
you did


 Thiscomponent.storeToURL( ConvertToURL(sfile), Array( 
MakePropertyValue("FilterName", "writer8", "ReadOnly", "False" ))


and i allways do convertToURL(myURL) to been sure it's a correct URL 
(your URL seems corrrect)


Did you played around with

"storeAsURL" and "storeAToURL"

I  do the folowing check
  if fileexists(ConvertToURL(sfile)) then
Thiscomponent.storeToURL( ConvertToURL(sfile), Array( 
MakePropertyValue("FilterName", "writer8", "ReadOnly", "False"))

'bIsNewDoc = False
else
Thiscomponent.storeAsURL( ConvertToURL(sfile), Array( 
MakePropertyValue("FilterName", "writer8", "ReadOnly", "False"))

'bIsNewDoc = true
end if

Hope it helps

Fernand

On 26/03/2015 11:38, Piet van Oostrum wrote:

I am currently experimenting with programming LibreOffice through Python/UNO.
One thing I tried is to create a document, not with the loadComponentFromURL 
call from the desktop, but the route via the XLoadable interface,

After setting up the connection, getting the context, servicemanager, desktop, 
and XSCRIPTCONTEXT,
the following works:

calcdoc = 
smgr.createInstanceWithContext("com.sun.star.sheet.SpreadsheetDocument", 
context)
calcdoc.initNew() # or calcdoc.load()
sheets = calcdoc.getSheets()
sheet1 = sheets.getByName("Sheet1")

cell = sheet1.getCellByPosition(0,0)
cell.String = "Hello World"

calcdoc.storeAsURL("file:///Users/piet/TEST/LibreOffice/testcalc.ods", ())
calcdoc.close(True)

Of course I could have used
calcdoc = desktop.loadComponentFromURL("private:factory/scalc", "_blank", 0, 
());
(or with a Hidden=True property)
but I just wanted to experiment with the createInstance version.

Now the above example works perfectly. It creates the spreadsheet, and nothing 
is shown on the screen.

Now when I do this with a Writer document:

textdoc = smgr.createInstanceWithContext("com.sun.star.text.TextDocument", 
context)

LibreOffice crashes with a segmentation fault. It looks like a null pointer is 
dereferenced or stored into. It seems to be in the event loop. So maybe there 
is some pointer not properly initialized.

Here is part of the crash report (Mac OS X 10.10.2). This happens both with 
LibreOffice 4.4.1.2 from the installer package and a self-compiled master 
version.

Process:   soffice [25385]
Path:  
/Users/USER/Downloads/*/LibreOfficeDev.app/Contents/MacOS/soffice
Identifier:org.libreoffice.script
Version:   4.5.0 (0)
Code Type: X86-64 (Native)
Parent Process:bash [71305]
Responsible:   Terminal [71161]
User ID:   501

Date/Time: 2015-03-26 11:23:20.020 +0100
OS Version:Mac OS X 10.10.2 (14C1510)
Report Version:11
Anonymous UUID:0AEBB0CD-ADAB-A830-FE6A-DB114A5C4135

Sleep/Wake UUID:   6AC2711A-D840-4BA5-9661-4545A1C4ABDB

Time Awake Since Boot: 90 seconds
Time Since Wake:   8400 seconds

Crashed Thread:10

Exception Type:EXC_BAD_ACCESS (SIGSEGV)
Exception Codes:   KERN_INVALID_ADDRESS at 0x

VM Regions Near 0:
-->
 __TEXT 00010feff000-00010ff0 [4K] r-x/rwx 
SM=COW  /Users/USER/Downloads/*/LibreOfficeDev.app/Contents/MacOS/soffice

Thread 0:: Dispatch queue: com.apple.main-thread
0   libsystem_kernel.dylib  0x7fff93f494de mach_msg_trap + 10
1   libsystem_kernel.dylib  0x7fff93f4864f mach_msg + 55
2   com.apple.CoreFoundation0x7fff92a4ab34 
__CFRunLoopServiceMachPort + 212
3   com.apple.CoreFoundation0x7fff92a49ffb __CFRunLoopRun + 1371
4   com.apple.CoreFoundation0x7fff92a49858 CFRunLoopRunSpecific 
+ 296
5   com.apple.HIToolbox 0x7fff92df2aef 
RunCurrentEventLoopInMode + 235
6   com.apple.HIToolbox 0x7fff92df286a 
ReceiveNextEventCommon + 431
7   com.apple.HIToolbox 0x7fff92df26ab 
_BlockUntilNextEventMatchingListInModeWithFilter + 71
8   com.apple.AppKit0x7fff87bbcf81 _DPSNextEvent + 964
9   com.apple.AppKit0x7fff87bbc730 -[NSApplication 
nextEventMatchingMask:untilDate:inMode:dequeue:] + 194
10  libvcllo.dylib  0x000111f80ee6 
AquaSalInstance::Yield(bool, bool) + 1094
11  libvcllo.dylib  0x000111f0e0ca Application::Yield() 
+ 74
12  libvcllo.dylib  0x000111f0e065 
Application::Execute() + 37
13  libsofficeapp.dylib 0x00010ff7ea75 
desktop::Desktop::Main() + 7573
14  libvcllo.dylib  0x000111f11812 ImplSVMain() + 50
15  libvcllo.dylib  0x000111f808b4 
AquaSalInstance::handleAppDefinedEvent(NSEvent*) + 84
16  libvcllo.dylib  0x000

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 3 commits - include/vcl sc/inc sc/source

[Jan Holesovsky]

 include/vcl/ITiledRenderable.hxx |2 -
 sc/inc/docuno.hxx|3 ++
 sc/source/ui/inc/gridwin.hxx |   12 ++---
 sc/source/ui/unoobj/docuno.cxx   |   49 +++
 sc/source/ui/view/gridwin.cxx|   27 -
 sc/source/ui/view/gridwin4.cxx   |4 +--
 6 files changed, 54 insertions(+), 43 deletions(-)

New commits:
commit fe85a118bd93e5cd7c21736e5df7c72817c55c46
Author: Jan Holesovsky 
Date:   Thu Mar 26 12:33:40 2015 +0100

sc tiled editing: Implement scaling of drawings and bitmaps in Calc.

Change-Id: I1faa4608047e5a7ce30c317c72babfa44cdd808d

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index c8a9d93..0717635 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -119,7 +119,7 @@ public:
  *
  * @see lok::Document::setGraphicSelection().
  */
-virtual void setGraphicSelection(int /*nType*/, int /*nX*/, int /*nY*/) { }
+virtual void setGraphicSelection(int nType, int nX, int nY) = 0;
 
 /**
  * @see lok::Document::resetSelection().
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index a2af3b4..e826eb7 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -397,6 +397,9 @@ public:
 /// @see vcl::ITiledRenderable::setTextSelection().
 virtual void setTextSelection(int nType, int nX, int nY) SAL_OVERRIDE;
 
+/// @see vcl::ITiledRenderable::setGraphicSelection().
+virtual void setGraphicSelection(int nType, int nX, int nY) SAL_OVERRIDE;
+
 /// @see vcl::ITiledRenderable::initializeForTiledRendering().
 virtual void initializeForTiledRendering() SAL_OVERRIDE;
 };
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 7b9ec31..b72949c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -598,7 +598,6 @@ void ScModelObj::setTextSelection(int nType, int nX, int nY)
 
 // There seems to be no clear way of getting the grid window for this
 // particular document, hence we need to hope we get the right window.
-ScViewData* pViewData = ScDocShell::GetViewData();
 ScGridWindow* pGridWindow = pViewData->GetActiveWin();
 
 if (!pGridWindow)
@@ -608,6 +607,42 @@ void ScModelObj::setTextSelection(int nType, int nX, int 
nY)
 }
 }
 
+void ScModelObj::setGraphicSelection(int nType, int nX, int nY)
+{
+SolarMutexGuard aGuard;
+
+// There seems to be no clear way of getting the grid window for this
+// particular document, hence we need to hope we get the right window.
+ScViewData* pViewData = ScDocShell::GetViewData();
+ScGridWindow* pGridWindow = pViewData->GetActiveWin();
+
+int nPixelX = nX * pViewData->GetPPTX();
+int nPixelY = nY * pViewData->GetPPTY();
+
+switch (nType)
+{
+case LOK_SETGRAPHICSELECTION_START:
+{
+MouseEvent aClickEvent(Point(nPixelX, nPixelY), 1, 
MouseEventModifiers::SIMPLECLICK, MOUSE_LEFT);
+pGridWindow->MouseButtonDown(aClickEvent);
+MouseEvent aMoveEvent(Point(nPixelX + 1, nPixelY), 0, 
MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
+pGridWindow->MouseMove(aMoveEvent);
+}
+break;
+case LOK_SETGRAPHICSELECTION_END:
+{
+MouseEvent aMoveEvent(Point(nPixelX - 1, nPixelY), 0, 
MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
+pGridWindow->MouseMove(aMoveEvent);
+MouseEvent aClickEvent(Point(nPixelX, nPixelY), 1, 
MouseEventModifiers::SIMPLECLICK, MOUSE_LEFT);
+pGridWindow->MouseButtonUp(aClickEvent);
+}
+break;
+default:
+assert(false);
+break;
+}
+}
+
 void ScModelObj::initializeForTiledRendering()
 {
 SolarMutexGuard aGuard;
commit 7a6c385d2f80d1f83bb1e957f36a35060e4e7824
Author: Jan Holesovsky 
Date:   Thu Mar 26 12:00:55 2015 +0100

sc: No need for a special LogicMouseButtonUp/Down.

They were not in logic units but in pixels anyway.

Change-Id: I5b6cea13b84659c3404b38b9a19c091b41ccd3c4

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 3d4f90f..9d8965d 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -324,12 +324,6 @@ public:
 /// @see OutputDevice::LogicInvalidate().
 void LogicInvalidate(const Rectangle* pRectangle) SAL_OVERRIDE;
 
-/// Same as MouseButtonDown(), but coordinates are in logic unit.
-void LogicMouseButtonDown(const MouseEvent& rMouseEvent);
-
-/// Same as MouseButtonUp(), but coordinates are in logic unit.
-void LogicMouseButtonUp(const MouseEvent& rMouseEvent);
-
 /// Update the cell selection according to what handles have been dragged.
 /// @see vcl::ITiledRenderable::setTextSelection() for the values of nType.
 /// Coordinates are in pixels.
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 1247b78..7b9ec31 1

Crash test update

[Crashtest VM]

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


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 88dd606bf7e8818223f5b3183eeb114794eaf316
Author: Yousuf Philips 
Date:   Tue Mar 24 19:50:30 2015 +0400

tdf#87904 changing the sort arrangment of impress's sidebar tabs

Change-Id: I3cd51d216c505659a543f9136db4a4c0ea1f66c8
Reviewed-on: https://gerrit.libreoffice.org/14986
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 94e86fa..8d641b1c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -77,7 +77,7 @@
   
 
 
-  120
+  160
 
   
 
@@ -117,7 +117,7 @@
   
 
 
-  160
+  120
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/accessibility/ChildrenManagerImpl.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit f2fcf221a42a87a4604cecd1b6b29d4c20986ec0
Author: Caolán McNamara 
Date:   Thu Mar 26 11:04:52 2015 +

survive 'enable jre' dialog interrupting CreateAccessibilityObjects

Change-Id: I4395160780fc055d14554ad62c6ec757ec8dbbe1

diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx 
b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 12e4054..869c5dd 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -276,13 +276,23 @@ void ChildrenManagerImpl::Update (bool 
bCreateNewObjectsOnDemand)
 
 // 6. If children have to be created immediately and not on demand then
 // create the missing accessible objects now.
-if ( ! bCreateNewObjectsOnDemand)
-CreateAccessibilityObjects (maVisibleChildren);
+if (!bCreateNewObjectsOnDemand)
+{
+//operate on a copy of the list and restore it afterwards to guard
+//against the pathological case where maVisibleChildren gets modified
+//by other calls to this object while CreateAccessibilityObjects
+//executes which can happen when java is disabled and the "enable-java"
+//dialog appears during the instantiation of the linguistic components
+//triggered by the creation of shapes belonging to the a11y objects
+//
+//i.e. launch start-center, launch impress with java disabled and
+//a java-using linguistic component installed
+maVisibleChildren.swap(aChildList);
+CreateAccessibilityObjects(aChildList);
+maVisibleChildren.swap(aChildList);
+}
 }
 
-
-
-
 void ChildrenManagerImpl::CreateListOfVisibleShapes (
 ChildDescriptorListType& raDescriptorList)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - android/experimental

[Tomaž Vajngerl]

 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java
   |   25 +
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
|  203 ++
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
   |  199 -
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
  |  100 
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandleCanvasElement.java
 |   96 
 
android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
 |7 
 6 files changed, 331 insertions(+), 299 deletions(-)

New commits:
commit 888682c22af79dc7bc09a4f5d017f2c98bff817f
Author: Tomaž Vajngerl 
Date:   Thu Mar 26 19:55:18 2015 +0900

android: rename graphic selection and handle

Change-Id: I7bf89b92190ba37535fa89118269d706d6bf05d9

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
similarity index 80%
rename from 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
rename to 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
index a205c67..8251495 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
@@ -17,13 +17,13 @@ import android.graphics.RectF;
 import org.libreoffice.LOKitShell;
 import org.mozilla.gecko.gfx.LayerView;
 
-import static 
org.libreoffice.canvas.GraphicSelectionHandleCanvasElement.HandlePosition;
+import static org.libreoffice.canvas.GraphicSelectionHandle.HandlePosition;
 
 /**
  * This class is responsible to draw and reposition the selection
  * rectangle.
  */
-public class GraphicSelectionCanvasElement implements CanvasElement {
+public class GraphicSelection implements CanvasElement {
 private final Paint mPaint;
 public RectF mRectangle = new RectF();
 public RectF mScaledRectangle = new RectF();
@@ -31,23 +31,23 @@ public class GraphicSelectionCanvasElement implements 
CanvasElement {
 private DragType mType = DragType.NONE;
 private PointF mStartDragPosition;
 
-private GraphicSelectionHandleCanvasElement mHandles[] = new 
GraphicSelectionHandleCanvasElement[8];
-private GraphicSelectionHandleCanvasElement mDragHandle = null;
+private GraphicSelectionHandle mHandles[] = new GraphicSelectionHandle[8];
+private GraphicSelectionHandle mDragHandle = null;
 
-public GraphicSelectionCanvasElement() {
+public GraphicSelection() {
 mPaint = new Paint();
 mPaint.setStyle(Paint.Style.STROKE);
 mPaint.setColor(Color.BLACK);
 mPaint.setStrokeWidth(2);
 
-mHandles[0] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.TOP_LEFT);
-mHandles[1] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.TOP);
-mHandles[2] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.TOP_RIGHT);
-mHandles[3] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.LEFT);
-mHandles[4] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.RIGHT);
-mHandles[5] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.BOTTOM_LEFT);
-mHandles[6] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.BOTTOM);
-mHandles[7] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.BOTTOM_RIGHT);
+mHandles[0] = new GraphicSelectionHandle(HandlePosition.TOP_LEFT);
+mHandles[1] = new GraphicSelectionHandle(HandlePosition.TOP);
+mHandles[2] = new GraphicSelectionHandle(HandlePosition.TOP_RIGHT);
+mHandles[3] = new GraphicSelectionHandle(HandlePosition.LEFT);
+mHandles[4] = new GraphicSelectionHandle(HandlePosition.RIGHT);
+mHandles[5] = new GraphicSelectionHandle(HandlePosition.BOTTOM_LEFT);
+mHandles[6] = new GraphicSelectionHandle(HandlePosition.BOTTOM);
+mHandles[7] = new GraphicSelectionHandle(HandlePosition.BOTTOM_RIGHT);
 }
 
 public void reposition(RectF scaledRectangle) {
@@ -66,7 +66,7 @@ public class GraphicSelectionCanvasElement implements 
CanvasElement {
 
 public boolean contains(float x, float y) {
 // Check if handle was hit
-for (GraphicSelectionHandleCanvasElement handle : mHandles) {
+for (GraphicSelectionHandle handle : mHandles) {
 if (handle.contains(x, y)) {
 return true;
 }
@@ -80,7 +80,7 @@ public class GraphicSelectionCanvasElement implements 
CanvasElement {
 @Override
 public void draw(Canvas canvas) {
 canvas.drawRect(mDrawRecta

LibreOffice crash

[Piet van Oostrum]

I am currently experimenting with programming LibreOffice through Python/UNO.
One thing I tried is to create a document, not with the loadComponentFromURL 
call from the desktop, but the route via the XLoadable interface,

After setting up the connection, getting the context, servicemanager, desktop, 
and XSCRIPTCONTEXT,
the following works:

calcdoc = 
smgr.createInstanceWithContext("com.sun.star.sheet.SpreadsheetDocument", 
context)
calcdoc.initNew() # or calcdoc.load()
sheets = calcdoc.getSheets()
sheet1 = sheets.getByName("Sheet1")

cell = sheet1.getCellByPosition(0,0)
cell.String = "Hello World"

calcdoc.storeAsURL("file:///Users/piet/TEST/LibreOffice/testcalc.ods", ())
calcdoc.close(True)

Of course I could have used
calcdoc = desktop.loadComponentFromURL("private:factory/scalc", "_blank", 0, 
()); 
(or with a Hidden=True property)
but I just wanted to experiment with the createInstance version.

Now the above example works perfectly. It creates the spreadsheet, and nothing 
is shown on the screen.

Now when I do this with a Writer document:

textdoc = smgr.createInstanceWithContext("com.sun.star.text.TextDocument", 
context)

LibreOffice crashes with a segmentation fault. It looks like a null pointer is 
dereferenced or stored into. It seems to be in the event loop. So maybe there 
is some pointer not properly initialized.

Here is part of the crash report (Mac OS X 10.10.2). This happens both with 
LibreOffice 4.4.1.2 from the installer package and a self-compiled master 
version.

Process:   soffice [25385]
Path:  
/Users/USER/Downloads/*/LibreOfficeDev.app/Contents/MacOS/soffice
Identifier:org.libreoffice.script
Version:   4.5.0 (0)
Code Type: X86-64 (Native)
Parent Process:bash [71305]
Responsible:   Terminal [71161]
User ID:   501

Date/Time: 2015-03-26 11:23:20.020 +0100
OS Version:Mac OS X 10.10.2 (14C1510)
Report Version:11
Anonymous UUID:0AEBB0CD-ADAB-A830-FE6A-DB114A5C4135

Sleep/Wake UUID:   6AC2711A-D840-4BA5-9661-4545A1C4ABDB

Time Awake Since Boot: 90 seconds
Time Since Wake:   8400 seconds

Crashed Thread:10

Exception Type:EXC_BAD_ACCESS (SIGSEGV)
Exception Codes:   KERN_INVALID_ADDRESS at 0x

VM Regions Near 0:
--> 
__TEXT 00010feff000-00010ff0 [4K] r-x/rwx 
SM=COW  /Users/USER/Downloads/*/LibreOfficeDev.app/Contents/MacOS/soffice

Thread 0:: Dispatch queue: com.apple.main-thread
0   libsystem_kernel.dylib  0x7fff93f494de mach_msg_trap + 10
1   libsystem_kernel.dylib  0x7fff93f4864f mach_msg + 55
2   com.apple.CoreFoundation0x7fff92a4ab34 
__CFRunLoopServiceMachPort + 212
3   com.apple.CoreFoundation0x7fff92a49ffb __CFRunLoopRun + 1371
4   com.apple.CoreFoundation0x7fff92a49858 CFRunLoopRunSpecific 
+ 296
5   com.apple.HIToolbox 0x7fff92df2aef 
RunCurrentEventLoopInMode + 235
6   com.apple.HIToolbox 0x7fff92df286a 
ReceiveNextEventCommon + 431
7   com.apple.HIToolbox 0x7fff92df26ab 
_BlockUntilNextEventMatchingListInModeWithFilter + 71
8   com.apple.AppKit0x7fff87bbcf81 _DPSNextEvent + 964
9   com.apple.AppKit0x7fff87bbc730 -[NSApplication 
nextEventMatchingMask:untilDate:inMode:dequeue:] + 194
10  libvcllo.dylib  0x000111f80ee6 
AquaSalInstance::Yield(bool, bool) + 1094
11  libvcllo.dylib  0x000111f0e0ca Application::Yield() 
+ 74
12  libvcllo.dylib  0x000111f0e065 
Application::Execute() + 37
13  libsofficeapp.dylib 0x00010ff7ea75 
desktop::Desktop::Main() + 7573
14  libvcllo.dylib  0x000111f11812 ImplSVMain() + 50
15  libvcllo.dylib  0x000111f808b4 
AquaSalInstance::handleAppDefinedEvent(NSEvent*) + 84
16  libvcllo.dylib  0x000111fb65b1 -[VCL_NSApplication 
sendEvent:] + 321
17  com.apple.AppKit0x7fff87bb0608 -[NSApplication run] 
+ 711
18  com.apple.AppKit0x7fff87b9ba14 NSApplicationMain + 
1832
19  libvcllo.dylib  0x000111f7fc09 ImplSVMainHook(int*) 
+ 329
20  libvcllo.dylib  0x000111f123fa SVMain() + 26
21  libsofficeapp.dylib 0x00010ffa9bc0 soffice_main + 224
22  org.libreoffice.script  0x00010fefff20 main + 16
23  libdyld.dylib   0x7fff86dc25c9 start + 1

-- 
Piet van Oostrum 
WWW: http://pietvanoostrum.com/
PGP key: [8DAE142BE17999C4]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 3 commits - android/experimental

[Tomaž Vajngerl]

 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
   |  146 +-
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandleCanvasElement.java
 |   63 +++-
 
android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
 |  129 +---
 3 files changed, 197 insertions(+), 141 deletions(-)

New commits:
commit 28a19256aeef3431bedc9b3cc62171963ecefdc9
Author: Tomaž Vajngerl 
Date:   Thu Mar 26 19:29:41 2015 +0900

android: fix handle and selection behaviour, clean-up

Change-Id: I1f4404b1beb8dc3d5f64c21443c8e50cefe6fc63

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
index 39b2fe0..909d808 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
@@ -9,6 +9,7 @@
 package org.libreoffice.canvas;
 
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PointF;
 import android.graphics.RectF;
@@ -16,12 +17,14 @@ import android.graphics.RectF;
 import org.libreoffice.LOKitShell;
 import org.mozilla.gecko.gfx.LayerView;
 
+import static 
org.libreoffice.canvas.GraphicSelectionHandleCanvasElement.HandlePosition;
+
 /**
  * This class is responsible to draw and reposition the selection
  * rectangle.
  */
 public class GraphicSelectionCanvasElement {
-private final Paint mGraphicSelectionPaint;
+private final Paint mPaint;
 public RectF mRectangle = new RectF();
 public RectF mScaledRectangle = new RectF();
 private RectF mDrawRectangle = new RectF();
@@ -31,17 +34,20 @@ public class GraphicSelectionCanvasElement {
 private GraphicSelectionHandleCanvasElement mHandles[] = new 
GraphicSelectionHandleCanvasElement[8];
 private GraphicSelectionHandleCanvasElement mDragHandle = null;
 
-public GraphicSelectionCanvasElement(Paint graphicSelectionPaint) {
-mGraphicSelectionPaint = graphicSelectionPaint;
-
-mHandles[0] = new 
GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
-mHandles[1] = new 
GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
-mHandles[2] = new 
GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
-mHandles[3] = new 
GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
-mHandles[4] = new 
GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
-mHandles[5] = new 
GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
-mHandles[6] = new 
GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
-mHandles[7] = new 
GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
+public GraphicSelectionCanvasElement() {
+mPaint = new Paint();
+mPaint.setStyle(Paint.Style.STROKE);
+mPaint.setColor(Color.BLACK);
+mPaint.setStrokeWidth(2);
+
+mHandles[0] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.TOP_LEFT);
+mHandles[1] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.TOP);
+mHandles[2] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.TOP_RIGHT);
+mHandles[3] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.LEFT);
+mHandles[4] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.RIGHT);
+mHandles[5] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.BOTTOM_LEFT);
+mHandles[6] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.BOTTOM);
+mHandles[7] = new 
GraphicSelectionHandleCanvasElement(HandlePosition.BOTTOM_RIGHT);
 }
 
 public void reposition(RectF scaledRectangle) {
@@ -69,13 +75,9 @@ public class GraphicSelectionCanvasElement {
 }
 
 public void draw(Canvas canvas) {
-canvas.drawRect(mDrawRectangle, mGraphicSelectionPaint);
+canvas.drawRect(mDrawRectangle, mPaint);
 for (GraphicSelectionHandleCanvasElement handle : mHandles) {
-if (mType == DragType.MOVE || mType == DragType.EXTEND) {
-handle.drawSelected(canvas);
-} else {
-handle.draw(canvas);
-}
+handle.draw(canvas);
 }
 }
 
@@ -85,6 +87,7 @@ public class GraphicSelectionCanvasElement {
 for (GraphicSelectionHandleCanvasElement handle : mHandles) {
 if (handle.contains(position.x, position.y)) {
 mDragHandle = handle;
+mDragHandle.select();
 mType = DragType.EXTEND;
 sendGraphicSelectionStart(handle.mPosition);
 }
@@ -99,15 +102,47 @@ public class GraphicSelectionCanvasElement {
 

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

[Yousuf Philips]

 sc/source/ui/src/popup.src|   79 --
 sd/source/ui/app/menuids_tmpl.src |  162 --
 sd/source/ui/app/popup.src|   10 --
 sw/source/ui/app/mn.src   |   96 --
 4 files changed, 347 deletions(-)

New commits:
commit 2df3522a5159baa1c9d55e52adbfeba7eae76955
Author: Yousuf Philips 
Date:   Tue Mar 24 09:36:42 2015 +0400

tdf#86606 remove direct formatting entries from context menu

Change-Id: I57ec4cb36aa0e3a921653d337bcf5029fc5d3fc8
Reviewed-on: https://gerrit.libreoffice.org/14979
Tested-by: Yousuf Philips 
Reviewed-by: Yousuf Philips 

diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 82268dd..16b88c3 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -365,85 +365,6 @@ Menu RID_POPUP_EDIT
 
 MenuItem { Separator = TRUE ; };
 
-MenuItem // Menu-Controller
- // Menu-Controller
- // Menu-Controller
- // Menu-Controller
-{
-ITEM_FORMAT_ATTR_CHAR_FONT
-};
-MenuItem // Menu-Controller
- // Menu-Controller
- // Menu-Controller
- // Menu-Controller
-{
-ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT
-};
-MenuItem
-{
-Text [ en-US ] = "Style" ;
-Identifier = RID_MN_FORMAT_STYLE ;
-HelpID = HID_MN_FORMAT_STYLE ;
-SubMenu = Menu
-{
-ItemList =
-{
-MenuItem
-{
-ITEM_FORMAT_ATTR_CHAR_WEIGHT
-};
-MenuItem
-{
-ITEM_FORMAT_ATTR_CHAR_POSTURE
-};
-MenuItem
-{
-ITEM_FORMAT_ATTR_CHAR_OVERLINE
-};
-MenuItem
-{
-ITEM_FORMAT_ATTR_CHAR_UNDERLINE
-};
-MenuItem
-{
-Identifier = SID_ULINE_VAL_DOUBLE ;
-HelpID = CMD_SID_ULINE_VAL_DOUBLE ;
-Text [ en-US ] = "Do~uble Underline" ;
-};
-MenuItem
-{
-ITEM_FORMAT_ATTR_CHAR_STRIKEOUT
-};
-MenuItem
-{
-ITEM_FORMAT_ATTR_CHAR_SHADOWED
-};
-MenuItem
-{
-ITEM_FORMAT_ATTR_CHAR_CONTOUR
-};
-MenuItem
-{
-Separator = TRUE ;
-};
-MenuItem
-{
-Identifier = SID_SET_SUPER_SCRIPT ;
-HelpID = CMD_SID_SET_SUPER_SCRIPT ;
-Text [ en-US ] = "Su~perscript" ;
-};
-MenuItem
-{
-Identifier = SID_SET_SUB_SCRIPT ;
-HelpID = CMD_SID_SET_SUB_SCRIPT ;
-Text [ en-US ] = "Su~bscript" ;
-};
-};
-};
-};
-
-MenuItem { Separator = TRUE ; };
-
 MenuItem
 {
 Text [ en-US ] = "Insert Fields" ;
diff --git a/sd/source/ui/app/menuids_tmpl.src 
b/sd/source/ui/app/menuids_tmpl.src
index 0c8aa1d..cea91ed 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -406,125 +406,6 @@
 Text [ en-US ] = "P~aragraph...";\
 };
 
-#define MN_TEXT_ATTR\
-MenuItem\
-{\
-Identifier = SID_ATTR_CHAR_FONT ; \
-HelpId = CMD_SID_ATTR_CHAR_FONT ; \
-Text [ en-US ] = "~Font" ; \
-};\
-MenuItem\
-{\
-Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \
-HelpId = CMD_SID_ATTR_CHAR_FONTHEIGHT ; \
-Text [ en-US ] = "~Size" ; \
-};\
-MenuItem\
-{\
-Identifier = DUMMY ; \
-Command = ".uno:StyleMenu" ; \
-Text [ en-US ] = "St~yle" ; \
-SubMenu = Menu\
-{\
-ItemList = \
-{\
-MenuItem\
-{\
-Identifier = SID_ATTR_CHAR_WEIGHT ; \
-HelpId = CMD_SID_ATTR_CHAR_WEIGHT ; \
-Text [ en-US ] = "Bold" ; \
-};\
-MenuItem\
-{\
-Identifier = SID_ATTR_CHAR_POSTURE ; \
-HelpId = CMD_SID_ATTR_CHAR_POSTURE ; \
-Text [ en-US ] = "Italic" ; \
-};\
-MenuItem\
-{\
-Identifier = SID_ATTR_CHAR_OVERLINE ; \
-HelpId = CMD_SID_ATTR_

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

[Stephan Bergmann]

 compilerplugins/clang/constantfunction.cxx |6 --
 vcl/unx/gtk/window/gtksalframe.cxx |2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ca39d8fe038af6a07189838652713fc5a6296f7d
Author: Stephan Bergmann 
Date:   Thu Mar 26 10:53:57 2015 +0100

loplugin:cstylecast

Change-Id: Ia04113c52787aa7498ba11864313a39caa1c1d22

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx 
b/vcl/unx/gtk/window/gtksalframe.cxx
index 0c5ff07..36a780b 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -993,7 +993,7 @@ void GtkSalFrame::InitCommon()
 GtkGesture *pSwipe = gtk_gesture_swipe_new(m_pWindow);
 g_signal_connect(pSwipe, "swipe", G_CALLBACK(gestureSwipe), this);
 gtk_event_controller_set_propagation_phase(GTK_EVENT_CONTROLLER (pSwipe), 
GTK_PHASE_TARGET);
-g_object_weak_ref(G_OBJECT(m_pWindow), (GWeakNotify)g_object_unref, 
pSwipe);
+g_object_weak_ref(G_OBJECT(m_pWindow), 
reinterpret_cast(g_object_unref), pSwipe);
 #endif
 
 #else
commit 1f1ce7e01ad7470de475f346e939757dbb1151f7
Author: Stephan Bergmann 
Date:   Thu Mar 26 10:52:35 2015 +0100

loplugin:constantfunction: vcl/unx/gtk3

Change-Id: I66ffc0c3a73d45e9d4b54f46092a65913b753d26

diff --git a/compilerplugins/clang/constantfunction.cxx 
b/compilerplugins/clang/constantfunction.cxx
index 4ca710f..4f367fc 100644
--- a/compilerplugins/clang/constantfunction.cxx
+++ b/compilerplugins/clang/constantfunction.cxx
@@ -405,8 +405,10 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 return true;
 }
 // vcl/unx/gtk3 re-using vcl/unx/gtk:
-if (aFunctionName == "GtkData::initNWF"
-|| aFunctionName == "GtkSalFrame::EnsureAppMenuWatch")
+if (aFunctionName == "DeInitAtkBridge"
+|| aFunctionName == "GtkData::initNWF"
+|| aFunctionName == "GtkSalFrame::EnsureAppMenuWatch"
+|| aFunctionName == "InitAtkBridge")
 {
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 90222] replace ScaList in scaddins with a std container

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=90222

--- Comment #4 from Pieter Adriaensen  ---
I pushed a patch to gerrit

https://gerrit.libreoffice.org/#/c/15012/
tdf#90222: replace ScaList in scaddins with a std container

I still have a question though: The ScaList is always used to put data of the
same class in. So isn't it better to change it to vector instead of being a
vector and doing static_casts?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 compilerplugins/clang/constantfunction.cxx |   10 ++
 vcl/inc/unx/gtk/gtkdata.hxx|4 +---
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 6409db7838751a3671485f035b9f975eb5ca23f2
Author: Stephan Bergmann 
Date:   Thu Mar 26 10:30:26 2015 +0100

loplugin:constantfunction: vcl/unx/gtk3

Change-Id: Ieedf89bebb59e783dfe13ef2d5ae7ba3347cdc62

diff --git a/compilerplugins/clang/constantfunction.cxx 
b/compilerplugins/clang/constantfunction.cxx
index c89e6b7..4ca710f 100644
--- a/compilerplugins/clang/constantfunction.cxx
+++ b/compilerplugins/clang/constantfunction.cxx
@@ -128,6 +128,10 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 if (aFileName == SRCDIR "/filter/source/svg/svgreader.cxx") {
 return true;
 }
+// vcl/unx/gtk3 re-using vcl/unx/gtk:
+if (aFileName.find("/../../gtk/") != std::string::npos) {
+return true;
+}
 // used by code generated by python
 if (getFilename(pFunctionDecl->getCanonicalDecl()->getLocStart()) == 
SRCDIR "/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx") {
 return true;
@@ -400,6 +404,12 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 if (aFunctionName == "SwVectorModifyBase::dumpAsXml") {
 return true;
 }
+// vcl/unx/gtk3 re-using vcl/unx/gtk:
+if (aFunctionName == "GtkData::initNWF"
+|| aFunctionName == "GtkSalFrame::EnsureAppMenuWatch")
+{
+return true;
+}
 
 // can't mess with the TYPEINIT macros in include/tools/rtti.hxx or the 
LINK macros in include/tools/link.hxx
 std::string aImmediateMacro = "";
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index e270204..416b583 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -176,9 +176,7 @@ public:
 
 virtual void PostUserEvent() SAL_OVERRIDE;
 
-#if GTK_CHECK_VERSION(3,0,0)
-guint32 GetLastUserEventTime( bool /* b */ ) { return GDK_CURRENT_TIME; } 
// horrible hack
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
 virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE;
 #endif
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/cmdevt.hxx   |   30 ++-
 sd/source/ui/inc/slideshow.hxx   |2 
 sd/source/ui/slideshow/slideshow.cxx |5 +
 sd/source/ui/slideshow/slideshowimpl.cxx |   21 +++
 sd/source/ui/slideshow/slideshowimpl.hxx |1 
 sd/source/ui/view/viewshel.cxx   |   10 +++
 vcl/inc/salwtype.hxx |   10 +++
 vcl/inc/unx/gtk/gtkframe.hxx |3 +
 vcl/source/window/winproc.cxx|   83 +--
 vcl/unx/gtk/window/gtksalframe.cxx   |   30 +++
 10 files changed, 178 insertions(+), 17 deletions(-)

New commits:
commit 903a420609252aff12d9481b5fd8cc8d1f1d445f
Author: Caolán McNamara 
Date:   Mon Mar 23 21:07:10 2015 +

add GtkSwipeGesture support and implement swipe left/right to change slides

keep it simple for now.

deliver to the same target window that gets the MouseWheel events, maybe 
worth combining
MouseWheel and Gestures into the same thing

and use it in slideshows so swipe toward the left to advance to the next 
slide,
to the right to return to the previous slide.

swipes are followed by mouse up events, impress already has a similar hack
to hide an mouse-up from the (incredibly complicated) interaction with
the slideshow so simply use that

Change-Id: Ib34f6fa0f15f3aa34eef887eb9d5642de9e5cdd1

diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx
index 6e85c1e..8e62e25 100644
--- a/include/vcl/cmdevt.hxx
+++ b/include/vcl/cmdevt.hxx
@@ -336,10 +336,26 @@ inline 
CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart,
 mnEnd = nEnd;
 }
 
+class VCL_DLLPUBLIC CommandSwipeData
+{
+double mnVelocityX;
+double mnVelocityY;
+public:
+CommandSwipeData()
+: mnVelocityX(0)
+, mnVelocityY(0)
+{
+}
+CommandSwipeData(double nVelocityX, double nVelocityY)
+: mnVelocityX(nVelocityX)
+, mnVelocityY(nVelocityY)
+{
+}
+double getVelocityX() const { return mnVelocityX; }
+double getVelocityY() const { return mnVelocityY; }
+};
 
 // - CommandEvent -
-
-
 #define COMMAND_CONTEXTMENU ((sal_uInt16)1)
 #define COMMAND_STARTDRAG   ((sal_uInt16)2)
 #define COMMAND_WHEEL   ((sal_uInt16)3)
@@ -359,7 +375,7 @@ inline 
CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart,
 #define COMMAND_SELECTIONCHANGE ((sal_uInt16)18)
 #define COMMAND_PREPARERECONVERSION ((sal_uInt16)19)
 #define COMMAND_QUERYCHARPOSITION   ((sal_uInt16)20)
-
+#define COMMAND_SWIPE   ((sal_uInt16)21)
 
 class VCL_DLLPUBLIC CommandEvent
 {
@@ -387,6 +403,7 @@ public:
 const CommandDialogData*GetDialogData() const;
   CommandMediaData* GetMediaData() const;
 const CommandSelectionChangeData*   GetSelectionChangeData() const;
+const CommandSwipeData* GetSwipeData() const;
 };
 
 inline CommandEvent::CommandEvent()
@@ -469,6 +486,13 @@ inline const CommandSelectionChangeData* 
CommandEvent::GetSelectionChangeData()
 return NULL;
 }
 
+inline const CommandSwipeData* CommandEvent::GetSwipeData() const
+{
+if( mnCommand == COMMAND_SWIPE )
+return (const CommandSwipeData*)(mpData);
+else
+return NULL;
+}
 
 #endif // INCLUDED_VCL_CMDEVT_HXX
 
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index f4cc6c2..d6ef3ae 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -52,6 +52,7 @@ class Rectangle;
 namespace vcl { class Window; }
 class SfxRequest;
 class WorkWindow;
+class CommandSwipeData;
 struct ImplSVEvent;
 
 // TODO: Remove
@@ -154,6 +155,7 @@ public:
 /** sets or clears the pause state of the running slideshow.
  This should only be called by the SdShowWindow */
 bool pause( bool bPause );
+bool swipe(const CommandSwipeData &rSwipeData);
 
 // settings
 bool isFullScreen();// a.k.a. 
FuSlideShow::IsFullScreen()
diff --git a/sd/source/ui/slideshow/slideshow.cxx 
b/sd/source/ui/slideshow/slideshow.cxx
index ff04b30..cfcf5e3 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1059,6 +1059,11 @@ bool SlideShow::isDrawingPossible()
 return mxController.is() && mxController->getUsePen();
 }
 
+bool SlideShow::swipe(const CommandSwipeData& rSwipeData)
+{
+return mxController.is() && mxController->swipe(rSwipeData);
+}
+
 void SlideShow::StartInPlacePresentationConfigurationCallback()
 {
 if( mnInPlaceConfigEvent != 0 )
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index b4220e2..fdbff3f 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1109,6 +1109,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< 
beans::PropertyVal

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.2.2' created by Christian Lohmaier 
 at 2015-03-26 09:56 -0700

Tag libreoffice-4.4.2.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVE8muAAoJEPQ0oe+v7q6jF9wP/0MBReDq+dC2XIFO4g9fvo2i
EdfFaqhx3T3mTl+zb32b1cYjnsZ1emGs4WvpnLmWjje36xPzOskyjUwK2bmSSI2G
f/us0WifYDYwxRS6GaTRvkOGLgUG9jxalFLhmTwoDn0uxHimWfPt78nDussz52qj
oBNGNXofO+myJA1D7CpKmDjdcZefvyvC/3BcySmNRLYYxWIuFOsViXzWWC3D+laW
Ojlr2qQm1Mz65oooCsrpldidPMP8E9c3kuaaSunZ03jwjq7P9kK6OqofKzSKtSrK
exVnbN4yQ6eoepfI5qvzwr50NksVLRl0Wb4lquxYndQmNixRqed62kxZiVei7/26
JR8XFg3k3n4aEUWsR6ydF0XJktGF9yTxI3WZvUf8cQILi6lIttXUa2e8bBT+xiTO
s+4Qcyy8Yj9a8+HUuLMxmEVSAsZU3SA581v0VLAN5A3TRIJOgVeoNwyn9zI1N2Ci
4iOcDVD2tlnNYuWeYMWmm/0+eksZ9JAAW+y5zbmA5BfwRsf0Er8+aSY8aif1DleR
GdxVZ8xU7GBV5D2+ADcLV8sHIGMlHSrVpBWRUNkF2aj5LKfOsIsjFhXqdzUxSeh0
b5tRAZUWok+QG/+pAKHs5vbB+3w+qbN8aAYmjzAylLhMewxRpAM38xHIEK/3StAN
giFCDQBhRJL+tLXJSXS0
=FamG
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.2.2' created by Christian Lohmaier 
 at 2015-03-26 09:56 -0700

Tag libreoffice-4.4.2.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVE8myAAoJEPQ0oe+v7q6jw/IQAInpEWh51daMnRwxhNwkWE6w
FVBSPEut2Uu4wkzMLKl8rInWmNJ+jLVB/yORsBQfrX/ODXLbH0jhL0WdbLtzhLoG
5aa3ZOKSy4T7cULj/yKQwlPcNsFu5DZbzhCG6C63ajoeP8G7mjcZccHi2Cd4p+Sd
ZMKuJiPU6F2ElZSFCDp1F8aJUnibUyQ2d/9lqotnWpvndds61RLbCsM92ViXqWU0
Bozf1LSG2CIgN/DUB0FROdVg3XqT5u/A2LqC7hDHP6HBtFWmlXXWtcx1etqxoPLP
dzcO5mMxIh2hduivDRJ5JKh+GkcC27gxpFAfw5ofHrRI2oZHQcySY0khw2aV4L4R
vMrphYpZYETUaz7e6kdmGpfLzZOmJeg8qCiOTgVDjFFSLzdIwcVQ0IouKYkae8Bu
+VMeY5l/boxKleahhTMqgCvgTvJeLOKOFkFsS38WR6OaqSnNqUNMiA6edssGL4so
R+DY0sI6TCrHsI9UU6EMJqLhU76GFyH+oO3KVgRdA9wENsYa+0BUejDzD9xwu+GR
A/riQsDlFsrXWjydIHDJNz7ZgBM11cUFIZxUJi5O4GwJDo/FFk5UeftpJN214FJu
gx4zgJSugoxj1P3hDh/v0/w1RR0m2AyrvfBwRi31GL0434B+nQ3FIYRMxQIcUcaU
g7RG1a+R3jPliRxDZCnH
=6cjW
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.2.2' created by Christian Lohmaier 
 at 2015-03-26 09:56 -0700

Tag libreoffice-4.4.2.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVE8mnAAoJEPQ0oe+v7q6joYQQAMgzUSqgYlsUrVf6YTdWrykY
5ArLBSfMOZCcavrVYroZa6LkuqfsZbY6fNXY+5saw2kWszKq4jE55achK0385+lj
A7pyOGO9IeSdeNfaZwKzRUU6gj3MrdYIaqwJTo99VxAkgsOCBBnL2IHhBFuuksOp
bqahAXiweI+kcKI0NnED/tZBV19tSwggAsvW41bhIPECEQOgnfykPrZv1YRvJXX/
vlag+UKvVw1LRO4lA9SgNeAw32mqfPT3bY48mWxDOHbbsaYzrukT8NDHkCILfUxO
ANpmiyJZX8jPT2KsYoUHcwIAdtcCVQGkxbts1xhUEjwz6j9TUne/SXUpJxeSSqKh
IqkVIl+BuQgZUCOaTZ3R6X1yvkTOuOieU7DmYctnt+rWBwbiuI2tAbPQB3DtQNbH
k9gzY5Te0j5MCJxIlqvi7Kt1LQcxbeZZQNaNG5PPMITHM/J4VptdzJeL067efkKn
HrEqlzYV/UV4NI5RZolRpnEhVr3mF5ScRaSef6hSm4NZ5lryi6RsjZLFsAweTopz
SVpYG8Dpr8zOOR606POFU/CaObF7lqHHn2sEnBZ79X3Bsh/1/pV6M2KB8zW9/OjU
6UxjvtISN5c0FvR2CwdIeYs5mjeUnPUfWrSHrtNkGmiGDGEK6N3F4LztD3BpsmWW
Jof0Zd77NGNTdcmVXTPj
=DIbF
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.2.2' created by Christian Lohmaier 
 at 2015-03-26 09:56 -0700

Tag libreoffice-4.4.2.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVE8mrAAoJEPQ0oe+v7q6jl10QALbaRcL+lpqUuRz1ax2Xlbh5
tB1Zkn3CWWSnQxnrcJ5tGI52AwxZp+pCmHFa9Nn8lDXGUSznK86bLy+qyX2frqDv
MQotMB6oTFJo0SpRH4AOXVdw8SunzBaLX+7O05mHnpY+QB+lDKaWlnydsFfOPXYJ
AkSM/7c9MOr+JsGHrAA2K/0wvAEO6L0WzplC2y7UeaqEoC26RXMIePm0Lgqz6Uve
vLuwtWIC0NWWKvYLraSYOeuyvL+j7Zod+LXRYxK2Zrp/CNZQ5e7xPNUH5suFgsHb
7BrXRVAR+ZsV33DqrqdFTUOlu7we7AVX9vWM0KeW+odkKUH/m3wicQVsva3nj6h9
kQmlF1X0foYpQTC0KELAvwlpR98EuZOEhx71nWmFvV14B9J9xb+pOS8B0xoPRiW7
HD4g9PfFtzq+Xr3zEd30PRlpbvZ4oO3T4lOJ3Yjvyux98m2GqXG3K0+Sh/3TUjw6
L2YyE8q7+9L7BmFK6LPACoeAO3Ixb6DjcTZT2U7a2jtcYxqwi/t4M35+XOj+iSri
hXA7eNwIiUe6E3IHlgYIQ1Bk41G2EqCQcwg93xAHvh37YHAf2oAfCP6374xVr9tT
1AssC1P/SV86ySoHCemEGoQB/cHL+Sft6vut7pMFjjH4y/eb826DVFl+foz2N7Ue
7hMuVFwJbBacyCLQ8mi6
=ocEe
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

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

New commits:
commit a22dff5a4fd676f1035069f1d26dc30179b86d77
Author: Christian Lohmaier 
Date:   Thu Mar 26 09:56:56 2015 +0100

bump product version to 4.4.2.2.0+

Change-Id: Id5a1010e33eabc0a7dcf11616aebe2f8674d2002

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

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 90010, which changed state.

Bug 90010 Summary: Images embedded in password protected document are lost on 
save
https://bugs.documentfoundation.org/show_bug.cgi?id=90010

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-2' - package/source

[Matúš Kukan]

 package/source/zippackage/ZipPackageStream.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9ae9434662a9165aa31575448bc577e4b48db753
Author: Matúš Kukan 
Date:   Wed Mar 25 21:35:55 2015 +0100

tdf#90010 Partially revert "package: Do not bother with deflating jpeg 
images"

This reverts commit 0843ade74e5848c0babad509b10c334b01847be2 for the case, 
when
the document is protected by password. Would be nice to fix properly later.

Change-Id: If159639d6f74de4e106e9dad382faac9d5de4a09
(cherry picked from commit ca5ff4559726455d0c8fbdd08cb35af3308492bf)
Reviewed-on: https://gerrit.libreoffice.org/15006
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 
(cherry picked from commit da651b6ccb47e82f71d890fc8bb9d6cf0201f289)
Reviewed-on: https://gerrit.libreoffice.org/15010
Reviewed-by: Markus Mohrhard 
Reviewed-by: Miklos Vajna 
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index e22b234..c34ba01 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -775,7 +775,8 @@ bool ZipPackageStream::saveChild(
 
 uno::Reference< io::XSeekable > xSeek(xStream, uno::UNO_QUERY);
 // It's not worth to deflate jpegs to save ~1% in a slow process
-if (xSeek.is() && msMediaType.endsWith("/jpeg"))
+// Unfortunately, does not work for streams protected by password
+if (xSeek.is() && msMediaType.endsWith("/jpeg") && !m_bToBeEncrypted)
 {
 ImplSetStoredData(*pTempEntry, xStream);
 xSeek->seek(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC IDEA- AUTOMATED ERROR CHECKING IN CALC

[rajat vijay]

Dear MARKUS,
Sir,
Here is a list of my ideas:
> In the "data validation" feature, add two new types in the "Allow" list
namely
1- "Customized". This feature will will allow the user to perform data
validation with reference to formulas.
2- "Units". This feature will let the user associate an unit with a
particular cell or a range. The "Data" field will have a list of units
namely-meter, seconds, and most of the other scientific units.
> Detecting an EMPTY cell in the range for formula, where the user put a
cell range as an argument.
> Adding different currencies error


Here are two more errors that i would like to implement--
> Calculation error on numbers formatted as text or preceded by an
apostrophe
> Warning for a formulas inconsistent with other formulas in the region

Your guidance with code pointers on implementing the above these will be a
great help !!!

Yours sincerely
RAJAT VIIJAY

On Thu, Mar 26, 2015 at 2:14 PM, rajat vijay  wrote:

> Dear MARKUS ,
> Please let me know the format of the proposal to be submitted as the 27
> march is the last date.
> The topic is "AUTOMATED ERROR CHECKING IN CALC" FOR GSoC 2K15.
>
> I am working on the easy hack "Currency Dropdown Menu", you can also
> confirm my work from there.
>
> I have already mailed you my ideas including the ones of my own.
>
> Yours Sincerely
> RAJAT VIJAY
>
>
> On Wed, Mar 25, 2015 at 10:16 PM, rajat vijay 
> wrote:
>
>> Sir,
>> Here are two more errors that i would like to implement--
>> > Calculation error on numbers formatted as text or preceded by an
>> apostrophe
>> > Warning for a formulas inconsistent with other formulas in the region
>>
>> Your guidance with code pointers on implementing the above these will be
>> a great help !!!
>>
>> Yours sincerely
>> RAJAT VIIJAY
>>
>> On Wed, Mar 25, 2015 at 9:37 PM, rajat vijay 
>> wrote:
>>
>>> Sir,
>>> Here is a list of my ideas:
>>> > In the "data validation" feature, add two new types in the "Allow"
>>> list namely
>>> 1- "Customized". This feature will will allow the user to perform data
>>> validation with reference to formulas.
>>> 2- "Units". This feature will let the user associate an unit with a
>>> particular cell or a range. The "Data" field will have a list of units
>>> namely-meter, seconds, and most of the other scientific units.
>>> > Detecting an EMPTY cell in the range for formula, where the user put a
>>> cell range as an argument.
>>> > Adding different currencies error
>>>
>>>
>>> On Wed, Mar 25, 2015 at 6:32 PM, Wols Lists 
>>> wrote:
>>>
 On 24/03/15 18:25, Markus Mohrhard wrote:
 > As Eike mentioned that is not the idea behind this task. The task
 would
 > be to integrate correct currency handling (that you show a
 warning/error
 > when you try to sum across different currencies e.g. EURO + DOLLAR).
 For
 > this the first requirement is most likely to get the unit feature
 branch
 > merged into master (it also requires some more work before merging can
 > be considered).

 And to my mind (I worked for a trade association that handled
 calculations in most currencies - from Sterling to Italian and Turkish
 lire, and hyperinflation currencies like Zimbabwe) the idea of automatic
 conversion is actually extremely dangerous.

 Quite often it's an end-user requirement to use x dp (can be a daft
 requirement) or x sf (we used 4sf, the eurozone had a LEGAL obligation
 to use 6 back in the day). And if you're dealing with a Zimbabwe or the
 like, do you really want to use today's exchange rate on yesterday's
 transaction?

 Cheers,
 Wol

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

Re: GSoC IDEA- AUTOMATED ERROR CHECKING IN CALC

[rajat vijay]

Dear MARKUS ,
Please let me know the format of the proposal to be submitted as the 27
march is the last date.
The topic is "AUTOMATED ERROR CHECKING IN CALC" FOR GSoC 2K15.

I am working on the easy hack "Currency Dropdown Menu", you can also
confirm my work from there.

I have already mailed you my ideas including the ones of my own.

Yours Sincerely
RAJAT VIJAY


On Wed, Mar 25, 2015 at 10:16 PM, rajat vijay  wrote:

> Sir,
> Here are two more errors that i would like to implement--
> > Calculation error on numbers formatted as text or preceded by an
> apostrophe
> > Warning for a formulas inconsistent with other formulas in the region
>
> Your guidance with code pointers on implementing the above these will be a
> great help !!!
>
> Yours sincerely
> RAJAT VIIJAY
>
> On Wed, Mar 25, 2015 at 9:37 PM, rajat vijay 
> wrote:
>
>> Sir,
>> Here is a list of my ideas:
>> > In the "data validation" feature, add two new types in the "Allow" list
>> namely
>> 1- "Customized". This feature will will allow the user to perform data
>> validation with reference to formulas.
>> 2- "Units". This feature will let the user associate an unit with a
>> particular cell or a range. The "Data" field will have a list of units
>> namely-meter, seconds, and most of the other scientific units.
>> > Detecting an EMPTY cell in the range for formula, where the user put a
>> cell range as an argument.
>> > Adding different currencies error
>>
>>
>> On Wed, Mar 25, 2015 at 6:32 PM, Wols Lists 
>> wrote:
>>
>>> On 24/03/15 18:25, Markus Mohrhard wrote:
>>> > As Eike mentioned that is not the idea behind this task. The task would
>>> > be to integrate correct currency handling (that you show a
>>> warning/error
>>> > when you try to sum across different currencies e.g. EURO + DOLLAR).
>>> For
>>> > this the first requirement is most likely to get the unit feature
>>> branch
>>> > merged into master (it also requires some more work before merging can
>>> > be considered).
>>>
>>> And to my mind (I worked for a trade association that handled
>>> calculations in most currencies - from Sterling to Italian and Turkish
>>> lire, and hyperinflation currencies like Zimbabwe) the idea of automatic
>>> conversion is actually extremely dangerous.
>>>
>>> Quite often it's an end-user requirement to use x dp (can be a daft
>>> requirement) or x sf (we used 4sf, the eurozone had a LEGAL obligation
>>> to use 6 back in the day). And if you're dealing with a Zimbabwe or the
>>> like, do you really want to use today's exchange rate on yesterday's
>>> transaction?
>>>
>>> Cheers,
>>> Wol
>>>
>>
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4-2' - source/ca source/cs source/de source/fi source/gl source/gn source/hr source/is source/it source/ja source/nl source/nn source/oc s

[Christian Lohmaier]

 source/ca/helpcontent2/source/text/shared/00.po |  
  6 
 source/ca/helpcontent2/source/text/shared/01.po |  
 38 
 source/ca/helpcontent2/source/text/swriter/00.po|  
 35 
 source/ca/helpcontent2/source/text/swriter/01.po|  
 73 
 source/ca/helpcontent2/source/text/swriter/librelogo.po |  
 18 
 source/cs/helpcontent2/source/text/shared/autopi.po |  
 26 
 source/de/sc/uiconfig/scalc/ui.po   |  
 14 
 source/de/sw/source/uibase/utlui.po |  
  8 
 source/fi/officecfg/registry/data/org/openoffice/Office/UI.po   |  
 36 
 source/gl/cui/uiconfig/ui.po|  
 22 
 source/gl/extensions/uiconfig/sabpilot/ui.po|  
 55 
 source/gl/extensions/uiconfig/sbibliography/ui.po   |  
 14 
 source/gl/filter/uiconfig/ui.po |  
 12 
 source/gl/sc/source/ui/StatisticsDialogs.po |  
 14 
 source/gl/sc/source/ui/miscdlgs.po  |  
 27 
 source/gl/sc/source/ui/navipi.po|  
  8 
 source/gl/sc/source/ui/src.po   |  
 18 
 source/gl/starmath/source.po|  
  5 
 source/gl/svtools/source/java.po|  
 24 
 source/gl/svtools/source/misc.po|  
 10 
 source/gl/svtools/uiconfig/ui.po|  
 12 
 source/gl/sw/source/ui/app.po   |  
 10 
 source/gl/sw/source/ui/dbui.po  |  
  8 
 source/gl/sw/source/ui/dialog.po|  
 10 
 source/gl/sw/source/ui/dochdl.po|  
 12 
 source/gl/sw/source/ui/index.po |  
 10 
 source/gl/sw/source/ui/misc.po  |  
 12 
 source/gl/sw/source/ui/shells.po|  
 16 
 source/gl/sw/source/ui/utlui.po |  
 14 
 source/gl/sw/source/uibase/dbui.po  |  
 24 
 source/gl/sw/source/uibase/dialog.po|  
 18 
 source/gl/sw/source/uibase/docvw.po |  
 56 
 source/gl/sw/source/uibase/inc.po   |  
 16 
 source/gl/sw/source/uibase/lingu.po |  
 40 
 source/gl/sw/source/uibase/misc.po  |  
 22 
 source/gl/sw/source/uibase/ribbar.po|  
 52 
 source/gn/accessibility/source/helper.po|  
  6 
 source/gn/basctl/source/basicide.po |  
 18 
 source/gn/basctl/source/dlged.po|  
  6 
 source/gn/basctl/uiconfig/basicide/ui.po|  
 12 
 source/gn/basic/source/classes.po   |  
 16 
 source/gn/chart2/source/controller/dialogs.po   |  
 12 
 source/gn/chart2/uiconfig/ui.po |  
 54 
 source/gn/cui/source/customize.po   |  
 10 
 source/gn/cui/source/dialogs.po |  
 14 
 source/gn/cui/source/options.po |  
  8 
 source/gn/cui/source/tabpages.po|  
 33 
 source/gn/cui/uiconfig/ui.po| 
1701 -
 source/gn/dbaccess/source/ui/app.po |  
 12 
 source/gn/dbaccess/source/ui/browser.po |  
  8 
 source/gn/dbaccess/source/ui/control.po |  
 10 
 source/gn/dbaccess/source/ui/inc.po |  
 12 
 source/gn/dbaccess/source/ui/querydesign.po |  
 10 
 source/gn/dbaccess/source/ui/tabledesign.po |  
  8 
 source/gn/dbaccess/uiconfig/ui.po   |  
 26 
 source/gn/desktop/source/deployment/gui.po  |  
  6 
 source/gn/desktop/uiconfig/ui.po|  
  6 
 source/gn/editeng/source/items.po   |  
 90 
 s

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-2' - translations

[Christian Lohmaier]

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

New commits:
commit a3158e0550c797e579d2b792cc37f571a8006700
Author: Christian Lohmaier 
Date:   Thu Mar 26 00:11:29 2015 +0100

Updated core
Project: translations  d856589b6c5eef15b7cdf47615bedffecf0d4069

diff --git a/translations b/translations
index 87cf73a..d856589 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 87cf73a1e1a4d5956db0593cb3f8a9cbf3037104
+Subproject commit d856589b6c5eef15b7cdf47615bedffecf0d4069
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source

[Miklos Vajna]

 oox/source/core/xmlfilterbase.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 31433d007cce7d36897277a875c25c5b102e15aa
Author: Miklos Vajna 
Date:   Mon Mar 2 08:40:20 2015 +0100

tdf#89774 oox: TotalTime is in minutes

(cherry picked from commit 302f413eec4da8c8572911d08e939186c5ac57cf)

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx

Change-Id: Ie65a8adbd077997f4a13914dd8e0ba4d55afd7b7
Reviewed-on: https://gerrit.libreoffice.org/15017
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 3b807df..3a089ad 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -648,7 +648,8 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< 
XDocumentProperties > xProp
 writeElement( pAppProps, XML_Slides,"slides" );
 writeElement( pAppProps, XML_Notes, "notes" );
 #endif  /* def OOXTODO */
-writeElement( pAppProps, XML_TotalTime, 
xProperties->getEditingDuration() );
+// EditingDuration is in seconds, TotalTime is in minutes.
+writeElement( pAppProps, XML_TotalTime, 
xProperties->getEditingDuration() / 60 );
 #ifdef OOXTODO
 writeElement( pAppProps, XML_HiddenSlides,  "hidden slides" );
 writeElement( pAppProps, XML_MMClips,   "mm clips" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 compilerplugins/clang/constantfunction.cxx |   37 ++---
 1 file changed, 8 insertions(+), 29 deletions(-)

New commits:
commit 82f4f6b19febb607d8823923380777f27e0ab3d9
Author: Stephan Bergmann 
Date:   Thu Mar 26 09:24:58 2015 +0100

loplugins:constantfunction: properly detect overloaded operators

Change-Id: I484e1206d1f17305d21f7e750b8aca9d1c8d809b

diff --git a/compilerplugins/clang/constantfunction.cxx 
b/compilerplugins/clang/constantfunction.cxx
index c3cd2b4..c89e6b7 100644
--- a/compilerplugins/clang/constantfunction.cxx
+++ b/compilerplugins/clang/constantfunction.cxx
@@ -160,13 +160,17 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 return true;
 }
 
-std::string aFunctionName = pFunctionDecl->getQualifiedNameAsString();
-
-// various places override operator== and "return false;"
-if (aFunctionName.find("::operator==") != std::string::npos ) {
+switch (pFunctionDecl->getOverloadedOperator()) {
+case OO_Delete:
+case OO_EqualEqual:
+case OO_Call:
 return true;
+default:
+break;
 }
 
+std::string aFunctionName = pFunctionDecl->getQualifiedNameAsString();
+
 // something to do with dynamic loading in sal/textenc/textenc.cxx
 if (aFunctionName == "thisModule") {
 return true;
@@ -187,11 +191,6 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 if (aFunctionName == "ExceptionThrower_acquire_release_nop") {
 return true;
 }
-// /store/
-if (aFunctionName == "store::PageData::operator delete"
-|| aFunctionName == "(anonymous namespace)::Entry::operator delete") {
-return true;
-}
 // differetnt hook function is called on different platforms, 
/vcl/source/app/svmainhook.cxx
 if (aFunctionName == "ImplSVMainHook") {
 return true;
@@ -244,10 +243,6 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 if (aFunctionName == "SbxDecimal::neg" || aFunctionName == 
"SbxDecimal::isZero") {
 return true;
 }
-// template stuff, include/sfx2/thumbnailview.hxx
-if (aFunctionName == "ViewFilterAll::operator()") {
-return true;
-}
 // used as a callback, include/sfx2/shell.hxx
 if (aFunctionName == "SfxShell::EmptyExecStub" || aFunctionName == 
"SfxShell::EmptyStateStub"
 || aFunctionName == "SfxShell::VerbState") {
@@ -309,14 +304,6 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 if (aFunctionName == "accessibility::CreateEmptyShapeReference") {
 return true;
 }
-//  svx/source/inc/frmselimpl.hxx
-if (aFunctionName == "svx::FrameBorderDummy_Pred::operator()") {
-return true;
-}
-//  desktop/source/lib/init.cxx
-if (aFunctionName == "NoDelete::operator()") {
-return true;
-}
 //  chart2/source/view/main/AbstractShapeFactory.cxx
 if (aFunctionName == "chart::(anonymous namespace)::thisModule") {
 return true;
@@ -325,10 +312,6 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 if (aFunctionName == "chart::InternalData::dump") {
 return true;
 }
-//  chart2/source/view/main/DummyXShape.cxx
-if (aFunctionName == "chart::dummy::(anonymous 
namespace)::PrintProperties::operator()") {
-return true;
-}
 //  hwpfilter/
 if (aFunctionName == "debug" || aFunctionName == "token_debug") {
 return true;
@@ -353,10 +336,6 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 if (aFunctionName == "SwWW8ImplReader::Read_F_Shape") {
 return true;
 }
-// callback, sd/source/ui/framework/tools/FrameworkHelper.cxx
-if (aFunctionName == "sd::framework::(anonymous 
namespace)::FrameworkHelperAllPassFilter::operator()") {
-return true;
-}
 // called from SDI file, I don't know what that stuff is about, 
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cx
 if (aFunctionName == "sd::slidesorter::SlideSorterViewShell::ExecStatusBar"
 || aFunctionName == "sd::OutlineViewShell::ExecStatusBar") {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - config_host.mk.in Makefile.in

[David Tardon]

 Makefile.in   |5 -
 config_host.mk.in |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 81e43176d838920743b5cb226f9ea9509eb1036c
Author: David Tardon 
Date:   Thu Mar 26 09:22:30 2015 +0100

fix build from module

Change-Id: I044e6c82b4f3b492ed384e86dbe9e6955f8f792f

diff --git a/config_host.mk.in b/config_host.mk.in
index 40a1989..a75560c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -652,7 +652,7 @@ export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
 export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
 
 # lang-related stuff
-include config_$(gb_Side)_lang.mk
+include $(BUILDDIR)/config_$(gb_Side)_lang.mk
 
 # tarball names
 # does use some of the variables defined above
commit c8708f34d6ab4152ef74c01ed2210ec7aee83dbe
Author: David Tardon 
Date:   Thu Mar 26 09:19:01 2015 +0100

add Makefile deps and cleanup for config_host_lang.mk*

Change-Id: I7fabd28ccdf66a4fa96838aafadbe6ceee8d9ee3

diff --git a/Makefile.in b/Makefile.in
index 36bcaf3..61b16ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,12 +32,13 @@ GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T)
 ifeq (,$(MAKE_RESTARTS)$(if $(GIT_BUILD),,T)$(if $(filter-out help showmodules 
clean distclean,$(MAKECMDGOALS)),,T))
 
 .PHONY : force-restart
-Makefile: $(BUILDDIR)/config_host.mk force-restart
+Makefile: $(BUILDDIR)/config_host.mk $(BUILDDIR)/config_host_lang.mk 
force-restart
@touch $@
 
 # run configure in an environment not polluted by config_host.mk
 $(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/config_host.mk.in \
+   $(SRCDIR)/config_host_lang.mk.in \
$(SRCDIR)/Makefile.in \
$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
$(SRCDIR)/configure.ac \
@@ -179,6 +180,8 @@ distclean : clean compilerplugins-clean
 $(BUILDDIR)/config_build.mk \
 $(BUILDDIR)/config_host.mk \
 $(BUILDDIR)/config_host.mk.stamp \
+$(BUILDDIR)/config_host_lang.mk \
+$(BUILDDIR)/config_host_lang.mk.stamp \
 $(BUILDDIR)/config_host/*.h \
 $(BUILDDIR)/configure \
 $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/tango icon-themes/tango_testing

[Adolfo Jayme Barrientos]

 dev/null |binary
 icon-themes/tango/vcl/res/msgbox.png |binary
 icon-themes/tango/vcl/res/msgbox.svg | 5032 +++
 icon-themes/tango_testing/vcl/res/msgbox.svg | 5032 ---
 4 files changed, 5032 insertions(+), 5032 deletions(-)

New commits:
commit 5a0de29f6156e8ee92832b09eb1198a2b5f120da
Author: Adolfo Jayme Barrientos 
Date:   Thu Mar 26 02:10:48 2015 -0600

Move message box icons from Tango Testing to Tango

It was about time!

Change-Id: I88bbd7a1d6651f87d6524fd651a7c5c460105b5f

diff --git a/icon-themes/tango/vcl/res/msgbox.png 
b/icon-themes/tango/vcl/res/msgbox.png
index c47fd78..19a94ae 100644
Binary files a/icon-themes/tango/vcl/res/msgbox.png and 
b/icon-themes/tango/vcl/res/msgbox.png differ
diff --git a/icon-themes/tango_testing/vcl/res/msgbox.svg 
b/icon-themes/tango/vcl/res/msgbox.svg
similarity index 100%
rename from icon-themes/tango_testing/vcl/res/msgbox.svg
rename to icon-themes/tango/vcl/res/msgbox.svg
diff --git a/icon-themes/tango/vcl/res/msgbox.xcf.bz2 
b/icon-themes/tango/vcl/res/msgbox.xcf.bz2
deleted file mode 100644
index e635247..000
Binary files a/icon-themes/tango/vcl/res/msgbox.xcf.bz2 and /dev/null differ
diff --git a/icon-themes/tango_testing/vcl/res/msgbox.png 
b/icon-themes/tango_testing/vcl/res/msgbox.png
deleted file mode 100644
index 19a94ae..000
Binary files a/icon-themes/tango_testing/vcl/res/msgbox.png and /dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/filter/ww8/docxattributeoutput.cxx |   22 --
 sw/source/filter/ww8/docxattributeoutput.hxx |2 --
 2 files changed, 24 deletions(-)

New commits:
commit 83ebe2ca6fee69e6f2db8061379e718a72c7977f
Author: Miklos Vajna 
Date:   Thu Mar 26 09:07:55 2015 +0100

DOCX export: remove no longer needed AddToAttrList() variants

Change-Id: Ide671e1ec9d80069869b14fb3c94acbd287a3427

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 44a7aef..3d71b74 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8381,28 +8381,6 @@ void DocxAttributeOutput::BulletDefinition(int nId, 
const Graphic& rGraphic, Siz
 m_pSerializer->endElementNS(XML_w, XML_numPicBullet);
 }
 
-void DocxAttributeOutput::AddToAttrList( ::sax_fastparser::FastAttributeList* 
&pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue )
-{
-AddToAttrList( pAttrList, 1, nAttrName, sAttrValue );
-}
-
-void DocxAttributeOutput::AddToAttrList( ::sax_fastparser::FastAttributeList* 
&pAttrList, sal_Int32 nAttrs, ... )
-{
-if( !pAttrList )
-pAttrList = m_pSerializer->createAttrList();
-
-va_list args;
-va_start( args, nAttrs );
-for( sal_Int32 i = 0; iadd( nName, pValue );
-}
-va_end( args );
-}
-
 void DocxAttributeOutput::AddToAttrList( 
std::unique_ptr& pAttrList, sal_Int32 
nAttrName, const sal_Char* sAttrValue )
 {
 AddToAttrList( pAttrList, 1, nAttrName, sAttrValue );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index fbf5d2d..037bdf4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -717,8 +717,6 @@ private:
 void CmdField_Impl( FieldInfos& rInfos );
 void EndField_Impl( FieldInfos& rInfos );
 
-void AddToAttrList( ::sax_fastparser::FastAttributeList* &pAttrList, 
sal_Int32 nAttrName, const sal_Char* sAttrValue );
-void AddToAttrList( ::sax_fastparser::FastAttributeList* &pAttrList, 
sal_Int32 nArgs, ... );
 void AddToAttrList( std::unique_ptr& 
pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue );
 void AddToAttrList( std::unique_ptr& 
pAttrList, sal_Int32 nArgs, ... );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 basic/qa/cppunit/test_vba.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c1fed2a9a198b75c618b3adb6db8ce50e5f50fff
Author: Tor Lillqvist 
Date:   Thu Mar 26 09:22:42 2015 +0200

WaE: this method is empty and should be removed

Change-Id: Ia5ec3890a4e57c460dab58fcd690530ebf836140

diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 936cce3..f7ddc6c 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -137,6 +137,9 @@ void VBATest::testMiscOLEStuff()
 CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn != NULL );
 CPPUNIT_ASSERT_MESSAGE("Result not as expected", 
pReturn->GetOUString() == "OK" );
 }
+#else
+// Avoid "this method is empty and should be removed" warning
+(void) 42;
 #endif
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - cui/source editeng/source filter/source include/editeng sc/source sd/source svx/source sw/source

[Noel Grandin]

 cui/source/tabpages/numpages.cxx   |   34 -
 editeng/source/editeng/eerdll.cxx  |2 -
 editeng/source/items/bulitem.cxx   |   74 ++---
 editeng/source/items/numitem.cxx   |   16 
 editeng/source/uno/unonrule.cxx|4 +-
 filter/source/msfilter/svdfppt.cxx |   14 +++
 include/editeng/bulletitem.hxx |   72 +---
 include/editeng/numitem.hxx|   55 ---
 sc/source/ui/unoobj/styleuno.cxx   |2 -
 sd/source/core/drawdoc4.cxx|6 +--
 sd/source/core/stlpool.cxx |5 +-
 sd/source/ui/dlg/dlgolbul.cxx  |4 +-
 sd/source/ui/func/fuolbull.cxx |2 -
 sd/source/ui/view/viewshel.cxx |2 -
 svx/source/sidebar/nbdtmg.cxx  |   12 --
 svx/source/unodraw/unomod.cxx  |2 -
 sw/source/core/doc/number.cxx  |   11 ++---
 sw/source/uibase/shells/txtnum.cxx |4 +-
 18 files changed, 140 insertions(+), 181 deletions(-)

New commits:
commit ccea3b6721da2dbf7a319c6e3e24428429cdf3ba
Author: Noel Grandin 
Date:   Thu Mar 26 09:38:35 2015 +0200

the valid flags in SvxBulletItem are unused

Change-Id: Ifd06179e42edc916002e8b0feaabd52f1aa6

diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index a7bd2e2..1a5738d 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -105,7 +105,6 @@ SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : 
SfxPoolItem( _nWhich )
 {
 SetDefaultFont_Impl();
 SetDefaults_Impl();
-nValidMask = 0x;
 }
 
 SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich )
@@ -163,8 +162,6 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 
_nWhich )
 
 // UNICODE: rStrm >> aFollowText;
 aFollowText = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet());
-
-nValidMask = 0x;
 }
 
 SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem 
)
@@ -178,7 +175,6 @@ SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : 
SfxPoolItem( rItem )
 nWidth  = rItem.nWidth;
 nScale  = rItem.nScale;
 cSymbol = rItem.cSymbol;
-nValidMask  = rItem.nValidMask;
 }
 
 
@@ -237,29 +233,17 @@ void SvxBulletItem::CopyValidProperties( const 
SvxBulletItem& rCopyFrom )
 {
 vcl::Font _aFont = GetFont();
 vcl::Font aNewFont = rCopyFrom.GetFont();
-if ( rCopyFrom.IsValid( VALID_FONTNAME ) )
-{
-_aFont.SetName( aNewFont.GetName() );
-_aFont.SetFamily( aNewFont.GetFamily() );
-_aFont.SetStyleName( aNewFont.GetStyleName() );
-}
-if ( rCopyFrom.IsValid( VALID_FONTCOLOR ) )
-_aFont.SetColor( aNewFont.GetColor() );
-if ( rCopyFrom.IsValid( VALID_SYMBOL ) )
-SetSymbol( rCopyFrom.GetSymbol() );
-if ( rCopyFrom.IsValid( VALID_BITMAP ) )
-SetGraphicObject( rCopyFrom.GetGraphicObject() );
-if ( rCopyFrom.IsValid( VALID_SCALE ) )
-SetScale( rCopyFrom.GetScale() );
-if ( rCopyFrom.IsValid( VALID_START ) )
-SetStart( rCopyFrom.GetStart() );
-if ( rCopyFrom.IsValid( VALID_STYLE ) )
-SetStyle( rCopyFrom.GetStyle() );
-if ( rCopyFrom.IsValid( VALID_PREVTEXT ) )
-SetPrevText( rCopyFrom.GetPrevText() );
-if ( rCopyFrom.IsValid( VALID_FOLLOWTEXT ) )
-SetFollowText( rCopyFrom.GetFollowText() );
-
+_aFont.SetName( aNewFont.GetName() );
+_aFont.SetFamily( aNewFont.GetFamily() );
+_aFont.SetStyleName( aNewFont.GetStyleName() );
+_aFont.SetColor( aNewFont.GetColor() );
+SetSymbol( rCopyFrom.GetSymbol() );
+SetGraphicObject( rCopyFrom.GetGraphicObject() );
+SetScale( rCopyFrom.GetScale() );
+SetStart( rCopyFrom.GetStart() );
+SetStyle( rCopyFrom.GetStyle() );
+SetPrevText( rCopyFrom.GetPrevText() );
+SetFollowText( rCopyFrom.GetFollowText() );
 SetFont( _aFont );
 }
 
@@ -272,8 +256,7 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) 
const
 const SvxBulletItem& rBullet = static_cast(rItem);
 // Compare with ValidMask, otherwise no put possible in a AttrSet if the
 // item differs only in terms of the ValidMask from an existing one.
-if( nValidMask != rBullet.nValidMask||
-nStyle != rBullet.nStyle||
+if( nStyle != rBullet.nStyle||
 nScale != rBullet.nScale||
 nWidth != rBullet.nWidth||
 nStart != rBullet.nStart||
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index a9a1f68..68c5b69 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -20,10 +20,10 @@
 #define INCLUDED_EDITENG_BULLETITEM_HXX
 
 #include 
-#include 
-
+#include 
+#include 
+#include 
 
-// define 
 
 // Styles
 enum class SvxBulletStyle
@@ -38,21 +38,6 @@ enum class SvxBulletStyle
 BM