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

[Noel Grandin]

 include/tools/resid.hxx|   35 ++-
 tools/source/rc/rc.cxx |   11 +--
 tools/source/rc/resmgr.cxx |4 ++--
 vcl/source/window/resource.cxx |1 -
 4 files changed, 17 insertions(+), 34 deletions(-)

New commits:
commit f9aee52eb56c69373c98ced5aff2128ea8c26f1d
Author: Noel Grandin 
Date:   Sun Apr 10 14:44:15 2016 +0200

give tools::ResId a shave and a haircut

m_nRT2 and m_nWinBits fields are not in use anymore, at least as far
back as 2013, when the heading files were moved around

Change-Id: Ie3299a576450803332aeab72d5c0e68227e2
Reviewed-on: https://gerrit.libreoffice.org/23960
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx
index aa47075..29452c6 100644
--- a/include/tools/resid.hxx
+++ b/include/tools/resid.hxx
@@ -47,12 +47,10 @@ class ResId
 mutable sal_uInt32  m_nResId;  // Resource Identifier
 mutable RESOURCE_TYPE   m_nRT; // type for loading (mutable to be 
set later)
 mutable ResMgr *m_pResMgr; // load from this ResMgr (mutable 
for setting on demand)
-mutable RESOURCE_TYPE   m_nRT2;// type for loading (supersedes 
m_nRT)
-mutable sal_uInt32  m_nWinBits;// container for original style 
bits on a window in a resource
 
 void ImplInit( sal_uInt32 nId, ResMgr& rMgr, RSHEADER_TYPE* pRes )
 {
-m_pResource = pRes; m_nResId = nId; m_nRT = RSC_NOTYPE; m_pResMgr = 
&rMgr; m_nRT2 = RSC_NOTYPE; m_nWinBits = 0;
+m_pResource = pRes; m_nResId = nId; m_nRT = RSC_NOTYPE; m_pResMgr = 
&rMgr;
 OSL_ENSURE( m_pResMgr != nullptr, "ResId without ResMgr created" );
 }
 
@@ -66,8 +64,6 @@ public:
 ImplInit( nId, rMgr, nullptr );
 }
 
-void SetWinBits( sal_uInt32 nBits ) const { m_nWinBits = nBits; }
-
 RESOURCE_TYPE   GetRT() const { return m_nRT; }
 
 /** Set the type if not already set. Ask for type with GetRT()
@@ -81,22 +77,12 @@ public:
 @see
 ResId::GetRT2(), ResId::GetRT()
 */
-const ResId &   SetRT( RESOURCE_TYPE nType ) const
-{
-if( RSC_NOTYPE == m_nRT )
-m_nRT = nType;
-return *this;
-}
-
-/** Get the effective type (m_nRT2 or m_nRT1)
-
-A second resource type is used to supersede settings
-of the base class ( e.g. Window )
-*/
-RESOURCE_TYPE   GetRT2() const
-{
-return (RSC_NOTYPE == m_nRT2) ? m_nRT : m_nRT2;
-}
+ const ResId &   SetRT( RESOURCE_TYPE nType ) const
+ {
+ if( RSC_NOTYPE == m_nRT )
+ m_nRT = nType;
+ return *this;
+ }
 
 ResMgr *GetResMgr() const { return m_pResMgr; }
 voidSetResMgr( ResMgr * pMgr ) const
@@ -114,11 +100,10 @@ public:
 return *this;
 }
 
-boolIsAutoRelease()  const
-{ return !(m_nResId & RSC_DONTRELEASE); }
+boolIsAutoRelease()  const { return !(m_nResId & 
RSC_DONTRELEASE); }
 
-sal_uInt32  GetId()const { return m_nResId & ~RSC_DONTRELEASE; 
}
-RSHEADER_TYPE*  GetpResource() const { return m_pResource; }
+sal_uInt32  GetId()  const { return m_nResId & 
~RSC_DONTRELEASE; }
+RSHEADER_TYPE*  GetpResource()   const { return m_pResource; }
 
 TOOLS_DLLPUBLIC OUString toString() const;
 TOOLS_DLLPUBLIC operator OUString() const { return toString(); }
diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx
index de16eaa..262f07a 100644
--- a/tools/source/rc/rc.cxx
+++ b/tools/source/rc/rc.cxx
@@ -18,7 +18,7 @@
  */
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -42,6 +42,7 @@ void Resource::GetRes( const ResId& rResId )
 OUString ResId::toString() const
 {
 SetRT( RSC_STRING );
+
 ResMgr* pResMgr = GetResMgr();
 
 if ( !pResMgr || !pResMgr->GetResource( *this ) )
@@ -49,11 +50,9 @@ OUString ResId::toString() const
 OUString sRet;
 
 #if OSL_DEBUG_LEVEL > 0
-sRet = OUStringBuffer().
-append("(GetId())).
-append(" not found>").
-makeStringAndClear();
+sRet = "(GetId()))
++ " not found>";
 #endif
 
 if( pResMgr )
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8cccee4..668b414 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -913,7 +913,7 @@ bool ResMgr::IsAvailable( const ResId& rId, const Resource* 
pResObj ) const
 
 boolbAvailable = false;
 RSHEADER_TYPE*  pClassRes = rId.GetpResource();
-RESOURCE_TYPE   nRT = rId.GetRT2();
+RESOURCE_TYPE   nRT = rId.GetRT();
 sal_uInt32  nId = rId.GetId();
 const ResMgr*   pMgr = rId.GetResMgr();
 
@@ -978,7 +978,7 @@ bool ResMgr::GetResource( const ResId& rId, const Resource* 
pResObj )
 }
 
 RSHEADER_TYPE*  pClassRes = rId.GetpResource();
-RESOURCE_TYPE   nRT = rId.GetRT2();
+RESO

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

[slideon]

 sw/qa/python/check_change_color.py |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7f29612cf010c89d5d2dffd4c868a79ad6f9897c
Author: slideon 
Date:   Mon Apr 11 13:48:54 2016 -0400

Add other tests to check_change_color

Add tests for GridColor and FootnoteLineColor

Change-Id: Ia1112cbff5fd77ae1fa83fac362e917eb35f530d
Reviewed-on: https://gerrit.libreoffice.org/24001
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/sw/qa/python/check_change_color.py 
b/sw/qa/python/check_change_color.py
index d0700f1..a835bc2 100644
--- a/sw/qa/python/check_change_color.py
+++ b/sw/qa/python/check_change_color.py
@@ -1,6 +1,7 @@
 import unittest
 from org.libreoffice.unotest import UnoInProcess
 
+
 class CheckChangeColor(unittest.TestCase):
 
 @classmethod
@@ -25,5 +26,11 @@ class CheckChangeColor(unittest.TestCase):
 self.assertEqual(xPageStyle.BackColor, 0x00FF)
 self.assertEqual(xPageStyle.IsLandscape, True)
 
+xPageStyle.setPropertyValue("GridColor", 0x00FF)
+self.assertEqual(xPageStyle.GridColor, 0x00FF)
+
+xPageStyle.setPropertyValue("FootnoteLineColor", 0x00FF)
+self.assertEqual(xPageStyle.FootnoteLineColor, 0x00FF)
+
 if __name__ == '__main__':
 unittest.main()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/test

[Miklos Vajna]

 loolwsd/test/Makefile.am |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 73985418c7295d888fade7971bc43ffb05a8e94f
Author: Miklos Vajna 
Date:   Tue Apr 12 08:37:24 2016 +0200

${systemplate} -> @SYSTEMPLATE_PATH@ to fix make check

Change-Id: I5cb78fa3820c2e48fe071ba2b030b824a6780e10

diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am
index 7ac0fd4..f4c71fa 100644
--- a/loolwsd/test/Makefile.am
+++ b/loolwsd/test/Makefile.am
@@ -1,7 +1,3 @@
-# variables for tests
-jails=${top_builddir}/test/jails
-systemplate=${top_builddir}/test/systemplate
-
 AUTOMAKE_OPTION = serial-tests
 
 check_PROGRAMS = test
@@ -25,7 +21,7 @@ unit_storage_la_SOURCES = UnitStorage.cpp
 unit_storage_la_LDFLAGS = -module
 
 if HAVE_LO_PATH
-SYSTEM_STAMP = ${systemplate}/system_stamp
+SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
 else
 SYSTEM_STAMP =
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/xmloff sc/source sw/inc sw/source xmloff/inc xmloff/source

[Noel Grandin]

 include/xmloff/animationexport.hxx |4 ++--
 include/xmloff/animexp.hxx |4 ++--
 include/xmloff/attrlist.hxx|2 +-
 include/xmloff/txtparae.hxx|2 +-
 include/xmloff/xmlexp.hxx  |2 +-
 include/xmloff/xmlexppr.hxx|2 +-
 include/xmloff/xmlimp.hxx  |2 +-
 include/xmloff/xmlimppr.hxx|2 +-
 sc/source/filter/xml/xmlstyle.cxx  |4 ++--
 sc/source/filter/xml/xmlstyle.hxx  |4 ++--
 sw/inc/SwNumberTree.hxx|2 +-
 sw/inc/doc.hxx |2 +-
 sw/inc/ndgrf.hxx   |2 +-
 sw/inc/textboxhelper.hxx   |2 +-
 sw/inc/unoparagraph.hxx|2 +-
 sw/inc/unotbl.hxx  |4 ++--
 sw/source/core/SwNumberTree/SwNumberTree.cxx   |2 +-
 sw/source/core/crsr/crbm.cxx   |2 +-
 sw/source/core/doc/docbm.cxx   |4 ++--
 sw/source/core/doc/docglos.cxx |2 +-
 sw/source/core/doc/swstylemanager.cxx  |2 +-
 sw/source/core/doc/tblcpy.cxx  |6 +++---
 sw/source/core/doc/textboxhelper.cxx   |2 +-
 sw/source/core/graphic/ndgrf.cxx   |2 +-
 sw/source/core/unocore/unoobj2.cxx |2 +-
 sw/source/core/unocore/unostyle.cxx|2 +-
 sw/source/core/unocore/unotbl.cxx  |6 +++---
 sw/source/core/unocore/unotext.cxx |2 +-
 xmloff/inc/PropertySetMerger.hxx   |4 ++--
 xmloff/inc/StyleMap.hxx|2 +-
 xmloff/inc/XMLChartPropertySetMapper.hxx   |4 ++--
 xmloff/source/chart/PropertyMaps.cxx   |4 ++--
 xmloff/source/chart/SchXMLExport.cxx   |   16 
 xmloff/source/chart/SchXMLPlotAreaContext.cxx  |4 ++--
 xmloff/source/chart/SchXMLTableContext.cxx |4 ++--
 xmloff/source/chart/SchXMLTableContext.hxx |4 ++--
 xmloff/source/chart/SchXMLTools.cxx|2 +-
 xmloff/source/chart/SchXMLTools.hxx|4 ++--
 xmloff/source/core/DomBuilderContext.cxx   |4 ++--
 xmloff/source/core/PropertySetMerger.cxx   |2 +-
 xmloff/source/core/attrlist.cxx|2 +-
 xmloff/source/core/xmlexp.cxx  |2 +-
 xmloff/source/core/xmlimp.cxx  |2 +-
 xmloff/source/draw/animationexport.cxx |4 ++--
 xmloff/source/draw/animexp.cxx |4 ++--
 xmloff/source/draw/sdpropls.cxx|4 ++--
 xmloff/source/draw/sdpropls.hxx|4 ++--
 xmloff/source/draw/sdxmlexp.cxx|8 
 xmloff/source/draw/sdxmlexp_impl.hxx   |8 
 xmloff/source/draw/shapeimport.cxx |4 ++--
 xmloff/source/style/PageMasterExportPropMapper.cxx |4 ++--
 xmloff/source/style/PageMasterExportPropMapper.hxx |2 +-
 xmloff/source/style/StyleMap.cxx   |2 +-
 xmloff/source/style/xmlexppr.cxx   |2 +-
 xmloff/source/style/xmlimppr.cxx   |4 ++--
 xmloff/source/text/txtexppr.cxx|2 +-
 xmloff/source/text/txtexppr.hxx|2 +-
 xmloff/source/text/txtparae.cxx|2 +-
 58 files changed, 96 insertions(+), 96 deletions(-)

New commits:
commit 7c99b5586d7cb145079129470fdbf720399eee3c
Author: Noel Grandin 
Date:   Tue Apr 12 08:33:08 2016 +0200

clang-tidy performance-unnecessary-value-param in sw

Change-Id: I3e030743b640d5a5f6b3bf4a4e9ba50ccd001287

diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index f4144ee..4b9bdae 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -476,7 +476,7 @@ protected:
   - false   only set if aItLastValid is preceding
 the current last valid node
  */
-void SetLastValid(tSwNumberTreeChildren::const_iterator aItLastValid,
+void SetLastValid(const tSwNumberTreeChildren::const_iterator& 
aItLastValid,
   bool bValidating = false) const;
 
 /**
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 7c3cfc9..1dbf4ad 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -877,7 +877,7 @@ public:
 
 Convenince function used by ReplaceDocumentProperties to skip some UNO 
calls.
  */
-void ReplaceUserDefinedDocumentProperties( const css::uno::Reference< 
css::document::XDocumentProperties > xSourceDocProps );
+void ReplaceUserDefinedDocumentProperties( const css::uno::Reference< 
css::documen

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

[Noel Grandin]

 include/vcl/bitmap.hxx  |2 +-
 include/vcl/embeddedfontshelper.hxx |2 +-
 include/vcl/floatwin.hxx|2 +-
 include/vcl/print.hxx   |4 ++--
 include/vcl/window.hxx  |4 ++--
 vcl/inc/unx/glyphcache.hxx  |2 +-
 vcl/inc/unx/screensaverinhibitor.hxx|2 +-
 vcl/opengl/gdiimpl.cxx  |2 +-
 vcl/source/gdi/bitmap.cxx   |2 +-
 vcl/source/gdi/embeddedfontshelper.cxx  |2 +-
 vcl/source/gdi/pdfwriter_impl.hxx   |2 +-
 vcl/source/gdi/pdfwriter_impl2.cxx  |2 +-
 vcl/source/gdi/print3.cxx   |4 ++--
 vcl/source/window/accessibility.cxx |2 +-
 vcl/source/window/floatwin.cxx  |2 +-
 vcl/source/window/window2.cxx   |2 +-
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx  |2 +-
 vcl/unx/generic/window/screensaverinhibitor.cxx |6 +++---
 vcl/unx/gtk/a11y/atkvalue.cxx   |2 +-
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx|6 +++---
 vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx|6 +++---
 vcl/unx/gtk/gtksalframe.cxx |2 +-
 22 files changed, 31 insertions(+), 31 deletions(-)

New commits:
commit 03fd8d24c2e4603731e796b24e51289736c65621
Author: Noel Grandin 
Date:   Mon Apr 11 15:29:25 2016 +0200

clang-tidy performance-unnecessary-value-param in vcl

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

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 7dcc844..e534d20 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -718,7 +718,7 @@ public:
 
 SAL_DLLPRIVATE void ImplMakeUnique();
 std::shared_ptr ImplGetImpBitmap() const { return mxImpBmp;}
-SAL_DLLPRIVATE void ImplSetImpBitmap( std::shared_ptr 
xImpBmp );
+SAL_DLLPRIVATE void ImplSetImpBitmap( const 
std::shared_ptr& xImpBmp );
 SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap );
 
 SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew) const;
diff --git a/include/vcl/embeddedfontshelper.hxx 
b/include/vcl/embeddedfontshelper.hxx
index cae59da..e986e50 100644
--- a/include/vcl/embeddedfontshelper.hxx
+++ b/include/vcl/embeddedfontshelper.hxx
@@ -46,7 +46,7 @@ public:
   @param key key to xor the data with, from the start until the key's 
length (not repeated)
   @param eot whether the data is compressed in Embedded OpenType format
 */
-static bool addEmbeddedFont( css::uno::Reference< css::io::XInputStream > 
stream,
+static bool addEmbeddedFont( const css::uno::Reference< 
css::io::XInputStream >& stream,
 const OUString& fontName, const char* extra,
 std::vector< unsigned char > key = std::vector< unsigned char >(), 
bool eot = false);
 
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index d414fb8..92ca793 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -131,7 +131,7 @@ public:
  sal_uInt16& rArrangeIndex );
static Point ImplConvertToAbsPos(vcl::Window* 
pReference, const Point& rPos);
static Rectangle ImplConvertToAbsPos(vcl::Window* 
pReference, const Rectangle& rRect);
-SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags 
nFlags = FloatWinPopupEndFlags::NONE, VclPtr xFocusId = nullptr );
+SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags 
nFlags = FloatWinPopupEndFlags::NONE, const VclPtr& xFocusId = 
nullptr );
 SAL_DLLPRIVATE Rectangle&   ImplGetItemEdgeClipRect();
 SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return 
mbInPopupMode; }
 virtualvoid doDeferredInit(WinBits nBits) override;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 9133ed2..e92e13d 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -381,13 +381,13 @@ public:
 static bool PreparePrintJob( 
std::shared_ptr i_pController,
 const JobSetup& i_rInitSetup );
 static bool ExecutePrintJob( 
std::shared_ptr i_pController );
-static void FinishPrintJob( 
std::shared_ptr i_pController );
+static void FinishPrintJob( const 
std::shared_ptr& i_pController );
 
 /** Implementation detail of PrintJob being asynchronous
 
 not exported, not usable outside vcl
 */
-static void SAL_DLLPRIVATE  ImplPrintJob( 
std::shared_ptr i_pController,
+static void SAL_DLLPRIVATE  ImplPrintJob( const 
std::shared_ptr& i_pController,
 const JobSetup& i_rIn

[Libreoffice-commits] online.git: loolwsd/Makefile.am loolwsd/test

[Tor Lillqvist]

 loolwsd/Makefile.am  |   10 --
 loolwsd/test/Makefile.am |8 +++-
 2 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 255f9304e94ef4f6cae9b8d4ab397efe1f654673
Author: Tor Lillqvist 
Date:   Tue Apr 12 09:29:57 2016 +0300

Fix build without --with-lo-path

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 0a336fe..d674e55 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -88,7 +88,9 @@ EXTRA_DIST = discovery.xml \
 
 if HAVE_LO_PATH
 
-@SYSTEMPLATE_PATH@/system_stamp :
+SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
+
+$(SYSTEM_STAMP) :
if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@"; 
fi
${top_srcdir}/loolwsd-systemplate-setup "@SYSTEMPLATE_PATH@" 
"@LO_PATH@" && touch $@
 
@@ -104,6 +106,10 @@ run: @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
@echo "   
https://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello.odt&host=wss://localhost:9980"
./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
   --childroot="@JAILS_PATH@" --allowlocalstorage
+else
+
+SYSTEM_STAMP =
+
 endif
 
 clean-cache:
@@ -116,7 +122,7 @@ clean-cache:
 # capabilities won't survive packaging anyway. Instead, handle it when
 # installing the RPM or Debian package.
 
-all-local: loolforkit certificates @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
+all-local: loolforkit certificates @JAILS_PATH@ $(SYSTEM_STAMP)
if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit; \
sudo @SETCAP@ cap_sys_admin=ep loolmount; \
diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am
index 49c2567..7ac0fd4 100644
--- a/loolwsd/test/Makefile.am
+++ b/loolwsd/test/Makefile.am
@@ -24,8 +24,14 @@ unit_prefork_la_LDFLAGS = -module
 unit_storage_la_SOURCES = UnitStorage.cpp
 unit_storage_la_LDFLAGS = -module
 
+if HAVE_LO_PATH
+SYSTEM_STAMP = ${systemplate}/system_stamp
+else
+SYSTEM_STAMP =
+endif
+
 ${top_builddir}/test/run_unit.sh.log ${top_builddir}/test/run_unit.sh.trs : \
-   ${systemplate}/system_stamp @JAILS_PATH@ \
+   $(SYSTEM_STAMP) @JAILS_PATH@ \
${top_srcdir}/test/run_unit.sh \
${top_builddir}/loolwsd ${top_builddir}/loolforkit \
$(wildcard *.la)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 loolwsd/AdminModel.cpp |4 ++--
 loolwsd/AdminModel.hpp |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 773dad57ba5f082fb0b95ca262a56f058fec4b02
Author: Miklos Vajna 
Date:   Tue Apr 12 08:09:39 2016 +0200

AdminModel: can pass these by reference

Change-Id: I1c9ff03c06a8de00162cb2987b7218209f514850

diff --git a/loolwsd/AdminModel.cpp b/loolwsd/AdminModel.cpp
index debd8a8..709f74b 100644
--- a/loolwsd/AdminModel.cpp
+++ b/loolwsd/AdminModel.cpp
@@ -124,7 +124,7 @@ void AdminModel::update(const std::string& data)
 notify(data);
 }
 
-std::string AdminModel::query(const std::string command)
+std::string AdminModel::query(const std::string& command)
 {
 StringTokenizer tokens(command, " ", StringTokenizer::TOK_IGNORE_EMPTY | 
StringTokenizer::TOK_TRIM);
 
@@ -278,7 +278,7 @@ void AdminModel::notify(const std::string& message)
 }
 }
 
-void AdminModel::addDocument(Poco::Process::PID pid, std::string url)
+void AdminModel::addDocument(Poco::Process::PID pid, const std::string& url)
 {
 _documents.emplace(pid, Document(pid, url));
 }
diff --git a/loolwsd/AdminModel.hpp b/loolwsd/AdminModel.hpp
index 04d65a6..639dd43 100644
--- a/loolwsd/AdminModel.hpp
+++ b/loolwsd/AdminModel.hpp
@@ -141,7 +141,7 @@ public:
 
 void update(const std::string& data);
 
-std::string query(const std::string command);
+std::string query(const std::string& command);
 
 /// Returns memory consumed by all active loolkit processes
 unsigned getTotalMemoryUsage();
@@ -166,7 +166,7 @@ public:
 void notify(const std::string& message);
 
 private:
-void addDocument(Poco::Process::PID pid, std::string url);
+void addDocument(Poco::Process::PID pid, const std::string& url);
 
 void removeDocument(Poco::Process::PID pid);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 sfx2/source/control/dispatch.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0a8abaadf322dca5628c6e62eb18b19394995c40
Author: Pranav Kant 
Date:   Mon Apr 11 17:03:45 2016 +0530

lok context menu: Include uno commands for submenus too

