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

[Noel Grandin]

 chart2/inc/pch/precompiled_chartcore.hxx   |1 
 chart2/source/view/charttypes/GL3DBarChart.cxx |   88 +++--
 chart2/source/view/inc/GL3DBarChart.hxx|7 -
 chart2/source/view/inc/GL3DPlotterBase.hxx |5 -
 chart2/source/view/main/ChartView.cxx  |   73 
 5 files changed, 76 insertions(+), 98 deletions(-)

New commits:
commit 73baabfffc34461068df57d1a1851351b17cb8e8
Author: Noel Grandin 
Date:   Tue Nov 10 09:18:04 2015 +0200

chart2: replace boost::ptr_vector with std::vector

Change-Id: I5c374afcfa2760ebf21e461f38fe392692054dfe

diff --git a/chart2/inc/pch/precompiled_chartcore.hxx 
b/chart2/inc/pch/precompiled_chartcore.hxx
index fde1f3c..5860f8f 100644
--- a/chart2/inc/pch/precompiled_chartcore.hxx
+++ b/chart2/inc/pch/precompiled_chartcore.hxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 34a54da..722a93f 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -116,7 +116,6 @@
 #include 
 
 #include 
-#include 
 
 namespace chart {
 
@@ -248,7 +247,7 @@ void AxisUsage::setExplicitScaleAndIncrement(
 aVCooSysList[i]->setExplicitScaleAndIncrement(nDimIndex, nAxisIndex, 
rScale, rInc);
 }
 
-typedef boost::ptr_vector SeriesPlottersType;
+typedef std::vector > SeriesPlottersType;
 
 /** This class is a container of `SeriesPlotter` objects (such as `PieChart`
  *  instances). It is used for initializing coordinate systems, axes and scales
@@ -385,11 +384,9 @@ SeriesPlotterContainer::~SeriesPlotterContainer()
 std::vector< LegendEntryProvider* > 
SeriesPlotterContainer::getLegendEntryProviderList()
 {
 std::vector< LegendEntryProvider* > aRet( m_aSeriesPlotterList.size() );
-SeriesPlottersType::iterator   aPlotterIter = 
m_aSeriesPlotterList.begin();
-const SeriesPlottersType::iterator aPlotterEnd  = 
m_aSeriesPlotterList.end();
 sal_Int32 nN = 0;
-for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != 
aPlotterEnd; ++aPlotterIter, nN++ )
-aRet[nN] = &(*aPlotterIter);
+for( std::unique_ptr& aPlotter : m_aSeriesPlotterList)
+aRet[nN++] = aPlotter.get();
 return aRet;
 }
 
@@ -535,7 +532,7 @@ void 
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 if( !pPlotter )
 continue;
 
-m_aSeriesPlotterList.push_back( pPlotter );
+m_aSeriesPlotterList.push_back( 
std::unique_ptr(pPlotter) );
 pPlotter->setNumberFormatsSupplier( xNumberFormatsSupplier );
 pPlotter->setColorScheme( xColorScheme );
 if(pVCooSys)
@@ -630,9 +627,7 @@ void 
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 {
 if(!bSeriesNamesInitialized)
 {
-VSeriesPlotter* pSeriesPlotter = &m_aSeriesPlotterList[0];
-if( pSeriesPlotter )
-aSeriesNames = pSeriesPlotter->getSeriesNames();
+aSeriesNames = m_aSeriesPlotterList[0]->getSeriesNames();
 bSeriesNamesInitialized = true;
 }
 pVCooSys->setSeriesNamesForAxis( aSeriesNames );
@@ -731,11 +726,9 @@ void SeriesPlotterContainer::initAxisUsageList(const Date& 
rNullDate)
 void SeriesPlotterContainer::setScalesFromCooSysToPlotter()
 {
 //set scales to plotter to enable them to provide the preferred scene 
AspectRatio
-SeriesPlottersType::iterator   aPlotterIter = 
m_aSeriesPlotterList.begin();
-const SeriesPlottersType::iterator aPlotterEnd  = 
m_aSeriesPlotterList.end();
-for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != 
aPlotterEnd; ++aPlotterIter )
+for( std::unique_ptr& aPlotter : m_aSeriesPlotterList )
 {
-VSeriesPlotter* pSeriesPlotter = &(*aPlotterIter);
+VSeriesPlotter* pSeriesPlotter = aPlotter.get();
 VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( m_rVCooSysList, 
pSeriesPlotter );
 if(pVCooSys)
 {
@@ -750,11 +743,9 @@ void SeriesPlotterContainer::setScalesFromCooSysToPlotter()
 void SeriesPlotterContainer::setNumberFormatsFromAxes()
 {
 //set numberformats to plotter to enable them to display the data labels 
in the numberformat of the axis
-SeriesPlottersType::iterator   aPlotterIter = 
m_aSeriesPlotterList.begin();
-const SeriesPlottersType::iterator aPlotterEnd  = 
m_aSeriesPlotterList.end();
-for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != 
aPlotterEnd; ++aPlotterIter )
+for( std::unique_ptr& aPlotter : m_aSeriesPlotterList )
 {
-VSeriesPlotter* pSeriesPlotter = &(*aPlotterIter);
+VSeriesPlotter* pSeriesPlotter = aPlotter.get();
 VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( m_rVCooSysList, 
pSeriesPlotter );

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

[Mike Kaganski]

 sw/qa/extras/ooxmlexport/data/plausable-border.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|2 +-
 writerfilter/source/dmapper/PropertyMap.cxx |   10 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 061d98ccc7fc95234514d5dee3d9e80e49b10dc7
Author: Mike Kaganski 
Date:   Fri Oct 30 22:02:50 2015 +1000

tdf#95071: fix spacing calculations for border with page offset

With commit ebf767eeb2a169ba533e1b2ffccf16f41d95df35, some previously
hidden bugs manifested themselves, this is one of them.
The margin size calculated incorrectly when border offset was from
page. The border is drawn from the margin inwards, so the margin
should be equal to OOXML w:space attribute, and border distance
should be OOXML page margin - border distance - border width.

Incorrect calculation gave negative margin, with IllegalArgumentException
thrown in SfxItemPropertySet::setPropertyValue.

Change-Id: Ifcf4a348e975df53410933aab3684d17f68b688c
Reviewed-on: https://gerrit.libreoffice.org/19586
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/sw/qa/extras/ooxmlexport/data/plausable-border.docx 
b/sw/qa/extras/ooxmlexport/data/plausable-border.docx
index a1a9547..c6f049f 100644
Binary files a/sw/qa/extras/ooxmlexport/data/plausable-border.docx and 
b/sw/qa/extras/ooxmlexport/data/plausable-border.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6f1ea3e..003872c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -568,7 +568,7 @@ DECLARE_OOXMLIMPORT_TEST(testN758883, "n758883.docx")
 uno::Reference 
xPropertySet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
 sal_Int32 nValue = 0;
 xPropertySet->getPropertyValue("LeftMargin") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(794), nValue);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(847), nValue);
 
 // No assert for the 3rd problem: see the comment in the test doc.
 
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 536a00c..ac02e62 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -675,18 +675,18 @@ void SectionPropertyMap::SetBorderDistance( 
uno::Reference< beans::XPropertySet
 PropertyIds eMarginId, PropertyIds eDistId, sal_Int32 nDistance, 
sal_Int32 nOffsetFrom, sal_uInt32 nLineWidth )
 {
 sal_Int32 nDist = nDistance;
-if( nOffsetFrom == 1 )
+if( nOffsetFrom == 1 ) // From page
 {
 const OUString sMarginName = getPropertyName( eMarginId );
 uno::Any aMargin = xStyle->getPropertyValue( sMarginName );
 sal_Int32 nMargin = 0;
 aMargin >>= nMargin;
 
-// Change the margins with the ( border distance - line width )
-xStyle->setPropertyValue( sMarginName, uno::makeAny( nDistance - 
nLineWidth ) );
+// Change the margins with the border distance
+xStyle->setPropertyValue( sMarginName, uno::makeAny( nDistance ) );
 
-// Set the distance to ( Margin - distance )
-nDist = nMargin - nDistance;
+// Set the distance to ( Margin - distance - nLineWidth )
+nDist = nMargin - nDistance - nLineWidth;
 }
 const OUString sBorderDistanceName = getPropertyName( eDistId );
 if (xStyle.is())
___
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' - sw/source

[László Németh]

 sw/source/core/objectpositioning/anchoredobjectposition.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 98ef16db0d228ebc0e7bad0290dcc9d3f1d6469b
Author: László Németh 
Date:   Fri Nov 6 14:54:02 2015 +0100

tdf#92648 fix DOCX import regression (textbox shrinking in footers)

caused by the fix for tdf#91260

(cherry picked from commit 16331514fd10d444bec89f892a106cbbba9e16c0)

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

diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx 
b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index b4e63e3..ee354ce 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -484,8 +484,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( 
const SwTwips nTopOfAnc
 SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject());
 SwFormatFrmSize aSize(pFormat->GetFrmSize());
 SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - 
nAdjustedRelPosY);
-aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 );
-pFrameFormat->SetFormatAttr(aSize);
+if (nShrinked >= 0) {
+aSize.SetHeight( nShrinked );
+pFrameFormat->SetFormatAttr(aSize);
+}
 nAdjustedRelPosY = nProposedRelPosY;
 } else if ( SwTextBoxHelper::findTextBox(pFormat) )
 // when the shape has a textbox, use only the proposed 
vertical position
___
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' - sfx2/source

[Andras Timar]

 sfx2/source/dialog/mailmodel.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit cf4b042c934913785ea8886b6a6b3871926c53a3
Author: Andras Timar 
Date:   Fri Nov 6 08:22:33 2015 -0800

tdf#89852 on Windows do not decode the filename for email subject

... because MAPISendMail does not accept Unicode

Change-Id: Id48a41d1cf25d1a991b0f83fd5daa1a65896e958
(cherry picked from commit 77ff51623eab0c5908c84400c6eb8448ddb1e9c8)
Reviewed-on: https://gerrit.libreoffice.org/19830
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index b0cdda7..521b74f 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -828,7 +828,11 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const 
css::uno::Reference< css:
 OUString subject(
 url.getBase(
 INetURLObject::LAST_SEGMENT, false,
+#ifdef WNT
+INetURLObject::NO_DECODE)); // MAPISendMail does 
not accept Unicode
+#else
 INetURLObject::DECODE_WITH_CHARSET));
+#endif
 if (subject.isEmpty()) {
 subject = maAttachedDocuments[0];
 }
___
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' - vcl/source

[Michael Stahl]

 vcl/source/filter/wmf/winmtf.cxx |5 ++---
 vcl/source/filter/wmf/winmtf.hxx |1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 08337202b175b8ccf4bd1336abad5d817b006213
Author: Michael Stahl 
Date:   Thu Nov 5 13:16:50 2015 +0100

compilerplugins: enhance "badstatics" plugin to find members

Finds static variables of types that have bad non-static members.

(cherry picked from commit 10afa00c8ce4f0de9191cd182409a3a5d8e55bb8)

Omit the actual compiler plugin, just the fix for the release branch.

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

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 3f54ae8..513751d 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -944,12 +944,11 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 
nRasterOp )
 if ( nRasterOp != mnRop )
 {
 mnRop = nRasterOp;
-static WinMtfFillStyle aNopFillStyle;
 static WinMtfLineStyle aNopLineStyle;
 
 if ( mbNopMode && ( nRasterOp != R2_NOP ) )
 {   // changing modes from R2_NOP so set pen and brush
-maFillStyle = aNopFillStyle;
+maFillStyle = m_NopFillStyle;
 maLineStyle = aNopLineStyle;
 mbNopMode = false;
 }
@@ -968,7 +967,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp )
 meRasterOp = ROP_OVERPAINT;
 if( !mbNopMode )
 {
-aNopFillStyle = maFillStyle;
+m_NopFillStyle = maFillStyle;
 aNopLineStyle = maLineStyle;
 maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), 
true );
 maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), 
true );
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index d50fb37..3b78821 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -545,6 +545,7 @@ class WinMtfOutput
 WinMtfLineStyle maLineStyle;
 WinMtfFillStyle maLatestFillStyle;
 WinMtfFillStyle maFillStyle;
+WinMtfFillStyle m_NopFillStyle;
 vcl::Font   maLatestFont;
 vcl::Font   maFont;
 sal_uInt32  mnLatestTextAlign;
___
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' - sd/source vcl/qa

[Caolán McNamara]

 sd/source/ui/view/Outliner.cxx   |2 +-
 vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f318e585265fe5b863bd9927f5aad415ba060173
Author: Caolán McNamara 
Date:   Thu Nov 5 21:15:14 2015 +

afl-eventesting: deref of null mpTextObj

Change-Id: Icdb7d1cc250640f428984b96b0a51ac950013cb2
(cherry picked from commit 0c39c456f47c14e2b7f86d1bc6857dc0e2ca6cb3)
Reviewed-on: https://gerrit.libreoffice.org/19814
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e073118..8d88518 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1272,7 +1272,7 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 
nPageIndex)
 void Outliner::EnterEditMode (bool bGrabFocus)
 {
 OutlinerView* pOutlinerView = mpImpl->GetOutlinerView();
-if (pOutlinerView != NULL)
+if (pOutlinerView && mpTextObj)
 {
 pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1)));
 SetPaperSize( mpTextObj->GetLogicRect().GetSize() );
diff --git a/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 
b/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5
new file mode 100644
index 000..0221754
Binary files /dev/null and 
b/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/filter/excel/read.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit d671a70f18c815427747f315179fa51533f47907
Author: Stephan Bergmann 
Date:   Tue Nov 10 08:23:42 2015 +0100

-Werror,-Wtautological-undefined-compare

Change-Id: I5773cdac91d56131f349f213dc21a20a7d3eca96

diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 5e5558e..93ed6df 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -101,8 +101,6 @@ FltError ImportExcel::Read()
 sal_uInt16  nOpcode;
 sal_uInt16  nBofLevel = 0;
 
-OSL_ENSURE( &aIn != NULL, "-ImportExcel::Read(): No Stream - what 
happened?!" );
-
 std::unique_ptr< ScfSimpleProgressBar > pProgress( new 
ScfSimpleProgressBar(
 aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[jan iversen]

 cppu/source/uno/lbenv.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 5ff684477d7cb67a52223d555ae5f1341c6f8517
Author: jan iversen 
Date:   Mon Nov 9 19:13:57 2015 +0100

cid#1338242 cid#1338241 removed throw from extern "C" function

Encapsulated throw from C++ to a return false in the "C" function

Change-Id: I2fc89b0dcf434395859300b3d3890247d1288295
Reviewed-on: https://gerrit.libreoffice.org/19872
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index d036212..e1d294f 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1050,10 +1050,16 @@ static bool loadEnv(OUString const  & cLibStem,
 // late init with some code from matching uno language binding
 // will be unloaded by environment
 osl::Module aMod;
-bool bMod = cppu::detail::loadModule(aMod, cLibStem);
-
-if (!bMod)
+try {
+bool bMod = cppu::detail::loadModule(aMod, cLibStem);
+if (!bMod)
+return false;
+}
+catch(...) {
+// Catch everything and convert to return false
 return false;
+}
+
 
 uno_initEnvironmentFunc fpInit = 
reinterpret_cast(aMod.getSymbol(UNO_INIT_ENVIRONMENT));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[jan iversen]

 cppu/source/uno/lbmap.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 6a2440ea91bb86cba74ecbb8afd520c8afa41ded
Author: jan iversen 
Date:   Mon Nov 9 19:30:30 2015 +0100

cid#1338241 removed throw from C function.

Lower level C++ make a throw, this cannot be passed
back in a C function.

Change-Id: I54ace0284d0291d54f53b8947e9f4ffc2e0a56ab
Reviewed-on: https://gerrit.libreoffice.org/19873
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 51e1c26..82060fd 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -350,7 +350,14 @@ static inline bool loadModule(osl::Module & rModule, const 
OUString & rBridgeNam
 
 if (!bNeg)
 {
-bool bModule = cppu::detail::loadModule(rModule, rBridgeName);
+bool bModule;
+try {
+bModule = cppu::detail::loadModule(rModule, rBridgeName);
+}
+catch(...) {
+// convert throw to return false
+bModule = false;
+}
 
 if (bModule)
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 32419] When inserted on Writer, get "Base size" for formulas from underlining paragraph

[bugzilla-daemon]

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

--- Comment #16 from Yury  ---
(In reply to Aneesh Dandime from comment #15)
> This is my first "Easy Hack" attempt. In fact LO is my first open source
> endeavour. I will try my best tho any leads from previous attempts might be
> handy. So, if you have worked on it previously, please guide me.

I've only made some smallish hacks related to formula export/import. For a
quality help you should turn to the developers list, and to irc channels, too,
I imagine:

http://news.gmane.org/gmane.comp.documentfoundation.libreoffice.devel for

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

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

[Armin Le Grand]

 vcl/source/outdev/bitmap.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 99e3ab6effa9356a1a444160e60ed8df099b15a3
Author: Armin Le Grand 
Date:   Mon Nov 9 14:00:50 2015 +0100

tdf#95481 catch out-of-range access in vcl bitmap

blendBitmap24 assumes bitmap is 2 lines high for doing
interpolation. For bitmaps of height 1, really nothing to interpolate
there. Fix cornercase by 'blending' between the very same line instead.

Change-Id: I9b94000aa563e525d0bb2418346ad2c86af26df8
Reviewed-on: https://gerrit.libreoffice.org/19863
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index a2e30aa..adddcaa 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -810,11 +810,13 @@ public:
 const long nMapY  = mpMapY[nY];
 const long nMapFY = mpMapYOffset[nY];
 
-pLine0 = pSource->GetScanline(nMapY);
-pLine1 = pSource->GetScanline(nMapY + 1);
+ pLine0 = pSource->GetScanline(nMapY);
+// tdf#95481 guard nMapY + 1 to be within bounds
+pLine1 = (nMapY + 1 < pSource->Height()) ? 
pSource->GetScanline(nMapY + 1) : pLine0;
 
 pLineAlpha0 = pSourceAlpha->GetScanline(nMapY);
-pLineAlpha1 = pSourceAlpha->GetScanline(nMapY + 1);
+// tdf#95481 guard nMapY + 1 to be within bounds
+pLineAlpha1 = (nMapY + 1 < pSourceAlpha->Height()) ? 
pSourceAlpha->GetScanline(nMapY + 1) : pLineAlpha0;
 
 pDestScanline = pDestination->GetScanline(nY);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 32419] When inserted on Writer, get "Base size" for formulas from underlining paragraph

[bugzilla-daemon]

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

--- Comment #15 from Aneesh Dandime  ---
(In reply to Yury from comment #14)
> (In reply to Aneesh Dandime from comment #13)
> > I am taking up the task of implementing this enhancement.
> 
> Nice and commendable :). Thanks in advance!
> 
> While you are digging, would you please consider the following suggestion
> for your solution: use special set of character styles, used for setting the
> fontfaces, bold/italics, etc. in formulas?
> 
> Those styles could have names on the lines of "*formula", "*formula
> (functions)", etc., and be initialised, e.g., from default char style. (Can
> you have "commonly hidden" style names in LO?)
> 
> Now, those styles would be used on new formula creation, if present. Their
> use could be switched off for individual formulas (like with checkbox "use
> formula look styles" in formula properties). AND their use should be
> switchable off for the document as a whole, too.
> 
> P.S. If I had any hope of implementing it in reasonable timeframe, I'd have
> a try myself. Current functionality is a pain to work with. As it is, I can
> only try to envision the look-and-feel of how I'd wish this to work.

This is my first "Easy Hack" attempt. In fact LO is my first open source
endeavour. I will try my best tho any leads from previous attempts might be
handy. So, if you have worked on it previously, please guide me.

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

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

[Miklos Vajna]

 sw/inc/SwStyleNameMapper.hxx |   68 +--
 sw/inc/tblafmt.hxx   |  162 +++
 sw/source/core/bastyp/init.cxx   |   66 +--
 sw/source/core/doc/SwStyleNameMapper.cxx |  210 +-
 sw/source/core/doc/tblafmt.cxx   |  398 +--
 sw/source/uibase/inc/conttree.hxx|   96 ++--
 sw/source/uibase/inc/navipi.hxx  |   84 ++--
 sw/source/uibase/utlui/content.cxx   |  646 +++
 sw/source/uibase/utlui/glbltree.cxx  |   10 
 sw/source/uibase/utlui/navipi.cxx|  574 +--
 10 files changed, 1157 insertions(+), 1157 deletions(-)

New commits:
commit b2831b5bb26ae8cbb2b1796f390e1b1b90eb4202
Author: Miklos Vajna 
Date:   Tue Nov 10 07:48:22 2015 +0100

sw: prefix members of SwNavigationPI

Change-Id: I801c9c93921719955431716c6e56e79eed529800

diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index b2d07e8..5d74116 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -57,45 +57,45 @@ class SwNavigationPI : public vcl::Window,
 friend class SwContentTree;
 friend class SwGlobalTree;
 
-VclPtraContentToolBox;
-VclPtr   aGlobalToolBox;
-ImageList   aContentImageList;
-VclPtr   aContentTree;
-VclPtraGlobalTree;
-VclPtr aDocListBox;
-IdleaPageChgIdle;
-OUStringsContentFileName;
-OUStringaContextArr[3];
-OUStringaStatusArr[4];
-Point   aBoxBottomLeft; // Pos when Box is at bottom
-
-SfxObjectShellLock  *pxObjectShell;
-SwView  *pContentView;
-SwWrtShell  *pContentWrtShell;
-SwView  *pActContView;
-SwView  *pCreateView;
-VclPtr  pPopupWindow;
-VclPtr  pFloatingWindow;
-
-SfxChildWindowContext* pContextWin;
-
-SwNavigationConfig  *pConfig;
-SfxBindings &rBindings;
-
-longnDocLBIniHeight;
-longnWishWidth;
-sal_uInt16  nAutoMarkIdx;
-RegionMode  nRegionMode; // 0 - URL, 1 - region with link 2 - region 
without link
-short   nZoomIn;
-short   nZoomOutInit;
-short   nZoomOut;
-
-boolbSmallMode : 1;
-boolbIsZoomedIn : 1;
-boolbPageCtrlsVisible : 1;
-boolbGlobalMode : 1;
-
-bool _IsZoomedIn() const {return bIsZoomedIn;}
+VclPtrm_aContentToolBox;
+VclPtr   m_aGlobalToolBox;
+ImageList   m_aContentImageList;
+VclPtr   m_aContentTree;
+VclPtrm_aGlobalTree;
+VclPtr m_aDocListBox;
+Idlem_aPageChgIdle;
+OUStringm_sContentFileName;
+OUStringm_aContextArr[3];
+OUStringm_aStatusArr[4];
+Point   m_aBoxBottomLeft; // Pos when Box is at bottom
+
+SfxObjectShellLock  *m_pxObjectShell;
+SwView  *m_pContentView;
+SwWrtShell  *m_pContentWrtShell;
+SwView  *m_pActContView;
+SwView  *m_pCreateView;
+VclPtr  m_pPopupWindow;
+VclPtr  m_pFloatingWindow;
+
+SfxChildWindowContext* m_pContextWin;
+
+SwNavigationConfig  *m_pConfig;
+SfxBindings &m_rBindings;
+
+longm_nDocLBIniHeight;
+longm_nWishWidth;
+sal_uInt16  m_nAutoMarkIdx;
+RegionMode  m_nRegionMode; // 0 - URL, 1 - region with link 2 - region 
without link
+short   m_nZoomIn;
+short   m_nZoomOutInit;
+short   m_nZoomOut;
+
+boolm_bSmallMode : 1;
+boolm_bIsZoomedIn : 1;
+boolm_bPageCtrlsVisible : 1;
+boolm_bGlobalMode : 1;
+
+bool _IsZoomedIn() const {return m_bIsZoomedIn;}
 void _ZoomOut();
 void _ZoomIn();
 
@@ -132,7 +132,7 @@ protected:
 
 NumEditAction&  GetPageEdit();
 boolToggleTree();
-voidSetGlobalMode(bool bSet) {bGlobalMode = bSet;}
+voidSetGlobalMode(bool bSet) {m_bGlobalMode = bSet;}
 
 public:
 
@@ -151,14 +151,14 @@ public:
 static OUString CreateDropFileName( TransferableDataHelper& rData );
 static OUString CleanEntry(const OUString& rEntry);
 
-RegionMode  GetRegionDropMode() const {return nRegionMode;}
+RegionMode  GetRegionDropMode() const {return m_nRegionMode;}
 voidSetRegionDropMode(RegionMode nNewMode);
 
 sal_Int8AcceptDrop( const AcceptDropEvent& rEvt );
 sal_Int8ExecuteDrop( const ExecuteDropEvent& rEvt );
 
 boolIsGlobalDoc() const;
-boolIsGlobalMode() const {returnbGlobalMode;}
+boolIsGlobalMode() const {returnm_bGlobalMode;}
 
 SwView* GetCreateView() const;
 voidCreateNavigationTool(const Rectangle& rRect, bool 
bSetFocus, vcl::Window *pParent);
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/sourc

[Libreoffice-commits] core.git: Branch 'feature/glyphy' - 478 commits - avmedia/source basctl/source basebmp/test basic/qa basic/source bean/com bean/qa binaryurp/source bin/get-bugzilla-attachments-b

[Tor Lillqvist]

Rebased ref, commits from common ancestor:
commit 9d97bf50ee7d8cf157f4bab3bb0a19ea6a918a51
Author: Tor Lillqvist 
Date:   Mon Nov 2 22:29:23 2015 +0200

The glyphy configury takes no --enable/disable-debug option

Change-Id: Id098945656c0d97a0fc11efb42a0d09efb3e5557

diff --git a/external/glyphy/ExternalProject_glyphy.mk 
b/external/glyphy/ExternalProject_glyphy.mk
index 463cb81..6243187 100644
--- a/external/glyphy/ExternalProject_glyphy.mk
+++ b/external/glyphy/ExternalProject_glyphy.mk
@@ -29,7 +29,6 @@ $(call gb_ExternalProject_get_state_target,glyphy,build) :
, \
--enable-shared --disable-static \
) \
-   $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(if $(verbose),V=1) \
commit 1c4859722b2ebb9cd8b0db0b6fdf734eead64db7
Author: Tor Lillqvist 
Date:   Mon Nov 2 22:28:29 2015 +0200

We (unintentionally?) build a static archive with MSVC

Change-Id: Ief0ccec4b63e2ac767285f4c19175fa000eaad6c

diff --git a/external/glyphy/ExternalPackage_glyphy.mk 
b/external/glyphy/ExternalPackage_glyphy.mk
index cbae840..b4a32fc 100644
--- a/external/glyphy/ExternalPackage_glyphy.mk
+++ b/external/glyphy/ExternalPackage_glyphy.mk
@@ -13,6 +13,8 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,glyphy,glyphy))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.dylib,src/.libs/libglyphy.dylib))
+else ifeq ($(OS),WNT)
+# We build a static archive with MSVC, so nothing to add
 else ifeq ($(DISABLE_DYNLOADING),)
 $(eval $(call 
gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.so.0,src/.libs/libglyphy.so.0.0.0))
 endif
commit 8ef19fe4c28fe55c3f74cfdf6675afaa30eec333
Author: Tor Lillqvist 
Date:   Mon Nov 2 22:27:24 2015 +0200

Need _USE_MATH_DEFINES with MSVC for M_PI_2

Change-Id: Ieb7671480b88304a94066965d10d455865915090

diff --git a/external/glyphy/ExternalProject_glyphy.mk 
b/external/glyphy/ExternalProject_glyphy.mk
index 1eda015..463cb81 100644
--- a/external/glyphy/ExternalProject_glyphy.mk
+++ b/external/glyphy/ExternalProject_glyphy.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,glyphy, \
 
 $(call gb_ExternalProject_get_state_target,glyphy,build) :
$(call gb_ExternalProject_run,build,\
+   $(if $(filter MSC,$(COM)),CPPFLAGS=-D_USE_MATH_DEFINES) \
MAKE=$(MAKE) ./configure \
--with-pic \
$(if $(DISABLE_DYNLOADING), \
commit 424bf08e677e7644293ca45c0ad43df6dddeb2dd
Author: Tor Lillqvist 
Date:   Mon Nov 2 18:14:10 2015 +0200

Fix some thinkos or copy-paste mistakes for glyphy

Change-Id: Ie008086c2a34081c9f50a61808b73b66eda58e2c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e4e8b03..9cadb13 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -288,14 +288,14 @@ endef
 
 endif # SYSTEM_GLEW
 
-$(eval $(call gb_Helper_register_packages_for_install,ooo,\
-   liborcus \
-))
-
-ifneq ($(SYSTEM_GLEW),)
+ifneq ($(SYSTEM_GLYPHY),)
 
 else # !SYSTEM_GLYPHY
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   glyphy \
+))
+
 define gb_LinkTarget__use_glyphy
 $(call gb_LinkTarget_use_package,$(1),glyphy)
 
@@ -310,7 +310,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
-endif GLYPHY
+endif # SYSTEM_GLYPHY
 
 define gb_LinkTarget__use_iconv
 $(call gb_LinkTarget_add_libs,$(1),-liconv)
diff --git a/config_host.mk.in b/config_host.mk.in
index d04374a..cde8e90 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -525,6 +525,7 @@ export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@
 export SYSTEM_GENCMN=@SYSTEM_GENCMN@
 export SYSTEM_GLEW=@SYSTEM_GLEW@
 export SYSTEM_GLM=@SYSTEM_GLM@
+export SYSTEM_GLYPHY=@SYSTEM_GLYPHY@
 export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@
 export SYSTEM_HARFBUZZ=@SYSTEM_HARFBUZZ@
 export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 9daf548..7c78c7d 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,FREETYPE,freetype) \
$(call gb_Helper_optional,GLEW,glew) \
$(call gb_Helper_optional,GLM,glm) \
+   $(call gb_Helper_optional,GLYPHY,glyphy) \
$(call gb_Helper_optional,GRAPHITE,graphite) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \
diff --git a/external/glyphy/Module_glyphy.mk b/external/glyphy/Module_glyphy.mk
index 084c542..6228bba 100644
--- a/external/glyphy/Module_glyphy.mk
+++ b/external/glyphy/Module_glyphy.mk
@@ -9,7

Re: System POPPLER_VERSION redefined, won't build

[ariel cornejo]

$ dpkg -l \*poppler\*Desired=Unknown/Install/Remove/Purge/Hold|
Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend|/
Err?=(none)/Reinst-required (Status,Err: uppercase=bad)||/ Name 
  
VersionArchitecture  
Description+++-===-==-==-ii
 
libpoppler-dev:amd640.33.0-0ubuntu3amd64  PDF
rendering library -- development filesii  libpoppler-glib8:amd64 
0.33.0-0ubuntu3amd64  PDF rendering library (GLib-based
shared library)ii  libpoppler-private-dev:amd6 0.33.0-0ubuntu3amd64 

PDF rendering library -- private development filesii  libpoppler52:amd64
 
0.33.0-0ubuntu3amd64  PDF rendering libraryii  poppler-data 
  
0.4.7-3allencoding data for the poppler PDF
rendering libraryii  poppler-utils   0.33.0-0ubuntu3amd64   
  
PDF utilities (based on Poppler)




--
View this message in context: 
http://nabble.documentfoundation.org/System-POPPLER-VERSION-redefined-won-t-build-tp4165697p4165810.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

[Bug 32419] When inserted on Writer, get "Base size" for formulas from underlining paragraph

[bugzilla-daemon]

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

--- Comment #14 from Yury  ---
(In reply to Aneesh Dandime from comment #13)
> I am taking up the task of implementing this enhancement.

Nice and commendable :). Thanks in advance!

While you are digging, would you please consider the following suggestion for
your solution: use special set of character styles, used for setting the
fontfaces, bold/italics, etc. in formulas?

Those styles could have names on the lines of "*formula", "*formula
(functions)", etc., and be initialised, e.g., from default char style. (Can you
have "commonly hidden" style names in LO?)

Now, those styles would be used on new formula creation, if present. Their use
could be switched off for individual formulas (like with checkbox "use formula
look styles" in formula properties). AND their use should be switchable off for
the document as a whole, too.

P.S. If I had any hope of implementing it in reasonable timeframe, I'd have a
try myself. Current functionality is a pain to work with. As it is, I can only
try to envision the look-and-feel of how I'd wish this to work.

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

[Bug 32419] When inserted on Writer, get "Base size" for formulas from underlining paragraph

[bugzilla-daemon]

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

Aneesh Dandime  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |f2014...@goa.bits-pilani.ac
   |desktop.org |.in

--- Comment #13 from Aneesh Dandime  ---
I am taking up the task of implementing this enhancement.

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

Re: Getting Started with LO Dev

[Alex F]

Running make clean and recompiling the build seems to have solved the
problem. 
Hope this helps others who ever face a similar problem.



--
View this message in context: 
http://nabble.documentfoundation.org/Getting-Started-with-LO-Dev-tp4165802p4165804.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

Getting Started with LO Dev

[Alex F]

Hi there, 

I'm Alex, a CS undergrad and like Massimiliano & Sakunt, would like to
contribute to LO. I'm interested in LO for Android in particular and have
been attempting to set up the development environment for Android. Wasn't
really able to get past building though. Compiling on my linux machine gave
me this error:

http://pastebin.com/1j06DDWe

Did I go wrong somewhere? 

Regards,
Alex



--
View this message in context: 
http://nabble.documentfoundation.org/Getting-Started-with-LO-Dev-tp4165802.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] online.git: loleaflet/src

[Henry Castro]

 loleaflet/src/control/Control.ColumnHeader.js |   13 +++--
 loleaflet/src/control/Control.RowHeader.js|   12 ++--
 loleaflet/src/control/Control.Scroll.js   |3 +--
 loleaflet/src/layer/tile/CalcTileLayer.js |   14 ++
 4 files changed, 32 insertions(+), 10 deletions(-)

New commits:
commit 75ad86bee187cddc05e7e8b7c46d670ddcdac9c9
Author: Henry Castro 
Date:   Mon Nov 9 22:00:09 2015 -0400

loleaflet: fix row/column, scroll issues

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index 7280bc2..7c3934c 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -17,6 +17,8 @@ L.Control.ColumnHeader = L.Control.extend({
 L.DomUtil.create('tbody', '', this._table);
 this._columns = L.DomUtil.create('tr','', 
this._table.firstChild);
 
+this._position = 0;
+
 // dummy initial header
 L.DomUtil.create('th','spreadsheet-table-column-cell', 
this._columns);
 
@@ -28,8 +30,15 @@ L.Control.ColumnHeader = L.Control.extend({
 this._columns = L.DomUtil.create('tr', '', 
this._table.firstChild);
 },
 
-offsetColumn: function (point) {
-L.DomUtil.setStyle(this._table, 'left', point + 'px');
+
+setScrollPosition: function (position) {
+this._position = position;
+L.DomUtil.setStyle(this._table, 'left', this._position + 'px');
+},
+
+offsetScrollPosition: function (offset) {
+this._position = this._position - offset;
+L.DomUtil.setStyle(this._table, 'left', this._position + 'px');
 },
 
 fillColumns: function (columns, converter, context) {
diff --git a/loleaflet/src/control/Control.RowHeader.js 
b/loleaflet/src/control/Control.RowHeader.js
index 141527f..02625ae 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -11,6 +11,8 @@ L.Control.RowHeader = L.Control.extend({
 this._table.id = 'spreadsheet-table-row';
 this._rows = L.DomUtil.create('tbody', '', this._table);
 
+this._position = 0;
+
 // dummy initial row header
 var row = L.DomUtil.create('tr', '', this._rows);
 L.DomUtil.create('th','spreadsheet-table-row-cell', row);
@@ -23,8 +25,14 @@ L.Control.RowHeader = L.Control.extend({
 this._rows = L.DomUtil.create('tbody', '', this._table);
 },
 
-offsetRow: function (value) {
-L.DomUtil.setStyle(this._table, 'top', value + 'px');
+setScrollPosition: function (position) {
+this._position = position;
+L.DomUtil.setStyle(this._table, 'top', this._position + 'px');
+},
+
+offsetScrollPosition: function (offset) {
+this._position = this._position - offset;
+L.DomUtil.setStyle(this._table, 'top', this._position + 'px');
 },
 
 fillRows: function (rows, converter, context) {
diff --git a/loleaflet/src/control/Control.Scroll.js 
b/loleaflet/src/control/Control.Scroll.js
index f9813a4..bb7c194 100644
--- a/loleaflet/src/control/Control.Scroll.js
+++ b/loleaflet/src/control/Control.Scroll.js
@@ -55,14 +55,13 @@ L.Control.Scroll = L.Control.extend({
this._prevScrollY = -e.mcs.top;
this._prevScrollX = -e.mcs.left;
this._map.scroll(offset.x, offset.y);
+this._map.fire('scrolloffset', offset);
}
-this._map.fire('scroll', e.mcs);
},
 
_onScrollEnd: function (e) {
this._prevScrollY = -e.mcs.top;
this._prevScrollX = -e.mcs.left;
-this._map.fire('scroll', e.mcs);
},
 
_onScrollTo: function (e) {
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index d1f5a42..c81eaed 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -11,7 +11,8 @@ L.CalcTileLayer = L.TileLayer.extend({
 map.addControl(this._columns);
 map.addControl(this._rows);
 map.addControl(L.control.tabs());
-map.on('scroll', this._onScroll, this);
+map.on('scrolloffset', this._onScrollOffset, this);
+map.on('updatescrolloffset', this._onUpdateScrollOffset, this);
 map.on('zoomend', this._onZoomRowColumns, this);
 },
 
@@ -111,9 +112,14 @@ L.CalcTileLayer = L.TileLayer.extend({
}
},
 
-_onScroll: function(point) {
-this._columns.offsetColumn(point.left);
-this._rows.offsetRow(point.top);
+_onScrollOf

Re: Coverity, read-only generic account.

[Norbert Thiebaud]

On Mon, Nov 9, 2015 at 4:13 PM, jan iversen  wrote:
> Hi.
>
> I would like that we have a generic account in coverity (read-only), so that
> e.g. I
> can show new people the issues there.
>
> Currently (because we also seems not to have a report module), I have to
> copy/paste information from coverity in order to mail it to the people I try
> to help.
>
> If we make an account e.g. "libreoffice" with password "libreoffice" and
> limit it
> to reading, everybody could see the coverity issues.

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 ?

Norbert

PS: having a 'public' user/password may very well fall afoul of coverity ToS
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[László Németh]

 sw/qa/extras/uiwriter/data/tdf92648.docx |binary
 sw/qa/extras/uiwriter/uiwriter.cxx   |   17 +
 2 files changed, 17 insertions(+)

New commits:
commit 41d90d6c7c41df781ecaf7745872f20abd7e52a9
Author: László Németh 
Date:   Tue Nov 10 01:00:51 2015 +0100

tdf#92648 unit test for DOCX import regression (textbox shrinking)

Change-Id: I810708bbd337b325ed58927fcdd67f24f70f1252

diff --git a/sw/qa/extras/uiwriter/data/tdf92648.docx 
b/sw/qa/extras/uiwriter/data/tdf92648.docx
new file mode 100644
index 000..4857723
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf92648.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8924f28..f0b495d 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -167,6 +167,7 @@ public:
 void testTdf88986();
 void testTdf87922();
 void testTdf77014();
+void testTdf92648();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -243,6 +244,7 @@ public:
 CPPUNIT_TEST(testTdf88986);
 CPPUNIT_TEST(testTdf87922);
 CPPUNIT_TEST(testTdf77014);
+CPPUNIT_TEST(testTdf92648);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2743,6 +2745,21 @@ void SwUiWriterTest::testTdf77014()
 CPPUNIT_ASSERT_EQUAL(OUString("1"),   
parseDump("/root/page/body/txt[5]/Text[5]", "nLength"));
 }
 
+void SwUiWriterTest::testTdf92648()
+{
+SwDoc* pDoc = createDoc("tdf92648.docx");
+SdrPage* pPage = 
pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+std::set aTextBoxes = 
SwTextBoxHelper::findTextBoxes(pDoc);
+// Make sure we have ten draw shapes.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(10), SwTextBoxHelper::getCount(pPage, 
aTextBoxes));
+// and the text boxes haven't got zero height
+for (std::set::iterator it=aTextBoxes.begin(); 
it!=aTextBoxes.end(); ++it)
+{
+SwFormatFrmSize aSize((*it)->GetFrmSize());
+CPPUNIT_ASSERT(aSize.GetHeight() != 0);
+}
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens]

 solenv/gbuild/gbuild.help.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6540c288372c3cbb94a30daa5a40e97690cb0ea5
Author: Thorsten Behrens 
Date:   Mon Nov 9 15:58:53 2015 +0100

Remove misleading 'make build' line from gbuild help

Change-Id: If389e2dc6f5af07662e6ab8aa94e0e9ce8e30f5b
Reviewed-on: https://gerrit.libreoffice.org/19865
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 9364994..35b97c7 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -28,7 +28,6 @@ IMPORTANT OPTIONS
 
 AVAILABLE TARGETS
all  build product and run unit tests (default goal)
-   buildbuild product
unitcheckrun unit tests
slowcheckrun slow unit tests
subsequentcheck  run system tests (requires full installation)
@@ -43,6 +42,7 @@ AVAILABLE TARGETS
 NOTE: needs graphviz to work
showmodules  shows all registered modules
 build the named module
+   .build   build the named module without running unittests
.check   run unittests of the named module
.clean   clean the named module
.all build the named module and the pre-requisite modules 
for it
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

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

New commits:
commit 453cf8a4c44b7935c3029524bfd40fa9c1d87753
Author: Bjoern Michaelsen 
Date:   Mon Nov 9 23:13:00 2015 +0100

yet another member of SwXTextPortion needs to be guarded in the dtor

Change-Id: Ia1e3febd6a2f0c18c686a04ef5b98ee1ad2d8b88

diff --git a/sw/source/core/unocore/unoport.cxx 
b/sw/source/core/unocore/unoport.cxx
index f3f8039..732dcc9 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -140,6 +140,11 @@ SwXTextPortion::~SwXTextPortion()
 {
 SolarMutexGuard aGuard;
 m_pUnoCursor.reset(nullptr);
+if(m_FrameDepend.GetRegisteredIn())
+{
+auto pFrameDepend(const_cast(&m_FrameDepend));
+pFrameDepend->GetRegisteredIn()->Remove(pFrameDepend);
+}
 }
 
 uno::Reference< text::XText >  SwXTextPortion::getText()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Coverity, read-only generic account.

[jan iversen]

Hi.

I would like that we have a generic account in coverity (read-only), so that
e.g. I
can show new people the issues there.

Currently (because we also seems not to have a report module), I have to
copy/paste information from coverity in order to mail it to the people I try
to help.

If we make an account e.g. "libreoffice" with password "libreoffice" and
limit it
to reading, everybody could see the coverity issues.

Thoughts ?

rgds
jan I.




--
View this message in context: 
http://nabble.documentfoundation.org/Coverity-read-only-generic-account-tp4165797.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

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

[Tommy]

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...


most of the time you got an INVALID tag after 7 months of inactivity...
so, again, no reason to blame QA if you can't answer questions after 7 
months



I tend to agree that INVALID is accurate but if ABANDONED and/or EXPIRED will 
make
them feel better, that's fine.



anyway, whatever you decide is ok for me.
but I think we are paying too much attention to users who are not giving 
a valualble contribution to Bugzilla and LibO in general



I really don't care much about feelings of bad bug submitters.
probably most of them would deserve a PEBKAC status :-)



This will mostly be used by the automatic
pings and most QA people probably won't have to do much to maintain this
new status.


Best,
Joel


bye, Tommy

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

Re: git / gerrit best work flow ?

[jan iversen]

Thanks a lot for the input, I now have a good idea how to explain the work
flow to others.

I like the idea of branching that is a natural part of GIT.

rgds
jan i.




--
View this message in context: 
http://nabble.documentfoundation.org/git-gerrit-best-work-flow-tp4165745p4165795.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] online.git: loolwsd/LOOLSession.cpp

[Jan Holesovsky]

 loolwsd/LOOLSession.cpp |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 0f03c3b925f35d9ed762effa80a2ddb0d444b9e1
Author: Jan Holesovsky 
Date:   Mon Nov 9 22:20:26 2015 +0100

loolwsd: Don't assert on 'canceltiles'.

Fixes a regression from 6a1477d8a9ba70e01bfe494f5850ba7eae8ee8c1 where now 
the
'canceltiles' command reaches the ChildProcessSession::handleInput().

This is good in general - in case'd need to add some special handling even 
to
the handler; but so far all we need happens on the message queue level.

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 883ebce..7565470 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -699,15 +699,21 @@ bool ChildProcessSession::handleInput(const char *buffer, 
int length)
 
 Application::instance().logger().information(Util::logPrefix() + 
_kindString + ",Input," + getAbbreviatedMessage(buffer, length));
 
-if (tokens[0] == "commandvalues")
+if (tokens[0] == "canceltiles")
+{
+// this command makes sense only on the command queue level, nothing
+// to do here
+return true;
+}
+else if (tokens[0] == "commandvalues")
 {
 return getCommandValues(buffer, length, tokens);
 }
-if (tokens[0] == "partpagerectangles")
+else if (tokens[0] == "partpagerectangles")
 {
 return getPartPageRectangles(buffer, length);
 }
-if (tokens[0] == "load")
+else if (tokens[0] == "load")
 {
 if (_docURL != "")
 {
___
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]

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

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

[Joel Madero]

>
>
> 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 tend to
agree that INVALID is accurate but if ABANDONED and/or EXPIRED will make
them feel better, that's fine. This will mostly be used by the automatic
pings and most QA people probably won't have to do much to maintain this
new status.


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

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

[Oliver Specht]

 sw/source/core/fields/cellfml.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 74d6d268e9a7193dcca39bbfad2830a2504dfe79
Author: Oliver Specht 
Date:   Fri Nov 6 13:33:58 2015 +0100

tdf#94624 calculation of power operator fixed

cell values are added in parentheses to make sure negative values are 
handled
correctly

Change-Id: I7366493e3cd6c25607e311d4b610ef8aa704a8bb
Reviewed-on: https://gerrit.libreoffice.org/19821
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 
(cherry picked from commit 0bd2a5eedd91466f97806e198b125546d256d1f8)
Reviewed-on: https://gerrit.libreoffice.org/19826
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/fields/cellfml.cxx 
b/sw/source/core/fields/cellfml.cxx
index 1010f00..6565401 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -366,8 +366,10 @@ void SwTableFormula::_MakeFormula( const SwTable& rTable, 
OUString& rNewStr,
 // calculate the value of the box
 if ( pSttBox->getRowSpan() >= 1 )
 {
+rNewStr += "(";
 rNewStr += pCalcPara->rCalc.GetStrResult(
 pSttBox->GetValue( *pCalcPara ), false );
+rNewStr += ")";
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sc/source/filter/xml/xmlimprt.cxx |   15 +++
 sc/source/filter/xml/xmlimprt.hxx |9 +
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 003ba90531b6ee5c3b3225298a1490ed9a7048a4
Author: Michael Stahl 
Date:   Mon Nov 9 20:55:59 2015 +0100

sc: replace boost::ptr_map with std::map

Change-Id: I0cc3addefa436050259785ccf2ce540a84e9fcae

diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 62d128b..ad11e91 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -19,7 +19,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 
@@ -2398,12 +2397,13 @@ bool ScXMLImport::GetValidation(const OUString& sName, 
ScMyImportValidation& aVa
 void ScXMLImport::AddNamedExpression(SCTAB nTab, ScMyNamedExpression* 
pNamedExp)
 {
 ::std::unique_ptr p(pNamedExp);
-SheetNamedExpMap::iterator itr = maSheetNamedExpressions.find(nTab);
-if (itr == maSheetNamedExpressions.end())
+SheetNamedExpMap::iterator itr = m_SheetNamedExpressions.find(nTab);
+if (itr == m_SheetNamedExpressions.end())
 {
 // No chain exists for this sheet.  Create one.
 ::std::unique_ptr pNew(new ScMyNamedExpressions);
-::std::pair r = 
o3tl::ptr_container::insert(maSheetNamedExpressions, nTab, std::move(pNew));
+::std::pair r =
+m_SheetNamedExpressions.insert(std::make_pair(nTab, 
std::move(pNew)));
 if (!r.second)
 // insertion failed.
 return;
@@ -3157,15 +3157,14 @@ void ScXMLImport::SetSheetNamedRanges()
 if (!pDoc)
 return;
 
-SheetNamedExpMap::const_iterator itr = maSheetNamedExpressions.begin(), 
itrEnd = maSheetNamedExpressions.end();
-for (; itr != itrEnd; ++itr)
+for (auto const& itr : m_SheetNamedExpressions)
 {
-SCTAB nTab = itr->first;
+const SCTAB nTab = itr.first;
 ScRangeName* pRangeNames = pDoc->GetRangeName(nTab);
 if (!pRangeNames)
 continue;
 
-const ScMyNamedExpressions& rNames = *itr->second;
+const ScMyNamedExpressions& rNames = *itr.second;
 ::std::for_each(rNames.begin(), rNames.end(), RangeNameInserter(pDoc, 
*pRangeNames, *this));
 }
 }
diff --git a/sc/source/filter/xml/xmlimprt.hxx 
b/sc/source/filter/xml/xmlimprt.hxx
index 4b562b8..b87e82a 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -42,12 +42,13 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
+#include 
 #include 
 #include 
-#include 
-#include 
 
 class ScMyStyleNumberFormats;
 class XMLNumberFormatAttributesExportHelper;
@@ -823,7 +824,7 @@ class ScXMLEditAttributeMap;
 class ScXMLImport: public SvXMLImport, boost::noncopyable
 {
 typedef std::unordered_map< OUString, sal_Int16, OUStringHash >   
CellTypeMap;
-typedef ::boost::ptr_map SheetNamedExpMap;
+typedef ::std::map> 
SheetNamedExpMap;
 
 CellTypeMap aCellTypeMap;
 
@@ -939,7 +940,7 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable
 ScMyTables  aTables;
 
 ScMyNamedExpressions*   m_pMyNamedExpressions;
-SheetNamedExpMap maSheetNamedExpressions;
+SheetNamedExpMap m_SheetNamedExpressions;
 
 ScMyLabelRanges*pMyLabelRanges;
 ScMyImportValidations*  pValidations;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source

[Damjan Jovanovic]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 97a42ad0d0816ffcc5fc12fed85a1f3789544fc8
Author: Damjan Jovanovic 
Date:   Mon Nov 9 18:14:21 2015 +

#i121096# When editing a table query in Design View, the ORDER BY clause of 
the the query being edited is ignored.

When Base's Query Design View parses the SQL query, it looked at the wrong 
node position
in the SQL parse tree for the ORDER BY clause (child 4 = join instead of 
child 5 = order by),
causing the sort order to be forgotten. Fix this.

Patch by: me

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 60f4688..7bfff8b 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2400,9 +2400,9 @@ namespace
 const ::connectivity::OSQLParseNode* pParseRoot )
 {
 SqlParseError eErrorCode = eOk;
-if (!pParseRoot->getChild(3)->getChild(4)->isLeaf())
+if (!pParseRoot->getChild(3)->getChild(ORDER_BY_CHILD_POS)->isLeaf())
 {
-::connectivity::OSQLParseNode* pNode = 
pParseRoot->getChild(3)->getChild(4)->getChild(2);
+::connectivity::OSQLParseNode* pNode = 
pParseRoot->getChild(3)->getChild(ORDER_BY_CHILD_POS)->getChild(2);
 ::connectivity::OSQLParseNode* pParamRef = NULL;
 
 OQueryController& rController = 
static_cast(_pView->getController());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

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

New commits:
commit e61465d25f5e52bf439db65ed7a641722637034a
Author: Bjoern Michaelsen 
Date:   Mon Nov 9 20:46:38 2015 +0100

another missing SolarMutex in Writer UNO

Change-Id: Ia9451b3f6180f97fda6ff16c65b5fbfcd17b75ec

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 3500551..28eb646 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1260,8 +1260,11 @@ SwXFrame::SwXFrame(SwFrameFormat& rFrameFormat, 
FlyCntType eSet, const ::SfxItem
 
 SwXFrame::~SwXFrame()
 {
+SolarMutexGuard aGuard;
 delete m_pCopySource;
 delete pProps;
+if(GetRegisteredIn())
+GetRegisteredIn()->Remove(this);
 }
 
 template
___
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' - configure.ac

[Andras Timar]

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

New commits:
commit 4815a27f41eb55aa29346a3e77dd870d88c385ee
Author: Andras Timar 
Date:   Mon Nov 9 20:42:16 2015 +0100

Bump version to 5.0-9

Change-Id: I1730f23e920702ea4f06b4403c47e0167fe758c5

diff --git a/configure.ac b/configure.ac
index 335068e..16f224c 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([Collabora Office],[5.0.10.8],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.9],[],[],[https://CollaboraOffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

Hi Bjoern,

On Monday, 2015-11-09 20:15:39 +0100, Bjoern Michaelsen wrote:

> On Mon, Nov 09, 2015 at 07:10:44PM +0100, Eike Rathke wrote:
> > Insufficient Data though can also be used for situations where a bug can
> > not be reproduced due to, well, insufficient data.. i.e. happened one
> > time crash and no stack trace, no exact steps to reproduce, even if the
> > reporter was or would be willing to provide ... all cases where
> > WORKSFORME sounds a bit odd and lax (which is a valid resolution if the
> > given steps do not lead to the described failure), but ABANDONED
> > wouldn't fit either, IMHO..
> 
> That would almost NEEDINFO. The only difference between NEEDINFO and
> INSUFFICIENT DATA is that one is considered resolved, while the other one isnt
> and there is no way to see from the wording that NEEDINFO is the unresolved 
> one
> and INSUFFICIENT DATA is the resolved one. Its likely that will lead to
> confusion.

Hu? No. What I meant is have INSUFFICIENTDATA on the same level as
WORKSFORME and INVALID, a status attribute, not a status. So if a bug
was in status NEEDINFO for some time and info wasn't provided it can be
set to RESOLVED INSUFFICIENTDATA and then closed (we may even think of
skipping RESOLVED and directly go to CLOSED instead, as it is no
resolution, just closing a bug).

  Eike

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


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

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

[Bjoern Michaelsen]

Hi,

On Mon, Nov 09, 2015 at 09:23:20AM -0800, Joel Madero wrote:
> > * ABANDONED
> > * INSUFFICIENT DATA (RedHat)
> > * EXPIRED (Launchpad)
> 
> Of these I like ABANDONED as it indicates that the user abandoned
> his/her own bug. Insufficient Data is really wordy to me, Expired
> indicates that the user could just set the bug back to UNCONFIRMED and
> say "this is still a valid bug" (mistaking "expired" for "fixed" or some
> other such thing).

Hmm, yeah. So my preference is EXPIRED followed closely by ABANDONED and last
INSUFFICIENT DATA. I already wrote my considerations about INSUFFICIENT DATA in
the other subthread.

Why do I prefer EXPIRED over ABANDONED? The first is less loaded with emotion,
while the latter implies some kind of guilt (at least to me). Thus the latter
has a higher chance of provocing the reporter into blame-gaming and trying to
prove that WE abondoned the bug and not HE/SHE. Since this is intended for bugs
where we assume there wont be any productive data following, I'd think that
would be counterproductive.

Best,

Bjoern

N.B.: The launchpad bug states names provoke the reporter early on (NEEDINFO is
called "incomplete" which is clearer in calling the reporter into action) and
if that doesnt provide results tries to silently kill the issues (bugs get
auto-set to "expired" after 90 days of inactivity with a countdown shown as
long the bug is in "incomplete".  When it happens nobody complains as launchpad
already gave those 90 days before and you had it coming.)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Jan Holesovsky]

 loolwsd/LOOLSession.cpp |   22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 2dcfb61a6952377f0621d683018404291c6b8602
Author: Jan Holesovsky 
Date:   Mon Nov 9 20:08:19 2015 +0100

loolwsd: Don't crash due to an uncaught std::out_of_range exception.

Let's invalidate everything in such a case.

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 63380bc..883ebce 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -834,10 +834,24 @@ extern "C"
 StringTokenizer tokens(std::string(pPayload), " ", 
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
 if (tokens.count() == 4)
 {
-int x(std::stoi(tokens[0]));
-int y(std::stoi(tokens[1]));
-int width(std::stoi(tokens[2]));
-int height(std::stoi(tokens[3]));
+int x, y, width, height;
+
+try {
+x = std::stoi(tokens[0]);
+y = std::stoi(tokens[1]);
+width = std::stoi(tokens[2]);
+height = std::stoi(tokens[3]);
+}
+catch (std::out_of_range&)
+{
+// something went wrong, invalidate everything
+
Application::instance().logger().information(Util::logPrefix() + "Ignoring 
integer values out of range: " + pPayload);
+x = 0;
+y = 0;
+width = INT_MAX;
+height = INT_MAX;
+}
+
 srv->sendTextFrame("invalidatetiles:"
" part=" + std::to_string(curPart) +
" x=" + std::to_string(x) +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joel Madero]

On 11/09/2015 11:15 AM, Bjoern Michaelsen wrote:
> On Mon, Nov 09, 2015 at 07:10:44PM +0100, Eike Rathke wrote:
>> Insufficient Data though can also be used for situations where a bug can
>> not be reproduced due to, well, insufficient data.. i.e. happened one
>> time crash and no stack trace, no exact steps to reproduce, even if the
>> reporter was or would be willing to provide ... all cases where
>> WORKSFORME sounds a bit odd and lax (which is a valid resolution if the
>> given steps do not lead to the described failure), but ABANDONED
>> wouldn't fit either, IMHO..
> That would almost NEEDINFO. The only difference between NEEDINFO and
> INSUFFICIENT DATA is that one is considered resolved, while the other one isnt
> and there is no way to see from the wording that NEEDINFO is the unresolved 
> one
> and INSUFFICIENT DATA is the resolved one. Its likely that will lead to
> confusion.

I was thinking exactly this and am back to thinking ABANDONED is the
best option. We wouldn't go right to ABANDONED. We would go to NEEDINFO
- which puts users on notice that we need something, after 6 months,
we'd do a follow-up ping saying "hurry up or else..." and then after
another month we close as ABANDONED, which seems to describe the
situation well.

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

Re: git / gerrit best work flow ?

[Christian Lohmaier]

On Mon, Nov 9, 2015 at 6:00 PM, jan iversen  wrote:
>
> Sometimes I have to correct an older patch set, I do the following in core:
>
> git pull

Norbert already wrote this: use pull -r

> 

This is not only correcting an older patch set, but would also rebase it.
Not that this would be a bad thing, but it is doing more than fixing a
typo or similar.
Have a look at tinderbox before pushing at that revision, would be bad
if you rebased to a version that fails to compile on some system.

> make changes
> ./logerrit ...
>
> Then in order to cleanup I do
> git reset head~
> git checkout files from changeset

or

git checkout -b jan_gerrit_whatever (or skip that if you don't plan to
revisit the patch anytime soon)

git checkout master

> This does not seem optimal, any suggestion on how to effectively work with
> different changesets fast ?

use branches for everything is a general rule of thumb. Easier to work
with branches than having to remember to use git reset (and less
error-prone)

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

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

[Bjoern Michaelsen]

On Mon, Nov 09, 2015 at 07:10:44PM +0100, Eike Rathke wrote:
> Insufficient Data though can also be used for situations where a bug can
> not be reproduced due to, well, insufficient data.. i.e. happened one
> time crash and no stack trace, no exact steps to reproduce, even if the
> reporter was or would be willing to provide ... all cases where
> WORKSFORME sounds a bit odd and lax (which is a valid resolution if the
> given steps do not lead to the described failure), but ABANDONED
> wouldn't fit either, IMHO..

That would almost NEEDINFO. The only difference between NEEDINFO and
INSUFFICIENT DATA is that one is considered resolved, while the other one isnt
and there is no way to see from the wording that NEEDINFO is the unresolved one
and INSUFFICIENT DATA is the resolved one. Its likely that will lead to
confusion.

Best,

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

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

[Bjoern Michaelsen]

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

New commits:
commit c20930bfec4ce4953ffdaff1971216290fab0e4d
Author: Bjoern Michaelsen 
Date:   Mon Nov 9 19:55:13 2015 +0100

also fix SwXFlatParagraphIterator

Change-Id: Ib35759c4d9e6ebc8e211d57d53d923f15ac9845a

diff --git a/sw/source/core/unocore/unoflatpara.cxx 
b/sw/source/core/unocore/unoflatpara.cxx
index 4628abc..62f77d8 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -361,6 +361,9 @@ SwXFlatParagraphIterator::SwXFlatParagraphIterator( SwDoc& 
rDoc, sal_Int32 nType
 
 SwXFlatParagraphIterator::~SwXFlatParagraphIterator()
 {
+SolarMutexGuard aGuard;
+if(GetRegisteredIn())
+GetRegisteredIn()->Remove(this);
 }
 
 void SwXFlatParagraphIterator::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem *pNew )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/ui/view/prevloc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df7f3c6733c1b4e4470554497f2c2aa96a442c30
Author: Stephan Bergmann 
Date:   Mon Nov 9 19:42:57 2015 +0100

loplugin:redundantcast

Change-Id: I8bfdb2c88b82dc9f1335d92589838cda4b1e7cf7

diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx
index 8dd0621..b0e407c 100644
--- a/sc/source/ui/view/prevloc.cxx
+++ b/sc/source/ui/view/prevloc.cxx
@@ -273,7 +273,7 @@ static ScPreviewLocationEntry* lcl_GetEntryByAddress(
 for (auto const& it : rEntries)
 {
 if ( it->eType == eType && it->aCellRange.In( rPos ) )
-return const_cast(it.get());
+return it.get();
 }
 
 return NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: git / gerrit best work flow ?

[Eike Rathke]

Hi jan,

On Monday, 2015-11-09 10:00:01 -0700, jan iversen wrote:

> Sometimes I have to correct an older patch set, I do the following in core:
> 
> git pull
> 
> make changes
> ./logerrit ...
> 
> Then in order to cleanup I do
> git reset head~
> git checkout files from changeset
> 
> This does not seem optimal, any suggestion on how to effectively work with
> different changesets fast ?

Use git-review ;-)
https://wiki.documentfoundation.org/Development/GitReview
(that page btw seems a bit outdated regarding installation, git-review
should be available now with all(?) distros, and the page should not
focus on git-review development but usage in our gerrit process instead)

Instead of git-review you can also use ./logerrit to create a branch and
cherry-pick the gerrit change and submit an amended commit for that
change and clean the temporary branch, but git-review does all that for
you. Plus, which I regard as a big bonus, it warns about multiple
commits that are about to be pushed to gerrit, whereas ./logerrit
silently pushes them all.

So, basically

# download changenumber and apply on a temporary branch named after
# submitter and changenumber (changenumber is the currently 5 digits
# gerrit change, not the Change-Id):
git review 
# do your changes
git commit --amend ...
git review -R -f
# -R skips rebasing change (may be desired when amending a change, see
# git review --help), then pushes to gerrit, and -f finishes the
# temporary branch, switching back to your branch and removing the
# temporary branch

You can also use  git review -xto just cherry-pick
onto your current branch without creating a named branch, e.g. if your
master isn't ahead of origin/master and a  git review   would not result
in multiple changes to be pushed, and after submitting to gerrit do
git reset --hard HEAD^
Otherwise a separate branch is of advantage.

Btw,  git reset HEAD^   (without --hard) probably is not what you want
(actually it is the same as  git reset --mixed HEAD^ ), it just undoes
the commit and preserves the modified files, so you could git add and
include them in your next commit..

  Eike

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


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

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

[Stephan Bergmann]

 oox/source/core/xmlfilterbase.cxx |  110 +++---
 1 file changed, 44 insertions(+), 66 deletions(-)

New commits:
commit d9b03172af1b81c0aede3e7e94e83d8932f26150
Author: Stephan Bergmann 
Date:   Mon Nov 9 18:44:05 2015 +0100

Clean up Sequence construction

...to avoid silly errors like the one fixed with
37039fde1187c2e71bdde6e7fafd23c6ae8a871e "Missing comma."

Change-Id: Iab4d25f44fd8867ee1ef5e15c209ada5c6ebb0c8
Reviewed-on: https://gerrit.libreoffice.org/19871
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 1aeac9a..9f01e34 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -94,72 +94,50 @@ struct NamespaceIds: public rtl::StaticWithInit<
 {
 Sequence< beans::Pair< OUString, sal_Int32 > > operator()()
 {
-static const char* const namespaceURIs[] = {
-"http://www.w3.org/XML/1998/namespace";,
-"http://schemas.openxmlformats.org/package/2006/relationships";,
-
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";,
-"http://purl.oclc.org/ooxml/officeDocument/relationships";,
-"http://schemas.openxmlformats.org/drawingml/2006/main";,
-"http://purl.oclc.org/ooxml/drawingml/main";,
-"http://schemas.openxmlformats.org/drawingml/2006/diagram";,
-"http://purl.oclc.org/ooxml/drawingml/diagram";,
-"http://schemas.openxmlformats.org/drawingml/2006/chart";,
-"http://schemas.openxmlformats.org/drawingml/2006/chartDrawing";,
-"urn:schemas-microsoft-com:vml",
-"urn:schemas-microsoft-com:office:office",
-"urn:schemas-microsoft-com:office:word",
-"urn:schemas-microsoft-com:office:excel",
-"urn:schemas-microsoft-com:office:powerpoint",
-"http://schemas.microsoft.com/office/2006/activeX";,
-"http://schemas.openxmlformats.org/spreadsheetml/2006/main";,
-
"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing";,
-"http://schemas.microsoft.com/office/excel/2006/main";,
-"http://schemas.openxmlformats.org/presentationml/2006/main";,
-"http://schemas.openxmlformats.org/markup-compatibility/2006";,
-"http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2";,
-"http://schemas.microsoft.com/office/drawing/2008/diagram";,
-"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";,
-"http://schemas.libreoffice.org/";,
-"http://schemas.microsoft.com/office/powerpoint/2010/main";,
-"http://schemas.microsoft.com/office/powerpoint/2012/main";
-};
-
-static const sal_Int32 namespaceIds[] = {
-NMSP_xml,
-NMSP_packageRel,
-NMSP_officeRel,
-NMSP_officeRel,
-NMSP_dml,
-NMSP_dml,
-NMSP_dmlDiagram,
-NMSP_dmlDiagram,
-NMSP_dmlChart,
-NMSP_dmlChartDr,
-NMSP_vml,
-NMSP_vmlOffice,
-NMSP_vmlWord,
-NMSP_vmlExcel,
-NMSP_vmlPowerpoint,
-NMSP_ax,
-NMSP_xls,
-NMSP_xm,
-NMSP_dmlSpreadDr,
-NMSP_ppt,
-NMSP_mce,
-NMSP_mceTest,
-NMSP_dsp,
-NMSP_xls14Lst,
-NMSP_loext,
-NMSP_p14,
-NMSP_p15,
-};
-
-Sequence< beans::Pair< OUString, sal_Int32 > > 
aRet(SAL_N_ELEMENTS(namespaceIds));
-for( sal_Int32 i=0; i>{
+{"http://www.w3.org/XML/1998/namespace";, NMSP_xml},
+{"http://schemas.openxmlformats.org/package/2006/relationships";,
+ NMSP_packageRel},
+
{"http://schemas.openxmlformats.org/officeDocument/2006/relationships";,
+ NMSP_officeRel},
+{"http://purl.oclc.org/ooxml/officeDocument/relationships";,
+ NMSP_officeRel},
+{"http://schemas.openxmlformats.org/drawingml/2006/main";, 
NMSP_dml},
+{"http://purl.oclc.org/ooxml/drawingml/main";, NMSP_dml},
+{"http://schemas.openxmlformats.org/drawingml/2006/diagram";,
+ NMSP_dmlDiagram},
+{"http://purl.oclc.org/ooxml/drawingml/diagram";, NMSP_dmlDiagram},
+{"http://schemas.openxmlformats.org/drawingml/2006/chart";,
+ NMSP_dmlChart},
+{"http://schemas.openxmlformats.org/drawingml/2006/chartDrawing";,
+ NMSP_dmlChartDr},
+{"urn:schemas-microsoft-com:vml", NMSP_vml},
+{"urn:schemas-microsoft-com:office:office", NMSP_vmlOffice},
+{"urn:schemas-microsoft-com:office:word", NMSP_vmlWord},
+{"urn:schemas-microsoft-com:office:excel", NMSP_vmlExcel},
+{"ur

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

[Norbert Thiebaud]

On Mon, Nov 9, 2015 at 12:13 PM, Joel Madero  wrote:
>
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
>>
>> Insufficient Data though can also be used for situations where a bug can
>> not be reproduced due to, well, insufficient data.. i.e. happened one
>> time crash and no stack trace, no exact steps to reproduce, even if the
>> reporter was or would be willing to provide ... all cases where
>> WORKSFORME sounds a bit odd and lax (which is a valid resolution if the
>> given steps do not lead to the described failure), but ABANDONED
>> wouldn't fit either, IMHO..
> True - I'm happy with either of them. I'm not so sure this will tame the
> rude users from going on rants about having to provide sufficient
> information but it's a start :)

I do not care either about the exact wording... the only point I'm
looking to improve upon is that
'Works for me' is a cop-out and is bound to put the recipient in a bad
mood even a willing and cooperative reporter.
I'd like wording that reflect that the bug is not just 'ignored' or
the report dismissed, but that it cannot be acted upon, due to
a lack of follow up by the reporter or other in position to reproduce,
or due to an apparent
impossibility to reproduce coupled with a lack of exploitable data
from the original report.

Yes it won't prevent some of the outburst we see on occasion, but at
least it won't feed the beast
either.

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

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

[Bjoern Michaelsen]

 sw/source/core/access/accpara.cxx  |2 ++
 sw/source/core/attr/calbck.cxx |8 
 sw/source/core/unocore/unodraw.cxx |3 +++
 sw/source/core/unocore/unoport.cxx |5 -
 sw/source/core/unocore/unoportenum.cxx |5 -
 sw/source/core/unocore/unosett.cxx |1 +
 sw/source/core/unocore/unostyle.cxx|2 ++
 sw/source/core/unocore/unotbl.cxx  |   13 +++--
 8 files changed, 35 insertions(+), 4 deletions(-)

New commits:
commit ffdc5db260b7c17c47109f707b3664a3f3caafaa
Author: Bjoern Michaelsen 
Date:   Mon Nov 9 18:56:17 2015 +0100

fix a set of race conditions in the writer uno wrappers

- whenever SwClients are added or removed, the SolarMutex should be
  locked
- locking the mutex there would be a performance killer
- thus only DBG_TESTSOLARMUTEX() and fixing the fallout on DBG_UTL
  builds

Change-Id: I3b10b9a01c40fbe68d15ce6e9c5c74db34eb1eb6
Reviewed-on: https://gerrit.libreoffice.org/19856

diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index dce86d8..5ab1d0d 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -564,6 +564,8 @@ SwAccessibleParagraph::~SwAccessibleParagraph()
 delete pPortionData;
 delete pHyperTextData;
 delete mpParaChangeTrackInfo; // #i108125#
+if(GetRegisteredIn())
+GetRegisteredIn()->Remove(this);
 }
 
 bool SwAccessibleParagraph::HasCursor()
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index fafb9a6..0ba6a74 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 sw::LegacyModifyHint::~LegacyModifyHint() {}
 
@@ -29,6 +30,8 @@ TYPEINIT0( SwClient );
 
 SwClient::~SwClient()
 {
+if(GetRegisteredIn())
+DBG_TESTSOLARMUTEX();
 OSL_ENSURE( !pRegisteredIn || pRegisteredIn->HasWriterListeners(), 
"SwModify still known, but Client already disconnected!" );
 if( pRegisteredIn && pRegisteredIn->HasWriterListeners() )
 pRegisteredIn->Remove( this );
@@ -36,6 +39,7 @@ SwClient::~SwClient()
 
 void SwClient::CheckRegistration( const SfxPoolItem* pOld, const SfxPoolItem* )
 {
+DBG_TESTSOLARMUTEX();
 // this method only handles notification about dying SwModify objects
 if( (!pOld || pOld->Which() != RES_OBJECTDYING) )
 return;
@@ -73,6 +77,7 @@ void SwClient::Modify(SfxPoolItem const*const pOldValue, 
SfxPoolItem const*const
 
 SwModify::~SwModify()
 {
+DBG_TESTSOLARMUTEX();
 OSL_ENSURE( !IsModifyLocked(), "Modify destroyed but locked." );
 
 if ( IsInCache() )
@@ -109,6 +114,7 @@ SwModify::~SwModify()
 
 void SwModify::NotifyClients( const SfxPoolItem* pOldValue, const SfxPoolItem* 
pNewValue )
 {
+DBG_TESTSOLARMUTEX();
 if ( IsInCache() || IsInSwFntCache() )
 {
 const sal_uInt16 nWhich = pOldValue ? pOldValue->Which() :
@@ -158,6 +164,7 @@ bool SwModify::GetInfo( SfxPoolItem& rInfo ) const
 
 void SwModify::Add( SwClient* pDepend )
 {
+DBG_TESTSOLARMUTEX();
 OSL_ENSURE( !m_bLockClientList, "Client inserted while in Modify" );
 
 if(pDepend->pRegisteredIn != this )
@@ -202,6 +209,7 @@ SwClient* SwModify::Remove( SwClient* pDepend )
 if(m_bInDocDTOR)
 return nullptr;
 
+DBG_TESTSOLARMUTEX();
 assert(pDepend->pRegisteredIn == this);
 
 // SwClient is my listener
diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index 1062514..fb99025e 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1006,12 +1006,15 @@ void SwXShape::AddExistingShapeToFormat( SdrObject& 
_rObj )
 
 SwXShape::~SwXShape()
 {
+SolarMutexGuard aGuard;
 if (xShapeAgg.is())
 {
 uno::Reference< uno::XInterface >  xRef;
 xShapeAgg->setDelegator(xRef);
 }
 delete pImpl;
+if(GetRegisteredIn())
+GetRegisteredIn()->Remove(this);
 }
 
 uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( 
uno::RuntimeException, std::exception )
diff --git a/sw/source/core/unocore/unoport.cxx 
b/sw/source/core/unocore/unoport.cxx
index 480e76a..f3f8039 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -137,7 +137,10 @@ SwXTextPortion::SwXTextPortion(
 }
 
 SwXTextPortion::~SwXTextPortion()
-{ }
+{
+SolarMutexGuard aGuard;
+m_pUnoCursor.reset(nullptr);
+}
 
 uno::Reference< text::XText >  SwXTextPortion::getText()
 throw( uno::RuntimeException, std::exception )
diff --git a/sw/source/core/unocore/unoportenum.cxx 
b/sw/source/core/unocore/unoportenum.cxx
index c9c4e6e..7af952a 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -384,7 +384,10 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration(
 }
 
 SwXTextPortionEnumeration::~SwXTextPortionEnumeration()
-{ }
+{
+SolarMutexGuard aGua

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

[Joel Madero]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

>
> Insufficient Data though can also be used for situations where a bug can
> not be reproduced due to, well, insufficient data.. i.e. happened one
> time crash and no stack trace, no exact steps to reproduce, even if the
> reporter was or would be willing to provide ... all cases where
> WORKSFORME sounds a bit odd and lax (which is a valid resolution if the
> given steps do not lead to the described failure), but ABANDONED
> wouldn't fit either, IMHO..
True - I'm happy with either of them. I'm not so sure this will tame the
rude users from going on rants about having to provide sufficient
information but it's a start :)

Let's let others speak up and then Robinson can just go with whatever
seems to be the consensus.

Best,
Joel
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)

iQEcBAEBAgAGBQJWQOIxAAoJEAFBJ8aP+xsU7LkH/R1PBNtb6c2zTKTHjTka4n9g
fMInqpMKxYogLG5aWV0iztFQuRJuoQ6LGijm9T2tft7gH5EOr86pwtcEyjabPiwy
cIZ+2p6IZ84CJIu2cac8k5SM0QWfX6lYlBhJEriVMB2kxIynn1Jd6oKlrL6A3xSG
qkpFzTZx5KzLvHlv2Lq7Cb+xpjBg7Kz4iEDAmgO5QPHjLgXmjRox2olxc3gaiwRJ
bBTF5byMn1Zncp93LENtphDfITZzTR6gdDxFfB4Ut8N09Syyq9iGtGKUxUOtVZjm
4J1YHbhtTTpw8Q+oTF+UMnGXgU63WkibdHA6ZjdHxJD35IX/Yh9KNCKrc5AzmpM=
=eaZ/
-END PGP SIGNATURE-

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

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

[Eike Rathke]

Hi Joel,

On Monday, 2015-11-09 09:23:20 -0800, Joel Madero wrote:

> > * ABANDONED
> > * INSUFFICIENT DATA (RedHat)
> > * EXPIRED (Launchpad)
> 
> Of these I like ABANDONED as it indicates that the user abandoned
> his/her own bug. Insufficient Data is really wordy to me,

Insufficient Data though can also be used for situations where a bug can
not be reproduced due to, well, insufficient data.. i.e. happened one
time crash and no stack trace, no exact steps to reproduce, even if the
reporter was or would be willing to provide ... all cases where
WORKSFORME sounds a bit odd and lax (which is a valid resolution if the
given steps do not lead to the described failure), but ABANDONED
wouldn't fit either, IMHO..

  Eike

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


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

Re: git / gerrit best work flow ?

[Norbert Thiebaud]

On Mon, Nov 9, 2015 at 11:00 AM, jan iversen
 wrote:
> Hi.
>
> I have a lode setup with dev/core and dev/work. I use work to work on my own
> patches.
>
> Sometimes I have to correct an older patch set, I do the following in core:
>
> git pull
> 
> make changes
> ./logerrit ...
>

no need to git pull, and when you pull take the habit of doing git
pull -r not git pull
if your git config is set right, git pull shoudl do pit pull -r... but
if not you may end-up with a merge commit.. which is a no-no.

git fetch origin refs/changes/..
git checkout FETCH_HEAD
(note these 2 commands are provided to you in the gerrit ui under the
'download pull-down on the top right.. second choice)

modify build etc..

then
git add 
git commit --amend
and
git push origin HEAD:refs/for/master  (assuming the patch was for the
master branch)

then git checkout master to return to master
if there is any left-over changes (and there should not have been or
that indicate you likely did not amend your original commit correctly)
you can do : git reset --hard

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

Re: Ghasan Al-Sakkaf license statement

[Eike Rathke]

Hi Ghasan,

On Tuesday, 2015-11-10 00:35:45 +0800, Ghasan Al-Sakkaf wrote:

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

Thanks, added to
https://wiki.documentfoundation.org/Development/Developers#A

  Eike

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


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

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

[Joel Madero]

> * ABANDONED
> * INSUFFICIENT DATA (RedHat)
> * EXPIRED (Launchpad)

Of these I like ABANDONED as it indicates that the user abandoned
his/her own bug. Insufficient Data is really wordy to me, Expired
indicates that the user could just set the bug back to UNCONFIRMED and
say "this is still a valid bug" (mistaking "expired" for "fixed" or some
other such thing).

Couple other points:

1. Please update the wiki when the change happens (both the status wiki
as well as the gardening wiki);
2. Please ping me directly so that I update my stuff for the next time I
do a mass ping.

Seems like a good idea. Thanks for leading it (and for Norbert's
original suggestion).


Best,
Joel

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

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

[Stephan Bergmann]

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

New commits:
commit 37039fde1187c2e71bdde6e7fafd23c6ae8a871e
Author: Stephan Bergmann 
Date:   Mon Nov 9 18:21:14 2015 +0100

Missing comma

Change-Id: Ia2497902771b78130b6263885bdb3362d1e6c76c

diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index fca049c..1aeac9a 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -120,7 +120,7 @@ struct NamespaceIds: public rtl::StaticWithInit<
 "http://schemas.microsoft.com/office/drawing/2008/diagram";,
 "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";,
 "http://schemas.libreoffice.org/";,
-"http://schemas.microsoft.com/office/powerpoint/2010/main";
+"http://schemas.microsoft.com/office/powerpoint/2010/main";,
 "http://schemas.microsoft.com/office/powerpoint/2012/main";
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/oox/ppt/slidetransition.hxx |2 +-
 oox/source/ppt/slidetransition.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1056f627efb0625ab658f4219a6a3c7002e2022f
Author: Stephan Bergmann 
Date:   Mon Nov 9 18:12:43 2015 +0100

loplugin:passstuffbyref

Change-Id: Ibcab688c042e32a81b936573503c4a9066244161

diff --git a/include/oox/ppt/slidetransition.hxx 
b/include/oox/ppt/slidetransition.hxx
index 4680320..1e322e0 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -54,7 +54,7 @@ namespace oox { namespace ppt {
 void setOoxTransitionType( ::sal_Int32 OoxType,
  ::sal_Int32 
param1, ::sal_Int32 param2 );
 
-void setPresetTransition(OUString sPresetTransition);
+void setPresetTransition(OUString const & sPresetTransition);
 
 private:
 ::sal_Int16 mnTransitionType;
diff --git a/oox/source/ppt/slidetransition.cxx 
b/oox/source/ppt/slidetransition.cxx
index 6681447..0fe0b10 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -419,7 +419,7 @@ namespace oox { namespace ppt {
 }
 }
 
-void SlideTransition::setPresetTransition(OUString sPresetTransition)
+void SlideTransition::setPresetTransition(OUString const & 
sPresetTransition)
 {
 if (sPresetTransition == "fallOver")
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - i18npool/Library_localedata_others.mk i18npool/source

[Eike Rathke]

 i18npool/Library_localedata_others.mk |8 +
 i18npool/source/localedata/data/ar_BH.xml |   41 ++
 i18npool/source/localedata/data/ar_IQ.xml |   41 ++
 i18npool/source/localedata/data/ar_JO.xml |   41 ++
 i18npool/source/localedata/data/ar_LY.xml |   41 ++
 i18npool/source/localedata/data/ar_MA.xml |   41 ++
 i18npool/source/localedata/data/ar_QA.xml |   41 ++
 i18npool/source/localedata/data/ar_SY.xml |   41 ++
 i18npool/source/localedata/data/ar_YE.xml |   41 ++
 i18npool/source/localedata/localedata.cxx |9 +-
 10 files changed, 344 insertions(+), 1 deletion(-)

New commits:
commit 31801a402e048b4861cb373687f28ea15ca60ebb
Author: Eike Rathke 
Date:   Mon Nov 9 18:01:44 2015 +0100

add [ar-{BH,IQ,JO,LY,MA,QA,SY,YE}] to locale data libs, tdf#95485

Change-Id: Idbe31956d8627ff51f90d2e4a52666d33143b8c0

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index 5e79699..b485379 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -20,13 +20,21 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_ak_GH \
CustomTarget/i18npool/localedata/localedata_am_ET \
CustomTarget/i18npool/localedata/localedata_ar_AE \
+   CustomTarget/i18npool/localedata/localedata_ar_BH \
CustomTarget/i18npool/localedata/localedata_ar_DZ \
CustomTarget/i18npool/localedata/localedata_ar_EG \
+   CustomTarget/i18npool/localedata/localedata_ar_IQ \
+   CustomTarget/i18npool/localedata/localedata_ar_JO \
CustomTarget/i18npool/localedata/localedata_ar_KW \
CustomTarget/i18npool/localedata/localedata_ar_LB \
+   CustomTarget/i18npool/localedata/localedata_ar_LY \
+   CustomTarget/i18npool/localedata/localedata_ar_MA \
CustomTarget/i18npool/localedata/localedata_ar_OM \
+   CustomTarget/i18npool/localedata/localedata_ar_QA \
CustomTarget/i18npool/localedata/localedata_ar_SA \
+   CustomTarget/i18npool/localedata/localedata_ar_SY \
CustomTarget/i18npool/localedata/localedata_ar_TN \
+   CustomTarget/i18npool/localedata/localedata_ar_YE \
CustomTarget/i18npool/localedata/localedata_axk_CG \
CustomTarget/i18npool/localedata/localedata_az_AZ \
CustomTarget/i18npool/localedata/localedata_beq_CG \
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index f0ceb8b..703406a 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -305,7 +305,14 @@ static const struct {
 { "lgr_SB", lcl_DATA_OTHERS },
 { "mos_BF", lcl_DATA_OTHERS },
 { "ny_MW",  lcl_DATA_OTHERS },
-{ "ti_ET",  lcl_DATA_OTHERS }
+{ "ar_BH",  lcl_DATA_OTHERS },
+{ "ar_IQ",  lcl_DATA_OTHERS },
+{ "ar_JO",  lcl_DATA_OTHERS },
+{ "ar_LY",  lcl_DATA_OTHERS },
+{ "ar_MA",  lcl_DATA_OTHERS },
+{ "ar_QA",  lcl_DATA_OTHERS },
+{ "ar_SY",  lcl_DATA_OTHERS },
+{ "ar_YE",  lcl_DATA_OTHERS }
 };
 
 #else
commit 7e997e2c1b5aaa9ad525e15e06fc8f0e8ed8fc25
Author: Eike Rathke 
Date:   Mon Nov 9 17:58:01 2015 +0100

add U+200F RIGHT-TO-LEFT MARK to currency symbol, tdf#95485 follow-up

... same as in other ar_* locale data.

Change-Id: If5bd17d710fc6a9b40aac87eb49a8615f59a7a31

diff --git a/i18npool/source/localedata/data/ar_BH.xml 
b/i18npool/source/localedata/data/ar_BH.xml
index 82cb61b..f2934f3 100644
--- a/i18npool/source/localedata/data/ar_BH.xml
+++ b/i18npool/source/localedata/data/ar_BH.xml
@@ -20,7 +20,7 @@
 
   
   
-  
+  
   
   
   
@@ -28,7 +28,7 @@
   
 
   BHD
-  د.ب.
+  د.ب.‏
   BHD
   BHD
   2
diff --git a/i18npool/source/localedata/data/ar_IQ.xml 
b/i18npool/source/localedata/data/ar_IQ.xml
index 26c9074..f4b338e 100644
--- a/i18npool/source/localedata/data/ar_IQ.xml
+++ b/i18npool/source/localedata/data/ar_IQ.xml
@@ -20,7 +20,7 @@
 
   
   
-  
+  
   
   
   
@@ -28,7 +28,7 @@
   
 
   IQD
-  د.ع.
+  د.ع.‏
   IQD
   IQD
   2
diff --git a/i18npool/source/localedata/data/ar_JO.xml 
b/i18npool/source/localedata/data/ar_JO.xml
index 5246ad9..422ed9c 100644
--- a/i18npool/source/localedata/data/ar_JO.xml
+++ b/i18npool/source/localedata/data/ar_JO.xml
@@ -20,7 +20,7 @@
 
   
   
-  
+  
   
   
   
@@ -28,7 +28,7 @@
   
 
   JOD
-  د.أ.
+  د.أ.‏
   JOD
   JOD
   2
diff --git a/i18npool/source/localedata/data/ar_LY.xml 
b/i18npool/source/localedata/data/ar_LY.xml
index 71ba64d..ae50797 100644
--- a/i18npool/source/localedata/data/ar_LY.xml
+++ b/i18npool/source/localedata/data/ar_

git / gerrit best work flow ?

[jan iversen]

Hi.

I have a lode setup with dev/core and dev/work. I use work to work on my own
patches.

Sometimes I have to correct an older patch set, I do the following in core:

git pull

make changes
./logerrit ...

Then in order to cleanup I do
git reset head~
git checkout files from changeset

This does not seem optimal, any suggestion on how to effectively work with
different changesets fast ?

thanks in advance
rgds
jan I.



--
View this message in context: 
http://nabble.documentfoundation.org/git-gerrit-best-work-flow-tp4165745.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: Branch 'libreoffice-5-0' - editeng/source

[Stephan Bergmann]

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

New commits:
commit 5889d97f4e6ac41db9cd65b55baa14c46a283893
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/19857
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

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

Ghasan Al-Sakkaf license statement

[Ghasan Al-Sakkaf]

Hi all,

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

Warm Regards,
Ghasan Al-Sakkaf

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

[Libreoffice-commits] core.git: distro-configs/Jenkins

[Norbert Thiebaud]

 distro-configs/Jenkins/Linux_ubsan_master.conf |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6626a569a47751b65230f2ee95345640dbe8a562
Author: Norbert Thiebaud 
Date:   Mon Nov 9 10:16:39 2015 -0600

do not force-disable ccache for jenkins-ubsan build

Change-Id: I791d9d6710462ba0a325228a890b941f6000ce13

diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf 
b/distro-configs/Jenkins/Linux_ubsan_master.conf
index 44baa50..0c23236 100644
--- a/distro-configs/Jenkins/Linux_ubsan_master.conf
+++ b/distro-configs/Jenkins/Linux_ubsan_master.conf
@@ -1,4 +1,3 @@
---disable-ccache
 --disable-ooenv
 --enable-avahi
 --enable-dbgutil
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sc/source/filter/xml/xmlimprt.cxx |   18 ++--
 sc/source/filter/xml/xmlimprt.hxx |   14 +--
 sc/source/ui/inc/prevloc.hxx  |   15 ++-
 sc/source/ui/view/prevloc.cxx |   62 ++
 starmath/inc/node.hxx |   17 ++-
 starmath/source/mathmlimport.cxx  |  139 +---
 starmath/source/parse.cxx |  162 --
 7 files changed, 222 insertions(+), 205 deletions(-)

New commits:
commit 9ed9f30f2202cc7d57b1dbe68a37cc6fbbd2866a
Author: Michael Stahl 
Date:   Mon Nov 9 15:25:29 2015 +0100

starmath: replace boost::ptr_deque with std::deque

Change-Id: I1d2671a0b355bd4dbb195d69af2c432c50df904e

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 3126f58..c7f71ba 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -20,16 +20,16 @@
 #ifndef INCLUDED_STARMATH_INC_NODE_HXX
 #define INCLUDED_STARMATH_INC_NODE_HXX
 
-#include 
-#include 
-
 #include "types.hxx"
 #include "token.hxx"
 #include "error.hxx"
 #include "rect.hxx"
 #include "format.hxx"
-#include 
+
 #include 
+#include 
+#include 
+#include 
 
 #define ATTR_BOLD   0x0001
 #define ATTR_ITALIC 0x0002
@@ -61,15 +61,16 @@ class SmNode;
 class SmStructureNode;
 
 typedef std::shared_ptr SmNodePointer;
-typedef boost::ptr_deque SmNodeStack;
+typedef std::deque> SmNodeStack;
 typedef std::vector< SmNode * > SmNodeArray;
 
 template < typename T >
-T* popOrZero( boost::ptr_deque & rStack )
+T* popOrZero(std::deque> & rStack)
 {
 if (rStack.empty())
-return 0;
-auto pTmp = rStack.pop_front();
+return nullptr;
+std::unique_ptr pTmp(std::move(rStack.front()));
+rStack.pop_front();
 return pTmp.release();
 }
 
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 658b6b4..98cb9ad 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -42,6 +42,7 @@ one go*/
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -670,9 +671,9 @@ void SmXMLContext_Helper::ApplyAttrs()
 aToken.eType = TBOLD;
 else
 aToken.eType = TNBOLD;
-SmFontNode *pFontNode = new SmFontNode(aToken);
+std::unique_ptr pFontNode(new SmFontNode(aToken));
 pFontNode->SetSubNodes(0,popOrZero(rNodeStack));
-rNodeStack.push_front(pFontNode);
+rNodeStack.push_front(std::move(pFontNode));
 }
 if (nIsItalic != -1)
 {
@@ -680,14 +681,14 @@ void SmXMLContext_Helper::ApplyAttrs()
 aToken.eType = TITALIC;
 else
 aToken.eType = TNITALIC;
-SmFontNode *pFontNode = new SmFontNode(aToken);
+std::unique_ptr pFontNode(new SmFontNode(aToken));
 pFontNode->SetSubNodes(0,popOrZero(rNodeStack));
-rNodeStack.push_front(pFontNode);
+rNodeStack.push_front(std::move(pFontNode));
 }
 if (nFontSize != 0.0)
 {
 aToken.eType = TSIZE;
-SmFontNode *pFontNode = new SmFontNode(aToken);
+std::unique_ptr pFontNode(new SmFontNode(aToken));
 
 if (util::MeasureUnit::PERCENT == rContext.GetSmImport()
 .GetMM100UnitConverter().GetXMLMeasureUnit())
@@ -703,7 +704,7 @@ void SmXMLContext_Helper::ApplyAttrs()
 
pFontNode->SetSizeParameter(Fraction(nFontSize),FontSizeType::ABSOLUT);
 
 pFontNode->SetSubNodes(0,popOrZero(rNodeStack));
-rNodeStack.push_front(pFontNode);
+rNodeStack.push_front(std::move(pFontNode));
 }
 if (!sFontFamily.isEmpty())
 {
@@ -718,9 +719,9 @@ void SmXMLContext_Helper::ApplyAttrs()
 return;
 
 aToken.aText = sFontFamily;
-SmFontNode *pFontNode = new SmFontNode(aToken);
+std::unique_ptr pFontNode(new SmFontNode(aToken));
 pFontNode->SetSubNodes(0,popOrZero(rNodeStack));
-rNodeStack.push_front(pFontNode);
+rNodeStack.push_front(std::move(pFontNode));
 }
 if (!sColor.isEmpty())
 {
@@ -732,9 +733,9 @@ void SmXMLContext_Helper::ApplyAttrs()
 if (tok != XML_TOK_UNKNOWN)
 {
 aToken.eType = static_cast(tok);
-SmFontNode *pFontNode = new SmFontNode(aToken);
+std::unique_ptr pFontNode(new SmFontNode(aToken));
 pFontNode->SetSubNodes(0,popOrZero(rNodeStack));
-rNodeStack.push_front(pFontNode);
+rNodeStack.push_front(std::move(pFontNode));
 }
 }
 
