[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - 84 commits - loleaflet/dist loleaflet/po loleaflet/src loolwsd/ChildSession.cpp loolwsd/ChildSession.hpp loolwsd/Clie

2016-10-27 Thread Henry Castro 
 loleaflet/dist/errormessages.js   |6 
 loleaflet/dist/spreadsheet.css|2 
 loleaflet/dist/toolbar/toolbar.js |   28 -
 loleaflet/po/templates/loleaflet-help.pot |2 
 loleaflet/po/templates/loleaflet-ui.pot   |   97 ++--
 loleaflet/src/control/Control.ColumnHeader.js |4 
 loleaflet/src/control/Control.Header.js   |   17 
 loleaflet/src/control/Control.Menubar.js  |1 
 loleaflet/src/control/Control.RowHeader.js|6 
 loleaflet/src/control/Parts.js|3 
 loleaflet/src/core/Socket.js  |   20 
 loleaflet/src/layer/marker/Cursor.js  |   10 
 loleaflet/src/layer/tile/TileLayer.js |   90 +++-
 loleaflet/src/map/handler/Map.SlideShow.js|2 
 loolwsd/ChildSession.cpp  |6 
 loolwsd/ChildSession.hpp  |1 
 loolwsd/ClientSession.cpp |  122 +++--
 loolwsd/ClientSession.hpp |   54 +-
 loolwsd/Common.hpp|   11 
 loolwsd/Connect.cpp   |6 
 loolwsd/DocumentBroker.cpp|  212 ++---
 loolwsd/DocumentBroker.hpp|   69 ++-
 loolwsd/Exceptions.hpp|6 
 loolwsd/IoUtil.cpp|   10 
 loolwsd/IoUtil.hpp|8 
 loolwsd/LOOLForKit.cpp|  106 +++-
 loolwsd/LOOLKit.cpp   |   60 --
 loolwsd/LOOLProtocol.hpp  |   39 +
 loolwsd/LOOLSession.cpp   |5 
 loolwsd/LOOLSession.hpp   |5 
 loolwsd/LOOLWSD.cpp   |  580 ++
 loolwsd/Log.cpp   |   12 
 loolwsd/Log.hpp   |8 
 loolwsd/PrisonerSession.cpp   |   10 
 loolwsd/PrisonerSession.hpp   |3 
 loolwsd/Storage.cpp   |  108 ++--
 loolwsd/Storage.hpp   |   92 ++--
 loolwsd/Unit.hpp  |4 
 loolwsd/UserMessages.hpp  |4 
 loolwsd/Util.cpp  |5 
 loolwsd/Util.hpp  |   16 
 loolwsd/loolmap.c |  253 +--
 loolwsd/protocol.txt  |   10 
 loolwsd/test/UnitAdmin.cpp|6 
 loolwsd/test/UnitStorage.cpp  |4 
 loolwsd/test/countloolkits.hpp|   14 
 loolwsd/test/helpers.hpp  |   36 +
 loolwsd/test/httpcrashtest.cpp|   23 -
 loolwsd/test/httpwserror.cpp  |   71 ++-
 loolwsd/test/httpwstest.cpp   |   15 
 loolwsd/test/run_unit.sh.in   |4 
 loolwsd/test/test.cpp |   73 +--
 52 files changed, 1344 insertions(+), 1015 deletions(-)

New commits:
commit fc46e846d4d369ec1230c16249188ff7a9816b38
Author: Henry Castro 
Date:   Thu Oct 20 09:31:27 2016 -0400

loleaflet: refocus map due drop down insert table

(cherry picked from commit e189f60ad4e2f2fe00fb45268b481f9e97121b43)

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 33a172f..5102811 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -265,6 +265,8 @@ function insertTable() {
' }, "Rows": { "type": "long","value": '
+ row + ' }}';
map._socket.sendMessage(msg);
+   // refocus map due popup
+   map.focus();
}
}, '.col');
 
commit e5b3525b2f26b7b4b8e06fddc12eaa45b835d2af
Author: Pranav Kant 
Date:   Thu Oct 20 17:21:50 2016 +0530

loleaflet: Click user item to go to its cursor

Change-Id: Iac87da20cfe422000eb9a32ccad50e8483637616
(cherry picked from commit 49f4e696e517b5f278aab465eebccaae9d8cc675)

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index c3379d0..33a172f 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1292,11 +1292,24 @@ map.on('statusindicator', function (e) {
}
 });
 
+function onUseritemClicked(e) {
+   var viewId = parseInt(e.currentTarget.id.replace('user-', ''));
+
+   if (map._docLayer) {
+   if (map.getDocType() === 'spreadsheet') {
+   map._docLayer.goToCellViewCursor(viewId);
+   } else if (map.getDocType() === 'text') {
+   map._docLayer.goToViewCursor(viewId);
+   }
+   }
+}
+
 function getUserItem(viewId, userName, color) {
-   var html = '' +
+   var html = '' +
 '' +
 '' + userName + 
'' +
-  '';
+   '';
+

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

2016-10-27 Thread Jochen Nitschke 
 svl/source/items/itemprop.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit f53cd8826b45007d70adf2ec7b41377150d2ed67
Author: Jochen Nitschke 
Date:   Wed Oct 26 21:49:43 2016 +0200

remove unused variable

aSet unused since
2ebd79b3d214c62c0997606115ebc50700d6a760
loplugin:constantfunction: svl

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

diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index c3ec9b6..e6ac2ed 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -187,15 +187,12 @@ void SfxItemPropertySet::getPropertyValue( const 
SfxItemPropertySimpleEntry& rEn
 {
 pItem->QueryValue( rAny, rEntry.nMemberId );
 }
-else
+else if(0 == (rEntry.nFlags & PropertyAttribute::MAYBEVOID))
 {
-SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID);
-if(0 == (rEntry.nFlags & PropertyAttribute::MAYBEVOID))
-throw RuntimeException(
-"Property not found in ItemSet but not MAYBEVOID?", 
nullptr);
+throw RuntimeException(
+"Property not found in ItemSet but not MAYBEVOID?", nullptr);
 }
 
-
 // convert general SfxEnumItem values to specific values
 if( rEntry.aType.getTypeClass() == TypeClass_ENUM &&
  rAny.getValueTypeClass() == TypeClass_LONG )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source dbaccess/source editeng/source include/editeng include/sfx2 include/svx include/vcl sc/source sd/inc sd/source sfx2/source svx/source sw/inc sw/source vcl/so

2016-10-27 Thread Noel Grandin 
 cui/source/dialogs/insrc.cxx   |6 
 cui/source/dialogs/newtabledlg.cxx |6 
 cui/source/dialogs/scriptdlg.cxx   |2 
 cui/source/dialogs/splitcelldlg.cxx|6 
 cui/source/factory/dlgfact.cxx |  263 -
 cui/source/factory/dlgfact.hxx |  134 
 cui/source/inc/insrc.hxx   |1 
 cui/source/inc/newtabledlg.hxx |1 
 cui/source/inc/splitcelldlg.hxx|1 
 dbaccess/source/ui/browser/brwctrlr.cxx|4 
 dbaccess/source/ui/querydesign/QTableConnection.cxx|3 
 dbaccess/source/ui/querydesign/TableConnection.cxx |8 
 dbaccess/source/ui/relationdesign/RTableConnection.cxx |2 
 editeng/source/misc/hangulhanja.cxx|6 
 include/editeng/edtdlg.hxx |6 
 include/sfx2/sfxdlg.hxx|   22 -
 include/svx/SpellDialogChildWindow.hxx |2 
 include/svx/hyperdlg.hxx   |2 
 include/svx/svxdlg.hxx |   96 +++---
 include/vcl/abstdlg.hxx|   20 -
 include/vcl/outdev.hxx |7 
 sc/source/ui/app/scdll.cxx |1 
 sc/source/ui/attrdlg/scdlgfact.cxx |   82 ++---
 sc/source/ui/dbgui/csvcontrol.cxx  |1 
 sc/source/ui/docshell/arealink.cxx |8 
 sc/source/ui/inc/cellsh.hxx|6 
 sc/source/ui/inc/csvtablebox.hxx   |3 
 sc/source/ui/inc/redcom.hxx|2 
 sc/source/ui/inc/validate.hxx  |   13 
 sc/source/ui/miscdlgs/redcom.cxx   |2 
 sc/source/ui/view/cellsh.cxx   |2 
 sc/source/ui/view/cellsh1.cxx  |5 
 sc/source/ui/view/cellsh4.cxx  |1 
 sc/source/ui/view/gridwin.cxx  |1 
 sd/inc/sdabstdlg.hxx   |   48 +--
 sd/source/ui/dlg/sddlgfact.cxx |   92 ++---
 sd/source/ui/dlg/sddlgfact.hxx |   46 +-
 sd/source/ui/docshell/docshel2.cxx |4 
 sfx2/source/appl/appserv.cxx   |8 
 sfx2/source/view/printer.cxx   |1 
 svx/source/dialog/SpellDialogChildWindow.cxx   |7 
 svx/source/gallery2/galbrws1.cxx   |4 
 sw/inc/swabstdlg.hxx   |  100 +++---
 sw/source/ui/dialog/swdlgfact.cxx  |  206 ++---
 sw/source/ui/dialog/swdlgfact.hxx  |  101 +++---
 sw/source/uibase/app/apphdl.cxx|   11 
 sw/source/uibase/app/docsh2.cxx|5 
 sw/source/uibase/app/docst.cxx |2 
 sw/source/uibase/dbui/dbmgr.cxx|8 
 sw/source/uibase/dialog/wordcountwrapper.cxx   |5 
 sw/source/uibase/inc/fldwrap.hxx   |4 
 sw/source/uibase/inc/idxmrk.hxx|4 
 sw/source/uibase/inc/wordcountdialog.hxx   |4 
 sw/source/uibase/wrtsh/wrtsh2.cxx  |2 
 vcl/source/window/msgbox.cxx   |7 
 vcl/source/window/window.cxx   |7 
 56 files changed, 747 insertions(+), 654 deletions(-)

New commits:
commit eca5ea9f79181d45cd7fbabe2313617d3025818a
Author: Noel Grandin 
Date:   Wed Sep 21 14:48:15 2016 +0200

make the AbstractDialog stuff extend from VclReferenceBase

Because some stuff wants to multiple-inherit from VclAbstractDialog and
OutputDevice-subclasses, and we'd prefer to keep all the lifetime
management through a single smart pointer class (VclPtr)

The change in msgbox.cxx and window.cxx is to workaround a bug in
VS2013 to do with virtual inheritance and delegating constructors.

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

diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 13f18c3..a6d6a4b 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -47,10 +47,16 @@ SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool 
bCol, const OString&
 
 SvxInsRowColDlg::~SvxInsRowColDlg()
 {
+disposeOnce();
+}
+
+void SvxInsRowColDlg::dispose()
+{
 m_pCountEdit.clear();
 m_pBeforeBtn.clear();
 m_pAfterBtn.clear();
 m_pDialog.disposeAndClear();
+SvxAbstractInsRowColDlg::dispose();
 }
 
 sh

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

2016-10-27 Thread Noel Grandin 
 include/svx/AccessibleControlShape.hxx |3 
 include/svx/AccessibleShape.hxx|2 
 include/svx/SmartTagMgr.hxx|2 
 include/svx/algitem.hxx|2 
 include/svx/chrtitem.hxx   |1 
 include/svx/ctredlin.hxx   |2 
 include/svx/fmshell.hxx|2 
 include/svx/fmsrcimp.hxx   |2 
 include/svx/hdft.hxx   |4 
 include/svx/imapdlg.hxx|1 
 include/svx/nbdtmg.hxx |4 
 include/svx/numfmtsh.hxx   |1 
 include/svx/rulritem.hxx   |1 
 include/svx/sdr/animation/scheduler.hxx|3 
 include/svx/sdr/contact/objectcontact.hxx  |6 
 include/svx/sdrmasterpagedescriptor.hxx|3 
 include/svx/sidebar/PanelLayout.hxx|1 
 include/svx/svddrgmt.hxx   |1 
 include/svx/svdhdl.hxx |2 
 include/svx/svdmrkv.hxx|3 
 include/svx/svdoedge.hxx   |1 
 include/svx/svdomedia.hxx  |2 
 include/svx/svdpagv.hxx|2 
 include/svx/svdtrans.hxx   |1 
 include/svx/textchainflow.hxx  |3 
 include/svx/viewpt3d.hxx   |2 
 include/svx/xmleohlp.hxx   |2 
 svx/inc/GalleryControl.hxx |1 
 svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx |7 
 svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx|3 
 svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx  |2 
 svx/source/accessibility/AccessibleControlShape.cxx|7 
 svx/source/accessibility/AccessibleFrameSelector.cxx   |   12 -
 svx/source/accessibility/AccessibleShape.cxx   |   22 --
 svx/source/accessibility/AccessibleTextHelper.cxx  |3 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx |7 
 svx/source/accessibility/charmapacc.cxx|   12 -
 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx  |   31 ---
 svx/source/accessibility/svxrectctaccessiblecontext.cxx|   25 +--
 svx/source/dialog/_contdlg.cxx |   14 -
 svx/source/dialog/contimp.hxx  |3 
 svx/source/dialog/ctredlin.cxx |   79 
-
 svx/source/dialog/frmsel.cxx   |9 -
 svx/source/dialog/hdft.cxx |2 
 svx/source/dialog/imapdlg.cxx  |7 
 svx/source/dialog/rulritem.cxx |7 
 svx/source/engine3d/viewpt3d2.cxx  |   11 -
 svx/source/form/databaselocationinput.cxx  |8 -
 svx/source/form/fmshell.cxx|   11 -
 svx/source/form/fmsrcimp.cxx   |2 
 svx/source/form/fmtextcontrolshell.cxx |   16 --
 svx/source/form/fmvwimp.cxx|   23 +-
 svx/source/form/navigatortree.cxx  |8 -
 svx/source/gallery2/GalleryControl.cxx |   10 -
 svx/source/inc/AccessibleFrameSelector.hxx |2 
 svx/source/inc/GraphCtlAccessibleContext.hxx   |1 
 svx/source/inc/charmapacc.hxx  |1 
 svx/source/inc/eventhandler.hxx|3 
 svx/source/inc/fmexpl.hxx  |1 
 svx/source/inc/fmtextcontrolshell.hxx  |4 
 svx/source/inc/fmvwimp.hxx |2 
 svx/source/inc/frmselimpl.hxx  |2 
 svx/source/inc/svxpixelctlaccessiblecontext.hxx|   12 -
 svx/source/inc/svxrectctaccessiblecontext.hxx  |   21 --
 svx/source/items/algitem.cxx   |   25 +--
 svx/source/items/chrt

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

2016-10-27 Thread Armin Le Grand 
 comphelper/source/misc/backupfilehelper.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 8dcad50137bdcfd1fd1ef444b3397bdec1d5417a
Author: Armin Le Grand 
Date:   Fri Oct 21 17:51:19 2016 +0200

profilesafe: Make sure no recursive saving happens

Change-Id: Idd57a948fcaaf23614ca1a92051a50b86e4bb0c5
Reviewed-on: https://gerrit.libreoffice.org/30145
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index d8780d9..0615117 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -2613,6 +2613,10 @@ namespace comphelper
 maDirs,
 maFiles);
 
+// should not extist, but for the case an error occurred and it got
+// copied somehow, avoid further recurive copying/saving
+maDirs.erase("SafeMode");
+
 // not really needed, can be abandoned
 maDirs.erase("psprint");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Merging feature/commonsallayout branch

2016-10-27 Thread Yousuf Philips 

On 10/20/2016 11:07 AM, Tor Lillqvist wrote:

Is there any reason to believe that those clueless people who hold on to
it will change their mind in any significant number by the time LO 5.4
comes out? Or LO 5.5? They will hold on to it as long as the machine
keeps working.


You know the saying, "if it ain't broke, don't fix it", and most people 
dont consider XP broke (me included) even if MS isnt officially 
supporting it. XP is a lighter weight OS, so many people wont upgrade 
because their hardware cant handle it. On the other hand, you still have 
governments paying microsoft to still support it XP, so XP isnt going 
away anytime soon.


http://www.digitaltrends.com/computing/london-metropolitan-police-windows-xp-updates/
http://bgr.com/2015/06/24/windows-xp-support-us-navy-millions/

There are a number of Mac users who arent above OS X 10.8 for various 
reasons, but as LO's Mac user base isnt as large as Windows, dropping 
the support there in favour of a better toolchain and functionality does 
make sense.



But yeah, I know, the hardest thing in the FLOSS world is taking
decisions that might annoy somebody.


Users will always be annoyed with things changing, even if it is for the 
better.



--tml


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

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

2016-10-27 Thread Miklos Vajna 
 sw/qa/extras/ooxmlexport/data/tdf103001.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|   13 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   32 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |7 +++--
 sw/source/filter/ww8/docxexport.cxx  |8 +++---
 5 files changed, 44 insertions(+), 16 deletions(-)

New commits:
commit 3f373500282c926031eed4f995ca8d51402ed187
Author: Miklos Vajna 
Date:   Tue Oct 11 08:03:58 2016 +0200

tdf#103001 DOCX export: fix RelId cache when switching streams

RelIds are used to refer to external streams, e.g. images. A RelId cache
tries to avoid storing the same image more than once in the export
result. RelIds are relative to an XML stream, so caching them across
stream switches is problematic. There was code already to notify the
cache after a header or footer was written, but:

1) It was only done after a switch, not before and

2) It cleared the whole cache, instead of stashing it away, and
restoring it when the write of the special stream is done.

Regression from commit b484e9814c66d8d51cea974390963a6944bc9d73
(tdf#83227 oox: reuse RelId in DML/VML export for the same graphic,
2015-09-07), this existing problem became more visible when caching
started to include draw images, not just writer ones.

Fix both problems by turning the cache into a stack that is
pushed/popped around stream changes.

(cherry picked from commit 3906d25a2e12123aee54654ad26699a2832389d4)

Change-Id: If9ec168823eea5e272197e28f6125ba626605550
Reviewed-on: https://gerrit.libreoffice.org/29832
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf103001.docx 
b/sw/qa/extras/ooxmlexport/data/tdf103001.docx
new file mode 100644
index 000..332d415
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf103001.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index f763598..c199d6f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -952,6 +952,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf83227, "tdf83227.docx")
 CPPUNIT_ASSERT_EQUAL(false, 
bool(xNameAccess->hasByName("word/media/image2.png")));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf103001, "tdf103001.docx")
+{
+// The same image is featured in the header and in the body text, make sure
+// the header relation is still written, even when caching is enabled.
+if (!mbExported)
+return;
+
+uno::Reference xNameAccess = 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
 maTempFile.GetURL());
+// This failed: header reused the RelId of the body text, even if RelIds
+// are local to their stream.
+CPPUNIT_ASSERT(xNameAccess->hasByName("word/_rels/header1.xml.rels"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf92521, "tdf92521.odt")
 {
 if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9c1d832..da5f181 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4170,25 +4170,34 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* 
pSdrObj )
 }
 }
 
-void DocxAttributeOutput::ClearRelIdCache()
+void DocxAttributeOutput::PopRelIdCache()
 {
-m_aRelIdCache.clear();
-m_aSdrRelIdCache.clear();
+if (!m_aRelIdCache.empty())
+m_aRelIdCache.pop();
+if (!m_aSdrRelIdCache.empty())
+m_aSdrRelIdCache.pop();
+}
+
+void DocxAttributeOutput::PushRelIdCache()
+{
+m_aRelIdCache.push(std::map());
+m_aSdrRelIdCache.push(std::map());
 }
 
 OUString DocxAttributeOutput::FindRelId(BitmapChecksum nChecksum)
 {
 OUString aRet;
 
-if (m_aSdrRelIdCache.find(nChecksum) != m_aSdrRelIdCache.end())
-aRet = m_aSdrRelIdCache[nChecksum];
+if (!m_aSdrRelIdCache.empty() && m_aSdrRelIdCache.top().find(nChecksum) != 
m_aSdrRelIdCache.top().end())
+aRet = m_aSdrRelIdCache.top()[nChecksum];
 
 return aRet;
 }
 
 void DocxAttributeOutput::CacheRelId(BitmapChecksum nChecksum, const OUString& 
rRelId)
 {
- m_aSdrRelIdCache[nChecksum] = rRelId;
+if (!m_aSdrRelIdCache.empty())
+m_aSdrRelIdCache.top()[nChecksum] = rRelId;
 }
 
 void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const 
Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, 
const SdrObject* pSdrObj )
@@ -4226,9 +4235,9 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 else
 pGraphic = pOLENode->GetGraphic();
 
-if (m_aRelIdCache.find(pGraphic) != m_aRelIdCache.end())
+if (!m_aRelIdCache.empty() && m_aRelIdCache.top().find(pGraphic) != 
m_aRelIdCache.top().en

[Libreoffice-commits] core.git: 8 commits - chart2/source dbaccess/inc dbaccess/Library_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbapp.mk dbaccess/UIConfig_dbbrowser.mk dbaccess/UICo

2016-10-27 Thread Maxim Monastirsky 
 chart2/source/controller/chartcontroller.component   |2 
 chart2/source/controller/main/ToolbarController.cxx  |2 
 dbaccess/Library_dbu.mk  |1 
 dbaccess/UIConfig_dbapp.mk   |4 
 dbaccess/UIConfig_dbbrowser.mk   |4 
 dbaccess/UIConfig_dbtdata.mk |4 
 dbaccess/inc/dbaccess_helpid.hrc |7 
 dbaccess/source/ui/app/app.src   |   65 --
 dbaccess/source/ui/browser/sbabrw.src|   19 
 dbaccess/source/ui/control/toolboxcontroller.cxx |  263 
--
 dbaccess/source/ui/inc/dbu_resource.hrc  |2 
 dbaccess/source/ui/inc/toolboxcontroller.hxx |   66 --
 dbaccess/source/ui/inc/uiservices.hxx|1 
 dbaccess/source/ui/misc/uiservices.cxx   |1 
 dbaccess/uiconfig/dbapp/popupmenu/new.xml|   20 
 dbaccess/uiconfig/dbbrowser/popupmenu/refreshdata.xml|   13 
 dbaccess/uiconfig/dbtdata/popupmenu/refreshdata.xml  |   13 
 dbaccess/util/dbu.component  |3 
 framework/source/uielement/menubarmanager.cxx|   14 
 framework/source/uielement/popuptoolbarcontroller.cxx|   86 +++
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu  |   56 +-
 officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu |   17 
 22 files changed, 215 insertions(+), 448 deletions(-)

New commits:
commit 2dc980990316e1efd1c21ecc5050bbc134838f7a
Author: Maxim Monastirsky 
Date:   Thu Oct 27 10:08:16 2016 +0300

Make XServiceInfo match what's in .component file

also should match the entry in
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu

Change-Id: If5f532d428bfcd925123ab83df6185680a04249e

diff --git a/chart2/source/controller/chartcontroller.component 
b/chart2/source/controller/chartcontroller.component
index 2348063..01201cb 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -53,6 +53,6 @@
   
   
-
+
   
 
diff --git a/chart2/source/controller/main/ToolbarController.cxx 
b/chart2/source/controller/main/ToolbarController.cxx
index b7f2d35..072804b 100644
--- a/chart2/source/controller/main/ToolbarController.cxx
+++ b/chart2/source/controller/main/ToolbarController.cxx
@@ -113,7 +113,7 @@ void ChartToolbarController::update()
 OUString ChartToolbarController::getImplementationName()
 throw (css::uno::RuntimeException, std::exception)
 {
-return OUString("org.libreoffice.chart2.ChartToolbarController");
+return OUString("org.libreoffice.chart2.Chart2ToolboxController");
 }
 
 sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName)
commit 0438d3e63601c98e202e6b251da90fb17bd048c3
Author: Maxim Monastirsky 
Date:   Thu Oct 27 01:21:48 2016 +0300

dbaccess: OToolboxController is now unused

This also removes the only occurrence of the
"com.sun.star.frame.ToolboxController" service. However it shouldn't
be considered as API CHANGE, as no 3rd-party code should rely on
undocumented services, and fortunately a toolbox controller like this
has no use for 3rd-party anyway.