Change-Id: I4ba49ba94a3270a5d53754320e5fbd49e3f5c848

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 396f993..aab0e29 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -198,6 +198,8 @@ namespace {
 continue;
 
 aItemTree.put("type", "menu");
+if (!aCommandURL.isEmpty())
+aItemTree.put("command", 
aCommandURL.toUtf8().getStr());
 aItemTree.push_back(std::make_pair("menu", aSubmenu));
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 framework/Library_fwk.mk  |1 
 framework/inc/classes/fwktabwindow.hxx|  127 --
 framework/source/classes/fwktabwindow.cxx |  359 --
 3 files changed, 487 deletions(-)

New commits:
commit b0e678c86136ef6d65cea66168a99217664c0278
Author: Maxim Monastirsky 
Date:   Tue Apr 12 00:39:53 2016 +0300

FwkTabWindow is unused since d6d86237b1b438919609988049ac4a152612fee1

Change-Id: Ifad573ac687548a889165012e7b7bb2f4b82750c

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index d1927cd..ab6518a 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -67,7 +67,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/accelerators/presethandler \
 framework/source/accelerators/storageholder \
 framework/source/classes/framecontainer \
-framework/source/classes/fwktabwindow \
 framework/source/classes/taskcreator \
 framework/source/dispatch/closedispatcher \
 framework/source/dispatch/dispatchinformationprovider \
diff --git a/framework/inc/classes/fwktabwindow.hxx 
b/framework/inc/classes/fwktabwindow.hxx
deleted file mode 100644
index 6fdea7a..000
--- a/framework/inc/classes/fwktabwindow.hxx
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWKTABWINDOW_HXX
-#define INCLUDED_FRAMEWORK_INC_CLASSES_FWKTABWINDOW_HXX
-
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-namespace com { namespace sun { namespace star {
-namespace awt {
-class XWindow;
-class XContainerWindowProvider;
-class XContainerWindowEventHandler; }
-namespace beans {
-struct NamedValue; }
-} } }
-
-namespace framework
-{
-
-class FwkTabControl : public TabControl
-{
-public:
-FwkTabControl(vcl::Window* pParent);
-
-void BroadcastEvent( sal_uLong nEvent );
-};
-
-class FwkTabPage : public TabPage
-{
-private:
-OUString   m_sPageURL;
-css::uno::Reference< css::awt::XWindow >m_xPage;
-css::uno::Reference< css::awt::XContainerWindowEventHandler >   
m_xEventHdl;
-css::uno::Reference< css::awt::XContainerWindowProvider >   
m_xWinProvider;
-
-voidCreateDialog();
-boolCallMethod( const OUString& rMethod );
-
-public:
-FwkTabPage(
-vcl::Window* pParent,
-const OUString& rPageURL,
-const css::uno::Reference< css::awt::XContainerWindowEventHandler >& 
rEventHdl,
-const css::uno::Reference< css::awt::XContainerWindowProvider >& 
rProvider );
-
-virtual ~FwkTabPage();
-virtual voiddispose() override;
-
-virtual voidActivatePage() override;
-virtual voidDeactivatePage() override;
-virtual voidResize() override;
-};
-
-struct TabEntry
-{
-sal_Int32   m_nIndex;
-ScopedVclPtr  m_pPage;
-OUStringm_sPageURL;
-css::uno::Reference< css::awt::XContainerWindowEventHandler > m_xEventHdl;
-
-TabEntry() :
-m_nIndex( -1 ), m_pPage( nullptr ) {}
-
-TabEntry( sal_Int32 nIndex, const OUString& sURL, const 
css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) :
-m_nIndex( nIndex ), m_pPage( nullptr ), m_sPageURL( sURL ), 
m_xEventHdl( rEventHdl ) {}
-~TabEntry() { m_pPage.disposeAndClear(); }
-};
-
-typedef std::vector< TabEntry* > TabEntryList;
-
-class FwkTabWindow : public vcl::Window
-{
-private:
-VclPtr  m_aTabCtrl;
-TabEntryList   m_TabList;
-
-css::uno::Reference< css::awt::XContainerWindowProvider >   m_xWinProvider;
-
-voidClearEntryList();
-TabEntry*   FindEntry( sal_Int32 nIndex ) const;
-boolRemoveEntry( sal_Int32 nIndex );
-
-DECL_DLLPRIVATE_LINK_TYPED(ActivatePageHdl,   TabControl *, void);
-DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl *, bool);
-
-public:
-FwkTabWindow( vcl::Window* pParent );
-virtual ~FwkTabWindow();
-virtual voiddispose() ove

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - scp2/InstallModule_ooo.mk scp2/source

[Rene Engelhard]

 scp2/InstallModule_ooo.mk|1 +
 scp2/source/ooo/common_brand.scp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e441b3e87e83af2018bbbfd698fd701fe5624181
Author: Rene Engelhard 
Date:   Mon Apr 11 09:56:23 2016 +0200

don't install qstart.desktop if it's disabled (--disable-systray)

Conflicts:
scp2/InstallModule_ooo.mk

Change-Id: I21a53381ad4018034de3833e8e244d0d7a7d28b8

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 91b11a3..29f83a6 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_GTK \
+   ENABLE_SYSTRAY_GTK \
ENABLE_MACOSX_SANDBOX \
ENABLE_NPAPI_FROM_BROWSER \
ENABLE_ONLINE_UPDATE \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ff674f4..2072358 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -609,7 +609,7 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
-#ifdef ENABLE_GTK
+#ifdef ENABLE_SYSTRAY_GTK
 File gid_Brand_File_Share_Xdg_QStart
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Xdg;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 framework/source/uielement/popuptoolbarcontroller.cxx |   79 +-
 1 file changed, 41 insertions(+), 38 deletions(-)

New commits:
commit 747a0fdda2a7723c2f8a8a022b468bcf29c700e3
Author: Maxim Monastirsky 
Date:   Mon Apr 11 23:30:41 2016 +0300

SaveToolbarController: Better support of readonly docs

The sfx2 impl. of XStorable::isReadonly isn't really helpful
for files w/o write permissions that were switched to edit
mode, as it returns the state of the UI. So instead let's just
rely on the state of the .uno:Save slot.

Change-Id: I3b033be3c9424a4479e9224f02d186960b540d21

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index e497705..4575f21 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -43,7 +43,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -355,14 +354,14 @@ public:
 
 private:
 bool m_bSplitButton;
-bool m_bModified;
+TriState m_eModified;
 css::uno::Reference< css::util::XModifiable > m_xModifiable;
 };
 
 SaveToolbarController::SaveToolbarController( const css::uno::Reference< 
css::uno::XComponentContext >& rxContext )
 : ImplInheritanceHelper( rxContext, ".uno:SaveAsMenu" )
 , m_bSplitButton( true )
-, m_bModified( false )
+, m_eModified( TRISTATE_FALSE )
 {
 }
 
@@ -378,20 +377,6 @@ void SaveToolbarController::initialize( const 
css::uno::Sequence< css::uno::Any
 m_bSplitButton = false;
 pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) & ~ 
ToolBoxItemBits::DROPDOWN );
 }
-
-css::uno::Reference< css::frame::XController > xController( 
m_xFrame->getController(), css::uno::UNO_QUERY );
-if ( xController.is() )
-m_xModifiable.set( xController->getModel(), css::uno::UNO_QUERY );
-
-if ( !m_xModifiable.is() )
-// Can be in table/query design.
-m_xModifiable.set( xController, css::uno::UNO_QUERY );
-
-if ( m_xModifiable.is() )
-{
-m_xModifiable->addModifyListener( this );
-m_bModified = m_xModifiable->isModified();
-}
 }
 
 sal_Bool SaveToolbarController::opensSubToolbar()
@@ -421,14 +406,13 @@ void SaveToolbarController::updateImage()
 return;
 
 bool bLargeIcons = pToolBox->GetToolboxButtonSize() == 
TOOLBOX_BUTTONSIZE_LARGE;
-css::uno::Reference< css::frame::XStorable > xStorable( m_xModifiable, 
css::uno::UNO_QUERY );
 Image aImage;
 
-if ( m_bSplitButton && xStorable.is() && xStorable->isReadonly() )
+if ( m_bSplitButton && m_eModified == TRISTATE_INDET )
 {
 aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand( 
".uno:SaveAs", bLargeIcons, m_xFrame );
 }