@@ -929,10 +930,10 @@ void SmXMLPhantomContext_Impl::EndElement()
 aToken.nLevel = 5;
 aToken.eType = TPHANTOM;
 
-SmFontNode *pPhantom = new SmFontNode(aToken);
+std::unique_ptr pPhantom(new SmFontNode(aToken));
 SmNodeStack &rNodeStack = GetSmImport().GetNodeStack();
 pPhant

Re: Developer Info

[jan iversen]

Hi.

you can use eclipse or whatever you want.

Here is your first error, it is a simple one, but let us make a little bit
more challenging :-)

Look in file /qadevOOo/runner/base/java_fat_service.java in function
executeTest();

It contains 2 function calls, that has no meaning, so they can be removed
without affecting how the
code works.

when you do you local commit, please give a commit msg like:

"cid#1329596, cid#1329597 

"

and then run (in core) run ./logerrit submit master

your patch will show up in your gerrit (menu "changes"), assign me (
j...@documentfoundation.org" as reviewer.

Feel free to ask if you are unsure.

Have fun
rgds
jan i.

Ps. this is a real simple bug, but it helps you understand how gerrit works
etc.



On 9 November 2015 at 11:24, Massimiliano Fiori 
wrote:

> Hi, Thank you Jan,
> i registered on gerrit platform.
> I prefer, if is possible, to see your Java problems for try to create my
> first patch, is it possible to use an IDE, like Eclipse, to edit the java
> code in easy way?
>
> Reagards,
> Massimiliano.
>
>
>
> Il giorno 08 nov 2015, alle ore 18:44, jan iversen <
> jancasacon...@gmail.com> ha scritto:
>
> Congratulations !!! that is actually the most difficult step.
>
> Now when both of you have time it would be good for you to register on the
> mailing list:
> http://nabble.documentfoundation.org/
>
> This is where we all "talk" together.
>
> Sooner or later you will also need to register in Gerrit:
> https://wiki.documentfoundation.org/Development/gerrit
>
> we use gerrit to submit and review patches, this is not mandatory for the
> first couple
> of patches, I can do it for you, but it is something you need to get used
> to.
>
> Finally here is a link to "easy hacks":
> https://wiki.documentfoundation.org/Development/Easy_Hacks
>
> Which is problems that are easy to solve, and are there for new people. I
> do however
> also have a set of problems in java, which are open. Most of the java
> problems are
> simple problems, but typically in multiple files. So whatever you prefer I
> am there
> to help you.
>
> Sukant@ Do not be stressed getting your environment up and running, there
> are plenty
> of work waiting.
>
> have a nice day.
> rgds
> jan i.
>
>
>
> On 8 November 2015 at 17:06, Massimiliano Fiori  > wrote:
>
>> Hi,
>> Yes i hadn't set CCACHE correctly. Now i have builded lode successfully.
>> Now what is my next step to create a patch for the project?
>>
>> Thanks a lot,
>> Massimiliano.
>>
>>
>> Il giorno 07 nov 2015, alle ore 21:11, jan iversen <
>> jancasacon...@gmail.com> ha scritto:
>>
>> Hi.
>>
>> I researched it a bit more, it seems that the clang compiler is not well
>> supported by lode.
>>
>> Have a look at:
>>
>> https://wiki.documentfoundation.org/Development/Building_LibreOffice_with_Clang#Setup
>>
>> the developer specialists told me, that your problem is typically caused
>> because you
>> do not have
>>
>> CCACHE_CPP2=1
>>
>> Have fun
>>
>> rgds
>>
>> jan i.
>>
>>
>>
>> On 7 November 2015 at 19:59, jan iversen  wrote:
>>
>>> Hi.
>>>
>>> It seems to me you missed the "autogen.sh" statement.
>>>
>>> you ran "setup --dev" and checked out the source.
>>>
>>> then you need to do:
>>>
>>> cd dev/core
>>> ./autogen.sh
>>>
>>> and after that (if it does not give you any errors)
>>> ../../opt/bin/make 2>&1 | tee build.log
>>>
>>> you can run ./autogen.sh anytime, so please run it again, and make sure
>>> it does not report errors.
>>>
>>> Secondly it is important that you use "../../opt/bin/make" and NOT the
>>> make standard in OSX.
>>>
>>> Finally you need to deactivate your virus checker (this is not the
>>> problem right now).
>>>
>>> Please try my suggestion, and then let me have the whole build.log
>>>
>>> have fun
>>> jan i.
>>>
>>> On 7 November 2015 at 14:54, Massimiliano Fiori <
>>> massimiliano.fi...@aol.it> wrote:
>>>
 Hi Sakunt,
 nice to meet you!

 I try to build lode and i have this error after '../../opt/bin/make 2>&
 1 | tee build.log’ command :

 [build C  ] cppuhelper/source/findsofficepath.c
 clang: error: argument unused during compilation: '-I
 /Users/Bayway/Developer/lode/dev/core/cppuhelper/source/'
 clang: error: argument unused during compilation: '-I
 /Users/Bayway/Developer/lode/dev/core/include'
 clang: error: argument unused during compilation: '-I
 /Library/Java/JavaVirtualMachines/jdk1.7.0_79.jdk/Contents/Home/include'
 clang: error: argument unused during compilation: '-I
 /Library/Java/JavaVirtualMachines/jdk1.7.0_79.jdk/Contents/Home/include/darwin'
 clang: error: argument unused during compilation: '-I
 /Users/Bayway/Developer/lode/dev/core/config_host'
 /Users/Bayway/Developer/lode/dev/core/solenv/gbuild/LinkTarget.mk:138:
 recipe for target
 '/Users/Bayway/Developer/lode/dev/core/workdir/CObject/cppuhelper/source/findsofficepath.o'
 failed
 make[1]: ***
 [/Users/Bayway/Developer/lode/dev/core/workdir/CObject/cppuhelper/source

Bugzilla: Adding new Status for 'abandoned' bugs?

[Robinson Tryon]

Hi all,

As mentioned in the ESC call, it could be helpful to add a new
Bugzilla Status that encompasses bugs that have been abandoned/don't
have enough data.

=> What type of bugs would this cover?

* User isn't willing to share private document with anyone, and we
can't reproduce
* Bug sits in NEEDINFO status for 6+ months
* (other situations?)

=> Reasoning:

* We currently mark abandoned bugs as RESOLVED WORKSFORME, or RESOLVED
INVALID, but an additional Status value could help us be more precise
in indicating why a bug has been set aside.
* An additional Status would allow us to be more diplomatic with tough
users, and avoid the potential negatives of "INVALID" or "WORKS FOR
ME" on such bugs

=> Naming:

A couple of names for this status have been offered, however new
suggestions are certainly welcome. Here are a few suggestions or
status values that are currently in use on other bug trackers:
* ABANDONED
* INSUFFICIENT DATA (RedHat)
* EXPIRED (Launchpad)


Thoughts on adding a new Status?
Suggestions for what name we might use?
Please share your thoughts!


Thanks,
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
802-379-9482 | IRC: colonelqubit on Freenode
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Katarina Behrens]

 sc/qa/unit/subsequent_export-test.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit df6d3e9d91c25bd1ef7c7cba0f1af63895890411
Author: Katarina Behrens 
Date:   Mon Nov 9 15:51:50 2015 +0100

Related tdf#92296, tdf#90812: Make this test more strict

i.e. not only make sure that rPr is there, but also test the text
chunk has the right font colour ( it went off-by-one in regression
caused by the fix of tdf#90812 )

Change-Id: I3788a845393686ed621743e117b7eb439e38e0b3

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 24ebd59..3fe86d9 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2685,7 +2685,8 @@ void ScExportTest::testSheetRunParagraphProperty()
 xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory, 
"xl/sharedStrings.xml", XLSX);
 CPPUNIT_ASSERT(pDoc);
 
-assertXPath(pDoc, "/x:sst/x:si/x:r[1]/x:rPr[1]", 1);
+OUString aColor = getXPath(pDoc, "/x:sst/x:si/x:r[1]/x:rPr[1]/x:color", 
"rgb");
+CPPUNIT_ASSERT_EQUAL(OUString(""), aColor);
 
 xDocSh->DoClose();
 }