BTW there are other cases of using non-existent (unique) service
names for toolbox controllers in non-sfx2 modules, rather than using
the standard "com.sun.star.frame.ToolbarController". There is
OToolboxController in reportdesign (which I hope to remove soon too,
as it's just a wrapper around SvxColorToolBoxControl). And there was
also ShapeToolbarController in chart2 which I removed in
2aea9e37d697ce51efc5fb37ba50f1bf177e0445 ("Introduce generic sub toolbar
controller").

Change-Id: Iea8858be2406f32bb5a022920b4b1cee70603c09

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 00db4f8..6aa3f15 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
 dbaccess/source/ui/control/SqlNameEdit \
 dbaccess/source/ui/control/TableGrantCtrl \
 dbaccess/source/ui/control/tabletree \
-dbaccess/source/ui/control/toolboxcontroller \
 dbaccess/source/ui/control/undosqledit \
 dbaccess/source/ui/control/VertSplitView \
 dbaccess/source/ui/dlg/admincontrols \
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx 
b/dbaccess/source/ui/control/toolboxcontroller.cxx
deleted file mode 100644
index 2208de1..000
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ /dev/null
@@ -1,263 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the Li

[Libreoffice-commits] core.git: 2 commits - postprocess/Rdb_services.mk sd/README

2016-10-27 Thread David Tardon 
 postprocess/Rdb_services.mk |2 +-
 sd/README   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 25a55eb169c737149ad79432f3c1f202fd67c09c
Author: David Tardon 
Date:   Tue Oct 25 17:09:05 2016 +0200

fix path in README

Change-Id: I7f1252d38ed045d9c23d3369e42e107c3ba2bec9

diff --git a/sd/README b/sd/README
index 4760c0e..c250d81 100644
--- a/sd/README
+++ b/sd/README
@@ -8,7 +8,7 @@ of ppt and pptx filter, few other filters too.
 
 the slideshow UI lives here as well, the slideshow engine is in
 slideshow module though (including the 3D transitions engine
-slideshow/source/engine/OGLTrans).
+slideshow/source/engine/opengl).
 
 the most used filters are ODF's odp, binary ppt and OOXML's
 pptx. their locations are listed below:
commit 01b5dfb418f4e0d98b605cb21fd0175601da5a9d
Author: David Tardon 
Date:   Tue Oct 25 17:08:02 2016 +0200

fix path

Change-Id: I9eada2693b67d3ca0b0062b9f4dbc9f9bf34d090

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index e22623b..cd95213 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -216,7 +216,7 @@ $(eval $(call gb_Rdb_add_components,services,\
extensions/source/update/ui/updchk \
) \
$(if $(ENABLE_OPENGL_TRANSITIONS), \
-   slideshow/source/engine/OGLTrans/ogltrans \
+   slideshow/source/engine/opengl/ogltrans \
) \
$(if $(ENABLE_TDE), \
shell/source/backends/kdebe/tdebe1 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/Admin.cpp loolwsd/AdminModel.cpp loolwsd/DocumentBroker.cpp loolwsd/DocumentBroker.hpp loolwsd/LOOLWSD.cpp

2016-10-27 Thread Ashod Nakashian 
 loolwsd/Admin.cpp  |1 
 loolwsd/AdminModel.cpp |   97 -
 loolwsd/DocumentBroker.cpp |   16 +++
 loolwsd/DocumentBroker.hpp |7 ---
 loolwsd/LOOLWSD.cpp|8 ---
 5 files changed, 71 insertions(+), 58 deletions(-)

New commits:
commit 6c0be6d90dbb0808f667467bd67dc6b7582bcda0
Author: Ashod Nakashian 
Date:   Sat Oct 22 10:25:57 2016 -0400

loolwsd: move admin updates into DocumentBroker

Change-Id: Ic35198a7e4457a775fac25954279501e37b94b42
Reviewed-on: https://gerrit.libreoffice.org/30199
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 61c1fc5..ca10d50 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -17,6 +17,7 @@
 #include 
 #include 
 
+#include "Admin.hpp"
 #include "ClientSession.hpp"
 #include "Exceptions.hpp"
 #include "LOOLProtocol.hpp"
@@ -162,6 +163,15 @@ DocumentBroker::DocumentBroker(const Poco::URI& uriPublic,
 Log::info("DocumentBroker [" + _uriPublic.toString() + "] created. DocKey: 
[" + _docKey + "]");
 }
 
+DocumentBroker::~DocumentBroker()
+{
+Admin::instance().rmDoc(_docKey);
+
+Log::info() << "~DocumentBroker [" << _uriPublic.toString()
+<< "] destroyed with " << getSessionsCount()
+<< " sessions left." << Log::end;
+}
+
 bool DocumentBroker::load(const std::string& sessionId, const std::string& 
jailId)
 {
 {
@@ -464,6 +474,9 @@ size_t 
DocumentBroker::addSession(std::shared_ptr& session)
 throw;
 }
 
+// Tell the admin console about this new doc
+Admin::instance().addDoc(_docKey, getPid(), getFilename(), id);
+
 auto prisonerSession = std::make_shared(id, 
shared_from_this());
 
 // Connect the prison session to the client.
@@ -504,6 +517,9 @@ size_t DocumentBroker::removeSession(const std::string& id)
 _childProcess->sendTextFrame(msg);
 }
 
+// Lets remove this session from the admin console too
+Admin::instance().rmDoc(_docKey, id);
+
 return _sessions.size();
 }
 
diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp
index 9472fb9..170613c 100644
--- a/loolwsd/DocumentBroker.hpp
+++ b/loolwsd/DocumentBroker.hpp
@@ -173,12 +173,7 @@ public:
const std::string& childRoot,
const std::shared_ptr& childProcess);
 
-~DocumentBroker()
-{
-Log::info() << "~DocumentBroker [" << _uriPublic.toString()
-<< "] destroyed with " << getSessionsCount()
-<< " sessions left." << Log::end;
-}
+~DocumentBroker();
 
 /// Loads a document from the public URI into the jail.
 bool load(const std::string& sessionId, const std::string& jailId);
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index e0723e6..ef88a77 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -831,9 +831,6 @@ private:
 ws->sendFrame(status.data(), (int) status.size());
 }
 
-// Tell the admin console about this new doc
-Admin::instance().addDoc(docKey, docBroker->getPid(), 
docBroker->getFilename(), id);
-
 LOOLWSD::dumpEventTrace(docBroker->getJailId(), id, "NewSession: " 
+ uri);
 
 // Let messages flow.
@@ -883,9 +880,6 @@ private:
 sessionsCount = docBroker->removeSession(id);
 Log::trace(docKey + ", ws_sessions--: " + 
std::to_string(sessionsCount));
 }
-
-// Lets remove this session from the admin console too
-Admin::instance().rmDoc(docKey, id);
 }
 
 if (sessionsCount == 0)
@@ -897,8 +891,6 @@ private:
 --LOOLWSD::NumDocBrokers;
 logNumDocBrokers(__LINE__);
 #endif
-Log::info("Removing complete doc [" + docKey + "] from 
Admin.");
-Admin::instance().rmDoc(docKey);
 }
 
 LOOLWSD::dumpEventTrace(docBroker->getJailId(), id, "EndSession: " 
+ uri);
commit 2e9b3ae247879d199af80e52ef250bfe20038078
Author: Ashod Nakashian 
Date:   Sat Oct 22 10:24:27 2016 -0400

loolwsd: admin cleanups

Change-Id: I1ed9cdfe1c78665722ed517218ce45055c661b69
Reviewed-on: https://gerrit.libreoffice.org/30198
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp
index 3ef735f..04d479b 100644
--- a/loolwsd/Admin.cpp
+++ b/loolwsd/Admin.cpp
@@ -317,6 +317,7 @@ void Admin::rmDoc(const std::string& docKey, const 
std::string& sessionId)
 void Admin::rmDoc(const std::string& docKey)
 {
 std::unique_lock modelLock(_modelMutex);
+Log::info("Removing complete doc [" + docKey + "] from Admin.");
 _model.removeDocument(docKey);
 }
 
diff --git a/loolwsd/AdminModel.cpp b/loolwsd/AdminModel.cpp
index a025400..45afd2a 100644
--- a/loolwsd/AdminModel.cpp
+++ b/

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

2016-10-27 Thread Caolán McNamara 
 helpers/help_hid.lst  |4 
 source/text/scalc/01/0408.xhp |   10 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit a4da1a4e16caf0c413b5a4e4f3e2e7c068fede51
Author: Caolán McNamara 
Date:   Mon Oct 24 13:03:53 2016 +0100

update help ids for function panel .ui conversion

Change-Id: Ie6623190ca919e7e4cf0d76ba94fd67056a09f3e

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 32385d7..6805688 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -30,7 +30,6 @@ FID_FILL_TO_RIGHT,26225,.uno:FillRight
 FID_FILL_TO_TOP,26226,.uno:FillUp
 FID_FILTER_OK,26108,.uno:FilterExecute
 FID_FOCUS_POSWND,26645,.uno:FocusCellAddress
-FID_FUNCTION_BOX,26248,.uno:FunctionBox
 FID_HARD_RECALC,26318,.uno:CalculateHard
 FID_INPUTLINE_BLOCK,26129,.uno:InputLineBlock
 FID_INPUTLINE_ENTER,26101,.uno:InputLineEnter
@@ -4879,10 +4878,7 @@ sc_CheckBox_RID_SCPAGE_CALC_BTN_REGEX,957252628,
 sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575,
 sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637,
 sc_FloatingWindow_RID_SCDLG_TEAM,231304704,
-sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481,
 sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304,
-sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
-sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
diff --git a/source/text/scalc/01/0408.xhp 
b/source/text/scalc/01/0408.xhp
index 7b46e44..36aa5b7 100644
--- a/source/text/scalc/01/0408.xhp
+++ b/source/text/scalc/01/0408.xhp
@@ -42,15 +42,15 @@
 
 
 The 
Function List window is a resizable dockable 
window. Use it to quickly enter functions in the spreadsheet. By 
double-clicking an entry in the functions list, the respective function is 
directly inserted with all parameters.
-
+
 
 Category List
 
-
+
 
 Function List
-Displays the available 
functions. When you select a function, the area below the list box 
displays a short description. To insert the selected function double-click it 
or click the Insert Function into calculation sheet 
icon.
-
+Displays the available 
functions. When you select a function, the area below the list box 
displays a short description. To insert the selected function double-click it 
or click the Insert Function into calculation sheet 
icon.
+
 
 Insert 
Function into calculation sheet
 
@@ -60,7 +60,7 @@
Icon
 
 
-  Inserts the selected function 
into the document.
+  Inserts the selected function into 
the document.
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Miklos Vajna 
 solenv/qa/python/gbuildtoide.py |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3803460589e6f158267315848728ccaba7d57275
Author: Miklos Vajna 
Date:   Wed Oct 26 20:12:07 2016 +0200

solenv: fix Windows build

Traceback (most recent call last):
File 
"C:cygwinhometdflodejenkinsworkspacelo_gerritConfigwindows_msc_dbgutil_32solenvqapythongbuildtoide.py",
 line 32, in test_gbuildtoide
del(os.environ['LD_LIBRARY_PATH']) # built with ASAN; prevent that
File 
"C:cygwinhometdflodejenkinsworkspacelo_gerritConfigwindows_msc_dbgutil_32instdirprogram\python-core-3.3.0libos.py",
 line 692, in __delitem__
raise KeyError(key) from None
KeyError: 'LD_LIBRARY_PATH'

Change-Id: I1575caf90cafffd71dd28fedc46b5e3570848be8
Reviewed-on: https://gerrit.libreoffice.org/30304
Reviewed-by: Miklos Vajna 
Tested-by: Michael Stahl 

diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 4de079e..e189995 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -29,7 +29,8 @@ class CheckGbuildToIde(unittest.TestCase):
 def test_gbuildtoide(self):
 os.chdir(os.path.join(os.environ['SRCDIR'], 'solenv', 'qa', 'python', 
'selftest'))
 # make may find instdir/program/libfreebl3.so and fall over if that was
-del(os.environ['LD_LIBRARY_PATH']) # built with ASAN; prevent that
+   if 'LD_LIBRARY_PATH' in os.environ:
+del(os.environ['LD_LIBRARY_PATH']) # built with ASAN; prevent that
 make = os.environ['MAKE']
 subprocess.check_call([make, 'gbuildtoide', 'WORKDIR=%s' % 
self.tempworkmixed])
 jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToIde', 
'Library'))
@@ -70,3 +71,5 @@ class CheckGbuildToIde(unittest.TestCase):
 
 if __name__ == "__main__":
 unittest.main()
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Aron Budea 
 sc/source/core/data/dpcache.cxx   |5 +++--
 sc/source/core/tool/cellkeytranslator.cxx |6 --
 sc/source/core/tool/compare.cxx   |5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 8175e30b732e3f6f4f1058934e7fe8a1189f40cf
Author: Aron Budea 
Date:   Tue Oct 25 01:01:01 2016 +0200

tdf#79892: Pass resolved locale to transliterate calls in Calc

Instead of ScGlobal::eLnge, use
ScGlobal::pSysLocale->GetLanguageTag().getLanguageType().

Change-Id: Ie0aa90098860ac2b6cee195180dbc213eaf3b5f8
Reviewed-on: https://gerrit.libreoffice.org/30240
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 49b1d61..03ba6588 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -562,10 +562,11 @@ bool ScDPCache::ValidQuery( SCROW nRow, const 
ScQueryParam &rParam) const
 {
 OUString aQueryStr = 
rEntry.GetQueryItem().maString.getString();
 css::uno::Sequence< sal_Int32 > xOff;
+const LanguageType nLang = 
ScGlobal::pSysLocale->GetLanguageTag().getLanguageType();
 OUString aCell = pTransliteration->transliterate(
-aCellStr, ScGlobal::eLnge, 0, 
aCellStr.getLength(), &xOff);
+aCellStr, nLang, 0, aCellStr.getLength(), &xOff);
 OUString aQuer = pTransliteration->transliterate(
-aQueryStr, ScGlobal::eLnge, 0, 
aQueryStr.getLength(), &xOff);
+aQueryStr, nLang, 0, aQueryStr.getLength(), &xOff);
 bOk = (aCell.indexOf( aQuer ) != -1);
 }
 if (rEntry.eOp == SC_NOT_EQUAL)
diff --git a/sc/source/core/tool/cellkeytranslator.cxx 
b/sc/source/core/tool/cellkeytranslator.cxx
index 2c515e3..b1d0122 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -161,9 +162,10 @@ void ScCellKeywordTranslator::transKeyword(OUString& 
rName, const lang::Locale*
 if ( !spInstance.get() )
 spInstance.reset( new ScCellKeywordTranslator );
 
-LanguageType eLang = pLocale ? 
LanguageTag(*pLocale).makeFallback().getLanguageType() : LANGUAGE_SYSTEM;
+LanguageType nLang = pLocale ?
+LanguageTag(*pLocale).makeFallback().getLanguageType() : 
ScGlobal::pSysLocale->GetLanguageTag().getLanguageType();
 Sequence aOffsets;
-rName = spInstance->maTransWrapper.transliterate(rName, eLang, 0, 
rName.getLength(), &aOffsets);
+rName = spInstance->maTransWrapper.transliterate(rName, nLang, 0, 
rName.getLength(), &aOffsets);
 lclMatchKeyword(rName, spInstance->maStringNameMap, eOpCode, pLocale);
 }
 
