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

[Miklos Vajna]

 oox/source/drawingml/shape.cxx  |   13 +++--
 sw/qa/extras/ooxmlimport/data/tdf85232.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   11 +++
 3 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit 11129d89b152db54c86bb2bda58c24b8abb6c5a8
Author: Miklos Vajna 
Date:   Wed Nov 11 08:57:31 2015 +0100

tdf#85232 WPG import: fix handling of line shapes

The missing convertMm100ToTwip() calls mispositioned the line shapes
inside the groupshape in case of using drawingML inside DOCX files.

Change-Id: I0c9d652de43d779f9073a8bfe22866ce4f31d0fa

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 7d329b2..6f84759 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -480,10 +480,11 @@ Reference< XShape > Shape::createAndInsert(
 aTransformation.translate( aCenter.getX(), aCenter.getY() );
 }
 
+bool bInGroup = !aParentTransformation.isIdentity();
 if( maPosition.X != 0 || maPosition.Y != 0)
 {
 // if global position is used, add it to transformation
-if (mbWps && aParentTransformation.isIdentity())
+if (mbWps && !bInGroup)
 aTransformation.translate( maPosition.X * EMU_PER_HMM, 
maPosition.Y * EMU_PER_HMM);
 else
 aTransformation.translate( maPosition.X, maPosition.Y );
@@ -505,10 +506,18 @@ Reference< XShape > Shape::createAndInsert(
 sal_Int32 i, nNumPoints = aPoly.count();
 uno::Sequence< awt::Point > aPointSequence( nNumPoints );
 awt::Point* pPoints = aPointSequence.getArray();
+uno::Reference xModelInfo(rFilterBase.getModel(), 
uno::UNO_QUERY);
+bool bIsWriter = 
xModelInfo->supportsService("com.sun.star.text.TextDocument");
 for( i = 0; i < nNumPoints; ++i )
 {
 const ::basegfx::B2DPoint aPoint( aPoly.getB2DPoint( i ) );
-pPoints[ i ] = awt::Point( static_cast< sal_Int32 >( aPoint.getX() 
), static_cast< sal_Int32 >( aPoint.getY() ) );
+if (bIsWriter && bInGroup)
+// Writer's draw page is in twips, and these points get passed
+// to core without any unit conversion when Writer
+// postprocesses only the group shape itself.
+pPoints[i] = 
awt::Point(static_cast(convertMm100ToTwip(aPoint.getX())), 
static_cast(convertMm100ToTwip(aPoint.getY(;
+else
+pPoints[i] = awt::Point(static_cast(aPoint.getX()), 
static_cast(aPoint.getY()));
 }
 uno::Sequence< uno::Sequence< awt::Point > > aPolyPolySequence( 1 );
 aPolyPolySequence.getArray()[ 0 ] = aPointSequence;
diff --git a/sw/qa/extras/ooxmlimport/data/tdf85232.docx 
b/sw/qa/extras/ooxmlimport/data/tdf85232.docx
new file mode 100644
index 000..35e8a88
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf85232.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 003872c..c023257 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2909,6 +2909,17 @@ DECLARE_OOXMLIMPORT_TEST(testTdf94374, "hello.docx")
 CPPUNIT_ASSERT(paste("tdf94374.docx", xEnd));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf85232, "tdf85232.docx")
+{
+uno::Reference xShapes(getShapeByName("Group 219"), 
uno::UNO_QUERY);
+uno::Reference xShape(xShapes->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xShapeDescriptor(xShape, 
uno::UNO_QUERY);
+// Make sure we're not testing the ellipse child.
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.LineShape"), 
xShapeDescriptor->getShapeType());
+// This was 2900: horizontal position of the line was incorrect, the 3 
children were not connected visually.
+CPPUNIT_ASSERT_EQUAL(static_cast(2267), 
xShape->getPosition().X);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/filter/ww8/ww8graf.cxx   |4 
 sw/source/filter/ww8/ww8par.cxx|   32 +--
 sw/source/filter/ww8/ww8par.hxx|  114 +--
 sw/source/filter/ww8/ww8par2.cxx   |  136 ++---
 sw/source/filter/ww8/ww8par3.cxx   |   44 ++--
 sw/source/filter/ww8/ww8par6.cxx   |   68 +++---
 sw/source/ui/frmdlg/frmpage.cxx|  280 +--
 sw/source/uibase/inc/frmpage.hxx   |   54 ++---
 sw/source/uibase/inc/redlndlg.hxx  |   58 ++---
 sw/source/uibase/inc/toxmgr.hxx|  182 +-
 sw/source/uibase/index/toxmgr.cxx  |   10 
 sw/source/uibase/misc/redlndlg.cxx |  372 ++---
 12 files changed, 677 insertions(+), 677 deletions(-)

New commits:
commit fdeaa040059647f7bd1d103f2971e945bbe18659
Author: Miklos Vajna 
Date:   Wed Nov 11 08:56:22 2015 +0100

sw: prefix members of SwFrmAddPage

Change-Id: Id4a5a5794ff03a88922df7fd1dcba75ed601dd59

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 81d391b..514be1b 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2864,34 +2864,34 @@ IMPL_LINK_NOARG_TYPED(SwFrmURLPage, InsertFileHdl, 
Button*, void)
 
 SwFrmAddPage::SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet)
 : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", 
&rSet)
-, pWrtSh(nullptr)
-, bHtmlMode(false)
-, bFormat(false)
-, bNew(false)
-{
-get(pNameFrame, "nameframe");
-get(pNameFT,"name_label");
-get(pNameED,"name");
-get(pAltNameFT,"altname_label");
-get(pAltNameED,"altname");
-get(pPrevFT,"prev_label");
-get(pPrevLB,"prev");
-get(pNextFT,"next_label");
-get(pNextLB,"next");
-
-get(pProtectFrame,"protect");
-get(pProtectContentCB,"protectcontent");
-get(pProtectFrameCB,"protectframe");
-get(pProtectSizeCB,"protectsize");
+, m_pWrtSh(nullptr)
+, m_bHtmlMode(false)
+, m_bFormat(false)
+, m_bNew(false)
+{
+get(m_pNameFrame, "nameframe");
+get(m_pNameFT,"name_label");
+get(m_pNameED,"name");
+get(m_pAltNameFT,"altname_label");
+get(m_pAltNameED,"altname");
+get(m_pPrevFT,"prev_label");
+get(m_pPrevLB,"prev");
+get(m_pNextFT,"next_label");
+get(m_pNextLB,"next");
+
+get(m_pProtectFrame,"protect");
+get(m_pProtectContentCB,"protectcontent");
+get(m_pProtectFrameCB,"protectframe");
+get(m_pProtectSizeCB,"protectsize");
 
 get(m_pContentAlignFrame, "contentalign");
 get(m_pVertAlignLB,"vertalign");
 
-get(pPropertiesFrame,"properties");
-get(pEditInReadonlyCB,"editinreadonly");
-get(pPrintFrameCB,"printframe");
-get(pTextFlowFT,"textflow_label");
-get(pTextFlowLB,"textflow");
+get(m_pPropertiesFrame,"properties");
+get(m_pEditInReadonlyCB,"editinreadonly");
+get(m_pPrintFrameCB,"printframe");
+get(m_pTextFlowFT,"textflow_label");
+get(m_pTextFlowLB,"textflow");
 
 }
 
@@ -2902,26 +2902,26 @@ SwFrmAddPage::~SwFrmAddPage()
 
 void SwFrmAddPage::dispose()
 {
-pNameFrame.clear();
-pNameFT.clear();
-pNameED.clear();
-pAltNameFT.clear();
-pAltNameED.clear();
-pPrevFT.clear();
-pPrevLB.clear();
-pNextFT.clear();
-pNextLB.clear();
-pProtectFrame.clear();
-pProtectContentCB.clear();
-pProtectFrameCB.clear();
-pProtectSizeCB.clear();
+m_pNameFrame.clear();
+m_pNameFT.clear();
+m_pNameED.clear();
+m_pAltNameFT.clear();
+m_pAltNameED.clear();
+m_pPrevFT.clear();
+m_pPrevLB.clear();
+m_pNextFT.clear();
+m_pNextLB.clear();
+m_pProtectFrame.clear();
+m_pProtectContentCB.clear();
+m_pProtectFrameCB.clear();
+m_pProtectSizeCB.clear();
 m_pContentAlignFrame.clear();
 m_pVertAlignLB.clear();
-pPropertiesFrame.clear();
-pEditInReadonlyCB.clear();
-pPrintFrameCB.clear();
-pTextFlowFT.clear();
-pTextFlowLB.clear();
+m_pPropertiesFrame.clear();
+m_pEditInReadonlyCB.clear();
+m_pPrintFrameCB.clear();
+m_pTextFlowFT.clear();
+m_pTextFlowLB.clear();
 SfxTabPage::dispose();
 }
 
@@ -2935,30 +2935,30 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
 {
 const SfxPoolItem* pItem;
 sal_uInt16 nHtmlMode = ::GetHtmlMode(static_cast(SfxObjectShell::Current()));
-bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0;
-if (bHtmlMode)
+m_bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0;
+if (m_bHtmlMode)
 {
-pProtectFrame->Hide();
-pEditInReadonlyCB->Hide();
-pPrintFrameCB->Hide();
+m_pProtectFrame->Hide();
+m_pEditInReadonlyCB->Hide();
+m_pPrintFrameCB->Hide();
 }
-if (sDlgType == "PictureDialog" || sDlgType == "ObjectDialog")
+if (m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog")
 {
-pEditInReadonlyCB->Hide();
-if (bHtmlMode)
+m_pEditInReadonlyCB->Hide();
+if (m_bHtmlMode)
 {
-pPrope

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

[Samuel Mehrbrodt]

 framework/source/layoutmanager/layoutmanager.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 53f66fa6793d96f410acc7a256beb3284d65f296
Author: Samuel Mehrbrodt 
Date:   Wed Nov 11 08:49:53 2015 +0100

Fix NotebookBar not showing up when directly opening a document

Change-Id: I6bb154102d5e58e7c7e1f1b0d68629555a6d1697

diff --git a/framework/source/layoutmanager/layoutmanager.cxx 
b/framework/source/layoutmanager/layoutmanager.cxx
index fe10f2e..1c15c9f 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -784,11 +784,6 @@ void LayoutManager::implts_updateUIElementsVisibleState( 
bool bSetVisible )
 if ( bSetVisible )
 {
 pSysWindow->SetMenuBar(pMenuBar);
-if (getenv("LO_USE_NOTEBOOKBAR"))
-{
-pSysWindow->CreateNotebookBar("vcl/ui/notebookbar.ui", 
m_xFrame);
-pSysWindow->SetMenuBarMode(MenuBarMode::Hide);
-}
 }
 else
 pSysWindow->SetMenuBar( nullptr );
@@ -1466,7 +1461,7 @@ throw (RuntimeException, std::exception)
 {
 // #i38743# don't create a menubar if frame isn't top
 if ( !bInPlaceMenu && !m_xMenuBar.is() && 
implts_isFrameOrWindowTop( xFrame ))
-{
+{
 m_xMenuBar = implts_createElement( aName );
 if ( m_xMenuBar.is() )
 {
@@ -1508,6 +1503,11 @@ throw (RuntimeException, std::exception)
 }
 }
 }
+if (getenv("LO_USE_NOTEBOOKBAR"))
+{
+
pSysWindow->CreateNotebookBar("vcl/ui/notebookbar.ui", m_xFrame);
+pSysWindow->SetMenuBarMode(MenuBarMode::Hide);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/source basic/source compilerplugins/clang connectivity/source dbaccess/source extensions/source filter/source hwpfilter/source idl/source l10ntools/source openc

[Noel Grandin]

 basegfx/source/polygon/b2dpolygoncutandtouch.cxx   |5 
 basic/source/runtime/methods.cxx   |   13 
 basic/source/sbx/sbxstr.cxx|9 
 compilerplugins/clang/memoryvar.cxx|  239 
++
 connectivity/source/drivers/dbase/dindexnode.cxx   |7 
 dbaccess/source/ui/misc/UITools.cxx|6 
 extensions/source/plugin/unx/npnapi.cxx|7 
 filter/source/graphicfilter/ieps/ieps.cxx  |   32 -
 hwpfilter/source/cspline.cxx   |   23 
 idl/source/prj/svidl.cxx   |   22 
 l10ntools/source/helpex.cxx|   15 
 opencl/source/opencl_device.cxx|9 
 opencl/source/openclwrapper.cxx|5 
 rsc/source/prj/gui.cxx |   16 
 sc/qa/unit/ucalc.cxx   |3 
 sc/source/core/tool/callform.cxx   |  125 ++---
 sc/source/filter/starcalc/scflt.cxx|8 
 sc/source/ui/unoobj/funcuno.cxx|8 
 scaddins/source/analysis/analysishelper.cxx|9 
 sd/source/filter/eppt/eppt.cxx |4 
 sd/source/filter/ppt/pptin.cxx |5 
 sdext/source/minimizer/pppoptimizertoken.cxx   |6 
 sdext/source/pdfimport/wrapper/wrapper.cxx |7 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx  |8 
 slideshow/source/engine/transitions/slidetransitionfactory.cxx |8 
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx|   12 
 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx   |   11 
 sw/source/core/crsr/swcrsr.cxx |8 
 sw/source/core/doc/DocumentContentOperationsManager.cxx|6 
 sw/source/core/docnode/node.cxx|   11 
 sw/source/core/docnode/swbaslnk.cxx|7 
 sw/source/core/frmedt/tblsel.cxx   |9 
 sw/source/core/table/swnewtable.cxx|3 
 sw/source/core/text/itradj.cxx |   17 
 sw/source/core/unocore/unocrsrhelper.cxx   |   41 -
 sw/source/core/unocore/unostyle.cxx|   27 -
 sw/source/filter/html/htmlforw.cxx |8 
 testtools/source/bridgetest/bridgetest.cxx |6 
 tools/source/inet/inetmime.cxx |8 
 ucb/source/ucp/webdav-neon/LockSequence.cxx|   20 
 vcl/source/gdi/dibtools.cxx|6 
 vcl/source/gdi/gdimtf.cxx  |7 
 vcl/source/gdi/gfxlink.cxx |8 
 vcl/source/gdi/impgraph.cxx|9 
 vcl/source/gdi/salmisc.cxx |   34 -
 xmloff/source/draw/EnhancedCustomShapeToken.cxx|6 
 46 files changed, 503 insertions(+), 360 deletions(-)

New commits:
commit db17d3c17c40d6b0e92392cf3c6e343d1d17b771
Author: Noel Grandin 
Date:   Tue Nov 10 13:36:34 2015 +0200

new loplugin: memoryvar

detect when we can convert a new/delete sequence on a local variable to
use std::unique_ptr

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

diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx 
b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 0ccebe9..71804b3 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -29,6 +29,7 @@
 
 #include 
 #include 
+#include 
 
 #define SUBDIVIDE_FOR_CUT_TEST_COUNT(50)
 
@@ -887,7 +888,7 @@ namespace basegfx
 else
 {
 // first solve self cuts and self touches for all 
contained single polygons
-temporaryPolygonData *pTempData = new 
temporaryPolygonData[nCount];
+std::unique_ptr pTempData(new 
temporaryPolygonData[nCount]);
 sal_uInt32 a, b;
 
 for(a = 0L; a < nCount; a++)
@@ -934,8 +935,6 @@ namespace basegfx
 {
 
aRetval.append(mergeTemporaryPointsAndPolygon(pTempData[a].getPolygon(), 
pTempData[a].getTemporaryPointVector()));
 }
-
-delete[] pTempData;
 }
 
 return aRetval;
diff --git a/basic/source/runtime/methods.cxx b/basic/sourc

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

[Mario J . Rugiero]

 sw/source/core/access/accmap.cxx  |4 +-
 sw/source/core/doc/DocumentDeviceManager.cxx  |4 +-
 sw/source/core/doc/DocumentSettingManager.cxx |8 ++---
 sw/source/core/doc/doc.cxx|   16 +++
 sw/source/core/doc/docdesc.cxx|   16 +--
 sw/source/core/doc/docfmt.cxx |4 +-
 sw/source/core/doc/docftn.cxx |   17 +++-
 sw/source/core/doc/ftnidx.cxx |3 +-
 sw/source/core/doc/lineinfo.cxx   |   11 +++
 sw/source/core/doc/number.cxx |8 ++---
 sw/source/core/inc/rolbck.hxx |2 -
 sw/source/core/txtnode/thints.cxx |   36 ++
 sw/source/filter/ww8/wrtw8nds.cxx |4 +-
 sw/source/filter/ww8/wrtw8sty.cxx |   12 
 sw/source/uibase/dbui/dbmgr.cxx   |   14 --
 15 files changed, 79 insertions(+), 80 deletions(-)

New commits:
commit 2ce9e4be4a438203382cb9cca824ce3e90647f3a
Author: Mario J. Rugiero 
Date:   Tue Nov 10 23:16:03 2015 -0300

Replace several for_each by range based fors and functors by lambdas in sw.

It also corrects one whitespace and an outdated comment.

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

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b771417..2af9cd1 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -3093,8 +3093,8 @@ void SwAccessibleMap::FireEvents()
 {
 mpEvents->SetFiring();
 mpEvents->MoveInvalidXAccToEnd();
-::std::for_each(mpEvents->begin(), mpEvents->end(),
-[this] (SwAccessibleEvent_Impl const& rEvent) { 
this->FireEvent(rEvent); } );
+for( auto const& aEvent : *mpEvents )
+ FireEvent(aEvent);
 
 delete mpEventMap;
 mpEventMap = nullptr;
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx 
b/sw/source/core/doc/DocumentDeviceManager.cxx
index 7032101..234a0e2 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -339,8 +339,8 @@ void DocumentDeviceManager::PrtDataChanged()
 
 pFntCache->Flush();
 
-std::set aAllLayouts = m_rDoc.GetAllLayouts();
-std::for_each( aAllLayouts.begin(), 
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), 
INV_SIZE));
+for(SwRootFrm* aLayout : m_rDoc.GetAllLayouts())
+aLayout->InvalidateAllContent(INV_SIZE);
 
 for(SwViewShell& rShell : pSh->GetRingContainer())
 rShell.InitPrt(getPrinter(false));
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 67c3f12..4944eac 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -434,8 +434,8 @@ void 
sw::DocumentSettingManager::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLan
 if( pTmpRoot && !m_rDoc.IsInReading() )
 {
 pTmpRoot->StartAllAction();
-std::set aAllLayouts = m_rDoc.GetAllLayouts();
-std::for_each( aAllLayouts.begin(), aAllLayouts.end(), 
std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
+for(SwRootFrm* aLayout : m_rDoc.GetAllLayouts())
+aLayout->InvalidateAllContent(INV_SIZE);
 pTmpRoot->EndAllAction();
 }
 m_rDoc.getIDocumentState().SetModified();
@@ -504,8 +504,8 @@ void 
sw::DocumentSettingManager::setCharacterCompressionType( /*[in]*/SwCharComp
 if( pTmpRoot && !m_rDoc.IsInReading() )
 {
 pTmpRoot->StartAllAction();
-std::set aAllLayouts = m_rDoc.GetAllLayouts();
-std::for_each( aAllLayouts.begin(), aAllLayouts.end(), 
std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
+for( auto aLayout : m_rDoc.GetAllLayouts() )
+aLayout->InvalidateAllContent(INV_SIZE);
 pTmpRoot->EndAllAction();
 }
 m_rDoc.getIDocumentState().SetModified();
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 3557c66..38631b1 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1144,14 +1144,18 @@ void SwDoc::SpellItAgainSam( bool bInvalid, bool 
bOnlyWrong, bool bSmartTags )
 OSL_ENSURE( getIDocumentLayoutAccess().GetCurrentLayout(), "SpellAgain: 
Where's my RootFrm?" );
 if( bInvalid )
 {
-std::for_each( aAllLayouts.begin(), 
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::AllInvalidateSmartTagsOrSpelling),bSmartTags));
-std::for_each( aAllLayouts.begin(), 
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::SetNeedGrammarCheck), 
tru

Re: Unicode characters in Thesaurus dialog box

[shantanu oak]

Hi,
I have reported this bug here...

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

No problem on Ubuntu. This seems to be windows only issue.
Surprisingly if there is any english character on the line, it shows the
other language correctly (as shown in the image). If there is no english
character then it does not know how to render the text. This behavior is
different than the bug already reported (90261) where all asian characters
are shown as boxes.

-- Shantanu

On Sun, Nov 8, 2015 at 4:49 PM, shantanu oak  wrote:

> Hi,
> I am developing Thesaurus for Marathi language. I have 2 synonyms added
> for a word. Out of which the first one is shown correctly.
>
> (noun)|सत्ता
> (विशेषण)|प्रभुत्व
>
> https://www.flickr.com/photos/shantanuo/22450714007
>
> The first word is shown correctly while the second one is shown as boxes.
> This is because there is no ascii character like a-z . I guess there is
> some regular expression preventing any word other than english to be
> displayed correctly. Can someone confirm this is bug so that I can add it
> to bugzilla.
>
> -- Shantanu
>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Chr . Rossmanith]

 filter/source/svg/svgreader.cxx |   54 
 1 file changed, 49 insertions(+), 5 deletions(-)

New commits:
commit 591903a1b1b64e68322f7454d3e61b2503028b9a
Author: Chr. Rossmanith 
Date:   Tue Nov 10 21:17:54 2015 +0100

tdf#51165: handle mixture of open and closed polygons in a path

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

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index e30acf3..04d8e01 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -128,6 +128,35 @@ double colorDiffSquared(const ARGBColor& rCol1, const 
ARGBColor& rCol2)
 + square(rCol1.b-rCol2.b);
 }
 
+/**
+check whether a polypolygon contains both open and closed
+polygons
+**/
+bool PolyPolygonIsMixedOpenAndClosed( const basegfx::B2DPolyPolygon& rPoly )
+{
+bool bRetval(false);
+bool bOpen(false);
+bool bClosed(false);
+
+// PolyPolygon is mixed open and closed if there is more than one
+// polygon and there are both closed and open polygons.
+for( sal_uInt32 a(0L); !bRetval && a < rPoly.count(); a++ )
+{
+if ( (rPoly.getB2DPolygon(a)).isClosed() )
+{
+bClosed = true;
+}
+else
+{
+bOpen = true;
+}
+
+bRetval = (bClosed && bOpen);
+}
+
+return bRetval;
+}
+
 typedef std::map ElementRefMapType;
 
 struct AnnotatingVisitor
@@ -1366,11 +1395,26 @@ struct ShapeWritingVisitor
 aPoly.setClosed(true);
 }
 
-writePathShape(xAttrs,
-   xUnoAttrs,
-   xElem,
-   sStyleId,
-   aPoly);
+// tdf#51165: rendering of paths with open and closed polygons 
is not implemented
+// split mixed polypolygons into single polygons and add them 
one by one
+if( PolyPolygonIsMixedOpenAndClosed(aPoly) )
+{
+for( sal_uInt32 i(0L); ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 sw/source/core/unocore/unotbl.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f019f5d6fe05b15a83a7fea40d9448de2fabb00d
Author: Bjoern Michaelsen 
Date:   Wed Nov 11 01:22:24 2015 +0100

another missing SolarMutex in Writer UNO: SwXCell

Change-Id: I1c8413cd0b9baa7f38e452e94f33e29bc4cf6717

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index d3f8f71..d42b1ab 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -742,6 +742,9 @@ SwXCell::SwXCell(SwFrameFormat* pTableFormat, const 
SwStartNode& rStartNode) :
 
 SwXCell::~SwXCell()
 {
+SolarMutexGuard aGuard;
+if(GetRegisteredIn())
+GetRegisteredIn()->Remove(this);
 }
 
 namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help compiling an idl for an Add-in

[lucass]

To be sure i ran ./setsdkenv_unix --force-configure

My configurations:

 
 *
 * SDK environment is prepared for Linux
 *
 * SDK = /usr/lib/libreoffice/sdk
 * Office = /usr/lib/libreoffice
 * Make = /usr/bin
 * Zip = /usr/bin
 * cat = /bin
 * sed = /bin
 * C++ Compiler = /usr/bin
 * Java = /home/lucas/Programs/jdk1.8.0_25
 * SDK Output directory = /home/lucas/loOut/libreoffice5.0_sdk
 * Auto deployment = YES
 *
 

Still having the same compilation error.

➜  sdk  /usr/lib/libreoffice/sdk/bin/idlc -C -O
/home/lucas/dev/clojurecalc/ClojureCalc/build/idl/urd -I
/home/lucas/dev/clojurecalc/ClojureCalc/src -I /usr/lib/libreoffice/sdk/idl
/home/lucas/dev/clojurecalc/ClojureCalc/src/com/github/beothorn/clojurecalc/ClojureCalc.idl
Compiling:
/home/lucas/dev/clojurecalc/ClojureCalc/src/com/github/beothorn/clojurecalc/ClojureCalc.idl
:1 [62:62] : Statement can not be parsed: syntax error,
unexpected $undefined
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:80 [42:42] :
Statement can not be parsed: definitions
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:94 [5:8] :
Statement can not be parsed: syntax error, unexpected IDL_VOID
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:94 [19:19] :
Statement can not be parsed: definitions
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:100 [5:8] :
Statement can not be parsed: syntax error, unexpected IDL_VOID
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:100 [19:19] :
Statement can not be parsed: definitions
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:102 [1:1] :
Statement can not be parsed: syntax error, unexpected '}', expecting $end
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:102 [2:2] :
Statement can not be parsed: definitions
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:105 [1:1] :
Statement can not be parsed: syntax error, unexpected '}', expecting $end
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:105 [2:2] :
Statement can not be parsed: definitions
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:105 [4:4] :
Statement can not be parsed: syntax error, unexpected '}', expecting $end
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:105 [5:5] :
Statement can not be parsed: definitions
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:105 [7:7] :
Statement can not be parsed: syntax error, unexpected '}', expecting $end
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:105 [8:8] :
Statement can not be parsed: definitions
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:105 [10:10] :
Statement can not be parsed: syntax error, unexpected '}', expecting $end
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:105 [11:11] :
Statement can not be parsed: definitions
/usr/lib/libreoffice/sdk/bin/idlc.bin: detected 16
errors/usr/lib/libreoffice/sdk/bin/idlc.bin Version 1.1


On Tue, Nov 10, 2015 at 11:57 AM, lucass  wrote:

> When using the ubuntu sdk I did do that, I setted the same cpp from which
> I copied the version output and the sdk from the libreoffice-dev package.
> I'm not at my computer right now.
> I saw that setsdkenv_unix prints all setted values, I'll recheck them
> later and send it here.
>
> Thanks
>
> On Tue, Nov 10, 2015 at 11:16 AM, Stephan Bergmann 
> wrote:
>
>> On 11/10/2015 01:53 PM, lucass wrote:
>>
>>> I downloaded the rpm file on the official site and extracted it (using
>>> the file compression tool that comes with ubuntu).
>>> I couldn't make idlc work, but I think it was because my own lack of
>>> experience.
>>> When running idlc it complained about not finding libreglo.so .
>>>
>>
>> For one, you need to configure the LO SDK before using it, by running its
>> setsdkenv_unix.sh, see ).
>> Did you do that?  If not, that is maybe also the reason why the
>> Ubuntu-provided LO SDK does not work for you.
>>
>> For another, a LO SDK should always be used in combination with a
>> matching LO installation.  It is unwise and unsupported to use a LO SDK
>> downloaded from libreoffice.org together with a Ubuntu-provided LO
>> installation.
>>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Bjoern Michaelsen]

 sw/inc/calbck.hxx|8 ++-
 sw/source/core/attr/calbck.cxx   |   44 +++
 sw/source/core/table/swtable.cxx |2 -
 3 files changed, 22 insertions(+), 32 deletions(-)

New commits:
commit 938cd22ae87d7098143a0e18e1e348479cdf69e9
Author: Bjoern Michaelsen 
Date:   Tue Nov 10 22:50:47 2015 +0100

remove b_mInDocDTOR flag altogether

Change-Id: I09ca56854f23fe1fc452648042990bee29082f88

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index f718507..dcd6dc9 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -149,7 +149,6 @@ class SW_DLLPUBLIC SwModify: public SwClient
 sw::WriterListener* m_pWriterListeners;// the start of the 
linked list of clients
 bool m_bModifyLocked : 1; // don't broadcast changes now
 bool m_bLockClientList : 1;   // may be set when this instance 
notifies its clients
-bool m_bInDocDTOR : 1;// workaround for problems when a lot of 
objects are destroyed
 bool m_bInCache   : 1;
 bool m_bInSwFntCache : 1;
 
@@ -162,10 +161,10 @@ class SW_DLLPUBLIC SwModify: public SwClient
 SwModify &operator =(const SwModify&) = delete;
 public:
 SwModify()
-: SwClient(nullptr), m_pWriterListeners(nullptr), 
m_bModifyLocked(false), m_bLockClientList(false), m_bInDocDTOR(false), 
m_bInCache(false), m_bInSwFntCache(false)
+: SwClient(nullptr), m_pWriterListeners(nullptr), 
m_bModifyLocked(false), m_bLockClientList(false), m_bInCache(false), 
m_bInSwFntCache(false)
 {}
 explicit SwModify( SwModify* pToRegisterIn )
-: SwClient(pToRegisterIn), m_pWriterListeners(nullptr), 
m_bModifyLocked(false), m_bLockClientList(false), m_bInDocDTOR(false), 
m_bInCache(false), m_bInSwFntCache(false)
+: SwClient(pToRegisterIn), m_pWriterListeners(nullptr), 
m_bModifyLocked(false), m_bLockClientList(false), m_bInCache(false), 
m_bInSwFntCache(false)
 {}
 
 // broadcasting: send notifications to all clients
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 51a188c..d7ec7cd 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -77,13 +77,13 @@ void SwClient::Modify(SfxPoolItem const*const pOldValue, 
SfxPoolItem const*const
 
 void SwModify::SetInDocDTOR()
 {
-m_bInDocDTOR = true;
 // If the document gets destroyed anyway, just tell clients to
 // forget me so that they don't try to get removed from my list
 // later when they also get destroyed
 SwIterator aIter(*this);
 for(SwClient* pClient = aIter.First(); pClient; pClient = aIter.Next())
 pClient->pRegisteredIn = nullptr;
+m_pWriterListeners = nullptr;
 }
 
 SwModify::~SwModify()
@@ -97,8 +97,6 @@ SwModify::~SwModify()
 if ( IsInSwFntCache() )
 pSwFontCache->Delete( this );
 
-if(m_bInDocDTOR)
-return;
 // notify all clients that they shall remove themselves
 SwPtrMsgPoolItem aDyObject( RES_OBJECTDYING, this );
 NotifyClients( &aDyObject, &aDyObject );
@@ -203,9 +201,6 @@ void SwModify::Add( SwClient* pDepend )
 
 SwClient* SwModify::Remove( SwClient* pDepend )
 {
-if(m_bInDocDTOR)
-return nullptr;
-
 DBG_TESTSOLARMUTEX();
 assert(pDepend->pRegisteredIn == this);
 
commit f93a2e530d94c4ef73e234b8cc5d3dd79977a8c8
Author: Bjoern Michaelsen 
Date:   Tue Nov 10 22:12:59 2015 +0100

reduce branch depth in SwModify dtor

Change-Id: I82046cfc191425dc830125944214293b5b9197f9

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index b56575d..f718507 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -192,7 +192,7 @@ public:
 void UnlockModify() { m_bModifyLocked = false; }
 void SetInCache( bool bNew ){ m_bInCache = bNew;   }
 void SetInSwFntCache( bool bNew )   { m_bInSwFntCache = bNew;  }
-void SetInDocDTOR() { m_bInDocDTOR = true; }
+void SetInDocDTOR();
 bool IsModifyLocked() const { return m_bModifyLocked;  }
 bool IsInCache()  const { return m_bInCache;   }
 bool IsInSwFntCache() const { return m_bInSwFntCache;  }
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index fb6654e..51a188c 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -75,6 +75,17 @@ void SwClient::Modify(SfxPoolItem const*const pOldValue, 
SfxPoolItem const*const
 CheckRegistration( pOldValue, pNewValue );
 }
 
+void SwModify::SetInDocDTOR()
+{
+m_bInDocDTOR = true;
+// If the document gets destroyed anyway, just tell clients to
+// forget me so that they don't try to get removed from my list
+// later when they also get destroyed
+SwIterator aIter(*this);
+for(SwClient* pClient = aIter.First(); pClient; pClient = aIter.Next())
+pClient->pRegisteredIn = nullptr;
+}
+
 SwModify::~SwModify()
 {
 DBG_TESTSOLARMUTEX();
@@ -86,30 +97,16 @@ SwModify::~Sw

[Libreoffice-commits] core.git: sc/Module_sc.mk

[Rene Engelhard]

 sc/Module_sc.mk |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 6849dfca92506a112a89f1839b268a3a119be50b
Author: Rene Engelhard 
Date:   Thu Nov 5 22:47:21 2015 +0100

make Library_scqahelper a check target so it's not built on make build

Change-Id: I6e7fcfd7e8819601ffe6ddac447ef9cf72fe13e6

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 21794b9..02f41e1 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -22,12 +22,6 @@ $(eval $(call gb_Module_add_l10n_targets,sc,\
UIConfig_scalc \
 ))
 
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-$(eval $(call gb_Module_add_targets,sc,\
-   Library_scqahelper \
-))
-endif
-
 ifeq ($(ENABLE_TELEPATHY),TRUE)
 
 $(eval $(call gb_Module_add_targets,sc,\
@@ -45,6 +39,8 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
+   $(if $(filter $(BUILD_TYPE),$(DESKTOP)),, \
+   Library_scqahelper) \
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sc_ucalc) \
 CppunitTest_sc_filters_test \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 include/sot include/vcl sc/source sd/inc sot/inc sot/Library_sot.mk sot/source svtools/source vcl/opengl

[Ashod Nakashian]

 include/sfx2/mailmodelapi.hxx|1 
 include/sot/formats.hxx  |   15 
 include/vcl/ITiledRenderable.hxx |1 
 sc/source/filter/excel/tokstack.cxx  |1 
 sc/source/filter/excel/xlformula.cxx |1 
 sd/inc/strmname.h|2 +
 sot/Library_sot.mk   |5 
 sot/inc/sysformats.hxx   |   36 +++
 sot/source/base/exchange.cxx |2 -
 sot/source/base/formats.cxx  |5 +---
 svtools/source/toolpanel/paneltabbar.cxx |1 
 vcl/opengl/win/gdiimpl.cxx   |5 
 12 files changed, 52 insertions(+), 23 deletions(-)

New commits:
commit bf6d72afeac77b791f5770a6bb353d4d133e9e56
Author: Ashod Nakashian 
Date:   Tue Nov 10 16:34:55 2015 -0500

Missing includes

Restored some missing includes and
refactored sot/formats.hxx.

Change-Id: I11b7102b06889f426f5e0f3efa3a835c6e774d88
Reviewed-on: https://gerrit.libreoffice.org/19891
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index 3ffd522..911ce8f 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx
index c85a10f..fa3c768 100644
--- a/include/sot/formats.hxx
+++ b/include/sot/formats.hxx
@@ -20,21 +20,6 @@
 #ifndef INCLUDED_SOT_FORMATS_HXX
 #define INCLUDED_SOT_FORMATS_HXX
 
-#ifdef _SOT_FORMATS_INCLUDE_SYSTEMFORMATS
-
-#ifdef WNT
-#ifdef _MSC_VER
-#pragma warning(push, 1)
-#pragma warning(disable: 4917)
-#endif
-#include 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#endif
-
-#endif
-
 #include 
 
 // - predefined formats -
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 963f1fc..05f4e32 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace vcl
 {
diff --git a/sc/source/filter/excel/tokstack.cxx 
b/sc/source/filter/excel/tokstack.cxx
index 9a6f13f..4bc6ba0 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -24,6 +24,7 @@
 
 #include 
 
+#include 
 #include 
 
 const sal_uInt16TokenPool::nScTokenOff = 8192;
diff --git a/sc/source/filter/excel/xlformula.cxx 
b/sc/source/filter/excel/xlformula.cxx
index b1cd82c..5d060cf 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -19,6 +19,7 @@
 
 #include "xlformula.hxx"
 
+#include 
 #include "compiler.hxx"
 #include "rangenam.hxx"
 #include "token.hxx"
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 149f156..3706f01 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SD_INC_STRMNAME_H
 #define INCLUDED_SD_INC_STRMNAME_H
 
+#include 
+
 // PowerPoint-Filter
 static const OUString pFilterPowerPoint97( "MS PowerPoint 97" );
 static const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" 
);
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 97381d0..a17ce38 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -31,6 +31,11 @@ $(eval $(call gb_Library_add_defs,sot,\
 
 $(eval $(call 
gb_Library_set_precompiled_header,sot,$(SRCDIR)/sot/inc/pch/precompiled_sot))
 
+$(eval $(call gb_Library_set_include,sot,\
+-I$(SRCDIR)/sot/inc \
+$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_libraries,sot,\
 comphelper \
 cppu \
diff --git a/sot/inc/sysformats.hxx b/sot/inc/sysformats.hxx
new file mode 100644
index 000..ccad252
--- /dev/null
+++ b/sot/inc/sysformats.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SOT_SYSFORMATS_HXX
+#define INCLUDED_SOT_SYSFORMATS_HXX
+
+#ifdef WNT
+#ifdef _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable: 4917)
+#endif
+#include 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif
+
+#endif // INCLUDED_SO

[Libreoffice-commits] core.git: 2 commits - offapi/com

[Michael Stahl]

 offapi/com/sun/star/rdf/FileFormat.idl |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4db3342e84dbbc80e0cb893b4739f6c617e9c19c
Author: Michael Stahl 
Date:   Tue Nov 10 22:36:21 2015 +0100

update the RDF media types as well

Change-Id: Ic10dbef286d12e897841fac352d7f6e36086ab20

diff --git a/offapi/com/sun/star/rdf/FileFormat.idl 
b/offapi/com/sun/star/rdf/FileFormat.idl
index e517220..5b48ed2 100644
--- a/offapi/com/sun/star/rdf/FileFormat.idl
+++ b/offapi/com/sun/star/rdf/FileFormat.idl
@@ -55,10 +55,10 @@ constants FileFormat
 const short NTRIPLES= 2;// "text/plain";
 
 /// http://www.w3.org/TR/trig/";>TriG
-const short TRIG= 3;// "application/x-trig";
+const short TRIG= 3;// "application/trig";
 
 /// https://web.archive.org/web/20110724134923/http://sw.nokia.com/trix/";>TriX
-const short TRIX= 4;// "if only the damn server were up I'd 
know";
+const short TRIX= 4;// "application/trix";
 
 /// http://www.dajobe.org/2004/01/turtle/";>Turtle
 const short TURTLE  = 5;// "application/turtle";
commit 2befa12ce02c7743a1cd4eaba8fc78ad73e20c2f
Author: Andrea Gelmini 
Date:   Mon Sep 21 15:47:47 2015 +0200

RDF: updated URLs

Change-Id: I604cef365d2b45c26686a9eaf014d431a4538153
Signed-off-by: Michael Stahl 

diff --git a/offapi/com/sun/star/rdf/FileFormat.idl 
b/offapi/com/sun/star/rdf/FileFormat.idl
index edf7daa..e517220 100644
--- a/offapi/com/sun/star/rdf/FileFormat.idl
+++ b/offapi/com/sun/star/rdf/FileFormat.idl
@@ -51,13 +51,13 @@ constants FileFormat
 /// http://www.w3.org/DesignIssues/Notation3";>N3 (Notation-3)
 const short N3  = 1;// "text/rdf+n3";
 
-/// http://www.w3.org/TR/rdf-testcases/#ntriples";>N-Triples
+/// http://www.w3.org/TR/n-triples/";>N-Triples
 const short NTRIPLES= 2;// "text/plain";
 
-/// http://www.wiwiss.fu-berlin.de/suhl/bizer/TriG/Spec/";>TriG
+/// http://www.w3.org/TR/trig/";>TriG
 const short TRIG= 3;// "application/x-trig";
 
-/// http://sw.nokia.com/trix/";>TriX
+/// https://web.archive.org/web/20110724134923/http://sw.nokia.com/trix/";>TriX
 const short TRIX= 4;// "if only the damn server were up I'd 
know";
 
 /// http://www.dajobe.org/2004/01/turtle/";>Turtle
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CAD software integration

[jonathon]

On November 10, 2015 1:05:23 PM PST, Norbert Thiebaud wrote

>this is really, really not a valid reason to want to integrate a CAD software 
>in an Office Suite.

Valid  or not, other groups have used the same tactic with OOo, or specific 
derivatives thereof.

jonathon

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 14 commits - download.lst editeng/source icon-themes/sifr include/vcl package/source readlicense_oo/license sd/source sfx2/source sw/

[Christian Lohmaier]

 download.lst |2 
 editeng/source/editeng/editundo.hxx  |2 
 editeng/source/misc/svxacorr.cxx |   34 
 icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow-callout.png |binary
 icon-themes/sifr/cmd/lc_arrowshapes.notched-left-arrow.png   |binary
 icon-themes/sifr/cmd/lc_arrowshapes.notched-right-arrow.png  |binary
 icon-themes/sifr/cmd/lc_arrowshapes.pentagon-right.png   |binary
 icon-themes/sifr/cmd/lc_arrowshapes.png  |binary
 icon-themes/sifr/cmd/lc_arrowshapes.s-sharped-arrow.png  |binary
 icon-themes/sifr/cmd/lc_arrowshapes.split-arrow.png  |binary
 icon-themes/sifr/cmd/lc_arrowshapes.split-round-arrow.png|binary
 icon-themes/sifr/cmd/lc_arrowshapes.striped-right-arrow.png  |binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-arrow.png |binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow-callout.png|binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-right-arrow-callout.png   |binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-right-arrow.png   |binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-right-down-arrow.png  |binary
 icon-themes/sifr/cmd/lc_calloutshapes.png|binary
 include/vcl/metric.hxx   |1 
 package/source/zipapi/ZipFile.cxx|   22 
 readlicense_oo/license/CREDITS.fodt  | 2460 
+-
 sd/source/ui/view/Outliner.cxx   |2 
 sfx2/source/dialog/mailmodel.cxx |4 
 sw/qa/extras/inc/swmodeltestbase.hxx |   12 
 sw/qa/extras/ooxmlexport/data/plausable-border.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 
 sw/qa/extras/rtfimport/data/tdf59454.rtf |8 
 sw/qa/extras/rtfimport/rtfimport.cxx |6 
 sw/qa/extras/uiwriter/uiwriter.cxx   |5 
 sw/source/core/fields/cellfml.cxx|2 
 sw/source/core/inc/scriptinfo.hxx|3 
 sw/source/core/objectpositioning/anchoredobjectposition.cxx  |6 
 sw/source/core/text/porlay.cxx   |   12 
 sw/source/core/txtnode/fntcache.cxx  |   24 
 vcl/inc/impfont.hxx  |3 
 vcl/inc/outfont.hxx  |1 
 vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 |binary
 vcl/source/filter/wmf/winmtf.cxx |5 
 vcl/source/filter/wmf/winmtf.hxx |1 
 vcl/source/gdi/metric.cxx|5 
 vcl/source/outdev/font.cxx   |   19 
 writerfilter/source/dmapper/PropertyMap.cxx  |   10 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   18 
 43 files changed, 1415 insertions(+), 1254 deletions(-)

New commits:
commit 8055e0934f14ae7419e668fdeee65add09d64bda
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:39:48 2015 +0100

update credits

Change-Id: Ic3563dca7a1dc24e6bf3fab326a9521b2f62603c
(cherry picked from commit f0c39754c4407d9f48249ba8c04a1222e25ded0c)
(cherry picked from commit 4759ba7062b2f77e18984dde9869b514c8cb48a4)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index cc05bbf..64a145f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org

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

[Christian Lohmaier]

 extras/source/autocorr/lang/cs/DocumentList.xml|   12 -
 extras/source/autocorr/lang/es/DocumentList.xml|3 
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |  143 +
 3 files changed, 152 insertions(+), 6 deletions(-)

New commits:
commit 8e2e3f54c0d47f7afea7c2f1cd0f87d9411c91c7
Author: Christian Lohmaier 
Date:   Tue Nov 10 22:25:33 2015 +0100

update emoji autocorrect files from po-files

Change-Id: I84d7bc394532d86d42403efa357ee9f57c968640

diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index dae5f42..05c5493 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -675,7 +675,7 @@
   
   
   
-  
+  
   
   
   
@@ -720,8 +720,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
@@ -775,7 +775,7 @@
   
   
   
-  
+  
   
   
   
@@ -926,7 +926,7 @@
   
   
   
-  
+  
   
   
   
@@ -1208,6 +1208,7 @@
   
   
   
+  
   
   
   
@@ -1245,7 +1246,6 @@
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/es/DocumentList.xml 
b/extras/source/autocorr/lang/es/DocumentList.xml
index 20541cc..ede331d 100644
--- a/extras/source/autocorr/lang/es/DocumentList.xml
+++ b/extras/source/autocorr/lang/es/DocumentList.xml
@@ -729,6 +729,7 @@
   
   
   
+  
   
   
   
@@ -736,6 +737,7 @@
   
   
   
+  
   
   
   
@@ -1279,6 +1281,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/zh-CN/DocumentList.xml 
b/extras/source/autocorr/lang/zh-CN/DocumentList.xml
index 534859e..2687c1a 100644
--- a/extras/source/autocorr/lang/zh-CN/DocumentList.xml
+++ b/extras/source/autocorr/lang/zh-CN/DocumentList.xml
@@ -811,6 +811,8 @@
   
   
   
+  
+  
   
   
   
@@ -837,6 +839,7 @@
   
   
   
+  
   
   
   
@@ -848,6 +851,11 @@
   
   
   
+  
+  
+  
+  
+  
   
   
   
@@ -913,6 +921,8 @@
   
   
   
+  
+  
   
   
   
@@ -931,17 +941,48 @@
   
   
   
+  
+  
   
+  
+  
   
+  
+  
   
+  
+  
+  
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
+  
   
+  
+  
+  
+  
+  
   
   
+  
+  
   
+  
+  
+  
   
   
   
@@ -952,9 +993,15 @@
   
   
   
+  
+  
+  
+  
   
   
   
+  
+  
   
   
   
@@ -963,6 +1010,11 @@
   
   
   
+  
+  
+  
+  
+  
   
   
   
@@ -973,6 +1025,7 @@
   
   
   
+  
   
   
   
@@ -981,26 +1034,51 @@
   
   
   
+  
+  
+  
   
   
+  
+  
   
   
   
   
+  
+  
   
   
   
+  
+  
+  
+  
   
   
   
   
   
+  
   
+  
+  
   
+  
+  
   
   
+  
+  
+  
+  
+  
   
   
+  
+  
+  
+  
   
   
   
@@ -1008,10 +1086,18 @@
   
   
   
+  
+  
   
+  
+  
+  
+  
   
   
+  
   
+  
   
   
   
@@ -1019,10 +1105,16 @@
   
   
   
+  
   
   
+  
+  
+  
+  
   
   
+  
   
   
   
@@ -1034,14 +1126,20 @@
   
   
   
+  
   
+  
   
   
   
+  
+  
   
   
   
+  
   
+  
   
   
   
@@ -1054,29 +1152,74 @@
   
   
   
+  
+  
+  
+  
+  
   
+  
+  
+  
   
+  
   
   
+  
+  
+  
+  
+  
+  
+  
   
+  
+  
+  
+  
   
   
+  
   
   
   
+  
   
+  
   
+  
+  
   
+  
   
+  
   
   
   
+  
+  
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
   
   
   
+  
+  
   
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 sc/source/ui/view/tabview.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 02f452d67faf086c4ade874bcf588cf48b8a1ddb
Author: Henry Castro 
Date:   Sun Nov 8 15:55:57 2015 -0400

sc lok: add missing commandName

LOOL requires to filter a requested command values message

Change-Id: If2eeb9990e0f9aec6410a70f7a6c132c080bda80
(cherry picked from commit c615699af18635c1aa1e7c9b930748eca004c5fc)

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 2c4b721..903013c 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2378,6 +2378,7 @@ OUString ScTabView::getRowColumnHeaders(const Rectangle& 
rRectangle)
 }
 
 boost::property_tree::ptree aTree;
+aTree.put("commandName", ".uno:ViewRowColumnHeaders");
 aTree.add_child("rows", aRows);
 aTree.add_child("columns", aCols);
 std::stringstream aStream;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CAD software integration

[jonathon]

On November 10, 2015 12:30:27 PM PST, Norbert Thiebaud wrote:

>LibreOffice is not a set of applications, it is one integrated office suite.

It is  a core  upon which other applications can be built, be it through 
templates, macros, or extensions. 

Wandering through the wasteland of applications that built upon SO, OOo, EO, 
AOo, LibO, BrOo, NO, etc, one comes across very few that were maintained for 
more than their original alpha or beta release, and, other those coded 
specifically for EO, none that are/were commercially supported.

The day that one can conclusively state that LibO, or any other OOo derivative 
has arrived in the corporate world, is when there are sales of applications for 
it, that have an MSRP of US$100,000, or more. (Applications, with multiple 
demonstable/proven sales of US$100+ would imply that corporate awareness of the 
specefic deriviative is starting to become serious.)

jonathon


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

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

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

New commits:
commit b961940d3a7ec2ebee0dbbf1875d1bd69d2f38c8
Author: Christian Lohmaier 
Date:   Tue Nov 10 22:03:02 2015 +0100

Updated core
Project: translations  4be4ef1047744aefb76f714402c34956429ad4f0

update translations for master

and force-fix errors using pocheck

Change-Id: I9407994b1931f2807645bd091474aac468b6efa9

diff --git a/translations b/translations
index b29df8c..4be4ef1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b29df8cb3000f603cfedccd11de4ae5ad1373eed
+Subproject commit 4be4ef1047744aefb76f714402c34956429ad4f0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CAD software integration

[Norbert Thiebaud]

On Tue, Nov 10, 2015 at 2:41 PM, Gastón J. Avila  wrote:
> The only point of doing it as part of the libreoffice suite would be that it
> would end up getting installed on every computer runing it, specially for
> students in developing countries like mine, instead of having to go around
> telling every teacher about it.

The this is _really_ not the way to go.
If you want some software package pre-installed, you need to work with
the distribution that put together the machine your student/teacher
are using.
or work with project that allow you to prepare such software stack 'on
a stick'.. either way this is really, really not a valid
reason to want to integrate a CAD software in an Office Suite

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

Re: CAD software integration

[jonathon]

On November 10, 2015 10:42:01 AM PST, "Gastón J. Avila" wrote:

>We would like to know if you think it would be a good idea to
>start a working on adding to the set of applications offered by
>libreoffice, one CAD application.

Just what we need.
Yet another non-functional, non-fixable, abandoned, CAD extension for LibO.

jonathon
-- 
Multilingual ODF support
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Stahl]

 sw/source/filter/html/htmltab.cxx |  181 +++---
 sw/source/filter/html/svxcss1.cxx |   14 +-
 sw/source/filter/html/svxcss1.hxx |7 -
 3 files changed, 105 insertions(+), 97 deletions(-)

New commits:
commit 35854bc3ade4875f801da907d69b168b97a56101
Author: Michael Stahl 
Date:   Tue Nov 10 21:24:08 2015 +0100

sw: replace boost::ptr_vector with std::vector

Change-Id: I6d4c9877b4fd0147d75260570cbca6b9a6333762

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index 987340c..5e1fc09 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -57,8 +57,6 @@
 #include "swcss1.hxx"
 #include 
 
-#include 
-
 #define NETSCAPE_DFLT_BORDER 1
 #define NETSCAPE_DFLT_CELLSPACING 2
 
@@ -362,7 +360,7 @@ public:
 // HTML table
 typedef std::vector> HTMLTableRows;
 
-typedef boost::ptr_vector HTMLTableColumns;
+typedef std::vector> HTMLTableColumns;
 
 typedef std::vector SdrObjects;
 
@@ -377,7 +375,7 @@ class HTMLTable
 std::vector *pDrawObjPrcWidths;   // column of draw object and 
its rel. width
 
 HTMLTableRows *m_pRows; ///< table rows
-HTMLTableColumns *pColumns; // table columns
+HTMLTableColumns *m_pColumns;   ///< table columns
 
 sal_uInt16 nRows;   // number of rows
 sal_uInt16 nCols;   // number of columns
@@ -929,7 +927,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
 pDrawObjPrcWidths = nullptr;
 
 m_pRows = new HTMLTableRows;
-pColumns = new HTMLTableColumns;
+m_pColumns = new HTMLTableColumns;
 nRows = 0;
 nCurRow = 0; nCurCol = 0;
 
@@ -1080,7 +1078,7 @@ HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable 
*pTopTab,
 InitCtor( pOptions );
 
 for( sal_uInt16 i=0; ipush_back( new HTMLTableColumn );
+m_pColumns->push_back(o3tl::make_unique());
 }
 
 HTMLTable::~HTMLTable()
@@ -1089,7 +1087,7 @@ HTMLTable::~HTMLTable()
 delete pDrawObjPrcWidths;
 
 delete m_pRows;
-delete pColumns;
+delete m_pColumns;
 delete pBGBrush;
 delete pInhBGBrush;
 
@@ -1105,7 +1103,7 @@ SwHTMLTableLayout *HTMLTable::CreateLayoutInfo()
 
 sal_uInt16 nBorderWidth = GetBorderWidth( aBorderLine, true );
 sal_uInt16 nLeftBorderWidth =
-((*pColumns)[0]).bLeftBorder ? GetBorderWidth( aLeftBorderLine, true ) 
: 0;
+(*m_pColumns)[0]->bLeftBorder ? GetBorderWidth(aLeftBorderLine, true) 
: 0;
 sal_uInt16 nRightBorderWidth =
 bRightBorder ? GetBorderWidth( aRightBorderLine, true ) : 0;
 sal_uInt16 nInhLeftBorderWidth = 0;
@@ -1146,7 +1144,7 @@ SwHTMLTableLayout *HTMLTable::CreateLayoutInfo()
 pLayoutInfo->SetExportable( bExportable );
 
 for( i=0; iSetColumn( ((*pColumns)[i]).CreateLayoutInfo(), i );
+pLayoutInfo->SetColumn( ((*m_pColumns)[i])->CreateLayoutInfo(), i );
 
 return pLayoutInfo;
 }
@@ -1345,7 +1343,7 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
 sal_uInt32 nNumFormat = 0;
 double nValue = 0.0;
 
-HTMLTableColumn *pColumn = &(*pColumns)[nCol];
+HTMLTableColumn *const pColumn = (*m_pColumns)[nCol].get();
 
 if( pBox->GetSttNd() )
 {
@@ -1450,7 +1448,7 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
 }
 bSet = true;
 }
-if( ((*pColumns)[nCol]).bLeftBorder )
+if (((*m_pColumns)[nCol])->bLeftBorder)
 {
 const SvxBorderLine& rBorderLine =
 0==nCol ? aLeftBorderLine : aBorderLine;
@@ -1934,7 +1932,7 @@ void HTMLTable::InheritVertBorders( const HTMLTable 
*pParent,
 GetBorderWidth( aInhRightBorderLine, true ) + MIN_BORDER_DIST;
 }
 
-if( ((*pParent->pColumns)[nCol]).bLeftBorder )
+if (((*pParent->m_pColumns)[nCol])->bLeftBorder)
 {
 bInhLeftBorder = true;  // erstmal nur merken
 aInhLeftBorderLine = 0==nCol ? pParent->aLeftBorderLine
@@ -1952,7 +1950,7 @@ void HTMLTable::InheritVertBorders( const HTMLTable 
*pParent,
 
 bRightAlwd = ( pParent->bRightAlwd &&
   (nCol+nColSpan==pParent->nCols ||
-   !((*pParent->pColumns)[nCol+nColSpan]).bLeftBorder) );
+   !((*pParent->m_pColumns)[nCol+nColSpan])->bLeftBorder) );
 }
 
 void HTMLTable::SetBorders()
@@ -1961,8 +1959,10 @@ void HTMLTable::SetBorders()
 for( i=1; iIsEndOfGroup()))
+{
+((*m_pColumns)[i])->bLeftBorder = true;
+}
 
 for( i=0; ibLeftBorder = true;
+}
 
 for( i=0; iGetAdjust()
: SVX_ADJUST_END );
 if( SVX_ADJUST_END==eAdjust )
 eAdjust = (*m_pRows)[nCurRow]->GetAdjust();
@@ -2055,7 +2057,7 @@ sal_Int16 HTMLTable::GetInheritedVertOri() const
 // text::VertOrientation::TOP ist der default!
 sal_Int16 eVOri = (*m_pRows)[nCurRow]->GetVertOri();
 if( text::VertOrientation::TOP==eVOri && nCurColGetVertOri();
 if( 

Re: CAD software integration

[Gastón J . Avila]

The only point of doing it as part of the libreoffice suite would be that
it would end up getting installed on every computer runing it, specially
for students in developing countries like mine, instead of having to go
around telling every teacher about it.

On Tue, Nov 10, 2015 at 5:30 PM, Norbert Thiebaud 
wrote:

> On Tue, Nov 10, 2015 at 12:42 PM, Gastón J. Avila 
> wrote:
> > Hi all,
> >
> > With a number of people we have been evaluating open-source CAD
> > applications. We would like to know if you think it would be a good idea
> to
> > start a working on adding to the set of applications offered by
> libreoffice,
> > one CAD application.
>
> LibreOffice is not a set of application.. it is one integrated office
> suite.
> >
> > There are a number of opensource alternatives to products like autocad
> but
> > none of them seem actively developed,
>
> a quick tour via google find some that seems to be quite lively.
> http://librecad.org/cms/home.html for example seems like something you
> may want to check-out
>
> > so we would like to know to which
> > extent it is possible to have a libreoffice application be developed
> outside
> > the current choices of language+build system.
>
> Very unlikely. and what would be the point anyway. if the language and
> the build system is not to your liking,
> why bother trying to peg a square in a round hole ? it surely would be
> much simpler to find
> a project that  1/ is related to your subject matter and 2/ already
> share your tool choices...
> Or even start one from scratch would be preferable rather than
> waste a lot of effort and time working around/against establish patterns.
>
> Norbert
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CAD software integration

[Tor Lillqvist]

On 10 November 2015 at 22:34, Tor Lillqvist  wrote:

> While at it, we should also start working on extending LO into the field
> of real-time process control, including defence and aerospace applications.
>
>
Including medical technology. It would be so reassuring if, when one
reaches the stage where intensive medical care is needed (knock on wood),
the beeping device beside one's bed would once in a while display a
reassuring "General Error. General I/O Error." message.

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

Re: CAD software integration

[Tor Lillqvist]

While at it, we should also start working on extending LO into the field of
real-time process control, including defence and aerospace applications.

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

Re: CAD software integration

[Norbert Thiebaud]

On Tue, Nov 10, 2015 at 12:42 PM, Gastón J. Avila  wrote:
> Hi all,
>
> With a number of people we have been evaluating open-source CAD
> applications. We would like to know if you think it would be a good idea to
> start a working on adding to the set of applications offered by libreoffice,
> one CAD application.

LibreOffice is not a set of application.. it is one integrated office suite.
>
> There are a number of opensource alternatives to products like autocad but
> none of them seem actively developed,

a quick tour via google find some that seems to be quite lively.
http://librecad.org/cms/home.html for example seems like something you
may want to check-out

> so we would like to know to which
> extent it is possible to have a libreoffice application be developed outside
> the current choices of language+build system.

Very unlikely. and what would be the point anyway. if the language and
the build system is not to your liking,
why bother trying to peg a square in a round hole ? it surely would be
much simpler to find
a project that  1/ is related to your subject matter and 2/ already
share your tool choices...
Or even start one from scratch would be preferable rather than
waste a lot of effort and time working around/against establish patterns.

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

[Libreoffice-commits] core.git: 3 commits - include/svx reportdesign/source sd/source sfx2/source svx/source

[Matteo Casalin]

 include/svx/xdash.hxx  |   22 ++---
 reportdesign/source/ui/report/ReportController.cxx |1 
 sd/source/core/drawdoc4.cxx|1 
 sfx2/source/dialog/styfitem.cxx|   15 ++
 svx/source/xoutdev/xattr.cxx   |6 ++---
 5 files changed, 21 insertions(+), 24 deletions(-)

New commits:
commit 86043a2f57a9f50cabe689dd5e9f8db0dbd16f80
Author: Matteo Casalin 
Date:   Sun Nov 8 19:45:45 2015 +0100

Remove unused XDash variables

Change-Id: Ibc40a0f8b422aebeeb1df5a6701dee4be134862b

diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 6126c03..3235aa6 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2403,7 +2403,6 @@ void OReportController::openPageDialog(const 
uno::Reference& _
 const Graphic aNullGraphic;
 const ::Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use 
defined default color
 const ::Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); // #i121448# Use 
defined default color
-const XDash aNullDash;
 const XGradient aNullGrad(RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
 const XHatch aNullHatch(aNullLineCol);
 
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index a18ad19..0007165 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -552,7 +552,6 @@ void SdDrawDocument::CreateDefaultCellStyles()
 
 ColoraNullCol(RGB_Color(COL_BLACK));
 
-XDash aNullDash;
 XGradient aNullGrad(aNullCol,RGB_Color(COL_WHITE));
   aNullGrad.SetStartIntens( 100 );
   aNullGrad.SetEndIntens( 100 );
commit a847127fc32c2c611a7c2cc281e1ce7b27bb7754
Author: Matteo Casalin 
Date:   Sun Nov 8 19:41:42 2015 +0100

XDash: salu_uIntPtr to sal_uInt32

Unsigned integer was used tp be consistent with previous integral type,
but both unsigned and signed integers are used by callers.

Change-Id: I3f902e00fbff690a72a7ca0f1c818976d3d2bebe

diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx
index 4b0ef84..f7e20e9 100644
--- a/include/svx/xdash.hxx
+++ b/include/svx/xdash.hxx
@@ -35,31 +35,31 @@ class SVX_DLLPUBLIC XDash
 protected:
 css::drawing::DashStyle  eDash;
 sal_uInt16   nDots;
-sal_uIntPtr  nDotLen;
+sal_uInt32   nDotLen;
 sal_uInt16   nDashes;
-sal_uIntPtr  nDashLen;
-sal_uIntPtr  nDistance;
+sal_uInt32   nDashLen;
+sal_uInt32   nDistance;
 
 public:
   XDash(css::drawing::DashStyle eDash = css::drawing::DashStyle_RECT,
-sal_uInt16 nDots = 1, sal_uIntPtr nDotLen = 20,
-sal_uInt16 nDashes = 1, sal_uIntPtr nDashLen = 20, sal_uIntPtr 
nDistance = 20);
+sal_uInt16 nDots = 1, sal_uInt32 nDotLen = 20,
+sal_uInt16 nDashes = 1, sal_uInt32 nDashLen = 20, sal_uInt32 
nDistance = 20);
 
 bool operator==(const XDash& rDash) const;
 
 void SetDashStyle(css::drawing::DashStyle eNewStyle) { eDash = eNewStyle; }
 void SetDots(sal_uInt16 nNewDots){ nDots = nNewDots; }
-void SetDotLen(sal_uIntPtr nNewDotLen)   { nDotLen = 
nNewDotLen; }
+void SetDotLen(sal_uInt32 nNewDotLen){ nDotLen = 
nNewDotLen; }
 void SetDashes(sal_uInt16 nNewDashes){ nDashes = 
nNewDashes; }
-void SetDashLen(sal_uIntPtr nNewDashLen) { nDashLen = 
nNewDashLen; }
-void SetDistance(sal_uIntPtr nNewDistance)   { nDistance = 
nNewDistance; }
+void SetDashLen(sal_uInt32 nNewDashLen)  { nDashLen = 
nNewDashLen; }
+void SetDistance(sal_uInt32 nNewDistance){ nDistance = 
nNewDistance; }
 
 css::drawing::DashStyle  GetDashStyle() const{ return eDash; }
 sal_uInt16   GetDots() const { return nDots; }
-sal_uIntPtr  GetDotLen() const   { return nDotLen; }
+sal_uInt32   GetDotLen() const   { return nDotLen; }
 sal_uInt16   GetDashes() const   { return nDashes; }
-sal_uIntPtr  GetDashLen() const  { return nDashLen; }
-sal_uIntPtr  GetDistance() const { return nDistance; }
+sal_uInt32   GetDashLen() const  { return nDashLen; }
+sal_uInt32   GetDistance() const { return nDistance; }
 
 // XDash is translated into an array of doubles which describe the lengths 
of the
 // dashes, dots and empty passages. It returns the complete length of the 
full DashDot
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 5d08e1e..4b5f51b 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xou

Re: System POPPLER_VERSION redefined, won't build

[Michael Stahl]

On 10.11.2015 18:35, ariel cornejo wrote:
> Michael Stahl-2 wrote
> it is definitely a bug somewhere if HAVE_POPPLER_VERSION_H isn't set
> for a current version of poppler. e.g. on Fedora 22 i have
> /usr/include/poppler/cpp/poppler-version.h and
> HAVE_POPPLER_VERSION_H set. maybe look at config.log where it checks
> for poppler-version.h what the error is.
> 
> Turns out poppler-version.h was missing; in Ubuntu it comes in the
> libpoppler-cpp-dev package.
> 

> So configure does check for the file but ignores the failed test.

well that check was apparently added because there are old versions of
poppler that didn't have this poppler-version.h header, see
697804f48f4217dab145d96175c6cddf560ec614

> There's also GfxState.h, that comes in yet another package
> libpoppler-private-dev and is also needed, but configure doesn't test
> for it. Maybe they used to be in the same package so only one test was
> needed?

ugh... sounds like somebody who actually uses Ubuntu needs to submit a
patch to configure.ac to detect all of the constantly multiplying
libpoppler-*-dev packages we need.


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

Re: Unicode characters in Thesaurus dialog box

[Khaled Hosny]

On Tue, Nov 10, 2015 at 03:10:25AM -0600, Adolfo Jayme Barrientos wrote:
> 2015-11-08 23:24 GMT-06:00 Khaled Hosny :
> > Is this true, I always had font fallback on LibreOffice UI (on Linux at
> > least), even my main UI font does not support Latin at all but otherwise
> > the UI shows English text just fine.
> 
> I’ve always had this problem in Ubuntu. My most recent attestation of
> the problem was when I triaged this bug:
> https://bugs.documentfoundation.org/show_bug.cgi?id=94476
> 
> I’ve followed the reporter’s steps (in Spanish) and could confirm his
> findings. Here’s a screenshot I took:
> http://i.imgur.com/R3h9wP8.png

Looks fine here, see attachment.

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

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

[Miklos Vajna]

 sw/source/uibase/docvw/SidebarWin.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 88f4866803fc766503292252cb36af4a70ea98fd
Author: Miklos Vajna 
Date:   Tue Nov 10 20:08:49 2015 +0100

This PixelToLogic() call can be conditional in SwSidebarWin::SetPosAndSize()

It is only needed when tiled rendering.

Change-Id: Ie1668f5f3d4d17abc212e2262a6c155dcb855d2e

diff --git a/sw/source/uibase/docvw/SidebarWin.cxx 
b/sw/source/uibase/docvw/SidebarWin.cxx
index 94a4235..414f3aa 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -607,15 +607,15 @@ void SwSidebarWin::SetPosAndSize()
 
 // LOK has map mode disabled, and we still want to perform pixel ->
 // twips conversion for the size of the line above the note.
-bool bEnableMapMode = comphelper::LibreOfficeKit::isActive() && 
!EditWin().IsMapModeEnabled();
-if (bEnableMapMode)
+if (comphelper::LibreOfficeKit::isActive() && 
!EditWin().IsMapModeEnabled())
+{
 EditWin().EnableMapMode();
-Size aSize(aLineEnd.getX() - aLineStart.getX(), aLineEnd.getY() - 
aLineStart.getY());
-aSize = EditWin().PixelToLogic(aSize);
-aLineEnd = aLineStart;
-aLineEnd.Move(aSize.getWidth(), aSize.getHeight());
-if (bEnableMapMode)
+Size aSize(aLineEnd.getX() - aLineStart.getX(), aLineEnd.getY() - 
aLineStart.getY());
+aSize = EditWin().PixelToLogic(aSize);
+aLineEnd = aLineStart;
+aLineEnd.Move(aSize.getWidth(), aSize.getHeight());
 EditWin().EnableMapMode(false);
+}
 
 if (!IsPreview())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

CAD software integration

[Gastón J . Avila]

Hi all,

With a number of people we have been evaluating open-source CAD
applications. We would like to know if you think it would be a good idea to
start a working on adding to the set of applications offered by
libreoffice, one CAD application.

There are a number of opensource alternatives to products like autocad but
none of them seem actively developed, so we would like to know to which
extent it is possible to have a libreoffice application be developed
outside the current choices of language+build system.

As background to this, we are trying to get CAD software into laptops used
by schools and we thing channeling this idea through libreoffice would be
the best.

If you have suggestions, we welcome them.

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

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

[Miklos Vajna]

 sw/source/uibase/docvw/SidebarWin.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 096408073c2de484cba3736d13b57d22b7f48775
Author: Miklos Vajna 
Date:   Tue Nov 10 19:29:22 2015 +0100

sw lok: fix length of the line overlay above the notes

With this, e.g. a line above a note (with width of 180 px) is also 180
px, not 12 px.

Change-Id: I7c4eeda1bc904242dc298013411b9671ba0f2149

diff --git a/sw/source/uibase/docvw/SidebarWin.cxx 
b/sw/source/uibase/docvw/SidebarWin.cxx
index 0682f0b..94a4235 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -605,6 +605,18 @@ void SwSidebarWin::SetPosAndSize()
 break;
 }
 
+// LOK has map mode disabled, and we still want to perform pixel ->
+// twips conversion for the size of the line above the note.
+bool bEnableMapMode = comphelper::LibreOfficeKit::isActive() && 
!EditWin().IsMapModeEnabled();
+if (bEnableMapMode)
+EditWin().EnableMapMode();
+Size aSize(aLineEnd.getX() - aLineStart.getX(), aLineEnd.getY() - 
aLineStart.getY());
+aSize = EditWin().PixelToLogic(aSize);
+aLineEnd = aLineStart;
+aLineEnd.Move(aSize.getWidth(), aSize.getHeight());
+if (bEnableMapMode)
+EditWin().EnableMapMode(false);
+
 if (!IsPreview())
 {
 if (mpAnchor)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/liblangtag

[Eike Rathke]

 download.lst   |2 -
 external/liblangtag/UnpackedTarball_langtag.mk |7 ++--
 external/liblangtag/liblangtag-msvc.patch  |   36 -
 3 files changed, 5 insertions(+), 40 deletions(-)

New commits:
commit 4b6e7da25f837349e10929b0258059398be8106d
Author: Eike Rathke 
Date:   Tue Nov 10 14:11:06 2015 +0100

upgrade liblangtag to 0.5.8

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

diff --git a/download.lst b/download.lst
index 6c00b4f..a70467b 100755
--- a/download.lst
+++ b/download.lst
@@ -86,7 +86,7 @@ export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
-export LIBLANGTAG_TARBALL := 
80d063d6db4c010e18c606af8aed6231-liblangtag-0.5.7.tar.bz2
+export LIBLANGTAG_TARBALL := 
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
 export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
diff --git a/external/liblangtag/UnpackedTarball_langtag.mk 
b/external/liblangtag/UnpackedTarball_langtag.mk
index 52ffc39..541baa3 100644
--- a/external/liblangtag/UnpackedTarball_langtag.mk
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -15,9 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\
$(GNUTAR) -x -j -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
 ))
 
-$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-   external/liblangtag/liblangtag-msvc.patch \
-))
+# Currently no patches applied, if there were it would be:
+#$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
+#  external/liblangtag/your-modification.patch \
+#))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
diff --git a/external/liblangtag/liblangtag-msvc.patch 
b/external/liblangtag/liblangtag-msvc.patch
deleted file mode 100644
index 535797b..000
--- a/external/liblangtag/liblangtag-msvc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
 foo/langtag.orig/configure 2015-06-26 10:53:36.0 +0200
-+++ foo/langtag/configure  2015-09-03 08:16:58.672240500 +0200
-@@ -14786,8 +14786,7 @@
-   fi
- 
- 
--if test "x$ac_cv_func_vsnprintf" = xyes; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether vsnprintf is 
C99-compliant" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether vsnprintf is 
C99-compliant" >&5
- $as_echo_n "checking Whether vsnprintf is C99-compliant... " >&6; }
- if ${lt_cv_c99_vsnprintf+:} false; then :
-   $as_echo_n "(cached) " >&6
-@@ -14798,7 +14797,10 @@
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+#include 
-+#include 
- #include 
-+#include 
- int
- foo(char *format, ...)
- {
-@@ -14834,11 +14836,10 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_c99_vsnprintf" >&5
- $as_echo "$lt_cv_c99_vsnprintf" >&6; }
--  if test "x$lt_cv_c99_vsnprintf" = xyes; then
-+if test "x$lt_cv_c99_vsnprintf" = xyes; then
- 
- $as_echo "#define LT_HAVE_C99_VSNPRINTF 1" >>confdefs.h
- 
--  fi
- fi
- 
- 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.7.1' created by Christian Lohmaier 
 at 2015-11-10 17:57 -0800

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

iQIcBAABAgAGBQJWQjAnAAoJEPQ0oe+v7q6jSgQP/2vSFSZIQlvzi6pCDYiRvf6s
Xpe/jNVHJIccNQLfzDBXRR8MiwStk6j3+u0NGcp/UvfjRMaLrBWpkEiLOjOCMz8T
+89I91R2I9qZnPM2HUEGCjFFKcTK0TI+srZn6AU77yQknLdbUSH5c+RFsNwHVBdM
9K8JXVAm1fPOQ/RVkevZrwO9miOknYRrJCsDMuYB7g8xlJY1HkZ65rwou0KVt5mU
FLA9HKRDGOf6n1Gg0WERcJlh+Zz2dr9bpHZYYGFCt2Jii5rhVA2JaANxVChTQZeX
ZZMdDbGXHJo00zKqBI4Xi3c73ygmGP+c1LP7Xbx4AoUE9VRXtiiZoN3a3fFhEyCh
qXJW23aXMpo3xdy0TPS1+ZwOkks9+BI/j+YfnVl3b30xHnZwi4BMPQk3VvzFtpVX
ERKFsehSj9tXPDJKZ+ktaOTUiWYL91YMhdrWPbvxN+1qRfTFUJYvoEfoUghiaDRP
Bw5KxMu4dbKsIx9hRj/J37J0seKt6O0LhLkDMpTXGyW0KmJvzwaejxjttN2G0eqF
2HuxTmlQHEMKXllq3vDqf5jXfxq4/2io8+2oNmgvfy2ieV7F1hFPOr7X0V7/9Hj+
XGrGuVmgQD2qzahVScBRenhP1RhuwyUiZ7m65MIhnXh8UoM1erbvXLvLQuyH0fw3
Z6VdR+LZ27BYNIZCC76j
=KQx1
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.7.1' created by Christian Lohmaier 
 at 2015-11-10 17:57 -0800

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

iQIcBAABAgAGBQJWQjAlAAoJEPQ0oe+v7q6j50AQAM2XiRphWxYQiIGT3At+Tvtd
HEOofgLYM5QSD/EUCqUTLGzDuF5kQo9Lkak3CG1kg+UWivWKOEe1c6nsedgV9Xmp
eauXD03UP3/Ufj93hIG7UcFofJ76ALAGGkmqbDse+eH5WphM1qsswXyURNE2xzZu
H3eThN4YYnI8f9Y9/c0MwXwoQz03TZCaC6zmi7gZrkaBAaQJs5DrFaeY8ikbGRfm
z/ijXp31rElJg83FrLs+bs6TVyGMWBbHotEI/gZDyNurGVqreeSBPz9k+w4QagrP
6EFdrUXbH+VbbmX3xKj2jks3/pGh5IDXFwTjp/Lk7wzr5OV7tLDJR3LYuZlo5k+/
HARm6kjdMpUqfZAQ3Q/5PWrKHsVf5GcVS7bSe2X4LzjNflVBAtZ8iMID6IdRdB9F
CorGsL1OO0lvXAeNPAensfgVUfJHQbr3CMS4icmY9NkMuX1vxh9FzOezb3TcjUqD
Vu/pA5GpT6Zo8d7AawKQGRmDcDMWThFXnNcqND7YhGLQuA8bF+4Y+cmSGK22Y/7E
3N4auvvfvLNrioB9cbJ63AyEGPQ3QsywMhjbtn5omOfzKWUsS1tUUjX+Ng0MbzoN
UHdFsSoeo8VUCch0e6Pu3ShGC6LQ6mkFm61UDZUnaav+0loyIIXtzjTdcH72Mgq0
xwjXfdcw70YEgv+73IM9
=iOqx
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.7.1' created by Christian Lohmaier 
 at 2015-11-10 17:57 -0800

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

iQIcBAABAgAGBQJWQjAiAAoJEPQ0oe+v7q6jPdcP/i3Isxbi0MlNBMD4b9DPaUm6
+Kf2vkQP0rbeWOZomkMbTSnBbOa8PehDosruKHkCVy9A3riGpDAuo7NgABDR97jR
mWRajC4MOPWcUvJPH0Igi2t+FVh1Qs4F7iDS1VJwpgxa2f4Vyo4ieNF9kf5e3yJw
ccXxO/i9fhHb1p/xNQfCQsTR9OIjvZIHspWhIzLnuQMA/2D/q4JCZDNUBdqpQte/
2oTZm7lpLHVBWnDhe/FmWCM4+dtwWTAn8hetyc7P5Puqi23/lxStWBQyYVJ6dub4
Mi+iFLVfCH67rRMgz9ZCDQQBgzGMdKINGz8XaOqGAIWD0pLdyzQXoHlgwSn0e6Ff
L3KibL4FfVyF1+yLC5GmwX92zwPpxfP239CHMAlQ1l1Y/k2uR9kQuhAYV4KPzjtF
lcG0o3QTixSykwSm1ll7qaNpBGxEAeYL8XxaitEzy16ShHvx4obHxQerpbU2BAIS
ErMcwxFQhrax4tNIXpj9WbnmT8HadpuR755w9AMVhvMSKpqvHYyxGyC7Ns4+/w/K
CkRMSnG5XIktg73L+KJNwQgb5EMrqHoBAKcTc3slvXEKmxSSpI8euIg5VADE+jpX
xGADfUFO2rh9jMK1lvPQxaiOr1CyGBr794TizLXQ9jM7FPkP9LWc5K3AtjjfSSUv
P9f+wUO0KlKhv+DRND50
=y1ZW
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.7.1' created by Christian Lohmaier 
 at 2015-11-10 17:57 -0800

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

iQIcBAABAgAGBQJWQjAfAAoJEPQ0oe+v7q6jv20P/308d/MbHuuZdrfqeEBN7VYU
vyRxeOL+O7MDBJrIClUP19R3ZPiML60hqcQirMwSKK+9nttUtzsmQkoKjsLtP4hG
aOHCsN61asxpUOix4kREUZcp5KVXCXQULLH2GwfGV9GN875ajuR1FYxnGkQrRcUn
eO+U5WqJSWluCQMpPXAHi7G3Tr/L8qsfgicqGTYjk1AL4ylEooAuqgXk10mjZim/
B4z0Yd1xy63eJc7QjmJnLmhMd5wotQ3+MuzxMo/QDSoj4suCwlXPfubSLYN1VblQ
+WLzIJ79XvAhuhWvtu5UfN9FrIaGe6e8odE/5oZXYqCVvu43P8R0125459a1J9tf
dbMOzJveOlY88Z4k+fqlQMboDR4mfiWG+Ql5/sgw5W43/uHOgDsGV8VcpMcnH3/T
Z0NdYXByzvKWTGOwrsG0x2wrvAxwLnLswdWHUr/+ER1Q7hHPvQQ+8UJ7NPF4s+ih
uaARD8oLPvlOq/zq0o0/HJvy0rxiZmE98P/c6DxhZQmNSWskpihyh+2FdIU+hZzq
9+gM74cMNk11GPhWc278RUbvJhGngylgzZZJkAR9UbViS+wr0mWwH4eAJ5Cbcq3c
0wjGN7A4kwAkTZhYo7Shn+zQZEbBdf6vMd+6w0L31BBOaerIavrZTMb2O2D+WWTI
jKaDGdDfcPvG/eTY4Sz5
=Emyv
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

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

New commits:
commit 751ec4ed1763e25605c5d810a9dc8d9b210bd541
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:58:56 2015 +0100

bump product version to 4.4.7.1.0+

Change-Id: Id48aba39bcca3751a644f7f79049b168e3ea6a6a

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

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

[Christian Lohmaier]

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

New commits:
commit f1ca42dbd68471db005a5f4b3c1e71199920c136
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:50:02 2015 +0100

bump product version to 4.4.8.0.0+

Change-Id: Ia1c49b198e6da9cd97efba4488eacbcdc667b5f3

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

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-4-7'

[Christian Lohmaier]

New branch 'libreoffice-4-4-7' available with the following commits:
commit de240f8aa4a8ca261f4a6ef595598bc04a8c475d
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:47:47 2015 +0100

Branch libreoffice-4-4-7

This is 'libreoffice-4-4-7' - the stable branch for the 4.4.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I33df04421f12a8b08e785390cbadd9319f78ad16

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-4-7'

[Christian Lohmaier]

New branch 'libreoffice-4-4-7' available with the following commits:
commit a4206c0a13c285557948d93532b77f172aae6a85
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:47:26 2015 +0100

Branch libreoffice-4-4-7

This is 'libreoffice-4-4-7' - the stable branch for the 4.4.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3148d9089041dcfb1778d7530c5e9feea83e6144

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-4-7'

[Christian Lohmaier]

New branch 'libreoffice-4-4-7' available with the following commits:
commit ec54cb5cde43e9ebd41998417111634872147357
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:47:26 2015 +0100

Branch libreoffice-4-4-7

This is 'libreoffice-4-4-7' - the stable branch for the 4.4.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-4-7'

[Christian Lohmaier]

New branch 'libreoffice-4-4-7' available with the following commits:
commit cc438bccbef298941943ed90fa9bc24e61e65ae6
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:47:26 2015 +0100

Branch libreoffice-4-4-7

This is 'libreoffice-4-4-7' - the stable branch for the 4.4.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I4422647e3b74c93fbffd3d9663f3693697b6f7f0

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2460 ++--
 1 file changed, 1265 insertions(+), 1195 deletions(-)

New commits:
commit 642ec7f3a14780d18589ef7b7e42ceeefc43b899
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:39:48 2015 +0100

update credits

Change-Id: Ic3563dca7a1dc24e6bf3fab326a9521b2f62603c
(cherry picked from commit f0c39754c4407d9f48249ba8c04a1222e25ded0c)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index cc05bbf..64a145f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.0.2.2$Linux_X86_64
 
LibreOffice_project/37b43f919e4de5eeaca9b9755ed688758a8251fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.0.3.2$Linux_X86_64
 
LibreOffice_project/e5f16313668ac592c1bfb310f4390624e3dbfb752012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   811
+   65297
501
39980
-   22624
+   21645
true
true

 
  view2
- 3676
- 3471
+ 10368
+ 11000
  501
- 811
+ 65297
  40479
- 23433
+ 86940
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   4000492
+   4004169
false
false
false
@@ -311,24 +311,24 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -392,26 +392,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -1032,7 +1029,7 @@

   
  Credits
-1097 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-10-27 18:25:07.
+1105 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-11-10 18:16:18.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1059,10 +1056,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 18409Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 18511Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 10330Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 10622Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1070,30 +1067,30 @@
  
  
   
-   Tor 
LillqvistCommits: 7107Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7127Joined: 
2010-03-23
   
   
Kohei 
YoshidaCommits: 5360Joined: 
2009-06-19
   
   
-   Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
+   Miklos 
VajnaCommits: 5021Joined: 
2010-07-29
   
   
-   Miklos 
VajnaCo

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2460 ++--
 1 file changed, 1265 insertions(+), 1195 deletions(-)

New commits:
commit 4759ba7062b2f77e18984dde9869b514c8cb48a4
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:39:48 2015 +0100

update credits

Change-Id: Ic3563dca7a1dc24e6bf3fab326a9521b2f62603c
(cherry picked from commit f0c39754c4407d9f48249ba8c04a1222e25ded0c)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index cc05bbf..64a145f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.0.2.2$Linux_X86_64
 
LibreOffice_project/37b43f919e4de5eeaca9b9755ed688758a8251fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.0.3.2$Linux_X86_64
 
LibreOffice_project/e5f16313668ac592c1bfb310f4390624e3dbfb752012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   811
+   65297
501
39980
-   22624
+   21645
true
true

 
  view2
- 3676
- 3471
+ 10368
+ 11000
  501
- 811
+ 65297
  40479
- 23433
+ 86940
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   4000492
+   4004169
false
false
false
@@ -311,24 +311,24 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -392,26 +392,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -1032,7 +1029,7 @@

   
  Credits
-1097 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-10-27 18:25:07.
+1105 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-11-10 18:16:18.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1059,10 +1056,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 18409Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 18511Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 10330Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 10622Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1070,30 +1067,30 @@
  
  
   
-   Tor 
LillqvistCommits: 7107Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7127Joined: 
2010-03-23
   
   
Kohei 
YoshidaCommits: 5360Joined: 
2009-06-19
   
   
-   Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
+   Miklos 
VajnaCommits: 5021Joined: 
2010-07-29
   
   
-   Miklos 
VajnaCo

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2460 ++--
 1 file changed, 1265 insertions(+), 1195 deletions(-)

New commits:
commit f0c39754c4407d9f48249ba8c04a1222e25ded0c
Author: Christian Lohmaier 
Date:   Tue Nov 10 18:39:48 2015 +0100

update credits

Change-Id: Ic3563dca7a1dc24e6bf3fab326a9521b2f62603c

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index cc05bbf..64a145f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.0.2.2$Linux_X86_64
 
LibreOffice_project/37b43f919e4de5eeaca9b9755ed688758a8251fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.0.3.2$Linux_X86_64
 
LibreOffice_project/e5f16313668ac592c1bfb310f4390624e3dbfb752012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   811
+   65297
501
39980
-   22624
+   21645
true
true

 
  view2
- 3676
- 3471
+ 10368
+ 11000
  501
- 811
+ 65297
  40479
- 23433
+ 86940
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   4000492
+   4004169
false
false
false
@@ -311,24 +311,24 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -392,26 +392,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -1032,7 +1029,7 @@

   
  Credits
-1097 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-10-27 18:25:07.
+1105 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-11-10 18:16:18.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1059,10 +1056,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 18409Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 18511Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 10330Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 10622Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1070,30 +1067,30 @@
  
  
   
-   Tor 
LillqvistCommits: 7107Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7127Joined: 
2010-03-23
   
   
Kohei 
YoshidaCommits: 5360Joined: 
2009-06-19
   
   
-   Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
+   Miklos 
VajnaCommits: 5021Joined: 
2010-07-29
   
   
-   Miklos 
VajnaCommits: 4948Joined: 
2010-07-29
+   Frank Schoenheit 
[fs]Commits: 500

Re: System POPPLER_VERSION redefined, won't build

[ariel cornejo]

Michael Stahl-2 wrote
> it is definitely a bug somewhere if HAVE_POPPLER_VERSION_H isn't set fora
> current version of poppler.e.g. on Fedora 22 i have
> /usr/include/poppler/cpp/poppler-version.h andHAVE_POPPLER_VERSION_H
> set.maybe look at config.log where it checks for poppler-version.h what
> theerror is.

Turns out poppler-version.h was missing; in Ubuntu it comes in the
libpoppler-cpp-dev package. 
Here's what happens without it.
Output from autogen.sh:
checking for POPPLER... yeschecking cpp/poppler-version.h usability...
nochecking cpp/poppler-version.h presence... nochecking for
cpp/poppler-version.h... no
config.log:
configure:36446: checking for POPPLERconfigure:36453: $PKG_CONFIG --exists
--print-errors "poppler >= 0.12.0 "configure:36456: $? = 0configure:36470:
$PKG_CONFIG --exists --print-errors "poppler >= 0.12.0 "configure:36473: $?
= 0configure:36531: result: yesconfigure:36545: checking
cpp/poppler-version.h usabilityconfigure:36545: g++ -c -O3 -march=native
-pipe -I/usr/include/poppler-I/usr/include/poppler  conftest.cpp
>&5conftest.cpp:138:33: fatal error: cpp/poppler-version.h: No such file or
directorycompilation terminated.configure:36545: $? = 1configure: failed
program was:| /* confdefs.h */| #include
configure:36545: result: noconfigure:36545: checking
cpp/poppler-version.h presenceconfigure:36545: g++ -E  
-I/usr/include/poppler  conftest.cppconftest.cpp:105:33: fatal error:
cpp/poppler-version.h: No such file or directorycompilation
terminated.configure:36545: $? = 1configure: failed program was:| /*
confdefs.h */| #define PACKAGE_NAME "LibreOffice"| #define PACKAGE_TARNAME
"libreoffice"| #define PACKAGE_VERSION "5.1.0.0.alpha1+"...| #include
configure:36545: result: noconfigure:36545: checking
cpp/poppler-version.h presenceconfigure:36545: g++ -E  
-I/usr/include/poppler  conftest.cppconftest.cpp:105:33: fatal error:
cpp/poppler-version.h: No such file or directorycompilation
terminated.configure:36545: $? = 1configure: failed program was:| /*
confdefs.h */| #define PACKAGE_NAME "LibreOffice"| #define PACKAGE_TARNAME
"libreoffice"| #define PACKAGE_VERSION "5.1.0.0.alpha1+"...| /* end
confdefs.h.  */| #include configure:36545: result:
noconfigure:36545: checking for cpp/poppler-version.hconfigure:36545:
result: noconfigure:36630: checking whether to build the Wiki Publisher
extension
http://pastebin.com/CGrUQwuh   
So configure does check for the file but ignores the failed test. 
There's also GfxState.h, that comes in yet another package
libpoppler-private-dev and is also needed, but configure doesn't test for
it. Maybe they used to be in the same package so only one test was needed?




--
View this message in context: 
http://nabble.documentfoundation.org/System-POPPLER-VERSION-redefined-won-t-build-tp4165697p4165894.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sc/qa/perf/scperfobj.cxx |   40 
 1 file changed, 20 insertions(+), 20 deletions(-)

New commits:
commit d6f4502425d750d909583d0e2b9ab58c46fa7bec
Author: Stephan Bergmann 
Date:   Tue Nov 10 18:16:18 2015 +0100

loplugin:stringconstant

Change-Id: Iae42578fe1dfb91e994abece577a2f9c6c6d5032

diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx
index b15fa4b..493072b 100644
--- a/sc/qa/perf/scperfobj.cxx
+++ b/sc/qa/perf/scperfobj.cxx
@@ -148,7 +148,7 @@ void ScPerfObj::testSheetFindAll()
 uno::Reference< util::XSearchDescriptor> xSearchDescr = 
xSearchable->createSearchDescriptor();
 
 // search for a value
-xSearchDescr->setSearchString(OUString("value_1"));
+xSearchDescr->setSearchString("value_1");
 
 callgrindStart();
 
@@ -168,9 +168,9 @@ void ScPerfObj::testSheetFindAll()
 xSearchDescr = xSearchableStyle->createSearchDescriptor();
 
 uno::Reference< beans::XPropertySet > 
xSearchProp(xSearchDescr,UNO_QUERY_THROW);
-xSearchProp->setPropertyValue(OUString("SearchStyles"), makeAny(true));
+xSearchProp->setPropertyValue("SearchStyles", makeAny(true));
 
-xSearchDescr->setSearchString(OUString("aCellStyle"));
+xSearchDescr->setSearchString("aCellStyle");
 
 callgrindStart();
 
@@ -274,7 +274,7 @@ void ScPerfObj::testSum()
 // get getSheets
 uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
 
-uno::Any rSheet = 
xSheets->getByName(OUString::createFromAscii("SumSheet"));
+uno::Any rSheet = xSheets->getByName("SumSheet");
 
 // query for the XSpreadsheet interface
 uno::Reference< sheet::XSpreadsheet > xSheet (rSheet, UNO_QUERY);
@@ -282,7 +282,7 @@ void ScPerfObj::testSum()
 
 
 callgrindStart();
-xCell->setFormula(OUString::createFromAscii("=SUM(A1:A1)"));
+xCell->setFormula("=SUM(A1:A1)");
 xCalculatable->calculate();
 callgrindDump("sc:sum_numbers_column");
 
@@ -291,7 +291,7 @@ void ScPerfObj::testSum()
 // query for the XCellRange interface
 uno::Reference< table::XCellRange > rCellRange(rSheet, UNO_QUERY);
 // query the cell range
-uno::Reference< table::XCellRange > xCellRange = 
rCellRange->getCellRangeByName(OUString::createFromAscii("B1"));
+uno::Reference< table::XCellRange > xCellRange = 
rCellRange->getCellRangeByName("B1");
 
 uno::Reference< sheet::XArrayFormulaRange > xArrayFormulaRange(xCellRange, 
UNO_QUERY_THROW);
 
@@ -313,14 +313,14 @@ void ScPerfObj::testFTest()
 // get getSheets
 uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
 
-uno::Any rSheet = 
xSheets->getByName(OUString::createFromAscii("FTestSheet"));
+uno::Any rSheet = xSheets->getByName("FTestSheet");
 
 // query for the XSpreadsheet interface
 uno::Reference< sheet::XSpreadsheet > xSheet (rSheet, UNO_QUERY);
 uno::Reference< table::XCell > xCell = xSheet->getCellByPosition(0, 0);
 
 callgrindStart();
-xCell->setFormula(OUString::createFromAscii("=FTEST(B1:K10;L1:U10)"));
+xCell->setFormula("=FTEST(B1:K10;L1:U10)");
 xCalculatable->calculate();
 callgrindDump("sc:ftest");
 
@@ -337,14 +337,14 @@ void ScPerfObj::testChiTest()
 // get getSheets
 uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
 
-uno::Any rSheet = 
xSheets->getByName(OUString::createFromAscii("ChiTestSheet"));
+uno::Any rSheet = xSheets->getByName("ChiTestSheet");
 
 // query for the XSpreadsheet interface
 uno::Reference< sheet::XSpreadsheet > xSheet (rSheet, UNO_QUERY);
 uno::Reference< table::XCell > xCell = xSheet->getCellByPosition(0, 0);
 
 callgrindStart();
-
xCell->setFormula(OUString::createFromAscii("=CHITEST(B1:CV100;CW1:GQ100)"));
+xCell->setFormula("=CHITEST(B1:CV100;CW1:GQ100)");
 xCalculatable->calculate();
 callgrindDump("sc:chitest");
 
@@ -361,14 +361,14 @@ void ScPerfObj::testSumX2PY2Test()
 // get getSheets
 uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
 
-uno::Any rSheet = 
xSheets->getByName(OUString::createFromAscii("SumX2PY2Sheet"));
+uno::Any rSheet = xSheets->getByName("SumX2PY2Sheet");
 
 // query for the XSpreadsheet interface
 uno::Reference< sheet::XSpreadsheet > xSheet (rSheet, UNO_QUERY);
 uno::Reference< table::XCell > xCell = xSheet->getCellByPosition(2, 0);
 
 callgrindStart();
-
xCell->setFormula(OUString::createFromAscii("=SUMX2PY2(A1:A1;B1:B1)"));
+xCell->setFormula("=SUMX2PY2(A1:A1;B1:B1)");
 xCalculatable->calculate();
 callgrindDump("sc:sumx2py2");
 
@@ -385,14 +385,14 @@ void ScPerfObj::testTTest()
 // get getSheets
 uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
 
-uno::Any rSheet = 
xSheets->getByName(OUString::createFromAscii("TTestSheet"));
+uno::Any rSheet = xSheets->getBy

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4' - source/am source/bg source/ca source/cy source/de source/es source/fr source/kk source/nn source/oc source/ru source/sq source/tr sou

[Christian Lohmaier]

 source/am/helpcontent2/source/text/shared/01.po|  118 
+++---
 source/am/helpcontent2/source/text/shared/guide.po |   34 +-
 source/am/sd/source/ui/app.po  |   12 -
 source/am/sd/uiconfig/sdraw/ui.po  |   20 -
 source/am/sd/uiconfig/simpress/ui.po   |   43 +--
 source/bg/instsetoo_native/inc_openoffice/windows/msi_languages.po |8 
 source/ca/officecfg/registry/data/org/openoffice/Office.po |   12 -
 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po  |   12 -
 source/ca/sd/source/ui/app.po  |   12 -
 source/ca/sw/uiconfig/swriter/ui.po|   11 
 source/ca/uui/uiconfig/ui.po   |   11 
 source/cy/officecfg/registry/data/org/openoffice/Office.po |8 
 source/de/helpcontent2/source/text/scalc/01.po |   12 -
 source/de/readlicense_oo/docs.po   |   10 
 source/de/scaddins/source/analysis.po  |   10 
 source/es/helpcontent2/source/text/scalc/01.po |   24 --
 source/fr/helpcontent2/source/text/shared/optionen.po  |   10 
 source/fr/uui/uiconfig/ui.po   |6 
 source/kk/dbaccess/uiconfig/ui.po  |   13 -
 source/kk/readlicense_oo/docs.po   |   13 -
 source/kk/wizards/source/formwizard.po |   10 
 source/nn/helpcontent2/source/text/scalc/01.po |   20 -
 source/nn/helpcontent2/source/text/scalc/guide.po  |8 
 source/nn/helpcontent2/source/text/swriter/librelogo.po|6 
 source/oc/basic/source/classes.po  |   10 
 source/oc/cui/source/tabpages.po   |   10 
 source/oc/desktop/source/app.po|   10 
 source/oc/desktop/source/deployment/unopkg.po  |   12 -
 source/oc/readlicense_oo/docs.po   |   10 
 source/oc/sc/source/ui/src.po  |   14 -
 source/oc/sc/uiconfig/scalc/ui.po  |   10 
 source/oc/sd/uiconfig/sdraw/ui.po  |   10 
 source/oc/svx/source/src.po|   10 
 source/oc/uui/source.po|   14 -
 source/ru/sc/uiconfig/scalc/ui.po  |8 
 source/sq/helpcontent2/source/text/shared/01.po|9 
 source/tr/officecfg/registry/data/org/openoffice/Office.po |   12 -
 source/tr/officecfg/registry/data/org/openoffice/Office/UI.po  |   12 -
 source/tr/sd/source/ui/app.po  |   12 -
 source/tr/sw/uiconfig/swriter/ui.po|   13 -
 source/tr/uui/uiconfig/ui.po   |   11 
 source/uk/sc/source/ui/src.po  |   14 -
 source/uk/svx/source/stbctrls.po   |   10 
 43 files changed, 293 insertions(+), 361 deletions(-)

New commits:
commit 707379846961650781992c9f28ddc908277e3d08
Author: Christian Lohmaier 
Date:   Tue Nov 10 17:16:48 2015 +0100

update translations for 4.4.7 rc1

and force-fix errors using pocheck

Change-Id: Ic9fedd349b21b4d2c4c7231bda37e40dd6f2d1a8

diff --git a/source/am/helpcontent2/source/text/shared/01.po 
b/source/am/helpcontent2/source/text/shared/01.po
index e94a6da..2beff29 100644
--- a/source/am/helpcontent2/source/text/shared/01.po
+++ b/source/am/helpcontent2/source/text/shared/01.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2015-09-29 13:13+0200\n"
-"PO-Revision-Date: 2015-08-07 22:37+\n"
+"PO-Revision-Date: 2015-11-08 20:13+\n"
 "Last-Translator: Samson B \n"
 "Language-Team: LANGUAGE \n"
 "Language: am\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1438987072.00\n"
+"X-POOTLE-MTIME: 1447013601.00\n"
 
 #: 0101.xhp
 msgctxt ""
@@ -344,14 +344,13 @@ msgid "Labels"
 msgstr "ምልክቶች"
 
 #: 0101.xhp
-#, fuzzy
 msgctxt ""
 "0101.xhp\n"
 "par_id3148388\n"
 "106\n"
 "help.text"
 msgid "Opens the Labels dialog where you can set the options for your 
labels, and then creates a new text document for the labels ($[officename] 
Writer)."
-msgstr "መክፈቻ የ ንግድ ካርዶች ንግግር የንግድ 
ካርዶች የሚፈጥሩበት እና የ ጽሁፍ ሰነዶች

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

[Christian Lohmaier]

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

New commits:
commit ae0d9490da6fc35f727f3766281e3c25a1147153
Author: Christian Lohmaier 
Date:   Tue Nov 10 17:16:48 2015 +0100

Updated core
Project: translations  707379846961650781992c9f28ddc908277e3d08

update translations for 4.4.7 rc1

and force-fix errors using pocheck

Change-Id: Ic9fedd349b21b4d2c4c7231bda37e40dd6f2d1a8

diff --git a/translations b/translations
index 0e648e8..7073798 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0e648e823e10953a06056f094055d878573afd86
+Subproject commit 707379846961650781992c9f28ddc908277e3d08
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 17 commits - apple_remote/source avmedia/source bridges/source connectivity/source desktop/source fpicker/source framework/source include/vcl jvmfwk/plugins lingucompon

[Stephan Bergmann]

 apple_remote/source/HIDRemoteControlDevice.m |2 
 avmedia/source/macavf/framegrabber.mm|8 -
 avmedia/source/macavf/macavfuno.mm   |2 
 avmedia/source/macavf/player.mm  |6 
 avmedia/source/macavf/window.mm  |2 
 avmedia/source/quicktime/quicktimeuno.mm |2 
 avmedia/source/quicktime/window.mm   |6 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx|2 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx|   28 +--
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx |   16 +-
 bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx|   30 ++--
 bridges/source/cpp_uno/shared/component.cxx  |2 
 bridges/source/cpp_uno/shared/vtablefactory.cxx  |2 
 connectivity/source/drivers/macab/MacabAddressBook.cxx   |   18 +-
 connectivity/source/drivers/macab/MacabColumns.cxx   |2 
 connectivity/source/drivers/macab/MacabConnection.cxx|   12 -
 connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx  |4 
 connectivity/source/drivers/macab/MacabDriver.cxx|   14 -
 connectivity/source/drivers/macab/MacabGroup.cxx |6 
 connectivity/source/drivers/macab/MacabHeader.cxx|   12 -
 connectivity/source/drivers/macab/MacabPreparedStatement.cxx |   44 +++---
 connectivity/source/drivers/macab/MacabRecord.cxx|   36 ++---
 connectivity/source/drivers/macab/MacabRecords.cxx   |   54 +++
 connectivity/source/drivers/macab/MacabResultSet.cxx |   60 
 connectivity/source/drivers/macab/MacabResultSetMetaData.cxx |8 -
 connectivity/source/drivers/macab/MacabServices.cxx  |4 
 connectivity/source/drivers/macab/MacabStatement.cxx |   20 +-
 connectivity/source/drivers/macab/MacabTables.cxx|2 
 connectivity/source/drivers/macab/macabcondition.cxx |   18 +-
 connectivity/source/drivers/macab/macabutilities.hxx |2 
 connectivity/source/drivers/mork/MNSFolders.cxx  |6 
 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx   |6 
 connectivity/source/drivers/odbc/OConnection.cxx |2 
 desktop/source/app/app.cxx   |2 
 fpicker/source/aqua/AquaFilePickerDelegate.mm|   10 -
 fpicker/source/aqua/CFStringUtilities.mm |   12 -
 fpicker/source/aqua/ControlHelper.mm |   12 -
 fpicker/source/aqua/FPentry.mm   |2 
 fpicker/source/aqua/FilterHelper.mm  |   20 +-
 fpicker/source/aqua/NSURL_OOoAdditions.mm|   10 -
 fpicker/source/aqua/SalAquaFilePicker.mm |8 -
 fpicker/source/aqua/SalAquaPicker.mm |   10 -
 framework/source/fwi/helper/networkdomain.cxx|2 
 include/vcl/menu.hxx |2 
 include/vcl/sysdata.hxx  |4 
 jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx   |2 
 jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |2 
 lingucomponent/source/spellcheck/macosxspell/macreg.mm   |2 
 lingucomponent/source/spellcheck/macosxspell/macspellimp.mm  |   26 +--
 opencl/source/openclwrapper.cxx  |2 
 sal/osl/unx/file_misc.cxx|2 
 sal/osl/unx/file_volume.cxx  |2 
 sal/osl/unx/nlsupport.cxx|   14 -
 sal/osl/unx/osxlocale.cxx|6 
 sal/osl/unx/process_impl.cxx |4 
 sal/osl/unx/signal.cxx   |2 
 sal/osl/unx/system.cxx   |   32 ++--
 sd/source/ui/remotecontrol/OSXBluetooth.mm   |4 
 sfx2/source/appl/shutdowniconaqua.mm |6 
 shell/source/backends/localebe/localebackend.cxx |   12 -
 shell/source/backends/macbe/macbackend.mm|   12 -
 shell/source/backends/macbe/macbecdef.cxx|4 
 soltools/cpp/_getopt.c   |4 
 unoidl/source/sourcetreeprovider.cxx |4 
 vcl/inc/quartz/salgdicommon.hxx  |2 
 vcl/osx/DataFlavorMapping.cxx|6 
 vcl/osx/DragSource.cxx   |6 
 vcl/osx/DropTarget.cxx   |2 
 vcl/osx/HtmlFmtFlt.cxx   |2 
 vcl/osx/OSXTransferable.cxx  |4 
 vcl/osx/a11yfocustracker.cxx  

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

[Stephan Bergmann]

 vcl/source/outdev/text.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 57da9541f43a01500e1da919498d32a8e974c800
Author: Stephan Bergmann 
Date:   Tue Nov 10 16:06:10 2015 +0100

Revert "vcl: Assert that a non-negative nXPos is always found"

This reverts commit e3bd0951e6b8e8889aabc8640c5641ab32300517,
the newly added assert fires during JunitTest_forms_unoapi_2.

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index c37951e..9a745be 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1124,7 +1124,6 @@ bool OutputDevice::GetCaretPositions( const OUString& 
rStr, long* pCaretXArray,
 for( i = 0; i < 2 * nLen; ++i )
 if( pCaretXArray[ i ] >= 0 )
 break;
-assert(i < 2 * nLen); // otherwise i may go beyond the end of pCaretXArray
 long nXPos = pCaretXArray[ i ];
 for( i = 0; i < 2 * nLen; ++i )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - download.lst

[Michael Stahl]

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

New commits:
commit 1b95e63f0fd976df77c59a31c48b13747e97098e
Author: Michael Stahl 
Date:   Thu Nov 5 15:43:32 2015 +0100

nss: upgrade to release 3.19.4

Reviewed-on: https://gerrit.libreoffice.org/19808
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 0c1922a268cefb7a1c90f2519053123303ca6ebf)

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

diff --git a/download.lst b/download.lst
index b3dc7f8..cbfdbeb 100644
--- a/download.lst
+++ b/download.lst
@@ -110,7 +110,7 @@ export MWAW_TARBALL := 
libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL := 
2100bc5a7ea9685928ff68cda2e60569-nss-3.19.2-with-nspr-4.10.8.tar.gz
+export NSS_TARBALL := 
478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz
 export ODFGEN_MD5SUM := 8716be5c22ae8353f9aaa380d74840dc
 export ODFGEN_VERSION_MICRO := 4
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos]

 svtools/source/misc/langtab.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 637485331cce33e6b7d277f993b37109bbf6b21c
Author: Adolfo Jayme Barrientos 
Date:   Tue Nov 10 08:30:50 2015 -0600

This language string should be more consistent

Change-Id: I84d3346f7074f7fb413f800386c5ff2f4dbf0a69

diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index e6251a4..4163c91 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -283,7 +283,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "Sami, Southern (Norway)" ; LANGUAGE_SAMI_SOUTHERN_NORWAY ; > ;
 < "Sami, Southern (Sweden)" ; LANGUAGE_SAMI_SOUTHERN_SWEDEN ; > ;
 < "Sami, Kildin (Russia)" ; LANGUAGE_USER_SAMI_KILDIN_RUSSIA ; > ;
-< "Guaraní, Paraguayan" ; LANGUAGE_GUARANI_PARAGUAY ; > ;
+< "Guarani (Paraguay)" ; LANGUAGE_GUARANI_PARAGUAY ; > ;
 < "Bodo" ; LANGUAGE_USER_BODO_INDIA ; > ;
 < "Dogri" ; LANGUAGE_USER_DOGRI_INDIA ; > ;
 < "Maithili" ; LANGUAGE_USER_MAITHILI_INDIA ; > ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help compiling an idl for an Add-in

[Michael Stahl]

On 10.11.2015 13:53, lucass wrote:
> Hello,
> I downloaded the rpm file on the official site and extracted it (using
> the file compression tool that comes with ubuntu). 
> I couldn't make idlc work, but I think it was because my own lack of
> experience.
> When running idlc it complained about not finding libreglo.so .

you need to install the LibreOffice rpms from tdf.org as well - the SDK
has to match the installation.

the easiest way to do that is to "apt-get install rpm" and use the
"install" script that is in the root directory of the rpm-tar.gz.  you
don't even need to be root to run it, and can install in any directory
you want.


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

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

[Adolfo Jayme Barrientos]

 cui/uiconfig/ui/aboutconfigdialog.ui |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6c3de4f43888a461802b31e7379030f1ac1b99de
Author: Adolfo Jayme Barrientos 
Date:   Tue Nov 10 08:05:34 2015 -0600

tdf#95594 Remove “dialog” type hint from Expert Config window

Change-Id: I4a997ab8959f8d890aaa8779d8d036cee1fc060b

diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui 
b/cui/uiconfig/ui/aboutconfigdialog.ui
index 3773c50..65cc729 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -7,7 +7,8 @@
 False
 6
 Expert Configuration
-dialog
+normal
+True
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 solenv/bin/modules/installer/windows/file.pm |5 +
 1 file changed, 5 insertions(+)

New commits:
commit a322355727368ab087b718d32b70e4a9d9db645d
Author: Andras Timar 
Date:   Tue Nov 10 15:01:40 2015 +0100

tdf#76239 fake file version for font files

Change-Id: I59a9401c0bdc2d641ea54498af0eb1e589ab12f3

diff --git a/solenv/bin/modules/installer/windows/file.pm 
b/solenv/bin/modules/installer/windows/file.pm
index 457b31a..c41be70 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -551,6 +551,11 @@ sub get_fileversion
 $fileversion = $version . "." . $subversion . "." . $microversion 
. "." . $vervariant;
 }
 }
+# fake file version for font files (tdf#76239)
+if ( $onefile->{'Name'} =~ /\.ttf$|\.TTF$/ )
+{
+$fileversion = "1.0.0.0";
+}
 
 return $fileversion;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help compiling an idl for an Add-in

[lucass]

When using the ubuntu sdk I did do that, I setted the same cpp from which I
copied the version output and the sdk from the libreoffice-dev package.
I'm not at my computer right now.
I saw that setsdkenv_unix prints all setted values, I'll recheck them later
and send it here.

Thanks

On Tue, Nov 10, 2015 at 11:16 AM, Stephan Bergmann 
wrote:

> On 11/10/2015 01:53 PM, lucass wrote:
>
>> I downloaded the rpm file on the official site and extracted it (using
>> the file compression tool that comes with ubuntu).
>> I couldn't make idlc work, but I think it was because my own lack of
>> experience.
>> When running idlc it complained about not finding libreglo.so .
>>
>
> For one, you need to configure the LO SDK before using it, by running its
> setsdkenv_unix.sh, see ).
> Did you do that?  If not, that is maybe also the reason why the
> Ubuntu-provided LO SDK does not work for you.
>
> For another, a LO SDK should always be used in combination with a matching
> LO installation.  It is unwise and unsupported to use a LO SDK downloaded
> from libreoffice.org together with a Ubuntu-provided LO installation.
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 external/liblangtag/README |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 0871a03bbda59e0935234c9760a655a911ea0897
Author: Eike Rathke 
Date:   Tue Nov 10 14:41:27 2015 +0100

add description of the language-subtag-registry update process

Change-Id: I94b8cd007bdbf3b535c5de9eb56fe5495f39dabf

diff --git a/external/liblangtag/README b/external/liblangtag/README
index 694daee..5d7bfc9 100644
--- a/external/liblangtag/README
+++ b/external/liblangtag/README
@@ -1 +1,10 @@
 From [http://tagoh.bitbucket.org/liblangtag/]. An interface for BCP47 language 
tags.
+
+Updated IANA Language Subtag Registry files are available as
+[https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry]
+and per convention are stored as a data/language-subtag-registry file in a
+language-subtag-registry--MM-DD.tar.bz2 archive, with -MM-DD being the
+File-Date entry of the file, for example
+language-subtag-registry-2015-08-04.tar.bz2, and uploaded to the external
+sources repository to be included in the build of liblangtag. See download.lst
+LANGTAGREG_TARBALL and LANGTAGREG_MD5SUM.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Coverity, read-only generic account.

[Caolán McNamara]

On Mon, 2015-11-09 at 18:08 -0600, Norbert Thiebaud wrote:
> actually, since coverity is mostly hovering at 0 issue these days... 
> and new issues do not linger too long, we could simply open-up the
> coverity thing and let the world look at the reported issues.
> 
> caolan ? you thoughts ?

Yes. I guess that makes sense. I've changed it to allow read-only
access for all users now.

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

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

[Eike Rathke]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 660e37ad62d1c62a18325cffe6dd601e2df20aaa
Author: Eike Rathke 
Date:   Tue Nov 10 14:37:15 2015 +0100

update language-subtag-registry to 2015-08-04

Change-Id: I479a3083f56631135a7f6d94e2864583a9b30a30

diff --git a/download.lst b/download.lst
index 81a2354..6c00b4f 100755
--- a/download.lst
+++ b/download.lst
@@ -74,8 +74,8 @@ export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7
 export JPEG_TARBALL := jpegsrc.v9a.tar.gz
 export JPEG_TURBO_MD5SUM := 2c3a68129dac443a72815ff5bb374b05
 export JPEG_TURBO_TARBALL := libjpeg-turbo-1.3.1.tar.gz
-export LANGTAGREG_MD5SUM := d431bd8a70455be1fa8523fa633c005b
-export LANGTAGREG_TARBALL := language-subtag-registry-2015-06-08.tar.bz2
+export LANGTAGREG_MD5SUM := bf5986dbfa1c9a0f26cf1b00ed369484
+export LANGTAGREG_TARBALL := language-subtag-registry-2015-08-04.tar.bz2
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_MD5SUM := f4c08d38ceade4a664ebff7228910a33
 export LCMS2_TARBALL := lcms2-2.6.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 cui/source/customize/cfgutil.cxx|   65 ---
 cui/source/customize/selector.cxx   |   10 -
 cui/source/inc/cfgutil.hxx  |4 
 cui/source/inc/numpages.hxx |4 
 cui/source/inc/selector.hxx |4 
 cui/source/tabpages/numpages.cxx|8 -
 editeng/source/editeng/editdbg.cxx  |   17 +-
 editeng/source/editeng/editdoc.cxx  |  185 
 editeng/source/editeng/editdoc.hxx  |   15 +-
 editeng/source/editeng/editeng.cxx  |8 -
 editeng/source/editeng/editobj.cxx  |   90 +++
 editeng/source/editeng/editobj2.hxx |8 -
 editeng/source/editeng/editundo.cxx |   12 +-
 editeng/source/editeng/editundo.hxx |4 
 editeng/source/editeng/editview.cxx |2 
 editeng/source/editeng/fieldupdater.cxx |4 
 editeng/source/editeng/impedit.cxx  |2 
 editeng/source/editeng/impedit.hxx  |5 
 editeng/source/editeng/impedit2.cxx |   13 +-
 editeng/source/editeng/impedit3.cxx |6 -
 editeng/source/editeng/impedit4.cxx |6 -
 editeng/source/editeng/impedit5.cxx |8 -
 22 files changed, 235 insertions(+), 245 deletions(-)

New commits:
commit 97ebf71c8bbe1755e02fe4d486d04353cf2575da
Author: Noel Grandin 
Date:   Tue Nov 10 15:18:31 2015 +0200

editeng: boost::ptr_vector->std::vector

Change-Id: I49cf179016a0690cb87bc12880da8b1824ac01cc

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 203531a..eb4921c 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -684,7 +684,7 @@ bool EditEngine::IsCallParaInsertedOrDeleted() const
 
 void EditEngine::AppendDeletedNodeInfo(DeletedNodeInfo* pInfo)
 {
-pImpEditEngine->aDeletedNodes.push_back(pInfo);
+
pImpEditEngine->aDeletedNodes.push_back(std::unique_ptr(pInfo));
 }
 
 void EditEngine::UpdateSelections()
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 815e7ae..40bb0f7 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -59,7 +59,8 @@
 #include 
 
 #include 
-#include 
+#include 
+#include 
 
 #define DEL_LEFT1
 #define DEL_RIGHT   2
@@ -467,7 +468,7 @@ private:
 OnDemandTransliterationWrapper  xTransliterationWrapper;
 
 // For Formatting / Update 
-boost::ptr_vector aDeletedNodes;
+std::vector > aDeletedNodes;
 Rectangle   aInvalidRect;
 sal_uInt32  nCurTextHeight;
 sal_uInt32  nCurTextHeightNTP;  // without trailing empty 
paragraphs
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index ee31b8e..1ae1dd8 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -61,6 +61,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -2202,8 +2203,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* 
pLeft, ContentNode* pR
 }
 
 sal_Int32 nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
-DeletedNodeInfo* pInf = new DeletedNodeInfo( pRight, nParagraphTobeDeleted 
);
-aDeletedNodes.push_back(pInf);
+aDeletedNodes.push_back(o3tl::make_unique( pRight, 
nParagraphTobeDeleted ));
 
 GetEditEnginePtr()->ParagraphConnected( aEditDoc.GetPos( pLeft ), 
aEditDoc.GetPos( pRight ) );
 
@@ -2441,8 +2441,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara )
 
 OSL_ENSURE( pNode, "Blind Node in ImpRemoveParagraph" );
 
-DeletedNodeInfo* pInf = new DeletedNodeInfo( pNode, nPara );
-aDeletedNodes.push_back(pInf);
+aDeletedNodes.push_back(o3tl::make_unique( pNode, nPara 
));
 
 // The node is managed by the undo and possibly destroyed!
 aEditDoc.Release( nPara );
@@ -3293,7 +3292,7 @@ void ImpEditEngine::UpdateSelections()
 bool bChanged = false;
 for (size_t i = 0, n = aDeletedNodes.size(); i < n; ++i)
 {
-const DeletedNodeInfo& rInf = aDeletedNodes[i];
+const DeletedNodeInfo& rInf = *aDeletedNodes[i].get();
 if ( ( aCurSel.Min().GetNode() == rInf.GetNode() ) ||
  ( aCurSel.Max().GetNode() == rInf.GetNode() ) )
 {
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 9d878ae..5b3498e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -69,6 +69,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -3947,8 +3948,7 @@ void ImpEditEngine::ShowParagraph( sal_Int32 nParagraph, 
bool bShow )
 {
 // Mark as deleted, so that no selection will end or begin at
 // this paragraph...
-DeletedNodeInfo* pDelInfo = new DeletedNodeInfo( 
pPPortion->GetNode(), nParagraph );
-aDeletedNodes.push_back(pDelInfo);
+aDeletedNodes.push_back(o3tl::make_unique( 
pPPortion->GetNode(), nParagraph ));
   

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

[Stephan Bergmann]

 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5f19eb658d8b20619f5591f6de824741e348910
Author: Stephan Bergmann 
Date:   Tue Nov 10 14:21:29 2015 +0100

Avoid -Werror=pedantic when building CppunitTest_libreofficekit_checkapi

...at least the Linux-deb-x86_64@56-lhm-ubuntu-trusty tinderbox complains 
that

> include/LibreOfficeKit/LibreOfficeKitInit.h:223:77: error: ISO C++ 
forbids casting between pointer-to-function and pointer-to-object 
[-Werror=pedantic]
> pSym2 = (LokHookFunction2 *) lok_dlsym(dlhandle, "libreofficekit_hook_2");

Change-Id: Ibd75a44fcc7da35ea32bde3fd2a300a16493789f

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 9de88a2..67af078 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -119,7 +119,7 @@ ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_CXX03FLAGS := -std=gnu++98 -Werror=c++11-extensions -Wno-c++11-long-long \
 -Wno-deprecated-declarations
 else
-gb_CXX03FLAGS := -std=gnu++98 -pedantic-errors -Wno-long-long \
+gb_CXX03FLAGS := -std=gnu++98 -Wno-long-long \
 -Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help compiling an idl for an Add-in

[Stephan Bergmann]

On 11/10/2015 01:53 PM, lucass wrote:

I downloaded the rpm file on the official site and extracted it (using
the file compression tool that comes with ubuntu).
I couldn't make idlc work, but I think it was because my own lack of
experience.
When running idlc it complained about not finding libreglo.so .


For one, you need to configure the LO SDK before using it, by running 
its setsdkenv_unix.sh, see 
).  Did you do that?  If 
not, that is maybe also the reason why the Ubuntu-provided LO SDK does 
not work for you.


For another, a LO SDK should always be used in combination with a 
matching LO installation.  It is unwise and unsupported to use a LO SDK 
downloaded from libreoffice.org together with a Ubuntu-provided LO 
installation.

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

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

[Miklos Vajna]

 sw/source/filter/ww8/attributeoutputbase.hxx |6 +--
 sw/source/filter/ww8/docxattributeoutput.cxx |   34 +--
 sw/source/filter/ww8/docxattributeoutput.hxx |6 +--
 sw/source/filter/ww8/docxsdrexport.cxx   |8 ++--
 sw/source/filter/ww8/docxsdrexport.hxx   |   10 ++---
 sw/source/filter/ww8/rtfattributeoutput.cxx  |   18 +-
 sw/source/filter/ww8/rtfattributeoutput.hxx  |4 +-
 sw/source/filter/ww8/rtfsdrexport.cxx|4 +-
 sw/source/filter/ww8/writerhelper.cxx|   47 ++-
 sw/source/filter/ww8/writerhelper.hxx|   30 -
 sw/source/filter/ww8/wrtw8esh.cxx|   24 ++---
 sw/source/filter/ww8/wrtw8nds.cxx|   30 -
 sw/source/filter/ww8/wrtww8.cxx  |4 +-
 sw/source/filter/ww8/wrtww8.hxx  |   36 ++--
 sw/source/filter/ww8/wrtww8gr.cxx|   24 ++---
 sw/source/filter/ww8/ww8atr.cxx  |   14 
 sw/source/filter/ww8/ww8attributeoutput.hxx  |2 -
 sw/source/filter/ww8/ww8par.cxx  |6 +--
 18 files changed, 155 insertions(+), 152 deletions(-)

New commits:
commit 87cd02c4dab1e5b333b0c153b432dc7d9f47338d
Author: Miklos Vajna 
Date:   Tue Nov 10 14:11:54 2015 +0100

sw: rename sw::Frame in the WW8 filter to ww8::Frame

This way it's more clear that sw::FrameClient has nothing to do with
sw::Frame, also later renaming SwFrm to SwFrame won't cause confusion
about why do we have both sw::Frame and SwFrame.

Change-Id: I87c4d199d418c77fdbb600fc388c8b9f026cb0fa

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 3fe18ea..308a247 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -129,7 +129,7 @@ namespace rtl { class OUString; }
 
 class MSWordExportBase;
 
-namespace sw { class Frame; }
+namespace ww8 { class Frame; }
 
 namespace msword {
 const sal_uInt8 ColumnBreak = 0xE;
@@ -365,7 +365,7 @@ protected:
 static void GetNumberPara( OUString& rStr, const SwField& rField );
 
 /// Output frames - the implementation.
-virtual void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& 
rNdTopLeft ) = 0;
+virtual void OutputFlyFrame_Impl( const ww8::Frame& rFormat, const Point& 
rNdTopLeft ) = 0;
 
 /// Sfx item Sfx item RES_CHRATR_CASEMAP
 virtual void CharCaseMap( const SvxCaseMapItem& ) = 0;
@@ -643,7 +643,7 @@ public:
 void OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool 
bTestForDefault );
 
 /// Output frames.
-void OutputFlyFrame( const sw::Frame& rFormat );
+void OutputFlyFrame( const ww8::Frame& rFormat );
 
 void GetTablePageSize
 ( ww8::WW8TableNodeInfoInner * pTableTextNodeInfoInner,
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index cfd0484..bcfbf61 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -450,7 +450,7 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 {
 // write the paragraph properties + the run, already in the correct order
 m_pSerializer->mergeTopMarks(Tag_StartParagraph_2);
-std::vector<  std::shared_ptr  > aFramePrTextbox;
+std::vector<  std::shared_ptr  > aFramePrTextbox;
 // Write the anchored frame if any
 // Word can't handle nested text boxes, so write them on the same level.
 ++m_nTextFrameLevel;
@@ -463,7 +463,7 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 for (size_t nIndex = 0; nIndex < m_aFramesOfParagraph.size(); ++nIndex)
 {
 m_bParagraphFrameOpen = true;
-sw::Frame aFrame = m_aFramesOfParagraph[nIndex];
+ww8::Frame aFrame = m_aFramesOfParagraph[nIndex];
 const SwFrameFormat& rFrameFormat = aFrame.GetFrameFormat();
 
 if (!TextBoxIsFramePr(rFrameFormat) || m_bWritingHeaderFooter)
@@ -526,8 +526,8 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 }
 else
 {
-std::shared_ptr  pFramePr;
-pFramePr.reset(new sw::Frame(aFrame));
+std::shared_ptr  pFramePr;
+pFramePr.reset(new ww8::Frame(aFrame));
 aFramePrTextbox.push_back(pFramePr);
 }
 }
@@ -585,7 +585,7 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 // Write framePr
 if(!aFramePrTextbox.empty())
 {
-for (std::vector< std::shared_ptr > ::iterator it = 
aFramePrTextbox.begin() ; it != aFramePrTextbox.end(); ++it)
+for (std::vector< std::shared_ptr > ::iterator it = 
aFramePrTextbox.begin() ; it != aFramePrTextbox.end(); ++it)
 {
  

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

[Miklos Vajna]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |4 ++
 sw/inc/docufld.hxx  |1 
 sw/inc/fldbas.hxx   |1 
 sw/inc/fmtfld.hxx   |1 
 sw/source/core/fields/docufld.cxx   |   15 ++
 sw/source/core/fields/fldbas.cxx|   29 +++-
 sw/source/core/txtnode/atrfld.cxx   |   17 +++
 sw/source/uibase/docvw/PostItMgr.cxx|   11 ++-
 sw/source/uibase/docvw/SidebarTxtControl.cxx|   11 +++
 9 files changed, 69 insertions(+), 21 deletions(-)

New commits:
commit 6c3dbdbccbcccf914360dac1167599c5b89446a8
Author: Miklos Vajna 
Date:   Tue Nov 10 14:08:26 2015 +0100

sw lok: fix width of the notes sidebar

The map mode is in general disabled during tiled rendering, so mouse
positions can be sent in using twips, but here we have to temporarily
enable it, otherwise the width will be returned always in pixels.

With this, the gray background of the sidebar has the proper width, not
e.g. fifteenth of the expected value (using default zoom).

Change-Id: I4380ee0ba6bcda97cf71735161dbdc826e7a2532

diff --git a/sw/source/uibase/docvw/PostItMgr.cxx 
b/sw/source/uibase/docvw/PostItMgr.cxx
index 08bb106..1abe5c4 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -74,6 +74,7 @@
 
 #include 
 #include 
+#include 
 
 #include "annotsh.hxx"
 #include "swabstdlg.hxx"
@@ -1813,7 +1814,15 @@ unsigned long SwPostItMgr::GetSidebarWidth(bool bPx) 
const
 if (bPx)
 return aWidth;
 else
-return mpEditWin->PixelToLogic(Size( aWidth ,0)).Width();
+{
+bool bEnableMapMode = comphelper::LibreOfficeKit::isActive() && 
!mpEditWin->IsMapModeEnabled();
+if (bEnableMapMode)
+mpEditWin->EnableMapMode();
+long nRet = mpEditWin->PixelToLogic(Size(aWidth, 0)).Width();
+if (bEnableMapMode)
+mpEditWin->EnableMapMode(false);
+return nRet;
+}
 }
 
 unsigned long SwPostItMgr::GetSidebarBorderWidth(bool bPx) const
commit b3b9f2c5b4dde4c5ea9736f8ceda4cdb98036b0b
Author: Miklos Vajna 
Date:   Tue Nov 10 11:42:36 2015 +0100

sw: allow doc model xml dump creation while editing comment text

Change-Id: Ie682cfe97b8c48bc66575b89875ca617dbb8ab4e

diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx 
b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 4ab884b..4b1c274 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -20,6 +20,8 @@
 #include 
 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -187,6 +189,15 @@ void SidebarTextControl::Paint(vcl::RenderContext& 
rRenderContext, const Rectang
 
 void SidebarTextControl::KeyInput( const KeyEvent& rKeyEvt )
 {
+if (getenv("SW_DEBUG") && rKeyEvt.GetKeyCode().GetCode() == KEY_F12)
+{
+if (rKeyEvt.GetKeyCode().IsShift())
+{
+mrDocView.GetDocShell()->GetDoc()->dumpAsXml();
+return;
+}
+}
+
 const vcl::KeyCode& rKeyCode = rKeyEvt.GetKeyCode();
 sal_uInt16 nKey = rKeyCode.GetCode();
 if ( ( rKeyCode.IsMod1() && rKeyCode.IsMod2() ) &&
commit 9b504ad3ae9f71ea02df2ab6f2c2fbd59d38ae9a
Author: Miklos Vajna 
Date:   Tue Nov 10 11:33:03 2015 +0100

sw doc model xml dump: show comment text

Change-Id: If15ca89f2b7c54441f076eb233c4e1414dac25c0

diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 34b083e..2e8c915 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -487,6 +487,7 @@ public:
 virtual boolQueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) 
const override;
 virtual boolPutValue( const css::uno::Any& rVal, sal_uInt16 nWhich 
) override;
 virtual OUStringGetDescription() const override;
+virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
 class SwDocInfoFieldType : public SwValueFieldType
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 603e758..6a49b5e 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -360,6 +360,7 @@ public:
 virtual OUStringGetDescription() const;
 /// Is this field clickable?
 bool IsClickable() const;
+virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 inline SwFieldType* SwField::GetTyp() const
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 0f83415..4aba5ee 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -112,6 +112,7 @@ public:
 { return m_wXTextField; }
 SAL_DLLPRIVATE void 
SetXTextField(css::uno::Reference const& xTextField)
 { m_wXTextField = xTextField; }
+void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
 enum class SwFormatFieldHintWhich
diff --git a/sw/source/core/fields/docufld.cxx 
b/sw/source/core/fields/docufld.cxx
index 8227cc

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

[Stephan Bergmann]

 sc/qa/unit/bugfix-test.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60679f4740602cbd487ec36ad8be59429acc47b3
Author: Stephan Bergmann 
Date:   Tue Nov 10 14:08:26 2015 +0100

loplugin:nullptr

Change-Id: I7e266a0e29d86247d01df38da00899a8a1700719

diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 2b5d2ef..8518e20 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -192,11 +192,11 @@ void ScFiltersTest::testTdf91979()
 CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
 
 ScDocShellRef xDocSh = dynamic_cast(pFoundShell);
-CPPUNIT_ASSERT(xDocSh != NULL);
+CPPUNIT_ASSERT(xDocSh != nullptr);
 
 // Get the document controller
 ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
-CPPUNIT_ASSERT(pViewShell != NULL);
+CPPUNIT_ASSERT(pViewShell != nullptr);
 auto& aViewData = pViewShell->GetViewData();
 auto* pDoc = aViewData.GetDocument();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/qa/unit/bugfix-test.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 46b3d0697468bcad6522f8e29007b544e3440b5a
Author: Stephan Bergmann 
Date:   Tue Nov 10 14:05:58 2015 +0100

loplugin:staticcall

Change-Id: I9ff07fcd5160cf218dc5add2db362aa329544708

diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 209776d..2b5d2ef 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -202,8 +202,8 @@ void ScFiltersTest::testTdf91979()
 
 // Check coordinates of a distant cell
 Point aPos = aViewData.GetScrPos(MAXCOL - 1, 1, SC_SPLIT_TOPLEFT, 
true);
-int nColWidth = aViewData.ToPixel(pDoc->GetColWidth(0, 0), 
aViewData.GetPPTX());
-int nRowHeight = aViewData.ToPixel(pDoc->GetRowHeight(0, 0), 
aViewData.GetPPTY());
+int nColWidth = ScViewData::ToPixel(pDoc->GetColWidth(0, 0), 
aViewData.GetPPTX());
+int nRowHeight = ScViewData::ToPixel(pDoc->GetRowHeight(0, 0), 
aViewData.GetPPTY());
 CPPUNIT_ASSERT(aPos.getX() == (MAXCOL - 1) * nColWidth);
 CPPUNIT_ASSERT(aPos.getY() == 1 * nRowHeight);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help compiling an idl for an Add-in

[lucass]

Hello,
I downloaded the rpm file on the official site and extracted it (using the
file compression tool that comes with ubuntu).
I couldn't make idlc work, but I think it was because my own lack of
experience.
When running idlc it complained about not finding libreglo.so .
I've changed idlc to output what it was calling and it is indeed calling
the idlc.bin on the same folder on the sdk.
Is there anything else you think I could try to investigate the problem a
little further?
I'm more experienced on Java, so I'm sorry that I can't provide any further
details.

Thanks


On Mon, Nov 9, 2015 at 7:15 PM, lucass  wrote:

> Hi Bjoern,
>
> This is the cpp output:
>
> ➜  ~  cpp --version
> cpp (Ubuntu 5.2.1-22ubuntu2) 5.2.1 20151010
> Copyright (C) 2015 Free Software Foundation, Inc.
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
>
> So, 5.2.1 right?
>
> I'll try to download the sdk instead to check if it compiles.
> I'll let you know the result.
>
> thanks
>
>
> On Mon, Nov 9, 2015 at 9:39 AM, Bjoern Michaelsen <
> bjoern.michael...@canonical.com> wrote:
>
>> Hi,
>>
>> On Mon, Nov 09, 2015 at 10:58:20AM +0100, Stephan Bergmann wrote:
>> > The SDK's idlc calls out to a C preprocessor to preprocess the .idl
>> files.
>> > Normally, it calls the ucpp executable next to itself in the SDK's bin
>> dir.
>> > I assume that something is broken in the Ubuntu setup, and that idlc
>> calls
>> > some other preprocessor in a way that does not work.
>>
>> Ubuntu uses cpp as provided by gcc. This is known not to work with
>> gcc-4.8, but
>> so far there was no indication for me that it doesnt work with later
>> versions
>> of gcc.
>>
>> @lucass: What gcc version do you have installed? (What does "cpp
>> --version" say?)
>>
>> Best,
>>
>> Bjoern
>>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Oliver Specht]

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

New commits:
commit 83518724e389dbc76f6f87602ea74df434e25de4
Author: Oliver Specht 
Date:   Tue Nov 10 13:38:02 2015 +0100

added slash to 'Merge Modules' path to fix building win instset

Change-Id: I83702435e9f8e0e73d6a3ecee1e6a7a30dda52d9
Reviewed-on: https://gerrit.libreoffice.org/19886
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 2f064eb..6bdf28d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5340,7 +5340,7 @@ find_msms()
 dnl something like $(perl -e 'print $ENV{"CommonProgramFiles(x86)"}') to
 dnl obtain its value from cygwin:
 if test -z "$msmdir"; then
-my_msm_dir="${COMMONPROGRAMFILES}/Merge Modules"
+my_msm_dir="${COMMONPROGRAMFILES}/Merge Modules/"
 if test -e "$my_msm_dir/$my_msm_file"; then
 msmdir=$my_msm_dir
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/qa/extras/uiwriter/uiwriter.cxx  |2 ++
 sw/source/filter/ww8/rtfattributeoutput.cxx |6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a6ae84cc296d4d28e9a48a57406e955138c87a80
Author: Mike Kaganski 
Date:   Sun Nov 1 10:03:50 2015 +1000

tdf#70318: Prevent extra empty paragraph in clipboard RTF content

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

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index b9b3e93..3049531 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -527,6 +527,8 @@ void SwUiWriterTest::testExportRTF()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aData.indexOf("aaa"));
 CPPUNIT_ASSERT(aData.indexOf("bbb") != -1);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aData.indexOf("ccc"));
+// Ensure there's no extra newline
+CPPUNIT_ASSERT(aData.endsWith(OString("bbb}") + 
OString(SAL_NEWLINE_STRING) + OString("}")));
 }
 
 void SwUiWriterTest::testFdo74981()
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 52cdf24..47f63db 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -273,9 +273,9 @@ void 
RtfAttributeOutput::StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNo
 void RtfAttributeOutput::EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t 
pTextNodeInfoInner)
 {
 bool bLastPara = false;
-if (m_rExport.m_nTextTyp == TXT_FTN || m_rExport.m_nTextTyp == TXT_EDN)
+if (m_rExport.m_nTextTyp == TXT_FTN || m_rExport.m_nTextTyp == TXT_EDN || 
m_rExport.m_pDoc->IsClipBoard())
 {
-// We're ending a paragraph that is the last paragraph of a footnote 
or endnote.
+// We're ending a paragraph that is the last paragraph of a footnote 
or endnote, or of clipboard.
 bLastPara = m_rExport.m_nCurrentNodeIndex && 
m_rExport.m_nCurrentNodeIndex == m_rExport.m_pCurPam->End()->nNode.GetIndex();
 }
 
@@ -290,7 +290,7 @@ void 
RtfAttributeOutput::EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t pTex
 else
 {
 aParagraph->append(SAL_NEWLINE_STRING);
-// RTF_PAR at the end of the footnote would cause an additional empty 
paragraph.
+// RTF_PAR at the end of the footnote or clipboard, would cause an 
additional empty paragraph.
 if (!bLastPara)
 {
 aParagraph->append(OOO_STRING_SVTOOLS_RTF_PAR);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

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

New commits:
commit 96a6b7bb1a073b6d2a5c01712b2c9a818c53c77a
Author: tagezi 
Date:   Mon Nov 9 14:45:22 2015 +0200

Updated core
Project: help  c3b9e2711f3670e3a9f5fdf7abb7e4dca8ea1f2b

tdf#95698 correction a parent tag for paragraphs

ful_func.xhp -- changed the parent tag from 'variable' to 'section'
for paragraphs

func_im* -- canged corresponding links form embedvar to embed

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

diff --git a/helpcontent2 b/helpcontent2
index 886917b..c3b9e27 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 886917bcac6656b66f78c84c57cc30822008
+Subproject commit c3b9e2711f3670e3a9f5fdf7abb7e4dca8ea1f2b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 source/text/scalc/01/ful_func.xhp|   12 ++--
 source/text/scalc/01/func_imcos.xhp  |6 +++---
 source/text/scalc/01/func_imcosh.xhp |6 +++---
 source/text/scalc/01/func_imcot.xhp  |6 +++---
 source/text/scalc/01/func_imcsc.xhp  |6 +++---
 source/text/scalc/01/func_imcsch.xhp |6 +++---
 source/text/scalc/01/func_imsec.xhp  |6 +++---
 source/text/scalc/01/func_imsech.xhp |6 +++---
 source/text/scalc/01/func_imsin.xhp  |6 +++---
 source/text/scalc/01/func_imsinh.xhp |6 +++---
 source/text/scalc/01/func_imtan.xhp  |6 +++---
 11 files changed, 36 insertions(+), 36 deletions(-)

New commits:
commit c3b9e2711f3670e3a9f5fdf7abb7e4dca8ea1f2b
Author: tagezi 
Date:   Mon Nov 9 14:45:22 2015 +0200

tdf#95698 correction a parent tag for paragraphs

ful_func.xhp -- changed the parent tag from 'variable' to 'section'
for paragraphs

func_im* -- canged corresponding links form embedvar to embed

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

diff --git a/source/text/scalc/01/ful_func.xhp 
b/source/text/scalc/01/ful_func.xhp
index 4835f40..b6ff653 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -15,16 +15,16 @@
 
 
 Title in descriptions of functions 
-   
+   

Syntax

-   
-   
+   
+   

Examples

-   
+   

 Notes for functions 

@@ -61,10 +61,10 @@
The imaginary part is equal to zero, so it is not 
displayed in the result.


-   
+   

The result is presented in the string format and has 
the character "i" or "j" as an imaginary unit.

-   
+   
 
 
diff --git a/source/text/scalc/01/func_imcos.xhp 
b/source/text/scalc/01/func_imcos.xhp
index 9e0b221..1e49165 100644
--- a/source/text/scalc/01/func_imcos.xhp
+++ b/source/text/scalc/01/func_imcos.xhp
@@ -34,9 +34,9 @@

cos(a+bi) = cos(a)cosh(b) - sin(a)sinh(b)i
 
-   
+   

-   
+   

IMCOS(Complex_number)

@@ -51,7 +51,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imcosh.xhp 
b/source/text/scalc/01/func_imcosh.xhp
index f93b09b..de6c9b7 100644
--- a/source/text/scalc/01/func_imcosh.xhp
+++ b/source/text/scalc/01/func_imcosh.xhp
@@ -34,9 +34,9 @@

cosh(a+bi)=cosh(a)cos(b)+sinh(a)sin(b)i

-   
+   

-   
+   

IMCOSH(Complex_number)

@@ -51,7 +51,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imcot.xhp 
b/source/text/scalc/01/func_imcot.xhp
index 7993741..7a35940 100644
--- a/source/text/scalc/01/func_imcot.xhp
+++ b/source/text/scalc/01/func_imcot.xhp
@@ -38,9 +38,9 @@



-   
+   

-   
+   

IMCOT(Complex_number)

@@ -55,7 +55,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imcsc.xhp 
b/source/text/scalc/01/func_imcsc.xhp
index 7285d50..24bdfdc 100644
--- a/source/text/scalc/01/func_imcsc.xhp
+++ b/source/text/scalc/01/func_imcsc.xhp
@@ -38,9 +38,9 @@



-   
+   

-   
+   

IMCSC(Complex_number)

@@ -55,7 +55,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imcsch.xhp 
b/source/text/scalc/01/func_imcsch.xhp
index 4b054a5..f543812 100644
--- a/source/text/scalc/01/func_imcsch.xhp
+++ b/source/text/scalc/01/func_imcsch.xhp
@@ -38,9 +38,9 @@



-   
+   

-   
+   

IMCSCH(Complex_number)

@@ -55,7 +55,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imsec.xhp 
b/source/text/scalc/01/func_imsec.xhp
index ca9b031..e614a7d 100644
--- a/source/text/scalc/01/func_imsec.xhp
+++ b/source/text/scalc/01/func_imsec.xhp
@@ -38,9 +38,9 @@



-   
+   

-   
+   

IMSEC(Complex_number)

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

[Giuseppe Castagno]

 external/neon/UnpackedTarball_neon.mk |   11 
 external/neon/neon_fix_lock_timeout_windows.patch |   27 ++
 2 files changed, 38 insertions(+)

New commits:
commit f75c1966a6869eb043debbcb4432a6b12f874d10
Author: Giuseppe Castagno 
Date:   Sun Nov 8 11:48:31 2015 +0100

tdf#90249 fix lock timeout in neon for Windows platform.

According to RFC 4918 the value used for lock timeout is unsigned
32 bit, see:

for info.

This patch fix the way the timeout element of lock response
payload is parsed in Windows.

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

diff --git a/external/neon/UnpackedTarball_neon.mk 
b/external/neon/UnpackedTarball_neon.mk
index 25784c4..9cce366 100644
--- a/external/neon/UnpackedTarball_neon.mk
+++ b/external/neon/UnpackedTarball_neon.mk
@@ -17,12 +17,23 @@ $(eval $(call gb_UnpackedTarball_add_files,neon,src,\
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,neon,0))
 
+ifeq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,neon,\
external/neon/neon.patch \
external/neon/neon_ne_set_request_flag.patch \
external/neon/neon_with_gnutls.patch \
external/neon/ubsan.patch \
external/neon/neon_fix_lock_token_on_if.patch \
+   external/neon/neon_fix_lock_timeout_windows.patch \
 ))
+else
+$(eval $(call gb_UnpackedTarball_add_patches,neon,\
+   external/neon/neon.patch \
+   external/neon/neon_ne_set_request_flag.patch \
+   external/neon/neon_with_gnutls.patch \
+   external/neon/ubsan.patch \
+   external/neon/neon_fix_lock_token_on_if.patch \
+))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/neon/neon_fix_lock_timeout_windows.patch 
b/external/neon/neon_fix_lock_timeout_windows.patch
new file mode 100644
index 000..d6fe030
--- /dev/null
+++ b/external/neon/neon_fix_lock_timeout_windows.patch
@@ -0,0 +1,27 @@
+--- src.origin/ne_locks.c  2007-02-05 11:09:27.0 +0100
 src/ne_locks.c 2015-11-08 17:21:52.968561488 +0100
+@@ -428,10 +428,20 @@
+ if (ne_strcasecmp(timeout, "infinite") == 0) {
+   return NE_TIMEOUT_INFINITE;
+ } else if (strncasecmp(timeout, "Second-", 7) == 0) {
+-  long to = strtol(timeout+7, NULL, 10);
+-  if (to == LONG_MIN || to == LONG_MAX)
+-  return NE_TIMEOUT_INVALID;
+-  return to;
++// according RFC 4918 the value used for lock timeout is unsigned 32 
bit
++// see: 
++// adapt it to the 'long' used internally by neon instead
++// LONG_MAX means around 68 years.
++unsigned long to1 = strtoul(timeout+7, NULL, 10);
++long to;
++if (to1 >= LONG_MAX)
++to = LONG_MAX - 1;
++else
++to = (long)to1;
++NE_DEBUG(NE_DBG_LOCKS, "Received lock timeout: %ld\n", to);
++if (to == LONG_MIN || to == LONG_MAX)
++return NE_TIMEOUT_INVALID;
++return to;
+ } else {
+   return NE_TIMEOUT_INVALID;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: System POPPLER_VERSION redefined, won't build

[Michael Stahl]

On 09.11.2015 04:39, ariel cornejo wrote:
> (cont'd)
> 
> Apparently POPPLER_VERSION depends on HAVE_POPPLER_VERSION_H, which in
> turn is set in the configure script:
> 
> $as_echo "#define HAVE_POPPLER_VERSION_H 1" >>confdefs.h

it is definitely a bug somewhere if HAVE_POPPLER_VERSION_H isn't set for
a current version of poppler.

e.g. on Fedora 22 i have /usr/include/poppler/cpp/poppler-version.h and
HAVE_POPPLER_VERSION_H set.

maybe look at config.log where it checks for poppler-version.h what the
error is.

> But in the past I've just had to run autogen.sh before make. What's
> more, configure ignores the options I set in autogen.lastrun. Just to
> see what would happen, I created core/confdefs.h with the single
> required line, to no avail; it might not even be the right path.

you need to use autogen.input, not autogen.lastrun.



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

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

[Takeshi Abe]

 vcl/source/outdev/text.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e3bd0951e6b8e8889aabc8640c5641ab32300517
Author: Takeshi Abe 
Date:   Fri Oct 16 10:36:23 2015 +0900

vcl: Assert that a non-negative nXPos is always found

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

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 9a745be..c37951e 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1124,6 +1124,7 @@ bool OutputDevice::GetCaretPositions( const OUString& 
rStr, long* pCaretXArray,
 for( i = 0; i < 2 * nLen; ++i )
 if( pCaretXArray[ i ] >= 0 )
 break;
+assert(i < 2 * nLen); // otherwise i may go beyond the end of pCaretXArray
 long nXPos = pCaretXArray[ i ];
 for( i = 0; i < 2 * nLen; ++i )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sfx2/source/dialog/dinfdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c34ae20ed2d36e3853ce4c5cf6bea0d7d088d6b
Author: Stephan Bergmann 
Date:   Tue Nov 10 13:26:42 2015 +0100

loplugin:bodynotinblock

Change-Id: I10e532dcbe98384fde9c553ccd2e151abf53251f

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 1bd60c6..8209bd4 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -570,7 +570,7 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, 
sal_uInt8 nMemberId )
 case MID_DOCINFO_USETHUMBNAILSAVE:
 bRet = (rVal >>=bValue);
 if ( bRet )
-SetUseThumbnailSave( bValue );
+SetUseThumbnailSave( bValue );
 break;
 case MID_DOCINFO_DELETEUSERDATA:
 // QUESTION: deleting user data was done here; seems to be 
superfluous!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 starmath/source/node.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 594733a5410fed82968d10a9854a82e8d896f250
Author: Takeshi Abe 
Date:   Sat Oct 10 18:51:07 2015 +0900

starmath: Assert FindIndex()'s precondition

by using std::assert rather thatn DBG_ASSERT.

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

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index cf50b77..a1847ef 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -259,16 +260,15 @@ void SmNode::Prepare(const SmFormat &rFormat, const 
SmDocShell &rDocShell)
 
 sal_uInt16 SmNode::FindIndex() const
 {
-const SmStructureNode* pParent = GetParent();
-if (!pParent) { return 0; }
+assert(mpParentNode != nullptr && "FindIndex() requires this is a 
subnode.");
 
-for (sal_uInt16 i = 0; i < pParent->GetNumSubNodes(); ++i) {
-if (pParent->GetSubNode(i) == this) {
+for (sal_uInt16 i = 0; i < mpParentNode->GetNumSubNodes(); ++i) {
+if (mpParentNode->GetSubNode(i) == this) {
 return i;
 }
 }
 
-DBG_ASSERT(false, "Connection between parent and child is inconsistent.");
+assert(false && "Connection between parent and child is inconsistent.");
 return 0;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Niklas Johansson]

 sw/source/core/access/accpara.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2bd26bfc3ca278b5b31d86bd3cfac95342009e8d
Author: Niklas Johansson 
Date:   Sun Oct 18 00:44:03 2015 +0200

NVDA does not read . when stepping word by word

SwAccessibleParagraph::GetWordBoundary is called when you navigate
word by word normally done by pressing Ctrl+Right/Left arrow. This works
well as long as the word is an actual word. Problem is that what we
land on is not always an actual word the cursor will for example stop
at . (periods) and at the moment that won't be exposed to accessibility
tools such as NVDA screen reader. Orca on Linux seem to have some type
of workaround but it dosen't really work. I'll try to find out if the
workaround is actually in Orca or in the way LibreOffice exposes things
to atk.

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

diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 4822556..d18841e 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -768,9 +768,9 @@ bool SwAccessibleParagraph::GetWordBoundary(
 rBound = g_pBreakIt->GetBreakIter()->getWordBoundary(
 rText, nPos, aLocale, nWordType, sal_True );
 
-// It's a word if the first character is an alpha-numeric character.
-bRet = GetAppCharClass().isLetterNumeric(
-OUString(rText[rBound.startPos]) );
+// If we have a break-iterator let's trust that it
+// does the right thing.
+bRet = true;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[bureken]

 include/sfx2/dinfdlg.hxx |7 +-
 include/sfx2/objsh.hxx   |2 +
 include/sfx2/sfx.hrc |1 
 sfx2/source/dialog/dinfdlg.cxx   |   40 ++-
 sfx2/source/doc/objcont.cxx  |   12 ++
 sfx2/source/doc/objserv.cxx  |6 +++--
 sfx2/source/doc/objstor.cxx  |2 -
 sfx2/source/inc/objshimp.hxx |1 
 sfx2/uiconfig/ui/documentinfopage.ui |   19 
 9 files changed, 85 insertions(+), 5 deletions(-)

New commits:
commit d7ca71d4b1ac085c575fdc24f37940100ab38961
Author: bureken 
Date:   Mon Oct 26 03:39:00 2015 +0300

tdf#87995 - settings : missing a checkbox in order to avoid thumbnail saving

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

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 1d3ef7a..faf6494 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -81,6 +81,7 @@ private:
 bool m_bHasTemplate;
 bool m_bDeleteUserData;
 bool m_bUseUserData;
+bool m_bUseThumbnailSave;
 std::vector< CustomProperty* >m_aCustomProperties;
 css::uno::Sequence< css::document::CmisProperty > m_aCmisProperties;
 
@@ -90,7 +91,7 @@ public:
 SfxDocumentInfoItem( const OUString &rFileName,
 const css::uno::Reference< css::document::XDocumentProperties> & 
i_xDocProps,
 const css::uno::Sequence< css::document::CmisProperty> & i_cmisProps,
-bool bUseUserData );
+bool bUseUserData, bool bUseThumbnailSave );
 SfxDocumentInfoItem( const SfxDocumentInfoItem& );
 virtual ~SfxDocumentInfoItem();
 
@@ -153,8 +154,11 @@ public:
 boolHasTemplate() const { return m_bHasTemplate; }
 voidSetDeleteUserData( bool bSet );
 voidSetUseUserData( bool bSet );
+voidSetUseThumbnailSave( bool bSet );
 boolIsDeleteUserData() const { return m_bDeleteUserData;}
 boolIsUseUserData() const { return m_bUseUserData;}
+boolIsUseThumbnailSave() const { return m_bUseThumbnailSave;}
+
 
 std::vector< CustomProperty* >  GetCustomProperties() const;
 voidClearCustomProperties();
@@ -194,6 +198,7 @@ private:
 
 VclPtr  m_pUseUserDataCB;
 VclPtrm_pDeleteBtn;
+VclPtr  m_pUseThumbnailSaveCB;
 
 VclPtr m_pTemplFt;
 VclPtr   m_pTemplValFt;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 70da010..fed9399 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -422,10 +422,12 @@ public:
 
 boolIsQueryLoadTemplate() const;
 boolIsUseUserData() const;
+boolIsUseThumbnailSave() const;
 boolIsLoadReadonly() const;
 boolIsSaveVersionOnClose() const;
 voidSetQueryLoadTemplate( bool b );
 voidSetUseUserData( bool bNew );
+voidSetUseThumbnailSave( bool _bNew );
 voidSetLoadReadonly( bool _bReadonly );
 voidSetSaveVersionOnClose( bool bSet );
 voidResetFromTemplate( const OUString& 
rTemplateName, const OUString& rFileName );
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 4f63e526..582ad1e 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -228,6 +228,7 @@
 #define MID_DOCINFO_DEFAULTTARGET0x30
 #define MID_DOCINFO_USEUSERDATA  0x31
 #define MID_DOCINFO_DELETEUSERDATA   0x32
+#define MID_DOCINFO_USETHUMBNAILSAVE 0x33
 
 // only for FastPropertySet
 #define MID_TYPE 0x38
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index ecd40c9..1bd60c6 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -214,13 +214,14 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
 , m_bHasTemplate( true )
 , m_bDeleteUserData( false )
 , m_bUseUserData( true )
+, m_bUseThumbnailSave( true )
 {
 }
 
 SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile,
 const uno::Reference& i_xDocProps,
 const uno::Sequence& i_cmisProps,
-bool bIs )
+bool bIs, bool _bIs )
 : SfxStringItem( SID_DOCINFO, rFile )
 , m_AutoloadDelay( i_xDocProps->getAutoloadSecs() )
 , m_AutoloadURL( i_xDocProps->getAutoloadURL() )
@@ -243,6 +244,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& 
rFile,
 , m_bHasTemplate( true )
 , m_bDeleteUserData( false )
 , m_bUseUserData( bIs )
+, m_bUseThumbnailSave( _bIs )
 {
  

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

[Stephan Bergmann]

 include/LibreOfficeKit/LibreOfficeKit.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 37968fd404ca04333502921e5560f893c7933888
Author: Stephan Bergmann 
Date:   Tue Nov 10 13:21:28 2015 +0100

Missing include (for NULL)

Change-Id: I26e448de315b56f36cfeb74a66c0db6a9148d9b0

diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 303f397..fe8c4d1 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
 #define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
 
+#include 
+
 #include "LibreOfficeKit.h"
 #include "LibreOfficeKitInit.h"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/CppunitTest_libreofficekit_checkapi.mk libreofficekit/Module_libreofficekit.mk libreofficekit/qa

[Stephan Bergmann]

 libreofficekit/CppunitTest_libreofficekit_checkapi.mk |   28 ++
 libreofficekit/Module_libreofficekit.mk   |4 ++
 libreofficekit/qa/unit/checkapi.cxx   |   22 ++
 3 files changed, 54 insertions(+)

New commits:
commit b17ca2d4782cea3f4d8576ed29c8760e79fb3a26
Author: Stephan Bergmann 
Date:   Tue Nov 10 13:20:42 2015 +0100

Add a check for non-LIBO_INTERNAL_ONLY, C++03-compatible LibreOfficeKit.hxx

Change-Id: I56336b8163de48e424526f5f426c2ad350292627

diff --git a/libreofficekit/CppunitTest_libreofficekit_checkapi.mk 
b/libreofficekit/CppunitTest_libreofficekit_checkapi.mk
new file mode 100644
index 000..600564a
--- /dev/null
+++ b/libreofficekit/CppunitTest_libreofficekit_checkapi.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,libreofficekit_checkapi))
+
+$(eval $(call gb_CppunitTest_add_cxxflags,libreofficekit_checkapi, \
+$(gb_CXX03FLAGS) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,libreofficekit_checkapi, \
+libreofficekit/qa/unit/checkapi \
+))
+
+$(eval $(call gb_CppunitTest_set_external_code,libreofficekit_checkapi))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_CppunitTest_add_libs,libreofficekit_checkapi, \
+-ldl \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libreofficekit/Module_libreofficekit.mk 
b/libreofficekit/Module_libreofficekit.mk
index 7d1c5ea..70cf40b 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_Module_Module,libreofficekit))
 
 ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
 
+$(eval $(call gb_Module_add_check_targets,libreofficekit, \
+CppunitTest_libreofficekit_checkapi \
+))
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
 CppunitTest_libreofficekit_tiledrendering \
 ))
diff --git a/libreofficekit/qa/unit/checkapi.cxx 
b/libreofficekit/qa/unit/checkapi.cxx
new file mode 100644
index 000..acf00e0
--- /dev/null
+++ b/libreofficekit/qa/unit/checkapi.cxx
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#if defined LIBO_INTERNAL_ONLY
+#error Build system problem; LIBO_INTERNAL_ONLY should not be defined here
+#endif
+
+#include 
+
+#include 
+#include 
+#include 
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/com include/cppu include/cppuhelper include/osl include/rtl include/salhelper include/typelib include/uno

[Stephan Bergmann]

 include/com/sun/star/uno/Any.hxx  |1 +
 include/com/sun/star/uno/Reference.h  |1 +
 include/com/sun/star/uno/Reference.hxx|4 
 include/com/sun/star/uno/Sequence.hxx |1 +
 include/com/sun/star/uno/Type.hxx |4 
 include/com/sun/star/uno/genfunc.hxx  |4 
 include/cppu/unotype.hxx  |2 ++
 include/cppuhelper/factory.hxx|4 
 include/cppuhelper/interfacecontainer.h   |1 +
 include/cppuhelper/interfacecontainer.hxx |4 
 include/cppuhelper/typeprovider.hxx   |4 
 include/cppuhelper/weak.hxx   |1 +
 include/cppuhelper/weakref.hxx|4 
 include/osl/conditn.hxx   |4 
 include/osl/diagnose.hxx  |1 +
 include/osl/file.hxx  |1 +
 include/osl/module.hxx|4 
 include/osl/pipe.hxx  |4 
 include/osl/security.hxx  |4 
 include/osl/socket_decl.hxx   |4 
 include/osl/thread.hxx|1 +
 include/rtl/bootstrap.hxx |5 +
 include/rtl/byteseq.hxx   |1 +
 include/rtl/instance.hxx  |2 ++
 include/rtl/math.hxx  |1 +
 include/rtl/strbuf.hxx|1 +
 include/rtl/ustrbuf.hxx   |1 +
 include/rtl/ustring.hxx   |1 +
 include/salhelper/singletonref.hxx|4 
 include/typelib/typedescription.hxx   |4 
 include/uno/current_context.hxx   |4 
 include/uno/dispatcher.hxx|4 
 include/uno/environment.hxx   |4 
 include/uno/mapping.hxx   |4 
 34 files changed, 94 insertions(+)

New commits:
commit 08138396828aea9961f836c203d9d4a683c98882
Author: Stephan Bergmann 
Date:   Tue Nov 10 13:14:21 2015 +0100

Missing includes (for NULL)

Change-Id: Id2359f6ff4bddb2afbc0b346e17cd858f00179e3

diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index 9f0de98..79f0cdb 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -22,6 +22,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/include/com/sun/star/uno/Reference.h 
b/include/com/sun/star/uno/Reference.h
index 58009a3..ba08688 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -22,6 +22,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 
diff --git a/include/com/sun/star/uno/Reference.hxx 
b/include/com/sun/star/uno/Reference.hxx
index 7e8b4db..498d5be 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_REFERENCE_HXX
 #define INCLUDED_COM_SUN_STAR_UNO_REFERENCE_HXX
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
diff --git a/include/com/sun/star/uno/Sequence.hxx 
b/include/com/sun/star/uno/Sequence.hxx
index c522932..8b69039 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.hxx
@@ -22,6 +22,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/include/com/sun/star/uno/Type.hxx 
b/include/com/sun/star/uno/Type.hxx
index 0d88928..36800ce 100644
--- a/include/com/sun/star/uno/Type.hxx
+++ b/include/com/sun/star/uno/Type.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_TYPE_HXX
 #define INCLUDED_COM_SUN_STAR_UNO_TYPE_HXX
 
+#include 
+
+#include 
+
 #include 
 #include 
 
diff --git a/include/com/sun/star/uno/genfunc.hxx 
b/include/com/sun/star/uno/genfunc.hxx
index 9583375..d32f2a3 100644
--- a/include/com/sun/star/uno/genfunc.hxx
+++ b/include/com/sun/star/uno/genfunc.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_GENFUNC_HXX
 #define INCLUDED_COM_SUN_STAR_UNO_GENFUNC_HXX
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx
index 5b4cb4c..2ab7681 100644
--- a/include/cppu/unotype.hxx
+++ b/include/cppu/unotype.hxx
@@ -22,6 +22,8 @@
 
 #include 
 
+#include 
+
 #if defined LIBO_INTERNAL_ONLY
 #include 
 #endif
diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx
index 7f69b76..ee8ac00 100644
--- a/include/cppuhelper/factory.hxx
+++ b/include/cppuhelper/factory.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_CPPUHELPER_FACTORY_HXX
 #define INCLUDED_CPPUHELPER_FACTORY_HXX
 
+#include 
+
+#include 
+
 #include 
 #include 
 
diff --git a/include/cppuhelper/interfacecontainer.h 
b/include/cppuhelper/interfacecontainer.h
index 245b718..5aa75dd 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -21,6 +21,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/cppuhelper/interfacecontainer.hxx 
b/include/cppuhelper/

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

[Niklas Johansson]

 sw/source/core/access/accpara.cxx |   25 -
 sw/source/core/access/accportions.cxx |9 +++--
 2 files changed, 3 insertions(+), 31 deletions(-)

New commits:
commit e2ff5810f1578794aa2617e8d0b44d64642f8eca
Author: Niklas Johansson 
Date:   Sat Oct 3 00:25:48 2015 +0200

tdf#93139 Orca Screen Reader does not read bullet part 2

Since we now expose the bullet character to accessible text we should
not also expose the attributes, that will make NVDA read the bullet
twice. We can also remove some special cases for the fact that the bullet
earlier was not apart of the accessible text.

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

diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 7d0934c..4822556 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1683,14 +1683,6 @@ uno::Sequence 
SwAccessibleParagraph::getCharacterAttributes(
 
 pValues = aValues.getArray();
 
-const SwTextNode* pTextNode( GetTextNode() );
-PropertyValue& rValue = pValues[aValues.getLength() - 1 ];
-rValue.Name = "NumberingPrefix";
-OUString sNumBullet = pTextNode->GetNumString();
-rValue.Value <<= sNumBullet;
-rValue.Handle = -1;
-rValue.State = PropertyState_DIRECT_VALUE;
-
 OUString strTypeName = GetFieldTypeNameAtIndex(nIndex);
 if (!strTypeName.isEmpty())
 {
@@ -2364,23 +2356,6 @@ void SwAccessibleParagraph::_correctValues( const 
sal_Int32 nIndex,
 continue;
 }
 
-//number bullet
-if (rValue.Name == UNO_NAME_NUMBERING_RULES)
-{
-if ( pTextNode->HasBullet() || pTextNode->HasNumber() )
-{
-uno::Any aVal;
-SwNumRule* pNumRule = pTextNode->GetNumRule();
-if (pNumRule)
-{
-uno::Reference< container::XIndexReplace >  xNum = new 
SwXNumberingRules(*pNumRule);
-aVal.setValue(&xNum, 
cppu::UnoType::get());
-}
-rValue.Value <<= aVal;
-}
-continue;
-}
-
 //footnote & endnote
 if (rValue.Name == UNO_NAME_CHAR_ESCAPEMENT)
 {
diff --git a/sw/source/core/access/accportions.cxx 
b/sw/source/core/access/accportions.cxx
index 1fb823c..ec6eb87 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -148,13 +148,9 @@ void SwAccessiblePortionData::Special(
 switch( nType )
 {
 case POR_POSTITS:
-sDisplay = OUString(sal_Unicode(0xfffc));
-break;
 case POR_FLYCNT:
 sDisplay = OUString(sal_Unicode(0xfffc));
 break;
-case POR_GRFNUM:
-break;
 case POR_FLD:
 case POR_HIDDEN:
 case POR_COMBINED:
@@ -180,10 +176,11 @@ void SwAccessiblePortionData::Special(
 break;
 case POR_NUMBER:
 case POR_BULLET:
-{
 sDisplay = rText + " ";
 break;
-}
+// There should probably be some special treatment to graphical bullets
+case POR_GRFNUM:
+break;
 // #i111768# - apply patch from kstribley:
 // Include the control characters.
 case POR_CONTROLCHAR:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 AllLangHelp_shared.mk   |1 
 source/text/scalc/00/0403.xhp   |   36 -
 source/text/scalc/00/0407.xhp   |   32 -
 source/text/scalc/01/0307.xhp   |   57 +-
 source/text/scalc/01/0308.xhp   |   37 +
 source/text/scalc/01/0309.xhp   |   47 +-
 source/text/scalc/01/0310.xhp   |   52 +-
 source/text/scalc/01/0408.xhp   |   76 +--
 source/text/scalc/01/0510.xhp   |  269 +++--
 source/text/scalc/01/0708.xhp   |   50 +-
 source/text/scalc/01/0709.xhp   |   44 +-
 source/text/scalc/guide/line_fix.xhp|   75 +--
 source/text/scalc/main0103.xhp  |   66 ++-
 source/text/scalc/main0104.xhp  |5 
 source/text/scalc/main0105.xhp  |   55 +-
 source/text/scalc/main0107.xhp  |   30 -
 source/text/sdraw/main0103.xhp  |   52 +-
 source/text/shared/00/0406.xhp  |2 
 source/text/shared/00/00040500.xhp  |  540 ++--
 source/text/shared/01/0301.xhp  |  119 +++---
 source/text/shared/01/0304.xhp  |   46 +-
 source/text/shared/01/0306.xhp  |   41 +-
 source/text/shared/01/0311.xhp  |   50 +-
 source/text/shared/01/0399.xhp  |   37 +
 source/text/shared/01/04180100.xhp  |   48 +-
 source/text/shared/01/gallery.xhp   |   57 +-
 source/text/shared/01/guides.xhp|   54 +-
 source/text/shared/01/menu_view_sidebar.xhp |   35 +
 source/text/shared/02/1909.xhp  |   41 +-
 source/text/shared/optionen/01070100.xhp|4 
 source/text/simpress/00/0403.xhp|  123 ++
 source/text/simpress/01/0306.xhp|   39 --
 source/text/simpress/01/0308.xhp|   48 +-
 source/text/simpress/01/0309.xhp|   42 +-
 source/text/simpress/01/0310.xhp|   37 -
 source/text/simpress/01/0311.xhp|   42 +-
 source/text/simpress/01/0312.xhp|   34 -
 source/text/simpress/01/03150100.xhp|   52 +-
 source/text/simpress/01/03150300.xhp|   45 +-
 source/text/simpress/01/03151000.xhp|   37 +
 source/text/simpress/01/0318.xhp|   17 
 source/text/simpress/01/0510.xhp|  173 
 source/text/simpress/01/slidesorter.xhp |2 
 source/text/simpress/main0103.xhp   |   51 +-
 source/text/simpress/main0104.xhp   |1 
 source/text/simpress/main0105.xhp   |   57 +-
 source/text/swriter/00/0403.xhp |  146 +++
 source/text/swriter/01/0211.xhp |3 
 source/text/swriter/01/0305.xhp |   44 +-
 source/text/swriter/01/0307.xhp |   37 -
 source/text/swriter/01/0308.xhp |   46 +-
 source/text/swriter/01/0309.xhp |   43 +-
 source/text/swriter/01/0310.xhp |   42 +-
 source/text/swriter/01/0312.xhp |   36 -
 source/text/swriter/01/0313.xhp |   37 -
 source/text/swriter/01/0314.xhp |   41 +-
 source/text/swriter/01/0514.xhp |  280 +++---
 source/text/swriter/main0103.xhp|   79 ++--
 source/text/swriter/main0105.xhp|   55 +-
 source/text/swriter/main0110.xhp|  168 +---
 60 files changed, 2089 insertions(+), 1826 deletions(-)

New commits:
commit 886917bcac6656b66f78c84c57cc30822008
Author: Yousuf Philips 
Date:   Mon Nov 2 00:06:15 2015 +0400

tdf#92825 Rearrange the view menu in writer, calc, and impress

Change-Id: I707e1daa263acb5a09a6a90e745a619f9dd67388
Reviewed-on: https://gerrit.libreoffice.org/19721
Reviewed-by: Lera Goncharuk 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 3ba125d..dbcc98e 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -340,6 +340,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/01/guides \
 helpcontent2/source/text/shared/01/mediaplayer \
 helpcontent2/source/text/shared/01/menu_edit_find \
+helpcontent2/source/text/shared/01/menu_view_sidebar \
 helpcontent2/source/text/shared/01/moviesound \
 helpcontent2/source/text/shared/01/online_update \
 helpcontent2/source/text/shared/01/online_update_dialog \
diff --git a/source/text/scalc/00/0403.xhp 
b/source/text/scalc/00/0403.xhp
index 38d28e0..48790ed 100644
--- a/source/text/scalc/00/0403.xhp
+++ b/source/text/scalc/00/0403.xhp
@@ -1,6 +1,5 @@
 
-
-
+
 
+-->
 
-
 
-
-View Menu
-/text/scalc/00/0403.xhp
-
-
-Sun Microsystems, Inc.
-converted from old format - 
fpe
-
+  
+View Menu
+/text/scalc/00/0403.xhp
+  
 
+
 
-  
-  
-  View Menu
-  Choose View - Column & Row 
Headers
-  Choose View - Value 
Highlighting
-  Choose View - Toolbars - Formula 
Bar
-  Choose View - Page Break 
Previe

Re: [Libreoffice-qa] Bugzilla: Adding new Status for 'abandoned' bugs?

[Michael Stahl]

On 09.11.2015 23:11, Tommy wrote:
> Joel Madero wrote:
>>
>>>
>>>
>>> I think we should keep labeling those as INVALID
>>>
>>> IMHO the time spent to implement this new
>>> ABANDONED/EXPIRED/WHATEVERstate will be almost useless...
>>>
>>> in both cases the fault of the bug closure is the reporting user
>>> so I really do not care at all being diplomatic with people who don't
>>> provide necessary informations.
>>
>> To put this in context - this began after several users over the course
>> of a few weeks got quite irate at the WFM/Invalid status.
> 
> 
> I don't understand why those people should feel irate or offended if the 
> INVALID state is due to their deficiency to provide a valide testcase or 
> answers to legitimate QA questions...

i think it's just poor usability of bugzilla.  the word INVALID sort of
makes it sound like it should never have been filed in the first place
and it's all the reporter's fault, while e.g. INSUFFICIENT_DATA is
somewhat weaker in assigning blame to the reporter - it may be there's a
valid bug, but we just don't have enough data to fix anything.


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

[Libreoffice-commits] core.git: helpcontent2

[Yousuf Philips]

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

New commits:
commit db3fb670bfc485799b6010541d9316736948befc
Author: Yousuf Philips 
Date:   Mon Nov 2 00:06:15 2015 +0400

Updated core
Project: help  886917bcac6656b66f78c84c57cc30822008

tdf#92825 Rearrange the view menu in writer, calc, and impress

Change-Id: I707e1daa263acb5a09a6a90e745a619f9dd67388
Reviewed-on: https://gerrit.libreoffice.org/19721
Reviewed-by: Lera Goncharuk 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/helpcontent2 b/helpcontent2
index 2f91170..886917b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2f91170b8637554100e427525541ade2fd38c574
+Subproject commit 886917bcac6656b66f78c84c57cc30822008
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sc/qa/unit/bugfix-test.cxx |   43 +
 sc/source/ui/view/viewdata.cxx |   12 +--
 2 files changed, 45 insertions(+), 10 deletions(-)

New commits:
commit 1fa38d29030ae9d9751a1fbec30d8ba3263e681d
Author: Mike Kaganski 
Date:   Fri Nov 6 17:56:19 2015 +1000

tdf#91979: ScViewData::GetScrPos(): remove coordinates limit of 32767

This removes the restriction for returned coodrinates from 
ScViewData::GetScrPos().
The reasoning is the following:
1. In the existing implementation, the limit enforcement is flawed. The 
routine is
capable to return negative coordinates, but only positives are checked. 
Also, the
routine code itself uses value greater than 32767 (specifically, 65535 in 
case of
col/row exceed MAXCOL/MAXROW), that later gets truncated.
2. In case of tiled rendering, it's already possible to see the numbers 
greater
than 32767.
3. Given that the code works for long time and produces big negatives, as 
well as
big positives in case of tiled rendering, it's highly probable that 
existing code
is prepared for large returned values.

Another option could be additionally check for !bAllowNeg before emposing 
the limit

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

diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 0c2d43b..209776d 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -47,6 +47,7 @@
 #include "cellvalue.hxx"
 #include "attrib.hxx"
 #include "dpshttab.hxx"
+#include "tabvwsh.hxx"
 #include 
 #include 
 #include 
@@ -62,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "helper/qahelper.hxx"
 #include "helper/shared_test_impl.hxx"
@@ -82,6 +84,7 @@ public:
 void testTdf36933();
 void testTdf43700();
 void testTdf43534();
+void testTdf91979();
 // void testTdf40110();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
@@ -89,6 +92,7 @@ public:
 CPPUNIT_TEST(testTdf36933);
 CPPUNIT_TEST(testTdf43700);
 CPPUNIT_TEST(testTdf43534);
+CPPUNIT_TEST(testTdf91979);
 // CPPUNIT_TEST(testTdf40110);
 CPPUNIT_TEST_SUITE_END();
 private:
@@ -167,6 +171,45 @@ void ScFiltersTest::testTdf43534()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testTdf91979()
+{
+uno::Reference< frame::XDesktop2 > xDesktop = 
frame::Desktop::create(::comphelper::getProcessComponentContext());
+CPPUNIT_ASSERT(xDesktop.is());
+
+Sequence < beans::PropertyValue > args(1);
+args[0].Name = "Hidden";
+args[0].Value <<= sal_True;
+
+uno::Reference< lang::XComponent > xComponent = 
xDesktop->loadComponentFromURL(
+"private:factory/scalc",
+"_blank",
+0,
+args);
+CPPUNIT_ASSERT(xComponent.is());
+
+// Get the document model
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+
+ScDocShellRef xDocSh = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT(xDocSh != NULL);
+
+// Get the document controller
+ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
+CPPUNIT_ASSERT(pViewShell != NULL);
+auto& aViewData = pViewShell->GetViewData();
+auto* pDoc = aViewData.GetDocument();
+
+// Check coordinates of a distant cell
+Point aPos = aViewData.GetScrPos(MAXCOL - 1, 1, SC_SPLIT_TOPLEFT, 
true);
+int nColWidth = aViewData.ToPixel(pDoc->GetColWidth(0, 0), 
aViewData.GetPPTX());
+int nRowHeight = aViewData.ToPixel(pDoc->GetRowHeight(0, 0), 
aViewData.GetPPTY());
+CPPUNIT_ASSERT(aPos.getX() == (MAXCOL - 1) * nColWidth);
+CPPUNIT_ASSERT(aPos.getY() == 1 * nRowHeight);
+
+xDocSh->DoClose();
+}
+
 /*
 void ScFiltersTest::testTdf40110()
 {
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 6df608e..91272a5 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1529,7 +1529,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW 
nWhereY, ScSplitPos eWhich,
 for (nX = nPosX; nX < nWhereX && (bAllowNeg || bIsTiledRendering || 
nScrPosX <= aScrSize.Width()); nX++)
 {
 if ( nX > MAXCOL )
-nScrPosX = 65535;
+nScrPosX = 0x7FFF;
 else
 {
 nTSize = pDoc->GetColWidth( nX, nTabNo );
@@ -1560,7 +1560,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW 
nWhereY, ScSplitPos eWhich,
 for (nY = nPosY; nY < nWhereY && (bAllowNeg || bIsTiledRendering || 
nScrPosY <= aScrSize.Height()); nY++)
 {
 if ( nY > MAXROW )
-nScrPosY = 65535;
+nScrPosY = 0x7FFF;
 else
 {
 nTSize = pDoc->GetRowHeight( nY, nTab

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

[Stephan Bergmann]

 sfx2/source/appl/shutdowniconaqua.mm |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit a152908657ef662e9c5608e3bca3c5f511a01b8e
Author: Stephan Bergmann 
Date:   Tue Nov 10 12:56:58 2015 +0100

loplugin:stringconstant

Change-Id: Ibb9114d34f2695aa85858e456518e36dbcbe0af1

diff --git a/sfx2/source/appl/shutdowniconaqua.mm 
b/sfx2/source/appl/shutdowniconaqua.mm
index f18791b..58b5c41 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -69,28 +69,28 @@
 ShutdownIcon::FileOpen();
 break;
 case MI_WRITER:
-ShutdownIcon::OpenURL( OUString(  WRITER_URL ), OUString( "_default" ) 
);
+ShutdownIcon::OpenURL( WRITER_URL, "_default" );
 break;
 case MI_CALC:
-ShutdownIcon::OpenURL( OUString( CALC_URL ), OUString( "_default" ) );
+ShutdownIcon::OpenURL( CALC_URL, "_default" );
 break;
 case MI_IMPRESS:
-ShutdownIcon::OpenURL( OUString( IMPRESS_URL ), OUString( "_default" ) 
);
+ShutdownIcon::OpenURL( IMPRESS_URL, "_default" );
 break;
 case MI_DRAW:
-ShutdownIcon::OpenURL( OUString( DRAW_URL ), OUString( "_default" ) );
+ShutdownIcon::OpenURL( DRAW_URL, "_default" );
 break;
 case MI_BASE:
-ShutdownIcon::OpenURL( OUString( BASE_URL ), OUString( "_default" ) );
+ShutdownIcon::OpenURL( BASE_URL, "_default" );
 break;
 case MI_MATH:
-ShutdownIcon::OpenURL( OUString( MATH_URL ), OUString( "_default" ) );
+ShutdownIcon::OpenURL( MATH_URL, "_default" );
 break;
 case MI_TEMPLATE:
 ShutdownIcon::FromTemplate();
 break;
 case MI_STARTMODULE:
-ShutdownIcon::OpenURL( OUString( STARTMODULE_URL ), OUString( 
"_default" ) );
+ShutdownIcon::OpenURL( STARTMODULE_URL, "_default" );
 break;
 default:
 break;
@@ -101,7 +101,7 @@
 {
 (void)pSender;
 // start start module
-ShutdownIcon::OpenURL( OUString( STARTMODULE_URL ), OUString( "_default" ) 
);
+ShutdownIcon::OpenURL( STARTMODULE_URL, "_default" );
 }
 
 @end
@@ -279,7 +279,7 @@ class RecentFilesStringLength : public 
::cppu::WeakImplHelper< css::util::XStrin
 aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = "FilterName";
 aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = css::uno::makeAny( aFilter );
 
-ShutdownIcon::OpenURL( rRecentFile.aURL, OUString( "_default" ), 
aArgsList );
+ShutdownIcon::OpenURL( rRecentFile.aURL, "_default", aArgsList );
 }
 }
 @end
@@ -441,7 +441,7 @@ void aqua_init_systray()
 // insert entry for startcenter
 if( aModuleOptions.IsModuleInstalled( 
SvtModuleOptions::EModule::STARTMODULE ) )
 {
-appendMenuItem( pMenu, nil, pShutdownIcon->GetResString( 
STR_QUICKSTART_STARTCENTER ), MI_STARTMODULE, OUString( "n" ) );
+appendMenuItem( pMenu, nil, pShutdownIcon->GetResString( 
STR_QUICKSTART_STARTCENTER ), MI_STARTMODULE, "n" );
 if( [NSApp respondsToSelector: 
@selector(setDockIconClickHandler:)] )
 [NSApp performSelector:@selector(setDockIconClickHandler:) 
withObject: pExecute];
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry starmath/inc starmath/source starmath/uiconfig

[Marcos Paulo de Souza]

 officecfg/registry/schema/org/openoffice/Office/Math.xcs |   10 +
 starmath/inc/dialog.hxx  |1 
 starmath/inc/starmath.hrc|1 
 starmath/source/cfgitem.cxx  |   28 ++-
 starmath/source/cfgitem.hxx  |2 +
 starmath/source/dialog.cxx   |4 ++
 starmath/source/document.cxx |1 
 starmath/source/edit.cxx |6 ++-
 starmath/source/smmod.cxx|1 
 starmath/source/unomodel.cxx |1 
 starmath/uiconfig/smath/ui/smathsettings.ui  |   16 
 11 files changed, 69 insertions(+), 2 deletions(-)

New commits:
commit e2bfbfcb809329b9ed0bdd2fee14f343ca3603dd
Author: Marcos Paulo de Souza 
Date:   Mon Nov 2 21:43:24 2015 -0200

tdf#43090: Add option to disable auto close brackets

As many users asked, now there is a checkbox inside Tools->Math
called "Auto close brackets, parentheses and braces". This option is
enabled by default, but can be turned off now.

Change-Id: I6f96201c0720fb62fc2dce99222f97194e930fbe
Signed-off-by: Marcos Paulo de Souza 
Reviewed-on: https://gerrit.libreoffice.org/19750
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index 3b05a12..c89c779 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -329,6 +329,16 @@
 
 true
   
+  
+
+
+
+
+  Auto close brackets, parentheses and braces when editing a 
formula.
+  Auto close brackets, parentheses and braces when editing a 
formula
+
+true
+  
 
 
   
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 16cf98d..4e7f374 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -61,6 +61,7 @@ class SmPrintOptionsTabPage : public SfxTabPage
 VclPtrm_pZoom;
 VclPtr   m_pNoRightSpaces;
 VclPtr   m_pSaveOnlyUsedSymbols;
+VclPtr   m_pAutoCloseBrackets;
 
 DECL_LINK_TYPED(SizeButtonClickHdl, Button *, void);
 
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 9a64513..cefa6c5 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -75,6 +75,7 @@
 #define SID_NO_RIGHT_SPACES (SID_SMA_START + 124)
 #define SID_SAVE_ONLY_USED_SYMBOLS  (SID_SMA_START + 125)
 #define SID_ELEMENTSDOCKINGWINDOW   (SID_SMA_START + 126)
+#define SID_AUTO_CLOSE_BRACKETS (SID_SMA_START + 127)
 
 #define RID_PRINTUIOPTIONS  (RID_APP_START + 11)
 
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 858479d..d6c91b7 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -123,6 +123,7 @@ struct SmCfgOther
 boolbPrintFormulaText;
 boolbPrintFrame;
 boolbIsSaveOnlyUsedSymbols;
+boolbIsAutoCloseBrackets;
 boolbIgnoreSpacesRight;
 boolbToolboxVisible;
 boolbAutoRedraw;
@@ -139,7 +140,8 @@ SmCfgOther::SmCfgOther()
 bPrintTitle = bPrintFormulaText   =
 bPrintFrame = bIgnoreSpacesRight  =
 bToolboxVisible = bAutoRedraw =
-bFormulaCursor  = bIsSaveOnlyUsedSymbols = true;
+bIsAutoCloseBrackets = bFormulaCursor
+= bIsSaveOnlyUsedSymbols = true;
 }
 
 
@@ -780,6 +782,7 @@ void SmMathConfig::LoadOther()
 pOther->ePrintSize = 
static_cast(officecfg::Office::Math::Print::Size::get());
 pOther->nPrintZoomFactor = 
officecfg::Office::Math::Print::ZoomFactor::get();
 pOther->bIsSaveOnlyUsedSymbols = 
officecfg::Office::Math::LoadSave::IsSaveOnlyUsedSymbols::get();
+pOther->bIsAutoCloseBrackets = 
officecfg::Office::Math::Misc::AutoCloseBrackets::get();
 pOther->bIgnoreSpacesRight = 
officecfg::Office::Math::Misc::IgnoreSpacesRight::get();
 pOther->bToolboxVisible = 
officecfg::Office::Math::View::ToolboxVisible::get();
 pOther->bAutoRedraw = officecfg::Office::Math::View::AutoRedraw::get();
@@ -801,6 +804,7 @@ void SmMathConfig::SaveOther()
 officecfg::Office::Math::Print::Size::set(pOther->ePrintSize, batch);
 officecfg::Office::Math::Print::ZoomFactor::set(pOther->nPrintZoomFactor, 
batch);
 
officecfg::Office::Math::LoadSave::IsSaveOnlyUsedSymbols::set(pOther->bIsSaveOnlyUsedSymbols,
 batch);
+
officecfg::Office::Math::Misc::AutoCloseBrackets::set(pOther->bIsAutoCloseBrackets,
 batch);
 
officecfg::Office::Math::Misc::IgnoreSpacesRight::set(pOther->bIgnoreSpacesRight,
 batch);
 
officecfg::Office::Math::View::Too

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

[Stephan Bergmann]

 sfx2/source/appl/shutdowniconaqua.mm |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 66094c6ab5776d0ce871621922b90140e01982a6
Author: Stephan Bergmann 
Date:   Tue Nov 10 12:53:59 2015 +0100

loplugin:oncevar

Change-Id: Iee9987aeafed126e4324d8d487289469577fafa2

diff --git a/sfx2/source/appl/shutdowniconaqua.mm 
b/sfx2/source/appl/shutdowniconaqua.mm
index e231aac..f18791b 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -411,14 +411,13 @@ void aqua_init_systray()
 std::set< rtl::OUString > aFileNewAppsAvailable;
 SvtDynamicMenuOptions aOpt;
 css::uno::Sequence < css::uno::Sequence < 
css::beans::PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU );
-const rtl::OUString sURLKey( "URL" );
 
 const css::uno::Sequence< css::beans::PropertyValue >* pNewMenu = 
aNewMenu.getConstArray();
 const css::uno::Sequence< css::beans::PropertyValue >* pNewMenuEnd 
= aNewMenu.getConstArray() + aNewMenu.getLength();
 for ( ; pNewMenu != pNewMenuEnd; ++pNewMenu )
 {
 comphelper::SequenceAsHashMap aEntryItems( *pNewMenu );
-rtl::OUString sURL( aEntryItems.getUnpackedValueOrDefault( 
sURLKey, rtl::OUString() ) );
+rtl::OUString sURL( aEntryItems.getUnpackedValueOrDefault( 
"URL", rtl::OUString() ) );
 if ( sURL.getLength() )
 aFileNewAppsAvailable.insert( sURL );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 editeng/source/editeng/editundo.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a41a4548baf490c8f12e36aa24f1ad943e760400
Author: Stephan Bergmann 
Date:   Mon Nov 9 12:11:15 2015 +0100

EditUndoRemoveChars::GetStr must return a reference

...as ImpEditEngine::ImpRemoveChars (editeng/source/editeng/impedit2.cxx) 
calls

  pCurUndo->GetStr() += aStr;

Regression introduced with d5e11f5ffb741aabe7e43be78ef764a1f3cafd8e "convert
editeng/source/editeng/editundo.hxx from String to OUString."

Change-Id: Iab3dd3b861bca715a90e89e3a63a6f298657367d
(cherry picked from commit e31205f3ec1f941ab5a188bfde6329edf2acc55b)
Reviewed-on: https://gerrit.libreoffice.org/19858
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/editeng/editundo.hxx 
b/editeng/source/editeng/editundo.hxx
index a31261a..9d6451a 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -126,7 +126,7 @@ public:
 EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& 
rStr);
 
 const EPaM& GetEPaM() { return aEPaM; }
-OUStringGetStr() const { return aText; }
+OUString &  GetStr() { return aText; }
 
 virtual voidUndo() SAL_OVERRIDE;
 virtual voidRedo() SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/vcl sw/source vcl/inc vcl/source

[Mark Hung]

 include/vcl/metric.hxx  |1 +
 sw/source/core/inc/scriptinfo.hxx   |3 ++-
 sw/source/core/text/porlay.cxx  |   12 +---
 sw/source/core/txtnode/fntcache.cxx |   24 
 vcl/inc/impfont.hxx |3 ++-
 vcl/inc/outfont.hxx |1 +
 vcl/source/gdi/metric.cxx   |5 +
 vcl/source/outdev/font.cxx  |   19 +++
 8 files changed, 55 insertions(+), 13 deletions(-)

New commits:
commit f5ed3a29e995152b80bf1adc888094d735a0882c
Author: Mark Hung 
Date:   Wed Oct 21 22:34:08 2015 +0800

tdf#81144 Chinese full-width punctuation does not align properly

Ideographic fullstop and comma in most Chinese fonts are centered,
while those in Japanese fonts align closer to the left. Original
compression algorithm trimed right side of the punctuation, making
fullwidth fullstop or comma in Chinese font visually unbalanced.
In worst case, it crowds together with the followed compressed
punctuation.

This patch fix the situation in the folowing way
1) make compression less stronger.
2) Trim space according to glyph bearing to font height ratio.
3) fix a memory access violation issue

Reviewed-on: https://gerrit.libreoffice.org/19517
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

Conflicts:
sw/source/core/txtnode/fntcache.cxx

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

diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index e204969..1f43dcd 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -72,6 +72,7 @@ public:
 longGetExtLeading() const;
 longGetLineHeight() const;
 longGetSlant() const;
+boolIsFullstopCentered() const;
 
 FontMetric& operator=( const FontMetric& rMetric );
 booloperator==( const FontMetric& rMetric ) const;
diff --git a/sw/source/core/inc/scriptinfo.hxx 
b/sw/source/core/inc/scriptinfo.hxx
index 5ad950f..bf3c932 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -37,7 +37,7 @@ typedef std::list< sal_Int32 > PositionList;
 class SwScriptInfo
 {
 public:
-enum CompType { KANA, SPECIAL_LEFT, SPECIAL_RIGHT, NONE };
+enum CompType { KANA, SPECIAL_LEFT, SPECIAL_RIGHT, NONE, SPECIAL_MIDDLE};
 
 private:
 //! Records a single change in script type.
@@ -255,6 +255,7 @@ public:
 // modifies the kerning array according to a given compress value
 long Compress( long* pKernArray, sal_Int32 nIdx, sal_Int32 nLen,
const sal_uInt16 nCompress, const sal_uInt16 nFontHeight,
+   const bool bCentered,
Point* pPoint = NULL ) const;
 
 /** Performs a kashida justification on the kerning array
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 4e41c32..c7afcaf 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -874,12 +874,15 @@ void SwScriptInfo::InitScriptInfo( const SwTextNode& 
rNode, bool bRTL )
 eState = SPECIAL_LEFT;
 break;
 // Right punctuation found
-case 0x3001: case 0x3002: case 0x3009: case 0x300B:
+case 0x3009: case 0x300B:
 case 0x300D: case 0x300F: case 0x3011: case 0x3015:
 case 0x3017: case 0x3019: case 0x301B: case 0x301E:
 case 0x301F:
 eState = SPECIAL_RIGHT;
 break;
+case 0x3001: case 0x3002:   // Fullstop or comma
+eState = SPECIAL_MIDDLE ;
+break;
 default:
 eState = ( 0x3040 <= cChar && 0x3100 > cChar ) ? KANA : 
NONE;
 }
@@ -1509,6 +1512,7 @@ size_t SwScriptInfo::HasKana( sal_Int32 nStart, const 
sal_Int32 nLen ) const
 
 long SwScriptInfo::Compress( long* pKernArray, sal_Int32 nIdx, sal_Int32 nLen,
  const sal_uInt16 nCompress, const sal_uInt16 
nFontHeight,
+ bool bCenter,
  Point* pPoint ) const
 {
 SAL_WARN_IF( !nCompress, "sw.core", "Compression without compression?!" );
@@ -1571,7 +1575,7 @@ long SwScriptInfo::Compress( long* pKernArray, sal_Int32 
nIdx, sal_Int32 nLen,
 long nMove = 0;
 if( SwScriptInfo::KANA != nType )
 {
-nLast /= 2;
+nLast /= 24000;
 if( pPoint && SwScriptInfo::SPECIAL_LEFT == nType )
 {
 if( nI )
@@ -1582,12 +1586,14 @@ long SwScriptInfo::Compress( long* pKernArray, 
sal_Int32 nIdx, s

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf59454.rtf   |8 
 sw/qa/extras/rtfimport/rtfimport.cxx   |6 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   18 ++
 3 files changed, 32 insertions(+)

New commits:
commit 610e6fddbc19dd2ac23b6a6cf4d8cbfb0dcf589a
Author: Miklos Vajna 
Date:   Mon Oct 26 08:56:05 2015 +0100

tdf#59454 RTF import: handle section break right before a table

DOCX import could handle this situation, as commit
2e8aad6d45c53d554ccaf26de998ede708cfc289 (fdo#39056 fdo#75431 Section
Properties if section starts with table, 2014-04-18) added support for
this situation, in case NS_ooxml::LN_tblStart/End is emitted by the
tokenizer.

Fix the problem by sending these tokens in the RTF tokenizer as well, at
least for non-nested tables.

Change-Id: Ifedb121754634529c27820dd5175e7f9e24019e1
(cherry picked from commit e57752170e604c85a6fe8aeaa38784796e00bab1)
Reviewed-on: https://gerrit.libreoffice.org/19878
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/rtfimport/data/tdf59454.rtf 
b/sw/qa/extras/rtfimport/data/tdf59454.rtf
new file mode 100644
index 000..b10820a
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf59454.rtf
@@ -0,0 +1,8 @@
+{\rtf1
+foo\par
+\sect\sectd
+\trowd\cellx980\cellx11480\cellx14000\pard\plain \intbl\itap1\s33\qj\hyphpar1 
\fs24 \qc\hyphpar1 A1\cell
+\pard\plain \intbl\itap1\s33\qj\hyphpar1 \fs24 \qc\hyphpar1 B1\cell
+\pard\plain \intbl\itap1\s33\qj\hyphpar1 \fs24 \qc\hyphpar1 C1\cell
+\trowd\cellx980\clbrdrt\brdrs\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clvertalt\cellx11480\clbrdrt\brdrs\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clvertalt\cellx14000\row
+\pard\plain bar\par }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c7f34c2..b718572 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2344,6 +2344,12 @@ DECLARE_RTFIMPORT_TEST(testTdf94435, "tdf94435.rtf")
 CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, 
static_cast(getProperty(getParagraph(1), 
"ParaAdjust")));
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf59454, "tdf59454.rtf")
+{
+// This was 1, section break was ignored right before a table.
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d61c664..6dd2405 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2138,6 +2138,15 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword 
nKeyword)
 {
 parBreak();
 // Not in table? Reset max width.
+if (m_nCellxMax)
+{
+// Was in table, but not anymore -> tblEnd.
+RTFSprms aAttributes;
+RTFSprms aSprms;
+aSprms.set(NS_ooxml::LN_tblEnd, std::make_shared(1));
+writerfilter::Reference::Pointer_t pProperties = 
std::make_shared(aAttributes, aSprms);
+Mapper().props(pProperties);
+}
 m_nCellxMax = 0;
 }
 else if (m_aStates.top().eDestination != Destination::SHAPETEXT)
@@ -4236,6 +4245,15 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
 m_aStates.top().aTableCellAttributes = 
m_aDefaultState.aTableCellAttributes;
 // We assume text after a row definition always belongs to the table, 
to handle text before the real INTBL token
 dispatchFlag(RTF_INTBL);
+if (!m_nCellxMax)
+{
+// Wasn't in table, but now is -> tblStart.
+RTFSprms aAttributes;
+RTFSprms aSprms;
+aSprms.set(NS_ooxml::LN_tblStart, std::make_shared(1));
+writerfilter::Reference::Pointer_t pProperties = 
std::make_shared(aAttributes, aSprms);
+Mapper().props(pProperties);
+}
 m_nCellxMax = std::max(m_nCellxMax, nParam);
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 vcl/unx/generic/app/saldisp.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit cec647c42a07091d946723cdf711aa3b56d0b6cf
Author: Takeshi Abe 
Date:   Sat Nov 7 21:41:33 2015 +0900

vcl: We see what you meant by DBG_ASSERT(true, ...)

This also makes SalColormap::GetColor() return an RGB color
if m_hColormap is valid.

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

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index b86fa37..49e00de 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -52,6 +52,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include "unx/i18n_im.hxx"
 #include "unx/i18n_xkb.hxx"
@@ -1865,7 +1866,7 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture )
 
 if( ret != GrabSuccess )
 {
-DBG_ASSERT( true, "SalDisplay::CaptureMouse could not grab 
pointer\n");
+SAL_WARN("vcl", "SalDisplay::CaptureMouse could not grab pointer: 
" << ret);
 return -1;
 }
 }
@@ -2744,9 +2745,9 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const
 if( !m_aPalette.empty() && nPixel < m_nUsed )
 return m_aPalette[nPixel];
 
-if( m_hColormap )
+if( !m_hColormap )
 {
-DBG_ASSERT( true, "SalColormap::GetColor() !hColormap_\n" );
+SAL_WARN("vcl", "SalColormap::GetColor() !m_hColormap");
 return nPixel;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

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

New commits:
commit 0ecbe22d290ca14cfccaa239ad67309e5d14784d
Author: Jan Holesovsky 
Date:   Tue Nov 10 12:42:47 2015 +0100

desktop: Make the --writer/--calc/--impress command line options work again.

Change-Id: I977d1fbedb1b784cb95273184ec5e5a7fa156eef

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3ae2e38..97a6c24 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2264,7 +2264,7 @@ void Desktop::OpenClients()
 SAL_WARN( "desktop.app", "Error during recovery" << e.Message);
 }
 }
-else if (bExistsRecoveryData && bDisableRecovery)
+else if (bExistsRecoveryData && bDisableRecovery && 
!rArgs.HasModuleParam())
 // prevent new Writer doc
 bRecovery = true;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

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

New commits:
commit 7788175562494b0a907c87c1238bb3703bed2598
Author: Jan Holesovsky 
Date:   Tue Nov 10 12:42:47 2015 +0100

desktop: Make the --writer/--calc/--impress command line options work again.

Change-Id: I977d1fbedb1b784cb95273184ec5e5a7fa156eef

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5042752..f204d20b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2272,7 +2272,7 @@ void Desktop::OpenClients()
 SAL_WARN( "desktop.app", "Error during recovery" << e.Message);
 }
 }
-else if (bExistsRecoveryData && bDisableRecovery)
+else if (bExistsRecoveryData && bDisableRecovery && 
!rArgs.HasModuleParam())
 // prevent new Writer doc
 bRecovery = true;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli]

 filter/source/svg/svgreader.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 47b25a727938051f226b8a7ff1ff5f0768fb53f2
Author: Xisco Fauli 
Date:   Mon Nov 9 16:11:10 2015 +0100

SVG: tdf#95510: stop-color and stop-opacity can be defined inside style too

Exemple:

http://www.w3.org/2000/svg";>


  
  

  
  


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

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index c19aa6e9..e30acf3 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1042,6 +1042,12 @@ struct AnnotatingVisitor
 case XML_TEXT_ANCHOR:
 parseTextAlign(maCurrState,aValueUtf8.getStr());
 break;
+case XML_STOP_COLOR:
+case XML_STOP_OPACITY:
+parseGradientStop( maGradientStopVector.back(),
+   maGradientStopVector.size()-1,
+   nTokenId, sValue );
+break;
 case XML_TOKEN_INVALID:
 SAL_INFO("svg", "unhandled token");
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/osx/printaccessoryview.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 560bc4f97c4de94e1a58fa8207a3b7b2ce04cecc
Author: Stephan Bergmann 
Date:   Tue Nov 10 12:20:17 2015 +0100

loplugin:stringconstant

Change-Id: I32b1263c00e2b2e4d3d43ca3e96e4492e09e9c17

diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 22a61a9..4579b70 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -1157,7 +1157,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, 
long& rCurY, long nAttachO
 {
 addBool( pCurParent, nCurX, nCurY, 0,
  pControllerProperties->getPrintSelectionString(), 
bSelectionBoxEnabled,
- OUString( "PrintContent" ), bSelectionBoxChecked,
+ "PrintContent", bSelectionBoxChecked,
  aRightColumn, pControllerProperties, pCtrlTarget 
);
 bAddSelectionCheckBox = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthias Freund]

 icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png|binary
 icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png|binary
 icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png|binary
 icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png   |binary
 icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png |binary
 icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png |binary
 icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png|binary
 icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png|binary
 icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png|binary
 icon-themes/sifr/cmd/sc_calloutshapes.png   |binary
 icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png   |binary
 icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png |binary
 icon-themes/sifr/cmd/sc_calloutshapes.round-rectangular-callout.png |binary
 13 files changed

New commits:
commit 131a1962beb53d4945f7edf2cdb94fff0154bdc9
Author: Matthias Freund 
Date:   Mon Nov 9 22:39:15 2015 +0100

tdf#75256 sifr updates: callout shapes

Change-Id: Id584edf091aebd95bb71d7efd2df6fdaa511c837
Reviewed-on: https://gerrit.libreoffice.org/19875
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png 
b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png
index c00263d..966c1f7 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png and 
b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png differ
diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png 
b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png
index 0f70db4..3f6e961 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png and 
b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png differ
diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png 
b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png
index 7dd34d4..430b365 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png and 
b/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png differ
diff --git a/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png 
b/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png
index 25fd333..449188f 100644
Binary files a/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png 
and b/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png differ
diff --git 
a/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png 
b/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png
index 87564a4..1324c78 100644
Binary files 
a/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png and 
b/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png 
b/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png
index 9cf522a..6adde3b4 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png and 
b/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png 
b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png
index 219f247..ac24e73 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png and 
b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png 
b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png
index 5737a68..d062164 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png and 
b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png 
b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png
index 5857bd5..73c0f1d 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png and 
b/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.png 
b/icon-themes/sifr/cmd/sc_calloutshapes.png
index 1b1d7e0..c6bb30e 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.png and 
b/icon-themes/sifr/cmd/sc_calloutshapes.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png 
b/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png
index 99adb5b..422af5d 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png 
and b/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png differ
diff --git a/icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png 
b/icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png
index 6e0910e..4c890c5 100644
Binary files a/icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png and 
b/icon-themes/sifr/cmd