___
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

[Katarina Behrens]

 sc/source/filter/excel/xestring.cxx |3 +--
 sc/source/filter/excel/xetable.cxx  |   17 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 5ad39e2b06d08f160fc0750d179ebc7ebc211a93
Author: Katarina Behrens 
Date:   Thu Nov 5 17:57:07 2015 +0100

tdf#92296: Fix off-by-one formatting of text runs on OOXML export

This essentially reverts commit 8865ed2efecd03722d10e522265f31c99b13b2bb
and implements a different fix for tdf#90812:
If the formatting of entire cell is uniform, remove formatting of the
leading text run and create corresponding cell style. In all other cases,
write out formattings for each individual run.

Change-Id: I7724b7a474f773f2cdc39e9150d843642fb05bbe
Reviewed-on: https://gerrit.libreoffice.org/19811
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit dd971d008780186c88cc33df3610ed8cc9f0a2f4)

diff --git a/sc/source/filter/excel/xestring.cxx 
b/sc/source/filter/excel/xestring.cxx
index 0e1a127..2e716b0 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -427,10 +427,9 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const
 const XclExpFont* pFont = NULL;
 for ( ; aIt != aEnd; ++aIt )
 {
-// pFont getting first then pass it to run otherwise pFont is NULL.
-pFont = rFonts.GetFont( aIt->mnFontIdx );
 nStart = lcl_WriteRun( rStrm, GetUnicodeBuffer(),
 nStart, aIt->mnChar-nStart, pFont );
+pFont = rFonts.GetFont( aIt->mnFontIdx );
 }
 lcl_WriteRun( rStrm, GetUnicodeBuffer(),
 nStart, GetUnicodeBuffer().size() - nStart, pFont );
diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 8422ef6..21f0aa9 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -723,13 +723,18 @@ void XclExpLabelCell::Init( const XclExpRoot& rRoot,
 mxText = xText;
 mnSstIndex = 0;
 
-// create the cell format
-sal_uInt16 nXclFont = mxText->RemoveLeadingFont();
-if( GetXFId() == EXC_XFID_NOTFOUND )
+const XclFormatRunVec& rFormats = mxText->GetFormats();
+// Create the cell format and remove formatting of the leading run
+// if the entire string is equally formatted
+if( rFormats.size() == 1 )
 {
-OSL_ENSURE( nXclFont != EXC_FONT_NOTFOUND, "XclExpLabelCell::Init - 
leading font not found" );
-bool bForceLineBreak = mxText->IsWrapped();
-SetXFId( rRoot.GetXFBuffer().InsertWithFont( pPattern, 
ApiScriptType::WEAK, nXclFont, bForceLineBreak ) );
+sal_uInt16 nXclFont = mxText->RemoveLeadingFont();
+if( GetXFId() == EXC_XFID_NOTFOUND )
+{
+OSL_ENSURE( nXclFont != EXC_FONT_NOTFOUND, "XclExpLabelCell::Init 
- leading font not found" );
+bool bForceLineBreak = mxText->IsWrapped();
+SetXFId( rRoot.GetXFBuffer().InsertWithFont( pPattern, 
ApiScriptType::WEAK, nXclFont, bForceLineBreak ) );
+}
 }
 
 // get auto-wrap attribute from cell format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

QA Meeting Minutes - 2015-11-04

[Robinson Tryon]

Hi all,

Thanks to all for attending the QA Call last week! Minutes are here:
https://wiki.documentfoundation.org/QA/Meetings/2015/November_04

Our meeting this week will be at the regular time:
https://wiki.documentfoundation.org/QA/Meetings/2015/November_11

If you have any ACTION items to address, please take a look today or
tomorrow and see if you can make some progress by Wednesday. It's
always great to hear what y'all have been working on throughout the
past week!

Cheers,
--R

P.S. UNCONFIRMED bugs are up to 553!  Let's discuss how we can
chew-away at that number on Wednesday.

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
802-379-9482 | IRC: colonelqubit on Freenode
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andras Timar]

 sw/source/filter/ww8/ww8par.cxx |   23 ++-
 1 file changed, 18 insertions(+), 5 deletions(-)

New commits:
commit a8c1ed47fb9dc2e878ad5f2cf26b967cf8e09d34
Author: Andras Timar 
Date:   Mon Nov 9 15:38:01 2015 +0100

Revert "Revert "fix tdf#94818 while retaining the tdf#90504 fix""

This reverts commit dad32b63f852716af94cf995696b62b6e60724bd.

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 903f944..0886deb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3530,11 +3530,24 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
 }
 break;
 case 0x7:
-bNewParaEnd = true;
-if (m_pPlcxMan->GetPapPLCF()->Where() == nCpOfs+nPosCp+1)
-TabCellEnd();   // Table cell/row end
-else
-bParaMark = true;
+{
+bNewParaEnd = true;
+WW8PLCFxDesc* pPap = m_pPlcxMan->GetPap();
+//The last paragraph of each cell is terminated by a special
+//paragraph mark called a cell mark. Following the cell mark
+//that ends the last cell of a table row, the table row is
+//terminated by a special paragraph mark called a row mark
+//
+//So the 0x7 should be right at the end of the previous
+//range to be a real cell-end.
+if (pPap->nOrigStartPos == nCpOfs+nPosCp+1 ||
+pPap->nOrigStartPos == WW8_CP_MAX)
+{
+TabCellEnd();   // Table cell/row end
+}
+else
+bParaMark = true;
+}
 break;
 case 0xf:
 if( !m_bSpec )// "Satellite"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 sw/source/filter/ww8/ww8par.cxx |   23 +--
 vcl/source/outdev/map.cxx   |8 
 2 files changed, 9 insertions(+), 22 deletions(-)

New commits:
commit b6bee78750a84e9598d836223bf9a0937893dcc0
Author: Andras Timar 
Date:   Mon Nov 9 15:13:55 2015 +0100

translated German warnings

Change-Id: Ibb42bfbbf8c7a1796998c5390e7d933009b3ab89

diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 4e84033..70de3fb 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1511,15 +1511,15 @@ static void verifyUnitSourceDest( MapUnit eUnitSource, 
MapUnit eUnitDest )
 DBG_ASSERT( eUnitSource != MAP_SYSFONT
 && eUnitSource != MAP_APPFONT
 && eUnitSource != MAP_RELATIVE,
-"Source MapUnit nicht erlaubt" );
+"Source MapUnit is not permitted" );
 DBG_ASSERT( eUnitDest != MAP_SYSFONT
 && eUnitDest != MAP_APPFONT
 && eUnitDest != MAP_RELATIVE,
-"Destination MapUnit nicht erlaubt" );
+"Destination MapUnit is not permitted" );
 SAL_WARN_IF( eUnitSource == MAP_PIXEL, "vcl",
-   "MAP_PIXEL mit 72dpi angenaehert" );
+   "MAP_PIXEL approximated with 72dpi" );
 SAL_WARN_IF( eUnitDest == MAP_PIXEL, "vcl",
-   "MAP_PIXEL mit 72dpi angenaehert" );
+   "MAP_PIXEL approximated with 72dpi" );
 }
 
 #define ENTER3( eUnitSource, eUnitDest )\