diff --git a/sc/source/core/tool/compare.cxx b/sc/source/core/tool/compare.cxx
index a1dd602..4135953 100644
--- a/sc/source/core/tool/compare.cxx
+++ b/sc/source/core/tool/compare.cxx
@@ -161,11 +161,12 @@ double CompareFunc( const Compare& rComp, CompareOptions* 
pOptions )
 }
 else
 {
+const LanguageType nLang = 
ScGlobal::pSysLocale->GetLanguageTag().getLanguageType();
 OUString aCell( pTransliteration->transliterate(
-rCell1.maStr.getString(), ScGlobal::eLnge, 0,
+rCell1.maStr.getString(), nLang, 0,
 rCell1.maStr.getLength(), nullptr));
 OUString aQuer( pTransliteration->transliterate(
-rCell2.maStr.getString(), ScGlobal::eLnge, 0,
+rCell2.maStr.getString(), nLang, 0,
 rCell2.maStr.getLength(), nullptr));
 bMatch = (aCell.indexOf( aQuer ) != -1);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: stoc/Library_javavm.mk stoc/source

2016-10-27 Thread Eike Rathke 
 stoc/Library_javavm.mk|1 +
 stoc/source/javavm/javavm.cxx |   30 ++
 2 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 9b09a217c79e8a35fc4de54c89ef49fbf8f72752
Author: Eike Rathke 
Date:   Tue Oct 25 13:10:07 2016 +0200

Resolves: #i86470# Wrong Java locale when using "nl" and "fr"

Languages don't always have a country; if there is no "-" separating
language and country in the ooLocale registry value, use the entire
value as the language.

Initial finding by Damjan Jovanovic.
However, LibreOffice knows BCP47 language tags so that needs a different
approach.

(cherry picked from commit d61ab2b5a0e35d55cb001e139be791420245bf35)

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

diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index a45518c..fc4428d 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Library_use_udk_api,javavm))
 $(eval $(call gb_Library_use_libraries,javavm,\
 cppu \
 cppuhelper \
+i18nlangtag \
 jvmaccess \
 jvmfwk \
 sal \
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 87196d5..b27df6f 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -71,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "jni.h"
 
 #include 
@@ -368,28 +369,25 @@ void getDefaultLocaleFromConfig(
 // read locale
 css::uno::Reference locale = 
xRegistryRootKey->openKey("L10N/ooLocale");
 if(locale.is() && !locale->getStringValue().isEmpty()) {
+LanguageTag aLanguageTag( locale->getStringValue());
 OUString language;
+OUString script;
 OUString country;
+// Java knows nothing but plain old ISO language and country codes.
+aLanguageTag.getIsoLanguageScriptCountry( language, script, country);
 
-sal_Int32 index = locale->getStringValue().indexOf((sal_Unicode) '-');
+if(!language.isEmpty()) {
+OUString prop = "user.language="
+  + language;
 
-if(index >= 0) {
-language = locale->getStringValue().copy(0, index);
-country = locale->getStringValue().copy(index + 1);
-
-if(!language.isEmpty()) {
-OUString prop = "user.language="
-  + language;
-
-pjvm->pushProp(prop);
-}
+pjvm->pushProp(prop);
+}
 
-if(!country.isEmpty()) {
-OUString prop = "user.country="
-  + country;
+if(!country.isEmpty()) {
+OUString prop = "user.country="
+  + country;
 
-pjvm->pushProp(prop);
-}
+pjvm->pushProp(prop);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Noel Grandin 
 slideshow/source/engine/opengl/TransitionerImpl.cxx |   10 ++
 slideshow/source/engine/slide/slideimpl.cxx |   20 ++--
 2 files changed, 4 insertions(+), 26 deletions(-)

New commits:
commit 7195c7e8b80f0a875126e9275aa12e4608b1763c
Author: Noel Grandin 
Date:   Thu Oct 27 10:58:37 2016 +0200

loplugin:expandablemethods in slideshow

Change-Id: I3a7207e0566bc4b871b364da3180ce67e1099de8

diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx 
b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 6e2f5a9..ef1d385 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -201,7 +201,6 @@ private:
 void GLInitSlides();
 
 bool impl_prepareTransition();
-void impl_finishTransition();
 
 private:
 rtl::Reference mpContext;
@@ -412,12 +411,6 @@ bool OGLTransitionerImpl::impl_prepareTransition()
 return false;
 }
 
-void OGLTransitionerImpl::impl_finishTransition()
-{
-if( mpTransition && mpTransition->getSettings().mnRequiredGLVersion <= 
mnGLVersion )
-mpTransition->finish();
-}
-
 bool OGLTransitionerImpl::setTransition( const 
std::shared_ptr& pTransition )
 {
 if ( mpTransition ) // already initialized
@@ -1106,7 +1099,8 @@ void OGLTransitionerImpl::impl_dispose()
 mpContext->makeCurrent();
 CHECK_GL_ERROR();
 
-impl_finishTransition();
+if( mpTransition && mpTransition->getSettings().mnRequiredGLVersion <= 
mnGLVersion )
+mpTransition->finish();
 disposeTextures();
 if( mpContext.is() )
 mpContext->dispose();
diff --git a/slideshow/source/engine/slide/slideimpl.cxx 
b/slideshow/source/engine/slide/slideimpl.cxx
index 2d7dafc..49e1aba 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -175,12 +175,6 @@ private:
 /// Prefetch show, but don't call applyInitialShapeAttributes()
 bool implPrefetchShow();
 
-/// Start GIF and other intrinsic shape animations
-void endIntrinsicAnimations();
-
-/// End GIF and other intrinsic shape animations
-void startIntrinsicAnimations();
-
 /// Add Polygons to the member maPolygons
 void addPolygons(const PolyPolygonVector& rPolygons);
 
@@ -465,7 +459,7 @@ void SlideImpl::show( bool bSlideBackgoundPainted )
 // enable shape-intrinsic animations (drawing layer animations or
 // GIF animations)
 if( mbIntrinsicAnimationsAllowed )
-startIntrinsicAnimations();
+mpSubsettableShapeManager->notifyIntrinsicAnimationsEnabled();
 
 // enable paint overlay, if maUserPaintColor is valid
 activatePaintOverlay();
@@ -491,7 +485,7 @@ void SlideImpl::hide()
 
 
 // switch off all shape-intrinsic animations.
-endIntrinsicAnimations();
+mpSubsettableShapeManager->notifyIntrinsicAnimationsDisabled();
 
 // force-end all SMIL animations, too
 maAnimations.end();
@@ -855,16 +849,6 @@ void SlideImpl::deactivatePaintOverlay()
 mbPaintOverlayActive = false;
 }
 
-void SlideImpl::endIntrinsicAnimations()
-{
-mpSubsettableShapeManager->notifyIntrinsicAnimationsDisabled();
-}
-
-void SlideImpl::startIntrinsicAnimations()
-{
-mpSubsettableShapeManager->notifyIntrinsicAnimationsEnabled();
-}
-
 void SlideImpl::applyShapeAttributes(
 const css::uno::Reference< css::animations::XAnimationNode >& 
xRootAnimationNode,
 bool bInitial) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Muhammet Kara 
 cui/source/dialogs/dlgname.cxx |5 -
 cui/uiconfig/ui/namedialog.ui  |5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 0c2272786bc8663554ea7d4a72f03379e0d6608d
Author: Muhammet Kara 
Date:   Wed Oct 26 11:35:24 2016 +0300

tdf#103464 Don't allow empty names in SvxNameDialog

Menus, context menus, toolbars, toolbar items...
could be created with empty names, and could be
renamed to have empty names before this patch.

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

diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 88b768a..cedbf7e 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -60,8 +60,11 @@ void SvxNameDialog::dispose()
 
 IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl, Edit&, void)
 {
+// Do not allow empty names
 if(aCheckNameHdl.IsSet())
-pBtnOK->Enable(aCheckNameHdl.Call(*this));
+pBtnOK->Enable(!pEdtName->GetText().isEmpty() && 
aCheckNameHdl.Call(*this));
+else
+pBtnOK->Enable(!pEdtName->GetText().isEmpty());
 }
 
 
diff --git a/cui/uiconfig/ui/namedialog.ui b/cui/uiconfig/ui/namedialog.ui
index 4d7bef0..541b795 100644
--- a/cui/uiconfig/ui/namedialog.ui
+++ b/cui/uiconfig/ui/namedialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -20,6 +20,7 @@
   
 gtk-ok
 True
+False
 True
 True
 True
@@ -80,10 +81,10 @@
   
 True
 False
-0
 True
 True
 name_entry
+0
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread László Németh 
 0 files changed

New commits:
commit db3ec60bdde61e265287b4be9a5bae84fa233c09
Author: László Németh 
Date:   Thu Oct 27 11:33:25 2016 +0200

empty commit (repeat, fix test)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Tor Lillqvist 
 basic/qa/cppunit/test_vba.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f29ce347f906d4147e7366a888dd4b401cbb1894
Author: Tor Lillqvist 
Date:   Thu Oct 27 12:25:09 2016 +0300

Bypass VBATest::testMiscOLEStuff() in a 64-bit Windows build for now

It fails when Excel is installed, for some reason:

Basic error:
Type: com.sun.star.uno.RuntimeException
Message: [automation bridge] unexpected exception in 
IUnknownWrapper_Impl::invoke ! Message :
[automation bridge]: [Microsoft][ODBC Driver Manager] Data source name 
not found and no default driver specified
macro result for ole_ObjAssignNoDflt.vb
macro returned:


C:/cygwin64/home/Tor/lo/64bit-debug/basic/qa/cppunit/test_vba.cxx:155:`anonymous
 namespace'::VBATest::testMiscOLEStuff
assertion failed
- Expression: pReturn->GetOUString() == "OK"
- Result not as expected

Note that this test returns early if Excel is not installed, so it is
not run effectively performed anyway even in 32-bit builds on most
(any?) Jenkins and tinderbox machines.

Change-Id: I0a0b6f27219dec116369fae1bb7c95b3e9597e77

diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index fb16951..4e5adc3 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -87,8 +87,10 @@ void VBATest::testMiscVBAFunctions()
 
 void VBATest::testMiscOLEStuff()
 {
-// not much point even trying to run except on windows
-#if defined(_WIN32)
+// Not much point even trying to run except on Windows. Does not work
+// on 64-bit Windows with Excel installed. (Without Excel doesn't
+// really do anything anyway, see "so skip test" below.)
+#if defined(_WIN32) && !defined(_WIN64)
 // test if we have the necessary runtime environment
 // to run the OLE tests.
 uno::Reference< lang::XMultiServiceFactory > xOLEFactory;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests

2016-10-27 Thread Stephan Bergmann 
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java |   24 
+-
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 97c4f06d097b31e96bd27bb13f1366a02a5c0064
Author: Stephan Bergmann 
Date:   Thu Oct 27 11:51:53 2016 +0200

untabify

Change-Id: I090f63d93166de9bee2527e0e75248916204be5a

diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java 
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
index 48bd9b2..a91e1d6d 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
@@ -469,18 +469,18 @@ public class _XAccessibleComponent extends 
MultiMethodTest {
 boolean result = false;
 Size size = oObj.getSize();
 
-   for (int i = 0; i < 2 && !result; i++)
-   {
-   result = true;
-   result &= (size.Width == bounds.Width);
-   result &= (size.Height == bounds.Height);
-   if (!result) {
-   log.println( "potential race bounds " + bounds.Width + "x" + 
bounds.Height +
-" vs. size " + size.Width + "x" + size.Height);
-   // Possibily we hit a race condition and it re-sized (?) ...
-   bounds = oObj.getBounds();
-   size = oObj.getSize();
-   }
+for (int i = 0; i < 2 && !result; i++)
+{
+result = true;
+result &= (size.Width == bounds.Width);
+result &= (size.Height == bounds.Height);
+if (!result) {
+log.println( "potential race bounds " + bounds.Width + "x" + 
bounds.Height +
+ " vs. size " + size.Width + "x" + size.Height);
+// Possibily we hit a race condition and it re-sized (?) ...
+bounds = oObj.getBounds();
+size = oObj.getSize();
+}
 }
 
 tRes.tested("getSize()", result);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests

2016-10-27 Thread Stephan Bergmann 
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 7f45ebf7fa209a974032a6c695f194d9a20baaef
Author: Stephan Bergmann 
Date:   Thu Oct 27 11:52:30 2016 +0200

Add link to bug describing such a race

Change-Id: Idd3e325c1240905649e04333fadcde9ac4a4ad0f

diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java 
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
index a91e1d6d..18d2cf1 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
@@ -478,6 +478,11 @@ public class _XAccessibleComponent extends MultiMethodTest 
{
 log.println( "potential race bounds " + bounds.Width + "x" + 
bounds.Height +
  " vs. size " + size.Width + "x" + size.Height);
 // Possibily we hit a race condition and it re-sized (?) ...
+// One such race is described in
+// 
+// "SvpSalInstance::CheckTimeout -> ScTable::SetRowHeightRange
+// breaks JunitTest_sc_unoapi sc.ScAccessibleCell::com::sun::
+// star::accessibility::XAccessibleComponent::getSize()".
 bounds = oObj.getBounds();
 size = oObj.getSize();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Eike Rathke 
 sc/source/filter/oox/externallinkbuffer.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit d12c7aee5cb7e8e1d6971f0cbb392d4b48b007d4
Author: Eike Rathke 
Date:   Thu Oct 27 11:59:59 2016 +0200

remove non-sensical OSL_ENSURE

That started as
OSL_ENSURE( (nTabId == 0) || (getFilterType() == FILTER_OOXML) || 
(getBiff() == BIFF8),
then with c4cb83504faa1d241a116001fd27f7148de300ba became
OSL_ENSURE( (nTabId == 0) || (getBiff() == BIFF8),
then with e73c4d5013d7a0bf7d72db1773d7125ab91cf269 became
OSL_ENSURE( nTabId == 0,
which makes no sense anymore and gets hit in ~every call.

Change-Id: I5dfe3dd53310ab2f977ad574acb1ec9874775020

diff --git a/sc/source/filter/oox/externallinkbuffer.cxx 
b/sc/source/filter/oox/externallinkbuffer.cxx
index 45444ee..0530a7b 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -435,8 +435,6 @@ sal_Int32 ExternalLink::getDocumentLinkIndex() const
 sal_Int32 ExternalLink::getSheetCacheIndex( sal_Int32 nTabId ) const
 {
 OSL_ENSURE( meLinkType == LINKTYPE_EXTERNAL, 
"ExternalLink::getSheetCacheIndex - invalid link type" );
-OSL_ENSURE( nTabId == 0,
-"ExternalLink::getSheetCacheIndex - invalid sheet index" );
 return ContainerHelper::getVectorElement( maSheetCaches, nTabId, -1 );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Eike Rathke 
 sc/source/filter/inc/defnamesbuffer.hxx |4 ++--
 sc/source/filter/oox/defnamesbuffer.cxx |   10 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e641c1740f36ce11c9f178193f74a53ac7af8465
Author: Eike Rathke 
Date:   Thu Oct 27 12:06:46 2016 +0200

Resolves: tdf#103530 OOXML: pass ExternalLinkInfo compiling named 
expressions

Change-Id: If15aa520b93f30b889e5f950185068ef3bdb9235

diff --git a/sc/source/filter/inc/defnamesbuffer.hxx 
b/sc/source/filter/inc/defnamesbuffer.hxx
index 7cf4fba..7a2417d 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -99,8 +99,8 @@ public:
 /** Creates a defined name in the Calc document. */
 voidcreateNameObject( sal_Int32 nIndex );
 /** Converts the formula string or BIFF token array for this defined name. 
*/
-voidconvertFormula();
-std::unique_ptr getScTokens();
+voidconvertFormula( const 
css::uno::Sequence& rExternalLinks );
+std::unique_ptr getScTokens( const 
css::uno::Sequence& rExternalLinks );
 /** Returns true, if this defined name is global in the document. */
 inline bool isGlobalName() const { return mnCalcSheet < 0; }
 /** Returns true, if this defined name is a special builtin name. */
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx 
b/sc/source/filter/oox/defnamesbuffer.cxx
index 7584055..b03d78b 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -322,11 +322,13 @@ void DefinedName::createNameObject( sal_Int32 nIndex )
 mnTokenIndex = nIndex;
 }
 
-std::unique_ptr DefinedName::getScTokens()
+std::unique_ptr DefinedName::getScTokens(
+const css::uno::Sequence& rExternalLinks 
)
 {
 ScTokenArray aTokenArray;
 ScCompiler aCompiler(&getScDocument(), ScAddress(0, 0, mnCalcSheet));
 aCompiler.SetGrammar(formula::FormulaGrammar::GRAM_OOXML);
+aCompiler.SetExternalLinks( rExternalLinks);
 std::unique_ptr 
pArray(aCompiler.CompileString(maModel.maFormula));
 // Compile the tokens into RPN once to populate information into tokens
 // where necessary, e.g. for TableRef inner reference. RPN can be discarded
@@ -339,7 +341,7 @@ std::unique_ptr DefinedName::getScTokens()
 return pArray;
 }
 
-void DefinedName::convertFormula()
+void DefinedName::convertFormula( const 
css::uno::Sequence& rExternalLinks )
 {
 // macro function or vba procedure
 if(!mpScRangeData)
@@ -347,7 +349,7 @@ void DefinedName::convertFormula()
 
 // convert and set formula of the defined name
 {
-std::unique_ptr pTokenArray = getScTokens();
+std::unique_ptr pTokenArray = getScTokens( 
rExternalLinks);
 mpScRangeData->SetCode( *pTokenArray );
 }
 
@@ -445,7 +447,7 @@ void DefinedNamesBuffer::finalizeImport()
 
 /*  Now convert all name formulas, so that the formula parser can find all
 names in case of circular dependencies. */
-maDefNames.forEachMem( &DefinedName::convertFormula );
+maDefNames.forEachMem( &DefinedName::convertFormula, 
getExternalLinks().getLinkInfos());
 }
 
 DefinedNameRef DefinedNamesBuffer::getByIndex( sal_Int32 nIndex ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svl stoc/source svgio/inc svgio/source svl/source

2016-10-27 Thread Noel Grandin 
 include/svl/itempool.hxx  |1 
 include/svl/sharecontrolfile.hxx  |1 
 include/svl/visitem.hxx   |2 -
 include/svl/zforlist.hxx  |5 ---
 stoc/source/inspect/introspection.cxx |8 --
 svgio/inc/svgstyleattributes.hxx  |3 --
 svgio/source/svgreader/svgstyleattributes.cxx |6 ++--
 svl/source/items/poolio.cxx   |7 -
 svl/source/items/visitem.cxx  |8 --
 svl/source/misc/sharecontrolfile.cxx  |   34 +-
 svl/source/numbers/zforlist.cxx   |   18 +++--
 11 files changed, 22 insertions(+), 71 deletions(-)

New commits:
commit c19d2b276b7a28c07315cf60cb0965098a935e5f
Author: Noel Grandin 
Date:   Thu Oct 27 10:34:56 2016 +0200

loplugin:expandablemethods in stoc..svl

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

diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 6c9327f..5121177 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -167,7 +167,6 @@ public:
 
 SvStream &  Load(SvStream &);
 virtual SvStream &  Store(SvStream &) const;
-boolHasPersistentRefCounts() const;
 voidLoadCompleted();
 
 sal_uInt16  GetFirstWhich() const;
diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx
index d622d0e..ad899ac 100644
--- a/include/svl/sharecontrolfile.hxx
+++ b/include/svl/sharecontrolfile.hxx
@@ -44,7 +44,6 @@ class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon
 
 std::vector< LockFileEntry >  m_aUsersData;
 
-void OpenStream();
 void Close();
 bool IsValid()
 {
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 0efc712..b661c37 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -63,8 +63,6 @@ public:
 
 virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override;
 
-OUString GetValueTextByVal(bool bTheValue) const;
-
 bool GetValue() const { return m_nValue.bVisible; }
 };
 
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 9611eb6..ab7dd90 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -849,11 +849,6 @@ private:
 // Create builtin formats for language/country if necessary, return 
CLOffset
 SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge );
 
-// Build negative currency format, old compatibility style
-SVL_DLLPRIVATE void ImpGetNegCurrFormat(OUStringBuffer& sNegStr, const 
OUString& rCurrSymbol);
-// Build positive currency format, old compatibility style
-SVL_DLLPRIVATE void ImpGetPosCurrFormat(OUStringBuffer& sPosStr, const 
OUString& rCurrSymbol);
-
 // Create theCurrencyTable with all NfCurrencyEntry
 SVL_DLLPRIVATE static void ImpInitCurrencyTable();
 
diff --git a/stoc/source/inspect/introspection.cxx 
b/stoc/source/inspect/introspection.cxx
index 081983f..a755443 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -701,7 +701,6 @@ class ImplIntrospectionAccess : public 
IntrospectionAccessHelper
 Reference getXIndexAccess();
 Reference   getXEnumerationAccess();
 ReferencegetXIdlArray();
-Reference   getXUnoTunnel();
 
 void cacheXNameContainer();
 void cacheXIndexContainer();
@@ -1019,11 +1018,6 @@ Reference 
ImplIntrospectionAccess::getXIdlArray()
 return mxObjIdlArray;
 }
 
-Reference ImplIntrospectionAccess::getXUnoTunnel()
-{
-return Reference::query( mxIface );
-}
-
 // Methods from XInterface
 Any SAL_CALL ImplIntrospectionAccess::queryInterface( const Type& rType )
 throw( RuntimeException, std::exception )
@@ -1282,7 +1276,7 @@ void ImplIntrospectionAccess::set(Any& array, sal_Int32 
index, const Any& value)
 sal_Int64 ImplIntrospectionAccess::getSomething( const Sequence< sal_Int8 >& 
aIdentifier )
 throw (RuntimeException, std::exception)
 {
-return getXUnoTunnel()->getSomething( aIdentifier );
+return Reference::query( mxIface )->getSomething( aIdentifier 
);
 }
 
 
diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index 360335a..2021204 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -351,7 +351,6 @@ namespace svgio
 
 /// StrokeDashOffset content
 SvgNumber getStrokeDashOffset() const;
-void setStrokeDashOffset(const SvgNumber& rStrokeDashOffset) { 
maStrokeDashOffset = rStrokeDashOffset; }
 
 /// StrokeLinecap content
 StrokeLinecap getStrokeLinecap() const;
@@ -363,7 +362,6 @@ namespace svgio
 
 /// Strok

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

2016-10-27 Thread Noel Grandin 
 extensions/source/propctrlr/taborder.hxx|3 -
 include/svtools/PlaceEditDialog.hxx |1 
 include/svtools/accessibleruler.hxx |8 
 include/svtools/brwbox.hxx  |2 -
 include/svtools/calendar.hxx|1 
 include/svtools/dialogcontrolling.hxx   |1 
 include/svtools/filectrl.hxx|3 -
 include/svtools/grfmgr.hxx  |5 --
 include/svtools/simptabl.hxx|1 
 include/svtools/treelistbox.hxx |3 -
 include/svtools/unoevent.hxx|1 
 include/svtools/wizdlg.hxx  |1 
 svtools/source/brwbox/brwbox2.cxx   |2 -
 svtools/source/config/extcolorcfg.cxx   |8 
 svtools/source/contnr/fileview.cxx  |   24 +
 svtools/source/contnr/imivctl.hxx   |3 -
 svtools/source/contnr/imivctl1.cxx  |   11 +-
 svtools/source/contnr/simptabl.cxx  |   20 ---
 svtools/source/contnr/svimpbox.cxx  |7 
 svtools/source/contnr/treelistbox.cxx   |   22 +---
 svtools/source/control/accessibleruler.cxx  |2 -
 svtools/source/control/calendar.cxx |7 
 svtools/source/control/filectrl.cxx |7 
 svtools/source/control/toolbarmenu.cxx  |8 
 svtools/source/control/toolbarmenuacc.cxx   |   19 +++---
 svtools/source/control/toolbarmenuimp.hxx   |3 -
 svtools/source/dialogs/PlaceEditDialog.cxx  |   49 
 svtools/source/dialogs/addresstemplate.cxx  |9 -
 svtools/source/dialogs/wizdlg.cxx   |7 
 svtools/source/graphic/descriptor.cxx   |   19 +-
 svtools/source/graphic/descriptor.hxx   |3 -
 svtools/source/graphic/graphic.cxx  |   17 +
 svtools/source/graphic/graphic.hxx  |2 -
 svtools/source/graphic/grfmgr.cxx   |   18 --
 svtools/source/inc/svimpbox.hxx |3 -
 svtools/source/inc/unoiface.hxx |3 -
 svtools/source/misc/dialogcontrolling.cxx   |   11 +-
 svtools/source/misc/templatefoldercache.cxx |9 -
 svtools/source/table/tabledatawindow.cxx|5 --
 svtools/source/table/tabledatawindow.hxx|2 -
 svtools/source/uno/unoevent.cxx |   13 +--
 svtools/source/uno/unoiface.cxx |2 -
 42 files changed, 80 insertions(+), 265 deletions(-)

New commits:
commit 7da765dde1800aa607f96e7a5807582ad2894acb
Author: Noel Grandin 
Date:   Thu Oct 27 10:21:42 2016 +0200

loplugin:expandablemethods in svtools

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

diff --git a/extensions/source/propctrlr/taborder.hxx 
b/extensions/source/propctrlr/taborder.hxx
index 4e35156..6569086 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -52,9 +52,6 @@ namespace pcr
 
 protected:
 virtual voidModelHasMoved(SvTreeListEntry* pSource ) override;
-
-private:
-using SvTreeListBox::MoveSelection;
 };
 
 
diff --git a/include/svtools/PlaceEditDialog.hxx 
b/include/svtools/PlaceEditDialog.hxx
index c6ab42b..4649307 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -81,7 +81,6 @@ public :
 private:
 
 void InitDetails( );
-void UpdateLabel( );
 
 DECL_LINK ( OKHdl, Button *, void );
 DECL_LINK ( DelHdl, Button *, void );
diff --git a/include/svtools/accessibleruler.hxx 
b/include/svtools/accessibleruler.hxx
index ddc63a4..2d4861f 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -178,9 +178,6 @@ protected:
 /// @returns true if it's disposed or in disposing
 inline bool IsAlive() const;
 
-/// @returns true if it's not disposed and no in disposing
-inline bool IsNotAlive() const;
-
 /// throws the exception DisposedException if it's not alive
 void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
 
@@ -212,11 +209,6 @@ inline bool SvtRulerAccessible::IsAlive() const
 return !rBHelper.bDisposed && !rBHelper.bInDispose;
 }
 
-inline bool SvtRulerAccessible::IsNotAlive() const
-{
-return rBHelper.bDisposed || rBHelper.bInDispose;
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 5ec84e6..903fce8 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -302,8 +302,6 @@ private:
 
 boolGoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool 
bRowColMove = false);
 voidSelectColumnPos( sal_uInt16 nCol, bool _bSelect, bool 
bMakeVisible);
-voidSelectColumnId( sal_uInt16 nColId, bool _bSelect, bool 
bMakeVisible)
-{ SelectColumnPos

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

2016-10-27 Thread Giuseppe Castagno 
 ucb/source/ucp/webdav-neon/webdavcontent.cxx |   56 +--
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit cac08e96c753f3aabf3332914da97a49abe1e395
Author: Giuseppe Castagno 
Date:   Thu Oct 27 10:03:46 2016 +0200

Cosmetic: Move function member around...

...so it's nearer to the other function member that uses the
class variables it initializes.

Change-Id: I199621fbcad36313e0948627d47445a1de211d02
Reviewed-on: https://gerrit.libreoffice.org/30313
Reviewed-by: Giuseppe Castagno 
Tested-by: Giuseppe Castagno 

diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx 
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 96b86f7..96a7371 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -285,34 +285,6 @@ Content::~Content()
 }
 
 
-void Content::initOptsCacheLifeTime()
-{
-// see description in
-// officecfg/registry/schema/org/openoffice/Inet.xcs
-// for use of these filed values.
-sal_uInt32 nAtime;
-nAtime = officecfg::Inet::Settings::OptsCacheLifeImplWeb::get( m_xContext 
);
-m_nOptsCacheLifeImplWeb = std::max( sal_uInt32( 0 ),
-std::min( nAtime, sal_uInt32( 3600 ) ) 
);
-
-nAtime = officecfg::Inet::Settings::OptsCacheLifeDAV::get( m_xContext );
-m_nOptsCacheLifeDAV = std::max( sal_uInt32( 0 ),
-std::min( nAtime, sal_uInt32( 3600 ) ) );
-
-nAtime = officecfg::Inet::Settings::OptsCacheLifeDAVLocked::get( 
m_xContext );
-m_nOptsCacheLifeDAVLocked = std::max( sal_uInt32( 0 ),
-std::min( nAtime, sal_uInt32( 3600 ) ) );
-
-nAtime = officecfg::Inet::Settings::OptsCacheLifeNotImpl::get( m_xContext 
);
-m_nOptsCacheLifeNotImpl = std::max( sal_uInt32( 0 ),
-  std::min( nAtime, sal_uInt32( 
43200 ) ) );
-
-nAtime = officecfg::Inet::Settings::OptsCacheLifeNotFound::get( m_xContext 
);
-m_nOptsCacheLifeNotFound = std::max( sal_uInt32( 0 ),
-  std::min( nAtime, sal_uInt32( 30 
) ) );
-}
-
-
 // XInterface methods.
 
 
@@ -4032,6 +4004,34 @@ Content::ResourceType Content::getResourceType(
 }
 
 
+void Content::initOptsCacheLifeTime()
+{
+// see description in
+// officecfg/registry/schema/org/openoffice/Inet.xcs
+// for use of these filed values.
+sal_uInt32 nAtime;
+nAtime = officecfg::Inet::Settings::OptsCacheLifeImplWeb::get( m_xContext 
);
+m_nOptsCacheLifeImplWeb = std::max( sal_uInt32( 0 ),
+std::min( nAtime, sal_uInt32( 3600 ) ) 
);
+
+nAtime = officecfg::Inet::Settings::OptsCacheLifeDAV::get( m_xContext );
+m_nOptsCacheLifeDAV = std::max( sal_uInt32( 0 ),
+std::min( nAtime, sal_uInt32( 3600 ) ) );
+
+nAtime = officecfg::Inet::Settings::OptsCacheLifeDAVLocked::get( 
m_xContext );
+m_nOptsCacheLifeDAVLocked = std::max( sal_uInt32( 0 ),
+std::min( nAtime, sal_uInt32( 3600 ) ) );
+
+nAtime = officecfg::Inet::Settings::OptsCacheLifeNotImpl::get( m_xContext 
);
+m_nOptsCacheLifeNotImpl = std::max( sal_uInt32( 0 ),
+  std::min( nAtime, sal_uInt32( 
43200 ) ) );
+
+nAtime = officecfg::Inet::Settings::OptsCacheLifeNotFound::get( m_xContext 
);
+m_nOptsCacheLifeNotFound = std::max( sal_uInt32( 0 ),
+  std::min( nAtime, sal_uInt32( 30 
) ) );
+}
+
+
 void Content::getResourceOptions(
 const css::uno::Reference< css::ucb::XCommandEnvironment 
>& xEnv,
 DAVOptions& rDAVOptions,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Caolán McNamara 
 sw/source/filter/rtf/swparrtf.cxx |   28 +---
 1 file changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 91114f68e0a81d4f2a5354bc6057f62c22c780b4
Author: Caolán McNamara 
Date:   Thu Oct 27 11:47:29 2016 +0100

I'm testing inserting a rtf, but really want to test simple loading

Change-Id: I13c6e8394de9b7214f3e4d448a7b18cbf3b637e9

diff --git a/sw/source/filter/rtf/swparrtf.cxx 
b/sw/source/filter/rtf/swparrtf.cxx
index 93ebb28..4bc289d 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -160,30 +160,36 @@ extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL 
ImportRTF()
 
 extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(const OUString& 
rURL)
 {
-Reader* pReader = ImportRTF();
-
 SvFileStream aFileStream(rURL, StreamMode::READ);
-tools::SvRef xStorage;
-pReader->pStrm = &aFileStream;
-pReader->SetFltName("FILTER_RTF");
 
 SwGlobals::ensure();
 
 SfxObjectShellLock xDocSh(new SwDocShell(SfxObjectCreateMode::INTERNAL));
 xDocSh->DoInitNew();
-SwDoc* pD =  static_cast((&xDocSh))->GetDoc();
 
-bool bRet = false;
+uno::Reference 
xMultiServiceFactory(comphelper::getProcessServiceFactory());
+uno::Reference 
xInterface(xMultiServiceFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"),
 uno::UNO_QUERY_THROW);
+
+uno::Reference xImporter(xInterface, 
uno::UNO_QUERY_THROW);
+uno::Reference xDstDoc(xDocSh->GetModel(), 
uno::UNO_QUERY_THROW);
+xImporter->setTargetDocument(xDstDoc);
+
+uno::Reference xFilter(xInterface, 
uno::UNO_QUERY_THROW);
+uno::Sequence aDescriptor(1);
+aDescriptor[0].Name = "InputStream";
+uno::Reference xStream(new utl::OStreamWrapper(aFileStream));
+aDescriptor[0].Value <<= xStream;
+bool bRet(1);
 try
 {
-SwPaM aPaM(pD->GetNodes().GetEndOfContent());
-bRet = pReader->Read(*pD, OUString(), aPaM, OUString()) == 0;
+xFilter->filter(aDescriptor);
 }
-catch (std::exception const&)
+catch (...)
 {
+bRet = false;
 }
-delete pReader;
 return bRet;
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Eike Rathke 
 sc/source/core/tool/compiler.cxx |   38 +-
 1 file changed, 33 insertions(+), 5 deletions(-)

New commits:
commit 02af87fdd76bc94fb51aeb160c74d6f719c42c63
Author: Eike Rathke 
Date:   Thu Oct 27 12:52:01 2016 +0200

Resolves: tdf#103531 OOXML: write external file ID within quoted sheet names

Excel expects '[1]Sheet Name' instead of [1]'Sheet Name' and complains if it
encounters the latter.

Fortunately Calc handles both.

Change-Id: If1129e58725b522ca4755c05e313c03fca065f28

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 920b75b..c863423 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1470,12 +1470,23 @@ struct ConventionXL_OOX : public ConventionXL_A1
 OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, 
const OUString& /*rFileName*/,
 const OUString& rTabName, const ScSingleRefData& rRef ) const override
 {
-// [N]'Sheet Name'!$A$1
+// '[N]Sheet Name'!$A$1 or [N]SheetName!$A$1
 // Where N is a 1-based positive integer number of a file name in OOXML
 // xl/externalLinks/externalLinkN.xml
 
-ConventionXL_OOX::makeExternalDocStr(rBuffer, nFileId);
-ScRangeStringConverter::AppendTableName(rBuffer, rTabName);
+OUString aQuotedTab( rTabName);
+ScCompiler::CheckTabQuotes( aQuotedTab);
+if (!aQuotedTab.isEmpty() && aQuotedTab[0] == '\'')
+{
+rBuffer.append('\'');
+ConventionXL_OOX::makeExternalDocStr( rBuffer, nFileId);
+rBuffer.append( aQuotedTab.copy(1));
+}
+else
+{
+ConventionXL_OOX::makeExternalDocStr( rBuffer, nFileId);
+rBuffer.append( aQuotedTab);
+}
 rBuffer.append('!');
 
 makeSingleCellStr(rBuffer, rRef, rRef.toAbs(rPos));
@@ -1486,10 +1497,27 @@ struct ConventionXL_OOX : public ConventionXL_A1
 const std::vector& rTabNames, const OUString& rTabName,
 const ScComplexRefData& rRef ) const override
 {
+// '[N]Sheet One':'Sheet Two'!A1:B2 or [N]SheetOne!A1:B2
+// Actually Excel writes '[N]Sheet One:Sheet Two'!A1:B2 but reads the
+// simpler to produce and more logical form with independently quoted
+// sheet names as well. The [N] having to be within the quoted sheet
+// name is ugly enough..
+
 ScRange aAbsRef = rRef.toAbs(rPos);
 
-ConventionXL_OOX::makeExternalDocStr(rBuffer, nFileId);
-ConventionXL::makeExternalTabNameRange(rBuffer, rTabName, rTabNames, 
aAbsRef);
+OUStringBuffer aBuf;
+ConventionXL::makeExternalTabNameRange( aBuf, rTabName, rTabNames, 
aAbsRef);
+if (!aBuf.isEmpty() && aBuf[0] == '\'')
+{
+rBuffer.append('\'');
+ConventionXL_OOX::makeExternalDocStr( rBuffer, nFileId);
+rBuffer.append( aBuf.copy(1));
+}
+else
+{
+ConventionXL_OOX::makeExternalDocStr( rBuffer, nFileId);
+rBuffer.append( aBuf);
+}
 rBuffer.append('!');
 
 makeSingleCellStr(rBuffer, rRef.Ref1, aAbsRef.aStart);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Julien Nabet 
 vcl/source/gdi/pdfextoutdevdata.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 873929d14aa4013eb3dac216db9b828ff01e8d8f
Author: Julien Nabet 
Date:   Sat Oct 22 20:06:26 2016 +0200

tdf#99723: target ratio must be reached

to be sure we can avoid decompressing/recompressing

Regression from 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=76ec54e8c9f3580450bca85236a4f5af0c328588

Change-Id: Iacd7b2419ea85756f936b17f04c4e495d15e5b81
Reviewed-on: https://gerrit.libreoffice.org/30163
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 
(cherry picked from commit 88fb9d8f0aae0030fac75156f78818affae4298f)
Reviewed-on: https://gerrit.libreoffice.org/30265
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx 
b/vcl/source/gdi/pdfextoutdevdata.cxx
index 34d0c1b..1a58c90 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -830,14 +830,18 @@ bool PDFExtOutDevData::HasAdequateCompression( const 
Graphic &rGraphic,
 { 80, 1500 }, { 75, 1700 }
 };
 sal_Int32 nTargetRatio = 1;
+bool bIsTargetRatioReached = false;
 for (auto & rRatio : aRatios)
 {
 if ( mnCompressionQuality > rRatio.mnQuality )
+{
+bIsTargetRatioReached = true;
 break;
+}
 nTargetRatio = rRatio.mnRatio;
 }
 
-return nCurrentRatio > nTargetRatio;
+return ((nCurrentRatio > nTargetRatio) && bIsTargetRatioReached);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Merging feature/commonsallayout branch

2016-10-27 Thread Bjoern Michaelsen 
Hi,

On Fri, Oct 21, 2016 at 04:01:22AM +0400, Yousuf Philips wrote:
> You know the saying, "if it ain't broke, don't fix it", and most people dont
> consider XP broke (me included) even if MS isnt officially supporting it. 

Its not broke -- it simply doesnt exist anymore. That is what "end of life"
(aka death) means.

> On the other hand, you still have governments paying
> microsoft to still support it XP, so XP isnt going away anytime soon.

You are refered to folks doing L3 support for LibreOffice with that -- as this
is a promise that is entirely unreasonable to ask of this community. And with
that this also ends the topic for this list.

_Iff_ you throw huge amounts of money at a L3 supporter and have bought support
from Microsoft[1] for the OS you want to base on, you might get lucky there.
But as said that is not an issue for this list. The topic has been discussed
conclusively on the ESC before and there are no new facts to waste its time on 
this
again.

Best,

Bjoern



[1] Because while asking for support of newer LibreOffice versions on Windows
XP is already a painful thought, doing the same on Windows XP without having
support for _that_ is even more nonsense.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-10-27 Thread Andras Timar 
 loleaflet/src/core/Socket.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1496a08e78d2eb26ad498b95e616d9b5c0072e12
Author: Andras Timar 
Date:   Thu Oct 27 13:28:52 2016 +0200

too many connections/users -> jump to FAQ

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index ba35050..b24aed6 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -245,7 +245,7 @@ L.Socket = L.Class.extend({
textMsg = textMsg.replace(/%0/g, 
command.params[0]);
textMsg = textMsg.replace(/%1/g, 
command.params[1]);
textMsg = textMsg.replace(/%2/g, (typeof 
brandProductName !== 'undefined' ? brandProductName : 'LibreOffice Online'));
-   textMsg = textMsg.replace(/%3/g, (typeof 
brandProductURL !== 'undefined' ? brandProductURL : 
'https://wiki.documentfoundation.org/Development/LibreOffice_Online'));
+   textMsg = textMsg.replace(/%3/g, (typeof 
brandProductFAQURL !== 'undefined' ? brandProductFAQURL : 
'https://wiki.documentfoundation.org/Development/LibreOffice_Online'));
}
else if (command.errorKind === 'serviceunavailable') {
this._map._fatal = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Eike Rathke 
 sc/source/core/tool/compiler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6628078a929a39a95ae8b2f51348996dc41afbc
Author: Eike Rathke 
Date:   Thu Oct 27 13:25:59 2016 +0200

sc: OOXML: actually write both sheet names in external 3D references

... instead of twice the same name. Even if not handled yet in Calc, 
external
3D references may get imported and have to be written again.
Copy&Paste error since 2f373570c51e13baf0530605ef59808462e6ca71

Change-Id: I6cb982793e1072d619053c02860a8046e78bc99e

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index c863423..847fa5e 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1184,7 +1184,7 @@ struct ConventionXL
 if (rTabName != aLastTabName)
 {
 rBuf.append(':');
-ScRangeStringConverter::AppendTableName(rBuf, rTabName);
+ScRangeStringConverter::AppendTableName(rBuf, aLastTabName);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Noel Grandin 
 sot/source/sdstor/stgcache.cxx|2 +-
 sot/source/sdstor/stgcache.hxx|1 -
 starmath/inc/ElementsDockingWindow.hxx|2 --
 starmath/inc/dialog.hxx   |1 -
 starmath/inc/rect.hxx |2 --
 starmath/inc/utility.hxx  |1 -
 starmath/source/ElementsDockingWindow.cxx |7 +--
 starmath/source/cfgitem.cxx   |   10 ++
 starmath/source/cfgitem.hxx   |1 -
 starmath/source/dialog.cxx|2 +-
 starmath/source/mathmlimport.cxx  |2 +-
 starmath/source/mathmlimport.hxx  |4 
 starmath/source/rect.cxx  |   10 ++
 starmath/source/utility.cxx   |   19 +++
 14 files changed, 15 insertions(+), 49 deletions(-)

New commits:
commit 618171552e1bcddb07660167d9df4512435269b0
Author: Noel Grandin 
Date:   Thu Oct 27 10:50:45 2016 +0200

loplugin:expandablemethods in sot..starmath

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

diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 55f91f12..2ee2c28 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -274,7 +274,7 @@ void StgCache::SetStrm( UCBStorageStream* pStgStream )
 
 void StgCache::SetDirty( const rtl::Reference< StgPage > &rPage )
 {
-assert( IsWritable() );
+assert( m_pStrm && m_pStrm->IsWritable() );
 maDirtyPages[ rPage->GetPage() ] = rPage;
 }
 
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 0fafeba..5a1ec38 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -70,7 +70,6 @@ public:
 SvStream* GetStrm() { return m_pStrm; }
 void  SetStrm( SvStream*, bool );
 void  SetStrm( UCBStorageStream* );
-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& );
diff --git a/starmath/inc/ElementsDockingWindow.hxx 
b/starmath/inc/ElementsDockingWindow.hxx
index 15ca546..50b1648 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -106,8 +106,6 @@ class SmElementsControl : public Control
 
 void addElements(const sal_uInt16 aElementsArray[][2], sal_uInt16 size);
 
-void addSeparator();
-
 void build();
 
 //if pContext is not NULL, then draw, otherwise
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 047f115..79bc363 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -379,7 +379,6 @@ public:
 
 boolSelectSymbolSet(const OUString &rSymbolSetName);
 voidSelectSymbol(sal_uInt16 nSymbolPos);
-sal_uInt16  GetSelectedSymbol() const   { return 
m_pSymbolSetDisplay->GetSelectSymbol(); }
 };
 
 
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index c28e1d2..5f20fda 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -111,8 +111,6 @@ class SmRect
 protected:
 void BuildRect (const OutputDevice &rDev, const SmFormat *pFormat,
 const OUString &rText, sal_uInt16 nBorderWidth);
-void Init(const OutputDevice &rDev, const SmFormat *pFormat,
-  const OUString &rText, sal_uInt16 nBorderWidth);
 
 inline  void CopyMBL(const SmRect& rRect);
 void CopyAlignInfo(const SmRect& rRect);
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index be4c84d..7920fc8 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -122,7 +122,6 @@ public:
 virtual ~SmFontPickList() { Clear(); }
 
 virtual voidInsert(const vcl::Font &rFont);
-voidRemove(const vcl::Font &rFont);
 
 voidClear();
 vcl::Font   Get(sal_uInt16 nPos = 0) const;
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index fe517fb..4721e51 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -502,11 +502,6 @@ void SmElementsControl::DoScroll(long nDelta)
 Invalidate();
 }
 
-void SmElementsControl::addSeparator()
-{
-maElementList.push_back(o3tl::make_unique());
-}
-
 void SmElementsControl::addElement(const OUString& aElementVisual, const 
OUString& aElementSource, const OUString& aHelpText)
 {
 std::unique_ptr pNode(SmParser().ParseExpression(aElementVisual));
@@ -541,7 +536,7 @@ void SmElementsControl::addElements(const sal_uInt16 
aElementsArray[][2], sal_uI
 sal_uInt16 aElementId = aElementsArray[i][0];
 sal_uInt16 aElementIdHelp = aElementsArray[i][1];

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

2016-10-27 Thread Noel Grandin 
 sdext/source/presenter/PresenterAccessibility.cxx   |9 -
 sdext/source/presenter/PresenterController.cxx  |   18 +++---
 sdext/source/presenter/PresenterController.hxx  |2 -
 sdext/source/presenter/PresenterNotesView.cxx   |   18 +++---
 sdext/source/presenter/PresenterNotesView.hxx   |6 ---
 sdext/source/presenter/PresenterProtocolHandler.cxx |   34 +---
 sdext/source/presenter/PresenterScreen.cxx  |   22 
 sdext/source/presenter/PresenterScrollBar.cxx   |   29 +
 sdext/source/presenter/PresenterScrollBar.hxx   |1 
 sdext/source/presenter/PresenterSlideShowView.cxx   |   20 +--
 sdext/source/presenter/PresenterTextView.cxx|7 
 sdext/source/presenter/PresenterTextView.hxx|1 
 sdext/source/presenter/PresenterWindowManager.cxx   |7 
 sdext/source/presenter/PresenterWindowManager.hxx   |2 -
 14 files changed, 50 insertions(+), 126 deletions(-)

New commits:
commit e5438e9ef75a7fdc3c8c6ba44d116f277e036d96
Author: Noel Grandin 
Date:   Thu Oct 27 12:48:08 2016 +0200

loplugin:expandablemethods in sdext

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

diff --git a/sdext/source/presenter/PresenterAccessibility.cxx 
b/sdext/source/presenter/PresenterAccessibility.cxx
index 03d3017..7c474b2 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -217,8 +217,6 @@ protected:
 
 void UpdateState (const sal_Int16 aState, const bool bValue);
 
-bool IsDisposed() const;
-
 void ThrowIfDisposed() const
 throw (css::lang::DisposedException);
 };
@@ -1090,7 +1088,7 @@ void SAL_CALL 
PresenterAccessible::AccessibleObject::addAccessibleEventListener
 {
 const osl::MutexGuard aGuard(m_aMutex);
 
-if (IsDisposed())
+if (rBHelper.bDisposed || rBHelper.bInDispose)
 {
 uno::Reference xThis (static_cast(this), 
UNO_QUERY);
 rxListener->disposing (lang::EventObject(xThis));
@@ -1336,11 +1334,6 @@ awt::Point 
PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation()
 return awt::Point();
 }
 
-bool PresenterAccessible::AccessibleObject::IsDisposed() const
-{
-return (rBHelper.bDisposed || rBHelper.bInDispose);
-}
-
 void PresenterAccessible::AccessibleObject::ThrowIfDisposed() const
 throw (lang::DisposedException)
 {
diff --git a/sdext/source/presenter/PresenterController.cxx 
b/sdext/source/presenter/PresenterController.cxx
index 5a8235c..f6e39cd 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -722,7 +722,12 @@ void SAL_CALL 
PresenterController::notifyConfigurationChange (
 const ConfigurationChangeEvent& rEvent)
 throw (RuntimeException, std::exception)
 {
-ThrowIfDisposed();
+if (rBHelper.bDisposed || rBHelper.bInDispose)
+{
+throw lang::DisposedException (
+OUString( "PresenterController object has already been disposed"),
+const_cast(static_cast(this)));
+}
 
 sal_Int32 nType (0);
 if ( ! (rEvent.UserData >>= nType))
@@ -1208,17 +1213,6 @@ void PresenterController::UpdatePendingSlideNumber 
(const sal_Int32 nPendingSlid
 0));
 }
 
-void PresenterController::ThrowIfDisposed() const
-throw (css::lang::DisposedException)
-{
-if (rBHelper.bDisposed || rBHelper.bInDispose)
-{
-throw lang::DisposedException (
-OUString( "PresenterController object has already been disposed"),
-const_cast(static_cast(this)));
-}
-}
-
 void PresenterController::SwitchMonitors()
 {
 Reference xScreen( mxScreen );
diff --git a/sdext/source/presenter/PresenterController.hxx 
b/sdext/source/presenter/PresenterController.hxx
index e54bcf0..3b96626 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -244,8 +244,6 @@ private:
 The modifier bit field as provided by the key up event.
 */
 void HandleNumericKeyPress (const sal_Int32 nKey, const sal_Int32 
nModifiers);
-
-void ThrowIfDisposed() const throw (css::lang::DisposedException);
 };
 
 } } // end of namespace ::sdext::presenter
diff --git a/sdext/source/presenter/PresenterNotesView.cxx 
b/sdext/source/presenter/PresenterNotesView.cxx
index 11b6d9e..c964839 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -320,7 +320,12 @@ void SAL_CALL PresenterNotesView::windowHidden (const 
lang::EventObject& rEvent)
 void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent)
 throw (RuntimeException, std::exception)
 {
-ThrowIfDisposed();
+if (rBHelper.bDisposed || rBHelper.bInDispose)
+{
+

Information - missing license email.

2016-10-27 Thread Jan Iversen 
Hi

For general information, I am reaching out to emails, where we have patches 
submitted the last month, but I cannot find the relation to a license 
statement. This week it is 42 emails. I am pretty sure a lot of them is not 
really missing license statements, but have just changed email (which I then 
will register and keep track of).

the email is as follows:
———
Hi

We have cross checked git/gerrit patches with 
https://wiki.documentfoundation.org/Development/Developers 
 which contain all 
submitted licenses.

We could not find your email on the wiki page,  so we hope you will do  one of 
two:
if you have not submitted your license please do so (look at the wiki for 
instructions),
if you have changed your email, please respond to this mail and tell us your 
original email.

Sadly enough nowadays just writing good patches and submitting is not enough to 
ensure that the LibreOffice (and other FOSS projects) stays free, a license is 
needed.

We have registered your last patch as of xxx, and hope you will continue to 
help LibreOffice grow better

Last 12 month we have had 37.156 commits and 15.006 coming from new 
contributors. . Your patches are very valued, and working together as a 
community enables us to keep LibreOffice being THE office package.

Thanks for helping.
rgds
Jan I.


I will not CC this list with all the mails for privacy (and spamming) reasons. 
The list get automatically build every night and mailed to me.

rgds
jan I.



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

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

2016-10-27 Thread László Németh 
 0 files changed

New commits:
commit 55f0ae58171be0d7b1da32f783bcb1d0e78694b3
Author: László Németh 
Date:   Thu Oct 27 13:45:35 2016 +0200

empty commit (repeat with send)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Eike Rathke 
 sc/source/core/tool/address.cxx |   50 
 1 file changed, 41 insertions(+), 9 deletions(-)

New commits:
commit 40241c2aec0e88cbb51b802bda2db458e14f792f
Author: Eike Rathke 
Date:   Thu Oct 27 14:39:40 2016 +0200

sc: OOXML: range with file ID within quoted sheet name, tdf#103531 related

Wherever non-formula-expression ranges with external document reference 
might
be used in OOXML, format ScAddress/ScRange as '[1]Sheet Name' instead of
[1]'Sheet Name' as Excel expects them.

Change-Id: Ia7be13f4d631405e4bcb4617fbded27586fa5dcd

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index c613853..4e41852 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2050,9 +2050,25 @@ template inline void lcl_Format( T& r, 
SCTAB nTab, SCROW nRow, SCCO
 r.append(".");
 break;
 
+case formula::FormulaGrammar::CONV_XL_OOX:
+if (!aTabName.isEmpty() && aTabName[0] == '\'')
+{
+if (!aDocName.isEmpty())
+{
+lcl_string_append(r.append("'["), aDocName);
+r.append("]");
+lcl_string_append(r, aTabName.copy(1));
+}
+else
+{
+lcl_string_append(r, aTabName);
+}
+r.append("!");
+break;
+}
+SAL_FALLTHROUGH;
 case formula::FormulaGrammar::CONV_XL_A1:
 case formula::FormulaGrammar::CONV_XL_R1C1:
-case formula::FormulaGrammar::CONV_XL_OOX:
 if (!aDocName.isEmpty())
 {
 lcl_string_append(r.append("["), aDocName);
@@ -2136,18 +2152,34 @@ static void lcl_ScRange_Format_XL_Header( 
OUStringBuffer& rString, const ScRange
 if( nFlags & ScRefFlags::TAB_3D )
 {
 OUString aTabName, aDocName;
-lcl_Split_DocTab( pDoc, rRange.aStart.Tab(), rDetails, nFlags,
-  aTabName, aDocName );
-if( !aDocName.isEmpty() )
+lcl_Split_DocTab( pDoc, rRange.aStart.Tab(), rDetails, nFlags, 
aTabName, aDocName );
+switch (rDetails.eConv)
 {
-rString.append("[").append(aDocName).append("]");
+case formula::FormulaGrammar::CONV_XL_OOX:
+if (!aTabName.isEmpty() && aTabName[0] == '\'')
+{
+if (!aDocName.isEmpty())
+{
+
rString.append("'[").append(aDocName).append("]").append(aTabName.copy(1));
+}
+else
+{
+rString.append(aTabName);
+}
+break;
+}
+SAL_FALLTHROUGH;
+default:
+if (!aDocName.isEmpty())
+{
+rString.append("[").append(aDocName).append("]");
+}
+rString.append(aTabName);
+break;
 }
-rString.append(aTabName);
-
 if( nFlags & ScRefFlags::TAB2_3D )
 {
-lcl_Split_DocTab( pDoc, rRange.aEnd.Tab(), rDetails, nFlags,
-  aTabName, aDocName );
+lcl_Split_DocTab( pDoc, rRange.aEnd.Tab(), rDetails, nFlags, 
aTabName, aDocName );
 rString.append(":");
 rString.append(aTabName);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Noel Grandin 
 include/sfx2/dinfdlg.hxx  |9 --
 include/sfx2/docfile.hxx  |1 
 include/sfx2/frmdescr.hxx |1 
 include/sfx2/objsh.hxx|5 ---
 include/sfx2/opengrf.hxx  |1 
 include/sfx2/passwd.hxx   |4 --
 include/sfx2/tbxctrl.hxx  |3 --
 include/sfx2/thumbnailview.hxx|1 
 include/sfx2/titledockwin.hxx |6 
 include/sfx2/viewfrm.hxx  |1 
 sfx2/source/appl/opengrf.cxx  |7 
 sfx2/source/control/thumbnailview.cxx |   32 -
 sfx2/source/dialog/dinfdlg.cxx|6 ++--
 sfx2/source/dialog/filedlghelper.cxx  |9 +-
 sfx2/source/dialog/filedlgimpl.hxx|5 +--
 sfx2/source/dialog/passwd.cxx |2 -
 sfx2/source/dialog/templdlg.cxx   |   23 ++-
 sfx2/source/dialog/titledockwin.cxx   |   11 ++-
 sfx2/source/doc/Metadatable.cxx   |   10 --
 sfx2/source/doc/docfile.cxx   |   20 +
 sfx2/source/doc/docundomanager.cxx|4 --
 sfx2/source/doc/frmdescr.cxx  |7 
 sfx2/source/doc/objmisc.cxx   |7 
 sfx2/source/doc/objxtor.cxx   |   11 ++-
 sfx2/source/doc/sfxbasemodel.cxx  |   51 --
 sfx2/source/doc/sfxmodelfactory.cxx   |   11 ---
 sfx2/source/inc/templdgi.hxx  |1 
 sfx2/source/toolbox/tbxitem.cxx   |   24 
 sfx2/source/view/viewfrm.cxx  |7 
 29 files changed, 75 insertions(+), 205 deletions(-)

New commits:
commit 337e19bf469c0a7a10fabd07fa6ae13f77075e36
Author: Noel Grandin 
Date:   Thu Oct 27 12:07:39 2016 +0200

loplugin:expandablemethods in sfx2

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

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 1972b91..9ffbb33 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -115,24 +115,15 @@ public:
 
 const css::util::DateTime&
 getCreationDate() const { return m_CreationDate; }
-voidsetCreationDate(const css::util::DateTime& i_val) {
-m_CreationDate = i_val;
-}
 const OUString& getModifiedBy() const { return m_ModifiedBy; }
 voidsetModifiedBy(const OUString& i_val) { m_ModifiedBy = i_val; }
 
 const css::util::DateTime&
 getModificationDate() const { return m_ModificationDate; }
-voidsetModificationDate(const css::util::DateTime& i_val) {
-m_ModificationDate = i_val;
-}
 const OUString& getPrintedBy() const { return m_PrintedBy; }
 voidsetPrintedBy(const OUString& i_val) { m_PrintedBy = i_val; }
 const css::util::DateTime&
 getPrintDate() const { return m_PrintDate; }
-voidsetPrintDate(const css::util::DateTime& i_val) {
-m_PrintDate = i_val;
-}
 sal_Int16   getEditingCycles() const { return m_EditingCycles; }
 voidsetEditingCycles(sal_Int16 i_val) { m_EditingCycles = i_val; }
 sal_Int32   getEditingDuration() const { return m_EditingDuration; }
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 6738786..07cfbe1 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -223,7 +223,6 @@ public:
 SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl();
 
 SAL_DLLPRIVATE void Init_Impl();
-SAL_DLLPRIVATE void ForceSynchronStream_Impl();
 
 SAL_DLLPRIVATE void GetLockingStream_Impl();
 SAL_DLLPRIVATE void GetMedium_Impl();
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 1a792bf..4f09680 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -79,7 +79,6 @@ public:
 const INetURLObject&GetURL() const
 { return aURL; }
 voidSetURL( const OUString& rURL );
-voidSetActualURL( const INetURLObject& rURL );
 voidSetActualURL( const OUString& rURL );
 voidSetReadOnly( bool bSet ) { bReadOnly = bSet;}
 voidSetEditable( bool bSet );
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 0c4d5b3..20ec6e3 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -227,10 +227,6 @@ protected:
 voidModifyChanged();
 virtual boolClose() override;
 
-/** declares the document to have capabilities to contain basic/dialog 
libraries
-*/
-voidSetHasNoBasic();
-
 /// template method, called by FlushDocInfo; this implementation is empty
 virtual voidDoFlushDocInfo();
 
@@ -294,7 +290,6 @@ public:
 bool

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

2016-10-27 Thread László Németh 
 loleaflet/src/core/Socket.js |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 443d0baea169e5a7e07fba8912e4ce2e4510c759
Author: László Németh 
Date:   Thu Oct 27 14:50:46 2016 +0200

loleaflet: tile debug: add timestamps to the console log

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index b24aed6..6182142 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -54,7 +54,7 @@ L.Socket = L.Class.extend({
if (typeof msg === 'string') {
L.Log.log(msg, L.OUTGOING, coords);
if (this._map._docLayer && 
this._map._docLayer._debug) {
-   console.log('%cOUTGOING%c: ' + 
msg.concat(' ').replace(' ', '%c ', 1), 'background:#fbb;color:black', 
'color:red', 'color:black');
+   console.log(+new Date() + ' 
%cOUTGOING%c: ' + msg.concat(' ').replace(' ', '%c ', 1), 
'background:#fbb;color:black', 'color:red', 'color:black');
}
}
}
@@ -69,7 +69,7 @@ L.Socket = L.Class.extend({
if (typeof msg === 'string') {
L.Log.log(msg, L.OUTGOING, coords);
if (this._map._docLayer && this._map._docLayer._debug) {
-   console.log('%cOUTGOING%c: ' + msg.concat(' 
').replace(' ', '%c ', 1), 'background:#fbb;color:black', 'color:red', 
'color:black');
+   console.log(+new Date() + ' %cOUTGOING%c: ' + 
msg.concat(' ').replace(' ', '%c ', 1), 'background:#fbb;color:black', 
'color:red', 'color:black');
}
}
 
@@ -133,7 +133,7 @@ L.Socket = L.Class.extend({
}
 
if (this._map._docLayer && this._map._docLayer._debug) {
-   console.log('%cINCOMING%c: ' + textMsg.concat(' 
').replace(' ', '%c ', 1), 'background:#ddf;color:black', 'color:blue', 
'color:black');
+   console.log(+new Date() + ' %cINCOMING%c: ' + 
textMsg.concat(' ').replace(' ', '%c ', 1), 'background:#ddf;color:black', 
'color:blue', 'color:black');
}
 
var command = this.parseServerCmd(textMsg);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Stephan Bergmann 
 sw/source/filter/rtf/swparrtf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f82bd120bc6be156e565f0bf663a4ffab356830e
Author: Stephan Bergmann 
Date:   Thu Oct 27 15:02:37 2016 +0200

loplugin:literaltoboolconversion

Change-Id: I886f4fcb3de5a931f94b2f45f5f0cdb841af26d1

diff --git a/sw/source/filter/rtf/swparrtf.cxx 
b/sw/source/filter/rtf/swparrtf.cxx
index 4bc289d..be7b259 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -179,7 +179,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL 
TestImportRTF(const OUString& rURL
 aDescriptor[0].Name = "InputStream";
 uno::Reference xStream(new utl::OStreamWrapper(aFileStream));
 aDescriptor[0].Value <<= xStream;
-bool bRet(1);
+bool bRet = true;
 try
 {
 xFilter->filter(aDescriptor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread László Németh 
 0 files changed

New commits:
commit e6e219c18bb8e1bb29ef5deb6c546947f3da8a37
Author: László Németh 
Date:   Thu Oct 27 15:19:01 2016 +0200

empty commit (repeat)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Miklos Vajna 
 xmlsecurity/qa/unit/pdfsigning/data/pdf14adobe.pdf |binary
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx  |   63 +-
 xmlsecurity/source/pdfio/pdfdocument.cxx   |   93 +
 3 files changed, 116 insertions(+), 40 deletions(-)

New commits:
commit 3e12ef2cbb54a48b1e925a427d5daa05e5f797e3
Author: Miklos Vajna 
Date:   Thu Oct 27 13:00:27 2016 +0200

xmlsecurity PDF verify: support array ref annotations

Each pdf signature is mentioned in the Annots key of a page object.
Usually the key contains an array value. But it's valid for the key to
contain a reference to an object, where the object contains the actual
array, so support this case as well.

Also:

- stop parsing name tokens on the first seen '(' character (usually
  there is a whitespace between the two, but that's not required)
- handle \0 characters in the last 1024 bytes of the document by using
  std::search() instead of strstr().

Change-Id: I3a167b23340230f99f1ae4112473ed10e1c96b09

diff --git a/xmlsecurity/qa/unit/pdfsigning/data/pdf14adobe.pdf 
b/xmlsecurity/qa/unit/pdfsigning/data/pdf14adobe.pdf
new file mode 100644
index 000..58aadb4
Binary files /dev/null and b/xmlsecurity/qa/unit/pdfsigning/data/pdf14adobe.pdf 
differ
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 1f9ef83..62855c4 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -37,6 +37,12 @@ class PDFSigningTest : public test::BootstrapFixture
  * had nOriginalSignatureCount signatures.
  */
 void sign(const OUString& rInURL, const OUString& rOutURL, size_t 
nOriginalSignatureCount);
+/**
+ * Read a pdf and make sure that it has the expected number of valid
+ * signatures.
+ */
+void verify(const OUString& rURL, size_t nCount);
+
 public:
 PDFSigningTest();
 void setUp() override;
@@ -49,12 +55,15 @@ public:
 void testPDFRemove();
 /// Test removing all signatures from a previously multi-signed file.
 void testPDFRemoveAll();
+/// Test a PDF 1.4 document, signed by Adobe.
+void testPDF14Adobe();
 
 CPPUNIT_TEST_SUITE(PDFSigningTest);
 CPPUNIT_TEST(testPDFAdd);
 CPPUNIT_TEST(testPDFAdd2);
 CPPUNIT_TEST(testPDFRemove);
 CPPUNIT_TEST(testPDFRemoveAll);
+CPPUNIT_TEST(testPDF14Adobe);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -81,6 +90,21 @@ void PDFSigningTest::setUp()
 #endif
 }
 
+void PDFSigningTest::verify(const OUString& rURL, size_t nCount)
+{
+SvFileStream aStream(rURL, StreamMode::READ);
+xmlsecurity::pdfio::PDFDocument aVerifyDocument;
+CPPUNIT_ASSERT(aVerifyDocument.Read(aStream));
+std::vector aSignatures = 
aVerifyDocument.GetSignatureWidgets();
+CPPUNIT_ASSERT_EQUAL(nCount, aSignatures.size());
+for (size_t i = 0; i < aSignatures.size(); ++i)
+{
+SignatureInformation aInfo(i);
+bool bLast = i == aSignatures.size() - 1;
+
CPPUNIT_ASSERT(xmlsecurity::pdfio::PDFDocument::ValidateSignature(aStream, 
aSignatures[i], aInfo, bLast));
+}
+}
+
 void PDFSigningTest::sign(const OUString& rInURL, const OUString& rOutURL, 
size_t nOriginalSignatureCount)
 {
 // Make sure that input has nOriginalSignatureCount signatures.
@@ -108,21 +132,8 @@ void PDFSigningTest::sign(const OUString& rInURL, const 
OUString& rOutURL, size_
 CPPUNIT_ASSERT(aDocument.Write(aOutStream));
 }
 
-// Read back the signed pdf and make sure that it has one valid signature.
-{
-SvFileStream aStream(rOutURL, StreamMode::READ);
-xmlsecurity::pdfio::PDFDocument aVerifyDocument;
-CPPUNIT_ASSERT(aVerifyDocument.Read(aStream));
-std::vector aSignatures = 
aVerifyDocument.GetSignatureWidgets();
-// This was nOriginalSignatureCount when PDFDocument::Sign() silently 
returned success, without doing anything.
-CPPUNIT_ASSERT_EQUAL(nOriginalSignatureCount + 1, aSignatures.size());
-for (size_t i = 0; i < aSignatures.size(); ++i)
-{
-SignatureInformation aInfo(i);
-bool bLast = i == aSignatures.size() - 1;
-
CPPUNIT_ASSERT(xmlsecurity::pdfio::PDFDocument::ValidateSignature(aStream, 
aSignatures[i], aInfo, bLast));
-}
-}
+// This was nOriginalSignatureCount when PDFDocument::Sign() silently 
returned success, without doing anything.
+verify(rOutURL, nOriginalSignatureCount + 1);
 }
 
 void PDFSigningTest::testPDFAdd()
@@ -183,14 +194,9 @@ void PDFSigningTest::testPDFRemove()
 }
 
 // Read back the pdf and make sure that it no longer has signatures.
-{
-SvFileStream aStream(aOutURL, StreamMode::READ);
-xmlsecurity::pdfio::PDFDocument aVerifyDocument;
-CPPUNIT_ASSERT(aVerifyDocument.Read(aStream));
-std::vector aSignatures = 
aVerifyDocument.GetSignatureWidgets();
-// This

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

2016-10-27 Thread Caolán McNamara 
 sw/source/uibase/uiview/viewdlg2.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f6ff0c237bde50d1fab6b19d8738b6f3f042
Author: Caolán McNamara 
Date:   Thu Oct 27 14:32:52 2016 +0100

fix writer insert caption crash

since...

commit eca5ea9f79181d45cd7fbabe2313617d3025818a
Date:   Wed Sep 21 14:48:15 2016 +0200

Change-Id: I69b50df0ec19369fcd96d7d184c6d5f586a50b25

diff --git a/sw/source/uibase/uiview/viewdlg2.cxx 
b/sw/source/uibase/uiview/viewdlg2.cxx
index 82adfbe..ae34348 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -54,7 +54,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
 assert(pFact && "SwAbstractDialogFactory fail!");
 
-std::unique_ptr 
pDialog(pFact->CreateSwCaptionDialog( pMDI, *this ));
+ScopedVclPtr 
pDialog(pFact->CreateSwCaptionDialog( pMDI, *this ));
 assert(pDialog && "Dialog creation failed!");
 if ( pDialog )
 {
@@ -66,7 +66,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
 {
 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
 assert(pFact && "Dialog creation failed!");
-std::unique_ptr 
pDlg(pFact->CreateInsFootNoteDlg(
+ScopedVclPtr 
pDlg(pFact->CreateInsFootNoteDlg(
 pMDI, *m_pWrtShell, true));
 assert(pDlg && "Dialog creation failed!");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Caolán McNamara 
 sw/source/core/frmedt/fews.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit feedd45ba2dd308af2d3a1b2f64681b9467535b6
Author: Caolán McNamara 
Date:   Thu Oct 27 14:37:03 2016 +0100

in msword the hard-break between image and caption has a width

while for us it doesn't, make it invisible to give it zero width
in both implementations to head off interoperability misery

Change-Id: I0944006817944b20ef35502c8588357e7ee54810

diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 9d206c1..58d0c90 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -502,8 +503,15 @@ void SwFEShell::InsertLabel( const SwLabelType eType, 
const OUString &rText, con
 }
 //put a hard-break after the graphic to keep it separated
 //from the caption text if the outer frame is resized
-SwIndex aIdx(pTextNode, bBefore ? nInsertPos : 1);
+const sal_Int32 nIndex = bBefore ? nInsertPos : 1;
+SwIndex aIdx(pTextNode, nIndex);
 pTextNode->InsertText("\n", aIdx);
+//set the hard-break to be hidden, otherwise it has
+//non-zero width in word and so hard-break flows on
+//the next line, pushing the caption text out of
+//the frame making the caption apparently disappear
+SvxCharHiddenItem aHidden(true, RES_CHRATR_HIDDEN);
+pTextNode->InsertItem(aHidden, nIndex, nIndex + 1);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Marco A . G . Pinto 
 extras/source/autocorr/lang/pt/DocumentList.xml |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 090e666c127e81ed47338034796f574bbbddfb73
Author: Marco A.G.Pinto 
Date:   Thu Oct 27 12:19:32 2016 +

Added 20 words to autocorrect pt_PT.

Change-Id: I504de5175c7563c2b81b765786fd1b57da16202b
Reviewed-on: https://gerrit.libreoffice.org/30328
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml 
b/extras/source/autocorr/lang/pt/DocumentList.xml
index 458aae7..83fad31 100644
--- a/extras/source/autocorr/lang/pt/DocumentList.xml
+++ b/extras/source/autocorr/lang/pt/DocumentList.xml
@@ -3205,4 +3205,24 @@
 
 
 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: localization of ui

2016-10-27 Thread baigali 
thank you for replying.
yes,i followed the wiki,but the language code  is Cyrillic Mongolian ,its 
defined in here 
http://opengrok.libreoffice.org/xref/core/i18nlangtag/source/isolang/isolang.cxx#388
and
http://opengrok.libreoffice.org/xref/core/include/i18nlangtag/lang.h#300
.
Is is possible that vcl don't recognize traditional Mongolian?






-- Original message --
From: "Jan Iversen"; 
Sendtime: Thursday, Oct 27, 2016 1:48 PM
To: "baigali"<1304646...@qq.com>; 
Cc: "libreoffice"; 
Subject: Re: localization of ui



Hi


I'm now working on libreoffice user interface localization in traditional 
Mongolian, and I using this wiki 
https://wiki.documentfoundation.org/LibreOffice_Localization_Guide/Adding_a_New_Language_or_Locale
built libreoffice with traditional Mongolian resource ,but on windows10 
,traditional Mongolian translation of ui is empty ,on windows7 is tofo.Can 
someone tell me where is the problem?




Traditional Mongolian is already part of LibreOffice (language code  ??mn??, 
and directory translations/source/mn) so no need to add it as a new language.


When you build Libreoffice, did you follow 
https://wiki.documentfoundation.org/Development/lode in addition to those 
instructions you need to add  translations, dictionaries and helpcontent2. This 
is done with:


cd lode/dev/core
git submodule update ??init dictionaries
git submodule update ??init helpcontent2
git submodule update ??init translations





and in autogen.input you also need
??with-lang=mn




have a nice day
rgds
jan I.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: localization of ui

2016-10-27 Thread Jan Iversen 
Hi

> 
> I'm now working on libreoffice user interface localization in traditional 
> Mongolian, and I using this wiki 
> https://wiki.documentfoundation.org/LibreOffice_Localization_Guide/Adding_a_New_Language_or_Locale
> built libreoffice with traditional Mongolian resource ,but on windows10 
> ,traditional Mongolian translation of ui is empty ,on windows7 is tofo.Can 
> someone tell me where is the problem?

Traditional Mongolian is already part of LibreOffice (language code  “mn”, and 
directory translations/source/mn) so no need to add it as a new language.

When you build Libreoffice, did you follow 
https://wiki.documentfoundation.org/Development/lode 
 in addition to those 
instructions you need to add  translations, dictionaries and helpcontent2. This 
is done with:

cd lode/dev/core
git submodule update —init dictionaries
git submodule update —init helpcontent2
git submodule update —init translations


and in autogen.input you also need
—with-lang=mn


have a nice day
rgds
jan I.

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

Re: localization of ui

2016-10-27 Thread Jan Iversen 

> yes,i followed the wiki,but the language code  is Cyrillic Mongolian ,its 
> defined in here
> http://opengrok.libreoffice.org/xref/core/i18nlangtag/source/isolang/isolang.cxx#388
> and
> http://opengrok.libreoffice.org/xref/core/include/i18nlangtag/lang.h#300 
> 
Well https://en.wikipedia.org/wiki/Mongolian_language 
 defines “mn” as the official 
code for mongolia, so I assume that is why we use it.

There are also quite some translation work done on that code.

> Is is possible that vcl don't recognize traditional Mongolian?
If “mn” is not traditional Mongolian (which it seems to be) you need to find 
the proper iso code. A new code need to added several places in the code being 
as described in the wiki page you first referenced.

Please have a discussion on the l10n mailing list, about which codes should be 
used, as Developers we look at the ISO-639-1 definitions.

rgds
jan I.

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

Re: localization of ui

2016-10-27 Thread Jan Iversen 

> On 27 Oct 2016, at 10:02, baigali <1304646...@qq.com> wrote:
> 
> thank you,I mailed to the l10n mailing list.
> I think,it is maybe not the l10n problem, there is no traditional Mongolian 
> .po resource, so can't get form git. I made a traditional Mongolian resource 
>  based on Chinese simplified zh-CN ,and modified some i18n source code 
> , but problem occurred like I said in first email. Attachment is my work.
No of course there are no mn-CN .po file, currently we only have mn  in pootle 
and there are mn .po files.

your patch seems to be OK (without having reviewed in detail), but in order to 
build properly, you also need to add translations/source/mn-CN so that your 
translations can be merged with the code when you build.

The problem you have is typically because:
- Language not being merged (check build.log to see that it actually merged 
mn-CN)
- Language code not being complete (can you select mn-CN in the UI)

If you want your patch merged you need to send it to gerrit, so it can be 
reviewed (./logerrit submit master)

rgds
jan I.

> 
> 
> 
> -- Original --
> From:  "Jan Iversen";;
> Send time: Thursday, Oct 27, 2016 3:28 PM
> To: "baigali"<1304646...@qq.com>;
> Cc: "libreoffice";
> Subject:  Re: localization of ui
> 
> 
>> yes,i followed the wiki,but the language code  is Cyrillic Mongolian 
>> ,its defined in here
>> http://opengrok.libreoffice.org/xref/core/i18nlangtag/source/isolang/isolang.cxx#388
>>  
>> 
>> and
>> http://opengrok.libreoffice.org/xref/core/include/i18nlangtag/lang.h#300 
>> 
> Well https://en.wikipedia.org/wiki/Mongolian_language 
>  defines “mn” as the 
> official code for mongolia, so I assume that is why we use it.
> 
> There are also quite some translation work done on that code.
> 
>> Is is possible that vcl don't recognize traditional Mongolian?
> If “mn” is not traditional Mongolian (which it seems to be) you need to find 
> the proper iso code. A new code need to added several places in the code 
> being as described in the wiki page you first referenced.
> 
> Please have a discussion on the l10n mailing list, about which codes should 
> be used, as Developers we look at the ISO-639-1 definitions.
> 
> rgds
> jan I.
> 
> 

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

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

2016-10-27 Thread Miklos Vajna 
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx |   15 ---
 xmlsecurity/source/pdfio/pdfdocument.cxx  |   24 
 2 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit 9df81ea7752216db7a7cf54df1b307d97e51b1a3
Author: Miklos Vajna 
Date:   Thu Oct 27 17:01:09 2016 +0200

xmlsecurity PDF verify: import out-of-signature date

The signature date can be placed as the value of the "M" key, and also
inside the signed PKCS#7 binary. When the later is missing show what's
described in the previous.

Change-Id: Idb40d91adb70486bc1f19d4755a3f8e17d35e9e9

diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 62855c4..5ee1322 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -41,7 +41,7 @@ class PDFSigningTest : public test::BootstrapFixture
  * Read a pdf and make sure that it has the expected number of valid
  * signatures.
  */
-void verify(const OUString& rURL, size_t nCount);
+std::vector verify(const OUString& rURL, size_t 
nCount);
 
 public:
 PDFSigningTest();
@@ -90,8 +90,12 @@ void PDFSigningTest::setUp()
 #endif
 }
 
-void PDFSigningTest::verify(const OUString& rURL, size_t nCount)
+std::vector PDFSigningTest::verify(const OUString& rURL, 
size_t nCount)
 {
+uno::Reference xSEInitializer = 
xml::crypto::SEInitializer::create(mxComponentContext);
+uno::Reference xSecurityContext = 
xSEInitializer->createSecurityContext(OUString());
+std::vector aRet;
+
 SvFileStream aStream(rURL, StreamMode::READ);
 xmlsecurity::pdfio::PDFDocument aVerifyDocument;
 CPPUNIT_ASSERT(aVerifyDocument.Read(aStream));
@@ -102,7 +106,10 @@ void PDFSigningTest::verify(const OUString& rURL, size_t 
nCount)
 SignatureInformation aInfo(i);
 bool bLast = i == aSignatures.size() - 1;
 
CPPUNIT_ASSERT(xmlsecurity::pdfio::PDFDocument::ValidateSignature(aStream, 
aSignatures[i], aInfo, bLast));
+aRet.push_back(aInfo);
 }
+
+return aRet;
 }
 
 void PDFSigningTest::sign(const OUString& rInURL, const OUString& rOutURL, 
size_t nOriginalSignatureCount)
@@ -241,7 +248,9 @@ void PDFSigningTest::testPDF14Adobe()
 // Two signatures, first is SHA1, the second is SHA256.
 // This was 0, as we failed to find the Annots key's value when it was a
 // reference-to-array, not an array.
-verify(m_directories.getURLFromSrc(DATA_DIRECTORY) + "pdf14adobe.pdf", 2);
+std::vector aInfos = 
verify(m_directories.getURLFromSrc(DATA_DIRECTORY) + "pdf14adobe.pdf", 2);
+// This was 0, out-of-PKCS#7 signature date wasn't read.
+CPPUNIT_ASSERT_EQUAL(static_cast(2016), 
aInfos[1].stDateTime.Year);
 #endif
 }
 
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index adbf51b..a0e00ef 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -258,6 +258,7 @@ class PDFLiteralStringElement : public PDFElement
 OString m_aValue;
 public:
 bool Read(SvStream& rStream) override;
+const OString& GetValue() const;
 };
 
 /// The trailer singleton is at the end of the doc.
@@ -1314,6 +1315,24 @@ bool PDFDocument::ValidateSignature(SvStream& rStream, 
PDFObjectElement* pSignat
 rInformation.ouDescription = aBuffer.makeStringAndClear();
 }
 
+// Date: used only when the time of signing is not available in the
+// signature.
+auto pM = dynamic_cast(pValue->Lookup("M"));
+if (pM)
+{
+// Example: "D:20161027100104".
+const OString& rM = pM->GetValue();
+if (rM.startsWith("D:") && rM.getLength() >= 16)
+{
+rInformation.stDateTime.Year = rM.copy(2, 4).toInt32();
+rInformation.stDateTime.Month = rM.copy(6, 2).toInt32();
+rInformation.stDateTime.Day = rM.copy(8, 2).toInt32();
+rInformation.stDateTime.Hours = rM.copy(10, 2).toInt32();
+rInformation.stDateTime.Minutes = rM.copy(12, 2).toInt32();
+rInformation.stDateTime.Seconds = rM.copy(14, 2).toInt32();
+}
+}
+
 // Build a list of offset-length pairs, representing the signed bytes.
 std::vector> aByteRanges;
 size_t nByteRangeOffset = 0;
@@ -1697,6 +1716,11 @@ bool PDFLiteralStringElement::Read(SvStream& rStream)
 return false;
 }
 
+const OString& PDFLiteralStringElement::GetValue() const
+{
+return m_aValue;
+}
+
 PDFTrailerElement::PDFTrailerElement(PDFDocument& rDoc)
 : m_rDoc(rDoc)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: localization of ui

2016-10-27 Thread baigali 
thank you,I mailed to the l10n mailing list.
I think,it is maybe not the l10n problem, there is no traditional Mongolian .po 
resource, so can't get form git. I made a traditional Mongolian resource 
 based on Chinese simplified zh-CN ,and modified some i18n source code , 
but problem occurred like I said in first email. Attachment is my work.







-- Original --
From:  "Jan Iversen";;
Send time: Thursday, Oct 27, 2016 3:28 PM
To: "baigali"<1304646...@qq.com>; 
Cc: "libreoffice"; 
Subject:  Re: localization of ui




yes,i followed the wiki,but the language code  is Cyrillic Mongolian ,its 
defined in here
http://opengrok.libreoffice.org/xref/core/i18nlangtag/source/isolang/isolang.cxx#388
and
http://opengrok.libreoffice.org/xref/core/include/i18nlangtag/lang.h#300



Well https://en.wikipedia.org/wiki/Mongolian_language defines ??mn?? as the 
official code for mongolia, so I assume that is why we use it.


There are also quite some translation work done on that code.


Is is possible that vcl don't recognize traditional Mongolian?

If ??mn?? is not traditional Mongolian (which it seems to be) you need to find 
the proper iso code. A new code need to added several places in the code being 
as described in the wiki page you first referenced.


Please have a discussion on the l10n mailing list, about which codes should be 
used, as Developers we look at the ISO-639-1 definitions.


rgds
jan I.

traditional-mongolian.diff
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: connectivity/source include/comphelper mysqlc/source odk/examples

2016-10-27 Thread Stephan Bergmann 
 connectivity/source/drivers/firebird/SubComponent.hxx  |3 
---
 connectivity/source/inc/hsqldb/HTable.hxx  |3 
---
 connectivity/source/inc/mysql/YTable.hxx   |3 
---
 include/comphelper/IdPropArrayHelper.hxx   |3 
---
 include/comphelper/proparrhlp.hxx  |3 
---
 mysqlc/source/mysqlc_subcomponent.hxx  |3 
---
 odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx |3 
---
 7 files changed, 21 deletions(-)

New commits:
commit d4398c776706fd3a5bc3b3fa9f8a3e965a7a6306
Author: Stephan Bergmann 
Date:   Thu Oct 27 17:08:09 2016 +0200

Remove bogus comments about ~IPropertyArrayHelper not being virtual

...which isn't true at least ever since 
b525a3115f54576017a576ff842dede5e2e3545d
"initial import", but got copy/pasted all over the place

Change-Id: I47d3d8a594aef3ac3736d7176ae964a118821014

diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx 
b/connectivity/source/drivers/firebird/SubComponent.hxx
index 5c87097..609c07a 100644
--- a/connectivity/source/drivers/firebird/SubComponent.hxx
+++ b/connectivity/source/drivers/firebird/SubComponent.hxx
@@ -80,9 +80,6 @@ namespace connectivity
 This method needs to be implemented in derived classes.
 
 The method gets called with s_aMutex acquired.
-
-as long as IPropertyArrayHelper has no virtual destructor, the 
implementation of ~OPropertyArrayUsageHelper
-assumes that you created an ::cppu::OPropertyArrayHelper when 
deleting s_pProps.
 @return an pointer to the newly 
created array helper. Must not be NULL.
 */
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const = 
0;
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx 
b/connectivity/source/inc/hsqldb/HTable.hxx
index 4673e41..08ed264 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -65,9 +65,6 @@ namespace connectivity
 This method needs to be implemented in derived classes.
 
 The method gets called with s_aMutex acquired.
-
-as long as IPropertyArrayHelper has no virtual destructor, the 
implementation of ~OPropertyArrayUsageHelper
-assumes that you created an ::cppu::OPropertyArrayHelper when 
deleting s_pProps.
 @return an pointer to the newly 
created array helper. Must not be NULL.
 */
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 
nId) const override;
diff --git a/connectivity/source/inc/mysql/YTable.hxx 
b/connectivity/source/inc/mysql/YTable.hxx
index a8055e6..8fca785 100644
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
@@ -72,9 +72,6 @@ namespace connectivity
 This method needs to be implemented in derived classes.
 
 The method gets called with s_aMutex acquired.
-
-as long as IPropertyArrayHelper has no virtual destructor, the 
implementation of ~OPropertyArrayUsageHelper
-assumes that you created an ::cppu::OPropertyArrayHelper when 
deleting s_pProps.
 @return an pointer to the newly 
created array helper. Must not be NULL.
 */
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 
nId) const override;
diff --git a/include/comphelper/IdPropArrayHelper.hxx 
b/include/comphelper/IdPropArrayHelper.hxx
index 18367b0..a8b2f4e 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.hxx
@@ -74,9 +74,6 @@ namespace comphelper
 This method needs to be implemented in derived classes.
 
 The method gets called with Mutex acquired.
-
-as long as IPropertyArrayHelper has no virtual destructor, the 
implementation of ~OPropertyArrayUsageHelper
-assumes that you created an ::cppu::OPropertyArrayHelper when 
deleting s_pProps.
 @return an pointer to the newly created 
array helper. Must not be NULL.
 */
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) 
const = 0;
diff --git a/include/comphelper/proparrhlp.hxx 
b/include/comphelper/proparrhlp.hxx
index 507c51b..3584553 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -57,9 +57,6 @@ protected:
 This method needs to be implemented in derived classes.
 
 The method gets called with Mutex acquired.
-
-as long as IPropertyArrayHelper

Code Contributor Statement

2016-10-27 Thread Otto Kekäläinen 
(as requested by Jan)

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

Otto Kekäläinen
Follow me at @ottokekalainen
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Gabriel Adriano de Melo license statement

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

minutes of ESC call ...

2016-10-27 Thread Michael Meeks 
* Present:
 + Stephan, Sophie, Andras, Caolan, JanI, Olivier, Michael M, Eike,
   Christian, Miklos, Robinson, Jan-Marek, Bjoern, Norbert, Michael S,
   Xisco, Bubli
 
* Completed Action Items:
+ dig out tooling on license verification for JanI (Michael)
 [ Script now controls last month gerrit patches daily against list of 
licenses
 Primary result 140 emails without license
 Checked names against Wiki Developers
 Result 42 emails, where I cannot find the licese, will email those 
(JanI )
   Can you run it for say the last 2 years ? (Michael)
 Need to have private legal@ pieces included ]
 yes just setting a different deltatime, private legal@ can be added
 without problems, if I know the email (janI)
+ get a small UX tweak code-change committed (Heiko)
   [ this was already 2016-10-06, see 
core_b15fef02c9311e0c160906769abbf96a96e56c73 (jani) ]
+ bisected keyword added to esc-commit-stats.pl (Xisco)
+ Jitsi - send some instructions out for next time (Michael)
[ not done, requires telephone bridge setup etc.
  Tried to create a Google G-suite account - failed horribly
   - costs 2x+ what was advertised, forces domain-name registration.
  We have a Jitsi server - but no phone bridge. ]
+ align release dates and issues, patch merging (Caolan, Cloph)
[ narrowed down to mid January now, no impact on us. ]
+ Ask beta-co-working for a couple of days before FOSDEM (Sophie)
[ Betacowork available on 6-7 February - after FOSDEM, but not before.
  Prefer before, but not enough to do anything (Eike).
  AI: will book later today (Sophie); Friday is too busy. ]
 
* Pending Action Items:
+ poke at MSDN licenses (Michael)
[ update - an ongoing issue here. ]
 
* Release Engineering update (Cloph)
+ 5.1.6 - end of line: any retrospectives ?
+ announced as final today
+ too early for a retrospective yet.
+ 5.2.3 RC2 status (janI)
+ on servers right now.
+ uploaded and announced for testing today
+ messup in Slovenian / sl translation (overridden by accident)
+ need to do an RC3 just to fix this.
+ an RC3 is prolly easier to manage on the mirrors.
+ much appreciated (Sophie)
+ need to figure out what needs to be undone / reverted etc.
+ expect tag today/tomorrow.
+ 5.3.0 alpha 1
+ announced for testing - available from mirrors.
+ build issue when signing them on Windows
+ a race - signing when file are still in-use
+ had to re-run make
+ need to isolate the root cause.
+ has the onedrive keys - but they don't work anymore.
+ apparently onedrive changed the API; needs investigating.
+ 5.3.0 Beta1 & branch - Nov 21st
+ Android & iOS Remote (Cloph)
+ finished building Android remotes, did review of pending patches.
+ same for Android viewer, will publish to beta channel & await 
feedback.
+ looking into the F-droid thing too.
 
* Documentation (Olivier)
* New contributors Dr. Geepan on Help contents
   + (NET)WORKDAYS.INTL functions
  + Contents by Dr. Geepan
  + Help page creation by Olivier
   + More to come
* Progress in new help system (with browser) by Fabio Biocchetti
   + First patch in gerrit
  + Creation of a micro xhp-page server in javascript
  + Support from Olivier and Eike
* New author for LibeOffice books, updating Getting Started (Dave Koelmeyer)
  + revised by Olivier
  + Proofread by Hazel Hussman
 
* UX Update (Heiko)
  + Total num. of needsUXEval 470 (-2)
+ Base  1
+ Calc 35 (+1)
+ Draw 65
+ Extensions0
+ filters and storage   1
+ framework 1
+ Impress  24
+ Installation  0
+ LibreOffice 248 (-2)
+ Localization  0
+ Printing and PDF export   2 (+1)
+ UI   16
+ Writer   77
  + Silent week, organization with meta tickets ongoing

http://nabble.documentfoundation.org/Better-organization-of-bugs-with-meta-bugs-tp4198286.html
  + New more welcoming landing page at the wiki; next step is to update 
subsidiary sites
  + only one easy-hack with skill design currently.
  + how to get feedback ?
  + reddit - ranting; positive feedback on facebook.
  + font-management: more discussion of details.
  + Q: How to build & communicate statistics?
  + Xisco - has a nice script to parse JSON bugzilla dumps
  + can Usability re-use this script and run on VM 174 ?
  + discussed with Jan this week: no clear decision.
  + running it locally currently (Xisco)
  + what do you want to track ?

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

2016-10-27 Thread Eike Rathke 
 sc/source/filter/inc/workbookhelper.hxx |2 +
 sc/source/filter/oox/formulabuffer.cxx  |   43 +---
 sc/source/filter/oox/workbookhelper.cxx |   17 +++-
 3 files changed, 47 insertions(+), 15 deletions(-)

New commits:
commit dac45f154a72e1bb35d7b0540ab5723390c11b30
Author: Eike Rathke 
Date:   Sat Oct 15 16:42:42 2016 +0200

Resolves: tdf#98481 Google Sheets uses OOXML t="str" differently

Set string results only for known good generators, otherwise
recalculate. See source code comment.

(cherry picked from commit 2a45b26c619d1125419819d501a7653cf8d6e5ca)

Backport.
Also added to WorkerThread.

 Conflicts:
sc/source/filter/oox/formulabuffer.cxx

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

diff --git a/sc/source/filter/inc/workbookhelper.hxx 
b/sc/source/filter/inc/workbookhelper.hxx
index c314bf5..59c5c56 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -136,6 +136,8 @@ public:
 boolisWorkbookFile() const;
 /** Returns the index of the current Calc sheet, if filter currently 
processes a sheet. */
 sal_Int16   getCurrentSheetIndex() const;
+/** Returns true when reading a file generated by a known good generator. 
*/
+boolisGeneratorKnownGood() const;
 
 /** Sets the VBA project storage used to import VBA source code and forms. 
*/
 voidsetVbaProjectStorage( const StorageRef& rxVbaPrjStrg );
diff --git a/sc/source/filter/oox/formulabuffer.cxx 
b/sc/source/filter/oox/formulabuffer.cxx
index d7a574e..41c99f8 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -255,7 +255,7 @@ void applyArrayFormulas(
 }
 
 void applyCellFormulaValues(
-ScDocumentImport& rDoc, const std::vector& 
rVector )
+ScDocumentImport& rDoc, const std::vector& 
rVector, bool bGeneratorKnownGood )
 {
 svl::SharedStringPool& rStrPool = rDoc.getDoc().GetSharedStringPool();
 
@@ -278,12 +278,23 @@ void applyCellFormulaValues(
 }
 break;
 case XML_str:
-{
-svl::SharedString aSS = rStrPool.intern(rValueStr);
-pCell->SetResultToken(new formula::FormulaStringToken(aSS));
-pCell->ResetDirty();
-pCell->SetChanged(false);
-}
+// Excel uses t="str" for string results (per definition
+// ECMA-376 18.18.11 ST_CellType (Cell Type) "Cell containing a
+// formula string.", but that 't' Cell Data Type attribute, "an
+// enumeration representing the cell's data type", is meant for
+// the content of the  element). We follow that. Other
+// applications might not and instead use t="str" for the cell
+// content if formula. Setting an otherwise numeric result as
+// string result fouls things up, set result strings only for
+// documents claiming to be generated by a known good
+// generator. See tdf#98481
+if (bGeneratorKnownGood)
+{
+svl::SharedString aSS = rStrPool.intern(rValueStr);
+pCell->SetResultToken(new 
formula::FormulaStringToken(aSS));
+pCell->ResetDirty();
+pCell->SetChanged(false);
+}
 break;
 default:
 ;
@@ -293,7 +304,7 @@ void applyCellFormulaValues(
 
 void processSheetFormulaCells(
 ScDocumentImport& rDoc, FormulaBuffer::SheetItem& rItem, 
SvNumberFormatter& rFormatter,
-const uno::Sequence& rExternalLinks )
+const uno::Sequence& rExternalLinks, bool 
bGeneratorKnownGood )
 {
 if (rItem.mpSharedFormulaEntries && rItem.mpSharedFormulaIDs)
 applySharedFormulas(rDoc, rFormatter, *rItem.mpSharedFormulaEntries, 
*rItem.mpSharedFormulaIDs);
@@ -308,7 +319,7 @@ void processSheetFormulaCells(
 applyArrayFormulas(rDoc, rFormatter, *rItem.mpArrayFormulas);
 
 if (rItem.mpCellFormulaValues)
-applyCellFormulaValues(rDoc, *rItem.mpCellFormulaValues);
+applyCellFormulaValues(rDoc, *rItem.mpCellFormulaValues, 
bGeneratorKnownGood);
 }
 
 class WorkerThread: public salhelper::Thread
@@ -317,6 +328,7 @@ class WorkerThread: public salhelper::Thread
 FormulaBuffer::SheetItem& mrItem;
 std::unique_ptr mpFormatter;
 const uno::Sequence& mrExternalLinks;
+bool mbGeneratorKnownGood;
 
 public:
 WorkerThread(const WorkerThread&) = delete;
@@ -324,16 +336,17 @@ public:
 
 WorkerThread(
 ScDocumentImport& rDoc, FormulaBuffer::SheetItem& rItem, 
SvNumberFormatter* pFormatter,
-const uno

License Statement

2016-10-27 Thread Maarten Hoes 
All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.


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

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

2016-10-27 Thread Maxim Monastirsky 
 sw/source/uibase/shells/textsh.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3b44da9482eb8a0095c85314cd71b7bafb38b29
Author: Maxim Monastirsky 
Date:   Thu Oct 27 19:21:58 2016 +0300

Fix insert special character crash

Change-Id: Id75567f5f6689d15d62f88ed0907c296434b8f0a

diff --git a/sw/source/uibase/shells/textsh.cxx 
b/sw/source/uibase/shells/textsh.cxx
index b5663ae..7613cad 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -942,7 +942,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
 aAllSet.Put( SfxStringItem( SID_FONT_NAME, aFont.GetFamilyName() ) 
);
 
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-std::unique_ptr pDlg(pFact->CreateSfxDialog( 
GetView().GetWindow(), aAllSet,
+ScopedVclPtr pDlg(pFact->CreateSfxDialog( 
GetView().GetWindow(), aAllSet,
 GetView().GetViewFrame()->GetFrame().GetFrameInterface(), 
RID_SVXDLG_CHARMAP ));
 if( RET_OK == pDlg->Execute() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Yanpas License Statement

2016-10-27 Thread Yan 
All of my past & future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.

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

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

2016-10-27 Thread László Németh 
 0 files changed

New commits:
commit 317342633b8e0b5cc8e2bd140302d692ac449c8a
Author: László Németh 
Date:   Thu Oct 27 18:44:32 2016 +0200

empty commit (repeat, send without proc.)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: localization of ui

2016-10-27 Thread Eike Rathke 
Hi baigali,

On Thursday, 2016-10-27 15:17:19 +0800, baigali wrote:

> thank you for replying.
> yes,i followed the wiki,but the language code  is Cyrillic Mongolian ,its 
> defined in here 
> http://opengrok.libreoffice.org/xref/core/i18nlangtag/source/isolang/isolang.cxx#388
> and
> http://opengrok.libreoffice.org/xref/core/include/i18nlangtag/lang.h#300
> .
> Is is possible that vcl don't recognize traditional Mongolian?

Well, the first problem is that 'mn' is a macrolanguage code (several
individual languages), which to be exact should be specified as either
'khk' Mongolian, Halh, or 'mvf' Mongolian, Peripheral.

The second problem is that there can be mn-Cyrl and mn-Mong, but both
are actually redundant as 'khk' already implies the default Cyrillic
script and 'mvf' the default Mongolian script. However, due to legacy
reasons the language tags mn-Cyrl-MN (alias mn-MN), mn-Mong-MN and
mn-Mong-CN are used. Which should be khk-MN or khk-Cyrl-MN, khk-Mong-MN
and mvf-CN instead. You'll find comments about that in isolang.cxx but
spreaded over several entries. Just search for LANGUAGE_MONGOLIAN.

As for vcl, do a
git grep LANGUAGE_MONGOLIAN_MONGOLIAN vcl
which currently yields 2 files
vcl/source/gdi/sallayout.cxx
vcl/win/gdi/salfont.cxx

So, theoretically the Mongolian script is recognized.
But, the implications it has like vertical LTR writing direction in an
RTL alphabet likely is not supported. Is that what you mean by "not
recognized"?

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

2016-10-27 Thread Maxim Monastirsky 
 svx/source/mnuctrls/smarttagmenu.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 4433d95b374c13a3501cdf3a6e273f68eb49873a
Author: Maxim Monastirsky 
Date:   Thu Oct 27 20:15:23 2016 +0300

MenuItemData now properly disposes the submenu

At least since:

commit ee79a2dd7ea60e902cab3a9203e307b8a78fee23
Author: Caolán McNamara 
Date:   Fri Jul 29 14:33:22 2016 +0100

Resolves: tdf#101169 crash using column menu in base

Change-Id: Ib1bc70e8e66f2be123d8a3e5d5e213775e9a5762

diff --git a/svx/source/mnuctrls/smarttagmenu.cxx 
b/svx/source/mnuctrls/smarttagmenu.cxx
index d1d279b..404062f 100644
--- a/svx/source/mnuctrls/smarttagmenu.cxx
+++ b/svx/source/mnuctrls/smarttagmenu.cxx
@@ -50,7 +50,6 @@ private:
   sal_uInt32 nActionID ) : m_xAction( xAction ), 
m_xSmartTagProperties( xSmartTagProperties ), m_nActionID( nActionID ) {}
 };
 std::vector< InvokeAction > m_aInvokeActions;
-std::vector< VclPtr< PopupMenu > > m_aSubMenus;
 std::unique_ptr< const SvxSmartTagItem > m_pSmartTagItem;
 };
 
@@ -61,15 +60,12 @@ SmartTagMenuController::SmartTagMenuController( const 
css::uno::Reference< css::
 
 SmartTagMenuController::~SmartTagMenuController()
 {
-for (auto& i : m_aSubMenus)
-i.disposeAndClear();
 }
 
 void SmartTagMenuController::statusChanged( const 
css::frame::FeatureStateEvent& rEvent )
 throw ( css::uno::RuntimeException, std::exception )
 {
 resetPopupMenu( m_xPopupMenu );
-m_aSubMenus.clear();
 
 css::uno::Sequence< css::beans::PropertyValue > aProperties;
 if ( rEvent.IsEnabled && ( rEvent.State >>= aProperties ) )
@@ -155,7 +151,6 @@ void SmartTagMenuController::FillMenu()
 pVCLMenu->InsertItem( nMenuId, aSmartTagCaption );
 VclPtrInstance pMenu;
 pSubMenu = pMenu;
-m_aSubMenus.push_back( pMenu );
 pVCLMenu->SetPopupMenu( nMenuId++, pSubMenu );
 }
 pSubMenu->SetSelectHdl( LINK( this, SmartTagMenuController, MenuSelect 
) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: localization of ui

2016-10-27 Thread Eike Rathke 
Hi baigali,

On Thursday, 2016-10-27 16:02:58 +0800, baigali wrote:

> thank you,I mailed to the l10n mailing list.
> I think,it is maybe not the l10n problem, there is no traditional Mongolian 
> .po resource, so can't get form git. I made a traditional Mongolian resource 
>  based on Chinese simplified zh-CN ,and modified some i18n source code 
> , but problem occurred like I said in first email. Attachment is my work.

Using mn-CN is not quite right (the zh-CN also has a legacy history),
for UI translation that should be mn-Mong instead as that only involves
a language written in a specific script, not a country.

Changing mn-Mong-CN to mn-CN in your patch is wrong. Note that
i18nlangtag/source/isolang/MS-LCID.lst is never to be changed, it is
a generated list how Microsoft maps their LCID locale IDs to language
tags.

Adding mn-CN to i18nlangtag/source/isolang/isolang.cxx probably is
unnecessary, unless the tag is used in the wild in which case it could
be an alias for mn-Mong-CN and likely should use the kSAME override
mechanism.

Adding mn_CN to i18npool/source/localedata/localedata.cxx and
i18npool/Library_localedata_others.mk makes no sense, as there is no
mn_CN locale data, and if then it should be named mn_Mong_CN.

mn-TR in l10ntools/source/ulfconv/msi-encodinglist.txt is odd and
certainly was wrong all the time, but that should be replaced with
mn-Mong as well instead of mn-CN.

Adding several LangIDs to vcl/win/gdi/salfont.cxx for the same Unicode
range does not work, that table is binary searched and adding duplicates
would yield arbitrary results.

Sorry for tearing all that apart ;-)  but we need to get these things
right and avoid mistakes and bad decisions that have been made in the
past.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

2016-10-27 Thread Miklos Vajna 
 xmlsecurity/source/pdfio/pdfdocument.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 4beac67a2ba1e63e2b47ab54a34cb3e9af77b593
Author: Miklos Vajna 
Date:   Thu Oct 27 17:34:35 2016 +0200

xmlsecurity PDF verify: handle missing trailer

Support for Cross-Reference Streams is still missing, but this avoids
a crash at least.

Change-Id: I8c5d16531f8603feeebe8feddb7c3bdfa61943cb

diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index a0e00ef..1ca7361 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -909,6 +909,13 @@ bool PDFDocument::Read(SvStream& rStream)
 SAL_WARN("xmlsecurity.pdfio", "PDFDocument::Read: failed to 
tokenizer trailer after xref");
 return false;
 }
+
+if (!m_pTrailer)
+{
+SAL_WARN("xmlsecurity.pdfio", "PDFDocument::Read: found no 
trailer");
+return false;
+}
+
 auto pPrev = 
dynamic_cast(m_pTrailer->Lookup("Prev"));
 if (pPrev)
 nStartXRef = pPrev->GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Merging new VCL scheduler feature branch

2016-10-27 Thread Michael Meeks 
Hi jmux,

On 10/24/2016 03:20 PM, Jan-Marek Glogowski wrote:
> I've updated and fixed the feature branch and I'm confident enough to
> merge it :-)

First - thanks for grasping the nettle here. There is nothing terribly
beautiful about our old scheduler code, and we need someone brave to
come along and re-work it. This is certainly brave =)

Overall - there are some good things here; but there are also some bits
I'm not so thrilled with, and since I'm confident that even the
simplest, and most obvious change to this code results in regressions,
the "drastically changes its behaviour" type of patch is going to be
very useful to be able to bisect them out - I would really suggest
re-basing it and cherry-picking the work in pieces.

> I'll just quote my mail from last month.

Sorry for taking so long to get to review it.

>> It completely drops the idea of separated idle and timer handling and
>> drops a lot of special handling and workarounds for problems in the
>> original code, but keeps the Idle class for convenience.

I like this piece FWIW. I'd like a much more glib-like main-loop for
what we have here.

However - what the timer vs. idle separation achieved was to give a
'true idle' sense - ie. some tasks were only performed when there were
no incoming OS events - such as key-events, re-sizing, re-painting etc.
That is really important to be able to handle producer vs. consumer
mis-matches, and to keep rendering and typing crisp when we're loaded.
It is not entirely obvious how that works in the new world but its one
of the most important pieces.

>> P.S. it adds a VCL python GDB script, which can be used to dump the list
>> of currently scheduled tasks.

This is great =)

>> P.P.S. naming is sill a mess. Sometimes it's task, sometimes event. The
>> scheduler class is actually the base class for the timers and idles and
>> should be renamed Event or Task.

Sure. I append some more detailed notes on various pieces.

On windows, with the branch - when I re-size a writer window in master
- after a few seconds of frantic event production - I get the window
failing to respond - there are no re-renders at all.

Interestingly - I also see a large number of SfxItemDisruptor_Impl
items in the scheduler debug - which is curious. Possibly some problem
in the (legacy) manual linked-list logic ?

I'd love to see some of the old bugs in this area re-tested - I started
to add a few of them to the tracker:

https://bugs.documentfoundation.org/showdependencytree.cgi?id=103542

Bug 91727 eg. was a good one to re-test from an idle handling
perspective; but I think there are more of those I've not added yet.

Have you tested suspend & resume - which (with the associated clock
jumping) can be something of a challenge ?

Anyhow some more notes appended, I think dripping these in piece by
piece would be great.

HTH,

Michael.

* This fragment of another patch turns from a synchronous paint on
  re-size to an async/idle one - is that expected ? and/or why ?
+ would love to have that separated in its own bibisectable
  commit.

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 2d23020..6eb69af 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -670,11 +670,8 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl,
Idle *, void)
 if( mpWindowImpl->mbReallyVisible )
 {
 ImplCallResize();
-if( mpWindowImpl->mpFrameData->maPaintIdle.IsActive() )
-{
-mpWindowImpl->mpFrameData->maPaintIdle.Stop();
-mpWindowImpl->mpFrameData->maPaintIdle.Invoke( nullptr );
-}
+if( !mpWindowImpl->mpFrameData->maPaintIdle.IsActive() )
+mpWindowImpl->mpFrameData->maPaintIdle.Start();
 }
 }

* void DocumentTimerManager::StartIdling()

+ Not really clear about the switch to a timer here:

@@ -97,7 +100,8 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*,
pIdle, void )
-pIdle->Start();
+pTimer->SetTimeout( 2000 );
+pTimer->Start();

+ Where do these random numbers come from ? why two
  second delay for ~all of the core writer functionality
  layout, spell-checking etc. ?
+ Can we have some 'busy' mode instead - which we can switch
  a document into - when it is undergoing heavy manipulation
  that will disable this work ?
+ I wonder how much of your interactivity problem
  this would solve by itself as the 1st commit ? =)

* I like this guy:

+static const SAL_CONSTEXPR sal_uInt64 ImmediateTimeoutMs = 0;
...
-if ( !nMS )
-nMS = 1;

A good place to go =) Then again - we need to skip polling, or
do a non-sleeping poll in several backends in this case - and there was
some frightning OS/X backend comment around this

New Defects reported by Coverity Scan for LibreOffice

2016-10-27 Thread scan-admin 

Hi,

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

12 new defect(s) introduced to LibreOffice found with Coverity Scan.
25 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 12 of 12 defect(s)


** CID 1374319:  Uninitialized members  (UNINIT_CTOR)
/vcl/source/gdi/octree.cxx: 104 in Octree::Octree(const BitmapReadAccess &, 
unsigned long)()



*** CID 1374319:  Uninitialized members  (UNINIT_CTOR)
/vcl/source/gdi/octree.cxx: 104 in Octree::Octree(const BitmapReadAccess &, 
unsigned long)()
98 while( nLeafCount > nMax )
99 ImplReduce();
100 }
101 }
102 }
103 }
>>> CID 1374319:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "nPalIndex" is not initialized in this 
>>> constructor nor in any functions that it calls.
104 }
105 
106 Octree::~Octree()
107 {
108 ImplDeleteOctree( &pTree );
109 delete pNodeCache;

** CID 1374318:  Uninitialized members  (UNINIT_CTOR)
/rsc/source/parser/rscdb.cxx: 65 in RscTypCont::RscTypCont(RscError *, 
RSCBYTEORDER_TYPE, const rtl::OString &, unsigned int)()



*** CID 1374318:  Uninitialized members  (UNINIT_CTOR)
/rsc/source/parser/rscdb.cxx: 65 in RscTypCont::RscTypCont(RscError *, 
RSCBYTEORDER_TYPE, const rtl::OString &, unsigned int)()
59 , aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, 
&aLangType )
60 , aLangShort( pHS->getID( "Lang_short" ), RSC_NOTYPE, &aShort, 
&aLangType )
61 , pEH(pErrHdl)
62 , nFlags( nFlagsP )
63 {
64 Init();
>>> CID 1374318:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "nFilePos" is not initialized in this 
>>> constructor nor in any functions that it calls.
65 }
66 
67 OString RscTypCont::ChangeLanguage(const OString& rNewLang)
68 {
69 OString aRet = aLanguage;
70 aLanguage = rNewLang;

** CID 1374317:  Error handling issues  (UNCAUGHT_EXCEPT)
/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx: 149 in 
framework::ActionTriggerSeparatorPropertySet::convertFastPropertyValue(com::sun::star::uno::Any
 &, com::sun::star::uno::Any &, int, const com::sun::star::uno::Any &)()



*** CID 1374317:  Error handling issues  (UNCAUGHT_EXCEPT)
/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx: 149 in 
framework::ActionTriggerSeparatorPropertySet::convertFastPropertyValue(com::sun::star::uno::Any
 &, com::sun::star::uno::Any &, int, const com::sun::star::uno::Any &)()
143 
144 Sequence< sal_Int8 > SAL_CALL 
ActionTriggerSeparatorPropertySet::getImplementationId() throw ( 
RuntimeException, std::exception )
145 {
146 return css::uno::Sequence();
147 }
148 
>>> CID 1374317:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown 
>>> but the throw list "throw(com::sun::star::lang::IllegalArgumentException)" 
>>> doesn't allow it to be thrown. This will cause a call to unexpected() which 
>>> usually calls terminate().
149 sal_Bool SAL_CALL 
ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
150 Any&aConvertedValue,
151 Any&aOldValue,
152 sal_Int32   nHandle,
153 const Any&  aValue  )
154 throw( IllegalArgumentException )

** CID 1374316:  Error handling issues  (UNCAUGHT_EXCEPT)
/forms/source/component/Hidden.cxx: 91 in 
frm::OHiddenModel::convertFastPropertyValue(com::sun::star::uno::Any &, 
com::sun::star::uno::Any &, int, const com::sun::star::uno::Any &)()



*** CID 1374316:  Error handling issues  (UNCAUGHT_EXCEPT)
/forms/source/component/Hidden.cxx: 91 in 
frm::OHiddenModel::convertFastPropertyValue(com::sun::star::uno::Any &, 
com::sun::star::uno::Any &, int, const com::sun::star::uno::Any &)()
85 default:
86 OControlModel::setFastPropertyValue_NoBroadcast(_nHandle, 
_rValue);
87 }
88 }
89 
90 
>>> CID 1374316:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown 
>>> but the throw list "throw(com::sun::star::lang::IllegalArgumentException)" 
>>> doesn't allow it to be thrown. This will cause a call to unexpected() which 
>>> usually calls terminate().
91 sal_Bool OHiddenModel::convertF

Re: Merging new VCL scheduler feature branch

2016-10-27 Thread Michael Stahl 
On 27.10.2016 20:39, Michael Meeks wrote:
>   Interestingly - I also see a large number of SfxItemDisruptor_Impl
> items in the scheduler debug - which is curious. Possibly some problem
> in the (legacy) manual linked-list logic ?

FYI those are a recent addition from this change which removed some
indirection:

ommit 22c75d86db9351ab271942a755a2a75a76920943
Author: Michael Stahl 
AuthorDate: Wed Jul 27 20:55:45 2016 +0200

sfx2: just use Idle in SfxItemDisruptor_Impl

This Application::InsertIdleHdl() stuff is ancient and now obsolete.

of course i never checked how many of these would pile up so i hope
"large number" isn't too large to cause new performance issues.

> commit 5abe75596c3df7fdf100533856361a7ed007f561
> Author: Jan-Marek Glogowski 
> Date:   Thu Sep 8 06:55:30 2016 +0200
> 
> Revert all SalYieldResult changes => bool
> 
> -SalYieldResult SvpSalInstance::DoYield(bool bWait, bool
> bHandleAllCurrentEvents, sal_uLong const nReleased)
> +bool SvpSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents,
> sal_uLong const nReleased)
> 
>   * Really dislike that - please just make the enum more
> descriptive to express what is going on.
>   * The enum having only two values - but being descriptive
> is good.
>   * I can't tell what DoYield returns from the above signature, or
> where to look to find that out.
>   * I fear the previous mess of '!' operators, and unclear
> booleans and re-use of this result - which made the
> original code really, really hard to follow (for stupid
> people like me).

i'd like to join your haters-of-meaningless-bools club.

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

Re: Merging new VCL scheduler feature branch

2016-10-27 Thread Michael Meeks 

On 10/27/2016 07:56 PM, Michael Stahl wrote:
> FYI those are a recent addition from this change which removed some
> indirection:
> 
> ommit 22c75d86db9351ab271942a755a2a75a76920943
> Author: Michael Stahl 
> sfx2: just use Idle in SfxItemDisruptor_Impl

Interesting =) I saw about a dozen+ or so of them in the queue.

I'd love to replace the sw/ internal idle handling loop with the
standard VCL one too - but that in turn requires really quite some
gradation of priorities - so that we do layout at idle before we do
document statistics, before spell checking, before we do grammar
checking, etc. =) at least if we want to keep the same behavior.

That rather cuts across the "collapse all priorities" patch FWIW -
personally, I'd prefer them as per glib - separated by some 100's so we
could fine-tune these relative things easily.

Then again - if the scheudler performs much better after jmux's work -
then we can whack many more, more granular tasks into it - which is
good; but then we will need more granular prioritisation too.

> i'd like to join your haters-of-meaningless-bools club.

Ah - it's really Tor's club; I'm a late convert - and this particular
piece of code converted me when I did the change ;-)

ATB,

Michael.

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

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

2016-10-27 Thread Caolán McNamara 
 rsc/source/parser/rscdb.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a9297447b139b127723201771b5c225c9bd5efec
Author: Caolán McNamara 
Date:   Thu Oct 27 21:00:47 2016 +0100

coverity#1374318 Uninitialized scalar field

Change-Id: I247b9d37b71ebba621b63026d597037450155e18

diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index dca7975..cd43e21 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -43,6 +43,7 @@ RscTypCont::RscTypCont( RscError * pErrHdl,
 , nByteOrder( nOrder )
 , aSearchPath( rSearchPath )
 , nUniqueId(256)
+, nFilePos( 0 )
 , nPMId(RSC_VERSIONCONTROL +1) // at least one more
 , aBool( pHS->getID( "sal_Bool" ), RSC_NOTYPE )
 , aShort( pHS->getID( "short" ), RSC_NOTYPE )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Caolán McNamara 
 stoc/source/javavm/javavm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e46e9bb5c226defde6fb4b3c1d4022991df33c1
Author: Caolán McNamara 
Date:   Thu Oct 27 21:10:57 2016 +0100

coverity#1374309 Uncaught exception

Change-Id: I043236e45fbb110b6b3818f2b02dcf1f512623f6

diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index b780b7a..d27c081 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -349,7 +349,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
 void getDefaultLocaleFromConfig(
 stoc_javavm::JVM * pjvm,
 const css::uno::Reference & xSMgr,
-const css::uno::Reference &xCtx ) 
throw(css::uno::Exception)
+const css::uno::Reference &xCtx ) 
throw(css::uno::Exception, std::exception)
 {
 css::uno::Reference xConfRegistry =
 xSMgr->createInstanceWithContext( 
"com.sun.star.configuration.ConfigurationRegistry", xCtx );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Caolán McNamara 
 vcl/source/gdi/octree.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 7c33c49dd50aaf4ec3d7e32af395e8f6311c96e7
Author: Caolán McNamara 
Date:   Thu Oct 27 21:27:07 2016 +0100

coverity#1374319 Uninitialized pointer field

Change-Id: Ifc604753360f552512a5c9f9f9c42083a38e1a5f

diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 7df368b..2abad51 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -52,11 +52,14 @@ ImpNodeCache::~ImpNodeCache()
 }
 }
 
-Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) :
-nMax( nColors ),
-nLeafCount  ( 0 ),
-pTree   ( nullptr ),
-pAcc( &rReadAcc )
+Octree::Octree(const BitmapReadAccess& rReadAcc, sal_uLong nColors)
+: nMax(nColors)
+, nLeafCount(0)
+, nLevel(0)
+, pTree(nullptr)
+, pColor(nullptr)
+, pAcc(&rReadAcc)
+, nPalIndex(0)
 {
 pNodeCache = new ImpNodeCache( nColors );
 memset( pReduce, 0, ( OCTREE_BITS + 1 ) * sizeof( NODE* ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

2016-10-27 Thread Michael Stahl 
 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bc3f952e66fe0a44044b4b101be3e96e20a670e6
Author: Michael Stahl 
Date:   Thu Oct 27 22:24:13 2016 +0200

avoid odd make warning on WNT

Library_vcl.mk:753: extraneous text after 'endif' directive

Change-Id: Iec487705b762880dd463acaba2d3590ff2587562

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e127aa2..93a5459 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -262,6 +262,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,glyphy)/src/.libs -lglyphy \
 )
 endif
+
 endef
 
 endif # SYSTEM_GLYPHY
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Caolán McNamara 
 framework/inc/classes/actiontriggerseparatorpropertyset.hxx|2 +-
 framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d164f7e93e874cdda4d61d042287f8b66c6452a8
Author: Caolán McNamara 
Date:   Thu Oct 27 21:31:44 2016 +0100

coverity#1374317 Uncaught exception

Change-Id: I37a7b2f12cec522e116ccf4b1aa550ad2cba14ea

diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx 
b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 6e389c9..4c6696a 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -70,7 +70,7 @@ class ActionTriggerSeparatorPropertySet :   private 
cppu::BaseMutex,
 css::uno::Any& 
  aOldValue,
 sal_Int32  
 nHandle,
 const 
css::uno::Any& aValue  )
-throw( css::lang::IllegalArgumentException ) override;
+throw( css::lang::IllegalArgumentException, 
css::uno::RuntimeException, std::exception ) override;
 
 virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 
nHandle, const css::uno::Any& aValue )
 throw( css::uno::Exception, std::exception ) override;
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx 
b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index 49720d6..53b3e0e 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -151,7 +151,7 @@ sal_Bool SAL_CALL 
ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
 Any&aOldValue,
 sal_Int32   nHandle,
 const Any&  aValue  )
-throw( IllegalArgumentException )
+throw( IllegalArgumentException, RuntimeException, std::exception )
 {
 //  Check, if value of property will changed in method 
"setFastPropertyValue_NoBroadcast()".
 //  Return sal_True, if changed - else return sal_False.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Caolán McNamara 
 forms/source/component/Hidden.cxx |2 +-
 forms/source/component/Hidden.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e14070332bd3920c49e8802fcd48099cda4b190
Author: Caolán McNamara 
Date:   Thu Oct 27 21:34:57 2016 +0100

coverity#1374316 Uncaught exception

Change-Id: I32f872d74f167604de006f1d77a9219a37011bfa

diff --git a/forms/source/component/Hidden.cxx 
b/forms/source/component/Hidden.cxx
index 2816bfd..92953dd 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -90,7 +90,7 @@ void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 
_nHandle, const An
 
 sal_Bool OHiddenModel::convertFastPropertyValue(
 Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const 
Any& _rValue)
-throw (IllegalArgumentException)
+throw (IllegalArgumentException, RuntimeException, std::exception)
 {
 bool bModified(false);
 switch (_nHandle)
diff --git a/forms/source/component/Hidden.hxx 
b/forms/source/component/Hidden.hxx
index 091ffb8..28952ca 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -40,7 +40,7 @@ public:
 throw (css::uno::Exception, std::exception) override;
 virtual sal_Bool SAL_CALL convertFastPropertyValue(
 css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, 
sal_Int32 _nHandle, const css::uno::Any& _rValue )
-throw (css::lang::IllegalArgumentException) override;
+throw (css::lang::IllegalArgumentException, 
css::uno::RuntimeException, std::exception) override;
 
 // XServiceInfo
 OUString SAL_CALL getImplementationName()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - forms/source

2016-10-27 Thread Caolán McNamara 
 forms/source/component/Date.cxx  |2 +-
 forms/source/component/Date.hxx  |2 +-
 forms/source/component/File.cxx  |2 +-
 forms/source/component/File.hxx  |2 +-
 forms/source/component/ListBox.cxx   |2 +-
 forms/source/component/ListBox.hxx   |2 +-
 forms/source/component/Time.cxx  |2 +-
 forms/source/component/Time.hxx  |2 +-
 forms/source/component/navigationbar.cxx |2 +-
 forms/source/component/navigationbar.hxx |2 +-
 forms/source/richtext/richtextmodel.cxx  |2 +-
 forms/source/richtext/richtextmodel.hxx  |2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 798c107a1afa6e22a0de97c49d0bda552913e56a
Author: Caolán McNamara 
Date:   Thu Oct 27 21:47:03 2016 +0100

coverity#1374310 Uncaught exception

Change-Id: Ie0ae4412d42d15e2c6c52a8cb0b7b3893405a16b

diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 2ecbe38..497aa6b 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -168,7 +168,7 @@ void 
OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
 
 
 sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, 
Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
-throw( IllegalArgumentException )
+throw( IllegalArgumentException, RuntimeException, 
std::exception )
 {
 switch (nHandle)
 {
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index 04cd3f7..a3888b5 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -57,7 +57,7 @@ public:
 virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, 
const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) 
override;
 
 virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& 
rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const 
css::uno::Any& rValue )
-throw(css::lang::IllegalArgumentException) override;
+throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, 
std::exception) override;
 
 virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) 
const override;
 
commit f20a45808f85ab83f7b4d5b0e1ea86d493031fef
Author: Caolán McNamara 
Date:   Thu Oct 27 21:46:19 2016 +0100

coverity#1374311 Uncaught exception

Change-Id: I3f0e2fdfbf3c0517593ef87bc7bcbfe2ee693eef

diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index d412304..317eaad 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -172,7 +172,7 @@ void SAL_CALL OTimeModel::getFastPropertyValue(Any& 
_rValue, sal_Int32 _nHandle
 
 
 sal_Bool SAL_CALL OTimeModel::convertFastPropertyValue(Any& _rConvertedValue, 
Any& _rOldValue,
-sal_Int32 _nHandle, const Any& _rValue ) 
throw(IllegalArgumentException)
+sal_Int32 _nHandle, const Any& _rValue ) 
throw(IllegalArgumentException, RuntimeException, std::exception)
 {
 if (PROPERTY_ID_FORMATKEY == _nHandle)
 return convertFormatKeyPropertyValue(_rConvertedValue, _rOldValue, 
_rValue);
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 8c14e6c..5a3f599 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -48,7 +48,7 @@ public:
 virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, 
sal_Int32 nHandle ) const override;
 virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& 
rConvertedValue, css::uno::Any& rOldValue,
   sal_Int32 nHandle, const 
css::uno::Any& rValue )
-
throw(css::lang::IllegalArgumentException) override;
+
throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, 
std::exception) override;
 virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, 
const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) 
override;
 
 // css::lang::XServiceInfo
commit 7580c5e5bd8d71fea12a02d1ef554b0dea78c965
Author: Caolán McNamara 
Date:   Thu Oct 27 21:45:06 2016 +0100

coverity#1374312 Uncaught exception

Change-Id: I901c5399cdc33d55c4d3bdfa7a566adc74340405

diff --git a/forms/source/component/navigationbar.cxx 
b/forms/source/component/navigationbar.cxx
index a70f2cf..8b1a102 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -341,7 +341,7 @@ namespace frm
 
 
 sal_Bool SAL_CALL ONavigationBarModel::convertFastPropertyValue( Any& 
_rConvertedValue, Any& _rOldValue,
-sal_Int32 _nHandle, const Any& _rValue ) throw( 
IllegalArgumentException )
+sal_Int32 _nHandle, const Any& _rValue ) throw( 
IllegalArgumentException, RuntimeExce

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - icon-themes/galaxy officecfg/registry sw/inc sw/qa sw/sdi sw/source sw/uiconfig

2016-10-27 Thread Miklos Vajna 
 icon-themes/galaxy/cmd/lc_smallcaps.png  |binary
 icon-themes/galaxy/cmd/sc_smallcaps.png  |binary
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 ++
 sw/inc/cmdid.h   |1 
 sw/qa/extras/uiwriter/uiwriter.cxx   |   20 
+
 sw/sdi/_textsh.sdi   |6 +
 sw/sdi/swriter.sdi   |   18 

 sw/source/uibase/shells/txtattr.cxx  |   37 
++
 sw/uiconfig/swriter/toolbar/textobjectbar.xml|1 
 9 files changed, 91 insertions(+)

New commits:
commit 7acac0db1b4971cd3c3de59bc661e3a8554d1d86
Author: Miklos Vajna 
Date:   Tue Sep 27 09:11:25 2016 +0200

tdf#87914 sw: add an initial .uno:SmallCaps command

- handle it in SwTextShell (for normal Writer text)
- simple icon in the galaxy theme

(cherry picked from commit d378cd2f766eeb1fd1c98f62c9ae6b5b59fd00f1)

Change-Id: Ib8f11dbca28b19a2fc0411c92d9f0b4b052277bb

diff --git a/icon-themes/galaxy/cmd/lc_smallcaps.png 
b/icon-themes/galaxy/cmd/lc_smallcaps.png
new file mode 100644
index 000..7ef20ce
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_smallcaps.png differ
diff --git a/icon-themes/galaxy/cmd/sc_smallcaps.png 
b/icon-themes/galaxy/cmd/sc_smallcaps.png
new file mode 100644
index 000..eaf4101
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_smallcaps.png differ
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0facec0..d5fdee8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3661,6 +3661,14 @@
   9
 
   
+  
+
+  Small capitals
+
+
+  9
+
+  
   
 
   ~Distribution...
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index cd0ce77..e677e77 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -300,6 +300,7 @@
 #define FN_AUTOFORMAT_REDLINE_APPLY (FN_FORMAT + 6 ) /* apply autoformat with 
Redlining */
 #define FN_SET_SUPER_SCRIPT (FN_FORMAT + 11) /* superscript */
 #define FN_SET_SUB_SCRIPT   (FN_FORMAT + 12) /* subscript */
+#define FN_SET_SMALL_CAPS   (FN_FORMAT + 13) /* small caps */
 
 #define FN_FORMAT_PAGE_SETTING_DLG  (FN_FORMAT + 42)  /*  */
 #define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45)  /* number format in 
table */
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 208efa4..f2c4263 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -186,6 +187,7 @@ public:
 void testTdf96961();
 void testTdf88453();
 void testTdf88453Table();
+void testSmallCaps();
 void testTdf98987();
 void testTdf99004();
 void testTdf84695();
@@ -283,6 +285,7 @@ public:
 CPPUNIT_TEST(testTdf96961);
 CPPUNIT_TEST(testTdf88453);
 CPPUNIT_TEST(testTdf88453Table);
+CPPUNIT_TEST(testSmallCaps);
 CPPUNIT_TEST(testTdf98987);
 CPPUNIT_TEST(testTdf99004);
 CPPUNIT_TEST(testTdf84695);
@@ -3182,6 +3185,23 @@ void SwUiWriterTest::testTdf88453Table()
 CPPUNIT_ASSERT_EQUAL(3, getPages());
 }
 
+void SwUiWriterTest::testSmallCaps()
+{
+// Create a document, add some characters and select them.
+createDoc();
+SwDoc* pDoc = createDoc();
+SwDocShell* pDocShell = pDoc->GetDocShell();
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+pWrtShell->Insert("text");
+pWrtShell->SelAll();
+
+// Dispatch the command to make them formatted small capitals.
+lcl_dispatchCommand(mxComponent, ".uno:SmallCaps", {});
+
+// This was css::style::CaseMap::NONE as the shell didn't handle the 
command.
+CPPUNIT_ASSERT_EQUAL(css::style::CaseMap::SMALLCAPS, 
getProperty(getRun(getParagraph(1), 1), "CharCaseMap"));
+}
+
 void SwUiWriterTest::testTdf98987()
 {
 createDoc("tdf98987.docx");
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 1479451..2a5df5f 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1458,6 +1458,12 @@ interface BaseText
 StateMethod = GetAttrState ;
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
+FN_SET_SMALL_CAPS
+[
+ExecMethod = ExecCharAttr ;
+StateMethod = GetAttrState ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
 SID_ATTR_CHAR_CASEMAP // status(final|play)
 [
 ExecMethod = ExecTextCtrl;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index c0ba826..f5f335e 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swri

[Libreoffice-commits] core.git: cui/source dbaccess/source include/svx include/vcl svtools/source svx/source sw/source vcl/source

2016-10-27 Thread Maxim Monastirsky 
 cui/source/tabpages/numpages.cxx   |4 
 cui/source/tabpages/tpline.cxx |   12 
 dbaccess/source/ui/browser/sbagrid.cxx |2 +-
 dbaccess/source/ui/inc/sbagrid.hxx |2 +-
 include/svx/fmgridcl.hxx   |2 +-
 include/vcl/menu.hxx   |1 -
 svtools/source/contnr/svimpbox.cxx |   15 ---
 svx/source/fmcomp/fmgridcl.cxx |5 +
 sw/source/uibase/inc/workctrl.hxx  |3 ---
 sw/source/uibase/ribbar/workctrl.cxx   |   20 ++--
 vcl/source/window/menu.cxx |7 ---
 11 files changed, 6 insertions(+), 67 deletions(-)

New commits:
commit 89c23b4aaef931b5d6009efaf44ce6e6c976e8d4
Author: Maxim Monastirsky 
Date:   Thu Oct 27 22:31:47 2016 +0300

Sub menus no longer need manual disposing

after:

commit ee79a2dd7ea60e902cab3a9203e307b8a78fee23
Author: Caolán McNamara 
Date:   Fri Jul 29 14:33:22 2016 +0100

Resolves: tdf#101169 crash using column menu in base

Change-Id: I7c6e54dd5574c61cffd5884d1cf1b63075073001
Reviewed-on: https://gerrit.libreoffice.org/30343
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index fc2719c..5846d9e 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1188,10 +1188,6 @@ SvxNumOptionsTabPage::~SvxNumOptionsTabPage()
 
 void SvxNumOptionsTabPage::dispose()
 {
-if (m_pBitmapMB)
-{
-m_pBitmapMB->GetPopupMenu()->DisposePopupMenu(m_nGalleryId);
-}
 delete pActNum;
 pActNum = nullptr;
 delete pSaveNum;
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 43f51a5..11ffd61 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -227,18 +227,6 @@ SvxLineTabPage::~SvxLineTabPage()
 
 void SvxLineTabPage::dispose()
 {
-// Symbols on a line (e.g. StarCharts), dtor new!
-if (m_pSymbolMB)
-{
-m_pSymbolMB->GetPopupMenu()->DisposePopupMenu( MN_GALLERY );
-
-if(m_pSymbolList)
-{
-m_pSymbolMB->GetPopupMenu()->DisposePopupMenu( MN_SYMBOLS );
-}
-m_pSymbolMB = nullptr;
-}
-
 for (SvxBmpItemInfo* pInfo : m_aGrfBrushItems)
 {
 delete pInfo->pBrushItem;
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index 983ab27..374a3bb 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -681,7 +681,7 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 
nColId, PopupMenu& rM
 }
 }
 
-void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& 
rMenu, sal_uInt16 nExecutionResult)
+void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const 
PopupMenu& rMenu, sal_uInt16 nExecutionResult)
 {
 switch (nExecutionResult)
 {
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx 
b/dbaccess/source/ui/inc/sbagrid.hxx
index 18e20d5..4908ab9 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -176,7 +176,7 @@ namespace dbaui
 
 // FmGridHeader overridables
 virtual voidPreExecuteColumnContextMenu(sal_uInt16 nColId, 
PopupMenu& rMenu) override;
-virtual voidPostExecuteColumnContextMenu(sal_uInt16 nColId, 
PopupMenu& rMenu, sal_uInt16 nExecutionResult) override;
+virtual voidPostExecuteColumnContextMenu(sal_uInt16 nColId, const 
PopupMenu& rMenu, sal_uInt16 nExecutionResult) override;
 
 private:
 // DragSourceHelper overridables
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index f2e114c..78ad042 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -67,7 +67,7 @@ protected:
 virtual voidPreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& 
rMenu);
 /** After executing the context menu for a column this method is called.
 */
-virtual voidPostExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& 
rMenu, sal_uInt16 nExecutionResult);
+virtual voidPostExecuteColumnContextMenu(sal_uInt16 nColId, const 
PopupMenu& rMenu, sal_uInt16 nExecutionResult);
 
 // DropTargetHelper
 virtual sal_Int8AcceptDrop( const AcceptDropEvent& rEvt ) override;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 684c2a8..959d54d 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -282,7 +282,6 @@ public:
 
 void SetPopupMenu( sal_uInt16 nItemId, PopupMenu* pMenu );
 PopupMenu* GetPopupMenu( sal_uInt16 nItemId ) const;
-void DisposePopupMenu( sal_uInt16 nItemId );
 
 void SetAccelKey( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode );
 vcl::KeyCode GetAccelKey( sal_uInt16 nItemId ) const;
diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 6cd671b..b535552 100644
--- a/svto

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

2016-10-27 Thread Maxim Monastirsky 
 sw/source/uibase/ribbar/workctrl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eb07ae8fc52378d9b59bcb6a7df8bb022b8b9cc0
Author: Maxim Monastirsky 
Date:   Fri Oct 28 01:18:53 2016 +0300

Don't crash under gen

In gtk there is apparently GtkSalMenu which increases
the refcount.

Change-Id: I5c52c7b40d0a854e0007362a32a55f0ffed668c1

diff --git a/sw/source/uibase/ribbar/workctrl.cxx 
b/sw/source/uibase/ribbar/workctrl.cxx
index a03a4d7..3e51a78 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -96,7 +96,7 @@ VclPtr SwTbxAutoTextCtrl::CreatePopupWindow()
 sal_uInt16 nIndex = static_cast(100*i);
 // but insert without extension
 pPopup->InsertItem( i, sTitle);
-PopupMenu* pSub = VclPtr::Create();
+VclPtrInstance pSub;
 pSub->SetSelectHdl(aLnk);
 pPopup->SetPopupMenu(i, pSub);
 for(sal_uInt16 j = 0; j < nBlockCount; j++)
commit 03d6174919657a0e52e65d31fbc4b9a26db5d51e
Author: Maxim Monastirsky 
Date:   Fri Oct 28 01:18:17 2016 +0300

Reduce scope

Change-Id: I06695b310d016751ec80f1aacbba8567a70088a5

diff --git a/sw/source/uibase/ribbar/workctrl.cxx 
b/sw/source/uibase/ribbar/workctrl.cxx
index 8007a50..a03a4d7 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -78,13 +78,13 @@ SwTbxAutoTextCtrl::~SwTbxAutoTextCtrl()
 
 VclPtr SwTbxAutoTextCtrl::CreatePopupWindow()
 {
-ScopedVclPtrInstance pPopup;
 SwView* pView = ::GetActiveView();
 if(pView && !pView->GetDocShell()->IsReadOnly() &&
!pView->GetWrtShell().HasReadonlySel() )
 {
 Link aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
 
+ScopedVclPtrInstance pPopup;
 SwGlossaryList* pGlossaryList = ::GetGlossaryList();
 const size_t nGroupCount = pGlossaryList->GetGroupCount();
 for(size_t i = 1; i <= nGroupCount; ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/win32

2016-10-27 Thread Ariel Constenla-Haile 
 desktop/win32/source/setup/setup.cpp |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 903b2240b3ad8fe050d2db659eeffb5b8983f66d
Author: Ariel Constenla-Haile 
Date:   Fri Oct 28 02:17:19 2016 +

i127195 - Update product code of VC redistributables

diff --git a/desktop/win32/source/setup/setup.cpp 
b/desktop/win32/source/setup/setup.cpp
index 09406d8..a7df510 100644
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -81,8 +81,10 @@
 
 #define RUNTIME_X64_NAMETEXT( "redist\\vcredist_x64.exe" )
 #define RUNTIME_X86_NAMETEXT( "redist\\vcredist_x86.exe" )
-#define PRODUCTCODE_X86 TEXT( "{E503B4BF-F7BB-3D5F-8BC8-F694B1CFF942}" )
-#define PRODUCTCODE_X64 TEXT( "{350AA351-21FA-3270-8B7A-835434E766AD}" )
+// Microsoft Visual C++ 2008 Redistributable - x86 9.0.30729.6161
+#define PRODUCTCODE_X86 TEXT( "{9BE518E6-ECC6-35A9-88E4-87755C07200F}" )
+// Microsoft Visual C++ 2008 Redistributable - x64 9.0.30729.6161
+#define PRODUCTCODE_X64 TEXT( "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}" )
 
 #define MSIAPI_DllGetVersion "DllGetVersion"
 #define ADVAPI32API_CheckTokenMembership "CheckTokenMembership"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-10-27 Thread Adolfo Jayme Barrientos 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c55cc87280d50d8b64d3b7e4a335dae7984d89cc
Author: Adolfo Jayme Barrientos 
Date:   Thu Oct 27 23:10:51 2016 -0500

Updated core
Project: help  005b4a65cdb91fe7566207b9e4c0b4125bf0e133

tdf#103540 Explicitly say the button affects all levels

Props to Regina.

Change-Id: I99d0bc807b1e777e0920bcfbab91f15a408c2a4a

diff --git a/helpcontent2 b/helpcontent2
index f0c69d2..005b4a6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f0c69d271ed0811c3e2a6198669662f1e2f40d73
+Subproject commit 005b4a65cdb91fe7566207b9e4c0b4125bf0e133
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Adolfo Jayme Barrientos 
 source/text/swriter/01/04120221.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 005b4a65cdb91fe7566207b9e4c0b4125bf0e133
Author: Adolfo Jayme Barrientos 
Date:   Thu Oct 27 23:10:51 2016 -0500

tdf#103540 Explicitly say the button affects all levels

Props to Regina.

Change-Id: I99d0bc807b1e777e0920bcfbab91f15a408c2a4a

diff --git a/source/text/swriter/01/04120221.xhp 
b/source/text/swriter/01/04120221.xhp
index 3280859..f3bf6e7 100644
--- a/source/text/swriter/01/04120221.xhp
+++ b/source/text/swriter/01/04120221.xhp
@@ -76,7 +76,7 @@
  Hyperlink (LS and LE)
 Creates a 
hyperlink for the part of the entry that you enclose by the opening (LS) and 
the closing (LE) hyperlink tags. On the Structure line, click in 
the empty box in front of the part that you want to create a hyperlink for, and 
then click this button. Click in the empty box after the part that you want to 
hyperlink, and then click this button again. All hyperlinks must be unique. 
Available only for a table of contents.
 All
-Applies the 
current settings without closing the dialog.
+Applies the current settings to all 
levels without closing the dialog.
 
 Character Style
 Specify 
the formatting style for the selected part on the Structure 
line.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-27 Thread Tor Lillqvist 
 xmlsecurity/source/helper/ooxmlsecexporter.cxx   |  168 +++
 xmlsecurity/source/helper/xmlsignaturehelper.cxx |2 
 xmlsecurity/source/helper/xsecctl.cxx|  116 +++
 xmlsecurity/source/helper/xsecctl.hxx|   65 +---
 xmlsecurity/source/helper/xsecparser.cxx |   44 +++---
 5 files changed, 175 insertions(+), 220 deletions(-)

New commits:
commit d863835fe25edb6e15961d41fa2305e9b734
Author: Tor Lillqvist 
Date:   Fri Oct 28 01:02:08 2016 +0300

Bin unnecessary TAG_ and ATTR_ macros and expand in-place

They just make grepping harder, and don't really avoid a risk of
mistyping. For instance, there were both TAG_TRANSFORM and
TAG_TRANSFORMS (with values "Transform" and "Transforms"), so if you
think you are likely to misspell "Transforms" as "Transform", you are
as likely to misspell TAG_TRANSFORMS as TAG_TRANSFORM. Typos affecting
generated XML should be catched by unit tests anyway.

Some of the (newer) code here is already in this style, using string
literals directly for tags and attributes, so this change just makes
the style more uniform.

I did not touch the macros that have long URIs as value. For them
there is some usefulness in having the shorter macros in the
code. (But the names of the ALGO_* macros are not consistently
constructed from the URIs.)

Change-Id: I9130395f45fafc13fb2a6ac47e98177647e27cf9

diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx 
b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 38ca141..11d5ee8 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -108,47 +108,47 @@ bool 
OOXMLSecExporter::Impl::isOOXMLRelationBlacklist(const OUString& rRelationN
 
 void OOXMLSecExporter::Impl::writeSignedInfo()
 {
-m_xDocumentHandler->startElement(TAG_SIGNEDINFO, 
uno::Reference(new SvXMLAttributeList()));
+m_xDocumentHandler->startElement("SignedInfo", 
uno::Reference(new SvXMLAttributeList()));
 
 writeCanonicalizationMethod();
 writeSignatureMethod();
 writeSignedInfoReferences();
 
-m_xDocumentHandler->endElement(TAG_SIGNEDINFO);
+m_xDocumentHandler->endElement("SignedInfo");
 }
 
 void OOXMLSecExporter::Impl::writeCanonicalizationMethod()
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
-pAttributeList->AddAttribute(ATTR_ALGORITHM, ALGO_C14N);
-m_xDocumentHandler->startElement(TAG_CANONICALIZATIONMETHOD, 
uno::Reference(pAttributeList.get()));
-m_xDocumentHandler->endElement(TAG_CANONICALIZATIONMETHOD);
+pAttributeList->AddAttribute("Algorithm", ALGO_C14N);
+m_xDocumentHandler->startElement("CanonicalizationMethod", 
uno::Reference(pAttributeList.get()));
+m_xDocumentHandler->endElement("CanonicalizationMethod");
 
 }
 
 void OOXMLSecExporter::Impl::writeCanonicalizationTransform()
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
-pAttributeList->AddAttribute(ATTR_ALGORITHM, ALGO_C14N);
-m_xDocumentHandler->startElement(TAG_TRANSFORM, 
uno::Reference(pAttributeList.get()));
-m_xDocumentHandler->endElement(TAG_TRANSFORM);
+pAttributeList->AddAttribute("Algorithm", ALGO_C14N);
+m_xDocumentHandler->startElement("Transform", 
uno::Reference(pAttributeList.get()));
+m_xDocumentHandler->endElement("Transform");
 
 }
 
 void OOXMLSecExporter::Impl::writeDigestMethod()
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
-pAttributeList->AddAttribute(ATTR_ALGORITHM, ALGO_XMLDSIGSHA256);
-m_xDocumentHandler->startElement(TAG_DIGESTMETHOD, 
uno::Reference(pAttributeList.get()));
-m_xDocumentHandler->endElement(TAG_DIGESTMETHOD);
+pAttributeList->AddAttribute("Algorithm", ALGO_XMLDSIGSHA256);
+m_xDocumentHandler->startElement("DigestMethod", 
uno::Reference(pAttributeList.get()));
+m_xDocumentHandler->endElement("DigestMethod");
 }
 
 void OOXMLSecExporter::Impl::writeSignatureMethod()
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
-pAttributeList->AddAttribute(ATTR_ALGORITHM, ALGO_RSASHA256);
-m_xDocumentHandler->startElement(TAG_SIGNATUREMETHOD, 
uno::Reference(pAttributeList.get()));
-m_xDocumentHandler->endElement(TAG_SIGNATUREMETHOD);
+pAttributeList->AddAttribute("Algorithm", ALGO_RSASHA256);
+m_xDocumentHandler->startElement("SignatureMethod", 
uno::Reference(pAttributeList.get()));
+m_xDocumentHandler->endElement("SignatureMethod");
 }
 
 void OOXMLSecExporter::Impl::writeSignedInfoReferences()
@@ -164,58 +164,58 @@ void OOXMLSecExporter::Impl::writeSignedInfoReferences()
 pAttributeList->AddAttribute("Type", 
"http://www.w3.org/2000/09/xmldsig#Object";);
 else
 pAttributeList->AddAttribute("Type", 
"http://uri.etsi.org/01903#SignedProperties";);
-pAttributeList->AddAttribute(ATTR_URI, "#" + rReference.ouURI);

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

2016-10-27 Thread Tor Lillqvist 
 xmlsecurity/source/helper/xmlsignaturehelper.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e333d386ce68ced452bda2ffadac900ba8259861
Author: Tor Lillqvist 
Date:   Fri Oct 28 08:40:01 2016 +0300

Bin one more pointless TAG_ macro

Change-Id: I78e85923e2c5da366c0bec0812c8fe0240310b67

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx 
b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 2a43bb1..a944f6f 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -51,7 +51,6 @@
 #include 
 #include 
 
-#define TAG_DOCUMENTSIGNATURES  "document-signatures"
 #define NS_DOCUMENTSIGNATURES   "http://openoffice.org/2004/documentsignatures";
 #define NS_DOCUMENTSIGNATURES_ODF_1_2 
"urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0"
 #define OOXML_SIGNATURE_ORIGIN 
"http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin";
@@ -182,7 +181,7 @@ uno::Reference 
XMLSignatureHelper::CreateDocumentHandlerWithH
 
 xSaxWriter->startDocument();
 xSaxWriter->startElement(
-TAG_DOCUMENTSIGNATURES,
+"document-signatures",
 uno::Reference< css::xml::sax::XAttributeList > (pAttributeList));
 
 return xSaxWriter;
@@ -190,7 +189,7 @@ uno::Reference 
XMLSignatureHelper::CreateDocumentHandlerWithH
 
 void XMLSignatureHelper::CloseDocumentHandler( const 
uno::Reference& xDocumentHandler )
 {
-xDocumentHandler->endElement( TAG_DOCUMENTSIGNATURES );
+xDocumentHandler->endElement( "document-signatures" );
 xDocumentHandler->endDocument();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gabriel Adriano de Melo license statement

2016-10-27 Thread Jan Iversen 
WELCOME
Thanks for your license statement.

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

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

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

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

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

Re: Code Contributor Statement

2016-10-27 Thread Jan Iversen 
Thanks a lot, I have added you to the wiki.

rgds
jan I.

> On 27 Oct 2016, at 17:14, Otto Kekäläinen  wrote:
> 
> (as requested by Jan)
> 
> All of my past & future contributions to LibreOffice may be
> licensed under the MPLv2/LGPLv3+ dual license.
> 
> Otto Kekäläinen
> Follow me at @ottokekalainen
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice-commits] core.git: 7 commits - compilerplugins/clang cppu/Library_cppu.mk cppu/source desktop/CppunitTest_desktop_app.mk include/sal include/tubes sc/source tubes/qa tubes/source

2016-10-27 Thread Stephan Bergmann 
 compilerplugins/clang/reservedid.cxx |2 
 cppu/Library_cppu.mk |5 
 cppu/source/typelib/typelib.cxx  |   47 +
 cppu/source/uno/EnvDcp.c |   43 -
 cppu/source/uno/EnvDcp.cxx   |   43 +
 desktop/CppunitTest_desktop_app.mk   |1 
 include/sal/log-areas.dox|3 
 include/tubes/collaboration.hxx  |   13 +
 include/tubes/conference.hxx |   83 --
 include/tubes/constants.h|   35 
 include/tubes/file-transfer-helper.h |  121 ---
 include/tubes/manager.hxx|3 
 include/tubes/tubesdllapi.h  |1 
 sc/source/ui/collab/sendfunc.cxx |   30 +--
 sc/source/ui/collab/sendfunc.hxx |   20 +-
 sc/source/ui/inc/sccollaboration.hxx |   10 -
 tubes/qa/test_manager.cxx|   38 ++--
 tubes/source/approver.c  |2 
 tubes/source/collaboration.cxx   |   17 +-
 tubes/source/conference.cxx  |   91 +--
 tubes/source/conference.hxx  |   81 ++
 tubes/source/constants.h |   35 
 tubes/source/contacts.cxx|  278 +++
 tubes/source/contacts.hxx|   64 
 tubes/source/file-transfer-helper.c  |   11 +
 tubes/source/file-transfer-helper.h  |  121 +++
 tubes/source/manager.cxx |  125 ---
 27 files changed, 682 insertions(+), 641 deletions(-)

New commits:
commit c0b3531919f9b999014589feb4ac79a53e178cd3
Author: Stephan Bergmann 
Date:   Thu Oct 27 21:19:55 2016 +0200

Use SAL_DLLPRIVATE instead of extra TUBES_DLLPRIVATE

Change-Id: I188bf325e6eb6db0250a58d9354860733950e887

diff --git a/include/tubes/collaboration.hxx b/include/tubes/collaboration.hxx
index 4f68666..d07bc16 100644
--- a/include/tubes/collaboration.hxx
+++ b/include/tubes/collaboration.hxx
@@ -40,8 +40,8 @@ public:
 /** Prepares document for collaboration and should call SetConference() */
 virtual void StartCollaboration( TeleConference* pConference ) = 0;
 
-TUBES_DLLPRIVATE sal_uInt64 GetId() const;
-TUBES_DLLPRIVATE void Invite( TpContact* pContact ) const;
+SAL_DLLPRIVATE sal_uInt64 GetId() const;
+SAL_DLLPRIVATE void Invite( TpContact* pContact ) const;
 
 /** Application calls this to display contacts dialog from where can the 
collaboration start */
 void DisplayContacts();
diff --git a/include/tubes/tubesdllapi.h b/include/tubes/tubesdllapi.h
index 3687eba..1e93127 100644
--- a/include/tubes/tubesdllapi.h
+++ b/include/tubes/tubesdllapi.h
@@ -9,7 +9,6 @@
 #else
 #define TUBES_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
-#define TUBES_DLLPRIVATE SAL_DLLPRIVATE
 
 #endif // INCLUDED_TUBES_TUBESDLLAPI_H
 
commit 226383e690752c0bec8ec22b5a5cac2787e36742
Author: Stephan Bergmann 
Date:   Thu Oct 27 22:05:16 2016 +0200

loplugin:reservedid

Change-Id: I49e0e53b4ff17170e8aa8247b5428b6f1209d93c

diff --git a/tubes/source/conference.hxx b/tubes/source/conference.hxx
index 3b80eb1..b39b8fb 100644
--- a/tubes/source/conference.hxx
+++ b/tubes/source/conference.hxx
@@ -13,12 +13,10 @@
 #include 
 #include 
 
+#include 
+
 class Collaboration;
 class TeleConferenceImpl;
-typedef struct _TpAccount TpAccount;
-typedef struct _TpContact TpContact;
-typedef struct _TpDBusTubeChannel TpDBusTubeChannel;
-typedef struct _GDBusConnection GDBusConnection;
 
 /** Conference setup by TeleManager */
 class TeleConference
commit f479e6878e03ff3a6090b2b617175ebc1036915f
Author: Stephan Bergmann 
Date:   Thu Oct 27 20:56:43 2016 +0200

Move internal include files from include/tubes/ to tubes/source/

Change-Id: I2fa9334721c203d4d977f0638a9030e8e74efc06

diff --git a/tubes/source/approver.c b/tubes/source/approver.c
index d8d8901..6d6e280 100644
--- a/tubes/source/approver.c
+++ b/tubes/source/approver.c
@@ -16,7 +16,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 GMainLoop *mainloop = NULL;
 
diff --git a/tubes/source/collaboration.cxx b/tubes/source/collaboration.cxx
index ce097b2..fe397f8 100644
--- a/tubes/source/collaboration.cxx
+++ b/tubes/source/collaboration.cxx
@@ -8,10 +8,9 @@
  */
 
 #include 
-
-#include 
 #include 
 
+#include 
 #include 
 
 Collaboration::Collaboration() :
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index 57d0e9d..373a564 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -7,13 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
-
 #include 
-#include 
-#include 
 #include 
 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 
diff --git a/include/tubes/conference.hxx b/tubes/source/conference.hxx
similarity index 100%
rename from include/tubes/conference.hxx
rename to tubes/source/conference.hxx
diff --git a/include/tubes/constants.h b/tubes/source/constants.h
similarity index 100%
rename from include/tubes/constants.h
rename to tubes/source/constants.h
diff --git a/tubes/sourc