-else if ( m_bModified )
+else if ( m_eModified == TRISTATE_TRUE )
 {
 Image aResImage( bLargeIcons ? FwkResId( IMG_SAVEMODIFIED_LARGE ) : 
FwkResId( IMG_SAVEMODIFIED_SMALL ) );
 aImage = aResImage;
@@ -444,36 +428,55 @@ void SaveToolbarController::updateImage()
 void SaveToolbarController::statusChanged( const 
css::frame::FeatureStateEvent& rEvent )
 throw ( css::uno::RuntimeException, std::exception )
 {
-css::uno::Reference< css::frame::XStorable > xStorable( m_xModifiable, 
css::uno::UNO_QUERY );
+ToolBox* pToolBox = nullptr;
+sal_uInt16 nId = 0;
+if ( !getToolboxId( nId, &pToolBox ) )
+return;
+
+css::uno::Reference< css::frame::XModel > xModel;
+css::uno::Reference< css::frame::XController > xController( 
m_xFrame->getController(), css::uno::UNO_QUERY );
+if ( xController.is() )
+xModel.set( xController->getModel(), css::uno::UNO_QUERY );
 
-// If the model is able to tell us whether we're in read only mode, change 
the button to save as only mode
-// based on that. Otherwise just dumbly disable the button (because there 
could be other reasons why the
-// save slot is disabled, where save as isn't possible as well).
-if ( m_bSplitButton && xStorable.is() )
+if ( !m_xModifiable.is() )
 {
-ToolBox* pToolBox = nullptr;
-sal_uInt16 nId = 0;
-if ( !getToolboxId( nId, &pToolBox ) )
-return;
+m_xModifiable.set( xModel, css::uno::UNO_QUERY );
+
+if ( !m_xModifiable.is() )
+// Can be in table/query design.
+m_xModifiable.set( xController, css::uno::UNO_QUERY );
 
-bool bReadOnly = xStorable->isReadonly();
+if ( m_xModifiable.is() )
+m_xModifiable->addModifyListener( this );
+}
+
+m_eModified = m_xModifiable.is() && m_xModifiable->isModified() ? 
TRISTATE_TRUE : TRISTATE_FALSE;
+
+// xModel is nullptr in table/query design, so use that to exclude them 
from
+// the save as only mode, as they disable also the save as command when 
not in
+// edit mode, or with empty table/query.
+if ( m_bSplitButton && xMode

[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk scp2/source

[Rene Engelhard]

 scp2/InstallModule_ooo.mk|1 +
 scp2/source/ooo/common_brand.scp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cb6d938a07f727138a5ec2db1cbefaf4b1be3c50
Author: Rene Engelhard 
Date:   Mon Apr 11 09:56:23 2016 +0200

don't install qstart.desktop if it's disabled (--disable-systray)

Change-Id: I21a53381ad4018034de3833e8e244d0d7a7d28b8

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index d54ca2e..35db721 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_GTK \
+   ENABLE_SYSTRAY_GTK \
ENABLE_GTK3 \
ENABLE_MACOSX_SANDBOX \
ENABLE_ONLINE_UPDATE \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 3bf3c91..7cd7733 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -609,7 +609,7 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
-#ifdef ENABLE_GTK
+#ifdef ENABLE_SYSTRAY_GTK
 File gid_Brand_File_Share_Xdg_QStart
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Xdg;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 framework/source/uielement/popuptoolbarcontroller.cxx   |9 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   22 
++
 2 files changed, 23 insertions(+), 8 deletions(-)

New commits:
commit a3a1c50d6495860327e8cf9db869c466aa054d22
Author: Maxim Monastirsky 
Date:   Sat Apr 9 23:29:43 2016 +0300

SaveToolbarController: Blacklist in Basic IDE too

Save as/to remote don't work there. Still would be
nice to have the modified state icon change there too,
but that's for a future investigation.

Change-Id: Id119a40c39f9c69738b1e61e23ffe3424276229e

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index cb81fa5..0f7d229 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1140,6 +1140,17 @@
   
com.sun.star.comp.framework.GenericPopupToolbarController
 
   
+  
+
+  .uno:Save
+
+
+  com.sun.star.script.BasicIDE
+
+
+  
com.sun.star.comp.framework.GenericPopupToolbarController
+
+  
   
 
   .uno:FreezePanes
commit e58b8075983330737642c68bd7e67071efecd906
Author: Maxim Monastirsky 
Date:   Tue Apr 5 00:47:03 2016 +0300

SaveToolbarController: Blacklist RelationDesign in officecfg

Change-Id: I8aa14bb76a26aa12771000b393bee37d26ba85e7

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index 23c81d7..e497705 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -371,21 +371,14 @@ void SaveToolbarController::initialize( const 
css::uno::Sequence< css::uno::Any
 {
 PopupMenuToolbarController::initialize( aArguments );
 
-bool bRelationDesignModule = m_sModuleName.endsWith( "RelationDesign" );
-
 ToolBox* pToolBox = nullptr;
 sal_uInt16 nId = 0;
-if ( getToolboxId( nId, &pToolBox )
-&& ( bRelationDesignModule || pToolBox->GetItemCommand( nId ) != 
m_aCommandURL ) )
+if ( getToolboxId( nId, &pToolBox ) && pToolBox->GetItemCommand( nId ) != 
m_aCommandURL )
 {
 m_bSplitButton = false;
 pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) & ~ 
ToolBoxItemBits::DROPDOWN );
 }
 
-if ( bRelationDesignModule )
-// No modified icon there, just disable the button if there's nothing 
to save.
-return;
-
 css::uno::Reference< css::frame::XController > xController( 
m_xFrame->getController(), css::uno::UNO_QUERY );
 if ( xController.is() )
 m_xModifiable.set( xController->getModel(), css::uno::UNO_QUERY );
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 6de8c28..cb81fa5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1129,6 +1129,17 @@
   com.sun.star.comp.framework.SaveToolbarController
 
   
+  
+
+  .uno:Save
+
+
+  com.sun.star.sdb.RelationDesign
+
+
+  
com.sun.star.comp.framework.GenericPopupToolbarController
+
+  
   
 
   .uno:FreezePanes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/configure.ac loolwsd/Makefile.am loolwsd/README loolwsd/test

[Michael Meeks]

 loolwsd/Makefile.am |   22 ++
 loolwsd/README  |   66 ++--
 loolwsd/configure.ac|   14 -
 loolwsd/test/.gitignore |2 +
 loolwsd/test/Makefile.am|   30 +++-
 loolwsd/test/data/hello.odt |binary
 loolwsd/test/run_test.sh.in |   33 ++
 loolwsd/test/run_unit.sh|   25 
 loolwsd/test/run_unit.sh.in |   32 +
 9 files changed, 145 insertions(+), 79 deletions(-)

New commits:
commit ea1e2493bf64a8ec4ac5b5791d10c9ea896a01a7
Author: Michael Meeks 
Date:   Mon Apr 11 18:21:16 2016 +0100

Re-factor tests, move jails & systemplate up a level into loolwsd.

Also generate the test scripts with config.status containing absolute
paths to make them easier to run, and enable the older unit tests.

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index c35b39c..0a336fe 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -86,6 +86,26 @@ EXTRA_DIST = discovery.xml \
  loolwsd.service \
  sysconfig.loolwsd
 
+if HAVE_LO_PATH
+
+@SYSTEMPLATE_PATH@/system_stamp :
+   if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@"; 
fi
+   ${top_srcdir}/loolwsd-systemplate-setup "@SYSTEMPLATE_PATH@" 
"@LO_PATH@" && touch $@
+
+@JAILS_PATH@ :
+   mkdir -p $@
+
+clean-local:
+   if test "z@JAILS_PATH@" != "z"; then rm -rf "@JAILS_PATH@"; fi
+   if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@"; 
fi
+
+run: @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
+   @echo "Launching loolwsd - launch this in your browser:"
+   @echo "   
https://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello.odt&host=wss://localhost:9980"
+   ./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
+  --childroot="@JAILS_PATH@" --allowlocalstorage
+endif
+
 clean-cache:
 # Intentionally don't use "*" below... Avoid risk of accidentally running rm 
-rf /*
test -n "@LOOLWSD_CACHEDIR@" && rm -rf "@LOOLWSD_CACHEDIR@"/[0-9a-f]
@@ -96,7 +116,7 @@ clean-cache:
 # capabilities won't survive packaging anyway. Instead, handle it when
 # installing the RPM or Debian package.
 
-all-local: loolforkit certificates
+all-local: loolforkit certificates @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit; \
sudo @SETCAP@ cap_sys_admin=ep loolmount; \
diff --git a/loolwsd/README b/loolwsd/README
index 7034b9d..618fe6c 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -36,7 +36,8 @@ possibly iterating several times...
 
 and then
 
-./configure --enable-silent-rules --with-lokit-path=${MASTER}/include
+./configure --enable-silent-rules --with-lokit-path=${MASTER}/include \
+   --with-lo-path=${MASTER}/instdir --enable-debug
 make
 
 
@@ -44,7 +45,7 @@ where ${MASTER} is the location of the LibreOffice source 
tree.
 
 When building from a tarball less magic is needed.
 
-Run 'make check' after each commit. Requires loolwsd to be running.
+Run 'make check' after each commit.
 
 Note that the loolforkit program needs the CAP_SYS_CHROOT capability,
 thus you will be asked the root password when running make as it
@@ -79,7 +80,22 @@ If you're using the defaults you'll need to:
 sudo mkdir -p /usr/local/var/cache/loolwsd
 sudo chown `whoami` /usr/local/var/cache/loolwsd
 
-Now you need to set up a minimal chroot system, and directory for the jails:
+Now you can just do:
+
+make run
+
+and follow the link that recommends (see loleaflet/README for more info).
+
+Again, ${MASTER} is location of the LibreOffice source tree with a built
+LibreOffice.  This is work in progress, and consequently needs the latest
+LibreOffice master.
+
+
+Running manually
+
+
+If you want to do the 'make run' yourself, you need to set up a minimal
+chroot system, and directory for the jails:
 
 SYSTEMPLATE=`pwd`/systemplate  # or tweak for your system
 ROOTFORJAILS=`pwd`/jails   # or tweak for your system
@@ -93,12 +109,6 @@ now do:
 
 ./loolwsd --systemplate=${SYSTEMPLATE} --lotemplate=${MASTER}/instdir 
--childroot=${ROOTFORJAILS}
 
-and connect loleaflet to that (see loleaflet/README for more info).
-
-Again, ${MASTER} is location of the LibreOffice source tree with a built
-LibreOffice.  This is work in progress, and consequently needs the latest
-LibreOffice master.
-
 The ${SYSTEMPLATE} is a directory tree set up using the
 loolwsd-systemplate-setup script here. (It should not exist before
 running the script.) It will contain the runtime environment needed by
@@ -114,24 +124,26 @@ ${SYSTEMPLATE} and the ${MASTER}/instdir directories into 
each chroot
 jail, ${SYSTEMPLATE} and ${MASTER}/instdir need to be on the same file
 system as ${

[Libreoffice-commits] core.git: Branch 'feature/fixes20' -

[László Németh]

 0 files changed

New commits:
commit d12349c9bdd64479d1f22de9c021a813ecc0
Author: László Németh 
Date:   Mon Apr 11 22:29:46 2016 +0200

empty commit

Change-Id: Id9c59e31d915d507361fcd7f37ea400a66267cb8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-design] Minutes of the Design Hangout: 2016-04-01

[Jacobo Aragunde Pérez]

On 11/04/16 17:00, Wols Lists wrote:
> On 11/04/16 10:24, Yousuf 'Jay' Philips wrote:
>> On 04/05/2016 05:38 PM, Wols Lists wrote:
>>> Just seen this - one little comment ...
>>>
>>> "Prefer graphical widgets in favor of controls that require the input of
>>> an exact value (e.g. an image’s transparency with discrete steps via
>>> sliders)."
>>>
>>> I'm not sure how appropriate it is in these circumstances, but one of
>>> the things that drives me up the wall with guis is how you're forced to
>>> use sliders/mice so much. A graphical widget should have a button that
>>> converts it into an input window - eg I sometimes want to enter colours
>>> as pantones.
>>>
>>> Most people are visual. Most people prefer sliders. Just remember that
>>> some of us don't ... :-) That's why I'm a WordPerfect fan - it's so easy
>>> to use an input dialog that plonks things *exactly* where you want them
>>> rather than dragging and hoping you've dropped it in the right place :-)
>>
>> Though we will be introducing more graphical widgets, they will be
>> accompanied by regular input fields that users can view/input the exact
>> value. E.g. the transparency slider and spinbox field in the area
>> content panel.
>>
> That's great. It's just that sometimes us text people get forgotten :-(
> 

Text input is also important for screen reader users :) I guess you can
make a slider accessible, but a text entry will always work better.

Best,
-- 
Jacobo Aragunde
Software Engineer at Igalia
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stefan Weiberg]

 mysqlc/source/mysqlc_connection.hxx|4 ++--
 mysqlc/source/mysqlc_databasemetadata.hxx  |4 ++--
 mysqlc/source/mysqlc_driver.hxx|4 ++--
 mysqlc/source/mysqlc_preparedstatement.hxx |2 +-
 mysqlc/source/mysqlc_resultset.hxx |4 ++--
 mysqlc/source/mysqlc_resultsetmetadata.hxx |4 ++--
 mysqlc/source/mysqlc_statement.hxx |4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit cf1ecad26d22e3dc5f556f976bdc49a31bfa5630
Author: Stefan Weiberg 
Date:   Mon Apr 11 14:47:39 2016 +

tdf#88206: use variadic variants for cppu helper

Change-Id: I58a00f721cbb37f97fdbc599d57c26b1e89f4c73
Reviewed-on: https://gerrit.libreoffice.org/23998
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/mysqlc/source/mysqlc_connection.hxx 
b/mysqlc/source/mysqlc_connection.hxx
index 50ac3c5..8d83af7 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -37,7 +37,7 @@
 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 
@@ -61,7 +61,7 @@ namespace connectivity
 using ::com::sun::star::uno::RuntimeException;
 typedef css::uno::Reference< css::container::XNameAccess > 
my_XNameAccessRef;
 
-typedef ::cppu::WeakComponentImplHelper3<   css::sdbc::XConnection,
+typedef ::cppu::WeakComponentImplHelper<   css::sdbc::XConnection,
 
css::sdbc::XWarningsSupplier,
 css::lang::XServiceInfo
 > OMetaConnection_BASE;
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx 
b/mysqlc/source/mysqlc_databasemetadata.hxx
index 531ba50..bf2bf2e 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -23,7 +23,7 @@
 #include "mysqlc_connection.hxx"
 
 #include 
-#include 
+#include 
 
 #include 
 
@@ -37,7 +37,7 @@ namespace connectivity
 // Class: ODatabaseMetaData
 
 
-typedef ::cppu::WeakImplHelper1< css::sdbc::XDatabaseMetaData> 
ODatabaseMetaData_BASE;
+typedef ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData> 
ODatabaseMetaData_BASE;
 
 class ODatabaseMetaData : public ODatabaseMetaData_BASE
 {
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index 0d1f3a3..d0c322c 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -35,7 +35,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 
@@ -50,7 +50,7 @@ namespace connectivity
 using ::com::sun::star::uno::Sequence;
 Reference< css::uno::XInterface > SAL_CALL 
MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& 
_rxFactory) throw(Exception);
 
-typedef ::cppu::WeakComponentImplHelper2<   css::sdbc::XDriver,
+typedef ::cppu::WeakComponentImplHelper<   css::sdbc::XDriver,
 css::lang::XServiceInfo > 
ODriver_BASE;
 
 typedef void* (SAL_CALL * 
OMysqlCConnection_CreateInstanceFunction)(void* _pDriver);
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx 
b/mysqlc/source/mysqlc_preparedstatement.hxx
index d5c657d..4a99290 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -41,7 +41,7 @@ namespace connectivity
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::sdbc::XResultSetMetaData;
 
-typedef ::cppu::ImplHelper5

Re: [libreoffice-design] Minutes of the Design Hangout: 2016-04-01

[Wols Lists]

On 11/04/16 10:24, Yousuf 'Jay' Philips wrote:
> On 04/05/2016 05:38 PM, Wols Lists wrote:
>> Just seen this - one little comment ...
>>
>> "Prefer graphical widgets in favor of controls that require the input of
>> an exact value (e.g. an image’s transparency with discrete steps via
>> sliders)."
>>
>> I'm not sure how appropriate it is in these circumstances, but one of
>> the things that drives me up the wall with guis is how you're forced to
>> use sliders/mice so much. A graphical widget should have a button that
>> converts it into an input window - eg I sometimes want to enter colours
>> as pantones.
>>
>> Most people are visual. Most people prefer sliders. Just remember that
>> some of us don't ... :-) That's why I'm a WordPerfect fan - it's so easy
>> to use an input dialog that plonks things *exactly* where you want them
>> rather than dragging and hoping you've dropped it in the right place :-)
> 
> Though we will be introducing more graphical widgets, they will be
> accompanied by regular input fields that users can view/input the exact
> value. E.g. the transparency slider and spinbox field in the area
> content panel.
> 
That's great. It's just that sometimes us text people get forgotten :-(

It would be nice if it's explicitly stated in the guidelines that the
presence of such text-box entry fields should be a MANDATORY option
(where they make sense, of course). It's fine for them to be tucked
away, but they need to be there.

(And I'm minded of a story about MS-Access. Because everything was
visual, this guy thought "hey, you can't visualise this relational
concept. Can you do it in Access? Probably not!" and he was right.
Probably Joe Celko.)

Cheers,
Wol

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

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

[Stephan Bergmann]

 framework/inc/classes/framecontainer.hxx |5 
 framework/source/services/frame.cxx  |  287 +++
 2 files changed, 146 insertions(+), 146 deletions(-)

New commits:
commit 5183dad60e5a5ce04f1f606a09d5ef3e850a464d
Author: Stephan Bergmann 
Date:   Mon Apr 11 16:50:02 2016 +0200

Lock member access in Frame::disposing

What a mess.  Ideally, Frame would use its own rBHelper.rMutex, not 
SolarMutex.
But much of the framework code it calls into uses SolarMutex, too, making it
difficult to change that without running into the risk of deadlock.  And 
then,
some member variables are cleared early in Frame::disposing, while others 
are
only cleared en bloc at the end.  Be conservative and keep it that way (as 
other
Frame functions recursively called from within Frame::disposing could 
observe
the difference and rely on the current behavior), even if that means 
creating
lots of small, independent locked regions within Frame::disposing (which 
can be
detrimental to both performance and correctness).

Change-Id: I28f9a379ce03ed661e96c7deb8eb73cb58fb2cf7

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 69aaf5b..4cc239c 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -385,7 +389,6 @@ private:
 // non threadsafe
 void impl_checkMenuCloser( 
   );
 void impl_setCloser  ( const css::uno::Reference< 
css::frame::XFrame2 >& xFrame , bool bState );
-void impl_disposeContainerWindow (   css::uno::Reference< 
css::awt::XWindow >&   xWindow  );
 
 void disableLayoutManager(const css::uno::Reference< 
css::frame::XLayoutManager2 >& xLayoutManager);
 
@@ -2088,10 +2091,21 @@ void SAL_CALL Frame::disposing()
 // We will die, die and die ...
 implts_stopWindowListening();
 
-if (m_xLayoutManager.is())
-disableLayoutManager(m_xLayoutManager);
+css::uno::Reference layoutMgr;
+{
+SolarMutexGuard g;
+layoutMgr = m_xLayoutManager;
+}
+if (layoutMgr.is()) {
+disableLayoutManager(layoutMgr);
+}
 
-delete m_pWindowCommandDispatch;
+WindowCommandDispatch * disp = nullptr;
+{
+SolarMutexGuard g;
+std::swap(disp, m_pWindowCommandDispatch);
+}
+delete disp;
 
 // Send message to all listener and forget her references.
 css::lang::EventObject aEvent( xThis );
@@ -2102,7 +2116,11 @@ void SAL_CALL Frame::disposing()
 
 // interception/dispatch chain must be destructed explicitly
 // Otherwise some dispatches and/or interception objects won't die.
-css::uno::Reference< css::lang::XEventListener > 
xDispatchHelper(m_xDispatchHelper, css::uno::UNO_QUERY_THROW);
+css::uno::Reference< css::lang::XEventListener > xDispatchHelper;
+{
+SolarMutexGuard g;
+xDispatchHelper.set(m_xDispatchHelper, css::uno::UNO_QUERY_THROW);
+}
 xDispatchHelper->disposing(aEvent);
 xDispatchHelper.clear();
 
@@ -2126,10 +2144,14 @@ void SAL_CALL Frame::disposing()
 // It's important to do that before we free some other internal structures.
 // Because if our parent gets an activate and found us as last possible 
active frame
 // he try to deactivate us ... and we run into some trouble 
(DisposedExceptions!).
-if( m_xParent.is() )
+css::uno::Reference parent;
+{
+SolarMutexGuard g;
+std::swap(parent, m_xParent);
+}
+if( parent.is() )
 {
-m_xParent->getFrames()->remove( xThis );
-m_xParent.clear();
+parent->getFrames()->remove( xThis );
 }
 
 /* } SAFE */
@@ -2139,23 +2161,32 @@ void SAL_CALL Frame::disposing()
 // Note: Dispose it hard - because suspending must be done inside close() 
call!
 // But try to dispose the controller first before you destroy the window.
 // Because the window is used by the controller too ...
-if (m_xController.is())
+css::uno::Reference< css::lang::XComponent > xDisposableCtrl;
+css::uno::Reference< css::lang::XComponent > xDisposableComp;
 {
-css::uno::Reference< css::lang::XComponent > xDisposable( 
m_xController, css::uno::UNO_QUERY );
-if (xDisposable.is())
-xDisposable->dispose();
-}
-
-if (m_xComponentWindow.is())
-{
-css::uno::Reference< css::lang::XComponent > xDisposable( 
m_xComponentWindow, css::uno::UNO_QUERY );
-if (xDisposable.is())
-xDisposable->dispose();
+SolarMutexGuard g;
+xDisposableCtrl.set( m_xController, css::uno::UNO_QUERY );
+xDisposableComp.set( m_xComponentWindow, css::uno::UNO_QUERY );
 }
+if (xDispos

[Libreoffice-commits] online.git: loolwsd/IoUtil.cpp

[Tor Lillqvist]

 loolwsd/IoUtil.cpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0f3fa0e9d443efe95418510cba9d40c068964731
Author: Tor Lillqvist 
Date:   Mon Apr 11 17:16:34 2016 +0300

Don't log the payload inside a CLOSE frame

It is a status code, a 2-byte unsigned integer in network byte order,
potentially followed by a textual reason. But we never include any
specific status codes in the CLOSE frames anyway. (With a Poco-based
WebSocket peer it is always WS_NORMAL_CLOSE, 1000, 0x03 0xE8.)

diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index 4dacbb4..0b9caaa 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -163,7 +163,8 @@ void SocketProcessor(std::shared_ptr ws,
  << ", n: " << n
  << ", payload size: " << payload.size()
  << ", flags: " << std::hex << flags << Log::end;
-if (payload.size() > 1)
+
+if ((flags & WebSocket::FRAME_OP_BITMASK) != WebSocket::FRAME_OP_CLOSE 
&& payload.size() > 1)
 {
 std::string msg;
 Poco::URI::encode(std::string(payload.data(), payload.size()), "", 
msg);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/README

[Tor Lillqvist]

 loolwsd/README |   22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

New commits:
commit ccf73d159d41f38f71263b210086e28d57a5d29f
Author: Tor Lillqvist 
Date:   Mon Apr 11 17:04:16 2016 +0300

Mention libtoolize, and that building from tarball is simpler

(Is it?)

diff --git a/loolwsd/README b/loolwsd/README
index d5aa4be..7034b9d 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -25,17 +25,25 @@ On Debian 8 (Linux x86_64) you can use in 
/etc/apt/sources.list:
 Building
 
 
-loolwsd uses autoconf/automake, so build using the usual:
-
-MASTER=/path/to/built/core.git # configure for your system
+loolwsd uses autoconf/automake, so especially when building from .git
+(as opposed to from a distribution tarball) you need the usual fun:
 
 autoreconf
+libtoolize
 automake --add-missing
+
+possibly iterating several times...
+
+and then
+
 ./configure --enable-silent-rules --with-lokit-path=${MASTER}/include
 make
 
+
 where ${MASTER} is the location of the LibreOffice source tree.
 
+When building from a tarball less magic is needed.
+
 Run 'make check' after each commit. Requires loolwsd to be running.
 
 Note that the loolforkit program needs the CAP_SYS_CHROOT capability,
commit 9929842a692a8c43ce13b201e215e6f4b18c2aa8
Author: Tor Lillqvist 
Date:   Mon Apr 11 17:00:11 2016 +0300

It is loolforkit that has capabilities now, not loolwsd

diff --git a/loolwsd/README b/loolwsd/README
index a7f409f..d5aa4be 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -38,7 +38,7 @@ where ${MASTER} is the location of the LibreOffice source 
tree.
 
 Run 'make check' after each commit. Requires loolwsd to be running.
 
-Note that the loolwsd program needs the CAP_SYS_CHROOT capability,
+Note that the loolforkit program needs the CAP_SYS_CHROOT capability,
 thus you will be asked the root password when running make as it
 invokes sudo to run /sbin/setcap.
 
@@ -157,9 +157,9 @@ When the crash happens too early, you also want to
 so that you have time to attach to the process.
 
 Then run loolwsd, and attach your debugger to the process you are
-interested in. Note that as the loolwsd executable file has
-capabilities set, you need to run the debugger with super-user
-privilege.
+interested in. Note that as the loolforkit executable file has
+capabilities set, so when debugging that you need to run the debugger
+with super-user privilege.
 
 Also, note that as the child processes run in a chroot environment,
 they see the LibreOffice shared libraries as being in a directory tree
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - include/sax include/svtools include/svx include/toolkit include/tools include/ucbhelper include/unotools include/vbahelper sax/source svtools/inc svtools/so

[Noel Grandin]

 include/sax/fshelper.hxx|4 ++--
 include/svtools/headbar.hxx |2 +-
 include/svtools/unoimap.hxx |2 +-
 include/svx/PaletteManager.hxx  |2 +-
 include/svx/SmartTagItem.hxx|6 +++---
 include/svx/svdmodel.hxx|4 ++--
 include/svx/tbcontrl.hxx|2 +-
 include/svx/unoapi.hxx  |4 ++--
 include/toolkit/controls/roadmapcontrol.hxx |8 
 include/tools/b3dtrans.hxx  |2 +-
 include/ucbhelper/content.hxx   |2 +-
 include/unotools/ucbhelper.hxx  |4 ++--
 include/unotools/ucbstreamhelper.hxx|   10 +-
 include/vbahelper/vbashapes.hxx |4 ++--
 sax/source/tools/fshelper.cxx   |4 ++--
 svtools/inc/table/tablecontrol.hxx  |2 +-
 svtools/source/control/headbar.cxx  |2 +-
 svtools/source/misc/dialogcontrolling.cxx   |2 +-
 svtools/source/table/tablecontrol.cxx   |2 +-
 svtools/source/table/tablecontrol_impl.cxx  |2 +-
 svtools/source/table/tablecontrol_impl.hxx  |2 +-
 svtools/source/uno/unoimap.cxx  |2 +-
 svx/source/dialog/rubydialog.cxx|4 ++--
 svx/source/fmcomp/gridcell.cxx  |2 +-
 svx/source/form/fmpgeimp.cxx|2 +-
 svx/source/form/fmvwimp.cxx |2 +-
 svx/source/inc/fmpgeimp.hxx |2 +-
 svx/source/inc/gridcell.hxx |2 +-
 svx/source/items/SmartTagItem.cxx   |6 +++---
 svx/source/sidebar/line/LineWidthValueSet.cxx   |2 +-
 svx/source/sidebar/line/LineWidthValueSet.hxx   |2 +-
 svx/source/svdraw/svdmodel.cxx  |4 ++--
 svx/source/table/accessibletableshape.cxx   |4 ++--
 svx/source/tbxctrls/PaletteManager.cxx  |2 +-
 svx/source/tbxctrls/tbcontrl.cxx|4 ++--
 svx/source/unodraw/unopage.cxx  |2 +-
 svx/source/unodraw/unoshape.cxx |4 ++--
 svx/source/xml/xmlxtexp.cxx |2 +-
 svx/source/xml/xmlxtimp.cxx |2 +-
 toolkit/source/controls/roadmapcontrol.cxx  |8 
 toolkit/source/controls/unocontrolcontainer.cxx |2 +-
 tools/source/generic/b3dtrans.cxx   |2 +-
 ucbhelper/source/client/content.cxx |2 +-
 unotools/source/ucbhelper/ucbhelper.cxx |4 ++--
 unotools/source/ucbhelper/ucblockbytes.cxx  |   20 ++--
 unotools/source/ucbhelper/ucbstreamhelper.cxx   |   12 ++--
 vbahelper/source/vbahelper/vbafillformat.cxx|2 +-
 vbahelper/source/vbahelper/vbafillformat.hxx|2 +-
 vbahelper/source/vbahelper/vbashapes.cxx|4 ++--
 49 files changed, 90 insertions(+), 90 deletions(-)

New commits:
commit 2c93d340ae4e854b5c9d3aa8c38a8bba0ae6b74b
Author: Noel Grandin 
Date:   Mon Apr 11 15:11:42 2016 +0200

clang-tidy performance-unnecessary-value-param in vbahelper

Change-Id: Ifbe78c4a43b9d77d6ecf481bb1a9aaac6bcd01a6

diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx
index 22ba0aa..78bdc33 100644
--- a/include/vbahelper/vbashapes.hxx
+++ b/include/vbahelper/vbashapes.hxx
@@ -52,8 +52,8 @@ protected:
 
 public:
 ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, 
const css::uno::Reference< css::uno::XComponentContext >& xContext, const 
css::uno::Reference< css::container::XIndexAccess >& xShapes, const 
css::uno::Reference< css::frame::XModel >& xModel );
-static void setDefaultShapeProperties( css::uno::Reference< 
css::drawing::XShape > xShape ) throw (css::uno::RuntimeException);
-static void setShape_NameProperty( css::uno::Reference< 
css::drawing::XShape > xShape, const OUString& sName );
+static void setDefaultShapeProperties( const css::uno::Reference< 
css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException);
+static void setShape_NameProperty( const css::uno::Reference< 
css::drawing::XShape >& xShape, const OUString& sName );
 //XEnumerationAccess
 virtual css::uno::Type SAL_CALL getElementType() throw 
(css::uno::RuntimeException) override;
 virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL 
createEnumeration() throw (css::uno::RuntimeException) override;
diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx 
b/vbahelper/source/vbahelper/vbafillformat.cxx
index 0313dd8..31f77dd 100644
--- a/vbahelper/source/vbahelper/vbafillformat.cxx
+++ b/vbahelper/source/vbahelper/vbafillformat.cxx
@@ -26,7 +26,7 @@
 using namespace ooo::vba;
 using namespace com::sun::star;
 
-ScVbaFillFormat::ScVbaFillFormat( const uno::Reference< XHelperInterface >& 
xParent, const uno::Reference< uno::XComp

[Libreoffice-commits] core.git: Branch 'private/tml/splitgroup' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/tml/crack-1' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/tml/cp-4.2-ia2' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arnaud Versini]

 basic/source/basmgr/basmgr.cxx |   43 +++--
 1 file changed, 20 insertions(+), 23 deletions(-)

New commits:
commit d036e4df855798b31ff0e782c98be43be455883f
Author: Arnaud Versini 
Date:   Sun Apr 10 10:34:48 2016 +0200

BASIC: Remove useless static_cast from basmgr.cxx

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

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index dd8602f..6278462 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -179,9 +179,8 @@ void BasMgrContainerListenerImpl::insertLibraryImpl( const 
uno::Reference< scrip
 
 if( !pMgr->GetLib( aLibName ) )
 {
-BasicManager* pBasMgr = static_cast< BasicManager* >( pMgr );
 StarBASIC* pLib =
-pBasMgr->CreateLibForLibContainer( aLibName, xScriptCont );
+pMgr->CreateLibForLibContainer( aLibName, xScriptCont );
 DBG_ASSERT( pLib, "XML Import: Basic library could not be created");
 }
 
@@ -190,8 +189,7 @@ void BasMgrContainerListenerImpl::insertLibraryImpl( const 
uno::Reference< scrip
 {
 // Register listener for library
 Reference< container::XContainerListener > xLibraryListener
-= static_cast< container::XContainerListener* >
-( new BasMgrContainerListenerImpl( pMgr, aLibName ) );
+= new BasMgrContainerListenerImpl( pMgr, aLibName );
 xLibContainer->addContainerListener( xLibraryListener );
 }
 
@@ -534,7 +532,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const 
OUString& rBaseURL, Star
 // in an 6.0+ office. So also the old basic dialogs can be saved.
 tools::SvRef xManagerStream = 
rStorage.OpenSotStream( szManagerStream, eStreamReadMode );
 mpImpl->mpManagerStream = new SvMemoryStream();
-static_cast(&xManagerStream)->ReadStream( 
*mpImpl->mpManagerStream );
+xManagerStream->ReadStream( *mpImpl->mpManagerStream );
 
 tools::SvRef xBasicStorage = rStorage.OpenSotStorage( 
szBasicStorage, eStorageReadMode, false );
 if( xBasicStorage.Is() && !xBasicStorage->GetError() )
@@ -546,7 +544,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const 
OUString& rBaseURL, Star
 BasicLibInfo& rInfo = *mpImpl->aLibs[nL];
 tools::SvRef xBasicStream = 
xBasicStorage->OpenSotStream( rInfo.GetLibName(), eStreamReadMode );
 mpImpl->mppLibStreams[nL] = new SvMemoryStream();
-static_cast(&xBasicStream)->ReadStream( *( 
mpImpl->mppLibStreams[nL] ) );
+xBasicStream->ReadStream( *( mpImpl->mppLibStreams[nL] ) );
 }
 }
 }
@@ -607,8 +605,7 @@ void BasicManager::SetLibraryContainerInfo( const 
LibraryContainerInfo& rInfo )
 // Register listener for lib container
 OUString aEmptyLibName;
 uno::Reference< container::XContainerListener > xLibContainerListener
-= static_cast< container::XContainerListener* >
-( new BasMgrContainerListenerImpl( this, aEmptyLibName ) );
+= new BasMgrContainerListenerImpl( this, aEmptyLibName );
 
 uno::Reference< container::XContainer> xLibContainer( xScriptCont, 
uno::UNO_QUERY );
 xLibContainer->addContainerListener( xLibContainerListener );
@@ -1801,8 +1798,7 @@ uno::Any ModuleContainer_Impl::getByName( const OUString& 
aName )
 SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr;
 if( !pMod )
 throw container::NoSuchElementException();
-uno::Reference< script::XStarBasicModuleInfo > xMod = 
static_cast(new ModuleInfo_Impl
-( aName, "StarBasic", pMod->GetSource32() ));
+uno::Reference< script::XStarBasicModuleInfo > xMod = new ModuleInfo_Impl( 
aName, "StarBasic", pMod->GetSource32() );
 uno::Any aRetAny;
 aRetAny <<= xMod;
 return aRetAny;
@@ -1941,7 +1937,8 @@ sal_Bool DialogContainer_Impl::hasElements()
 for( sal_Int16 nObj = 0; nObj < nCount ; nObj++ )
 {
 SbxVariable* pVar = mpLib->GetObjects()->Get( nObj );
-if ( nullptr != dynamic_cast( pVar) && ( 
static_cast(pVar)->GetSbxId() == SBXID_DIALOG ) )
+SbxObject* pObj = dynamic_cast(pVar);
+if ( pObj && (pObj->GetSbxId() == SBXID_DIALOG ) )
 {
 bRet = true;
 break;
@@ -1955,15 +1952,14 @@ uno::Any DialogContainer_Impl::getByName( const 
OUString& aName )
 throw(container::NoSuchElementException, lang::WrappedTargetException, 
uno::RuntimeException, std::exception)
 {
 SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE );
-if( !( pVar && nullptr != dynamic_cast( pVar) &&
-   ( static_cast(pVar)->GetSbxId() == SBXID_DIALOG ) ) )
+SbxObject* pObj = dynamic_cast(pVar);
+if( !( pObj &

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

[Miklos Vajna]

 sd/source/filter/eppt/pptx-epptooxml.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 0207ed2a00f1a5962d9b920bdf9898937476aa85
Author: Miklos Vajna 
Date:   Mon Apr 11 12:57:47 2016 +0200

sd: inline BEGIN_SHAPE/END_SHAPE macros

They are used only once.

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

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 014ea00..e968e33 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1877,9 +1877,6 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, 
PageType ePageType, bool
 pFS->endElementNS( XML_p, XML_spTree );
 }
 
-#define BEGIN_SHAPE mpFS->startElementNS( XML_p, XML_sp, FSEND )
-#define END_SHAPE mpFS->endElementNS( XML_p, XML_sp )
-
 ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > 
xShape, PageType ePageType, bool bPresObj )
 {
 if( ( ePageType == NOTICE && bPresObj ) || ePageType == LAYOUT )
@@ -1902,7 +1899,7 @@ bool PowerPointShapeExport::WritePlaceholder( Reference< 
XShape > xShape, Placeh
 
 ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > 
xShape, PlaceholderType ePlaceholder )
 {
-BEGIN_SHAPE;
+mpFS->startElementNS( XML_p, XML_sp, FSEND );
 
 // non visual shape properties
 mpFS->startElementNS( XML_p, XML_nvSpPr, FSEND );
@@ -1960,7 +1957,7 @@ ShapeExport& 
PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > x
 
 WriteTextBox( xShape, XML_p );
 
-END_SHAPE;
+mpFS->endElementNS( XML_p, XML_sp );
 
 return *this;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |   48 ++---
 1 file changed, 25 insertions(+), 23 deletions(-)

New commits:
commit 93efd7ebbad293d3729b8ea4b9726aff498f607f
Author: Caolán McNamara 
Date:   Mon Apr 11 13:27:39 2016 +0100

Resolves: tdf#98366 paste document has 10x10 sized SdPages...

so long lines in them are clipped out in the preview.

Change-Id: I355986ff4a9c9e53f8e8f5d41b63f74c633f41ee

diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx 
b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 358d5de..2b0e78a 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -90,30 +90,32 @@ namespace sdr
 
 if(bIsLine)
 {
+//tdf#63955 if we have an extremely long line then clip it to a
+//very generous range of -1 page width/height vs +1 page
+//width/height to avoid oom and massive churn generating a huge
+//polygon chain to cover the length in applyLineDashing if this
+//line is dashed
 const SdrPage* pPage = GetPathObj().GetPage();
-double fPageWidth = pPage ? pPage->GetWdt() : 0.0;
-double fPageHeight = pPage ? pPage->GetHgt() : 0.0;
-if (fPageWidth && fPageHeight)
-{
-//tdf#63955 if we have an extremely long line then clip it
-//to a very generous range of -1 page width/height vs +1
-//page width/height to avoid oom and massive churn
-//generating a huge polygon chain to cover the length in
-//applyLineDashing if this line is dashed
-//tdf#97276 don't clip if the underlying page dimension
-//is unknown
-basegfx::B2DRange aClipRange(-fPageWidth, -fPageHeight,
- fPageWidth*2, fPageHeight*2);
-aUnitPolyPolygon = 
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
-   
aClipRange, true, true);
-nPolyCount = ensureGeometry(aUnitPolyPolygon);
-
-// re-check that we have't been clipped out to oblivion
-bIsLine =
-!aUnitPolyPolygon.areControlPointsUsed()
-&& 1 == nPolyCount
-&& 2 == aUnitPolyPolygon.getB2DPolygon(0).count();
-}
+sal_Int32 nPageWidth = pPage ? pPage->GetWdt() : 0;
+sal_Int32 nPageHeight = pPage ? pPage->GetHgt() : 0;
+
+//But, see tdf#97276 and tdf#98366. Don't clip too much if the
+//underlying page dimension is unknown or a paste document
+//where the page sizes use the odd default of 10x10
+nPageWidth = std::max(21000, nPageWidth);
+nPageHeight = std::max(29700, nPageHeight);
+basegfx::B2DRange aClipRange(-nPageWidth, -nPageHeight,
+ nPageWidth*2, nPageHeight*2);
+
+aUnitPolyPolygon = 
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
+   aClipRange, 
true, true);
+nPolyCount = ensureGeometry(aUnitPolyPolygon);
+
+// re-check that we have't been clipped out to oblivion
+bIsLine =
+!aUnitPolyPolygon.areControlPointsUsed()
+&& 1 == nPolyCount
+&& 2 == aUnitPolyPolygon.getB2DPolygon(0).count();
 }
 
 if(bIsLine)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - basic/source include/basic solenv/inc vcl/source

[Stephan Bergmann]

 basic/source/sbx/sbxform.cxx   |   16 +++---
 include/basic/sbxform.hxx  |4 -
 solenv/inc/doxygen.cfg |3 -
 solenv/inc/doxygen_doc.cfg |3 -
 solenv/inc/doxygen_tag.cfg |3 -
 vcl/source/filter/igif/gifread.cxx |   87 +++-
 vcl/source/filter/igif/gifread.hxx |   89 -
 vcl/source/filter/ixbm/xbmread.cxx |   41 -
 vcl/source/filter/ixbm/xbmread.hxx |   44 --
 vcl/source/filter/ixpm/xpmread.cxx |   78 
 vcl/source/filter/ixpm/xpmread.hxx |   81 -
 vcl/source/filter/jpeg/jpegcomp.h  |   20 +---
 vcl/source/filter/jpeg/transupp.c  |   24 -
 vcl/source/fontsubset/sft.cxx  |   37 ++-
 vcl/source/fontsubset/ttcr.cxx |   25 +++---
 15 files changed, 251 insertions(+), 304 deletions(-)

New commits:
commit a2f91994dffb5945ff70de864591d594d2fe7f59
Author: Stephan Bergmann 
Date:   Fri Apr 8 22:23:06 2016 +0200

Avoid reserved identifier

Change-Id: I6dfb2961adeb412405c58e0a0b51e130cbd3e0c3

diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 3323d4f..92c8bc8 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -227,7 +227,7 @@ void SbxBasicFormater::ParseBack( OUStringBuffer& sStrg, 
const OUString& sFormat
 }
 }
 
-#ifdef _with_sprintf
+#ifdef with_sprintf_
 
 
 void SbxBasicFormater::InitScan( double _dNum )
@@ -657,7 +657,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
 bZeroSpaceOn = false;
 
 
-#ifdef _with_sprintf
+#ifdef with_sprintf_
 InitScan( dNumber );
 #endif
 // scanning the format-string:
@@ -697,7 +697,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
 for( short j = nMaxDigit; j > nDigitPos; j-- )
 {
 short nTempDigit;
-#ifdef _with_sprintf
+#ifdef with_sprintf_
 AppendDigit( sReturnStrg, nTempDigit = 
GetDigitAtPosScan( j, bFoundFirstDigit ) );
 #else
 AppendDigit( sReturnStrg, nTempDigit = 
GetDigitAtPos( dNumber, j, dNumber, bFoundFirstDigit ) );
@@ -730,7 +730,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
 else
 {
 short nTempDigit;
-#ifdef _with_sprintf
+#ifdef with_sprintf_
 AppendDigit( sReturnStrg, nTempDigit = GetDigitAtPosScan( 
nDigitPos, bFoundFirstDigit ) );
 #else
 AppendDigit( sReturnStrg, nTempDigit = GetDigitAtPos( 
dNumber, nDigitPos, dNumber, bFoundFirstDigit ) );
@@ -760,7 +760,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
 {
 for( short j = nMaxExponentDigit; j > nExponentPos; 
j-- )
 {
-#ifdef _with_sprintf
+#ifdef with_sprintf_
 AppendDigit( sReturnStrg, GetDigitAtPosExpScan( 
dExponent, j, bFoundFirstDigit ) );
 #else
 AppendDigit( sReturnStrg,GetDigitAtPos( dExponent, 
j, dExponent, bFoundFirstDigit ) );
@@ -775,7 +775,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
 }
 else
 {
-#ifdef _with_sprintf
+#ifdef with_sprintf_
 AppendDigit( sReturnStrg, GetDigitAtPosExpScan( dExponent, 
nExponentPos, bFoundFirstDigit ) );
 #else
 AppendDigit( sReturnStrg, GetDigitAtPos( dExponent, 
nExponentPos, dExponent, bFoundFirstDigit ) );
@@ -817,7 +817,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
 }
 
 bool bOverflow = false;
-#ifdef _with_sprintf
+#ifdef with_sprintf_
 short nNextDigit = GetDigitAtPosScan( nDigitPos, 
bFoundFirstDigit );
 #else
 short nNextDigit = GetDigitAtPos( dNumber, nDigitPos, dNumber, 
bFoundFirstDigit );
@@ -916,7 +916,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
 // scan completed - rounding necessary?
 if( !bScientific )
 {
-#ifdef _with_sprintf
+#ifdef with_sprintf_
 short nNextDigit = GetDigitAtPosScan( nDigitPos, bFoundFirstDigit );
 #else
 short nNextDigit = GetDigitAtPos( dNumber, nDigitPos, dNumber, 
bFoundFirstDigit );
diff --git a/include/basic/sbxform.hxx b/include/basic/sbxform.hxx
index ff32b37..4832ed3 100644
--- a/include/basic/sbxform.hxx
+++ b/include/basic/sbxform.hxx
@@ -73,7 +73,7 @@
 a) use sprintf()
 b) use log10() and pow() digit
 */
-#define _with_sprintf   // use a)
+#define with_sprintf_   // use a)
 
 #include 
 #include 
@@ -115,7 +115,7 @@ class BASIC_DLLPUBLIC SbxBasicFormater {
 BASIC_DLLPRIVATE void   StrRoundDigit( OUStringBuffer& sStrg, short nPos );
 BASIC_DLLPRIVATE void   ParseBack( OUStringBuffer& sStrg, const OUString& 
sFormatStrg,
 

[Libreoffice-commits] online.git: Changes to 'distro/collabora/cloudsuite-rc2'

[Tor Lillqvist]

New branch 'distro/collabora/cloudsuite-rc2' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara]

 dbaccess/source/ui/inc/dbu_misc.hrc |2 +-
 dbaccess/source/ui/misc/WCPage.cxx  |2 +-
 dbaccess/source/ui/misc/WizardPages.src |4 ++--
 dbaccess/uiconfig/ui/copytablepage.ui   |   16 +++-
 4 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 87e949b68e9931ed5f19ab6ceb8a709ec2d3d6cf
Author: Muhammet Kara 
Date:   Sun Apr 10 22:25:14 2016 +0300

tdf#49554 Fix misleading error message

Fix misleading error message about primary key
on first page of table import wizard, and give
additional info about the process by adding
an info label.

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

diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc 
b/dbaccess/source/ui/inc/dbu_misc.hrc
index 61b5d67..48b1ee5 100644
--- a/dbaccess/source/ui/inc/dbu_misc.hrc
+++ b/dbaccess/source/ui/inc/dbu_misc.hrc
@@ -25,7 +25,7 @@
 #define IMG_DOWNRID_STR_MISC_START +  1
 #define STR_WIZ_COLUMN_SELECT_TITEL RID_STR_MISC_START +  2
 #define STR_WIZ_TYPE_SELECT_TITEL   RID_STR_MISC_START +  3
-#define STR_WIZ_PKEY_ALREADY_DEFINEDRID_STR_MISC_START +  4
+#define STR_WIZ_NAME_ALREADY_DEFINEDRID_STR_MISC_START +  4
 #define STR_WIZ_NAME_MATCHING_TITEL RID_STR_MISC_START +  5
 #define STR_WIZ_TABLE_COPY  RID_STR_MISC_START +  6
 #define STR_COPYTABLE_TITLE_COPYRID_STR_MISC_START +  7
diff --git a/dbaccess/source/ui/misc/WCPage.cxx 
b/dbaccess/source/ui/misc/WCPage.cxx
index c866e3e..1613036 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -205,7 +205,7 @@ bool OCopyTable::LeavePage()
 if (m_pParent->m_bCreatePrimaryKeyColumn
 &&  m_pParent->m_aKeyName != 
m_pParent->createUniqueName(m_pParent->m_aKeyName) )
 {
-OUString aInfoString( ModuleRes(STR_WIZ_PKEY_ALREADY_DEFINED) );
+OUString aInfoString( ModuleRes(STR_WIZ_NAME_ALREADY_DEFINED) );
 aInfoString += " ";
 aInfoString += m_pParent->m_aKeyName;
 m_pParent->showError(aInfoString);
diff --git a/dbaccess/source/ui/misc/WizardPages.src 
b/dbaccess/source/ui/misc/WizardPages.src
index ed04106..4f2d1e8 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -31,9 +31,9 @@ String STR_WIZ_TYPE_SELECT_TITEL
 Text [ en-US ] = "Type formatting";
 };
 
-String STR_WIZ_PKEY_ALREADY_DEFINED
+String STR_WIZ_NAME_ALREADY_DEFINED
 {
-Text [ en-US ] = "The following fields have already been set as primary 
keys:\n";
+Text [ en-US ] = "Enter a unique name for the new primary key data 
field.\nThe following name is already in use:";
 };
 
 String STR_WIZ_NAME_MATCHING_TITEL
diff --git a/dbaccess/uiconfig/ui/copytablepage.ui 
b/dbaccess/uiconfig/ui/copytablepage.ui
index ca94cde..dd082b4 100644
--- a/dbaccess/uiconfig/ui/copytablepage.ui
+++ b/dbaccess/uiconfig/ui/copytablepage.ui
@@ -112,7 +112,7 @@
 
 
   
-Crea_te primary 
key
+Crea_te new 
field as primary key
 True
 True
 False
@@ -167,6 +167,20 @@
 6
   
 
+
+  
+True
+False
+0
+Existing data 
fields can be set as primary key on the type formatting step (third page) of 
the wizard.
+True
+72
+  
+  
+0
+7
+  
+
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 framework/source/uielement/menubarmanager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 654fa8aaed2f959103e3402e2036e9b1e0d734fc
Author: Stephan Bergmann 
Date:   Mon Apr 11 13:43:16 2016 +0200

loplugin:stringconstant

Change-Id: I4776cca99c362998a979507880dce1eccf8e5e04

diff --git a/framework/source/uielement/menubarmanager.cxx 
b/framework/source/uielement/menubarmanager.cxx
index 0e32ae1..3c74936 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -861,7 +861,7 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, 
bool )
 if ( !pMenuItemHandler->xPopupMenuController.is() 
&&
  m_xPopupMenuControllerFactory->hasController( 
pMenuItemHandler->aMenuItemURL, m_aModuleIdentifier ) )
 {
-if( xMenuItemDispatch.is() || 
!pMenuItemHandler->aMenuItemURL.equalsAscii( ".uno:RecentFileList") )
+if( xMenuItemDispatch.is() || 
pMenuItemHandler->aMenuItemURL != ".uno:RecentFileList" )
 bPopupMenu = CreatePopupMenuController( 
pMenuItemHandler );
 }
 else if ( 
pMenuItemHandler->xPopupMenuController.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes20' - sal/osl

[László Németh]

 sal/osl/w32/time.c |   22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 378f9d7e70f3702d53480df65841b1baa390c460
Author: László Németh 
Date:   Fri Apr 1 23:16:27 2016 +0200

osl_getSystemTime: use high precision timer of W32, if available

Change-Id: I7029f37639ead7a8b597ff39d1abcd295fab0551

diff --git a/sal/osl/w32/time.c b/sal/osl/w32/time.c
index 90d659a..325c57e 100644
--- a/sal/osl/w32/time.c
+++ b/sal/osl/w32/time.c
@@ -35,10 +35,28 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal)
 FILETIME   CurTime, OffTime;
 __int64Value;
 
+typedef BOOL (WINAPI *CheckTokenMembership_PROC)( HANDLE, PSID, PBOOL );
+
+static HMODULE  hModule = NULL;
+static CheckTokenMembership_PROCpCheckTokenMembership = NULL;
+
 OSL_ASSERT(pTimeVal != 0);
 
-GetSystemTime(&SystemTime);
-SystemTimeToFileTime(&SystemTime, &CurTime);
+if ( !hModule )
+{
+hModule = GetModuleHandleA( "Kernel32.dll" );
+if ( hModule )
+pCheckTokenMembership = (CheckTokenMembership_PROC)GetProcAddress( 
hModule, "GetSystemTimePreciseAsFileTime" );
+}
+
+// use ~1 microsecond resolution if available
+if ( pCheckTokenMembership )
+GetSystemTimePreciseAsFileTime(&CurTime);
+else
+{
+GetSystemTime(&SystemTime);
+SystemTimeToFileTime(&SystemTime, &CurTime);
+}
 
 SystemTime.wYear = 1970;
 SystemTime.wMonth= 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing SVG attribute "stroke-miterlimit" ( tdf#48066)

[Armin Le Grand]

Hi Regina,

comments inline :-)

Am 10.04.2016 um 00:46 schrieb Regina Henschel:

Hi all,

I have put a patch to Gerrit https://gerrit.libreoffice.org/#/c/23946/
It does only rendering, MetaActions are missing. But it is already so 
large, that I think a review would be good before I continue. Because 
I can only build and test on Windows, I would be glad, if you would 
test and review it for Linux and MacOSX.


I cannot help with Mac - have no possibility to build currently myself.
I can do a linux build - you can do that too on a VirtualMachine, I use 
that ;-)






For the warning-break [1] on MacOSX from Jenkins I need some help. I 
cannot compile or test on Mac.
The value fMiterMinimumAngle has to be used in case eLineJoin == 
basegfx::B2DLineJoin::Miter in OpenGLSalGraphicsImpl::DrawPolyLine 
around line 886.

In content this has to happen in that place:
if ('current miter length' > 'miter limit')
then use the same statements as in case Bevel
else use the statement in line 892.

But I'm not sure about the meaning of variable 'length' in line#885.


The MetaPolyLineAction gets a LineInfo and a tools::Polygon, but 
LineInfo does neither contain miter minimum angle nor miter limit. 
Therefore my question is, how to resolve it. Making a total new 
MetaAction? Or extend LineInfo (similar as ExtLineInfo in pdfwriter)? 
Or extend MetaPolyLineAction to take a PolygonStrokePrimitive2D or a 
B2DPolyPolygon plus the needed line and stroke information separate?


Hard to say. It belongs logically to LineInfo, so I would opt to put it 
there. MetaActions support new versions, so the old will ignore the new 
values, the new can read them. It is necessary to set useful defaults 
when old Metafile is loaded, not to forget!




The module com::sun::star::rendering has a struct StrokeAttributes, 
which would contain all needed information. How is that currently 
used? Is it useful?


A fast grep shows that it is used in canvas and cppcanvas. It uses 
sal_Int8 for Cap and Join types, this makes it less useful from my POV...



Regards,
Armin



Kind regards
Regina


[1]
/Users/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/MacOSX/vcl/opengl/gdiimpl.cxx:770:167: 
error: unused parameter 'fMiterMinimumAngle' [-Werror,-Wunused-parameter]
void OpenGLSalGraphicsImpl::DrawPolyLine(const basegfx::B2DPolygon& 
rPolygon, float fLineWidth, basegfx::B2DLineJoin eLineJoin, 
css::drawing::LineCap eLineCap, float fMiterMinimumAngle)




--
--
ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2)

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

Re: Implementing SVG attribute "stroke-miterlimit" ( tdf#48066)

[Armin Le Grand]

Hi Regina,

comments inline :-)

Am 08.04.2016 um 18:27 schrieb Regina Henschel:

Hi Armin,

since yesterday I have thought about it. I now think, that I will use 
the GDI+ type 'LineJoinMiterClipped'. That makes rendering inside LO 
consistent and that is more important as interoperability with foreign 
applications. It is then still possible to implement the use of the 
GDI+ type 'LineJoinMiter' in addition later on, and use it for pptx.


I checked and agree - when the limit is exceeded, fallback to bevel 
should happen. This is exactly what we do and what others do, e.g. cairo:


"If the current line join style is set to |CAIRO_LINE_JOIN_MITER| 
 
(see |cairo_set_line_join()| 
), 
the miter limit is used to determine whether the lines should be joined 
with a bevel instead of a miter. Cairo divides the length of the miter 
by the line width. If the result is greater than the miter limit, the 
style is converted to a bevel."




It is not a problem of scaling, but the kind how the sharp corner is 
clipped is fundamental different.


Yes, extending it somehow - instead of just doing a bevel it 'keeps' 
some lengths - stragne ;.)




If you think I should do it different, please tell me.

Next problem: When testing a curve I got bug
https://bugs.documentfoundation.org/show_bug.cgi?id=99165 Rendering of 
mitered curve changes with zoom level
That is independent of SVG, but effects the rendering of SVG too. Do 
you have a code pointer, where I should look for the reason?


I am surprised - and indeed, it is already in aoo. Sigh.
Entry is in VclPixelProcessor2D::tryDrawPolygonStrokePrimitive2DDirect, 
two hits, 1st is the fat line, 2nd the hairline. This goes down to the 
Gdiplus renderer WinSalGraphicsImpl::drawPolyLine which does


const Gdiplus::REAL aMiterLimit(15.0);
Gdiplus::DllExports::GdipSetPenMiterLimit(pTestPen, 
aMiterLimit);
Gdiplus::DllExports::GdipSetPenLineJoin(pTestPen, 
Gdiplus::LineJoinMiter);


If this does not work (hopefully better with LineJoinMiterClipped) we 
have a problem with WIndows.
BTW: jumping in the debugger over tryDrawPolygonStrokePrimitive2DDirect 
in VclPixelProcessor2D::processBasePrimitive2D and using the 
decomposition works...


Regards,
Armin



The state is now, that I have finished the transport of 
fMiterMinimumAngle for Windows. The rendering is already good with 
decomposition and with anti-aliasing on as well, here on Windows. I 
have started to adapt the headers for the other OS. A MetaXYAction is 
still missing.


Kind regards
Regina

Armin Le Grand schrieb:

Hi Regina,

yes, the MiterLimits are different in different systems, but all are
somehow specified using the angle between the two vectors involved. I
remember to have seen some definitions, most using the same and 15 as
default value. The ways to be compatible with MS are:
- find a definition somewhere, mqaybe in forums or newsgroups (I have
none, sorry)
- reverse engineer by trying out. Probability is high that there is a
(linear?) relationship between the values, so it might be a simple 
scaling

HTH!

Regards,
Armin

Am 07.04.2016 um 14:35 schrieb Regina Henschel:

Hi all,

I have made some progress. But a new problem comes up.

I have changed WinSalGraphicsImpl::drawPolyLine [3] so that it gets an
additional parameter fMiterMinimumAngle (same meaning as in
createAreaGeometryForJoin) and uses it for gdi+. The rendering in
edit-mode in Draw and Impress is correct then with gdi+ on Windows.
Even Text in SVG works out of the box. [BTW: The current rendering
using gdi+ is wrong, see my report bug#99102.]

The behavior of gdi+ is described in [1]. To get the same kind of
behavior as in LO, when the miter limit is exceeded, the LineJoin type
'LineJoinMiterClipped' has to be used.

Being only in LibreOffice and SVG, that would be no problem. But MS
seems to use different defaults. The rendering in PowerPoint looks
like gdi+ type 'LineJoinMiter'. The specification for 'lim' in
ECMA-376, Part 1, chapter 20.1.8.43, has no details, and I have not
found details otherwhere.

This gdi+ type 'LineJoinMiter' kind of clipping (see the image in the
article [1]) will be used in SVG 2 [2] too under the identifier
'miter-clip'.

So my question: Ignore interoperability with MS? If not, how to 
solve it?


Kind regards
Regina

[1]
https://msdn.microsoft.com/en-us/library/windows/desktop/ms534148%28v=vs.85%29.aspx 




[2] https://www.w3.org/TR/svg-strokes/#StrokeShape

[3]
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 7febbe8..36ecb31 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -2031,7 +2031,8 @@ bool WinSalGraphicsImpl::drawPolyLine(
 double fTransparency,
 const basegfx::B2DVector& rLineWidths,
 basegfx::B2DLineJoin eLineJoin,
-css::drawing::LineCap eLi

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

[Oliver Specht]

 framework/source/uielement/menubarmanager.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit daf209b64d36ee5261ee18e91548d02ce374fbe3
Author: Oliver Specht 
Date:   Mon Apr 11 11:32:52 2016 +0200

allow disabling recent files menu entry

patch 85071c6c7b120935b03926228916393a94aa5ef0 fixed the problem of submenus
in tools/language but broke the disabling of the recent files menu entry
This patch makes it possible to disable and the recent files entry without
breaking other menu entries

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

diff --git a/framework/source/uielement/menubarmanager.cxx 
b/framework/source/uielement/menubarmanager.cxx
index 9b4b334..0e32ae1 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -861,7 +861,8 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, 
bool )
 if ( !pMenuItemHandler->xPopupMenuController.is() 
&&
  m_xPopupMenuControllerFactory->hasController( 
pMenuItemHandler->aMenuItemURL, m_aModuleIdentifier ) )
 {
-bPopupMenu = CreatePopupMenuController( 
pMenuItemHandler );
+if( xMenuItemDispatch.is() || 
!pMenuItemHandler->aMenuItemURL.equalsAscii( ".uno:RecentFileList") )
+bPopupMenu = CreatePopupMenuController( 
pMenuItemHandler );
 }
 else if ( 
pMenuItemHandler->xPopupMenuController.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - extras/source

[Andras Timar]

 extras/source/autocorr/lang/hr/DocumentList.xml   |  957 +++---
 extras/source/autocorr/lang/hr/SentenceExceptList.xml |  176 +++
 2 files changed, 584 insertions(+), 549 deletions(-)

New commits:
commit 3030da902bf62d2952c638c7db2cbf83b69214d8
Author: Andras Timar 
Date:   Thu Apr 7 13:54:16 2016 +0200

tdf#98771 Update DocumentList.xml and SentenceExceptionList.xml for Croatian

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

diff --git a/extras/source/autocorr/lang/hr/DocumentList.xml 
b/extras/source/autocorr/lang/hr/DocumentList.xml
index 3a2453e..04ef508 100644
--- a/extras/source/autocorr/lang/hr/DocumentList.xml
+++ b/extras/source/autocorr/lang/hr/DocumentList.xml
@@ -1,553 +1,72 @@
 
 http://openoffice.org/2001/block-list";>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  http://"/>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
+  
   
   
+  
   
   
   
@@ -555,42 +74,74 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
   
   
   
+  
+  
   
   
   
   
+  
   
+  
+  
+  
   
   
   
   
   
+  
+  
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
+  
   
   
   
   
   
   
+  
   
   
   
+  
+  
   
   
   
+  
   
   
   
+  
   
+  
   
   
   
+  
   
   
   
@@ -600,14 +151,15 @@
   
   
   
+  
   
   
   
-  
   
   
   
   
+  
   
   
   
@@ -617,15 +169,23 @@
   
   
   
+  
   
   
   
   
   
   
+  
+  
+  
+  
+  
+  
   
   
   
+  
   
   
   
@@ -645,6 +205,7 @@
   
   
   
+  
   
   
   
@@ -652,8 +213,10 @@
   
   
   
+  
   
   
+  
   
   
   
@@ -665,10 +228,12 @@
   
   
   
+  
   
   
   
   
+  
   
   
   
@@ -677,37 +242,60 @@
   
   
   
+  
   
   
   
   
   
+  
+  
+  
   
   
+  
+  
   
   
   
   
+  
   
+  
   
+  
   
   
   
   
+  
+  
+  
+  
   
   
   
   
   
+  
   
   
+  
+  
   
+  
+  
   
   
+  
+  
   
+  
+  
   
   
   
+  
   
   
   
@@ -717,11 +305,17 @@
   
   
   
+  
+  
   
   
   
+  
+  
+  
   
   
+  
   
   
   
@@ -729,20 +323,31 @@
   
   
   
+  
+  
+  
   
   
+  
   
+  
+  
   
   
   
+  
   
   
   
   
   
+  
+  
   
+  
   
   
+  
   
   
   
@@ -754,38 +359,58 @@
   
   
   
+  
   
   
+  
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
+  
   
+  
+  
+  
   
+  
+  
   
   
+  
+  
+  
   
   
   
+  
   
   
   
   
   
   
+  
   
+  
+  
+  
+  
   
   
   
+  
   
   
   
@@ -793,9 +418,14 @@
   
   
   
+  
+  
+  
+  
   
   
   
+  
   
   
   
@@ -806,6 +436,11 @@
   
   
   
+  
+  
+  
+  
+  
   
   
   
@@ -820,12 +455,14 @@
   
   
   
+  
   
   
   
   
   
   
+  

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

[Juergen Funk]

 vcl/win/window/salframe.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 58bcea744ac4d9f73f055527369ef54cbc8f1a97
Author: Juergen Funk 
Date:   Sat Mar 26 10:37:13 2016 +0100

tdf#87944 COLOR-PICKER stays on wrong position.

After this patch dab2582f05979cd99a5937cb95a387cfed70bb8d
under windows always open on the wrong position
(open in the middle of the application but not under the
pushbutton)

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

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 63b96ca..f04d923 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1310,6 +1310,9 @@ void WinSalFrame::SetPosSize( long nX, long nY, long 
nWidth, long nHeight,
 
 nX = aPt.x;
 nY = aPt.y;
+
+// the position is set
+mbDefPos = false;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/DocumentBroker.cpp

[Tor Lillqvist]

 loolwsd/DocumentBroker.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eb5fcdba93ab639a7bb8041ea2e51513b1531b80
Author: Tor Lillqvist 
Date:   Mon Apr 11 13:31:03 2016 +0300

Consistenly put a colon after the "editlock" in the message sent to the 
client

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 4a582fe..3bc698a 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -276,7 +276,7 @@ void DocumentBroker::removeWSSession(const std::string id)
 {
 haveEditLock = it->second->isEditLocked();
 it->second->setEditLock(false);
-it->second->sendTextFrame("editlock 0");
+it->second->sendTextFrame("editlock: 0");
 _wsSessions.erase(it);
 }
 
@@ -287,7 +287,7 @@ void DocumentBroker::removeWSSession(const std::string id)
 if (it != _wsSessions.end())
 {
 it->second->setEditLock(true);
-it->second->sendTextFrame("editlock 1");
+it->second->sendTextFrame("editlock: 1");
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - extras/source

[Krunoslav Šebetić]

 extras/source/autocorr/lang/hr/DocumentList.xml   |  541 --
 extras/source/autocorr/lang/hr/SentenceExceptList.xml |  176 +
 2 files changed, 173 insertions(+), 544 deletions(-)

New commits:
commit 72a7b8d08649ecea2b749d72c660d0d9ecf05abd
Author: Krunoslav Šebetić 
Date:   Thu Apr 7 13:37:07 2016 +0200

tdf#98771 Update DocumentList.xml and SentenceExceptionList.xml for Croatian

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

diff --git a/extras/source/autocorr/lang/hr/DocumentList.xml 
b/extras/source/autocorr/lang/hr/DocumentList.xml
index de70c18..04ef508 100644
--- a/extras/source/autocorr/lang/hr/DocumentList.xml
+++ b/extras/source/autocorr/lang/hr/DocumentList.xml
@@ -1,546 +1,5 @@
 
 http://openoffice.org/2001/block-list";>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  http://"/>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   
   
   
diff --git a/extras/source/autocorr/lang/hr/SentenceExceptList.xml 
b/extras/source/autocorr/lang/hr/SentenceExceptList.xml
index ef336ba..5fff8d7 100644
--- a/extras/source/autocorr/lang/hr/SentenceExceptList.xml
+++ b/extras/source/autocorr/lang/hr/SentenceExceptList.xml
@@ -1,6 +1,176 @@
 
 http://openoffice.org/2001/block-list";>
-  
-  
-  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung]

 framework/source/loadenv/loadenv.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9230b2b09a8dc0ea71263a1c321f4f63a222ac9
Author: Mark Hung 
Date:   Sat Apr 9 23:45:28 2016 +0800

tdf#48300 bring window to top and restore window when minimized.

While XWindow->ToTop() in Linux do the both for default ( None ),
ToTopFlags::RestoreWhenMin has to be specified in Windows in order
to restore the window, and ToTopFlags::ForegroundTask is necessary
when ToTopFlags::RestoreWhenMin is specified in order to bring
non-minimized window to the front.

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

diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 6084133..5daa223 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1655,7 +1655,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const 
css::uno::Reference< css::awt::X
 }
 
 if( pWindow->IsVisible() && (bForceFrontAndFocus || bForceToFront) )
-pWindow->ToTop();
+pWindow->ToTop( ToTopFlags::RestoreWhenMin | 
ToTopFlags::ForegroundTask );
 else
 pWindow->Show(true, (bForceFrontAndFocus || bForceToFront) ? 
ShowFlags::ForegroundTask : ShowFlags::NONE );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/sfx2 sfx2/source

[Katarina Behrens]

 include/sfx2/sidebar/ContextList.hxx|1 +
 sfx2/source/sidebar/ContextList.cxx |   20 
 sfx2/source/sidebar/ResourceManager.cxx |9 -
 sfx2/source/sidebar/TabBar.cxx  |   10 ++
 4 files changed, 35 insertions(+), 5 deletions(-)

New commits:
commit 9da397de852b5d7a6eb77293030ea895bd42a2cd
Author: Katarina Behrens 
Date:   Tue Mar 22 16:32:47 2016 +0100

tdf#97398: Toggle deck/panel visibility individually for each app

Change in visibility of a shared deck ('any, any, ...') or panel
made in 1 app must not affect its visibility in the remaining apps

Change-Id: I78472ce078409edec796ef649349df4bda62a709
Reviewed-on: https://gerrit.libreoffice.org/23432
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit 1a045a9df7918adf4c0d8a62db3331f120266c6e)
Reviewed-on: https://gerrit.libreoffice.org/23712
Reviewed-by: Miklos Vajna 

diff --git a/include/sfx2/sidebar/ContextList.hxx 
b/include/sfx2/sidebar/ContextList.hxx
index 9c56d15..8e9c1ce 100644
--- a/include/sfx2/sidebar/ContextList.hxx
+++ b/include/sfx2/sidebar/ContextList.hxx
@@ -55,6 +55,7 @@ public:
 const bool bIsInitiallyVisible,
 const ::rtl::OUString& rsMenuCommand);
 
+void ToggleVisibilityForContext( const Context& rContext,const bool 
bIsInitiallyVisible );
 const ::std::vector& GetEntries() const {return maEntries;};
 
 private:
diff --git a/sfx2/source/sidebar/ContextList.cxx 
b/sfx2/source/sidebar/ContextList.cxx
index 6b95196..f515dcf 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -85,6 +85,26 @@ void ContextList::AddContextDescription (
 maEntries.back().msMenuCommand = rsMenuCommand;
 }
 
+void ContextList::ToggleVisibilityForContext( const Context &rContext, const 
bool bVisible)
+{
+ContextList::Entry *pEntry = GetMatch( rContext );
+
+if ( pEntry )
+{
+const sal_Int32 nMatch( rContext.EvaluateMatch( pEntry->maContext ) );
+
+if ( nMatch & Context::ApplicationWildcardMatch )
+{
+// Create a separate context list entry for this app if 'any'
+// is the only context that matches. Toggling the visibility
+// for 'any' would change it for all apps, not just this one
+AddContextDescription( rContext, bVisible, OUString() );
+}
+else if ( nMatch == Context::OptimalMatch || nMatch == 
Context::ContextWildcardMatch )
+pEntry->mbIsInitiallyVisible = bVisible;
+}
+}
+
 } } // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ResourceManager.cxx 
b/sfx2/source/sidebar/ResourceManager.cxx
index 1389c53..b2f9d17 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -54,7 +54,7 @@ bool getBool(utl::OConfigurationNode const & aNode, const 
char* pNodeName)
 return comphelper::getBOOL(aNode.getNodeValue(pNodeName));
 }
 
-css::uno::Sequence BuildContextList (ContextList rContextList, bool 
isEnabled)
+css::uno::Sequence BuildContextList (ContextList rContextList)
 {
 const ::std::vector& entries = 
rContextList.GetEntries();
 
@@ -69,7 +69,7 @@ css::uno::Sequence BuildContextList (ContextList 
rContextList, bool is
 OUString menuCommand = iEntry->msMenuCommand;
 
 OUString visibility;
-if (isEnabled)
+if (iEntry->mbIsInitiallyVisible)
 visibility = "visible";
 else
 visibility = "hidden";
@@ -323,7 +323,7 @@ void ResourceManager::SaveDeckSettings(const 
DeckDescriptor* pDeckDesc)
 
 // save deck settings
 
-::uno::Sequence< OUString > sContextList = 
BuildContextList(pDeckDesc->maContextList, pDeckDesc->mbIsEnabled);
+::uno::Sequence< OUString > sContextList = 
BuildContextList(pDeckDesc->maContextList);
 
 utl::OConfigurationNode aDeckNode 
(aDeckRootNode.openNode(pDeckDesc->msNodeName));
 
@@ -353,10 +353,9 @@ void ResourceManager::SaveDeckSettings(const 
DeckDescriptor* pDeckDesc)
 {
 Panel* aPanel = *iPanel;
 OUString panelId = aPanel->GetId();
-bool isExpanded = aPanel->IsExpanded();
 const PanelDescriptor* pPanelDesc = 
GetPanelDescriptor(panelId);
 
-::uno::Sequence< OUString > sPanelContextList = 
BuildContextList(pPanelDesc->maContextList, isExpanded);
+::uno::Sequence< OUString > sPanelContextList = 
BuildContextList(pPanelDesc->maContextList);
 
 utl::OConfigurationNode aPanelNode 
(aPanelRootNode.openNode(pPanelDesc->msNodeName));
 
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 0c99317..ef6e185 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -337,8 +337,18 @@ void TabBar::ToggleHideFlag (const sal_Int32 nIndex

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

[Giuseppe Castagno]

 include/sfx2/dinfdlg.hxx   |6 ++--
 sfx2/source/dialog/dinfdlg.cxx |   59 +++--
 2 files changed, 38 insertions(+), 27 deletions(-)

New commits:
commit cab0323ebce6f46baad32c41829e3a5e93a10e4b
Author: Giuseppe Castagno 
Date:   Mon Feb 29 10:30:01 2016 +0100

tdf#74885 Fix direction in CMIS property editor scrollbar

Use outer container size to compute scroll max range.
Remove class member function no longer used.
Remove class field no longer used.
Rename some local variables.

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

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 9fe1553..5cd2c50 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -557,7 +557,6 @@ struct CmisPropertyLine : public VclBuilderContainer
 std::vector< CmisValue* > m_aValues;
 std::vector< CmisDateTime* >  m_aDateTimes;
 std::vector< CmisYesNo* > m_aYesNos;
-sal_Int32 m_nNumValue;
 long getItemHeight() const;
 CmisPropertyLine( vcl::Window* pParent );
 virtual ~CmisPropertyLine();
@@ -576,8 +575,8 @@ public:
 CmisPropertiesWindow(SfxTabPage* pParent);
 ~CmisPropertiesWindow();
 
-sal_uInt16 GetLineCount() const;
 inline sal_Int32 GetItemHeight() const { return m_nItemHeight; }
+inline long getBoxHeight() const { return 
VclContainer::getLayoutRequisition(*m_pBox).Height(); };
 void AddLine( const OUString& sId, const OUString& sName,
   const OUString& sType, const bool bUpdatable,
   const bool bRequired, const bool bMultiValued,
@@ -639,6 +638,9 @@ public:
 virtual void dispose() override;
 
 static VclPtr Create( vcl::Window* pParent, const SfxItemSet* 
);
+virtual void SetPosSizePixel(const Point& rAllocPos, const Size& 
rAllocation) override;
+virtual void SetSizePixel(const Size& rAllocation) override;
+virtual void SetPosPixel(const Point& rAllocPos) override;
 };
 
 #endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 792f831..a2bf84e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2314,7 +2314,6 @@ CmisPropertyLine::CmisPropertyLine(vcl::Window* pParent)
 , m_bRequired(false)
 , m_bMultiValued(false)
 , m_bOpenChoice(false)
-, m_nNumValue(1)
 {
 m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), 
"sfx/ui/cmisline.ui");
 get( m_pFrame, "CmisFrame" );
@@ -2364,7 +2363,6 @@ long CmisPropertyLine::getItemHeight() const
 CmisPropertiesWindow::CmisPropertiesWindow(SfxTabPage* pParent):
 m_aNumberFormatter( ::comphelper::getProcessComponentContext(),
 
Application::GetSettings().GetLanguageTag().getLanguageType() )
-
 {
 pParent->get(m_pBox, "CmisWindow");
 CmisPropertyLine aTemp( m_pBox );
@@ -2388,16 +2386,6 @@ void CmisPropertiesWindow::ClearAllLines()
 m_aCmisPropertiesLines.clear();
 }
 
-sal_uInt16 CmisPropertiesWindow::GetLineCount() const
-{
-sal_uInt16 nCount = 0;
-std::vector< CmisPropertyLine* >::const_iterator pIter;
-for ( pIter = m_aCmisPropertiesLines.begin();
-  pIter != m_aCmisPropertiesLines.end(); ++pIter )
-nCount += ( (*pIter)->m_nNumValue + 1 );
-return nCount;
-}
-
 void CmisPropertiesWindow::AddLine( const OUString& sId, const OUString& sName,
 const OUString& sType, const bool 
bUpdatable,
 const bool bRequired, const bool 
bMultiValued,
@@ -2417,8 +2405,8 @@ void CmisPropertiesWindow::AddLine( const OUString& sId, 
const OUString& sName,
 Sequence< sal_Int64 > seqValue;
 rAny >>= seqValue;
 sal_uInt32 nIndex = m_aNumberFormatter.GetFormatIndex( 
NF_NUMBER_SYSTEM );
-sal_Int32 m_nNumValue = seqValue.getLength( );
-for ( sal_Int32 i = 0; i < m_nNumValue; ++i )
+sal_Int32 nNumValue = seqValue.getLength( );
+for ( sal_Int32 i = 0; i < nNumValue; ++i )
 {
 OUString sValue;
 m_aNumberFormatter.GetInputLineString( seqValue[i], nIndex, sValue 
);
@@ -2432,8 +2420,8 @@ void CmisPropertiesWindow::AddLine( const OUString& sId, 
const OUString& sName,
 Sequence< double > seqValue;
 rAny >>= seqValue;
 sal_uInt32 nIndex = m_aNumberFormatter.GetFormatIndex( 
NF_NUMBER_SYSTEM );
-sal_Int32 m_nNumValue = seqValue.getLength( );
-for ( sal_Int32 i = 0; i < m_nNumValue; ++i )
+sal_Int32 nNumValue = seqValue.getLength( );
+for ( sal_Int32 i = 0; i < nNumValue; ++i )
 {
 OUString sValue;
 m_aNumberFormatter.GetInputLineString( seqValue[i], nIndex, sValue 
);
@@ -2447,8 +2435,8 @@

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

[Miklos Vajna]

 include/svx/pageitem.hxx   |4 +++-
 sw/qa/extras/rtfimport/data/tdf65642.rtf   |   23 +++
 sw/qa/extras/rtfimport/rtfimport.cxx   |8 
 writerfilter/source/dmapper/DomainMapper.cxx   |   12 
 writerfilter/source/dmapper/PropertyMap.cxx|4 
 writerfilter/source/dmapper/PropertyMap.hxx|3 +++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   10 +-
 7 files changed, 62 insertions(+), 2 deletions(-)

New commits:
commit 03b3c54039c7459922919af2c227583769677490
Author: Miklos Vajna 
Date:   Tue Mar 22 08:09:01 2016 +0100

tdf#65642 RTF filter: import \pgnrestart and \pgnucltr

This implicitly adds support for DOCX import of  as well.

(cherry picked from commits abaf6bde4ee91c628bd55a7ec2e876a5d0ecff6e and
d29b75c402ea635b3865501e43c9f349885913af)

Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx

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

diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 76260eb..29091d0 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -32,7 +32,9 @@ enum SvxNumType
 SVX_ARABIC,
 SVX_NUMBER_NONE,
 SVX_CHAR_SPECIAL,
-SVX_PAGEDESC
+SVX_PAGEDESC,
+SVX_BITMAP,
+SVX_CHARS_UPPER_LETTER_N
 };
 
 /*
diff --git a/sw/qa/extras/rtfimport/data/tdf65642.rtf 
b/sw/qa/extras/rtfimport/data/tdf65642.rtf
new file mode 100644
index 000..f13d221
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf65642.rtf
@@ -0,0 +1,23 @@
+{\rtf1
+\pard\plain \ltrpar\ql 
\li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0
+{\field\fldedit
+{\*\fldinst
+{ PAGE   \\* MERGEFORMAT }
+}
+{\fldrslt
+{1}
+}
+}
+\sect
+\sectd\pgnrestart\pgnucltr
+{\field\fldedit
+{\*\fldinst
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid525329  PAGE   \\* MERGEFORMAT }
+}
+{\fldrslt
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1024\langfe1024\noproof\insrsid9597790 
A}
+}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid13321744
+\par }
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 7c9c098..4236a48 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2395,6 +2395,14 @@ DECLARE_RTFIMPORT_TEST(testTdf87034, "tdf87034.rtf")
 CPPUNIT_ASSERT_EQUAL(OUString("A1B3C4D"), getParagraph(1)->getString());
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf65642, "tdf65642.rtf")
+{
+// The second page's numbering type: this was style::NumberingType::ARABIC.
+CPPUNIT_ASSERT_EQUAL(style::NumberingType::CHARS_UPPER_LETTER_N, 
getProperty(getStyles("PageStyles")->getByName("Converted1"), 
"NumberingType"));
+// The second page's restart value: this was 0.
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
getProperty(getParagraph(2), "PageNumberOffset"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 9a3ae42..61ff534 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -966,6 +966,18 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 if (pSectionContext != nullptr)
 pSectionContext->SetPageNumber(nIntValue);
 break;
+case NS_ooxml::LN_CT_PageNumber_fmt:
+if (pSectionContext)
+{
+switch (nIntValue)
+{
+case NS_ooxml::LN_Value_ST_NumberFormat_upperLetter:
+// A, B, ...
+
pSectionContext->SetPageNumberType(style::NumberingType::CHARS_UPPER_LETTER_N);
+break;
+}
+}
+break;
 case NS_ooxml::LN_CT_FtnEdn_type:
 // This is the "separator" footnote, ignore its linebreak.
 if (static_cast(nIntValue) == 
NS_ooxml::LN_Value_doc_ST_FtnEdn_separator)
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index dab485f..ad06b9e 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -412,6 +412,7 @@ SectionPropertyMap::SectionPropertyMap(bool 
bIsFirstSection) :
 ,m_bIsLandscape( false )
 ,m_bPageNoRestart( false )
 ,m_nPageNumber( -1 )
+,m_nPageNumberType(-1)
 ,m_nBreakType( -1 )
 ,m_nPaperBin( -1 )
 ,m_nFirstPaperBin( -1 )
@@ -1217,6 +1218,9 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM_Impl )
 

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

[Julien Nabet]

 basic/source/sbx/sbxscan.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f088a556ca17658b442da6ad9ddd52be138750ef
Author: Julien Nabet 
Date:   Mon Apr 11 09:34:13 2016 +0200

Remove an useless check I had added

Reverts partly 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=43109b751bf5fd36318de56b2fb686acc724673f

Change-Id: Ief7fd752d260031e243ea4304f6c55fa4dc42bfd
Reviewed-on: https://gerrit.libreoffice.org/23984
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index e0c8559..f108946 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -531,7 +531,7 @@ static sal_uInt16 printfmtstr( const OUString& rStr, 
OUString& rRes, const OUStr
 aTemp.append( *pStr ? *pStr++ : static_cast< sal_Unicode >(' '));
 pFmt++;
 }
-while( pFmt && *pFmt != '\\' );
+while( *pFmt != '\\' );
 aTemp.append(*pStr ? *pStr++ : static_cast< sal_Unicode >(' '));
 pFmt++; break;
 case '&':
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 loleaflet/src/map/Map.js  |6 --
 loleaflet/src/map/handler/Map.Keyboard.js |7 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit ef2638298a3fe75ffd34fa82330a7e775090918b
Author: Pranav Kant 
Date:   Mon Apr 11 12:39:21 2016 +0530

loleaflet: listen to composition events

Treat 'compositionend' event as 'keypress' event with composited
data.

Change-Id: Ia1d35e3ce2c583259dc6b6179741050ed173fe64

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index a1a768d..c01b430 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -671,7 +671,7 @@ L.Map = L.Evented.extend({
L.DomEvent[onOff](this._container, 'click dblclick mousedown 
mouseup ' +
'mouseover mouseout mousemove contextmenu dragover drop 
' +
'keydown keypress keyup trplclick qdrplclick', 
this._handleDOMEvent, this);
-   L.DomEvent[onOff](this._textArea, 'copy cut paste keydown 
keypress keyup', this._handleDOMEvent, this);
+   L.DomEvent[onOff](this._textArea, 'copy cut paste keydown 
keypress keyup compositionend', this._handleDOMEvent, this);
 
if (this.options.trackResize && 
this._resizeDetector.contentWindow) {
L.DomEvent[onOff](this._resizeDetector.contentWindow, 
'resize', this._onResize, this);
@@ -788,7 +788,9 @@ L.Map = L.Evented.extend({
var data = {
originalEvent: e
};
-   if (e.type !== 'keypress' && e.type !== 'keyup' && e.type !== 
'keydown' && e.type !== 'copy' && e.type !== 'cut' && e.type !== 'paste') {
+   if (e.type !== 'keypress' && e.type !== 'keyup' && e.type !== 
'keydown' &&
+   e.type !== 'copy' && e.type !== 'cut' && e.type !== 
'paste' &&
+   e.type !== 'compositionend') {
data.containerPoint = target instanceof L.Marker ?

this.latLngToContainerPoint(target.getLatLng()) : 
this.mouseEventToContainerPoint(e);
data.layerPoint = 
this.containerPointToLayerPoint(data.containerPoint);
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index b72c246..d6138b2 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -170,11 +170,13 @@ L.Map.Keyboard = L.Handler.extend({
 
this._map.on('mousedown', this._onMouseDown, this);
this._map.on('keydown keyup keypress', this._onKeyDown, this);
+   this._map.on('compositionend', this._onKeyDown, this);
},
 
removeHooks: function () {
this._map.on('mousedown', this._onMouseDown, this);
this._map.off('keydown keyup keypress', this._onKeyDown, this);
+   this._map.off('compositionend', this._onKeyDown, this);
},
 
_setPanOffset: function (pan) {
@@ -257,6 +259,9 @@ L.Map.Keyboard = L.Handler.extend({
 
var charCode = e.originalEvent.charCode;
var keyCode = e.originalEvent.keyCode;
+   if (e.type === 'compositionend') {
+   charCode = keyCode = e.originalEvent.data.charCodeAt();
+   }
var unoKeyCode = this._toUNOKeyCode(keyCode);
 
if (this.modifier) {
@@ -273,7 +278,7 @@ L.Map.Keyboard = L.Handler.extend({
if (e.type === 'keydown' && 
this.handleOnKeyDown[keyCode] && charCode === 0) {
docLayer._postKeyboardEvent('input', charCode, 
unoKeyCode);
}
-   else if (e.type === 'keypress' &&
+   else if ((e.type === 'keypress' || e.type === 
'compositionend') &&
(!this.handleOnKeyDown[keyCode] || charCode !== 
0)) {
if (charCode === keyCode && charCode !== 13) {
// Chrome sets keyCode = charCode for 
printable keys
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Florian Effenberger license statement

[Florian Effenberger]

Hello,

seems I've contributed a little bit of code a while ago, so here we go. ;-)

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


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

[Libreoffice-commits] core.git: 7 commits - basic/source connectivity/source drawinglayer/source editeng/source formula/source include/basic include/connectivity include/drawinglayer include/editeng i

[Noel Grandin]

 basic/source/basmgr/basicmanagerrepository.cxx |4 -
 basic/source/basmgr/basmgr.cxx |   24 +++
 basic/source/classes/sbunoobj.cxx  |   23 ++-
 basic/source/inc/sbunoobj.hxx  |8 +-
 basic/source/runtime/runtime.cxx   |3 
 basic/source/sbx/sbxvar.cxx|2 
 basic/source/uno/dlgcont.cxx   |2 
 basic/source/uno/namecont.cxx  |6 -
 basic/source/uno/scriptcont.cxx|2 
 connectivity/source/commontools/dbtools.cxx|   10 +--
 connectivity/source/drivers/dbase/DTable.cxx   |2 
 connectivity/source/drivers/dbase/dindexnode.cxx   |2 
 connectivity/source/drivers/mork/MDriver.cxx   |2 
 connectivity/source/drivers/mork/MDriver.hxx   |2 
 connectivity/source/drivers/mysql/YUsers.cxx   |4 -
 connectivity/source/inc/dbase/DTable.hxx   |2 
 connectivity/source/inc/dbase/dindexnode.hxx   |2 
 drawinglayer/source/dumper/EnhancedShapeDumper.cxx |   34 +-
 drawinglayer/source/dumper/EnhancedShapeDumper.hxx |   34 +-
 drawinglayer/source/dumper/XShapeDumper.cxx|   52 
 editeng/source/editeng/editeng.cxx |4 -
 editeng/source/editeng/editview.cxx|4 -
 editeng/source/editeng/impedit.hxx |   14 ++--
 editeng/source/editeng/impedit2.cxx|2 
 editeng/source/editeng/impedit4.cxx|   10 +--
 editeng/source/outliner/outlin2.cxx|4 -
 formula/source/core/api/FormulaCompiler.cxx|   10 +--
 include/basic/sbxvar.hxx   |2 
 include/connectivity/CommonTools.hxx   |   10 +--
 include/drawinglayer/XShapeDumper.hxx  |4 -
 include/editeng/editeng.hxx|4 -
 include/editeng/editview.hxx   |4 -
 include/editeng/outliner.hxx   |4 -
 include/formula/FormulaCompiler.hxx|6 -
 include/oox/core/xmlfilterbase.hxx |4 -
 include/oox/crypto/DocumentDecryption.hxx  |2 
 include/oox/export/chartexport.hxx |   67 ++---
 include/oox/export/drawingml.hxx   |   62 +--
 include/oox/export/shapes.hxx  |   58 +-
 include/oox/export/vmlexport.hxx   |2 
 include/oox/helper/grabbagstack.hxx|2 
 include/oox/helper/propertymap.hxx |6 -
 include/oox/ppt/pptshapegroupcontext.hxx   |2 
 include/oox/vml/vmlformatting.hxx  |2 
 include/oox/vml/vmltextbox.hxx |2 
 include/svl/IndexedStyleSheets.hxx |6 -
 include/svl/currencytable.hxx  |2 
 include/svl/documentlockfile.hxx   |2 
 include/svl/style.hxx  |2 
 include/svl/stylepool.hxx  |2 
 oox/inc/drawingml/chart/typegroupconverter.hxx |2 
 oox/inc/drawingml/table/tablecell.hxx  |2 
 oox/inc/drawingml/table/tableproperties.hxx|2 
 oox/source/core/xmlfilterbase.cxx  |   20 +++---
 oox/source/crypto/DocumentDecryption.cxx   |2 
 oox/source/drawingml/chart/typegroupconverter.cxx  |2 
 oox/source/drawingml/table/tablecell.cxx   |4 -
 oox/source/drawingml/table/tableproperties.cxx |6 -
 oox/source/export/chartexport.cxx  |   62 +--
 oox/source/export/drawingml.cxx|   60 +-
 oox/source/export/shapes.cxx   |   60 +-
 oox/source/export/vmlexport.cxx|2 
 oox/source/helper/grabbagstack.cxx |2 
 oox/source/helper/propertymap.cxx  |   10 +--
 oox/source/ole/vbaexport.cxx   |   10 +--
 oox/source/ppt/pptshapegroupcontext.cxx|2 
 oox/source/shape/ShapeFilterBase.cxx   |2 
 oox/source/shape/ShapeFilterBase.hxx   |2 
 oox/source/vml/vmlformatting.cxx   |2 
 oox/source/vml/vmltextbox.cxx  |2 
 sc/inc/compiler.hxx|6 -
 sc/source/core/tool/compiler.cxx   |6 -
 sd/source/filter/eppt/pptx-epptooxml.cxx   |   12 +--
 svl/source/items/IndexedStyleSheets.cxx|6 -
 svl/source/items/style.cxx |2 
 svl/source/items/stylepool.cxx |2 
 svl/source/misc/documentlockfile.cxx   |2 
 svl/source/numbers/currencytable.cxx   |2 
 78 files changed, 404 insertions(+), 415 deletions(-)

New commits:
commit cb9bcae7baf70eba601daba8857b

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

[Stephan Bergmann]

 framework/source/services/frame.cxx |   33 ++---
 1 file changed, 10 insertions(+), 23 deletions(-)

New commits:
commit b9d091e7d4eb3014aa6198f64f414702105b5aab
Author: Stephan Bergmann 
Date:   Mon Apr 11 11:31:59 2016 +0200

No need to clear component context during dispose

...which simplifies access to m_xContext member.

Change-Id: Ia028b5ae26d94527b6668365ab1197103afb8c22

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index fcc0c33..4cab4b4 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -585,10 +585,9 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL 
Frame::loadComponentFromUR
 
 SolarMutexClearableGuard aReadLock;
 css::uno::Reference< css::frame::XComponentLoader > xThis(static_cast< 
css::frame::XComponentLoader* >(this), css::uno::UNO_QUERY);
-css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext;
 aReadLock.clear();
 
-return LoadEnv::loadComponentFromURL(xThis, xContext, sURL, 
sTargetFrameName, nSearchFlags, lArguments);
+return LoadEnv::loadComponentFromURL(xThis, m_xContext, sURL, 
sTargetFrameName, nSearchFlags, lArguments);
 }
 
 
/*-
@@ -779,7 +778,6 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< 
css::awt::XWindow >&
 if (pWindow && pWindow->IsVisible())
 m_bIsHidden = false;
 
-css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext;
 css::uno::Reference< css::frame::XLayoutManager2 >  xLayoutManager = 
m_xLayoutManager;
 
 // Release lock ... because we call some impl methods, which are 
threadsafe by himself.
@@ -793,7 +791,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< 
css::awt::XWindow >&
 // create progress helper
 css::uno::Reference< css::frame::XFrame > xThis
(static_cast< css::frame::XFrame* >(this), 
css::uno::UNO_QUERY_THROW);
 css::uno::Reference< css::task::XStatusIndicatorFactory > 
xIndicatorFactory =
-css::task::StatusIndicatorFactory::createWithFrame(xContext, xThis, 
sal_False/*DisableReschedule*/, sal_True/*AllowParentShow*/ );
+css::task::StatusIndicatorFactory::createWithFrame(m_xContext, xThis, 
sal_False/*DisableReschedule*/, sal_True/*AllowParentShow*/ );
 
 // SAFE -> --
 aWriteLock.reset();
@@ -805,10 +803,10 @@ void SAL_CALL Frame::initialize( const 
css::uno::Reference< css::awt::XWindow >&
 // So superflous messages are filtered to NULL :-)
 implts_startWindowListening();
 
-m_pWindowCommandDispatch = new WindowCommandDispatch(xContext, this);
+m_pWindowCommandDispatch = new WindowCommandDispatch(m_xContext, this);
 
 // Initialize title functionality
-TitleHelper* pTitleHelper = new TitleHelper( xContext );
+TitleHelper* pTitleHelper = new TitleHelper( m_xContext );
 m_xTitleHelper.set(static_cast< ::cppu::OWeakObject* >(pTitleHelper), 
css::uno::UNO_QUERY_THROW);
 pTitleHelper->setOwner(xThis);
 }
@@ -962,7 +960,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::findFrame( const OUStr
 /* SAFE { */
 SolarMutexResettableGuard aReadLock;
 css::uno::Reference< css::frame::XFrame >  xParent  ( 
m_xParent, css::uno::UNO_QUERY );
-css::uno::Reference< css::uno::XComponentContext > xContext = 
m_xContext;
 bool   bIsTopFrame  = 
m_bIsFrameTop;
 bool   bIsTopWindow = 
WindowHelper::isTopWindow(m_xContainerWindow);
 aReadLock.clear();
@@ -974,7 +971,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::findFrame( const OUStr
 
 if ( sTargetFrameName==SPECIALTARGET_BLANK )
 {
-TaskCreator aCreator(xContext);
+TaskCreator aCreator(m_xContext);
 xTarget = aCreator.createTask(sTargetFrameName);
 }
 
@@ -1171,7 +1168,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::findFrame( const OUStr
 (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
)
 {
-TaskCreator aCreator(xContext);
+TaskCreator aCreator(m_xContext);
 xTarget = aCreator.createTask(sTargetFrameName);
 }
 }
@@ -2176,7 +2173,6 @@ void SAL_CALL Frame::disposing()
 // Release some other references.
 // This calls should be easy ... I hope it :-)
 m_xDispatchHelper.clear();
-m_xContext.clear();
 m_xDropTargetListener.clear();
 m_xDispatchRecorderSupplier.clear();
 m_xLayoutManager.clear();
@@ -2495,15 +2491,9 @@ void SAL_CALL Frame::windowClosing( const 
css::lang::EventObject& ) throw( css::
 Otherwhise the dialog "would you save your changes?" will be shown 
more than once ...
   

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

[Akshay Deep]

 include/sfx2/templateabstractview.hxx|8 
 sfx2/source/control/templateabstractview.cxx |9 +
 sfx2/source/control/templatedefaultview.cxx  |1 +
 sfx2/source/control/templatelocalview.cxx|4 ++--
 4 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 2e6ed7e0a0f7395d548cbbff71cb72ba32d10309
Author: Akshay Deep 
Date:   Tue Apr 5 00:36:09 2016 +0530

tdf#89095 Start Center: bigger thumbnails for templates

ThumbnailDefaultView is now able to dynamically update the size of the 
thumbnail in its item.
Removed padding for thumbnails.

Change-Id: Ibc267c848a844098a59525c76e234f4f9c4d0ed1
Reviewed-on: https://gerrit.libreoffice.org/23816
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/include/sfx2/templateabstractview.hxx 
b/include/sfx2/templateabstractview.hxx
index 2ff5a26..81d0a96 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -104,6 +104,11 @@ public:
 
 void setOpenTemplateHdl(const Link &rLink);
 
+void updateThumbnailDimensions(long itemMaxSize);
+
+long getThumbnailWidth() const  { return mnThumbnailWidth;}
+long getThumbnailHeight() const {return mnThumbnailHeight;}
+
 static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height);
 
 static BitmapEx getDefaultThumbnail( const OUString& rPath );
@@ -123,6 +128,9 @@ protected:
 sal_uInt16 mnCurRegionId;
 OUString maCurRegionName;
 
+long mnThumbnailWidth;
+long mnThumbnailHeight;
+
 VclPtr maAllButton;
 VclPtr  maFTName;
 
diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index d0e6ccd..25374e4 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -122,6 +122,8 @@ bool ViewFilter_Application::operator () (const 
ThumbnailViewItem *pItem)
 TemplateAbstractView::TemplateAbstractView (vcl::Window *pParent, WinBits 
nWinStyle, bool bDisableTransientChildren)
 : ThumbnailView(pParent,nWinStyle,bDisableTransientChildren),
   mnCurRegionId(0),
+  mnThumbnailWidth(TEMPLATE_THUMBNAIL_MAX_WIDTH),
+  mnThumbnailHeight(TEMPLATE_THUMBNAIL_MAX_HEIGHT),
   maAllButton(VclPtr::Create(this, 
SfxResId(BTN_ALL_TEMPLATES))),
   maFTName(VclPtr::Create(this, SfxResId(FT_NAME)))
 {
@@ -134,6 +136,8 @@ TemplateAbstractView::TemplateAbstractView (vcl::Window 
*pParent, WinBits nWinSt
 TemplateAbstractView::TemplateAbstractView(vcl::Window *pParent)
 : ThumbnailView(pParent),
   mnCurRegionId(0),
+  mnThumbnailWidth(TEMPLATE_THUMBNAIL_MAX_WIDTH),
+  mnThumbnailHeight(TEMPLATE_THUMBNAIL_MAX_HEIGHT),
   maAllButton(VclPtr::Create(this, 
SfxResId(BTN_ALL_TEMPLATES))),
   maFTName(VclPtr::Create(this, SfxResId(FT_NAME)))
 {
@@ -205,6 +209,11 @@ void TemplateAbstractView::insertItems(const 
std::vector
 updateItems(aItems);
 }
 
+void TemplateAbstractView::updateThumbnailDimensions(long itemMaxSize)
+{
+mnThumbnailWidth = itemMaxSize;
+mnThumbnailHeight = itemMaxSize;
+}
 
 void TemplateAbstractView::setOpenRegionHdl(const Link &rLink)
 {
diff --git a/sfx2/source/control/templatedefaultview.cxx 
b/sfx2/source/control/templatedefaultview.cxx
index 5c17536..aad2187 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -24,6 +24,7 @@ TemplateDefaultView::TemplateDefaultView( Window* pParent)
 Rectangle aScreen = 
Application::GetScreenPosSizePixel(Application::GetDisplayBuiltInScreen());
 mnItemMaxSize = std::min(aScreen.GetWidth(),aScreen.GetHeight()) > 800 ? 
256 : 192;
 ThumbnailView::setItemDimensions( mnItemMaxSize, mnItemMaxSize, 
mnTextHeight, mnItemPadding );
+updateThumbnailDimensions(mnItemMaxSize);
 
 // startcenter specific settings
 maFillColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get());
diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index 070bb0a..7c82737 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -87,8 +87,8 @@ void TemplateLocalView::Populate ()
 aProperties.aName = aName;
 aProperties.aPath = aURL;
 aProperties.aThumbnail = TemplateAbstractView::fetchThumbnail(aURL,
-  
TEMPLATE_THUMBNAIL_MAX_WIDTH,
-  
TEMPLATE_THUMBNAIL_MAX_HEIGHT);
+  
getThumbnailWidth(),
+  
getThumbnailHeight());
 
 pItem->maTemplates.push_back(aProperties);
 }
___
Libreoffice-com

Re: [libreoffice-design] Minutes of the Design Hangout: 2016-04-01

[Yousuf 'Jay' Philips]

On 04/05/2016 05:38 PM, Wols Lists wrote:

Just seen this - one little comment ...

"Prefer graphical widgets in favor of controls that require the input of
an exact value (e.g. an image’s transparency with discrete steps via
sliders)."

I'm not sure how appropriate it is in these circumstances, but one of
the things that drives me up the wall with guis is how you're forced to
use sliders/mice so much. A graphical widget should have a button that
converts it into an input window - eg I sometimes want to enter colours
as pantones.

Most people are visual. Most people prefer sliders. Just remember that
some of us don't ... :-) That's why I'm a WordPerfect fan - it's so easy
to use an input dialog that plonks things *exactly* where you want them
rather than dragging and hoping you've dropped it in the right place :-)


Though we will be introducing more graphical widgets, they will be 
accompanied by regular input fields that users can view/input the exact 
value. E.g. the transparency slider and spinbox field in the area 
content panel.



Cheers,
Wol


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

[Libreoffice-commits] core.git: chart2/source svx/source ucb/source vcl/opengl

[Caolán McNamara]

 chart2/source/controller/accessibility/AccessibleChartShape.hxx |2 +-
 svx/source/sidebar/line/LineWidthValueSet.hxx   |2 +-
 ucb/source/sorter/sortresult.cxx|2 +-
 vcl/opengl/PackedTextureAtlas.cxx   |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b8cd2221bc0376c63b5d9d09fd1fa232b765e229
Author: Caolán McNamara 
Date:   Mon Apr 11 09:14:01 2016 +0100

cppcheck: noExplicitConstructor

Change-Id: Ie25240030fd848a5b30526746206bfd5fe543091

diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx 
b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index e853c50..79c88c3 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -44,7 +44,7 @@ class AccessibleChartShape :
 public impl::AccessibleChartShape_Base
 {
 public:
-AccessibleChartShape( const AccessibleElementInfo& rAccInfo );
+explicit AccessibleChartShape( const AccessibleElementInfo& rAccInfo );
 virtual ~AccessibleChartShape();
 
 //  XServiceInfo 
diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx 
b/svx/source/sidebar/line/LineWidthValueSet.hxx
index 36a17ad..6fb9ae5 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.hxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.hxx
@@ -28,7 +28,7 @@ class LineWidthValueSet
 : public ValueSet
 {
 public:
-LineWidthValueSet(vcl::Window* pParent);
+explicit LineWidthValueSet(vcl::Window* pParent);
 virtual ~LineWidthValueSet();
 virtual void dispose() override;
 
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 47ad05a..43c7493 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -81,7 +81,7 @@ struct SortListData
 sal_IntPtr  mnCurPos;
 sal_IntPtr  mnOldPos;
 
-SortListData( sal_IntPtr nPos );
+explicit SortListData( sal_IntPtr nPos );
 };
 
 
diff --git a/vcl/opengl/PackedTextureAtlas.cxx 
b/vcl/opengl/PackedTextureAtlas.cxx
index 60fa1e9..b176658 100644
--- a/vcl/opengl/PackedTextureAtlas.cxx
+++ b/vcl/opengl/PackedTextureAtlas.cxx
@@ -24,7 +24,7 @@ struct Node
 std::unique_ptr mRightNode;
 bool mOccupied;
 
-Node(Rectangle& aRectangle);
+explicit Node(Rectangle& rRectangle);
 
 bool isLeaf();
 Node* insert(int nWidth, int nHeight, int nPadding);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cppuhelper/source/component.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5c362058471aad3efff85c6a5d146f6e7baa4583
Author: Stephan Bergmann 
Date:   Mon Apr 11 11:03:48 2016 +0200

Fix indentation

Change-Id: Ia043e0a5b7ec9623f6575a83374720be1f3b6b83

diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 1450ad5..ccbf179 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -150,13 +150,13 @@ void OComponentHelper::dispose()
 // Remark: It is an error to call dispose more than once
 bool bDoDispose = false;
 {
-MutexGuard aGuard( rBHelper.rMutex );
-if( !rBHelper.bDisposed && !rBHelper.bInDispose )
-{
-// only one call go into this section
-rBHelper.bInDispose = sal_True;
-bDoDispose = true;
-}
+MutexGuard aGuard( rBHelper.rMutex );
+if( !rBHelper.bDisposed && !rBHelper.bInDispose )
+{
+// only one call go into this section
+rBHelper.bInDispose = sal_True;
+bDoDispose = true;
+}
 }
 
 // Do not hold the mutex because we are broadcasting
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Miklos Vajna]

 bin/gbuild-to-ide |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 363444aa6e6a2a0a81d6a82c4a4d6417291f87a2
Author: Miklos Vajna 
Date:   Mon Apr 11 09:14:09 2016 +0200

vim-ide-integration: clang does not always like gnu++1y that much

And gives the error:

include/c++/4.8/cstdio:120:11: error: no member named 'gets' in the global 
namespace

when it's build against libstdc++.

Commit 9e6221f114ba4422caa79f38ee0a20fb8a8931cd (clang does not like gnu++11
that much, use c++11 instead, 2014-09-06) added support for invoking clang 
for
IDE purposes even in a tree configured for gcc. Extend this in case 
configure
sets -std=gnu++1y for gcc as well.

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

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index f6835bd..ba683a9 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -464,7 +464,10 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
 command += cxxflag
 command += ' -c '
 command += file
-return command.replace('-std=gnu++11', '-std=c++11')
+# Help clang when the tree is configured for gcc.
+for gnu in ('-std=gnu++11', '-std=gnu++1y'):
+command = command.replace(gnu, '-std=c++11')
+return command
 
 
 class KdevelopIntegrationGenerator(IdeIntegrationGenerator):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 4 commits - loolwsd/Common.hpp loolwsd/IoUtil.cpp loolwsd/IoUtil.hpp loolwsd/LOOLWSD.cpp

[Tor Lillqvist]

 loolwsd/Common.hpp  |2 +-
 loolwsd/IoUtil.cpp  |   20 
 loolwsd/IoUtil.hpp  |   22 +++---
 loolwsd/LOOLWSD.cpp |2 +-
 4 files changed, 13 insertions(+), 33 deletions(-)

New commits:
commit a1f4ded793b2b52e5ad98c5cb2836eb4fbd44738
Author: Tor Lillqvist 
Date:   Mon Apr 11 11:28:10 2016 +0300

YAGNI: Drop parameter with default value that is never overridden

No non-default value is never passed. Just use the default value as such in 
the function.

diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index 6ffdcd4..4dacbb4 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -259,8 +259,7 @@ ssize_t readFIFO(int pipe, char* buffer, ssize_t size)
 /// Returns 0 for timeout, <0 for error, and >0 on success.
 /// On success, line will contain the read message.
 int PipeReader::readLine(std::string& line,
- std::function stopPredicate,
- const size_t timeoutMs)
+ std::function stopPredicate)
 {
 const char *endOfLine = static_cast(std::memchr(_data.data(), '\n', _data.size()));
 if (endOfLine != nullptr)
@@ -275,7 +274,7 @@ int PipeReader::readLine(std::string& line,
 
 // Poll in short intervals to check for stop condition.
 const auto pollTimeoutMs = 500;
-auto maxPollCount = timeoutMs / pollTimeoutMs;
+auto maxPollCount = POLL_TIMEOUT_MS / pollTimeoutMs;
 while (maxPollCount-- > 0)
 {
 if (stopPredicate())
@@ -339,11 +338,10 @@ int PipeReader::readLine(std::string& line,
 }
 
 bool PipeReader::processOnce(std::function handler,
- std::function stopPredicate,
- const size_t pollTimeoutMs)
+ std::function stopPredicate)
 {
 std::string line;
-const auto ready = readLine(line, stopPredicate, pollTimeoutMs);
+const auto ready = readLine(line, stopPredicate);
 if (ready == 0)
 {
 // Timeout.
diff --git a/loolwsd/IoUtil.hpp b/loolwsd/IoUtil.hpp
index 494f2a2..10078bb 100644
--- a/loolwsd/IoUtil.hpp
+++ b/loolwsd/IoUtil.hpp
@@ -55,16 +55,14 @@ namespace IoUtil
 /// to check for termination condition.
 /// Intended to be called from a polling loop.
 bool processOnce(std::function handler,
- std::function stopPredicate,
- const size_t pollTimeoutMs = POLL_TIMEOUT_MS);
+ std::function stopPredicate);
 
 private:
 /// Reads a single line from the pipe.
 /// Returns 0 for timeout, <0 for error, and >0 on success.
 /// On success, line will contain the read message.
 int readLine(std::string& line,
- std::function stopPredicate,
- const size_t timeoutMs = POLL_TIMEOUT_MS);
+ std::function stopPredicate);
 
 const std::string _name;
 const int _pipe;
commit 6729bb7726db9aee7f5881902358065b6be67db9
Author: Tor Lillqvist 
Date:   Mon Apr 11 11:23:33 2016 +0300

PipeReader::readLine() is used only internally by processOnce()

diff --git a/loolwsd/IoUtil.hpp b/loolwsd/IoUtil.hpp
index 09107ea..494f2a2 100644
--- a/loolwsd/IoUtil.hpp
+++ b/loolwsd/IoUtil.hpp
@@ -51,13 +51,6 @@ namespace IoUtil
 
 const std::string& getName() const { return _name; }
 
-/// Reads a single line from the pipe.
-/// Returns 0 for timeout, <0 for error, and >0 on success.
-/// On success, line will contain the read message.
-int readLine(std::string& line,
- std::function stopPredicate,
- const size_t timeoutMs = POLL_TIMEOUT_MS);
-
 /// Processes a single line read and invoking stopPredicate
 /// to check for termination condition.
 /// Intended to be called from a polling loop.
@@ -66,6 +59,13 @@ namespace IoUtil
  const size_t pollTimeoutMs = POLL_TIMEOUT_MS);
 
 private:
+/// Reads a single line from the pipe.
+/// Returns 0 for timeout, <0 for error, and >0 on success.
+/// On success, line will contain the read message.
+int readLine(std::string& line,
+ std::function stopPredicate,
+ const size_t timeoutMs = POLL_TIMEOUT_MS);
+
 const std::string _name;
 const int _pipe;
 std::string _data;
commit 077a4436dfc6522ae7d3a9b6a807242ea0daccc1
Author: Tor Lillqvist 
Date:   Mon Apr 11 11:21:18 2016 +0300

Bin unused function PipeReader::process()

diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index e24b121..6ffdcd4 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -363,16 +363,6 @@ bool 
PipeReader::processOnce(std::function handler,
 return true;
 }
 
-void PipeReader::process(std::function handler,
- std::function stopPredicate,
- const size_t pollTimeoutMs)
-

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

[Jochen Nitschke]

 dbaccess/source/core/api/RowSetCache.hxx |4 ++--
 sot/source/sdstor/stgcache.hxx   |8 
 svl/source/config/cjkoptions.cxx |2 +-
 svl/source/config/ctloptions.cxx |2 +-
 vcl/win/gdi/winlayout.cxx|2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b15ee18a5e81b7c3908fb5343930638cac4918d9
Author: Jochen Nitschke 
Date:   Mon Apr 11 09:09:44 2016 +0200

cppcheck: silence warnings assertWithSideEffect

Mark some class methods as pure.
warnings look like this:
> dbaccess/source/core/api/RowSetBase.cxx
> 593assertWithSideEffect   398 warning Assert statement calls
> a function which may have desired side effects: 'isAfterLast'.

Change-Id: I1b69340c3714be4678b599fa9a8ca933122aa857
Reviewed-on: https://gerrit.libreoffice.org/23981
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/dbaccess/source/core/api/RowSetCache.hxx 
b/dbaccess/source/core/api/RowSetCache.hxx
index 86bb8cc..c623d34 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -174,8 +174,8 @@ namespace dbaccess
 
 // css::sdbc::XResultSet
 bool next(  );
-bool isBeforeFirst(  ) { return m_bBeforeFirst;}
-bool isAfterLast(  ) { return m_bAfterLast;}
+bool isBeforeFirst(  ) const { return m_bBeforeFirst;}
+bool isAfterLast(  ) const { return m_bAfterLast;}
 bool isFirst(  );
 bool isLast(  );
 bool beforeFirst(  );
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 3c0d866..d0ac5c8 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -66,13 +66,13 @@ public:
 void  IncRef()  { m_nRef++;   }
 sal_uInt16 DecRef() { return --m_nRef;}
 void  SetPhysPageSize( short );
-sal_Int32 GetPhysPages(){ return m_nPages;}
-short GetPhysPageSize() { return m_nPageSize; }
+sal_Int32 GetPhysPages() const  { return m_nPages;}
+short GetPhysPageSize() const   { return m_nPageSize; }
 SvStream* GetStrm() { return m_pStrm; }
 void  SetStrm( SvStream*, bool );
 void  SetStrm( UCBStorageStream* );
-bool  IsWritable()  { return ( m_pStrm && 
m_pStrm->IsWritable() ); }
-bool  Good(){ return m_nError == SVSTREAM_OK; }
+bool  IsWritable() const{ return ( m_pStrm && 
m_pStrm->IsWritable() ); }
+bool  Good() const  { return m_nError == SVSTREAM_OK; }
 ErrCode GetError()  { return m_nError;}
 void  MoveError( StorageBase& );
 void  SetError( ErrCode );
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index a9b7786..9062501 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -66,7 +66,7 @@ public:
 virtual voidNotify( const css::uno::Sequence< OUString >& 
rPropertyNames ) override;
 voidLoad();
 
-bool IsLoaded() { return bIsLoaded; }
+bool IsLoaded() const   { return bIsLoaded; }
 
 bool IsCJKFontEnabled() const   { return bCJKFont;  }
 bool IsVerticalTextEnabled() const  { return bVerticalText; }
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index e431ecf..7aed551 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -63,7 +63,7 @@ public:
 virtual voidNotify( const Sequence< OUString >& _aPropertyNames ) 
override;
 voidLoad();
 
-boolIsLoaded() { return m_bIsLoaded; }
+boolIsLoaded() const { return m_bIsLoaded; }
 voidSetCTLFontEnabled( bool _bEnabled );
 boolIsCTLFontEnabled() const { return m_bCTLFontEnabled; }
 
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index f370ff5..eb4e15e 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -124,7 +124,7 @@ public:
 return maOpenGLTextureCache[nGlyphIndex];
 }
 
-bool IsGlyphCached(int nGlyphIndex)
+bool IsGlyphCached(int nGlyphIndex) const
 {
 return maOpenGLTextureCache.find(nGlyphIndex) != 
maOpenGLTextureCache.end();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sw/uiconfig/swriter/ui/tocdialog.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d91f38bcff7014564c71cb8782fee28b3090caab
Author: Yousuf Philips 
Date:   Sun Apr 10 16:19:26 2016 +0400

tdf#99161 Change Index/ToC dialog title and tab

Change-Id: I80349233e4fe3969da98814edaa1df52bb9adb35
Reviewed-on: https://gerrit.libreoffice.org/23959
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui 
b/sw/uiconfig/swriter/ui/tocdialog.ui
index 3d6c2eb..3857a2f 100644
--- a/sw/uiconfig/swriter/ui/tocdialog.ui
+++ b/sw/uiconfig/swriter/ui/tocdialog.ui
@@ -5,7 +5,7 @@
   
 False
 6
-Insert Index or Table of 
Contents
+Table of Contents, Index or 
Bibliography
 False
 dialog
 
@@ -134,7 +134,7 @@
   
 True
 False
-Index or Table 
of Contents
+Type
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

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

New commits:
commit 0dec0ffec52a7dc01ac3f8ef26bd5a7d12ac4cf2
Author: Miklos Vajna 
Date:   Mon Apr 11 09:16:13 2016 +0200

cid#1358429 null pointer dereference

Change-Id: Iec3e2218c356c5a3d01edc0aa55ad9fd18e957f2

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index a44f12e..bb58cd2 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2438,9 +2438,9 @@ void SdXImpressDocument::postMouseEvent(int nType, int 
nX, int nY, int nCount, i
 SolarMutexGuard aGuard;
 
 DrawViewShell* pViewShell = GetViewShell();
-Window* pWindow = pViewShell->GetActiveWindow();
 if (!pViewShell)
 return;
+Window* pWindow = pViewShell->GetActiveWindow();
 
 Point aPos(Point(convertTwipToMm100(nX), convertTwipToMm100(nY)));
 MouseEvent aEvent(aPos, nCount,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source include/svtools

[Jan Holesovsky]

 cui/AllLangResTarget_cui.mk|1 -
 cui/source/inc/cuires.hrc  |1 -
 cui/source/options/optgdlg.src |   28 
 include/svtools/apearcfg.hxx   |2 +-
 4 files changed, 1 insertion(+), 31 deletions(-)

New commits:
commit b846677427015231d4b377bbcae9ae3618baf1cf
Author: Jan Holesovsky 
Date:   Mon Apr 11 09:21:52 2016 +0200

RID_SVXSTR_LANGUAGE_RESTART is not needed any more.

Change-Id: I426026938c4cf0e6af22be11dca8e68f991004c0

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 364fa37..8d5ece0 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
 cui/source/options/optcolor.src \
 cui/source/options/optdict.src \
 cui/source/options/optfltr.src \
-cui/source/options/optgdlg.src \
 cui/source/options/optinet2.src \
 cui/source/options/optjava.src \
 cui/source/options/optlingu.src \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 658401d..e46e4a1 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -27,7 +27,6 @@
 
 // RID_SVX_START + 0 unused
 #define RID_SVXSTR_OPTIONS_RESTART  (RID_SVX_START + 1)
-#define RID_SVXSTR_LANGUAGE_RESTART (RID_SVX_START + 2)
 
 #define RID_CUIIMG_HARDDISK (RID_SVX_START + 4)
 #define RID_CUIIMG_LIB  (RID_SVX_START + 5)
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
deleted file mode 100644
index 206fb3a..000
--- a/cui/source/options/optgdlg.src
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-#include "helpid.hrc"
-
-String RID_SVXSTR_LANGUAGE_RESTART
-{
-Text [ en-US ] = "The language setting of the user interface has been 
updated and will take effect the next time you start %PRODUCTNAME 
%PRODUCTVERSION";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index 3b9dd1d..c4ae370 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -31,7 +31,7 @@ typedef enum {
 NoSnap
 } SnapType;
 
-typedef enum { // MUST match the order chosen in ListBox LB_DRAG_MODE in 
optgdlg.src
+typedef enum {
 DragFullWindow,
 DragFrame,
 DragSystemDep
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/opengl/texture.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4e07c7e279b21c4ae93b832a65e221e2dab5391d
Author: Tomaž Vajngerl 
Date:   Mon Apr 11 16:37:25 2016 +0900

coverity#1358428 fix "Null pointer dereferences"

Change-Id: I629ff54ea721f4d9626258690767088b1abfb0c6

diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index b3a3626..38ff8f7 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -398,11 +398,11 @@ void 
OpenGLTexture::FillCoords(std::vector& aCoord, const
 GLfloat y1 = 0.0f;
 GLfloat y2 = 0.0f;
 
-double fTextureWidth(mpImpl->mnWidth);
-double fTextureHeight(mpImpl->mnHeight);
-
 if (mpImpl)
 {
+double fTextureWidth(mpImpl->mnWidth);
+double fTextureHeight(mpImpl->mnHeight);
+
 x1 = (maRect.Left() + rPosAry.mnSrcX) / fTextureWidth;
 x2 = (maRect.Left() + rPosAry.mnSrcX + rPosAry.mnSrcWidth) / 
fTextureWidth;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/mork/MResultSet.cxx |   12 
 1 file changed, 12 deletions(-)

New commits:
commit 3c3bd96ce8e95f0572b7b3a78c2ca1c4fb977802
Author: Stephan Bergmann 
Date:   Mon Apr 11 09:26:43 2016 +0200

No need to wrap SAL_INFO in OSL_DEBUG_LEVEL > 0

Change-Id: Ibb62a7fd5975ca891333f78a6f3c7c50329aa073

diff --git a/connectivity/source/drivers/mork/MResultSet.cxx 
b/connectivity/source/drivers/mork/MResultSet.cxx
index 35cb7ff..518da92 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -705,15 +705,11 @@ void OResultSet::parseParameter( const OSQLParseNode* 
pNode, OUString& rMatchStr
 if ( m_aParameterRow.is() ) {
 OSL_ENSURE( m_nParamIndex < (sal_Int32)m_aParameterRow->get().size() + 
1, "More parameters than values found" );
 rMatchString = (m_aParameterRow->get())[(sal_uInt16)m_nParamIndex];
-#if OSL_DEBUG_LEVEL > 0
 SAL_INFO("connectivity.mork", "Prop Value: " << rMatchString);
-#endif
 }
-#if OSL_DEBUG_LEVEL > 0
 else {
 SAL_INFO("connectivity.mork", "Prop Value: Invalid ParameterRow!");
 }
-#endif
 }
 
 #define WILDCARD "%"
@@ -740,20 +736,14 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* 
parseT
 for(;aIter != xColumns->get().end();++aIter)
 {
 
(*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))
 >>= aColName;
-#if OSL_DEBUG_LEVEL > 0
 SAL_INFO("connectivity.mork", "Prop Column Name: " << 
aColName);
-#endif
 if ( m_aParameterRow.is() ) {
 aParameterValue = (m_aParameterRow->get())[(sal_uInt16)i];
-#if OSL_DEBUG_LEVEL > 0
 SAL_INFO("connectivity.mork", "Prop Value: " << 
aParameterValue);
-#endif
 }
-#if OSL_DEBUG_LEVEL > 0
 else {
 SAL_INFO("connectivity.mork", "Prop Value: Invalid 
ParameterRow!");
 }
-#endif
 i++;
 }
 }
@@ -876,9 +866,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*   
  parseT
 if(SQL_ISRULE(pColumn,column_ref))
 m_pSQLIterator->getColumnRange(pColumn,columnName,sTableRange);
 
-#if OSL_DEBUG_LEVEL > 0
 SAL_INFO("connectivity.mork", "ColumnName = " << columnName);
-#endif
 
 if ( SQL_ISRULE(pAtom,parameter) ) {
 parseParameter( pAtom, matchString );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source extensions/source filter/source forms/source framework/inc framework/source jvmfwk/plugins l10ntools/inc lingucomponent/source linguistic/source oox/sour

[Jochen Nitschke]

 editeng/source/editeng/editattr.hxx |7 +++--
 editeng/source/editeng/editdoc.hxx  |6 ++--
 editeng/source/editeng/editobj2.hxx |   10 +--
 editeng/source/editeng/impedit.hxx  |5 ++-
 extensions/source/abpilot/datasourcehandling.cxx|5 ++-
 extensions/source/config/ldap/ldapaccess.cxx|6 ++--
 extensions/source/propctrlr/browserlistbox.cxx  |5 ++-
 extensions/source/propctrlr/composeduiupdate.cxx|6 ++--
 extensions/source/propctrlr/genericpropertyhandler.cxx  |6 ++--
 extensions/source/propctrlr/stringrepresentation.cxx|6 ++--
 extensions/source/update/check/updatehdl.hxx|6 ++--
 filter/source/svg/test/odfserializer.cxx|6 ++--
 forms/source/inc/propertybaghelper.hxx  |6 ++--
 framework/inc/threadhelp/gate.hxx   |   13 
--
 framework/inc/threadhelp/transactionguard.hxx   |5 ++-
 framework/inc/threadhelp/transactionmanager.hxx |5 ++-
 framework/source/layoutmanager/layoutmanager.cxx|5 ++-
 framework/source/services/ContextChangeEventMultiplexer.cxx |6 ++--
 framework/source/services/modulemanager.cxx |8 +++---
 framework/source/uielement/langselectionstatusbarcontroller.cxx |5 ++-
 framework/source/uielement/menubarmanager.cxx   |6 ++--
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx  |6 +++-
 l10ntools/inc/po.hxx|   13 
++
 lingucomponent/source/languageguessing/guesslang.cxx|6 ++--
 linguistic/source/convdiclist.cxx   |6 ++--
 linguistic/source/lngsvcmgr.cxx |8 +++---
 linguistic/source/spelldsp.cxx  |5 ++-
 oox/source/core/filterbase.cxx  |5 ++-
 28 files changed, 106 insertions(+), 76 deletions(-)

New commits:
commit d84ef731d8f5d8c1e896ecda3d03d4bb9129578d
Author: Jochen Nitschke 
Date:   Sat Apr 9 17:07:54 2016 +0200

tdf#94306 replace boost::noncopyable ...

... in modules editeng to oox.
Replace with C++11 delete copy-constructur and
copy-assignment.
Remove boost/noncopyable.hpp includes and
one unused boost/checked_delete.hpp include in linguistic.

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

diff --git a/editeng/source/editeng/editattr.hxx 
b/editeng/source/editeng/editattr.hxx
index 6db6fd6..13bf5a2 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -23,8 +23,6 @@
 #include 
 #include 
 
-#include 
-
 class Color;
 class SvxFont;
 class SvxFontItem;
@@ -65,7 +63,7 @@ class SfxGrabBagItem;
 
 // bFeature: Attribute must not expand/shrink, length is always 1
 // bEdge: Attribute will not expand, if you want to expand just on the edge
-class EditCharAttrib : private boost::noncopyable
+class EditCharAttrib
 {
 protected:
 const SfxPoolItem*  pItem;
@@ -79,6 +77,9 @@ public:
 EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 
nEnd );
 virtual ~EditCharAttrib();
 
+EditCharAttrib(const EditCharAttrib&) = delete;
+EditCharAttrib& operator=(const EditCharAttrib&) = delete;
+
 sal_uInt16  Which() const   { return pItem->Which(); }
 const SfxPoolItem*  GetItem() const { return pItem; }
 
diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index 024c4b4..a18a682 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -35,8 +35,6 @@
 #include 
 #include 
 
-#include 
-
 class ImpEditEngine;
 class SvxTabStop;
 
@@ -233,7 +231,7 @@ public:
 
 // class ContentNode
 
-class ContentNode : private boost::noncopyable
+class ContentNode
 {
 private:
 OUString maString;
@@ -247,6 +245,8 @@ public:
 ContentNode( SfxItemPool& rItemPool );
 ContentNode( const OUString& rStr, const ContentAttribs& 
rContentAttribs );
 ~ContentNode();
+ContentNode(const ContentNode&) = delete;
+ContentNode&operator=(const ContentNode&) = delete;
 
 ContentAttribs& GetContentAttribs() { return aContentAttribs; }
 const ContentAttribs& GetContentAttribs() const { return aContentAttribs; }
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index 6f9fae2..aeeab19 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -28,7 +28,6 @@
 #include "svl/sharedstring.

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

[Jochen Nitschke]

 sc/inc/textuno.hxx   |   12 +++
 sc/source/ui/unoobj/fielduno.cxx |   20 
 sc/source/ui/unoobj/textuno.cxx  |   62 +++
 3 files changed, 49 insertions(+), 45 deletions(-)

New commits:
commit 2553c5b95d4596fc1ef679a42073d5bc62737914
Author: Jochen Nitschke 
Date:   Fri Mar 25 19:56:14 2016 +0100

tdf#84938 replace #defined constants with enum class

replace if constructs with switch
remove temp variables

tried to squeeze the enum in one of the 3 classes
but it doesn't feel right anywhere.
ScHeaderFooterContentObj doesn't use it, except for initialzing
ScHeaderFooterTextObj.
ScHeaderFooterTextData holds it but nothing more.
ScHeaderFooterTextObj uses it but always has to get it via
ScHeaderFooterTextData.GetPart()

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

diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index bb32420..6447ee0 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -49,9 +49,7 @@ class ScHeaderFooterTextObj;
 
 struct ScHeaderFieldData;
 
-#define SC_HDFT_LEFT0
-#define SC_HDFT_CENTER  1
-#define SC_HDFT_RIGHT   2
+enum class ScHeaderFooterPart{ LEFT, CENTER, RIGHT };
 
 //  ScHeaderFooterContentObj is a dumb container which must be re-written into
 //  the page template using setPropertyValue
@@ -113,7 +111,7 @@ class ScHeaderFooterTextData
 private:
 std::unique_ptr mpTextObj;
 rtl::Reference rContentObj;
-sal_uInt16  nPart;
+ScHeaderFooterPart  nPart;
 ScEditEngineDefaulter*  pEditEngine;
 SvxEditEngineForwarder* pForwarder;
 boolbDataValid;
@@ -122,7 +120,7 @@ public:
 ScHeaderFooterTextData(const ScHeaderFooterTextData&) = delete;
 const ScHeaderFooterTextData& operator=(const ScHeaderFooterTextData&) = 
delete;
 ScHeaderFooterTextData(
-rtl::Reference const & rContent, sal_uInt16 
nP, const EditTextObject* pTextObj);
+rtl::Reference const & rContent, 
ScHeaderFooterPart nP, const EditTextObject* pTextObj);
 ~ScHeaderFooterTextData();
 
 // helper functions
@@ -131,7 +129,7 @@ public:
 void UpdateData(EditEngine& rEditEngine);
 ScEditEngineDefaulter*  GetEditEngine() { GetTextForwarder(); return 
pEditEngine; }
 
-sal_uInt16  GetPart() const { return nPart; }
+ScHeaderFooterPart  GetPart() const { return nPart; }
 rtl::Reference GetContentObj() const { return 
rContentObj; }
 
 const EditTextObject* GetTextObject() const { return mpTextObj.get(); }
@@ -160,7 +158,7 @@ private:
 
 public:
 ScHeaderFooterTextObj(
-rtl::Reference const & rContent, sal_uInt16 
nP, const EditTextObject* pTextObj);
+rtl::Reference const & rContent, 
ScHeaderFooterPart nP, const EditTextObject* pTextObj);
 virtual ~ScHeaderFooterTextObj();
 
 const EditTextObject* GetTextObject() const;
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 8ec23e9..5f64bfd 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -481,13 +481,19 @@ uno::Reference 
ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_In
 uno::Reference xTextRange;
 rtl::Reference rContentObj = 
mrData.GetContentObj();
 uno::Reference xText;
-sal_uInt16 nPart = mrData.GetPart();
-if (nPart == SC_HDFT_LEFT)
-xText = rContentObj->getLeftText();
-else if (nPart == SC_HDFT_CENTER)
-xText = rContentObj->getCenterText();
-else
-xText = rContentObj->getRightText();
+
+switch ( mrData.GetPart() )
+{
+case ScHeaderFooterPart::LEFT:
+xText = rContentObj->getLeftText();
+break;
+case ScHeaderFooterPart::CENTER:
+xText = rContentObj->getCenterText();
+break;
+case ScHeaderFooterPart::RIGHT:
+xText = rContentObj->getRightText();
+break;
+}
 
 uno::Reference xTemp(xText, uno::UNO_QUERY);
 xTextRange = xTemp;
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 053e41b..53b23fe 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -93,9 +93,9 @@ SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, 
"ScHeaderFooterTextObj", "stardiv
 ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* 
pLeft,
 const EditTextObject* 
pCenter,
 const EditTextObject* 
pRight ) :
-mxLeftText(new ScHeaderFooterTextObj(this, SC_HDFT_LEFT, pLeft)),
-mxCenterText(new ScHeaderFooterTextObj(this, SC_HDFT_CENTER, pCenter)),
-mxRightText(new ScHeaderFooterTextObj(this, SC_HDFT_RIGHT, pRight))
+mxLeftText

[Libreoffice-commits] core.git: reportdesign/inc reportdesign/source sal/cppunittester sal/osl sal/qa sal/rtl sal/textenc sc/inc sdext/source sd/inc sd/source

[Jochen Nitschke]

 reportdesign/inc/RptObject.hxx 
 |5 ++-
 reportdesign/source/core/api/ReportDefinition.cxx  
 |5 ++-
 reportdesign/source/core/inc/conditionupdater.hxx  
 |   10 ++-
 reportdesign/source/core/sdr/UndoEnv.cxx   
 |5 ++-
 reportdesign/source/core/sdr/formatnormalizer.hxx  
 |6 ++--
 reportdesign/source/filter/xml/xmlFixedContent.cxx 
 |5 ++-
 reportdesign/source/filter/xml/xmlfilter.cxx   
 |5 ++-
 reportdesign/source/ui/dlg/AddField.cxx
 |1 
 reportdesign/source/ui/dlg/Navigator.cxx   
 |5 ++-
 reportdesign/source/ui/inc/CondFormat.hxx  
 |2 -
 reportdesign/source/ui/inc/ReportController.hxx
 |6 ++--
 reportdesign/source/ui/report/ReportController.cxx 
 |1 
 reportdesign/source/ui/report/ReportControllerObserver.cxx 
 |5 ++-
 sal/cppunittester/cppunittester.cxx
 |   12 +---
 sal/osl/unx/file.cxx   
 |5 ++-
 sal/osl/unx/file_path_helper.cxx   
 |6 ++--
 sal/qa/osl/setthreadname/test-setthreadname.cxx
 |7 +++--
 sal/rtl/bootstrap.cxx  
 |   11 +--
 sal/rtl/rtl_process.cxx
 |6 ++--
 sal/textenc/textenc.cxx
 |   11 +--
 sc/inc/chart2uno.hxx   
 |   14 +-
 sc/inc/dptabsrc.hxx
 |9 --
 sc/inc/table.hxx   
 |5 ++-
 sd/inc/Outliner.hxx
 |7 ++---
 sd/source/core/annotations/Annotation.cxx  
 |6 ++--
 sd/source/core/annotations/AnnotationEnumeration.cxx   
 |5 ++-
 sd/source/core/undoanim.cxx
 |5 ++-
 
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx 
|6 ++--
 sd/source/ui/inc/SlideSorter.hxx   
 |6 ++--
 sd/source/ui/inc/framework/ConfigurationController.hxx 
 |4 +-
 sd/source/ui/presenter/CanvasUpdateRequester.hxx   
 |8 +++--
 sd/source/ui/presenter/PresenterCanvas.cxx 
 |6 ++--
 sd/source/ui/presenter/PresenterCanvas.hxx 
 |6 ++--
 sd/source/ui/presenter/PresenterHelper.hxx 
 |6 ++--
 sd/source/ui/presenter/PresenterPreviewCache.hxx   
 |6 ++--
 sd/source/ui/presenter/PresenterTextView.hxx   
 |6 ++--
 sd/source/ui/presenter/SlideRenderer.hxx   
 |6 ++--
 sd/source/ui/remotecontrol/IBluetoothSocket.hxx
 |6 ++--
 sd/source/ui/sidebar/PanelFactory.hxx  
 |6 ++--
 sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx   
 |2 -
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
 |5 ++-
 sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
 |7 ++---
 sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx   
 |6 ++--
 sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx  
 |8 ++---
 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx  
 |9 +++---
 sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
 |6 ++--
 sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx  
 |6 ++--
 sd/source/ui/slidesorter/shell/SlideSorterService.hxx  
 |6 ++--
 sd/source/ui/slidesorter/view/SlideSorterView.cxx  
 |6 ++--
 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx 
 |6 ++--
 sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx 
 |1 
 sdext/source/pdfimport/misc/pwdinteract.cxx
 |   11 ---
 sdext/source/presenter/PresenterBitmapContainer.hxx
 |4 +-
 sdext/source/prese

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

[Tor Lillqvist]

 loolwsd/LOOLProtocol.hpp |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit a598ea869cb6684263e7c1961f2dd43613e56b4b
Author: Tor Lillqvist 
Date:   Mon Apr 11 10:11:49 2016 +0300

Use less misleading function and variable names

Also, get rid of one default parameter that was passed a non-default
value only 'internally'.

diff --git a/loolwsd/LOOLProtocol.hpp b/loolwsd/LOOLProtocol.hpp
index 66276b1..0ed166a 100644
--- a/loolwsd/LOOLProtocol.hpp
+++ b/loolwsd/LOOLProtocol.hpp
@@ -43,20 +43,26 @@ namespace LOOLProtocol
 // Functions that parse messages. All return false if parsing fails
 bool parseStatus(const std::string& message, LibreOfficeKitDocumentType& 
type, int& nParts, int& currentPart, int& width, int& height);
 
-/// Returns the first token of a message given a delimiter.
 inline
-std::string getFirstToken(const char *message, const int length, const 
char delim = ' ')
+std::string getDelimitedInitialSubstring(const char *message, const int 
length, const char delimiter)
 {
 if (message == nullptr || length <= 0)
 {
 return "";
 }
 
-const char *endOfLine = static_cast(std::memchr(message, 
delim, length));
-const auto size = (endOfLine == nullptr ? length : endOfLine - 
message);
+const char *foundDelimiter = static_cast(std::memchr(message, delimiter, length));
+const auto size = (foundDelimiter == nullptr ? length : foundDelimiter 
- message);
 return std::string(message, size);
 }
 
+/// Returns the first token of a message.
+inline
+std::string getFirstToken(const char *message, const int length)
+{
+return getDelimitedInitialSubstring(message, length, ' ');
+}
+
 inline
 std::string getFirstToken(const std::vector& message)
 {
@@ -81,7 +87,7 @@ namespace LOOLProtocol
 inline
 std::string getFirstLine(const char *message, const int length)
 {
-return getFirstToken(message, length, '\n');
+return getDelimitedInitialSubstring(message, length, '\n');
 }
 
 inline
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/Util.cpp

[Miklos Vajna]

 loolwsd/Util.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee1e036aa9d3ed41a0d766935f1ca4a8c944173d
Author: Miklos Vajna 
Date:   Mon Apr 11 09:12:59 2016 +0200

Util: strcpy -> strncpy

Change-Id: I03f50f4e5e7f404364fdf90197750bf7cd762c9c

diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index c26e63b..c6fae82 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -148,7 +148,7 @@ namespace Log
 << std::setw(5) << std::setfill('0') << Poco::Process::id();
 Source.id = oss.str();
 assert (sizeof (LogPrefix) > strlen(oss.str().c_str()) + 1);
-strcpy(LogPrefix, oss.str().c_str());
+strncpy(LogPrefix, oss.str().c_str(), sizeof(LogPrefix));
 
 auto channel = (isatty(fileno(stdout)) || std::getenv("LOOL_LOGCOLOR")
  ? static_cast(new 
Poco::ColorConsoleChannel())
@@ -488,7 +488,7 @@ namespace Util
<< Poco::Process::id() << "\n";
 std::string streamStr = stream.str();
 assert (sizeof (FatalGdbString) > strlen(streamStr.c_str()) + 1);
-strcpy(FatalGdbString, streamStr.c_str());
+strncpy(FatalGdbString, streamStr.c_str(), sizeof(FatalGdbString));
 }
 
 int getChildStatus(const int code)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Berk Gureken]

 cui/source/options/optgdlg.cxx   |8 ++--
 include/svtools/restartdialog.hxx|5 -
 svtools/source/dialogs/restartdialog.cxx |3 +++
 svtools/uiconfig/ui/restartdialog.ui |   23 +++
 4 files changed, 32 insertions(+), 7 deletions(-)

New commits:
commit cf81f3ba0602eeffad8907a1bb9cdd24e62c2d1e
Author: Berk Gureken 
Date:   Tue Mar 22 07:15:05 2016 +0200

tdf#79656 Restart now window for language change

When you change the UI language and click OK,
Restart Now window opens instead of warning window.

Change-Id: Ic503bf4536a855891456f48745b748786857200f
Reviewed-on: https://gerrit.libreoffice.org/23421
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 52ef10e..396d1ee 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -97,6 +97,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -1285,8 +1287,10 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
 xProp->setPropertyValue(sUserLocaleKey, makeAny(aLangString));
 Reference< XChangesBatch >(xProp, 
UNO_QUERY_THROW)->commitChanges();
 // display info
-ScopedVclPtrInstance< MessageDialog > aBox(this, 
CUI_RES(RID_SVXSTR_LANGUAGE_RESTART), VCL_MESSAGE_INFO);
-aBox->Execute();
+SolarMutexGuard aGuard;
+svtools::executeRestartDialog(
+comphelper::getProcessComponentContext(), nullptr,
+svtools::RESTART_REASON_LANGUAGE_CHANGE);
 
 // tell quickstarter to stop being a veto listener
 
diff --git a/include/svtools/restartdialog.hxx 
b/include/svtools/restartdialog.hxx
index e1ca07d..d90ec4d 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -32,9 +32,12 @@ enum RestartReason {
 RESTART_REASON_BIBLIOGRAPHY_INSTALL,
 // "For the bibliography to work properly,
 // %PRODUCTNAME must be restarted."
-RESTART_REASON_MAILMERGE_INSTALL
+RESTART_REASON_MAILMERGE_INSTALL,
 // "For the mail merge to work properly,
 // %PRODUCTNAME must be restarted."
+RESTART_REASON_LANGUAGE_CHANGE
+// "For the updated language settings to take effect,
+// %PRODUCTNAME must be restarted."
 };
 
 // Must be called with the solar mutex locked:
diff --git a/svtools/source/dialogs/restartdialog.cxx 
b/svtools/source/dialogs/restartdialog.cxx
index 0ff1340..3b9df0f 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -43,6 +43,9 @@ public:
 case svtools::RESTART_REASON_MAILMERGE_INSTALL:
 get(reason_, "reason_mailmerge_install");
 break;
+case svtools::RESTART_REASON_LANGUAGE_CHANGE:
+get(reason_, "reason_language_change");
+break;
 default:
 assert(false); // this cannot happen
 }
diff --git a/svtools/uiconfig/ui/restartdialog.ui 
b/svtools/uiconfig/ui/restartdialog.ui
index 9e4b984..2dc71d7 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -91,6 +91,21 @@
   
 
 
+  
+False
+True
+0
+For mail merge to 
work properly, %PRODUCTNAME must be restarted.
+True
+50
+  
+  
+False
+True
+2
+  
+
+
   
 False
 True
@@ -106,18 +121,18 @@
   
 
 
-  
+  
 False
 True
 0
-For mail merge to 
work properly, %PRODUCTNAME must be restarted.
+For the updated 
language settings to take effect, %PRODUCTNAME must be restarted.
 True
 50
   
   
 False
 True
-2
+3
   
 
 
@@ -131,7 +146,7 @@
   
 False
 True
-3
+5
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

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

3 new defect(s) introduced to LibreOffice found with Coverity Scan.
2 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 3 of 3 defect(s)


** CID 1358429:  Null pointer dereferences  (REVERSE_INULL)
/sd/source/ui/unoidl/unomodel.cxx: 2442 in 
SdXImpressDocument::postMouseEvent(int, int, int, int, int, int)()



*** CID 1358429:  Null pointer dereferences  (REVERSE_INULL)
/sd/source/ui/unoidl/unomodel.cxx: 2442 in 
SdXImpressDocument::postMouseEvent(int, int, int, int, int, int)()
2436 void SdXImpressDocument::postMouseEvent(int nType, int nX, int nY, int 
nCount, int nButtons, int nModifier)
2437 {
2438 SolarMutexGuard aGuard;
2439 
2440 DrawViewShell* pViewShell = GetViewShell();
2441 Window* pWindow = pViewShell->GetActiveWindow();
>>> CID 1358429:  Null pointer dereferences  (REVERSE_INULL)
>>> Null-checking "pViewShell" suggests that it may be null, but it has 
>>> already been dereferenced on all paths leading to the check.
2442 if (!pViewShell)
2443 return;
2444 
2445 Point aPos(Point(convertTwipToMm100(nX), convertTwipToMm100(nY)));
2446 MouseEvent aEvent(aPos, nCount,
2447 MouseEventModifiers::SIMPLECLICK, nButtons, nModifier);

** CID 1358428:  Null pointer dereferences  (REVERSE_INULL)
/vcl/opengl/texture.cxx: 404 in OpenGLTexture::FillCoords<(unsigned 
int)4>(std::vector> &, const SalTwoRect &, bool) 
const()



*** CID 1358428:  Null pointer dereferences  (REVERSE_INULL)
/vcl/opengl/texture.cxx: 404 in OpenGLTexture::FillCoords<(unsigned 
int)4>(std::vector> &, const SalTwoRect &, bool) 
const()
398 GLfloat y1 = 0.0f;
399 GLfloat y2 = 0.0f;
400 
401 double fTextureWidth(mpImpl->mnWidth);
402 double fTextureHeight(mpImpl->mnHeight);
403 
>>> CID 1358428:  Null pointer dereferences  (REVERSE_INULL)
>>> Null-checking "this->mpImpl" suggests that it may be null, but it has 
>>> already been dereferenced on all paths leading to the check.
404 if (mpImpl)
405 {
406 x1 = (maRect.Left() + rPosAry.mnSrcX) / fTextureWidth;
407 x2 = (maRect.Left() + rPosAry.mnSrcX + rPosAry.mnSrcWidth) / 
fTextureWidth;
408 
409 if (bInverted)

** CID 1358427:  Null pointer dereferences  (NULL_RETURNS)
/sd/source/ui/unoidl/unomodel.cxx: 2440 in 
SdXImpressDocument::postMouseEvent(int, int, int, int, int, int)()



*** CID 1358427:  Null pointer dereferences  (NULL_RETURNS)
/sd/source/ui/unoidl/unomodel.cxx: 2440 in 
SdXImpressDocument::postMouseEvent(int, int, int, int, int, int)()
2434 }
2435 
2436 void SdXImpressDocument::postMouseEvent(int nType, int nX, int nY, int 
nCount, int nButtons, int nModifier)
2437 {
2438 SolarMutexGuard aGuard;
2439 
>>> CID 1358427:  Null pointer dereferences  (NULL_RETURNS)
>>> Assigning: "pViewShell" = null return value from "GetViewShell".
2440 DrawViewShell* pViewShell = GetViewShell();
2441 Window* pWindow = pViewShell->GetActiveWindow();
2442 if (!pViewShell)
2443 return;
2444 
2445 Point aPos(Point(convertTwipToMm100(nX), convertTwipToMm100(nY)));



To view the defects in Coverity Scan visit, 
https://scan.coverity.com/projects/libreoffice?tab=overview

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://scan.coverity.com/subscriptions/edit?email=libreoffice%40lists.freedesktop.org&token=d6481d718a775246b2340f282ebe5939

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

[Libreoffice-commits] core.git: basctl/source canvas/source

[Jochen Nitschke]

 basctl/source/basicide/doceventnotifier.cxx   |2 +-
 canvas/source/directx/dx_graphicsprovider.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b4ddacbc552905d0434e9204ee954cb4522a00cd
Author: Jochen Nitschke 
Date:   Mon Apr 11 00:35:08 2016 +0200

fix copy assignment signatures

get value by reference

introduced in
commit 8c2f2e1dd77cdce9bdf63beff5a79f91adc44630 and
commit f9b200ce54cd67ddc04747f9676568a86e14d864

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

diff --git a/basctl/source/basicide/doceventnotifier.cxx 
b/basctl/source/basicide/doceventnotifier.cxx
index a993709..9fa7064 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -67,7 +67,7 @@ namespace basctl
 public:
 // noncopyable
 Impl(const Impl&) = delete;
-const Impl& operator=(const Impl) = delete;
+Impl& operator=(const Impl&) = delete;
 
 Impl (DocumentEventListener&, Reference const& rxDocument);
 virtual ~Impl ();
diff --git a/canvas/source/directx/dx_graphicsprovider.hxx 
b/canvas/source/directx/dx_graphicsprovider.hxx
index 22e6577..2d7c3d8 100644
--- a/canvas/source/directx/dx_graphicsprovider.hxx
+++ b/canvas/source/directx/dx_graphicsprovider.hxx
@@ -36,7 +36,7 @@ namespace dxcanvas
 virtual ~GraphicsProvider() {}
 /// make noncopyable
 GraphicsProvider(const GraphicsProvider&) = delete;
-const GraphicsProvider operator=(const GraphicsProvider) = delete;
+GraphicsProvider& operator=(const GraphicsProvider&) = delete;
 
 virtual GraphicsSharedPtr getGraphics() = 0;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/test

[Tor Lillqvist]

 loolwsd/test/httpwstest.cpp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 1c9a6400b6c65c63e2a62f01f4bf6f8ab2177034
Author: Tor Lillqvist 
Date:   Mon Apr 11 10:00:45 2016 +0300

Make the testBadLoad() unit test pass again

The server sends an "editlock: 1" message even if no document has been
loaded. Ignore that while waiting for the "error:" message.

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index aad1e37..794a031 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -203,6 +203,12 @@ void HTTPWSTest::testBadLoad()
 {
 std::cout << "Received message: " << 
LOOLProtocol::getAbbreviatedMessage(buffer, n) << std::endl;
 const std::string line = LOOLProtocol::getFirstLine(buffer, n);
+
+// For some reason the server claims a client has the 'edit 
lock' even if no
+// document has been successfully loaded
+if (LOOLProtocol::getFirstToken(buffer, n) == "editlock:")
+continue;
+
 CPPUNIT_ASSERT_EQUAL(std::string("error: cmd=status 
kind=nodocloaded"), line);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - chart2/source include/sfx2 include/svtools include/svx include/tools sc/inc sc/source sfx2/inc sfx2/source store/source svtools/source svx/source tools/sour

[Noel Grandin]

 chart2/source/controller/dialogs/DialogModel.cxx|8 +-
 chart2/source/controller/dialogs/DialogModel.hxx|3 -
 chart2/source/controller/dialogs/dlg_CreationWizard.cxx |   26 +
 chart2/source/controller/inc/dlg_CreationWizard.hxx |6 --
 chart2/source/inc/LifeTime.hxx  |3 -
 chart2/source/model/inc/BaseCoordinateSystem.hxx|3 -
 chart2/source/model/main/BaseCoordinateSystem.cxx   |5 -
 chart2/source/model/main/CartesianCoordinateSystem.cxx  |2 
 chart2/source/model/main/PolarCoordinateSystem.cxx  |2 
 chart2/source/model/template/PieChartType.cxx   |5 -
 chart2/source/model/template/PieChartType.hxx   |3 -
 chart2/source/tools/LifeTime.cxx|8 --
 include/sfx2/docfile.hxx|2 
 include/sfx2/docinf.hxx |4 -
 include/sfx2/fcontnr.hxx|2 
 include/sfx2/filedlghelper.hxx  |2 
 include/sfx2/mailmodelapi.hxx   |4 -
 include/sfx2/objsh.hxx  |4 -
 include/sfx2/request.hxx|2 
 include/sfx2/sidebar/ResourceManager.hxx|2 
 include/sfx2/sidebar/SidebarController.hxx  |8 +-
 include/sfx2/viewsh.hxx |4 -
 include/svtools/ivctrl.hxx  |2 
 include/svtools/treelistbox.hxx |2 
 include/svx/svdopath.hxx|2 
 include/tools/urlobj.hxx|   10 +--
 sc/inc/column.hxx   |4 -
 sc/inc/document.hxx |2 
 sc/inc/formulacell.hxx  |2 
 sc/inc/table.hxx|2 
 sc/source/core/data/column.cxx  |8 +-
 sc/source/core/data/column4.cxx |4 -
 sc/source/core/data/document.cxx|6 +-
 sc/source/core/data/formulacell.cxx |4 -
 sc/source/core/data/table2.cxx  |4 -
 sc/source/core/data/table4.cxx  |2 
 sfx2/inc/guisaveas.hxx  |2 
 sfx2/source/appl/childwinimpl.cxx   |4 -
 sfx2/source/appl/helpinterceptor.cxx|2 
 sfx2/source/appl/helpinterceptor.hxx|2 
 sfx2/source/appl/module.cxx |2 
 sfx2/source/appl/newhelp.cxx|4 -
 sfx2/source/appl/newhelp.hxx|2 
 sfx2/source/appl/shellimpl.cxx  |6 +-
 sfx2/source/bastyp/fltfnc.cxx   |2 
 sfx2/source/control/bindings.cxx|2 
 sfx2/source/control/request.cxx |2 
 sfx2/source/dialog/filedlghelper.cxx|6 +-
 sfx2/source/dialog/filedlgimpl.hxx  |6 +-
 sfx2/source/dialog/mailmodel.cxx|4 -
 sfx2/source/dialog/tabdlg.cxx   |   43 ++--
 sfx2/source/doc/SfxDocumentMetaData.cxx |6 +-
 sfx2/source/doc/docfile.cxx |2 
 sfx2/source/doc/docinf.cxx  |4 -
 sfx2/source/doc/doctemplateslocal.cxx   |6 +-
 sfx2/source/doc/doctemplateslocal.hxx   |6 +-
 sfx2/source/doc/guisaveas.cxx   |2 
 sfx2/source/doc/objxtor.cxx |4 -
 sfx2/source/doc/oleprops.cxx|2 
 sfx2/source/doc/oleprops.hxx|2 
 sfx2/source/inc/childwinimpl.hxx|4 -
 sfx2/source/inc/shellimpl.hxx   |6 +-
 sfx2/source/sidebar/ResourceManager.cxx |4 -
 sfx2/source/sidebar/SidebarController.cxx   |8 +-
 sfx2/source/view/viewfrm.cxx|2 
 sfx2/source/view/viewsh.cxx |6 +-
 store/source/storbase.hxx   |4 -
 store/source/stortree.hxx   |5 -
 svtools/source/contnr/ivctrl.cxx|7 +-
 svtools/source/contnr/treelistbox.cxx   |   41 +--
 svx/source/svdraw/svddrgv.cxx   |2 
 svx/source/svdraw/svdopath.cxx  |6 +-
 tools/source/fsys/urlobj.cxx|4 -
 tools/source/inet/inetmime.cxx  |8 +-
 vcl/source/app/session.cxx  |8 +-
 xmloff/source/draw