commit dad32b63f852716af94cf995696b62b6e60724bd
Author: Andras Timar 
Date:   Wed Nov 4 16:08:32 2015 +0100

Revert "fix tdf#94818 while retaining the tdf#90504 fix"

This reverts commit 959ac511dbebeb3983da92052ced837b39b74ed9.

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0886deb..903f944 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3530,24 +3530,11 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
 }
 break;
 case 0x7:
-{
-bNewParaEnd = true;
-WW8PLCFxDesc* pPap = m_pPlcxMan->GetPap();
-//The last paragraph of each cell is terminated by a special
-//paragraph mark called a cell mark. Following the cell mark
-//that ends the last cell of a table row, the table row is
-//terminated by a special paragraph mark called a row mark
-//
-//So the 0x7 should be right at the end of the previous
-//range to be a real cell-end.
-if (pPap->nOrigStartPos == nCpOfs+nPosCp+1 ||
-pPap->nOrigStartPos == WW8_CP_MAX)
-{
-TabCellEnd();   // Table cell/row end
-}
-else
-bParaMark = true;
-}
+bNewParaEnd = true;
+if (m_pPlcxMan->GetPapPLCF()->Where() == nCpOfs+nPosCp+1)
+TabCellEnd();   // Table cell/row end
+else
+bParaMark = true;
 break;
 case 0xf:
 if( !m_bSpec )// "Satellite"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

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


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

