[Libreoffice-commits] core.git: svx/source
svx/source/dialog/srchdlg.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 1a4fc613e13d2ac3cf9cf96f29aa3f367a8fb25a
Author: Dennis Francis
Date: Sat Oct 24 19:11:52 2015 +0530
Remember the state of "Search formatted display string" checkbox
This checkbox was introduced in the commit
9a85743766e8a063d20d5f93ee88758e243397f4
This patch makes Calc persistently remember the option's setting between
invocations of the Find & Replace dialog.
Change-Id: I82c1355e85cd16ce13229d495a6d243e185318ad
Reviewed-on: https://gerrit.libreoffice.org/19574
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index c3e5815..c1ef963 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -567,6 +567,7 @@ bool SvxSearchDialog::Close()
aOpt.SetNotes ( m_pNotesBtn->IsChecked() );
aOpt.SetIgnoreDiacritics_CTL( m_pIgnoreDiacritics->IsChecked() );
aOpt.SetIgnoreKashida_CTL ( m_pIgnoreKashida->IsChecked() );
+aOpt.SetSearchFormatted ( m_pSearchFormattedCB->IsChecked() );
aOpt.Commit();
const SfxPoolItem* ppArgs[] = { pSearchItem, 0 };
@@ -811,6 +812,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
if ( pSearchItem->GetAppFlag() == SvxSearchApp::CALC )
{
m_pCalcGrid->Show();
+m_pSearchFormattedCB->Check( aOpt.IsSearchFormatted() );
Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl );
m_pCalcSearchInLB->SetSelectHdl( LINK( this, SvxSearchDialog,
LBSelectHdl_Impl ) );
m_pRowsBtn->SetClickHdl( aLink );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - avmedia/source sfx2/source
avmedia/source/vlc/vlcframegrabber.cxx |3 -
avmedia/source/vlc/vlcplayer.cxx |3 -
sfx2/source/appl/shutdowniconaqua.mm | 79 +++--
3 files changed, 38 insertions(+), 47 deletions(-)
New commits:
commit 1848581f4f3a3f22e2d104a2890699c26d35e1e8
Author: Douglas Mencken
Date: Sat Oct 24 11:32:13 2015 -0400
clean-up for sfx2/source/appl/shutdowniconaqua.mm
Change-Id: I459e00ca0b6578be6f7543eb220720b1a48c1ac7
Reviewed-on: https://gerrit.libreoffice.org/19584
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/appl/shutdowniconaqua.mm
b/sfx2/source/appl/shutdowniconaqua.mm
index 27ea87d..81b7db2 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -44,13 +44,6 @@
#include
#include "postmac.h"
-using namespace ::osl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::util;
-
#define MI_OPEN1
#define MI_WRITER 2
#define MI_CALC3
@@ -137,7 +130,7 @@ struct RecentMenuEntry
rtl::OUString aPassword;
};
-class RecentFilesStringLength : public ::cppu::WeakImplHelper<
::com::sun::star::util::XStringWidth >
+class RecentFilesStringLength : public ::cppu::WeakImplHelper<
css::util::XStringWidth >
{
public:
RecentFilesStringLength() {}
@@ -145,7 +138,7 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper< ::com::sun::star:
// XStringWidth
sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString )
-throw (::com::sun::star::uno::RuntimeException) override
+throw ( css::uno::RuntimeException ) override
{
return aString.getLength();
}
@@ -183,24 +176,24 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper< ::com::sun::star:
int nItems = [menu numberOfItems];
while( nItems -- )
[menu removeItemAtIndex: 0];
-
+
// update recent item list
-Sequence< Sequence< PropertyValue > > aHistoryList(
SvtHistoryOptions().GetList( ePICKLIST ) );
+css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >
aHistoryList( SvtHistoryOptions().GetList( ePICKLIST ) );
int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 :
aHistoryList.getLength();
-
+
m_pRecentFilesItems->clear();
if( ( nPickListMenuItems > 0 ) )
{
for ( int i = 0; i < nPickListMenuItems; i++ )
{
-Sequence< PropertyValue >& rPickListEntry = aHistoryList[i];
+css::uno::Sequence< css::beans::PropertyValue >& rPickListEntry =
aHistoryList[i];
RecentMenuEntry aRecentFile;
-
+
for ( int j = 0; j < rPickListEntry.getLength(); j++ )
{
-Any a = rPickListEntry[j].Value;
-
+css::uno::Any a = rPickListEntry[j].Value;
+
if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL )
a >>= aRecentFile.aURL;
else if ( rPickListEntry[j].Name ==
HISTORY_PROPERTYNAME_FILTER )
@@ -210,7 +203,7 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper< ::com::sun::star:
else if ( rPickListEntry[j].Name ==
HISTORY_PROPERTYNAME_PASSWORD )
a >>= aRecentFile.aPassword;
}
-
+
m_pRecentFilesItems->push_back( aRecentFile );
}
}
@@ -220,14 +213,14 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper< ::com::sun::star:
{
rtl::OUString aMenuTitle;
INetURLObject aURL( (*m_pRecentFilesItems)[i].aURL );
-
+
if ( aURL.GetProtocol() == INetProtocol::File )
{
// Do handle file URL differently => convert it to a system
// path and abbreviate it with a special function:
::rtl::OUString aSystemPath( aURL.getFSysPath(
INetURLObject::FSYS_DETECT ) );
::rtl::OUString aCompactedSystemPath;
-
+
oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData,
&aCompactedSystemPath.pData, 46, NULL );
if ( !nError )
aMenuTitle = aCompactedSystemPath;
@@ -237,10 +230,10 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper< ::com::sun::star:
else
{
// Use INetURLObject to abbreviate all other URLs
-Reference< XStringWidth > xStringLength( new
RecentFilesStringLength() );
+css::uno::Reference< css::util::XStringWidth > xStringLength( new
RecentFilesStringLength() );
aMenuTitle = aURL.getAbbreviated( xStringLength, 46,
INetURLObject::DECODE_UNAMBIGUOUS );
}
-
+
NSMenuItem* pNewItem = [[NSMenu
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2015-25-10_02:07:51 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/math.cxx | 229 ---
1 file changed, 4 insertions(+), 225 deletions(-)
New commits:
commit a62bc6a65abb47adb0e4caff7e38823c15b302fc
Author: Eike Rathke
Date: Sat Oct 24 22:44:25 2015 +0200
replace implementation of rtl_math_erf() and rtl_math_erfc()
... with ::std::erf() and ::std::erfc() of C++11
Change-Id: I8ccc86ec4d6d71a92409770fc119f72e7084073a
Reviewed-on: https://gerrit.libreoffice.org/19583
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 3ec6fe0..5a624e1 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -68,131 +68,6 @@ static double getN10Exp( int nExp )
return 1.0;
}
-/** Approximation algorithm for erf for 0 < x < 0.65. */
-static void lcl_Erf0065( double x, double& fVal )
-{
-static const double pn[] = {
-1.12837916709551256,
-1.35894887627277916E-1,
-4.03259488531795274E-2,
-1.20339380863079457E-3,
-6.49254556481904354E-5
-};
-static const double qn[] = {
-1.0,
-4.53767041780002545E-1,
-8.69936222615385890E-2,
-8.49717371168693357E-3,
-3.64915280629351082E-4
-};
-double fPSum = 0.0;
-double fQSum = 0.0;
-double fXPow = 1.0;
-for ( unsigned int i = 0; i <= 4; ++i )
-{
-fPSum += pn[i]*fXPow;
-fQSum += qn[i]*fXPow;
-fXPow *= x*x;
-}
-fVal = x * fPSum / fQSum;
-}
-
-/** Approximation algorithm for erfc for 0.65 < x < 6.0. */
-static void lcl_Erfc0600( double x, double& fVal )
-{
-double fPSum = 0.0;
-double fQSum = 0.0;
-double fXPow = 1.0;
-const double *pn;
-const double *qn;
-
-if ( x < 2.2 )
-{
-static const double pn22[] = {
-9.9992049799098E-1,
-1.33154163936765307,
-8.78115804155881782E-1,
-3.31899559578213215E-1,
-7.14193832506776067E-2,
-7.06940843763253131E-3
-};
-static const double qn22[] = {
-1.0,
-2.45992070144245533,
-2.65383972869775752,
-1.61876655543871376,
-5.94651311286481502E-1,
-1.26579413030177940E-1,
-1.25304936549413393E-2
-};
-pn = pn22;
-qn = qn22;
-}
-else /* if ( x < 6.0 ) this is true, but the compiler does not know */
-{
-static const double pn60[] = {
-9.99921140009714409E-1,
-1.62356584489366647,
-1.26739901455873222,
-5.81528574177741135E-1,
-1.57289620742838702E-1,
-2.25716982919217555E-2
-};
-static const double qn60[] = {
-1.0,
-2.75143870676376208,
-3.37367334657284535,
-2.38574194785344389,
-1.05074004614827206,
-2.78788439273628983E-1,
-4.00072964526861362E-2
-};
-pn = pn60;
-qn = qn60;
-}
-
-for ( unsigned int i = 0; i < 6; ++i )
-{
-fPSum += pn[i]*fXPow;
-fQSum += qn[i]*fXPow;
-fXPow *= x;
-}
-fQSum += qn[6]*fXPow;
-fVal = exp( -1.0*x*x )* fPSum / fQSum;
-}
-
-/** Approximation algorithm for erfc for 6.0 < x < 26.54 (but used for all
-x > 6.0). */
-static void lcl_Erfc2654( double x, double& fVal )
-{
-static const double pn[] = {
-5.64189583547756078E-1,
-8.80253746105525775,
-3.84683103716117320E1,
-4.77209965874436377E1,
-8.08040729052301677
-};
-static const double qn[] = {
-1.0,
-1.61020914205869003E1,
-7.54843505665954743E1,
-1.12123870801026015E2,
-3.73997570145040850E1
-};
-
-double fPSum = 0.0;
-double fQSum = 0.0;
-double fXPow = 1.0;
-
-for ( unsigned int i = 0; i <= 4; ++i )
-{
-fPSum += pn[i]*fXPow;
-fQSum += qn[i]*fXPow;
-fXPow /= x*x;
-}
-fVal = exp(-1.0*x*x)*fPSum / (x*fQSum);
-}
-
namespace {
double const nKorrVal[] = {
@@ -1166,112 +1041,16 @@ double SAL_CALL rtl_math_atanh( double fValue )
SAL_THROW_EXTERN_C()
return 0.5 * rtl_math_log1p( 2.0 * fValue / (1.0-fValue) );
}
-/** Parent error function (erf) that calls different algorithms based on the
-value of x. It takes care of cases where x is negative as erf is an odd
-function i.e. erf(-x) = -erf(x).
-
-Kramer, W., and Blomquist, F., 2000, Algorithms with Guaranteed Error
Bounds
-for the Error Function and the Complementary Error Function
-
-http://www.math.uni-wuppertal.de/wrswt/literatur_en.html
-
-@author Kohei Yoshida
-
-@see #i55735#
- */
+/** Parent error function (erf) */
double SAL_CALL rtl_math_erf( double x ) SAL_THROW_EXTERN_C()
{
-if( x == 0.0 )
-return 0.0;
-
-// Other
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr3.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 14cd70ba5af2dcd47dbeafe9cbbb43662448d454
Author: Eike Rathke
Date: Sun Oct 25 00:17:15 2015 +0200
Revert "crashtestig: infinite recurse in ooo32833-1.sxc"
This reverts commit d2a07cd3214af27c5af601992e3c4a1a6e3b3dad.
We now ensure in sal that calling rtl_math_erfc() with NaN actually
works and returns a result as defined.
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index c85edcd..eb8e0d9 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1599,10 +1599,7 @@ void ScInterpreter::ScLogNormDist( int nMinParamCount )
//expanded, see #i100119
void ScInterpreter::ScStdNormDist()
{
-double fVal = GetDouble();
-if (!rtl::math::isNan(fVal))
-fVal = integralPhi(fVal);
-PushDouble(fVal);
+PushDouble(integralPhi(GetDouble()));
}
void ScInterpreter::ScStdNormDist_MS()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewdata.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 4607005c380f230d8a44671f91a456598dfe6081
Author: Christian Lohmaier
Date: Sun Oct 25 00:18:12 2015 +0200
fraction assert kills Android viewer when viewing e.g. a ods with just a
note
use SAL_WARN_IF instead - getting logged with info is more suitable for
this - useless zoom factors won't cause other problems
Change-Id: I7b8dd6551297eeff8e720ff85702f0049a4b93a2
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 9e6b151..aa1daef 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -629,8 +629,10 @@ void ScViewData::SetZoom( const Fraction& rNewX, const
Fraction& rNewY, std::vec
CreateTabData( tabs );
// sanity check - we shouldn't need something this low / big
-assert(rNewX > Fraction(1, 100) && rNewX < Fraction(100, 1));
-assert(rNewY > Fraction(1, 100) && rNewY < Fraction(100, 1));
+SAL_WARN_IF(rNewX < Fraction(1, 100) || rNewX > Fraction(100, 1),
"sal_viewdata",
+"fraction rNewX not sensible: " << (double) rNewX);
+SAL_WARN_IF(rNewY < Fraction(1, 100) || rNewY > Fraction(100, 1),
"sal_viewdata",
+"fraction rNewY not sensible: " << (double) rNewY);
if ( bAll )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes11' - toolkit/source
toolkit/source/awt/vclxtoolkit.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 72c9d1b2f32bf8fdeb42a5548f79881ca144c262
Author: László Németh
Date: Sat Oct 24 23:39:46 2015 +0200
Revert "fix ProcessTaskScheduling"
This reverts commit 8e144709b7fadcbebba8bb41fdcc7f6deb485712.
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 3c2aafd..ee1f9b8 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1892,8 +1892,7 @@ void SAL_CALL VCLXToolkit::processEventsToIdle()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
-for (int i = 0; i < 10; ++i)
-Application::Reschedule(true);
+Scheduler::ProcessTaskScheduling(false);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit f7c8774b2f3423095d794e90c58ab505ef8a1706
Author: Vasily Melenchuk
Date: Sat Oct 24 19:31:42 2015 +0300
tdf#39960 fix saving of GIF images into RTF
Currently in case of RTF export LO converts all unknown graphic into WMF.
And some images due to zero prefSize
produce invalid WMF of zero dimensions.
As a workaround for current case we do not convert GIF images to WMF, PNG
format looks better here. The code can
be extended to provide suitable converters for other formats.
Change-Id: I0c98111a4496250874aa4f664dd2f70134c1bdd1
Reviewed-on: https://gerrit.libreoffice.org/19581
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index a4e37df..ff7f7d6 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3837,6 +3837,9 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrameFormat* pFlyFrameFormat
if (rGraphic.GetType()==GRAPHIC_NONE)
return;
+ConvertDataFormat pConvertDestinationFormat = ConvertDataFormat::WMF;
+const sal_Char* pConvertDestinationBLIPType =
OOO_STRING_SVTOOLS_RTF_WMETAFILE;
+
GfxLink aGraphicLink;
const sal_Char* pBLIPType = 0;
if (rGraphic.IsLink())
@@ -3869,6 +3872,11 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrameFormat* pFlyFrameFormat
pBLIPType =
IsEMF(pGraphicAry, nSize) ? OOO_STRING_SVTOOLS_RTF_EMFBLIP :
OOO_STRING_SVTOOLS_RTF_WMETAFILE;
break;
+case GFX_LINK_TYPE_NATIVE_GIF:
+// GIF is not supported by RTF, but we override default conversion
to WMF, PNG seems fits better here.
+pConvertDestinationFormat = ConvertDataFormat::PNG;
+pConvertDestinationBLIPType = OOO_STRING_SVTOOLS_RTF_PNGBLIP;
+break;
default:
break;
}
@@ -3977,9 +3985,9 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrameFormat* pFlyFrameFormat
else
{
aStream.Seek(0);
-if (GraphicConverter::Export(aStream, rGraphic,
ConvertDataFormat::WMF) != ERRCODE_NONE)
+if (GraphicConverter::Export(aStream, rGraphic,
pConvertDestinationFormat) != ERRCODE_NONE)
SAL_WARN("sw.rtf", "failed to export the graphic");
-pBLIPType = OOO_STRING_SVTOOLS_RTF_WMETAFILE;
+pBLIPType = pConvertDestinationBLIPType;
aStream.Seek(STREAM_SEEK_TO_END);
nSize = aStream.Tell();
pGraphicAry = static_cast(aStream.GetData());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/qa
sal/qa/rtl/math/test-rtl-math.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 70a50e8390d1d0260b81dc49b629db3069abe427
Author: Eike Rathke
Date: Sat Oct 24 23:25:18 2015 +0200
add delta for double comparison
Change-Id: I008438a6b1651068165e6a07b16ea0b2e447074f
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx
b/sal/qa/rtl/math/test-rtl-math.cxx
index e3dcfec..aa7b213 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -104,7 +104,7 @@ public:
CPPUNIT_ASSERT_EQUAL(true,rtl::math::isNan(x));
x = 3.0;
res = rtl::math::erf(-x);
-CPPUNIT_ASSERT_EQUAL(-rtl::math::erf(x),res);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( -rtl::math::erf(x), res, 1E-12);
}
void test_erfc() {
@@ -123,7 +123,7 @@ public:
CPPUNIT_ASSERT_EQUAL(true,rtl::math::isNan(x));
x = 3.0;
res = rtl::math::erfc(-x);
-CPPUNIT_ASSERT_EQUAL(2.0-rtl::math::erfc(x),res);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 2.0 - rtl::math::erfc(x), res, 1E-12);
}
void test_expm1() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Test name: Test::testAutoFill assertion failed
Hi All Some more information on this problem. It occurs on Slackware 14.1 and Current - the compiler is gcc versions 4.82 and 4.93 respectively. It does NOT occur in Lubuntu 14:04- the compiler is gcc version 4.84 The results of a bisect are - 8e4dc1d760d85e09bbc3f3bbb5b8be2947db1b63 is the first bad commit commit 8e4dc1d760d85e09bbc3f3bbb5b8be2947db1b63 Author: Noel Grandin Date: Fri Aug 22 15:15:17 2014 +0200 create type-safe bitfield for sc insert/delete flags The most important part of the change is in sc/inc/global.hxx It creates a type-safe struct that prevents the accidental interaction between regular integer types and the flags struct. It also provides utility methods that make combining and testing the flags type-safe. Change-Id: Ibc5b20058b1655df913490682b679afd1297b36d Reviewed-on: https://gerrit.libreoffice.org/11071 Reviewed-by: Eike Rathke Tested-by: Eike Rathke :04 04 f9f6a67e9269712bb1997ee6ba9fb49d21e4455e 494c585ff088b7980af64f28e556a58b2afcc35b M sc I've had a look at the contents of the commit and it does look as though it touches the area that's causing me problems. The commit does look fairly generic so why one distro should fail and another pass does look a bit bizarre. I suppose the next stage is to pull out gdb from the toolkit and try and ascertain where the paths of Lubuntu and Slackware diverge. Or, has anyone got any other suggestions on how to tackle this problem? I've not raised a bug report yet. Alex On 01/09/15 18:22, Alex McMurchy wrote: Hi All When compiling LibreOffice I get a failed Unit test. If I hash out the failing CPPUNIT_ASSERT I get no more errors and Libreoffice compiles successfully. I suspect the problem is environmental, missing package or something, as I've managed to compile without intervention on another distro. Any suggestions on how I can resolve this problem, without hashing out the code or skipping the test, will be appreciated. I've pulled from git and git branch says I'm on * libreoffice-5-0-0 master I've compiled with --without-gssapi --without-krb5 --without-system-npapi-headers The error is - [build CXX] sc/qa/unit/ucalc.cxx [build CXX] sc/qa/unit/ucalc_column.cxx [build CXX] sc/qa/unit/ucalc_formula.cxx [build CXX] sc/qa/unit/ucalc_pivottable.cxx [build CXX] sc/qa/unit/ucalc_sharedformula.cxx [build CXX] sc/qa/unit/ucalc_sort.cxx [build DEP] LNK:CppunitTest/libtest_sc_ucalc.so [build LNK] CppunitTest/libtest_sc_ucalc.so [build CUT] sc_ucalc /home/master/git/libreoffice/sc/qa/unit/ucalc.cxx:4540:Test::testAutoFill assertion failed - Expression: m_pDoc->GetCellType(ScAddress(0,i,0)) == CELLTYPE_NONE ucalc.cxx:4540:Assertion Test name: Test::testAutoFill assertion failed - Expression: m_pDoc->GetCellType(ScAddress(0,i,0)) == CELLTYPE_NONE Failures !!! Run: 205 Failure total: 1 Failures: 1 Errors: 0 Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_sc_ucalc make[1]: *** [/home/master/git/libreoffice/workdir/CppunitTest/sc_ucalc.test] Error 1 make: *** [build] Error 2 Compilation of libreoffice failed with 2 at Sun 30 Aug 16:01:04 BST 2015 If I hash out the problem area like this - 4536 pUndoMgr->Undo(); 4537 4538 /*CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(0,0,0))); 4539 for (SCROW i = 1; i <= 5; ++i) 4540 CPPUNIT_ASSERT(m_pDoc->GetCellType(ScAddress(0,i,0)) == CELLTYPE_NONE); */ The test no longer fails and LibreOffice goes on to compile successfully. I've done a quick debug on it and the failure occurs on the first iteration of the loop when i=1 Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-3' - vcl/source
vcl/source/control/edit.cxx |2 ++
vcl/source/window/window2.cxx |2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5918fc62403e86a8060629950412f8e136747f7f
Author: Tomaž Vajngerl
Date: Thu Oct 22 19:03:01 2015 +0200
tdf#94138 fix printing of edit form fields
There are 2 bugs:
- In Window::GetDrawPixelFont we asked for the font to the
current window, which didn't work correctly when printing. The
device itself should provide the font and not the window.
- In paint method the font wasn't setup correctly which should
happen before painting by calling ApplySettings. The effect of
this is that print preview didn't show the correct font for the
edit control and similar when you copy + paste the edit control.
The work around for this is to call ApplySettings again.
Change-Id: I74960355823c71c1d5a18a82bbc86561a3c4b760
(cherry picked from commit 825b3df7f1d987021ec4a08ff8e7ed78e5772c97)
Reviewed-on: https://gerrit.libreoffice.org/19531
Reviewed-by: Jan Holesovsky
Tested-by: Christian Lohmaier
Reviewed-by: Thorsten Behrens
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d83b7f2..3250845 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -495,6 +495,8 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext,
const Rectangle& rRec
if (!IsReallyVisible())
return;
+ApplySettings(rRenderContext);
+
OUString aText = ImplGetText();
sal_Int32 nLen = aText.getLength();
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e3c19d5..0be48c7 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -654,7 +654,7 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const
vcl::Font Window::GetDrawPixelFont(OutputDevice* pDev) const
{
-vcl::Font aFont = GetPointFont(*const_cast(this));
+vcl::Font aFont = GetPointFont(*pDev);
Size aFontSize = aFont.GetSize();
MapMode aPtMapMode(MAP_POINT);
aFontSize = pDev->LogicToPixel( aFontSize, aPtMapMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/qa
sal/qa/rtl/math/test-rtl-math.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 5f7bc190b0f27fc58d26a6342eed9ead69a25808
Author: Eike Rathke
Date: Sat Oct 24 22:26:03 2015 +0200
test oddness of rtl_math_erf() and rtl_math_erfc()
Change-Id: I12f38d29d1d0b02b8a99977a232646c213ef20e9
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx
b/sal/qa/rtl/math/test-rtl-math.cxx
index 1d3f07f..e3dcfec 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -102,6 +102,9 @@ public:
rtl::math::setNan( &x);
res = rtl::math::erf(x);
CPPUNIT_ASSERT_EQUAL(true,rtl::math::isNan(x));
+x = 3.0;
+res = rtl::math::erf(-x);
+CPPUNIT_ASSERT_EQUAL(-rtl::math::erf(x),res);
}
void test_erfc() {
@@ -118,6 +121,9 @@ public:
rtl::math::setNan( &x);
res = rtl::math::erfc(x);
CPPUNIT_ASSERT_EQUAL(true,rtl::math::isNan(x));
+x = 3.0;
+res = rtl::math::erfc(-x);
+CPPUNIT_ASSERT_EQUAL(2.0-rtl::math::erfc(x),res);
}
void test_expm1() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/printaccessoryview.mm | 319 --
1 file changed, 3 insertions(+), 316 deletions(-)
New commits:
commit 157420cf07078b036fb11e6950d5bcae032a4bb4
Author: Douglas Mencken
Date: Wed Oct 21 09:59:34 2015 -0400
vcl.osx.print: bin >>vintage<< implementation
Change-Id: I09958e48846962aa5ad29e3e6cc0ce2450973f74
Reviewed-on: https://gerrit.libreoffice.org/19516
Tested-by: Jenkins
Reviewed-by: Norbert Thiebaud
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 80d972e..b4042d2 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -45,16 +45,6 @@ using namespace com::sun::star;
using namespace com::sun::star::beans;
using namespace com::sun::star::uno;
-#if MACOSX_SDK_VERSION <= 1040
-// as long as you are linking with 10.4 libraries there's no preview
-# define VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
-# undef MODERN_IMPLEMENTATION_OF_PRINT_DIALOG
-#else
-// since 10.5 you can use multiple accessory views and have accessory views
and a preview
-# define MODERN_IMPLEMENTATION_OF_PRINT_DIALOG
-# undef VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
-#endif
-
class ControllerProperties;
@interface ControlTarget : NSObject
@@ -64,14 +54,9 @@ class ControllerProperties;
-(id)initWithControllerMap: (ControllerProperties*)pController;
-(void)triggered:(id)pSender;
-(void)triggeredNumeric:(id)pSender;
-#ifdef VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
--(void)triggeredPreview:(id)pSender;
-#endif
-(void)dealloc;
@end
-#ifdef MODERN_IMPLEMENTATION_OF_PRINT_DIALOG
-
@interface AquaPrintPanelAccessoryController : NSViewController<
NSPrintPanelAccessorizing >
{
NSPrintOperation *mpPrintOperation;
@@ -163,8 +148,6 @@ class ControllerProperties;
@end
-#endif
-
class ControllerProperties
{
std::map< int, rtl::OUString > maTagToPropertyName;
@@ -174,51 +157,14 @@ class ControllerProperties
int mnNextTag;
sal_Int32 mnLastPageCount;
ResStringArray maLocalizedStrings;
-#ifdef VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
-vcl::PrinterController* mpController;
-NSPrintOperation* mpOp;
-PrintAccessoryViewState*mpState;
-NSBox* mpPreviewBox;
-NSImageView*mpPreview; // print preview is not
provided "by default"
-NSView* mpAccessoryView;
-NSTabView* mpTabView;
-NSTextField*mpPageEdit;
-NSStepper* mpStepper;
-#else
AquaPrintPanelAccessoryController* mpAccessoryController;
-#endif
public:
-ControllerProperties(
-#ifdef VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
- vcl::PrinterController* i_pController
-, NSPrintOperation* i_pOp
-, PrintAccessoryViewState* i_pState
-, NSView* i_pAccessoryView
-, NSTabView* i_pTabView
-#else
- AquaPrintPanelAccessoryController*
i_pAccessoryController
-#endif
- )
+ControllerProperties( AquaPrintPanelAccessoryController*
i_pAccessoryController )
: mnNextTag( 0 )
-#ifdef VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
-, mnLastPageCount( i_pController->getFilteredPageCount() )
-, mpController( i_pController )
-, mpOp( i_pOp )
-, mpState( i_pState )
-, mpPreviewBox( nil )
-, mpPreview( nil )
-, mpAccessoryView( i_pAccessoryView )
-, mpTabView( i_pTabView )
-, mpPageEdit( nil )
-, mpStepper( nil )
-#else
, mnLastPageCount( [i_pAccessoryController
printerController]->getFilteredPageCount() )
-#endif
, maLocalizedStrings( VclResId( SV_PRINT_NATIVE_STRINGS ) )
-#ifdef MODERN_IMPLEMENTATION_OF_PRINT_DIALOG
, mpAccessoryController( i_pAccessoryController )
-#endif
{
assert( maLocalizedStrings.Count() >= 5 && "resources not found" );
}
@@ -237,47 +183,6 @@ public:
: OUString( "Print selection only" );
}
-#ifdef VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
-void updatePrintJob()
-{
-// page range may be changed by option choice
-sal_Int32 nPages = mpController->getFilteredPageCount();
-
-mpState->bNeedRestart = false;
-if( nPages != mnLastPageCount )
-{
-#if OSL_DEBUG_LEVEL > 1
-SAL_INFO( "vcl.osx.print", "number of pages changed" <<
- " from " << mnLastPageCount << " to " << nPages );
-#endif
-mpState->bNeedRestart = true;
-}
-mnLastPageCount = nPages;
-
-NSTabViewItem* pItem = [mpTabView selectedTabViewItem];
-if( pItem )
-mpState->nLastPage = [mpTabView indexOfTabViewItem: pItem];
-else
-mpState
[Libreoffice-commits] core.git: 2 commits - sal/qa sal/rtl
sal/qa/rtl/math/test-rtl-math.cxx | 48 ++
sal/rtl/math.cxx | 43 ++
2 files changed, 91 insertions(+)
New commits:
commit 34abbb53f347f53892cc9dde60e36499588681fd
Author: Eike Rathke
Date: Sat Oct 24 22:05:36 2015 +0200
unit tests for rtl_math_expm1() and rtl_math_log1p()
Change-Id: I1b573365d55f6455e892b4b5b98a7090de5caf4c
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx
b/sal/qa/rtl/math/test-rtl-math.cxx
index b462de4..1d3f07f 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -120,12 +120,60 @@ public:
CPPUNIT_ASSERT_EQUAL(true,rtl::math::isNan(x));
}
+void test_expm1() {
+double x, res;
+x = 0.0;
+res = rtl::math::expm1(x);
+CPPUNIT_ASSERT_EQUAL(0.0,res);
+x = -0.0;
+res = rtl::math::expm1(x);
+CPPUNIT_ASSERT_EQUAL(-0.0,res);
+CPPUNIT_ASSERT_EQUAL(true, rtl::math::isSignBitSet(res));
+rtl::math::setInf( &x, false);
+res = rtl::math::expm1(x);
+CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res) &&
!rtl::math::isSignBitSet(res));
+rtl::math::setInf( &x, true);
+res = rtl::math::expm1(x);
+CPPUNIT_ASSERT_EQUAL(-1.0,res);
+rtl::math::setNan( &x);
+res = rtl::math::expm1(x);
+CPPUNIT_ASSERT_EQUAL(true,rtl::math::isNan(x));
+}
+
+void test_log1p() {
+double x, res;
+x = 0.0;
+res = rtl::math::log1p(x);
+CPPUNIT_ASSERT_EQUAL(0.0,res);
+x = -0.0;
+res = rtl::math::log1p(x);
+CPPUNIT_ASSERT_EQUAL(-0.0,res);
+CPPUNIT_ASSERT_EQUAL(true, rtl::math::isSignBitSet(res));
+rtl::math::setInf( &x, false);
+res = rtl::math::log1p(x);
+CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res) &&
!rtl::math::isSignBitSet(res));
+x = -1.0;
+res = rtl::math::log1p(x);
+CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res) &&
rtl::math::isSignBitSet(res));
+x = -1.1;
+res = rtl::math::log1p(x);
+CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res));
+rtl::math::setInf( &x, true);
+res = rtl::math::log1p(x);
+CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res));
+rtl::math::setNan( &x);
+res = rtl::math::log1p(x);
+CPPUNIT_ASSERT_EQUAL(true,rtl::math::isNan(x));
+}
+
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(test_stringToDouble_good);
CPPUNIT_TEST(test_stringToDouble_bad);
CPPUNIT_TEST(test_stringToDouble_exponent_without_digit);
CPPUNIT_TEST(test_erf);
CPPUNIT_TEST(test_erfc);
+CPPUNIT_TEST(test_expm1);
+CPPUNIT_TEST(test_log1p);
CPPUNIT_TEST_SUITE_END();
};
commit 04967cba8e71e178915068e237a96e32a8cb3e9e
Author: Eike Rathke
Date: Sat Oct 24 22:04:28 2015 +0200
implement Inf and NaN handling for rtl_math_expm1() and rtl_math_log1p()
Change-Id: Ie424a6f038107ef8b574d0422efaf49b441c110f
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 37225f4..3ec6fe0 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1096,6 +1096,24 @@ double SAL_CALL rtl_math_approxValue( double fValue )
SAL_THROW_EXTERN_C()
double SAL_CALL rtl_math_expm1( double fValue ) SAL_THROW_EXTERN_C()
{
+// See http://en.cppreference.com/w/cpp/numeric/math/expm1
+
+if (fValue == 0.0)
+return fValue;
+
+if (!::rtl::math::isFinite(fValue))
+{
+if (::rtl::math::isInf(fValue))
+{
+if (::rtl::math::isSignBitSet(fValue))
+return -1.0;
+else
+return fValue;
+}
+// It is a NaN.
+return fValue;
+}
+
double fe = exp( fValue );
if (fe == 1.0)
return fValue;
@@ -1106,6 +1124,31 @@ double SAL_CALL rtl_math_expm1( double fValue )
SAL_THROW_EXTERN_C()
double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C()
{
+// See http://en.cppreference.com/w/cpp/numeric/math/log1p
+
+if (fValue == 0.0)
+return fValue;
+
+if (fValue == -1.0)
+{
+rtl::math::setInf( &fValue, true);
+return fValue;
+}
+
+if (fValue < -1.0) // includes -Inf
+{
+rtl::math::setNan( &fValue);
+return fValue;
+}
+
+if (!::rtl::math::isFinite(fValue))
+{
+if (::rtl::math::isInf(fValue))
+return fValue;
+// It is a NaN.
+return fValue;
+}
+
// Use volatile because a compiler may be too smart "optimizing" the
// condition such that in certain cases the else path was called even if
// (fp==1.0) was true, where the term (fp-1.0) then resulted in 0.0 and
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sal/qa sal/rtl
sal/qa/rtl/math/test-rtl-math.cxx | 34 ++
sal/rtl/math.cxx | 22 ++
2 files changed, 56 insertions(+)
New commits:
commit 9846b6ab3d36c8b2696e8829c121016f9fa81e66
Author: Eike Rathke
Date: Sat Oct 24 21:31:45 2015 +0200
unit tests for rtl_math_erf() and rtl_math_erfc()
Change-Id: Ia6b025ba9980f0a7b333b2dc4ae708c3a63fca21
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx
b/sal/qa/rtl/math/test-rtl-math.cxx
index e6422c4..b462de4 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -88,10 +88,44 @@ public:
CPPUNIT_ASSERT_EQUAL(0.0, res);
}
+void test_erf() {
+double x, res;
+x = 0.0;
+res = rtl::math::erf(x);
+CPPUNIT_ASSERT_EQUAL(0.0,res);
+rtl::math::setInf( &x, false);
+res = rtl::math::erf(x);
+CPPUNIT_ASSERT_EQUAL(1.0,res);
+rtl::math::setInf( &x, true);
+res = rtl::math::erf(x);
+CPPUNIT_ASSERT_EQUAL(-1.0,res);
+rtl::math::setNan( &x);
+res = rtl::math::erf(x);
+CPPUNIT_ASSERT_EQUAL(true,rtl::math::isNan(x));
+}
+
+void test_erfc() {
+double x, res;
+x = 0.0;
+res = rtl::math::erfc(x);
+CPPUNIT_ASSERT_EQUAL(1.0,res);
+rtl::math::setInf( &x, false);
+res = rtl::math::erfc(x);
+CPPUNIT_ASSERT_EQUAL(0.0,res);
+rtl::math::setInf( &x, true);
+res = rtl::math::erfc(x);
+CPPUNIT_ASSERT_EQUAL(2.0,res);
+rtl::math::setNan( &x);
+res = rtl::math::erfc(x);
+CPPUNIT_ASSERT_EQUAL(true,rtl::math::isNan(x));
+}
+
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(test_stringToDouble_good);
CPPUNIT_TEST(test_stringToDouble_bad);
CPPUNIT_TEST(test_stringToDouble_exponent_without_digit);
+CPPUNIT_TEST(test_erf);
+CPPUNIT_TEST(test_erfc);
CPPUNIT_TEST_SUITE_END();
};
commit 5f2db274dbf4d8b808f9ddbe4959deadbc1ec9fa
Author: Eike Rathke
Date: Sat Oct 24 21:30:14 2015 +0200
implement proper Inf and NaN handling in rtl_math_erf() and rtl_math_erfc()
Change-Id: Ib96d7123a3c483e9a1c78666bf042396510d733f
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 9599028..37225f4 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1143,7 +1143,18 @@ double SAL_CALL rtl_math_erf( double x )
SAL_THROW_EXTERN_C()
// Otherwise we may end up in endless recursion through rtl_math_erfc().
if (!::rtl::math::isFinite(x))
+{
+// See http://en.cppreference.com/w/cpp/numeric/math/erf
+if (::rtl::math::isInf(x))
+{
+if (::rtl::math::isSignBitSet(x))
+return -1.0;
+else
+return 1.0;
+}
+// It is a NaN.
return x;
+}
bool bNegative = false;
if ( x < 0.0 )
@@ -1183,7 +1194,18 @@ double SAL_CALL rtl_math_erfc( double x )
SAL_THROW_EXTERN_C()
// Otherwise we may end up in endless recursion through rtl_math_erf().
if (!::rtl::math::isFinite(x))
+{
+// See http://en.cppreference.com/w/cpp/numeric/math/erfc
+if (::rtl::math::isInf(x))
+{
+if (::rtl::math::isSignBitSet(x))
+return 2.0;
+else
+return 0.0;
+}
+// It is a NaN.
return x;
+}
bool bNegative = false;
if ( x < 0.0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Simon Steinbeiss license statement
Hi everyone, all of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Cheers Simon Steinbeiss ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/osx
vcl/inc/osx/printview.h |7
vcl/osx/printaccessoryview.mm | 478 +-
vcl/osx/printview.mm | 12 -
vcl/osx/salprn.cxx|3
4 files changed, 352 insertions(+), 148 deletions(-)
New commits:
commit 0d4f422300d81dcb9d875885c988e88a926fb722
Author: Douglas Mencken
Date: Sun Oct 18 11:29:49 2015 -0400
vcl.osx.print: convert to use modern API for print dialog
Change-Id: Icc7d7ad95d1ffbf55f1cd704148f3ceb58618e6c
Reviewed-on: https://gerrit.libreoffice.org/19432
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/vcl/inc/osx/printview.h b/vcl/inc/osx/printview.h
index e396bd8..22fafb6 100644
--- a/vcl/inc/osx/printview.h
+++ b/vcl/inc/osx/printview.h
@@ -42,7 +42,8 @@ struct PrintAccessoryViewState
vcl::PrinterController* mpController;
AquaSalInfoPrinter* mpInfoPrinter;
}
--(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter:
(AquaSalInfoPrinter*)pInfoPrinter;
+-(id)initWithController: (vcl::PrinterController*)pController
+withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter;
-(BOOL)knowsPageRange: (NSRangePointer)range;
-(NSRect)rectForPage: (int)page;
-(NSPoint)locationOfPrintRect: (NSRect)aRect;
@@ -52,7 +53,9 @@ struct PrintAccessoryViewState
@interface AquaPrintAccessoryView : NSObject
{
}
-+(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController:
(vcl::PrinterController*)pController withState:
(PrintAccessoryViewState*)pState;
++(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp
+ withController: (vcl::PrinterController*)pController
+withState: (PrintAccessoryViewState*)pState;
@end
#endif // INCLUDED_VCL_INC_OSX_PRINTVIEW_H
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index d03d4f4..80d972e 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -45,11 +45,15 @@ using namespace com::sun::star;
using namespace com::sun::star::beans;
using namespace com::sun::star::uno;
-/* Note: the accessory view as implemented here is already deprecated in
Leopard. Unfortunately
- as long as our baseline is Tiger we cannot gain the advantages over
multiple accessory views
- as well havs having accessory views AND a preview (as long as you are
linked vs. 10.4 libraries
- the preview insists on not being present. This is unfortunate.
-*/
+#if MACOSX_SDK_VERSION <= 1040
+// as long as you are linking with 10.4 libraries there's no preview
+# define VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
+# undef MODERN_IMPLEMENTATION_OF_PRINT_DIALOG
+#else
+// since 10.5 you can use multiple accessory views and have accessory views
and a preview
+# define MODERN_IMPLEMENTATION_OF_PRINT_DIALOG
+# undef VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
+#endif
class ControllerProperties;
@@ -60,93 +64,207 @@ class ControllerProperties;
-(id)initWithControllerMap: (ControllerProperties*)pController;
-(void)triggered:(id)pSender;
-(void)triggeredNumeric:(id)pSender;
+#ifdef VINTAGE_IMPLEMENTATION_OF_PRINT_DIALOG
-(void)triggeredPreview:(id)pSender;
+#endif
-(void)dealloc;
@end
+#ifdef MODERN_IMPLEMENTATION_OF_PRINT_DIALOG
+
+@interface AquaPrintPanelAccessoryController : NSViewController<
NSPrintPanelAccessorizing >
+{
+NSPrintOperation *mpPrintOperation;
+vcl::PrinterController *mpPrinterController;
+PrintAccessoryViewState *mpViewState;
+}
+
+-(void)forPrintOperation:(NSPrintOperation*)pPrintOp;
+-(void)withPrinterController:(vcl::PrinterController*)pController;
+-(void)withViewState:(PrintAccessoryViewState*)pState;
+
+-(NSPrintOperation*)printOperation;
+-(vcl::PrinterController*)printerController;
+-(PrintAccessoryViewState*)viewState;
+
+-(NSSet*)keyPathsForValuesAffectingPreview;
+-(NSArray*)localizedSummaryItems;
+
+-(sal_Int32)updatePrintOperation:(sal_Int32)pLastPageCount;
+
+@end
+
+@implementation AquaPrintPanelAccessoryController
+
+-(void)forPrintOperation:(NSPrintOperation*)pPrintOp
+{ mpPrintOperation = pPrintOp; }
+
+-(void)withPrinterController:(vcl::PrinterController*)pController
+{ mpPrinterController = pController; }
+
+-(void)withViewState:(PrintAccessoryViewState*)pState
+{ mpViewState = pState; }
+
+-(NSPrintOperation*)printOperation
+{ return mpPrintOperation; }
+
+-(vcl::PrinterController*)printerController
+{ return mpPrinterController; }
+
+-(PrintAccessoryViewState*)viewState
+{ return mpViewState; }
+
+-(NSSet*)keyPathsForValuesAffectingPreview
+{
+return [ NSSet setWithObject:@"updatePrintOperation" ];
+}
+
+-(NSArray*)localizedSummaryItems
+{
+return [ NSArray arrayWithObject:
+ [ NSDictionary dictionary ] ];
+}
+
+-(sal_Int32)updatePrintOperation:(sal_Int32)pLastPageCount
+{
+// page range may be changed by option choice
+sal_Int32 nPages = mpPrinterController->getFilteredPageCount();
+
+mpViewState->bNeedRestart = false;
+if( n
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/math.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit caf093e56f7d9f9223dd546d353d77dffaeb0b9a
Author: Eike Rathke
Date: Sat Oct 24 20:42:11 2015 +0200
prevent endless recursion through rtl_math_erf* for Inf or NaN
Change-Id: If6eb273bc4d76f85da0844caea4bd697c6263013
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index db9b06a..9599028 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -1141,6 +1141,10 @@ double SAL_CALL rtl_math_erf( double x )
SAL_THROW_EXTERN_C()
if( x == 0.0 )
return 0.0;
+// Otherwise we may end up in endless recursion through rtl_math_erfc().
+if (!::rtl::math::isFinite(x))
+return x;
+
bool bNegative = false;
if ( x < 0.0 )
{
@@ -1177,6 +1181,10 @@ double SAL_CALL rtl_math_erfc( double x )
SAL_THROW_EXTERN_C()
if ( x == 0.0 )
return 1.0;
+// Otherwise we may end up in endless recursion through rtl_math_erf().
+if (!::rtl::math::isFinite(x))
+return x;
+
bool bNegative = false;
if ( x < 0.0 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/Library_pl.mk extensions/source extensions/StaticLibrary_plugcon.mk solenv/bin
extensions/Library_pl.mk|6 --
extensions/StaticLibrary_plugcon.mk |6 --
extensions/source/plugin/inc/plugin/unx/plugcon.hxx |6 --
solenv/bin/ooinstall|5 -
4 files changed, 23 deletions(-)
New commits:
commit 11fc708e71054dcd512a81981e735db375e79aa4
Author: David Ostrovsky
Date: Sat Oct 24 19:17:24 2015 +0200
Remove left over references to SYSTEM_MOZILLA
In a0c53a961a0af21f69f592b43799cd635c994810 SYSTEM_MOZILLA was removed.
Change-Id: I421a293c7611dd5ed0d810c9c8a80f19faf1689a
Reviewed-on: https://gerrit.libreoffice.org/19580
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 680877c..82a71d6 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -32,12 +32,6 @@ $(eval $(call gb_Library_add_defs,pl,\
endif # ENABLE_JAVA=YES
-ifeq ($(SYSTEM_MOZILLA),YES)
-$(eval $(call gb_Library_add_defs,pl,\
- -DSYSTEM_MOZILLA \
-))
-endif # SYSTEM_MOZILLA=YES
-
ifeq ($(OS),SOLARIS)
$(eval $(call gb_Library_add_libs,pl,\
-lsocket \
diff --git a/extensions/StaticLibrary_plugcon.mk
b/extensions/StaticLibrary_plugcon.mk
index 4992309..149e86b 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -36,12 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,plugcon,\
endif # ENABLE_JAVA=YES
-ifeq ($(SYSTEM_MOZILLA),YES)
-$(eval $(call gb_StaticLibrary_add_defs,plugcon,\
- -DSYSTEM_MOZILLA \
-))
-endif # SYSTEM_MOZILLA=YES
-
ifeq ($(ENABLE_GTK),TRUE)
$(eval $(call gb_StaticLibrary_add_defs,plugcon,\
-DENABLE_GTK \
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 0793296..ad3fc67 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -55,12 +55,6 @@ extern "C" {
#endif
#define MOZ_X11
#include
-#ifdef SYSTEM_MOZILLA
-#ifndef OJI
-# define OJI
-#endif
-#define MOZ_X11
-#endif
#if ! defined ( _NPAPI_H_) && ! defined (npapi_h_)
extern "C" {
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 04de7ab..f9034cd 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -35,11 +35,6 @@ if (defined($ENV{TMPDIR})) {
}
if (!-d $tmp_dir) {die "Set TMPDIR!\n";}
-# Workaround for system Mozilla
-if ($ENV{'SYSTEM_MOZILLA'} eq 'YES') {
-$ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}";
-}
-
for $arg (@ARGV) {
if ($arg eq '-s' || $arg eq '--strip') {
$strip = "-strip";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60906] Make color configuration consistent
https://bugs.documentfoundation.org/show_bug.cgi?id=60906 --- Comment #4 from Feyza --- (In reply to Feyza from comment #3) > I sent following patch for this bug: > > https://gerrit.libreoffice.org/#/c/19571/ -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/ui/docshell/docsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5a00b977b617bdd9ef263067e95d26c3953c575c
Author: Mike Kaganski
Date: Sat Oct 24 19:03:33 2015 +1000
tdf#95220: Check if DrawingLayer is not nullptr
bool ScDocShell::isTiledRendering() const crashed without this check
Change-Id: Idb7ace05eb1aa37cbc3d956503c046b0e9b9d0e5
Reviewed-on: https://gerrit.libreoffice.org/19570
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit 4fc31c1569ba1dc0e2e3aaf9eb8f0747776daa04)
Reviewed-on: https://gerrit.libreoffice.org/19579
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index ad3b6bf..a93aea4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3185,7 +3185,7 @@ void ScDocShell::libreOfficeKitCallback(int nType, const
char* pPayload) const
bool ScDocShell::isTiledRendering() const
{
-return aDocument.GetDrawLayer()->isTiledRendering();
+return aDocument.GetDrawLayer() &&
aDocument.GetDrawLayer()->isTiledRendering();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/docsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4fc31c1569ba1dc0e2e3aaf9eb8f0747776daa04
Author: Mike Kaganski
Date: Sat Oct 24 19:03:33 2015 +1000
tdf#95220: Check if DrawingLayer is not nullptr
bool ScDocShell::isTiledRendering() const crashed without this check
Change-Id: Idb7ace05eb1aa37cbc3d956503c046b0e9b9d0e5
Reviewed-on: https://gerrit.libreoffice.org/19570
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index f35d181..81c3555 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3196,7 +3196,7 @@ void ScDocShell::libreOfficeKitCallback(int nType, const
char* pPayload) const
bool ScDocShell::isTiledRendering() const
{
-return aDocument.GetDrawLayer()->isTiledRendering();
+return aDocument.GetDrawLayer() &&
aDocument.GetDrawLayer()->isTiledRendering();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/core/tool/interpr5.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 26b38babf9a85caac32019cd86e2307b446743c7
Author: Dennis Francis
Date: Fri Oct 23 03:28:37 2015 +0530
tdf#32834 : improve the precision of MDETERM calculation
MDETERM uses lcl_LUP_decompose() which as the name suggests does LUP
decomposition.
This patch allows additive cancellations to occur in a cleaner way while
doing the *only*
additive operation in LUP decomposition, that is while computing Shur
complement.
This patch does not change the high level semantics of the algorithm.
Also note that this change makes improvement only in the case where matrix
elements entered
by the user are *integers*. The change allows MDETERM to evaluate to exact
0.0 for
singular integer matrices.
The steps to calculate Shur complement are :
for i = k+1 to n
aik = aik / akk;
for j = k+1 to n
aij = aij - akj*aik
This is now modified as :
for i = k+1 to n
for j = k+1 to n
aij = ( aij*akk - akj*aik ) / akk
Without this change MDETERM() for certain singular matrices used to
evaluate to a tiny non zero value,
which also caused MINVERSE() to generate a wrong output.
An example of such a matrix is :
1 2 3
4 5 6
7 8 9
Change-Id: Idd4211ddceab1b758fd05bfd57f7eecd5d4fd1a0
Reviewed-on: https://gerrit.libreoffice.org/19534
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit e1e73a97b20af862f2fb914cb16a4f74c3ad31cb)
Reviewed-on: https://gerrit.libreoffice.org/19578
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index bfaa438..3947eba 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -709,11 +709,12 @@ static int lcl_LUP_decompose( ScMatrix* mA, const SCSIZE
n,
// Compute Schur complement.
for (SCSIZE i = k+1; i < n; ++i)
{
-double fTmp = mA->GetDouble( k, i) / mA->GetDouble( k, k);
-mA->PutDouble( fTmp, k, i);
+double fNum = mA->GetDouble( k, i);
+double fDen = mA->GetDouble( k, k);
+mA->PutDouble( fNum/fDen, k, i);
for (SCSIZE j = k+1; j < n; ++j)
-mA->PutDouble( mA->GetDouble( j, i) - fTmp * mA->GetDouble( j,
-k), j, i);
+mA->PutDouble( ( mA->GetDouble( j, i) * fDen -
+fNum * mA->GetDouble( j, k) ) / fDen, j, i);
}
}
#if OSL_DEBUG_LEVEL > 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.0.3.2'
Tag 'libreoffice-5.0.3.2' created by Christian Lohmaier at 2015-10-24 16:22 -0700 Tag libreoffice-5.0.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWK6JRAAoJEPQ0oe+v7q6j5ogP/jFCBLWPfnuOrxxlcH2uq060 GWn5RsDJd3m27liceUpe+fCl0P4r2TzefaAPHlyhABkiDEEce//p3kBHf1yFjRG4 NFaGKvd4GTncK9c0HVaqn9qlo9MeSpf7wEbcwBQY/4MwyF4Tk++iyqDhjFftzAfT EBGtgTq/u9ODqFuugjsoH63exwK+D0HLUEdB7l13/HJDvFOwcknHatxEUh8wkjQO UFli08qIEOgmOMqpqrONkdgaPmMTPK8rhhVJ/SYzneTVSTYKNjcRqKiXDSFzJZMn uwd9xOV1oE73yp9WRvinaILqnvuIdIYjJ108VuYH7oattOfUi72fOQ8yr/qJI5UJ 0HM7K+cYZwd7lsQUWBgVcA6A0H5sA2CKT2j+BLD6RqXvbJX5sWsJz0ciid/BG287 SSbbZ8IQsgMAdGOR5IdBBduJIoAGIMTqvvT4ZfsVlZWwoS/vAKaa7ixTR36HMR5I FXRSe3OAYN+VOC/ny1l5vhNtOn0C+PpfoqzrCFxwZbyiGCrQG5XquLi/IP8R8Bsw 2utvp8DedgZ/bBEi3pLqMVcH00mEAyJCeSxmwFeRIegAJPOovj5YVk+9yeedHfdg d4BV2HO+AgFwENJY7ty/pwfWsGfdJdOQIOmPaU9yXB4wDbMnSITole3cllrzkBHF mDig546LhQkBgixqZcI9 =tkzA -END PGP SIGNATURE- Changes since cp-5.0-branch-point-1258: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.0.3.2'
Tag 'libreoffice-5.0.3.2' created by Christian Lohmaier at 2015-10-24 16:22 -0700 Tag libreoffice-5.0.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWK6JKAAoJEPQ0oe+v7q6jnzwP/Rou0BbVxFH0lgM6B8ppiA9D vCdAGwTmWCdeJUrDFU+fB2wtmNZUgEdChTpSO1n9JyLlrnGqfAdUDPQCSaSb2VOS g/adbRMEPB6Uy3RtxRT1qoasW0HL4HtbUiHuDESAg6isKRWHJphi4R4sFeaIc9Rh zllmhvjTuTVvpeqHnqgxHpVp3nKpM0lhXOLFTqHikPqjNmi5ATze/AYmrbHvRB4L QStqsFqgul8ZPGAPVydOedfrCyMyz2EAzBZu4cvS5qh9SvzFObgd4S2+9BEtoe5b 9ruZXD/cBtoHzhCHJIx4uQiWu3/E9u2BCAw43x3ln1O03kI0TTmtZDe8k4gREiQa IOW68efDtoeshw8+Yy16dmYwosWWsSG6Al7h1DQZWCPpO8BdcnGUHy3R5nb7N5EV SfxQzYzANVqOCbLOc6iHhoX0NHCL6i/k/LM7a68Nt6lxUYVLmuTQTyPejjgG1Ceg wYtub40BGECHda9kSA5j+PXwz6OFEz4boVBHzi2O2a86VAjzMLox1Dgjzoeu1nPy Jed3CcEXfkJ7TONxn9xs+0EkblJH4R6oakAOsc1aMDxmNpFAnTOhdZL+gSg9G0Z4 krY8dG/AA5FPiFRn7j72KdR0z5N5pDjG0tivpzeGxSOFg34gCROStaozvEg4ydYJ u1HkHh6jiADRFeEA7SB3 =nsV0 -END PGP SIGNATURE- Changes since libreoffice-5-0-branch-point-12: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.0.3.2'
Tag 'libreoffice-5.0.3.2' created by Christian Lohmaier at 2015-10-24 16:22 -0700 Tag libreoffice-5.0.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWK6JOAAoJEPQ0oe+v7q6j2jYP/10oWI5JpR6UvMfXs8J6DVDK doYio1LSj/HuLJXXoO3ikpzhTQNVEeGdC3hwvxHzIXPC8dOKG2Xd85gD7wiw7BxN F1roUpNq0GR9Cl3jANjNzJlzzl2gRE7Vg2+DJu+D+0kWriWHX7CBt2jsRf+0SUYV 8/oKIf7WWZF8hLuVGHPvgORRAc/VdlweSK7h75jFf+xeNcMvrdBIhXgBRoK52wOG pgFyuGKZqoi4uU8hlCSKrhSLEs8TbnUwkJHJguV1QGM0nbOAboU3PH6MLeEXvCN9 uffcxKWGKM5oTGnpnZ25wjGQJsc0MmsSmO0ZVyHAlEVg07Aw12+YiOyT+tAYtf8i kpvVN7gLaD7NI0iiv+TMRVSASy+H4M934KTzgP7XWiJMZC5BrxadHS0ja53Tcxqc efPiwK66h5HxLDiHjdlDVBimlo7hstXOtwIw/Q+4jMJAl/h4lHi4/7LIlj33t26S GlyS+lugGzt4odprk4bOfFClHvd8d7SDaTsfGtAms5ohTZGaj/Gs5hYRCqfglT4w Kkpq1fxD59m9SYTugGuqaUeb2yVh57st112AF1CpRWA+YqyrsKIX9LCqq4Ce2Ug/ wISNWlXGYYar1WaBk/e+0qsXQ+TzvZlMiXnuHkZSaDSGDh4twLOElr3vpMaAc3Ku dcxqvraYK8KRRgsN519k =fNg1 -END PGP SIGNATURE- Changes since libreoffice-5-0-branch-point-26: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.0.3.2'
Tag 'libreoffice-5.0.3.2' created by Christian Lohmaier at 2015-10-24 16:22 -0700 Tag libreoffice-5.0.3.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWK6JHAAoJEPQ0oe+v7q6jMLwQAKTjy+t9qYVNo9rdX+8TG9ep G3Szq0UaUJtKkgaCQC418xwUj47mKJz1HYc6d9syKSyyKEHISa4asRy7z41lSK2c tWVDBcD6MElk0LL2izLT5DY1UXWtqrBhnIDwxWjiQxQBA+xKtsn+NXJroy0Naah4 krMwVecUPAcPuQJCIJwVwgJqZ9AdXVTgcOsh7cmWIWTeoQYC782SxXrsfHLtA9ER VdIN+UuxZvCIaKceAEWGDgiDTSXzntqHVkXoCxvPMS/aI4E33R0YJADLlSySUJ5G 1QzqyN0+RnhvSu4csZ9PNgQpguPG0DMi2S8A1JwIFTm5iT4b+FzV3TsGt9epdEd+ /SWltiSyY6jiVyXJeb+YEu/szAQbO06dNYq0grWTDq++MWWbtCAchsrx71ZcdQgX S/atSocB/9pY91cNuCwIphGnXOnXNkSqYrl8PDtYzYzq8ceaYNBg+65xngYS0jae XFf4bww3KVBygJ+TBam0aKwqRZ9q/pA7IUGTdqPXGPtc10NVawFQgivlvJD/AlnY fc9x1wGIzSDUbbaGOABSNY/7L2CtwWvrLj6MGzi0DnsuwGYhvB+L6a0GX1sAUpF4 oyMUY1hwrMhJS+OksTJ6ZYG782uWzNuqWs6D9YLkzL7V8d4J4NrwCGHatwd/y8KL sXGvm8tBedCq6uI2V9bG =eQU5 -END PGP SIGNATURE- Changes since libreoffice-5-0-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff27242ae641dd853a048297825b1812f188cd18 Author: Christian Lohmaier Date: Sat Oct 24 17:23:27 2015 +0200 bump product version to 5.0.3.2.0+ Change-Id: I9c99674fcdcedbb429b8292ecfc5f839cb61525d diff --git a/configure.ac b/configure.ac index 000adb7..5f5f9c5 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.0.3.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.0.3.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.hxx |2 ++
sc/qa/unit/ucalc_formula.cxx | 40
2 files changed, 42 insertions(+)
New commits:
commit c43442dfef3f5b21bec40054b56f406efdc5a84f
Author: Dennis Francis
Date: Sat Oct 24 13:16:14 2015 +0530
unit test for MDETERM() tdf#32834
Change-Id: Icc55931f5bc64fcc2745ca68f62851ee2c59f711
Reviewed-on: https://gerrit.libreoffice.org/19569
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 29ca1e0..b1a6af2 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -193,6 +193,7 @@ public:
void testFuncGCD();
void testFuncLCM();
void testFuncSUMSQ();
+void testFuncMDETERM();
void testExternalRef();
void testExternalRefFunctions();
@@ -534,6 +535,7 @@ public:
CPPUNIT_TEST(testFuncGCD);
CPPUNIT_TEST(testFuncLCM);
CPPUNIT_TEST(testFuncSUMSQ);
+CPPUNIT_TEST(testFuncMDETERM);
CPPUNIT_TEST(testExternalRef);
CPPUNIT_TEST(testExternalRangeName);
CPPUNIT_TEST(testExternalRefFunctions);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 8538eae..1e0c06b 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -6572,6 +6572,46 @@ void Test::testFuncSUMSQ()
m_pDoc->DeleteTab(0);
}
+void Test::testFuncMDETERM()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+
+m_pDoc->InsertTab(0, "MDETERM_test");
+ScAddress aPos(8,0,0);
+OUString aColCodes("ABCDEFGH");
+OUString aFormulaTemplate("=MDETERM(A1:B2)");
+OUStringBuffer aFormulaBuffer(aFormulaTemplate);
+for( SCSIZE nSize = 3; nSize <= 8; nSize++ )
+{
+double fVal = 1.0;
+// Generate a singular integer matrix
+for( SCROW nRow = 0; nRow < static_cast(nSize); nRow++ )
+{
+for( SCCOL nCol = 0; nCol < static_cast(nSize); nCol++ )
+{
+m_pDoc->SetValue(nCol, nRow, 0, fVal);
+fVal += 1.0;
+}
+}
+aFormulaBuffer[12] = aColCodes[nSize-1];
+aFormulaBuffer[13] = static_cast( '0' + nSize );
+m_pDoc->SetString(aPos, aFormulaBuffer.toString());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Calculation of MDETERM incorrect for
singular integer matrix",
+ 0.0, m_pDoc->GetValue(aPos));
+}
+
+int aVals[] = {23, 31, 13, 12, 34, 64, 34, 31, 98, 32, 33, 63, 45, 54, 65,
76};
+int nIdx = 0;
+for( SCROW nRow = 0; nRow < 4; nRow++ )
+for( SCCOL nCol = 0; nCol < 4; nCol++ )
+m_pDoc->SetValue(nCol, nRow, 0,
static_cast(aVals[nIdx++]));
+m_pDoc->SetString(aPos, "=MDETERM(A1:D4)");
+// Following test is conservative in the sense that on Linux x86_64 the
error is less that 1.0E-9
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Calculation of MDETERM incorrect for
non-singular integer matrix",
+ -180655.0, m_pDoc->GetValue(aPos),
1.0E-6);
+m_pDoc->DeleteTab(0);
+}
+
void Test::testFormulaErrorPropagation()
{
sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr5.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit e1e73a97b20af862f2fb914cb16a4f74c3ad31cb
Author: Dennis Francis
Date: Fri Oct 23 03:28:37 2015 +0530
tdf#32834 : improve the precision of MDETERM calculation
MDETERM uses lcl_LUP_decompose() which as the name suggests does LUP
decomposition.
This patch allows additive cancellations to occur in a cleaner way while
doing the *only*
additive operation in LUP decomposition, that is while computing Shur
complement.
This patch does not change the high level semantics of the algorithm.
Also note that this change makes improvement only in the case where matrix
elements entered
by the user are *integers*. The change allows MDETERM to evaluate to exact
0.0 for
singular integer matrices.
The steps to calculate Shur complement are :
for i = k+1 to n
aik = aik / akk;
for j = k+1 to n
aij = aij - akj*aik
This is now modified as :
for i = k+1 to n
for j = k+1 to n
aij = ( aij*akk - akj*aik ) / akk
Without this change MDETERM() for certain singular matrices used to
evaluate to a tiny non zero value,
which also caused MINVERSE() to generate a wrong output.
An example of such a matrix is :
1 2 3
4 5 6
7 8 9
Change-Id: Idd4211ddceab1b758fd05bfd57f7eecd5d4fd1a0
Reviewed-on: https://gerrit.libreoffice.org/19534
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 88cd12d..eac7cd4 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -711,11 +711,12 @@ static int lcl_LUP_decompose( ScMatrix* mA, const SCSIZE
n,
// Compute Schur complement.
for (SCSIZE i = k+1; i < n; ++i)
{
-double fTmp = mA->GetDouble( k, i) / mA->GetDouble( k, k);
-mA->PutDouble( fTmp, k, i);
+double fNum = mA->GetDouble( k, i);
+double fDen = mA->GetDouble( k, k);
+mA->PutDouble( fNum/fDen, k, i);
for (SCSIZE j = k+1; j < n; ++j)
-mA->PutDouble( mA->GetDouble( j, i) - fTmp * mA->GetDouble( j,
-k), j, i);
+mA->PutDouble( ( mA->GetDouble( j, i) * fDen -
+fNum * mA->GetDouble( j, k) ) / fDen, j, i);
}
}
#if OSL_DEBUG_LEVEL > 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: helpauthoring/README
helpauthoring/README |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 3c7b4601876f29d6d6954b47fa45c73026dec112 Author: Eike Rathke Date: Sat Oct 24 16:09:55 2015 +0200 correct path help/ to helpcontent2/ diff --git a/helpauthoring/README b/helpauthoring/README index 8cab6b8..baed178 100644 --- a/helpauthoring/README +++ b/helpauthoring/README @@ -19,11 +19,11 @@ and start hacking it. Most probably you'll want to do improvements to the To do that the most effectively, choose a reasonably complicated .xhp file, like: - help/source/text/schart/01/type_stock.xhp + helpcontent2/source/text/schart/01/type_stock.xhp convert it to .fodt (Save As... in Writer), and then use: - xsltproc helpauthoring/filter/soffice2xmlhelp.xsl help/source/text/schart/01/type_stock.fodt > out + xsltproc helpauthoring/filter/soffice2xmlhelp.xsl helpcontent2/source/text/schart/01/type_stock.fodt > out When you are happy with the improved output in 'out', commit & push the improved soffice2xmlhelp.xsl via gerrit. ___ 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-3' - extras/source
extras/source/autocorr/lang/cs/DocumentList.xml | 24 - extras/source/autocorr/lang/is/DocumentList.xml | 538 +++- 2 files changed, 547 insertions(+), 15 deletions(-) New commits: commit 7bbe77c9af43ba2f14c25b643739d94ca8223db4 Author: Christian Lohmaier Date: Sat Oct 24 15:14:09 2015 +0200 update emoji autocorrect entries from po-files Change-Id: I3923ba58c0f56f3a97808521e39401eea9acb154 (cherry picked from commit d5a4774ec89bbc39ee5844731f8964ded4c100f3) diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml b/extras/source/autocorr/lang/cs/DocumentList.xml index 9253aca..f7b217e 100644 --- a/extras/source/autocorr/lang/cs/DocumentList.xml +++ b/extras/source/autocorr/lang/cs/DocumentList.xml @@ -572,56 +572,56 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/extras/source/autocorr/lang/is/DocumentList.xml b/extras/source/autocorr/lang/is/DocumentList.xml index 22fc7d5..5bd0b00 100644 --- a/extras/source/autocorr/lang/is/DocumentList.xml +++ b/extras/source/autocorr/lang/is/DocumentList.xml @@ -1,7 +1,9 @@ http://openoffice.org/2001/block-list";> + + @@ -61,36 +63,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -116,17 +147,40 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -135,35 +189,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -175,58 +263,134 @@ + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -235,23 +399,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -260,13 +448,34 @@ + + + + + + + + + + + + + + + + + + + + + @@ -279,66 +488,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -348,24 +661,36 @@ + + + + + + + + + + - + + + @@ -373,32 +698,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -408,84 +770,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - extras/source
extras/source/autocorr/lang/cs/DocumentList.xml | 24 - extras/source/autocorr/lang/is/DocumentList.xml | 538 +++- 2 files changed, 547 insertions(+), 15 deletions(-) New commits: commit d5a4774ec89bbc39ee5844731f8964ded4c100f3 Author: Christian Lohmaier Date: Sat Oct 24 15:14:09 2015 +0200 update emoji autocorrect entries from po-files Change-Id: I3923ba58c0f56f3a97808521e39401eea9acb154 diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml b/extras/source/autocorr/lang/cs/DocumentList.xml index 9253aca..f7b217e 100644 --- a/extras/source/autocorr/lang/cs/DocumentList.xml +++ b/extras/source/autocorr/lang/cs/DocumentList.xml @@ -572,56 +572,56 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/extras/source/autocorr/lang/is/DocumentList.xml b/extras/source/autocorr/lang/is/DocumentList.xml index 22fc7d5..5bd0b00 100644 --- a/extras/source/autocorr/lang/is/DocumentList.xml +++ b/extras/source/autocorr/lang/is/DocumentList.xml @@ -1,7 +1,9 @@ http://openoffice.org/2001/block-list";> + + @@ -61,36 +63,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -116,17 +147,40 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -135,35 +189,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -175,58 +263,134 @@ + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -235,23 +399,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -260,13 +448,34 @@ + + + + + + + + + + + + + + + + + + + + + @@ -279,66 +488,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -348,24 +661,36 @@ + + + + + + + + + + - + + + @@ -373,32 +698,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -408,84 +770,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -494,13 +956,26 @@ + + + + +
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 737bc4d2d5939b7a51b6048fc29c83a63610a3c1 Author: Christian Lohmaier Date: Sat Oct 24 15:08:59 2015 +0200 Updated core Project: translations 8c6b926aa676b673926e16416ad10f8e9d033211 5.0.3 rc2 translations - actually run pocheck Change-Id: Idaae5031fefb4550ebe2a8bdd23472bdf3c5b635 (cherry picked from commit 72d22bd3a8099bd062066bb60bccb867376c77f8) diff --git a/translations b/translations index 955713b..8c6b926 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 955713b7939102e4131cd8f399030e8669499375 +Subproject commit 8c6b926aa676b673926e16416ad10f8e9d033211 ___ 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' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 898d192a5d3680695649f41df239599612380455 Author: Christian Lohmaier Date: Sat Oct 24 15:08:59 2015 +0200 Updated core Project: translations 72d22bd3a8099bd062066bb60bccb867376c77f8 5.0.3 rc2 translations - actually run pocheck Change-Id: Idaae5031fefb4550ebe2a8bdd23472bdf3c5b635 diff --git a/translations b/translations index 617cfd0..72d22bd 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 617cfd09fb15bd1dba7c9e647cc1413e28d93342 +Subproject commit 72d22bd3a8099bd062066bb60bccb867376c77f8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0-3' - source/am source/as source/bg source/bn-IN source/bo source/br source/brx source/bs source/ca source/ca-valencia source/cs source/d
source/am/formula/source/core/resource.po| 29 source/am/sw/source/ui/utlui.po | 19 source/as/starmath/source.po | 42 source/bg/sw/source/ui/utlui.po | 19 source/bn-IN/formula/source/core/resource.po | 65 - source/bn-IN/scaddins/source/analysis.po | 20 source/bo/formula/source/core/resource.po| 47 source/bo/sw/source/ui/utlui.po | 107 -- source/br/formula/source/core/resource.po| 47 source/brx/formula/source/core/resource.po | 46 source/brx/starmath/source.po| 82 - source/brx/sw/source/ui/utlui.po | 34 source/bs/sw/source/ui/utlui.po | 20 source/ca-valencia/formula/source/core/resource.po | 29 source/ca/formula/source/core/resource.po| 29 source/cs/sw/source/ui/utlui.po | 19 source/da/formula/source/core/resource.po| 29 source/de/sw/source/ui/utlui.po | 19 source/dgo/formula/source/core/resource.po | 73 - source/dgo/instsetoo_native/inc_openoffice/windows/msi_languages.po | 26 source/dgo/starmath/source.po| 244 source/dgo/sw/source/ui/utlui.po | 18 source/dz/formula/source/core/resource.po| 47 source/dz/instsetoo_native/inc_openoffice/windows/msi_languages.po | 27 source/eo/formula/source/core/resource.po| 38 source/es/formula/source/core/resource.po| 47 source/eu/formula/source/core/resource.po| 29 source/eu/starmath/source.po | 22 source/fa/starmath/source.po | 265 - source/fa/sw/source/ui/utlui.po | 22 source/fr/formula/source/core/resource.po| 23 source/fr/sw/source/ui/utlui.po | 22 source/gl/formula/source/core/resource.po| 56 - source/gu/formula/source/core/resource.po| 24 source/gu/starmath/source.po | 51 source/gug/formula/source/core/resource.po | 47 source/gug/sw/source/ui/utlui.po | 27 source/hi/starmath/source.po | 51 source/hi/sw/source/ui/utlui.po | 48 source/hu/formula/source/core/resource.po| 24 source/id/sw/source/ui/utlui.po | 23 source/it/sw/source/ui/utlui.po | 23 source/ja/sw/source/ui/utlui.po | 19 source/ka/formula/source/core/resource.po| 65 - source/ka/instsetoo_native/inc_openoffice/windows/msi_languages.po | 27 source/ka/scaddins/source/analysis.po| 38 source/ka/starmath/source.po | 38 source/ka/sw/source/ui/utlui.po | 27 source/kk/formula/source/core/resource.po| 20 source/kk/sw/source/ui/utlui.po | 19 source/km/formula/source/core/resource.po| 34 source/km/scaddins/source/analysis.po| 38 source/kmr-Latn/formula/source/core/resource.po | 128 -- source/kmr-Latn/instsetoo_native/inc_openoffice/windows/msi_languages.po | 27 source/kmr-Latn/scaddins/source/analysis.po | 29 source/kmr-Latn/starmath/source.po | 47 source/kmr-Latn/sw/source/ui/utlui.po| 19 source/kn/formula/source/core/resource.po| 51 source/ko/formula/source/core/resource.po| 65 - source/ko/sw/source/ui/utlui.po | 25
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0' - source/am source/as source/bg source/bn-IN source/bo source/br source/brx source/bs source/ca source/ca-valencia source/cs source/da
source/am/formula/source/core/resource.po| 29 source/am/sw/source/ui/utlui.po | 19 source/as/starmath/source.po | 42 source/bg/sw/source/ui/utlui.po | 19 source/bn-IN/formula/source/core/resource.po | 65 - source/bn-IN/scaddins/source/analysis.po | 20 source/bo/formula/source/core/resource.po| 47 source/bo/sw/source/ui/utlui.po | 107 -- source/br/formula/source/core/resource.po| 47 source/brx/formula/source/core/resource.po | 46 source/brx/starmath/source.po| 82 - source/brx/sw/source/ui/utlui.po | 34 source/bs/sw/source/ui/utlui.po | 20 source/ca-valencia/formula/source/core/resource.po | 29 source/ca/formula/source/core/resource.po| 29 source/cs/sw/source/ui/utlui.po | 19 source/da/formula/source/core/resource.po| 29 source/de/sw/source/ui/utlui.po | 19 source/dgo/formula/source/core/resource.po | 73 - source/dgo/instsetoo_native/inc_openoffice/windows/msi_languages.po | 26 source/dgo/starmath/source.po| 244 source/dgo/sw/source/ui/utlui.po | 18 source/dz/formula/source/core/resource.po| 47 source/dz/instsetoo_native/inc_openoffice/windows/msi_languages.po | 27 source/eo/formula/source/core/resource.po| 38 source/es/formula/source/core/resource.po| 47 source/eu/formula/source/core/resource.po| 29 source/eu/starmath/source.po | 22 source/fa/starmath/source.po | 265 - source/fa/sw/source/ui/utlui.po | 22 source/fr/formula/source/core/resource.po| 23 source/fr/sw/source/ui/utlui.po | 22 source/gl/formula/source/core/resource.po| 56 - source/gu/formula/source/core/resource.po| 24 source/gu/starmath/source.po | 51 source/gug/formula/source/core/resource.po | 47 source/gug/sw/source/ui/utlui.po | 27 source/hi/starmath/source.po | 51 source/hi/sw/source/ui/utlui.po | 48 source/hu/formula/source/core/resource.po| 24 source/id/sw/source/ui/utlui.po | 23 source/it/sw/source/ui/utlui.po | 23 source/ja/sw/source/ui/utlui.po | 19 source/ka/formula/source/core/resource.po| 65 - source/ka/instsetoo_native/inc_openoffice/windows/msi_languages.po | 27 source/ka/scaddins/source/analysis.po| 38 source/ka/starmath/source.po | 38 source/ka/sw/source/ui/utlui.po | 27 source/kk/formula/source/core/resource.po| 20 source/kk/sw/source/ui/utlui.po | 19 source/km/formula/source/core/resource.po| 34 source/km/scaddins/source/analysis.po| 38 source/kmr-Latn/formula/source/core/resource.po | 128 -- source/kmr-Latn/instsetoo_native/inc_openoffice/windows/msi_languages.po | 27 source/kmr-Latn/scaddins/source/analysis.po | 29 source/kmr-Latn/starmath/source.po | 47 source/kmr-Latn/sw/source/ui/utlui.po| 19 source/kn/formula/source/core/resource.po| 51 source/ko/formula/source/core/resource.po| 65 - source/ko/sw/source/ui/utlui.po | 25
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0-3' - source/am source/as source/bg source/bn-IN source/bo source/br source/brx source/bs source/ca source/ca-valencia source/cs source/d
source/am/chart2/uiconfig/ui.po | 6 source/am/connectivity/source/resource.po| 20 source/am/cui/source/tabpages.po | 8 source/am/cui/uiconfig/ui.po | 8 source/am/extras/source/autocorr/emoji.po| 29 source/am/formula/source/core/resource.po| 29 source/am/helpcontent2/source/text/shared/01.po | 32 source/am/helpcontent2/source/text/shared/05.po | 32 source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po | 16 source/am/nlpsolver/src/locale.po| 14 source/am/officecfg/registry/data/org/openoffice/Office/UI.po| 6 source/am/sc/uiconfig/scalc/ui.po| 6 source/am/sd/uiconfig/sdraw/ui.po| 18 source/am/sd/uiconfig/simpress/ui.po | 18 source/am/starmath/uiconfig/smath/ui.po | 10 source/am/sw/source/ui/utlui.po | 19 source/am/sw/uiconfig/swriter/ui.po | 6 source/am/vcl/source/src.po | 7 source/am/vcl/uiconfig/ui.po | 7 source/as/starmath/source.po | 42 source/bg/sw/source/ui/utlui.po | 19 source/bn-IN/formula/source/core/resource.po | 65 source/bn-IN/scaddins/source/analysis.po | 20 source/bo/formula/source/core/resource.po| 47 source/bo/sw/source/ui/utlui.po | 107 source/br/formula/source/core/resource.po| 53 source/br/officecfg/registry/data/org/openoffice/Office/UI.po| 6 source/br/starmath/source.po | 10 source/brx/formula/source/core/resource.po | 46 source/brx/starmath/source.po| 82 source/brx/sw/source/ui/utlui.po | 34 source/bs/sw/source/ui/utlui.po | 20 source/ca-valencia/formula/source/core/resource.po | 29 source/ca/formula/source/core/resource.po| 29 source/cs/extras/source/autocorr/emoji.po| 42 source/cs/helpcontent2/source/text/sbasic/shared.po | 6 source/cs/helpcontent2/source/text/swriter/librelogo.po | 5 source/cs/officecfg/registry/data/org/openoffice/Office.po | 6 source/cs/officecfg/registry/data/org/openoffice/Office/UI.po| 11 source/cs/sc/source/ui/src.po| 9 source/cs/sd/source/ui/view.po | 8 source/cs/sd/uiconfig/simpress/ui.po | 6 source/cs/svx/source/dialog.po | 10 source/cs/sw/source/ui/utlui.po | 19 source/cs/sw/uiconfig/swriter/ui.po | 5 source/da/formula/source/core/resource.po| 29 source/de/helpcontent2/source/text/shared/guide.po | 6 source/de/svx/uiconfig/ui.po | 12 source/de/sw/source/ui/utlui.po | 19 source/de/vcl/source/src.po | 12 source/dgo/formula/source/core/resource.po | 73 source/dgo/instsetoo_native/inc_openoffice/windows/msi_languages.po | 26 source/dgo/starmath/source.po| 244 ++ source/dgo/sw/source/ui/utlui.po | 18 source/dz/formula/source/core/resource.po| 47 source/dz/instsetoo_native/inc_openoffice/windows/msi_languages.po | 27 source/eo/formula/source/core/resource.po| 38 source/es/avmedia/source/viewer.po
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f354c99f61029b14146a2ee0e33e5567f22c3642 Author: Christian Lohmaier Date: Thu Oct 22 14:57:49 2015 +0200 Updated core Project: translations 955713b7939102e4131cd8f399030e8669499375 update translations for 5.0.3 rc2 and force-fix errors using pocheck Change-Id: I8935ca74bea696888d217b0326ba7025d6de0d58 (cherry picked from commit 617cfd09fb15bd1dba7c9e647cc1413e28d93342) diff --git a/translations b/translations index 7f72f0b..955713b 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 7f72f0b6a093c5ca52a43e3a7f4b15afe0a1f17d +Subproject commit 955713b7939102e4131cd8f399030e8669499375 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0' - source/am source/as source/bg source/bn-IN source/bo source/br source/brx source/bs source/ca source/ca-valencia source/cs source/da
source/am/chart2/uiconfig/ui.po | 6 source/am/connectivity/source/resource.po| 20 source/am/cui/source/tabpages.po | 8 source/am/cui/uiconfig/ui.po | 8 source/am/extras/source/autocorr/emoji.po| 29 source/am/formula/source/core/resource.po| 29 source/am/helpcontent2/source/text/shared/01.po | 32 source/am/helpcontent2/source/text/shared/05.po | 32 source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po | 16 source/am/nlpsolver/src/locale.po| 14 source/am/officecfg/registry/data/org/openoffice/Office/UI.po| 6 source/am/sc/uiconfig/scalc/ui.po| 6 source/am/sd/uiconfig/sdraw/ui.po| 18 source/am/sd/uiconfig/simpress/ui.po | 18 source/am/starmath/uiconfig/smath/ui.po | 10 source/am/sw/source/ui/utlui.po | 19 source/am/sw/uiconfig/swriter/ui.po | 6 source/am/vcl/source/src.po | 7 source/am/vcl/uiconfig/ui.po | 7 source/as/starmath/source.po | 42 source/bg/sw/source/ui/utlui.po | 19 source/bn-IN/formula/source/core/resource.po | 65 source/bn-IN/scaddins/source/analysis.po | 20 source/bo/formula/source/core/resource.po| 47 source/bo/sw/source/ui/utlui.po | 107 source/br/formula/source/core/resource.po| 53 source/br/officecfg/registry/data/org/openoffice/Office/UI.po| 6 source/br/starmath/source.po | 10 source/brx/formula/source/core/resource.po | 46 source/brx/starmath/source.po| 82 source/brx/sw/source/ui/utlui.po | 34 source/bs/sw/source/ui/utlui.po | 20 source/ca-valencia/formula/source/core/resource.po | 29 source/ca/formula/source/core/resource.po| 29 source/cs/extras/source/autocorr/emoji.po| 42 source/cs/helpcontent2/source/text/sbasic/shared.po | 6 source/cs/helpcontent2/source/text/swriter/librelogo.po | 5 source/cs/officecfg/registry/data/org/openoffice/Office.po | 6 source/cs/officecfg/registry/data/org/openoffice/Office/UI.po| 11 source/cs/sc/source/ui/src.po| 9 source/cs/sd/source/ui/view.po | 8 source/cs/sd/uiconfig/simpress/ui.po | 6 source/cs/svx/source/dialog.po | 10 source/cs/sw/source/ui/utlui.po | 19 source/cs/sw/uiconfig/swriter/ui.po | 5 source/da/formula/source/core/resource.po| 29 source/de/helpcontent2/source/text/shared/guide.po | 6 source/de/svx/uiconfig/ui.po | 12 source/de/sw/source/ui/utlui.po | 19 source/de/vcl/source/src.po | 12 source/dgo/formula/source/core/resource.po | 73 source/dgo/instsetoo_native/inc_openoffice/windows/msi_languages.po | 26 source/dgo/starmath/source.po| 244 ++ source/dgo/sw/source/ui/utlui.po | 18 source/dz/formula/source/core/resource.po| 47 source/dz/instsetoo_native/inc_openoffice/windows/msi_languages.po | 27 source/eo/formula/source/core/resource.po| 38 source/es/avmedia/source/viewer.po
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1b8ad1409cb66411837a3da39d2e6469e91297e Author: Christian Lohmaier Date: Thu Oct 22 14:57:49 2015 +0200 Updated core Project: translations 617cfd09fb15bd1dba7c9e647cc1413e28d93342 update translations for 5.0.3 rc2 and force-fix errors using pocheck Change-Id: I8935ca74bea696888d217b0326ba7025d6de0d58 diff --git a/translations b/translations index 3a53547..617cfd0 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 3a5354783e989a66d3a3142a18412893ba93caeb +Subproject commit 617cfd09fb15bd1dba7c9e647cc1413e28d93342 ___ 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-3' - instsetoo_native/CustomTarget_setup.mk instsetoo_native/util
instsetoo_native/CustomTarget_setup.mk |1 + instsetoo_native/util/openoffice.lst.in | 10 +- 2 files changed, 6 insertions(+), 5 deletions(-) New commits: commit ce5407549cb76d2792236f2b44a22ff596e35ca2 Author: Christian Lohmaier Date: Thu Sep 24 22:37:56 2015 +0200 sync splash-progressbar position for installets with instdir values for actual installer versions come from openoffice.lst, add a hint to the instdir-makefile Change-Id: I6eea5585dd776d4d6071af7b508a91a9c385cb3a (cherry picked from commit f38683a114c1c36284a795c052e8708bc65438c3) (cherry picked from commit f73c3b7d7dc68bd1b44749fdc755a9bca1bb6ce8) diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index f898d55..149f2b8 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -103,6 +103,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ ) > $@ +# for release-builds (building installers) adjust values in openoffice.lst.in $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index d05f8ab..8cf38a2 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -16,11 +16,11 @@ Globals SOLSUREPACKAGEPREFIX libreoffice REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb REGISTRATIONURL http://survey.libreoffice.org/user/index.php -PROGRESSBARCOLOR 128,128,128 -PROGRESSSIZE 409,8 -PROGRESSPOSITION 72,189 -PROGRESSFRAMECOLOR 245,245,245 -PROGRESSTEXTBASELINE 170 +PROGRESSBARCOLOR 0,0,0 +PROGRESSSIZE 444,8 +PROGRESSPOSITION 35,153 +PROGRESSFRAMECOLOR 102,102,102 +PROGRESSTEXTBASELINE 145 PROGRESSTEXTCOLOR 255,255,255 NATIVEPROGRESS false REGISTRYLAYERNAME Layers ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extensions/source rsc/source sw/source vcl/source
extensions/source/ole/servprov.cxx | 12 +++-
rsc/source/rscpp/cpp5.c|2 +-
sw/source/core/bastyp/calc.cxx |4 ++--
vcl/source/fontsubset/sft.cxx |2 +-
vcl/source/gdi/sallayout.cxx |6 +++---
5 files changed, 14 insertions(+), 12 deletions(-)
New commits:
commit 5f64aba978b117eb4372fef913823243a800fbea
Author: Caolán McNamara
Date: Sat Oct 24 12:43:28 2015 +0100
cppcheck: invalidPrintfArgType_sint
Change-Id: I4103c8e1549db44055fbfcb8ced6ec36d27fc126
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 499219b..1f73ff3 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -241,7 +241,7 @@ again:
else
{
#ifdef DEBUG_EVAL
-fprintf( pCppOut, "pushing %d onto value stack[%d]\n",
+fprintf( pCppOut, "pushing %d onto value stack[%u]\n",
evalue, valp - value);
#endif
*valp++ = evalue;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 7473c41..1f4dc62 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1666,7 +1666,7 @@ void main()
for( int n = 0; n < 27; ++n )
{
-unsigned long ii = 0;
+unsigned int ii = 0;
const sal_Char* pp = sNTypeTab[ n ];
while( *pp )
@@ -1677,7 +1677,7 @@ void main()
ch = aArr[ ii ] ? 'X' : ' ';
aArr[ ii ] = 1;
-printf( "%-20s -> %3d [%c]\n", sNTypeTab[ n ], ii, ch );
+printf( "%-20s -> %3u [%c]\n", sNTypeTab[ n ], ii, ch );
}
}
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 51f3f95..7461f56 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2343,7 +2343,7 @@ int CreateT42FromTTGlyphs(TrueTypeFont *ttf,
fprintf(outf, "0 1 255 {Encoding exch /.notdef put} for\n");
for (i = 1; iptr, ttf->fsize), (unsigned int)nGlyphs,
(unsigned int)rtl_crc32(0, glyphArray, nGlyphs * 2), (unsigned int)rtl_crc32(0,
encoding, nGlyphs));
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 6becfe7..e351deb 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1624,7 +1624,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
nValid[ nLevel ] = mpLayouts[n]->GetNextGlyphs( 1, &nDummy, aPos,
nStartNew[ nLevel ], &nGlyphAdv[ nLevel ], &nCharPos[ nLevel ] );
#ifdef MULTI_SL_DEBUG
-if (nValid[nLevel]) fprintf(mslLog(), "layout[%d]->GetNextGlyphs %d,%d
x%d a%d c%d %x\n", n, nStartOld[nLevel], nStartNew[nLevel], aPos.X(),
(long)nGlyphAdv[nLevel], nCharPos[nLevel],
+if (nValid[nLevel]) fprintf(mslLog(), "layout[%d]->GetNextGlyphs %d,%d
x%d a%d c%ld %x\n", n, nStartOld[nLevel], nStartNew[nLevel], aPos.X(),
(long)nGlyphAdv[nLevel], nCharPos[nLevel],
rArgs.mrStr[nCharPos[nLevel]]);
#endif
if( (n > 0) && !nValid[ nLevel ] )
@@ -1695,7 +1695,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
nValid[0] = mpLayouts[0]->GetNextGlyphs( 1, &nDummy, aPos,
nStartNew[0], &nGlyphAdv[0], &nCharPos[0] );
#ifdef MULTI_SL_DEBUG
-if (nValid[0]) fprintf(mslLog(), "layout[0]->GetNextGlyphs
%d,%d x%d a%d c%d %x\n", nStartOld[0], nStartNew[0], aPos.X(),
(long)nGlyphAdv[0], nCharPos[0], rArgs.mrStr[nCharPos[0]]);
+if (nValid[0]) fprintf(mslLog(), "layout[0]->GetNextGlyphs
%d,%d x%d a%ld c%d %x\n", nStartOld[0], nStartNew[0], aPos.X(),
(long)nGlyphAdv[0], nCharPos[0], rArgs.mrStr[nCharPos[0]]);
#endif
if( !nValid[0] )
break;
@@ -1715,7 +1715,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
nValid[n] = mpLayouts[n]->GetNextGlyphs( 1, &nDummy, aPos,
nStartNew[n],
&nGlyphAdv[n], &nCharPos[n] );
#ifdef MULTI_SL_DEBUG
-if (nValid[n]) fprintf(mslLog(), "layout[%d]->GetNextGlyphs %d,%d
a%d c%d %x\n", n, nStartOld[n], nStartNew[n], (long)nGlyphAdv[n], nCharPos[n],
rArgs.mrStr[nCharPos[n]]);
+if (nValid[n]) fprintf(mslLog(), "layout[%d]->GetNextGlyphs %d,%d
a%ld c%d %x\n", n, nStartOld[n], nStartNew[n], (long)nGlyphAdv[n], nCharPos[n],
rArgs.mrStr[nCharPos[n]]);
#endif
// break after last glyph of active layout
if( !nValid[n] )
commit 97839c6768f09684bfd0d39322896f65b68f8549
Author: Caolán McNamara
Date: Sat Oct 24 12:41:18 2015 +0100
bogus cppcheck duplicateExpressionTernary warning
Change-Id: I9c6e7699790cc2e526a15daf8c5c2aa30fc9
diff --git a/extensions/source/ole/servprov.cxx
b/extensions/source/ole/servprov.cxx
index 2467850..a38dd90 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -442,12 +442,14 @@ sal_Bool OleConverter_Impl2::supportsService(OUString
const & ServiceName)
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - instsetoo_native/CustomTarget_setup.mk instsetoo_native/util
instsetoo_native/CustomTarget_setup.mk |1 + instsetoo_native/util/openoffice.lst.in | 10 +- 2 files changed, 6 insertions(+), 5 deletions(-) New commits: commit f73c3b7d7dc68bd1b44749fdc755a9bca1bb6ce8 Author: Christian Lohmaier Date: Thu Sep 24 22:37:56 2015 +0200 sync splash-progressbar position for installets with instdir values for actual installer versions come from openoffice.lst, add a hint to the instdir-makefile Change-Id: I6eea5585dd776d4d6071af7b508a91a9c385cb3a (cherry picked from commit f38683a114c1c36284a795c052e8708bc65438c3) diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index f898d55..149f2b8 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -103,6 +103,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ ) > $@ +# for release-builds (building installers) adjust values in openoffice.lst.in $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index d05f8ab..8cf38a2 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -16,11 +16,11 @@ Globals SOLSUREPACKAGEPREFIX libreoffice REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb REGISTRATIONURL http://survey.libreoffice.org/user/index.php -PROGRESSBARCOLOR 128,128,128 -PROGRESSSIZE 409,8 -PROGRESSPOSITION 72,189 -PROGRESSFRAMECOLOR 245,245,245 -PROGRESSTEXTBASELINE 170 +PROGRESSBARCOLOR 0,0,0 +PROGRESSSIZE 444,8 +PROGRESSPOSITION 35,153 +PROGRESSFRAMECOLOR 102,102,102 +PROGRESSTEXTBASELINE 145 PROGRESSTEXTCOLOR 255,255,255 NATIVEPROGRESS false REGISTRYLAYERNAME Layers ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/uiconfig
chart2/uiconfig/ui/sidebarelements.ui |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 04f66b00738601a789eb76b7a950c0dec6fbb084 Author: Yousuf Philips Date: Wed Oct 14 14:32:22 2015 +0400 tdf#91063 Change show legend label to tooltip in chart sidebar Change-Id: I3d4cd44527bd9687df002543055286daf6e24a65 Reviewed-on: https://gerrit.libreoffice.org/19370 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/chart2/uiconfig/ui/sidebarelements.ui b/chart2/uiconfig/ui/sidebarelements.ui index 901a483..9ee199e 100644 --- a/chart2/uiconfig/ui/sidebarelements.ui +++ b/chart2/uiconfig/ui/sidebarelements.ui @@ -97,12 +97,13 @@ False -Show Legend +Show Legend True True False 0 True +5 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 17 commits - accessibility/inc accessibility/source android/Bootstrap basctl/source basic/source bridges/source chart2/source comphel
Rebased ref, commits from common ancestor:
commit 6cb8c46b28c3d6d33d90cbc94dc6cbc157ae158f
Author: Douglas Mencken
Date: Wed Oct 21 16:50:40 2015 -0400
Fix âGuÃa problemâ
âGuÃa problemâ is actually an unability (i.e. crash) to add new formula
or to open existing file with formulas ...
... terminate called after throwing an instance of
'com::sun::star::uno::RuntimeException'
program received signal SIGABRT, aborted
b a c k t r a c e
0 __kill
1 abort
...
5 __cxa_throw
6 com::sun::star::uno::BaseReference::iquery_throw
7 SfxObjectShell::SetupStorage
8 SfxBaseModel::storeToStorage
9 OCommonEmbeddedObject::StoreDocToStorage_Impl
10 OCommonEmbeddedObject::storeAsEntry
11 comphelper::EmbeddedObjectContainer::StoreEmbeddedObject
12 comphelper::EmbeddedObjectContainer::InsertEmbeddedObject
...
Fantastically enough that exception cannot be caught even with `catch (...)'
What's interesting introduced by this patch
⢠make ``uno::Reference< beans::XPropertySet > xProps( xStorage,
uno::UNO_QUERY );''
not to be a first line in SfxObjectShell::SetupStorage
⢠add SAL_INFOs to know how the code flows
⢠use `catch ( ... )' here and there
⢠don't throw exceptions from OStorageHelper::GetXStorageFormat in the
case when
media type returned from xStorProps->getPropertyValue("MediaType") is
empty
⢠`return' instead of throwing an exception for the case when
`!xStorage.is()'
in OCommonEmbeddedObject::StoreDocToStorage_Impl
Change-Id: I1241518a7ce87f68da71655f6f7f0a9ab9cb6bdb
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index caa2d25..c8e2fa1 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -467,6 +467,8 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject(
const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName,
bool bCopy,
const OUString& rSrcShellID, const OUString& rDestShellID )
{
+SAL_INFO( "comphelper.container", "entering
>>EmbeddedObjectContainer::StoreEmbeddedObject<<" );
+
uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
if ( rName.isEmpty() )
rName = CreateUniqueObjectName();
@@ -500,9 +502,9 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject(
}
}
}
-catch (uno::Exception const& e)
+catch ( uno::Exception const& ex )
{
-SAL_WARN("comphelper.container",
"EmbeddedObjectContainer::StoreEmbeddedObject: exception caught: " <<
e.Message);
+SAL_WARN( "comphelper.container",
"EmbeddedObjectContainer::StoreEmbeddedObject: exception caught: " <<
ex.Message );
// TODO/LATER: better error recovery should keep storage intact
return false;
}
@@ -512,6 +514,8 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject(
bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference <
embed::XEmbeddedObject >& xObj, OUString& rName )
{
+SAL_INFO( "comphelper.container", "entering >>bool
EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference <
embed::XEmbeddedObject >& xObj, OUString& rName )<<" );
+
// store it into the container storage
if (StoreEmbeddedObject(xObj, rName, false, OUString(), OUString()))
{
@@ -519,12 +523,14 @@ bool EmbeddedObjectContainer::InsertEmbeddedObject( const
uno::Reference < embed
AddEmbeddedObject( xObj, rName );
return true;
}
-else
-return false;
+
+return false;
}
uno::Reference < embed::XEmbeddedObject >
EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference <
io::XInputStream >& xStm, OUString& rNewName )
{
+SAL_INFO( "comphelper.container", "entering >>uno::Reference <
embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const
uno::Reference < io::XInputStream >& xStm, OUString& rNewName )<<" );
+
if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
@@ -585,6 +591,8 @@ uno::Reference < embed::XEmbeddedObject >
EmbeddedObjectContainer::InsertEmbedde
uno::Reference < embed::XEmbeddedObject >
EmbeddedObjectContainer::InsertEmbeddedObject( const css::uno::Sequence <
css::beans::PropertyValue >& aMedium, OUString& rNewName )
{
+SAL_INFO( "comphelper.container", "entering >>uno::Reference <
embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const
css::uno::Sequence < css::beans::PropertyValue >& aMedium, OUString& rNewName
)<<" );
+
if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
diff --git a/comphelper/source/misc/storagehelper.cxx
b/comphelper/source/misc/storagehelper.cxx
index b2fe5d9..95d386f 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/svx
include/svx/sdtacitm.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a3b56a4f3eb55fad4bf10589a0acbc7879429cdd
Author: Jan-Marek Glogowski
Date: Fri Oct 23 21:00:46 2015 +0200
Use SAL_OVERRIDE for override
Otherwise build breaks on gcc 4.6.
Change-Id: I9f0d94448e31e8b61b271fc088f0ce74128c375b
Reviewed-on: https://gerrit.libreoffice.org/19564
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/include/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx
index 23c7149..a14ba85 100644
--- a/include/svx/sdtacitm.hxx
+++ b/include/svx/sdtacitm.hxx
@@ -28,10 +28,10 @@ public:
SdrTextAniCountItem(sal_uInt16 nVal=0):
SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
SdrTextAniCountItem(SvStream& rIn):
SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn) {}
-virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override
+virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const
SAL_OVERRIDE
{ return new SdrTextAniCountItem(rStream); }
-virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override
+virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE
{ return new SdrTextAniCountItem(*this); }
};
___
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-3' - sc/source
sc/source/core/tool/interpr1.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 5154b77b88c1b95afb0b2399e765bb3cad9f89fe
Author: Eike Rathke
Date: Wed Oct 21 18:45:18 2015 +0200
Resolves: tdf#95226 fix broken IFERROR/IFNA array logic
Change-Id: I059248659f51746cfc1d06faeaadaf3d645c03d3
(cherry picked from commit 968e2faff6d4283dacd9010d31cb4c0df45eb7c5)
Reviewed-on: https://gerrit.libreoffice.org/19520
Reviewed-by: Caolán McNamara
Reviewed-by: Markus Mohrhard
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index ff8a990..f6caa79 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -354,11 +354,11 @@ void ScInterpreter::ScIfError( bool bNAonly )
SCSIZE nC = 0, nR = 0;
for ( ; nC < nCols && (nC != nErrorCol || nR !=
nErrorRow); /*nop*/ )
{
-for ( ; nR < nRows && (nC != nErrorCol || nR !=
nErrorRow); ++nR)
+for (nR = 0 ; nR < nRows && (nC != nErrorCol || nR !=
nErrorRow); ++nR)
{
lcl_storeJumpMatResult(pMatPtr, pJumpMat, nC, nR);
}
-if (nC != nErrorCol || nR != nErrorRow)
+if (nC != nErrorCol && nR != nErrorRow)
++nC;
}
// Now the mixed cases.
@@ -376,6 +376,7 @@ void ScInterpreter::ScIfError( bool bNAonly )
lcl_storeJumpMatResult(pMatPtr, pJumpMat, nC,
nR);
}
}
+nR = 0;
}
xNew = new ScJumpMatrixToken( pJumpMat );
GetTokenMatrixMap().insert( ScTokenMatrixMap::value_type(
pCur, xNew ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: QA Meeting Minutes - 2015-10-21
Hi Robinson, Le 24/10/2015 09:37, Robinson Tryon a écrit : > Hi all, > > Thanks for the great QA Meeting on Wednesday! > > Minutes are here: > https://wiki.documentfoundation.org/QA/Meetings/2015/October_21 > > Our next meeting will be on the 28th, just a couple of days before the > BugHunting Session for LibreOffice 5.1. We'll go over any last-minute > updates for the weekend at that point: > https://wiki.documentfoundation.org/QA/Meetings/2015/October_28 Has the meeting changed its time or place? I was online at 13 UTC but didn't see anything on irc? Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org GSM: +33683901545 IRC: sophi Co-founder - Release coordinator The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-3' - sc/source
sc/source/core/tool/address.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5430d2a2a642038c149c29350c86f1bee3a4e650 Author: Eike Rathke Date: Tue Oct 13 18:29:27 2015 +0200 Resolves: tdf#94514 more restrictive check on end of column specifier ... needed since we accept A:A entire column notation without the need of a row number being specified. Change-Id: I84f6a39e213a4b554e0188e73b4acb34c7a98460 (cherry picked from commit 14bb562b4a8776974391641adcc62ded013ffd2f) Reviewed-on: https://gerrit.libreoffice.org/19360 Reviewed-by: Caolán McNamara Reviewed-by: Markus Mohrhard Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 051b062..4b56e80 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -1153,7 +1153,7 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDo else nBits = 0; -if( nCol > MAXCOL || rtl::isAsciiAlpha( *p ) ) +if (nCol > MAXCOL || (*p && *p != '$' && !rtl::isAsciiDigit( *p ))) nBits = 0; nRes |= nBits; if( !nBits ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - comphelper/source embeddedobj/source sfx2/source
Rebased ref, commits from common ancestor:
commit 8ac9ac5016436e08609b4c183725729680739dbd
Author: Douglas Mencken
Date: Wed Oct 21 16:50:40 2015 -0400
Fix âGuÃa problemâ
âGuÃa problemâ is actually an unability (i.e. crash) to add new formula
or to open existing file with formulas ...
... terminate called after throwing an instance of
'com::sun::star::uno::RuntimeException'
program received signal SIGABRT, aborted
b a c k t r a c e
0 __kill
1 abort
...
5 __cxa_throw
6 com::sun::star::uno::BaseReference::iquery_throw
7 SfxObjectShell::SetupStorage
8 SfxBaseModel::storeToStorage
9 OCommonEmbeddedObject::StoreDocToStorage_Impl
10 OCommonEmbeddedObject::storeAsEntry
11 comphelper::EmbeddedObjectContainer::StoreEmbeddedObject
12 comphelper::EmbeddedObjectContainer::InsertEmbeddedObject
...
Fantastically enough that exception cannot be caught even with `catch (...)'
What's interesting introduced by this patch
⢠make ``uno::Reference< beans::XPropertySet > xProps( xStorage,
uno::UNO_QUERY );''
not to be a first line in SfxObjectShell::SetupStorage
⢠add SAL_INFOs to know how the code flows
⢠use `catch ( ... )' here and there
⢠don't throw exceptions from OStorageHelper::GetXStorageFormat in the
case when
media type returned from xStorProps->getPropertyValue("MediaType") is
empty
⢠`return' instead of throwing an exception for the case when
`!xStorage.is()'
in OCommonEmbeddedObject::StoreDocToStorage_Impl
Change-Id: I1241518a7ce87f68da71655f6f7f0a9ab9cb6bdb
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index caa2d25..c8e2fa1 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -467,6 +467,8 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject(
const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName,
bool bCopy,
const OUString& rSrcShellID, const OUString& rDestShellID )
{
+SAL_INFO( "comphelper.container", "entering
>>EmbeddedObjectContainer::StoreEmbeddedObject<<" );
+
uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
if ( rName.isEmpty() )
rName = CreateUniqueObjectName();
@@ -500,9 +502,9 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject(
}
}
}
-catch (uno::Exception const& e)
+catch ( uno::Exception const& ex )
{
-SAL_WARN("comphelper.container",
"EmbeddedObjectContainer::StoreEmbeddedObject: exception caught: " <<
e.Message);
+SAL_WARN( "comphelper.container",
"EmbeddedObjectContainer::StoreEmbeddedObject: exception caught: " <<
ex.Message );
// TODO/LATER: better error recovery should keep storage intact
return false;
}
@@ -512,6 +514,8 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject(
bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference <
embed::XEmbeddedObject >& xObj, OUString& rName )
{
+SAL_INFO( "comphelper.container", "entering >>bool
EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference <
embed::XEmbeddedObject >& xObj, OUString& rName )<<" );
+
// store it into the container storage
if (StoreEmbeddedObject(xObj, rName, false, OUString(), OUString()))
{
@@ -519,12 +523,14 @@ bool EmbeddedObjectContainer::InsertEmbeddedObject( const
uno::Reference < embed
AddEmbeddedObject( xObj, rName );
return true;
}
-else
-return false;
+
+return false;
}
uno::Reference < embed::XEmbeddedObject >
EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference <
io::XInputStream >& xStm, OUString& rNewName )
{
+SAL_INFO( "comphelper.container", "entering >>uno::Reference <
embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const
uno::Reference < io::XInputStream >& xStm, OUString& rNewName )<<" );
+
if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
@@ -585,6 +591,8 @@ uno::Reference < embed::XEmbeddedObject >
EmbeddedObjectContainer::InsertEmbedde
uno::Reference < embed::XEmbeddedObject >
EmbeddedObjectContainer::InsertEmbeddedObject( const css::uno::Sequence <
css::beans::PropertyValue >& aMedium, OUString& rNewName )
{
+SAL_INFO( "comphelper.container", "entering >>uno::Reference <
embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const
css::uno::Sequence < css::beans::PropertyValue >& aMedium, OUString& rNewName
)<<" );
+
if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
diff --git a/comphelper/source/misc/storagehelper.cxx
b/comphelper/source/misc/storagehelper.cxx
index b2fe5d9..95d386f 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=79641 tommy27 changed: What|Removed |Added Status|RESOLVED|CLOSED -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=75025 tommy27 changed: What|Removed |Added Status|RESOLVED|CLOSED -- 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
QA Meeting Minutes - 2015-10-21
Hi all, Thanks for the great QA Meeting on Wednesday! Minutes are here: https://wiki.documentfoundation.org/QA/Meetings/2015/October_21 Our next meeting will be on the 28th, just a couple of days before the BugHunting Session for LibreOffice 5.1. We'll go over any last-minute updates for the weekend at that point: https://wiki.documentfoundation.org/QA/Meetings/2015/October_28 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