[Tomaž Vajngerl]

 include/oox/ppt/slidetransition.hxx   |3 ++
 oox/source/core/fragmenthandler2.cxx  |1 
 oox/source/core/xmlfilterbase.cxx |2 +
 oox/source/ppt/slidetransition.cxx|   13 +
 oox/source/ppt/slidetransitioncontext.cxx |8 ++
 oox/source/token/namespaces-strict.txt|4 +++
 oox/source/token/namespaces.hxx.tail  |1 
 oox/source/token/namespaces.txt   |4 +++
 oox/source/token/tokens.txt   |1 
 sd/qa/unit/export-tests.cxx   |3 ++
 sd/source/filter/eppt/pptx-epptooxml.cxx  |   40 +++---
 11 files changed, 71 insertions(+), 9 deletions(-)

New commits:
commit 18cd4b273f3781620ecb8dd68e6d616bba498992
Author: Tomaž Vajngerl 
Date:   Mon Nov 9 13:32:32 2015 +0100

pptx: "fall" transition, which needed p15 namespace

Added p15 namespace which is present in MSO 2013+ documents. It
adds a "prstTrans" element with a string "prst" attribute which
is a name of the transition to be performed.

This was added to support "fall" transition which translates to
"fallOver" preset transition.

Change-Id: I429bb106a12c1b99cce756502508e917720daef3

diff --git a/include/oox/ppt/slidetransition.hxx 
b/include/oox/ppt/slidetransition.hxx
index b0e2351..4680320 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -53,6 +53,9 @@ namespace oox { namespace ppt {
 
 void setOoxTransitionType( ::sal_Int32 OoxType,
  ::sal_Int32 
param1, ::sal_Int32 param2 );
+
+void setPresetTransition(OUString sPresetTransition);
+
 private:
 ::sal_Int16 mnTransitionType;
 ::sal_Int16 mnTransitionSubType;
diff --git a/oox/source/core/fragmenthandler2.cxx 
b/oox/source/core/fragmenthandler2.cxx
index ba7b6ef..2057eb6 100644
--- a/oox/source/core/fragmenthandler2.cxx
+++ b/oox/source/core/fragmenthandler2.cxx
@@ -72,6 +72,7 @@ bool FragmentHandler2::prepareMceContext( sal_Int32 nElement, 
const AttributeLis
 static std::vector aSupportedNS =
 {
 "p14",
+"p15",
 };
 
 if (std::find(aSupportedNS.begin(), aSupportedNS.end(), 
aRequires) != aSupportedNS.end())
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index d59b2b4..fca049c 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -121,6 +121,7 @@ struct NamespaceIds: public rtl::StaticWithInit<
 "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";,
 "http://schemas.libreoffice.org/";,
 "http://schemas.microsoft.com/office/powerpoint/2010/main";
+"http://schemas.microsoft.com/office/powerpoint/2012/main";
 };
 
 static const sal_Int32 namespaceIds[] = {
@@ -150,6 +151,7 @@ struct NamespaceIds: public rtl::StaticWithInit<
 NMSP_xls14Lst,
 NMSP_loext,
 NMSP_p14,
+NMSP_p15,
 };
 
 Sequence< beans::Pair< OUString, sal_Int32 > > 
aRet(SAL_N_ELEMENTS(namespaceIds));
diff --git a/oox/source/ppt/slidetransition.cxx 
b/oox/source/ppt/slidetransition.cxx
index e623558..6681447 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -419,6 +419,19 @@ namespace oox { namespace ppt {
 }
 }
 
+void SlideTransition::setPresetTransition(OUString sPresetTransition)
+{
+if (sPresetTransition == "fallOver")
+{
+mnTransitionType = TransitionType::MISCSHAPEWIPE;
+mnTransitionSubType = TransitionSubType::LEFTTORIGHT;
+}
+else
+{
+mnTransitionType = 0;
+}
+}
+
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/slidetransitioncontext.cxx 
b/oox/source/ppt/slidetransitioncontext.cxx
index 4a9c996..a5d5496 100644
--- a/oox/source/ppt/slidetransitioncontext.cxx
+++ b/oox/source/ppt/slidetransitioncontext.cxx
@@ -152,6 +152,14 @@ SlideTransitionContext::~SlideTransitionContext() throw()
 maTransition.setOoxTransitionType(aElementToken, 
sal_Int32(rAttribs.getBool(XML_isInverted, false)), 0);
 }
 return this;
+case P15_TOKEN(prstTrans):
+if (!mbHasTransition)
+{
+mbHasTransition = true;
+maTransition.setPresetTransition(rAttribs.getString(XML_prst, ""));
+}
+return this;
+
 
 default:
 break;
diff --git a/oox/source/token/namespaces-strict.txt 
b/oox/source/token/namespaces-strict.txt
index 74efa82..69eb335 100644
--- a/oox/source/token/namespaces-strict.txt
+++ b/oox/source/token/namespaces-strict.txt
@@ -80,6 +80,10 @@ w14 
http://schemas.microsoft.com/office/word/2010/wordml
 a14 http://schemas.microsoft.com

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

[Andras Timar]

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

New commits:
commit 9f84cc2e251c0cbd05c15395fe5cff2b944f1cd1
Author: Andras Timar 
Date:   Mon Nov 9 13:01:24 2015 +0100

loolwsd: loolwsd.service KillMode should be control-group

diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 8e410f8..136bad4 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -6,7 +6,7 @@ After=network.target
 EnvironmentFile=-/etc/sysconfig/loolwsd
 ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5
 User=lool
-KillMode=process
+KillMode=control-group
 Restart=always
 
 [Install]
___
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

[Bjoern Michaelsen]

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: config_host/config_global.h.in configure.ac dbaccess/source extensions/source fpicker/source include/rtl sal/qa svtools/source svx/source toolkit/source

[Stephan Bergmann]

 config_host/config_global.h.in |1 
 configure.ac   |   17 +
 dbaccess/source/ui/dlg/DbAdminImpl.cxx |   36 +
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |2 -
 extensions/source/dbpilots/gridwizard.cxx  |2 -
 fpicker/source/office/commonpicker.cxx |   16 -
 include/rtl/string.hxx |   14 
 include/rtl/ustring.hxx|   25 ++
 sal/qa/rtl/strings/test_oustring_concat.cxx|   10 -
 svtools/source/dialogs/addresstemplate.cxx |   10 ++---
 svx/source/form/fmsrccfg.cxx   |8 +---
 toolkit/source/controls/formattedcontrol.cxx   |6 +--
 12 files changed, 100 insertions(+), 47 deletions(-)

New commits:
commit 9d3cb71115cfb34adde975f66f394303982f85be
Author: Stephan Bergmann 
Date:   Mon Nov 9 12:22:17 2015 +0100

Prevent += called on temporary O[U]String instances

...found regression e31205f3ec1f941ab5a188bfde6329edf2acc55b
"EditUndoRemoveChars::GetStr must return a reference" and dubious code
0e23f7b0839df68d277186b4df54ba391ac3406a "Lets assume this doesn't want to
update m_pForcedPrefix->GetText() anyway" in addition to the apparent 
sillies
directly fixed in this commit.

Introduces HAVE_CXX11_REF_QUALIFIER.

Change-Id: I564e98254fd53c1dd9b34193d7057c59721ee24c

diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 72e3f3c..c7c5987 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -14,6 +14,7 @@ Any change in this header will cause a rebuild of almost 
everything.
 
 #define HAVE_CXX11_CONSTEXPR 0
 #define HAVE_CXX14_CONSTEXPR 0
+#define HAVE_CXX11_REF_QUALIFIER 0
 #define HAVE_CXX14_SIZED_DEALLOCATION 0
 #define HAVE_GCC_BUILTIN_ATOMIC 0
 /* _Pragma */
diff --git a/configure.ac b/configure.ac
index cf52e9d..2f064eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6335,6 +6335,23 @@ if test "$cxx14_constexpr" = yes; then
 AC_DEFINE([HAVE_CXX14_CONSTEXPR])
 fi
 
+AC_MSG_CHECKING([whether $CXX supports C++11 ref-qualifier])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+struct S {
+void f() &;
+void f() &&;
+};
+]])], [cxx11_ref_qualifier=yes], [cxx11_ref_qualifier=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([$cxx11_ref_qualifier])
+if test "$cxx11_ref_qualifier" = yes; then
+AC_DEFINE([HAVE_CXX11_REF_QUALIFIER])
+fi
+
 AC_MSG_CHECKING([whether $CXX supports C++14 sized deallocation])
 if test "$CROSS_COMPILING" = TRUE; then
 cxx14_sized_deallocation=no
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx 
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 8455001..2ec9b1b 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -917,11 +917,10 @@ void 
ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet
 }
 else {
 OSL_FAIL(
-(   OString( 
"ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property 
value (" )
-+=  OString( translatePropertyId( _nId ) )
-+=  OString( " should be no string)!" )
-).getStr()
-);
+OString(
+
"ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property 
value ("
++ translatePropertyId(_nId)
++ " should be no string)!").getStr());
 }
 break;
 
@@ -947,11 +946,10 @@ void 
ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet
 }
 else {
 OSL_FAIL(
-(   OString( 
"ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property 
value (" )
-+=  OString( translatePropertyId( _nId ) )
-+=  OString( " should be no boolean)!" )
-).getStr()
-);
+OString(
+
"ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property 
value ("
++ translatePropertyId(_nId)
++ " should be no boolean)!").getStr());
 }
 break;
 
@@ -964,11 +962,10 @@ void 
ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet
 }
 else {
 OSL_FAIL(
-(   OString( 
"ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property 
value (" )
-+=  OString( translatePropertyId( _nId ) )
-+=  OString( " should be no int)!" )
-).getStr()
-   

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

[Caolán McNamara]

 cui/uiconfig/ui/wordcompletionpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53352be12cb6a191934b8107559ea47171868718
Author: Caolán McNamara 
Date:   Mon Nov 9 11:14:37 2015 +

Resolves: tdf#92311 raise auto correct entry limit to unsigned short max

Change-Id: Ie27d727ab4606ffe3f47263251316f6faac7ca74

diff --git a/cui/uiconfig/ui/wordcompletionpage.ui 
b/cui/uiconfig/ui/wordcompletionpage.ui
index a501663..0ab7df9 100644
--- a/cui/uiconfig/ui/wordcompletionpage.ui
+++ b/cui/uiconfig/ui/wordcompletionpage.ui
@@ -5,7 +5,7 @@
   
   
 50
-1
+65535
 500
 25
 100
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 dbaccess/source/ui/control/curledit.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e23f7b0839df68d277186b4df54ba391ac3406a
Author: Stephan Bergmann 
Date:   Mon Nov 9 12:15:29 2015 +0100

Lets assume this doesn't want to update m_pForcedPrefix->GetText() anyway

The line was like that ever since the code was introduced with
13d20309158340fca42c44e7a9a460ddbeee5126 "edit control for connection 
urls," and
Window::GetText() likely never in the past returned a reference to a string.

Change-Id: Ideb5c6a279ac25c2439187a9182f988696818012

diff --git a/dbaccess/source/ui/control/curledit.cxx 
b/dbaccess/source/ui/control/curledit.cxx
index 483bd41..912dd3f 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -140,7 +140,7 @@ void OConnectionURLEdit::SetText(const OUString& _rStr, 
const Selection& /*_rNew
 OUString OConnectionURLEdit::GetText() const
 {
 if ( m_pForcedPrefix )
-return m_pForcedPrefix->GetText() += Edit::GetText();
+return m_pForcedPrefix->GetText() + Edit::GetText();
 return Edit::GetText();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit e31205f3ec1f941ab5a188bfde6329edf2acc55b
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

diff --git a/editeng/source/editeng/editundo.hxx 
b/editeng/source/editeng/editundo.hxx
index 094e999..775f5a9 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -123,7 +123,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() override;
 virtual voidRedo() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sc/inc/chartarr.hxx|8 ++-
 sc/inc/colorscale.hxx  |   11 +++-
 sc/inc/formulagroup.hxx|   10 ++--
 sc/qa/unit/ucalc.cxx   |7 +--
 sc/source/core/data/colorscale.cxx |   57 +++--
 sc/source/core/data/column2.cxx|   33 --
 sc/source/core/data/fillinfo.cxx   |2 
 sc/source/core/tool/chartarr.cxx   |   34 +-
 sc/source/core/tool/formulagroup.cxx   |   13 +++--
 sc/source/filter/excel/xecontent.cxx   |3 -
 sc/source/filter/excel/xeextlst.cxx|2 
 sc/source/filter/oox/condformatbuffer.cxx  |2 
 sc/source/filter/xml/xmlcondformat.cxx |2 
 sc/source/filter/xml/xmlexprt.cxx  |3 -
 sc/source/ui/condformat/condformatdlgentry.cxx |7 +--
 sc/source/ui/unoobj/condformatuno.cxx  |8 +--
 16 files changed, 119 insertions(+), 83 deletions(-)

New commits:
commit 8e36027e2768b4d9d7c8beff864a557c450184ca
Author: Michael Stahl 
Date:   Sat Nov 7 00:20:26 2015 +0100

sc: replace boost::ptr_vector with std::vector

Change-Id: Id80f6d6be9f5cb15448ea00299b8e371ccd812ee

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 43a1998..a8d9f1f 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_SC_INC_COLORSCALE_HXX
 #define INCLUDED_SC_INC_COLORSCALE_HXX
 
-#include 
 #include 
 #include 
 #include "rangelst.hxx"
@@ -334,7 +333,8 @@ struct ScIconSetFormatData
  * Specifies whether the icons should be shown in reverse order
  */
 bool mbReverse;
-boost::ptr_vector maEntries;
+typedef std::vector> Entries_t;
+Entries_t m_Entries;
 bool mbCustom;
 // the std::pair points to exactly one image
 // std..pair::second == -1 means no image
@@ -346,6 +346,9 @@ struct ScIconSetFormatData
 mbReverse(false),
 mbCustom(false)
 {}
+
+ScIconSetFormatData(ScIconSetFormatData const&);
+ScIconSetFormatData& operator=(ScIconSetFormatData const&) = delete; 
//TODO?
 };
 
 class SC_DLLPUBLIC ScIconSetFormat : public ScColorFormat
@@ -374,8 +377,8 @@ public:
 static ScIconSetMap* getIconSetMap();
 static BitmapEx& getBitmap( ScIconSetType eType, sal_Int32 nIndex );
 
-typedef boost::ptr_vector::iterator iterator;
-typedef boost::ptr_vector::const_iterator 
const_iterator;
+typedef ScIconSetFormatData::Entries_t::iterator iterator;
+typedef ScIconSetFormatData::Entries_t::const_iterator const_iterator;
 
 iterator begin();
 const_iterator begin() const;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 169f03d..3562228 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -70,6 +70,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -5946,9 +5947,9 @@ void Test::testIconSet()
 
 ScIconSetFormat* pEntry = new ScIconSetFormat(m_pDoc);
 ScIconSetFormatData* pData = new ScIconSetFormatData;
-pData->maEntries.push_back(new ScColorScaleEntry(0, COL_BLUE));
-pData->maEntries.push_back(new ScColorScaleEntry(1, COL_GREEN));
-pData->maEntries.push_back(new ScColorScaleEntry(2, COL_RED));
+pData->m_Entries.push_back(o3tl::make_unique(0, 
COL_BLUE));
+pData->m_Entries.push_back(o3tl::make_unique(1, 
COL_GREEN));
+pData->m_Entries.push_back(o3tl::make_unique(2, 
COL_RED));
 pEntry->SetIconSetData(pData);
 
 m_pDoc->AddCondFormatData(pFormat->GetRange(), 0, 1);
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index c346f73..74e4e33 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -17,6 +17,7 @@
 #include "refupdatecontext.hxx"
 
 #include 
+#include 
 
 #include 
 
@@ -925,6 +926,20 @@ void ScDataBarFormat::EnsureSize()
 }
 }
 
+ScIconSetFormatData::ScIconSetFormatData(ScIconSetFormatData const& rOther)
+: eIconSetType(rOther.eIconSetType)
+, mbShowValue(rOther.mbShowValue)
+, mbReverse(rOther.mbReverse)
+, mbCustom(rOther.mbCustom)
+, maCustomVector(rOther.maCustomVector)
+{
+m_Entries.reserve(rOther.m_Entries.size());
+for (auto const& it : rOther.m_Entries)
+{
+m_Entries.push_back(o3tl::make_unique(*it));
+}
+}
+
 ScIconSetFormat::ScIconSetFormat(ScDocument* pDoc):
 ScColorFormat(pDoc),
 mpFormatData(new ScIconSetFormatData)
@@ -973,7 +988,7 @@ ScIconSetInfo* ScIconSetFormat::GetIconSetInfo(const 
ScAddress& rAddr) const
 // now we have for sure a value
 double nVal = mpDoc->GetValue(rAddr);
 
-if (mpFormatData->maEntries.size() < 2)
+if (mpFormatData->m_Entries.size() < 2)
 return NULL;
 
 double nMin = GetMinValue();
@@ -1002,7 +1017,7 @@ ScIconSetInfo* ScIconSetFormat::GetIconSetInfo(const 
ScAddress& rAddr) const
 
 if(mpFormatData->mbReverse)
 {
-sal_In

[Libreoffice-commits] online.git: loolwsd/LOOLSession.hpp loolwsd/LOOLWSD.cpp loolwsd/Makefile.am loolwsd/MessageQueue.cpp loolwsd/MessageQueue.hpp loolwsd/tsqueue.h

[Jan Holesovsky]

 loolwsd/LOOLSession.hpp  |4 -
 loolwsd/LOOLWSD.cpp  |   41 +++---
 loolwsd/Makefile.am  |5 --
 loolwsd/MessageQueue.cpp |  107 +++
 loolwsd/MessageQueue.hpp |   82 
 loolwsd/tsqueue.h|   75 
 6 files changed, 200 insertions(+), 114 deletions(-)

New commits:
commit 6a1477d8a9ba70e01bfe494f5850ba7eae8ee8c1
Author: Jan Holesovsky 
Date:   Mon Nov 9 11:36:37 2015 +0100

loolwsd: Specialize the MessageQueue a bit.

Introduce a bit of hierarchy there, at some stage we'll want to re-order the
tile requests a bit so that it works better for collaborative editing; for 
the
moment, removing the duplicate entries is enough.

diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index e84b5d1..2bee3cd 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -29,8 +29,8 @@
 #include 
 #include 
 
+#include "MessageQueue.hpp"
 #include "TileCache.hpp"
-#include "tsqueue.h"
 
 // We have three kinds of Websocket sessions
 // 1) Between the master loolwsd server to the end-user LOOL client
@@ -159,7 +159,7 @@ private:
 int _curPart;
 int _loadPart;
 /// Kind::ToClient instances store URLs of completed 'save as' documents.
-tsqueue _saveAsQueue;
+MessageQueue _saveAsQueue;
 };
 
 class ChildProcessSession final : public LOOLSession
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index e1cf3d0..3626953 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -105,7 +105,7 @@ DEALINGS IN THE SOFTWARE.
 #include "LOOLProtocol.hpp"
 #include "LOOLSession.hpp"
 #include "LOOLWSD.hpp"
-#include "tsqueue.h"
+#include "MessageQueue.hpp"
 #include "Util.hpp"
 
 using namespace LOOLProtocol;
@@ -149,7 +149,7 @@ using Poco::NamedMutex;
 class QueueHandler: public Runnable
 {
 public:
-QueueHandler(tsqueue& queue):
+QueueHandler(MessageQueue& queue):
 _queue(queue)
 {
 }
@@ -178,7 +178,7 @@ public:
 
 private:
 std::shared_ptr _session;
-tsqueue& _queue;
+MessageQueue& _queue;
 };
 
 /// Handles the filename part of the convert-to POST request payload.
@@ -347,7 +347,7 @@ public:
 return;
 }
 
-tsqueue queue;
+BasicTileQueue queue;
 Thread queueHandlerThread;
 QueueHandler handler(queue);
 
@@ -392,22 +392,7 @@ public:
 
 if (kind == LOOLSession::Kind::ToClient && 
firstLine.size() == static_cast(n))
 {
-// Check if it is a "canceltiles" and in that case 
remove outstanding
-// "tile" messages from the queue.
-if (tokens.count() == 1 && tokens[0] == 
"canceltiles")
-{
-queue.remove_if([](std::string& x) {
-return (x.find("tile ") == 0 && 
x.find("id=") == std::string::npos);
-});
-
-// Also forward the "canceltiles" to the child 
process, if any
-session->handleInput(buffer, n);
-}
-// Filter out duplicated tile messages.
-else if ((firstLine.compare(0, 5, "tile ") != 0) 
|| !queue.alreadyInQueue(firstLine))
-{
-queue.put(firstLine);
-}
+queue.put(firstLine);
 }
 else
 {
@@ -928,7 +913,7 @@ void LOOLWSD::componentMain()
 std::string hello("child " + std::to_string(_childId) + " " + 
std::to_string(Process::id()));
 session->sendTextFrame(hello);
 
-tsqueue queue;
+TileQueue queue;
 Thread queueHandlerThread;
 QueueHandler handler(queue);
 
@@ -950,19 +935,7 @@ void LOOLWSD::componentMain()
 // The only kind of messages a child process receives are the 
single-line ones (?)
 assert(firstLine.size() == 
static_cast(n));
 
-// Check if it is a "canceltiles" and in that case remove 
outstanding
-// "tile" messages from the queue.
-if (tokens.count() == 1 && tokens[0] == "canceltiles")
-{
-queue.remove_if([](std::string& x) {
-return (x.find("tile ") == 0 && x.find("id=") == 
std::string::npos);
-});
-}
-// Filter out duplicated tile messages.
-else if ((firstLine.compare(0, 5, "tile ") != 0) || 
!queue.alreadyInQueue(firstLine))
-{
-queue.put(firstLine);
-}
+queue.put(firstLine);
 }
 }
 while (n > 0 && 

Re: Developer Info

[Massimiliano Fiori]

Hi, Thank you Jan,
i registered on gerrit platform. 
I prefer, if is possible, to see your Java problems for try to create my first 
patch, is it possible to use an IDE, like Eclipse, to edit the java code in 
easy way?

Reagards,
Massimiliano.



> Il giorno 08 nov 2015, alle ore 18:44, jan iversen  
> ha scritto:
> 
> Congratulations !!! that is actually the most difficult step.
> 
> Now when both of you have time it would be good for you to register on the 
> mailing list:
> http://nabble.documentfoundation.org/ 
> 
> This is where we all "talk" together.
> 
> Sooner or later you will also need to register in Gerrit:
> https://wiki.documentfoundation.org/Development/gerrit 
> 
> 
> we use gerrit to submit and review patches, this is not mandatory for the 
> first couple
> of patches, I can do it for you, but it is something you need to get used to.
> 
> Finally here is a link to "easy hacks":
> https://wiki.documentfoundation.org/Development/Easy_Hacks 
> 
> 
> Which is problems that are easy to solve, and are there for new people. I do 
> however
> also have a set of problems in java, which are open. Most of the java 
> problems are
> simple problems, but typically in multiple files. So whatever you prefer I am 
> there
> to help you.
> 
> Sukant@ Do not be stressed getting your environment up and running, there are 
> plenty
> of work waiting.
> 
> have a nice day.
> rgds
> jan i.
> 
> 
> 
> On 8 November 2015 at 17:06, Massimiliano Fiori  > wrote:
> Hi, 
> Yes i hadn't set CCACHE correctly. Now i have builded lode successfully.
> Now what is my next step to create a patch for the project?
> 
> Thanks a lot, 
> Massimiliano. 
> 
> 
>> Il giorno 07 nov 2015, alle ore 21:11, jan iversen > > ha scritto:
>> 
>> Hi.
>> 
>> I researched it a bit more, it seems that the clang compiler is not well 
>> supported by lode.
>> 
>> Have a look at:
>> https://wiki.documentfoundation.org/Development/Building_LibreOffice_with_Clang#Setup
>>  
>> 
>> 
>> the developer specialists told me, that your problem is typically caused 
>> because you
>> do not have
>> CCACHE_CPP2=1
>> 
>> Have fun
>> rgds
>> jan i.
>> 
>> 
>> On 7 November 2015 at 19:59, jan iversen > > wrote:
>> Hi.
>> 
>> It seems to me you missed the "autogen.sh" statement.
>> 
>> you ran "setup --dev" and checked out the source.
>> 
>> then you need to do:
>> 
>> cd dev/core
>> ./autogen.sh
>> 
>> and after that (if it does not give you any errors)
>> ../../opt/bin/make 2>&1 | tee build.log
>> 
>> you can run ./autogen.sh anytime, so please run it again, and make sure it 
>> does not report errors.
>> 
>> Secondly it is important that you use "../../opt/bin/make" and NOT the make 
>> standard in OSX.
>> 
>> Finally you need to deactivate your virus checker (this is not the problem 
>> right now).
>> 
>> Please try my suggestion, and then let me have the whole build.log
>> 
>> have fun
>> jan i.
>> 
>> On 7 November 2015 at 14:54, Massimiliano Fiori > > wrote:
>> Hi Sakunt,
>> nice to meet you!
>> 
>> I try to build lode and i have this error after '../../opt/bin/make 2>&1 | 
>> tee build.log’ command :
>> 
>> [build C  ] cppuhelper/source/findsofficepath.c
>> clang: error: argument unused during compilation: '-I 
>> /Users/Bayway/Developer/lode/dev/core/cppuhelper/source/'
>> clang: error: argument unused during compilation: '-I 
>> /Users/Bayway/Developer/lode/dev/core/include'
>> clang: error: argument unused during compilation: '-I 
>> /Library/Java/JavaVirtualMachines/jdk1.7.0_79.jdk/Contents/Home/include'
>> clang: error: argument unused during compilation: '-I 
>> /Library/Java/JavaVirtualMachines/jdk1.7.0_79.jdk/Contents/Home/include/darwin'
>> clang: error: argument unused during compilation: '-I 
>> /Users/Bayway/Developer/lode/dev/core/config_host'
>> /Users/Bayway/Developer/lode/dev/core/solenv/gbuild/LinkTarget.mk:138: 
>> recipe for target 
>> '/Users/Bayway/Developer/lode/dev/core/workdir/CObject/cppuhelper/source/findsofficepath.o'
>>  failed
>> make[1]: *** 
>> [/Users/Bayway/Developer/lode/dev/core/workdir/CObject/cppuhelper/source/findsofficepath.o]
>>  Error 1
>> Makefile:247: recipe for target 'build' failed
>> make: *** [build] Error 2
>> 
>> My OS: Mac OSX 10.11.2
>> 
>> Thanks for all, 
>> Massimiliano
>> 
>> 
>>> Il giorno 07 nov 2015, alle ore 09:21, jan iversen >> > ha scritto:
>>> 
>>> Hi Massimiliano.
>>> 
>>> Welcome.
>>> 
>>> Sakunt meet Massimiliano
>>> Massimiliano meet Sakunt.
>>> 
>>> As I wrote to Sakunt, I am would like to help you get started and help you 
>>> get the first patches submitted.
>>> 
>>> The first 3-4 patche

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

[Tomaž Vajngerl]

 oox/source/ppt/slidetransition.cxx|8 
 oox/source/ppt/slidetransitioncontext.cxx |2 ++
 sd/qa/unit/data/AllTransitions.odp|binary
 sd/qa/unit/export-tests.cxx   |   12 ++--
 sd/source/filter/eppt/pptx-epptooxml.cxx  |   24 
 5 files changed, 44 insertions(+), 2 deletions(-)

New commits:
commit c24fbd8c8a4f00c4eeaa97528832afa67d4af1e7
Author: Tomaž Vajngerl 
Date:   Mon Nov 9 10:59:32 2015 +0100

pptx: import "Vortex" and "Ripple" transition + test

Change-Id: I29d71e9c07c4964275c13772cdb6042624550acb

diff --git a/oox/source/ppt/slidetransition.cxx 
b/oox/source/ppt/slidetransition.cxx
index 2c130dd..e623558 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -405,6 +405,14 @@ namespace oox { namespace ppt {
 else
 mnTransitionSubType = TransitionSubType::CORNERSOUT;
 break;
+case P14_TOKEN(vortex):
+mnTransitionType = TransitionType::MISCSHAPEWIPE;
+mnTransitionSubType = TransitionSubType::VERTICAL;
+break;
+case P14_TOKEN(ripple):
+mnTransitionType = TransitionType::MISCSHAPEWIPE;
+mnTransitionSubType = TransitionSubType::HORIZONTAL;
+break;
 default:
 mnTransitionType = 0;
 break;
diff --git a/oox/source/ppt/slidetransitioncontext.cxx 
b/oox/source/ppt/slidetransitioncontext.cxx
index 78d7825..4a9c996 100644
--- a/oox/source/ppt/slidetransitioncontext.cxx
+++ b/oox/source/ppt/slidetransitioncontext.cxx
@@ -129,6 +129,8 @@ SlideTransitionContext::~SlideTransitionContext() throw()
 case PPT_TOKEN( plus ):
 case PPT_TOKEN( random ):
 case PPT_TOKEN( wedge ):
+case P14_TOKEN( vortex ):
+case P14_TOKEN( ripple ):
 // CT_Empty
 if (!mbHasTransition)
 {
diff --git a/sd/qa/unit/data/AllTransitions.odp 
b/sd/qa/unit/data/AllTransitions.odp
index fa2eced..35b7a49 100644
Binary files a/sd/qa/unit/data/AllTransitions.odp and 
b/sd/qa/unit/data/AllTransitions.odp differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index bba730a..f16e9e9 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -173,13 +173,15 @@ public:
 CPPUNIT_TEST(testBulletMarginAndIndentation);
 CPPUNIT_TEST(testParaMarginAndindentation);
 CPPUNIT_TEST(testTransparentBackground);
-CPPUNIT_TEST(testExportTransitionsPPTX);
 CPPUNIT_TEST(testTdf91378);
 
 #if !defined WNT
 CPPUNIT_TEST(testBnc822341);
 #endif
 CPPUNIT_TEST(testTdf80224);
+
+CPPUNIT_TEST(testExportTransitionsPPTX);
+
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -1413,8 +1415,14 @@ void SdExportTest::testExportTransitionsPPTX()
 // INSIDE TURNING CUBE
 CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 60, 
TransitionType::MISCSHAPEWIPE, TransitionSubType::CORNERSIN));
 
+// VORTEX
+CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 70, 
TransitionType::MISCSHAPEWIPE, TransitionSubType::VERTICAL));
+
+// RIPPLE
+CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 71, 
TransitionType::MISCSHAPEWIPE, TransitionSubType::HORIZONTAL));
+
 // NEWSFLASH
-CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 71, TransitionType::ZOOM, 
TransitionSubType::ROTATEIN));
+CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 72, TransitionType::ZOOM, 
TransitionSubType::ROTATEIN));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
commit 733846f20c43588478d01c448f622cc9854bc59e
Author: Tomaž Vajngerl 
Date:   Mon Nov 9 10:51:06 2015 +0100

pptx: export "Ripple" and "Vortex" transition

Change-Id: I7e6683e8d4b461f193f64e2b1f077a5936008c1f

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 7862bc2..9d412f7 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -560,6 +560,16 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
 pDirection14 = "r";
 bOOXmlSpecificTransition = true;
 break;
+case animations::TransitionSubType::VERTICAL: // Vortex
+nTransition = XML_fade;
+nTransition14 = XML_vortex;
+bOOXmlSpecificTransition = true;
+break;
+case animations::TransitionSubType::HORIZONTAL: // Ripple
+nTransition = XML_fade;
+nTransition14 = XML_ripple;
+bOOXmlSpecificTransition = true;
+break;
 case animations::TransitionSubType::CORNERSIN:
 pInverted = "true";
 case animations::TransitionSubType::CORNERSOUT:
commit b3120fd7c408ef0d2f35c2b0a905f5db65eaa294
Author: Tomaž Vajngerl 
Date:   Mon Nov 9 10:44:30 2015 +0100

ppt

Re: Help compiling an idl for an Add-in

[Stephan Bergmann]

On 11/07/2015 02:45 PM, lucass wrote:

I'm working on an AddIn to use on Calc (
source:https://github.com/beothorn/ClojureCalc ) and I'm having a
problem when compilind an idl using idlc. This addin used to compile
without problems on an older libreoffice sdk (4.3 I think) but it
upgraded to 5.0.2.2 together with my ubuntu and now it doesn't compile
anymore. The error message isn't too helpful either because it points to
a line that doesn't exist, or I am interpreting the error message wrong.

Here's how I'm running idlc

|/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|

and the output

|Compiling:/home/lucas/dev/clojurecalc/ClojureCalc/src/com/github/beothorn/clojurecalc/ClojureCalc.idl
:1[62:62]:Statementcan notbe parsed:syntax
error,unexpected $undefined
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:80[42:42]:Statementcan
notbe parsed:definitions
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl:94[5:8]:Statementcan
notbe parsed:syntax error,unexpected IDL_VOID (...more 14errors
...)/usr/lib/libreoffice/sdk/bin/idlc.bin:detected
16errors/usr/lib/libreoffice/sdk/bin/idlc.bin Version1.1|

but line 80 on
/usr/lib/libreoffice/sdk/idl/com/sun/star/uno/XInterface.idl is a
comment, so I don't know what is happening.

The idl in questtion is this
https://github.com/beothorn/ClojureCalc/blob/master/src/com/github/beothorn/clojurecalc/ClojureCalc.idl

I also have the same errors on this idl

https://github.com/beothorn/ClojureCalc/blob/master/src/com/github/beothorn/clojurecalc/XClojureCalc.idl

I don't know how to further investigate this error, or maybe the problem
is obvious and I'm not seeing it. I would like some pointer to how to
keep looking on what's happening, if possible.


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.

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

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

[Noel Grandin]

 toolkit/inc/helper/unopropertyarrayhelper.hxx  |8 
 toolkit/inc/helper/unowrapper.hxx  |   18 
 toolkit/source/awt/animatedimagespeer.cxx  |2 
 toolkit/source/awt/asynccallback.cxx   |   10 
 toolkit/source/awt/scrollabledialog.cxx|4 
 toolkit/source/awt/stylesettings.hxx   |  222 +-
 toolkit/source/awt/vclxbitmap.cxx  |   36 
 toolkit/source/awt/vclxcontainer.cxx   |   58 
 toolkit/source/awt/vclxdevice.cxx  |   96 
 toolkit/source/awt/vclxfont.cxx|   48 
 toolkit/source/awt/vclxgraphics.cxx|6 
 toolkit/source/awt/vclxpointer.cxx |6 
 toolkit/source/awt/vclxprinter.cxx |   72 
 toolkit/source/awt/vclxregion.cxx  |   44 
 toolkit/source/awt/vclxsystemdependentwindow.cxx   |   24 
 toolkit/source/awt/vclxtabpagecontainer.cxx|   30 
 toolkit/source/awt/vclxtoolkit.cxx |  190 -
 toolkit/source/awt/vclxtopwindow.cxx   |   34 
 toolkit/source/awt/vclxwindow.cxx  |  258 +-
 toolkit/source/awt/vclxwindow1.cxx |   10 
 toolkit/source/awt/vclxwindows.cxx | 1072 
+-
 toolkit/source/awt/vclxwindows_internal.hxx|4 
 toolkit/source/controls/accessiblecontrolcontext.cxx   |4 
 toolkit/source/controls/animatedimages.cxx |2 
 toolkit/source/controls/controlmodelcontainerbase.cxx  |   24 
 toolkit/source/controls/controlmodelcontainerbase_internal.hxx |2 
 toolkit/source/controls/dialogcontrol.cxx  |   28 
 toolkit/source/controls/eventcontainer.cxx |4 
 toolkit/source/controls/geometrycontrolmodel.cxx   |   36 
 toolkit/source/controls/grid/defaultgriddatamodel.cxx  |6 
 toolkit/source/controls/grid/gridcolumn.cxx|   30 
 toolkit/source/controls/grid/gridcolumn.hxx|   92 
 toolkit/source/controls/grid/gridcontrol.cxx   |   20 
 toolkit/source/controls/grid/gridcontrol.hxx   |   74 
 toolkit/source/controls/grid/grideventforwarder.hxx|   20 
 toolkit/source/controls/grid/initguard.hxx |2 
 toolkit/source/controls/roadmapcontrol.cxx |8 
 toolkit/source/controls/roadmapentry.cxx   |   32 
 toolkit/source/controls/stdtabcontrollermodel.cxx  |   94 
 toolkit/source/controls/tabpagecontainer.cxx   |   22 
 toolkit/source/controls/tabpagemodel.cxx   |   20 
 toolkit/source/controls/tkscrollbar.cxx|   48 
 toolkit/source/controls/tkspinbutton.cxx   |2 
 toolkit/source/controls/tree/treecontrol.cxx   |8 
 toolkit/source/controls/tree/treecontrol.hxx   |   10 
 toolkit/source/controls/tree/treedatamodel.cxx |   50 
 toolkit/source/controls/unocontrolbase.cxx |   62 
 toolkit/source/controls/unocontrolcontainer.cxx|   20 
 toolkit/source/controls/unocontrolcontainermodel.cxx   |   14 
 toolkit/source/controls/unocontrolmodel.cxx|  198 -
 toolkit/source/controls/unocontrols.cxx|   78 
 toolkit/source/helper/accessibilityclient.cxx  |   24 
 toolkit/source/helper/listenermultiplexer.cxx  |  182 -
 toolkit/source/helper/property.cxx |   40 
 toolkit/source/helper/unopropertyarrayhelper.cxx   |   14 
 toolkit/source/helper/unowrapper.cxx   |   26 
 toolkit/source/helper/vclunohelper.cxx |  265 +-
 57 files changed, 1896 insertions(+), 1917 deletions(-)

New commits:
commit 4a00be7ade3235e18cab7706bcfe9a1adccb2462
Author: Noel Grandin 
Date:   Mon Nov 9 09:05:08 2015 +0200

com::sun::star->css in toolkit/

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

diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx 
b/toolkit/inc/helper/unopropertyarrayhelper.hxx
index 3632da5..bbe53a4 100644
--- a/toolkit/inc/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx
@@ -38,16 +38,16 @@ protected:
 boolImplHasProperty( sal_uInt16 nPropId ) const;
 
 public:
-UnoPropertyArrayHelper( const 
::com::sun::star::uno::Sequence& rIDs );
+UnoPropertyArrayHelper( const css::uno:

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

[László Németh]

 loleaflet/src/layer/tile/TileLayer.js |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8ca4260edf89000b1b828277356092e27d86d341
Author: László Németh 
Date:   Mon Nov 9 10:12:23 2015 +0100

loleaflet: fix Writer/Impress at zoom

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 203aa9a..1f00b05 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -114,7 +114,9 @@ L.TileLayer = L.GridLayer.extend({
map.on('paste', this._onPaste, this);
map.on('zoomend', this._onUpdateCursor, this);
map.on('zoomend', this._onUpdatePartPageRectangles, this);
-   map.on('zoomend', this._onCellCursorShift, this);
+   if (this._docType === 'spreadsheet') {
+   map.on('zoomend', this._onCellCursorShift, this);
+   }
map.on('dragstart', this._onDragStart, this);
map.on('requestloksession', this._onRequestLOKSession, this);
map.on('error', this._mapOnError, this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source basctl/source basic/source chart2/source comphelper/source compilerplugins/clang configmgr/source connectivity/source cppu/source cpputools/source dbacce

[Noel Grandin]

 avmedia/source/gstreamer/gstuno.cxx  |3 
 avmedia/source/opengl/ogluno.cxx |4 
 basctl/source/basicide/basobj2.cxx   |5 
 basctl/source/basicide/basobj3.cxx   |3 
 basctl/source/basicide/moduldl2.cxx  |4 
 basic/source/classes/eventatt.cxx|4 
 basic/source/classes/propacc.cxx |3 
 basic/source/classes/sbunoobj.cxx|6 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx |   18 -
 chart2/source/tools/DataSeriesHelper.cxx |3 
 chart2/source/tools/ErrorBar.cxx |3 
 chart2/source/tools/ExplicitCategoriesProvider.cxx   |3 
 chart2/source/view/main/VLegend.cxx  |3 
 comphelper/source/xml/ofopxmlhelper.cxx  |   18 -
 compilerplugins/clang/oncevar.cxx|  146 +++
 configmgr/source/configurationprovider.cxx   |3 
 configmgr/source/configurationregistry.cxx   |3 
 configmgr/source/defaultprovider.cxx |3 
 configmgr/source/readonlyaccess.cxx  |3 
 configmgr/source/readwriteaccess.cxx |3 
 configmgr/source/update.cxx  |3 
 connectivity/source/commontools/DateConversion.cxx   |3 
 connectivity/source/commontools/dbtools.cxx  |6 
 connectivity/source/drivers/hsqldb/HDriver.cxx   |7 
 connectivity/source/drivers/postgresql/pq_connection.cxx |3 
 connectivity/source/drivers/postgresql/pq_driver.cxx |   10 
 connectivity/source/manager/mdrivermanager.cxx   |   14 -
 cppu/source/uno/lbenv.cxx|3 
 cppu/source/uno/lbmap.cxx|3 
 cpputools/source/unoexe/unoexe.cxx   |6 
 dbaccess/source/ui/misc/UITools.cxx  |4 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx   |6 
 desktop/source/lib/init.cxx  |3 
 desktop/source/splash/splash.cxx |6 
 desktop/source/splash/unxsplash.cxx  |4 
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |4 
 editeng/source/uno/unofield.cxx  |3 
 filter/source/graphicfilter/ieps/ieps.cxx|   24 -
 filter/source/msfilter/escherex.cxx  |3 
 forms/source/xforms/xpathlib/xpathlib.cxx|4 
 framework/source/layoutmanager/helpers.cxx   |9 
 io/source/stm/opump.cxx  |4 
 javaunohelper/source/javaunohelper.cxx   |   12 
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx   |6 
 jvmfwk/source/fwkbase.cxx|   16 -
 linguistic/source/dlistimp.cxx   |3 
 oox/source/drawingml/customshapegeometry.cxx |   60 
 oox/source/drawingml/table/tableproperties.cxx   |6 
 oox/source/export/chartexport.cxx|3 
 reportdesign/source/ui/report/propbrw.cxx|8 
 sc/source/core/data/docpool.cxx  |3 
 sc/source/core/tool/interpr4.cxx |3 
 scripting/source/dlgprov/dlgprov.cxx |3 
 sd/source/filter/xml/sdxmlwrp.cxx|3 
 sd/source/ui/animations/CustomAnimationPane.cxx  |9 
 sd/source/ui/table/tablefunction.cxx |3 
 sd/source/ui/unoidl/unomodel.cxx |   10 
 sd/source/ui/view/drviewse.cxx   |3 
 sdext/source/minimizer/graphiccollector.cxx  |   16 -
 sdext/source/minimizer/impoptimizer.cxx  |   12 
 sfx2/source/appl/appinit.cxx |3 
 sfx2/source/appl/appuno.cxx  |6 
 sfx2/source/config/evntconf.cxx  |   21 -
 sfx2/source/dialog/filtergrouping.cxx|   13 
 sfx2/source/doc/sfxbasemodel.cxx |6 
 stoc/source/javavm/javavm.cxx|3 
 svgio/source/svguno/xsvgparser.cxx   |4 
 svx/source/form/fmPropBrw.cxx|9 
 svx/source/svdraw/svdoashp.cxx   |   36 --
 svx/source/toolbars/extrusionbar.cxx |7 
 svx/source/toolbars/fontworkbar.cxx  |3 
 sw/s

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

[jan iversen]

 qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java   |4 ++--
 qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e1fc599eb764186e5d511ace9785463eebbc7028
Author: jan iversen 
Date:   Fri Nov 6 09:15:51 2015 +0100

cid#1326599, cid#1326598: added throw (status generation)

Status.failed( ... ); is prepended with a throw
added import
and removed the return;

Change-Id: I73bc971e054c8726e45db0d5a37613c871691eab
Reviewed-on: https://gerrit.libreoffice.org/19793
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java 
b/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java
index 2ba5bb6..1f3eb73 100644
--- a/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java
+++ b/qadevOOo/tests/java/ifc/drawing/_XDrawPageExpander.java
@@ -19,6 +19,7 @@
 package ifc.drawing;
 
 import lib.MultiMethodTest;
+import lib.StatusException;
 import lib.Status;
 
 import com.sun.star.drawing.XDrawPage;
@@ -51,8 +52,7 @@ public class _XDrawPageExpander extends MultiMethodTest {
 XDrawPage oDrawPage = (XDrawPage) tEnv.getObjRelation("DrawPage");
 if ( oDrawPage == null ) {
 // SKIPPED.FAILED - the ObjectRelation is not available
-Status.failed( "ObjectRelation('DrawPages') XDrawPages n.a.");
-return;
+throw new StatusException(Status.failed( 
"ObjectRelation('DrawPages') XDrawPages n.a."));
 }
 log.println("testing expand() ... ");
 
diff --git a/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java 
b/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java
index dca8370..b346f93 100644
--- a/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java
+++ b/qadevOOo/tests/java/ifc/drawing/_XDrawPageSummarizer.java
@@ -19,6 +19,7 @@
 package ifc.drawing;
 
 import lib.MultiMethodTest;
+import lib.StatusException;
 import lib.Status;
 
 import com.sun.star.drawing.XDrawPageSummarizer;
@@ -50,8 +51,7 @@ public class _XDrawPageSummarizer extends MultiMethodTest {
 XDrawPages oDrawPages = (XDrawPages) tEnv.getObjRelation("DrawPages");
 if ( oDrawPages == null ) {
 // SKIPPED.FAILED - the ObjectRelation is not available
-Status.failed( "ObjectRelation('DrawPages') XDrawPages n.a." );
-return;
+throw new StatusException(Status.failed( 
"ObjectRelation('DrawPages') XDrawPages n.a." ));
 }
 log.println("testing summarize() ... ");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits